diff --git a/.coveragerc b/.coveragerc
index 03929d4ce39..5bf9de194df 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -98,9 +98,6 @@ omit =
     homeassistant/components/bme680/sensor.py
     homeassistant/components/bmp280/sensor.py
     homeassistant/components/bmw_connected_drive/*
-    homeassistant/components/bom/camera.py
-    homeassistant/components/bom/sensor.py
-    homeassistant/components/bom/weather.py
     homeassistant/components/braviatv/__init__.py
     homeassistant/components/braviatv/const.py
     homeassistant/components/braviatv/media_player.py
@@ -134,7 +131,6 @@ omit =
     homeassistant/components/clickatell/notify.py
     homeassistant/components/clicksend/notify.py
     homeassistant/components/clicksend_tts/notify.py
-    homeassistant/components/cloudflare/*
     homeassistant/components/cmus/media_player.py
     homeassistant/components/co2signal/*
     homeassistant/components/coinbase/*
@@ -609,8 +605,6 @@ omit =
     homeassistant/components/omnilogic/__init__.py
     homeassistant/components/omnilogic/common.py
     homeassistant/components/omnilogic/sensor.py
-    homeassistant/components/onewire/const.py
-    homeassistant/components/onewire/sensor.py
     homeassistant/components/onkyo/media_player.py
     homeassistant/components/onvif/__init__.py
     homeassistant/components/onvif/base.py
@@ -651,6 +645,9 @@ omit =
     homeassistant/components/ovo_energy/__init__.py
     homeassistant/components/ovo_energy/const.py
     homeassistant/components/ovo_energy/sensor.py
+    homeassistant/components/ozw/__init__.py
+    homeassistant/components/ozw/entity.py
+    homeassistant/components/ozw/services.py
     homeassistant/components/panasonic_bluray/media_player.py
     homeassistant/components/panasonic_viera/media_player.py
     homeassistant/components/pandora/media_player.py
@@ -720,7 +717,6 @@ omit =
     homeassistant/components/repetier/__init__.py
     homeassistant/components/repetier/sensor.py
     homeassistant/components/remote_rpi_gpio/*
-    homeassistant/components/rest/binary_sensor.py
     homeassistant/components/rest/notify.py
     homeassistant/components/rest/switch.py
     homeassistant/components/ring/camera.py
@@ -779,7 +775,9 @@ omit =
     homeassistant/components/simplepush/notify.py
     homeassistant/components/simplisafe/__init__.py
     homeassistant/components/simplisafe/alarm_control_panel.py
+    homeassistant/components/simplisafe/binary_sensor.py
     homeassistant/components/simplisafe/lock.py
+    homeassistant/components/simplisafe/sensor.py
     homeassistant/components/simulated/sensor.py
     homeassistant/components/sisyphus/*
     homeassistant/components/sky_hub/*
@@ -823,6 +821,7 @@ omit =
     homeassistant/components/spotify/__init__.py
     homeassistant/components/spotify/media_player.py
     homeassistant/components/squeezebox/__init__.py
+    homeassistant/components/squeezebox/browse_media.py
     homeassistant/components/squeezebox/media_player.py
     homeassistant/components/starline/*
     homeassistant/components/starlingbank/sensor.py
@@ -912,6 +911,7 @@ omit =
     homeassistant/components/torque/sensor.py
     homeassistant/components/totalconnect/*
     homeassistant/components/touchline/climate.py
+    homeassistant/components/tplink/common.py
     homeassistant/components/tplink/switch.py
     homeassistant/components/tplink_lte/*
     homeassistant/components/traccar/device_tracker.py
@@ -942,7 +942,9 @@ omit =
     homeassistant/components/upb/const.py
     homeassistant/components/upb/light.py
     homeassistant/components/upb/scene.py
-    homeassistant/components/upcloud/*
+    homeassistant/components/upcloud/__init__.py
+    homeassistant/components/upcloud/binary_sensor.py
+    homeassistant/components/upcloud/switch.py
     homeassistant/components/upnp/*
     homeassistant/components/upc_connect/*
     homeassistant/components/uptimerobot/binary_sensor.py
@@ -976,6 +978,7 @@ omit =
     homeassistant/components/vlc_telnet/media_player.py
     homeassistant/components/volkszaehler/sensor.py
     homeassistant/components/volumio/__init__.py
+    homeassistant/components/volumio/browse_media.py
     homeassistant/components/volumio/media_player.py
     homeassistant/components/volvooncall/*
     homeassistant/components/w800rf32/*
@@ -996,6 +999,15 @@ omit =
     homeassistant/components/worldtidesinfo/sensor.py
     homeassistant/components/worxlandroid/sensor.py
     homeassistant/components/x10/light.py
+    homeassistant/components/xbox/__init__.py
+    homeassistant/components/xbox/api.py
+    homeassistant/components/xbox/base_sensor.py
+    homeassistant/components/xbox/binary_sensor.py
+    homeassistant/components/xbox/browse_media.py
+    homeassistant/components/xbox/media_player.py
+    homeassistant/components/xbox/media_source.py
+    homeassistant/components/xbox/remote.py
+    homeassistant/components/xbox/sensor.py
     homeassistant/components/xbox_live/sensor.py
     homeassistant/components/xeoma/camera.py
     homeassistant/components/xfinity/device_tracker.py
@@ -1053,9 +1065,6 @@ omit =
     homeassistant/components/zoneminder/*
     homeassistant/components/supla/*
     homeassistant/components/zwave/util.py
-    homeassistant/components/ozw/__init__.py
-    homeassistant/components/ozw/entity.py
-    homeassistant/components/ozw/services.py
 
 [report]
 # Regexes for lines to exclude from consideration
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7b56b66d0b5..fc07d32bfc8 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
   "appPort": 8123,
   "runArgs": ["-e", "GIT_EDITOR=code --wait"],
   "extensions": [
-    "ms-python.python",
+    "ms-python.vscode-pylance",
     "visualstudioexptteam.vscodeintellicode",
     "ms-azure-devops.azure-pipelines",
     "redhat.vscode-yaml",
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e7412e6ba8e..05726ab79e5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -119,7 +119,7 @@ To help with the load of incoming pull requests:
 
 - [ ] I have reviewed two other [open pull requests][prs] in this repository.
 
-[prs]: https://github.com/home-assistant/core/pulls?q=is%3Aopen+is%3Apr+-author%3A%40me+-draft%3Atrue+-label%3Awaiting-for-upstream+sort%3Acreated-asc+-review%3Aapproved
+[prs]: https://github.com/home-assistant/core/pulls?q=is%3Aopen+is%3Apr+-author%3A%40me+-draft%3Atrue+-label%3Awaiting-for-upstream+sort%3Acreated-desc+review%3Anone
 
 <!--
   Thank you for contributing <3
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3d65df477e7..8125f81df44 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
@@ -73,7 +73,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -118,7 +118,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -163,7 +163,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -230,7 +230,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -278,7 +278,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -326,7 +326,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -371,7 +371,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -419,7 +419,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -475,7 +475,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -555,7 +555,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.1.2
+        uses: actions/setup-python@v2.1.4
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -736,7 +736,7 @@ jobs:
             -p no:sugar \
             tests
       - name: Upload coverage artifact
-        uses: actions/upload-artifact@v2.1.4
+        uses: actions/upload-artifact@v2.2.0
         with:
           name: coverage-${{ matrix.python-version }}-group${{ matrix.group }}
           path: .coverage
@@ -779,4 +779,4 @@ jobs:
           coverage report --fail-under=94
           coverage xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1.0.13
+        uses: codecov/codecov-action@v1.0.14
diff --git a/.gitignore b/.gitignore
index 75d63d8bacb..20c1991c45d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,7 +88,7 @@ venv
 .venv
 Pipfile*
 share/*
-Scripts/
+/Scripts/
 
 # vimmy stuff
 *.swp
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 114e6b6c87b..43dcb903650 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
           - --quiet-level=2
         exclude_types: [csv, json]
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.3
+    rev: 3.8.4
     hooks:
       - id: flake8
         additional_dependencies:
@@ -87,5 +87,5 @@ repos:
         entry: script/run-in-env.sh python3 -m script.hassfest
         pass_filenames: false
         language: script
-        types: [json]
-        files: ^homeassistant/.+/(manifest|strings)\.json$
+        types: [text]
+        files: ^(homeassistant/.+/(manifest|strings)\.json|\.coveragerc)$
diff --git a/CODEOWNERS b/CODEOWNERS
index 31a7bc6356b..87112840f5b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -17,6 +17,7 @@ homeassistant/components/abode/* @shred86
 homeassistant/components/accuweather/* @bieniu
 homeassistant/components/acmeda/* @atmurray
 homeassistant/components/adguard/* @frenck
+homeassistant/components/advantage_air/* @Bre77
 homeassistant/components/agent_dvr/* @ispysoftware
 homeassistant/components/airly/* @bieniu
 homeassistant/components/airvisual/* @bachya
@@ -59,7 +60,6 @@ homeassistant/components/blebox/* @gadgetmobile
 homeassistant/components/blink/* @fronzbot
 homeassistant/components/bmp280/* @belidzs
 homeassistant/components/bmw_connected_drive/* @gerard33 @rikroe
-homeassistant/components/bom/* @maddenp
 homeassistant/components/bond/* @prystupa
 homeassistant/components/braviatv/* @bieniu
 homeassistant/components/broadlink/* @danielhiversen @felipediel
@@ -75,7 +75,7 @@ homeassistant/components/cisco_ios/* @fbradyirl
 homeassistant/components/cisco_mobility_express/* @fbradyirl
 homeassistant/components/cisco_webex_teams/* @fbradyirl
 homeassistant/components/cloud/* @home-assistant/cloud
-homeassistant/components/cloudflare/* @ludeeus
+homeassistant/components/cloudflare/* @ludeeus @ctalkington
 homeassistant/components/comfoconnect/* @michaelarnauts
 homeassistant/components/config/* @home-assistant/core
 homeassistant/components/configurator/* @home-assistant/core
@@ -161,8 +161,8 @@ homeassistant/components/goalzero/* @tkdrob
 homeassistant/components/gogogate2/* @vangorra
 homeassistant/components/google_assistant/* @home-assistant/cloud
 homeassistant/components/google_cloud/* @lufton
-homeassistant/components/google_translate/* @awarecan
 homeassistant/components/gpsd/* @fabaff
+homeassistant/components/gree/* @cmroche
 homeassistant/components/greeneye_monitor/* @jkeljo
 homeassistant/components/griddy/* @bdraco
 homeassistant/components/group/* @home-assistant/core
@@ -277,7 +277,7 @@ homeassistant/components/neato/* @dshokouhi @Santobert
 homeassistant/components/nederlandse_spoorwegen/* @YarmoM
 homeassistant/components/nello/* @pschmitt
 homeassistant/components/ness_alarm/* @nickw444
-homeassistant/components/nest/* @awarecan
+homeassistant/components/nest/* @awarecan @allenporter
 homeassistant/components/netatmo/* @cgtobi
 homeassistant/components/netdata/* @fabaff
 homeassistant/components/nexia/* @ryannazaretian @bdraco
@@ -305,7 +305,7 @@ homeassistant/components/ohmconnect/* @robbiet480
 homeassistant/components/ombi/* @larssont
 homeassistant/components/omnilogic/* @oliver84 @djtimca @gentoosu
 homeassistant/components/onboarding/* @home-assistant/core
-homeassistant/components/onewire/* @garbled1
+homeassistant/components/onewire/* @garbled1 @epenet
 homeassistant/components/onvif/* @hunterjm
 homeassistant/components/openerz/* @misialq
 homeassistant/components/opengarage/* @danielhiversen
@@ -317,7 +317,6 @@ homeassistant/components/orangepi_gpio/* @pascallj
 homeassistant/components/oru/* @bvlaicu
 homeassistant/components/ovo_energy/* @timmo001
 homeassistant/components/ozw/* @cgarwood @marcelveldt @MartinHjelmare
-homeassistant/components/panasonic_viera/* @joogps
 homeassistant/components/panel_custom/* @home-assistant/frontend
 homeassistant/components/panel_iframe/* @home-assistant/frontend
 homeassistant/components/pcal9535a/* @Shulyaka
@@ -334,6 +333,7 @@ homeassistant/components/plum_lightpad/* @ColinHarrington @prystupa
 homeassistant/components/point/* @fredrike
 homeassistant/components/poolsense/* @haemishkyd
 homeassistant/components/powerwall/* @bdraco @jrester
+homeassistant/components/profiler/* @bdraco
 homeassistant/components/progettihwsw/* @ardaseremet
 homeassistant/components/prometheus/* @knyar
 homeassistant/components/proxmoxve/* @k4ds3 @jhollowe
@@ -355,7 +355,7 @@ homeassistant/components/rainmachine/* @bachya
 homeassistant/components/random/* @fabaff
 homeassistant/components/rejseplanen/* @DarkFox
 homeassistant/components/repetier/* @MTrab
-homeassistant/components/rfxtrx/* @danielhiversen @elupus
+homeassistant/components/rfxtrx/* @danielhiversen @elupus @RobBie1221
 homeassistant/components/ring/* @balloob
 homeassistant/components/risco/* @OnFreund
 homeassistant/components/rmvtransport/* @cgtobi
@@ -363,6 +363,7 @@ homeassistant/components/roku/* @ctalkington
 homeassistant/components/roomba/* @pschmitt @cyr-ius @shenxn
 homeassistant/components/roon/* @pavoni
 homeassistant/components/rpi_power/* @shenxn @swetoast
+homeassistant/components/ruckus_unleashed/* @gabe565
 homeassistant/components/safe_mode/* @home-assistant/core
 homeassistant/components/saj/* @fredericvl
 homeassistant/components/salt/* @bjornorri
@@ -436,6 +437,7 @@ homeassistant/components/tado/* @michaelarnauts @bdraco
 homeassistant/components/tag/* @balloob @dmulcahey
 homeassistant/components/tahoma/* @philklei
 homeassistant/components/tankerkoenig/* @guillempages
+homeassistant/components/tasmota/* @emontnemery
 homeassistant/components/tautulli/* @ludeeus
 homeassistant/components/tellduslive/* @fredrike
 homeassistant/components/template/* @PhracturedBlue @tetienne
@@ -450,7 +452,7 @@ homeassistant/components/tmb/* @alemuro
 homeassistant/components/todoist/* @boralyl
 homeassistant/components/toon/* @frenck
 homeassistant/components/totalconnect/* @austinmroczek
-homeassistant/components/tplink/* @rytilahti
+homeassistant/components/tplink/* @rytilahti @thegardenmonkey
 homeassistant/components/traccar/* @ludeeus
 homeassistant/components/tradfri/* @ggravlingen
 homeassistant/components/trafikverket_train/* @endor-force
@@ -495,6 +497,7 @@ homeassistant/components/wled/* @frenck
 homeassistant/components/wolflink/* @adamkrol93
 homeassistant/components/workday/* @fabaff
 homeassistant/components/worldclock/* @fabaff
+homeassistant/components/xbox/* @hunterjm
 homeassistant/components/xbox_live/* @MartinHjelmare
 homeassistant/components/xfinity/* @cisasteelersfan
 homeassistant/components/xiaomi_aqara/* @danielhiversen @syssi
@@ -507,7 +510,7 @@ homeassistant/components/yeelight/* @rytilahti @zewelor @shenxn
 homeassistant/components/yeelightsunflower/* @lindsaymarkward
 homeassistant/components/yessssms/* @flowolf
 homeassistant/components/yi/* @bachya
-homeassistant/components/zeroconf/* @Kane610
+homeassistant/components/zeroconf/* @bdraco
 homeassistant/components/zerproc/* @emlove
 homeassistant/components/zha/* @dmulcahey @adminiuga
 homeassistant/components/zodiac/* @JulienTant
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1921e5d38dd..8f8a79ab901 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,14 +5,14 @@ Everybody is invited and welcome to contribute to Home Assistant. There is a lot
 The process is straight-forward.
 
  - Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0 and 1)
- - Fork the Home Assistant [git repository](https://github.com/home-assistant/home-assistant).
+ - Fork the Home Assistant [git repository](https://github.com/home-assistant/core).
  - Write the code for your device, notification service, sensor, or IoT thing.
  - Ensure tests work.
- - Create a Pull Request against the [**dev**](https://github.com/home-assistant/home-assistant/tree/dev) branch of Home Assistant.
+ - Create a Pull Request against the [**dev**](https://github.com/home-assistant/core/tree/dev) branch of Home Assistant.
 
 Still interested? Then you should take a peek at the [developer documentation](https://developers.home-assistant.io/) to get more details.
 
 ## Feature suggestions
 
 If you want to suggest a new feature for Home Assistant (e.g., new integrations), please open a thread in our [Community Forum: Feature Requests](https://community.home-assistant.io/c/feature-requests).
-We use [GitHub for tracking issues](https://github.com/home-assistant/home-assistant/issues), not for tracking feature requests.
\ No newline at end of file
+We use [GitHub for tracking issues](https://github.com/home-assistant/core/issues), not for tracking feature requests.
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
index 4668e62892a..2420c2e44a0 100644
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -143,8 +143,8 @@ stages:
 
         version="$(homeassistantRelease)"
 
-        git clone https://github.com/home-assistant/hassio-version
-        cd hassio-version
+        git clone https://github.com/home-assistant/version
+        cd version
 
         dev_version="$(jq --raw-output '.homeassistant.default' dev.json)"
         beta_version="$(jq --raw-output '.homeassistant.default' beta.json)"
diff --git a/build.json b/build.json
index d63a245793b..f48c5e217aa 100644
--- a/build.json
+++ b/build.json
@@ -1,11 +1,11 @@
 {
   "image": "homeassistant/{arch}-homeassistant",
   "build_from": {
-    "aarch64": "homeassistant/aarch64-homeassistant-base:8.4.0",
-    "armhf": "homeassistant/armhf-homeassistant-base:8.4.0",
-    "armv7": "homeassistant/armv7-homeassistant-base:8.4.0",
-    "amd64": "homeassistant/amd64-homeassistant-base:8.4.0",
-    "i386": "homeassistant/i386-homeassistant-base:8.4.0"
+    "aarch64": "homeassistant/aarch64-homeassistant-base:2020.10.0",
+    "armhf": "homeassistant/armhf-homeassistant-base:2020.10.0",
+    "armv7": "homeassistant/armv7-homeassistant-base:2020.10.0",
+    "amd64": "homeassistant/amd64-homeassistant-base:2020.10.0",
+    "i386": "homeassistant/i386-homeassistant-base:2020.10.0"
   },
   "labels": {
     "io.hass.type": "core"
diff --git a/docs/screenshot-components.png b/docs/screenshot-components.png
index 44dc373e285..ad9d6d0e930 100644
Binary files a/docs/screenshot-components.png and b/docs/screenshot-components.png differ
diff --git a/docs/source/_templates/links.html b/docs/source/_templates/links.html
index 53a8d1e425d..7982649f72e 100644
--- a/docs/source/_templates/links.html
+++ b/docs/source/_templates/links.html
@@ -1,6 +1,6 @@
 <ul>
     <li><a href="https://home-assistant.io/">Homepage</a></li>
     <li><a href="https://community.home-assistant.io">Community Forums</a></li>
-    <li><a href="https://github.com/home-assistant/home-assistant">GitHub</a></li>
+    <li><a href="https://github.com/home-assistant/core">GitHub</a></li>
     <li><a href="https://discord.gg/c5DvZ4e">Discord</a></li>
 </ul>
diff --git a/homeassistant/auth/__init__.py b/homeassistant/auth/__init__.py
index 5a39090ae44..d2ce63f9490 100644
--- a/homeassistant/auth/__init__.py
+++ b/homeassistant/auth/__init__.py
@@ -2,7 +2,6 @@
 import asyncio
 from collections import OrderedDict
 from datetime import timedelta
-import logging
 from typing import Any, Dict, List, Optional, Tuple, cast
 
 import jwt
@@ -20,7 +19,6 @@ from .providers import AuthProvider, LoginFlow, auth_provider_from_config
 EVENT_USER_ADDED = "user_added"
 EVENT_USER_REMOVED = "user_removed"
 
-_LOGGER = logging.getLogger(__name__)
 _MfaModuleDict = Dict[str, MultiFactorAuthModule]
 _ProviderKey = Tuple[str, Optional[str]]
 _ProviderDict = Dict[_ProviderKey, AuthProvider]
diff --git a/homeassistant/auth/mfa_modules/insecure_example.py b/homeassistant/auth/mfa_modules/insecure_example.py
index 45cc07ae581..ddceeaae826 100644
--- a/homeassistant/auth/mfa_modules/insecure_example.py
+++ b/homeassistant/auth/mfa_modules/insecure_example.py
@@ -1,5 +1,4 @@
 """Example auth module."""
-import logging
 from typing import Any, Dict
 
 import voluptuous as vol
@@ -22,8 +21,6 @@ CONFIG_SCHEMA = MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend(
     extra=vol.PREVENT_EXTRA,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @MULTI_FACTOR_AUTH_MODULES.register("insecure_example")
 class InsecureExampleModule(MultiFactorAuthModule):
diff --git a/homeassistant/auth/mfa_modules/totp.py b/homeassistant/auth/mfa_modules/totp.py
index 2fc8c379861..359f79ce6ce 100644
--- a/homeassistant/auth/mfa_modules/totp.py
+++ b/homeassistant/auth/mfa_modules/totp.py
@@ -1,7 +1,6 @@
 """Time-based One Time Password auth module."""
 import asyncio
 from io import BytesIO
-import logging
 from typing import Any, Dict, Optional, Tuple
 
 import voluptuous as vol
@@ -30,8 +29,6 @@ INPUT_FIELD_CODE = "code"
 
 DUMMY_SECRET = "FPPTH34D4E3MI2HG"
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def _generate_qr_code(data: str) -> str:
     """Generate a base64 PNG string represent QR Code image of data."""
diff --git a/homeassistant/components/abode/config_flow.py b/homeassistant/components/abode/config_flow.py
index 18146551a56..72e7ec1d9eb 100644
--- a/homeassistant/components/abode/config_flow.py
+++ b/homeassistant/components/abode/config_flow.py
@@ -47,8 +47,8 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         except (AbodeException, ConnectTimeout, HTTPError) as ex:
             LOGGER.error("Unable to connect to Abode: %s", str(ex))
             if ex.errcode == HTTP_BAD_REQUEST:
-                return self._show_form({"base": "invalid_credentials"})
-            return self._show_form({"base": "connection_error"})
+                return self._show_form({"base": "invalid_auth"})
+            return self._show_form({"base": "cannot_connect"})
 
         return self.async_create_entry(
             title=user_input[CONF_USERNAME],
diff --git a/homeassistant/components/abode/strings.json b/homeassistant/components/abode/strings.json
index 14d570e76e2..63b62fefcec 100644
--- a/homeassistant/components/abode/strings.json
+++ b/homeassistant/components/abode/strings.json
@@ -10,12 +10,11 @@
       }
     },
     "error": {
-      "identifier_exists": "Account already registered.",
-      "invalid_credentials": "Invalid credentials.",
-      "connection_error": "Unable to connect to Abode."
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of Abode is allowed."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   }
 }
\ No newline at end of file
diff --git a/homeassistant/components/abode/translations/ca.json b/homeassistant/components/abode/translations/ca.json
index 5a1552700d9..f33b51f6d6b 100644
--- a/homeassistant/components/abode/translations/ca.json
+++ b/homeassistant/components/abode/translations/ca.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Nom\u00e9s es permet una \u00fanica configuraci\u00f3 d'Abode."
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No es pot connectar amb Abode.",
             "identifier_exists": "Compte ja registrat.",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Credencials inv\u00e0lides."
         },
         "step": {
diff --git a/homeassistant/components/abode/translations/cs.json b/homeassistant/components/abode/translations/cs.json
index e482cce526f..edd260bfbf5 100644
--- a/homeassistant/components/abode/translations/cs.json
+++ b/homeassistant/components/abode/translations/cs.json
@@ -1,18 +1,20 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Je povolena pouze jedna konfigurace Abode."
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "connection_error": "Nelze se p\u0159ipojit k Abode.",
             "identifier_exists": "\u00da\u010det je ji\u017e zaregistrov\u00e1n.",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
             "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje."
         },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
-                    "username": "E-mailov\u00e1 adresa"
+                    "username": "E-mail"
                 },
                 "title": "Vypl\u0148te p\u0159ihla\u0161ovac\u00ed \u00fadaje Abode"
             }
diff --git a/homeassistant/components/abode/translations/el.json b/homeassistant/components/abode/translations/el.json
new file mode 100644
index 00000000000..b30be708065
--- /dev/null
+++ b/homeassistant/components/abode/translations/el.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2",
+            "invalid_auth": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b1\u03c5\u03b8\u03b5\u03bd\u03c4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/abode/translations/en.json b/homeassistant/components/abode/translations/en.json
index ae33c6bed04..34a1ad27484 100644
--- a/homeassistant/components/abode/translations/en.json
+++ b/homeassistant/components/abode/translations/en.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Only a single configuration of Abode is allowed."
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_error": "Unable to connect to Abode.",
             "identifier_exists": "Account already registered.",
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid credentials."
         },
         "step": {
diff --git a/homeassistant/components/abode/translations/es.json b/homeassistant/components/abode/translations/es.json
index 76f06de9b85..8d17f040136 100644
--- a/homeassistant/components/abode/translations/es.json
+++ b/homeassistant/components/abode/translations/es.json
@@ -1,18 +1,20 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Solo se permite una \u00fanica configuraci\u00f3n de Abode."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se puede conectar a Abode.",
             "identifier_exists": "Cuenta ya registrada.",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_credentials": "Credenciales inv\u00e1lidas."
         },
         "step": {
             "user": {
                 "data": {
                     "password": "Contrase\u00f1a",
-                    "username": "Direcci\u00f3n de correo electr\u00f3nico"
+                    "username": "Correo electr\u00f3nico"
                 },
                 "title": "Rellene la informaci\u00f3n de acceso Abode"
             }
diff --git a/homeassistant/components/abode/translations/et.json b/homeassistant/components/abode/translations/et.json
new file mode 100644
index 00000000000..fec80d8679b
--- /dev/null
+++ b/homeassistant/components/abode/translations/et.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "\u00dchendus Abode-iga nurjus.",
+            "identifier_exists": "Konto on juba seadistatud",
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_credentials": "Sobimatu mandaat."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "E-post"
+                },
+                "title": "Sisesta oma Abode sisselogimisteave"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/abode/translations/fr.json b/homeassistant/components/abode/translations/fr.json
index 1c4cfe00872..81056f44fa8 100644
--- a/homeassistant/components/abode/translations/fr.json
+++ b/homeassistant/components/abode/translations/fr.json
@@ -4,8 +4,10 @@
             "single_instance_allowed": "Une seule configuration d'Abode est autoris\u00e9e."
         },
         "error": {
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "Impossible de se connecter \u00e0 Abode.",
             "identifier_exists": "Compte d\u00e9j\u00e0 enregistr\u00e9.",
+            "invalid_auth": "Authentification invalide",
             "invalid_credentials": "Informations d'identification invalides."
         },
         "step": {
diff --git a/homeassistant/components/abode/translations/it.json b/homeassistant/components/abode/translations/it.json
index 97b5d562283..e6a43a31d0d 100644
--- a/homeassistant/components/abode/translations/it.json
+++ b/homeassistant/components/abode/translations/it.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u00c8 consentita una sola configurazione di Abode."
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi ad Abode.",
             "identifier_exists": "Account gi\u00e0 registrato",
+            "invalid_auth": "Autenticazione non valida",
             "invalid_credentials": "Credenziali non valide"
         },
         "step": {
diff --git a/homeassistant/components/abode/translations/lb.json b/homeassistant/components/abode/translations/lb.json
index fffbe4b1a9a..f8021a1ab51 100644
--- a/homeassistant/components/abode/translations/lb.json
+++ b/homeassistant/components/abode/translations/lb.json
@@ -4,8 +4,10 @@
             "single_instance_allowed": "N\u00ebmmen eng eenzeg Konfiguratioun vun ZHA ass erlaabt."
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Kann sech net mat Abode verbannen.",
             "identifier_exists": "Konto ass scho registr\u00e9iert",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_credentials": "Ong\u00eblteg Login Informatioune"
         },
         "step": {
diff --git a/homeassistant/components/abode/translations/nl.json b/homeassistant/components/abode/translations/nl.json
index 580b1f487c0..aa143794d2b 100644
--- a/homeassistant/components/abode/translations/nl.json
+++ b/homeassistant/components/abode/translations/nl.json
@@ -4,6 +4,7 @@
             "single_instance_allowed": "Slechts een enkele configuratie van Abode is toegestaan."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kan geen verbinding maken met Abode.",
             "identifier_exists": "Account is al geregistreerd.",
             "invalid_credentials": "Ongeldige inloggegevens."
diff --git a/homeassistant/components/abode/translations/no.json b/homeassistant/components/abode/translations/no.json
index 60c1ad897f1..40d649546f2 100644
--- a/homeassistant/components/abode/translations/no.json
+++ b/homeassistant/components/abode/translations/no.json
@@ -1,18 +1,20 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Bare en enkelt konfigurasjon av Abode er tillatt."
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kan ikke koble til Abode.",
             "identifier_exists": "Kontoen er allerede registrert.",
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig legitimasjon"
         },
         "step": {
             "user": {
                 "data": {
                     "password": "Passord",
-                    "username": "E-postadresse"
+                    "username": "E-post"
                 },
                 "title": "Fyll ut innloggingsinformasjonen for Abode"
             }
diff --git a/homeassistant/components/abode/translations/pl.json b/homeassistant/components/abode/translations/pl.json
index d7a25bb20b7..c06cb0bbb35 100644
--- a/homeassistant/components/abode/translations/pl.json
+++ b/homeassistant/components/abode/translations/pl.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Dozwolona jest tylko jedna konfiguracja Abode."
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
-            "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z Abode.",
-            "identifier_exists": "Konto jest ju\u017c zarejestrowane.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z Abode",
+            "identifier_exists": "Konto jest ju\u017c zarejestrowane",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_credentials": "Nieprawid\u0142owe dane uwierzytelniaj\u0105ce"
         },
         "step": {
diff --git a/homeassistant/components/abode/translations/ru.json b/homeassistant/components/abode/translations/ru.json
index e0e6e131289..bec110bb706 100644
--- a/homeassistant/components/abode/translations/ru.json
+++ b/homeassistant/components/abode/translations/ru.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a Abode.",
             "identifier_exists": "\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0430.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435."
         },
         "step": {
diff --git a/homeassistant/components/abode/translations/zh-Hant.json b/homeassistant/components/abode/translations/zh-Hant.json
index 7a97cbda3c5..760935accd7 100644
--- a/homeassistant/components/abode/translations/zh-Hant.json
+++ b/homeassistant/components/abode/translations/zh-Hant.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44 Abode\u3002"
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "\u7121\u6cd5\u9023\u7dda\u81f3 Abode\u3002",
             "identifier_exists": "\u5e33\u865f\u5df2\u8a3b\u518a\u3002",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u6191\u8b49\u7121\u6548\u3002"
         },
         "step": {
diff --git a/homeassistant/components/accuweather/strings.json b/homeassistant/components/accuweather/strings.json
index 89228cd0692..7bf61de8476 100644
--- a/homeassistant/components/accuweather/strings.json
+++ b/homeassistant/components/accuweather/strings.json
@@ -5,10 +5,10 @@
         "title": "AccuWeather",
         "description": "If you need help with the configuration have a look here: https://www.home-assistant.io/integrations/accuweather/\n\nSome sensors are not enabled by default. You can enable them in the entity registry after the integration configuration.\nWeather forecast is not enabled by default. You can enable it in the integration options.",
         "data": {
-          "name": "Name of the integration",
+          "name": "[%key:common::config_flow::data::name%]",
           "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "Latitude",
-          "longitude": "Longitude"
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]"
         }
       }
     },
diff --git a/homeassistant/components/accuweather/translations/ca.json b/homeassistant/components/accuweather/translations/ca.json
index 55e1bdc83b7..e1b95b37e03 100644
--- a/homeassistant/components/accuweather/translations/ca.json
+++ b/homeassistant/components/accuweather/translations/ca.json
@@ -14,7 +14,7 @@
                     "api_key": "Clau API",
                     "latitude": "Latitud",
                     "longitude": "Longitud",
-                    "name": "Nom de la integraci\u00f3"
+                    "name": "Nom"
                 },
                 "description": "Si necessites ajuda amb la configuraci\u00f3, consulta els seg\u00fcent enlla\u00e7: https://www.home-assistant.io/integrations/accuweather/ \n\n Alguns sensors no estan activats de manera predeterminada. Els pots activar des del registre d'entitats, despr\u00e9s de la configurraci\u00f3 de la integraci\u00f3.\n La previsi\u00f3 meteorol\u00f2gica no est\u00e0 activada de manera predeterminada. Pots activar-la en les opcions de la integraci\u00f3.",
                 "title": "AccuWeather"
diff --git a/homeassistant/components/accuweather/translations/cs.json b/homeassistant/components/accuweather/translations/cs.json
index 80383c42462..d7d7d6e9b34 100644
--- a/homeassistant/components/accuweather/translations/cs.json
+++ b/homeassistant/components/accuweather/translations/cs.json
@@ -1,11 +1,34 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_api_key": "Neplatn\u00fd kl\u00ed\u010d API",
+            "requests_exceeded": "Byl p\u0159ekro\u010den povolen\u00fd po\u010det po\u017eadavk\u016f pro API Accuweather. Mus\u00edte po\u010dkat nebo zm\u011bnit API kl\u00ed\u010d."
+        },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "Kl\u00ed\u010d API",
                     "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
-                    "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka"
-                }
+                    "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka",
+                    "name": "Jm\u00e9no"
+                },
+                "description": "Pokud pot\u0159ebujete pomoc s nastaven\u00ed, pod\u00edvejte se na: https://www.home-assistant.io/integrations/accuweather/\n\nN\u011bkter\u00e9 senzory nejsou ve v\u00fdchoz\u00edm nastaven\u00ed povoleny. M\u016f\u017eete je povolit  po nastaven\u00ed integrace v registru entit.\nP\u0159edpov\u011b\u010f po\u010das\u00ed nen\u00ed ve v\u00fdchoz\u00edm nastaven\u00ed povolena. M\u016f\u017eete ji povolit v mo\u017enostech integrace.",
+                "title": "AccuWeather"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "forecast": "P\u0159edpov\u011b\u010f po\u010das\u00ed"
+                },
+                "description": "Kdy\u017e povol\u00edte p\u0159edpov\u011b\u010f po\u010das\u00ed, budou aktualizace dat prov\u00e1d\u011bny ka\u017ed\u00fdch 64 minut nam\u00edsto 32 minut z d\u016fvodu omezen\u00ed bezplatn\u00e9 verze AccuWeather.",
+                "title": "Mo\u017enosti AccuWeather"
             }
         }
     }
diff --git a/homeassistant/components/accuweather/translations/en.json b/homeassistant/components/accuweather/translations/en.json
index 8382236e7a0..b9986eda30f 100644
--- a/homeassistant/components/accuweather/translations/en.json
+++ b/homeassistant/components/accuweather/translations/en.json
@@ -14,7 +14,7 @@
                     "api_key": "API Key",
                     "latitude": "Latitude",
                     "longitude": "Longitude",
-                    "name": "Name of the integration"
+                    "name": "Name"
                 },
                 "description": "If you need help with the configuration have a look here: https://www.home-assistant.io/integrations/accuweather/\n\nSome sensors are not enabled by default. You can enable them in the entity registry after the integration configuration.\nWeather forecast is not enabled by default. You can enable it in the integration options.",
                 "title": "AccuWeather"
diff --git a/homeassistant/components/accuweather/translations/es.json b/homeassistant/components/accuweather/translations/es.json
index 4de57575464..5d4522e8ce1 100644
--- a/homeassistant/components/accuweather/translations/es.json
+++ b/homeassistant/components/accuweather/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
             "cannot_connect": "No se pudo conectar",
@@ -14,7 +14,7 @@
                     "api_key": "Clave API",
                     "latitude": "Latitud",
                     "longitude": "Longitud",
-                    "name": "Nombre de la integraci\u00f3n"
+                    "name": "Nombre"
                 },
                 "description": "Si necesitas ayuda con la configuraci\u00f3n, echa un vistazo aqu\u00ed: https://www.home-assistant.io/integrations/accuweather/ \n\nEl pron\u00f3stico del tiempo no est\u00e1 habilitado por defecto. Puedes habilitarlo en las opciones de la integraci\u00f3n.",
                 "title": "AccuWeather"
diff --git a/homeassistant/components/accuweather/translations/et.json b/homeassistant/components/accuweather/translations/et.json
index 51cf2050ba7..1b0bdbe643a 100644
--- a/homeassistant/components/accuweather/translations/et.json
+++ b/homeassistant/components/accuweather/translations/et.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Sidumine juba tehtud. V\u00f5imalik on ainult 1 sidumine,"
+            "single_instance_allowed": "Sidumine juba tehtud. V\u00f5imalik on ainult 1 sidumine."
         },
         "error": {
-            "cannot_connect": "\u00dchendus eba\u00f5nnestus",
+            "cannot_connect": "\u00dchendamine nurjus",
             "invalid_api_key": "API v\u00f5ti on vale",
             "requests_exceeded": "Accuweatheri API-le esitatud p\u00e4ringute piirarv on \u00fcletatud. Peate ootama (v\u00f5i muutma API v\u00f5tit)."
         },
diff --git a/homeassistant/components/accuweather/translations/it.json b/homeassistant/components/accuweather/translations/it.json
index 398f7e1e663..1c22344f551 100644
--- a/homeassistant/components/accuweather/translations/it.json
+++ b/homeassistant/components/accuweather/translations/it.json
@@ -14,7 +14,7 @@
                     "api_key": "Chiave API",
                     "latitude": "Latitudine",
                     "longitude": "Logitudine",
-                    "name": "Nome dell'integrazione"
+                    "name": "Nome"
                 },
                 "description": "Se hai bisogno di aiuto con la configurazione dai un'occhiata qui: https://www.home-assistant.io/integrations/accuweather/ \n\nAlcuni sensori non sono abilitati per impostazione predefinita. \u00c8 possibile abilitarli nel registro entit\u00e0 dopo la configurazione di integrazione. \nLe previsioni meteo non sono abilitate per impostazione predefinita. Puoi abilitarle nelle opzioni di integrazione.",
                 "title": "AccuWeather"
diff --git a/homeassistant/components/accuweather/translations/lb.json b/homeassistant/components/accuweather/translations/lb.json
index b83cf69c8d7..fecb7e62a6f 100644
--- a/homeassistant/components/accuweather/translations/lb.json
+++ b/homeassistant/components/accuweather/translations/lb.json
@@ -14,7 +14,7 @@
                     "api_key": "API Schl\u00ebssel",
                     "latitude": "Breedegrad",
                     "longitude": "L\u00e4ngegrad",
-                    "name": "Numm vun der Integratioun"
+                    "name": "Numm"
                 },
                 "description": "Falls du H\u00ebllef mat der Konfiguratioun brauch kuck h\u00e9i:\nhttps://www.home-assistant.io/integrations/accuweather/\n\nWieder Pr\u00e9visounen si standardm\u00e9isseg net aktiv. Du kanns d\u00e9i an den Optioune vun der Integratioun aschalten.",
                 "title": "AccuWeather"
diff --git a/homeassistant/components/accuweather/translations/nl.json b/homeassistant/components/accuweather/translations/nl.json
new file mode 100644
index 00000000000..5173004cea6
--- /dev/null
+++ b/homeassistant/components/accuweather/translations/nl.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "longitude": "Lengtegraad",
+                    "name": "Naam"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/accuweather/translations/no.json b/homeassistant/components/accuweather/translations/no.json
index c6cbc82bc2c..b90baf17be9 100644
--- a/homeassistant/components/accuweather/translations/no.json
+++ b/homeassistant/components/accuweather/translations/no.json
@@ -4,7 +4,7 @@
             "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_api_key": "Ugyldig API-n\u00f8kkel",
             "requests_exceeded": "Det tillatte antallet foresp\u00f8rsler til Accuweather API er overskredet. Du m\u00e5 vente eller endre API-n\u00f8kkel."
         },
@@ -14,7 +14,7 @@
                     "api_key": "API-n\u00f8kkel",
                     "latitude": "Breddegrad",
                     "longitude": "Lengdegrad",
-                    "name": "Navn p\u00e5 integrasjon"
+                    "name": "Navn"
                 },
                 "description": "Hvis du trenger hjelp med konfigurasjonen, kan du se her: https://www.home-assistant.io/integrations/accuweather/ \n\n Noen sensorer er ikke aktivert som standard. Du kan aktivere dem i enhetsregisteret etter integrasjonskonfigurasjonen. \n V\u00e6rmelding er ikke aktivert som standard. Du kan aktivere det i integrasjonsalternativene.",
                 "title": ""
diff --git a/homeassistant/components/accuweather/translations/pl.json b/homeassistant/components/accuweather/translations/pl.json
index 052ed5b6236..2ac9aabfc91 100644
--- a/homeassistant/components/accuweather/translations/pl.json
+++ b/homeassistant/components/accuweather/translations/pl.json
@@ -5,7 +5,7 @@
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "invalid_api_key": "Nieprawid\u0142owy klucz API.",
+            "invalid_api_key": "Nieprawid\u0142owy klucz API",
             "requests_exceeded": "Dozwolona liczba zapyta\u0144 do interfejsu API AccuWeather zosta\u0142a przekroczona. Musisz poczeka\u0107 lub zmieni\u0107 klucz API."
         },
         "step": {
@@ -14,7 +14,7 @@
                     "api_key": "Klucz API",
                     "latitude": "Szeroko\u015b\u0107 geograficzna",
                     "longitude": "D\u0142ugo\u015b\u0107 geograficzna",
-                    "name": "Nazwa integracji"
+                    "name": "Nazwa"
                 },
                 "description": "Je\u015bli potrzebujesz pomocy z konfiguracj\u0105, przejd\u017a na stron\u0119: https://www.home-assistant.io/integrations/accuweather/ \n\nCz\u0119\u015b\u0107 sensor\u00f3w nie jest w\u0142\u0105czona domy\u015blnie. Mo\u017cesz je w\u0142\u0105czy\u0107 w rejestrze encji po konfiguracji integracji.\nPrognoza pogody nie jest domy\u015blnie w\u0142\u0105czona. Mo\u017cesz j\u0105 w\u0142\u0105czy\u0107 w opcjach integracji.",
                 "title": "AccuWeather"
@@ -27,7 +27,7 @@
                 "data": {
                     "forecast": "Prognoza pogody"
                 },
-                "description": "Ze wzgl\u0119du na ograniczenia darmowej wersji klucza API AccuWeather po w\u0142\u0105czeniu prognozy pogody aktualizacje danych b\u0119d\u0105 wykonywane co 64 minut zamiast co 32 minut.",
+                "description": "Ze wzgl\u0119du na ograniczenia darmowej wersji klucza API AccuWeather po w\u0142\u0105czeniu prognozy pogody aktualizacje danych b\u0119d\u0105 wykonywane co 64 minuty zamiast co 32 minuty.",
                 "title": "Opcje AccuWeather"
             }
         }
diff --git a/homeassistant/components/accuweather/translations/sensor.sv.json b/homeassistant/components/accuweather/translations/sensor.sv.json
new file mode 100644
index 00000000000..cc940f75b17
--- /dev/null
+++ b/homeassistant/components/accuweather/translations/sensor.sv.json
@@ -0,0 +1,8 @@
+{
+    "state": {
+        "accuweather__pressure_tendency": {
+            "falling": "Fallande",
+            "rising": "Stigande"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/accuweather/translations/zh-Hant.json b/homeassistant/components/accuweather/translations/zh-Hant.json
index 0c6f3a7dc57..db6c097e1e3 100644
--- a/homeassistant/components/accuweather/translations/zh-Hant.json
+++ b/homeassistant/components/accuweather/translations/zh-Hant.json
@@ -14,7 +14,7 @@
                     "api_key": "API \u5bc6\u9470",
                     "latitude": "\u7def\u5ea6",
                     "longitude": "\u7d93\u5ea6",
-                    "name": "\u6574\u5408\u540d\u7a31"
+                    "name": "\u540d\u7a31"
                 },
                 "description": "\u5047\u5982\u4f60\u9700\u8981\u5354\u52a9\u9032\u884c\u8a2d\u5b9a\uff0c\u8acb\u53c3\u95b1\uff1ahttps://www.home-assistant.io/integrations/accuweather/\n\n\u67d0\u4e9b\u50b3\u611f\u5668\u9810\u8a2d\u70ba\u672a\u555f\u7528\uff0c\u53ef\u4ee5\u65bc\u6574\u5408\u8a2d\u5b9a\u4e2d\u555f\u7528\u9019\u4e9b\u5be6\u9ad4\u3002\u5929\u6c23\u9810\u5831\u9810\u8a2d\u672a\u958b\u555f\u3002\u53ef\u4ee5\u65bc\u6574\u5408\u9078\u9805\u4e2d\u958b\u555f\u3002",
                 "title": "AccuWeather"
diff --git a/homeassistant/components/acmeda/config_flow.py b/homeassistant/components/acmeda/config_flow.py
index 816768b0800..f421fa9ca25 100644
--- a/homeassistant/components/acmeda/config_flow.py
+++ b/homeassistant/components/acmeda/config_flow.py
@@ -45,7 +45,7 @@ class AcmedaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             pass
 
         if len(hubs) == 0:
-            return self.async_abort(reason="all_configured")
+            return self.async_abort(reason="no_devices_found")
 
         if len(hubs) == 1:
             return await self.async_create(hubs[0])
diff --git a/homeassistant/components/acmeda/strings.json b/homeassistant/components/acmeda/strings.json
index eb7ed44999b..a2209fe1a88 100644
--- a/homeassistant/components/acmeda/strings.json
+++ b/homeassistant/components/acmeda/strings.json
@@ -10,7 +10,7 @@
       }
     },
     "abort": {
-      "all_configured": "No new Pulse hubs discovered."
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/acmeda/translations/ca.json b/homeassistant/components/acmeda/translations/ca.json
index 0812387ab7f..2481794f8f2 100644
--- a/homeassistant/components/acmeda/translations/ca.json
+++ b/homeassistant/components/acmeda/translations/ca.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "all_configured": "No s'han descobert nous hubs de Pulse."
+            "all_configured": "No s'han descobert nous hubs de Pulse.",
+            "no_devices_found": "No s'han trobat dispositius a la xarxa"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/acmeda/translations/cs.json b/homeassistant/components/acmeda/translations/cs.json
new file mode 100644
index 00000000000..3f0012e00d2
--- /dev/null
+++ b/homeassistant/components/acmeda/translations/cs.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/acmeda/translations/en.json b/homeassistant/components/acmeda/translations/en.json
index ab20d0b1939..77768f20d69 100644
--- a/homeassistant/components/acmeda/translations/en.json
+++ b/homeassistant/components/acmeda/translations/en.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "all_configured": "No new Pulse hubs discovered."
+            "all_configured": "No new Pulse hubs discovered.",
+            "no_devices_found": "No devices found on the network"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/acmeda/translations/es.json b/homeassistant/components/acmeda/translations/es.json
index 0ca3dbf6e2f..dcdd885fe26 100644
--- a/homeassistant/components/acmeda/translations/es.json
+++ b/homeassistant/components/acmeda/translations/es.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "all_configured": "No se han descubierto nuevos hubs Pulse."
+            "all_configured": "No se han descubierto nuevos hubs Pulse.",
+            "no_devices_found": "No se encontraron dispositivos en la red"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/acmeda/translations/et.json b/homeassistant/components/acmeda/translations/et.json
new file mode 100644
index 00000000000..8f5881d9717
--- /dev/null
+++ b/homeassistant/components/acmeda/translations/et.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "Uusi Pulse'i jaotureid ei avastatud.",
+            "no_devices_found": "V\u00f5rgus ei tuvastatud \u00fchtegi seadet"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "id": "Hosti ID"
+                },
+                "title": "Vali lisatav jaotur"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/acmeda/translations/fr.json b/homeassistant/components/acmeda/translations/fr.json
index a60d52ac6f4..8270b13d76e 100644
--- a/homeassistant/components/acmeda/translations/fr.json
+++ b/homeassistant/components/acmeda/translations/fr.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "all_configured": "Aucun nouveau hub Pulse n'a \u00e9t\u00e9 d\u00e9couvert."
+            "all_configured": "Aucun nouveau hub Pulse n'a \u00e9t\u00e9 d\u00e9couvert.",
+            "no_devices_found": "Aucun appareil trouv\u00e9 sur le r\u00e9seau"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/acmeda/translations/it.json b/homeassistant/components/acmeda/translations/it.json
index a9349d06923..dbf92d54db9 100644
--- a/homeassistant/components/acmeda/translations/it.json
+++ b/homeassistant/components/acmeda/translations/it.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "all_configured": "Non sono stati scoperti nuovi hub Pulse."
+            "all_configured": "Non sono stati scoperti nuovi hub Pulse.",
+            "no_devices_found": "Nessun dispositivo trovato sulla rete"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/acmeda/translations/no.json b/homeassistant/components/acmeda/translations/no.json
index 66335077cfb..8ecb4ef889d 100644
--- a/homeassistant/components/acmeda/translations/no.json
+++ b/homeassistant/components/acmeda/translations/no.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "all_configured": "Ingen nye Pulse-hub oppdaget."
+            "all_configured": "Ingen nye Pulse-hub oppdaget.",
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/acmeda/translations/pl.json b/homeassistant/components/acmeda/translations/pl.json
index 4732d44580f..e2e68b4b327 100644
--- a/homeassistant/components/acmeda/translations/pl.json
+++ b/homeassistant/components/acmeda/translations/pl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "all_configured": "Nie wykryto hub\u00f3w Pulse."
+            "all_configured": "Nie wykryto hub\u00f3w Pulse",
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/acmeda/translations/ru.json b/homeassistant/components/acmeda/translations/ru.json
index 92922fdbb5d..b11fd876975 100644
--- a/homeassistant/components/acmeda/translations/ru.json
+++ b/homeassistant/components/acmeda/translations/ru.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "all_configured": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u044b."
+            "all_configured": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u044b.",
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/acmeda/translations/zh-Hant.json b/homeassistant/components/acmeda/translations/zh-Hant.json
index 5d4263ea5ae..e5f29fbb4bd 100644
--- a/homeassistant/components/acmeda/translations/zh-Hant.json
+++ b/homeassistant/components/acmeda/translations/zh-Hant.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "all_configured": "\u672a\u641c\u5c0b\u5230 Pulse hub"
+            "all_configured": "\u672a\u641c\u5c0b\u5230 Pulse hub",
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/adguard/config_flow.py b/homeassistant/components/adguard/config_flow.py
index a0ace623862..d728eed3003 100644
--- a/homeassistant/components/adguard/config_flow.py
+++ b/homeassistant/components/adguard/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow to configure the AdGuard Home integration."""
-import logging
-
 from adguardhome import AdGuardHome, AdGuardHomeConnectionError
 import voluptuous as vol
 
@@ -17,8 +15,6 @@ from homeassistant.const import (
 )
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @config_entries.HANDLERS.register(DOMAIN)
 class AdGuardHomeFlowHandler(ConfigFlow):
@@ -80,7 +76,7 @@ class AdGuardHomeFlowHandler(ConfigFlow):
         try:
             await adguard.version()
         except AdGuardHomeConnectionError:
-            errors["base"] = "connection_error"
+            errors["base"] = "cannot_connect"
             return await self._show_setup_form(errors)
 
         return self.async_create_entry(
@@ -152,7 +148,7 @@ class AdGuardHomeFlowHandler(ConfigFlow):
         try:
             await adguard.version()
         except AdGuardHomeConnectionError:
-            errors["base"] = "connection_error"
+            errors["base"] = "cannot_connect"
             return await self._show_hassio_form(errors)
 
         return self.async_create_entry(
diff --git a/homeassistant/components/adguard/sensor.py b/homeassistant/components/adguard/sensor.py
index 10eec606028..05e23ba8b80 100644
--- a/homeassistant/components/adguard/sensor.py
+++ b/homeassistant/components/adguard/sensor.py
@@ -1,6 +1,5 @@
 """Support for AdGuard Home sensors."""
 from datetime import timedelta
-import logging
 
 from adguardhome import AdGuardHomeConnectionError
 
@@ -15,8 +14,6 @@ from homeassistant.const import PERCENTAGE, TIME_MILLISECONDS
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.typing import HomeAssistantType
 
-_LOGGER = logging.getLogger(__name__)
-
 SCAN_INTERVAL = timedelta(seconds=300)
 PARALLEL_UPDATES = 4
 
diff --git a/homeassistant/components/adguard/strings.json b/homeassistant/components/adguard/strings.json
index f010f9e2ade..2d4bb49304f 100644
--- a/homeassistant/components/adguard/strings.json
+++ b/homeassistant/components/adguard/strings.json
@@ -8,8 +8,8 @@
           "password": "[%key:common::config_flow::data::password%]",
           "port": "[%key:common::config_flow::data::port%]",
           "username": "[%key:common::config_flow::data::username%]",
-          "ssl": "AdGuard Home uses a SSL certificate",
-          "verify_ssl": "AdGuard Home uses a proper certificate"
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         }
       },
       "hassio_confirm": {
@@ -17,10 +17,12 @@
         "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the Hass.io add-on: {addon}?"
       }
     },
-    "error": { "connection_error": "Failed to connect." },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
     "abort": {
       "existing_instance_updated": "Updated existing configuration.",
-      "single_instance_allowed": "Only a single configuration of AdGuard Home is allowed."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   }
 }
diff --git a/homeassistant/components/adguard/translations/ca.json b/homeassistant/components/adguard/translations/ca.json
index b263e433cfb..aec7f6fc2da 100644
--- a/homeassistant/components/adguard/translations/ca.json
+++ b/homeassistant/components/adguard/translations/ca.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "existing_instance_updated": "S'ha actualitzat la configuraci\u00f3 existent.",
-            "single_instance_allowed": "Nom\u00e9s es permet una \u00fanica configuraci\u00f3 d'AdGuard Home."
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar."
         },
         "step": {
@@ -17,9 +18,9 @@
                     "host": "[%key::common::config_flow::data::host%]",
                     "password": "[%key::common::config_flow::data::password%]",
                     "port": "[%key::common::config_flow::data::port%]",
-                    "ssl": "AdGuard Home utilitza un certificat SSL",
+                    "ssl": "Utilitza un certificat SSL",
                     "username": "[%key::common::config_flow::data::username%]",
-                    "verify_ssl": "AdGuard Home utilitza un certificat adequat"
+                    "verify_ssl": "Verifica el certificat SSL"
                 },
                 "description": "Configuraci\u00f3 de la inst\u00e0ncia d'AdGuard Home, permet el control i la monitoritzaci\u00f3."
             }
diff --git a/homeassistant/components/adguard/translations/cs.json b/homeassistant/components/adguard/translations/cs.json
index 082fa365e7c..1677e73d494 100644
--- a/homeassistant/components/adguard/translations/cs.json
+++ b/homeassistant/components/adguard/translations/cs.json
@@ -1,5 +1,13 @@
 {
     "config": {
+        "abort": {
+            "existing_instance_updated": "St\u00e1vaj\u00edc\u00ed nastaven\u00ed aktualizov\u00e1no.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit."
+        },
         "step": {
             "hassio_confirm": {
                 "description": "Chcete nakonfigurovat slu\u017ebu Home Assistant pro p\u0159ipojen\u00ed k AddGuard pomoc\u00ed hass.io {addon}?",
@@ -10,7 +18,9 @@
                     "host": "Hostitel",
                     "password": "Heslo",
                     "port": "Port",
-                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no",
+                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL"
                 }
             }
         }
diff --git a/homeassistant/components/adguard/translations/el.json b/homeassistant/components/adguard/translations/el.json
new file mode 100644
index 00000000000..04b238a916d
--- /dev/null
+++ b/homeassistant/components/adguard/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/adguard/translations/en.json b/homeassistant/components/adguard/translations/en.json
index b52d0e5afd8..e0c1f6d7a0b 100644
--- a/homeassistant/components/adguard/translations/en.json
+++ b/homeassistant/components/adguard/translations/en.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "existing_instance_updated": "Updated existing configuration.",
-            "single_instance_allowed": "Only a single configuration of AdGuard Home is allowed."
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect."
         },
         "step": {
@@ -17,9 +18,9 @@
                     "host": "Host",
                     "password": "Password",
                     "port": "Port",
-                    "ssl": "AdGuard Home uses a SSL certificate",
+                    "ssl": "Uses an SSL certificate",
                     "username": "Username",
-                    "verify_ssl": "AdGuard Home uses a proper certificate"
+                    "verify_ssl": "Verify SSL certificate"
                 },
                 "description": "Set up your AdGuard Home instance to allow monitoring and control."
             }
diff --git a/homeassistant/components/adguard/translations/es.json b/homeassistant/components/adguard/translations/es.json
index 82ba749dcc8..b6c275a401c 100644
--- a/homeassistant/components/adguard/translations/es.json
+++ b/homeassistant/components/adguard/translations/es.json
@@ -5,6 +5,7 @@
             "single_instance_allowed": "S\u00f3lo se permite una \u00fanica configuraci\u00f3n de AdGuard Home."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se conect\u00f3."
         },
         "step": {
diff --git a/homeassistant/components/adguard/translations/et.json b/homeassistant/components/adguard/translations/et.json
new file mode 100644
index 00000000000..4f950ebb748
--- /dev/null
+++ b/homeassistant/components/adguard/translations/et.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "existing_instance_updated": "Olemasolevad seaded v\u00e4rskendatud.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "\u00dchenduse loomine nurjus"
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Kas soovid seadistada Home Assistant-i \u00fchenduse AdGuard Home'iga mida pakub Hass.io lisandmoodul: {addon} ?",
+                "title": "AdGuard Home Hass.io pistikprogrammi kaudu"
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "port": "",
+                    "ssl": "Kasuta SSL sertifikaati",
+                    "username": "Kasutajanimi",
+                    "verify_ssl": "Kontrolli SSL sertifikaati"
+                },
+                "description": "Seadista AdGuard Home'i sidumine, et v\u00f5imaldada j\u00e4lgimist ja juhtimist."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/adguard/translations/fr.json b/homeassistant/components/adguard/translations/fr.json
index bf275f922f1..43cee03560c 100644
--- a/homeassistant/components/adguard/translations/fr.json
+++ b/homeassistant/components/adguard/translations/fr.json
@@ -5,6 +5,7 @@
             "single_instance_allowed": "Une seule configuration d'AdGuard Home est autoris\u00e9e."
         },
         "error": {
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "\u00c9chec de connexion."
         },
         "step": {
diff --git a/homeassistant/components/adguard/translations/it.json b/homeassistant/components/adguard/translations/it.json
index ac2a903c5e5..ff37f64aefc 100644
--- a/homeassistant/components/adguard/translations/it.json
+++ b/homeassistant/components/adguard/translations/it.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "existing_instance_updated": "Configurazione esistente aggiornata.",
-            "single_instance_allowed": "\u00c8 consentita solo una singola configurazione di AdGuard Home."
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi."
         },
         "step": {
@@ -17,9 +18,9 @@
                     "host": "Host",
                     "password": "Password",
                     "port": "Porta",
-                    "ssl": "AdGuard Home utilizza un certificato SSL",
+                    "ssl": "Utilizza un certificato SSL",
                     "username": "Nome utente",
-                    "verify_ssl": "AdGuard Home utilizza un certificato appropriato"
+                    "verify_ssl": "Verificare il certificato SSL"
                 },
                 "description": "Configura l'istanza di AdGuard Home per consentire il monitoraggio e il controllo."
             }
diff --git a/homeassistant/components/adguard/translations/lb.json b/homeassistant/components/adguard/translations/lb.json
index abf6df83a6a..860abfeb27f 100644
--- a/homeassistant/components/adguard/translations/lb.json
+++ b/homeassistant/components/adguard/translations/lb.json
@@ -5,6 +5,7 @@
             "single_instance_allowed": "N\u00ebmmen eng eenzeg Konfiguratioun vun AdGuard Home ass erlaabt."
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbannen."
         },
         "step": {
diff --git a/homeassistant/components/adguard/translations/nl.json b/homeassistant/components/adguard/translations/nl.json
index 61d009b503e..6451028e6d0 100644
--- a/homeassistant/components/adguard/translations/nl.json
+++ b/homeassistant/components/adguard/translations/nl.json
@@ -5,6 +5,7 @@
             "single_instance_allowed": "Slechts \u00e9\u00e9n configuratie van AdGuard Home is toegestaan."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kon niet verbinden."
         },
         "step": {
@@ -15,6 +16,7 @@
             "user": {
                 "data": {
                     "password": "Wachtwoord",
+                    "port": "Poort",
                     "ssl": "AdGuard Home maakt gebruik van een SSL certificaat",
                     "username": "Gebruikersnaam",
                     "verify_ssl": "AdGuard Home maakt gebruik van een goed certificaat"
diff --git a/homeassistant/components/adguard/translations/no.json b/homeassistant/components/adguard/translations/no.json
index a772988c042..d1f08720df1 100644
--- a/homeassistant/components/adguard/translations/no.json
+++ b/homeassistant/components/adguard/translations/no.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "existing_instance_updated": "Oppdatert eksisterende konfigurasjon.",
-            "single_instance_allowed": "Kun en konfigurasjon av AdGuard Hjemer tillatt."
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Tilkobling mislyktes."
         },
         "step": {
@@ -16,10 +17,10 @@
                 "data": {
                     "host": "Vert",
                     "password": "Passord",
-                    "port": "",
-                    "ssl": "AdGuard Hjem bruker et SSL-sertifikat",
+                    "port": "Port",
+                    "ssl": "Bruker et SSL-sertifikat",
                     "username": "Brukernavn",
-                    "verify_ssl": "AdGuard Home bruker et riktig sertifikat"
+                    "verify_ssl": "Verifisere SSL-sertifikat"
                 },
                 "description": "Sett opp din AdGuard Hjem instans for \u00e5 tillate overv\u00e5king og kontroll."
             }
diff --git a/homeassistant/components/adguard/translations/pl.json b/homeassistant/components/adguard/translations/pl.json
index 2e9ce8c0b3c..9991e30859a 100644
--- a/homeassistant/components/adguard/translations/pl.json
+++ b/homeassistant/components/adguard/translations/pl.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "existing_instance_updated": "Zaktualizowano istniej\u0105c\u0105 konfiguracj\u0119.",
-            "single_instance_allowed": "Dozwolona jest tylko jedna konfiguracja AdGuard Home."
+            "existing_instance_updated": "Zaktualizowano istniej\u0105c\u0105 konfiguracj\u0119",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "step": {
@@ -17,9 +18,9 @@
                     "host": "Nazwa hosta lub adres IP",
                     "password": "Has\u0142o",
                     "port": "Port",
-                    "ssl": "AdGuard Home u\u017cywa certyfikatu SSL",
+                    "ssl": "Certyfikat SSL",
                     "username": "Nazwa u\u017cytkownika",
-                    "verify_ssl": "AdGuard Home u\u017cywa odpowiedniego certyfikatu."
+                    "verify_ssl": "Weryfikacja certyfikatu SSL"
                 },
                 "description": "Skonfiguruj instancj\u0119 AdGuard Home, aby umo\u017cliwi\u0107 monitorowanie i kontrol\u0119."
             }
diff --git a/homeassistant/components/adguard/translations/ru.json b/homeassistant/components/adguard/translations/ru.json
index ed65b1423bd..175d0bc1d5a 100644
--- a/homeassistant/components/adguard/translations/ru.json
+++ b/homeassistant/components/adguard/translations/ru.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "existing_instance_updated": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430.",
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f."
         },
         "step": {
@@ -17,9 +18,9 @@
                     "host": "\u0425\u043e\u0441\u0442",
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "AdGuard Home \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
                     "username": "\u041b\u043e\u0433\u0438\u043d",
-                    "verify_ssl": "AdGuard Home \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442"
+                    "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 },
                 "description": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435 Home Assistant \u0434\u043b\u044f \u043c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430 \u0438 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044f AdGuard Home."
             }
diff --git a/homeassistant/components/adguard/translations/zh-Hans.json b/homeassistant/components/adguard/translations/zh-Hans.json
index 4204beb5268..64a68e91877 100644
--- a/homeassistant/components/adguard/translations/zh-Hans.json
+++ b/homeassistant/components/adguard/translations/zh-Hans.json
@@ -3,6 +3,9 @@
         "abort": {
             "existing_instance_updated": "\u66f4\u65b0\u4e86\u73b0\u6709\u914d\u7f6e\u3002"
         },
+        "error": {
+            "connection_error": "\u8fde\u63a5\u5931\u8d25\u3002"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/adguard/translations/zh-Hant.json b/homeassistant/components/adguard/translations/zh-Hant.json
index 5fbfdbbc59c..b883b0a01ba 100644
--- a/homeassistant/components/adguard/translations/zh-Hant.json
+++ b/homeassistant/components/adguard/translations/zh-Hant.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "existing_instance_updated": "\u5df2\u66f4\u65b0\u73fe\u6709\u8a2d\u5b9a\u3002",
-            "single_instance_allowed": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44 AdGuard Home\u3002"
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "\u9023\u7dda\u5931\u6557\u3002"
         },
         "step": {
@@ -17,9 +18,9 @@
                     "host": "\u4e3b\u6a5f\u7aef",
                     "password": "\u5bc6\u78bc",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "AdGuard Home \u4f7f\u7528 SSL \u8a8d\u8b49",
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
                     "username": "\u4f7f\u7528\u8005\u540d\u7a31",
-                    "verify_ssl": "AdGuard Home \u4f7f\u7528\u5c0d\u61c9\u8a8d\u8b49"
+                    "verify_ssl": "\u78ba\u8a8d SSL \u8a8d\u8b49"
                 },
                 "description": "\u8a2d\u5b9a AdGuard Home \u4ee5\u9032\u884c\u76e3\u63a7\u3002"
             }
diff --git a/homeassistant/components/ads/binary_sensor.py b/homeassistant/components/ads/binary_sensor.py
index d481420b4d4..0cf89dfa7cc 100644
--- a/homeassistant/components/ads/binary_sensor.py
+++ b/homeassistant/components/ads/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for ADS binary sensors."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
@@ -14,8 +12,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import CONF_ADS_VAR, DATA_ADS, STATE_KEY_STATE, AdsEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "ADS binary sensor"
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
diff --git a/homeassistant/components/ads/cover.py b/homeassistant/components/ads/cover.py
index 1a350b3e39f..5348873c7d0 100644
--- a/homeassistant/components/ads/cover.py
+++ b/homeassistant/components/ads/cover.py
@@ -1,6 +1,4 @@
 """Support for ADS covers."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.cover import (
@@ -25,8 +23,6 @@ from . import (
     AdsEntity,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "ADS Cover"
 
 CONF_ADS_VAR_SET_POS = "adsvar_set_position"
diff --git a/homeassistant/components/ads/light.py b/homeassistant/components/ads/light.py
index 74701066078..82ead5fbf59 100644
--- a/homeassistant/components/ads/light.py
+++ b/homeassistant/components/ads/light.py
@@ -1,6 +1,4 @@
 """Support for ADS light sources."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.light import (
@@ -21,7 +19,6 @@ from . import (
     AdsEntity,
 )
 
-_LOGGER = logging.getLogger(__name__)
 DEFAULT_NAME = "ADS Light"
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
diff --git a/homeassistant/components/ads/sensor.py b/homeassistant/components/ads/sensor.py
index 134acae3f94..2f411b27723 100644
--- a/homeassistant/components/ads/sensor.py
+++ b/homeassistant/components/ads/sensor.py
@@ -1,6 +1,4 @@
 """Support for ADS sensors."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components import ads
@@ -10,8 +8,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import CONF_ADS_FACTOR, CONF_ADS_TYPE, CONF_ADS_VAR, STATE_KEY_STATE, AdsEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "ADS sensor"
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
diff --git a/homeassistant/components/ads/switch.py b/homeassistant/components/ads/switch.py
index c8231d8a31d..9f807899e54 100644
--- a/homeassistant/components/ads/switch.py
+++ b/homeassistant/components/ads/switch.py
@@ -1,6 +1,4 @@
 """Support for ADS switch platform."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
@@ -9,8 +7,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import CONF_ADS_VAR, DATA_ADS, STATE_KEY_STATE, AdsEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "ADS Switch"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/advantage_air/__init__.py b/homeassistant/components/advantage_air/__init__.py
new file mode 100644
index 00000000000..7b270f1f335
--- /dev/null
+++ b/homeassistant/components/advantage_air/__init__.py
@@ -0,0 +1,92 @@
+"""Advantage Air climate integration."""
+
+import asyncio
+from datetime import timedelta
+import logging
+
+from advantage_air import ApiError, advantage_air
+
+from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import ADVANTAGE_AIR_RETRY, DOMAIN
+
+ADVANTAGE_AIR_SYNC_INTERVAL = 15
+ADVANTAGE_AIR_PLATFORMS = ["climate", "cover", "binary_sensor", "sensor", "switch"]
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup(hass, config):
+    """Set up Advantage Air integration."""
+    hass.data[DOMAIN] = {}
+    return True
+
+
+async def async_setup_entry(hass, entry):
+    """Set up Advantage Air config."""
+    ip_address = entry.data[CONF_IP_ADDRESS]
+    port = entry.data[CONF_PORT]
+    api = advantage_air(
+        ip_address,
+        port=port,
+        session=async_get_clientsession(hass),
+        retry=ADVANTAGE_AIR_RETRY,
+    )
+
+    async def async_get():
+        try:
+            return await api.async_get()
+        except ApiError as err:
+            raise UpdateFailed(err) from err
+
+    coordinator = DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        name="Advantage Air",
+        update_method=async_get,
+        update_interval=timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL),
+    )
+
+    async def async_change(change):
+        try:
+            if await api.async_change(change):
+                await coordinator.async_refresh()
+        except ApiError as err:
+            _LOGGER.warning(err)
+
+    await coordinator.async_refresh()
+
+    if not coordinator.data:
+        raise ConfigEntryNotReady
+
+    hass.data[DOMAIN][entry.entry_id] = {
+        "coordinator": coordinator,
+        "async_change": async_change,
+    }
+
+    for platform in ADVANTAGE_AIR_PLATFORMS:
+        hass.async_create_task(
+            hass.config_entries.async_forward_entry_setup(entry, platform)
+        )
+
+    return True
+
+
+async def async_unload_entry(hass, entry):
+    """Unload Advantage Air Config."""
+    unload_ok = all(
+        await asyncio.gather(
+            *[
+                hass.config_entries.async_forward_entry_unload(entry, component)
+                for component in ADVANTAGE_AIR_PLATFORMS
+            ]
+        )
+    )
+
+    if unload_ok:
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
diff --git a/homeassistant/components/advantage_air/binary_sensor.py b/homeassistant/components/advantage_air/binary_sensor.py
new file mode 100644
index 00000000000..50a7ef83895
--- /dev/null
+++ b/homeassistant/components/advantage_air/binary_sensor.py
@@ -0,0 +1,75 @@
+"""Binary Sensor platform for Advantage Air integration."""
+
+from homeassistant.components.binary_sensor import (
+    DEVICE_CLASS_MOTION,
+    DEVICE_CLASS_PROBLEM,
+    BinarySensorEntity,
+)
+
+from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
+from .entity import AdvantageAirEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up AdvantageAir motion platform."""
+
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+
+    entities = []
+    for ac_key, ac_device in instance["coordinator"].data["aircons"].items():
+        entities.append(AdvantageAirZoneFilter(instance, ac_key))
+        for zone_key, zone in ac_device["zones"].items():
+            # Only add motion sensor when motion is enabled
+            if zone["motionConfig"] >= 2:
+                entities.append(AdvantageAirZoneMotion(instance, ac_key, zone_key))
+    async_add_entities(entities)
+
+
+class AdvantageAirZoneFilter(AdvantageAirEntity, BinarySensorEntity):
+    """Advantage Air Filter."""
+
+    @property
+    def name(self):
+        """Return the name."""
+        return f'{self._ac["name"]} Filter'
+
+    @property
+    def unique_id(self):
+        """Return a unique id."""
+        return f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-filter'
+
+    @property
+    def device_class(self):
+        """Return the device class of the vent."""
+        return DEVICE_CLASS_PROBLEM
+
+    @property
+    def is_on(self):
+        """Return if filter needs cleaning."""
+        return self._ac["filterCleanStatus"]
+
+
+class AdvantageAirZoneMotion(AdvantageAirEntity, BinarySensorEntity):
+    """Advantage Air Zone Motion."""
+
+    @property
+    def name(self):
+        """Return the name."""
+        return f'{self._zone["name"]} Motion'
+
+    @property
+    def unique_id(self):
+        """Return a unique id."""
+        return f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-{self.zone_key}-motion'
+
+    @property
+    def device_class(self):
+        """Return the device class of the vent."""
+        return DEVICE_CLASS_MOTION
+
+    @property
+    def is_on(self):
+        """Return if motion is detect."""
+        return self._zone["motion"]
diff --git a/homeassistant/components/advantage_air/climate.py b/homeassistant/components/advantage_air/climate.py
new file mode 100644
index 00000000000..d3c4e897819
--- /dev/null
+++ b/homeassistant/components/advantage_air/climate.py
@@ -0,0 +1,235 @@
+"""Climate platform for Advantage Air integration."""
+
+from homeassistant.components.climate import ClimateEntity
+from homeassistant.components.climate.const import (
+    FAN_AUTO,
+    FAN_HIGH,
+    FAN_LOW,
+    FAN_MEDIUM,
+    HVAC_MODE_COOL,
+    HVAC_MODE_DRY,
+    HVAC_MODE_FAN_ONLY,
+    HVAC_MODE_HEAT,
+    HVAC_MODE_OFF,
+    SUPPORT_FAN_MODE,
+    SUPPORT_TARGET_TEMPERATURE,
+)
+from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, TEMP_CELSIUS
+
+from .const import (
+    ADVANTAGE_AIR_STATE_CLOSE,
+    ADVANTAGE_AIR_STATE_OFF,
+    ADVANTAGE_AIR_STATE_ON,
+    ADVANTAGE_AIR_STATE_OPEN,
+    DOMAIN as ADVANTAGE_AIR_DOMAIN,
+)
+from .entity import AdvantageAirEntity
+
+ADVANTAGE_AIR_HVAC_MODES = {
+    "heat": HVAC_MODE_HEAT,
+    "cool": HVAC_MODE_COOL,
+    "vent": HVAC_MODE_FAN_ONLY,
+    "dry": HVAC_MODE_DRY,
+}
+HASS_HVAC_MODES = {v: k for k, v in ADVANTAGE_AIR_HVAC_MODES.items()}
+
+ADVANTAGE_AIR_FAN_MODES = {
+    "auto": FAN_AUTO,
+    "low": FAN_LOW,
+    "medium": FAN_MEDIUM,
+    "high": FAN_HIGH,
+}
+HASS_FAN_MODES = {v: k for k, v in ADVANTAGE_AIR_FAN_MODES.items()}
+FAN_SPEEDS = {FAN_LOW: 30, FAN_MEDIUM: 60, FAN_HIGH: 100}
+
+AC_HVAC_MODES = [
+    HVAC_MODE_OFF,
+    HVAC_MODE_COOL,
+    HVAC_MODE_HEAT,
+    HVAC_MODE_FAN_ONLY,
+    HVAC_MODE_DRY,
+]
+ZONE_HVAC_MODES = [HVAC_MODE_OFF, HVAC_MODE_FAN_ONLY]
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up AdvantageAir climate platform."""
+
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+
+    entities = []
+    for ac_key, ac_device in instance["coordinator"].data["aircons"].items():
+        entities.append(AdvantageAirAC(instance, ac_key))
+        for zone_key, zone in ac_device["zones"].items():
+            # Only add zone climate control when zone is in temperature control
+            if zone["type"] != 0:
+                entities.append(AdvantageAirZone(instance, ac_key, zone_key))
+    async_add_entities(entities)
+
+
+class AdvantageAirClimateEntity(AdvantageAirEntity, ClimateEntity):
+    """AdvantageAir Climate class."""
+
+    @property
+    def temperature_unit(self):
+        """Return the temperature unit."""
+        return TEMP_CELSIUS
+
+    @property
+    def target_temperature_step(self):
+        """Return the supported temperature step."""
+        return PRECISION_WHOLE
+
+    @property
+    def max_temp(self):
+        """Return the maximum supported temperature."""
+        return 32
+
+    @property
+    def min_temp(self):
+        """Return the minimum supported temperature."""
+        return 16
+
+
+class AdvantageAirAC(AdvantageAirClimateEntity):
+    """AdvantageAir AC unit."""
+
+    @property
+    def name(self):
+        """Return the name."""
+        return self._ac["name"]
+
+    @property
+    def unique_id(self):
+        """Return a unique id."""
+        return f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}'
+
+    @property
+    def target_temperature(self):
+        """Return the current target temperature."""
+        return self._ac["setTemp"]
+
+    @property
+    def hvac_mode(self):
+        """Return the current HVAC modes."""
+        if self._ac["state"] == ADVANTAGE_AIR_STATE_ON:
+            return ADVANTAGE_AIR_HVAC_MODES.get(self._ac["mode"])
+        return HVAC_MODE_OFF
+
+    @property
+    def hvac_modes(self):
+        """Return the supported HVAC modes."""
+        return AC_HVAC_MODES
+
+    @property
+    def fan_mode(self):
+        """Return the current fan modes."""
+        return ADVANTAGE_AIR_FAN_MODES.get(self._ac["fan"])
+
+    @property
+    def fan_modes(self):
+        """Return the supported fan modes."""
+        return [FAN_AUTO, FAN_LOW, FAN_MEDIUM, FAN_HIGH]
+
+    @property
+    def supported_features(self):
+        """Return the supported features."""
+        return SUPPORT_TARGET_TEMPERATURE | SUPPORT_FAN_MODE
+
+    async def async_set_hvac_mode(self, hvac_mode):
+        """Set the HVAC Mode and State."""
+        if hvac_mode == HVAC_MODE_OFF:
+            await self.async_change(
+                {self.ac_key: {"info": {"state": ADVANTAGE_AIR_STATE_OFF}}}
+            )
+        else:
+            await self.async_change(
+                {
+                    self.ac_key: {
+                        "info": {
+                            "state": ADVANTAGE_AIR_STATE_ON,
+                            "mode": HASS_HVAC_MODES.get(hvac_mode),
+                        }
+                    }
+                }
+            )
+
+    async def async_set_fan_mode(self, fan_mode):
+        """Set the Fan Mode."""
+        await self.async_change(
+            {self.ac_key: {"info": {"fan": HASS_FAN_MODES.get(fan_mode)}}}
+        )
+
+    async def async_set_temperature(self, **kwargs):
+        """Set the Temperature."""
+        temp = kwargs.get(ATTR_TEMPERATURE)
+        await self.async_change({self.ac_key: {"info": {"setTemp": temp}}})
+
+
+class AdvantageAirZone(AdvantageAirClimateEntity):
+    """AdvantageAir Zone control."""
+
+    @property
+    def name(self):
+        """Return the name."""
+        return self._zone["name"]
+
+    @property
+    def unique_id(self):
+        """Return a unique id."""
+        return f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-{self.zone_key}'
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self._zone["measuredTemp"]
+
+    @property
+    def target_temperature(self):
+        """Return the target temperature."""
+        return self._zone["setTemp"]
+
+    @property
+    def hvac_mode(self):
+        """Return the current HVAC modes."""
+        if self._zone["state"] == ADVANTAGE_AIR_STATE_OPEN:
+            return HVAC_MODE_FAN_ONLY
+        return HVAC_MODE_OFF
+
+    @property
+    def hvac_modes(self):
+        """Return supported HVAC modes."""
+        return ZONE_HVAC_MODES
+
+    @property
+    def supported_features(self):
+        """Return the supported features."""
+        return SUPPORT_TARGET_TEMPERATURE
+
+    async def async_set_hvac_mode(self, hvac_mode):
+        """Set the HVAC Mode and State."""
+        if hvac_mode == HVAC_MODE_OFF:
+            await self.async_change(
+                {
+                    self.ac_key: {
+                        "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_CLOSE}}
+                    }
+                }
+            )
+        else:
+            await self.async_change(
+                {
+                    self.ac_key: {
+                        "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_OPEN}}
+                    }
+                }
+            )
+
+    async def async_set_temperature(self, **kwargs):
+        """Set the Temperature."""
+        temp = kwargs.get(ATTR_TEMPERATURE)
+        await self.async_change(
+            {self.ac_key: {"zones": {self.zone_key: {"setTemp": temp}}}}
+        )
diff --git a/homeassistant/components/advantage_air/config_flow.py b/homeassistant/components/advantage_air/config_flow.py
new file mode 100644
index 00000000000..39c6e9efd4e
--- /dev/null
+++ b/homeassistant/components/advantage_air/config_flow.py
@@ -0,0 +1,57 @@
+"""Config Flow for Advantage Air integration."""
+from advantage_air import ApiError, advantage_air
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import ADVANTAGE_AIR_RETRY, DOMAIN
+
+ADVANTAGE_AIR_DEFAULT_PORT = 2025
+
+ADVANTAGE_AIR_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_IP_ADDRESS): str,
+        vol.Optional(CONF_PORT, default=ADVANTAGE_AIR_DEFAULT_PORT): int,
+    }
+)
+
+
+class AdvantageAirConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Config Advantage Air API connection."""
+
+    VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_POLL
+    DOMAIN = DOMAIN
+
+    async def async_step_user(self, user_input=None):
+        """Get configuration from the user."""
+        errors = {}
+        if user_input:
+            ip_address = user_input[CONF_IP_ADDRESS]
+            port = user_input[CONF_PORT]
+
+            try:
+                data = await advantage_air(
+                    ip_address,
+                    port=port,
+                    session=async_get_clientsession(self.hass),
+                    retry=ADVANTAGE_AIR_RETRY,
+                ).async_get(1)
+            except ApiError:
+                errors["base"] = "cannot_connect"
+            else:
+                await self.async_set_unique_id(data["system"]["rid"])
+                self._abort_if_unique_id_configured()
+
+                return self.async_create_entry(
+                    title=data["system"]["name"],
+                    data=user_input,
+                )
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=ADVANTAGE_AIR_SCHEMA,
+            errors=errors,
+        )
diff --git a/homeassistant/components/advantage_air/const.py b/homeassistant/components/advantage_air/const.py
new file mode 100644
index 00000000000..078c266bfb0
--- /dev/null
+++ b/homeassistant/components/advantage_air/const.py
@@ -0,0 +1,7 @@
+"""Constants used by Advantage Air integration."""
+DOMAIN = "advantage_air"
+ADVANTAGE_AIR_RETRY = 5
+ADVANTAGE_AIR_STATE_OPEN = "open"
+ADVANTAGE_AIR_STATE_CLOSE = "close"
+ADVANTAGE_AIR_STATE_ON = "on"
+ADVANTAGE_AIR_STATE_OFF = "off"
diff --git a/homeassistant/components/advantage_air/cover.py b/homeassistant/components/advantage_air/cover.py
new file mode 100644
index 00000000000..69d66849cd6
--- /dev/null
+++ b/homeassistant/components/advantage_air/cover.py
@@ -0,0 +1,116 @@
+"""Cover platform for Advantage Air integration."""
+
+from homeassistant.components.cover import (
+    ATTR_POSITION,
+    DEVICE_CLASS_DAMPER,
+    SUPPORT_CLOSE,
+    SUPPORT_OPEN,
+    SUPPORT_SET_POSITION,
+    CoverEntity,
+)
+
+from .const import (
+    ADVANTAGE_AIR_STATE_CLOSE,
+    ADVANTAGE_AIR_STATE_OPEN,
+    DOMAIN as ADVANTAGE_AIR_DOMAIN,
+)
+from .entity import AdvantageAirEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up AdvantageAir cover platform."""
+
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+
+    entities = []
+    for ac_key, ac_device in instance["coordinator"].data["aircons"].items():
+        for zone_key, zone in ac_device["zones"].items():
+            # Only add zone vent controls when zone in vent control mode.
+            if zone["type"] == 0:
+                entities.append(AdvantageAirZoneVent(instance, ac_key, zone_key))
+    async_add_entities(entities)
+
+
+class AdvantageAirZoneVent(AdvantageAirEntity, CoverEntity):
+    """Advantage Air Cover Class."""
+
+    @property
+    def name(self):
+        """Return the name."""
+        return f'{self._zone["name"]}'
+
+    @property
+    def unique_id(self):
+        """Return a unique id."""
+        return f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-{self.zone_key}'
+
+    @property
+    def device_class(self):
+        """Return the device class of the vent."""
+        return DEVICE_CLASS_DAMPER
+
+    @property
+    def supported_features(self):
+        """Return the supported features."""
+        return SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_SET_POSITION
+
+    @property
+    def is_closed(self):
+        """Return if vent is fully closed."""
+        return self._zone["state"] == ADVANTAGE_AIR_STATE_CLOSE
+
+    @property
+    def current_cover_position(self):
+        """Return vents current position as a percentage."""
+        if self._zone["state"] == ADVANTAGE_AIR_STATE_OPEN:
+            return self._zone["value"]
+        return 0
+
+    async def async_open_cover(self, **kwargs):
+        """Fully open zone vent."""
+        await self.async_change(
+            {
+                self.ac_key: {
+                    "zones": {
+                        self.zone_key: {"state": ADVANTAGE_AIR_STATE_OPEN, "value": 100}
+                    }
+                }
+            }
+        )
+
+    async def async_close_cover(self, **kwargs):
+        """Fully close zone vent."""
+        await self.async_change(
+            {
+                self.ac_key: {
+                    "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_CLOSE}}
+                }
+            }
+        )
+
+    async def async_set_cover_position(self, **kwargs):
+        """Change vent position."""
+        position = round(kwargs[ATTR_POSITION] / 5) * 5
+        if position == 0:
+            await self.async_change(
+                {
+                    self.ac_key: {
+                        "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_CLOSE}}
+                    }
+                }
+            )
+        else:
+            await self.async_change(
+                {
+                    self.ac_key: {
+                        "zones": {
+                            self.zone_key: {
+                                "state": ADVANTAGE_AIR_STATE_OPEN,
+                                "value": position,
+                            }
+                        }
+                    }
+                }
+            )
diff --git a/homeassistant/components/advantage_air/entity.py b/homeassistant/components/advantage_air/entity.py
new file mode 100644
index 00000000000..ea20368c10f
--- /dev/null
+++ b/homeassistant/components/advantage_air/entity.py
@@ -0,0 +1,35 @@
+"""Advantage Air parent entity class."""
+
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+
+
+class AdvantageAirEntity(CoordinatorEntity):
+    """Parent class for Advantage Air Entities."""
+
+    def __init__(self, instance, ac_key, zone_key=None):
+        """Initialize common aspects of an Advantage Air sensor."""
+        super().__init__(instance["coordinator"])
+        self.async_change = instance["async_change"]
+        self.ac_key = ac_key
+        self.zone_key = zone_key
+
+    @property
+    def _ac(self):
+        return self.coordinator.data["aircons"][self.ac_key]["info"]
+
+    @property
+    def _zone(self):
+        return self.coordinator.data["aircons"][self.ac_key]["zones"][self.zone_key]
+
+    @property
+    def device_info(self):
+        """Return parent device information."""
+        return {
+            "identifiers": {(DOMAIN, self.coordinator.data["system"]["rid"])},
+            "name": self.coordinator.data["system"]["name"],
+            "manufacturer": "Advantage Air",
+            "model": self.coordinator.data["system"]["sysType"],
+            "sw_version": self.coordinator.data["system"]["myAppRev"],
+        }
diff --git a/homeassistant/components/advantage_air/manifest.json b/homeassistant/components/advantage_air/manifest.json
new file mode 100644
index 00000000000..87655d61be4
--- /dev/null
+++ b/homeassistant/components/advantage_air/manifest.json
@@ -0,0 +1,9 @@
+{
+  "domain": "advantage_air",
+  "name": "Advantage Air",
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/advantage_air",
+  "codeowners": ["@Bre77"],
+  "requirements": ["advantage_air==0.2.1"],
+  "quality_scale": "platinum"
+}
diff --git a/homeassistant/components/advantage_air/sensor.py b/homeassistant/components/advantage_air/sensor.py
new file mode 100644
index 00000000000..d25ce4888fc
--- /dev/null
+++ b/homeassistant/components/advantage_air/sensor.py
@@ -0,0 +1,152 @@
+"""Sensor platform for Advantage Air integration."""
+import voluptuous as vol
+
+from homeassistant.const import PERCENTAGE
+from homeassistant.helpers import config_validation as cv, entity_platform
+
+from .const import ADVANTAGE_AIR_STATE_OPEN, DOMAIN as ADVANTAGE_AIR_DOMAIN
+from .entity import AdvantageAirEntity
+
+ADVANTAGE_AIR_SET_COUNTDOWN_VALUE = "minutes"
+ADVANTAGE_AIR_SET_COUNTDOWN_UNIT = "min"
+ADVANTAGE_AIR_SERVICE_SET_TIME_TO = "set_time_to"
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up AdvantageAir sensor platform."""
+
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+
+    entities = []
+    for ac_key, ac_device in instance["coordinator"].data["aircons"].items():
+        entities.append(AdvantageAirTimeTo(instance, ac_key, "On"))
+        entities.append(AdvantageAirTimeTo(instance, ac_key, "Off"))
+        for zone_key, zone in ac_device["zones"].items():
+            # Only show damper sensors when zone is in temperature control
+            if zone["type"] != 0:
+                entities.append(AdvantageAirZoneVent(instance, ac_key, zone_key))
+            # Only show wireless signal strength sensors when using wireless sensors
+            if zone["rssi"] > 0:
+                entities.append(AdvantageAirZoneSignal(instance, ac_key, zone_key))
+    async_add_entities(entities)
+
+    platform = entity_platform.current_platform.get()
+    platform.async_register_entity_service(
+        ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
+        {vol.Required("minutes"): cv.positive_int},
+        "set_time_to",
+    )
+
+
+class AdvantageAirTimeTo(AdvantageAirEntity):
+    """Representation of Advantage Air timer control."""
+
+    def __init__(self, instance, ac_key, action):
+        """Initialize the Advantage Air timer control."""
+        super().__init__(instance, ac_key)
+        self.action = action
+        self._time_key = f"countDownTo{self.action}"
+
+    @property
+    def name(self):
+        """Return the name."""
+        return f'{self._ac["name"]} Time To {self.action}'
+
+    @property
+    def unique_id(self):
+        """Return a unique id."""
+        return f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-timeto{self.action}'
+
+    @property
+    def state(self):
+        """Return the current value."""
+        return self._ac[self._time_key]
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return ADVANTAGE_AIR_SET_COUNTDOWN_UNIT
+
+    @property
+    def icon(self):
+        """Return a representative icon of the timer."""
+        if self._ac[self._time_key] > 0:
+            return "mdi:timer-outline"
+        return "mdi:timer-off-outline"
+
+    async def set_time_to(self, **kwargs):
+        """Set the timer value."""
+        value = min(720, max(0, int(kwargs[ADVANTAGE_AIR_SET_COUNTDOWN_VALUE])))
+        await self.async_change({self.ac_key: {"info": {self._time_key: value}}})
+
+
+class AdvantageAirZoneVent(AdvantageAirEntity):
+    """Representation of Advantage Air Zone Vent Sensor."""
+
+    @property
+    def name(self):
+        """Return the name."""
+        return f'{self._zone["name"]} Vent'
+
+    @property
+    def unique_id(self):
+        """Return a unique id."""
+        return f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-{self.zone_key}-vent'
+
+    @property
+    def state(self):
+        """Return the current value of the air vent."""
+        if self._zone["state"] == ADVANTAGE_AIR_STATE_OPEN:
+            return self._zone["value"]
+        return 0
+
+    @property
+    def unit_of_measurement(self):
+        """Return the percent sign."""
+        return PERCENTAGE
+
+    @property
+    def icon(self):
+        """Return a representative icon."""
+        if self._zone["state"] == ADVANTAGE_AIR_STATE_OPEN:
+            return "mdi:fan"
+        return "mdi:fan-off"
+
+
+class AdvantageAirZoneSignal(AdvantageAirEntity):
+    """Representation of Advantage Air Zone wireless signal sensor."""
+
+    @property
+    def name(self):
+        """Return the name."""
+        return f'{self._zone["name"]} Signal'
+
+    @property
+    def unique_id(self):
+        """Return a unique id."""
+        return f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-{self.zone_key}-signal'
+
+    @property
+    def state(self):
+        """Return the current value of the wireless signal."""
+        return self._zone["rssi"]
+
+    @property
+    def unit_of_measurement(self):
+        """Return the percent sign."""
+        return PERCENTAGE
+
+    @property
+    def icon(self):
+        """Return a representative icon."""
+        if self._zone["rssi"] >= 80:
+            return "mdi:wifi-strength-4"
+        if self._zone["rssi"] >= 60:
+            return "mdi:wifi-strength-3"
+        if self._zone["rssi"] >= 40:
+            return "mdi:wifi-strength-2"
+        if self._zone["rssi"] >= 20:
+            return "mdi:wifi-strength-1"
+        return "mdi:wifi-strength-outline"
diff --git a/homeassistant/components/advantage_air/services.yaml b/homeassistant/components/advantage_air/services.yaml
new file mode 100644
index 00000000000..aa222577b2f
--- /dev/null
+++ b/homeassistant/components/advantage_air/services.yaml
@@ -0,0 +1,9 @@
+set_time_to:
+  description: Control timers to turn the system on or off after a set number of minutes
+  fields:
+    entity_id:
+      description: Time To sensor entity
+      example: "sensor.ac_time_to_on"
+    minutes:
+      description: Minutes until action
+      example: "60"
diff --git a/homeassistant/components/advantage_air/strings.json b/homeassistant/components/advantage_air/strings.json
new file mode 100644
index 00000000000..c8b9cd1dc5f
--- /dev/null
+++ b/homeassistant/components/advantage_air/strings.json
@@ -0,0 +1,22 @@
+{
+  "config": {
+    "flow_title": "Advantage Air Setup",
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "ip_address": "[%key:common::config_flow::data::ip%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "description": "Connect to the API of your Advantage Air wall mounted tablet.",
+        "title": "Connect"
+      }
+    }
+  },
+  "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/switch.py b/homeassistant/components/advantage_air/switch.py
new file mode 100644
index 00000000000..6c687c1427e
--- /dev/null
+++ b/homeassistant/components/advantage_air/switch.py
@@ -0,0 +1,58 @@
+"""Switch platform for Advantage Air integration."""
+
+from homeassistant.helpers.entity import ToggleEntity
+
+from .const import (
+    ADVANTAGE_AIR_STATE_OFF,
+    ADVANTAGE_AIR_STATE_ON,
+    DOMAIN as ADVANTAGE_AIR_DOMAIN,
+)
+from .entity import AdvantageAirEntity
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up AdvantageAir toggle platform."""
+
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+
+    entities = []
+    for ac_key, ac_device in instance["coordinator"].data["aircons"].items():
+        if ac_device["info"]["freshAirStatus"] != "none":
+            entities.append(AdvantageAirFreshAir(instance, ac_key))
+    async_add_entities(entities)
+
+
+class AdvantageAirFreshAir(AdvantageAirEntity, ToggleEntity):
+    """Representation of Advantage Air fresh air control."""
+
+    @property
+    def name(self):
+        """Return the name."""
+        return f'{self._ac["name"]} Fresh Air'
+
+    @property
+    def unique_id(self):
+        """Return a unique id."""
+        return f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-freshair'
+
+    @property
+    def is_on(self):
+        """Return the fresh air status."""
+        return self._ac["freshAirStatus"] == ADVANTAGE_AIR_STATE_ON
+
+    @property
+    def icon(self):
+        """Return a representative icon of the fresh air switch."""
+        return "mdi:air-filter"
+
+    async def async_turn_on(self, **kwargs):
+        """Turn fresh air on."""
+        await self.async_change(
+            {self.ac_key: {"info": {"freshAirStatus": ADVANTAGE_AIR_STATE_ON}}}
+        )
+
+    async def async_turn_off(self, **kwargs):
+        """Turn fresh air off."""
+        await self.async_change(
+            {self.ac_key: {"info": {"freshAirStatus": ADVANTAGE_AIR_STATE_OFF}}}
+        )
diff --git a/homeassistant/components/advantage_air/translations/ca.json b/homeassistant/components/advantage_air/translations/ca.json
new file mode 100644
index 00000000000..80d023a672b
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/ca.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
+        },
+        "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3"
+        },
+        "flow_title": "Configuraci\u00f3 d'Advantage Air",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "Adre\u00e7a IP",
+                    "port": "Port"
+                },
+                "description": "Connecta't a l'API de la tauleta d'Advantage Air.",
+                "title": "Connecta"
+            }
+        }
+    },
+    "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/cs.json b/homeassistant/components/advantage_air/translations/cs.json
new file mode 100644
index 00000000000..d4dc0b3a5ae
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/cs.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "flow_title": "Nastaven\u00ed Advantage Air",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP adresa",
+                    "port": "Port"
+                },
+                "title": "P\u0159ipojit"
+            }
+        }
+    },
+    "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/de.json b/homeassistant/components/advantage_air/translations/de.json
new file mode 100644
index 00000000000..e2a9646a0aa
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/de.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP Adresse",
+                    "port": "Port"
+                },
+                "title": "Verbinden"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/en.json b/homeassistant/components/advantage_air/translations/en.json
new file mode 100644
index 00000000000..209ba946545
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/en.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Device is already configured"
+        },
+        "error": {
+            "cannot_connect": "Failed to connect"
+        },
+        "flow_title": "Advantage Air Setup",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP Address",
+                    "port": "Port"
+                },
+                "description": "Connect to the API of your Advantage Air wall mounted tablet.",
+                "title": "Connect"
+            }
+        }
+    },
+    "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/es.json b/homeassistant/components/advantage_air/translations/es.json
new file mode 100644
index 00000000000..d3234a85c2e
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/es.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
+        },
+        "error": {
+            "cannot_connect": "No se pudo conectar"
+        },
+        "flow_title": "Configuraci\u00f3n de Advantage Air",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "Direcci\u00f3n IP",
+                    "port": "Puerto"
+                },
+                "description": "Con\u00e9ctate a la API de tu tableta de pared Advantage Air.",
+                "title": "Conectar"
+            }
+        }
+    },
+    "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/et.json b/homeassistant/components/advantage_air/translations/et.json
new file mode 100644
index 00000000000..a4419dfcd6e
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendus nurjus"
+        },
+        "flow_title": "Advantage Air-i seadistamine",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP aadress",
+                    "port": ""
+                },
+                "description": "\u00dchendu oma Advantage Air seinale paigaldatud tahvelarvuti API-ga.",
+                "title": "\u00dchenda"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/it.json b/homeassistant/components/advantage_air/translations/it.json
new file mode 100644
index 00000000000..a755c3e1f00
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/it.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
+        },
+        "error": {
+            "cannot_connect": "Impossibile connettersi"
+        },
+        "flow_title": "Configurazione di Advantage Air",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "Indirizzo IP",
+                    "port": "Porta"
+                },
+                "description": "Connettiti all'API del tablet montato a parete di Advantage Air.",
+                "title": "Connetti"
+            }
+        }
+    },
+    "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/nl.json b/homeassistant/components/advantage_air/translations/nl.json
new file mode 100644
index 00000000000..554163d3278
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/nl.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "port": "Poort"
+                },
+                "title": "Verbind"
+            }
+        }
+    },
+    "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/no.json b/homeassistant/components/advantage_air/translations/no.json
new file mode 100644
index 00000000000..a8cb3c0eaee
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/no.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Enheten er allerede konfigurert"
+        },
+        "error": {
+            "cannot_connect": "Tilkobling mislyktes"
+        },
+        "flow_title": "[VOID] oppsett",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP adresse",
+                    "port": "Port"
+                },
+                "description": "Koble til API p\u00e5 din Advantage Air veggmonterte nettbrett.",
+                "title": "Koble til"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/pl.json b/homeassistant/components/advantage_air/translations/pl.json
new file mode 100644
index 00000000000..9fb32ac283b
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/pl.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+        },
+        "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+        },
+        "flow_title": "Konfiguracja Advantage Air",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "Adres IP",
+                    "port": "Port"
+                },
+                "description": "Po\u0142\u0105cz si\u0119 z API tabletu firmy Advantage Air.",
+                "title": "Po\u0142\u0105czenie"
+            }
+        }
+    },
+    "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/ru.json b/homeassistant/components/advantage_air/translations/ru.json
new file mode 100644
index 00000000000..bb2bdfebc8f
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/ru.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
+        },
+        "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
+        },
+        "flow_title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 Advantage Air",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP-\u0430\u0434\u0440\u0435\u0441",
+                    "port": "\u041f\u043e\u0440\u0442"
+                },
+                "description": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u0435\u0441\u044c \u043a API \u0412\u0430\u0448\u0435\u0433\u043e \u043d\u0430\u0441\u0442\u0435\u043d\u043d\u043e\u0433\u043e \u043f\u043b\u0430\u043d\u0448\u0435\u0442\u0430 Advantage Air.",
+                "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f"
+            }
+        }
+    },
+    "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/zh-Hans.json b/homeassistant/components/advantage_air/translations/zh-Hans.json
new file mode 100644
index 00000000000..a25ab477c70
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP\u5730\u5740"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/advantage_air/translations/zh-Hant.json b/homeassistant/components/advantage_air/translations/zh-Hant.json
new file mode 100644
index 00000000000..68eac9fdf9b
--- /dev/null
+++ b/homeassistant/components/advantage_air/translations/zh-Hant.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+        },
+        "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
+        },
+        "flow_title": "Advantage Air \u8a2d\u5b9a",
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP \u4f4d\u5740",
+                    "port": "\u901a\u8a0a\u57e0"
+                },
+                "description": "\u9023\u7dda\u81f3 Advantage Air \u58c1\u639b\u5e73\u677f API\u3002",
+                "title": "\u9023\u63a5"
+            }
+        }
+    },
+    "title": "Advantage Air"
+}
\ No newline at end of file
diff --git a/homeassistant/components/aftership/sensor.py b/homeassistant/components/aftership/sensor.py
index 83ab52499da..07267c1185d 100644
--- a/homeassistant/components/aftership/sensor.py
+++ b/homeassistant/components/aftership/sensor.py
@@ -31,7 +31,7 @@ UPDATE_TOPIC = f"{DOMAIN}_update"
 
 ICON = "mdi:package-variant-closed"
 
-MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
 
 SERVICE_ADD_TRACKING = "add_tracking"
 SERVICE_REMOVE_TRACKING = "remove_tracking"
diff --git a/homeassistant/components/agent_dvr/__init__.py b/homeassistant/components/agent_dvr/__init__.py
index 878a100684f..fc52ee0ef36 100644
--- a/homeassistant/components/agent_dvr/__init__.py
+++ b/homeassistant/components/agent_dvr/__init__.py
@@ -1,6 +1,5 @@
 """Support for Agent."""
 import asyncio
-import logging
 
 from agent import AgentError
 from agent.a import Agent
@@ -14,8 +13,6 @@ from .const import CONNECTION, DOMAIN as AGENT_DOMAIN, SERVER_URL
 ATTRIBUTION = "ispyconnect.com"
 DEFAULT_BRAND = "Agent DVR by ispyconnect.com"
 
-_LOGGER = logging.getLogger(__name__)
-
 FORWARDS = ["alarm_control_panel", "camera"]
 
 
diff --git a/homeassistant/components/agent_dvr/config_flow.py b/homeassistant/components/agent_dvr/config_flow.py
index cc1d6355f3f..9448b8d3123 100644
--- a/homeassistant/components/agent_dvr/config_flow.py
+++ b/homeassistant/components/agent_dvr/config_flow.py
@@ -62,7 +62,7 @@ class AgentFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
                 return await self._create_entry(agent_client.name)
 
-            errors["base"] = "device_unavailable"
+            errors["base"] = "cannot_connect"
 
         data = {
             vol.Required(CONF_HOST): str,
diff --git a/homeassistant/components/agent_dvr/strings.json b/homeassistant/components/agent_dvr/strings.json
index 95f99231083..eb5d8a51763 100644
--- a/homeassistant/components/agent_dvr/strings.json
+++ b/homeassistant/components/agent_dvr/strings.json
@@ -11,11 +11,11 @@
       }
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
     "error": {
-      "already_in_progress": "Config flow for device is already in progress.",
-      "device_unavailable": "Device is not available"
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/agent_dvr/translations/ca.json b/homeassistant/components/agent_dvr/translations/ca.json
index 401f2166bd1..fbd6f5e2d29 100644
--- a/homeassistant/components/agent_dvr/translations/ca.json
+++ b/homeassistant/components/agent_dvr/translations/ca.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Dispositiu ja est\u00e0 configurat"
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "already_in_progress": "El flux de dades de configuraci\u00f3 pel dispositiu ja est\u00e0 en curs.",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "device_unavailable": "Dispositiu no est\u00e0 disponible"
         },
         "step": {
diff --git a/homeassistant/components/agent_dvr/translations/cs.json b/homeassistant/components/agent_dvr/translations/cs.json
index 406bddd1a12..88e0dadfed6 100644
--- a/homeassistant/components/agent_dvr/translations/cs.json
+++ b/homeassistant/components/agent_dvr/translations/cs.json
@@ -1,12 +1,22 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "device_unavailable": "Za\u0159\u00edzen\u00ed nen\u00ed k dispozici"
+        },
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel",
                     "port": "Port"
-                }
+                },
+                "title": "Nastaven\u00ed Agent DVR"
             }
         }
-    }
+    },
+    "title": "Agent DVR"
 }
\ No newline at end of file
diff --git a/homeassistant/components/agent_dvr/translations/en.json b/homeassistant/components/agent_dvr/translations/en.json
index 0f110a06863..001cad0ec7c 100644
--- a/homeassistant/components/agent_dvr/translations/en.json
+++ b/homeassistant/components/agent_dvr/translations/en.json
@@ -4,7 +4,8 @@
             "already_configured": "Device is already configured"
         },
         "error": {
-            "already_in_progress": "Config flow for device is already in progress.",
+            "already_in_progress": "Configuration flow is already in progress",
+            "cannot_connect": "Failed to connect",
             "device_unavailable": "Device is not available"
         },
         "step": {
diff --git a/homeassistant/components/agent_dvr/translations/es.json b/homeassistant/components/agent_dvr/translations/es.json
index b738f71dd75..314846ba2a2 100644
--- a/homeassistant/components/agent_dvr/translations/es.json
+++ b/homeassistant/components/agent_dvr/translations/es.json
@@ -4,7 +4,8 @@
             "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "already_in_progress": "El flujo de configuraci\u00f3n para el dispositivo ya est\u00e1 en marcha.",
+            "already_in_progress": "El flujo de configuraci\u00f3n ya est\u00e1 en proceso",
+            "cannot_connect": "No se pudo conectar",
             "device_unavailable": "El dispositivo no est\u00e1 disponible"
         },
         "step": {
diff --git a/homeassistant/components/agent_dvr/translations/et.json b/homeassistant/components/agent_dvr/translations/et.json
new file mode 100644
index 00000000000..4d67e6ced59
--- /dev/null
+++ b/homeassistant/components/agent_dvr/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "device_unavailable": "Seade pole saadaval"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                },
+                "title": "Seadista Agent DVR"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/agent_dvr/translations/it.json b/homeassistant/components/agent_dvr/translations/it.json
index 1db719893aa..b004e7d2d43 100644
--- a/homeassistant/components/agent_dvr/translations/it.json
+++ b/homeassistant/components/agent_dvr/translations/it.json
@@ -4,7 +4,8 @@
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "already_in_progress": "Il flusso di configurazione per il dispositivo \u00e8 gi\u00e0 in corso.",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
+            "cannot_connect": "Impossibile connettersi",
             "device_unavailable": "Il dispositivo non \u00e8 disponibile"
         },
         "step": {
diff --git a/homeassistant/components/agent_dvr/translations/nl.json b/homeassistant/components/agent_dvr/translations/nl.json
index c1909b19508..79e2caae08d 100644
--- a/homeassistant/components/agent_dvr/translations/nl.json
+++ b/homeassistant/components/agent_dvr/translations/nl.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/agent_dvr/translations/no.json b/homeassistant/components/agent_dvr/translations/no.json
index 3fcbb8f1617..2068258b894 100644
--- a/homeassistant/components/agent_dvr/translations/no.json
+++ b/homeassistant/components/agent_dvr/translations/no.json
@@ -4,18 +4,19 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "already_in_progress": "Konfigurasjonsflyt for enhet p\u00e5g\u00e5r allerede.",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
+            "cannot_connect": "Tilkobling mislyktes",
             "device_unavailable": "Enheten er ikke tilgjengelig"
         },
         "step": {
             "user": {
                 "data": {
                     "host": "Vert",
-                    "port": ""
+                    "port": "Port"
                 },
                 "title": "Konfigurere Agent DVR"
             }
         }
     },
-    "title": "Agent DVR"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/agent_dvr/translations/pl.json b/homeassistant/components/agent_dvr/translations/pl.json
index 9c101555f78..14c9b00a464 100644
--- a/homeassistant/components/agent_dvr/translations/pl.json
+++ b/homeassistant/components/agent_dvr/translations/pl.json
@@ -4,8 +4,9 @@
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "already_in_progress": "Konfiguracja urz\u0105dzenia jest ju\u017c w toku.",
-            "device_unavailable": "Urz\u0105dzenie nie jest dost\u0119pne."
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "device_unavailable": "Urz\u0105dzenie nie jest dost\u0119pne"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/agent_dvr/translations/ru.json b/homeassistant/components/agent_dvr/translations/ru.json
index 69b192fc710..20a6eebc73f 100644
--- a/homeassistant/components/agent_dvr/translations/ru.json
+++ b/homeassistant/components/agent_dvr/translations/ru.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "device_unavailable": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e."
         },
         "step": {
diff --git a/homeassistant/components/agent_dvr/translations/zh-Hans.json b/homeassistant/components/agent_dvr/translations/zh-Hans.json
new file mode 100644
index 00000000000..2941dfd9383
--- /dev/null
+++ b/homeassistant/components/agent_dvr/translations/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/agent_dvr/translations/zh-Hant.json b/homeassistant/components/agent_dvr/translations/zh-Hant.json
index dba3e0937b7..9acbf536f8d 100644
--- a/homeassistant/components/agent_dvr/translations/zh-Hant.json
+++ b/homeassistant/components/agent_dvr/translations/zh-Hant.json
@@ -4,7 +4,8 @@
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "already_in_progress": "\u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "device_unavailable": "\u8a2d\u5099\u7121\u6cd5\u4f7f\u7528"
         },
         "step": {
diff --git a/homeassistant/components/airly/config_flow.py b/homeassistant/components/airly/config_flow.py
index 84bad2d3719..8b3b1949ec3 100644
--- a/homeassistant/components/airly/config_flow.py
+++ b/homeassistant/components/airly/config_flow.py
@@ -39,7 +39,7 @@ class AirlyFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             self._abort_if_unique_id_configured()
             api_key_valid = await self._test_api_key(websession, user_input["api_key"])
             if not api_key_valid:
-                self._errors["base"] = "auth"
+                self._errors["base"] = "invalid_api_key"
             else:
                 location_valid = await self._test_location(
                     websession,
diff --git a/homeassistant/components/airly/strings.json b/homeassistant/components/airly/strings.json
index 8bf7782e910..3453fb7b38a 100644
--- a/homeassistant/components/airly/strings.json
+++ b/homeassistant/components/airly/strings.json
@@ -5,19 +5,19 @@
         "title": "Airly",
         "description": "Set up Airly air quality integration. To generate API key go to https://developer.airly.eu/register",
         "data": {
-          "name": "Name of the integration",
+          "name": "[%key:common::config_flow::data::name%]",
           "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "Latitude",
-          "longitude": "Longitude"
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]"
         }
       }
     },
     "error": {
       "wrong_location": "No Airly measuring stations in this area.",
-      "auth": "API key is not correct."
+      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]"
     },
     "abort": {
-      "already_configured": "Airly integration for these coordinates is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/airly/translations/ca.json b/homeassistant/components/airly/translations/ca.json
index 9d085481120..95e26e5b888 100644
--- a/homeassistant/components/airly/translations/ca.json
+++ b/homeassistant/components/airly/translations/ca.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ja est\u00e0 configurada un integraci\u00f3 Airly amb aquestes coordenades."
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada"
         },
         "error": {
             "auth": "La clau API no \u00e9s correcta.",
+            "invalid_api_key": "Clau API inv\u00e0lida",
             "wrong_location": "No hi ha estacions de mesura Airly en aquesta zona."
         },
         "step": {
@@ -13,7 +14,7 @@
                     "api_key": "Clau API",
                     "latitude": "Latitud",
                     "longitude": "Longitud",
-                    "name": "Nom de la integraci\u00f3"
+                    "name": "Nom"
                 },
                 "description": "Configura una integraci\u00f3 de qualitat d'aire Airly. Per generar la clau API, v\u00e9s a https://developer.airly.eu/register",
                 "title": "Airly"
diff --git a/homeassistant/components/airly/translations/cs.json b/homeassistant/components/airly/translations/cs.json
index 757cf90e1e2..279f0328274 100644
--- a/homeassistant/components/airly/translations/cs.json
+++ b/homeassistant/components/airly/translations/cs.json
@@ -1,10 +1,22 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "auth": "Kl\u00ed\u010d API nen\u00ed spr\u00e1vn\u00fd.",
+            "invalid_api_key": "Neplatn\u00fd kl\u00ed\u010d API",
+            "wrong_location": "\u017d\u00e1dn\u00e9 m\u011b\u0159ic\u00ed stanice Airly v t\u00e9to oblasti."
+        },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Kl\u00ed\u010d API"
-                }
+                    "api_key": "Kl\u00ed\u010d API",
+                    "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
+                    "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka",
+                    "name": "Jm\u00e9no"
+                },
+                "title": "Airly"
             }
         }
     }
diff --git a/homeassistant/components/airly/translations/el.json b/homeassistant/components/airly/translations/el.json
new file mode 100644
index 00000000000..e39b0aef88d
--- /dev/null
+++ b/homeassistant/components/airly/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "invalid_api_key": "\u0386\u03ba\u03c5\u03c1\u03bf API \u03ba\u03bb\u03b5\u03b9\u03b4\u03af"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/airly/translations/en.json b/homeassistant/components/airly/translations/en.json
index 2dd164823cc..620e77f32ca 100644
--- a/homeassistant/components/airly/translations/en.json
+++ b/homeassistant/components/airly/translations/en.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Airly integration for these coordinates is already configured."
+            "already_configured": "Location is already configured"
         },
         "error": {
             "auth": "API key is not correct.",
+            "invalid_api_key": "Invalid API key",
             "wrong_location": "No Airly measuring stations in this area."
         },
         "step": {
@@ -13,7 +14,7 @@
                     "api_key": "API Key",
                     "latitude": "Latitude",
                     "longitude": "Longitude",
-                    "name": "Name of the integration"
+                    "name": "Name"
                 },
                 "description": "Set up Airly air quality integration. To generate API key go to https://developer.airly.eu/register",
                 "title": "Airly"
diff --git a/homeassistant/components/airly/translations/es.json b/homeassistant/components/airly/translations/es.json
index dececf29a69..8491b130a4a 100644
--- a/homeassistant/components/airly/translations/es.json
+++ b/homeassistant/components/airly/translations/es.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La integraci\u00f3n a\u00e9rea para estas coordenadas ya est\u00e1 configurada."
+            "already_configured": "La ubicaci\u00f3n ya est\u00e1 configurada"
         },
         "error": {
             "auth": "La clave de la API no es correcta.",
+            "invalid_api_key": "Clave API no v\u00e1lida",
             "wrong_location": "No hay estaciones de medici\u00f3n Airly en esta zona."
         },
         "step": {
@@ -13,7 +14,7 @@
                     "api_key": "Clave API",
                     "latitude": "Latitud",
                     "longitude": "Longitud",
-                    "name": "Nombre de la integraci\u00f3n"
+                    "name": "Nombre"
                 },
                 "description": "Establecer la integraci\u00f3n de la calidad del aire de Airly. Para generar la clave de la API vaya a https://developer.airly.eu/register",
                 "title": "Airly"
diff --git a/homeassistant/components/airly/translations/et.json b/homeassistant/components/airly/translations/et.json
index aae3ef835bb..01ed979e0aa 100644
--- a/homeassistant/components/airly/translations/et.json
+++ b/homeassistant/components/airly/translations/et.json
@@ -1,11 +1,23 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Asukoht on juba m\u00e4\u00e4ratud"
+        },
+        "error": {
+            "auth": "API v\u00f5ti on vale.",
+            "invalid_api_key": "Vigane API v\u00f5ti",
+            "wrong_location": "Selles piirkonnas pole Airly m\u00f5\u00f5tejaamu."
+        },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "API v\u00f5ti",
                     "latitude": "Laiuskraad",
-                    "longitude": "Pikkuskraad"
-                }
+                    "longitude": "Pikkuskraad",
+                    "name": "Nimi"
+                },
+                "description": "Seadista Airly \u00f5hukvaliteedi andmete sidumine. API v\u00f5tme loomiseks mine aadressile https://developer.airly.eu/register",
+                "title": ""
             }
         }
     }
diff --git a/homeassistant/components/airly/translations/fr.json b/homeassistant/components/airly/translations/fr.json
index ac821ab226c..4259112dbc9 100644
--- a/homeassistant/components/airly/translations/fr.json
+++ b/homeassistant/components/airly/translations/fr.json
@@ -5,6 +5,7 @@
         },
         "error": {
             "auth": "La cl\u00e9 API n'est pas correcte.",
+            "invalid_api_key": "Cl\u00e9 API invalide",
             "wrong_location": "Aucune station de mesure Airly dans cette zone."
         },
         "step": {
diff --git a/homeassistant/components/airly/translations/it.json b/homeassistant/components/airly/translations/it.json
index e394b7af8d3..0b8e7eb4f68 100644
--- a/homeassistant/components/airly/translations/it.json
+++ b/homeassistant/components/airly/translations/it.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'integrazione Airly per queste coordinate \u00e8 gi\u00e0 configurata."
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata"
         },
         "error": {
             "auth": "La chiave API non \u00e8 corretta.",
+            "invalid_api_key": "Chiave API non valida",
             "wrong_location": "Nessuna stazione di misurazione Airly in quest'area."
         },
         "step": {
@@ -13,7 +14,7 @@
                     "api_key": "Chiave API",
                     "latitude": "Latitudine",
                     "longitude": "Logitudine",
-                    "name": "Nome dell'integrazione"
+                    "name": "Nome"
                 },
                 "description": "Configurazione dell'integrazione della qualit\u00e0 dell'aria Airly. Per generare la chiave API andare su https://developer.airly.eu/register",
                 "title": "Airly"
diff --git a/homeassistant/components/airly/translations/no.json b/homeassistant/components/airly/translations/no.json
index 09e77a311eb..1fd5bd2e77f 100644
--- a/homeassistant/components/airly/translations/no.json
+++ b/homeassistant/components/airly/translations/no.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Airly integrasjonen for disse koordinatene er allerede konfigurert."
+            "already_configured": "Plasseringen er allerede konfigurert"
         },
         "error": {
             "auth": "API-n\u00f8kkelen er ikke korrekt.",
+            "invalid_api_key": "Ugyldig API-n\u00f8kkel",
             "wrong_location": "Ingen Airly m\u00e5lestasjoner i dette omr\u00e5det."
         },
         "step": {
@@ -13,7 +14,7 @@
                     "api_key": "API-n\u00f8kkel",
                     "latitude": "Breddegrad",
                     "longitude": "Lengdegrad",
-                    "name": "Navn p\u00e5 integrasjonen"
+                    "name": "Navn"
                 },
                 "description": "Sett opp Airly luftkvalitet integrasjon. For \u00e5 opprette API-n\u00f8kkel, g\u00e5 til [https://developer.airly.eu/register](https://developer.airly.eu/register)",
                 "title": ""
diff --git a/homeassistant/components/airly/translations/pl.json b/homeassistant/components/airly/translations/pl.json
index 340b8cb4622..bcda47006ab 100644
--- a/homeassistant/components/airly/translations/pl.json
+++ b/homeassistant/components/airly/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Integracja Airly dla tych wsp\u00f3\u0142rz\u0119dnych jest ju\u017c skonfigurowana."
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
         },
         "error": {
-            "auth": "Klucz API jest nieprawid\u0142owy.",
-            "wrong_location": "Brak stacji pomiarowych Airly w tym rejonie."
+            "auth": "Nieprawid\u0142owy klucz API",
+            "invalid_api_key": "Nieprawid\u0142owy klucz API",
+            "wrong_location": "Brak stacji pomiarowych Airly w tym rejonie"
         },
         "step": {
             "user": {
@@ -13,7 +14,7 @@
                     "api_key": "Klucz API",
                     "latitude": "Szeroko\u015b\u0107 geograficzna",
                     "longitude": "D\u0142ugo\u015b\u0107 geograficzna",
-                    "name": "Nazwa integracji"
+                    "name": "Nazwa"
                 },
                 "description": "Konfiguracja integracji Airly. By wygenerowa\u0107 klucz API, przejd\u017a na stron\u0119 https://developer.airly.eu/register",
                 "title": "Airly"
diff --git a/homeassistant/components/airly/translations/ru.json b/homeassistant/components/airly/translations/ru.json
index 9b3a62331db..1d89090646f 100644
--- a/homeassistant/components/airly/translations/ru.json
+++ b/homeassistant/components/airly/translations/ru.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u0418\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f Airly \u0441 \u0442\u0430\u043a\u0438\u043c\u0438 \u0436\u0435 \u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0430\u043c\u0438 \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
             "auth": "\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API.",
+            "invalid_api_key": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API.",
             "wrong_location": "\u0412 \u044d\u0442\u043e\u0439 \u043e\u0431\u043b\u0430\u0441\u0442\u0438 \u043d\u0435\u0442 \u0438\u0437\u043c\u0435\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0445 \u0441\u0442\u0430\u043d\u0446\u0438\u0439 Airly."
         },
         "step": {
diff --git a/homeassistant/components/airly/translations/zh-Hant.json b/homeassistant/components/airly/translations/zh-Hant.json
index fc6c58cf978..4a4955953f0 100644
--- a/homeassistant/components/airly/translations/zh-Hant.json
+++ b/homeassistant/components/airly/translations/zh-Hant.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64 Airly \u6574\u5408\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
             "auth": "API \u5bc6\u9470\u4e0d\u6b63\u78ba\u3002",
+            "invalid_api_key": "API \u5bc6\u9470\u7121\u6548",
             "wrong_location": "\u8a72\u5340\u57df\u6c92\u6709 Arily \u76e3\u6e2c\u7ad9\u3002"
         },
         "step": {
@@ -13,7 +14,7 @@
                     "api_key": "API \u5bc6\u9470",
                     "latitude": "\u7def\u5ea6",
                     "longitude": "\u7d93\u5ea6",
-                    "name": "\u6574\u5408\u540d\u7a31"
+                    "name": "\u540d\u7a31"
                 },
                 "description": "\u6b32\u8a2d\u5b9a Airly \u7a7a\u6c23\u54c1\u8cea\u6574\u5408\u3002\u8acb\u81f3 https://developer.airly.eu/register \u7522\u751f API \u5bc6\u9470",
                 "title": "Airly"
diff --git a/homeassistant/components/airvisual/__init__.py b/homeassistant/components/airvisual/__init__.py
index d6d7a93a366..ef8a4ced1bd 100644
--- a/homeassistant/components/airvisual/__init__.py
+++ b/homeassistant/components/airvisual/__init__.py
@@ -12,7 +12,7 @@ from pyairvisual.errors import (
 )
 import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_IMPORT
+from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH
 from homeassistant.const import (
     ATTR_ATTRIBUTION,
     CONF_API_KEY,
@@ -97,14 +97,12 @@ def async_get_geography_id(geography_dict):
 
 
 @callback
-def async_get_cloud_api_update_interval(hass, api_key):
+def async_get_cloud_api_update_interval(hass, api_key, num_consumers):
     """Get a leveled scan interval for a particular cloud API key.
 
     This will shift based on the number of active consumers, thus keeping the user
     under the monthly API limit.
     """
-    num_consumers = len(async_get_cloud_coordinators_by_api_key(hass, api_key))
-
     # Assuming 10,000 calls per month and a "smallest possible month" of 28 days; note
     # that we give a buffer of 1500 API calls for any drift, restarts, etc.:
     minutes_between_api_calls = ceil(1 / (8500 / 28 / 24 / 60 / num_consumers))
@@ -133,8 +131,16 @@ def async_get_cloud_coordinators_by_api_key(hass, api_key):
 @callback
 def async_sync_geo_coordinator_update_intervals(hass, api_key):
     """Sync the update interval for geography-based data coordinators (by API key)."""
-    update_interval = async_get_cloud_api_update_interval(hass, api_key)
-    for coordinator in async_get_cloud_coordinators_by_api_key(hass, api_key):
+    coordinators = async_get_cloud_coordinators_by_api_key(hass, api_key)
+
+    if not coordinators:
+        return
+
+    update_interval = async_get_cloud_api_update_interval(
+        hass, api_key, len(coordinators)
+    )
+
+    for coordinator in coordinators:
         LOGGER.debug(
             "Updating interval for coordinator: %s, %s",
             coordinator.name,
@@ -234,13 +240,26 @@ async def async_setup_entry(hass, config_entry):
             try:
                 return await api_coro
             except (InvalidKeyError, KeyExpiredError):
-                hass.async_create_task(
-                    hass.config_entries.flow.async_init(
-                        DOMAIN,
-                        context={"source": "reauth"},
-                        data=config_entry.data,
+                matching_flows = [
+                    flow
+                    for flow in hass.config_entries.flow.async_progress()
+                    if flow["context"]["source"] == SOURCE_REAUTH
+                    and flow["context"]["unique_id"] == config_entry.unique_id
+                ]
+
+                if not matching_flows:
+                    hass.async_create_task(
+                        hass.config_entries.flow.async_init(
+                            DOMAIN,
+                            context={
+                                "source": SOURCE_REAUTH,
+                                "unique_id": config_entry.unique_id,
+                            },
+                            data=config_entry.data,
+                        )
                     )
-                )
+
+                return {}
             except AirVisualError as err:
                 raise UpdateFailed(f"Error while retrieving data: {err}") from err
 
@@ -262,7 +281,7 @@ async def async_setup_entry(hass, config_entry):
         )
 
         # Only geography-based entries have options:
-        config_entry.add_update_listener(async_update_options)
+        config_entry.add_update_listener(async_reload_entry)
     else:
         _standardize_node_pro_config_entry(hass, config_entry)
 
@@ -356,10 +375,9 @@ async def async_unload_entry(hass, config_entry):
     return unload_ok
 
 
-async def async_update_options(hass, config_entry):
+async def async_reload_entry(hass, config_entry):
     """Handle an options update."""
-    coordinator = hass.data[DOMAIN][DATA_COORDINATOR][config_entry.entry_id]
-    await coordinator.async_request_refresh()
+    await hass.config_entries.async_reload(config_entry.entry_id)
 
 
 class AirVisualEntity(CoordinatorEntity):
diff --git a/homeassistant/components/airvisual/config_flow.py b/homeassistant/components/airvisual/config_flow.py
index d8ab508b8bc..7cf1262fa43 100644
--- a/homeassistant/components/airvisual/config_flow.py
+++ b/homeassistant/components/airvisual/config_flow.py
@@ -107,33 +107,35 @@ class AirVisualFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             ):
                 return self.async_abort(reason="already_configured")
 
+        return await self.async_step_geography_finish(
+            user_input, "geography", self.geography_schema
+        )
+
+    async def async_step_geography_finish(self, user_input, error_step, error_schema):
+        """Validate a Cloud API key."""
         websession = aiohttp_client.async_get_clientsession(self.hass)
         cloud_api = CloudAPI(user_input[CONF_API_KEY], session=websession)
 
         # If this is the first (and only the first) time we've seen this API key, check
         # that it's valid:
-        checked_keys = self.hass.data.setdefault("airvisual_checked_api_keys", set())
-        check_keys_lock = self.hass.data.setdefault(
+        valid_keys = self.hass.data.setdefault("airvisual_checked_api_keys", set())
+        valid_keys_lock = self.hass.data.setdefault(
             "airvisual_checked_api_keys_lock", asyncio.Lock()
         )
 
-        async with check_keys_lock:
-            if user_input[CONF_API_KEY] not in checked_keys:
+        async with valid_keys_lock:
+            if user_input[CONF_API_KEY] not in valid_keys:
                 try:
                     await cloud_api.air_quality.nearest_city()
                 except InvalidKeyError:
                     return self.async_show_form(
-                        step_id="geography",
-                        data_schema=self.geography_schema,
+                        step_id=error_step,
+                        data_schema=error_schema,
                         errors={CONF_API_KEY: "invalid_api_key"},
                     )
 
-                checked_keys.add(user_input[CONF_API_KEY])
+                valid_keys.add(user_input[CONF_API_KEY])
 
-            return await self.async_step_geography_finish(user_input)
-
-    async def async_step_geography_finish(self, user_input=None):
-        """Handle the finalization of a Cloud API config entry."""
         existing_entry = await self.async_set_unique_id(self._geo_id)
         if existing_entry:
             self.hass.config_entries.async_update_entry(existing_entry, data=user_input)
@@ -166,7 +168,7 @@ class AirVisualFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             return self.async_show_form(
                 step_id="node_pro",
                 data_schema=self.node_pro_schema,
-                errors={CONF_IP_ADDRESS: "unable_to_connect"},
+                errors={CONF_IP_ADDRESS: "cannot_connect"},
             )
 
         await node.async_disconnect()
@@ -178,6 +180,7 @@ class AirVisualFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_reauth(self, data):
         """Handle configuration by re-auth."""
+        self._geo_id = async_get_geography_id(data)
         self._latitude = data[CONF_LATITUDE]
         self._longitude = data[CONF_LONGITUDE]
 
@@ -194,11 +197,12 @@ class AirVisualFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             CONF_API_KEY: user_input[CONF_API_KEY],
             CONF_LATITUDE: self._latitude,
             CONF_LONGITUDE: self._longitude,
+            CONF_INTEGRATION_TYPE: INTEGRATION_TYPE_GEOGRAPHY,
         }
 
-        self._geo_id = async_get_geography_id(conf)
-
-        return await self.async_step_geography_finish(conf)
+        return await self.async_step_geography_finish(
+            conf, "reauth_confirm", self.api_key_data_schema
+        )
 
     async def async_step_user(self, user_input=None):
         """Handle the start of the config flow."""
diff --git a/homeassistant/components/airvisual/manifest.json b/homeassistant/components/airvisual/manifest.json
index d7824551275..d11f3ab69a9 100644
--- a/homeassistant/components/airvisual/manifest.json
+++ b/homeassistant/components/airvisual/manifest.json
@@ -3,6 +3,6 @@
   "name": "AirVisual",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/airvisual",
-  "requirements": ["pyairvisual==5.0.2"],
+  "requirements": ["pyairvisual==5.0.3"],
   "codeowners": ["@bachya"]
 }
diff --git a/homeassistant/components/airvisual/strings.json b/homeassistant/components/airvisual/strings.json
index c7e2bc34701..22f9c80f313 100644
--- a/homeassistant/components/airvisual/strings.json
+++ b/homeassistant/components/airvisual/strings.json
@@ -6,18 +6,24 @@
         "description": "Use the AirVisual cloud API to monitor a geographical location.",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "Latitude",
-          "longitude": "Longitude"
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]"
         }
       },
       "node_pro": {
         "title": "Configure an AirVisual Node/Pro",
         "description": "Monitor a personal AirVisual unit. The password can be retrieved from the unit's UI.",
         "data": {
-          "ip_address": "Unit IP Address/Hostname",
+          "ip_address": "[%key:common::config_flow::data::host%]",
           "password": "[%key:common::config_flow::data::password%]"
         }
       },
+      "reauth_confirm": {
+        "title": "Re-authenticate AirVisual",
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        }
+      },
       "user": {
         "title": "Configure AirVisual",
         "description": "Pick what type of AirVisual data you want to monitor.",
@@ -29,12 +35,13 @@
       }
     },
     "error": {
-      "general_error": "There was an unknown error.",
-      "invalid_api_key": "Invalid API key provided.",
-      "unable_to_connect": "Unable to connect to Node/Pro unit."
+      "general_error": "[%key:common::config_flow::error::unknown%]",
+      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "These coordinates or Node/Pro ID are already registered."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%] or Node/Pro ID is already registered.",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "options": {
@@ -47,4 +54,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/airvisual/translations/ca.json b/homeassistant/components/airvisual/translations/ca.json
index 045be812dc2..c4e246adc55 100644
--- a/homeassistant/components/airvisual/translations/ca.json
+++ b/homeassistant/components/airvisual/translations/ca.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquestes coordenades o Node/Pro ID ja estan registrades."
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada o el Node/Pro ID ja est\u00e0 registrat.",
+            "reauth_successful": "Re-autenticaci\u00f3 realitzada correctament"
         },
         "error": {
-            "general_error": "S'ha produ\u00eft un error desconegut.",
-            "invalid_api_key": "Clau API proporiconada no v\u00e0lida.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "general_error": "Error inesperat",
+            "invalid_api_key": "Clau API inv\u00e0lida",
             "unable_to_connect": "No s'ha pogut connectar a la unitat Node/Pro."
         },
         "step": {
@@ -20,12 +22,18 @@
             },
             "node_pro": {
                 "data": {
-                    "ip_address": "Adre\u00e7a IP o amfitri\u00f3 de la unitat",
+                    "ip_address": "Amfitri\u00f3",
                     "password": "Contrasenya"
                 },
                 "description": "Monitoritza una unitat personal d'AirVisual. Pots obtenir la contrasenya des de la interf\u00edcie d'usuari (UI) de la unitat.",
                 "title": "Configuraci\u00f3 d'AirVisual Node/Pro"
             },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "Clau API"
+                },
+                "title": "Re-autenticaci\u00f3 amb AirVisual"
+            },
             "user": {
                 "data": {
                     "cloud_api": "Ubicaci\u00f3 geogr\u00e0fica",
diff --git a/homeassistant/components/airvisual/translations/cs.json b/homeassistant/components/airvisual/translations/cs.json
index 9c41a50b09f..507581d0286 100644
--- a/homeassistant/components/airvisual/translations/cs.json
+++ b/homeassistant/components/airvisual/translations/cs.json
@@ -1,15 +1,51 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno nebo ID uzlu/Pro je ji\u017e zaregistrov\u00e1no.",
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "general_error": "Neo\u010dek\u00e1van\u00e1 chyba",
+            "invalid_api_key": "Neplatn\u00fd kl\u00ed\u010d API",
+            "unable_to_connect": "Nelze se p\u0159ipojit k jednotce Node/Pro."
+        },
         "step": {
             "geography": {
                 "data": {
-                    "api_key": "Kl\u00ed\u010d API"
+                    "api_key": "Kl\u00ed\u010d API",
+                    "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
+                    "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka"
                 }
             },
             "node_pro": {
                 "data": {
+                    "ip_address": "Hostitel",
                     "password": "Heslo"
-                }
+                },
+                "title": "Nastaven\u00ed AirVisual Node/Pro"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "Kl\u00ed\u010d API"
+                },
+                "title": "Znovu ov\u011b\u0159it AirVisual"
+            },
+            "user": {
+                "data": {
+                    "cloud_api": "Geografick\u00e1 poloha",
+                    "node_pro": "AirVisual Node Pro",
+                    "type": "Typ integrace"
+                },
+                "description": "Vyberte, jak\u00fd typ dat AirVisual chcete sledovat.",
+                "title": "Nastaven\u00ed AirVisual"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "title": "Nastavte AirVisual"
             }
         }
     }
diff --git a/homeassistant/components/airvisual/translations/de.json b/homeassistant/components/airvisual/translations/de.json
index 1994239f243..22ecae71a73 100644
--- a/homeassistant/components/airvisual/translations/de.json
+++ b/homeassistant/components/airvisual/translations/de.json
@@ -25,6 +25,11 @@
                 "description": "\u00dcberwachen Sie eine pers\u00f6nliche AirVisual-Einheit. Das Passwort kann von der Benutzeroberfl\u00e4che des Ger\u00e4ts abgerufen werden.",
                 "title": "Konfigurieren Sie einen AirVisual Node/Pro"
             },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "API-Key"
+                }
+            },
             "user": {
                 "data": {
                     "cloud_api": "Geografische Position",
diff --git a/homeassistant/components/airvisual/translations/el.json b/homeassistant/components/airvisual/translations/el.json
new file mode 100644
index 00000000000..04b238a916d
--- /dev/null
+++ b/homeassistant/components/airvisual/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/airvisual/translations/en.json b/homeassistant/components/airvisual/translations/en.json
index a85c2ba75ce..cb76d524d38 100644
--- a/homeassistant/components/airvisual/translations/en.json
+++ b/homeassistant/components/airvisual/translations/en.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "These coordinates or Node/Pro ID are already registered."
+            "already_configured": "Location is already configured or Node/Pro ID is already registered.",
+            "reauth_successful": "Re-authentication was successful"
         },
         "error": {
-            "general_error": "There was an unknown error.",
-            "invalid_api_key": "Invalid API key provided.",
+            "cannot_connect": "Failed to connect",
+            "general_error": "Unexpected error",
+            "invalid_api_key": "Invalid API key",
             "unable_to_connect": "Unable to connect to Node/Pro unit."
         },
         "step": {
@@ -20,12 +22,18 @@
             },
             "node_pro": {
                 "data": {
-                    "ip_address": "Unit IP Address/Hostname",
+                    "ip_address": "Host",
                     "password": "Password"
                 },
                 "description": "Monitor a personal AirVisual unit. The password can be retrieved from the unit's UI.",
                 "title": "Configure an AirVisual Node/Pro"
             },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "API Key"
+                },
+                "title": "Re-authenticate AirVisual"
+            },
             "user": {
                 "data": {
                     "cloud_api": "Geographical Location",
diff --git a/homeassistant/components/airvisual/translations/es.json b/homeassistant/components/airvisual/translations/es.json
index dbb44ed4abe..f9d6460cd87 100644
--- a/homeassistant/components/airvisual/translations/es.json
+++ b/homeassistant/components/airvisual/translations/es.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Estas coordenadas o Nodo/Pro ID ya est\u00e1n registradas."
+            "already_configured": "La ubicaci\u00f3n ya est\u00e1 configurada o el Nodo/Pro ID ya est\u00e1 registrado.",
+            "reauth_successful": "La reautenticaci\u00f3n se realiz\u00f3 correctamente"
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "general_error": "Se ha producido un error desconocido.",
             "invalid_api_key": "Se proporciona una clave API no v\u00e1lida.",
             "unable_to_connect": "No se puede conectar a la unidad Node/Pro."
@@ -26,6 +28,12 @@
                 "description": "Monitorizar una unidad personal AirVisual. La contrase\u00f1a puede ser recuperada desde la interfaz de la unidad.",
                 "title": "Configurar un AirVisual Node/Pro"
             },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "Clave API"
+                },
+                "title": "Volver a autenticar AirVisual"
+            },
             "user": {
                 "data": {
                     "cloud_api": "Ubicaci\u00f3n Geogr\u00e1fica",
diff --git a/homeassistant/components/airvisual/translations/et.json b/homeassistant/components/airvisual/translations/et.json
index 51bc3faf3f2..e6ff1700852 100644
--- a/homeassistant/components/airvisual/translations/et.json
+++ b/homeassistant/components/airvisual/translations/et.json
@@ -1,16 +1,57 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Asukoht on juba m\u00e4\u00e4ratud v\u00f5i Node/Pro ID on juba registreeritud.",
+            "reauth_successful": "Taastuvastamine \u00f5nnestus"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "general_error": "Tundmatu viga",
+            "invalid_api_key": "Vale API v\u00f5ti",
+            "unable_to_connect": "Node / Pro-seadmega ei saa \u00fchendust luua."
+        },
         "step": {
             "geography": {
                 "data": {
+                    "api_key": "API v\u00f5ti",
                     "latitude": "Laiuskraad",
                     "longitude": "Pikkuskraad"
-                }
+                },
+                "description": "Kasutage AirVisual pilve API-t geograafilise asukoha j\u00e4lgimiseks.",
+                "title": "Seadista Geography"
+            },
+            "node_pro": {
+                "data": {
+                    "ip_address": "\u00dcksuse IP-aadress / hostinimi",
+                    "password": "Salas\u00f5na"
+                },
+                "description": "J\u00e4lgige isiklikku AirVisual-seadet. Parooli saab hankida seadme kasutajaliidese kaudu.",
+                "title": "Seadistage AirVisual Node / Pro"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "API v\u00f5ti"
+                },
+                "title": "Taastuvasta AirVisual"
             },
             "user": {
                 "data": {
-                    "cloud_api": "Geograafiline asukoht"
-                }
+                    "cloud_api": "Geograafiline asukoht",
+                    "node_pro": "",
+                    "type": "Sidumise t\u00fc\u00fcp"
+                },
+                "description": "Vali millist t\u00fc\u00fcpi AirVisuali andmeid soovid j\u00e4lgida.",
+                "title": "Seadista AirVisual"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "show_on_map": "N\u00e4ita j\u00e4lgitavat asukohta kaardil"
+                },
+                "title": "Seadista AirVisual"
             }
         }
     }
diff --git a/homeassistant/components/airvisual/translations/fr.json b/homeassistant/components/airvisual/translations/fr.json
index 7bd42083e6d..55247360306 100644
--- a/homeassistant/components/airvisual/translations/fr.json
+++ b/homeassistant/components/airvisual/translations/fr.json
@@ -4,6 +4,7 @@
             "already_configured": "Cette cl\u00e9 API est d\u00e9j\u00e0 utilis\u00e9e."
         },
         "error": {
+            "cannot_connect": "\u00c9chec de connexion",
             "general_error": "Une erreur inconnue est survenue.",
             "invalid_api_key": "La cl\u00e9 API fournie n'est pas valide.",
             "unable_to_connect": "Impossible de se connecter \u00e0 l'unit\u00e9 Node / Pro."
diff --git a/homeassistant/components/airvisual/translations/it.json b/homeassistant/components/airvisual/translations/it.json
index c22481918a0..670030c8a70 100644
--- a/homeassistant/components/airvisual/translations/it.json
+++ b/homeassistant/components/airvisual/translations/it.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Queste coordinate o Node/Pro ID sono gi\u00e0 registrate."
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata o Node/Pro ID sono gi\u00e0 registrati.",
+            "reauth_successful": "La riautenticazione ha avuto successo"
         },
         "error": {
-            "general_error": "Si \u00e8 verificato un errore sconosciuto.",
-            "invalid_api_key": "Chiave API non valida fornita.",
+            "cannot_connect": "Impossibile connettersi",
+            "general_error": "Errore imprevisto",
+            "invalid_api_key": "Chiave API non valida",
             "unable_to_connect": "Impossibile connettersi all'unit\u00e0 Node/Pro."
         },
         "step": {
@@ -20,12 +22,18 @@
             },
             "node_pro": {
                 "data": {
-                    "ip_address": "Indirizzo IP/Nome host dell'unit\u00e0",
+                    "ip_address": "Host",
                     "password": "Password"
                 },
                 "description": "Monitorare un'unit\u00e0 AirVisual personale. La password pu\u00f2 essere recuperata dall'interfaccia utente dell'unit\u00e0.",
                 "title": "Configurare un AirVisual Node/Pro"
             },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "Chiave API"
+                },
+                "title": "Riautenticare AirVisual"
+            },
             "user": {
                 "data": {
                     "cloud_api": "Posizione geografica",
diff --git a/homeassistant/components/airvisual/translations/lb.json b/homeassistant/components/airvisual/translations/lb.json
index d0cffc8ec2d..12e4c020341 100644
--- a/homeassistant/components/airvisual/translations/lb.json
+++ b/homeassistant/components/airvisual/translations/lb.json
@@ -4,7 +4,8 @@
             "already_configured": "D\u00ebs Koordinate oder ode/Pro ID si schon registr\u00e9iert."
         },
         "error": {
-            "general_error": "Onbekannten Feeler",
+            "cannot_connect": "Feeler beim verbannen",
+            "general_error": "Onerwaarte Feeler",
             "invalid_api_key": "Ong\u00ebltegen API Schl\u00ebssel uginn",
             "unable_to_connect": "Kann sech net mat der Node/Pri verbannen."
         },
diff --git a/homeassistant/components/airvisual/translations/nl.json b/homeassistant/components/airvisual/translations/nl.json
index cfccef38e89..503f3580c18 100644
--- a/homeassistant/components/airvisual/translations/nl.json
+++ b/homeassistant/components/airvisual/translations/nl.json
@@ -4,6 +4,7 @@
             "already_configured": "Deze co\u00f6rdinaten of Node / Pro ID zijn al geregistreerd."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "general_error": "Er is een onbekende fout opgetreden.",
             "unable_to_connect": "Kan geen verbinding maken met Node / Pro-apparaat."
         },
diff --git a/homeassistant/components/airvisual/translations/no.json b/homeassistant/components/airvisual/translations/no.json
index 8fcf00a6714..68f0b672825 100644
--- a/homeassistant/components/airvisual/translations/no.json
+++ b/homeassistant/components/airvisual/translations/no.json
@@ -1,17 +1,19 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Disse koordinatene eller Node / Pro ID er allerede registrert."
+            "already_configured": "Plasseringen er allerede konfigurert eller Node / Pro ID er allerede registrert.",
+            "reauth_successful": "Reautentisering var vellykket"
         },
         "error": {
-            "general_error": "Det oppstod en ukjent feil.",
-            "invalid_api_key": "Ugyldig API-n\u00f8kkel angitt.",
+            "cannot_connect": "Tilkobling mislyktes",
+            "general_error": "Uventet feil",
+            "invalid_api_key": "Ugyldig API-n\u00f8kkel",
             "unable_to_connect": "Kan ikke koble til Node / Pro-enheten."
         },
         "step": {
             "geography": {
                 "data": {
-                    "api_key": "API n\u00f8kkel",
+                    "api_key": "API-n\u00f8kkel",
                     "latitude": "Breddegrad",
                     "longitude": "Lengdegrad"
                 },
@@ -20,12 +22,18 @@
             },
             "node_pro": {
                 "data": {
-                    "ip_address": "Enhetens IP-adresse / vertsnavn",
+                    "ip_address": "Vert",
                     "password": "Passord"
                 },
                 "description": "Overv\u00e5ke en personlig AirVisual-enhet. Passordet kan hentes fra enhetens brukergrensesnitt.",
                 "title": "Konfigurer en AirVisual Node / Pro"
             },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "API-n\u00f8kkel"
+                },
+                "title": "Autentiser AirVisual p\u00e5 nytt"
+            },
             "user": {
                 "data": {
                     "cloud_api": "Geografisk plassering",
diff --git a/homeassistant/components/airvisual/translations/pl.json b/homeassistant/components/airvisual/translations/pl.json
index 5851afceabd..430fb5c348b 100644
--- a/homeassistant/components/airvisual/translations/pl.json
+++ b/homeassistant/components/airvisual/translations/pl.json
@@ -1,12 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ten klucz API jest ju\u017c w u\u017cyciu."
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana lub ID Node/Pro jest ju\u017c zarejestrowane",
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119"
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "general_error": "Nieoczekiwany b\u0142\u0105d",
-            "invalid_api_key": "Nieprawid\u0142owy klucz API.",
-            "unable_to_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z jednostk\u0105 Node/Pro."
+            "invalid_api_key": "Nieprawid\u0142owy klucz API",
+            "unable_to_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z jednostk\u0105 Node/Pro"
         },
         "step": {
             "geography": {
@@ -26,13 +28,19 @@
                 "description": "Monitoruj jednostk\u0119 AirVisual. Has\u0142o mo\u017cna odzyska\u0107 z interfejsu u\u017cytkownika urz\u0105dzenia.",
                 "title": "Konfiguracja AirVisual Node/Pro"
             },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "Klucz API"
+                },
+                "title": "Ponownie uwierzytelnij z AirVisual"
+            },
             "user": {
                 "data": {
                     "cloud_api": "Lokalizacja geograficzna",
                     "node_pro": "AirVisual Node Pro",
                     "type": "Typ integracji"
                 },
-                "description": "Monitoruj jako\u015b\u0107 powietrza w okre\u015blonej lokalizacji geograficznej.",
+                "description": "Wybierz, kt\u00f3re dane AirVisual chcesz monitorowa\u0107.",
                 "title": "Konfiguracja AirVisual"
             }
         }
diff --git a/homeassistant/components/airvisual/translations/ru.json b/homeassistant/components/airvisual/translations/ru.json
index 67af449c9b0..50f6a482d02 100644
--- a/homeassistant/components/airvisual/translations/ru.json
+++ b/homeassistant/components/airvisual/translations/ru.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043e."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u041b\u0438\u0431\u043e \u044d\u0442\u043e\u0442 Node / Pro ID \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d.",
+            "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
         },
         "error": {
-            "general_error": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "general_error": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
             "invalid_api_key": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API.",
             "unable_to_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
         },
@@ -20,12 +22,18 @@
             },
             "node_pro": {
                 "data": {
-                    "ip_address": "IP-\u0430\u0434\u0440\u0435\u0441/\u0418\u043c\u044f \u0445\u043e\u0441\u0442\u0430",
+                    "ip_address": "\u0425\u043e\u0441\u0442",
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c"
                 },
                 "description": "\u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 AirVisual. \u041f\u0430\u0440\u043e\u043b\u044c \u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0432 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432.",
                 "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 AirVisual Node / Pro"
             },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "\u041a\u043b\u044e\u0447 API"
+                },
+                "title": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0444\u0438\u043b\u044f"
+            },
             "user": {
                 "data": {
                     "cloud_api": "\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435",
diff --git a/homeassistant/components/airvisual/translations/zh-Hans.json b/homeassistant/components/airvisual/translations/zh-Hans.json
new file mode 100644
index 00000000000..2941dfd9383
--- /dev/null
+++ b/homeassistant/components/airvisual/translations/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/airvisual/translations/zh-Hant.json b/homeassistant/components/airvisual/translations/zh-Hant.json
index 80e8372f3f6..431dfb223ac 100644
--- a/homeassistant/components/airvisual/translations/zh-Hant.json
+++ b/homeassistant/components/airvisual/translations/zh-Hant.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u5ea7\u6a19\u6216 Node/Pro ID \u5df2\u8a3b\u518a\u3002"
+            "already_configured": "Node/Pro ID \u5df2\u8a3b\u518a\u6216\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
+            "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f"
         },
         "error": {
-            "general_error": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002",
-            "invalid_api_key": "API \u5bc6\u9470\u7121\u6548\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "general_error": "\u672a\u9810\u671f\u932f\u8aa4",
+            "invalid_api_key": "API \u5bc6\u9470\u7121\u6548",
             "unable_to_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 Node/Pro \u8a2d\u5099\u3002"
         },
         "step": {
@@ -20,12 +22,18 @@
             },
             "node_pro": {
                 "data": {
-                    "ip_address": "\u8a2d\u5099 IP \u4f4d\u5740/\u4e3b\u6a5f\u540d\u7a31",
+                    "ip_address": "\u4e3b\u6a5f\u7aef",
                     "password": "\u5bc6\u78bc"
                 },
                 "description": "\u76e3\u63a7\u500b\u4eba AirVisual \u8a2d\u5099\uff0c\u5bc6\u78bc\u53ef\u4ee5\u900f\u904e\u8a2d\u5099 UI \u7372\u5f97\u3002",
                 "title": "\u8a2d\u5b9a AirVisual Node/Pro"
             },
+            "reauth_confirm": {
+                "data": {
+                    "api_key": "API \u5bc6\u9470"
+                },
+                "title": "\u91cd\u65b0\u8a8d\u8b49 AirVisual"
+            },
             "user": {
                 "data": {
                     "cloud_api": "\u5730\u7406\u5ea7\u6a19",
diff --git a/homeassistant/components/alarm_control_panel/__init__.py b/homeassistant/components/alarm_control_panel/__init__.py
index 50b8adb4c03..114abfa9cd6 100644
--- a/homeassistant/components/alarm_control_panel/__init__.py
+++ b/homeassistant/components/alarm_control_panel/__init__.py
@@ -175,12 +175,11 @@ class AlarmControlPanelEntity(Entity):
     @property
     def state_attributes(self):
         """Return the state attributes."""
-        state_attr = {
+        return {
             ATTR_CODE_FORMAT: self.code_format,
             ATTR_CHANGED_BY: self.changed_by,
             ATTR_CODE_ARM_REQUIRED: self.code_arm_required,
         }
-        return state_attr
 
 
 class AlarmControlPanel(AlarmControlPanelEntity):
diff --git a/homeassistant/components/alarmdecoder/alarm_control_panel.py b/homeassistant/components/alarmdecoder/alarm_control_panel.py
index bc2d74a5042..5e3118b1d3d 100644
--- a/homeassistant/components/alarmdecoder/alarm_control_panel.py
+++ b/homeassistant/components/alarmdecoder/alarm_control_panel.py
@@ -1,6 +1,4 @@
 """Support for AlarmDecoder-based alarm control panels (Honeywell/DSC)."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.alarm_control_panel import (
@@ -36,8 +34,6 @@ from .const import (
     SIGNAL_PANEL_MESSAGE,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 SERVICE_ALARM_TOGGLE_CHIME = "alarm_toggle_chime"
 
 SERVICE_ALARM_KEYPRESS = "alarm_keypress"
diff --git a/homeassistant/components/alarmdecoder/binary_sensor.py b/homeassistant/components/alarmdecoder/binary_sensor.py
index 89b7d00b3a4..55bf13d7fef 100644
--- a/homeassistant/components/alarmdecoder/binary_sensor.py
+++ b/homeassistant/components/alarmdecoder/binary_sensor.py
@@ -120,8 +120,7 @@ class AlarmDecoderBinarySensor(BinarySensorEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {}
-        attr[CONF_ZONE_NUMBER] = self._zone_number
+        attr = {CONF_ZONE_NUMBER: self._zone_number}
         if self._rfid and self._rfstate is not None:
             attr[ATTR_RF_BIT0] = bool(self._rfstate & 0x01)
             attr[ATTR_RF_LOW_BAT] = bool(self._rfstate & 0x02)
diff --git a/homeassistant/components/alarmdecoder/config_flow.py b/homeassistant/components/alarmdecoder/config_flow.py
index 74b23f049a7..a82b84b60d1 100644
--- a/homeassistant/components/alarmdecoder/config_flow.py
+++ b/homeassistant/components/alarmdecoder/config_flow.py
@@ -111,7 +111,7 @@ class AlarmDecoderFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                     title=title, data={CONF_PROTOCOL: self.protocol, **connection}
                 )
             except NoDeviceError:
-                errors["base"] = "service_unavailable"
+                errors["base"] = "cannot_connect"
             except Exception:  # pylint: disable=broad-except
                 _LOGGER.exception("Unexpected exception during AlarmDecoder setup")
                 errors["base"] = "unknown"
diff --git a/homeassistant/components/alarmdecoder/sensor.py b/homeassistant/components/alarmdecoder/sensor.py
index 4ce953af1d4..a8aed8dac73 100644
--- a/homeassistant/components/alarmdecoder/sensor.py
+++ b/homeassistant/components/alarmdecoder/sensor.py
@@ -1,14 +1,10 @@
 """Support for AlarmDecoder sensors (Shows Panel Display)."""
-import logging
-
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import HomeAssistantType
 
 from .const import SIGNAL_PANEL_MESSAGE
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/alarmdecoder/strings.json b/homeassistant/components/alarmdecoder/strings.json
index ed250b92b98..33b33749048 100644
--- a/homeassistant/components/alarmdecoder/strings.json
+++ b/homeassistant/components/alarmdecoder/strings.json
@@ -18,7 +18,7 @@
       }
     },
     "error": {
-      "service_unavailable": "[%key:common::config_flow::error::cannot_connect%]"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "create_entry": { "default": "Successfully connected to AlarmDecoder." },
     "abort": {
diff --git a/homeassistant/components/alarmdecoder/translations/ca.json b/homeassistant/components/alarmdecoder/translations/ca.json
index 3042a991c5f..d21231e0a75 100644
--- a/homeassistant/components/alarmdecoder/translations/ca.json
+++ b/homeassistant/components/alarmdecoder/translations/ca.json
@@ -7,6 +7,7 @@
             "default": "S'ha connectat correctament amb AlarmDecoder."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "service_unavailable": "Ha fallat la connexi\u00f3"
         },
         "step": {
diff --git a/homeassistant/components/alarmdecoder/translations/cs.json b/homeassistant/components/alarmdecoder/translations/cs.json
index b42e092bb47..86408d58623 100644
--- a/homeassistant/components/alarmdecoder/translations/cs.json
+++ b/homeassistant/components/alarmdecoder/translations/cs.json
@@ -1,7 +1,41 @@
 {
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "create_entry": {
+            "default": "\u00dasp\u011b\u0161n\u011b p\u0159ipojen k AlarmDecoder."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "service_unavailable": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "step": {
+            "protocol": {
+                "data": {
+                    "device_path": "Cesta k za\u0159\u00edzen\u00ed",
+                    "host": "Hostitel",
+                    "port": "Port"
+                },
+                "title": "Nastavte spojen\u00ed"
+            },
+            "user": {
+                "data": {
+                    "protocol": "Protokol"
+                },
+                "title": "Vyberte protokol AlarmDecoder"
+            }
+        }
+    },
     "options": {
+        "error": {
+            "int": "Pole n\u00ed\u017ee mus\u00ed b\u00fdt cel\u00e9 \u010d\u00edslo."
+        },
         "step": {
             "arm_settings": {
+                "data": {
+                    "code_arm_required": "K\u00f3d vy\u017eadovan\u00fd pro zabezpe\u010den\u00ed"
+                },
                 "title": "Konfigurovat AlarmDecoder"
             },
             "init": {
diff --git a/homeassistant/components/alarmdecoder/translations/de.json b/homeassistant/components/alarmdecoder/translations/de.json
index 69318f87b11..8e72173d150 100644
--- a/homeassistant/components/alarmdecoder/translations/de.json
+++ b/homeassistant/components/alarmdecoder/translations/de.json
@@ -6,6 +6,7 @@
         "step": {
             "protocol": {
                 "data": {
+                    "device_path": "Ger\u00e4tepfad",
                     "host": "Host",
                     "port": "Port"
                 }
diff --git a/homeassistant/components/alarmdecoder/translations/el.json b/homeassistant/components/alarmdecoder/translations/el.json
index ad488dd17ff..44197dbe5fb 100644
--- a/homeassistant/components/alarmdecoder/translations/el.json
+++ b/homeassistant/components/alarmdecoder/translations/el.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u0397 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03ad\u03b9\u03bd\u03b1\u03b9 \u03ae\u03b4\u03b7 \u03c1\u03c5\u03b8\u03bc\u03b9\u03c3\u03bc\u03ad\u03bd\u03b7"
+        },
         "create_entry": {
             "default": "\u0395\u03c0\u03b9\u03c4\u03c5\u03c7\u03ae\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03c3\u03c4\u03bf AlarmDecoder."
         },
@@ -10,23 +13,60 @@
             "protocol": {
                 "data": {
                     "device_baudrate": "\u03a1\u03c5\u03b8\u03bc\u03cc\u03c2 Baud \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2",
-                    "device_path": "\u0394\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2"
-                }
+                    "device_path": "\u0394\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2",
+                    "host": "\u0394\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae\u03c2",
+                    "port": "\u0398\u03cd\u03c1\u03b1"
+                },
+                "title": "\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+            },
+            "user": {
+                "data": {
+                    "protocol": "\u03a0\u03c1\u03c9\u03c4\u03cc\u03ba\u03bf\u03bb\u03bb\u03bf"
+                },
+                "title": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c0\u03c1\u03c9\u03c4\u03cc\u03ba\u03bf\u03bb\u03bb\u03bf AlarmDecoder"
             }
         }
     },
     "options": {
+        "error": {
+            "int": "\u03a4\u03bf \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9 \u03c0\u03b5\u03b4\u03af\u03bf \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b1\u03ba\u03ad\u03c1\u03b1\u03b9\u03bf\u03c2.",
+            "loop_range": "\u039f \u03b2\u03c1\u03cc\u03c7\u03bf\u03c2 RF \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b1\u03ba\u03ad\u03c1\u03b1\u03b9\u03bf\u03c2 \u03b1\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03bc\u03b5\u03c4\u03b1\u03be\u03cd 1 \u03ba\u03b1\u03b9 4.",
+            "loop_rfid": "\u039f \u03b2\u03c1\u03cc\u03c7\u03bf\u03c2 RF \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af \u03c7\u03c9\u03c1\u03af\u03c2 \u03c4\u03bf \u03c3\u03b5\u03b9\u03c1\u03b9\u03b1\u03ba\u03cc RF.",
+            "relay_inclusive": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 \u03c1\u03b5\u03bb\u03ad \u03ba\u03b1\u03b9 \u03c4\u03bf \u03ba\u03b1\u03bd\u03ac\u03bb\u03b9 \u03b1\u03bd\u03b1\u03bc\u03b5\u03c4\u03ac\u03b4\u03bf\u03c3\u03b7\u03c2 \u03b5\u03be\u03b1\u03c1\u03c4\u03ce\u03bd\u03c4\u03b1\u03b9 \u03b1\u03c0\u03cc \u03c4\u03bf\u03bd \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1 \u03ba\u03b1\u03b9 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03c0\u03b5\u03c1\u03b9\u03bb\u03b1\u03bc\u03b2\u03ac\u03bd\u03bf\u03bd\u03c4\u03b1\u03b9 \u03bc\u03b1\u03b6\u03af."
+        },
         "step": {
+            "arm_settings": {
+                "data": {
+                    "alt_night_mode": "\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03bd\u03c5\u03c7\u03c4\u03b5\u03c1\u03b9\u03bd\u03ae \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1",
+                    "auto_bypass": "\u0391\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b7 \u03c0\u03b1\u03c1\u03ac\u03ba\u03b1\u03bc\u03c8\u03b7 \u03c3\u03c4\u03bf\u03bd \u039f\u03c0\u03bb\u03b9\u03c3\u03bc\u03cc",
+                    "code_arm_required": "\u0391\u03c0\u03b1\u03b9\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03b3\u03b9\u03b1 \u03bf\u03c0\u03bb\u03b9\u03c3\u03bc\u03cc"
+                },
+                "title": "\u0394\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 AlarmDecoder"
+            },
+            "init": {
+                "data": {
+                    "edit_select": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1"
+                },
+                "description": "\u03a4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03b5\u03af\u03c4\u03b5;",
+                "title": "\u0394\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 AlarmDecoder"
+            },
             "zone_details": {
                 "data": {
+                    "zone_loop": "\u0392\u03c1\u03cc\u03c7\u03bf\u03c2 RF",
+                    "zone_name": "\u038c\u03bd\u03bf\u03bc\u03b1 \u03b6\u03ce\u03bd\u03b7\u03c2",
+                    "zone_relayaddr": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 \u03c1\u03b5\u03bb\u03ad",
+                    "zone_relaychan": "\u039a\u03b1\u03bd\u03ac\u03bb\u03b9 \u03c1\u03b5\u03bb\u03ad",
+                    "zone_rfid": "\u03a3\u03b5\u03b9\u03c1\u03b9\u03b1\u03ba\u03cc RF",
                     "zone_type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03b6\u03ce\u03bd\u03b7\u03c2"
                 },
+                "description": "\u0395\u03b9\u03c3\u03b1\u03b3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03bb\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2 \u03b3\u03b9\u03b1 \u03c4\u03b7 \u03b6\u03ce\u03bd\u03b7 {zone_number}. \u0393\u03b9\u03b1 \u03bd\u03b1 \u03b4\u03b9\u03b1\u03b3\u03c1\u03ac\u03c8\u03b5\u03c4\u03b5 \u03c4\u03b7 \u03b6\u03ce\u03bd\u03b7 {zone_number}, \u03b1\u03c6\u03ae\u03c3\u03c4\u03b5 \u03ba\u03b5\u03bd\u03cc \u03c4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b6\u03ce\u03bd\u03b7\u03c2.",
                 "title": "\u0394\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 AlarmDecoder"
             },
             "zone_select": {
                 "data": {
                     "zone_number": "\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03b6\u03ce\u03bd\u03b7\u03c2"
                 },
+                "description": "\u0395\u03b9\u03c3\u03b1\u03b3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b1\u03c1\u03b9\u03b8\u03bc\u03cc \u03b6\u03ce\u03bd\u03b7\u03c2 \u03c0\u03bf\u03c5 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5, \u03bd\u03b1 \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03b5\u03af\u03c4\u03b5 \u03ae \u03bd\u03b1 \u03ba\u03b1\u03c4\u03b1\u03c1\u03b3\u03ae\u03c3\u03b5\u03c4\u03b5.",
                 "title": "\u0394\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 AlarmDecoder"
             }
         }
diff --git a/homeassistant/components/alarmdecoder/translations/en.json b/homeassistant/components/alarmdecoder/translations/en.json
index 66301414cc8..978e4d298f2 100644
--- a/homeassistant/components/alarmdecoder/translations/en.json
+++ b/homeassistant/components/alarmdecoder/translations/en.json
@@ -7,6 +7,7 @@
             "default": "Successfully connected to AlarmDecoder."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "service_unavailable": "Failed to connect"
         },
         "step": {
diff --git a/homeassistant/components/alarmdecoder/translations/es.json b/homeassistant/components/alarmdecoder/translations/es.json
index 5b4670306da..6d30e28c437 100644
--- a/homeassistant/components/alarmdecoder/translations/es.json
+++ b/homeassistant/components/alarmdecoder/translations/es.json
@@ -1,12 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositivo AlarmDecoder ya est\u00e1 configurado."
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "create_entry": {
             "default": "Conectado con \u00e9xito a AlarmDecoder."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "service_unavailable": "No se pudo conectar"
         },
         "step": {
diff --git a/homeassistant/components/alarmdecoder/translations/et.json b/homeassistant/components/alarmdecoder/translations/et.json
index 4837483dee3..27d4c64cfaf 100644
--- a/homeassistant/components/alarmdecoder/translations/et.json
+++ b/homeassistant/components/alarmdecoder/translations/et.json
@@ -1,14 +1,40 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "create_entry": {
+            "default": "AlarmDecoderiga \u00fchendamine \u00f5nnestus."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "service_unavailable": "\u00dchendamine nurjus"
+        },
         "step": {
+            "protocol": {
+                "data": {
+                    "device_baudrate": "Seadme edastuskiirus",
+                    "device_path": "Seadme asukoht",
+                    "host": "",
+                    "port": ""
+                },
+                "title": "M\u00e4\u00e4ra \u00fchenduse seaded"
+            },
             "user": {
                 "data": {
                     "protocol": "Protokoll"
-                }
+                },
+                "title": "Vali AlarmDecoderi protokoll"
             }
         }
     },
     "options": {
+        "error": {
+            "int": "Allolev v\u00e4li peab olema t\u00e4isarv.",
+            "loop_range": "RF Loop peab olema t\u00e4isarv vahemikus 1\u20134.",
+            "loop_rfid": "RF Loopi ei saa kasutada ilma RF Serial-ita.",
+            "relay_inclusive": "Releeaadress ja releekanal s\u00f5ltuvad \u00fcksteisest ja need peavad olema koos."
+        },
         "step": {
             "arm_settings": {
                 "data": {
diff --git a/homeassistant/components/alarmdecoder/translations/it.json b/homeassistant/components/alarmdecoder/translations/it.json
index ca5bf39cefd..bbff7529851 100644
--- a/homeassistant/components/alarmdecoder/translations/it.json
+++ b/homeassistant/components/alarmdecoder/translations/it.json
@@ -7,6 +7,7 @@
             "default": "Collegato con successo ad AlarmDecoder."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "service_unavailable": "Impossibile connettersi"
         },
         "step": {
diff --git a/homeassistant/components/alarmdecoder/translations/lb.json b/homeassistant/components/alarmdecoder/translations/lb.json
index 08dc02d6ea7..082e279c764 100644
--- a/homeassistant/components/alarmdecoder/translations/lb.json
+++ b/homeassistant/components/alarmdecoder/translations/lb.json
@@ -3,6 +3,9 @@
         "abort": {
             "already_configured": "Apparat ass scho konfigur\u00e9iert"
         },
+        "create_entry": {
+            "default": "Erfollegr\u00e4ich mat Alarmdecoder verbonnen."
+        },
         "error": {
             "service_unavailable": "Feeler beim verbannen"
         },
@@ -13,12 +16,14 @@
                     "device_path": "Pad vum Apparat",
                     "host": "Host",
                     "port": "Port"
-                }
+                },
+                "title": "Verbindung's Optioune konfigur\u00e9ieren"
             },
             "user": {
                 "data": {
                     "protocol": "Protokoll"
-                }
+                },
+                "title": "Alarmdecoder Protokoll auswielen"
             }
         }
     },
@@ -52,12 +57,15 @@
                     "zone_rfid": "RF Serielle",
                     "zone_type": "Type vun der Zone"
                 },
+                "description": "G\u00ebff Detailer fir Zone {zone_number} an. Fir Zone {zone_number} ze l\u00e4schen, loss den Numm vun der Zone eidel.",
                 "title": "AlarmDecoder konfigur\u00e9ieren"
             },
             "zone_select": {
                 "data": {
                     "zone_number": "Zone Nummer"
-                }
+                },
+                "description": "G\u00ebff d'Zonennummer an d\u00e9is Du w\u00eblls b\u00e4isetzen, \u00e4nneren oder l\u00e4schen.",
+                "title": "AlarmDecoder konfigur\u00e9ieren"
             }
         }
     }
diff --git a/homeassistant/components/alarmdecoder/translations/nl.json b/homeassistant/components/alarmdecoder/translations/nl.json
index 6091d4c4bd7..ac47fdf8730 100644
--- a/homeassistant/components/alarmdecoder/translations/nl.json
+++ b/homeassistant/components/alarmdecoder/translations/nl.json
@@ -7,6 +7,7 @@
             "default": "Succesvol verbonden met AlarmDecoder."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "service_unavailable": "Kon niet verbinden"
         },
         "step": {
diff --git a/homeassistant/components/alarmdecoder/translations/no.json b/homeassistant/components/alarmdecoder/translations/no.json
index 36c5f21c60c..881250b9686 100644
--- a/homeassistant/components/alarmdecoder/translations/no.json
+++ b/homeassistant/components/alarmdecoder/translations/no.json
@@ -7,7 +7,8 @@
             "default": "Vellykket koblet til AlarmDecoder."
         },
         "error": {
-            "service_unavailable": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes",
+            "service_unavailable": "Tilkobling mislyktes"
         },
         "step": {
             "protocol": {
diff --git a/homeassistant/components/alarmdecoder/translations/pl.json b/homeassistant/components/alarmdecoder/translations/pl.json
index 4e3f5b17ba1..8dfcc0a1a24 100644
--- a/homeassistant/components/alarmdecoder/translations/pl.json
+++ b/homeassistant/components/alarmdecoder/translations/pl.json
@@ -3,34 +3,72 @@
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
+        "create_entry": {
+            "default": "Pomy\u015blnie po\u0142\u0105czono z AlarmDecoder."
+        },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "service_unavailable": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "step": {
             "protocol": {
                 "data": {
+                    "device_baudrate": "Szybko\u015b\u0107 transmisji urz\u0105dzenia (Baud Rate)",
+                    "device_path": "\u015acie\u017cka urz\u0105dzenia",
                     "host": "Nazwa hosta lub adres IP",
                     "port": "Port"
-                }
+                },
+                "title": "Konfiguracja ustawie\u0144 po\u0142\u0105czenia"
+            },
+            "user": {
+                "data": {
+                    "protocol": "Protok\u00f3\u0142"
+                },
+                "title": "Wybierz protok\u00f3\u0142 AlarmDecodera"
             }
         }
     },
     "options": {
+        "error": {
+            "int": "Poni\u017csze pole musi by\u0107 liczb\u0105 ca\u0142kowit\u0105",
+            "loop_range": "P\u0119tla RF (RF Loop) musi by\u0107 liczb\u0105 ca\u0142kowit\u0105 od 1 do 4",
+            "loop_rfid": "P\u0119tli RF (RF Loop) nie mo\u017cna u\u017cywa\u0107 bez us\u0142ugi RF Serial",
+            "relay_inclusive": "Adres przeka\u017anika i kana\u0142 przeka\u017anika s\u0105 wsp\u00f3\u0142zale\u017cne i musz\u0105 by\u0107 zawarte razem"
+        },
         "step": {
+            "arm_settings": {
+                "data": {
+                    "alt_night_mode": "Alternatywny tryb nocny",
+                    "auto_bypass": "Automatyczne obej\u015bcie przy uzbrajaniu",
+                    "code_arm_required": "Wymagaj kodu do uzbrojenia"
+                },
+                "title": "Konfiguracja AlarmDecoder"
+            },
             "init": {
                 "data": {
                     "edit_select": "Edytuj"
-                }
+                },
+                "description": "Co chcia\u0142by\u015b edytowa\u0107?",
+                "title": "Konfiguracja AlarmDecoder"
             },
             "zone_details": {
                 "data": {
-                    "zone_relaychan": "Kana\u0142 przeka\u017anika"
-                }
+                    "zone_loop": "P\u0119tla RF (RF Loop)",
+                    "zone_name": "Nazwa strefy",
+                    "zone_relayaddr": "Adres przeka\u017anika",
+                    "zone_relaychan": "Kana\u0142 przeka\u017anika",
+                    "zone_rfid": "RF Serial",
+                    "zone_type": "Rodzaj strefy"
+                },
+                "description": "Wprowad\u017a szczeg\u00f3\u0142y dla strefy {zone_number}. Aby usun\u0105\u0107 stref\u0119 {zone_number}, pozostaw nazw\u0119 strefy pust\u0105.",
+                "title": "Konfiguracja AlarmDecoder"
             },
             "zone_select": {
                 "data": {
                     "zone_number": "Numer strefy"
-                }
+                },
+                "description": "Wprowad\u017a numer strefy, kt\u00f3r\u0105 chcesz doda\u0107, edytowa\u0107 lub usun\u0105\u0107.",
+                "title": "Konfiguracja AlarmDecoder"
             }
         }
     }
diff --git a/homeassistant/components/alarmdecoder/translations/ru.json b/homeassistant/components/alarmdecoder/translations/ru.json
index 3a6e56686fd..700b4fe6a88 100644
--- a/homeassistant/components/alarmdecoder/translations/ru.json
+++ b/homeassistant/components/alarmdecoder/translations/ru.json
@@ -7,6 +7,7 @@
             "default": "\u0423\u0441\u043f\u0435\u0448\u043d\u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u043e \u043a AlarmDecoder."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "service_unavailable": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "step": {
diff --git a/homeassistant/components/alarmdecoder/translations/zh-Hans.json b/homeassistant/components/alarmdecoder/translations/zh-Hans.json
new file mode 100644
index 00000000000..1810fa0bcf0
--- /dev/null
+++ b/homeassistant/components/alarmdecoder/translations/zh-Hans.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        },
+        "step": {
+            "protocol": {
+                "data": {
+                    "port": "\u7aef\u53e3"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/alarmdecoder/translations/zh-Hant.json b/homeassistant/components/alarmdecoder/translations/zh-Hant.json
index 4caf58203c8..b510b700b37 100644
--- a/homeassistant/components/alarmdecoder/translations/zh-Hant.json
+++ b/homeassistant/components/alarmdecoder/translations/zh-Hant.json
@@ -7,6 +7,7 @@
             "default": "\u6210\u529f\u9023\u7dda\u81f3 AlarmDecoder\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "service_unavailable": "\u9023\u7dda\u5931\u6557"
         },
         "step": {
diff --git a/homeassistant/components/alert/__init__.py b/homeassistant/components/alert/__init__.py
index 755bf6b3c49..53b1a1248dc 100644
--- a/homeassistant/components/alert/__init__.py
+++ b/homeassistant/components/alert/__init__.py
@@ -276,7 +276,7 @@ class Alert(ToggleEntity):
             self._send_done_message = True
 
             if self._message_template is not None:
-                message = self._message_template.async_render()
+                message = self._message_template.async_render(parse_result=False)
             else:
                 message = self._name
 
@@ -291,7 +291,7 @@ class Alert(ToggleEntity):
         if self._done_message_template is None:
             return
 
-        message = self._done_message_template.async_render()
+        message = self._done_message_template.async_render(parse_result=False)
 
         await self._send_notification_message(message)
 
@@ -300,7 +300,7 @@ class Alert(ToggleEntity):
         msg_payload = {ATTR_MESSAGE: message}
 
         if self._title_template is not None:
-            title = self._title_template.async_render()
+            title = self._title_template.async_render(parse_result=False)
             msg_payload.update({ATTR_TITLE: title})
         if self._data:
             msg_payload.update({ATTR_DATA: self._data})
diff --git a/homeassistant/components/alexa/__init__.py b/homeassistant/components/alexa/__init__.py
index 7522b7e2d58..5180a8d55b6 100644
--- a/homeassistant/components/alexa/__init__.py
+++ b/homeassistant/components/alexa/__init__.py
@@ -1,6 +1,4 @@
 """Support for Alexa skill service end point."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET, CONF_NAME
@@ -24,8 +22,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_FLASH_BRIEFINGS = "flash_briefings"
 CONF_SMART_HOME = "smart_home"
 DEFAULT_LOCALE = "en-US"
diff --git a/homeassistant/components/alexa/entities.py b/homeassistant/components/alexa/entities.py
index 53cf35dfe75..574ba6b8ba7 100644
--- a/homeassistant/components/alexa/entities.py
+++ b/homeassistant/components/alexa/entities.py
@@ -96,9 +96,24 @@ class DisplayCategory:
     # to HDMI1. Applies to Scenes
     ACTIVITY_TRIGGER = "ACTIVITY_TRIGGER"
 
-    # Indicates media devices with video or photo capabilities.
+    # Indicates a device that emits pleasant odors and masks unpleasant odors in interior spaces.
+    AIR_FRESHENER = "AIR_FRESHENER"
+
+    # Indicates a device that improves the quality of air in interior spaces.
+    AIR_PURIFIER = "AIR_PURIFIER"
+
+    # Indicates a smart device in an automobile, such as a dash camera.
+    AUTO_ACCESSORY = "AUTO_ACCESSORY"
+
+    # Indicates a security device with video or photo functionality.
     CAMERA = "CAMERA"
 
+    # Indicates a religious holiday decoration that often contains lights.
+    CHRISTMAS_TREE = "CHRISTMAS_TREE"
+
+    # Indicates a device that makes coffee.
+    COFFEE_MAKER = "COFFEE_MAKER"
+
     # Indicates a non-mobile computer, such as a desktop computer.
     COMPUTER = "COMPUTER"
 
@@ -120,9 +135,16 @@ class DisplayCategory:
     # Indicates a game console, such as Microsoft Xbox or Nintendo Switch
     GAME_CONSOLE = "GAME_CONSOLE"
 
-    # Indicates a garage door. Garage doors must implement the ModeController interface to open and close the door.
+    # Indicates a garage door.
+    # Garage doors must implement the ModeController interface to open and close the door.
     GARAGE_DOOR = "GARAGE_DOOR"
 
+    # Indicates a wearable device that transmits audio directly into the ear.
+    HEADPHONES = "HEADPHONES"
+
+    # Indicates a smart-home hub.
+    HUB = "HUB"
+
     # Indicates a window covering on the inside of a structure.
     INTERIOR_BLIND = "INTERIOR_BLIND"
 
@@ -144,18 +166,24 @@ class DisplayCategory:
     # Indicates a network-connected music system.
     MUSIC_SYSTEM = "MUSIC_SYSTEM"
 
-    # An endpoint that cannot be described in on of the other categories.
-    OTHER = "OTHER"
-
     # Indicates a network router.
     NETWORK_HARDWARE = "NETWORK_HARDWARE"
 
+    # An endpoint that cannot be described in on of the other categories.
+    OTHER = "OTHER"
+
     # Indicates an oven cooking appliance.
     OVEN = "OVEN"
 
     # Indicates a non-mobile phone, such as landline or an IP phone.
     PHONE = "PHONE"
 
+    # Indicates a device that prints.
+    PRINTER = "PRINTER"
+
+    # Indicates a network router.
+    ROUTER = "ROUTER"
+
     # Describes a combination of devices set to a specific state, when the
     # order of the state change is not important. For example a bedtime scene
     # might include turning off lights and lowering the thermostat, but the
@@ -168,6 +196,13 @@ class DisplayCategory:
     # Indicates a security panel.
     SECURITY_PANEL = "SECURITY_PANEL"
 
+    # Indicates a security system.
+    SECURITY_SYSTEM = "SECURITY_SYSTEM"
+
+    # Indicates an electric cooking device that sits on a countertop, cooks at low temperatures,
+    # and is often shaped like a cooking pot.
+    SLOW_COOKER = "SLOW_COOKER"
+
     # Indicates an endpoint that locks.
     SMARTLOCK = "SMARTLOCK"
 
@@ -198,6 +233,9 @@ class DisplayCategory:
     # Indicates the endpoint is a television.
     TV = "TV"
 
+    # Indicates a vacuum cleaner.
+    VACUUM_CLEANER = "VACUUM_CLEANER"
+
     # Indicates a network-connected wearable device, such as an Apple Watch, Fitbit, or Samsung Gear.
     WEARABLE = "WEARABLE"
 
@@ -347,6 +385,9 @@ class GenericCapabilities(AlexaEntity):
 
     def default_display_categories(self):
         """Return the display categories for this entity."""
+        if self.entity.domain == automation.DOMAIN:
+            return [DisplayCategory.ACTIVITY_TRIGGER]
+
         return [DisplayCategory.OTHER]
 
     def interfaces(self):
@@ -769,7 +810,7 @@ class VacuumCapabilities(AlexaEntity):
 
     def default_display_categories(self):
         """Return the display categories for this entity."""
-        return [DisplayCategory.OTHER]
+        return [DisplayCategory.VACUUM_CLEANER]
 
     def interfaces(self):
         """Yield the supported interfaces."""
diff --git a/homeassistant/components/alexa/flash_briefings.py b/homeassistant/components/alexa/flash_briefings.py
index ed3da1d10be..b8f78705e10 100644
--- a/homeassistant/components/alexa/flash_briefings.py
+++ b/homeassistant/components/alexa/flash_briefings.py
@@ -80,13 +80,17 @@ class AlexaFlashBriefingView(http.HomeAssistantView):
             output = {}
             if item.get(CONF_TITLE) is not None:
                 if isinstance(item.get(CONF_TITLE), template.Template):
-                    output[ATTR_TITLE_TEXT] = item[CONF_TITLE].async_render()
+                    output[ATTR_TITLE_TEXT] = item[CONF_TITLE].async_render(
+                        parse_result=False
+                    )
                 else:
                     output[ATTR_TITLE_TEXT] = item.get(CONF_TITLE)
 
             if item.get(CONF_TEXT) is not None:
                 if isinstance(item.get(CONF_TEXT), template.Template):
-                    output[ATTR_MAIN_TEXT] = item[CONF_TEXT].async_render()
+                    output[ATTR_MAIN_TEXT] = item[CONF_TEXT].async_render(
+                        parse_result=False
+                    )
                 else:
                     output[ATTR_MAIN_TEXT] = item.get(CONF_TEXT)
 
@@ -97,13 +101,17 @@ class AlexaFlashBriefingView(http.HomeAssistantView):
 
             if item.get(CONF_AUDIO) is not None:
                 if isinstance(item.get(CONF_AUDIO), template.Template):
-                    output[ATTR_STREAM_URL] = item[CONF_AUDIO].async_render()
+                    output[ATTR_STREAM_URL] = item[CONF_AUDIO].async_render(
+                        parse_result=False
+                    )
                 else:
                     output[ATTR_STREAM_URL] = item.get(CONF_AUDIO)
 
             if item.get(CONF_DISPLAY_URL) is not None:
                 if isinstance(item.get(CONF_DISPLAY_URL), template.Template):
-                    output[ATTR_REDIRECTION_URL] = item[CONF_DISPLAY_URL].async_render()
+                    output[ATTR_REDIRECTION_URL] = item[CONF_DISPLAY_URL].async_render(
+                        parse_result=False
+                    )
                 else:
                     output[ATTR_REDIRECTION_URL] = item.get(CONF_DISPLAY_URL)
 
diff --git a/homeassistant/components/alexa/intent.py b/homeassistant/components/alexa/intent.py
index c04b493beec..f64031250e2 100644
--- a/homeassistant/components/alexa/intent.py
+++ b/homeassistant/components/alexa/intent.py
@@ -271,7 +271,7 @@ class AlexaResponse:
 
         self.reprompt = {
             "type": speech_type.value,
-            key: text.async_render(self.variables),
+            key: text.async_render(self.variables, parse_result=False),
         }
 
     def as_dict(self):
diff --git a/homeassistant/components/almond/config_flow.py b/homeassistant/components/almond/config_flow.py
index 0421612b702..8a4c5417700 100644
--- a/homeassistant/components/almond/config_flow.py
+++ b/homeassistant/components/almond/config_flow.py
@@ -51,7 +51,7 @@ class AlmondFlowHandler(config_entry_oauth2_flow.AbstractOAuth2FlowHandler):
         """Handle a flow start."""
         # Only allow 1 instance.
         if self._async_current_entries():
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="single_instance_allowed")
 
         return await super().async_step_user(user_input)
 
@@ -79,7 +79,7 @@ class AlmondFlowHandler(config_entry_oauth2_flow.AbstractOAuth2FlowHandler):
         """Import data."""
         # Only allow 1 instance.
         if self._async_current_entries():
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="single_instance_allowed")
 
         if not await async_verify_local_connection(self.hass, user_input["host"]):
             self.logger.warning(
@@ -97,7 +97,7 @@ class AlmondFlowHandler(config_entry_oauth2_flow.AbstractOAuth2FlowHandler):
     async def async_step_hassio(self, discovery_info):
         """Receive a Hass.io discovery."""
         if self._async_current_entries():
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="single_instance_allowed")
 
         self.hassio_discovery = discovery_info
 
diff --git a/homeassistant/components/almond/strings.json b/homeassistant/components/almond/strings.json
index 9c85eeb92c1..8eb5478ecef 100644
--- a/homeassistant/components/almond/strings.json
+++ b/homeassistant/components/almond/strings.json
@@ -1,16 +1,18 @@
 {
   "config": {
     "step": {
-      "pick_implementation": { "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]" },
+      "pick_implementation": {
+        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      },
       "hassio_confirm": {
         "title": "Almond via Hass.io add-on",
         "description": "Do you want to configure Home Assistant to connect to Almond provided by the Hass.io add-on: {addon}?"
       }
     },
     "abort": {
-      "already_setup": "You can only configure one Almond account.",
-      "cannot_connect": "Unable to connect to the Almond server.",
-      "missing_configuration": "Please check the documentation on how to set up Almond.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]"
     }
   }
diff --git a/homeassistant/components/almond/translations/ca.json b/homeassistant/components/almond/translations/ca.json
index 81f114be1eb..b995d65e6ce 100644
--- a/homeassistant/components/almond/translations/ca.json
+++ b/homeassistant/components/almond/translations/ca.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_setup": "Nom\u00e9s pots configurar un \u00fanic compte amb Almond.",
-            "cannot_connect": "No es pot connectar amb el servidor d'Almond.",
-            "missing_configuration": "Consulta la documentaci\u00f3 sobre com configurar Almond.",
-            "no_url_available": "No hi ha cap URL disponible. Per a m\u00e9s informaci\u00f3 sobre aquest error, [consulta la secci\u00f3 d'ajuda]({docs_url})"
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
+            "no_url_available": "No hi ha cap URL disponible. Per a m\u00e9s informaci\u00f3 sobre aquest error, [consulta la secci\u00f3 d'ajuda]({docs_url})",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "hassio_confirm": {
@@ -12,7 +13,7 @@
                 "title": "Almond (complement de Hass.io)"
             },
             "pick_implementation": {
-                "title": "Selecci\u00f3 del m\u00e8tode d'autenticaci\u00f3"
+                "title": "Selecciona el m\u00e8tode d'autenticaci\u00f3"
             }
         }
     }
diff --git a/homeassistant/components/almond/translations/cs.json b/homeassistant/components/almond/translations/cs.json
index f103fcc2727..aa8a9d29939 100644
--- a/homeassistant/components/almond/translations/cs.json
+++ b/homeassistant/components/almond/translations/cs.json
@@ -1,9 +1,19 @@
 {
     "config": {
+        "abort": {
+            "already_setup": "M\u016f\u017eete nastavit pouze jeden \u00fa\u010det Almond.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "no_url_available": "Nen\u00ed k dispozici \u017e\u00e1dn\u00e1 adresa URL. Informace o t\u00e9to chyb\u011b naleznete [v sekci n\u00e1pov\u011bdy]({docs_url})",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
         "step": {
             "hassio_confirm": {
                 "description": "Chcete nakonfigurovat slu\u017ebu Home Assistant pro p\u0159ipojen\u00ed k Almond pomoc\u00ed hass.io {addon}?",
                 "title": "Almond prost\u0159ednictv\u00edm dopl\u0148ku Hass.io"
+            },
+            "pick_implementation": {
+                "title": "Vyberte metodu ov\u011b\u0159en\u00ed"
             }
         }
     }
diff --git a/homeassistant/components/almond/translations/en.json b/homeassistant/components/almond/translations/en.json
index 01608d56faf..909ebc6f601 100644
--- a/homeassistant/components/almond/translations/en.json
+++ b/homeassistant/components/almond/translations/en.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_setup": "You can only configure one Almond account.",
-            "cannot_connect": "Unable to connect to the Almond server.",
-            "missing_configuration": "Please check the documentation on how to set up Almond.",
-            "no_url_available": "No URL available. For information about this error, [check the help section]({docs_url})"
+            "cannot_connect": "Failed to connect",
+            "missing_configuration": "The component is not configured. Please follow the documentation.",
+            "no_url_available": "No URL available. For information about this error, [check the help section]({docs_url})",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "hassio_confirm": {
diff --git a/homeassistant/components/almond/translations/es.json b/homeassistant/components/almond/translations/es.json
index 94b1f4ea6ba..0da3c878b48 100644
--- a/homeassistant/components/almond/translations/es.json
+++ b/homeassistant/components/almond/translations/es.json
@@ -4,7 +4,8 @@
             "already_setup": "S\u00f3lo puede configurar una cuenta de Almond.",
             "cannot_connect": "No se puede conectar al servidor Almond.",
             "missing_configuration": "Consulte la documentaci\u00f3n sobre c\u00f3mo configurar Almond.",
-            "no_url_available": "No hay URL disponible. Para obtener informaci\u00f3n sobre este error, [consulta la secci\u00f3n de ayuda]({docs_url})"
+            "no_url_available": "No hay URL disponible. Para obtener informaci\u00f3n sobre este error, [consulta la secci\u00f3n de ayuda]({docs_url})",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "step": {
             "hassio_confirm": {
diff --git a/homeassistant/components/almond/translations/et.json b/homeassistant/components/almond/translations/et.json
new file mode 100644
index 00000000000..f5fa4a7d975
--- /dev/null
+++ b/homeassistant/components/almond/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Saad h\u00e4\u00e4lestada ainult \u00fche Almondi konto.",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "missing_configuration": "Osis on seadistamata. Vaata dokumentatsiooni.",
+            "no_url_available": "URL pole saadaval. Rohkem teavet [spikrijaotis]({docs_url})",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "hassio_confirm": {
+                "description": "Kas soovid seadistada Home Assistant-i \u00fchendust Almondiga mida pakub Hass.io lisandmoodul: {addon} ?",
+                "title": "Almond Hass.io lisandmooduli kaudu"
+            },
+            "pick_implementation": {
+                "title": "Vali tuvastusmeetod"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/almond/translations/it.json b/homeassistant/components/almond/translations/it.json
index 6bf280230a4..e3522ed0c29 100644
--- a/homeassistant/components/almond/translations/it.json
+++ b/homeassistant/components/almond/translations/it.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_setup": "\u00c8 possibile configurare un solo account Almond.",
-            "cannot_connect": "Impossibile connettersi al server Almond.",
-            "missing_configuration": "Si prega di controllare la documentazione su come impostare Almond.",
-            "no_url_available": "Nessun URL disponibile. Per informazioni su questo errore, [controlla la sezione della guida]({docs_url})"
+            "cannot_connect": "Impossibile connettersi",
+            "missing_configuration": "Il componente non \u00e8 configurato. Si prega di seguire la documentazione.",
+            "no_url_available": "Nessun URL disponibile. Per informazioni su questo errore, [controlla la sezione della guida]({docs_url})",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "hassio_confirm": {
diff --git a/homeassistant/components/almond/translations/nl.json b/homeassistant/components/almond/translations/nl.json
index da4671f8591..59caf8a1144 100644
--- a/homeassistant/components/almond/translations/nl.json
+++ b/homeassistant/components/almond/translations/nl.json
@@ -4,7 +4,8 @@
             "already_setup": "U kunt slechts \u00e9\u00e9n Almond-account configureren.",
             "cannot_connect": "Kan geen verbinding maken met de Almond-server.",
             "missing_configuration": "Raadpleeg de documentatie over het instellen van Almond.",
-            "no_url_available": "Geen URL beschikbaar. Voor informatie over deze fout, [check de helpsectie]({docs_url})"
+            "no_url_available": "Geen URL beschikbaar. Voor informatie over deze fout, [check de helpsectie]({docs_url})",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "step": {
             "hassio_confirm": {
diff --git a/homeassistant/components/almond/translations/no.json b/homeassistant/components/almond/translations/no.json
index c9da3b2303c..15052133615 100644
--- a/homeassistant/components/almond/translations/no.json
+++ b/homeassistant/components/almond/translations/no.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_setup": "Du kan bare konfigurere en Almond konto.",
-            "cannot_connect": "Kan ikke koble til Almond-serveren.",
-            "missing_configuration": "Vennligst sjekk dokumentasjonen om hvordan du setter opp Almond.",
-            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk {docs_url} ] ( {docs_url} )"
+            "cannot_connect": "Tilkobling mislyktes",
+            "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
+            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk hjelpseksjonen]({docs_url})",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "hassio_confirm": {
diff --git a/homeassistant/components/almond/translations/pl.json b/homeassistant/components/almond/translations/pl.json
index b9fc05c1b42..7fea4c52ae3 100644
--- a/homeassistant/components/almond/translations/pl.json
+++ b/homeassistant/components/almond/translations/pl.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Almond.",
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z serwerem Almond.",
-            "missing_configuration": "Prosz\u0119 zapozna\u0107 si\u0119 z dokumentacj\u0105 konfiguracji Almond."
+            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Almond",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_url_available": "Brak dost\u0119pnego adresu URL. Aby uzyska\u0107 informacje na temat tego b\u0142\u0119du, [sprawd\u017a sekcj\u0119 pomocy] ({docs_url})",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "hassio_confirm": {
-                "description": "Czy chcesz skonfigurowa\u0107 Home Assistanta, aby \u0142\u0105czy\u0142 si\u0119 z Almond dostarczonym przez dodatek Hass.io: {addon}?",
+                "description": "Czy chcesz skonfigurowa\u0107 Home Assistant, aby \u0142\u0105czy\u0142 si\u0119 z Almond dostarczonym przez dodatek Hass.io: {addon}?",
                 "title": "Almond poprzez dodatek Hass.io"
             },
             "pick_implementation": {
diff --git a/homeassistant/components/almond/translations/ru.json b/homeassistant/components/almond/translations/ru.json
index 3039ecc2d41..5a5d6a4c5c4 100644
--- a/homeassistant/components/almond/translations/ru.json
+++ b/homeassistant/components/almond/translations/ru.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 Almond.",
-            "missing_configuration": "\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438 \u043f\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0435 Almond.",
-            "no_url_available": "URL-\u0430\u0434\u0440\u0435\u0441 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d. \u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u0435\u0439]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e\u0431 \u044d\u0442\u043e\u0439 \u043e\u0448\u0438\u0431\u043a\u0435."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "missing_configuration": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
+            "no_url_available": "URL-\u0430\u0434\u0440\u0435\u0441 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d. \u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u0435\u0439]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e\u0431 \u044d\u0442\u043e\u0439 \u043e\u0448\u0438\u0431\u043a\u0435.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "hassio_confirm": {
diff --git a/homeassistant/components/almond/translations/zh-Hant.json b/homeassistant/components/almond/translations/zh-Hant.json
index d5ea73a873d..329362fdbc3 100644
--- a/homeassistant/components/almond/translations/zh-Hant.json
+++ b/homeassistant/components/almond/translations/zh-Hant.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44 Almond \u5e33\u865f\u3002",
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 Almond \u4f3a\u670d\u5668\u3002",
-            "missing_configuration": "\u8acb\u53c3\u8003\u76f8\u95dc\u6587\u4ef6\u4ee5\u4e86\u89e3\u5982\u4f55\u8a2d\u5b9a Almond\u3002",
-            "no_url_available": "\u6c92\u6709\u53ef\u7528\u7684\u7db2\u5740\u3002\u95dc\u65bc\u6b64\u932f\u8aa4\u66f4\u8a73\u7d30\u8a0a\u606f\uff0c[\u9ede\u9078\u5354\u52a9\u7ae0\u7bc0]({docs_url})"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
+            "no_url_available": "\u6c92\u6709\u53ef\u7528\u7684\u7db2\u5740\u3002\u95dc\u65bc\u6b64\u932f\u8aa4\u66f4\u8a73\u7d30\u8a0a\u606f\uff0c[\u9ede\u9078\u5354\u52a9\u7ae0\u7bc0]({docs_url})",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "hassio_confirm": {
diff --git a/homeassistant/components/ambiclimate/__init__.py b/homeassistant/components/ambiclimate/__init__.py
index 490c41255bf..e9247b9fd73 100644
--- a/homeassistant/components/ambiclimate/__init__.py
+++ b/homeassistant/components/ambiclimate/__init__.py
@@ -1,6 +1,4 @@
 """Support for Ambiclimate devices."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
@@ -9,8 +7,6 @@ from homeassistant.helpers import config_validation as cv
 from . import config_flow
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: vol.Schema(
diff --git a/homeassistant/components/ambiclimate/config_flow.py b/homeassistant/components/ambiclimate/config_flow.py
index 2b88e7ab91e..85504971489 100644
--- a/homeassistant/components/ambiclimate/config_flow.py
+++ b/homeassistant/components/ambiclimate/config_flow.py
@@ -53,20 +53,20 @@ class AmbiclimateFlowHandler(config_entries.ConfigFlow):
     async def async_step_user(self, user_input=None):
         """Handle external yaml configuration."""
         if self.hass.config_entries.async_entries(DOMAIN):
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="already_configured")
 
         config = self.hass.data.get(DATA_AMBICLIMATE_IMPL, {})
 
         if not config:
             _LOGGER.debug("No config")
-            return self.async_abort(reason="no_config")
+            return self.async_abort(reason="missing_configuration")
 
         return await self.async_step_auth()
 
     async def async_step_auth(self, user_input=None):
         """Handle a flow start."""
         if self.hass.config_entries.async_entries(DOMAIN):
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="already_configured")
 
         errors = {}
 
@@ -88,7 +88,7 @@ class AmbiclimateFlowHandler(config_entries.ConfigFlow):
     async def async_step_code(self, code=None):
         """Received code for authentication."""
         if self.hass.config_entries.async_entries(DOMAIN):
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="already_configured")
 
         token_info = await self._get_token_info(code)
 
diff --git a/homeassistant/components/ambiclimate/strings.json b/homeassistant/components/ambiclimate/strings.json
index 26af78f8915..b08b8919da2 100644
--- a/homeassistant/components/ambiclimate/strings.json
+++ b/homeassistant/components/ambiclimate/strings.json
@@ -7,15 +7,15 @@
       }
     },
     "create_entry": {
-      "default": "Successfully authenticated with Ambiclimate"
+      "default": "[%key:common::config_flow::create_entry::authenticated%]"
     },
     "error": {
       "no_token": "Not authenticated with Ambiclimate",
       "follow_link": "Please follow the link and authenticate before pressing Submit"
     },
     "abort": {
-      "already_setup": "The Ambiclimate account is configured.",
-      "no_config": "You need to configure Ambiclimate before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/ambiclimate/).",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
       "access_token": "Unknown error generating an access token."
     }
   }
diff --git a/homeassistant/components/ambiclimate/translations/ca.json b/homeassistant/components/ambiclimate/translations/ca.json
index 64ea45410d3..0740082cc05 100644
--- a/homeassistant/components/ambiclimate/translations/ca.json
+++ b/homeassistant/components/ambiclimate/translations/ca.json
@@ -2,11 +2,15 @@
     "config": {
         "abort": {
             "access_token": "S'ha produ\u00eft un error desconegut al generat un token d'acc\u00e9s.",
+            "already_configured": "El compte ja ha estat configurat",
+            "already_configured_account": "El compte ja ha estat configurat",
             "already_setup": "El compte d'Ambi Climate est\u00e0 configurat.",
-            "no_config": "Necessites configurar Ambiclimate abans de poder autenticar-t'hi. Llegeix les [instruccions](https://www.home-assistant.io/components/ambiclimate/)."
+            "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
+            "no_config": "Necessites configurar Ambiclimate abans de poder autenticar-t'hi. Llegeix les [instruccions](https://www.home-assistant.io/components/ambiclimate/).",
+            "oauth2_missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3."
         },
         "create_entry": {
-            "default": "Autenticaci\u00f3 exitosa amb Ambi Climate."
+            "default": "Autenticaci\u00f3 exitosa"
         },
         "error": {
             "follow_link": "V\u00e9s a l'enlla\u00e7 i autentica't abans de pr\u00e9mer Envia",
diff --git a/homeassistant/components/ambiclimate/translations/cs.json b/homeassistant/components/ambiclimate/translations/cs.json
index 2f2369429fe..a4ad6495510 100644
--- a/homeassistant/components/ambiclimate/translations/cs.json
+++ b/homeassistant/components/ambiclimate/translations/cs.json
@@ -1,5 +1,16 @@
 {
     "config": {
+        "abort": {
+            "access_token": "Nezn\u00e1m\u00e1 chyba p\u0159i generov\u00e1n\u00ed p\u0159\u00edstupov\u00e9ho tokenu.",
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "already_configured_account": "\u00da\u010det je ji\u017e nastaven",
+            "already_setup": "\u00da\u010det Ambiclimate je nastaven.",
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "oauth2_missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace."
+        },
+        "create_entry": {
+            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno"
+        },
         "error": {
             "follow_link": "N\u00e1sledujte odkaz a prove\u010fte ov\u011b\u0159en\u00ed p\u0159ed stisknut\u00edm tla\u010d\u00edtka Odeslat.",
             "no_token": "Nen\u00ed ov\u011b\u0159en s Ambiclimate"
diff --git a/homeassistant/components/ambiclimate/translations/en.json b/homeassistant/components/ambiclimate/translations/en.json
index 177ecd2907f..741c3de75b5 100644
--- a/homeassistant/components/ambiclimate/translations/en.json
+++ b/homeassistant/components/ambiclimate/translations/en.json
@@ -2,11 +2,15 @@
     "config": {
         "abort": {
             "access_token": "Unknown error generating an access token.",
+            "already_configured": "Account is already configured",
+            "already_configured_account": "Account is already configured",
             "already_setup": "The Ambiclimate account is configured.",
-            "no_config": "You need to configure Ambiclimate before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/ambiclimate/)."
+            "missing_configuration": "The component is not configured. Please follow the documentation.",
+            "no_config": "You need to configure Ambiclimate before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/ambiclimate/).",
+            "oauth2_missing_configuration": "The component is not configured. Please follow the documentation."
         },
         "create_entry": {
-            "default": "Successfully authenticated with Ambiclimate"
+            "default": "Successfully authenticated"
         },
         "error": {
             "follow_link": "Please follow the link and authenticate before pressing Submit",
diff --git a/homeassistant/components/ambiclimate/translations/es.json b/homeassistant/components/ambiclimate/translations/es.json
index 01d6643b634..ba5a53de2ae 100644
--- a/homeassistant/components/ambiclimate/translations/es.json
+++ b/homeassistant/components/ambiclimate/translations/es.json
@@ -2,8 +2,10 @@
     "config": {
         "abort": {
             "access_token": "Error desconocido al generar un token de acceso.",
+            "already_configured_account": "La cuenta ya ha sido configurada",
             "already_setup": "La cuenta de Ambiclimate est\u00e1 configurada.",
-            "no_config": "Es necesario configurar Ambiclimate antes de poder autenticarse con \u00e9l. [Por favor, lee las instrucciones](https://www.home-assistant.io/components/ambiclimate/)."
+            "no_config": "Es necesario configurar Ambiclimate antes de poder autenticarse con \u00e9l. [Por favor, lee las instrucciones](https://www.home-assistant.io/components/ambiclimate/).",
+            "oauth2_missing_configuration": "El componente no est\u00e1 configurado. Consulta la documentaci\u00f3n."
         },
         "create_entry": {
             "default": "Autenticado correctamente con Ambiclimate"
diff --git a/homeassistant/components/ambiclimate/translations/et.json b/homeassistant/components/ambiclimate/translations/et.json
new file mode 100644
index 00000000000..1571a11e695
--- /dev/null
+++ b/homeassistant/components/ambiclimate/translations/et.json
@@ -0,0 +1,26 @@
+{
+    "config": {
+        "abort": {
+            "access_token": "Tundmatu t\u00f5rge juurdep\u00e4\u00e4suloa loomisel.",
+            "already_configured": "Konto on juba seadistatud",
+            "already_configured_account": "Kasutaja on juba lisatud",
+            "already_setup": "Ambiclimate'i konto on seadistatud.",
+            "missing_configuration": "Osis pole seadistatud. Palun vaata dokumentatsiooni.",
+            "no_config": "Enne autentimist pead konfigureerima Ambiclimate konto. [Palun loe juhiseid] (https://www.home-assistant.io/components/ambiclimate/) (https://www.home-assistant.io/components/ambiclimate/).",
+            "oauth2_missing_configuration": "Osis pole h\u00e4\u00e4lestatud. Lisainfot saad dokumentatsioonist."
+        },
+        "create_entry": {
+            "default": "Ambiclimate autentimine \u00f5nnestus"
+        },
+        "error": {
+            "follow_link": "Enne Esita nupu  vajutamist j\u00e4rgige linki ja autentige",
+            "no_token": "Ambiclimate ei ole autenditud"
+        },
+        "step": {
+            "auth": {
+                "description": "J\u00e4rgi seda linki [link] ( {authorization_url} ) ja ** Luba** juurdep\u00e4\u00e4s oma Ambiclimate'i kontole, siis tule tagasi ja vajuta allolevat nuppu ** Esita **.\n (Veendu, et m\u00e4\u00e4ratud tagasihelistamise URL on {cb_url} )",
+                "title": "Autendi Ambiclimate"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ambiclimate/translations/fr.json b/homeassistant/components/ambiclimate/translations/fr.json
index 9c5864fcb0f..879a02d38d0 100644
--- a/homeassistant/components/ambiclimate/translations/fr.json
+++ b/homeassistant/components/ambiclimate/translations/fr.json
@@ -2,8 +2,10 @@
     "config": {
         "abort": {
             "access_token": "Erreur inconnue lors de la g\u00e9n\u00e9ration d'un jeton d'acc\u00e8s.",
+            "already_configured_account": "Le compte a d\u00e9j\u00e0 \u00e9t\u00e9 configur\u00e9",
             "already_setup": "Le compte Ambiclimate est configur\u00e9.",
-            "no_config": "Vous devez configurer Ambiclimate avant de pouvoir vous authentifier aupr\u00e8s de celui-ci. [Veuillez lire les instructions] (https://www.home-assistant.io/components/ambiclimate/)."
+            "no_config": "Vous devez configurer Ambiclimate avant de pouvoir vous authentifier aupr\u00e8s de celui-ci. [Veuillez lire les instructions] (https://www.home-assistant.io/components/ambiclimate/).",
+            "oauth2_missing_configuration": "Le composant n'est pas configur\u00e9. Veuillez suivre la documentation."
         },
         "create_entry": {
             "default": "Authentifi\u00e9 avec succ\u00e8s avec Ambiclimate"
diff --git a/homeassistant/components/ambiclimate/translations/it.json b/homeassistant/components/ambiclimate/translations/it.json
index 427aa0ab445..b53ebaab648 100644
--- a/homeassistant/components/ambiclimate/translations/it.json
+++ b/homeassistant/components/ambiclimate/translations/it.json
@@ -2,8 +2,10 @@
     "config": {
         "abort": {
             "access_token": "Errore sconosciuto durante la generazione di un token di accesso.",
+            "already_configured_account": "L'account \u00e8 gi\u00e0 configurato",
             "already_setup": "L'account Ambiclimate \u00e8 configurato.",
-            "no_config": "\u00c8 necessario configurare Ambiclimate prima di poter eseguire l'autenticazione con esso. [Leggere le istruzioni](https://www.home-assistant.io/components/ambiclimate/)."
+            "no_config": "\u00c8 necessario configurare Ambiclimate prima di poter eseguire l'autenticazione con esso. [Leggere le istruzioni](https://www.home-assistant.io/components/ambiclimate/).",
+            "oauth2_missing_configuration": "Il componente non \u00e8 configurato. Si prega di seguire la documentazione."
         },
         "create_entry": {
             "default": "Autenticato con successo con Ambiclimate"
diff --git a/homeassistant/components/ambiclimate/translations/nl.json b/homeassistant/components/ambiclimate/translations/nl.json
index e65688af89d..573cd8fecde 100644
--- a/homeassistant/components/ambiclimate/translations/nl.json
+++ b/homeassistant/components/ambiclimate/translations/nl.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "access_token": "Onbekende fout bij het genereren van een toegangstoken.",
+            "already_configured_account": "Account is al geconfigureerd",
             "already_setup": "Het Ambiclimate-account is geconfigureerd.",
             "no_config": "U moet Ambiclimate configureren voordat u zich ermee kunt authenticeren. (Lees de instructies) (https://www.home-assistant.io/components/ambiclimate/)."
         },
diff --git a/homeassistant/components/ambiclimate/translations/no.json b/homeassistant/components/ambiclimate/translations/no.json
index 3cc3f4617e7..70457f500bf 100644
--- a/homeassistant/components/ambiclimate/translations/no.json
+++ b/homeassistant/components/ambiclimate/translations/no.json
@@ -2,11 +2,15 @@
     "config": {
         "abort": {
             "access_token": "Ukjent feil ved oppretting av tilgangstoken.",
+            "already_configured": "Kontoen er allerede konfigurert",
+            "already_configured_account": "Kontoen er allerede konfigurert",
             "already_setup": "Ambiclimate-kontoen er konfigurert.",
-            "no_config": "Du m\u00e5 konfigurere Ambiclimate f\u00f8r du kan godkjenne den. [Vennligst les instruksjonene](https://www.home-assistant.io/components/ambiclimate/)."
+            "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
+            "no_config": "Du m\u00e5 konfigurere Ambiclimate f\u00f8r du kan godkjenne den. [Vennligst les instruksjonene](https://www.home-assistant.io/components/ambiclimate/).",
+            "oauth2_missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen."
         },
         "create_entry": {
-            "default": "Vellykket godkjenning med Ambiclimate"
+            "default": "Vellykket godkjenning"
         },
         "error": {
             "follow_link": "Vennligst f\u00f8lg lenken og godkjenn f\u00f8r du trykker p\u00e5 Send",
diff --git a/homeassistant/components/ambiclimate/translations/pl.json b/homeassistant/components/ambiclimate/translations/pl.json
index 69cb3f0e818..6c762de60b3 100644
--- a/homeassistant/components/ambiclimate/translations/pl.json
+++ b/homeassistant/components/ambiclimate/translations/pl.json
@@ -1,12 +1,16 @@
 {
     "config": {
         "abort": {
-            "access_token": "Nieznany b\u0142\u0105d podczas generowania tokena dost\u0119pu.",
-            "already_setup": "Konto Ambiclimate jest skonfigurowane.",
-            "no_config": "Musisz skonfigurowa\u0107 Ambiclimate, aby m\u00f3c si\u0119 z nim uwierzytelni\u0107. Zapoznaj si\u0119 z [instrukcj\u0105](https://www.home-assistant.io/components/ambiclimate/)."
+            "access_token": "Nieznany b\u0142\u0105d podczas generowania tokena dost\u0119pu",
+            "already_configured": "Konto jest ju\u017c skonfigurowane",
+            "already_configured_account": "Konto jest ju\u017c skonfigurowane",
+            "already_setup": "Konto Ambiclimate jest skonfigurowane",
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_config": "Musisz skonfigurowa\u0107 Ambiclimate, aby m\u00f3c si\u0119 z nim uwierzytelni\u0107. Zapoznaj si\u0119 z [instrukcj\u0105](https://www.home-assistant.io/components/ambiclimate/)",
+            "oauth2_missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105."
         },
         "create_entry": {
-            "default": "Pomy\u015blnie uwierzytelniono z Ambiclimate"
+            "default": "Pomy\u015blnie uwierzytelniono"
         },
         "error": {
             "follow_link": "Prosz\u0119 klikn\u0105\u0107 link i uwierzytelni\u0107 przed naci\u015bni\u0119ciem przycisku \"Zatwierd\u017a\"",
@@ -14,7 +18,7 @@
         },
         "step": {
             "auth": {
-                "description": "Kliknij poni\u017cszy [link]({authorization_url}) i <b>Zezw\u00f3l</b> na dost\u0119p do konta Ambiclimate, a nast\u0119pnie wr\u00f3\u0107 i naci\u015bnij <b>Zatwierd\u017a</b> poni\u017cej. \n(Upewnij si\u0119, \u017ce podany adres URL to {cb_url})",
+                "description": "Kliknij poni\u017cszy [link]({authorization_url}) i **Zezw\u00f3l** na dost\u0119p do konta Ambiclimate, a nast\u0119pnie wr\u00f3\u0107 i naci\u015bnij **Zatwierd\u017a** poni\u017cej.\n(Upewnij si\u0119, \u017ce podany adres \"URL callback\" to {cb_url})",
                 "title": "Uwierzytelnienie Ambiclimate"
             }
         }
diff --git a/homeassistant/components/ambiclimate/translations/ru.json b/homeassistant/components/ambiclimate/translations/ru.json
index 7a440f28bed..e4558d11008 100644
--- a/homeassistant/components/ambiclimate/translations/ru.json
+++ b/homeassistant/components/ambiclimate/translations/ru.json
@@ -2,8 +2,12 @@
     "config": {
         "abort": {
             "access_token": "\u041f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u0442\u043e\u043a\u0435\u043d\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430.",
+            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
+            "already_configured_account": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "already_setup": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
-            "no_config": "\u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 Ambiclimate \u043f\u0435\u0440\u0435\u0434 \u043f\u0440\u043e\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0435\u043c \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438](https://www.home-assistant.io/components/ambiclimate/)."
+            "missing_configuration": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
+            "no_config": "\u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 Ambiclimate \u043f\u0435\u0440\u0435\u0434 \u043f\u0440\u043e\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0435\u043c \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438](https://www.home-assistant.io/components/ambiclimate/).",
+            "oauth2_missing_configuration": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438."
         },
         "create_entry": {
             "default": "\u0410\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0439\u0434\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
diff --git a/homeassistant/components/ambiclimate/translations/zh-Hans.json b/homeassistant/components/ambiclimate/translations/zh-Hans.json
new file mode 100644
index 00000000000..df2d0ac6af9
--- /dev/null
+++ b/homeassistant/components/ambiclimate/translations/zh-Hans.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u8d26\u53f7\u5df2\u7ecf\u8bbe\u7f6e\u5b8c\u6210",
+            "missing_configuration": "\u7ec4\u4ef6\u5c1a\u672a\u914d\u7f6e\u3002\u8bf7\u53c2\u89c2\u6587\u4ef6\u8bf4\u660e\u3002"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ambiclimate/translations/zh-Hant.json b/homeassistant/components/ambiclimate/translations/zh-Hant.json
index 7b995d09944..d596e5b30d0 100644
--- a/homeassistant/components/ambiclimate/translations/zh-Hant.json
+++ b/homeassistant/components/ambiclimate/translations/zh-Hant.json
@@ -2,11 +2,15 @@
     "config": {
         "abort": {
             "access_token": "\u7522\u751f\u5b58\u53d6\u8a8d\u8b49\u78bc\u672a\u77e5\u932f\u8aa4\u3002",
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured_account": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "already_setup": "Ambiclimate \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "no_config": "\u5fc5\u9808\u5148\u8a2d\u5b9a Ambiclimate \u65b9\u80fd\u9032\u884c\u8a8d\u8b49\u3002[\u8acb\u53c3\u95b1\u6559\u5b78\u6307\u5f15]\uff08https://www.home-assistant.io/components/ambiclimate/\uff09\u3002"
+            "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
+            "no_config": "\u5fc5\u9808\u5148\u8a2d\u5b9a Ambiclimate \u65b9\u80fd\u9032\u884c\u8a8d\u8b49\u3002[\u8acb\u53c3\u95b1\u6559\u5b78\u6307\u5f15]\uff08https://www.home-assistant.io/components/ambiclimate/\uff09\u3002",
+            "oauth2_missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002"
         },
         "create_entry": {
-            "default": "\u5df2\u6210\u529f\u8a8d\u8b49 Ambiclimate \u8a2d\u5099\u3002"
+            "default": "\u5df2\u6210\u529f\u8a8d\u8b49"
         },
         "error": {
             "follow_link": "\u8acb\u65bc\u50b3\u9001\u524d\uff0c\u5148\u4f7f\u7528\u9023\u7d50\u4e26\u9032\u884c\u8a8d\u8b49\u3002",
diff --git a/homeassistant/components/ambient_station/__init__.py b/homeassistant/components/ambient_station/__init__.py
index 68bfb85cf62..23c0ad6e3dd 100644
--- a/homeassistant/components/ambient_station/__init__.py
+++ b/homeassistant/components/ambient_station/__init__.py
@@ -311,9 +311,10 @@ async def async_setup_entry(hass, config_entry):
         _LOGGER.error("Config entry failed: %s", err)
         raise ConfigEntryNotReady from err
 
-    hass.bus.async_listen_once(
-        EVENT_HOMEASSISTANT_STOP, ambient.client.websocket.disconnect()
-    )
+    async def _async_disconnect_websocket(*_):
+        await ambient.client.websocket.disconnect()
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _async_disconnect_websocket)
 
     return True
 
diff --git a/homeassistant/components/ambient_station/binary_sensor.py b/homeassistant/components/ambient_station/binary_sensor.py
index 5aba9d637d4..0a3a91e515c 100644
--- a/homeassistant/components/ambient_station/binary_sensor.py
+++ b/homeassistant/components/ambient_station/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Ambient Weather Station binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.const import ATTR_NAME
 from homeassistant.core import callback
@@ -28,8 +26,6 @@ from .const import (
     TYPE_BINARY_SENSOR,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up Ambient PWS binary sensors based on a config entry."""
diff --git a/homeassistant/components/ambient_station/sensor.py b/homeassistant/components/ambient_station/sensor.py
index b3b76715368..540e2facd4d 100644
--- a/homeassistant/components/ambient_station/sensor.py
+++ b/homeassistant/components/ambient_station/sensor.py
@@ -1,6 +1,4 @@
 """Support for Ambient Weather Station sensors."""
-import logging
-
 from homeassistant.const import ATTR_NAME
 from homeassistant.core import callback
 
@@ -18,8 +16,6 @@ from .const import (
     TYPE_SENSOR,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up Ambient PWS sensors based on a config entry."""
diff --git a/homeassistant/components/ambient_station/strings.json b/homeassistant/components/ambient_station/strings.json
index 54b3dd05511..a9bce82e10b 100644
--- a/homeassistant/components/ambient_station/strings.json
+++ b/homeassistant/components/ambient_station/strings.json
@@ -10,11 +10,11 @@
       }
     },
     "error": {
-      "invalid_key": "Invalid API Key and/or Application Key",
+      "invalid_key": "[%key:common::config_flow::error::invalid_api_key%]",
       "no_devices": "No devices found in account"
     },
     "abort": {
-      "already_configured": "This app key is already in use."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/ambient_station/translations/ca.json b/homeassistant/components/ambient_station/translations/ca.json
index 87934f8e90c..31a32da995e 100644
--- a/homeassistant/components/ambient_station/translations/ca.json
+++ b/homeassistant/components/ambient_station/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquesta clau d'aplicaci\u00f3 ja est\u00e0 en \u00fas."
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "error": {
-            "invalid_key": "Clau API i/o clau d'aplicaci\u00f3 inv\u00e0lida/es",
+            "invalid_key": "Clau API inv\u00e0lida",
             "no_devices": "No s'ha trobat cap dispositiu al compte"
         },
         "step": {
diff --git a/homeassistant/components/ambient_station/translations/cs.json b/homeassistant/components/ambient_station/translations/cs.json
index 757cf90e1e2..425bc3ba191 100644
--- a/homeassistant/components/ambient_station/translations/cs.json
+++ b/homeassistant/components/ambient_station/translations/cs.json
@@ -1,10 +1,19 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "error": {
+            "invalid_key": "Neplatn\u00fd kl\u00ed\u010d API",
+            "no_devices": "V \u00fa\u010dtu nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed"
+        },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Kl\u00ed\u010d API"
-                }
+                    "api_key": "Kl\u00ed\u010d API",
+                    "app_key": "Kl\u00ed\u010d aplikace"
+                },
+                "title": "Vypl\u0148te sv\u00e9 \u00fadaje"
             }
         }
     }
diff --git a/homeassistant/components/ambient_station/translations/en.json b/homeassistant/components/ambient_station/translations/en.json
index 10b7eebc38a..45e01462fc5 100644
--- a/homeassistant/components/ambient_station/translations/en.json
+++ b/homeassistant/components/ambient_station/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This app key is already in use."
+            "already_configured": "Service is already configured"
         },
         "error": {
-            "invalid_key": "Invalid API Key and/or Application Key",
+            "invalid_key": "Invalid API key",
             "no_devices": "No devices found in account"
         },
         "step": {
diff --git a/homeassistant/components/ambient_station/translations/es.json b/homeassistant/components/ambient_station/translations/es.json
index 12272affdf1..90e93e519b7 100644
--- a/homeassistant/components/ambient_station/translations/es.json
+++ b/homeassistant/components/ambient_station/translations/es.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Esta clave API ya est\u00e1 en uso."
+            "already_configured": "El servicio ya est\u00e1 configurado"
         },
         "error": {
-            "invalid_key": "Clave API y/o clave de aplicaci\u00f3n no v\u00e1lida",
+            "invalid_key": "Clave API no v\u00e1lida",
             "no_devices": "No se han encontrado dispositivos en la cuenta"
         },
         "step": {
diff --git a/homeassistant/components/ambient_station/translations/et.json b/homeassistant/components/ambient_station/translations/et.json
new file mode 100644
index 00000000000..211e55dd0cf
--- /dev/null
+++ b/homeassistant/components/ambient_station/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        },
+        "error": {
+            "invalid_key": "Vale API v\u00f5ti",
+            "no_devices": "Kontolt ei leitud \u00fchtegi seadet"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API v\u00f5ti",
+                    "app_key": "API v\u00f5ti"
+                },
+                "title": "Sisesta oma teave"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ambient_station/translations/it.json b/homeassistant/components/ambient_station/translations/it.json
index ceecb5363c8..8984314349c 100644
--- a/homeassistant/components/ambient_station/translations/it.json
+++ b/homeassistant/components/ambient_station/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questa chiave dell'app \u00e8 gi\u00e0 in uso."
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "invalid_key": "API Key e/o Application Key non valida",
+            "invalid_key": "Chiave API non valida",
             "no_devices": "Nessun dispositivo trovato nell'account"
         },
         "step": {
diff --git a/homeassistant/components/ambient_station/translations/no.json b/homeassistant/components/ambient_station/translations/no.json
index 972d1210f00..cf471f2c3a1 100644
--- a/homeassistant/components/ambient_station/translations/no.json
+++ b/homeassistant/components/ambient_station/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne app n\u00f8kkelen er allerede i bruk."
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "error": {
-            "invalid_key": "Ugyldig API-n\u00f8kkel og/eller programn\u00f8kkel",
+            "invalid_key": "Ugyldig API-n\u00f8kkel",
             "no_devices": "Ingen enheter funnet i kontoen"
         },
         "step": {
diff --git a/homeassistant/components/ambient_station/translations/pl.json b/homeassistant/components/ambient_station/translations/pl.json
index bb597971b0c..3fc36d82840 100644
--- a/homeassistant/components/ambient_station/translations/pl.json
+++ b/homeassistant/components/ambient_station/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ten klucz aplikacji jest ju\u017c w u\u017cyciu."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
-            "invalid_key": "Nieprawid\u0142owy klucz API i/lub klucz aplikacji",
+            "invalid_key": "Nieprawid\u0142owy klucz API",
             "no_devices": "Nie znaleziono urz\u0105dze\u0144 na koncie"
         },
         "step": {
diff --git a/homeassistant/components/ambient_station/translations/ru.json b/homeassistant/components/ambient_station/translations/ru.json
index a78bfbe3049..83074006641 100644
--- a/homeassistant/components/ambient_station/translations/ru.json
+++ b/homeassistant/components/ambient_station/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u042d\u0442\u043e\u0442 \u043a\u043b\u044e\u0447 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
-            "invalid_key": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API \u0438/\u0438\u043b\u0438 \u043a\u043b\u044e\u0447 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f.",
+            "invalid_key": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API.",
             "no_devices": "\u0412 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b."
         },
         "step": {
diff --git a/homeassistant/components/ambient_station/translations/zh-Hant.json b/homeassistant/components/ambient_station/translations/zh-Hant.json
index f14d177e899..51f0033b954 100644
--- a/homeassistant/components/ambient_station/translations/zh-Hant.json
+++ b/homeassistant/components/ambient_station/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u61c9\u7528\u7a0b\u5f0f\u5bc6\u9470\u5df2\u88ab\u4f7f\u7528\u3002"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "invalid_key": "API \u5bc6\u9470\u53ca/\u6216\u61c9\u7528\u5bc6\u9470\u7121\u6548",
+            "invalid_key": "API \u5bc6\u9470\u7121\u6548",
             "no_devices": "\u5e33\u865f\u4e2d\u627e\u4e0d\u5230\u4efb\u4f55\u8a2d\u5099"
         },
         "step": {
diff --git a/homeassistant/components/android_ip_webcam/__init__.py b/homeassistant/components/android_ip_webcam/__init__.py
index 333da7dceea..905d0262862 100644
--- a/homeassistant/components/android_ip_webcam/__init__.py
+++ b/homeassistant/components/android_ip_webcam/__init__.py
@@ -1,7 +1,6 @@
 """Support for Android IP Webcam."""
 import asyncio
 from datetime import timedelta
-import logging
 
 from pydroid_ipcam import PyDroidIPCam
 import voluptuous as vol
@@ -31,8 +30,6 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util.dt import utcnow
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_AUD_CONNS = "Audio Connections"
 ATTR_HOST = "host"
 ATTR_VID_CONNS = "Video Connections"
diff --git a/homeassistant/components/androidtv/manifest.json b/homeassistant/components/androidtv/manifest.json
index f6c773941f1..902688742ba 100644
--- a/homeassistant/components/androidtv/manifest.json
+++ b/homeassistant/components/androidtv/manifest.json
@@ -4,7 +4,7 @@
   "documentation": "https://www.home-assistant.io/integrations/androidtv",
   "requirements": [
     "adb-shell[async]==0.2.1",
-    "androidtv[async]==0.0.50",
+    "androidtv[async]==0.0.52",
     "pure-python-adb[async]==0.3.0.dev0"
   ],
   "codeowners": ["@JeffLIrion"]
diff --git a/homeassistant/components/androidtv/media_player.py b/homeassistant/components/androidtv/media_player.py
index e64581f9a05..b13a2000e5b 100644
--- a/homeassistant/components/androidtv/media_player.py
+++ b/homeassistant/components/androidtv/media_player.py
@@ -476,11 +476,6 @@ class ADBDevice(MediaPlayerEntity):
         """Return the device name."""
         return self._name
 
-    @property
-    def should_poll(self):
-        """Device should be polled."""
-        return True
-
     @property
     def source(self):
         """Return the current app."""
diff --git a/homeassistant/components/anel_pwrctrl/switch.py b/homeassistant/components/anel_pwrctrl/switch.py
index c769f51d5b6..0669a3bb6c6 100644
--- a/homeassistant/components/anel_pwrctrl/switch.py
+++ b/homeassistant/components/anel_pwrctrl/switch.py
@@ -66,11 +66,6 @@ class PwrCtrlSwitch(SwitchEntity):
         self._port = port
         self._parent_device = parent_device
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def unique_id(self):
         """Return the unique ID of the device."""
diff --git a/homeassistant/components/apache_kafka/__init__.py b/homeassistant/components/apache_kafka/__init__.py
index 52f57a4b753..5be3732757f 100644
--- a/homeassistant/components/apache_kafka/__init__.py
+++ b/homeassistant/components/apache_kafka/__init__.py
@@ -1,7 +1,6 @@
 """Support for Apache Kafka."""
 from datetime import datetime
 import json
-import logging
 
 from aiokafka import AIOKafkaProducer
 import voluptuous as vol
@@ -20,8 +19,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entityfilter import FILTER_SCHEMA
 from homeassistant.util import ssl as ssl_util
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "apache_kafka"
 
 CONF_FILTER = "filter"
@@ -63,7 +60,7 @@ async def async_setup(hass, config):
         conf.get(CONF_PASSWORD),
     )
 
-    hass.bus.async_listen(EVENT_HOMEASSISTANT_STOP, kafka.shutdown())
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, kafka.shutdown)
 
     await kafka.start()
 
@@ -133,7 +130,7 @@ class KafkaManager:
         self._hass.bus.async_listen(EVENT_STATE_CHANGED, self.write)
         await self._producer.start()
 
-    async def shutdown(self):
+    async def shutdown(self, _):
         """Shut the manager down."""
         await self._producer.stop()
 
diff --git a/homeassistant/components/api/__init__.py b/homeassistant/components/api/__init__.py
index 34d899e996c..72fb2636067 100644
--- a/homeassistant/components/api/__init__.py
+++ b/homeassistant/components/api/__init__.py
@@ -410,7 +410,7 @@ class APITemplateView(HomeAssistantView):
         try:
             data = await request.json()
             tpl = template.Template(data["template"], request.app["hass"])
-            return tpl.async_render(data.get("variables"))
+            return tpl.async_render(variables=data.get("variables"), parse_result=False)
         except (ValueError, TemplateError) as ex:
             return self.json_message(
                 f"Error rendering template: {ex}", HTTP_BAD_REQUEST
diff --git a/homeassistant/components/apns/notify.py b/homeassistant/components/apns/notify.py
index 59b2a7aa9fa..24d666fa59b 100644
--- a/homeassistant/components/apns/notify.py
+++ b/homeassistant/components/apns/notify.py
@@ -229,7 +229,7 @@ class ApnsNotificationService(BaseNotificationService):
         if isinstance(message, str):
             rendered_message = message
         elif isinstance(message, template_helper.Template):
-            rendered_message = message.render()
+            rendered_message = message.render(parse_result=False)
         else:
             rendered_message = ""
 
diff --git a/homeassistant/components/aqualogic/sensor.py b/homeassistant/components/aqualogic/sensor.py
index 138a4ecc8c8..f92cd11c011 100644
--- a/homeassistant/components/aqualogic/sensor.py
+++ b/homeassistant/components/aqualogic/sensor.py
@@ -1,5 +1,4 @@
 """Support for AquaLogic sensors."""
-import logging
 
 import voluptuous as vol
 
@@ -17,8 +16,6 @@ from homeassistant.helpers.entity import Entity
 
 from . import DOMAIN, UPDATE_TOPIC
 
-_LOGGER = logging.getLogger(__name__)
-
 TEMP_UNITS = [TEMP_CELSIUS, TEMP_FAHRENHEIT]
 PERCENT_UNITS = [PERCENTAGE, PERCENTAGE]
 SALT_UNITS = ["g/L", "PPM"]
diff --git a/homeassistant/components/aqualogic/switch.py b/homeassistant/components/aqualogic/switch.py
index 94822eaef18..08bba4cbd2d 100644
--- a/homeassistant/components/aqualogic/switch.py
+++ b/homeassistant/components/aqualogic/switch.py
@@ -1,6 +1,4 @@
 """Support for AquaLogic switches."""
-import logging
-
 from aqualogic.core import States
 import voluptuous as vol
 
@@ -10,8 +8,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import DOMAIN, UPDATE_TOPIC
 
-_LOGGER = logging.getLogger(__name__)
-
 SWITCH_TYPES = {
     "lights": "Lights",
     "filter": "Filter",
diff --git a/homeassistant/components/arcam_fmj/config_flow.py b/homeassistant/components/arcam_fmj/config_flow.py
index 2a9f1946cb4..d270af9295b 100644
--- a/homeassistant/components/arcam_fmj/config_flow.py
+++ b/homeassistant/components/arcam_fmj/config_flow.py
@@ -1,5 +1,4 @@
 """Config flow to configure the Arcam FMJ component."""
-import logging
 from urllib.parse import urlparse
 
 from arcam.fmj.client import Client, ConnectionFailed
@@ -13,8 +12,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DEFAULT_NAME, DEFAULT_PORT, DOMAIN, DOMAIN_DATA_ENTRIES
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def get_entry_client(hass, entry):
     """Retrieve client associated with a config entry."""
@@ -37,7 +34,7 @@ class ArcamFmjFlowHandler(config_entries.ConfigFlow):
         try:
             await client.start()
         except ConnectionFailed:
-            return self.async_abort(reason="unable_to_connect")
+            return self.async_abort(reason="cannot_connect")
         finally:
             await client.stop()
 
diff --git a/homeassistant/components/arcam_fmj/device_trigger.py b/homeassistant/components/arcam_fmj/device_trigger.py
index 40feb63f9f3..c03a082c149 100644
--- a/homeassistant/components/arcam_fmj/device_trigger.py
+++ b/homeassistant/components/arcam_fmj/device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     CONF_PLATFORM,
     CONF_TYPE,
 )
-from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
+from homeassistant.core import CALLBACK_TYPE, Event, HassJob, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry
 from homeassistant.helpers.typing import ConfigType
 
@@ -57,6 +57,7 @@ async def async_attach_trigger(
 ) -> CALLBACK_TYPE:
     """Attach a trigger."""
     config = TRIGGER_SCHEMA(config)
+    job = HassJob(action)
 
     if config[CONF_TYPE] == "turn_on":
         entity_id = config[CONF_ENTITY_ID]
@@ -64,8 +65,8 @@ async def async_attach_trigger(
         @callback
         def _handle_event(event: Event):
             if event.data[ATTR_ENTITY_ID] == entity_id:
-                hass.async_run_job(
-                    action,
+                hass.async_run_hass_job(
+                    job,
                     {"trigger": {**config, "description": f"{DOMAIN} - {entity_id}"}},
                     event.context,
                 )
diff --git a/homeassistant/components/arcam_fmj/strings.json b/homeassistant/components/arcam_fmj/strings.json
index 67aaf7a11cb..b6a7d6ee559 100644
--- a/homeassistant/components/arcam_fmj/strings.json
+++ b/homeassistant/components/arcam_fmj/strings.json
@@ -1,28 +1,28 @@
 {
-    "config": {
-        "abort": {
-            "already_configured": "Device was already setup.",
-            "already_in_progress": "Config flow for device is already in progress.",
-            "unable_to_connect": "Unable to connect to device."
-        },
-        "error": {},
-        "flow_title": "Arcam FMJ on {host}",
-        "step": {
-            "confirm": {
-                "description": "Do you want to add Arcam FMJ on `{host}` to Home Assistant?"
-            },
-            "user": {
-                "data": {
-                    "host": "[%key:common::config_flow::data::host%]",
-                    "port": "[%key:common::config_flow::data::port%]"
-                },
-                "description": "Please enter the host name or IP address of device."
-            }
-        }
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
-    "device_automation": {
-        "trigger_type": {
-            "turn_on": "{entity_name} was requested to turn on"
-        }
+    "error": {},
+    "flow_title": "Arcam FMJ on {host}",
+    "step": {
+      "confirm": {
+        "description": "Do you want to add Arcam FMJ on `{host}` to Home Assistant?"
+      },
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "description": "Please enter the host name or IP address of device."
+      }
     }
+  },
+  "device_automation": {
+    "trigger_type": {
+      "turn_on": "{entity_name} was requested to turn on"
+    }
+  }
 }
diff --git a/homeassistant/components/arcam_fmj/translations/ca.json b/homeassistant/components/arcam_fmj/translations/ca.json
index 28149d5e06e..a7c03abc41d 100644
--- a/homeassistant/components/arcam_fmj/translations/ca.json
+++ b/homeassistant/components/arcam_fmj/translations/ca.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositiu ja s'ha configurat.",
-            "already_in_progress": "El flux de dades de configuraci\u00f3 pel dispositiu ja est\u00e0 en curs.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "unable_to_connect": "No es pot connectar amb el dispositiu."
         },
         "flow_title": "Arcam FMJ a {host}",
diff --git a/homeassistant/components/arcam_fmj/translations/cs.json b/homeassistant/components/arcam_fmj/translations/cs.json
index 5bcc0c2295d..e6aba520755 100644
--- a/homeassistant/components/arcam_fmj/translations/cs.json
+++ b/homeassistant/components/arcam_fmj/translations/cs.json
@@ -1,5 +1,11 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unable_to_connect": "Nelze se p\u0159ipojit k za\u0159\u00edzen\u00ed."
+        },
         "step": {
             "user": {
                 "data": {
@@ -9,5 +15,10 @@
                 "description": "Zadejte n\u00e1zev hostitele nebo IP adresu za\u0159\u00edzen\u00ed."
             }
         }
+    },
+    "device_automation": {
+        "trigger_type": {
+            "turn_on": "{entity_name} bylo po\u017e\u00e1d\u00e1no o zapnut\u00ed"
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/arcam_fmj/translations/en.json b/homeassistant/components/arcam_fmj/translations/en.json
index b22ed592f69..9ab35fd6ff7 100644
--- a/homeassistant/components/arcam_fmj/translations/en.json
+++ b/homeassistant/components/arcam_fmj/translations/en.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Device was already setup.",
-            "already_in_progress": "Config flow for device is already in progress.",
+            "already_configured": "Device is already configured",
+            "already_in_progress": "Configuration flow is already in progress",
+            "cannot_connect": "Failed to connect",
             "unable_to_connect": "Unable to connect to device."
         },
         "flow_title": "Arcam FMJ on {host}",
diff --git a/homeassistant/components/arcam_fmj/translations/es.json b/homeassistant/components/arcam_fmj/translations/es.json
index 3965fba98d9..fab0457331f 100644
--- a/homeassistant/components/arcam_fmj/translations/es.json
+++ b/homeassistant/components/arcam_fmj/translations/es.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositivo ya est\u00e1 configurado.",
-            "already_in_progress": "El flujo de configuraci\u00f3n para el dispositivo ya est\u00e1 en marcha.",
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
+            "already_in_progress": "El flujo de configuraci\u00f3n ya est\u00e1 en proceso",
+            "cannot_connect": "No se pudo conectar",
             "unable_to_connect": "No se puede conectar con el dispositivo."
         },
         "flow_title": "Arcam FMJ en {host}",
diff --git a/homeassistant/components/arcam_fmj/translations/et.json b/homeassistant/components/arcam_fmj/translations/et.json
new file mode 100644
index 00000000000..2f6c6eb46db
--- /dev/null
+++ b/homeassistant/components/arcam_fmj/translations/et.json
@@ -0,0 +1,28 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unable_to_connect": "Seadmega ei saa \u00fchendust luua."
+        },
+        "flow_title": "Arcam FMJ saidil {host}",
+        "step": {
+            "confirm": {
+                "description": "Kas soovid lisada Arcam FMJ \u00fcksuse {host} Home Assistanti?"
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                },
+                "description": "Sisesta seadme hostinimi v\u00f5i IP-aadress."
+            }
+        }
+    },
+    "device_automation": {
+        "trigger_type": {
+            "turn_on": "{entity_name} paluti sisse l\u00fclitada"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/arcam_fmj/translations/it.json b/homeassistant/components/arcam_fmj/translations/it.json
index 61f3dd6fc47..fdfabdf9c19 100644
--- a/homeassistant/components/arcam_fmj/translations/it.json
+++ b/homeassistant/components/arcam_fmj/translations/it.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il dispositivo era gi\u00e0 configurato.",
-            "already_in_progress": "Il flusso di configurazione per il dispositivo \u00e8 gi\u00e0 in corso.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
+            "cannot_connect": "Impossibile connettersi",
             "unable_to_connect": "Impossibile connettersi al dispositivo."
         },
         "error": {
diff --git a/homeassistant/components/arcam_fmj/translations/lb.json b/homeassistant/components/arcam_fmj/translations/lb.json
index 1e0702886a3..36a834867c0 100644
--- a/homeassistant/components/arcam_fmj/translations/lb.json
+++ b/homeassistant/components/arcam_fmj/translations/lb.json
@@ -3,6 +3,7 @@
         "abort": {
             "already_configured": "Apparat ass scho konfigur\u00e9iert",
             "already_in_progress": "Konfiguratioun's Oflaf fir den Apparat ass schonn am gaangen.",
+            "cannot_connect": "Feeler beim verbannen",
             "unable_to_connect": "Keng Verbindung mam Apparat m\u00e9iglech."
         },
         "flow_title": "Arcam FMJ um {host}",
diff --git a/homeassistant/components/arcam_fmj/translations/nl.json b/homeassistant/components/arcam_fmj/translations/nl.json
index 761d57a48cb..1f1fa864700 100644
--- a/homeassistant/components/arcam_fmj/translations/nl.json
+++ b/homeassistant/components/arcam_fmj/translations/nl.json
@@ -1,4 +1,17 @@
 {
+    "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd",
+            "cannot_connect": "Kan geen verbinding maken"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "port": "Poort"
+                }
+            }
+        }
+    },
     "device_automation": {
         "trigger_type": {
             "turn_on": "{entity_name} is gevraagd in te schakelen"
diff --git a/homeassistant/components/arcam_fmj/translations/no.json b/homeassistant/components/arcam_fmj/translations/no.json
index 14d55224119..715691d7f4e 100644
--- a/homeassistant/components/arcam_fmj/translations/no.json
+++ b/homeassistant/components/arcam_fmj/translations/no.json
@@ -1,19 +1,20 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Enheten var allerede konfigurert.",
-            "already_in_progress": "Konfigurasjonsflyt for enhet p\u00e5g\u00e5r allerede.",
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
+            "cannot_connect": "Tilkobling mislyktes",
             "unable_to_connect": "Kan ikke koble til enheten."
         },
         "flow_title": "Arcam FMJ p\u00e5 {host}",
         "step": {
             "confirm": {
-                "description": "Vil du legge Arcam FMJ p\u00e5 ` {host} ` til Home Assistant? "
+                "description": "Vil du legge Arcam FMJ p\u00e5 `{host}` til Home Assistant?"
             },
             "user": {
                 "data": {
                     "host": "Vert",
-                    "port": ""
+                    "port": "Port"
                 },
                 "description": "Vennligst skriv inn vertsnavnet eller IP-adressen til enheten."
             }
diff --git a/homeassistant/components/arcam_fmj/translations/pl.json b/homeassistant/components/arcam_fmj/translations/pl.json
index 42ed803a161..16607259eb5 100644
--- a/homeassistant/components/arcam_fmj/translations/pl.json
+++ b/homeassistant/components/arcam_fmj/translations/pl.json
@@ -1,14 +1,28 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "unable_to_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z urz\u0105dzeniem"
         },
+        "error": {
+            "few": "kilka",
+            "many": "wiele",
+            "one": "jeden",
+            "other": "inne"
+        },
+        "flow_title": "Arcam FMJ na {host}",
         "step": {
+            "confirm": {
+                "description": "Czy chcesz doda\u0107 Arcam FMJ na \"{host}\" do Home Assistant?"
+            },
             "user": {
                 "data": {
                     "host": "Nazwa hosta lub adres IP",
                     "port": "Port"
-                }
+                },
+                "description": "Wpisz nazw\u0119 hosta lub adres IP urz\u0105dzenia."
             }
         }
     },
diff --git a/homeassistant/components/arcam_fmj/translations/ru.json b/homeassistant/components/arcam_fmj/translations/ru.json
index 807bfb4e4c5..00040a14e78 100644
--- a/homeassistant/components/arcam_fmj/translations/ru.json
+++ b/homeassistant/components/arcam_fmj/translations/ru.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "unable_to_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
         },
         "flow_title": "Arcam FMJ {host}",
diff --git a/homeassistant/components/arcam_fmj/translations/zh-Hant.json b/homeassistant/components/arcam_fmj/translations/zh-Hant.json
index f25906f0d81..ff2e38c8ba3 100644
--- a/homeassistant/components/arcam_fmj/translations/zh-Hant.json
+++ b/homeassistant/components/arcam_fmj/translations/zh-Hant.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u8a2d\u5099\u5df2\u8a2d\u5b9a\u3002",
-            "already_in_progress": "\u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "unable_to_connect": "\u7121\u6cd5\u9023\u7dda\u81f3\u8a2d\u5099\u3002"
         },
         "flow_title": "Arcam FMJ \uff08{host}\uff09",
diff --git a/homeassistant/components/arduino/sensor.py b/homeassistant/components/arduino/sensor.py
index 8da656d217a..f31272b3a20 100644
--- a/homeassistant/components/arduino/sensor.py
+++ b/homeassistant/components/arduino/sensor.py
@@ -1,6 +1,4 @@
 """Support for getting information from Arduino pins."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA
@@ -10,8 +8,6 @@ from homeassistant.helpers.entity import Entity
 
 from . import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PINS = "pins"
 CONF_TYPE = "analog"
 
diff --git a/homeassistant/components/arduino/switch.py b/homeassistant/components/arduino/switch.py
index 99b73c86fdb..6ee742fd506 100644
--- a/homeassistant/components/arduino/switch.py
+++ b/homeassistant/components/arduino/switch.py
@@ -1,6 +1,4 @@
 """Support for switching Arduino pins on and off."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
@@ -9,8 +7,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PINS = "pins"
 CONF_TYPE = "digital"
 CONF_NEGATE = "negate"
diff --git a/homeassistant/components/arest/sensor.py b/homeassistant/components/arest/sensor.py
index 7e50b1df8ff..d213a3d2903 100644
--- a/homeassistant/components/arest/sensor.py
+++ b/homeassistant/components/arest/sensor.py
@@ -78,7 +78,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 
         def _render(value):
             try:
-                return value_template.async_render({"value": value})
+                return value_template.async_render({"value": value}, parse_result=False)
             except TemplateError:
                 _LOGGER.exception("Error parsing value")
                 return value
diff --git a/homeassistant/components/arris_tg2492lg/device_tracker.py b/homeassistant/components/arris_tg2492lg/device_tracker.py
index d18d19806f9..e63bef9c108 100644
--- a/homeassistant/components/arris_tg2492lg/device_tracker.py
+++ b/homeassistant/components/arris_tg2492lg/device_tracker.py
@@ -1,5 +1,4 @@
 """Support for Arris TG2492LG router."""
-import logging
 from typing import List
 
 from arris_tg2492lg import ConnectBox, Device
@@ -13,8 +12,6 @@ from homeassistant.components.device_tracker import (
 from homeassistant.const import CONF_HOST, CONF_PASSWORD
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_HOST = "192.168.178.1"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/arwn/sensor.py b/homeassistant/components/arwn/sensor.py
index 7c947be61bf..3db1283279e 100644
--- a/homeassistant/components/arwn/sensor.py
+++ b/homeassistant/components/arwn/sensor.py
@@ -96,7 +96,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
                 store[sensor.name] = sensor
                 _LOGGER.debug(
                     "Registering new sensor %(name)s => %(event)s",
-                    dict(name=sensor.name, event=event),
+                    {"name": sensor.name, "event": event},
                 )
                 async_add_entities((sensor,), True)
             else:
diff --git a/homeassistant/components/asterisk_cdr/mailbox.py b/homeassistant/components/asterisk_cdr/mailbox.py
index 12587e531d7..28f48c7ab70 100644
--- a/homeassistant/components/asterisk_cdr/mailbox.py
+++ b/homeassistant/components/asterisk_cdr/mailbox.py
@@ -1,7 +1,6 @@
 """Support for the Asterisk CDR interface."""
 import datetime
 import hashlib
-import logging
 
 from homeassistant.components.asterisk_mbox import (
     DOMAIN as ASTERISK_DOMAIN,
@@ -11,8 +10,6 @@ from homeassistant.components.mailbox import Mailbox
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
-_LOGGER = logging.getLogger(__name__)
-
 MAILBOX_NAME = "asterisk_cdr"
 
 
diff --git a/homeassistant/components/atag/config_flow.py b/homeassistant/components/atag/config_flow.py
index 7ad05087304..865159aa658 100644
--- a/homeassistant/components/atag/config_flow.py
+++ b/homeassistant/components/atag/config_flow.py
@@ -4,7 +4,6 @@ import voluptuous as vol
 
 from homeassistant import config_entries
 from homeassistant.const import CONF_EMAIL, CONF_HOST, CONF_PORT
-from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from . import DOMAIN  # pylint: disable=unused-import
@@ -36,14 +35,13 @@ class AtagConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         except pyatag.errors.Unauthorized:
             return await self._show_form({"base": "unauthorized"})
         except pyatag.errors.AtagException:
-            return await self._show_form({"base": "connection_error"})
+            return await self._show_form({"base": "cannot_connect"})
 
         await self.async_set_unique_id(atag.id)
         self._abort_if_unique_id_configured(updates=user_input)
 
         return self.async_create_entry(title=atag.id, data=user_input)
 
-    @callback
     async def _show_form(self, errors=None):
         """Show the form to the user."""
         return self.async_show_form(
diff --git a/homeassistant/components/atag/strings.json b/homeassistant/components/atag/strings.json
index 85e22c10c1b..756ab491ba2 100644
--- a/homeassistant/components/atag/strings.json
+++ b/homeassistant/components/atag/strings.json
@@ -6,17 +6,17 @@
         "title": "Connect to the device",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
-          "email": "Email (Optional)",
+          "email": "[%key:common::config_flow::data::email%]",
           "port": "[%key:common::config_flow::data::port%]"
         }
       }
     },
     "error": {
       "unauthorized": "Pairing denied, check device for auth request",
-      "connection_error": "Failed to connect, please try again"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "This device has already been added to HomeAssistant"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
 }
diff --git a/homeassistant/components/atag/translations/ca.json b/homeassistant/components/atag/translations/ca.json
index 6677e7eaa4d..9c1dc1a5fb6 100644
--- a/homeassistant/components/atag/translations/ca.json
+++ b/homeassistant/components/atag/translations/ca.json
@@ -1,16 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest dispositiu ja ha estat afegit a Home Assistant"
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "connection_error": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "connection_error": "Ha fallat la connexi\u00f3",
             "unauthorized": "La vinculaci\u00f3 s'ha denegat, comprova si hi ha una sol\u00b7licitud d'autenticaci\u00f3 al dispositiu"
         },
         "step": {
             "user": {
                 "data": {
-                    "email": "Correu electr\u00f2nic (opcional)",
+                    "email": "Correu electr\u00f2nic",
                     "host": "Amfitri\u00f3",
                     "port": "Port"
                 },
diff --git a/homeassistant/components/atag/translations/cs.json b/homeassistant/components/atag/translations/cs.json
index 406bddd1a12..bb802758772 100644
--- a/homeassistant/components/atag/translations/cs.json
+++ b/homeassistant/components/atag/translations/cs.json
@@ -1,12 +1,22 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
         "step": {
             "user": {
                 "data": {
+                    "email": "E-mail",
                     "host": "Hostitel",
                     "port": "Port"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed"
             }
         }
-    }
+    },
+    "title": "Atag"
 }
\ No newline at end of file
diff --git a/homeassistant/components/atag/translations/en.json b/homeassistant/components/atag/translations/en.json
index 8901a417065..5b6226e13eb 100644
--- a/homeassistant/components/atag/translations/en.json
+++ b/homeassistant/components/atag/translations/en.json
@@ -1,16 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This device has already been added to HomeAssistant"
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "connection_error": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
+            "connection_error": "Failed to connect",
             "unauthorized": "Pairing denied, check device for auth request"
         },
         "step": {
             "user": {
                 "data": {
-                    "email": "Email (Optional)",
+                    "email": "Email",
                     "host": "Host",
                     "port": "Port"
                 },
diff --git a/homeassistant/components/atag/translations/es.json b/homeassistant/components/atag/translations/es.json
index c60a8476bdf..2cfcd4746c2 100644
--- a/homeassistant/components/atag/translations/es.json
+++ b/homeassistant/components/atag/translations/es.json
@@ -4,6 +4,7 @@
             "already_configured": "Este dispositivo ya ha sido a\u00f1adido a HomeAssistant"
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo",
             "unauthorized": "Emparejamiento denegado, comprobar el dispositivo para la solicitud de autorizaci\u00f3n"
         },
diff --git a/homeassistant/components/atag/translations/et.json b/homeassistant/components/atag/translations/et.json
new file mode 100644
index 00000000000..5376b60c3fd
--- /dev/null
+++ b/homeassistant/components/atag/translations/et.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "\u00dchendamine nurjus",
+            "unauthorized": "Sidumine on keelatud, kontrollige seadme tuvastamistaotlust"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "email": "E-post",
+                    "host": "",
+                    "port": ""
+                },
+                "title": "\u00dchendu seadmega"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/atag/translations/it.json b/homeassistant/components/atag/translations/it.json
index cbef4fab268..bdeeac8e60e 100644
--- a/homeassistant/components/atag/translations/it.json
+++ b/homeassistant/components/atag/translations/it.json
@@ -1,16 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo dispositivo \u00e8 gi\u00e0 stato aggiunto a HomeAssistant"
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "connection_error": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
+            "connection_error": "Impossibile connettersi",
             "unauthorized": "Associazione negata, controllare il dispositivo per la richiesta di autenticazione"
         },
         "step": {
             "user": {
                 "data": {
-                    "email": "E-mail (Opzionale)",
+                    "email": "E-mail",
                     "host": "Host",
                     "port": "Porta"
                 },
diff --git a/homeassistant/components/atag/translations/lb.json b/homeassistant/components/atag/translations/lb.json
index 7474d99de62..bd928aa81e1 100644
--- a/homeassistant/components/atag/translations/lb.json
+++ b/homeassistant/components/atag/translations/lb.json
@@ -4,7 +4,7 @@
             "already_configured": "D\u00ebsen Apparat ass schonn am Home Assistant dob\u00e4igesat ginn"
         },
         "error": {
-            "connection_error": "Feeler beim verbannen, prob\u00e9ier w.e.g. nach emol.",
+            "connection_error": "Feeler beim verbannen",
             "unauthorized": "Kopplung verweigert, iwwerpr\u00e9if den Apparat fir auth request"
         },
         "step": {
diff --git a/homeassistant/components/atag/translations/nl.json b/homeassistant/components/atag/translations/nl.json
index 077beb65871..5e4a4dd8d8c 100644
--- a/homeassistant/components/atag/translations/nl.json
+++ b/homeassistant/components/atag/translations/nl.json
@@ -4,12 +4,14 @@
             "already_configured": "Er kan slechts \u00e9\u00e9n Atag-apparaat worden toegevoegd aan Home Assistant "
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Verbinding mislukt, probeer het opnieuw",
             "unauthorized": "Koppelen geweigerd, controleer apparaat op autorisatieverzoek"
         },
         "step": {
             "user": {
                 "data": {
+                    "email": "Email",
                     "host": "Host",
                     "port": "Poort (10000)"
                 },
diff --git a/homeassistant/components/atag/translations/no.json b/homeassistant/components/atag/translations/no.json
index a0e428f286a..44d3fb8a96e 100644
--- a/homeassistant/components/atag/translations/no.json
+++ b/homeassistant/components/atag/translations/no.json
@@ -1,18 +1,19 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne enheten er allerede lagt til i HomeAssistant"
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "connection_error": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
+            "connection_error": "Tilkobling mislyktes",
             "unauthorized": "Parring nektet, sjekk enheten for autorisasjonsforesp\u00f8rsel"
         },
         "step": {
             "user": {
                 "data": {
-                    "email": "E-post (valgfritt)",
+                    "email": "E-post",
                     "host": "Vert",
-                    "port": ""
+                    "port": "Port"
                 },
                 "title": "Koble til enheten"
             }
diff --git a/homeassistant/components/atag/translations/pl.json b/homeassistant/components/atag/translations/pl.json
index d7d633aeda5..1858eb8bf80 100644
--- a/homeassistant/components/atag/translations/pl.json
+++ b/homeassistant/components/atag/translations/pl.json
@@ -1,15 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "To urz\u0105dzenie zosta\u0142o ju\u017c dodane do Home Assistant"
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "unauthorized": "Odmowa parowania, sprawd\u017a urz\u0105dzenie pod k\u0105tem \u017c\u0105dania autoryzacji"
         },
         "step": {
             "user": {
                 "data": {
-                    "email": "Adres e-mail (opcjonalnie)",
+                    "email": "Adres e-mail",
                     "host": "Nazwa hosta lub adres IP",
                     "port": "Port"
                 },
diff --git a/homeassistant/components/atag/translations/ru.json b/homeassistant/components/atag/translations/ru.json
index caf80b415e6..181f6c8092b 100644
--- a/homeassistant/components/atag/translations/ru.json
+++ b/homeassistant/components/atag/translations/ru.json
@@ -1,16 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "unauthorized": "\u0421\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u0435 \u0437\u0430\u043f\u0440\u0435\u0449\u0435\u043d\u043e, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0430 \u0437\u0430\u043f\u0440\u043e\u0441 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438."
         },
         "step": {
             "user": {
                 "data": {
-                    "email": "\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b (\u043d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e)",
+                    "email": "\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b",
                     "host": "\u0425\u043e\u0441\u0442",
                     "port": "\u041f\u043e\u0440\u0442"
                 },
diff --git a/homeassistant/components/atag/translations/zh-Hans.json b/homeassistant/components/atag/translations/zh-Hans.json
new file mode 100644
index 00000000000..2941dfd9383
--- /dev/null
+++ b/homeassistant/components/atag/translations/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/atag/translations/zh-Hant.json b/homeassistant/components/atag/translations/zh-Hant.json
index 6fc2e520d17..fe507272b4a 100644
--- a/homeassistant/components/atag/translations/zh-Hant.json
+++ b/homeassistant/components/atag/translations/zh-Hant.json
@@ -1,16 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u8a2d\u5099\u5df2\u7d93\u65b0\u589e\u81f3 Home Assistant"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "connection_error": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "connection_error": "\u9023\u7dda\u5931\u6557",
             "unauthorized": "\u914d\u5c0d\u906d\u62d2\uff0c\u8acb\u6aa2\u67e5\u8a2d\u5099\u8a8d\u8b49\u8acb\u6c42"
         },
         "step": {
             "user": {
                 "data": {
-                    "email": "\u90f5\u4ef6\uff08\u9078\u9805\uff09",
+                    "email": "\u96fb\u5b50\u90f5\u4ef6",
                     "host": "\u4e3b\u6a5f\u7aef",
                     "port": "\u901a\u8a0a\u57e0"
                 },
diff --git a/homeassistant/components/august/entity.py b/homeassistant/components/august/entity.py
index 1742a00b4e9..0d259778796 100644
--- a/homeassistant/components/august/entity.py
+++ b/homeassistant/components/august/entity.py
@@ -1,15 +1,10 @@
 """Base class for August entity."""
-
-import logging
-
 from homeassistant.core import callback
 from homeassistant.helpers.entity import Entity
 
 from . import DOMAIN
 from .const import MANUFACTURER
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class AugustEntityMixin(Entity):
     """Base implementation for August device."""
diff --git a/homeassistant/components/august/strings.json b/homeassistant/components/august/strings.json
index 254e8146984..998d870e629 100644
--- a/homeassistant/components/august/strings.json
+++ b/homeassistant/components/august/strings.json
@@ -1,13 +1,13 @@
 {
   "config": {
     "error": {
-      "unknown": "Unexpected error",
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication"
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "abort": {
-      "already_configured": "Account is already configured",
-      "reauth_successful": "Re-authentication was successful"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "step": {
       "validation": {
diff --git a/homeassistant/components/august/translations/ca.json b/homeassistant/components/august/translations/ca.json
index e8299249d73..9d3e3535e46 100644
--- a/homeassistant/components/august/translations/ca.json
+++ b/homeassistant/components/august/translations/ca.json
@@ -5,7 +5,7 @@
             "reauth_successful": "Re-autenticaci\u00f3 realitzada correctament"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/august/translations/cs.json b/homeassistant/components/august/translations/cs.json
index 338ff5d9a44..f1db40b0beb 100644
--- a/homeassistant/components/august/translations/cs.json
+++ b/homeassistant/components/august/translations/cs.json
@@ -1,11 +1,29 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
+                    "login_method": "Zp\u016fsob p\u0159ihl\u00e1\u0161en\u00ed",
                     "password": "Heslo",
+                    "timeout": "\u010casov\u00fd limit (v sekund\u00e1ch)",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "Nastavte \u00fa\u010det August"
+            },
+            "validation": {
+                "data": {
+                    "code": "Ov\u011b\u0159ovac\u00ed k\u00f3d"
+                },
+                "title": "Dvoufaktorov\u00e9 ov\u011b\u0159ov\u00e1n\u00ed"
             }
         }
     }
diff --git a/homeassistant/components/august/translations/el.json b/homeassistant/components/august/translations/el.json
deleted file mode 100644
index 08f214f7386..00000000000
--- a/homeassistant/components/august/translations/el.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "config": {
-        "abort": {
-            "reauth_successful": "\u0397 \u03b5\u03c0\u03b1\u03bd\u03b1\u03c0\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03ae\u03c4\u03b1\u03bd \u03b5\u03c0\u03b9\u03c4\u03c5\u03c7\u03ae\u03c2"
-        }
-    }
-}
\ No newline at end of file
diff --git a/homeassistant/components/august/translations/en.json b/homeassistant/components/august/translations/en.json
index 08d09e12095..c6c19321d8a 100644
--- a/homeassistant/components/august/translations/en.json
+++ b/homeassistant/components/august/translations/en.json
@@ -5,7 +5,7 @@
             "reauth_successful": "Re-authentication was successful"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/august/translations/es.json b/homeassistant/components/august/translations/es.json
index 2ec72c9e4eb..a8f7bc6af23 100644
--- a/homeassistant/components/august/translations/es.json
+++ b/homeassistant/components/august/translations/es.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La cuenta ya est\u00e1 configurada",
+            "already_configured": "La cuenta ya ha sido configurada",
             "reauth_successful": "La reautenticaci\u00f3n se realiz\u00f3 correctamente"
         },
         "error": {
-            "cannot_connect": "No se ha podido conectar, por favor, int\u00e9ntalo de nuevo.",
+            "cannot_connect": "No se pudo conectar",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "unknown": "Error inesperado"
         },
diff --git a/homeassistant/components/august/translations/et.json b/homeassistant/components/august/translations/et.json
index af21b9d8204..efff8b8fe0f 100644
--- a/homeassistant/components/august/translations/et.json
+++ b/homeassistant/components/august/translations/et.json
@@ -1,7 +1,32 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Konto on juba seadistatud",
             "reauth_successful": "Taasautentimine \u00f5nnestus"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "login_method": "Sisselogimismeetod",
+                    "password": "Salas\u00f5na",
+                    "timeout": "Ajal\u00f5pp (sekundites)",
+                    "username": "Kasutajanimi"
+                },
+                "description": "Kui sisselogimismeetod on \"e-post\" on kasutajanimi e-posti aadress. Kui sisselogimismeetod on \"telefon\" on kasutajanimi telefoninumber vormingus \"+NNNNNNNNN\".",
+                "title": "Seadista Augusti sidumise konto"
+            },
+            "validation": {
+                "data": {
+                    "code": "Kinnituskood"
+                },
+                "description": "Kontrolli oma {login_method} ( {username} ) ja sisesta kinnituskood",
+                "title": "Kaheastmelinetuvastuskood"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/august/translations/fr.json b/homeassistant/components/august/translations/fr.json
index 82568b681fd..752b7dc3712 100644
--- a/homeassistant/components/august/translations/fr.json
+++ b/homeassistant/components/august/translations/fr.json
@@ -1,8 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Le compte est d\u00e9j\u00e0 configur\u00e9",
-            "reauth_successful": "La r\u00e9-authentification a r\u00e9ussi"
+            "already_configured": "Le compte est d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
             "cannot_connect": "Impossible de se connecter, veuillez r\u00e9essayer",
diff --git a/homeassistant/components/august/translations/it.json b/homeassistant/components/august/translations/it.json
index 8f88b34e5e4..08332c29d7e 100644
--- a/homeassistant/components/august/translations/it.json
+++ b/homeassistant/components/august/translations/it.json
@@ -5,7 +5,7 @@
             "reauth_successful": "La riautenticazione ha avuto successo"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare.",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/august/translations/ko.json b/homeassistant/components/august/translations/ko.json
index c11bc55ec40..52f939c45a0 100644
--- a/homeassistant/components/august/translations/ko.json
+++ b/homeassistant/components/august/translations/ko.json
@@ -1,8 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\uacc4\uc815\uc774 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
-            "reauth_successful": "\uc7ac\uc778\uc99d\uc774 \uc131\uacf5\ud588\uc2b5\ub2c8\ub2e4."
+            "already_configured": "\uacc4\uc815\uc774 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4."
         },
         "error": {
             "cannot_connect": "\uc5f0\uacb0\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4. \ub2e4\uc2dc \uc2dc\ub3c4\ud574\uc8fc\uc138\uc694.",
diff --git a/homeassistant/components/august/translations/lb.json b/homeassistant/components/august/translations/lb.json
index dbc71325a81..501af05c2df 100644
--- a/homeassistant/components/august/translations/lb.json
+++ b/homeassistant/components/august/translations/lb.json
@@ -1,8 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Kont ass scho konfigur\u00e9iert",
-            "reauth_successful": "Re-Authentifikatioun erfollegr\u00e4ich"
+            "already_configured": "Kont ass scho konfigur\u00e9iert"
         },
         "error": {
             "cannot_connect": "Feeler beim verbannen, prob\u00e9iert w.e.g. nach emol.",
diff --git a/homeassistant/components/august/translations/nl.json b/homeassistant/components/august/translations/nl.json
index e48d27801cc..1697f634d9a 100644
--- a/homeassistant/components/august/translations/nl.json
+++ b/homeassistant/components/august/translations/nl.json
@@ -1,8 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Account al geconfigureerd",
-            "reauth_successful": "Herauthenticatie was succesvol"
+            "already_configured": "Account al geconfigureerd"
         },
         "error": {
             "cannot_connect": "Verbinding mislukt, probeer het opnieuw",
diff --git a/homeassistant/components/august/translations/no.json b/homeassistant/components/august/translations/no.json
index feb4e4e759b..6a418ccdc93 100644
--- a/homeassistant/components/august/translations/no.json
+++ b/homeassistant/components/august/translations/no.json
@@ -5,7 +5,7 @@
             "reauth_successful": "Reautentisering var vellykket"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
diff --git a/homeassistant/components/august/translations/pl.json b/homeassistant/components/august/translations/pl.json
index 0c38508399b..e76b663c307 100644
--- a/homeassistant/components/august/translations/pl.json
+++ b/homeassistant/components/august/translations/pl.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Konto jest ju\u017c skonfigurowane"
+            "already_configured": "Konto jest ju\u017c skonfigurowane",
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/august/translations/ru.json b/homeassistant/components/august/translations/ru.json
index 516b978a6e5..9ea0b531bf8 100644
--- a/homeassistant/components/august/translations/ru.json
+++ b/homeassistant/components/august/translations/ru.json
@@ -5,7 +5,7 @@
             "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/august/translations/zh-Hans.json b/homeassistant/components/august/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/august/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/august/translations/zh-Hant.json b/homeassistant/components/august/translations/zh-Hant.json
index 56a7bc4ef95..667d8814659 100644
--- a/homeassistant/components/august/translations/zh-Hant.json
+++ b/homeassistant/components/august/translations/zh-Hant.json
@@ -5,7 +5,7 @@
             "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/auth/__init__.py b/homeassistant/components/auth/__init__.py
index fba96b24084..43451632f38 100644
--- a/homeassistant/components/auth/__init__.py
+++ b/homeassistant/components/auth/__init__.py
@@ -115,7 +115,6 @@ Result will be a long-lived access token:
 
 """
 from datetime import timedelta
-import logging
 import uuid
 
 from aiohttp import web
@@ -179,8 +178,6 @@ SCHEMA_WS_SIGN_PATH = websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend(
 RESULT_TYPE_CREDENTIALS = "credentials"
 RESULT_TYPE_USER = "user"
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @bind_hass
 def create_auth_code(hass, client_id: str, user: User) -> str:
diff --git a/homeassistant/components/auth/translations/cs.json b/homeassistant/components/auth/translations/cs.json
index da234c3dd5d..d3f077d87e7 100644
--- a/homeassistant/components/auth/translations/cs.json
+++ b/homeassistant/components/auth/translations/cs.json
@@ -25,7 +25,7 @@
             "step": {
                 "init": {
                     "description": "Chcete-li aktivovat dvoufaktorovou autentizaci pomoc\u00ed jednor\u00e1zov\u00fdch hesel zalo\u017een\u00fdch na \u010dase, na\u010dt\u011bte k\u00f3d QR pomoc\u00ed va\u0161\u00ed autentiza\u010dn\u00ed aplikace. Pokud ji nem\u00e1te, doporu\u010dujeme bu\u010f [Google Authenticator](https://support.google.com/accounts/answer/1066447) nebo [Authy](https://authy.com/). \n\n {qr_code} \n \n Po skenov\u00e1n\u00ed k\u00f3du zadejte \u0161estcifern\u00fd k\u00f3d z aplikace a ov\u011b\u0159te nastaven\u00ed. Pokud m\u00e1te probl\u00e9my se skenov\u00e1n\u00edm k\u00f3du QR, prove\u010fte ru\u010dn\u00ed nastaven\u00ed s k\u00f3dem **`{code}`**.",
-                    "title": "Nastavte dvoufaktorovou autentizaci pomoc\u00ed TOTP"
+                    "title": "Nastavte dvoufaktorovou ov\u011b\u0159ov\u00e1n\u00ed pomoc\u00ed TOTP"
                 }
             },
             "title": "TOTP"
diff --git a/homeassistant/components/auth/translations/es.json b/homeassistant/components/auth/translations/es.json
index 5603c14fe1a..7495ffcfbc9 100644
--- a/homeassistant/components/auth/translations/es.json
+++ b/homeassistant/components/auth/translations/es.json
@@ -9,11 +9,11 @@
             },
             "step": {
                 "init": {
-                    "description": "Seleccione uno de los servicios de notificaci\u00f3n:",
-                    "title": "Configure una contrase\u00f1a de un solo uso entregada por el componente de notificaci\u00f3n"
+                    "description": "Selecciona uno de los servicios de notificaci\u00f3n:",
+                    "title": "Configurar una contrase\u00f1a de un solo uso entregada por el componente de notificaci\u00f3n"
                 },
                 "setup": {
-                    "description": "Se ha enviado una contrase\u00f1a de un solo uso a trav\u00e9s de ** notify. {notify_service} **. Por favor introd\u00facela a continuaci\u00f3n:",
+                    "description": "Se ha enviado una contrase\u00f1a de un solo uso a trav\u00e9s de ** notify.{notify_service} **. Por favor introd\u00facela a continuaci\u00f3n:",
                     "title": "Verificar la configuraci\u00f3n"
                 }
             },
@@ -26,7 +26,7 @@
             "step": {
                 "init": {
                     "description": "Para activar la autenticaci\u00f3n de dos factores utilizando contrase\u00f1as de un solo uso basadas en el tiempo, escanea el c\u00f3digo QR con tu aplicaci\u00f3n de autenticaci\u00f3n. Si no tienes una, te recomendamos el [Autenticador de Google](https://support.google.com/accounts/answer/1066447) o [Authy](https://authy.com/). \n\n {qr_code} \n \nDespu\u00e9s de escanear el c\u00f3digo, introduce el c\u00f3digo de seis d\u00edgitos de tu aplicaci\u00f3n para verificar la configuraci\u00f3n. Si tienes problemas para escanear el c\u00f3digo QR, realiza una configuraci\u00f3n manual con el c\u00f3digo **`{code}`**.",
-                    "title": "Configure la autenticaci\u00f3n de dos factores utilizando TOTP"
+                    "title": "Configurar la autenticaci\u00f3n de dos factores usando TOTP"
                 }
             },
             "title": "TOTP"
diff --git a/homeassistant/components/auth/translations/et.json b/homeassistant/components/auth/translations/et.json
index 290f4ee12a9..03fc42f38e2 100644
--- a/homeassistant/components/auth/translations/et.json
+++ b/homeassistant/components/auth/translations/et.json
@@ -1,6 +1,34 @@
 {
     "mfa_setup": {
+        "notify": {
+            "abort": {
+                "no_available_service": "Teavitusteenused pole saadaval."
+            },
+            "error": {
+                "invalid_code": "Vale kood, palun proovi uuesti."
+            },
+            "step": {
+                "init": {
+                    "description": "Vali \u00fcks teavitusteenustest:",
+                    "title": "Seadistage Notify poolt edastatud \u00fchekordne parool"
+                },
+                "setup": {
+                    "description": "\u00dchekordne parool on saadetud **notify. {notify_service}**. Palun sisesta see allpool:",
+                    "title": "Kontrolli seadistust"
+                }
+            },
+            "title": "Notify \u00fchekordne parool"
+        },
         "totp": {
+            "error": {
+                "invalid_code": "Vale kood, palun proovi uuesti. Kui saad selle vea pidevalt, veendu, et Home Assistant-i s\u00fcsteemi kell oleks t\u00e4pne."
+            },
+            "step": {
+                "init": {
+                    "description": "Kahefaktorilise autentimise aktiveerimiseks ajap\u00f5histe \u00fchekordsete paroolide abil skanni QR-kood oma autentimisrakendusega. Kui seda pole, soovitame kas [Google Authenticator] (https://support.google.com/accounts/answer/1066447) v\u00f5i [Authy] (https://authy.com/).\n\n {qr_code}\n\n P\u00e4rast koodi skannimist sisesta seadistuse kinnitamiseks rakenduse kuuekohaline kood. Kui on probleeme QR-koodi skannimisega, tehke koodiga **' {code}' ** k\u00e4sitsi seadistamine.",
+                    "title": "Seadistage TOTP-ga kaheastmeline autentimine"
+                }
+            },
             "title": ""
         }
     }
diff --git a/homeassistant/components/auth/translations/pl.json b/homeassistant/components/auth/translations/pl.json
index 78610a5324f..954c6d6c009 100644
--- a/homeassistant/components/auth/translations/pl.json
+++ b/homeassistant/components/auth/translations/pl.json
@@ -2,10 +2,10 @@
     "mfa_setup": {
         "notify": {
             "abort": {
-                "no_available_service": "Brak dost\u0119pnych us\u0142ug powiadamiania."
+                "no_available_service": "Brak dost\u0119pnych us\u0142ug powiadamiania"
             },
             "error": {
-                "invalid_code": "Nieprawid\u0142owy kod, spr\u00f3buj ponownie."
+                "invalid_code": "Nieprawid\u0142owy kod, spr\u00f3buj ponownie"
             },
             "step": {
                 "init": {
diff --git a/homeassistant/components/automation/translations/cs.json b/homeassistant/components/automation/translations/cs.json
index 5a8f3819c9d..b4b3c61be5a 100644
--- a/homeassistant/components/automation/translations/cs.json
+++ b/homeassistant/components/automation/translations/cs.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed"
+            "off": "Vypnuto",
+            "on": "Zapnuto"
         }
     },
     "title": "Automatizace"
diff --git a/homeassistant/components/automation/translations/pl.json b/homeassistant/components/automation/translations/pl.json
index f8ed21a204d..959fb48b355 100644
--- a/homeassistant/components/automation/translations/pl.json
+++ b/homeassistant/components/automation/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "Automatyzacja"
diff --git a/homeassistant/components/avea/light.py b/homeassistant/components/avea/light.py
index c3f6e19c2e2..eca020f6cd0 100644
--- a/homeassistant/components/avea/light.py
+++ b/homeassistant/components/avea/light.py
@@ -1,6 +1,4 @@
 """Support for the Elgato Avea lights."""
-import logging
-
 import avea  # pylint: disable=import-error
 
 from homeassistant.components.light import (
@@ -13,8 +11,6 @@ from homeassistant.components.light import (
 from homeassistant.exceptions import PlatformNotReady
 import homeassistant.util.color as color_util
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_AVEA = SUPPORT_BRIGHTNESS | SUPPORT_COLOR
 
 
diff --git a/homeassistant/components/avion/light.py b/homeassistant/components/avion/light.py
index e5281c13654..0af2f15b34e 100644
--- a/homeassistant/components/avion/light.py
+++ b/homeassistant/components/avion/light.py
@@ -1,6 +1,5 @@
 """Support for Avion dimmers."""
 import importlib
-import logging
 import time
 
 import voluptuous as vol
@@ -21,8 +20,6 @@ from homeassistant.const import (
 )
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_AVION_LED = SUPPORT_BRIGHTNESS
 
 DEVICE_SCHEMA = vol.Schema(
diff --git a/homeassistant/components/avri/__init__.py b/homeassistant/components/avri/__init__.py
index 3165b6ee87a..f3b659ddccd 100644
--- a/homeassistant/components/avri/__init__.py
+++ b/homeassistant/components/avri/__init__.py
@@ -1,7 +1,6 @@
 """The avri component."""
 import asyncio
 from datetime import timedelta
-import logging
 
 from avri.api import Avri
 
@@ -16,8 +15,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORMS = ["sensor"]
 SCAN_INTERVAL = timedelta(hours=4)
 
diff --git a/homeassistant/components/avri/strings.json b/homeassistant/components/avri/strings.json
index 9c7af6e47f2..4bc2556f700 100644
--- a/homeassistant/components/avri/strings.json
+++ b/homeassistant/components/avri/strings.json
@@ -2,7 +2,7 @@
   "title": "Avri",
   "config": {
     "abort": {
-      "already_configured": "This address is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]"
     },
     "error": {
       "invalid_house_number": "Invalid house number.",
diff --git a/homeassistant/components/avri/translations/ca.json b/homeassistant/components/avri/translations/ca.json
index 3e575942e96..46c7387a2ae 100644
--- a/homeassistant/components/avri/translations/ca.json
+++ b/homeassistant/components/avri/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquesta adre\u00e7a ja est\u00e0 configurada."
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada"
         },
         "error": {
             "invalid_country_code": "Codi de pa\u00eds desconegut.",
diff --git a/homeassistant/components/avri/translations/cs.json b/homeassistant/components/avri/translations/cs.json
new file mode 100644
index 00000000000..fc62440d48c
--- /dev/null
+++ b/homeassistant/components/avri/translations/cs.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "invalid_house_number": "Neplatn\u00e9 \u010d\u00edslo domu."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "country_code": "2p\u00edsmenn\u00fd k\u00f3d zem\u011b",
+                    "house_number": "\u010c\u00edslo domu",
+                    "house_number_extension": "Roz\u0161\u00ed\u0159en\u00ed \u010d\u00edsla domu",
+                    "zip_code": "PS\u010c"
+                },
+                "title": "Avri"
+            }
+        }
+    },
+    "title": "Avri"
+}
\ No newline at end of file
diff --git a/homeassistant/components/avri/translations/en.json b/homeassistant/components/avri/translations/en.json
index 83cd4232d42..2965d7c86a9 100644
--- a/homeassistant/components/avri/translations/en.json
+++ b/homeassistant/components/avri/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This address is already configured."
+            "already_configured": "Location is already configured"
         },
         "error": {
             "invalid_country_code": "Unknown 2 letter country code.",
diff --git a/homeassistant/components/avri/translations/et.json b/homeassistant/components/avri/translations/et.json
new file mode 100644
index 00000000000..2cee4be1d36
--- /dev/null
+++ b/homeassistant/components/avri/translations/et.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Aadress on juba m\u00e4\u00e4ratud"
+        },
+        "error": {
+            "invalid_country_code": "Tundmatu kahet\u00e4heline riigikood.",
+            "invalid_house_number": "Tundmatu majanumber."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "country_code": "Kahet\u00e4heline riigikood",
+                    "house_number": "Maja number",
+                    "house_number_extension": "Maja numbri laiendus",
+                    "zip_code": "Postiindeks"
+                },
+                "description": "Sisesta oma aadress",
+                "title": ""
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/avri/translations/it.json b/homeassistant/components/avri/translations/it.json
index de0164665a2..c29b78c5e13 100644
--- a/homeassistant/components/avri/translations/it.json
+++ b/homeassistant/components/avri/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo indirizzo \u00e8 gi\u00e0 configurato."
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata"
         },
         "error": {
             "invalid_country_code": "Codice paese di 2 lettere sconosciuto.",
diff --git a/homeassistant/components/avri/translations/no.json b/homeassistant/components/avri/translations/no.json
index 5d7f77113b9..87e1e583f1e 100644
--- a/homeassistant/components/avri/translations/no.json
+++ b/homeassistant/components/avri/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne adressen er allerede konfigurert."
+            "already_configured": "Plasseringen er allerede konfigurert"
         },
         "error": {
             "invalid_country_code": "Ukjent landskode p\u00e5 2 bokstaver.",
diff --git a/homeassistant/components/avri/translations/pl.json b/homeassistant/components/avri/translations/pl.json
index 0881b1ec26a..b092134fcdc 100644
--- a/homeassistant/components/avri/translations/pl.json
+++ b/homeassistant/components/avri/translations/pl.json
@@ -1,6 +1,10 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
+        },
         "error": {
+            "invalid_country_code": "Nieznany dwuliterowy kod kraju",
             "invalid_house_number": "Nieprawid\u0142owy numer domu"
         },
         "step": {
@@ -8,9 +12,13 @@
                 "data": {
                     "country_code": "Dwuliterowy kod kraju",
                     "house_number": "Numer domu",
+                    "house_number_extension": "Numer mieszkania",
                     "zip_code": "Kod pocztowy"
-                }
+                },
+                "description": "Wpisz sw\u00f3j adres",
+                "title": "Avri"
             }
         }
-    }
+    },
+    "title": "Avri"
 }
\ No newline at end of file
diff --git a/homeassistant/components/avri/translations/ru.json b/homeassistant/components/avri/translations/ru.json
index ff8d8c12606..e0fd8dc1a17 100644
--- a/homeassistant/components/avri/translations/ru.json
+++ b/homeassistant/components/avri/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
             "invalid_country_code": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u0434\u0432\u0443\u0445\u0431\u0443\u043a\u0432\u0435\u043d\u043d\u044b\u0439 \u043a\u043e\u0434 \u0441\u0442\u0440\u0430\u043d\u044b.",
diff --git a/homeassistant/components/avri/translations/zh-Hant.json b/homeassistant/components/avri/translations/zh-Hant.json
index ef229b5b2d1..f127418c2d8 100644
--- a/homeassistant/components/avri/translations/zh-Hant.json
+++ b/homeassistant/components/avri/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u5730\u5740\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
             "invalid_country_code": "\u672a\u77e5\u570b\u78bc\uff08\u5169\u5b57\u6bcd\uff09\u3002",
diff --git a/homeassistant/components/awair/config_flow.py b/homeassistant/components/awair/config_flow.py
index 886a51342c5..a4768014f96 100644
--- a/homeassistant/components/awair/config_flow.py
+++ b/homeassistant/components/awair/config_flow.py
@@ -50,10 +50,10 @@ class AwairFlowHandler(ConfigFlow, domain=DOMAIN):
                 title = f"{user.email} ({user.user_id})"
                 return self.async_create_entry(title=title, data=user_input)
 
-            if error != "auth":
+            if error != "invalid_access_token":
                 return self.async_abort(reason=error)
 
-            errors = {CONF_ACCESS_TOKEN: "auth"}
+            errors = {CONF_ACCESS_TOKEN: "invalid_access_token"}
 
         return self.async_show_form(
             step_id="user",
@@ -78,7 +78,7 @@ class AwairFlowHandler(ConfigFlow, domain=DOMAIN):
 
                         return self.async_abort(reason="reauth_successful")
 
-            if error != "auth":
+            if error != "invalid_access_token":
                 return self.async_abort(reason=error)
 
             errors = {CONF_ACCESS_TOKEN: error}
@@ -98,12 +98,12 @@ class AwairFlowHandler(ConfigFlow, domain=DOMAIN):
             user = await awair.user()
             devices = await user.devices()
             if not devices:
-                return (None, "no_devices")
+                return (None, "no_devices_found")
 
             return (user, None)
 
         except AuthError:
-            return (None, "auth")
+            return (None, "invalid_access_token")
         except AwairError as err:
             LOGGER.error("Unexpected API error: %s", err)
             return (None, "unknown")
diff --git a/homeassistant/components/awair/strings.json b/homeassistant/components/awair/strings.json
index 1351cbd2db0..f9b1f40e047 100644
--- a/homeassistant/components/awair/strings.json
+++ b/homeassistant/components/awair/strings.json
@@ -17,13 +17,13 @@
       }
     },
     "error": {
-      "auth": "[%key:common::config_flow::error::invalid_access_token%]",
-      "unknown": "Unknown Awair API error."
+      "invalid_access_token": "[%key:common::config_flow::error::invalid_access_token%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "no_devices": "[%key:common::config_flow::abort::no_devices_found%]",
-      "reauth_successful": "[%key:common::config_flow::data::access_token%] updated successfully"
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   }
 }
diff --git a/homeassistant/components/awair/translations/ca.json b/homeassistant/components/awair/translations/ca.json
index 076c12f7995..43e76eecb93 100644
--- a/homeassistant/components/awair/translations/ca.json
+++ b/homeassistant/components/awair/translations/ca.json
@@ -3,11 +3,13 @@
         "abort": {
             "already_configured": "El compte ja ha estat configurat",
             "no_devices": "No s'han trobat dispositius a la xarxa",
-            "reauth_successful": "Token d'acc\u00e9s actualitzat correctament"
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
+            "reauth_successful": "Re-autenticaci\u00f3 realitzada correctament"
         },
         "error": {
             "auth": "Token d'acc\u00e9s no v\u00e0lid",
-            "unknown": "Error desconegut de l'API Awair."
+            "invalid_access_token": "Token d'acc\u00e9s no v\u00e0lid",
+            "unknown": "Error inesperat"
         },
         "step": {
             "reauth": {
diff --git a/homeassistant/components/awair/translations/cs.json b/homeassistant/components/awair/translations/cs.json
index 131ef0a6261..8ad3bde6239 100644
--- a/homeassistant/components/awair/translations/cs.json
+++ b/homeassistant/components/awair/translations/cs.json
@@ -1,12 +1,15 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u00da\u010det je ji\u017e nakonfigurov\u00e1n",
-            "no_devices": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed.",
-            "reauth_successful": "P\u0159\u00edstupov\u00fd token \u00fasp\u011b\u0161n\u011b aktualizov\u00e1n"
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "no_devices": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9"
         },
         "error": {
-            "auth": "Neplatn\u00fd p\u0159\u00edstupov\u00fd token"
+            "auth": "Neplatn\u00fd p\u0159\u00edstupov\u00fd token",
+            "invalid_access_token": "Neplatn\u00fd p\u0159\u00edstupov\u00fd token",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "step": {
             "reauth": {
diff --git a/homeassistant/components/awair/translations/en.json b/homeassistant/components/awair/translations/en.json
index 1f3beb390a8..9dbf003bb43 100644
--- a/homeassistant/components/awair/translations/en.json
+++ b/homeassistant/components/awair/translations/en.json
@@ -3,11 +3,13 @@
         "abort": {
             "already_configured": "Account is already configured",
             "no_devices": "No devices found on the network",
-            "reauth_successful": "Access Token updated successfully"
+            "no_devices_found": "No devices found on the network",
+            "reauth_successful": "Re-authentication was successful"
         },
         "error": {
             "auth": "Invalid access token",
-            "unknown": "Unknown Awair API error."
+            "invalid_access_token": "Invalid access token",
+            "unknown": "Unexpected error"
         },
         "step": {
             "reauth": {
diff --git a/homeassistant/components/awair/translations/es.json b/homeassistant/components/awair/translations/es.json
index 90215ba9c30..272b042bd9d 100644
--- a/homeassistant/components/awair/translations/es.json
+++ b/homeassistant/components/awair/translations/es.json
@@ -3,11 +3,13 @@
         "abort": {
             "already_configured": "La cuenta ya ha sido configurada",
             "no_devices": "No se encontraron dispositivos en la red",
-            "reauth_successful": "Token de acceso actualizado correctamente "
+            "no_devices_found": "No se encontraron dispositivos en la red",
+            "reauth_successful": "La reautenticaci\u00f3n se realiz\u00f3 correctamente"
         },
         "error": {
             "auth": "Token de acceso no v\u00e1lido",
-            "unknown": "Error desconocido en API Awair"
+            "invalid_access_token": "Token de acceso no v\u00e1lido",
+            "unknown": "Error inesperado"
         },
         "step": {
             "reauth": {
diff --git a/homeassistant/components/awair/translations/et.json b/homeassistant/components/awair/translations/et.json
new file mode 100644
index 00000000000..9035f154362
--- /dev/null
+++ b/homeassistant/components/awair/translations/et.json
@@ -0,0 +1,31 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud",
+            "no_devices": "V\u00f5rgust ei leitud seadmeid",
+            "no_devices_found": "V\u00f5rgust ei leitud Awair seadmeid",
+            "reauth_successful": "Taasautentimine \u00f5nnestus"
+        },
+        "error": {
+            "auth": "Vigane juurdep\u00e4\u00e4sut\u00f5end",
+            "invalid_access_token": "Vigane juurdep\u00e4\u00e4sut\u00f5end",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "reauth": {
+                "data": {
+                    "access_token": "Juurdep\u00e4\u00e4sut\u00f5end",
+                    "email": "E-post"
+                },
+                "description": "Taassisesta oma Awairi arendaja juurdep\u00e4\u00e4suluba."
+            },
+            "user": {
+                "data": {
+                    "access_token": "Juurdep\u00e4\u00e4sut\u00f5end",
+                    "email": "E-post"
+                },
+                "description": "Pead registreerima Awair arendaja juurdep\u00e4\u00e4su loa aadressil: https://developer.getawair.com/onboard/login"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/awair/translations/it.json b/homeassistant/components/awair/translations/it.json
index b7f699e7902..92f1efa153a 100644
--- a/homeassistant/components/awair/translations/it.json
+++ b/homeassistant/components/awair/translations/it.json
@@ -3,11 +3,13 @@
         "abort": {
             "already_configured": "L'account \u00e8 gi\u00e0 configurato",
             "no_devices": "Nessun dispositivo trovato sulla rete",
-            "reauth_successful": "Token di accesso aggiornato correttamente"
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
+            "reauth_successful": "La riautenticazione ha avuto successo"
         },
         "error": {
             "auth": "Token di accesso non valido",
-            "unknown": "Errore API Awair sconosciuto."
+            "invalid_access_token": "Token di accesso non valido",
+            "unknown": "Errore imprevisto"
         },
         "step": {
             "reauth": {
diff --git a/homeassistant/components/awair/translations/lb.json b/homeassistant/components/awair/translations/lb.json
index 176a8984e8c..e11640adcca 100644
--- a/homeassistant/components/awair/translations/lb.json
+++ b/homeassistant/components/awair/translations/lb.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_configured": "Kont ass",
             "no_devices": "Keng Apparater am Netzwierk fonnt",
-            "reauth_successful": "Acc\u00e8s Jeton erfollegr\u00e4ich aktualis\u00e9iert"
+            "reauth_successful": "Erfollegr\u00e4ich aktualis\u00e9iert"
         },
         "error": {
             "auth": "Ong\u00ebltege Acc\u00e8s Jeton",
diff --git a/homeassistant/components/awair/translations/nl.json b/homeassistant/components/awair/translations/nl.json
new file mode 100644
index 00000000000..a11016f8d42
--- /dev/null
+++ b/homeassistant/components/awair/translations/nl.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Account is al geconfigureerd",
+            "no_devices_found": "Geen apparaten op het netwerk gevonden"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/awair/translations/no.json b/homeassistant/components/awair/translations/no.json
index 46c3d5c3711..f715950a4b4 100644
--- a/homeassistant/components/awair/translations/no.json
+++ b/homeassistant/components/awair/translations/no.json
@@ -3,24 +3,26 @@
         "abort": {
             "already_configured": "Kontoen er allerede konfigurert",
             "no_devices": "Ingen enheter funnet p\u00e5 nettverket",
-            "reauth_successful": "Tilgangstoken oppdatert"
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
+            "reauth_successful": "Reautentisering var vellykket"
         },
         "error": {
             "auth": "Ugyldig tilgangstoken",
-            "unknown": "Ukjent Awair API-feil."
+            "invalid_access_token": "Ugyldig tilgangstoken",
+            "unknown": "Uventet feil"
         },
         "step": {
             "reauth": {
                 "data": {
                     "access_token": "Tilgangstoken",
-                    "email": "Epost"
+                    "email": "E-post"
                 },
                 "description": "Skriv inn tilgangstokenet for Awair-utviklere p\u00e5 nytt."
             },
             "user": {
                 "data": {
                     "access_token": "Tilgangstoken",
-                    "email": "Epost "
+                    "email": "E-post"
                 },
                 "description": "Du m\u00e5 registrere deg for et Awair-utviklertilgangstoken p\u00e5: https://developer.getawair.com/onboard/login"
             }
diff --git a/homeassistant/components/awair/translations/pl.json b/homeassistant/components/awair/translations/pl.json
index 76fe5a91cd9..ad741308943 100644
--- a/homeassistant/components/awair/translations/pl.json
+++ b/homeassistant/components/awair/translations/pl.json
@@ -2,24 +2,29 @@
     "config": {
         "abort": {
             "already_configured": "Konto jest ju\u017c skonfigurowane",
-            "no_devices": "Nie znaleziono urz\u0105dze\u0144 w sieci.",
-            "reauth_successful": "Token dost\u0119pu pomy\u015blnie zaktualizowano"
+            "no_devices": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119"
         },
         "error": {
-            "auth": "Token dost\u0119pu"
+            "auth": "Token dost\u0119pu",
+            "invalid_access_token": "Niepoprawny token dost\u0119pu",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "reauth": {
                 "data": {
                     "access_token": "Token dost\u0119pu",
                     "email": "Adres e-mail"
-                }
+                },
+                "description": "Wprowad\u017a ponownie token dost\u0119pu programisty Awair."
             },
             "user": {
                 "data": {
                     "access_token": "Token dost\u0119pu",
                     "email": "Adres e-mail"
-                }
+                },
+                "description": "Aby uzyska\u0107 token dost\u0119pu programisty Awair, nale\u017cy zarejestrowa\u0107 si\u0119 pod adresem: https://developer.getawair.com/onboard/login"
             }
         }
     }
diff --git a/homeassistant/components/awair/translations/pt-BR.json b/homeassistant/components/awair/translations/pt-BR.json
new file mode 100644
index 00000000000..6cec4b5050d
--- /dev/null
+++ b/homeassistant/components/awair/translations/pt-BR.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "invalid_access_token": "token de acesso invalido"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/awair/translations/ru.json b/homeassistant/components/awair/translations/ru.json
index fdb25c2ee4d..d1831164587 100644
--- a/homeassistant/components/awair/translations/ru.json
+++ b/homeassistant/components/awair/translations/ru.json
@@ -3,11 +3,13 @@
         "abort": {
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "no_devices": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
-            "reauth_successful": "\u0422\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d."
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
         },
         "error": {
             "auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0442\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+            "invalid_access_token": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0442\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
             "reauth": {
diff --git a/homeassistant/components/awair/translations/zh-Hant.json b/homeassistant/components/awair/translations/zh-Hant.json
index 0a3e877d749..bc2a9d36b16 100644
--- a/homeassistant/components/awair/translations/zh-Hant.json
+++ b/homeassistant/components/awair/translations/zh-Hant.json
@@ -3,11 +3,13 @@
         "abort": {
             "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "no_devices": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
-            "reauth_successful": "\u5b58\u53d6\u5bc6\u9470 \u5df2\u6210\u529f\u66f4\u65b0"
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
+            "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f"
         },
         "error": {
             "auth": "\u5b58\u53d6\u5bc6\u9470\u7121\u6548",
-            "unknown": "\u672a\u77e5 Awair API \u932f\u8aa4\u3002"
+            "invalid_access_token": "\u5b58\u53d6\u5bc6\u9470\u7121\u6548",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "reauth": {
diff --git a/homeassistant/components/axis/__init__.py b/homeassistant/components/axis/__init__.py
index eedeac01366..f25348b44cd 100644
--- a/homeassistant/components/axis/__init__.py
+++ b/homeassistant/components/axis/__init__.py
@@ -7,7 +7,7 @@ from homeassistant.const import CONF_DEVICE, EVENT_HOMEASSISTANT_STOP
 from .const import DOMAIN as AXIS_DOMAIN
 from .device import AxisNetworkDevice
 
-LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup(hass, config):
@@ -47,14 +47,14 @@ async def async_unload_entry(hass, config_entry):
 
 async def async_migrate_entry(hass, config_entry):
     """Migrate old entry."""
-    LOGGER.debug("Migrating from version %s", config_entry.version)
+    _LOGGER.debug("Migrating from version %s", config_entry.version)
 
-    #  Flatten configuration but keep old data if user rollbacks HASS
+    #  Flatten configuration but keep old data if user rollbacks HASS prior to 0.106
     if config_entry.version == 1:
         config_entry.data = {**config_entry.data, **config_entry.data[CONF_DEVICE]}
 
         config_entry.version = 2
 
-    LOGGER.info("Migration to version %s successful", config_entry.version)
+    _LOGGER.info("Migration to version %s successful", config_entry.version)
 
     return True
diff --git a/homeassistant/components/axis/binary_sensor.py b/homeassistant/components/axis/binary_sensor.py
index dcdf440a472..1881fe887f9 100644
--- a/homeassistant/components/axis/binary_sensor.py
+++ b/homeassistant/components/axis/binary_sensor.py
@@ -49,7 +49,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         if event.CLASS != CLASS_OUTPUT and not (
             event.CLASS == CLASS_LIGHT and event.TYPE == "Light"
         ):
-            async_add_entities([AxisBinarySensor(event, device)], True)
+            async_add_entities([AxisBinarySensor(event, device)])
 
     device.listeners.append(
         async_dispatcher_connect(hass, device.signal_new_event, async_add_sensor)
diff --git a/homeassistant/components/axis/config_flow.py b/homeassistant/components/axis/config_flow.py
index 5b300fe323b..ea1db54855b 100644
--- a/homeassistant/components/axis/config_flow.py
+++ b/homeassistant/components/axis/config_flow.py
@@ -94,10 +94,10 @@ class AxisFlowHandler(config_entries.ConfigFlow, domain=AXIS_DOMAIN):
                 return await self._create_entry()
 
             except AuthenticationRequired:
-                errors["base"] = "faulty_credentials"
+                errors["base"] = "invalid_auth"
 
             except CannotConnect:
-                errors["base"] = "device_unavailable"
+                errors["base"] = "cannot_connect"
 
         data = self.discovery_schema or {
             vol.Required(CONF_HOST): str,
diff --git a/homeassistant/components/axis/device.py b/homeassistant/components/axis/device.py
index a22fea23e79..79204bf3002 100644
--- a/homeassistant/components/axis/device.py
+++ b/homeassistant/components/axis/device.py
@@ -77,6 +77,8 @@ class AxisNetworkDevice:
         """Return the serial number of this device."""
         return self.config_entry.unique_id
 
+    # Options
+
     @property
     def option_events(self):
         """Config entry option defining if platforms based on events should be created."""
@@ -94,6 +96,8 @@ class AxisNetworkDevice:
         """Config entry option defining minimum number of seconds to keep trigger high."""
         return self.config_entry.options.get(CONF_TRIGGER_TIME, DEFAULT_TRIGGER_TIME)
 
+    # Signals
+
     @property
     def signal_reachable(self):
         """Device specific event to signal a change in connection status."""
@@ -109,6 +113,8 @@ class AxisNetworkDevice:
         """Device specific event to signal a change in device address."""
         return f"axis_new_address_{self.serial}"
 
+    # Callbacks
+
     @callback
     def async_connection_status_callback(self, status):
         """Handle signals of device connection status.
@@ -155,9 +161,7 @@ class AxisNetworkDevice:
     async def use_mqtt(self, hass: HomeAssistant, component: str) -> None:
         """Set up to use MQTT."""
         try:
-            status = await hass.async_add_executor_job(
-                self.api.vapix.mqtt.get_client_status
-            )
+            status = await self.api.vapix.mqtt.get_client_status()
         except Unauthorized:
             # This means the user has too low privileges
             status = {}
@@ -175,6 +179,8 @@ class AxisNetworkDevice:
         event = mqtt_json_to_event(message.payload)
         self.api.event.process_event(event)
 
+    # Setup and teardown methods
+
     async def async_setup(self):
         """Set up the device."""
         try:
@@ -230,14 +236,15 @@ class AxisNetworkDevice:
             )
             self.api.stream.stop()
 
-    @callback
-    def shutdown(self, event):
+    async def shutdown(self, event):
         """Stop the event stream."""
         self.disconnect_from_stream()
+        await self.api.vapix.close()
 
     async def async_reset(self):
         """Reset this device to default state."""
         self.disconnect_from_stream()
+        await self.api.vapix.close()
 
         unload_ok = all(
             await asyncio.gather(
@@ -267,18 +274,21 @@ async def get_device(hass, host, port, username, password):
 
     try:
         with async_timeout.timeout(15):
-            await hass.async_add_executor_job(device.vapix.initialize)
+            await device.vapix.initialize()
 
         return device
 
     except axis.Unauthorized as err:
         LOGGER.warning("Connected to device at %s but not registered.", host)
+        await device.vapix.close()
         raise AuthenticationRequired from err
 
     except (asyncio.TimeoutError, axis.RequestError) as err:
         LOGGER.error("Error connecting to the Axis device at %s", host)
+        await device.vapix.close()
         raise CannotConnect from err
 
     except axis.AxisException as err:
         LOGGER.exception("Unknown Axis communication error occurred")
+        await device.vapix.close()
         raise AuthenticationRequired from err
diff --git a/homeassistant/components/axis/light.py b/homeassistant/components/axis/light.py
index 3ae15a46244..df4c00415ff 100644
--- a/homeassistant/components/axis/light.py
+++ b/homeassistant/components/axis/light.py
@@ -27,7 +27,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         event = device.api.event[event_id]
 
         if event.CLASS == CLASS_LIGHT and event.TYPE == "Light":
-            async_add_entities([AxisLight(event, device)], True)
+            async_add_entities([AxisLight(event, device)])
 
     device.listeners.append(
         async_dispatcher_connect(hass, device.signal_new_event, async_add_sensor)
@@ -52,19 +52,17 @@ class AxisLight(AxisEventBase, LightEntity):
         """Subscribe lights events."""
         await super().async_added_to_hass()
 
-        def get_light_capabilities():
-            """Get light capabilities."""
-            current_intensity = (
-                self.device.api.vapix.light_control.get_current_intensity(self.light_id)
-            )
-            self.current_intensity = current_intensity["data"]["intensity"]
-
-            max_intensity = self.device.api.vapix.light_control.get_valid_intensity(
+        current_intensity = (
+            await self.device.api.vapix.light_control.get_current_intensity(
                 self.light_id
             )
-            self.max_intensity = max_intensity["data"]["ranges"][0]["high"]
+        )
+        self.current_intensity = current_intensity["data"]["intensity"]
 
-        await self.hass.async_add_executor_job(get_light_capabilities)
+        max_intensity = await self.device.api.vapix.light_control.get_valid_intensity(
+            self.light_id
+        )
+        self.max_intensity = max_intensity["data"]["ranges"][0]["high"]
 
     @property
     def supported_features(self):
@@ -87,26 +85,28 @@ class AxisLight(AxisEventBase, LightEntity):
         """Return the brightness of this light between 0..255."""
         return int((self.current_intensity / self.max_intensity) * 255)
 
-    def turn_on(self, **kwargs):
+    async def async_turn_on(self, **kwargs):
         """Turn on light."""
         if not self.is_on:
-            self.device.api.vapix.light_control.activate_light(self.light_id)
+            await self.device.api.vapix.light_control.activate_light(self.light_id)
 
         if ATTR_BRIGHTNESS in kwargs:
             intensity = int((kwargs[ATTR_BRIGHTNESS] / 255) * self.max_intensity)
-            self.device.api.vapix.light_control.set_manual_intensity(
+            await self.device.api.vapix.light_control.set_manual_intensity(
                 self.light_id, intensity
             )
 
-    def turn_off(self, **kwargs):
+    async def async_turn_off(self, **kwargs):
         """Turn off light."""
         if self.is_on:
-            self.device.api.vapix.light_control.deactivate_light(self.light_id)
+            await self.device.api.vapix.light_control.deactivate_light(self.light_id)
 
-    def update(self):
+    async def async_update(self):
         """Update brightness."""
-        current_intensity = self.device.api.vapix.light_control.get_current_intensity(
-            self.light_id
+        current_intensity = (
+            await self.device.api.vapix.light_control.get_current_intensity(
+                self.light_id
+            )
         )
         self.current_intensity = current_intensity["data"]["intensity"]
 
diff --git a/homeassistant/components/axis/manifest.json b/homeassistant/components/axis/manifest.json
index 959d53a01ae..188520241f3 100644
--- a/homeassistant/components/axis/manifest.json
+++ b/homeassistant/components/axis/manifest.json
@@ -3,7 +3,7 @@
   "name": "Axis",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/axis",
-  "requirements": ["axis==37"],
+  "requirements": ["axis==41"],
   "zeroconf": [
     { "type": "_axis-video._tcp.local.", "macaddress": "00408C*" },
     { "type": "_axis-video._tcp.local.", "macaddress": "ACCC8E*" },
diff --git a/homeassistant/components/axis/strings.json b/homeassistant/components/axis/strings.json
index 672bfe141b9..046b7fee475 100644
--- a/homeassistant/components/axis/strings.json
+++ b/homeassistant/components/axis/strings.json
@@ -13,14 +13,13 @@
       }
     },
     "error": {
-      "already_configured": "Device is already configured",
-      "already_in_progress": "Config flow for device is already in progress.",
-      "device_unavailable": "Device is not available",
-      "faulty_credentials": "Bad user credentials"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "abort": {
-      "already_configured": "Device is already configured",
-      "bad_config_file": "Bad data from configuration file",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "link_local_address": "Link local addresses are not supported",
       "not_axis_device": "Discovered device not an Axis device"
     }
diff --git a/homeassistant/components/axis/switch.py b/homeassistant/components/axis/switch.py
index 256a22db114..f3436b3eb83 100644
--- a/homeassistant/components/axis/switch.py
+++ b/homeassistant/components/axis/switch.py
@@ -20,7 +20,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         event = device.api.event[event_id]
 
         if event.CLASS == CLASS_OUTPUT:
-            async_add_entities([AxisSwitch(event, device)], True)
+            async_add_entities([AxisSwitch(event, device)])
 
     device.listeners.append(
         async_dispatcher_connect(hass, device.signal_new_event, async_add_switch)
@@ -37,15 +37,11 @@ class AxisSwitch(AxisEventBase, SwitchEntity):
 
     async def async_turn_on(self, **kwargs):
         """Turn on switch."""
-        await self.hass.async_add_executor_job(
-            self.device.api.vapix.ports[self.event.id].close
-        )
+        await self.device.api.vapix.ports[self.event.id].close()
 
     async def async_turn_off(self, **kwargs):
         """Turn off switch."""
-        await self.hass.async_add_executor_job(
-            self.device.api.vapix.ports[self.event.id].open
-        )
+        await self.device.api.vapix.ports[self.event.id].open()
 
     @property
     def name(self):
diff --git a/homeassistant/components/axis/translations/ca.json b/homeassistant/components/axis/translations/ca.json
index 8cbbe638d24..209e9713bae 100644
--- a/homeassistant/components/axis/translations/ca.json
+++ b/homeassistant/components/axis/translations/ca.json
@@ -8,9 +8,11 @@
         },
         "error": {
             "already_configured": "El dispositiu ja est\u00e0 configurat",
-            "already_in_progress": "El flux de dades de configuraci\u00f3 pel dispositiu ja est\u00e0 en curs.",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "device_unavailable": "El dispositiu no est\u00e0 disponible",
-            "faulty_credentials": "Credencials d'usuari incorrectes"
+            "faulty_credentials": "Credencials d'usuari incorrectes",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
         },
         "flow_title": "Dispositiu d'eix: {name} ({host})",
         "step": {
diff --git a/homeassistant/components/axis/translations/cs.json b/homeassistant/components/axis/translations/cs.json
index dc88556b6e1..e6fc40692b2 100644
--- a/homeassistant/components/axis/translations/cs.json
+++ b/homeassistant/components/axis/translations/cs.json
@@ -1,5 +1,19 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "bad_config_file": "Chybn\u00e1 data z konfigura\u010dn\u00edho souboru",
+            "link_local_address": "Propojen\u00ed m\u00edstn\u00edch adres nen\u00ed podporov\u00e1no",
+            "not_axis_device": "Objeven\u00e9 za\u0159\u00edzen\u00ed nen\u00ed za\u0159\u00edzen\u00ed Axis"
+        },
+        "error": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "device_unavailable": "Za\u0159\u00edzen\u00ed nen\u00ed k dispozici",
+            "faulty_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
         "flow_title": "Za\u0159\u00edzen\u00ed Axis: {name} ({host})",
         "step": {
             "user": {
@@ -8,7 +22,8 @@
                     "password": "Heslo",
                     "port": "Port",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "Nastaven\u00ed za\u0159\u00edzen\u00ed Axis"
             }
         }
     }
diff --git a/homeassistant/components/axis/translations/en.json b/homeassistant/components/axis/translations/en.json
index 29461ee0612..f1eb6f3eaf8 100644
--- a/homeassistant/components/axis/translations/en.json
+++ b/homeassistant/components/axis/translations/en.json
@@ -8,9 +8,11 @@
         },
         "error": {
             "already_configured": "Device is already configured",
-            "already_in_progress": "Config flow for device is already in progress.",
+            "already_in_progress": "Configuration flow is already in progress",
+            "cannot_connect": "Failed to connect",
             "device_unavailable": "Device is not available",
-            "faulty_credentials": "Bad user credentials"
+            "faulty_credentials": "Bad user credentials",
+            "invalid_auth": "Invalid authentication"
         },
         "flow_title": "Axis device: {name} ({host})",
         "step": {
diff --git a/homeassistant/components/axis/translations/es.json b/homeassistant/components/axis/translations/es.json
index 045f939ab3c..7118cbfb094 100644
--- a/homeassistant/components/axis/translations/es.json
+++ b/homeassistant/components/axis/translations/es.json
@@ -9,8 +9,10 @@
         "error": {
             "already_configured": "El dispositivo ya est\u00e1 configurado",
             "already_in_progress": "El flujo de configuraci\u00f3n del dispositivo ya est\u00e1 en marcha.",
+            "cannot_connect": "No se pudo conectar",
             "device_unavailable": "El dispositivo no est\u00e1 disponible",
-            "faulty_credentials": "Credenciales de usuario incorrectas"
+            "faulty_credentials": "Credenciales de usuario incorrectas",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
         },
         "flow_title": "Dispositivo Axis: {name} ({host})",
         "step": {
diff --git a/homeassistant/components/axis/translations/et.json b/homeassistant/components/axis/translations/et.json
new file mode 100644
index 00000000000..ef293713144
--- /dev/null
+++ b/homeassistant/components/axis/translations/et.json
@@ -0,0 +1,40 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "bad_config_file": "Vigane konfiguratsioonikirje",
+            "link_local_address": "Kohtv\u00f5rgu linke ei toetata",
+            "not_axis_device": "Avastatud seade pole Axise seade"
+        },
+        "error": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "device_unavailable": "Seade pole saadaval",
+            "faulty_credentials": "Sobimatu mandaat.",
+            "invalid_auth": "Tuvastamise viga"
+        },
+        "flow_title": "Axise seade: {name} ({host})",
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "port": "",
+                    "username": "Kasutajanimi"
+                },
+                "title": "Seadista Axis'e seade"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "configure_stream": {
+                "data": {
+                    "stream_profile": "Vali kasutatav vooprofiil"
+                },
+                "title": "Axis'e seadme videovoo valikud"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/axis/translations/it.json b/homeassistant/components/axis/translations/it.json
index 1ad2baddb85..bae91d3e511 100644
--- a/homeassistant/components/axis/translations/it.json
+++ b/homeassistant/components/axis/translations/it.json
@@ -8,9 +8,11 @@
         },
         "error": {
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "Il flusso di configurazione per il dispositivo \u00e8 gi\u00e0 in corso.",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
+            "cannot_connect": "Impossibile connettersi",
             "device_unavailable": "Il dispositivo non \u00e8 disponibile",
-            "faulty_credentials": "Credenziali utente non valide"
+            "faulty_credentials": "Credenziali utente non valide",
+            "invalid_auth": "Autenticazione non valida"
         },
         "flow_title": "Dispositivo Axis: {name} ({host})",
         "step": {
diff --git a/homeassistant/components/axis/translations/lb.json b/homeassistant/components/axis/translations/lb.json
index 6de6b7044f8..7299fa76b33 100644
--- a/homeassistant/components/axis/translations/lb.json
+++ b/homeassistant/components/axis/translations/lb.json
@@ -9,8 +9,10 @@
         "error": {
             "already_configured": "Apparat ass scho konfigur\u00e9iert",
             "already_in_progress": "Konfiguratioun fir d\u00ebsen Apparat ass schonn am gaang.",
+            "cannot_connect": "Feeler beim verbannen",
             "device_unavailable": "Apparat ass net erreechbar",
-            "faulty_credentials": "Ong\u00eblteg Login Informatioune"
+            "faulty_credentials": "Ong\u00eblteg Login Informatioune",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun"
         },
         "flow_title": "Axis Apparat: {name} ({host})",
         "step": {
diff --git a/homeassistant/components/axis/translations/nl.json b/homeassistant/components/axis/translations/nl.json
index 01257e7585a..82347254900 100644
--- a/homeassistant/components/axis/translations/nl.json
+++ b/homeassistant/components/axis/translations/nl.json
@@ -9,6 +9,7 @@
         "error": {
             "already_configured": "Apparaat is al geconfigureerd",
             "already_in_progress": "De configuratiestroom voor het apparaat is al in volle gang.",
+            "cannot_connect": "Kan geen verbinding maken",
             "device_unavailable": "Apparaat is niet beschikbaar",
             "faulty_credentials": "Ongeldige gebruikersreferenties"
         },
diff --git a/homeassistant/components/axis/translations/no.json b/homeassistant/components/axis/translations/no.json
index 039e6138753..771ecc06b02 100644
--- a/homeassistant/components/axis/translations/no.json
+++ b/homeassistant/components/axis/translations/no.json
@@ -8,17 +8,19 @@
         },
         "error": {
             "already_configured": "Enheten er allerede konfigurert",
-            "already_in_progress": "Konfigurasjonsflyt for enhet p\u00e5g\u00e5r allerede.",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
+            "cannot_connect": "Tilkobling mislyktes",
             "device_unavailable": "Enheten er ikke tilgjengelig",
-            "faulty_credentials": "Ugyldig brukerlegitimasjon"
+            "faulty_credentials": "Ugyldig brukerlegitimasjon",
+            "invalid_auth": "Ugyldig godkjenning"
         },
-        "flow_title": "Akse-enhet: {Name} ({Host})",
+        "flow_title": "Axis enhet: {name} ({host})",
         "step": {
             "user": {
                 "data": {
                     "host": "Vert",
                     "password": "Passord",
-                    "port": "",
+                    "port": "Port",
                     "username": "Brukernavn"
                 },
                 "title": "Sett opp Axis enhet"
diff --git a/homeassistant/components/axis/translations/pl.json b/homeassistant/components/axis/translations/pl.json
index 154577573bb..68e7093c7e7 100644
--- a/homeassistant/components/axis/translations/pl.json
+++ b/homeassistant/components/axis/translations/pl.json
@@ -8,9 +8,11 @@
         },
         "error": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "already_in_progress": "Konfiguracja urz\u0105dzenia jest ju\u017c w toku.",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "device_unavailable": "Urz\u0105dzenie jest niedost\u0119pne",
-            "faulty_credentials": "B\u0142\u0119dne dane uwierzytelniaj\u0105ce"
+            "faulty_credentials": "B\u0142\u0119dne dane uwierzytelniaj\u0105ce",
+            "invalid_auth": "Niepoprawne uwierzytelnienie"
         },
         "flow_title": "Urz\u0105dzenie Axis: {name} ({host})",
         "step": {
diff --git a/homeassistant/components/axis/translations/ru.json b/homeassistant/components/axis/translations/ru.json
index 4f8aea64e78..e9138a13045 100644
--- a/homeassistant/components/axis/translations/ru.json
+++ b/homeassistant/components/axis/translations/ru.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "bad_config_file": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0438\u0437 \u0444\u0430\u0439\u043b\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438.",
             "link_local_address": "\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.",
             "not_axis_device": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c Axis."
         },
         "error": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "device_unavailable": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e.",
-            "faulty_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435."
+            "faulty_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
         },
         "flow_title": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e Axis {name} ({host})",
         "step": {
diff --git a/homeassistant/components/axis/translations/zh-Hant.json b/homeassistant/components/axis/translations/zh-Hant.json
index 8e90d449f11..fc81b43c2be 100644
--- a/homeassistant/components/axis/translations/zh-Hant.json
+++ b/homeassistant/components/axis/translations/zh-Hant.json
@@ -8,9 +8,11 @@
         },
         "error": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "\u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "device_unavailable": "\u8a2d\u5099\u7121\u6cd5\u4f7f\u7528",
-            "faulty_credentials": "\u4f7f\u7528\u8005\u6191\u8b49\u7121\u6548"
+            "faulty_credentials": "\u4f7f\u7528\u8005\u6191\u8b49\u7121\u6548",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548"
         },
         "flow_title": "Axis \u8a2d\u5099\uff1a{name} ({host})",
         "step": {
diff --git a/homeassistant/components/azure_devops/config_flow.py b/homeassistant/components/azure_devops/config_flow.py
index 69030871b8d..e1e7d833926 100644
--- a/homeassistant/components/azure_devops/config_flow.py
+++ b/homeassistant/components/azure_devops/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow to configure the Azure DevOps integration."""
-import logging
-
 from aioazuredevops.client import DevOpsClient
 import aiohttp
 import voluptuous as vol
@@ -14,8 +12,6 @@ from homeassistant.components.azure_devops.const import (  # pylint:disable=unus
 )
 from homeassistant.config_entries import ConfigFlow
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class AzureDevOpsFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a Azure DevOps config flow."""
@@ -64,14 +60,14 @@ class AzureDevOpsFlowHandler(ConfigFlow, domain=DOMAIN):
             if self._pat is not None:
                 await client.authorize(self._pat, self._organization)
                 if not client.authorized:
-                    errors["base"] = "authorization_error"
+                    errors["base"] = "invalid_auth"
                     return errors
             project_info = await client.get_project(self._organization, self._project)
             if project_info is None:
                 errors["base"] = "project_error"
                 return errors
         except aiohttp.ClientError:
-            errors["base"] = "connection_error"
+            errors["base"] = "cannot_connect"
             return errors
         return None
 
diff --git a/homeassistant/components/azure_devops/strings.json b/homeassistant/components/azure_devops/strings.json
index 2bb53010153..6c274404612 100644
--- a/homeassistant/components/azure_devops/strings.json
+++ b/homeassistant/components/azure_devops/strings.json
@@ -2,8 +2,8 @@
   "config": {
     "flow_title": "Azure DevOps: {project_url}",
     "error": {
-      "authorization_error": "Authorization error. Check you have access to the project and have the correct credentials.",
-      "connection_error": "Could not connect to Azure DevOps.",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "project_error": "Could not get project info."
     },
     "step": {
@@ -26,7 +26,7 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "reauth_successful": "[%key:common::config_flow::data::access_token%] updated successfully"
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "title": "Azure DevOps"
diff --git a/homeassistant/components/azure_devops/translations/ca.json b/homeassistant/components/azure_devops/translations/ca.json
index df8fe8c04b3..6622fb4f954 100644
--- a/homeassistant/components/azure_devops/translations/ca.json
+++ b/homeassistant/components/azure_devops/translations/ca.json
@@ -2,11 +2,13 @@
     "config": {
         "abort": {
             "already_configured": "El compte ja ha estat configurat",
-            "reauth_successful": "Token d'acc\u00e9s actualitzat correctament"
+            "reauth_successful": "Re-autenticaci\u00f3 realitzada correctament"
         },
         "error": {
             "authorization_error": "Error d'autoritzaci\u00f3. Comprova que tens acc\u00e9s al projecte i tens les credencials correctes.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar a Azure DevOps.",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "project_error": "No s'ha pogut obtenir la informaci\u00f3 del projecte."
         },
         "flow_title": "Azure DevOps: {project_url}",
diff --git a/homeassistant/components/azure_devops/translations/cs.json b/homeassistant/components/azure_devops/translations/cs.json
new file mode 100644
index 00000000000..938fee05510
--- /dev/null
+++ b/homeassistant/components/azure_devops/translations/cs.json
@@ -0,0 +1,33 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9"
+        },
+        "error": {
+            "authorization_error": "Chyba autorizace. Zkontrolujte, zda m\u00e1te p\u0159\u00edstup k projektu a zda m\u00e1te spr\u00e1vn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "Nelze se p\u0159ipojit k Azure DevOps.",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "project_error": "Nelze z\u00edskat informace o projektu."
+        },
+        "flow_title": "Azure DevOps: {project_url}",
+        "step": {
+            "reauth": {
+                "data": {
+                    "personal_access_token": "Osobn\u00ed p\u0159\u00edstupov\u00fd token (PAT)"
+                },
+                "title": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed"
+            },
+            "user": {
+                "data": {
+                    "organization": "Organizace",
+                    "personal_access_token": "Osobn\u00ed p\u0159\u00edstupov\u00fd token (PAT)",
+                    "project": "Projekt"
+                },
+                "title": "P\u0159idejte projekt Azure DevOps"
+            }
+        }
+    },
+    "title": "Azure DevOps"
+}
\ No newline at end of file
diff --git a/homeassistant/components/azure_devops/translations/de.json b/homeassistant/components/azure_devops/translations/de.json
new file mode 100644
index 00000000000..cd849b9f933
--- /dev/null
+++ b/homeassistant/components/azure_devops/translations/de.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "step": {
+            "reauth": {
+                "title": "Erneute Authentifizierung"
+            },
+            "user": {
+                "data": {
+                    "organization": "Organisation",
+                    "project": "Projekt"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/azure_devops/translations/en.json b/homeassistant/components/azure_devops/translations/en.json
index 3adeade6c5f..58d1dca7c76 100644
--- a/homeassistant/components/azure_devops/translations/en.json
+++ b/homeassistant/components/azure_devops/translations/en.json
@@ -2,11 +2,13 @@
     "config": {
         "abort": {
             "already_configured": "Account is already configured",
-            "reauth_successful": "Access Token updated successfully"
+            "reauth_successful": "Re-authentication was successful"
         },
         "error": {
             "authorization_error": "Authorization error. Check you have access to the project and have the correct credentials.",
+            "cannot_connect": "Failed to connect",
             "connection_error": "Could not connect to Azure DevOps.",
+            "invalid_auth": "Invalid authentication",
             "project_error": "Could not get project info."
         },
         "flow_title": "Azure DevOps: {project_url}",
diff --git a/homeassistant/components/azure_devops/translations/et.json b/homeassistant/components/azure_devops/translations/et.json
new file mode 100644
index 00000000000..1329b02c32a
--- /dev/null
+++ b/homeassistant/components/azure_devops/translations/et.json
@@ -0,0 +1,35 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud",
+            "reauth_successful": "Taasautentimine \u00f5nnestus"
+        },
+        "error": {
+            "authorization_error": "Tuvastusviga. Kontrolli kas sul on juurdep\u00e4\u00e4s projektile ja kas sul on \u00f5iged volitused.",
+            "cannot_connect": "\u00dchendus nurjus",
+            "connection_error": "Azure DevOpsiga ei saanud \u00fchendust luua.",
+            "invalid_auth": "Tuvastamise viga",
+            "project_error": "Projekti teavet ei \u00f5nnestunud hankida."
+        },
+        "flow_title": "Azure DevOps: {project_url}",
+        "step": {
+            "reauth": {
+                "data": {
+                    "personal_access_token": "Isiklik juurdep\u00e4\u00e4suluba (PAT)"
+                },
+                "description": "{project_url} tuvastamine nurjus. Sisesta oma kehtivad andmed.",
+                "title": "Taastuvastamine"
+            },
+            "user": {
+                "data": {
+                    "organization": "Organisatsioon",
+                    "personal_access_token": "Isiklik juurdep\u00e4\u00e4suluba (PAT)",
+                    "project": "Projekt"
+                },
+                "description": "Projektile juurdep\u00e4\u00e4semiseks seadista Azure DevOpsi eksemplar. Isiklik juurdep\u00e4\u00e4suluba on vajalik ainult eraprojekti jaoks.",
+                "title": "Lisa Azure DevOps Project"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/azure_devops/translations/it.json b/homeassistant/components/azure_devops/translations/it.json
index a62f366e724..d3a2b2dae6e 100644
--- a/homeassistant/components/azure_devops/translations/it.json
+++ b/homeassistant/components/azure_devops/translations/it.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "L'account \u00e8 gi\u00e0 configurato",
-            "reauth_successful": "Token di accesso aggiornato correttamente"
+            "reauth_successful": "La riautenticazione ha avuto successo"
         },
         "error": {
             "authorization_error": "Errore di autorizzazione. Verificare di avere accesso al progetto e disporre delle credenziali corrette.",
diff --git a/homeassistant/components/azure_devops/translations/nl.json b/homeassistant/components/azure_devops/translations/nl.json
new file mode 100644
index 00000000000..42978a06b37
--- /dev/null
+++ b/homeassistant/components/azure_devops/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Account is al geconfigureerd"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/azure_devops/translations/no.json b/homeassistant/components/azure_devops/translations/no.json
index 00d9ae4d925..a5b9cc34191 100644
--- a/homeassistant/components/azure_devops/translations/no.json
+++ b/homeassistant/components/azure_devops/translations/no.json
@@ -2,21 +2,23 @@
     "config": {
         "abort": {
             "already_configured": "Kontoen er allerede konfigurert",
-            "reauth_successful": "Tilgangstoken oppdatert"
+            "reauth_successful": "Reautentisering var vellykket"
         },
         "error": {
             "authorization_error": "Autoriseringsfeil. Sjekk at du har tilgang til prosjektet og har riktig legitimasjon.",
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kunne ikke koble til Azure DevOps.",
+            "invalid_auth": "Ugyldig godkjenning",
             "project_error": "Kunne ikke f\u00e5 prosjektinformasjon."
         },
-        "flow_title": "Azure DevOps: {project_url}",
+        "flow_title": "",
         "step": {
             "reauth": {
                 "data": {
                     "personal_access_token": "Token for personlig tilgang (PAT)"
                 },
                 "description": "Autentiseringen mislyktes for {project_url} . Vennligst skriv inn gjeldende legitimasjon.",
-                "title": "reautentisering"
+                "title": "Reautorisasjon"
             },
             "user": {
                 "data": {
@@ -29,5 +31,5 @@
             }
         }
     },
-    "title": "Azure DevOps"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/azure_devops/translations/pl.json b/homeassistant/components/azure_devops/translations/pl.json
index 868cbe84645..5dd93f73a5c 100644
--- a/homeassistant/components/azure_devops/translations/pl.json
+++ b/homeassistant/components/azure_devops/translations/pl.json
@@ -2,14 +2,32 @@
     "config": {
         "abort": {
             "already_configured": "Konto jest ju\u017c skonfigurowane",
-            "reauth_successful": "Token dost\u0119pu pomy\u015blnie zaktualizowany"
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119"
         },
+        "error": {
+            "authorization_error": "B\u0142\u0105d autoryzacji. Sprawd\u017a, czy masz dost\u0119p do projektu i masz prawid\u0142owe po\u015bwiadczenia.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z us\u0142ug\u0105 Azure DevOps",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "project_error": "Nie mo\u017cna uzyska\u0107 informacji o projekcie"
+        },
+        "flow_title": "Azure DevOps: {project_url}",
         "step": {
+            "reauth": {
+                "data": {
+                    "personal_access_token": "Osobisty token dost\u0119pu (PAT)"
+                },
+                "description": "Uwierzytelnianie dla {project_url} nie powiod\u0142o si\u0119. Wprowad\u017a aktualne dane uwierzytelniaj\u0105ce.",
+                "title": "Ponowne uwierzytelnianie"
+            },
             "user": {
                 "data": {
                     "organization": "Organizacja",
+                    "personal_access_token": "Osobisty token dost\u0119pu (PAT)",
                     "project": "Projekt"
-                }
+                },
+                "description": "Skonfiguruj instancj\u0119 Azure DevOps, aby uzyska\u0107 dost\u0119p do swojego projektu. Osobisty token dost\u0119pu (PAT) jest wymagany tylko dla prywatnego projektu.",
+                "title": "Dodaj projekt Azure DevOps"
             }
         }
     },
diff --git a/homeassistant/components/azure_devops/translations/ru.json b/homeassistant/components/azure_devops/translations/ru.json
index c98eddf5ade..d7ea5cde1a0 100644
--- a/homeassistant/components/azure_devops/translations/ru.json
+++ b/homeassistant/components/azure_devops/translations/ru.json
@@ -2,11 +2,13 @@
     "config": {
         "abort": {
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
-            "reauth_successful": "\u0422\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d."
+            "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
         },
         "error": {
             "authorization_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438. \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0443 \u0412\u0430\u0441 \u0435\u0441\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043f\u0440\u043e\u0435\u043a\u0442\u0443, \u0430 \u0442\u0430\u043a \u0436\u0435 \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a Azure DevOps.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "project_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0435."
         },
         "flow_title": "Azure DevOps: {project_url}",
diff --git a/homeassistant/components/azure_devops/translations/zh-Hant.json b/homeassistant/components/azure_devops/translations/zh-Hant.json
index f632ea947ae..8a4340901fb 100644
--- a/homeassistant/components/azure_devops/translations/zh-Hant.json
+++ b/homeassistant/components/azure_devops/translations/zh-Hant.json
@@ -2,11 +2,13 @@
     "config": {
         "abort": {
             "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "reauth_successful": "\u5b58\u53d6\u5bc6\u9470\u5df2\u6210\u529f\u66f4\u65b0"
+            "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f"
         },
         "error": {
             "authorization_error": "\u8a8d\u8b49\u932f\u8aa4\u3002\u8acb\u78ba\u8a8d\u64c1\u6709\u5c08\u6848\u5b58\u53d6\u6b0a\u8207\u6b63\u78ba\u7684\u8b49\u66f8\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "\u7121\u6cd5\u9023\u7dda\u81f3 Azure DevOps\u3002",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "project_error": "\u7121\u6cd5\u53d6\u5f97\u5c08\u6848\u8cc7\u8a0a\u3002"
         },
         "flow_title": "Azure DevOps\uff1a{project_url}",
diff --git a/homeassistant/components/azure_service_bus/manifest.json b/homeassistant/components/azure_service_bus/manifest.json
index 9e3f0e956e5..d7a232d8d1a 100644
--- a/homeassistant/components/azure_service_bus/manifest.json
+++ b/homeassistant/components/azure_service_bus/manifest.json
@@ -2,6 +2,6 @@
   "domain": "azure_service_bus",
   "name": "Azure Service Bus",
   "documentation": "https://www.home-assistant.io/integrations/azure_service_bus",
-  "requirements": ["azure-servicebus==0.50.1"],
+  "requirements": ["azure-servicebus==0.50.3"],
   "codeowners": ["@hfurubotten"]
 }
diff --git a/homeassistant/components/baidu/tts.py b/homeassistant/components/baidu/tts.py
index 5a14fc78020..72694248fa1 100644
--- a/homeassistant/components/baidu/tts.py
+++ b/homeassistant/components/baidu/tts.py
@@ -12,7 +12,7 @@ _LOGGER = logging.getLogger(__name__)
 
 SUPPORTED_LANGUAGES = ["zh"]
 DEFAULT_LANG = "zh"
-SUPPORTED_PERSON = [0, 1, 3, 4, 5, 103, 106, 110, 111]
+SUPPORTED_PERSON = [0, 1, 3, 4, 5, 103, 106, 110, 111, 5003, 5118]
 
 CONF_APP_ID = "app_id"
 CONF_SECRET_KEY = "secret_key"
diff --git a/homeassistant/components/bbb_gpio/__init__.py b/homeassistant/components/bbb_gpio/__init__.py
index 30a4bacc4da..61d98c7413e 100644
--- a/homeassistant/components/bbb_gpio/__init__.py
+++ b/homeassistant/components/bbb_gpio/__init__.py
@@ -1,12 +1,8 @@
 """Support for controlling GPIO pins of a Beaglebone Black."""
-import logging
-
 from Adafruit_BBIO import GPIO  # pylint: disable=import-error
 
 from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "bbb_gpio"
 
 
diff --git a/homeassistant/components/bbb_gpio/binary_sensor.py b/homeassistant/components/bbb_gpio/binary_sensor.py
index 229f7a6c61e..c772cf86f00 100644
--- a/homeassistant/components/bbb_gpio/binary_sensor.py
+++ b/homeassistant/components/bbb_gpio/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for binary sensor using Beaglebone Black GPIO."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components import bbb_gpio
@@ -8,8 +6,6 @@ from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensor
 from homeassistant.const import CONF_NAME, DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PINS = "pins"
 CONF_BOUNCETIME = "bouncetime"
 CONF_INVERT_LOGIC = "invert_logic"
diff --git a/homeassistant/components/bbb_gpio/switch.py b/homeassistant/components/bbb_gpio/switch.py
index cc776c21f9e..03a9065a15b 100644
--- a/homeassistant/components/bbb_gpio/switch.py
+++ b/homeassistant/components/bbb_gpio/switch.py
@@ -1,6 +1,4 @@
 """Allows to configure a switch using BeagleBone Black GPIO."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components import bbb_gpio
@@ -9,8 +7,6 @@ from homeassistant.const import CONF_NAME, DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import ToggleEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PINS = "pins"
 CONF_INITIAL = "initial"
 CONF_INVERT_LOGIC = "invert_logic"
diff --git a/homeassistant/components/beewi_smartclim/sensor.py b/homeassistant/components/beewi_smartclim/sensor.py
index b155a1e06be..e8a37d51be4 100644
--- a/homeassistant/components/beewi_smartclim/sensor.py
+++ b/homeassistant/components/beewi_smartclim/sensor.py
@@ -1,6 +1,4 @@
 """Platform for beewi_smartclim integration."""
-import logging
-
 from beewi_smartclim import BeewiSmartClimPoller  # pylint: disable=import-error
 import voluptuous as vol
 
@@ -17,8 +15,6 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 # Default values
 DEFAULT_NAME = "BeeWi SmartClim"
 
diff --git a/homeassistant/components/bh1750/sensor.py b/homeassistant/components/bh1750/sensor.py
index 4d4067eb77d..7680b8b09ad 100644
--- a/homeassistant/components/bh1750/sensor.py
+++ b/homeassistant/components/bh1750/sensor.py
@@ -69,7 +69,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
 
     bus = smbus.SMBus(bus_number)
 
-    sensor = await hass.async_add_job(
+    sensor = await hass.async_add_executor_job(
         partial(
             BH1750,
             bus,
@@ -130,7 +130,7 @@ class BH1750Sensor(Entity):
 
     async def async_update(self):
         """Get the latest data from the BH1750 and update the states."""
-        await self.hass.async_add_job(self.bh1750_sensor.update)
+        await self.hass.async_add_executor_job(self.bh1750_sensor.update)
         if self.bh1750_sensor.sample_ok and self.bh1750_sensor.light_level >= 0:
             self._state = int(round(self.bh1750_sensor.light_level * self._multiplier))
         else:
diff --git a/homeassistant/components/binary_sensor/translations/cs.json b/homeassistant/components/binary_sensor/translations/cs.json
index ae0745d3a49..be54f0192d7 100644
--- a/homeassistant/components/binary_sensor/translations/cs.json
+++ b/homeassistant/components/binary_sensor/translations/cs.json
@@ -52,7 +52,7 @@
             "hot": "{entity_name} se zah\u0159\u00e1l",
             "light": "{entity_name} za\u010dalo detekovat sv\u011btlo",
             "locked": "{entity_name} zam\u010deno",
-            "moist": "{entity_name} se navlh\u010dil",
+            "moist": "{entity_name} zvlhnul",
             "motion": "{entity_name} za\u010dalo detekovat pohyb",
             "moving": "{entity_name} se za\u010dal pohybovat",
             "no_gas": "{entity_name} p\u0159estalo detekovat plyn",
diff --git a/homeassistant/components/binary_sensor/translations/es.json b/homeassistant/components/binary_sensor/translations/es.json
index a3e48832468..013d587539a 100644
--- a/homeassistant/components/binary_sensor/translations/es.json
+++ b/homeassistant/components/binary_sensor/translations/es.json
@@ -96,11 +96,11 @@
         },
         "battery": {
             "off": "Normal",
-            "on": "Bajo"
+            "on": "Baja"
         },
         "cold": {
             "off": "Normal",
-            "on": "Frio"
+            "on": "Fr\u00edo"
         },
         "connectivity": {
             "off": "Desconectado",
diff --git a/homeassistant/components/binary_sensor/translations/no.json b/homeassistant/components/binary_sensor/translations/no.json
index b78a50a8628..ed85b1ab26d 100644
--- a/homeassistant/components/binary_sensor/translations/no.json
+++ b/homeassistant/components/binary_sensor/translations/no.json
@@ -95,11 +95,11 @@
             "on": "P\u00e5"
         },
         "battery": {
-            "off": "Normalt",
+            "off": "Normal",
             "on": "Lavt"
         },
         "cold": {
-            "off": "",
+            "off": "Normal",
             "on": "Kald"
         },
         "connectivity": {
@@ -115,11 +115,11 @@
             "on": "\u00c5pen"
         },
         "gas": {
-            "off": "Klar",
+            "off": "Klart",
             "on": "Oppdaget"
         },
         "heat": {
-            "off": "",
+            "off": "Normal",
             "on": "Varm"
         },
         "lock": {
@@ -168,7 +168,7 @@
         },
         "window": {
             "off": "Lukket",
-            "on": "\u00c5pen"
+            "on": "\u00c5pent"
         }
     },
     "title": "Bin\u00e6r sensor"
diff --git a/homeassistant/components/binary_sensor/translations/pl.json b/homeassistant/components/binary_sensor/translations/pl.json
index 67af6898c39..a3f578f1cef 100644
--- a/homeassistant/components/binary_sensor/translations/pl.json
+++ b/homeassistant/components/binary_sensor/translations/pl.json
@@ -91,8 +91,8 @@
     },
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         },
         "battery": {
             "off": "na\u0142adowana",
diff --git a/homeassistant/components/binary_sensor/translations/zh-Hans.json b/homeassistant/components/binary_sensor/translations/zh-Hans.json
index d2edb26163f..b13a3622aca 100644
--- a/homeassistant/components/binary_sensor/translations/zh-Hans.json
+++ b/homeassistant/components/binary_sensor/translations/zh-Hans.json
@@ -48,7 +48,12 @@
             "connected": "{entity_name} \u5df2\u8fde\u63a5",
             "gas": "{entity_name} \u5f00\u59cb\u68c0\u6d4b\u5230\u71c3\u6c14\u6cc4\u6f0f",
             "hot": "{entity_name} \u53d8\u70ed",
-            "light": "{entity_name} \u5f00\u59cb\u68c0\u6d4b\u5230\u5149\u7ebf"
+            "light": "{entity_name} \u5f00\u59cb\u68c0\u6d4b\u5230\u5149\u7ebf",
+            "motion": "{entity_name} \u68c0\u6d4b\u5230\u6709\u4eba",
+            "no_motion": "{entity_name} \u672a\u68c0\u6d4b\u5230\u6709\u4eba",
+            "not_opened": "{entity_name}\u5df2\u5173\u95ed",
+            "turned_off": "{entity_name} \u88ab\u5173\u95ed",
+            "turned_on": "{entity_name} \u88ab\u6253\u5f00"
         }
     },
     "state": {
diff --git a/homeassistant/components/bizkaibus/sensor.py b/homeassistant/components/bizkaibus/sensor.py
index 0b8e2682f30..c1cee98208c 100644
--- a/homeassistant/components/bizkaibus/sensor.py
+++ b/homeassistant/components/bizkaibus/sensor.py
@@ -1,7 +1,4 @@
 """Support for Bizkaibus, Biscay (Basque Country, Spain) Bus service."""
-
-import logging
-
 from bizkaibus.bizkaibus import BizkaibusData
 import voluptuous as vol
 
@@ -10,8 +7,6 @@ from homeassistant.const import CONF_NAME, TIME_MINUTES
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_DUE_IN = "Due in"
 
 CONF_STOP_ID = "stopid"
diff --git a/homeassistant/components/blebox/strings.json b/homeassistant/components/blebox/strings.json
index f929d62d8d9..9a3c261a34a 100644
--- a/homeassistant/components/blebox/strings.json
+++ b/homeassistant/components/blebox/strings.json
@@ -1,13 +1,13 @@
 {
   "config": {
     "abort": {
-      "already_configured": "This BleBox device is already configured.",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "address_already_configured": "A BleBox device is already configured at {address}."
     },
     "error": {
-      "cannot_connect": "Unable to connect to the BleBox device. (Check the logs for errors.)",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unsupported_version": "BleBox device has outdated firmware. Please upgrade it first.",
-      "unknown": "Unknown error while connecting to the BleBox device. (Check the logs for errors.)"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "flow_title": "BleBox device: {name} ({host})",
     "step": {
diff --git a/homeassistant/components/blebox/translations/ca.json b/homeassistant/components/blebox/translations/ca.json
index 39bf371fac1..aba528fafb5 100644
--- a/homeassistant/components/blebox/translations/ca.json
+++ b/homeassistant/components/blebox/translations/ca.json
@@ -2,11 +2,11 @@
     "config": {
         "abort": {
             "address_already_configured": "Ja hi ha un dispositiu BleBox configurat a {address}.",
-            "already_configured": "Aquest dispositiu BleBox ja est\u00e0 configurat"
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar al dispositiu BleBox. (Consulta els registres per veure-hi els errors).",
-            "unknown": "S'ha produ\u00eft un error desconegut en connectar-se al dispositiu BleBox. (Consulta els registres per veure-hi els errors).",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "unknown": "Error inesperat",
             "unsupported_version": "El dispositiu BleBox t\u00e9 un firmware obsolet. Primer actualitza'l."
         },
         "flow_title": "Dispositiu BleBox: {name} ({host})",
diff --git a/homeassistant/components/blebox/translations/cs.json b/homeassistant/components/blebox/translations/cs.json
index 814e0c63418..ad9e6007ac7 100644
--- a/homeassistant/components/blebox/translations/cs.json
+++ b/homeassistant/components/blebox/translations/cs.json
@@ -1,11 +1,23 @@
 {
     "config": {
+        "abort": {
+            "address_already_configured": "Za\u0159\u00edzen\u00ed BleBox je ji\u017e na adrese {address} nastaveno.",
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba",
+            "unsupported_version": "Za\u0159\u00edzen\u00ed BleBox m\u00e1 zastaral\u00fd firmware. Nejprve jej upgradujte."
+        },
+        "flow_title": "Za\u0159\u00edzen\u00ed BleBox: {name} ({host})",
         "step": {
             "user": {
                 "data": {
                     "host": "IP adresa",
                     "port": "Port"
-                }
+                },
+                "description": "Nastavte BleBox k integraci s Home Assistant.",
+                "title": "Nastaven\u00ed za\u0159\u00edzen\u00ed BleBox"
             }
         }
     }
diff --git a/homeassistant/components/blebox/translations/en.json b/homeassistant/components/blebox/translations/en.json
index 29f7a03bb31..7ff38e25343 100644
--- a/homeassistant/components/blebox/translations/en.json
+++ b/homeassistant/components/blebox/translations/en.json
@@ -2,11 +2,11 @@
     "config": {
         "abort": {
             "address_already_configured": "A BleBox device is already configured at {address}.",
-            "already_configured": "This BleBox device is already configured."
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Unable to connect to the BleBox device. (Check the logs for errors.)",
-            "unknown": "Unknown error while connecting to the BleBox device. (Check the logs for errors.)",
+            "cannot_connect": "Failed to connect",
+            "unknown": "Unexpected error",
             "unsupported_version": "BleBox device has outdated firmware. Please upgrade it first."
         },
         "flow_title": "BleBox device: {name} ({host})",
diff --git a/homeassistant/components/blebox/translations/es.json b/homeassistant/components/blebox/translations/es.json
index 991553a2074..a415edd9809 100644
--- a/homeassistant/components/blebox/translations/es.json
+++ b/homeassistant/components/blebox/translations/es.json
@@ -2,11 +2,11 @@
     "config": {
         "abort": {
             "address_already_configured": "Un dispositivo BleBox ya est\u00e1 configurado en {address}.",
-            "already_configured": "Este dispositivo BleBox ya est\u00e1 configurado."
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se puede conectar con el dispositivo BleBox. (Comprueba los logs en busca de errores).",
-            "unknown": "Error desconocido al conectarse con el dispositivo BleBox. (Comprueba los logs en busca de errores).",
+            "cannot_connect": "No se pudo conectar",
+            "unknown": "Error inesperado",
             "unsupported_version": "El dispositivo BleBox tiene un firmware anticuado. Por favor, actual\u00edzalo primero."
         },
         "flow_title": "Dispositivo BleBox: {name} ({host})",
diff --git a/homeassistant/components/blebox/translations/et.json b/homeassistant/components/blebox/translations/et.json
new file mode 100644
index 00000000000..64ca64c1d80
--- /dev/null
+++ b/homeassistant/components/blebox/translations/et.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "address_already_configured": "BleBox seade {address} on juba m\u00e4\u00e4ratud",
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga",
+            "unsupported_version": "BleBoxi seadmel on vananenud p\u00fcsivara. Esmalt v\u00e4rskenda seda."
+        },
+        "flow_title": "BleBoxi seade: {name} ( {host} )",
+        "step": {
+            "user": {
+                "data": {
+                    "host": "IP aadress",
+                    "port": ""
+                },
+                "description": "Seadista oma BleBox sidumine Home Assistant-iga.",
+                "title": "Seadista BleBox seade"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/blebox/translations/it.json b/homeassistant/components/blebox/translations/it.json
index 73f7b9276e9..265a158e22d 100644
--- a/homeassistant/components/blebox/translations/it.json
+++ b/homeassistant/components/blebox/translations/it.json
@@ -2,11 +2,11 @@
     "config": {
         "abort": {
             "address_already_configured": "Un dispositivo BleBox \u00e8 gi\u00e0 configurato in {address}.",
-            "already_configured": "Questo dispositivo BleBox \u00e8 gi\u00e0 configurato."
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi al dispositivo BleBox. (Controllare i registri per errori).",
-            "unknown": "Errore sconosciuto durante la connessione al dispositivo BleBox. (Controllare i registri per errori).",
+            "cannot_connect": "Impossibile connettersi",
+            "unknown": "Errore imprevisto",
             "unsupported_version": "Il dispositivo BleBox ha un firmware obsoleto. Si prega di aggiornarlo prima."
         },
         "flow_title": "Dispositivo BleBox: {name} ({host})",
diff --git a/homeassistant/components/blebox/translations/no.json b/homeassistant/components/blebox/translations/no.json
index 239d1fb03c6..cf46945950f 100644
--- a/homeassistant/components/blebox/translations/no.json
+++ b/homeassistant/components/blebox/translations/no.json
@@ -2,11 +2,11 @@
     "config": {
         "abort": {
             "address_already_configured": "En BleBox-enhet er allerede konfigurert p\u00e5 {address} .",
-            "already_configured": "Denne BleBox-enheten er allerede konfigurert."
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Kan ikke koble til BleBox-enheten. (Kontroller loggene for feil.)",
-            "unknown": "Ukjent feil under tilkobling til BleBox-enheten. (Kontroller loggene for feil.)",
+            "cannot_connect": "Tilkobling mislyktes",
+            "unknown": "Uventet feil",
             "unsupported_version": "BleBox-enheten har utdatert fastvare. Vennligst oppgrader den f\u00f8rst."
         },
         "flow_title": "BleBox-enhet: {name} ({host})",
@@ -14,7 +14,7 @@
             "user": {
                 "data": {
                     "host": "IP adresse",
-                    "port": ""
+                    "port": "Port"
                 },
                 "description": "Konfigurer BleBox-en til \u00e5 integreres med Home Assistant.",
                 "title": "Konfigurere BleBox-enheten"
diff --git a/homeassistant/components/blebox/translations/pl.json b/homeassistant/components/blebox/translations/pl.json
index 5b0f124014e..775d74aa5d7 100644
--- a/homeassistant/components/blebox/translations/pl.json
+++ b/homeassistant/components/blebox/translations/pl.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "address_already_configured": "Urz\u0105dzenie BleBox jest ju\u017c skonfigurowane pod adresem {address}.",
-            "already_configured": "To urz\u0105dzenie BleBox jest ju\u017c skonfigurowane."
+            "address_already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane pod adresem {address}",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z urz\u0105dzeniem BleBox. (Sprawd\u017a logi pod k\u0105tem b\u0142\u0119d\u00f3w).",
-            "unknown": "Nieznany b\u0142\u0105d podczas \u0142\u0105czenia z urz\u0105dzeniem BleBox. (Sprawd\u017a logi pod k\u0105tem b\u0142\u0119d\u00f3w).",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "unknown": "Nieoczekiwany b\u0142\u0105d",
             "unsupported_version": "Urz\u0105dzenie BleBox ma nieaktualny firmware. Prosz\u0119 go najpierw zaktualizowa\u0107."
         },
         "flow_title": "Urz\u0105dzenie BleBox: {name} ({host})",
diff --git a/homeassistant/components/blebox/translations/ru.json b/homeassistant/components/blebox/translations/ru.json
index b82261be7f7..4fd361021eb 100644
--- a/homeassistant/components/blebox/translations/ru.json
+++ b/homeassistant/components/blebox/translations/ru.json
@@ -2,11 +2,11 @@
     "config": {
         "abort": {
             "address_already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0441 \u0430\u0434\u0440\u0435\u0441\u043e\u043c {address } \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438 \u043d\u0430 \u043d\u0430\u043b\u0438\u0447\u0438\u0435 \u043e\u0448\u0438\u0431\u043e\u043a.",
-            "unknown": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438 \u043d\u0430 \u043d\u0430\u043b\u0438\u0447\u0438\u0435 \u043e\u0448\u0438\u0431\u043e\u043a.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
             "unsupported_version": "\u041f\u0440\u043e\u0448\u0438\u0432\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0441\u0442\u0430\u0440\u0435\u043b\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u0435 \u0435\u0451."
         },
         "flow_title": "BleBox device: {name} ({host})",
diff --git a/homeassistant/components/blebox/translations/sv.json b/homeassistant/components/blebox/translations/sv.json
new file mode 100644
index 00000000000..892b8b2cd91
--- /dev/null
+++ b/homeassistant/components/blebox/translations/sv.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "port": "Port"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/blebox/translations/zh-Hant.json b/homeassistant/components/blebox/translations/zh-Hant.json
index 75f6249a138..5d11c2e9a72 100644
--- a/homeassistant/components/blebox/translations/zh-Hant.json
+++ b/homeassistant/components/blebox/translations/zh-Hant.json
@@ -2,11 +2,11 @@
     "config": {
         "abort": {
             "address_already_configured": "\u4f4d\u65bc {address} \u7684 BleBox \u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
-            "already_configured": "BleBox \u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 BleBox \u8a2d\u5099\uff08\u8acb\u53c3\u95b1\u65e5\u8a8c\uff09\u3002",
-            "unknown": "\u9023\u7dda\u81f3 BleBox \u8a2d\u5099\u767c\u751f\u672a\u77e5\u932f\u8aa4\uff08\u8acb\u53c3\u95b1\u65e5\u8a8c\uff09\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4",
             "unsupported_version": "BleBox \u8a2d\u5099\u97cc\u9ad4\u904e\u820a\uff0c\u8acb\u5148\u9032\u884c\u66f4\u65b0\u3002"
         },
         "flow_title": "BleBox \u8a2d\u5099\uff1a{name} ({host})",
diff --git a/homeassistant/components/blink/sensor.py b/homeassistant/components/blink/sensor.py
index 35cc2d0d5a5..3c3adf6d990 100644
--- a/homeassistant/components/blink/sensor.py
+++ b/homeassistant/components/blink/sensor.py
@@ -4,6 +4,7 @@ import logging
 from homeassistant.const import (
     DEVICE_CLASS_SIGNAL_STRENGTH,
     DEVICE_CLASS_TEMPERATURE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     TEMP_FAHRENHEIT,
 )
 from homeassistant.helpers.entity import Entity
@@ -14,7 +15,11 @@ _LOGGER = logging.getLogger(__name__)
 
 SENSORS = {
     TYPE_TEMPERATURE: ["Temperature", TEMP_FAHRENHEIT, DEVICE_CLASS_TEMPERATURE],
-    TYPE_WIFI_STRENGTH: ["Wifi Signal", "dBm", DEVICE_CLASS_SIGNAL_STRENGTH],
+    TYPE_WIFI_STRENGTH: [
+        "Wifi Signal",
+        SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        DEVICE_CLASS_SIGNAL_STRENGTH,
+    ],
 }
 
 
diff --git a/homeassistant/components/blink/translations/cs.json b/homeassistant/components/blink/translations/cs.json
index 3b0f6c09f82..76f398c0170 100644
--- a/homeassistant/components/blink/translations/cs.json
+++ b/homeassistant/components/blink/translations/cs.json
@@ -1,13 +1,22 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
         },
         "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_access_token": "Neplatn\u00fd p\u0159\u00edstupov\u00fd token",
             "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
             "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "K\u00f3d dvoufaktorov\u00e9ho ov\u011b\u0159ov\u00e1n\u00ed"
+                },
+                "description": "Zadejte PIN zaslan\u00fd na v\u00e1\u0161 e-mail",
+                "title": "Dvoufaktorov\u00e9 ov\u011b\u0159ov\u00e1n\u00ed"
+            },
             "user": {
                 "data": {
                     "password": "Heslo",
@@ -15,5 +24,16 @@
                 }
             }
         }
+    },
+    "options": {
+        "step": {
+            "simple_options": {
+                "data": {
+                    "scan_interval": "Interval sledov\u00e1n\u00ed (v sekund\u00e1ch)"
+                },
+                "description": "Nastaven\u00ed integrace Blink",
+                "title": "Mo\u017enosti Blink"
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/blink/translations/et.json b/homeassistant/components/blink/translations/et.json
new file mode 100644
index 00000000000..24de0ccbefd
--- /dev/null
+++ b/homeassistant/components/blink/translations/et.json
@@ -0,0 +1,40 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_access_token": "Vigane juurdep\u00e4\u00e4sut\u00f5end",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "2FA kood"
+                },
+                "description": "Sisesta E-posti aadressile saadetud PIN-kood",
+                "title": "Kaheastmeline tuvastamine (2FA)"
+            },
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "title": "Logi sisse Blinki kontoga"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "simple_options": {
+                "data": {
+                    "scan_interval": "P\u00e4ringute intervall (sekundites)"
+                },
+                "description": "Seadista Blink'i sidumine",
+                "title": "Blink'i valikud"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/blink/translations/lb.json b/homeassistant/components/blink/translations/lb.json
index e77dfe9a38f..e772ca578b6 100644
--- a/homeassistant/components/blink/translations/lb.json
+++ b/homeassistant/components/blink/translations/lb.json
@@ -14,7 +14,7 @@
                 "data": {
                     "2fa": "2-Faktor Code"
                 },
-                "description": "G\u00ebff de PIn un dee per E-Mail versch\u00e9ckt gouf. Falls an der E-Mail kee PIN steht, einfach eidel loossen",
+                "description": "G\u00ebff de PIN un dee per E-Mail versch\u00e9ckt gouf",
                 "title": "2-Faktor-Authentifikatioun"
             },
             "user": {
diff --git a/homeassistant/components/blink/translations/no.json b/homeassistant/components/blink/translations/no.json
index ca568389cd6..938bf7b85aa 100644
--- a/homeassistant/components/blink/translations/no.json
+++ b/homeassistant/components/blink/translations/no.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Enheten er allerde konfigurert"
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_access_token": "Ugyldig tilgangstoken",
-            "invalid_auth": "Ugyldig legitimasjon",
+            "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
         "step": {
diff --git a/homeassistant/components/blink/translations/pl.json b/homeassistant/components/blink/translations/pl.json
index 1564ed2d685..50436c77e82 100644
--- a/homeassistant/components/blink/translations/pl.json
+++ b/homeassistant/components/blink/translations/pl.json
@@ -25,5 +25,16 @@
                 "title": "Zaloguj si\u0119 za pomoc\u0105 konta Blink"
             }
         }
+    },
+    "options": {
+        "step": {
+            "simple_options": {
+                "data": {
+                    "scan_interval": "Cz\u0119stotliwo\u015b\u0107 skanowania (w sekundach)"
+                },
+                "description": "Konfigurowanie integracji Blink",
+                "title": "Opcje Blink"
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/blink/translations/zh-Hans.json b/homeassistant/components/blink/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/blink/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/blinksticklight/light.py b/homeassistant/components/blinksticklight/light.py
index 56009c90da3..d1120420756 100644
--- a/homeassistant/components/blinksticklight/light.py
+++ b/homeassistant/components/blinksticklight/light.py
@@ -1,6 +1,4 @@
 """Support for Blinkstick lights."""
-import logging
-
 from blinkstick import blinkstick
 import voluptuous as vol
 
@@ -16,8 +14,6 @@ from homeassistant.const import CONF_NAME
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.color as color_util
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_SERIAL = "serial"
 
 DEFAULT_NAME = "Blinkstick"
@@ -54,11 +50,6 @@ class BlinkStickLight(LightEntity):
         self._hs_color = None
         self._brightness = None
 
-    @property
-    def should_poll(self):
-        """Set up polling."""
-        return True
-
     @property
     def name(self):
         """Return the name of the light."""
diff --git a/homeassistant/components/blinkt/light.py b/homeassistant/components/blinkt/light.py
index 768ca92d9d2..0d1aff7b826 100644
--- a/homeassistant/components/blinkt/light.py
+++ b/homeassistant/components/blinkt/light.py
@@ -1,6 +1,5 @@
 """Support for Blinkt! lights on Raspberry Pi."""
 import importlib
-import logging
 
 import voluptuous as vol
 
@@ -16,8 +15,6 @@ from homeassistant.const import CONF_NAME
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.color as color_util
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_BLINKT = SUPPORT_BRIGHTNESS | SUPPORT_COLOR
 
 DEFAULT_NAME = "blinkt"
diff --git a/homeassistant/components/bloomsky/binary_sensor.py b/homeassistant/components/bloomsky/binary_sensor.py
index 43c5614679c..4234b4fb145 100644
--- a/homeassistant/components/bloomsky/binary_sensor.py
+++ b/homeassistant/components/bloomsky/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support the binary sensors of a BloomSky weather station."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
@@ -13,8 +11,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSOR_TYPES = {"Rain": DEVICE_CLASS_MOISTURE, "Night": None}
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/bloomsky/sensor.py b/homeassistant/components/bloomsky/sensor.py
index eaa03ef2f3b..df06e39db7e 100644
--- a/homeassistant/components/bloomsky/sensor.py
+++ b/homeassistant/components/bloomsky/sensor.py
@@ -1,6 +1,4 @@
 """Support the sensor of a BloomSky weather station."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA
@@ -18,8 +16,6 @@ from homeassistant.helpers.entity import Entity
 
 from . import DOMAIN
 
-LOGGER = logging.getLogger(__name__)
-
 # These are the available sensors
 SENSOR_TYPES = [
     "Temperature",
diff --git a/homeassistant/components/bluesound/media_player.py b/homeassistant/components/bluesound/media_player.py
index c0088cb4a2a..0ace6f5679a 100644
--- a/homeassistant/components/bluesound/media_player.py
+++ b/homeassistant/components/bluesound/media_player.py
@@ -220,7 +220,7 @@ class BluesoundPlayer(MediaPlayerEntity):
         self._last_status_update = None
         self._is_online = False
         self._retry_remove = None
-        self._lastvol = None
+        self._muted = False
         self._master = None
         self._is_master = False
         self._group_name = None
@@ -660,10 +660,13 @@ class BluesoundPlayer(MediaPlayerEntity):
     @property
     def is_volume_muted(self):
         """Boolean if volume is currently muted."""
-        volume = self.volume_level
-        if not volume:
-            return None
-        return 0 <= volume < 0.001
+        mute = self._status.get("mute")
+        if self.is_grouped:
+            mute = self._sync_status.get("@mute")
+
+        if mute is not None:
+            mute = bool(int(mute))
+        return mute
 
     @property
     def name(self):
@@ -1044,10 +1047,5 @@ class BluesoundPlayer(MediaPlayerEntity):
     async def async_mute_volume(self, mute):
         """Send mute command to media player."""
         if mute:
-            volume = self.volume_level
-            if volume > 0:
-                self._lastvol = volume
-            return await self.send_bluesound_command("Volume?level=0")
-        return await self.send_bluesound_command(
-            f"Volume?level={float(self._lastvol) * 100}"
-        )
+            return await self.send_bluesound_command("Volume?mute=1")
+        return await self.send_bluesound_command("Volume?mute=0")
diff --git a/homeassistant/components/bme280/sensor.py b/homeassistant/components/bme280/sensor.py
index dd5ed905fe2..5f38c420ff1 100644
--- a/homeassistant/components/bme280/sensor.py
+++ b/homeassistant/components/bme280/sensor.py
@@ -89,7 +89,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     i2c_address = config[CONF_I2C_ADDRESS]
 
     bus = smbus.SMBus(config[CONF_I2C_BUS])
-    sensor = await hass.async_add_job(
+    sensor = await hass.async_add_executor_job(
         partial(
             BME280,
             bus,
@@ -108,7 +108,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
         _LOGGER.error("BME280 sensor not detected at %s", i2c_address)
         return False
 
-    sensor_handler = await hass.async_add_job(BME280Handler, sensor)
+    sensor_handler = await hass.async_add_executor_job(BME280Handler, sensor)
 
     dev = []
     try:
@@ -166,7 +166,7 @@ class BME280Sensor(Entity):
 
     async def async_update(self):
         """Get the latest data from the BME280 and update the states."""
-        await self.hass.async_add_job(self.bme280_client.update)
+        await self.hass.async_add_executor_job(self.bme280_client.update)
         if self.bme280_client.sensor.sample_ok:
             if self.type == SENSOR_TEMP:
                 temperature = round(self.bme280_client.sensor.temperature, 1)
diff --git a/homeassistant/components/bme680/sensor.py b/homeassistant/components/bme680/sensor.py
index e412b410935..49d95bbc53b 100644
--- a/homeassistant/components/bme680/sensor.py
+++ b/homeassistant/components/bme680/sensor.py
@@ -111,7 +111,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     SENSOR_TYPES[SENSOR_TEMP][1] = hass.config.units.temperature_unit
     name = config[CONF_NAME]
 
-    sensor_handler = await hass.async_add_job(_setup_bme680, config)
+    sensor_handler = await hass.async_add_executor_job(_setup_bme680, config)
     if sensor_handler is None:
         return
 
@@ -347,7 +347,7 @@ class BME680Sensor(Entity):
 
     async def async_update(self):
         """Get the latest data from the BME680 and update the states."""
-        await self.hass.async_add_job(self.bme680_client.update)
+        await self.hass.async_add_executor_job(self.bme680_client.update)
         if self.type == SENSOR_TEMP:
             temperature = round(self.bme680_client.sensor_data.temperature, 1)
             if self.temp_unit == TEMP_FAHRENHEIT:
diff --git a/homeassistant/components/bmw_connected_drive/manifest.json b/homeassistant/components/bmw_connected_drive/manifest.json
index c7cacfb6f63..bd76294c8e8 100644
--- a/homeassistant/components/bmw_connected_drive/manifest.json
+++ b/homeassistant/components/bmw_connected_drive/manifest.json
@@ -2,7 +2,7 @@
   "domain": "bmw_connected_drive",
   "name": "BMW Connected Drive",
   "documentation": "https://www.home-assistant.io/integrations/bmw_connected_drive",
-  "requirements": ["bimmer_connected==0.7.7"],
+  "requirements": ["bimmer_connected==0.7.8"],
   "dependencies": [],
   "codeowners": ["@gerard33", "@rikroe"]
 }
diff --git a/homeassistant/components/bom/__init__.py b/homeassistant/components/bom/__init__.py
deleted file mode 100644
index 7b83a5c981b..00000000000
--- a/homeassistant/components/bom/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""The bom component."""
diff --git a/homeassistant/components/bom/camera.py b/homeassistant/components/bom/camera.py
deleted file mode 100644
index b99b12916c7..00000000000
--- a/homeassistant/components/bom/camera.py
+++ /dev/null
@@ -1,132 +0,0 @@
-"""Provide animated GIF loops of BOM radar imagery."""
-from bomradarloop import BOMRadarLoop
-import voluptuous as vol
-
-from homeassistant.components.camera import PLATFORM_SCHEMA, Camera
-from homeassistant.const import CONF_ID, CONF_NAME
-from homeassistant.helpers import config_validation as cv
-
-CONF_DELTA = "delta"
-CONF_FRAMES = "frames"
-CONF_LOCATION = "location"
-CONF_OUTFILE = "filename"
-
-LOCATIONS = [
-    "Adelaide",
-    "Albany",
-    "AliceSprings",
-    "Bairnsdale",
-    "Bowen",
-    "Brisbane",
-    "Broome",
-    "Cairns",
-    "Canberra",
-    "Carnarvon",
-    "Ceduna",
-    "Dampier",
-    "Darwin",
-    "Emerald",
-    "Esperance",
-    "Geraldton",
-    "Giles",
-    "Gladstone",
-    "Gove",
-    "Grafton",
-    "Gympie",
-    "HallsCreek",
-    "Hobart",
-    "Kalgoorlie",
-    "Katherine",
-    "Learmonth",
-    "Longreach",
-    "Mackay",
-    "Marburg",
-    "Melbourne",
-    "Mildura",
-    "Moree",
-    "MorningtonIs",
-    "MountIsa",
-    "MtGambier",
-    "Namoi",
-    "Newcastle",
-    "Newdegate",
-    "NorfolkIs",
-    "NWTasmania",
-    "Perth",
-    "PortHedland",
-    "Rainbow",
-    "SellicksHill",
-    "SouthDoodlakine",
-    "Sydney",
-    "Townsville",
-    "WaggaWagga",
-    "Warrego",
-    "Warruwi",
-    "Watheroo",
-    "Weipa",
-    "WillisIs",
-    "Wollongong",
-    "Woomera",
-    "Wyndham",
-    "Yarrawonga",
-]
-
-
-def _validate_schema(config):
-    if config.get(CONF_LOCATION) is None:
-        if not all(config.get(x) for x in (CONF_ID, CONF_DELTA, CONF_FRAMES)):
-            raise vol.Invalid(
-                f"Specify '{CONF_ID}', '{CONF_DELTA}' and '{CONF_FRAMES}' when '{CONF_LOCATION}' is unspecified"
-            )
-    return config
-
-
-LOCATIONS_MSG = f"Set '{CONF_LOCATION}' to one of: {', '.join(sorted(LOCATIONS))}"
-XOR_MSG = f"Specify exactly one of '{CONF_ID}' or '{CONF_LOCATION}'"
-
-PLATFORM_SCHEMA = vol.All(
-    PLATFORM_SCHEMA.extend(
-        {
-            vol.Exclusive(CONF_ID, "xor", msg=XOR_MSG): cv.string,
-            vol.Exclusive(CONF_LOCATION, "xor", msg=XOR_MSG): vol.In(
-                LOCATIONS, msg=LOCATIONS_MSG
-            ),
-            vol.Optional(CONF_DELTA): cv.positive_int,
-            vol.Optional(CONF_FRAMES): cv.positive_int,
-            vol.Optional(CONF_NAME): cv.string,
-            vol.Optional(CONF_OUTFILE): cv.string,
-        }
-    ),
-    _validate_schema,
-)
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up BOM radar-loop camera component."""
-    location = config.get(CONF_LOCATION) or f"ID {config.get(CONF_ID)}"
-    name = config.get(CONF_NAME) or f"BOM Radar Loop - {location}"
-    args = [
-        config.get(x)
-        for x in (CONF_LOCATION, CONF_ID, CONF_DELTA, CONF_FRAMES, CONF_OUTFILE)
-    ]
-    add_entities([BOMRadarCam(name, *args)])
-
-
-class BOMRadarCam(Camera):
-    """A camera component producing animated BOM radar-imagery GIFs."""
-
-    def __init__(self, name, location, radar_id, delta, frames, outfile):
-        """Initialize the component."""
-
-        super().__init__()
-        self._name = name
-        self._cam = BOMRadarLoop(location, radar_id, delta, frames, outfile)
-
-    def camera_image(self):
-        """Return the current BOM radar-loop image."""
-        return self._cam.current
-
-    @property
-    def name(self):
-        """Return the component name."""
-        return self._name
diff --git a/homeassistant/components/bom/manifest.json b/homeassistant/components/bom/manifest.json
deleted file mode 100644
index a712c8fd080..00000000000
--- a/homeassistant/components/bom/manifest.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "domain": "bom",
-  "name": "Australian Bureau of Meteorology (BOM)",
-  "documentation": "https://www.home-assistant.io/integrations/bom",
-  "requirements": ["bomradarloop==0.1.5"],
-  "codeowners": ["@maddenp"]
-}
diff --git a/homeassistant/components/bom/sensor.py b/homeassistant/components/bom/sensor.py
deleted file mode 100644
index 12f43430829..00000000000
--- a/homeassistant/components/bom/sensor.py
+++ /dev/null
@@ -1,357 +0,0 @@
-"""Support for Australian BOM (Bureau of Meteorology) weather service."""
-import datetime
-import ftplib
-import gzip
-import io
-import json
-import logging
-import os
-import re
-import zipfile
-
-import requests
-import voluptuous as vol
-
-from homeassistant.components.sensor import PLATFORM_SCHEMA
-from homeassistant.const import (
-    ATTR_ATTRIBUTION,
-    CONF_LATITUDE,
-    CONF_LONGITUDE,
-    CONF_MONITORED_CONDITIONS,
-    CONF_NAME,
-    LENGTH_KILOMETERS,
-    LENGTH_METERS,
-    LENGTH_MILLIMETERS,
-    PERCENTAGE,
-    PRESSURE_MBAR,
-    SPEED_KILOMETERS_PER_HOUR,
-    TEMP_CELSIUS,
-)
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity import Entity
-from homeassistant.util import Throttle
-import homeassistant.util.dt as dt_util
-
-_LOGGER = logging.getLogger(__name__)
-
-ATTR_LAST_UPDATE = "last_update"
-ATTR_SENSOR_ID = "sensor_id"
-ATTR_STATION_ID = "station_id"
-ATTR_STATION_NAME = "station_name"
-ATTR_ZONE_ID = "zone_id"
-
-ATTRIBUTION = "Data provided by the Australian Bureau of Meteorology"
-
-CONF_STATION = "station"
-CONF_ZONE_ID = "zone_id"
-CONF_WMO_ID = "wmo_id"
-
-MIN_TIME_BETWEEN_UPDATES = datetime.timedelta(seconds=60)
-
-SENSOR_TYPES = {
-    "wmo": ["wmo", None],
-    "name": ["Station Name", None],
-    "history_product": ["Zone", None],
-    "local_date_time": ["Local Time", None],
-    "local_date_time_full": ["Local Time Full", None],
-    "aifstime_utc": ["UTC Time Full", None],
-    "lat": ["Lat", None],
-    "lon": ["Long", None],
-    "apparent_t": ["Feels Like C", TEMP_CELSIUS],
-    "cloud": ["Cloud", None],
-    "cloud_base_m": ["Cloud Base", None],
-    "cloud_oktas": ["Cloud Oktas", None],
-    "cloud_type_id": ["Cloud Type ID", None],
-    "cloud_type": ["Cloud Type", None],
-    "delta_t": ["Delta Temp C", TEMP_CELSIUS],
-    "gust_kmh": ["Wind Gust kmh", SPEED_KILOMETERS_PER_HOUR],
-    "gust_kt": ["Wind Gust kt", "kt"],
-    "air_temp": ["Air Temp C", TEMP_CELSIUS],
-    "dewpt": ["Dew Point C", TEMP_CELSIUS],
-    "press": ["Pressure mb", PRESSURE_MBAR],
-    "press_qnh": ["Pressure qnh", "qnh"],
-    "press_msl": ["Pressure msl", "msl"],
-    "press_tend": ["Pressure Tend", None],
-    "rain_trace": ["Rain Today", LENGTH_MILLIMETERS],
-    "rel_hum": ["Relative Humidity", PERCENTAGE],
-    "sea_state": ["Sea State", None],
-    "swell_dir_worded": ["Swell Direction", None],
-    "swell_height": ["Swell Height", LENGTH_METERS],
-    "swell_period": ["Swell Period", None],
-    "vis_km": [f"Visability {LENGTH_KILOMETERS}", LENGTH_KILOMETERS],
-    "weather": ["Weather", None],
-    "wind_dir": ["Wind Direction", None],
-    "wind_spd_kmh": ["Wind Speed kmh", SPEED_KILOMETERS_PER_HOUR],
-    "wind_spd_kt": ["Wind Speed kt", "kt"],
-}
-
-
-def validate_station(station):
-    """Check that the station ID is well-formed."""
-    if station is None:
-        return
-    station = station.replace(".shtml", "")
-    if not re.fullmatch(r"ID[A-Z]\d\d\d\d\d\.\d\d\d\d\d", station):
-        raise vol.error.Invalid("Malformed station ID")
-    return station
-
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Inclusive(CONF_ZONE_ID, "Deprecated partial station ID"): cv.string,
-        vol.Inclusive(CONF_WMO_ID, "Deprecated partial station ID"): cv.string,
-        vol.Optional(CONF_NAME): cv.string,
-        vol.Optional(CONF_STATION): validate_station,
-        vol.Required(CONF_MONITORED_CONDITIONS, default=[]): vol.All(
-            cv.ensure_list, [vol.In(SENSOR_TYPES)]
-        ),
-    }
-)
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the BOM sensor."""
-    station = config.get(CONF_STATION)
-    zone_id, wmo_id = config.get(CONF_ZONE_ID), config.get(CONF_WMO_ID)
-
-    if station is not None:
-        if zone_id and wmo_id:
-            _LOGGER.warning(
-                "Using configuration %s, not %s and %s for BOM sensor",
-                CONF_STATION,
-                CONF_ZONE_ID,
-                CONF_WMO_ID,
-            )
-    elif zone_id and wmo_id:
-        station = f"{zone_id}.{wmo_id}"
-    else:
-        station = closest_station(
-            config.get(CONF_LATITUDE),
-            config.get(CONF_LONGITUDE),
-            hass.config.config_dir,
-        )
-        if station is None:
-            _LOGGER.error("Could not get BOM weather station from lat/lon")
-            return
-
-    bom_data = BOMCurrentData(station)
-
-    try:
-        bom_data.update()
-    except ValueError as err:
-        _LOGGER.error("Received error from BOM Current: %s", err)
-        return
-
-    add_entities(
-        [
-            BOMCurrentSensor(bom_data, variable, config.get(CONF_NAME))
-            for variable in config[CONF_MONITORED_CONDITIONS]
-        ]
-    )
-
-
-class BOMCurrentSensor(Entity):
-    """Implementation of a BOM current sensor."""
-
-    def __init__(self, bom_data, condition, stationname):
-        """Initialize the sensor."""
-        self.bom_data = bom_data
-        self._condition = condition
-        self.stationname = stationname
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        if self.stationname is None:
-            return f"BOM {SENSOR_TYPES[self._condition][0]}"
-
-        return f"BOM {self.stationname} {SENSOR_TYPES[self._condition][0]}"
-
-    @property
-    def state(self):
-        """Return the state of the sensor."""
-        return self.bom_data.get_reading(self._condition)
-
-    @property
-    def device_state_attributes(self):
-        """Return the state attributes of the device."""
-        attr = {
-            ATTR_ATTRIBUTION: ATTRIBUTION,
-            ATTR_LAST_UPDATE: self.bom_data.last_updated,
-            ATTR_SENSOR_ID: self._condition,
-            ATTR_STATION_ID: self.bom_data.latest_data["wmo"],
-            ATTR_STATION_NAME: self.bom_data.latest_data["name"],
-            ATTR_ZONE_ID: self.bom_data.latest_data["history_product"],
-        }
-
-        return attr
-
-    @property
-    def unit_of_measurement(self):
-        """Return the units of measurement."""
-        return SENSOR_TYPES[self._condition][1]
-
-    def update(self):
-        """Update current conditions."""
-        self.bom_data.update()
-
-
-class BOMCurrentData:
-    """Get data from BOM."""
-
-    def __init__(self, station_id):
-        """Initialize the data object."""
-        self._zone_id, self._wmo_id = station_id.split(".")
-        self._data = None
-        self.last_updated = None
-
-    def _build_url(self):
-        """Build the URL for the requests."""
-        url = (
-            f"http://www.bom.gov.au/fwo/{self._zone_id}"
-            f"/{self._zone_id}.{self._wmo_id}.json"
-        )
-        _LOGGER.debug("BOM URL: %s", url)
-        return url
-
-    @property
-    def latest_data(self):
-        """Return the latest data object."""
-        if self._data:
-            return self._data[0]
-        return None
-
-    def get_reading(self, condition):
-        """Return the value for the given condition.
-
-        BOM weather publishes condition readings for weather (and a few other
-        conditions) at intervals throughout the day. To avoid a `-` value in
-        the frontend for these conditions, we traverse the historical data
-        for the latest value that is not `-`.
-
-        Iterators are used in this method to avoid iterating needlessly
-        through the entire BOM provided dataset.
-        """
-        condition_readings = (entry[condition] for entry in self._data)
-        reading = next((x for x in condition_readings if x != "-"), None)
-
-        if isinstance(reading, (int, float)):
-            return round(reading, 2)
-        return reading
-
-    def should_update(self):
-        """Determine whether an update should occur.
-
-        BOM provides updated data every 30 minutes. We manually define
-        refreshing logic here rather than a throttle to keep updates
-        in lock-step with BOM.
-
-        If 35 minutes has passed since the last BOM data update, then
-        an update should be done.
-        """
-        if self.last_updated is None:
-            # Never updated before, therefore an update should occur.
-            return True
-
-        now = dt_util.utcnow()
-        update_due_at = self.last_updated + datetime.timedelta(minutes=35)
-        return now > update_due_at
-
-    @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    def update(self):
-        """Get the latest data from BOM."""
-        if not self.should_update():
-            _LOGGER.debug(
-                "BOM was updated %s minutes ago, skipping update as"
-                " < 35 minutes, Now: %s, LastUpdate: %s",
-                (dt_util.utcnow() - self.last_updated),
-                dt_util.utcnow(),
-                self.last_updated,
-            )
-            return
-
-        try:
-            result = requests.get(self._build_url(), timeout=10).json()
-            self._data = result["observations"]["data"]
-
-            # set lastupdate using self._data[0] as the first element in the
-            # array is the latest date in the json
-            self.last_updated = dt_util.as_utc(
-                datetime.datetime.strptime(
-                    str(self._data[0]["local_date_time_full"]), "%Y%m%d%H%M%S"
-                )
-            )
-            return
-
-        except ValueError as err:
-            _LOGGER.error("Check BOM %s", err.args)
-            self._data = None
-            raise
-
-
-def _get_bom_stations():
-    """Return {CONF_STATION: (lat, lon)} for all stations, for auto-config.
-
-    This function does several MB of internet requests, so please use the
-    caching version to minimize latency and hit-count.
-    """
-    latlon = {}
-    with io.BytesIO() as file_obj:
-        with ftplib.FTP("ftp.bom.gov.au") as ftp:
-            ftp.login()
-            ftp.cwd("anon2/home/ncc/metadata/sitelists")
-            ftp.retrbinary("RETR stations.zip", file_obj.write)
-        file_obj.seek(0)
-        with zipfile.ZipFile(file_obj) as zipped:
-            with zipped.open("stations.txt") as station_txt:
-                for _ in range(4):
-                    station_txt.readline()  # skip header
-                while True:
-                    line = station_txt.readline().decode().strip()
-                    if len(line) < 120:
-                        break  # end while loop, ignoring any footer text
-                    wmo, lat, lon = (
-                        line[a:b].strip() for a, b in [(128, 134), (70, 78), (79, 88)]
-                    )
-                    if wmo != "..":
-                        latlon[wmo] = (float(lat), float(lon))
-    zones = {}
-    pattern = (
-        r'<a href="/products/(?P<zone>ID[A-Z]\d\d\d\d\d)/'
-        r'(?P=zone)\.(?P<wmo>\d\d\d\d\d).shtml">'
-    )
-    for state in ("nsw", "vic", "qld", "wa", "tas", "nt"):
-        url = f"http://www.bom.gov.au/{state}/observations/{state}all.shtml"
-        for zone_id, wmo_id in re.findall(pattern, requests.get(url).text):
-            zones[wmo_id] = zone_id
-    return {f"{zones[k]}.{k}": latlon[k] for k in set(latlon) & set(zones)}
-
-
-def bom_stations(cache_dir):
-    """Return {CONF_STATION: (lat, lon)} for all stations, for auto-config.
-
-    Results from internet requests are cached as compressed JSON, making
-    subsequent calls very much faster.
-    """
-    cache_file = os.path.join(cache_dir, ".bom-stations.json.gz")
-    if not os.path.isfile(cache_file):
-        stations = _get_bom_stations()
-        with gzip.open(cache_file, "wt") as cache:
-            json.dump(stations, cache, sort_keys=True)
-        return stations
-    with gzip.open(cache_file, "rt") as cache:
-        return {k: tuple(v) for k, v in json.load(cache).items()}
-
-
-def closest_station(lat, lon, cache_dir):
-    """Return the ZONE_ID.WMO_ID of the closest station to our lat/lon."""
-    if lat is None or lon is None or not os.path.isdir(cache_dir):
-        return
-    stations = bom_stations(cache_dir)
-
-    def comparable_dist(wmo_id):
-        """Create a psudeo-distance from latitude/longitude."""
-        station_lat, station_lon = stations[wmo_id]
-        return (lat - station_lat) ** 2 + (lon - station_lon) ** 2
-
-    return min(stations, key=comparable_dist)
diff --git a/homeassistant/components/bom/weather.py b/homeassistant/components/bom/weather.py
deleted file mode 100644
index 9229d0c11d4..00000000000
--- a/homeassistant/components/bom/weather.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""Support for Australian BOM (Bureau of Meteorology) weather service."""
-import logging
-
-import voluptuous as vol
-
-from homeassistant.components.weather import PLATFORM_SCHEMA, WeatherEntity
-from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, TEMP_CELSIUS
-from homeassistant.helpers import config_validation as cv
-
-# Reuse data and API logic from the sensor implementation
-from .sensor import CONF_STATION, BOMCurrentData, closest_station, validate_station
-
-_LOGGER = logging.getLogger(__name__)
-
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {vol.Optional(CONF_NAME): cv.string, vol.Optional(CONF_STATION): validate_station}
-)
-
-
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the BOM weather platform."""
-    station = config.get(CONF_STATION) or closest_station(
-        config.get(CONF_LATITUDE), config.get(CONF_LONGITUDE), hass.config.config_dir
-    )
-    if station is None:
-        _LOGGER.error("Could not get BOM weather station from lat/lon")
-        return False
-    bom_data = BOMCurrentData(station)
-    try:
-        bom_data.update()
-    except ValueError as err:
-        _LOGGER.error("Received error from BOM_Current: %s", err)
-        return False
-    add_entities([BOMWeather(bom_data, config.get(CONF_NAME))], True)
-
-
-class BOMWeather(WeatherEntity):
-    """Representation of a weather condition."""
-
-    def __init__(self, bom_data, stationname=None):
-        """Initialise the platform with a data instance and station name."""
-        self.bom_data = bom_data
-        self.stationname = stationname or self.bom_data.latest_data.get("name")
-
-    def update(self):
-        """Update current conditions."""
-        self.bom_data.update()
-
-    @property
-    def name(self):
-        """Return the name of the sensor."""
-        return f"BOM {self.stationname or '(unknown station)'}"
-
-    @property
-    def condition(self):
-        """Return the current condition."""
-        return self.bom_data.get_reading("weather") or self.bom_data.get_reading(
-            "cloud"
-        )
-
-    # Now implement the WeatherEntity interface
-
-    @property
-    def temperature(self):
-        """Return the platform temperature."""
-        return self.bom_data.get_reading("air_temp")
-
-    @property
-    def temperature_unit(self):
-        """Return the unit of measurement."""
-        return TEMP_CELSIUS
-
-    @property
-    def pressure(self):
-        """Return the mean sea-level pressure."""
-        return self.bom_data.get_reading("press_msl")
-
-    @property
-    def humidity(self):
-        """Return the relative humidity."""
-        return self.bom_data.get_reading("rel_hum")
-
-    @property
-    def wind_speed(self):
-        """Return the wind speed."""
-        return self.bom_data.get_reading("wind_spd_kmh")
-
-    @property
-    def wind_bearing(self):
-        """Return the wind bearing."""
-        directions = [
-            "N",
-            "NNE",
-            "NE",
-            "ENE",
-            "E",
-            "ESE",
-            "SE",
-            "SSE",
-            "S",
-            "SSW",
-            "SW",
-            "WSW",
-            "W",
-            "WNW",
-            "NW",
-            "NNW",
-        ]
-        wind = {name: idx * 360 / 16 for idx, name in enumerate(directions)}
-        return wind.get(self.bom_data.get_reading("wind_dir"))
-
-    @property
-    def attribution(self):
-        """Return the attribution."""
-        return "Data provided by the Australian Bureau of Meteorology"
diff --git a/homeassistant/components/bond/__init__.py b/homeassistant/components/bond/__init__.py
index a0ed6545b91..9af92f6e7e7 100644
--- a/homeassistant/components/bond/__init__.py
+++ b/homeassistant/components/bond/__init__.py
@@ -1,7 +1,6 @@
 """The Bond integration."""
 import asyncio
 from asyncio import TimeoutError as AsyncIOTimeoutError
-import logging
 
 from aiohttp import ClientError, ClientTimeout
 from bond_api import Bond
@@ -16,7 +15,6 @@ from homeassistant.helpers.entity import SLOW_UPDATE_WARNING
 from .const import DOMAIN
 from .utils import BondHub
 
-_LOGGER = logging.getLogger(__name__)
 PLATFORMS = ["cover", "fan", "light", "switch"]
 _API_TIMEOUT = SLOW_UPDATE_WARNING - 1
 
diff --git a/homeassistant/components/bond/entity.py b/homeassistant/components/bond/entity.py
index 716f121f1a1..501d6574960 100644
--- a/homeassistant/components/bond/entity.py
+++ b/homeassistant/components/bond/entity.py
@@ -18,10 +18,13 @@ _LOGGER = logging.getLogger(__name__)
 class BondEntity(Entity):
     """Generic Bond entity encapsulating common features of any Bond controlled device."""
 
-    def __init__(self, hub: BondHub, device: BondDevice):
+    def __init__(
+        self, hub: BondHub, device: BondDevice, sub_device: Optional[str] = None
+    ):
         """Initialize entity with API and device info."""
         self._hub = hub
         self._device = device
+        self._sub_device = sub_device
         self._available = True
 
     @property
@@ -29,7 +32,8 @@ class BondEntity(Entity):
         """Get unique ID for the entity."""
         hub_id = self._hub.bond_id
         device_id = self._device.device_id
-        return f"{hub_id}_{device_id}"
+        sub_device_id: str = f"_{self._sub_device}" if self._sub_device else ""
+        return f"{hub_id}_{device_id}{sub_device_id}"
 
     @property
     def name(self) -> Optional[str]:
diff --git a/homeassistant/components/bond/light.py b/homeassistant/components/bond/light.py
index 5e66019579d..82187bf6fab 100644
--- a/homeassistant/components/bond/light.py
+++ b/homeassistant/components/bond/light.py
@@ -29,7 +29,7 @@ async def async_setup_entry(
     """Set up Bond light devices."""
     hub: BondHub = hass.data[DOMAIN][entry.entry_id]
 
-    lights: List[Entity] = [
+    fan_lights: List[Entity] = [
         BondLight(hub, device)
         for device in hub.devices
         if DeviceType.is_fan(device.type) and device.supports_light()
@@ -41,15 +41,23 @@ async def async_setup_entry(
         if DeviceType.is_fireplace(device.type)
     ]
 
-    async_add_entities(lights + fireplaces, True)
+    fp_lights: List[Entity] = [
+        BondLight(hub, device, "light")
+        for device in hub.devices
+        if DeviceType.is_fireplace(device.type) and device.supports_light()
+    ]
+
+    async_add_entities(fan_lights + fireplaces + fp_lights, True)
 
 
 class BondLight(BondEntity, LightEntity):
     """Representation of a Bond light."""
 
-    def __init__(self, hub: BondHub, device: BondDevice):
+    def __init__(
+        self, hub: BondHub, device: BondDevice, sub_device: Optional[str] = None
+    ):
         """Create HA entity representing Bond fan."""
-        super().__init__(hub, device)
+        super().__init__(hub, device, sub_device)
         self._brightness: Optional[int] = None
         self._light: Optional[int] = None
 
diff --git a/homeassistant/components/bond/translations/cs.json b/homeassistant/components/bond/translations/cs.json
index bf42fe8d5fc..677c7e80236 100644
--- a/homeassistant/components/bond/translations/cs.json
+++ b/homeassistant/components/bond/translations/cs.json
@@ -3,6 +3,12 @@
         "abort": {
             "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakofigurovan\u00e9"
         },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "old_firmware": "Nepodporovan\u00fd star\u00fd firmware na za\u0159\u00edzen\u00ed Bond - p\u0159ed pokra\u010dov\u00e1n\u00edm prove\u010fte aktualizaci",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "flow_title": "Bond: {bond_id} ({host})",
         "step": {
             "confirm": {
@@ -10,6 +16,12 @@
                     "access_token": "P\u0159\u00edstupov\u00fd token"
                 },
                 "description": "Chcete nastavit {bond_id} ?"
+            },
+            "user": {
+                "data": {
+                    "access_token": "P\u0159\u00edstupov\u00fd token",
+                    "host": "Hostitel"
+                }
             }
         }
     }
diff --git a/homeassistant/components/bond/translations/et.json b/homeassistant/components/bond/translations/et.json
new file mode 100644
index 00000000000..dc6a8414bce
--- /dev/null
+++ b/homeassistant/components/bond/translations/et.json
@@ -0,0 +1,28 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "old_firmware": "Bondi seadme ei toeta vana p\u00fcsivara - uuenda enne j\u00e4tkamist",
+            "unknown": "Tundmatu viga"
+        },
+        "flow_title": "Bond: {bond_id} ( {host} )",
+        "step": {
+            "confirm": {
+                "data": {
+                    "access_token": "Juurdep\u00e4\u00e4sut\u00f5end"
+                },
+                "description": "Kas soovid seadistada teenuse {bond_id} ?"
+            },
+            "user": {
+                "data": {
+                    "access_token": "Juurdep\u00e4\u00e4sut\u00f5end",
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/bond/translations/nl.json b/homeassistant/components/bond/translations/nl.json
new file mode 100644
index 00000000000..8b2702b6708
--- /dev/null
+++ b/homeassistant/components/bond/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/bond/translations/no.json b/homeassistant/components/bond/translations/no.json
index 5629512a44c..01ff745eed3 100644
--- a/homeassistant/components/bond/translations/no.json
+++ b/homeassistant/components/bond/translations/no.json
@@ -4,12 +4,12 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "old_firmware": "Gammel fastvare som ikke st\u00f8ttes p\u00e5 Bond-enheten \u2013 vennligst oppgrader f\u00f8r du fortsetter",
             "unknown": "Uventet feil"
         },
-        "flow_title": "Obligasjon: {bond_id} ( {host} )",
+        "flow_title": "",
         "step": {
             "confirm": {
                 "data": {
diff --git a/homeassistant/components/bond/translations/pl.json b/homeassistant/components/bond/translations/pl.json
index 4fae986f701..c50c270b74c 100644
--- a/homeassistant/components/bond/translations/pl.json
+++ b/homeassistant/components/bond/translations/pl.json
@@ -6,13 +6,16 @@
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "old_firmware": "Stare, nieobs\u0142ugiwane oprogramowanie na urz\u0105dzeniu Bond - zaktualizuj przed kontynuowaniem",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
+        "flow_title": "Bond: {bond_id} ({host})",
         "step": {
             "confirm": {
                 "data": {
                     "access_token": "Token dost\u0119pu"
-                }
+                },
+                "description": "Czy chcesz skonfigurowa\u0107 {bond_id}?"
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/braviatv/strings.json b/homeassistant/components/braviatv/strings.json
index c066f91d395..fa0f91861e2 100644
--- a/homeassistant/components/braviatv/strings.json
+++ b/homeassistant/components/braviatv/strings.json
@@ -12,17 +12,17 @@
         "title": "Authorize Sony Bravia TV",
         "description": "Enter the PIN code shown on the Sony Bravia TV. \n\nIf the PIN code is not shown, you have to unregister Home Assistant on your TV, go to: Settings -> Network -> Remote device settings -> Unregister remote device.",
         "data": {
-          "pin": "PIN code"
+          "pin": "[%key:common::config_flow::data::pin%]"
         }
       }
     },
     "error": {
-      "invalid_host": "Invalid hostname or IP address.",
-      "cannot_connect": "Failed to connect, invalid host or PIN code.",
+      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unsupported_model": "Your TV model is not supported."
     },
     "abort": {
-      "already_configured": "This TV is already configured.",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "no_ip_control": "IP Control is disabled on your TV or the TV is not supported."
     }
   },
@@ -36,4 +36,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/braviatv/translations/ca.json b/homeassistant/components/braviatv/translations/ca.json
index c35dc3ce857..5aba974f5d2 100644
--- a/homeassistant/components/braviatv/translations/ca.json
+++ b/homeassistant/components/braviatv/translations/ca.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest televisor ja est\u00e0 configurat.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
             "no_ip_control": "El control IP del teu televisor est\u00e0 desactivat o aquest no \u00e9s compatible."
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, amfitri\u00f3 o codi PIN inv\u00e0lids.",
-            "invalid_host": "Nom de l'amfitri\u00f3 o adre\u00e7a IP inv\u00e0lids.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_host": "Nom de l'amfitri\u00f3 o l'adre\u00e7a IP inv\u00e0lids",
             "unsupported_model": "Aquest model de televisor no \u00e9s compatible."
         },
         "step": {
diff --git a/homeassistant/components/braviatv/translations/cs.json b/homeassistant/components/braviatv/translations/cs.json
index d7737722cc3..ae6e3e5c851 100644
--- a/homeassistant/components/braviatv/translations/cs.json
+++ b/homeassistant/components/braviatv/translations/cs.json
@@ -1,10 +1,37 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_host": "Neplatn\u00fd hostitel nebo IP adresa",
+            "unsupported_model": "V\u00e1\u0161 model televize nen\u00ed podporov\u00e1n."
+        },
         "step": {
+            "authorize": {
+                "data": {
+                    "pin": "PIN k\u00f3d"
+                },
+                "description": "Zadejte PIN k\u00f3d zobrazen\u00fd na televizi Sony Bravia.\n\nPokud se PIN k\u00f3d nezobraz\u00ed, je t\u0159eba zru\u0161it registraci Home Assistant na televizi, p\u0159ejd\u011bte na: Nastaven\u00ed -> S\u00ed\u0165 -> Nastaven\u00ed vzd\u00e1len\u00e9ho za\u0159\u00edzen\u00ed -> Zru\u0161it registraci vzd\u00e1len\u00e9ho za\u0159\u00edzen\u00ed.",
+                "title": "Autorizujte televizi Sony Bravia"
+            },
             "user": {
                 "data": {
                     "host": "Hostitel"
-                }
+                },
+                "description": "Nastavte integraci televize Sony Bravia. Pokud m\u00e1te s nastaven\u00edm probl\u00e9my, pod\u00edvejte se na: https://www.home-assistant.io/integrations/braviatv\n\n Ujist\u011bte se, \u017ee va\u0161e televize je zapnut\u00e1.",
+                "title": "Televize Sony Bravia"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "ignored_sources": "Seznam ignorovan\u00fdch zdroj\u016f"
+                },
+                "title": "Mo\u017enosti pro televizi Sony Bravia"
             }
         }
     }
diff --git a/homeassistant/components/braviatv/translations/de.json b/homeassistant/components/braviatv/translations/de.json
index 39ce34c16a9..b17d42ffaed 100644
--- a/homeassistant/components/braviatv/translations/de.json
+++ b/homeassistant/components/braviatv/translations/de.json
@@ -10,9 +10,6 @@
         },
         "step": {
             "authorize": {
-                "data": {
-                    "pin": "PIN Code"
-                },
                 "description": "Geben Sie den auf dem Sony Bravia-Fernseher angezeigten PIN-Code ein. \n\nWenn der PIN-Code nicht angezeigt wird, m\u00fcssen Sie die Registrierung von Home Assistant auf Ihrem Fernseher aufheben, gehen Sie daf\u00fcr zu: Einstellungen -> Netzwerk -> Remote - Ger\u00e4teeinstellungen -> Registrierung des entfernten Ger\u00e4ts aufheben.",
                 "title": "Autorisieren Sie Sony Bravia TV"
             },
diff --git a/homeassistant/components/braviatv/translations/en.json b/homeassistant/components/braviatv/translations/en.json
index 98a569b3ab1..05ced6af856 100644
--- a/homeassistant/components/braviatv/translations/en.json
+++ b/homeassistant/components/braviatv/translations/en.json
@@ -1,18 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This TV is already configured.",
+            "already_configured": "Device is already configured",
             "no_ip_control": "IP Control is disabled on your TV or the TV is not supported."
         },
         "error": {
-            "cannot_connect": "Failed to connect, invalid host or PIN code.",
-            "invalid_host": "Invalid hostname or IP address.",
+            "cannot_connect": "Failed to connect",
+            "invalid_host": "Invalid hostname or IP address",
             "unsupported_model": "Your TV model is not supported."
         },
         "step": {
             "authorize": {
                 "data": {
-                    "pin": "PIN code"
+                    "pin": "PIN Code"
                 },
                 "description": "Enter the PIN code shown on the Sony Bravia TV. \n\nIf the PIN code is not shown, you have to unregister Home Assistant on your TV, go to: Settings -> Network -> Remote device settings -> Unregister remote device.",
                 "title": "Authorize Sony Bravia TV"
diff --git a/homeassistant/components/braviatv/translations/es-419.json b/homeassistant/components/braviatv/translations/es-419.json
index 820ea329a0c..6a2a0da982e 100644
--- a/homeassistant/components/braviatv/translations/es-419.json
+++ b/homeassistant/components/braviatv/translations/es-419.json
@@ -10,9 +10,6 @@
         },
         "step": {
             "authorize": {
-                "data": {
-                    "pin": "C\u00f3digo PIN"
-                },
                 "description": "Ingrese el c\u00f3digo PIN que se muestra en la televisi\u00f3n Sony Bravia. \n\nSi no se muestra el c\u00f3digo PIN, debe cancelar el registro de Home Assistant en su televisi\u00f3n, vaya a: Configuraci\u00f3n -> Red -> Configuraci\u00f3n del dispositivo remoto - > Cancelar registro del dispositivo remoto.",
                 "title": "Autorizar Sony Bravia TV"
             },
diff --git a/homeassistant/components/braviatv/translations/es.json b/homeassistant/components/braviatv/translations/es.json
index 8995161f5de..2cc3b05010c 100644
--- a/homeassistant/components/braviatv/translations/es.json
+++ b/homeassistant/components/braviatv/translations/es.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Este televisor ya est\u00e1 configurado.",
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
             "no_ip_control": "El Control de IP est\u00e1 desactivado en tu televisor o el televisor no es compatible."
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, host o c\u00f3digo PIN no v\u00e1lido.",
-            "invalid_host": "Nombre del host o direcci\u00f3n IP no v\u00e1lidos.",
+            "cannot_connect": "No se pudo conectar",
+            "invalid_host": "Nombre de host o direcci\u00f3n IP no v\u00e1lidos",
             "unsupported_model": "Tu modelo de televisor no es compatible."
         },
         "step": {
diff --git a/homeassistant/components/braviatv/translations/et.json b/homeassistant/components/braviatv/translations/et.json
new file mode 100644
index 00000000000..b69844ee839
--- /dev/null
+++ b/homeassistant/components/braviatv/translations/et.json
@@ -0,0 +1,39 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "no_ip_control": "Teleris on IP-juhtimine keelatud v\u00f5i telerit ei toetata."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_host": "Vigane hostinimi v\u00f5i IP aadress",
+            "unsupported_model": "Teleri mudelit ei toetata."
+        },
+        "step": {
+            "authorize": {
+                "data": {
+                    "pin": "PIN kood"
+                },
+                "description": "Sisesta Sony Bravia teleris kuvatud PIN-kood.\n\n Kui PIN-koodi ei kuvata pead teleri Home Assistan'i sidumise t\u00fchistama. Mine: Seaded - > V\u00f5rk - > Kaugseadme seaded - > Kaugseadme registreerimise t\u00fchistamine.",
+                "title": "Sony Bravia TV autoriseerimine"
+            },
+            "user": {
+                "data": {
+                    "host": ""
+                },
+                "description": "Seadista Sony Bravia TV sidumine. Kuion probleeme seadetega mine: https://www.home-assistant.io/integrations/braviatv \n\nVeenduge, et teler on sisse l\u00fclitatud.",
+                "title": ""
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "ignored_sources": "Eiratud sisendite loend"
+                },
+                "title": "Sony Bravia teleri valikud"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/braviatv/translations/fr.json b/homeassistant/components/braviatv/translations/fr.json
index 68988b1fbfe..b0bb45d9654 100644
--- a/homeassistant/components/braviatv/translations/fr.json
+++ b/homeassistant/components/braviatv/translations/fr.json
@@ -11,9 +11,6 @@
         },
         "step": {
             "authorize": {
-                "data": {
-                    "pin": "Code PIN"
-                },
                 "description": "Saisissez le code PIN affich\u00e9 sur le t\u00e9l\u00e9viseur Sony Bravia. \n\nSi le code PIN n'est pas affich\u00e9, vous devez d\u00e9senregistrer Home Assistant de votre t\u00e9l\u00e9viseur, allez dans: Param\u00e8tres - > R\u00e9seau - > Param\u00e8tres de l'appareil distant - > Annuler l'enregistrement de l'appareil distant.",
                 "title": "Autoriser Sony Bravia TV"
             },
diff --git a/homeassistant/components/braviatv/translations/it.json b/homeassistant/components/braviatv/translations/it.json
index 46cb5fca7a4..95fcfc7622b 100644
--- a/homeassistant/components/braviatv/translations/it.json
+++ b/homeassistant/components/braviatv/translations/it.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo televisore \u00e8 gi\u00e0 configurato.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
             "no_ip_control": "Il controllo IP \u00e8 disabilitato sulla TV o la TV non \u00e8 supportata."
         },
         "error": {
-            "cannot_connect": "Connessione non riuscita, host o codice PIN non valido.",
-            "invalid_host": "Nome host o indirizzo IP non valido.",
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_host": "Nome host o indirizzo IP non valido",
             "unsupported_model": "Il tuo modello TV non \u00e8 supportato."
         },
         "step": {
diff --git a/homeassistant/components/braviatv/translations/ko.json b/homeassistant/components/braviatv/translations/ko.json
index e8c433ccbfc..3a82c38f904 100644
--- a/homeassistant/components/braviatv/translations/ko.json
+++ b/homeassistant/components/braviatv/translations/ko.json
@@ -11,9 +11,6 @@
         },
         "step": {
             "authorize": {
-                "data": {
-                    "pin": "PIN \ucf54\ub4dc"
-                },
                 "description": "Sony Bravia TV \uc5d0 \ud45c\uc2dc\ub41c PIN \ucf54\ub4dc\ub97c \uc785\ub825\ud574\uc8fc\uc138\uc694.\n\nPIN \ucf54\ub4dc\uac00 \ud45c\uc2dc\ub418\uc9c0 \uc54a\uc73c\uba74 TV \uc5d0\uc11c Home Assistant \ub97c \ub4f1\ub85d \ud574\uc81c\ud558\uc5ec\uc57c \ud569\ub2c8\ub2e4. Settings -> Network -> Remote device settings -> Unregister remote device \ub85c \uc774\ub3d9\ud558\uc5ec \ub4f1\ub85d\uc744 \ud574\uc81c\ud574\uc8fc\uc138\uc694.",
                 "title": "Sony Bravia TV \uc2b9\uc778\ud558\uae30"
             },
diff --git a/homeassistant/components/braviatv/translations/no.json b/homeassistant/components/braviatv/translations/no.json
index cd687d8f2d0..fc725b11adf 100644
--- a/homeassistant/components/braviatv/translations/no.json
+++ b/homeassistant/components/braviatv/translations/no.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne TV-en er allerede konfigurert.",
+            "already_configured": "Enheten er allerede konfigurert",
             "no_ip_control": "IP-kontrollen er deaktivert p\u00e5 TVen eller TV-en st\u00f8ttes ikke."
         },
         "error": {
-            "cannot_connect": "Kunne ikke koble til, ugyldig vert eller PIN-kode.",
-            "invalid_host": "Ugyldig vertsnavn eller IP-adresse.",
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_host": "Ugyldig vertsnavn eller IP-adresse",
             "unsupported_model": "TV-modellen din st\u00f8ttes ikke."
         },
         "step": {
diff --git a/homeassistant/components/braviatv/translations/pl.json b/homeassistant/components/braviatv/translations/pl.json
index 3b8262a5559..0088cf604ad 100644
--- a/homeassistant/components/braviatv/translations/pl.json
+++ b/homeassistant/components/braviatv/translations/pl.json
@@ -1,19 +1,20 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "no_ip_control": "Sterowanie IP jest wy\u0142\u0105czone w telewizorze lub telewizor nie jest obs\u0142ugiwany"
         },
         "error": {
-            "cannot_connect": "Po\u0142\u0105czenie nieudane, nieprawid\u0142owy host lub kod PIN.",
-            "invalid_host": "Nieprawid\u0142owa nazwa hosta lub adres IP.",
-            "unsupported_model": "Ten model telewizora nie jest obs\u0142ugiwany."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_host": "Nieprawid\u0142owa nazwa hosta lub adres IP",
+            "unsupported_model": "Ten model telewizora nie jest obs\u0142ugiwany"
         },
         "step": {
             "authorize": {
                 "data": {
                     "pin": "Kod PIN"
                 },
-                "description": "Wprowad\u017a kod PIN wy\u015bwietlany na telewizorze Sony Bravia. \n\nJe\u015bli kod PIN nie jest wy\u015bwietlany, musisz wyrejestrowa\u0107 Home Assistanta na swoim telewizorze, przejd\u017a do Ustawienia -> Sie\u0107 -> Ustawienia urz\u0105dzenia zdalnego -> Wyrejestruj urz\u0105dzenie zdalne.",
+                "description": "Wprowad\u017a kod PIN wy\u015bwietlany na telewizorze Sony Bravia. \n\nJe\u015bli kod PIN nie jest wy\u015bwietlany, musisz wyrejestrowa\u0107 Home Assistant na swoim telewizorze, przejd\u017a do Ustawienia -> Sie\u0107 -> Ustawienia urz\u0105dzenia zdalnego -> Wyrejestruj urz\u0105dzenie zdalne.",
                 "title": "Autoryzacja Sony Bravia TV"
             },
             "user": {
diff --git a/homeassistant/components/braviatv/translations/pt.json b/homeassistant/components/braviatv/translations/pt.json
index 5e5f1367f58..9d37ff831d2 100644
--- a/homeassistant/components/braviatv/translations/pt.json
+++ b/homeassistant/components/braviatv/translations/pt.json
@@ -10,9 +10,6 @@
         },
         "step": {
             "authorize": {
-                "data": {
-                    "pin": "C\u00f3digo PIN"
-                },
                 "description": "Digite o c\u00f3digo PIN mostrado na TV Sony Bravia. \n\nSe o c\u00f3digo PIN n\u00e3o for exibido, \u00e9 necess\u00e1rio cancelar o registro do Home Assistant na TV, v\u00e1 para: Configura\u00e7\u00f5es -> Rede -> Configura\u00e7\u00f5es do dispositivo remoto -> Cancelar registro do dispositivo remoto.",
                 "title": "Autorizar TV Sony Bravia"
             },
diff --git a/homeassistant/components/braviatv/translations/ru.json b/homeassistant/components/braviatv/translations/ru.json
index a799a29831f..add32dd0d79 100644
--- a/homeassistant/components/braviatv/translations/ru.json
+++ b/homeassistant/components/braviatv/translations/ru.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "no_ip_control": "\u041d\u0430 \u0442\u0435\u043b\u0435\u0432\u0438\u0437\u043e\u0440\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u043e \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e IP, \u043b\u0438\u0431\u043e \u044d\u0442\u0430 \u043c\u043e\u0434\u0435\u043b\u044c \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0445\u043e\u0441\u0442 \u0438\u043b\u0438 PIN-\u043a\u043e\u0434.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_host": "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0434\u043e\u043c\u0435\u043d\u043d\u043e\u0435 \u0438\u043c\u044f \u0438\u043b\u0438 IP-\u0430\u0434\u0440\u0435\u0441.",
             "unsupported_model": "\u042d\u0442\u0430 \u043c\u043e\u0434\u0435\u043b\u044c \u0442\u0435\u043b\u0435\u0432\u0438\u0437\u043e\u0440\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f."
         },
diff --git a/homeassistant/components/braviatv/translations/sl.json b/homeassistant/components/braviatv/translations/sl.json
index 99ab83a39c6..ae98bf15dc3 100644
--- a/homeassistant/components/braviatv/translations/sl.json
+++ b/homeassistant/components/braviatv/translations/sl.json
@@ -10,9 +10,6 @@
         },
         "step": {
             "authorize": {
-                "data": {
-                    "pin": "PIN koda"
-                },
                 "description": "Vnesite kodo PIN, ki je prikazana na Sony Bravia TVju. \n\n \u010ce koda PIN ni prikazana, morate na televizorju odjaviti Home Assistant, pojdite na: Nastavitve - > Omre\u017eje - > Nastavitve oddaljenih naprav - > Odjavite oddaljeno napravo.",
                 "title": "Pooblastite Sony Bravia TV"
             },
diff --git a/homeassistant/components/braviatv/translations/sv.json b/homeassistant/components/braviatv/translations/sv.json
index 6ec160e799a..b07494f15cb 100644
--- a/homeassistant/components/braviatv/translations/sv.json
+++ b/homeassistant/components/braviatv/translations/sv.json
@@ -9,9 +9,6 @@
         },
         "step": {
             "authorize": {
-                "data": {
-                    "pin": "Pin-kod"
-                },
                 "title": "Auktorisera Sony Bravia TV"
             },
             "user": {
diff --git a/homeassistant/components/braviatv/translations/zh-Hans.json b/homeassistant/components/braviatv/translations/zh-Hans.json
new file mode 100644
index 00000000000..c60c3f800ef
--- /dev/null
+++ b/homeassistant/components/braviatv/translations/zh-Hans.json
@@ -0,0 +1,9 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "description": "\u8bbe\u7f6eSony Bravia\u7535\u89c6\u96c6\u6210\u3002\u5982\u679c\u60a8\u5728\u914d\u7f6e\u65b9\u9762\u9047\u5230\u95ee\u9898\uff0c\u8bf7\u8bbf\u95ee\uff1ahttps://www.home-assistant.io/integrations/braviatv\n\u786e\u4fdd\u7535\u89c6\u5df2\u6253\u5f00\u3002"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/braviatv/translations/zh-Hant.json b/homeassistant/components/braviatv/translations/zh-Hant.json
index 027e44abaa4..eafe98f1541 100644
--- a/homeassistant/components/braviatv/translations/zh-Hant.json
+++ b/homeassistant/components/braviatv/translations/zh-Hant.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u96fb\u8996\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "no_ip_control": "\u96fb\u8996\u4e0a\u7684 IP \u5df2\u95dc\u9589\u6216\u4e0d\u652f\u63f4\u6b64\u6b3e\u96fb\u8996\u3002"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u7121\u6548\u7684\u4e3b\u6a5f\u540d\u7a31\u6216 PIN \u78bc\u3002",
-            "invalid_host": "\u7121\u6548\u4e3b\u6a5f\u540d\u6216 IP \u4f4d\u5740",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_host": "\u7121\u6548\u4e3b\u6a5f\u540d\u7a31\u6216 IP \u4f4d\u5740",
             "unsupported_model": "\u4e0d\u652f\u63f4\u6b64\u6b3e\u96fb\u8996\u578b\u865f\u3002"
         },
         "step": {
diff --git a/homeassistant/components/broadlink/__init__.py b/homeassistant/components/broadlink/__init__.py
index 74f26b5fbd6..501afaac930 100644
--- a/homeassistant/components/broadlink/__init__.py
+++ b/homeassistant/components/broadlink/__init__.py
@@ -1,12 +1,9 @@
 """The Broadlink integration."""
 from dataclasses import dataclass, field
-import logging
 
 from .const import DOMAIN
 from .device import BroadlinkDevice
 
-LOGGER = logging.getLogger(__name__)
-
 
 @dataclass
 class BroadlinkData:
diff --git a/homeassistant/components/broadlink/config_flow.py b/homeassistant/components/broadlink/config_flow.py
index 9fe83e350cf..179fac79dd7 100644
--- a/homeassistant/components/broadlink/config_flow.py
+++ b/homeassistant/components/broadlink/config_flow.py
@@ -1,6 +1,7 @@
 """Config flow for Broadlink devices."""
 import errno
 from functools import partial
+import logging
 import socket
 
 import broadlink as blk
@@ -15,7 +16,6 @@ from homeassistant import config_entries, data_entry_flow
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_TIMEOUT, CONF_TYPE
 from homeassistant.helpers import config_validation as cv
 
-from . import LOGGER
 from .const import (  # pylint: disable=unused-import
     DEFAULT_PORT,
     DEFAULT_TIMEOUT,
@@ -24,6 +24,8 @@ from .const import (  # pylint: disable=unused-import
 )
 from .helpers import format_mac
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class BroadlinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a Broadlink config flow."""
@@ -43,7 +45,7 @@ class BroadlinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             for device_type in device_types
         }
         if device.type not in supported_types:
-            LOGGER.error(
+            _LOGGER.error(
                 "Unsupported device: %s. If it worked before, please open "
                 "an issue at https://github.com/home-assistant/core/issues",
                 hex(device.devtype),
@@ -111,7 +113,7 @@ class BroadlinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                     f"{format_mac(self.device.mac)}, but {format_mac(device.mac)} was given"
                 )
 
-            LOGGER.error("Failed to connect to the device at %s: %s", host, err_msg)
+            _LOGGER.error("Failed to connect to the device at %s: %s", host, err_msg)
 
             if self.source == config_entries.SOURCE_IMPORT:
                 return self.async_abort(reason=errors["base"])
@@ -158,7 +160,7 @@ class BroadlinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         else:
             await self.async_set_unique_id(device.mac.hex())
             if self.source == config_entries.SOURCE_IMPORT:
-                LOGGER.warning(
+                _LOGGER.warning(
                     "The %s at %s is ready to be configured. Please "
                     "click Configuration in the sidebar and click "
                     "Integrations. Then find the device there and click "
@@ -172,7 +174,7 @@ class BroadlinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             return await self.async_step_finish()
 
         await self.async_set_unique_id(device.mac.hex())
-        LOGGER.error(
+        _LOGGER.error(
             "Failed to authenticate to the device at %s: %s", device.host[0], err_msg
         )
         return self.async_show_form(step_id="auth", errors=errors)
@@ -226,7 +228,7 @@ class BroadlinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             else:
                 return await self.async_step_finish()
 
-            LOGGER.error(
+            _LOGGER.error(
                 "Failed to unlock the device at %s: %s", device.host[0], err_msg
             )
 
diff --git a/homeassistant/components/broadlink/remote.py b/homeassistant/components/broadlink/remote.py
index 32305331a21..7c7a05ac167 100644
--- a/homeassistant/components/broadlink/remote.py
+++ b/homeassistant/components/broadlink/remote.py
@@ -243,6 +243,9 @@ class BroadlinkRemote(RemoteEntity, RestoreEntity):
         delay = kwargs[ATTR_DELAY_SECS]
 
         if not self._state:
+            _LOGGER.warning(
+                "remote.send_command canceled: %s entity is turned off", self.entity_id
+            )
             return
 
         should_delay = False
@@ -285,6 +288,9 @@ class BroadlinkRemote(RemoteEntity, RestoreEntity):
         toggle = kwargs[ATTR_ALTERNATIVE]
 
         if not self._state:
+            _LOGGER.warning(
+                "remote.learn_command canceled: %s entity is turned off", self.entity_id
+            )
             return
 
         should_store = False
diff --git a/homeassistant/components/broadlink/strings.json b/homeassistant/components/broadlink/strings.json
index d17c639469a..3ed1383cc88 100644
--- a/homeassistant/components/broadlink/strings.json
+++ b/homeassistant/components/broadlink/strings.json
@@ -26,21 +26,21 @@
       "finish": {
         "title": "Choose a name for the device",
         "data": {
-          "name": "Name"
+          "name": "[%key:common::config_flow::data::name%]"
         }
       }
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "There is already a configuration flow in progress for this device",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_host": "Invalid hostname or IP address",
+      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
       "not_supported": "Device not supported",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_host": "Invalid hostname or IP address",
+      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
   }
diff --git a/homeassistant/components/broadlink/translations/ca.json b/homeassistant/components/broadlink/translations/ca.json
index 4d2fa7a8373..edde3bbdfcf 100644
--- a/homeassistant/components/broadlink/translations/ca.json
+++ b/homeassistant/components/broadlink/translations/ca.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "El dispositiu ja est\u00e0 configurat",
-            "already_in_progress": "Ja hi ha un flux de configuraci\u00f3 en curs per a aquest dispositiu",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
             "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_host": "Nom de l'amfitri\u00f3 o l'adre\u00e7a IP inv\u00e0lids",
             "not_supported": "Dispositiu no compatible",
diff --git a/homeassistant/components/broadlink/translations/cs.json b/homeassistant/components/broadlink/translations/cs.json
new file mode 100644
index 00000000000..1ce891d60af
--- /dev/null
+++ b/homeassistant/components/broadlink/translations/cs.json
@@ -0,0 +1,47 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_host": "Neplatn\u00fd hostitel nebo IP adresa",
+            "not_supported": "Za\u0159\u00edzen\u00ed nen\u00ed podporov\u00e1no",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_host": "Neplatn\u00fd hostitel nebo IP adresa",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "flow_title": "{name} ({model} na {host})",
+        "step": {
+            "auth": {
+                "title": "Ov\u011b\u0159en\u00ed za\u0159\u00edzen\u00ed"
+            },
+            "finish": {
+                "data": {
+                    "name": "Jm\u00e9no"
+                },
+                "title": "Vyberte jm\u00e9no za\u0159\u00edzen\u00ed"
+            },
+            "reset": {
+                "description": "Va\u0161e za\u0159\u00edzen\u00ed je uzam\u010deno pro ov\u011b\u0159en\u00ed. Odemkn\u011bte jej podle pokyn\u016f:\n1. Obnovte tov\u00e1rn\u00ed nastaven\u00ed za\u0159\u00edzen\u00ed.\n2. Pomoc\u00ed ofici\u00e1ln\u00ed aplikace p\u0159idejte za\u0159\u00edzen\u00ed do m\u00edstn\u00ed s\u00edt\u011b.\n3. Stop. Neukon\u010dujte nastaven\u00ed. Zav\u0159ete aplikaci.\n4. Klikn\u011bte na Odeslat.",
+                "title": "Odemknout za\u0159\u00edzen\u00ed"
+            },
+            "unlock": {
+                "data": {
+                    "unlock": "Ano, ud\u011blej to."
+                },
+                "description": "Va\u0161e za\u0159\u00edzen\u00ed je uzam\u010deno. To m\u016f\u017ee v\u00e9st k probl\u00e9m\u016fm s ov\u011b\u0159ov\u00e1n\u00edm v Home Assistant. Chcete jej odemknout?",
+                "title": "Odemknut\u00ed za\u0159\u00edzen\u00ed (voliteln\u00e9)"
+            },
+            "user": {
+                "data": {
+                    "host": "Hostitel",
+                    "timeout": "\u010casov\u00fd limit"
+                },
+                "title": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/broadlink/translations/de.json b/homeassistant/components/broadlink/translations/de.json
index b0d7a55c787..99af347f1f4 100644
--- a/homeassistant/components/broadlink/translations/de.json
+++ b/homeassistant/components/broadlink/translations/de.json
@@ -1,10 +1,17 @@
 {
     "config": {
+        "abort": {
+            "not_supported": "Ger\u00e4t nicht unterst\u00fctzt"
+        },
         "step": {
+            "auth": {
+                "title": "Authentifiziere dich beim Ger\u00e4t"
+            },
             "finish": {
                 "data": {
                     "name": "Name"
-                }
+                },
+                "title": "W\u00e4hle einen Namen f\u00fcr das Ger\u00e4t"
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/broadlink/translations/el.json b/homeassistant/components/broadlink/translations/el.json
index d3346614257..360b9c91d68 100644
--- a/homeassistant/components/broadlink/translations/el.json
+++ b/homeassistant/components/broadlink/translations/el.json
@@ -1,7 +1,38 @@
 {
     "config": {
         "abort": {
+            "already_in_progress": "\u03a5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9 \u03ae\u03b4\u03b7 \u03bc\u03b9\u03b1 \u03c1\u03bf\u03ae \u03c1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7\u03c2 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd \u03c3\u03b5 \u03b5\u03be\u03ad\u03bb\u03b9\u03be\u03b7 \u03b3\u03b9\u03b1 \u03b1\u03c5\u03c4\u03ae\u03bd \u03c4\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae",
+            "invalid_host": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03ba\u03b5\u03bd\u03c4\u03c1\u03b9\u03ba\u03bf\u03cd \u03c5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03c4\u03ae \u03ae \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 IP",
             "not_supported": "\u0397 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03b4\u03b5\u03bd \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03c4\u03b1\u03b9"
+        },
+        "flow_title": "{name} ( {model} \u03c3\u03c4\u03bf {host} )",
+        "step": {
+            "auth": {
+                "title": "\u0388\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03c3\u03c4\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae"
+            },
+            "finish": {
+                "data": {
+                    "name": "\u038c\u03bd\u03bf\u03bc\u03b1"
+                },
+                "title": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b3\u03b9\u03b1 \u03c4\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae"
+            },
+            "reset": {
+                "description": "\u0397 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03c3\u03b1\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03ba\u03bb\u03b5\u03b9\u03b4\u03c9\u03bc\u03ad\u03bd\u03b7 \u03b3\u03b9\u03b1 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2. \u0391\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03ae\u03c3\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03bf\u03b4\u03b7\u03b3\u03af\u03b5\u03c2 \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03c4\u03bf \u03be\u03b5\u03ba\u03bb\u03b5\u03b9\u03b4\u03ce\u03c3\u03b5\u03c4\u03b5:\n1. \u0395\u03c1\u03b3\u03bf\u03c3\u03c4\u03b1\u03c3\u03b9\u03b1\u03ba\u03ae \u03b5\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b7\u03c2 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2.\n2. \u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03c0\u03af\u03c3\u03b7\u03bc\u03b7 \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03c3\u03c4\u03bf \u03c4\u03bf\u03c0\u03b9\u03ba\u03cc \u03c3\u03b1\u03c2 \u03b4\u03af\u03ba\u03c4\u03c5\u03bf.\n3. \u03a3\u03c4\u03b1\u03bc\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5. \u039c\u03b7\u03bd \u03bf\u03bb\u03bf\u03ba\u03bb\u03b7\u03c1\u03ce\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7 \u03c1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7. \u039a\u03bb\u03b5\u03af\u03c3\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae.\n4. \u039a\u03ac\u03bd\u03c4\u03b5 \u03ba\u03bb\u03b9\u03ba \u03c3\u03c4\u03b7\u03bd \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03a5\u03c0\u03bf\u03b2\u03bf\u03bb\u03ae.",
+                "title": "\u039e\u03b5\u03ba\u03bb\u03b5\u03af\u03b4\u03c9\u03bc\u03b1 \u03c4\u03b7\u03c2 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2"
+            },
+            "unlock": {
+                "data": {
+                    "unlock": "\u039d\u03b1\u03b9, \u03ba\u03ac\u03bd\u03c4\u03bf."
+                },
+                "description": "\u0397 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03c3\u03b1\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03ba\u03bb\u03b5\u03b9\u03b4\u03c9\u03bc\u03ad\u03bd\u03b7. \u0391\u03c5\u03c4\u03cc \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03bf\u03b4\u03b7\u03b3\u03ae\u03c3\u03b5\u03b9 \u03c3\u03b5 \u03c0\u03c1\u03bf\u03b2\u03bb\u03ae\u03bc\u03b1\u03c4\u03b1 \u03b5\u03bb\u03ad\u03b3\u03c7\u03bf\u03c5 \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03c3\u03c4\u03bf Home Assistant. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c4\u03bf \u03be\u03b5\u03ba\u03bb\u03b5\u03b9\u03b4\u03ce\u03c3\u03b5\u03c4\u03b5;",
+                "title": "\u039e\u03b5\u03ba\u03bb\u03b5\u03af\u03b4\u03c9\u03bc\u03b1 \u03c4\u03b7\u03c2 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2 (\u03c0\u03c1\u03bf\u03b1\u03b9\u03c1\u03b5\u03c4\u03b9\u03ba\u03cc)"
+            },
+            "user": {
+                "data": {
+                    "timeout": "\u03a7\u03c1\u03bf\u03bd\u03b9\u03ba\u03cc \u03cc\u03c1\u03b9\u03bf"
+                },
+                "title": "\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/broadlink/translations/en.json b/homeassistant/components/broadlink/translations/en.json
index bd8dfd0c403..0b1029b8a0a 100644
--- a/homeassistant/components/broadlink/translations/en.json
+++ b/homeassistant/components/broadlink/translations/en.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Device is already configured",
-            "already_in_progress": "There is already a configuration flow in progress for this device",
+            "already_in_progress": "Configuration flow is already in progress",
             "cannot_connect": "Failed to connect",
             "invalid_host": "Invalid hostname or IP address",
             "not_supported": "Device not supported",
diff --git a/homeassistant/components/broadlink/translations/es.json b/homeassistant/components/broadlink/translations/es.json
index 98c4cbdfb30..e7a35c2876f 100644
--- a/homeassistant/components/broadlink/translations/es.json
+++ b/homeassistant/components/broadlink/translations/es.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "El dispositivo ya est\u00e1 configurado",
-            "already_in_progress": "Ya hay un flujo de configuraci\u00f3n en curso para este dispositivo",
+            "already_in_progress": "El flujo de configuraci\u00f3n ya est\u00e1 en proceso",
             "cannot_connect": "No se pudo conectar",
             "invalid_host": "Nombre de host o direcci\u00f3n IP no v\u00e1lidos",
             "not_supported": "Dispositivo no compatible",
diff --git a/homeassistant/components/broadlink/translations/et.json b/homeassistant/components/broadlink/translations/et.json
index fc7f3424b62..20ae86b38c7 100644
--- a/homeassistant/components/broadlink/translations/et.json
+++ b/homeassistant/components/broadlink/translations/et.json
@@ -1,7 +1,47 @@
 {
     "config": {
         "abort": {
-            "not_supported": "Seadet ei toetata"
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_host": "Vigane hostinimi v\u00f5i IP aadress",
+            "not_supported": "Seadet ei toetata",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_host": "Sobimatu hostinimi v\u00f5i IP-aadress",
+            "unknown": "Tundmatu viga"
+        },
+        "flow_title": "{name} ( {model} asukohas {host} )",
+        "step": {
+            "auth": {
+                "title": "Seadme autentimine"
+            },
+            "finish": {
+                "data": {
+                    "name": "Nimi"
+                },
+                "title": "Seadme nime valimine"
+            },
+            "reset": {
+                "description": "Seade on autentimiseks lukustatud. Selle avamiseks j\u00e4rgi juhiseid.\n 1. L\u00e4htesta seade tehaseseadetele.\n 2. Kasuta seadme kohalikku v\u00f5rku lisamiseks ametlikku rakendust.\n 3. Peatu. \u00c4ra l\u00f5petaa seadistamist. Sulgea rakendus.\n 4. Kl\u00f5psa nuppu Esita.",
+                "title": "Seadme lukustuse eemaldamine"
+            },
+            "unlock": {
+                "data": {
+                    "unlock": "Jah, tee seda."
+                },
+                "description": "Seade on lukustatud. See v\u00f5ib p\u00f5hjustada Home Assistanti autentimisprobleeme. Kas soovid selle avada?",
+                "title": "Seadme lukustuse eemaldamine (valikuline)"
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "timeout": "Ajal\u00f5pp"
+                },
+                "title": "\u00dchendu seadmega"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/broadlink/translations/fr.json b/homeassistant/components/broadlink/translations/fr.json
index 1d80059fb7a..bb3af76ff95 100644
--- a/homeassistant/components/broadlink/translations/fr.json
+++ b/homeassistant/components/broadlink/translations/fr.json
@@ -10,7 +10,6 @@
         },
         "error": {
             "cannot_connect": "\u00c9chec de connexion",
-            "invalid_host": "Nom d'h\u00f4te ou adresse IP non valide",
             "unknown": "Erreur inattendue"
         },
         "flow_title": "{name} ( {model} \u00e0 {host} )",
diff --git a/homeassistant/components/broadlink/translations/it.json b/homeassistant/components/broadlink/translations/it.json
index 7f26e33e14f..d8e64b4bea3 100644
--- a/homeassistant/components/broadlink/translations/it.json
+++ b/homeassistant/components/broadlink/translations/it.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "\u00c8 gi\u00e0 in corso un flusso di configurazione per questo dispositivo",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
             "cannot_connect": "Impossibile connettersi",
             "invalid_host": "Nome host o indirizzo IP non valido",
             "not_supported": "Dispositivo non supportato",
diff --git a/homeassistant/components/broadlink/translations/ko.json b/homeassistant/components/broadlink/translations/ko.json
index 47ebf3db64a..b27391e1100 100644
--- a/homeassistant/components/broadlink/translations/ko.json
+++ b/homeassistant/components/broadlink/translations/ko.json
@@ -10,7 +10,6 @@
         },
         "error": {
             "cannot_connect": "\uc5f0\uacb0 \uc2e4\ud328",
-            "invalid_host": "\uc798\ubabb\ub41c \ud638\uc2a4\ud2b8\uba85 \ub610\ub294 IP \uc8fc\uc18c",
             "unknown": "\uc608\uc0c1\uce58 \ubabb\ud55c \uc5d0\ub7ec"
         },
         "flow_title": "{name} ({host} \uc758 {model})",
diff --git a/homeassistant/components/broadlink/translations/lb.json b/homeassistant/components/broadlink/translations/lb.json
index e4f60a3eac9..4946a504404 100644
--- a/homeassistant/components/broadlink/translations/lb.json
+++ b/homeassistant/components/broadlink/translations/lb.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Apparat ass scho konfigur\u00e9iert",
-            "already_in_progress": "Et ass schonn ee Konfiguratioun's Oflaf fir d\u00ebsen Apparat am gaang.",
+            "already_in_progress": "Et ass schonn ee Konfiguratioun's Oflaft am gaang.",
             "cannot_connect": "Feeler beim verbannen",
             "invalid_host": "Ong\u00ebltege Numm oder IP Adresse.",
             "not_supported": "Apparat net \u00ebnnerst\u00ebtzt.",
diff --git a/homeassistant/components/broadlink/translations/nl.json b/homeassistant/components/broadlink/translations/nl.json
index d6185150e49..ea0449afc58 100644
--- a/homeassistant/components/broadlink/translations/nl.json
+++ b/homeassistant/components/broadlink/translations/nl.json
@@ -2,6 +2,13 @@
     "config": {
         "abort": {
             "not_supported": "Apparaat wordt niet ondersteund"
+        },
+        "step": {
+            "finish": {
+                "data": {
+                    "name": "Naam"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/broadlink/translations/no.json b/homeassistant/components/broadlink/translations/no.json
index 14b55c93a96..d052e495b72 100644
--- a/homeassistant/components/broadlink/translations/no.json
+++ b/homeassistant/components/broadlink/translations/no.json
@@ -2,18 +2,18 @@
     "config": {
         "abort": {
             "already_configured": "Enheten er allerede konfigurert",
-            "already_in_progress": "Det p\u00e5g\u00e5r allerede en konfigurasjonsflyt for denne enheten",
-            "cannot_connect": "Tilkobling mislyktes.",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_host": "Ugyldig vertsnavn eller IP-adresse",
             "not_supported": "Enheten st\u00f8ttes ikke",
             "unknown": "Uventet feil"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_host": "Ugyldig vertsnavn eller IP-adresse",
             "unknown": "Uventet feil"
         },
-        "flow_title": "{name} ( {model} hos {host} )",
+        "flow_title": "{name} ({model} p\u00e5 {host})",
         "step": {
             "auth": {
                 "title": "Autentiser til enheten"
diff --git a/homeassistant/components/broadlink/translations/pl.json b/homeassistant/components/broadlink/translations/pl.json
index 64afc759689..a93c15c4288 100644
--- a/homeassistant/components/broadlink/translations/pl.json
+++ b/homeassistant/components/broadlink/translations/pl.json
@@ -2,15 +2,16 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "already_in_progress": "Konfiguracja integracji Broadlink jest ju\u017c w toku.",
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z urz\u0105dzeniem",
-            "invalid_host": "B\u0142\u0119dna nazwa hosta b\u0105d\u017a adres IP",
-            "unknown": "Wyst\u0105pi\u0142 nieoczekiwany b\u0142\u0105d"
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_host": "Nieprawid\u0142owa nazwa hosta lub adres IP",
+            "not_supported": "Urz\u0105dzenie nie jest obs\u0142ugiwane",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z urz\u0105dzeniem",
-            "invalid_host": "B\u0142\u0119dna nazwa hosta b\u0105d\u017a adres IP",
-            "unknown": "Wyst\u0105pi\u0142 nieoczekiwany b\u0142\u0105d"
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_host": "Nieprawid\u0142owa nazwa hosta lub adres IP",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "flow_title": "{name} ({model}, IP: {host})",
         "step": {
@@ -36,10 +37,10 @@
             },
             "user": {
                 "data": {
-                    "host": "Host lub Adres IP",
+                    "host": "Nazwa hosta lub adres IP",
                     "timeout": "Timeout (limit czasu)"
                 },
-                "title": "\u0141\u0105czenie z urz\u0105dzeniem"
+                "title": "Po\u0142\u0105czenie z urz\u0105dzeniem"
             }
         }
     }
diff --git a/homeassistant/components/broadlink/translations/ru.json b/homeassistant/components/broadlink/translations/ru.json
index 542efe753f9..617c508b8c2 100644
--- a/homeassistant/components/broadlink/translations/ru.json
+++ b/homeassistant/components/broadlink/translations/ru.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
             "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_host": "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0434\u043e\u043c\u0435\u043d\u043d\u043e\u0435 \u0438\u043c\u044f \u0438\u043b\u0438 IP-\u0430\u0434\u0440\u0435\u0441.",
             "not_supported": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.",
diff --git a/homeassistant/components/broadlink/translations/zh-Hant.json b/homeassistant/components/broadlink/translations/zh-Hant.json
index 6bb8d54bd16..01db5167bb2 100644
--- a/homeassistant/components/broadlink/translations/zh-Hant.json
+++ b/homeassistant/components/broadlink/translations/zh-Hant.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "\u6b64\u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
             "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_host": "\u7121\u6548\u4e3b\u6a5f\u540d\u7a31\u6216 IP \u4f4d\u5740",
             "not_supported": "\u8a2d\u5099\u4e0d\u652f\u63f4",
diff --git a/homeassistant/components/broadlink/updater.py b/homeassistant/components/broadlink/updater.py
index d36a07a185b..6d3bbc5b6c1 100644
--- a/homeassistant/components/broadlink/updater.py
+++ b/homeassistant/components/broadlink/updater.py
@@ -48,7 +48,7 @@ class BroadlinkUpdateManager(ABC):
         self.coordinator = DataUpdateCoordinator(
             device.hass,
             _LOGGER,
-            name="device",
+            name=f"{device.name} ({device.api.model} at {device.api.host[0]})",
             update_method=self.async_update,
             update_interval=timedelta(minutes=1),
         )
@@ -67,14 +67,20 @@ class BroadlinkUpdateManager(ABC):
             ):
                 self.available = False
                 _LOGGER.warning(
-                    "Disconnected from the device at %s", self.device.api.host[0]
+                    "Disconnected from %s (%s at %s)",
+                    self.device.name,
+                    self.device.api.model,
+                    self.device.api.host[0],
                 )
             raise UpdateFailed(err) from err
 
         else:
             if self.available is False:
                 _LOGGER.warning(
-                    "Connected to the device at %s", self.device.api.host[0]
+                    "Connected to %s (%s at %s)",
+                    self.device.name,
+                    self.device.api.model,
+                    self.device.api.host[0],
                 )
             self.available = True
             self.last_update = dt.utcnow()
diff --git a/homeassistant/components/brother/__init__.py b/homeassistant/components/brother/__init__.py
index d4cd5d4a2b5..f7e5fbdb0d1 100644
--- a/homeassistant/components/brother/__init__.py
+++ b/homeassistant/components/brother/__init__.py
@@ -6,7 +6,7 @@ import logging
 from brother import Brother, SnmpError, UnsupportedModel
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_TYPE
+from homeassistant.const import CONF_HOST, CONF_TYPE, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Config, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -58,7 +58,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
         )
     )
     if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
+        hass.data[DOMAIN].pop(entry.entry_id).shutdown()
 
     return unload_ok
 
@@ -69,6 +69,9 @@ class BrotherDataUpdateCoordinator(DataUpdateCoordinator):
     def __init__(self, hass, host, kind):
         """Initialize."""
         self.brother = Brother(host, kind=kind)
+        self._unsub_stop = hass.bus.async_listen(
+            EVENT_HOMEASSISTANT_STOP, self._handle_ha_stop
+        )
 
         super().__init__(
             hass,
@@ -79,8 +82,22 @@ class BrotherDataUpdateCoordinator(DataUpdateCoordinator):
 
     async def _async_update_data(self):
         """Update data via library."""
+        # Race condition on shutdown. Stop all the fetches.
+        if self._unsub_stop is None:
+            return None
+
         try:
             await self.brother.async_update()
         except (ConnectionError, SnmpError, UnsupportedModel) as error:
             raise UpdateFailed(error) from error
         return self.brother.data
+
+    def shutdown(self):
+        """Shutdown the Brother coordinator."""
+        self._unsub_stop()
+        self._unsub_stop = None
+        self.brother.shutdown()
+
+    def _handle_ha_stop(self, _):
+        """Handle Home Assistant stopping."""
+        self.shutdown()
diff --git a/homeassistant/components/brother/config_flow.py b/homeassistant/components/brother/config_flow.py
index 8b3a9539cc3..aa9d7ce53a3 100644
--- a/homeassistant/components/brother/config_flow.py
+++ b/homeassistant/components/brother/config_flow.py
@@ -50,6 +50,7 @@ class BrotherConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
                 brother = Brother(user_input[CONF_HOST])
                 await brother.async_update()
+                brother.shutdown()
 
                 await self.async_set_unique_id(brother.serial.lower())
                 self._abort_if_unique_id_configured()
@@ -59,7 +60,7 @@ class BrotherConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             except InvalidHost:
                 errors[CONF_HOST] = "wrong_host"
             except ConnectionError:
-                errors["base"] = "connection_error"
+                errors["base"] = "cannot_connect"
             except SnmpError:
                 errors["base"] = "snmp_error"
             except UnsupportedModel:
@@ -72,7 +73,7 @@ class BrotherConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_zeroconf(self, discovery_info):
         """Handle zeroconf discovery."""
         if discovery_info is None:
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
 
         if not discovery_info.get("name") or not discovery_info["name"].startswith(
             "Brother"
@@ -86,7 +87,7 @@ class BrotherConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         try:
             await self.brother.async_update()
         except (ConnectionError, SnmpError, UnsupportedModel):
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
 
         # Check if already configured
         await self.async_set_unique_id(self.brother.serial.lower())
diff --git a/homeassistant/components/brother/manifest.json b/homeassistant/components/brother/manifest.json
index 2e73f9b8450..bc63de34b2a 100644
--- a/homeassistant/components/brother/manifest.json
+++ b/homeassistant/components/brother/manifest.json
@@ -3,8 +3,8 @@
   "name": "Brother Printer",
   "documentation": "https://www.home-assistant.io/integrations/brother",
   "codeowners": ["@bieniu"],
-  "requirements": ["brother==0.1.17"],
-  "zeroconf": [{"type": "_printer._tcp.local.", "name":"brother*"}],
+  "requirements": ["brother==0.1.18"],
+  "zeroconf": [{"type": "_printer._tcp.local.", "name":"Brother*"}],
   "config_flow": true,
   "quality_scale": "platinum"
 }
diff --git a/homeassistant/components/brother/sensor.py b/homeassistant/components/brother/sensor.py
index abc0447e718..7239976f85e 100644
--- a/homeassistant/components/brother/sensor.py
+++ b/homeassistant/components/brother/sensor.py
@@ -1,6 +1,5 @@
 """Support for the Brother service."""
 from datetime import timedelta
-import logging
 
 from homeassistant.const import DEVICE_CLASS_TIMESTAMP
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -37,8 +36,6 @@ ATTR_MODEL = "model"
 ATTR_REMAINING_PAGES = "remaining_pages"
 ATTR_SERIAL = "serial"
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Add Brother entities from a config_entry."""
diff --git a/homeassistant/components/brother/strings.json b/homeassistant/components/brother/strings.json
index 264992a7eae..358f76e77b8 100644
--- a/homeassistant/components/brother/strings.json
+++ b/homeassistant/components/brother/strings.json
@@ -19,12 +19,12 @@
     },
     "error": {
       "wrong_host": "Invalid hostname or IP address.",
-      "connection_error": "Connection error.",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "snmp_error": "SNMP server turned off or printer not supported."
     },
     "abort": {
       "unsupported_model": "This printer model is not supported.",
-      "already_configured": "This printer is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
 }
\ No newline at end of file
diff --git a/homeassistant/components/brother/translations/ca.json b/homeassistant/components/brother/translations/ca.json
index 6f8c1ca912f..e32d26ff79a 100644
--- a/homeassistant/components/brother/translations/ca.json
+++ b/homeassistant/components/brother/translations/ca.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquesta impressora ja est\u00e0 configurada.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
             "unsupported_model": "Aquest model d'impressora no \u00e9s compatible."
         },
         "error": {
-            "connection_error": "Error de connexi\u00f3.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "connection_error": "Ha fallat la connexi\u00f3",
             "snmp_error": "El servidor SNMP s'ha tancat o la impressora no \u00e9s compatible.",
             "wrong_host": "Nom de l'amfitri\u00f3 o adre\u00e7a IP inv\u00e0lids."
         },
diff --git a/homeassistant/components/brother/translations/cs.json b/homeassistant/components/brother/translations/cs.json
index ed5f4998d3c..b44a68c9db3 100644
--- a/homeassistant/components/brother/translations/cs.json
+++ b/homeassistant/components/brother/translations/cs.json
@@ -1,10 +1,20 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "unsupported_model": "Tento model tisk\u00e1rny nen\u00ed podporov\u00e1n."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit",
+            "wrong_host": "Neplatn\u00fd hostitel nebo IP adresa."
+        },
         "flow_title": "Tisk\u00e1rna Brother: {model} {serial_number}",
         "step": {
             "user": {
                 "data": {
-                    "host": "Hostitel"
+                    "host": "Hostitel",
+                    "type": "Typ tisk\u00e1rny"
                 }
             },
             "zeroconf_confirm": {
diff --git a/homeassistant/components/brother/translations/el.json b/homeassistant/components/brother/translations/el.json
new file mode 100644
index 00000000000..04b238a916d
--- /dev/null
+++ b/homeassistant/components/brother/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/brother/translations/en.json b/homeassistant/components/brother/translations/en.json
index 8cd1ed46919..af5cc681d51 100644
--- a/homeassistant/components/brother/translations/en.json
+++ b/homeassistant/components/brother/translations/en.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This printer is already configured.",
+            "already_configured": "Device is already configured",
             "unsupported_model": "This printer model is not supported."
         },
         "error": {
-            "connection_error": "Connection error.",
+            "cannot_connect": "Failed to connect",
+            "connection_error": "Failed to connect",
             "snmp_error": "SNMP server turned off or printer not supported.",
             "wrong_host": "Invalid hostname or IP address."
         },
diff --git a/homeassistant/components/brother/translations/es.json b/homeassistant/components/brother/translations/es.json
index 51e1492be13..c64fb9adad0 100644
--- a/homeassistant/components/brother/translations/es.json
+++ b/homeassistant/components/brother/translations/es.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Esta impresora ya est\u00e1 configurada.",
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
             "unsupported_model": "Este modelo de impresora no es compatible."
         },
         "error": {
-            "connection_error": "Error de conexi\u00f3n.",
+            "cannot_connect": "No se pudo conectar",
+            "connection_error": "No se pudo conectar",
             "snmp_error": "El servidor SNMP est\u00e1 apagado o la impresora no es compatible.",
             "wrong_host": "Nombre del host o direcci\u00f3n IP no v\u00e1lidos."
         },
diff --git a/homeassistant/components/brother/translations/et.json b/homeassistant/components/brother/translations/et.json
index 4c5bb032f0b..27719d66d5b 100644
--- a/homeassistant/components/brother/translations/et.json
+++ b/homeassistant/components/brother/translations/et.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
             "unsupported_model": "Seda printeri mudelit ei toetata."
         },
         "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
             "connection_error": "\u00dchenduse t\u00f5rge.",
             "snmp_error": "SNMP-server on v\u00e4lja l\u00fclitatud v\u00f5i printerit ei toetata.",
             "wrong_host": "Sobimatu hostinimi v\u00f5i IP-aadress."
diff --git a/homeassistant/components/brother/translations/fr.json b/homeassistant/components/brother/translations/fr.json
index e47b046e59e..83b360b1706 100644
--- a/homeassistant/components/brother/translations/fr.json
+++ b/homeassistant/components/brother/translations/fr.json
@@ -5,6 +5,7 @@
             "unsupported_model": "Ce mod\u00e8le d'imprimante n'est pas pris en charge."
         },
         "error": {
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "Erreur de connexion.",
             "snmp_error": "Serveur SNMP d\u00e9sactiv\u00e9 ou imprimante non prise en charge.",
             "wrong_host": "Nom d'h\u00f4te ou adresse IP invalide."
diff --git a/homeassistant/components/brother/translations/it.json b/homeassistant/components/brother/translations/it.json
index 47d378606f1..47191618bc8 100644
--- a/homeassistant/components/brother/translations/it.json
+++ b/homeassistant/components/brother/translations/it.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questa stampante \u00e8 gi\u00e0 configurata.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
             "unsupported_model": "Questo modello di stampante non \u00e8 supportato."
         },
         "error": {
-            "connection_error": "Errore di connessione.",
+            "cannot_connect": "Impossibile connettersi",
+            "connection_error": "Impossibile connettersi",
             "snmp_error": "Server SNMP spento o stampante non supportata.",
             "wrong_host": "Nome host o indirizzo IP non valido."
         },
diff --git a/homeassistant/components/brother/translations/lb.json b/homeassistant/components/brother/translations/lb.json
index 8e329f99811..8c1842f9c26 100644
--- a/homeassistant/components/brother/translations/lb.json
+++ b/homeassistant/components/brother/translations/lb.json
@@ -5,6 +5,7 @@
             "unsupported_model": "D\u00ebse Printer Modell g\u00ebtt net \u00ebnnerst\u00ebtzt."
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler bei der Verbindung.",
             "snmp_error": "SNMP Server ausgeschalt oder Printer net \u00ebnnerst\u00ebtzt.",
             "wrong_host": "Ong\u00ebltege Numm oder IP Adresse"
diff --git a/homeassistant/components/brother/translations/nl.json b/homeassistant/components/brother/translations/nl.json
index 5b641652971..f1d1763e0be 100644
--- a/homeassistant/components/brother/translations/nl.json
+++ b/homeassistant/components/brother/translations/nl.json
@@ -5,6 +5,7 @@
             "unsupported_model": "Dit printermodel wordt niet ondersteund."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Verbindingsfout.",
             "snmp_error": "SNMP-server uitgeschakeld of printer wordt niet ondersteund.",
             "wrong_host": "Ongeldige hostnaam of IP-adres."
diff --git a/homeassistant/components/brother/translations/no.json b/homeassistant/components/brother/translations/no.json
index bfc5d811f42..2894b57dfe0 100644
--- a/homeassistant/components/brother/translations/no.json
+++ b/homeassistant/components/brother/translations/no.json
@@ -1,15 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne skriveren er allerede konfigurert.",
+            "already_configured": "Enheten er allerede konfigurert",
             "unsupported_model": "Denne skrivermodellen er ikke st\u00f8ttet."
         },
         "error": {
-            "connection_error": "Tilkoblingen mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
+            "connection_error": "Tilkobling mislyktes",
             "snmp_error": "SNMP verten er skrudd av eller printeren er ikke st\u00f8ttet.",
             "wrong_host": "Ugyldig vertsnavn eller IP-adresse."
         },
-        "flow_title": "Brother Printer: {model} {serial_number}",
+        "flow_title": "Brother skriver: {model} {serial_number}",
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/brother/translations/pl.json b/homeassistant/components/brother/translations/pl.json
index cb7c3365628..4fe878947fa 100644
--- a/homeassistant/components/brother/translations/pl.json
+++ b/homeassistant/components/brother/translations/pl.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ta drukarka jest ju\u017c skonfigurowana.",
-            "unsupported_model": "Ten model drukarki nie jest obs\u0142ugiwany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "unsupported_model": "Ten model drukarki nie jest obs\u0142ugiwany"
         },
         "error": {
-            "connection_error": "B\u0142\u0105d po\u0142\u0105czenia.",
-            "snmp_error": "Serwer SNMP wy\u0142\u0105czony lub drukarka nie jest obs\u0142ugiwana.",
-            "wrong_host": "Niepoprawna nazwa hosta lub adres IP drukarki."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "snmp_error": "Serwer SNMP wy\u0142\u0105czony lub drukarka nie jest obs\u0142ugiwana",
+            "wrong_host": "Niepoprawna nazwa hosta lub adres IP drukarki"
         },
         "flow_title": "Drukarka Brother: {model} {serial_number}",
         "step": {
@@ -22,7 +23,7 @@
                 "data": {
                     "type": "Typ drukarki"
                 },
-                "description": "Czy chcesz doda\u0107 drukark\u0119 Brother {model} o numerze seryjnym `{serial_number}` do Home Assistanta?",
+                "description": "Czy chcesz doda\u0107 drukark\u0119 Brother {model} o numerze seryjnym `{serial_number}` do Home Assistant?",
                 "title": "Wykryto drukark\u0119 Brother"
             }
         }
diff --git a/homeassistant/components/brother/translations/ru.json b/homeassistant/components/brother/translations/ru.json
index f880f754590..635fbf87f48 100644
--- a/homeassistant/components/brother/translations/ru.json
+++ b/homeassistant/components/brother/translations/ru.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "unsupported_model": "\u042d\u0442\u0430 \u043c\u043e\u0434\u0435\u043b\u044c \u043f\u0440\u0438\u043d\u0442\u0435\u0440\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f."
         },
         "error": {
-            "connection_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "snmp_error": "\u0421\u0435\u0440\u0432\u0435\u0440 SNMP \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d \u0438\u043b\u0438 \u043f\u0440\u0438\u043d\u0442\u0435\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.",
             "wrong_host": "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0434\u043e\u043c\u0435\u043d\u043d\u043e\u0435 \u0438\u043c\u044f \u0438\u043b\u0438 IP-\u0430\u0434\u0440\u0435\u0441."
         },
diff --git a/homeassistant/components/brother/translations/zh-Hans.json b/homeassistant/components/brother/translations/zh-Hans.json
new file mode 100644
index 00000000000..8f9e85e54a9
--- /dev/null
+++ b/homeassistant/components/brother/translations/zh-Hans.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25",
+            "snmp_error": "SNMP\u670d\u52a1\u5668\u5df2\u5173\u95ed\u6216\u4e0d\u652f\u6301\u6253\u5370\u3002"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/brother/translations/zh-Hant.json b/homeassistant/components/brother/translations/zh-Hant.json
index a1d35a44984..36455eaf085 100644
--- a/homeassistant/components/brother/translations/zh-Hant.json
+++ b/homeassistant/components/brother/translations/zh-Hant.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u5370\u8868\u6a5f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "unsupported_model": "\u4e0d\u652f\u63f4\u6b64\u6b3e\u5370\u8868\u6a5f\u3002"
         },
         "error": {
-            "connection_error": "\u9023\u7dda\u932f\u8aa4\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "connection_error": "\u9023\u7dda\u5931\u6557",
             "snmp_error": "SNMP \u4f3a\u670d\u5668\u70ba\u95dc\u9589\u72c0\u614b\u6216\u5370\u8868\u6a5f\u4e0d\u652f\u63f4\u3002",
             "wrong_host": "\u7121\u6548\u4e3b\u6a5f\u540d\u6216 IP \u4f4d\u5740"
         },
diff --git a/homeassistant/components/bsblan/__init__.py b/homeassistant/components/bsblan/__init__.py
index c799f8daa9b..870d96dab86 100644
--- a/homeassistant/components/bsblan/__init__.py
+++ b/homeassistant/components/bsblan/__init__.py
@@ -1,6 +1,5 @@
 """The BSB-Lan integration."""
 from datetime import timedelta
-import logging
 
 from bsblan import BSBLan, BSBLanConnectionError
 
@@ -16,8 +15,6 @@ from .const import CONF_PASSKEY, DATA_BSBLAN_CLIENT, DOMAIN
 
 SCAN_INTERVAL = timedelta(seconds=30)
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the BSB-Lan component."""
diff --git a/homeassistant/components/bsblan/config_flow.py b/homeassistant/components/bsblan/config_flow.py
index 1ecfc239af6..e0e806ae205 100644
--- a/homeassistant/components/bsblan/config_flow.py
+++ b/homeassistant/components/bsblan/config_flow.py
@@ -39,7 +39,7 @@ class BSBLanFlowHandler(ConfigFlow, domain=DOMAIN):
                 passkey=user_input.get(CONF_PASSKEY),
             )
         except BSBLanError:
-            return self._show_setup_form({"base": "connection_error"})
+            return self._show_setup_form({"base": "cannot_connect"})
 
         # Check if already configured
         await self.async_set_unique_id(info.device_identification)
diff --git a/homeassistant/components/bsblan/strings.json b/homeassistant/components/bsblan/strings.json
index 2e7c63f4d3a..1003f75a4a3 100644
--- a/homeassistant/components/bsblan/strings.json
+++ b/homeassistant/components/bsblan/strings.json
@@ -14,10 +14,10 @@
       }
     },
     "error": {
-      "connection_error": "Failed to connect to BSB-Lan device."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/bsblan/translations/ca.json b/homeassistant/components/bsblan/translations/ca.json
index 2fcab5683de..6096784c879 100644
--- a/homeassistant/components/bsblan/translations/ca.json
+++ b/homeassistant/components/bsblan/translations/ca.json
@@ -4,6 +4,7 @@
             "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar amb el dispositiu BSB-Lan."
         },
         "flow_title": "BSB-Lan: {name}",
diff --git a/homeassistant/components/bsblan/translations/cs.json b/homeassistant/components/bsblan/translations/cs.json
index 406bddd1a12..a29f842c49c 100644
--- a/homeassistant/components/bsblan/translations/cs.json
+++ b/homeassistant/components/bsblan/translations/cs.json
@@ -1,12 +1,22 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed BSB-Lan se nezda\u0159ilo."
+        },
+        "flow_title": "BSB-Lan: {name}",
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel",
                     "port": "Port"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed BSB-Lan"
             }
         }
-    }
+    },
+    "title": "BSB-Lan"
 }
\ No newline at end of file
diff --git a/homeassistant/components/bsblan/translations/el.json b/homeassistant/components/bsblan/translations/el.json
new file mode 100644
index 00000000000..04b238a916d
--- /dev/null
+++ b/homeassistant/components/bsblan/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/bsblan/translations/en.json b/homeassistant/components/bsblan/translations/en.json
index ce745b351b1..b8e3d0b5495 100644
--- a/homeassistant/components/bsblan/translations/en.json
+++ b/homeassistant/components/bsblan/translations/en.json
@@ -4,6 +4,7 @@
             "already_configured": "Device is already configured"
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect to BSB-Lan device."
         },
         "flow_title": "BSB-Lan: {name}",
diff --git a/homeassistant/components/bsblan/translations/es.json b/homeassistant/components/bsblan/translations/es.json
index e22dbfa75ec..319948ff5d1 100644
--- a/homeassistant/components/bsblan/translations/es.json
+++ b/homeassistant/components/bsblan/translations/es.json
@@ -4,6 +4,7 @@
             "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se ha podido conectar con el dispositivo BSB-Lan."
         },
         "flow_title": "BSB-Lan: {name}",
diff --git a/homeassistant/components/bsblan/translations/et.json b/homeassistant/components/bsblan/translations/et.json
new file mode 100644
index 00000000000..1c38cb46336
--- /dev/null
+++ b/homeassistant/components/bsblan/translations/et.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "BSB-Lan seadmega \u00fchenduse loomine nurjus."
+        },
+        "flow_title": "BSB-Lan: {name}",
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "passkey": "Juurdep\u00e4\u00e4sut\u00f5endi string",
+                    "port": ""
+                },
+                "description": "Seadista oma BSB-Lan seadme sidumine Home Assistant'iga.",
+                "title": "\u00dchendu BSB-Lan seadmega"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/bsblan/translations/fr.json b/homeassistant/components/bsblan/translations/fr.json
index 48b235aa177..1b912eaa93b 100644
--- a/homeassistant/components/bsblan/translations/fr.json
+++ b/homeassistant/components/bsblan/translations/fr.json
@@ -4,6 +4,7 @@
             "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "Impossible de se connecter \u00e0 l'appareil BSB-Lan."
         },
         "flow_title": "BSB-Lan: {name}",
diff --git a/homeassistant/components/bsblan/translations/it.json b/homeassistant/components/bsblan/translations/it.json
index 421a5ad975a..2ff7f173d17 100644
--- a/homeassistant/components/bsblan/translations/it.json
+++ b/homeassistant/components/bsblan/translations/it.json
@@ -4,6 +4,7 @@
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi al dispositivo BSB-Lan."
         },
         "flow_title": "BSB-Lan: {name}",
diff --git a/homeassistant/components/bsblan/translations/lb.json b/homeassistant/components/bsblan/translations/lb.json
index d0558a112ae..ee8e54c7d24 100644
--- a/homeassistant/components/bsblan/translations/lb.json
+++ b/homeassistant/components/bsblan/translations/lb.json
@@ -4,6 +4,7 @@
             "already_configured": "Apparat ass scho konfigur\u00e9iert"
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbannen mam BSB-Lan Apparat."
         },
         "flow_title": "BSB-LAN: {name}",
diff --git a/homeassistant/components/bsblan/translations/nl.json b/homeassistant/components/bsblan/translations/nl.json
index c92ccbebb62..a9f769389c5 100644
--- a/homeassistant/components/bsblan/translations/nl.json
+++ b/homeassistant/components/bsblan/translations/nl.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/bsblan/translations/no.json b/homeassistant/components/bsblan/translations/no.json
index 040349997f4..2661c1d1d0e 100644
--- a/homeassistant/components/bsblan/translations/no.json
+++ b/homeassistant/components/bsblan/translations/no.json
@@ -4,20 +4,21 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kunne ikke koble til BSB-Lan-enheten."
         },
-        "flow_title": "BSB-Lan: {name}",
+        "flow_title": "",
         "step": {
             "user": {
                 "data": {
                     "host": "Vert",
                     "passkey": "Tilgangsn\u00f8kkel streng",
-                    "port": ""
+                    "port": "Port"
                 },
                 "description": "Konfigurer din BSB-Lan-enhet for \u00e5 integrere med Home Assistant.",
                 "title": "Koble til BSB-Lan-enheten"
             }
         }
     },
-    "title": "BSB-Lan"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/bsblan/translations/pl.json b/homeassistant/components/bsblan/translations/pl.json
index d8a30744659..d4039c92f28 100644
--- a/homeassistant/components/bsblan/translations/pl.json
+++ b/homeassistant/components/bsblan/translations/pl.json
@@ -4,7 +4,8 @@
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z urz\u0105dzeniem BSB_LAN."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z urz\u0105dzeniem BSB_LAN"
         },
         "flow_title": "BSB-Lan: {name}",
         "step": {
@@ -14,7 +15,7 @@
                     "passkey": "Ci\u0105g klucza dost\u0119pu",
                     "port": "Port"
                 },
-                "description": "Konfiguracja urz\u0105dzenia BSB-LAN w celu integracji z Home Assistantem.",
+                "description": "Konfiguracja urz\u0105dzenia BSB-LAN w celu integracji z Home Assistant.",
                 "title": "Po\u0142\u0105czenie z urz\u0105dzeniem BSB-Lan"
             }
         }
diff --git a/homeassistant/components/bsblan/translations/ru.json b/homeassistant/components/bsblan/translations/ru.json
index 60d0ad4b653..3d4009abb7b 100644
--- a/homeassistant/components/bsblan/translations/ru.json
+++ b/homeassistant/components/bsblan/translations/ru.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
         },
         "flow_title": "BSB-Lan: {name}",
diff --git a/homeassistant/components/bsblan/translations/zh-Hans.json b/homeassistant/components/bsblan/translations/zh-Hans.json
new file mode 100644
index 00000000000..2941dfd9383
--- /dev/null
+++ b/homeassistant/components/bsblan/translations/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/bsblan/translations/zh-Hant.json b/homeassistant/components/bsblan/translations/zh-Hant.json
index 09f15ff84f8..81de5bf5365 100644
--- a/homeassistant/components/bsblan/translations/zh-Hant.json
+++ b/homeassistant/components/bsblan/translations/zh-Hant.json
@@ -4,6 +4,7 @@
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "BSB-Lan \u8a2d\u5099\u9023\u7dda\u5931\u6557\u3002"
         },
         "flow_title": "BSB-Lan\uff1a{name}",
diff --git a/homeassistant/components/buienradar/camera.py b/homeassistant/components/buienradar/camera.py
index 1bc0ee464db..44f86589b27 100644
--- a/homeassistant/components/buienradar/camera.py
+++ b/homeassistant/components/buienradar/camera.py
@@ -17,7 +17,7 @@ CONF_DIMENSION = "dimension"
 CONF_DELTA = "delta"
 CONF_COUNTRY = "country_code"
 
-_LOG = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(__name__)
 
 # Maximum range according to docs
 DIM_RANGE = vol.All(vol.Coerce(int), vol.Range(min=120, max=700))
@@ -29,9 +29,7 @@ PLATFORM_SCHEMA = vol.All(
     PLATFORM_SCHEMA.extend(
         {
             vol.Optional(CONF_DIMENSION, default=512): DIM_RANGE,
-            vol.Optional(CONF_DELTA, default=600.0): vol.All(
-                vol.Coerce(float), vol.Range(min=0)
-            ),
+            vol.Optional(CONF_DELTA, default=600.0): cv.positive_float,
             vol.Optional(CONF_NAME, default="Buienradar loop"): cv.string,
             vol.Optional(CONF_COUNTRY, default="NL"): vol.All(
                 vol.Coerce(str), vol.In(SUPPORTED_COUNTRY_CODES)
@@ -127,7 +125,7 @@ class BuienradarCam(Camera):
                 res.raise_for_status()
 
                 if res.status == 304:
-                    _LOG.debug("HTTP 304 - success")
+                    _LOGGER.debug("HTTP 304 - success")
                     return True
 
                 last_modified = res.headers.get("Last-Modified")
@@ -135,11 +133,11 @@ class BuienradarCam(Camera):
                     self._last_modified = last_modified
 
                 self._last_image = await res.read()
-                _LOG.debug("HTTP 200 - Last-Modified: %s", last_modified)
+                _LOGGER.debug("HTTP 200 - Last-Modified: %s", last_modified)
 
                 return True
         except (asyncio.TimeoutError, aiohttp.ClientError) as err:
-            _LOG.error("Failed to fetch image, %s", type(err))
+            _LOGGER.error("Failed to fetch image, %s", type(err))
             return False
 
     async def async_camera_image(self) -> Optional[bytes]:
@@ -168,7 +166,7 @@ class BuienradarCam(Camera):
         async with self._condition:
             # can not be tested - mocked http response returns immediately
             if self._loading:
-                _LOG.debug("already loading - waiting for notification")
+                _LOGGER.debug("already loading - waiting for notification")
                 await self._condition.wait()
                 return self._last_image
 
diff --git a/homeassistant/components/caldav/calendar.py b/homeassistant/components/caldav/calendar.py
index 1f1de734a8f..7abb0ad8444 100644
--- a/homeassistant/components/caldav/calendar.py
+++ b/homeassistant/components/caldav/calendar.py
@@ -167,7 +167,7 @@ class WebDavCalendarData:
     async def async_get_events(self, hass, start_date, end_date):
         """Get all events in a specific time frame."""
         # Get event list from the current calendar
-        vevent_list = await hass.async_add_job(
+        vevent_list = await hass.async_add_executor_job(
             self.calendar.date_search, start_date, end_date
         )
         event_list = []
diff --git a/homeassistant/components/calendar/__init__.py b/homeassistant/components/calendar/__init__.py
index c0e94defae5..478dafb3423 100644
--- a/homeassistant/components/calendar/__init__.py
+++ b/homeassistant/components/calendar/__init__.py
@@ -2,6 +2,7 @@
 from datetime import timedelta
 import logging
 import re
+from typing import Dict, List, cast
 
 from aiohttp import web
 
@@ -43,6 +44,16 @@ async def async_setup(hass, config):
     return True
 
 
+async def async_setup_entry(hass, entry):
+    """Set up a config entry."""
+    return await hass.data[DOMAIN].async_setup_entry(entry)
+
+
+async def async_unload_entry(hass, entry):
+    """Unload a config entry."""
+    return await hass.data[DOMAIN].async_unload_entry(entry)
+
+
 def get_date(date):
     """Get the dateTime from date or dateTime as a local."""
     if "date" in date:
@@ -207,10 +218,10 @@ class CalendarListView(http.HomeAssistantView):
     async def get(self, request: web.Request) -> web.Response:
         """Retrieve calendar list."""
         hass = request.app["hass"]
-        calendar_list = []
+        calendar_list: List[Dict[str, str]] = []
 
         for entity in self.component.entities:
             state = hass.states.get(entity.entity_id)
             calendar_list.append({"name": state.name, "entity_id": entity.entity_id})
 
-        return self.json(sorted(calendar_list, key=lambda x: x["name"]))
+        return self.json(sorted(calendar_list, key=lambda x: cast(str, x["name"])))
diff --git a/homeassistant/components/calendar/translations/cs.json b/homeassistant/components/calendar/translations/cs.json
index 315c67b0703..289c8ac1c6c 100644
--- a/homeassistant/components/calendar/translations/cs.json
+++ b/homeassistant/components/calendar/translations/cs.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed"
+            "off": "Vypnuto",
+            "on": "Zapnuto"
         }
     },
     "title": "Kalend\u00e1\u0159"
diff --git a/homeassistant/components/calendar/translations/pl.json b/homeassistant/components/calendar/translations/pl.json
index 94ac2fd244d..b9106249175 100644
--- a/homeassistant/components/calendar/translations/pl.json
+++ b/homeassistant/components/calendar/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "Kalendarz"
diff --git a/homeassistant/components/camera/translations/cs.json b/homeassistant/components/camera/translations/cs.json
index 3a310779d79..fcd1ca7b8d0 100644
--- a/homeassistant/components/camera/translations/cs.json
+++ b/homeassistant/components/camera/translations/cs.json
@@ -2,8 +2,8 @@
     "state": {
         "_": {
             "idle": "Ne\u010dinn\u00fd",
-            "recording": "Z\u00e1znam",
-            "streaming": "Streamov\u00e1n\u00ed"
+            "recording": "Nahr\u00e1v\u00e1 se",
+            "streaming": "Streamuje"
         }
     },
     "title": "Kamera"
diff --git a/homeassistant/components/canary/__init__.py b/homeassistant/components/canary/__init__.py
index 06f4134e24e..64f2d00735e 100644
--- a/homeassistant/components/canary/__init__.py
+++ b/homeassistant/components/canary/__init__.py
@@ -13,16 +13,16 @@ from homeassistant.const import CONF_PASSWORD, CONF_TIMEOUT, CONF_USERNAME
 from homeassistant.exceptions import ConfigEntryNotReady
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import HomeAssistantType
-from homeassistant.util import Throttle
 
 from .const import (
     CONF_FFMPEG_ARGUMENTS,
-    DATA_CANARY,
+    DATA_COORDINATOR,
     DATA_UNDO_UPDATE_LISTENER,
     DEFAULT_FFMPEG_ARGUMENTS,
     DEFAULT_TIMEOUT,
     DOMAIN,
 )
+from .coordinator import CanaryDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -89,17 +89,21 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
         hass.config_entries.async_update_entry(entry, options=options)
 
     try:
-        canary_data = await hass.async_add_executor_job(
-            _get_canary_data_instance, entry
-        )
+        canary_api = await hass.async_add_executor_job(_get_canary_api_instance, entry)
     except (ConnectTimeout, HTTPError) as error:
         _LOGGER.error("Unable to connect to Canary service: %s", str(error))
         raise ConfigEntryNotReady from error
 
+    coordinator = CanaryDataUpdateCoordinator(hass, api=canary_api)
+    await coordinator.async_refresh()
+
+    if not coordinator.last_update_success:
+        raise ConfigEntryNotReady
+
     undo_listener = entry.add_update_listener(_async_update_listener)
 
     hass.data[DOMAIN][entry.entry_id] = {
-        DATA_CANARY: canary_data,
+        DATA_COORDINATOR: coordinator,
         DATA_UNDO_UPDATE_LISTENER: undo_listener,
     }
 
@@ -134,77 +138,12 @@ async def _async_update_listener(hass: HomeAssistantType, entry: ConfigEntry) ->
     await hass.config_entries.async_reload(entry.entry_id)
 
 
-class CanaryData:
-    """Manages the data retrieved from Canary API."""
-
-    def __init__(self, api: Api):
-        """Init the Canary data object."""
-        self._api = api
-        self._locations_by_id = {}
-        self._readings_by_device_id = {}
-
-    @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    def update(self, **kwargs):
-        """Get the latest data from py-canary with a throttle."""
-        self._update(**kwargs)
-
-    def _update(self, **kwargs):
-        """Get the latest data from py-canary."""
-        for location in self._api.get_locations():
-            location_id = location.location_id
-
-            self._locations_by_id[location_id] = location
-
-            for device in location.devices:
-                if device.is_online:
-                    self._readings_by_device_id[
-                        device.device_id
-                    ] = self._api.get_latest_readings(device.device_id)
-
-    @property
-    def locations(self):
-        """Return a list of locations."""
-        return self._locations_by_id.values()
-
-    def get_location(self, location_id):
-        """Return a location based on location_id."""
-        return self._locations_by_id.get(location_id, [])
-
-    def get_readings(self, device_id):
-        """Return a list of readings based on device_id."""
-        return self._readings_by_device_id.get(device_id, [])
-
-    def get_reading(self, device_id, sensor_type):
-        """Return reading for device_id and sensor type."""
-        readings = self._readings_by_device_id.get(device_id, [])
-        return next(
-            (
-                reading.value
-                for reading in readings
-                if reading.sensor_type == sensor_type
-            ),
-            None,
-        )
-
-    def set_location_mode(self, location_id, mode_name, is_private=False):
-        """Set location mode."""
-        self._api.set_location_mode(location_id, mode_name, is_private)
-        self.update(no_throttle=True)
-
-    def get_live_stream_session(self, device):
-        """Return live stream session."""
-        return self._api.get_live_stream_session(device)
-
-
-def _get_canary_data_instance(entry: ConfigEntry) -> CanaryData:
-    """Initialize a new instance of CanaryData."""
+def _get_canary_api_instance(entry: ConfigEntry) -> Api:
+    """Initialize a new instance of CanaryApi."""
     canary = Api(
         entry.data[CONF_USERNAME],
         entry.data[CONF_PASSWORD],
         entry.options.get(CONF_TIMEOUT, DEFAULT_TIMEOUT),
     )
 
-    canary_data = CanaryData(canary)
-    canary_data.update()
-
-    return canary_data
+    return canary
diff --git a/homeassistant/components/canary/alarm_control_panel.py b/homeassistant/components/canary/alarm_control_panel.py
index 8d2b01fd5da..e4dda0f9f33 100644
--- a/homeassistant/components/canary/alarm_control_panel.py
+++ b/homeassistant/components/canary/alarm_control_panel.py
@@ -1,5 +1,4 @@
 """Support for Canary alarm."""
-import logging
 from typing import Callable, List
 
 from canary.api import LOCATION_MODE_AWAY, LOCATION_MODE_HOME, LOCATION_MODE_NIGHT
@@ -19,11 +18,10 @@ from homeassistant.const import (
 )
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import CanaryData
-from .const import DATA_CANARY, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
+from .const import DATA_COORDINATOR, DOMAIN
+from .coordinator import CanaryDataUpdateCoordinator
 
 
 async def async_setup_entry(
@@ -32,25 +30,35 @@ async def async_setup_entry(
     async_add_entities: Callable[[List[Entity], bool], None],
 ) -> None:
     """Set up Canary alarm control panels based on a config entry."""
-    data: CanaryData = hass.data[DOMAIN][entry.entry_id][DATA_CANARY]
-    alarms = [CanaryAlarm(data, location.location_id) for location in data.locations]
+    coordinator: CanaryDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
+        DATA_COORDINATOR
+    ]
+    alarms = [
+        CanaryAlarm(coordinator, location)
+        for location_id, location in coordinator.data["locations"].items()
+    ]
 
     async_add_entities(alarms, True)
 
 
-class CanaryAlarm(AlarmControlPanelEntity):
+class CanaryAlarm(CoordinatorEntity, AlarmControlPanelEntity):
     """Representation of a Canary alarm control panel."""
 
-    def __init__(self, data, location_id):
+    def __init__(self, coordinator, location):
         """Initialize a Canary security camera."""
-        self._data = data
-        self._location_id = location_id
+        super().__init__(coordinator)
+        self._location_id = location.location_id
+        self._location_name = location.name
+
+    @property
+    def location(self):
+        """Return information about the location."""
+        return self.coordinator.data["locations"][self._location_id]
 
     @property
     def name(self):
         """Return the name of the alarm."""
-        location = self._data.get_location(self._location_id)
-        return location.name
+        return self._location_name
 
     @property
     def unique_id(self):
@@ -60,18 +68,17 @@ class CanaryAlarm(AlarmControlPanelEntity):
     @property
     def state(self):
         """Return the state of the device."""
-        location = self._data.get_location(self._location_id)
-
-        if location.is_private:
+        if self.location.is_private:
             return STATE_ALARM_DISARMED
 
-        mode = location.mode
+        mode = self.location.mode
         if mode.name == LOCATION_MODE_AWAY:
             return STATE_ALARM_ARMED_AWAY
         if mode.name == LOCATION_MODE_HOME:
             return STATE_ALARM_ARMED_HOME
         if mode.name == LOCATION_MODE_NIGHT:
             return STATE_ALARM_ARMED_NIGHT
+
         return None
 
     @property
@@ -82,26 +89,24 @@ class CanaryAlarm(AlarmControlPanelEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        location = self._data.get_location(self._location_id)
-        return {"private": location.is_private}
+        return {"private": self.location.is_private}
 
     def alarm_disarm(self, code=None):
         """Send disarm command."""
-        location = self._data.get_location(self._location_id)
-        self._data.set_location_mode(self._location_id, location.mode.name, True)
+        self.coordinator.canary.set_location_mode(
+            self._location_id, self.location.mode.name, True
+        )
 
     def alarm_arm_home(self, code=None):
         """Send arm home command."""
-        self._data.set_location_mode(self._location_id, LOCATION_MODE_HOME)
+        self.coordinator.canary.set_location_mode(self._location_id, LOCATION_MODE_HOME)
 
     def alarm_arm_away(self, code=None):
         """Send arm away command."""
-        self._data.set_location_mode(self._location_id, LOCATION_MODE_AWAY)
+        self.coordinator.canary.set_location_mode(self._location_id, LOCATION_MODE_AWAY)
 
     def alarm_arm_night(self, code=None):
         """Send arm night command."""
-        self._data.set_location_mode(self._location_id, LOCATION_MODE_NIGHT)
-
-    def update(self):
-        """Get the latest state of the sensor."""
-        self._data.update()
+        self.coordinator.canary.set_location_mode(
+            self._location_id, LOCATION_MODE_NIGHT
+        )
diff --git a/homeassistant/components/canary/camera.py b/homeassistant/components/canary/camera.py
index 1cc7a535344..608dfe02b8a 100644
--- a/homeassistant/components/canary/camera.py
+++ b/homeassistant/components/canary/camera.py
@@ -1,7 +1,6 @@
 """Support for Canary camera."""
 import asyncio
 from datetime import timedelta
-import logging
 from typing import Callable, List
 
 from haffmpeg.camera import CameraMjpeg
@@ -15,19 +14,18 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util import Throttle
 
-from . import CanaryData
 from .const import (
     CONF_FFMPEG_ARGUMENTS,
-    DATA_CANARY,
+    DATA_COORDINATOR,
     DEFAULT_FFMPEG_ARGUMENTS,
     DEFAULT_TIMEOUT,
     DOMAIN,
     MANUFACTURER,
 )
-
-_LOGGER = logging.getLogger(__name__)
+from .coordinator import CanaryDataUpdateCoordinator
 
 MIN_TIME_BETWEEN_SESSION_RENEW = timedelta(seconds=90)
 
@@ -49,21 +47,22 @@ async def async_setup_entry(
     async_add_entities: Callable[[List[Entity], bool], None],
 ) -> None:
     """Set up Canary sensors based on a config entry."""
-    data: CanaryData = hass.data[DOMAIN][entry.entry_id][DATA_CANARY]
-
+    coordinator: CanaryDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
+        DATA_COORDINATOR
+    ]
     ffmpeg_arguments = entry.options.get(
         CONF_FFMPEG_ARGUMENTS, DEFAULT_FFMPEG_ARGUMENTS
     )
     cameras = []
 
-    for location in data.locations:
+    for location_id, location in coordinator.data["locations"].items():
         for device in location.devices:
             if device.is_online:
                 cameras.append(
                     CanaryCamera(
                         hass,
-                        data,
-                        location,
+                        coordinator,
+                        location_id,
                         device,
                         DEFAULT_TIMEOUT,
                         ffmpeg_arguments,
@@ -73,17 +72,15 @@ async def async_setup_entry(
     async_add_entities(cameras, True)
 
 
-class CanaryCamera(Camera):
+class CanaryCamera(CoordinatorEntity, Camera):
     """An implementation of a Canary security camera."""
 
-    def __init__(self, hass, data, location, device, timeout, ffmpeg_args):
+    def __init__(self, hass, coordinator, location_id, device, timeout, ffmpeg_args):
         """Initialize a Canary security camera."""
-        super().__init__()
-
+        super().__init__(coordinator)
         self._ffmpeg = hass.data[DATA_FFMPEG]
         self._ffmpeg_arguments = ffmpeg_args
-        self._data = data
-        self._location = location
+        self._location_id = location_id
         self._device = device
         self._device_id = device.device_id
         self._device_name = device.name
@@ -91,6 +88,11 @@ class CanaryCamera(Camera):
         self._timeout = timeout
         self._live_stream_session = None
 
+    @property
+    def location(self):
+        """Return information about the location."""
+        return self.coordinator.data["locations"][self._location_id]
+
     @property
     def name(self):
         """Return the name of this device."""
@@ -114,12 +116,12 @@ class CanaryCamera(Camera):
     @property
     def is_recording(self):
         """Return true if the device is recording."""
-        return self._location.is_recording
+        return self.location.is_recording
 
     @property
     def motion_detection_enabled(self):
         """Return the camera motion detection status."""
-        return not self._location.is_recording
+        return not self.location.is_recording
 
     async def async_camera_image(self):
         """Return a still image response from the camera."""
@@ -159,4 +161,6 @@ class CanaryCamera(Camera):
     @Throttle(MIN_TIME_BETWEEN_SESSION_RENEW)
     def renew_live_stream_session(self):
         """Renew live stream session."""
-        self._live_stream_session = self._data.get_live_stream_session(self._device)
+        self._live_stream_session = self.coordinator.canary.get_live_stream_session(
+            self._device
+        )
diff --git a/homeassistant/components/canary/const.py b/homeassistant/components/canary/const.py
index e6e3dbb73c9..8219a485ef9 100644
--- a/homeassistant/components/canary/const.py
+++ b/homeassistant/components/canary/const.py
@@ -8,7 +8,7 @@ MANUFACTURER = "Canary Connect, Inc"
 CONF_FFMPEG_ARGUMENTS = "ffmpeg_arguments"
 
 # Data
-DATA_CANARY = "canary"
+DATA_COORDINATOR = "coordinator"
 DATA_UNDO_UPDATE_LISTENER = "undo_update_listener"
 
 # Defaults
diff --git a/homeassistant/components/canary/coordinator.py b/homeassistant/components/canary/coordinator.py
new file mode 100644
index 00000000000..650bc3d70ea
--- /dev/null
+++ b/homeassistant/components/canary/coordinator.py
@@ -0,0 +1,59 @@
+"""Provides the Canary DataUpdateCoordinator."""
+from datetime import timedelta
+import logging
+
+from async_timeout import timeout
+from canary.api import Api
+from requests import ConnectTimeout, HTTPError
+
+from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class CanaryDataUpdateCoordinator(DataUpdateCoordinator):
+    """Class to manage fetching Canary data."""
+
+    def __init__(self, hass: HomeAssistantType, *, api: Api):
+        """Initialize global Canary data updater."""
+        self.canary = api
+        update_interval = timedelta(seconds=30)
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
+
+    def _update_data(self) -> dict:
+        """Fetch data from Canary via sync functions."""
+        locations_by_id = {}
+        readings_by_device_id = {}
+
+        for location in self.canary.get_locations():
+            location_id = location.location_id
+            locations_by_id[location_id] = location
+
+            for device in location.devices:
+                if device.is_online:
+                    readings_by_device_id[
+                        device.device_id
+                    ] = self.canary.get_latest_readings(device.device_id)
+
+        return {
+            "locations": locations_by_id,
+            "readings": readings_by_device_id,
+        }
+
+    async def _async_update_data(self) -> dict:
+        """Fetch data from Canary."""
+
+        try:
+            async with timeout(15):
+                return await self.hass.async_add_executor_job(self._update_data)
+        except (ConnectTimeout, HTTPError) as error:
+            raise UpdateFailed(f"Invalid response from API: {error}") from error
diff --git a/homeassistant/components/canary/sensor.py b/homeassistant/components/canary/sensor.py
index acf44457cbf..99dcdf48fce 100644
--- a/homeassistant/components/canary/sensor.py
+++ b/homeassistant/components/canary/sensor.py
@@ -10,13 +10,15 @@ from homeassistant.const import (
     DEVICE_CLASS_SIGNAL_STRENGTH,
     DEVICE_CLASS_TEMPERATURE,
     PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     TEMP_CELSIUS,
 )
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import CanaryData
-from .const import DATA_CANARY, DOMAIN, MANUFACTURER
+from .const import DATA_COORDINATOR, DOMAIN, MANUFACTURER
+from .coordinator import CanaryDataUpdateCoordinator
 
 SENSOR_VALUE_PRECISION = 2
 ATTR_AIR_QUALITY = "air_quality"
@@ -34,7 +36,13 @@ SENSOR_TYPES = [
     ["temperature", TEMP_CELSIUS, None, DEVICE_CLASS_TEMPERATURE, [CANARY_PRO]],
     ["humidity", PERCENTAGE, None, DEVICE_CLASS_HUMIDITY, [CANARY_PRO]],
     ["air_quality", None, "mdi:weather-windy", None, [CANARY_PRO]],
-    ["wifi", "dBm", None, DEVICE_CLASS_SIGNAL_STRENGTH, [CANARY_FLEX]],
+    [
+        "wifi",
+        SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        None,
+        DEVICE_CLASS_SIGNAL_STRENGTH,
+        [CANARY_FLEX],
+    ],
     ["battery", PERCENTAGE, None, DEVICE_CLASS_BATTERY, [CANARY_FLEX]],
 ]
 
@@ -49,37 +57,71 @@ async def async_setup_entry(
     async_add_entities: Callable[[List[Entity], bool], None],
 ) -> None:
     """Set up Canary sensors based on a config entry."""
-    data: CanaryData = hass.data[DOMAIN][entry.entry_id][DATA_CANARY]
+    coordinator: CanaryDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
+        DATA_COORDINATOR
+    ]
     sensors = []
 
-    for location in data.locations:
+    for location in coordinator.data["locations"].values():
         for device in location.devices:
             if device.is_online:
                 device_type = device.device_type
                 for sensor_type in SENSOR_TYPES:
                     if device_type.get("name") in sensor_type[4]:
                         sensors.append(
-                            CanarySensor(data, sensor_type, location, device)
+                            CanarySensor(coordinator, sensor_type, location, device)
                         )
 
     async_add_entities(sensors, True)
 
 
-class CanarySensor(Entity):
+class CanarySensor(CoordinatorEntity, Entity):
     """Representation of a Canary sensor."""
 
-    def __init__(self, data, sensor_type, location, device):
+    def __init__(self, coordinator, sensor_type, location, device):
         """Initialize the sensor."""
-        self._data = data
+        super().__init__(coordinator)
         self._sensor_type = sensor_type
         self._device_id = device.device_id
         self._device_name = device.name
         self._device_type_name = device.device_type["name"]
-        self._sensor_value = None
 
         sensor_type_name = sensor_type[0].replace("_", " ").title()
         self._name = f"{location.name} {device.name} {sensor_type_name}"
 
+        canary_sensor_type = None
+        if self._sensor_type[0] == "air_quality":
+            canary_sensor_type = SensorType.AIR_QUALITY
+        elif self._sensor_type[0] == "temperature":
+            canary_sensor_type = SensorType.TEMPERATURE
+        elif self._sensor_type[0] == "humidity":
+            canary_sensor_type = SensorType.HUMIDITY
+        elif self._sensor_type[0] == "wifi":
+            canary_sensor_type = SensorType.WIFI
+        elif self._sensor_type[0] == "battery":
+            canary_sensor_type = SensorType.BATTERY
+
+        self._canary_type = canary_sensor_type
+
+    @property
+    def reading(self):
+        """Return the device sensor reading."""
+        readings = self.coordinator.data["readings"][self._device_id]
+
+        value = next(
+            (
+                reading.value
+                for reading in readings
+                if reading.sensor_type == self._canary_type
+            ),
+            None,
+        )
+
+        if value is not None:
+            return round(float(value), SENSOR_VALUE_PRECISION)
+
+        return None
+
     @property
     def name(self):
         """Return the name of the Canary sensor."""
@@ -88,7 +130,7 @@ class CanarySensor(Entity):
     @property
     def state(self):
         """Return the state of the sensor."""
-        return self._sensor_value
+        return self.reading
 
     @property
     def unique_id(self):
@@ -123,36 +165,17 @@ class CanarySensor(Entity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        if self._sensor_type[0] == "air_quality" and self._sensor_value is not None:
+        reading = self.reading
+
+        if self._sensor_type[0] == "air_quality" and reading is not None:
             air_quality = None
-            if self._sensor_value <= 0.4:
+            if reading <= 0.4:
                 air_quality = STATE_AIR_QUALITY_VERY_ABNORMAL
-            elif self._sensor_value <= 0.59:
+            elif reading <= 0.59:
                 air_quality = STATE_AIR_QUALITY_ABNORMAL
-            elif self._sensor_value <= 1.0:
+            elif reading <= 1.0:
                 air_quality = STATE_AIR_QUALITY_NORMAL
 
             return {ATTR_AIR_QUALITY: air_quality}
 
         return None
-
-    def update(self):
-        """Get the latest state of the sensor."""
-        self._data.update()
-
-        canary_sensor_type = None
-        if self._sensor_type[0] == "air_quality":
-            canary_sensor_type = SensorType.AIR_QUALITY
-        elif self._sensor_type[0] == "temperature":
-            canary_sensor_type = SensorType.TEMPERATURE
-        elif self._sensor_type[0] == "humidity":
-            canary_sensor_type = SensorType.HUMIDITY
-        elif self._sensor_type[0] == "wifi":
-            canary_sensor_type = SensorType.WIFI
-        elif self._sensor_type[0] == "battery":
-            canary_sensor_type = SensorType.BATTERY
-
-        value = self._data.get_reading(self._device_id, canary_sensor_type)
-
-        if value is not None:
-            self._sensor_value = round(float(value), SENSOR_VALUE_PRECISION)
diff --git a/homeassistant/components/canary/translations/cs.json b/homeassistant/components/canary/translations/cs.json
new file mode 100644
index 00000000000..5b883f253be
--- /dev/null
+++ b/homeassistant/components/canary/translations/cs.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace.",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "flow_title": "Canary: {name}",
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "title": "P\u0159ipojen\u00ed k Canary"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "timeout": "\u010casov\u00fd limit po\u017eadavku (v sekund\u00e1ch)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/canary/translations/el.json b/homeassistant/components/canary/translations/el.json
index 2cf87db92a3..6b11d642829 100644
--- a/homeassistant/components/canary/translations/el.json
+++ b/homeassistant/components/canary/translations/el.json
@@ -1,10 +1,31 @@
 {
     "config": {
         "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae.",
             "unknown": "\u0391\u03c0\u03c1\u03cc\u03c3\u03bc\u03b5\u03bd\u03bf \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1"
         },
         "error": {
             "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        },
+        "flow_title": "Canary: {name}",
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
+                    "username": "\u038c\u03bd\u03bf\u03bc\u03b1 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7"
+                },
+                "title": "\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03c3\u03c4\u03bf Canary"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "ffmpeg_arguments": "\u03a4\u03b1 \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03b7\u03c1\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac \u03c0\u03bf\u03c5 \u03b4\u03b9\u03b1\u03b2\u03b9\u03b2\u03ac\u03c3\u03c4\u03b7\u03ba\u03b1\u03bd \u03c3\u03c4\u03bf ffmpeg \u03b3\u03b9\u03b1 \u03ba\u03ac\u03bc\u03b5\u03c1\u03b5\u03c2",
+                    "timeout": "\u0391\u03af\u03c4\u03b7\u03bc\u03b1 \u03c7\u03c1\u03bf\u03bd\u03b9\u03ba\u03bf\u03cd \u03bf\u03c1\u03af\u03bf\u03c5 (\u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03b1)"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/canary/translations/es.json b/homeassistant/components/canary/translations/es.json
index 1b881d4dcd2..018a1f30b08 100644
--- a/homeassistant/components/canary/translations/es.json
+++ b/homeassistant/components/canary/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n.",
             "unknown": "Error inesperado"
         },
         "error": {
diff --git a/homeassistant/components/canary/translations/et.json b/homeassistant/components/canary/translations/et.json
index cc6601e6cc5..1d30b9efe9e 100644
--- a/homeassistant/components/canary/translations/et.json
+++ b/homeassistant/components/canary/translations/et.json
@@ -1,7 +1,11 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine.",
+            "unknown": "Tundmatu viga"
+        },
         "error": {
-            "cannot_connect": "\u00dchendus nurjus"
+            "cannot_connect": "\u00dchendamine nurjus"
         },
         "flow_title": "Canary {name}",
         "step": {
@@ -9,7 +13,8 @@
                 "data": {
                     "password": "Salas\u00f5na",
                     "username": "Kasutajanimi"
-                }
+                },
+                "title": "Loo \u00fchendus Canary-iga"
             }
         }
     },
@@ -17,6 +22,7 @@
         "step": {
             "init": {
                 "data": {
+                    "ffmpeg_arguments": "Kaamerate jaoks edastavad argumendid (ffmpeg)",
                     "timeout": "P\u00e4ringu ajal\u00f5pp (sekundites)"
                 }
             }
diff --git a/homeassistant/components/canary/translations/no.json b/homeassistant/components/canary/translations/no.json
index 1de0a59b206..0c60c44d4ab 100644
--- a/homeassistant/components/canary/translations/no.json
+++ b/homeassistant/components/canary/translations/no.json
@@ -5,7 +5,7 @@
             "unknown": "Uventet feil"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "flow_title": "Canary: {name}",
         "step": {
diff --git a/homeassistant/components/canary/translations/pl.json b/homeassistant/components/canary/translations/pl.json
index 1d8bfdf512d..1da4db78731 100644
--- a/homeassistant/components/canary/translations/pl.json
+++ b/homeassistant/components/canary/translations/pl.json
@@ -7,11 +7,23 @@
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
+        "flow_title": "Canary: {name}",
         "step": {
             "user": {
                 "data": {
                     "password": "Has\u0142o",
                     "username": "Nazwa u\u017cytkownika"
+                },
+                "title": "Po\u0142\u0105czenie z Canary"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "ffmpeg_arguments": "Argumenty przekazane do ffmpeg dla kamer",
+                    "timeout": "Limit czasu \u017c\u0105dania (w sekundach)"
                 }
             }
         }
diff --git a/homeassistant/components/canary/translations/zh-Hans.json b/homeassistant/components/canary/translations/zh-Hans.json
new file mode 100644
index 00000000000..b0b26b02261
--- /dev/null
+++ b/homeassistant/components/canary/translations/zh-Hans.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u5bc6\u7801",
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/cast/manifest.json b/homeassistant/components/cast/manifest.json
index 03412d3b6df..3a795b60420 100644
--- a/homeassistant/components/cast/manifest.json
+++ b/homeassistant/components/cast/manifest.json
@@ -3,8 +3,8 @@
   "name": "Google Cast",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/cast",
-  "requirements": ["pychromecast==7.5.0"],
-  "after_dependencies": ["cloud", "http", "media_source", "tts", "zeroconf"],
+  "requirements": ["pychromecast==7.5.1"],
+  "after_dependencies": ["cloud", "http", "media_source", "plex", "tts", "zeroconf"],
   "zeroconf": ["_googlecast._tcp.local."],
   "codeowners": ["@emontnemery"]
 }
diff --git a/homeassistant/components/cast/media_player.py b/homeassistant/components/cast/media_player.py
index 76b6bd17f40..97956965b66 100644
--- a/homeassistant/components/cast/media_player.py
+++ b/homeassistant/components/cast/media_player.py
@@ -9,6 +9,7 @@ from typing import Optional
 import pychromecast
 from pychromecast.controllers.homeassistant import HomeAssistantController
 from pychromecast.controllers.multizone import MultizoneManager
+from pychromecast.controllers.plex import PlexController
 from pychromecast.quick_play import quick_play
 from pychromecast.socket_client import (
     CONNECTION_STATUS_CONNECTED,
@@ -19,7 +20,7 @@ import voluptuous as vol
 from homeassistant.auth.models import RefreshToken
 from homeassistant.components import media_source, zeroconf
 from homeassistant.components.http.auth import async_sign_path
-from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerEntity
+from homeassistant.components.media_player import MediaPlayerEntity
 from homeassistant.components.media_player.const import (
     ATTR_MEDIA_EXTRA,
     MEDIA_TYPE_MOVIE,
@@ -38,8 +39,9 @@ from homeassistant.components.media_player.const import (
     SUPPORT_VOLUME_MUTE,
     SUPPORT_VOLUME_SET,
 )
+from homeassistant.components.plex.const import PLEX_URI_SCHEME
+from homeassistant.components.plex.services import lookup_plex_media
 from homeassistant.const import (
-    CONF_HOST,
     EVENT_HOMEASSISTANT_STOP,
     STATE_IDLE,
     STATE_OFF,
@@ -58,7 +60,6 @@ from homeassistant.util.logging import async_create_catching_coro
 from .const import (
     ADDED_CAST_DEVICES_KEY,
     CAST_MULTIZONE_MANAGER_KEY,
-    DEFAULT_PORT,
     DOMAIN as CAST_DOMAIN,
     KNOWN_CHROMECAST_INFO_KEY,
     SIGNAL_CAST_DISCOVERED,
@@ -86,22 +87,9 @@ SUPPORT_CAST = (
 
 
 ENTITY_SCHEMA = vol.All(
-    cv.deprecated(CONF_HOST),
     vol.Schema(
         {
-            vol.Exclusive(CONF_HOST, "device_identifier"): cv.string,
-            vol.Exclusive(CONF_UUID, "device_identifier"): cv.string,
-            vol.Optional(CONF_IGNORE_CEC): vol.All(cv.ensure_list, [cv.string]),
-        }
-    ),
-)
-
-PLATFORM_SCHEMA = vol.All(
-    cv.deprecated(CONF_HOST),
-    PLATFORM_SCHEMA.extend(
-        {
-            vol.Exclusive(CONF_HOST, "device_identifier"): cv.string,
-            vol.Exclusive(CONF_UUID, "device_identifier"): cv.string,
+            vol.Optional(CONF_UUID): cv.string,
             vol.Optional(CONF_IGNORE_CEC): vol.All(cv.ensure_list, [cv.string]),
         }
     ),
@@ -130,21 +118,6 @@ def _async_create_cast_device(hass: HomeAssistantType, info: ChromecastInfo):
     return CastDevice(info)
 
 
-async def async_setup_platform(
-    hass: HomeAssistantType, config: ConfigType, async_add_entities, discovery_info=None
-):
-    """Set up the Cast platform.
-
-    Deprecated.
-    """
-    _LOGGER.warning(
-        "Setting configuration for Cast via platform is deprecated. "
-        "Configure via Cast integration instead."
-        "This option will become invalid in version 0.116"
-    )
-    await _async_setup_platform(hass, config, async_add_entities, discovery_info)
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up Cast from a config entry."""
     config = hass.data[CAST_DOMAIN].get("media_player") or {}
@@ -154,11 +127,11 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     # no pending task
     done, _ = await asyncio.wait(
         [
-            _async_setup_platform(hass, ENTITY_SCHEMA(cfg), async_add_entities, None)
+            _async_setup_platform(hass, ENTITY_SCHEMA(cfg), async_add_entities)
             for cfg in config
         ]
     )
-    if any([task.exception() for task in done]):
+    if any(task.exception() for task in done):
         exceptions = [task.exception() for task in done]
         for exception in exceptions:
             _LOGGER.debug("Failed to setup chromecast", exc_info=exception)
@@ -166,32 +139,24 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
 
 async def _async_setup_platform(
-    hass: HomeAssistantType, config: ConfigType, async_add_entities, discovery_info
+    hass: HomeAssistantType, config: ConfigType, async_add_entities
 ):
     """Set up the cast platform."""
     # Import CEC IGNORE attributes
     pychromecast.IGNORE_CEC += config.get(CONF_IGNORE_CEC, [])
     hass.data.setdefault(ADDED_CAST_DEVICES_KEY, set())
-    hass.data.setdefault(KNOWN_CHROMECAST_INFO_KEY, dict())
+    hass.data.setdefault(KNOWN_CHROMECAST_INFO_KEY, {})
 
     info = None
-    if discovery_info is not None:
-        info = ChromecastInfo(
-            host=discovery_info["host"], port=discovery_info["port"], services=None
-        )
-    elif CONF_UUID in config:
+    if CONF_UUID in config:
         info = ChromecastInfo(uuid=config[CONF_UUID], services=None)
-    elif CONF_HOST in config:
-        info = ChromecastInfo(host=config[CONF_HOST], port=DEFAULT_PORT, services=None)
 
     @callback
     def async_cast_discovered(discover: ChromecastInfo) -> None:
         """Handle discovery of a new chromecast."""
-        if info is not None and (
-            (info.uuid is not None and info.uuid != discover.uuid)
-            or (info.host is not None and info.host_port != discover.host_port)
-        ):
-            # Waiting for a specific cast device, this is not it.
+        # If info is set, we're handling a specific cast device identified by UUID
+        if info is not None and (info.uuid is not None and info.uuid != discover.uuid):
+            # UUID not matching, this is not it.
             return
 
         cast_device = _async_create_cast_device(hass, discover)
@@ -542,7 +507,7 @@ class CastDevice(MediaPlayerEntity):
             hass_url = get_url(self.hass, prefer_external=True)
             media_id = f"{hass_url}{media_id}"
 
-        await self.hass.async_add_job(
+        await self.hass.async_add_executor_job(
             ft.partial(self.play_media, media_type, media_id, **kwargs)
         )
 
@@ -574,6 +539,15 @@ class CastDevice(MediaPlayerEntity):
                 quick_play(self._chromecast, app_name, app_data)
             except NotImplementedError:
                 _LOGGER.error("App %s not supported", app_name)
+        # Handle plex
+        elif media_id and media_id.startswith(PLEX_URI_SCHEME):
+            media_id = media_id[len(PLEX_URI_SCHEME) :]
+            media, _ = lookup_plex_media(self.hass, media_type, media_id)
+            if media is None:
+                return
+            controller = PlexController()
+            self._chromecast.register_handler(controller)
+            controller.play_media(media)
         else:
             self._chromecast.media_controller.play_media(
                 media_id, media_type, **kwargs.get(ATTR_MEDIA_EXTRA, {})
diff --git a/homeassistant/components/cast/strings.json b/homeassistant/components/cast/strings.json
index aed62243f31..ad8f0f41ae7 100644
--- a/homeassistant/components/cast/strings.json
+++ b/homeassistant/components/cast/strings.json
@@ -2,12 +2,12 @@
   "config": {
     "step": {
       "confirm": {
-        "description": "Do you want to set up Google Cast?"
+        "description": "[%key:common::config_flow::description::confirm_setup%]"
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of Google Cast is necessary.",
-      "no_devices_found": "No Google Cast devices found on the network."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   }
 }
diff --git a/homeassistant/components/cast/translations/ca.json b/homeassistant/components/cast/translations/ca.json
index 02a2459fdc0..dc21c371e60 100644
--- a/homeassistant/components/cast/translations/ca.json
+++ b/homeassistant/components/cast/translations/ca.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No s'han trobat dispositius de Google Cast a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s cal una sola configuraci\u00f3 de Google Cast."
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "confirm": {
-                "description": "Vols configurar Google Cast?"
+                "description": "Vols comen\u00e7ar la configuraci\u00f3?"
             }
         }
     }
diff --git a/homeassistant/components/cast/translations/cs.json b/homeassistant/components/cast/translations/cs.json
index 3f67763b48b..d3f0e37a132 100644
--- a/homeassistant/components/cast/translations/cs.json
+++ b/homeassistant/components/cast/translations/cs.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "V s\u00edti nebyly nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed Google Cast.",
-            "single_instance_allowed": "Pouze jedin\u00e1 konfigurace Google Cast je nezbytn\u00e1."
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "step": {
             "confirm": {
-                "description": "Chcete nastavit Google Cast?"
+                "description": "Chcete za\u010d\u00edt nastavovat?"
             }
         }
     }
diff --git a/homeassistant/components/cast/translations/en.json b/homeassistant/components/cast/translations/en.json
index e06a94f700b..f05becffed3 100644
--- a/homeassistant/components/cast/translations/en.json
+++ b/homeassistant/components/cast/translations/en.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No Google Cast devices found on the network.",
-            "single_instance_allowed": "Only a single configuration of Google Cast is necessary."
+            "no_devices_found": "No devices found on the network",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "confirm": {
-                "description": "Do you want to set up Google Cast?"
+                "description": "Do you want to start set up?"
             }
         }
     }
diff --git a/homeassistant/components/cast/translations/es.json b/homeassistant/components/cast/translations/es.json
index 9b4efee18d5..520df7ee4cd 100644
--- a/homeassistant/components/cast/translations/es.json
+++ b/homeassistant/components/cast/translations/es.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No se encontraron dispositivos de Google Cast en la red.",
-            "single_instance_allowed": "S\u00f3lo es necesaria una \u00fanica configuraci\u00f3n de Google Cast."
+            "no_devices_found": "No se encontraron dispositivos en la red",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "step": {
             "confirm": {
-                "description": "\u00bfQuieres configurar Google Cast?"
+                "description": "\u00bfQuieres iniciar la configuraci\u00f3n?"
             }
         }
     }
diff --git a/homeassistant/components/cast/translations/it.json b/homeassistant/components/cast/translations/it.json
index 6e56218c992..0278fe07bfe 100644
--- a/homeassistant/components/cast/translations/it.json
+++ b/homeassistant/components/cast/translations/it.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nessun dispositivo Google Cast trovato in rete.",
-            "single_instance_allowed": "\u00c8 necessaria una sola configurazione di Google Cast."
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "confirm": {
-                "description": "Vuoi configurare Google Cast?"
+                "description": "Vuoi iniziare la configurazione?"
             }
         }
     }
diff --git a/homeassistant/components/cast/translations/no.json b/homeassistant/components/cast/translations/no.json
index b96be399cc8..b3d6b5d782e 100644
--- a/homeassistant/components/cast/translations/no.json
+++ b/homeassistant/components/cast/translations/no.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Ingen Google Cast enheter funnet p\u00e5 nettverket.",
-            "single_instance_allowed": "Kun en konfigurasjon av Google Cast er n\u00f8dvendig."
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "confirm": {
-                "description": "\u00d8nsker du \u00e5 sette opp Google Cast?"
+                "description": "Vil du starte oppsettet?"
             }
         }
     }
diff --git a/homeassistant/components/cast/translations/pl.json b/homeassistant/components/cast/translations/pl.json
index 965ee22ee5d..a8ee3fa57ac 100644
--- a/homeassistant/components/cast/translations/pl.json
+++ b/homeassistant/components/cast/translations/pl.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nie znaleziono w sieci urz\u0105dze\u0144 Google Cast.",
-            "single_instance_allowed": "Wymagana jest tylko jedna konfiguracja Google Cast."
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "confirm": {
-                "description": "Czy chcesz skonfigurowa\u0107 Google Cast?"
+                "description": "Czy chcesz rozpocz\u0105\u0107 konfiguracj\u0119?"
             }
         }
     }
diff --git a/homeassistant/components/cast/translations/ru.json b/homeassistant/components/cast/translations/ru.json
index a62f33832e0..85a42bf1be5 100644
--- a/homeassistant/components/cast/translations/ru.json
+++ b/homeassistant/components/cast/translations/ru.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 Google Cast \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b.",
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "confirm": {
-                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Google Cast?"
+                "description": "\u0425\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443?"
             }
         }
     }
diff --git a/homeassistant/components/cast/translations/zh-Hant.json b/homeassistant/components/cast/translations/zh-Hant.json
index 3bb3e70d688..91a0dc60be7 100644
--- a/homeassistant/components/cast/translations/zh-Hant.json
+++ b/homeassistant/components/cast/translations/zh-Hant.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230 Google Cast \u8a2d\u5099\u3002",
-            "single_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u6b21 Google Cast \u5373\u53ef\u3002"
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "confirm": {
-                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Google Cast\uff1f"
+                "description": "\u662f\u5426\u8981\u958b\u59cb\u8a2d\u5b9a\uff1f"
             }
         }
     }
diff --git a/homeassistant/components/cert_expiry/sensor.py b/homeassistant/components/cert_expiry/sensor.py
index ecf6ce18342..3d993fb2bc0 100644
--- a/homeassistant/components/cert_expiry/sensor.py
+++ b/homeassistant/components/cert_expiry/sensor.py
@@ -1,6 +1,5 @@
 """Counter for the days until an HTTPS (TLS) certificate will expire."""
 from datetime import timedelta
-import logging
 
 import voluptuous as vol
 
@@ -21,8 +20,6 @@ from homeassistant.util import dt
 
 from .const import DEFAULT_PORT, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 SCAN_INTERVAL = timedelta(hours=12)
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/cert_expiry/strings.json b/homeassistant/components/cert_expiry/strings.json
index fb14e90d586..bb50f1ee88b 100644
--- a/homeassistant/components/cert_expiry/strings.json
+++ b/homeassistant/components/cert_expiry/strings.json
@@ -17,8 +17,8 @@
       "connection_refused": "Connection refused when connecting to host"
     },
     "abort": {
-      "already_configured": "This host and port combination is already configured",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "import_failed": "Import from config failed"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/cert_expiry/translations/ca.json b/homeassistant/components/cert_expiry/translations/ca.json
index 50d761f03c2..42da690550b 100644
--- a/homeassistant/components/cert_expiry/translations/ca.json
+++ b/homeassistant/components/cert_expiry/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquesta combinaci\u00f3 d'amfitri\u00f3 i port ja est\u00e0 configurada",
+            "already_configured": "El servei ja est\u00e0 configurat",
             "import_failed": "La importaci\u00f3 des de configuraci\u00f3 ha fallat"
         },
         "error": {
diff --git a/homeassistant/components/cert_expiry/translations/cs.json b/homeassistant/components/cert_expiry/translations/cs.json
index 406bddd1a12..61bd93f40b3 100644
--- a/homeassistant/components/cert_expiry/translations/cs.json
+++ b/homeassistant/components/cert_expiry/translations/cs.json
@@ -1,9 +1,18 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena",
+            "import_failed": "Import z konfigurace se nezda\u0159il"
+        },
+        "error": {
+            "connection_refused": "P\u0159ipojen\u00ed bylo odm\u00edtnuto p\u0159i p\u0159ipojov\u00e1n\u00ed k hostiteli",
+            "connection_timeout": "\u010casov\u00fd limit p\u0159i p\u0159ipojen\u00ed k tomuto hostiteli vypr\u0161el"
+        },
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel",
+                    "name": "N\u00e1zev certifik\u00e1tu",
                     "port": "Port"
                 }
             }
diff --git a/homeassistant/components/cert_expiry/translations/en.json b/homeassistant/components/cert_expiry/translations/en.json
index 8d551ec2e03..ff9eb2582f1 100644
--- a/homeassistant/components/cert_expiry/translations/en.json
+++ b/homeassistant/components/cert_expiry/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This host and port combination is already configured",
+            "already_configured": "Service is already configured",
             "import_failed": "Import from config failed"
         },
         "error": {
diff --git a/homeassistant/components/cert_expiry/translations/es.json b/homeassistant/components/cert_expiry/translations/es.json
index 8f62d763063..1eaee01060f 100644
--- a/homeassistant/components/cert_expiry/translations/es.json
+++ b/homeassistant/components/cert_expiry/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Esta combinaci\u00f3n de host y puerto ya est\u00e1 configurada",
+            "already_configured": "El servicio ya est\u00e1 configurado",
             "import_failed": "No se pudo importar desde la configuraci\u00f3n"
         },
         "error": {
diff --git a/homeassistant/components/cert_expiry/translations/et.json b/homeassistant/components/cert_expiry/translations/et.json
new file mode 100644
index 00000000000..f7c8b5e7e47
--- /dev/null
+++ b/homeassistant/components/cert_expiry/translations/et.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud",
+            "import_failed": "Importimine konfiguratsioonist nurjus"
+        },
+        "error": {
+            "connection_refused": "Hostiga \u00fchenduse loomisel keelduti \u00fchendusest",
+            "connection_timeout": "Selle hostiga \u00fchenduse loomise ajal\u00f5pp",
+            "resolve_failed": "Seda hostinime ei saa lahendada"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "name": "Sertifikaadi nimi",
+                    "port": ""
+                },
+                "title": "Testitava serdi m\u00e4\u00e4ramine"
+            }
+        }
+    },
+    "title": "Sertifikaadi aegumine"
+}
\ No newline at end of file
diff --git a/homeassistant/components/cert_expiry/translations/it.json b/homeassistant/components/cert_expiry/translations/it.json
index 29b26710b62..232ee010221 100644
--- a/homeassistant/components/cert_expiry/translations/it.json
+++ b/homeassistant/components/cert_expiry/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questa combinazione di host e porta \u00e8 gi\u00e0 configurata",
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato",
             "import_failed": "Importazione dalla configurazione non riuscita"
         },
         "error": {
diff --git a/homeassistant/components/cert_expiry/translations/no.json b/homeassistant/components/cert_expiry/translations/no.json
index a7aa3d1ab13..78f7fc964bc 100644
--- a/homeassistant/components/cert_expiry/translations/no.json
+++ b/homeassistant/components/cert_expiry/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne verts- og portkombinasjonen er allerede konfigurert",
+            "already_configured": "Tjenesten er allerede konfigurert",
             "import_failed": "Import fra config mislyktes"
         },
         "error": {
@@ -14,7 +14,7 @@
                 "data": {
                     "host": "Vert",
                     "name": "Sertifikatets navn",
-                    "port": ""
+                    "port": "Port"
                 },
                 "title": "Definer sertifikatet som skal testes"
             }
diff --git a/homeassistant/components/cert_expiry/translations/pl.json b/homeassistant/components/cert_expiry/translations/pl.json
index 1561f30fcff..447cc115aff 100644
--- a/homeassistant/components/cert_expiry/translations/pl.json
+++ b/homeassistant/components/cert_expiry/translations/pl.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ta kombinacja hosta i portu jest ju\u017c skonfigurowana.",
-            "import_failed": "Import z konfiguracji nie powi\u00f3d\u0142 si\u0119."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana",
+            "import_failed": "Import z konfiguracji nie powi\u00f3d\u0142 si\u0119"
         },
         "error": {
             "connection_refused": "Po\u0142\u0105czenie odrzucone podczas \u0142\u0105czenia z hostem",
-            "connection_timeout": "Przekroczono limit czasu po\u0142\u0105czenia z hostem.",
+            "connection_timeout": "Przekroczono limit czasu po\u0142\u0105czenia z hostem",
             "resolve_failed": "Tego hosta nie mo\u017cna rozwi\u0105za\u0107"
         },
         "step": {
diff --git a/homeassistant/components/cert_expiry/translations/ru.json b/homeassistant/components/cert_expiry/translations/ru.json
index a924398f90e..6aec7082433 100644
--- a/homeassistant/components/cert_expiry/translations/ru.json
+++ b/homeassistant/components/cert_expiry/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u042d\u0442\u0430 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u044f \u0445\u043e\u0441\u0442\u0430 \u0438 \u043f\u043e\u0440\u0442\u0430 \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "import_failed": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0438\u043c\u043f\u043e\u0440\u0442\u0430 \u0438\u0437 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438."
         },
         "error": {
diff --git a/homeassistant/components/cert_expiry/translations/zh-Hant.json b/homeassistant/components/cert_expiry/translations/zh-Hant.json
index 6cfe05f6d1a..f21603709ac 100644
--- a/homeassistant/components/cert_expiry/translations/zh-Hant.json
+++ b/homeassistant/components/cert_expiry/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u4e3b\u6a5f\u7aef\u8207\u901a\u8a0a\u57e0\u7d44\u5408\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "import_failed": "\u532f\u5165\u8a2d\u5b9a\u5931\u6557"
         },
         "error": {
diff --git a/homeassistant/components/channels/media_player.py b/homeassistant/components/channels/media_player.py
index 54dc0f18374..481cdd7ecad 100644
--- a/homeassistant/components/channels/media_player.py
+++ b/homeassistant/components/channels/media_player.py
@@ -1,6 +1,4 @@
 """Support for interfacing with an instance of getchannels.com."""
-import logging
-
 from pychannels import Channels
 import voluptuous as vol
 
@@ -31,8 +29,6 @@ from homeassistant.helpers import config_validation as cv, entity_platform
 
 from .const import SERVICE_SEEK_BACKWARD, SERVICE_SEEK_BY, SERVICE_SEEK_FORWARD
 
-_LOGGER = logging.getLogger(__name__)
-
 DATA_CHANNELS = "channels"
 DEFAULT_NAME = "Channels"
 DEFAULT_PORT = 57000
diff --git a/homeassistant/components/circuit/__init__.py b/homeassistant/components/circuit/__init__.py
index 3d97e110475..37fb5cbf6f3 100644
--- a/homeassistant/components/circuit/__init__.py
+++ b/homeassistant/components/circuit/__init__.py
@@ -1,14 +1,9 @@
 """The Unify Circuit component."""
-
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_NAME, CONF_URL
 from homeassistant.helpers import config_validation as cv, discovery
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "circuit"
 CONF_WEBHOOK = "webhook"
 
diff --git a/homeassistant/components/clementine/media_player.py b/homeassistant/components/clementine/media_player.py
index 7478c9a7f2b..44ba5c3d600 100644
--- a/homeassistant/components/clementine/media_player.py
+++ b/homeassistant/components/clementine/media_player.py
@@ -1,6 +1,5 @@
 """Support for Clementine Music Player as media player."""
 from datetime import timedelta
-import logging
 import time
 
 from clementineremote import ClementineRemote
@@ -28,8 +27,6 @@ from homeassistant.const import (
 )
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Clementine Remote"
 DEFAULT_PORT = 5500
 
diff --git a/homeassistant/components/climate/translations/cs.json b/homeassistant/components/climate/translations/cs.json
index a61706acea8..caeb255264e 100644
--- a/homeassistant/components/climate/translations/cs.json
+++ b/homeassistant/components/climate/translations/cs.json
@@ -1,4 +1,19 @@
 {
+    "device_automation": {
+        "action_type": {
+            "set_hvac_mode": "Zm\u011bnit re\u017eim HVAC na {entity_name}",
+            "set_preset_mode": "Zm\u011bnit p\u0159ednastaven\u00fd re\u017eim na {entity_name}"
+        },
+        "condition_type": {
+            "is_hvac_mode": "{entity_name} je nastaveno na ur\u010dit\u00fd re\u017eim HVAC",
+            "is_preset_mode": "{entity_name} je nastaveno na p\u0159ednastaven\u00fd re\u017eim"
+        },
+        "trigger_type": {
+            "current_humidity_changed": "M\u011b\u0159en\u00e1 vlhkost na {entity_name} zm\u011bn\u011bna",
+            "current_temperature_changed": "M\u011b\u0159en\u00e1 teplota na {entity_name} zm\u011bn\u011bna",
+            "hvac_mode_changed": "Re\u017eim HVAC na {entity_name} zm\u011bn\u011bn"
+        }
+    },
     "state": {
         "_": {
             "auto": "Automatika",
@@ -6,9 +21,9 @@
             "dry": "Vysou\u0161en\u00ed",
             "fan_only": "Pouze ventil\u00e1tor",
             "heat": "Topen\u00ed",
-            "heat_cool": "Vyt\u00e1p\u011bn\u00ed/Chlazen\u00ed",
-            "off": "Neaktivn\u00ed"
+            "heat_cool": "Topen\u00ed/Chlazen\u00ed",
+            "off": "Vypnuto"
         }
     },
-    "title": "Klimatizace"
+    "title": "Klima"
 }
\ No newline at end of file
diff --git a/homeassistant/components/climate/translations/no.json b/homeassistant/components/climate/translations/no.json
index 4ac58d07bbb..e7540c923ec 100644
--- a/homeassistant/components/climate/translations/no.json
+++ b/homeassistant/components/climate/translations/no.json
@@ -21,7 +21,7 @@
             "dry": "T\u00f8rr",
             "fan_only": "Kun vifte",
             "heat": "Varme",
-            "heat_cool": "Varme/kj\u00f8lig",
+            "heat_cool": "Varme/kj\u00f8ling",
             "off": "Av"
         }
     },
diff --git a/homeassistant/components/climate/translations/ru.json b/homeassistant/components/climate/translations/ru.json
index 507686629e9..3cc2cc37a5c 100644
--- a/homeassistant/components/climate/translations/ru.json
+++ b/homeassistant/components/climate/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "device_automation": {
         "action_type": {
-            "set_hvac_mode": "\u0421\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u0440\u0430\u0431\u043e\u0442\u044b \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \"{entity_name}\"",
-            "set_preset_mode": "\u0421\u043c\u0435\u043d\u0438\u0442\u044c \u043d\u0430\u0431\u043e\u0440 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \"{entity_name}\""
+            "set_hvac_mode": "{entity_name}: \u0441\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c HVAC",
+            "set_preset_mode": "{entity_name}: \u0432\u044b\u0431\u0440\u0430\u0442\u044c \u043f\u0440\u0435\u0434\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c"
         },
         "condition_type": {
             "is_hvac_mode": "{entity_name} \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432 \u0437\u0430\u0434\u0430\u043d\u043d\u043e\u043c \u0440\u0435\u0436\u0438\u043c\u0435 \u0440\u0430\u0431\u043e\u0442\u044b",
diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index ad97284d857..b1ad55c0b04 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -1,6 +1,4 @@
 """Component to integrate the Home Assistant cloud."""
-import logging
-
 from hass_nabucasa import Cloud
 import voluptuous as vol
 
@@ -43,8 +41,6 @@ from .const import (
 )
 from .prefs import CloudPreferences
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_MODE = MODE_PROD
 
 SERVICE_REMOTE_CONNECT = "remote_connect"
diff --git a/homeassistant/components/cloud/client.py b/homeassistant/components/cloud/client.py
index 5a70948555d..8e309d92c7f 100644
--- a/homeassistant/components/cloud/client.py
+++ b/homeassistant/components/cloud/client.py
@@ -1,6 +1,5 @@
 """Interface implementation for cloud client."""
 import asyncio
-import logging
 from pathlib import Path
 from typing import Any, Dict
 
@@ -22,8 +21,6 @@ from . import alexa_config, google_config, utils
 from .const import DISPATCHER_REMOTE_UPDATE, DOMAIN
 from .prefs import CloudPreferences
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class CloudClient(Interface):
     """Interface class for Home Assistant Cloud."""
diff --git a/homeassistant/components/cloud/google_config.py b/homeassistant/components/cloud/google_config.py
index 882124af45c..4b5891359b6 100644
--- a/homeassistant/components/cloud/google_config.py
+++ b/homeassistant/components/cloud/google_config.py
@@ -11,7 +11,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STARTED,
     HTTP_OK,
 )
-from homeassistant.core import CoreState, callback, split_entity_id
+from homeassistant.core import CoreState, split_entity_id
 from homeassistant.helpers import entity_registry
 
 from .const import (
@@ -201,7 +201,6 @@ class CloudGoogleConfig(AbstractConfig):
 
         self._sync_on_started = True
 
-        @callback
         async def sync_google(_):
             """Sync entities to Google."""
             await self.async_sync_entities_all()
diff --git a/homeassistant/components/cloud/manifest.json b/homeassistant/components/cloud/manifest.json
index 2da3562717d..81986a3cf6d 100644
--- a/homeassistant/components/cloud/manifest.json
+++ b/homeassistant/components/cloud/manifest.json
@@ -2,7 +2,7 @@
   "domain": "cloud",
   "name": "Home Assistant Cloud",
   "documentation": "https://www.home-assistant.io/integrations/cloud",
-  "requirements": ["hass-nabucasa==0.37.0"],
+  "requirements": ["hass-nabucasa==0.37.1"],
   "dependencies": ["http", "webhook", "alexa"],
   "after_dependencies": ["google_assistant"],
   "codeowners": ["@home-assistant/cloud"]
diff --git a/homeassistant/components/cloudflare/__init__.py b/homeassistant/components/cloudflare/__init__.py
index 265621b6250..3ebb919393a 100644
--- a/homeassistant/components/cloudflare/__init__.py
+++ b/homeassistant/components/cloudflare/__init__.py
@@ -1,74 +1,130 @@
 """Update the IP addresses of your Cloudflare DNS records."""
 from datetime import timedelta
 import logging
+from typing import Dict
 
 from pycfdns import CloudflareUpdater
+from pycfdns.exceptions import (
+    CloudflareAuthenticationException,
+    CloudflareConnectionException,
+    CloudflareException,
+)
 import voluptuous as vol
 
-from homeassistant.const import CONF_API_KEY, CONF_EMAIL, CONF_ZONE
+from homeassistant.components import persistent_notification
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_API_KEY, CONF_API_TOKEN, CONF_EMAIL, CONF_ZONE
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.event import track_time_interval
+from homeassistant.helpers.event import async_track_time_interval
+
+from .const import (
+    CONF_RECORDS,
+    DATA_UNDO_UPDATE_INTERVAL,
+    DEFAULT_UPDATE_INTERVAL,
+    DOMAIN,
+    SERVICE_UPDATE_RECORDS,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_RECORDS = "records"
-
-DOMAIN = "cloudflare"
-
-INTERVAL = timedelta(minutes=60)
-
 CONFIG_SCHEMA = vol.Schema(
     {
-        DOMAIN: vol.Schema(
-            {
-                vol.Required(CONF_EMAIL): cv.string,
-                vol.Required(CONF_API_KEY): cv.string,
-                vol.Required(CONF_ZONE): cv.string,
-                vol.Required(CONF_RECORDS): vol.All(cv.ensure_list, [cv.string]),
-            }
+        DOMAIN: vol.All(
+            cv.deprecated(CONF_EMAIL, invalidation_version="0.119"),
+            cv.deprecated(CONF_API_KEY, invalidation_version="0.119"),
+            cv.deprecated(CONF_ZONE, invalidation_version="0.119"),
+            cv.deprecated(CONF_RECORDS, invalidation_version="0.119"),
+            vol.Schema(
+                {
+                    vol.Optional(CONF_EMAIL): cv.string,
+                    vol.Optional(CONF_API_KEY): cv.string,
+                    vol.Optional(CONF_ZONE): cv.string,
+                    vol.Optional(CONF_RECORDS): vol.All(cv.ensure_list, [cv.string]),
+                }
+            ),
         )
     },
     extra=vol.ALLOW_EXTRA,
 )
 
 
-def setup(hass, config):
-    """Set up the Cloudflare component."""
+async def async_setup(hass: HomeAssistant, config: Dict) -> bool:
+    """Set up the component."""
+    hass.data.setdefault(DOMAIN, {})
 
-    cfupdate = CloudflareUpdater()
-    email = config[DOMAIN][CONF_EMAIL]
-    key = config[DOMAIN][CONF_API_KEY]
-    zone = config[DOMAIN][CONF_ZONE]
-    records = config[DOMAIN][CONF_RECORDS]
+    if len(hass.config_entries.async_entries(DOMAIN)) > 0:
+        return True
 
-    def update_records_interval(now):
-        """Set up recurring update."""
-        _update_cloudflare(cfupdate, email, key, zone, records)
+    if DOMAIN in config and CONF_API_KEY in config[DOMAIN]:
+        persistent_notification.async_create(
+            hass,
+            "Cloudflare integration now requires an API Token. Please go to the integrations page to setup.",
+            "Cloudflare Setup",
+            "cloudflare_setup",
+        )
 
-    def update_records_service(now):
-        """Set up service for manual trigger."""
-        _update_cloudflare(cfupdate, email, key, zone, records)
-
-    track_time_interval(hass, update_records_interval, INTERVAL)
-    hass.services.register(DOMAIN, "update_records", update_records_service)
     return True
 
 
-def _update_cloudflare(cfupdate, email, key, zone, records):
-    """Update DNS records for a given zone."""
-    _LOGGER.debug("Starting update for zone %s", zone)
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Cloudflare from a config entry."""
+    cfupdate = CloudflareUpdater(
+        async_get_clientsession(hass),
+        entry.data[CONF_API_TOKEN],
+        entry.data[CONF_ZONE],
+        entry.data[CONF_RECORDS],
+    )
 
-    headers = cfupdate.set_header(email, key)
-    _LOGGER.debug("Header data defined as: %s", headers)
+    try:
+        zone_id = await cfupdate.get_zone_id()
+    except CloudflareAuthenticationException:
+        _LOGGER.error("API access forbidden. Please reauthenticate")
+        return False
+    except CloudflareConnectionException as error:
+        raise ConfigEntryNotReady from error
 
-    zoneid = cfupdate.get_zoneID(headers, zone)
-    _LOGGER.debug("Zone ID is set to: %s", zoneid)
+    async def update_records(now):
+        """Set up recurring update."""
+        try:
+            await _async_update_cloudflare(cfupdate, zone_id)
+        except CloudflareException as error:
+            _LOGGER.error("Error updating zone %s: %s", entry.data[CONF_ZONE], error)
 
-    update_records = cfupdate.get_recordInfo(headers, zoneid, zone, records)
-    _LOGGER.debug("Records: %s", update_records)
+    async def update_records_service(call):
+        """Set up service for manual trigger."""
+        try:
+            await _async_update_cloudflare(cfupdate, zone_id)
+        except CloudflareException as error:
+            _LOGGER.error("Error updating zone %s: %s", entry.data[CONF_ZONE], error)
 
-    result = cfupdate.update_records(headers, zoneid, update_records)
-    _LOGGER.debug("Update for zone %s is complete", zone)
+    update_interval = timedelta(minutes=DEFAULT_UPDATE_INTERVAL)
+    undo_interval = async_track_time_interval(hass, update_records, update_interval)
 
-    if result is not True:
-        _LOGGER.warning(result)
+    hass.data[DOMAIN][entry.entry_id] = {
+        DATA_UNDO_UPDATE_INTERVAL: undo_interval,
+    }
+
+    hass.services.async_register(DOMAIN, SERVICE_UPDATE_RECORDS, update_records_service)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload Cloudflare config entry."""
+    hass.data[DOMAIN][entry.entry_id][DATA_UNDO_UPDATE_INTERVAL]()
+    hass.data[DOMAIN].pop(entry.entry_id)
+
+    return True
+
+
+async def _async_update_cloudflare(cfupdate: CloudflareUpdater, zone_id: str):
+    _LOGGER.debug("Starting update for zone %s", cfupdate.zone)
+
+    records = await cfupdate.get_record_info(zone_id)
+    _LOGGER.debug("Records: %s", records)
+
+    await cfupdate.update_records(zone_id, records)
+    _LOGGER.debug("Update for zone %s is complete", cfupdate.zone)
diff --git a/homeassistant/components/cloudflare/config_flow.py b/homeassistant/components/cloudflare/config_flow.py
new file mode 100644
index 00000000000..c96e6455ce9
--- /dev/null
+++ b/homeassistant/components/cloudflare/config_flow.py
@@ -0,0 +1,180 @@
+"""Config flow for Cloudflare integration."""
+import logging
+from typing import Dict, List, Optional
+
+from pycfdns import CloudflareUpdater
+from pycfdns.exceptions import (
+    CloudflareAuthenticationException,
+    CloudflareConnectionException,
+    CloudflareZoneException,
+)
+import voluptuous as vol
+
+from homeassistant.components import persistent_notification
+from homeassistant.config_entries import CONN_CLASS_CLOUD_PUSH, ConfigFlow
+from homeassistant.const import CONF_API_TOKEN, CONF_ZONE
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import CONF_RECORDS
+from .const import DOMAIN  # pylint:disable=unused-import
+
+_LOGGER = logging.getLogger(__name__)
+
+DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_API_TOKEN): str,
+    }
+)
+
+
+def _zone_schema(zones: Optional[List] = None):
+    """Zone selection schema."""
+    zones_list = []
+
+    if zones is not None:
+        zones_list = zones
+
+    return vol.Schema({vol.Required(CONF_ZONE): vol.In(zones_list)})
+
+
+def _records_schema(records: Optional[List] = None):
+    """Zone records selection schema."""
+    records_dict = {}
+
+    if records:
+        records_dict = {name: name for name in records}
+
+    return vol.Schema({vol.Required(CONF_RECORDS): cv.multi_select(records_dict)})
+
+
+async def validate_input(hass: HomeAssistant, data: Dict):
+    """Validate the user input allows us to connect.
+
+    Data has the keys from DATA_SCHEMA with values provided by the user.
+    """
+    zone = data.get(CONF_ZONE)
+    records = None
+
+    cfupdate = CloudflareUpdater(
+        async_get_clientsession(hass),
+        data[CONF_API_TOKEN],
+        zone,
+        [],
+    )
+
+    try:
+        zones = await cfupdate.get_zones()
+        if zone:
+            zone_id = await cfupdate.get_zone_id()
+            records = await cfupdate.get_zone_records(zone_id, "A")
+    except CloudflareConnectionException as error:
+        raise CannotConnect from error
+    except CloudflareAuthenticationException as error:
+        raise InvalidAuth from error
+    except CloudflareZoneException as error:
+        raise InvalidZone from error
+
+    return {"zones": zones, "records": records}
+
+
+class CloudflareConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Cloudflare."""
+
+    VERSION = 1
+    CONNECTION_CLASS = CONN_CLASS_CLOUD_PUSH
+
+    def __init__(self):
+        """Initialize the Cloudflare config flow."""
+        self.cloudflare_config = {}
+        self.zones = None
+        self.records = None
+
+    async def async_step_user(self, user_input: Optional[Dict] = None):
+        """Handle a flow initiated by the user."""
+        if self._async_current_entries():
+            return self.async_abort(reason="single_instance_allowed")
+
+        assert self.hass
+        persistent_notification.async_dismiss(self.hass, "cloudflare_setup")
+
+        errors = {}
+
+        if user_input is not None:
+            info, errors = await self._async_validate_or_error(user_input)
+
+            if not errors:
+                self.cloudflare_config.update(user_input)
+                self.zones = info["zones"]
+                return await self.async_step_zone()
+
+        return self.async_show_form(
+            step_id="user", data_schema=DATA_SCHEMA, errors=errors
+        )
+
+    async def async_step_zone(self, user_input: Optional[Dict] = None):
+        """Handle the picking the zone."""
+        errors = {}
+
+        if user_input is not None:
+            self.cloudflare_config.update(user_input)
+            info, errors = await self._async_validate_or_error(self.cloudflare_config)
+
+            if not errors:
+                await self.async_set_unique_id(user_input[CONF_ZONE])
+                self.records = info["records"]
+
+                return await self.async_step_records()
+
+        return self.async_show_form(
+            step_id="zone",
+            data_schema=_zone_schema(self.zones),
+            errors=errors,
+        )
+
+    async def async_step_records(self, user_input: Optional[Dict] = None):
+        """Handle the picking the zone records."""
+        errors = {}
+
+        if user_input is not None:
+            self.cloudflare_config.update(user_input)
+            title = self.cloudflare_config[CONF_ZONE]
+            return self.async_create_entry(title=title, data=self.cloudflare_config)
+
+        return self.async_show_form(
+            step_id="records",
+            data_schema=_records_schema(self.records),
+            errors=errors,
+        )
+
+    async def _async_validate_or_error(self, config):
+        errors = {}
+        info = {}
+
+        try:
+            info = await validate_input(self.hass, config)
+        except CannotConnect:
+            errors["base"] = "cannot_connect"
+        except InvalidAuth:
+            errors["base"] = "invalid_auth"
+        except InvalidZone:
+            errors["base"] = "invalid_zone"
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Unexpected exception")
+            errors["base"] = "unknown"
+
+        return info, errors
+
+
+class CannotConnect(HomeAssistantError):
+    """Error to indicate we cannot connect."""
+
+
+class InvalidAuth(HomeAssistantError):
+    """Error to indicate there is invalid auth."""
+
+
+class InvalidZone(HomeAssistantError):
+    """Error to indicate we cannot validate zone exists in account."""
diff --git a/homeassistant/components/cloudflare/const.py b/homeassistant/components/cloudflare/const.py
new file mode 100644
index 00000000000..0bdce7b9a92
--- /dev/null
+++ b/homeassistant/components/cloudflare/const.py
@@ -0,0 +1,15 @@
+"""Constants for Cloudflare."""
+
+DOMAIN = "cloudflare"
+
+# Config
+CONF_RECORDS = "records"
+
+# Data
+DATA_UNDO_UPDATE_INTERVAL = "undo_update_interval"
+
+# Defaults
+DEFAULT_UPDATE_INTERVAL = 60  # in minutes
+
+# Services
+SERVICE_UPDATE_RECORDS = "update_records"
diff --git a/homeassistant/components/cloudflare/manifest.json b/homeassistant/components/cloudflare/manifest.json
index d22d526d01c..cab768953b1 100644
--- a/homeassistant/components/cloudflare/manifest.json
+++ b/homeassistant/components/cloudflare/manifest.json
@@ -2,6 +2,7 @@
   "domain": "cloudflare",
   "name": "Cloudflare",
   "documentation": "https://www.home-assistant.io/integrations/cloudflare",
-  "requirements": ["pycfdns==0.0.1"],
-  "codeowners": ["@ludeeus"]
+  "requirements": ["pycfdns==1.1.1"],
+  "codeowners": ["@ludeeus", "@ctalkington"],
+  "config_flow": true
 }
diff --git a/homeassistant/components/cloudflare/strings.json b/homeassistant/components/cloudflare/strings.json
new file mode 100644
index 00000000000..caf3da68876
--- /dev/null
+++ b/homeassistant/components/cloudflare/strings.json
@@ -0,0 +1,35 @@
+{
+  "config": {
+    "flow_title": "Cloudflare: {name}",
+    "step": {
+      "user": {
+        "title": "Connect to Cloudflare",
+        "description": "This integration requires an API Token created with Zone:Zone:Read and Zone:DNS:Edit permissions for all zones in your account.",
+        "data": {
+          "api_token": "[%key:common::config_flow::data::api_token%]"
+        }
+      },
+      "zone": {
+        "title": "Choose the Zone to Update",
+        "data": {
+          "zone": "Zone"
+        }
+      },
+      "records": {
+        "title": "Choose the Records to Update",
+        "data": {
+           "records": "Records"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "invalid_zone": "Invalid zone"
+    },
+    "abort": {
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  }
+}
diff --git a/homeassistant/components/cloudflare/translations/ca.json b/homeassistant/components/cloudflare/translations/ca.json
new file mode 100644
index 00000000000..edd31662e56
--- /dev/null
+++ b/homeassistant/components/cloudflare/translations/ca.json
@@ -0,0 +1,35 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3.",
+            "unknown": "Error inesperat"
+        },
+        "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
+            "invalid_zone": "Zona inv\u00e0lida"
+        },
+        "flow_title": "Cloudflare: {name}",
+        "step": {
+            "records": {
+                "data": {
+                    "records": "Registres"
+                },
+                "title": "Selecciona els registres a actualitzar"
+            },
+            "user": {
+                "data": {
+                    "api_token": "Token d'API"
+                },
+                "description": "Aquesta integraci\u00f3 necessita un token d'API creat amb permisos d'edici\u00f3 Zone:Zone:Read i Zone:DNS:Edit per a totes les zones del teu compte.",
+                "title": "Connexi\u00f3 amb Cloudflare"
+            },
+            "zone": {
+                "data": {
+                    "zone": "Zona"
+                },
+                "title": "Selecciona la zona a actualitzar"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/cloudflare/translations/cs.json b/homeassistant/components/cloudflare/translations/cs.json
new file mode 100644
index 00000000000..d618c25c4f0
--- /dev/null
+++ b/homeassistant/components/cloudflare/translations/cs.json
@@ -0,0 +1,34 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace.",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_zone": "Neplatn\u00e1 z\u00f3na"
+        },
+        "flow_title": "Cloudflare: {name}",
+        "step": {
+            "records": {
+                "data": {
+                    "records": "Z\u00e1znamy"
+                },
+                "title": "Vyberte z\u00e1znamy, kter\u00e9 chcete aktualizovat"
+            },
+            "user": {
+                "data": {
+                    "api_token": "API token"
+                },
+                "title": "P\u0159ipojen\u00ed ke Cloudflare"
+            },
+            "zone": {
+                "data": {
+                    "zone": "Z\u00f3na"
+                },
+                "title": "Vyberte z\u00f3nu, kter\u00e1 m\u00e1 b\u00fdt aktualizov\u00e1na"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/cloudflare/translations/en.json b/homeassistant/components/cloudflare/translations/en.json
new file mode 100644
index 00000000000..4016e22d8ee
--- /dev/null
+++ b/homeassistant/components/cloudflare/translations/en.json
@@ -0,0 +1,35 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Already configured. Only a single configuration possible.",
+            "unknown": "Unexpected error"
+        },
+        "error": {
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
+            "invalid_zone": "Invalid zone"
+        },
+        "flow_title": "Cloudflare: {name}",
+        "step": {
+            "records": {
+                "data": {
+                    "records": "Records"
+                },
+                "title": "Choose the Records to Update"
+            },
+            "user": {
+                "data": {
+                    "api_token": "API Token"
+                },
+                "description": "This integration requires an API Token created with Zone:Zone:Read and Zone:DNS:Edit permissions for all zones in your account.",
+                "title": "Connect to Cloudflare"
+            },
+            "zone": {
+                "data": {
+                    "zone": "Zone"
+                },
+                "title": "Choose the Zone to Update"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/cloudflare/translations/et.json b/homeassistant/components/cloudflare/translations/et.json
new file mode 100644
index 00000000000..9c9ab666a83
--- /dev/null
+++ b/homeassistant/components/cloudflare/translations/et.json
@@ -0,0 +1,34 @@
+{
+    "config": {
+        "abort": {
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendus nurjus",
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_zone": "Sobimatu ala"
+        },
+        "flow_title": "Cloudflare: {name}",
+        "step": {
+            "records": {
+                "data": {
+                    "records": "Kirjed"
+                },
+                "title": "Vali v\u00e4rskendatavad kirjed"
+            },
+            "user": {
+                "data": {
+                    "api_token": "Api v\u00f5ti"
+                },
+                "description": "Selle sidumise jaoks on vaja API tokenit, mis on loodud Zone: Zone: Read ja Zone: DNS: Edit k\u00f5igi oma konto alade \u00f5igusi.!?",
+                "title": "Loo \u00fchendus Cloudflare'iga"
+            },
+            "zone": {
+                "data": {
+                    "zone": "Ala"
+                },
+                "title": "Vali v\u00e4rskendatav ala"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/cloudflare/translations/pl.json b/homeassistant/components/cloudflare/translations/pl.json
new file mode 100644
index 00000000000..70c7869937a
--- /dev/null
+++ b/homeassistant/components/cloudflare/translations/pl.json
@@ -0,0 +1,35 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
+        },
+        "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "invalid_zone": "Nieprawid\u0142owa strefa"
+        },
+        "flow_title": "Cloudflare: {name}",
+        "step": {
+            "records": {
+                "data": {
+                    "records": "Rekordy"
+                },
+                "title": "Wybierz rekordy do uaktualnienia"
+            },
+            "user": {
+                "data": {
+                    "api_token": "Token API"
+                },
+                "description": "Ta integracja wymaga tokena API utworzonego z uprawnieniami \"Zone:Zone:Read\" oraz \"Zone:DNS:Edit\" dla wszystkich stref na Twoim koncie.",
+                "title": "Po\u0142\u0105czenie z Cloudflare"
+            },
+            "zone": {
+                "data": {
+                    "zone": "Strefa"
+                },
+                "title": "Wybierz stref\u0119 do uaktualnienia"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/cloudflare/translations/ru.json b/homeassistant/components/cloudflare/translations/ru.json
new file mode 100644
index 00000000000..fa4819d8c83
--- /dev/null
+++ b/homeassistant/components/cloudflare/translations/ru.json
@@ -0,0 +1,35 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+        },
+        "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
+            "invalid_zone": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0437\u043e\u043d\u0430"
+        },
+        "flow_title": "Cloudflare: {name}",
+        "step": {
+            "records": {
+                "data": {
+                    "records": "\u0417\u0430\u043f\u0438\u0441\u0438"
+                },
+                "title": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 \u0434\u043b\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f"
+            },
+            "user": {
+                "data": {
+                    "api_token": "\u0422\u043e\u043a\u0435\u043d API"
+                },
+                "description": "\u0414\u043b\u044f \u044d\u0442\u043e\u0439 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438 \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0442\u043e\u043a\u0435\u043d API, \u0441\u043e\u0437\u0434\u0430\u043d\u043d\u044b\u0439 \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f\u043c\u0438 Zone:Zone:Read \u0438 Zone:DNS:Edit \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u0437\u043e\u043d \u0432 \u0412\u0430\u0448\u0435\u0439 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438.",
+                "title": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a Cloudflare"
+            },
+            "zone": {
+                "data": {
+                    "zone": "\u0417\u043e\u043d\u0430"
+                },
+                "title": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0437\u043e\u043d\u0443 \u0434\u043b\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/command_line/binary_sensor.py b/homeassistant/components/command_line/binary_sensor.py
index cb78b7b9144..6021a5ef4f7 100644
--- a/homeassistant/components/command_line/binary_sensor.py
+++ b/homeassistant/components/command_line/binary_sensor.py
@@ -1,6 +1,5 @@
 """Support for custom shell commands to retrieve values."""
 from datetime import timedelta
-import logging
 
 import voluptuous as vol
 
@@ -23,8 +22,6 @@ from homeassistant.helpers.reload import setup_reload_service
 from .const import CONF_COMMAND_TIMEOUT, DEFAULT_TIMEOUT, DOMAIN, PLATFORMS
 from .sensor import CommandSensorData
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Binary Command Sensor"
 DEFAULT_PAYLOAD_ON = "ON"
 DEFAULT_PAYLOAD_OFF = "OFF"
diff --git a/homeassistant/components/concord232/alarm_control_panel.py b/homeassistant/components/concord232/alarm_control_panel.py
index 94880dcccf7..f502e805c85 100644
--- a/homeassistant/components/concord232/alarm_control_panel.py
+++ b/homeassistant/components/concord232/alarm_control_panel.py
@@ -101,7 +101,7 @@ class Concord232Alarm(alarm.AlarmControlPanelEntity):
         except requests.exceptions.ConnectionError as ex:
             _LOGGER.error(
                 "Unable to connect to %(host)s: %(reason)s",
-                dict(host=self._url, reason=ex),
+                {"host": self._url, "reason": ex},
             )
             return
         except IndexError:
diff --git a/homeassistant/components/concord232/binary_sensor.py b/homeassistant/components/concord232/binary_sensor.py
index 1288b9472ed..7fd1d9748b3 100644
--- a/homeassistant/components/concord232/binary_sensor.py
+++ b/homeassistant/components/concord232/binary_sensor.py
@@ -115,11 +115,6 @@ class Concord232ZoneSensor(BinarySensorEntity):
         """Return the class of this sensor, from DEVICE_CLASSES."""
         return self._zone_type
 
-    @property
-    def should_poll(self):
-        """No polling needed."""
-        return True
-
     @property
     def name(self):
         """Return the name of the binary sensor."""
diff --git a/homeassistant/components/config/__init__.py b/homeassistant/components/config/__init__.py
index 54482ffa34a..1098594a04c 100644
--- a/homeassistant/components/config/__init__.py
+++ b/homeassistant/components/config/__init__.py
@@ -189,7 +189,7 @@ class BaseEditConfigView(HomeAssistantView):
 
     async def read_config(self, hass):
         """Read the config."""
-        current = await hass.async_add_job(_read, hass.config.path(self.path))
+        current = await hass.async_add_executor_job(_read, hass.config.path(self.path))
         if not current:
             current = self._empty_config()
         return current
diff --git a/homeassistant/components/config/zwave.py b/homeassistant/components/config/zwave.py
index 7a99d29c774..ca1a99c6bb7 100644
--- a/homeassistant/components/config/zwave.py
+++ b/homeassistant/components/config/zwave.py
@@ -54,7 +54,7 @@ class ZWaveLogView(HomeAssistantView):
             return Response(text="Invalid datetime", status=HTTP_BAD_REQUEST)
 
         hass = request.app["hass"]
-        response = await hass.async_add_job(self._get_log, hass, lines)
+        response = await hass.async_add_executor_job(self._get_log, hass, lines)
 
         return Response(text="\n".join(response))
 
diff --git a/homeassistant/components/configurator/__init__.py b/homeassistant/components/configurator/__init__.py
index d03dbe1fe7b..9ddd9d76ed9 100644
--- a/homeassistant/components/configurator/__init__.py
+++ b/homeassistant/components/configurator/__init__.py
@@ -7,7 +7,6 @@ A callback has to be provided to `request_config` which will be called when
 the user has submitted configuration information.
 """
 import functools as ft
-import logging
 
 from homeassistant.const import (
     ATTR_ENTITY_PICTURE,
@@ -19,7 +18,6 @@ from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.loader import bind_hass
 from homeassistant.util.async_ import run_callback_threadsafe
 
-_LOGGER = logging.getLogger(__name__)
 _KEY_INSTANCE = "configurator"
 
 DATA_REQUESTS = "configurator_requests"
diff --git a/homeassistant/components/configurator/translations/cs.json b/homeassistant/components/configurator/translations/cs.json
index dcd1b4ee91e..4776871c73c 100644
--- a/homeassistant/components/configurator/translations/cs.json
+++ b/homeassistant/components/configurator/translations/cs.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "configure": "Nakonfigurovat",
-            "configured": "Nakonfigurov\u00e1no"
+            "configure": "Nastavit",
+            "configured": "Nastaveno"
         }
     },
     "title": "Konfigur\u00e1tor"
diff --git a/homeassistant/components/configurator/translations/pl.json b/homeassistant/components/configurator/translations/pl.json
index 45e5af46722..849a7e7bfef 100644
--- a/homeassistant/components/configurator/translations/pl.json
+++ b/homeassistant/components/configurator/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "state": {
         "_": {
-            "configure": "skonfiguruj",
+            "configure": "konfiguruj",
             "configured": "skonfigurowany"
         }
     },
diff --git a/homeassistant/components/control4/translations/cs.json b/homeassistant/components/control4/translations/cs.json
new file mode 100644
index 00000000000..c54454e9afe
--- /dev/null
+++ b/homeassistant/components/control4/translations/cs.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "IP adresa",
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/control4/translations/et.json b/homeassistant/components/control4/translations/et.json
new file mode 100644
index 00000000000..118fae3ecae
--- /dev/null
+++ b/homeassistant/components/control4/translations/et.json
@@ -0,0 +1,31 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "IP aadress",
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "description": "Sisesta oma Control4 konto andmed ja kohaliku kontrolleri IP-aadress."
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Sekundeid v\u00e4rskenduste vahel"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/control4/translations/nl.json b/homeassistant/components/control4/translations/nl.json
index 4d00f0bfc74..1cc1070f6b9 100644
--- a/homeassistant/components/control4/translations/nl.json
+++ b/homeassistant/components/control4/translations/nl.json
@@ -3,6 +3,7 @@
         "step": {
             "user": {
                 "data": {
+                    "host": "IP-adres",
                     "username": "Gebruikersnaam"
                 }
             }
diff --git a/homeassistant/components/control4/translations/no.json b/homeassistant/components/control4/translations/no.json
index bc6bcc64462..34c481a8140 100644
--- a/homeassistant/components/control4/translations/no.json
+++ b/homeassistant/components/control4/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
diff --git a/homeassistant/components/control4/translations/pl.json b/homeassistant/components/control4/translations/pl.json
index 0076cfb69dd..b5812564ece 100644
--- a/homeassistant/components/control4/translations/pl.json
+++ b/homeassistant/components/control4/translations/pl.json
@@ -12,8 +12,8 @@
             "user": {
                 "data": {
                     "host": "Adres IP",
-                    "password": "[%key_id:common::config_flow::data::password%]",
-                    "username": "[%key_id:common::config_flow::data::username%]"
+                    "password": "Has\u0142o",
+                    "username": "Nazwa u\u017cytkownika"
                 },
                 "description": "Prosz\u0119 wprowadzi\u0107 dane swojego konta Control4 oraz adres IP lokalnego kontrolera."
             }
diff --git a/homeassistant/components/control4/translations/zh-Hans.json b/homeassistant/components/control4/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/control4/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/conversation/default_agent.py b/homeassistant/components/conversation/default_agent.py
index 2f09cba2eb1..d2dcf13a62a 100644
--- a/homeassistant/components/conversation/default_agent.py
+++ b/homeassistant/components/conversation/default_agent.py
@@ -1,5 +1,4 @@
 """Standard conversastion implementation for Home Assistant."""
-import logging
 import re
 from typing import Optional
 
@@ -18,8 +17,6 @@ from .agent import AbstractConversationAgent
 from .const import DOMAIN
 from .util import create_matcher
 
-_LOGGER = logging.getLogger(__name__)
-
 REGEX_TURN_COMMAND = re.compile(r"turn (?P<name>(?: |\w)+) (?P<command>\w+)")
 REGEX_TYPE = type(re.compile(""))
 
diff --git a/homeassistant/components/coolmaster/climate.py b/homeassistant/components/coolmaster/climate.py
index 77afd85395a..7077854a768 100644
--- a/homeassistant/components/coolmaster/climate.py
+++ b/homeassistant/components/coolmaster/climate.py
@@ -14,6 +14,7 @@ from homeassistant.components.climate.const import (
     SUPPORT_TARGET_TEMPERATURE,
 )
 from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.core import callback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_SUPPORTED_MODES, DATA_COORDINATOR, DATA_INFO, DOMAIN
@@ -66,15 +67,10 @@ class CoolmasterClimate(CoordinatorEntity, ClimateEntity):
         self._hvac_modes = supported_modes
         self._info = info
 
-    def _refresh_from_coordinator(self):
+    @callback
+    def _handle_coordinator_update(self):
         self._unit = self.coordinator.data[self._unit_id]
-        self.async_write_ha_state()
-
-    async def async_added_to_hass(self):
-        """When entity is added to hass."""
-        self.async_on_remove(
-            self.coordinator.async_add_listener(self._refresh_from_coordinator)
-        )
+        super()._handle_coordinator_update()
 
     @property
     def device_info(self):
diff --git a/homeassistant/components/coolmaster/config_flow.py b/homeassistant/components/coolmaster/config_flow.py
index c674146fd15..7c9b4d5d065 100644
--- a/homeassistant/components/coolmaster/config_flow.py
+++ b/homeassistant/components/coolmaster/config_flow.py
@@ -54,7 +54,7 @@ class CoolmasterConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             if not result:
                 errors["base"] = "no_units"
         except (OSError, ConnectionRefusedError, TimeoutError):
-            errors["base"] = "connection_error"
+            errors["base"] = "cannot_connect"
 
         if errors:
             return self.async_show_form(
diff --git a/homeassistant/components/coolmaster/strings.json b/homeassistant/components/coolmaster/strings.json
index fd91e5576d2..7afc012a191 100644
--- a/homeassistant/components/coolmaster/strings.json
+++ b/homeassistant/components/coolmaster/strings.json
@@ -15,8 +15,8 @@
       }
     },
     "error": {
-      "connection_error": "Failed to connect to CoolMasterNet instance. Please check your host.",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "no_units": "Could not find any HVAC units in CoolMasterNet host."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/coolmaster/translations/ca.json b/homeassistant/components/coolmaster/translations/ca.json
index fb256e52f88..40186987031 100644
--- a/homeassistant/components/coolmaster/translations/ca.json
+++ b/homeassistant/components/coolmaster/translations/ca.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar amb la inst\u00e0ncia de CoolMasterNet. Comprova l'amfitri\u00f3.",
             "no_units": "No s'ha pogut trobar cap unitat d'HVAC a l'amfitri\u00f3 de CoolMasterNet."
         },
diff --git a/homeassistant/components/coolmaster/translations/cs.json b/homeassistant/components/coolmaster/translations/cs.json
index 56e7d591d6b..2f65198b6b4 100644
--- a/homeassistant/components/coolmaster/translations/cs.json
+++ b/homeassistant/components/coolmaster/translations/cs.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "connection_error": "Nepoda\u0159ilo se p\u0159ipojit k instanci CoolMasterNet. Zkontrolujte pros\u00edm sv\u00e9ho hostitele.",
             "no_units": "V hostiteli CoolMasterNet nelze naj\u00edt \u017e\u00e1dn\u00e9 jednotky HVAC."
         },
diff --git a/homeassistant/components/coolmaster/translations/el.json b/homeassistant/components/coolmaster/translations/el.json
new file mode 100644
index 00000000000..04b238a916d
--- /dev/null
+++ b/homeassistant/components/coolmaster/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/coolmaster/translations/en.json b/homeassistant/components/coolmaster/translations/en.json
index 6c09ceb725b..3e69c5c82fd 100644
--- a/homeassistant/components/coolmaster/translations/en.json
+++ b/homeassistant/components/coolmaster/translations/en.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect to CoolMasterNet instance. Please check your host.",
             "no_units": "Could not find any HVAC units in CoolMasterNet host."
         },
diff --git a/homeassistant/components/coolmaster/translations/es.json b/homeassistant/components/coolmaster/translations/es.json
index 6835914c513..3d5524d1f13 100644
--- a/homeassistant/components/coolmaster/translations/es.json
+++ b/homeassistant/components/coolmaster/translations/es.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "Error al conectarse a la instancia de CoolMasterNet. Por favor revise su anfitri\u00f3n.",
             "no_units": "No se ha encontrado ninguna unidad HVAC en el host CoolMasterNet."
         },
diff --git a/homeassistant/components/coolmaster/translations/et.json b/homeassistant/components/coolmaster/translations/et.json
new file mode 100644
index 00000000000..f4e0eb74c94
--- /dev/null
+++ b/homeassistant/components/coolmaster/translations/et.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "CoolMasterNet'iga \u00fchenduse loomine nurjus. Palun kontrolli hosti andmeid.",
+            "no_units": "CoolMasterNet'ist ei leitud \u00fchtegi HVAC seadet."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "cool": "Kasuta jahutusre\u017eiimi",
+                    "dry": "Kasuta kuivatusre\u017eiimi",
+                    "fan_only": "Kasuta ventilatsioonire\u017eiimi",
+                    "heat": "Kasuta k\u00fcttere\u017eiimi",
+                    "heat_cool": "Kasuta automaatset k\u00fctte / jahutuse re\u017eiimi",
+                    "host": "",
+                    "off": "Saab v\u00e4lja l\u00fclitada"
+                },
+                "title": "Seadista oma CoolMasterNet'i \u00fchenduse \u00fcksikasjad."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/coolmaster/translations/fr.json b/homeassistant/components/coolmaster/translations/fr.json
index f790e018718..2028043dc3e 100644
--- a/homeassistant/components/coolmaster/translations/fr.json
+++ b/homeassistant/components/coolmaster/translations/fr.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "\u00c9chec de la connexion \u00e0 l'instance CoolMasterNet. S'il vous pla\u00eet v\u00e9rifier votre h\u00f4te.",
             "no_units": "Impossible de trouver des unit\u00e9s HVAC dans l'h\u00f4te CoolMasterNet."
         },
diff --git a/homeassistant/components/coolmaster/translations/it.json b/homeassistant/components/coolmaster/translations/it.json
index 33ac306ce1a..0e7814581e3 100644
--- a/homeassistant/components/coolmaster/translations/it.json
+++ b/homeassistant/components/coolmaster/translations/it.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi all'istanza CoolMasterNet. Controlla il tuo host.",
             "no_units": "Impossibile trovare alcuna unit\u00e0 HVAC nell'host CoolMasterNet."
         },
diff --git a/homeassistant/components/coolmaster/translations/lb.json b/homeassistant/components/coolmaster/translations/lb.json
index e010aeb3e66..bcb77aa2a4e 100644
--- a/homeassistant/components/coolmaster/translations/lb.json
+++ b/homeassistant/components/coolmaster/translations/lb.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbanne mat der CoolMasterNet Instanz. Iwwerpr\u00e9ift w.e.g. \u00e4ren Apparat.",
             "no_units": "Konnt keng HVAC Eenheeten am CoolMasterNet Apparat fannen."
         },
diff --git a/homeassistant/components/coolmaster/translations/nl.json b/homeassistant/components/coolmaster/translations/nl.json
index 46fb120375a..ca44d4aef02 100644
--- a/homeassistant/components/coolmaster/translations/nl.json
+++ b/homeassistant/components/coolmaster/translations/nl.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kan geen verbinding maken met CoolMasterNet-instantie. Controleer uw host",
             "no_units": "Kon geen HVAC units vinden in CoolMasterNet host."
         },
diff --git a/homeassistant/components/coolmaster/translations/no.json b/homeassistant/components/coolmaster/translations/no.json
index 328b113a182..7b4b2159e07 100644
--- a/homeassistant/components/coolmaster/translations/no.json
+++ b/homeassistant/components/coolmaster/translations/no.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kunne ikke koble til CoolMasterNet-forekomsten. Sjekk verten din.",
             "no_units": "Kunne ikke finne noen HVAC-enheter i CoolMasterNet vert."
         },
diff --git a/homeassistant/components/coolmaster/translations/pl.json b/homeassistant/components/coolmaster/translations/pl.json
index 9b0e4bc5846..fce8f840f5d 100644
--- a/homeassistant/components/coolmaster/translations/pl.json
+++ b/homeassistant/components/coolmaster/translations/pl.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "error": {
-            "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 z CoolMasterNet. Sprawd\u017a adres hosta.",
-            "no_units": "Nie mo\u017cna znale\u017a\u0107 urz\u0105dze\u0144 HVAC na ho\u015bcie CoolMasterNet."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 z CoolMasterNet. Sprawd\u017a adres hosta",
+            "no_units": "Nie mo\u017cna znale\u017a\u0107 urz\u0105dze\u0144 HVAC na ho\u015bcie CoolMasterNet"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/coolmaster/translations/ru.json b/homeassistant/components/coolmaster/translations/ru.json
index 993a66539b2..3c508e80ab3 100644
--- a/homeassistant/components/coolmaster/translations/ru.json
+++ b/homeassistant/components/coolmaster/translations/ru.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0430\u0434\u0440\u0435\u0441 \u0445\u043e\u0441\u0442\u0430.",
             "no_units": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043e\u0442\u043e\u043f\u043b\u0435\u043d\u0438\u044f, \u0432\u0435\u043d\u0442\u0438\u043b\u044f\u0446\u0438\u0438 \u0438 \u043a\u043e\u043d\u0434\u0438\u0446\u0438\u043e\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f."
         },
diff --git a/homeassistant/components/coolmaster/translations/zh-Hans.json b/homeassistant/components/coolmaster/translations/zh-Hans.json
new file mode 100644
index 00000000000..c296a15219e
--- /dev/null
+++ b/homeassistant/components/coolmaster/translations/zh-Hans.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "off": "\u53ef\u4ee5\u5173\u95ed"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/coolmaster/translations/zh-Hant.json b/homeassistant/components/coolmaster/translations/zh-Hant.json
index a96bf8bd432..e3d6fc83db7 100644
--- a/homeassistant/components/coolmaster/translations/zh-Hant.json
+++ b/homeassistant/components/coolmaster/translations/zh-Hant.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "\u9023\u7dda\u81f3 CoolMasterNet \u5931\u6557\uff0c\u8acb\u6aa2\u67e5\u4e3b\u6a5f\u7aef\u3002",
             "no_units": "\u7121\u6cd5\u65bc CoolMasterNet \u4e3b\u6a5f\u627e\u5230\u4efb\u4f55 HVAC \u8a2d\u5099\u3002"
         },
diff --git a/homeassistant/components/coronavirus/config_flow.py b/homeassistant/components/coronavirus/config_flow.py
index 49183dd028e..ccf2e7f2c75 100644
--- a/homeassistant/components/coronavirus/config_flow.py
+++ b/homeassistant/components/coronavirus/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow for Coronavirus integration."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -8,8 +6,6 @@ from homeassistant import config_entries
 from . import get_coordinator
 from .const import DOMAIN, OPTION_WORLDWIDE  # pylint:disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Coronavirus."""
diff --git a/homeassistant/components/coronavirus/strings.json b/homeassistant/components/coronavirus/strings.json
index 949034e6bc7..6a5b2626003 100644
--- a/homeassistant/components/coronavirus/strings.json
+++ b/homeassistant/components/coronavirus/strings.json
@@ -6,6 +6,8 @@
         "data": { "country": "Country" }
       }
     },
-    "abort": { "already_configured": "This country is already configured." }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    }
   }
 }
diff --git a/homeassistant/components/coronavirus/translations/ca.json b/homeassistant/components/coronavirus/translations/ca.json
index c44da0ab21a..82e46a209d0 100644
--- a/homeassistant/components/coronavirus/translations/ca.json
+++ b/homeassistant/components/coronavirus/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest pa\u00eds ja est\u00e0 configurat."
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/coronavirus/translations/cs.json b/homeassistant/components/coronavirus/translations/cs.json
new file mode 100644
index 00000000000..744f0e158ac
--- /dev/null
+++ b/homeassistant/components/coronavirus/translations/cs.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "country": "Zem\u011b"
+                },
+                "title": "Vyberte zemi, kterou chcete sledovat"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/coronavirus/translations/en.json b/homeassistant/components/coronavirus/translations/en.json
index f388c734351..cbd057bfce1 100644
--- a/homeassistant/components/coronavirus/translations/en.json
+++ b/homeassistant/components/coronavirus/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This country is already configured."
+            "already_configured": "Service is already configured"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/coronavirus/translations/es.json b/homeassistant/components/coronavirus/translations/es.json
index 91bd835de7e..8363007d85a 100644
--- a/homeassistant/components/coronavirus/translations/es.json
+++ b/homeassistant/components/coronavirus/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Este pa\u00eds ya est\u00e1 configurado."
+            "already_configured": "El servicio ya est\u00e1 configurado"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/coronavirus/translations/et.json b/homeassistant/components/coronavirus/translations/et.json
index a69b845e623..880ada2e7c2 100644
--- a/homeassistant/components/coronavirus/translations/et.json
+++ b/homeassistant/components/coronavirus/translations/et.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "See riik on juba seadistatud."
+            "already_configured": "Teenus on juba seadistatud"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/coronavirus/translations/it.json b/homeassistant/components/coronavirus/translations/it.json
index 26b40e06ebd..8cc2065b94a 100644
--- a/homeassistant/components/coronavirus/translations/it.json
+++ b/homeassistant/components/coronavirus/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questa Nazione \u00e8 gi\u00e0 configurata."
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/coronavirus/translations/no.json b/homeassistant/components/coronavirus/translations/no.json
index 359f15b3323..bf111868e4b 100644
--- a/homeassistant/components/coronavirus/translations/no.json
+++ b/homeassistant/components/coronavirus/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Dette landet er allerede konfigurert."
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/coronavirus/translations/pl.json b/homeassistant/components/coronavirus/translations/pl.json
index 4660aa81ca6..f901f258682 100644
--- a/homeassistant/components/coronavirus/translations/pl.json
+++ b/homeassistant/components/coronavirus/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ten kraj jest ju\u017c skonfigurowany."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/coronavirus/translations/ru.json b/homeassistant/components/coronavirus/translations/ru.json
index 7a39c547c82..e7e6798f6a4 100644
--- a/homeassistant/components/coronavirus/translations/ru.json
+++ b/homeassistant/components/coronavirus/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/coronavirus/translations/zh-Hant.json b/homeassistant/components/coronavirus/translations/zh-Hant.json
index 22d5b893e42..9e2ed171453 100644
--- a/homeassistant/components/coronavirus/translations/zh-Hant.json
+++ b/homeassistant/components/coronavirus/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u570b\u5bb6\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/cover/__init__.py b/homeassistant/components/cover/__init__.py
index f1039505f82..c63963c87dc 100644
--- a/homeassistant/components/cover/__init__.py
+++ b/homeassistant/components/cover/__init__.py
@@ -248,7 +248,7 @@ class CoverEntity(Entity):
 
     async def async_open_cover(self, **kwargs):
         """Open the cover."""
-        await self.hass.async_add_job(ft.partial(self.open_cover, **kwargs))
+        await self.hass.async_add_executor_job(ft.partial(self.open_cover, **kwargs))
 
     def close_cover(self, **kwargs: Any) -> None:
         """Close cover."""
@@ -256,7 +256,7 @@ class CoverEntity(Entity):
 
     async def async_close_cover(self, **kwargs):
         """Close cover."""
-        await self.hass.async_add_job(ft.partial(self.close_cover, **kwargs))
+        await self.hass.async_add_executor_job(ft.partial(self.close_cover, **kwargs))
 
     def toggle(self, **kwargs: Any) -> None:
         """Toggle the entity."""
@@ -277,35 +277,41 @@ class CoverEntity(Entity):
 
     async def async_set_cover_position(self, **kwargs):
         """Move the cover to a specific position."""
-        await self.hass.async_add_job(ft.partial(self.set_cover_position, **kwargs))
+        await self.hass.async_add_executor_job(
+            ft.partial(self.set_cover_position, **kwargs)
+        )
 
     def stop_cover(self, **kwargs):
         """Stop the cover."""
 
     async def async_stop_cover(self, **kwargs):
         """Stop the cover."""
-        await self.hass.async_add_job(ft.partial(self.stop_cover, **kwargs))
+        await self.hass.async_add_executor_job(ft.partial(self.stop_cover, **kwargs))
 
     def open_cover_tilt(self, **kwargs: Any) -> None:
         """Open the cover tilt."""
 
     async def async_open_cover_tilt(self, **kwargs):
         """Open the cover tilt."""
-        await self.hass.async_add_job(ft.partial(self.open_cover_tilt, **kwargs))
+        await self.hass.async_add_executor_job(
+            ft.partial(self.open_cover_tilt, **kwargs)
+        )
 
     def close_cover_tilt(self, **kwargs: Any) -> None:
         """Close the cover tilt."""
 
     async def async_close_cover_tilt(self, **kwargs):
         """Close the cover tilt."""
-        await self.hass.async_add_job(ft.partial(self.close_cover_tilt, **kwargs))
+        await self.hass.async_add_executor_job(
+            ft.partial(self.close_cover_tilt, **kwargs)
+        )
 
     def set_cover_tilt_position(self, **kwargs):
         """Move the cover tilt to a specific position."""
 
     async def async_set_cover_tilt_position(self, **kwargs):
         """Move the cover tilt to a specific position."""
-        await self.hass.async_add_job(
+        await self.hass.async_add_executor_job(
             ft.partial(self.set_cover_tilt_position, **kwargs)
         )
 
@@ -314,7 +320,9 @@ class CoverEntity(Entity):
 
     async def async_stop_cover_tilt(self, **kwargs):
         """Stop the cover."""
-        await self.hass.async_add_job(ft.partial(self.stop_cover_tilt, **kwargs))
+        await self.hass.async_add_executor_job(
+            ft.partial(self.stop_cover_tilt, **kwargs)
+        )
 
     def toggle_tilt(self, **kwargs: Any) -> None:
         """Toggle the entity."""
diff --git a/homeassistant/components/cover/translations/cs.json b/homeassistant/components/cover/translations/cs.json
index b093fb9f214..c0d416fb1c3 100644
--- a/homeassistant/components/cover/translations/cs.json
+++ b/homeassistant/components/cover/translations/cs.json
@@ -1,6 +1,12 @@
 {
     "device_automation": {
         "action_type": {
+            "close": "Zav\u0159\u00edt {entity_name}",
+            "close_tilt": "Sn\u00ed\u017eit n\u00e1klon {entity_name}",
+            "open": "Otev\u0159\u00edt {entity_name}",
+            "open_tilt": "Zv\u00fd\u0161it n\u00e1klon {entity_name}",
+            "set_position": "Nastavit pozici {entity_name}",
+            "set_tilt_position": "Nastavit n\u00e1klon {entity_name}",
             "stop": "Zastavit {entity_name}"
         },
         "condition_type": {
@@ -8,16 +14,24 @@
             "is_closing": "{entity_name} se zav\u00edr\u00e1",
             "is_open": "{entity_name} je otev\u0159eno",
             "is_opening": "{entity_name} se otev\u00edr\u00e1",
-            "is_position": "pozice {entity_name} je",
-            "is_tilt_position": "pozice naklon\u011bn\u00ed {entity_name} je"
+            "is_position": "Pozice {entity_name} je",
+            "is_tilt_position": "N\u00e1klon {entity_name} je"
+        },
+        "trigger_type": {
+            "closed": "{entity_name} zav\u0159eno",
+            "closing": "{entity_name} se zav\u00edr\u00e1",
+            "opened": "{entity_name} otev\u0159ena",
+            "opening": "{entity_name} se otv\u00edr\u00e1",
+            "position": "P\u0159i zm\u011bn\u011b pozice {entity_name}",
+            "tilt_position": "P\u0159i zm\u011bn\u011b n\u00e1klonu {entity_name}"
         }
     },
     "state": {
         "_": {
             "closed": "Zav\u0159eno",
-            "closing": "Zav\u00edr\u00e1n\u00ed",
+            "closing": "Zav\u00edr\u00e1 se",
             "open": "Otev\u0159eno",
-            "opening": "Otev\u00edr\u00e1n\u00ed",
+            "opening": "Otev\u00edr\u00e1 se",
             "stopped": "Zastaveno"
         }
     },
diff --git a/homeassistant/components/cover/translations/pl.json b/homeassistant/components/cover/translations/pl.json
index 74f8d3860cb..a1b92a25337 100644
--- a/homeassistant/components/cover/translations/pl.json
+++ b/homeassistant/components/cover/translations/pl.json
@@ -6,7 +6,8 @@
             "open": "otw\u00f3rz {entity_name}",
             "open_tilt": "otw\u00f3rz {entity_name} do pochylenia",
             "set_position": "ustaw pozycj\u0119 {entity_name}",
-            "set_tilt_position": "ustaw pochylenie {entity_name}"
+            "set_tilt_position": "ustaw pochylenie {entity_name}",
+            "stop": "zatrzymaj {entity_name}"
         },
         "condition_type": {
             "is_closed": "{entity_name} jest zamkni\u0119ta",
diff --git a/homeassistant/components/cover/translations/ru.json b/homeassistant/components/cover/translations/ru.json
index 9b302e0e52a..21bbe7e2c4d 100644
--- a/homeassistant/components/cover/translations/ru.json
+++ b/homeassistant/components/cover/translations/ru.json
@@ -1,13 +1,13 @@
 {
     "device_automation": {
         "action_type": {
-            "close": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c {entity_name}",
-            "close_tilt": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c {entity_name} \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043d\u0430\u043a\u043b\u043e\u043d\u0430",
-            "open": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c {entity_name}",
-            "open_tilt": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c {entity_name} \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043d\u0430\u043a\u043b\u043e\u043d\u0430",
-            "set_position": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 {entity_name}",
-            "set_tilt_position": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043d\u0430\u043a\u043b\u043e\u043d\u0430 {entity_name}",
-            "stop": "\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c {entity_name}"
+            "close": "{entity_name}: \u0437\u0430\u043a\u0440\u044b\u0442\u044c",
+            "close_tilt": "{entity_name}: \u0437\u0430\u043a\u0440\u044b\u0442\u044c \u043b\u0430\u043c\u0435\u043b\u0438",
+            "open": "{entity_name}: \u043e\u0442\u043a\u0440\u044b\u0442\u044c",
+            "open_tilt": "{entity_name}: \u043e\u0442\u043a\u0440\u044b\u0442\u044c \u043b\u0430\u043c\u0435\u043b\u0438",
+            "set_position": "{entity_name}: \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435",
+            "set_tilt_position": "{entity_name}: \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043d\u0430\u043a\u043b\u043e\u043d \u043b\u0430\u043c\u0435\u043b\u0435\u0439",
+            "stop": "{entity_name}: \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c"
         },
         "condition_type": {
             "is_closed": "{entity_name} \u0432 \u0437\u0430\u043a\u0440\u044b\u0442\u043e\u043c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438",
diff --git a/homeassistant/components/cover/translations/zh-Hans.json b/homeassistant/components/cover/translations/zh-Hans.json
index 2929a2cd33e..0ff73407298 100644
--- a/homeassistant/components/cover/translations/zh-Hans.json
+++ b/homeassistant/components/cover/translations/zh-Hans.json
@@ -1,4 +1,12 @@
 {
+    "device_automation": {
+        "condition_type": {
+            "is_closed": "{entity_name} \u5df2\u5173\u95ed"
+        },
+        "trigger_type": {
+            "closed": "{entity_name}\u5df2\u5173\u95ed"
+        }
+    },
     "state": {
         "_": {
             "closed": "\u5df2\u5173\u95ed",
diff --git a/homeassistant/components/cpuspeed/sensor.py b/homeassistant/components/cpuspeed/sensor.py
index 4f352900012..df1a224bcce 100644
--- a/homeassistant/components/cpuspeed/sensor.py
+++ b/homeassistant/components/cpuspeed/sensor.py
@@ -1,6 +1,4 @@
 """Support for displaying the current CPU speed."""
-import logging
-
 from cpuinfo import cpuinfo
 import voluptuous as vol
 
@@ -9,8 +7,6 @@ from homeassistant.const import CONF_NAME, FREQUENCY_GIGAHERTZ
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_BRAND = "brand"
 ATTR_HZ = "ghz_advertised"
 ATTR_ARCH = "arch"
diff --git a/homeassistant/components/crimereports/sensor.py b/homeassistant/components/crimereports/sensor.py
index ff65658073f..8919b2d09b1 100644
--- a/homeassistant/components/crimereports/sensor.py
+++ b/homeassistant/components/crimereports/sensor.py
@@ -1,7 +1,6 @@
 """Sensor for Crime Reports."""
 from collections import defaultdict
 from datetime import timedelta
-import logging
 
 import crimereports
 import voluptuous as vol
@@ -26,8 +25,6 @@ from homeassistant.util import slugify
 from homeassistant.util.distance import convert
 from homeassistant.util.dt import now
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "crimereports"
 
 EVENT_INCIDENT = f"{DOMAIN}_incident"
diff --git a/homeassistant/components/daikin/__init__.py b/homeassistant/components/daikin/__init__.py
index 65a3bf28c3b..7b9c1ded673 100644
--- a/homeassistant/components/daikin/__init__.py
+++ b/homeassistant/components/daikin/__init__.py
@@ -9,7 +9,7 @@ from pydaikin.daikin_base import Appliance
 import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_HOSTS, CONF_PASSWORD
+from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_HOSTS, CONF_PASSWORD
 from homeassistant.exceptions import ConfigEntryNotReady
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
@@ -17,7 +17,7 @@ from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.util import Throttle
 
 from . import config_flow  # noqa: F401
-from .const import CONF_KEY, CONF_UUID, KEY_MAC, TIMEOUT
+from .const import CONF_UUID, KEY_MAC, TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -77,7 +77,7 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
     daikin_api = await daikin_api_setup(
         hass,
         conf[CONF_HOST],
-        conf.get(CONF_KEY),
+        conf.get(CONF_API_KEY),
         conf.get(CONF_UUID),
         conf.get(CONF_PASSWORD),
     )
diff --git a/homeassistant/components/daikin/config_flow.py b/homeassistant/components/daikin/config_flow.py
index 7142771a7c3..b9956a87af0 100644
--- a/homeassistant/components/daikin/config_flow.py
+++ b/homeassistant/components/daikin/config_flow.py
@@ -10,9 +10,9 @@ from pydaikin.discovery import Discovery
 import voluptuous as vol
 
 from homeassistant import config_entries
-from homeassistant.const import CONF_HOST, CONF_PASSWORD
+from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PASSWORD
 
-from .const import CONF_KEY, CONF_UUID, KEY_IP, KEY_MAC, TIMEOUT
+from .const import CONF_UUID, KEY_IP, KEY_MAC, TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -34,7 +34,7 @@ class FlowHandler(config_entries.ConfigFlow):
         return vol.Schema(
             {
                 vol.Required(CONF_HOST, default=self.host): str,
-                vol.Optional(CONF_KEY): str,
+                vol.Optional(CONF_API_KEY): str,
                 vol.Optional(CONF_PASSWORD): str,
             }
         )
@@ -50,7 +50,7 @@ class FlowHandler(config_entries.ConfigFlow):
             data={
                 CONF_HOST: host,
                 KEY_MAC: mac,
-                CONF_KEY: key,
+                CONF_API_KEY: key,
                 CONF_UUID: uuid,
                 CONF_PASSWORD: password,
             },
@@ -81,27 +81,27 @@ class FlowHandler(config_entries.ConfigFlow):
             return self.async_show_form(
                 step_id="user",
                 data_schema=self.schema,
-                errors={"base": "device_timeout"},
+                errors={"base": "cannot_connect"},
             )
         except web_exceptions.HTTPForbidden:
             return self.async_show_form(
                 step_id="user",
                 data_schema=self.schema,
-                errors={"base": "forbidden"},
+                errors={"base": "invalid_auth"},
             )
         except ClientError:
             _LOGGER.exception("ClientError")
             return self.async_show_form(
                 step_id="user",
                 data_schema=self.schema,
-                errors={"base": "device_fail"},
+                errors={"base": "unknown"},
             )
         except Exception:  # pylint: disable=broad-except
             _LOGGER.exception("Unexpected error creating device")
             return self.async_show_form(
                 step_id="user",
                 data_schema=self.schema,
-                errors={"base": "device_fail"},
+                errors={"base": "unknown"},
             )
 
         mac = device.mac
@@ -113,7 +113,7 @@ class FlowHandler(config_entries.ConfigFlow):
             return self.async_show_form(step_id="user", data_schema=self.schema)
         return await self._create_device(
             user_input[CONF_HOST],
-            user_input.get(CONF_KEY),
+            user_input.get(CONF_API_KEY),
             user_input.get(CONF_PASSWORD),
         )
 
diff --git a/homeassistant/components/daikin/const.py b/homeassistant/components/daikin/const.py
index 6662954c1dc..00bbbefd051 100644
--- a/homeassistant/components/daikin/const.py
+++ b/homeassistant/components/daikin/const.py
@@ -76,7 +76,6 @@ SENSOR_TYPES = {
     },
 }
 
-CONF_KEY = "key"
 CONF_UUID = "uuid"
 
 KEY_MAC = "mac"
diff --git a/homeassistant/components/daikin/sensor.py b/homeassistant/components/daikin/sensor.py
index 73cadba9e45..80de4ed34a5 100644
--- a/homeassistant/components/daikin/sensor.py
+++ b/homeassistant/components/daikin/sensor.py
@@ -1,6 +1,4 @@
 """Support for Daikin AC sensors."""
-import logging
-
 from homeassistant.const import (
     CONF_DEVICE_CLASS,
     CONF_ICON,
@@ -26,8 +24,6 @@ from .const import (
     SENSOR_TYPES,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Old way of setting up the Daikin sensors.
diff --git a/homeassistant/components/daikin/strings.json b/homeassistant/components/daikin/strings.json
index a8ebe0911b6..fc2b6e79a5e 100644
--- a/homeassistant/components/daikin/strings.json
+++ b/homeassistant/components/daikin/strings.json
@@ -3,10 +3,10 @@
     "step": {
       "user": {
         "title": "Configure Daikin AC",
-        "description": "Enter IP address of your Daikin AC.\n\nNote that [%key:common::config_flow::data::api_key%] and [%key:common::config_flow::data::password%] are used by BRP072Cxx and SKYFi devices respectively.",
+        "description": "Enter [%key:common::config_flow::data::ip%] of your Daikin AC.\n\nNote that [%key:common::config_flow::data::api_key%] and [%key:common::config_flow::data::password%] only are used by BRP072Cxx and SKYFi devices respectively.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
-          "key": "[%key:common::config_flow::data::api_key%]",
+          "api_key": "[%key:common::config_flow::data::api_key%]",
           "password": "[%key:common::config_flow::data::password%]"
         }
       }
@@ -16,9 +16,9 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "error": {
-      "device_fail": "[%key:common::config_flow::error::unknown%]",
-      "forbidden": "[%key:common::config_flow::error::invalid_auth%]",
-      "device_timeout": "[%key:common::config_flow::error::cannot_connect%]"
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   }
 }
diff --git a/homeassistant/components/daikin/switch.py b/homeassistant/components/daikin/switch.py
index 0dae8848d39..b39d7f27c55 100644
--- a/homeassistant/components/daikin/switch.py
+++ b/homeassistant/components/daikin/switch.py
@@ -1,12 +1,8 @@
 """Support for Daikin AirBase zones."""
-import logging
-
 from homeassistant.helpers.entity import ToggleEntity
 
 from . import DOMAIN as DAIKIN_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 ZONE_ICON = "mdi:home-circle"
 
 
diff --git a/homeassistant/components/daikin/translations/ca.json b/homeassistant/components/daikin/translations/ca.json
index 8233287e0d7..eecb0026fe3 100644
--- a/homeassistant/components/daikin/translations/ca.json
+++ b/homeassistant/components/daikin/translations/ca.json
@@ -5,18 +5,22 @@
             "cannot_connect": "Ha fallat la connexi\u00f3"
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "device_fail": "Error inesperat",
             "device_timeout": "Ha fallat la connexi\u00f3",
-            "forbidden": "Autenticaci\u00f3 inv\u00e0lida"
+            "forbidden": "Autenticaci\u00f3 inv\u00e0lida",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
+            "unknown": "Error inesperat"
         },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "Clau API",
                     "host": "Amfitri\u00f3",
                     "key": "Clau API",
                     "password": "Contrasenya"
                 },
-                "description": "Introdueix l'adre\u00e7a IP del teu AC Daikin.\n\nTingues en compte que la Clau API i la Contrasenya s'utilitzen als dispositius BRP072Cxx i SKYFi respectivament.",
+                "description": "Introdueix l'Adre\u00e7a IP del teu AC Daikin.\n\nTingues en compte que la Clau API i la Contrasenya s'utilitzen nom\u00e9s als dispositius BRP072Cxx i SKYFi respectivament.",
                 "title": "Configuraci\u00f3 de Daikin AC"
             }
         }
diff --git a/homeassistant/components/daikin/translations/cs.json b/homeassistant/components/daikin/translations/cs.json
index ad0a820e599..2fe8f6378a0 100644
--- a/homeassistant/components/daikin/translations/cs.json
+++ b/homeassistant/components/daikin/translations/cs.json
@@ -1,21 +1,27 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
         },
         "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "device_fail": "Neo\u010dek\u00e1van\u00e1 chyba",
             "device_timeout": "Nepoda\u0159ilo se p\u0159ipojit",
-            "forbidden": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+            "forbidden": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "Kl\u00ed\u010d API",
                     "host": "Hostitel",
                     "key": "Kl\u00ed\u010d API",
                     "password": "Heslo"
                 },
-                "description": "Zadejte IP adresu va\u0161eho Daikin AC. \n\n V\u0161imn\u011bte si, \u017ee Kl\u00ed\u010d API a Heslo pou\u017e\u00edvaj\u00ed za\u0159\u00edzen\u00ed BRP072Cxx respektive SKYFi."
+                "description": "Zadejte IP adresu va\u0161eho Daikin AC. \n\nV\u0161imn\u011bte si, \u017ee Kl\u00ed\u010d API a Heslo jsou pou\u017eit\u00e9 za\u0159\u00edzen\u00edm BRP072Cxx, respektive SKYFi.",
+                "title": "Nastaven\u00ed Daikin AC"
             }
         }
     }
diff --git a/homeassistant/components/daikin/translations/de.json b/homeassistant/components/daikin/translations/de.json
index b3b1b10d77a..cebe5f8647e 100644
--- a/homeassistant/components/daikin/translations/de.json
+++ b/homeassistant/components/daikin/translations/de.json
@@ -4,7 +4,8 @@
             "already_configured": "Ger\u00e4t ist bereits konfiguriert"
         },
         "error": {
-            "device_timeout": "Verbindung fehlgeschlagen"
+            "device_timeout": "Verbindung fehlgeschlagen",
+            "unknown": "Unerwarteter Fehler"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/daikin/translations/en.json b/homeassistant/components/daikin/translations/en.json
index 83ac7913f67..f4b2deef9af 100644
--- a/homeassistant/components/daikin/translations/en.json
+++ b/homeassistant/components/daikin/translations/en.json
@@ -5,18 +5,22 @@
             "cannot_connect": "Failed to connect"
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "device_fail": "Unexpected error",
             "device_timeout": "Failed to connect",
-            "forbidden": "Invalid authentication"
+            "forbidden": "Invalid authentication",
+            "invalid_auth": "Invalid authentication",
+            "unknown": "Unexpected error"
         },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "API Key",
                     "host": "Host",
                     "key": "API Key",
                     "password": "Password"
                 },
-                "description": "Enter IP address of your Daikin AC.\n\nNote that API Key and Password are used by BRP072Cxx and SKYFi devices respectively.",
+                "description": "Enter IP Address of your Daikin AC.\n\nNote that API Key and Password only are used by BRP072Cxx and SKYFi devices respectively.",
                 "title": "Configure Daikin AC"
             }
         }
diff --git a/homeassistant/components/daikin/translations/es.json b/homeassistant/components/daikin/translations/es.json
index 9c3b81a3f51..7f690b0a0df 100644
--- a/homeassistant/components/daikin/translations/es.json
+++ b/homeassistant/components/daikin/translations/es.json
@@ -5,18 +5,22 @@
             "cannot_connect": "No se pudo conectar"
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "device_fail": "Error inesperado",
             "device_timeout": "No se pudo conectar",
-            "forbidden": "Autenticaci\u00f3n no v\u00e1lida"
+            "forbidden": "Autenticaci\u00f3n no v\u00e1lida",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
+            "unknown": "Error inesperado"
         },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "Clave API",
                     "host": "Host",
                     "key": "Clave API",
                     "password": "Contrase\u00f1a"
                 },
-                "description": "Introduce la IP de tu aire acondicionado Daikin",
+                "description": "Introduce la direcci\u00f3n IP de tu aire acondicionado Daikin.\n\nTen en cuenta que la Clave API y la Contrase\u00f1a son usadas por los dispositivos BRP072Cxx y SKYFi respectivamente.",
                 "title": "Configurar aire acondicionado Daikin"
             }
         }
diff --git a/homeassistant/components/daikin/translations/et.json b/homeassistant/components/daikin/translations/et.json
new file mode 100644
index 00000000000..85e69c3ac9f
--- /dev/null
+++ b/homeassistant/components/daikin/translations/et.json
@@ -0,0 +1,28 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "device_fail": "Tundmatu viga",
+            "device_timeout": "\u00dchendamine nurjus",
+            "forbidden": "Tuvastamine nurjus",
+            "invalid_auth": "Tuvastamise viga",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API v\u00f5ti",
+                    "host": "",
+                    "key": "API v\u00f5ti",
+                    "password": "Salas\u00f5na"
+                },
+                "description": "Sisesta oma Daikin AC IP aadress.\nPane t\u00e4hele, et API v\u00f5ti ja Salas\u00f5na kasutavad ainult seadmed BRP072Cxx ja SKYFi.",
+                "title": "Seadista Daikin AC"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/daikin/translations/it.json b/homeassistant/components/daikin/translations/it.json
index 07aa45e7d96..6416024224a 100644
--- a/homeassistant/components/daikin/translations/it.json
+++ b/homeassistant/components/daikin/translations/it.json
@@ -5,18 +5,22 @@
             "cannot_connect": "Impossibile connettersi"
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "device_fail": "Errore imprevisto",
             "device_timeout": "Impossibile connettersi",
-            "forbidden": "Autenticazione non valida"
+            "forbidden": "Autenticazione non valida",
+            "invalid_auth": "Autenticazione non valida",
+            "unknown": "Errore imprevisto"
         },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "Chiave API",
                     "host": "Host",
                     "key": "Chiave API",
                     "password": "Password"
                 },
-                "description": "Inserisci l'indirizzo IP del tuo condizionatore d'aria Daikin. \n\nSi noti che Chiave API e Password sono usati rispettivamente dai dispositivi BRP072Cxx e SKYFi.",
+                "description": "Inserire l'Indirizzo IP del tuo condizionatore d'aria Daikin.\n\nNotare che solo la Chiave API e la Password sono rispettivamente usati dai dispositivi BRP072Cxx e SKYFi.",
                 "title": "Configura Daikin AC"
             }
         }
diff --git a/homeassistant/components/daikin/translations/no.json b/homeassistant/components/daikin/translations/no.json
index c06688a7e16..6bcf2b2e77c 100644
--- a/homeassistant/components/daikin/translations/no.json
+++ b/homeassistant/components/daikin/translations/no.json
@@ -2,21 +2,25 @@
     "config": {
         "abort": {
             "already_configured": "Enheten er allerede konfigurert",
-            "cannot_connect": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "device_fail": "Uventet feil",
-            "device_timeout": "Tilkobling mislyktes.",
-            "forbidden": "Ugyldig godkjenning"
+            "device_timeout": "Tilkobling mislyktes",
+            "forbidden": "Ugyldig godkjenning",
+            "invalid_auth": "Ugyldig godkjenning",
+            "unknown": "Uventet feil"
         },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "API-n\u00f8kkel",
                     "host": "Vert",
                     "key": "API-n\u00f8kkel",
                     "password": "Passord"
                 },
-                "description": "Angi IP-adressen til Daikin AC. \n\n Merk at API-n\u00f8kkel og Passord brukes av henholdsvis BRP072Cxx og SKYFi-enheter.",
+                "description": "Skriv inn IP adresse av Daikin AC.\n\n Merk at API-n\u00f8kkel og Passord bare brukes av henholdsvis BRP072Cxx og SKYFi-enheter.",
                 "title": "Konfigurer Daikin AC"
             }
         }
diff --git a/homeassistant/components/daikin/translations/pl.json b/homeassistant/components/daikin/translations/pl.json
index 7b40fa55a1d..f20666fda33 100644
--- a/homeassistant/components/daikin/translations/pl.json
+++ b/homeassistant/components/daikin/translations/pl.json
@@ -5,18 +5,22 @@
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "device_fail": "Nieoczekiwany b\u0142\u0105d",
             "device_timeout": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "forbidden": "Niepoprawne uwierzytelnienie"
+            "forbidden": "Niepoprawne uwierzytelnienie",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "Klucz API",
                     "host": "Nazwa hosta lub adres IP",
                     "key": "Klucz API",
                     "password": "Has\u0142o"
                 },
-                "description": "Wprowad\u017a adres IP Daikin AC.",
+                "description": "Wprowad\u017a adres IP klimatyzacji Daikin.\n\nZwr\u00f3\u0107 uwag\u0119, \u017ce klucz API oraz has\u0142o u\u017cywane s\u0105 odpowiednio tylko przez urz\u0105dzenia BRP072Cxx i SKYFi.",
                 "title": "Konfiguracja Daikin AC"
             }
         }
diff --git a/homeassistant/components/daikin/translations/ru.json b/homeassistant/components/daikin/translations/ru.json
index 32043f257d1..8587232fbbb 100644
--- a/homeassistant/components/daikin/translations/ru.json
+++ b/homeassistant/components/daikin/translations/ru.json
@@ -5,18 +5,22 @@
             "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "device_fail": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
             "device_timeout": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
-            "forbidden": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
+            "forbidden": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "\u041a\u043b\u044e\u0447 API",
                     "host": "\u0425\u043e\u0441\u0442",
                     "key": "\u041a\u043b\u044e\u0447 API",
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c"
                 },
-                "description": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 IP-\u0430\u0434\u0440\u0435\u0441 \u0432\u0430\u0448\u0435\u0433\u043e Daikin AC. \n\n\u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435 \u0432\u043d\u0438\u043c\u0430\u043d\u0438\u0435, \u0447\u0442\u043e \u041a\u043b\u044e\u0447 API \u0438 \u041f\u0430\u0440\u043e\u043b\u044c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0442\u0441\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430\u043c\u0438 BRP072Cxx \u0438 SKYFi \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e.",
+                "description": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 IP-\u0430\u0434\u0440\u0435\u0441 \u0412\u0430\u0448\u0435\u0433\u043e Daikin AC. \n\n\u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435 \u0432\u043d\u0438\u043c\u0430\u043d\u0438\u0435, \u0447\u0442\u043e \u041a\u043b\u044e\u0447 API \u0438 \u041f\u0430\u0440\u043e\u043b\u044c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0442\u0441\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430\u043c\u0438 BRP072Cxx \u0438 SKYFi \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0435\u043d\u043d\u043e.",
                 "title": "Daikin AC"
             }
         }
diff --git a/homeassistant/components/daikin/translations/sv.json b/homeassistant/components/daikin/translations/sv.json
index a704822f0b7..8c3e221f0bc 100644
--- a/homeassistant/components/daikin/translations/sv.json
+++ b/homeassistant/components/daikin/translations/sv.json
@@ -7,6 +7,7 @@
             "user": {
                 "data": {
                     "host": "V\u00e4rddatorn",
+                    "key": "API nyckel",
                     "password": "Enhetsl\u00f6senord (anv\u00e4nds endast av SKYFi-enheter)"
                 },
                 "description": "Ange IP-adressen f\u00f6r din Daikin AC.",
diff --git a/homeassistant/components/daikin/translations/zh-Hans.json b/homeassistant/components/daikin/translations/zh-Hans.json
index 307fd15324a..0acb5110fec 100644
--- a/homeassistant/components/daikin/translations/zh-Hans.json
+++ b/homeassistant/components/daikin/translations/zh-Hans.json
@@ -4,9 +4,14 @@
             "already_configured": "\u8bbe\u5907\u5df2\u914d\u7f6e\u5b8c\u6210",
             "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
         },
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25",
+            "invalid_auth": "\u9a8c\u8bc1\u7801\u9519\u8bef"
+        },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "API\u5bc6\u7801",
                     "host": "\u4e3b\u673a"
                 },
                 "description": "\u8f93\u5165\u60a8\u7684 Daikin \u7a7a\u8c03\u7684 IP \u5730\u5740\u3002",
diff --git a/homeassistant/components/daikin/translations/zh-Hant.json b/homeassistant/components/daikin/translations/zh-Hant.json
index 60ffcb8aba3..6ebd03b4376 100644
--- a/homeassistant/components/daikin/translations/zh-Hant.json
+++ b/homeassistant/components/daikin/translations/zh-Hant.json
@@ -5,18 +5,22 @@
             "cannot_connect": "\u9023\u7dda\u5931\u6557"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "device_fail": "\u672a\u9810\u671f\u932f\u8aa4",
             "device_timeout": "\u9023\u7dda\u5931\u6557",
-            "forbidden": "\u9a57\u8b49\u78bc\u7121\u6548"
+            "forbidden": "\u9a57\u8b49\u78bc\u7121\u6548",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "API \u5bc6\u9470",
                     "host": "\u4e3b\u6a5f\u7aef",
                     "key": "API \u5bc6\u9470",
                     "password": "\u5bc6\u78bc"
                 },
-                "description": "\u8f38\u5165\u60a8\u7684\u5927\u91d1\u7a7a\u8abf IP \u4f4d\u5740\u3002\n\n\u8acb\u6ce8\u610f\uff1aBRP072Cxx \u8207 SKYFi \u8a2d\u5099\u4e4b API \u5bc6\u9470\u8207\u5bc6\u78bc\u70ba\u5206\u958b\u4f7f\u7528\u3002",
+                "description": "\u8f38\u5165\u60a8\u7684\u5927\u91d1\u7a7a\u8abfIP \u4f4d\u5740\u3002\n\n\u8acb\u6ce8\u610f\uff1aBRP072Cxx \u8207 SKYFi \u8a2d\u5099\u4e4b API \u5bc6\u9470\u8207\u5bc6\u78bc\u70ba\u5206\u958b\u4f7f\u7528\u3002",
                 "title": "\u8a2d\u5b9a\u5927\u91d1\u7a7a\u8abf"
             }
         }
diff --git a/homeassistant/components/deconz/binary_sensor.py b/homeassistant/components/deconz/binary_sensor.py
index f7a9c1a5217..5b536aeb74c 100644
--- a/homeassistant/components/deconz/binary_sensor.py
+++ b/homeassistant/components/deconz/binary_sensor.py
@@ -33,10 +33,6 @@ DEVICE_CLASS = {
 }
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Old way of setting up deCONZ platforms."""
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the deCONZ binary sensor."""
     gateway = get_gateway_from_config_entry(hass, config_entry)
@@ -59,7 +55,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             ):
                 entities.append(DeconzBinarySensor(sensor, gateway))
 
-        async_add_entities(entities, True)
+        if entities:
+            async_add_entities(entities)
 
     gateway.listeners.append(
         async_dispatcher_connect(
diff --git a/homeassistant/components/deconz/climate.py b/homeassistant/components/deconz/climate.py
index 10ea7173f8a..4a6f2bd4937 100644
--- a/homeassistant/components/deconz/climate.py
+++ b/homeassistant/components/deconz/climate.py
@@ -16,11 +16,7 @@ from .const import ATTR_OFFSET, ATTR_VALVE, NEW_SENSOR
 from .deconz_device import DeconzDevice
 from .gateway import get_gateway_from_config_entry
 
-SUPPORT_HVAC = [HVAC_MODE_AUTO, HVAC_MODE_HEAT, HVAC_MODE_OFF]
-
-
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Old way of setting up deCONZ platforms."""
+HVAC_MODES = {HVAC_MODE_AUTO: "auto", HVAC_MODE_HEAT: "heat", HVAC_MODE_OFF: "off"}
 
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
@@ -48,7 +44,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             ):
                 entities.append(DeconzThermostat(sensor, gateway))
 
-        async_add_entities(entities, True)
+        if entities:
+            async_add_entities(entities)
 
     gateway.listeners.append(
         async_dispatcher_connect(
@@ -75,19 +72,19 @@ class DeconzThermostat(DeconzDevice, ClimateEntity):
 
         Need to be one of HVAC_MODE_*.
         """
-        if self._device.mode in SUPPORT_HVAC:
-            return self._device.mode
+        for hass_hvac_mode, device_mode in HVAC_MODES.items():
+            if self._device.mode == device_mode:
+                return hass_hvac_mode
+
         if self._device.state_on:
             return HVAC_MODE_HEAT
+
         return HVAC_MODE_OFF
 
     @property
-    def hvac_modes(self):
-        """Return the list of available hvac operation modes.
-
-        Need to be a subset of HVAC_MODES.
-        """
-        return SUPPORT_HVAC
+    def hvac_modes(self) -> list:
+        """Return the list of available hvac operation modes."""
+        return list(HVAC_MODES)
 
     @property
     def current_temperature(self):
@@ -101,21 +98,19 @@ class DeconzThermostat(DeconzDevice, ClimateEntity):
 
     async def async_set_temperature(self, **kwargs):
         """Set new target temperature."""
-        data = {}
+        if ATTR_TEMPERATURE not in kwargs:
+            raise ValueError(f"Expected attribute {ATTR_TEMPERATURE}")
 
-        if ATTR_TEMPERATURE in kwargs:
-            data["heatsetpoint"] = kwargs[ATTR_TEMPERATURE] * 100
+        data = {"heatsetpoint": kwargs[ATTR_TEMPERATURE] * 100}
 
         await self._device.async_set_config(data)
 
     async def async_set_hvac_mode(self, hvac_mode):
         """Set new target hvac mode."""
-        if hvac_mode == HVAC_MODE_AUTO:
-            data = {"mode": "auto"}
-        elif hvac_mode == HVAC_MODE_HEAT:
-            data = {"mode": "heat"}
-        elif hvac_mode == HVAC_MODE_OFF:
-            data = {"mode": "off"}
+        if hvac_mode not in HVAC_MODES:
+            raise ValueError(f"Unsupported mode {hvac_mode}")
+
+        data = {"mode": HVAC_MODES[hvac_mode]}
 
         await self._device.async_set_config(data)
 
diff --git a/homeassistant/components/deconz/config_flow.py b/homeassistant/components/deconz/config_flow.py
index 6c2df3ad614..c43c1c95504 100644
--- a/homeassistant/components/deconz/config_flow.py
+++ b/homeassistant/components/deconz/config_flow.py
@@ -172,6 +172,9 @@ class DeconzFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             except asyncio.TimeoutError:
                 return self.async_abort(reason="no_bridges")
 
+        if self.bridge_id == "0000000000000000":
+            return self.async_abort(reason="no_hardware_available")
+
         return self.async_create_entry(title=self.bridge_id, data=self.deconz_config)
 
     async def async_step_ssdp(self, discovery_info):
diff --git a/homeassistant/components/deconz/const.py b/homeassistant/components/deconz/const.py
index 31ae9eb018c..cbad37b1b87 100644
--- a/homeassistant/components/deconz/const.py
+++ b/homeassistant/components/deconz/const.py
@@ -1,6 +1,16 @@
 """Constants for the deCONZ component."""
 import logging
 
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
+from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
+from homeassistant.components.cover import DOMAIN as COVER_DOMAIN
+from homeassistant.components.fan import DOMAIN as FAN_DOMAIN
+from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
+from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN
+from homeassistant.components.scene import DOMAIN as SCENE_DOMAIN
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+
 LOGGER = logging.getLogger(__package__)
 
 DOMAIN = "deconz"
@@ -19,13 +29,15 @@ CONF_ALLOW_NEW_DEVICES = "allow_new_devices"
 CONF_MASTER_GATEWAY = "master"
 
 SUPPORTED_PLATFORMS = [
-    "binary_sensor",
-    "climate",
-    "cover",
-    "light",
-    "scene",
-    "sensor",
-    "switch",
+    BINARY_SENSOR_DOMAIN,
+    CLIMATE_DOMAIN,
+    COVER_DOMAIN,
+    FAN_DOMAIN,
+    LIGHT_DOMAIN,
+    LOCK_DOMAIN,
+    SCENE_DOMAIN,
+    SENSOR_DOMAIN,
+    SWITCH_DOMAIN,
 ]
 
 NEW_GROUP = "groups"
@@ -38,10 +50,19 @@ ATTR_OFFSET = "offset"
 ATTR_ON = "on"
 ATTR_VALVE = "valve"
 
+# Covers
 DAMPERS = ["Level controllable output"]
 WINDOW_COVERS = ["Window covering device", "Window covering controller"]
 COVER_TYPES = DAMPERS + WINDOW_COVERS
 
+# Fans
+FANS = ["Fan"]
+
+# Locks
+LOCKS = ["Door Lock"]
+LOCK_TYPES = LOCKS
+
+# Switches
 POWER_PLUGS = ["On/Off light", "On/Off plug-in unit", "Smart plug"]
 SIRENS = ["Warning device"]
 SWITCH_TYPES = POWER_PLUGS + SIRENS
diff --git a/homeassistant/components/deconz/cover.py b/homeassistant/components/deconz/cover.py
index 7bcd821a344..5982aead14f 100644
--- a/homeassistant/components/deconz/cover.py
+++ b/homeassistant/components/deconz/cover.py
@@ -17,10 +17,6 @@ from .deconz_device import DeconzDevice
 from .gateway import get_gateway_from_config_entry
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Old way of setting up deCONZ platforms."""
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up covers for deCONZ component.
 
@@ -41,7 +37,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             ):
                 entities.append(DeconzCover(light, gateway))
 
-        async_add_entities(entities, True)
+        if entities:
+            async_add_entities(entities)
 
     gateway.listeners.append(
         async_dispatcher_connect(
diff --git a/homeassistant/components/deconz/deconz_device.py b/homeassistant/components/deconz/deconz_device.py
index 4bcd63c8fa2..ab4d4083095 100644
--- a/homeassistant/components/deconz/deconz_device.py
+++ b/homeassistant/components/deconz/deconz_device.py
@@ -81,8 +81,7 @@ class DeconzDevice(DeconzBase, Entity):
     async def async_will_remove_from_hass(self) -> None:
         """Disconnect device object when removed."""
         self._device.remove_callback(self.async_update_callback)
-        if self.entity_id in self.gateway.deconz_ids:
-            del self.gateway.deconz_ids[self.entity_id]
+        del self.gateway.deconz_ids[self.entity_id]
         self.gateway.entities[self.TYPE].remove(self.unique_id)
 
     @callback
diff --git a/homeassistant/components/deconz/device_trigger.py b/homeassistant/components/deconz/device_trigger.py
index 0bff3f17f9e..869a6ef3594 100644
--- a/homeassistant/components/deconz/device_trigger.py
+++ b/homeassistant/components/deconz/device_trigger.py
@@ -16,6 +16,7 @@ from homeassistant.const import (
 )
 
 from . import DOMAIN
+from .const import LOGGER
 from .deconz_event import CONF_DECONZ_EVENT, CONF_GESTURE
 
 CONF_SUBTYPE = "subtype"
@@ -29,6 +30,7 @@ CONF_TRIPLE_PRESS = "remote_button_triple_press"
 CONF_QUADRUPLE_PRESS = "remote_button_quadruple_press"
 CONF_QUINTUPLE_PRESS = "remote_button_quintuple_press"
 CONF_ROTATED = "remote_button_rotated"
+CONF_ROTATED_FAST = "remote_button_rotated_fast"
 CONF_ROTATION_STOPPED = "remote_button_rotation_stopped"
 CONF_AWAKE = "remote_awakened"
 CONF_MOVE = "remote_moved"
@@ -185,8 +187,10 @@ TRADFRI_REMOTE = {
 
 TRADFRI_WIRELESS_DIMMER_MODEL = "TRADFRI wireless dimmer"
 TRADFRI_WIRELESS_DIMMER = {
+    (CONF_ROTATED_FAST, CONF_LEFT): {CONF_EVENT: 4002},
     (CONF_ROTATED, CONF_LEFT): {CONF_EVENT: 3002},
     (CONF_ROTATED, CONF_RIGHT): {CONF_EVENT: 2002},
+    (CONF_ROTATED_FAST, CONF_RIGHT): {CONF_EVENT: 1002},
 }
 
 AQARA_CUBE_MODEL = "lumi.sensor_cube"
@@ -429,6 +433,7 @@ async def async_attach_trigger(hass, config, action, automation_info):
 
     deconz_event = _get_deconz_event_from_device_id(hass, device.id)
     if deconz_event is None:
+        LOGGER.error("No deconz_event tied to device %s found", device.name)
         raise InvalidDeviceAutomationConfig
 
     event_id = deconz_event.serial
diff --git a/homeassistant/components/deconz/fan.py b/homeassistant/components/deconz/fan.py
new file mode 100644
index 00000000000..7936a8fead5
--- /dev/null
+++ b/homeassistant/components/deconz/fan.py
@@ -0,0 +1,123 @@
+"""Support for deCONZ switches."""
+from homeassistant.components.fan import (
+    DOMAIN,
+    SPEED_HIGH,
+    SPEED_LOW,
+    SPEED_MEDIUM,
+    SPEED_OFF,
+    SUPPORT_SET_SPEED,
+    FanEntity,
+)
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+
+from .const import FANS, NEW_LIGHT
+from .deconz_device import DeconzDevice
+from .gateway import get_gateway_from_config_entry
+
+SPEEDS = {SPEED_OFF: 0, SPEED_LOW: 1, SPEED_MEDIUM: 2, SPEED_HIGH: 4}
+SUPPORTED_ON_SPEEDS = {1: SPEED_LOW, 2: SPEED_MEDIUM, 4: SPEED_HIGH}
+
+
+def convert_speed(speed: int) -> str:
+    """Convert speed from deCONZ to HASS.
+
+    Fallback to medium speed if unsupported by HASS fan platform.
+    """
+    if speed in SPEEDS.values():
+        for hass_speed, deconz_speed in SPEEDS.items():
+            if speed == deconz_speed:
+                return hass_speed
+    return SPEED_MEDIUM
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities) -> None:
+    """Set up fans for deCONZ component.
+
+    Fans are based on the same device class as lights in deCONZ.
+    """
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+    gateway.entities[DOMAIN] = set()
+
+    @callback
+    def async_add_fan(lights) -> None:
+        """Add fan from deCONZ."""
+        entities = []
+
+        for light in lights:
+
+            if light.type in FANS and light.uniqueid not in gateway.entities[DOMAIN]:
+                entities.append(DeconzFan(light, gateway))
+
+        if entities:
+            async_add_entities(entities)
+
+    gateway.listeners.append(
+        async_dispatcher_connect(
+            hass, gateway.async_signal_new_device(NEW_LIGHT), async_add_fan
+        )
+    )
+
+    async_add_fan(gateway.api.lights.values())
+
+
+class DeconzFan(DeconzDevice, FanEntity):
+    """Representation of a deCONZ fan."""
+
+    TYPE = DOMAIN
+
+    def __init__(self, device, gateway) -> None:
+        """Set up fan."""
+        super().__init__(device, gateway)
+
+        self._default_on_speed = SPEEDS[SPEED_MEDIUM]
+        if self.speed != SPEED_OFF:
+            self._default_on_speed = self._device.speed
+
+        self._features = SUPPORT_SET_SPEED
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if fan is on."""
+        return self.speed != SPEED_OFF
+
+    @property
+    def speed(self) -> int:
+        """Return the current speed."""
+        return convert_speed(self._device.speed)
+
+    @property
+    def speed_list(self) -> list:
+        """Get the list of available speeds."""
+        return list(SPEEDS)
+
+    @property
+    def supported_features(self) -> int:
+        """Flag supported features."""
+        return self._features
+
+    @callback
+    def async_update_callback(self, force_update=False) -> None:
+        """Store latest configured speed from the device."""
+        if self.speed != SPEED_OFF and self._device.speed != self._default_on_speed:
+            self._default_on_speed = self._device.speed
+        super().async_update_callback(force_update)
+
+    async def async_set_speed(self, speed: str) -> None:
+        """Set the speed of the fan."""
+        if speed not in SPEEDS:
+            raise ValueError(f"Unsupported speed {speed}")
+
+        data = {"speed": SPEEDS[speed]}
+
+        await self._device.async_set_state(data)
+
+    async def async_turn_on(self, speed: str = None, **kwargs) -> None:
+        """Turn on fan."""
+        if not speed:
+            speed = convert_speed(self._default_on_speed)
+        await self.async_set_speed(speed)
+
+    async def async_turn_off(self, **kwargs) -> None:
+        """Turn off fan."""
+        await self.async_set_speed(SPEED_OFF)
diff --git a/homeassistant/components/deconz/gateway.py b/homeassistant/components/deconz/gateway.py
index 5ec07c40754..475b3c48525 100644
--- a/homeassistant/components/deconz/gateway.py
+++ b/homeassistant/components/deconz/gateway.py
@@ -34,7 +34,7 @@ from .errors import AuthenticationRequired, CannotConnect
 @callback
 def get_gateway_from_config_entry(hass, config_entry):
     """Return gateway with a matching bridge id."""
-    return hass.data[DOMAIN].get(config_entry.unique_id)
+    return hass.data[DOMAIN][config_entry.unique_id]
 
 
 class DeconzGateway:
@@ -51,7 +51,6 @@ class DeconzGateway:
         self.ignore_state_updates = False
 
         self.deconz_ids = {}
-        self.device_id = None
         self.entities = {}
         self.events = []
         self.listeners = []
@@ -140,16 +139,23 @@ class DeconzGateway:
     async def async_update_device_registry(self) -> None:
         """Update device registry."""
         device_registry = await self.hass.helpers.device_registry.async_get_registry()
-        entry = device_registry.async_get_or_create(
+
+        # Host device
+        device_registry.async_get_or_create(
             config_entry_id=self.config_entry.entry_id,
             connections={(CONNECTION_NETWORK_MAC, self.api.config.mac)},
+        )
+
+        # Gateway service
+        device_registry.async_get_or_create(
+            config_entry_id=self.config_entry.entry_id,
             identifiers={(DOMAIN, self.api.config.bridgeid)},
             manufacturer="Dresden Elektronik",
             model=self.api.config.modelid,
             name=self.api.config.name,
             sw_version=self.api.config.swversion,
+            via_device=(CONNECTION_NETWORK_MAC, self.api.config.mac),
         )
-        self.device_id = entry.id
 
     async def async_setup(self) -> bool:
         """Set up a deCONZ gateway."""
@@ -192,9 +198,6 @@ class DeconzGateway:
         """
         gateway = get_gateway_from_config_entry(hass, entry)
 
-        if not gateway:
-            return
-
         if gateway.api.host != gateway.host:
             gateway.api.close()
             gateway.api.host = gateway.host
diff --git a/homeassistant/components/deconz/light.py b/homeassistant/components/deconz/light.py
index 3f11cef31da..3bdf2c67caa 100644
--- a/homeassistant/components/deconz/light.py
+++ b/homeassistant/components/deconz/light.py
@@ -26,6 +26,7 @@ from .const import (
     CONF_GROUP_ID_BASE,
     COVER_TYPES,
     DOMAIN as DECONZ_DOMAIN,
+    LOCK_TYPES,
     NEW_GROUP,
     NEW_LIGHT,
     SWITCH_TYPES,
@@ -34,10 +35,6 @@ from .deconz_device import DeconzDevice
 from .gateway import get_gateway_from_config_entry
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Old way of setting up deCONZ platforms."""
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the deCONZ lights and groups from a config entry."""
     gateway = get_gateway_from_config_entry(hass, config_entry)
@@ -50,12 +47,13 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
         for light in lights:
             if (
-                light.type not in COVER_TYPES + SWITCH_TYPES
+                light.type not in COVER_TYPES + LOCK_TYPES + SWITCH_TYPES
                 and light.uniqueid not in gateway.entities[DOMAIN]
             ):
                 entities.append(DeconzLight(light, gateway))
 
-        async_add_entities(entities, True)
+        if entities:
+            async_add_entities(entities)
 
     gateway.listeners.append(
         async_dispatcher_connect(
@@ -80,7 +78,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             if new_group.unique_id not in known_groups:
                 entities.append(new_group)
 
-        async_add_entities(entities, True)
+        if entities:
+            async_add_entities(entities)
 
     gateway.listeners.append(
         async_dispatcher_connect(
@@ -210,10 +209,7 @@ class DeconzBaseLight(DeconzDevice, LightEntity):
     @property
     def device_state_attributes(self):
         """Return the device state attributes."""
-        attributes = {}
-        attributes["is_deconz_group"] = self._device.type == "LightGroup"
-
-        return attributes
+        return {"is_deconz_group": self._device.type == "LightGroup"}
 
 
 class DeconzLight(DeconzBaseLight):
diff --git a/homeassistant/components/deconz/lock.py b/homeassistant/components/deconz/lock.py
new file mode 100644
index 00000000000..175d422ea1b
--- /dev/null
+++ b/homeassistant/components/deconz/lock.py
@@ -0,0 +1,59 @@
+"""Support for deCONZ locks."""
+from homeassistant.components.lock import DOMAIN, LockEntity
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+
+from .const import LOCKS, NEW_LIGHT
+from .deconz_device import DeconzDevice
+from .gateway import get_gateway_from_config_entry
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up locks for deCONZ component.
+
+    Locks are based on the same device class as lights in deCONZ.
+    """
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+    gateway.entities[DOMAIN] = set()
+
+    @callback
+    def async_add_lock(lights):
+        """Add lock from deCONZ."""
+        entities = []
+
+        for light in lights:
+
+            if light.type in LOCKS and light.uniqueid not in gateway.entities[DOMAIN]:
+                entities.append(DeconzLock(light, gateway))
+
+        if entities:
+            async_add_entities(entities)
+
+    gateway.listeners.append(
+        async_dispatcher_connect(
+            hass, gateway.async_signal_new_device(NEW_LIGHT), async_add_lock
+        )
+    )
+
+    async_add_lock(gateway.api.lights.values())
+
+
+class DeconzLock(DeconzDevice, LockEntity):
+    """Representation of a deCONZ lock."""
+
+    TYPE = DOMAIN
+
+    @property
+    def is_locked(self):
+        """Return true if lock is on."""
+        return self._device.state
+
+    async def async_lock(self, **kwargs):
+        """Lock the lock."""
+        data = {"on": True}
+        await self._device.async_set_state(data)
+
+    async def async_unlock(self, **kwargs):
+        """Unlock the lock."""
+        data = {"on": False}
+        await self._device.async_set_state(data)
diff --git a/homeassistant/components/deconz/scene.py b/homeassistant/components/deconz/scene.py
index fdeb1d43acc..9ca7f39f034 100644
--- a/homeassistant/components/deconz/scene.py
+++ b/homeassistant/components/deconz/scene.py
@@ -9,10 +9,6 @@ from .const import NEW_SCENE
 from .gateway import get_gateway_from_config_entry
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Old way of setting up deCONZ platforms."""
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up scenes for deCONZ component."""
     gateway = get_gateway_from_config_entry(hass, config_entry)
@@ -22,7 +18,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         """Add scene from deCONZ."""
         entities = [DeconzScene(scene, gateway) for scene in scenes]
 
-        async_add_entities(entities)
+        if entities:
+            async_add_entities(entities)
 
     gateway.listeners.append(
         async_dispatcher_connect(
diff --git a/homeassistant/components/deconz/sensor.py b/homeassistant/components/deconz/sensor.py
index 08e81d2dd3b..7b55dbbf823 100644
--- a/homeassistant/components/deconz/sensor.py
+++ b/homeassistant/components/deconz/sensor.py
@@ -68,10 +68,6 @@ UNIT_OF_MEASUREMENT = {
 }
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Old way of setting up deCONZ platforms."""
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the deCONZ sensors."""
     gateway = get_gateway_from_config_entry(hass, config_entry)
@@ -112,7 +108,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             ):
                 entities.append(DeconzSensor(sensor, gateway))
 
-        async_add_entities(entities, True)
+        if entities:
+            async_add_entities(entities)
 
     gateway.listeners.append(
         async_dispatcher_connect(
diff --git a/homeassistant/components/deconz/services.py b/homeassistant/components/deconz/services.py
index bf503376321..a90f770eb9b 100644
--- a/homeassistant/components/deconz/services.py
+++ b/homeassistant/components/deconz/services.py
@@ -3,6 +3,7 @@ from pydeconz.utils import normalize_bridge_id
 import voluptuous as vol
 
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.helpers.entity_registry import (
     async_entries_for_config_entry,
     async_entries_for_device,
@@ -138,50 +139,14 @@ async def async_refresh_devices_service(hass, data):
     if CONF_BRIDGE_ID in data:
         gateway = hass.data[DOMAIN][normalize_bridge_id(data[CONF_BRIDGE_ID])]
 
-    groups = set(gateway.api.groups.keys())
-    lights = set(gateway.api.lights.keys())
-    scenes = set(gateway.api.scenes.keys())
-    sensors = set(gateway.api.sensors.keys())
-
     gateway.ignore_state_updates = True
     await gateway.api.refresh_state()
     gateway.ignore_state_updates = False
 
-    gateway.async_add_device_callback(
-        NEW_GROUP,
-        [
-            group
-            for group_id, group in gateway.api.groups.items()
-            if group_id not in groups
-        ],
-    )
-
-    gateway.async_add_device_callback(
-        NEW_LIGHT,
-        [
-            light
-            for light_id, light in gateway.api.lights.items()
-            if light_id not in lights
-        ],
-    )
-
-    gateway.async_add_device_callback(
-        NEW_SCENE,
-        [
-            scene
-            for scene_id, scene in gateway.api.scenes.items()
-            if scene_id not in scenes
-        ],
-    )
-
-    gateway.async_add_device_callback(
-        NEW_SENSOR,
-        [
-            sensor
-            for sensor_id, sensor in gateway.api.sensors.items()
-            if sensor_id not in sensors
-        ],
-    )
+    gateway.async_add_device_callback(NEW_GROUP, list(gateway.api.groups.values()))
+    gateway.async_add_device_callback(NEW_LIGHT, list(gateway.api.lights.values()))
+    gateway.async_add_device_callback(NEW_SCENE, list(gateway.api.scenes.values()))
+    gateway.async_add_device_callback(NEW_SENSOR, list(gateway.api.sensors.values()))
 
 
 async def async_remove_orphaned_entries_service(hass, data):
@@ -204,9 +169,20 @@ async def async_remove_orphaned_entries_service(hass, data):
         if gateway.config_entry.entry_id in entry.config_entries
     ]
 
-    # Don't remove the Gateway device
-    if gateway.device_id in devices_to_be_removed:
-        devices_to_be_removed.remove(gateway.device_id)
+    # Don't remove the Gateway host entry
+    gateway_host = device_registry.async_get_device(
+        connections={(CONNECTION_NETWORK_MAC, gateway.api.config.mac)},
+        identifiers=set(),
+    )
+    if gateway_host.id in devices_to_be_removed:
+        devices_to_be_removed.remove(gateway_host.id)
+
+    # Don't remove the Gateway service entry
+    gateway_service = device_registry.async_get_device(
+        identifiers={(DOMAIN, gateway.api.config.bridgeid)}, connections=set()
+    )
+    if gateway_service.id in devices_to_be_removed:
+        devices_to_be_removed.remove(gateway_service.id)
 
     # Don't remove devices belonging to available events
     for event in gateway.events:
diff --git a/homeassistant/components/deconz/strings.json b/homeassistant/components/deconz/strings.json
index d3e9e884cb2..bbda4e8c0cb 100644
--- a/homeassistant/components/deconz/strings.json
+++ b/homeassistant/components/deconz/strings.json
@@ -27,10 +27,10 @@
     },
     "abort": {
       "already_configured": "Bridge is already configured",
-      "already_in_progress": "Config flow for bridge is already in progress.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "no_bridges": "No deCONZ bridges discovered",
+      "no_hardware_available": "No radio hardware connected to deCONZ",
       "not_deconz_bridge": "Not a deCONZ bridge",
-      "one_instance_only": "Component only supports one deCONZ instance",
       "updated_instance": "Updated deCONZ instance with new host address"
     }
   },
@@ -58,6 +58,7 @@
       "remote_button_quadruple_press": "\"{subtype}\" button quadruple clicked",
       "remote_button_quintuple_press": "\"{subtype}\" button quintuple clicked",
       "remote_button_rotated": "Button rotated \"{subtype}\"",
+      "remote_button_rotated_fast": "Button rotated fast \"{subtype}\"",
       "remote_button_rotation_stopped": "Button rotation \"{subtype}\" stopped",
       "remote_falling": "Device in free fall",
       "remote_awakened": "Device awakened",
diff --git a/homeassistant/components/deconz/switch.py b/homeassistant/components/deconz/switch.py
index dacae4d4a56..509282e45f2 100644
--- a/homeassistant/components/deconz/switch.py
+++ b/homeassistant/components/deconz/switch.py
@@ -8,10 +8,6 @@ from .deconz_device import DeconzDevice
 from .gateway import get_gateway_from_config_entry
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Old way of setting up deCONZ platforms."""
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up switches for deCONZ component.
 
@@ -38,7 +34,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             ):
                 entities.append(DeconzSiren(light, gateway))
 
-        async_add_entities(entities, True)
+        if entities:
+            async_add_entities(entities)
 
     gateway.listeners.append(
         async_dispatcher_connect(
diff --git a/homeassistant/components/deconz/translations/ca.json b/homeassistant/components/deconz/translations/ca.json
index bb09ff892d6..0cda0b9c78d 100644
--- a/homeassistant/components/deconz/translations/ca.json
+++ b/homeassistant/components/deconz/translations/ca.json
@@ -2,8 +2,9 @@
     "config": {
         "abort": {
             "already_configured": "L'enlla\u00e7 ja est\u00e0 configurat",
-            "already_in_progress": "El flux de dades de configuraci\u00f3 per l'enlla\u00e7 ja est\u00e0 en curs.",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
             "no_bridges": "No s'han descobert enlla\u00e7os amb deCONZ",
+            "no_hardware_available": "No hi ha cap maquinari r\u00e0dio connectat a deCONZ",
             "not_deconz_bridge": "No \u00e9s un enlla\u00e7 deCONZ",
             "one_instance_only": "El component nom\u00e9s admet una inst\u00e0ncia deCONZ",
             "updated_instance": "S'ha actualitzat la inst\u00e0ncia de deCONZ amb una nova adre\u00e7a"
@@ -66,6 +67,7 @@
             "remote_button_quadruple_press": "Bot\u00f3 \"{subtype}\" clicat quatre vegades",
             "remote_button_quintuple_press": "Bot\u00f3 \"{subtype}\" clicat cinc vegades",
             "remote_button_rotated": "Bot\u00f3 \"{subtype}\" girat",
+            "remote_button_rotated_fast": "Bot\u00f3 \"{subtype}\" girat r\u00e0pidament",
             "remote_button_rotation_stopped": "La rotaci\u00f3 del bot\u00f3 \"{subtype}\" s'ha aturat",
             "remote_button_short_press": "Bot\u00f3 \"{subtype}\" premut",
             "remote_button_short_release": "Bot\u00f3 \"{subtype}\" alliberat",
diff --git a/homeassistant/components/deconz/translations/cs.json b/homeassistant/components/deconz/translations/cs.json
index 44d6b098da2..6591366f75c 100644
--- a/homeassistant/components/deconz/translations/cs.json
+++ b/homeassistant/components/deconz/translations/cs.json
@@ -1,9 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "P\u0159emost\u011bn\u00ed je ji\u017e nakonfigurov\u00e1no",
+            "already_configured": "P\u0159emost\u011bn\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
             "no_bridges": "\u017d\u00e1dn\u00e9 deCONZ p\u0159emost\u011bn\u00ed nebyly nalezeny",
-            "one_instance_only": "Komponent podporuje pouze jednu instanci deCONZ"
+            "not_deconz_bridge": "Nejedn\u00e1 se o deCONZ p\u0159emost\u011bn\u00ed",
+            "one_instance_only": "Komponent podporuje pouze jednu instanci deCONZ",
+            "updated_instance": "Instance deCONZ aktualizov\u00e1na s nov\u00fdm hostitelem"
         },
         "error": {
             "no_key": "Nelze z\u00edskat kl\u00ed\u010d API"
@@ -15,7 +18,7 @@
                 "title": "deCONZ Zigbee br\u00e1na prost\u0159ednictv\u00edm dopl\u0148ku Hass.io"
             },
             "link": {
-                "description": "Odemkn\u011bte br\u00e1nu deCONZ, pro registraci v Home Assistant. \n\n 1. P\u0159ejd\u011bte do nastaven\u00ed syst\u00e9mu deCONZ \n 2. Stiskn\u011bte tla\u010d\u00edtko \"Unlock Gateway\"",
+                "description": "Odemkn\u011bte br\u00e1nu deCONZ pro registraci v Home Assistant.\n\n 1. P\u0159ejd\u011bte na Nastaven\u00ed deCONZ - > Br\u00e1na - > Pokro\u010dil\u00e9\n 2. Stiskn\u011bte tla\u010d\u00edtko \"Ov\u011b\u0159it aplikaci\"",
                 "title": "Propojit s deCONZ"
             },
             "manual_input": {
@@ -23,6 +26,72 @@
                     "host": "Hostitel",
                     "port": "Port"
                 }
+            },
+            "user": {
+                "data": {
+                    "host": "Vyberte objevenou br\u00e1nu deCONZ"
+                }
+            }
+        }
+    },
+    "device_automation": {
+        "trigger_subtype": {
+            "both_buttons": "Ob\u011b tla\u010d\u00edtka",
+            "bottom_buttons": "Spodn\u00ed tla\u010d\u00edtka",
+            "button_1": "Prvn\u00ed tla\u010d\u00edtko",
+            "button_2": "Druh\u00e9 tla\u010d\u00edtko",
+            "button_3": "T\u0159et\u00ed tla\u010d\u00edtko",
+            "button_4": "\u010ctvrt\u00e9 tla\u010d\u00edtko",
+            "close": "Zav\u0159\u00edt",
+            "dim_down": "Sn\u00ed\u017eit ztlumen\u00ed",
+            "dim_up": "Zv\u00fd\u0161it ztlumen\u00ed",
+            "left": "Vlevo",
+            "open": "Otev\u0159eno",
+            "right": "Vpravo",
+            "side_1": "Strana 1",
+            "side_2": "Strana 2",
+            "side_3": "Strana 3",
+            "side_4": "Strana 4",
+            "side_5": "Strana 5",
+            "side_6": "Strana 6",
+            "top_buttons": "Horn\u00ed tla\u010d\u00edtka",
+            "turn_off": "Vypnout",
+            "turn_on": "Zapnout"
+        },
+        "trigger_type": {
+            "remote_awakened": "Za\u0159\u00edzen\u00ed probuzeno",
+            "remote_button_double_press": "Dvakr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_long_release": "Uvoln\u011bno tla\u010d\u00edtko \"{subtype}\" po dlouh\u00e9m stisku",
+            "remote_button_quadruple_press": "\u010cty\u0159ikr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_quintuple_press": "P\u011btkr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_short_press": "Stiknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_short_release": "Uvoln\u011bno tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_triple_press": "T\u0159ikr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_double_tap": "Dvakr\u00e1t poklep\u00e1no na za\u0159\u00edzen\u00ed \"{subtype}\"",
+            "remote_double_tap_any_side": "Za\u0159\u00edzen\u00ed bylo poklep\u00e1no 2x na libovolnou stranu",
+            "remote_flip_180_degrees": "Za\u0159\u00edzen\u00ed p\u0159evr\u00e1ceno o 180 stup\u0148\u016f",
+            "remote_flip_90_degrees": "Za\u0159\u00edzen\u00ed p\u0159evr\u00e1ceno o 90 stup\u0148\u016f",
+            "remote_gyro_activated": "Za\u0159\u00edzen\u00ed se zat\u0159\u00e1slo",
+            "remote_rotate_from_side_1": "Za\u0159\u00edzen\u00ed oto\u010deno ze \"strany 1\" na \"{subtype}\"",
+            "remote_rotate_from_side_2": "Za\u0159\u00edzen\u00ed oto\u010deno ze \"strany 2\" na \"{subtype}\"",
+            "remote_rotate_from_side_3": "Za\u0159\u00edzen\u00ed oto\u010deno ze \"strany 3\" na \"{subtype}\"",
+            "remote_rotate_from_side_4": "Za\u0159\u00edzen\u00ed oto\u010deno ze \"strany 4\" na \"{subtype}\"",
+            "remote_rotate_from_side_5": "Za\u0159\u00edzen\u00ed oto\u010deno ze \"strany 5\" na \"{subtype}\"",
+            "remote_rotate_from_side_6": "Za\u0159\u00edzen\u00ed oto\u010deno ze \"strany 6\" na \"{subtype}\"",
+            "remote_turned_clockwise": "Za\u0159\u00edzen\u00ed oto\u010deno ve sm\u011bru hodinov\u00fdch ru\u010di\u010dek",
+            "remote_turned_counter_clockwise": "Za\u0159\u00edzen\u00ed oto\u010deno proti sm\u011bru hodinov\u00fdch ru\u010di\u010dek"
+        }
+    },
+    "options": {
+        "step": {
+            "deconz_devices": {
+                "data": {
+                    "allow_clip_sensor": "Povolit senzory deCONZ CLIP",
+                    "allow_deconz_groups": "Povolit skupiny sv\u011btel deCONZ",
+                    "allow_new_devices": "Povolit automatick\u00e9 p\u0159id\u00e1v\u00e1n\u00ed nov\u00fdch za\u0159\u00edzen\u00ed"
+                },
+                "description": "Nastavte viditelnost typ\u016f za\u0159\u00edzen\u00ed deCONZ",
+                "title": "Mo\u017enosti deCONZ"
             }
         }
     }
diff --git a/homeassistant/components/deconz/translations/el.json b/homeassistant/components/deconz/translations/el.json
index d5ec540c7a0..bb5489843b8 100644
--- a/homeassistant/components/deconz/translations/el.json
+++ b/homeassistant/components/deconz/translations/el.json
@@ -1,4 +1,9 @@
 {
+    "config": {
+        "abort": {
+            "no_hardware_available": "\u0394\u03b5\u03bd \u03ad\u03c7\u03b5\u03b9 \u03c3\u03c5\u03bd\u03b4\u03b5\u03b8\u03b5\u03af \u03b1\u03c3\u03cd\u03c1\u03bc\u03b1\u03c4\u03bf \u03c5\u03bb\u03b9\u03ba\u03cc \u03c3\u03c4\u03bf deCONZ"
+        }
+    },
     "options": {
         "step": {
             "deconz_devices": {
diff --git a/homeassistant/components/deconz/translations/en.json b/homeassistant/components/deconz/translations/en.json
index 868c5771199..3604e2464c8 100644
--- a/homeassistant/components/deconz/translations/en.json
+++ b/homeassistant/components/deconz/translations/en.json
@@ -2,8 +2,9 @@
     "config": {
         "abort": {
             "already_configured": "Bridge is already configured",
-            "already_in_progress": "Config flow for bridge is already in progress.",
+            "already_in_progress": "Configuration flow is already in progress",
             "no_bridges": "No deCONZ bridges discovered",
+            "no_hardware_available": "No radio hardware connected to deCONZ",
             "not_deconz_bridge": "Not a deCONZ bridge",
             "one_instance_only": "Component only supports one deCONZ instance",
             "updated_instance": "Updated deCONZ instance with new host address"
@@ -66,6 +67,7 @@
             "remote_button_quadruple_press": "\"{subtype}\" button quadruple clicked",
             "remote_button_quintuple_press": "\"{subtype}\" button quintuple clicked",
             "remote_button_rotated": "Button rotated \"{subtype}\"",
+            "remote_button_rotated_fast": "Button rotated fast \"{subtype}\"",
             "remote_button_rotation_stopped": "Button rotation \"{subtype}\" stopped",
             "remote_button_short_press": "\"{subtype}\" button pressed",
             "remote_button_short_release": "\"{subtype}\" button released",
diff --git a/homeassistant/components/deconz/translations/es.json b/homeassistant/components/deconz/translations/es.json
index 877623188bb..c935e7398b3 100644
--- a/homeassistant/components/deconz/translations/es.json
+++ b/homeassistant/components/deconz/translations/es.json
@@ -4,6 +4,7 @@
             "already_configured": "La pasarela ya est\u00e1 configurada",
             "already_in_progress": "El flujo de configuraci\u00f3n para la pasarela ya est\u00e1 en marcha.",
             "no_bridges": "No se han descubierto pasarelas deCONZ",
+            "no_hardware_available": "No hay hardware de radio conectado a deCONZ",
             "not_deconz_bridge": "No es una pasarela deCONZ",
             "one_instance_only": "El componente solo admite una instancia de deCONZ",
             "updated_instance": "Instancia deCONZ actualizada con nueva direcci\u00f3n de host"
@@ -66,6 +67,7 @@
             "remote_button_quadruple_press": "Bot\u00f3n \"{subtype}\" cu\u00e1druple pulsaci\u00f3n",
             "remote_button_quintuple_press": "Bot\u00f3n \"{subtype}\" qu\u00edntuple pulsaci\u00f3n",
             "remote_button_rotated": "Bot\u00f3n \"{subtype}\" girado",
+            "remote_button_rotated_fast": "Bot\u00f3n \"{subtype}\" girado r\u00e1pido",
             "remote_button_rotation_stopped": "Bot\u00f3n rotativo \"{subtype}\" detenido",
             "remote_button_short_press": "Bot\u00f3n \"{subtype}\" pulsado",
             "remote_button_short_release": "Bot\u00f3n \"{subtype}\" soltado",
@@ -93,7 +95,8 @@
             "deconz_devices": {
                 "data": {
                     "allow_clip_sensor": "Permitir sensores deCONZ CLIP",
-                    "allow_deconz_groups": "Permitir grupos de luz deCONZ"
+                    "allow_deconz_groups": "Permitir grupos de luz deCONZ",
+                    "allow_new_devices": "Permitir a\u00f1adir autom\u00e1ticamente nuevos dispositivos"
                 },
                 "description": "Configurar la visibilidad de los tipos de dispositivos deCONZ",
                 "title": "Opciones deCONZ"
diff --git a/homeassistant/components/deconz/translations/et.json b/homeassistant/components/deconz/translations/et.json
index 636c75de471..0af02237071 100644
--- a/homeassistant/components/deconz/translations/et.json
+++ b/homeassistant/components/deconz/translations/et.json
@@ -1,4 +1,40 @@
 {
+    "config": {
+        "abort": {
+            "already_configured": "L\u00fc\u00fcs on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "no_bridges": "DeCONZ l\u00fc\u00fcse ei leitud",
+            "no_hardware_available": "DeCONZi raadio riistvara puudub",
+            "not_deconz_bridge": "See pole deCONZ-i sild",
+            "one_instance_only": "Komponent toetab ainult \u00fchte deCONZ-i sidumist",
+            "updated_instance": "DeCONZ-i eksemplarile omistati uus hostiaadress"
+        },
+        "error": {
+            "no_key": "API v\u00f5tit ei leitud"
+        },
+        "flow_title": "deCONZ Zigbee l\u00fc\u00fcs ( {host} )",
+        "step": {
+            "hassio_confirm": {
+                "description": "Kas soovid seadistada Home Assistant-i \u00fchenduse deCONZ-l\u00fc\u00fcsiga, mida pakub Hass.io lisandmoodul {addon} ?",
+                "title": "deCONZ Zigbee v\u00e4rav Hass.io pistikprogrammi kaudu"
+            },
+            "link": {
+                "description": "Home Assistanti registreerumiseks ava deCONZ-i l\u00fc\u00fcs.\n\n 1. Minge deCONZ Settings - > Gateway - > Advanced\n 2. Vajutage nuppu \"Authenticate app\"",
+                "title": "\u00dchenda deCONZ-iga"
+            },
+            "manual_input": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                }
+            },
+            "user": {
+                "data": {
+                    "host": "Vali avastatud deCONZ l\u00fc\u00fcs"
+                }
+            }
+        }
+    },
     "device_automation": {
         "trigger_subtype": {
             "both_buttons": "M\u00f5lemad nupud",
@@ -25,7 +61,34 @@
         },
         "trigger_type": {
             "remote_awakened": "Seade \u00e4rkas",
-            "remote_button_rotation_stopped": "Nupu \" {subtype} \"  p\u00f6\u00f6ramine peatus"
+            "remote_button_double_press": "\" {subtype} \" on topeltkl\u00f5psatud",
+            "remote_button_long_press": "\" {subtype} \" on pikalt alla vajutatud",
+            "remote_button_long_release": "\"{subtype}\" nupp vabastatati p\u00e4rast pikka vajutust",
+            "remote_button_quadruple_press": "\"{subtype}\" nuppu on neljakordselt kl\u00f5psatud",
+            "remote_button_quintuple_press": "\"{subtype}\" nuppu on viiekordselt kl\u00f5psatud",
+            "remote_button_rotated": "Nuppu \"{subtype}\" keerati",
+            "remote_button_rotated_fast": "Nuppu \"{ subtype}\"p\u00f6\u00f6rati kiiresti ",
+            "remote_button_rotation_stopped": "Nupu \" {subtype} \"  p\u00f6\u00f6ramine peatus",
+            "remote_button_short_press": "\"{subtype}\" nupp  on vajutatud",
+            "remote_button_short_release": "\"{subtype}\" nupp  vabastati",
+            "remote_button_triple_press": "Nuppu \"{subtype}\" kl\u00f5psati kolm korda",
+            "remote_double_tap": "Seadet \"{subtype}\" on topeltkl\u00f5psatud",
+            "remote_double_tap_any_side": "Seadet on topeltpuudutatud mis tahes k\u00fcljelt",
+            "remote_falling": "Seade on vabalangemises",
+            "remote_flip_180_degrees": "Seadet p\u00f6\u00f6rati 180 kraadi",
+            "remote_flip_90_degrees": "Seadet p\u00f6\u00f6rati 90 kraadi",
+            "remote_gyro_activated": "Seadet raputati",
+            "remote_turned_clockwise": "Seadet p\u00f6\u00f6rati p\u00e4rip\u00e4eva",
+            "remote_turned_counter_clockwise": "Seadet p\u00f6\u00f6rati vastup\u00e4eva"
+        }
+    },
+    "options": {
+        "step": {
+            "deconz_devices": {
+                "data": {
+                    "allow_new_devices": "Luba uute seadmete automaatne lisamine"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/deconz/translations/fr.json b/homeassistant/components/deconz/translations/fr.json
index e873d90be17..2704951db5c 100644
--- a/homeassistant/components/deconz/translations/fr.json
+++ b/homeassistant/components/deconz/translations/fr.json
@@ -4,6 +4,7 @@
             "already_configured": "Ce pont est d\u00e9j\u00e0 configur\u00e9",
             "already_in_progress": "Le flux de configuration pour le pont est d\u00e9j\u00e0 en cours.",
             "no_bridges": "Aucun pont deCONZ n'a \u00e9t\u00e9 d\u00e9couvert",
+            "no_hardware_available": "Aucun mat\u00e9riel radio connect\u00e9 \u00e0 deCONZ",
             "not_deconz_bridge": "Pas un pont deCONZ",
             "one_instance_only": "Le composant prend uniquement en charge une instance deCONZ",
             "updated_instance": "Instance deCONZ mise \u00e0 jour avec la nouvelle adresse d'h\u00f4te"
@@ -93,7 +94,8 @@
             "deconz_devices": {
                 "data": {
                     "allow_clip_sensor": "Autoriser les capteurs deCONZ CLIP",
-                    "allow_deconz_groups": "Autoriser les groupes de lumi\u00e8res deCONZ"
+                    "allow_deconz_groups": "Autoriser les groupes de lumi\u00e8res deCONZ",
+                    "allow_new_devices": "Autoriser l'ajout automatique de nouveaux appareils"
                 },
                 "description": "Configurer la visibilit\u00e9 des appareils de type deCONZ",
                 "title": "Options deCONZ"
diff --git a/homeassistant/components/deconz/translations/it.json b/homeassistant/components/deconz/translations/it.json
index 26a1a14e32a..2029e11613f 100644
--- a/homeassistant/components/deconz/translations/it.json
+++ b/homeassistant/components/deconz/translations/it.json
@@ -2,8 +2,9 @@
     "config": {
         "abort": {
             "already_configured": "Il Bridge \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "Il flusso di configurazione per bridge \u00e8 gi\u00e0 in corso.",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
             "no_bridges": "Nessun bridge deCONZ rilevato",
+            "no_hardware_available": "Nessun hardware radio collegato a deCONZ",
             "not_deconz_bridge": "Non \u00e8 un bridge deCONZ",
             "one_instance_only": "Il componente supporto solo un'istanza di deCONZ",
             "updated_instance": "Istanza deCONZ aggiornata con nuovo indirizzo host"
@@ -93,7 +94,8 @@
             "deconz_devices": {
                 "data": {
                     "allow_clip_sensor": "Consentire sensori CLIP deCONZ",
-                    "allow_deconz_groups": "Consentire gruppi luce deCONZ"
+                    "allow_deconz_groups": "Consentire gruppi luce deCONZ",
+                    "allow_new_devices": "Consentire l'aggiunta automatica di nuovi dispositivi"
                 },
                 "description": "Configurare la visibilit\u00e0 dei tipi di dispositivi deCONZ",
                 "title": "Opzioni deCONZ"
diff --git a/homeassistant/components/deconz/translations/lb.json b/homeassistant/components/deconz/translations/lb.json
index febc22b2e01..d2c36eb30bd 100644
--- a/homeassistant/components/deconz/translations/lb.json
+++ b/homeassistant/components/deconz/translations/lb.json
@@ -4,6 +4,7 @@
             "already_configured": "Bridge ass schon konfigur\u00e9iert",
             "already_in_progress": "Konfiguratioun fir d\u00ebsen Apparat ass schonn am gaang.",
             "no_bridges": "Keng dECONZ bridges fonnt",
+            "no_hardware_available": "Keng Radio Hardware verbonne mat deCONZ",
             "not_deconz_bridge": "Keng deCONZ Bridge",
             "one_instance_only": "Komponent \u00ebnnerst\u00ebtzt n\u00ebmmen eng deCONZ Instanz",
             "updated_instance": "deCONZ Instanz gouf mat der neier Adress vum Apparat ge\u00e4nnert"
diff --git a/homeassistant/components/deconz/translations/nl.json b/homeassistant/components/deconz/translations/nl.json
index 6c64e50caca..edd65efe3d8 100644
--- a/homeassistant/components/deconz/translations/nl.json
+++ b/homeassistant/components/deconz/translations/nl.json
@@ -4,6 +4,7 @@
             "already_configured": "Bridge is al geconfigureerd",
             "already_in_progress": "Configuratiestroom voor bridge wordt al ingesteld.",
             "no_bridges": "Geen deCONZ apparaten ontdekt",
+            "no_hardware_available": "Geen radiohardware aangesloten op deCONZ",
             "not_deconz_bridge": "Dit is geen deCONZ bridge",
             "one_instance_only": "Component ondersteunt slechts \u00e9\u00e9n deCONZ instantie",
             "updated_instance": "DeCONZ-instantie bijgewerkt met nieuw host-adres"
@@ -67,7 +68,7 @@
             "remote_button_quintuple_press": "\" {subtype} \" knop vijf keer aangeklikt",
             "remote_button_rotated": "Knop gedraaid \" {subtype} \"",
             "remote_button_rotation_stopped": "Knoprotatie \" {subtype} \" gestopt",
-            "remote_button_short_press": "\" {subtype} \" knop ingedrukt",
+            "remote_button_short_press": "\"{subtype}\" knop ingedrukt",
             "remote_button_short_release": "\"{subtype}\" knop losgelaten",
             "remote_button_triple_press": "\" {subtype} \" knop driemaal geklikt",
             "remote_double_tap": "Apparaat \"{subtype}\" dubbel getikt",
@@ -93,7 +94,8 @@
             "deconz_devices": {
                 "data": {
                     "allow_clip_sensor": "DeCONZ CLIP sensoren toestaan",
-                    "allow_deconz_groups": "Sta deCONZ-lichtgroepen toe"
+                    "allow_deconz_groups": "Sta deCONZ-lichtgroepen toe",
+                    "allow_new_devices": "Sta automatische toevoeging van nieuwe apparaten toe"
                 },
                 "description": "Configureer de zichtbaarheid van deCONZ-apparaattypen",
                 "title": "deCONZ opties"
diff --git a/homeassistant/components/deconz/translations/no.json b/homeassistant/components/deconz/translations/no.json
index f206027f1be..5515595bdee 100644
--- a/homeassistant/components/deconz/translations/no.json
+++ b/homeassistant/components/deconz/translations/no.json
@@ -2,8 +2,9 @@
     "config": {
         "abort": {
             "already_configured": "Broen er allerede konfigurert",
-            "already_in_progress": "Konfigurasjonsflyt for bro p\u00e5g\u00e5r allerede.",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
             "no_bridges": "Ingen deCONZ broer oppdaget",
+            "no_hardware_available": "Ingen radiomaskinvare koblet til deCONZ",
             "not_deconz_bridge": "Ikke en deCONZ bro",
             "one_instance_only": "Komponenten st\u00f8tter bare \u00e9n deCONZ forekomst",
             "updated_instance": "Oppdatert deCONZ forekomst med ny vertsadresse"
@@ -11,7 +12,7 @@
         "error": {
             "no_key": "Kunne ikke f\u00e5 en API-n\u00f8kkel"
         },
-        "flow_title": "deCONZ Zigbee gateway ({host})",
+        "flow_title": "",
         "step": {
             "hassio_confirm": {
                 "description": "Vil du konfigurere Home Assistant til \u00e5 koble seg til deCONZ-gateway levert av Hass.io-tillegget {addon} ?",
@@ -24,7 +25,7 @@
             "manual_input": {
                 "data": {
                     "host": "Vert",
-                    "port": ""
+                    "port": "Port"
                 }
             },
             "user": {
@@ -55,7 +56,7 @@
             "side_5": "",
             "side_6": "",
             "top_buttons": "\u00d8verste knappene",
-            "turn_off": "Skru av",
+            "turn_off": "Sl\u00e5 av",
             "turn_on": "Sl\u00e5 p\u00e5"
         },
         "trigger_type": {
@@ -66,24 +67,25 @@
             "remote_button_quadruple_press": "\"{subtype}\"-knappen ble firedoblet klikket",
             "remote_button_quintuple_press": "\"{subtype}\"-knappen femdobbelt klikket",
             "remote_button_rotated": "Knappen roterte \"{subtype}\"",
+            "remote_button_rotated_fast": "Knappen roterte raskt \"{subtype}\"",
             "remote_button_rotation_stopped": "Knapperotasjon \"{subtype}\" stoppet",
-            "remote_button_short_press": "\"{subtype}\" -knappen ble trykket",
+            "remote_button_short_press": "\"{subtype}\"-knappen ble trykket",
             "remote_button_short_release": "\"{subtype}\"-knappen sluppet",
             "remote_button_triple_press": "\"{subtype}\"-knappen trippel klikket",
-            "remote_double_tap": "Enheten \" {subtype} \" dobbeltklikket",
+            "remote_double_tap": "Enheten \"{subtype}\" dobbeltklikket",
             "remote_double_tap_any_side": "Enheten dobbeltklikket p\u00e5 alle sider",
             "remote_falling": "Enheten er i fritt fall",
             "remote_flip_180_degrees": "Enheten er snudd 180 grader",
             "remote_flip_90_degrees": "Enheten er snudd 90 grader",
             "remote_gyro_activated": "Enhet er ristet",
-            "remote_moved": "Enheten ble flyttet med \"{under type}\" opp",
-            "remote_moved_any_side": "Enheten flyttet med alle sider opp",
-            "remote_rotate_from_side_1": "Enheten rotert fra \"side 1\" til \" {subtype} \"",
-            "remote_rotate_from_side_2": "Enheten rotert fra \"side 2\" til \" {subtype} \"",
-            "remote_rotate_from_side_3": "Enheten rotert fra \"side 3\" til \" {subtype} \"",
-            "remote_rotate_from_side_4": "Enheten rotert fra \"side 4\" til \" {subtype} \"",
-            "remote_rotate_from_side_5": "Enheten rotert fra \"side 5\" til \" {subtype} \"",
-            "remote_rotate_from_side_6": "Enheten rotert fra \"side 6\" til \" {subtype} \"",
+            "remote_moved": "Enheten ble flyttet med \"{subtype}\" opp",
+            "remote_moved_any_side": "Enheten flyttet med hvilken som helst side opp",
+            "remote_rotate_from_side_1": "Enheten rotert fra \"side 1\" til \"{subtype}\"",
+            "remote_rotate_from_side_2": "Enheten rotert fra \"side 2\" til \"{subtype}\"",
+            "remote_rotate_from_side_3": "Enheten rotert fra \"side 3\" til \"{subtype}\"",
+            "remote_rotate_from_side_4": "Enheten rotert fra \"side 4\" til \"{subtype}\"",
+            "remote_rotate_from_side_5": "Enheten rotert fra \"side 5\" til \"{subtype}\"",
+            "remote_rotate_from_side_6": "Enheten rotert fra \"side 6\" til \"{subtype}\"",
             "remote_turned_clockwise": "Enheten dreide med klokken",
             "remote_turned_counter_clockwise": "Enheten dreide mot klokken"
         }
diff --git a/homeassistant/components/deconz/translations/pl.json b/homeassistant/components/deconz/translations/pl.json
index 2fa9549585a..c0b4ecf2e1d 100644
--- a/homeassistant/components/deconz/translations/pl.json
+++ b/homeassistant/components/deconz/translations/pl.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mostek jest ju\u017c skonfigurowany",
-            "already_in_progress": "Konfiguracja mostka jest ju\u017c w toku.",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
             "no_bridges": "Nie odkryto mostk\u00f3w deCONZ",
+            "no_hardware_available": "Nie wykryto komponentu radiowego pod\u0142\u0105czonego do deCONZ",
             "not_deconz_bridge": "To nie jest mostek deCONZ",
             "one_instance_only": "Komponent obs\u0142uguje tylko jedn\u0105 instancj\u0119 deCONZ",
             "updated_instance": "Zaktualizowano instancj\u0119 deCONZ o nowy adres hosta"
@@ -66,6 +67,7 @@
             "remote_button_quadruple_press": "przycisk \"{subtype}\" zostanie czterokrotnie naci\u015bni\u0119ty",
             "remote_button_quintuple_press": "przycisk \"{subtype}\" zostanie pi\u0119ciokrotnie naci\u015bni\u0119ty",
             "remote_button_rotated": "przycisk zostanie obr\u00f3cony \"{subtype}\"",
+            "remote_button_rotated_fast": "przycisk zostanie szybko obr\u00f3cony \"{subtype}\"",
             "remote_button_rotation_stopped": "nast\u0105pi zatrzymanie obrotu przycisku \"{subtype}\"",
             "remote_button_short_press": "przycisk \"{subtype}\" zostanie naci\u015bni\u0119ty",
             "remote_button_short_release": "przycisk \"{subtype}\" zostanie zwolniony",
@@ -93,7 +95,8 @@
             "deconz_devices": {
                 "data": {
                     "allow_clip_sensor": "Zezwalaj na czujniki deCONZ CLIP",
-                    "allow_deconz_groups": "Zezwalaj na grupy \u015bwiate\u0142 deCONZ"
+                    "allow_deconz_groups": "Zezwalaj na grupy \u015bwiate\u0142 deCONZ",
+                    "allow_new_devices": "Zezwalaj na automatyczne dodawanie nowych urz\u0105dze\u0144"
                 },
                 "description": "Skonfiguruj widoczno\u015b\u0107 typ\u00f3w urz\u0105dze\u0144 deCONZ",
                 "title": "Opcje deCONZ"
diff --git a/homeassistant/components/deconz/translations/ru.json b/homeassistant/components/deconz/translations/ru.json
index a3120d32652..92cb2deb27c 100644
--- a/homeassistant/components/deconz/translations/ru.json
+++ b/homeassistant/components/deconz/translations/ru.json
@@ -2,8 +2,9 @@
     "config": {
         "abort": {
             "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
             "no_bridges": "\u0428\u043b\u044e\u0437\u044b deCONZ \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b.",
+            "no_hardware_available": "\u041a deCONZ \u043d\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u043e \u0440\u0430\u0434\u0438\u043e\u043e\u0431\u043e\u0440\u0443\u0434\u043e\u0432\u0430\u043d\u0438\u0435.",
             "not_deconz_bridge": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0448\u043b\u044e\u0437\u043e\u043c deCONZ.",
             "one_instance_only": "\u041a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 deCONZ.",
             "updated_instance": "\u0410\u0434\u0440\u0435\u0441 \u0445\u043e\u0441\u0442\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d."
@@ -43,8 +44,8 @@
             "button_3": "\u0422\u0440\u0435\u0442\u044c\u044f \u043a\u043d\u043e\u043f\u043a\u0430",
             "button_4": "\u0427\u0435\u0442\u0432\u0435\u0440\u0442\u0430\u044f \u043a\u043d\u043e\u043f\u043a\u0430",
             "close": "\u0417\u0430\u043a\u0440\u044b\u0432\u0430\u0435\u0442\u0441\u044f",
-            "dim_down": "\u042f\u0440\u043a\u043e\u0441\u0442\u044c \u0443\u043c\u0435\u043d\u044c\u0448\u0430\u0435\u0442\u0441\u044f",
-            "dim_up": "\u042f\u0440\u043a\u043e\u0441\u0442\u044c \u0443\u0432\u0435\u043b\u0438\u0447\u0438\u0432\u0430\u0435\u0442\u0441\u044f",
+            "dim_down": "\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u044f\u0440\u043a\u043e\u0441\u0442\u044c",
+            "dim_up": "\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u044f\u0440\u043a\u043e\u0441\u0442\u044c",
             "left": "\u041d\u0430\u043b\u0435\u0432\u043e",
             "open": "\u041e\u0442\u043a\u0440\u044b\u0432\u0430\u0435\u0442\u0441\u044f",
             "right": "\u041d\u0430\u043f\u0440\u0430\u0432\u043e",
@@ -55,8 +56,8 @@
             "side_5": "\u0413\u0440\u0430\u043d\u044c 5",
             "side_6": "\u0413\u0440\u0430\u043d\u044c 6",
             "top_buttons": "\u0412\u0435\u0440\u0445\u043d\u0438\u0435 \u043a\u043d\u043e\u043f\u043a\u0438",
-            "turn_off": "\u0412\u044b\u043a\u043b\u044e\u0447\u0430\u0435\u0442\u0441\u044f",
-            "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0430\u0435\u0442\u0441\u044f"
+            "turn_off": "\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c"
         },
         "trigger_type": {
             "remote_awakened": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0440\u0430\u0437\u0431\u0443\u0434\u0438\u043b\u0438",
@@ -66,9 +67,10 @@
             "remote_button_quadruple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0447\u0435\u0442\u044b\u0440\u0435 \u0440\u0430\u0437\u0430",
             "remote_button_quintuple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u043f\u044f\u0442\u044c \u0440\u0430\u0437",
             "remote_button_rotated": "{subtype} \u0432\u0440\u0430\u0449\u0430\u0435\u0442\u0441\u044f",
+            "remote_button_rotated_fast": "\u041a\u043d\u043e\u043f\u043a\u0430 \"{subtype}\" \u0431\u044b\u0441\u0442\u0440\u043e \u0432\u0440\u0430\u0449\u0430\u0435\u0442\u0441\u044f",
             "remote_button_rotation_stopped": "{subtype} \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0438\u043b\u0430 \u0432\u0440\u0430\u0449\u0435\u043d\u0438\u0435",
-            "remote_button_short_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430",
-            "remote_button_short_release": "{subtype} \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430",
+            "remote_button_short_press": "\u041a\u043d\u043e\u043f\u043a\u0430 \"{subtype}\" \u043d\u0430\u0436\u0430\u0442\u0430",
+            "remote_button_short_release": "\u041a\u043d\u043e\u043f\u043a\u0430 \"{subtype}\" \u043e\u0442\u043f\u0443\u0449\u0435\u043d\u0430",
             "remote_button_triple_press": "{subtype} \u043d\u0430\u0436\u0430\u0442\u0430 \u0442\u0440\u0438 \u0440\u0430\u0437\u0430",
             "remote_double_tap": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c {subtype} \u043f\u043e\u0441\u0442\u0443\u0447\u0430\u043b\u0438 \u0434\u0432\u0430\u0436\u0434\u044b",
             "remote_double_tap_any_side": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c \u043f\u043e\u0441\u0442\u0443\u0447\u0430\u043b\u0438 \u0434\u0432\u0430\u0436\u0434\u044b",
diff --git a/homeassistant/components/deconz/translations/zh-Hans.json b/homeassistant/components/deconz/translations/zh-Hans.json
index 42b8067f647..57993237696 100644
--- a/homeassistant/components/deconz/translations/zh-Hans.json
+++ b/homeassistant/components/deconz/translations/zh-Hans.json
@@ -22,7 +22,8 @@
             "side_3": "\u7b2c 3 \u9762",
             "side_4": "\u7b2c 4 \u9762",
             "side_5": "\u7b2c 5 \u9762",
-            "side_6": "\u7b2c 6 \u9762"
+            "side_6": "\u7b2c 6 \u9762",
+            "turn_off": "\u5173\u95ed"
         },
         "trigger_type": {
             "remote_awakened": "\u8bbe\u5907\u5524\u9192",
diff --git a/homeassistant/components/deconz/translations/zh-Hant.json b/homeassistant/components/deconz/translations/zh-Hant.json
index 84b820c17cc..1ae61f03ffd 100644
--- a/homeassistant/components/deconz/translations/zh-Hant.json
+++ b/homeassistant/components/deconz/translations/zh-Hant.json
@@ -2,8 +2,9 @@
     "config": {
         "abort": {
             "already_configured": "Bridge \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "Bridge \u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
             "no_bridges": "\u672a\u641c\u5c0b\u5230 deCONZ Bridfe",
+            "no_hardware_available": "deCONZ \u6c92\u6709\u4efb\u4f55\u7121\u7dda\u96fb\u8a2d\u5099\u9023\u7dda",
             "not_deconz_bridge": "\u975e deCONZ Bridge \u8a2d\u5099",
             "one_instance_only": "\u7d44\u4ef6\u50c5\u652f\u63f4\u4e00\u7d44 deCONZ \u7269\u4ef6",
             "updated_instance": "\u4f7f\u7528\u65b0\u4e3b\u6a5f\u7aef\u4f4d\u5740\u66f4\u65b0 deCONZ \u8a2d\u5099"
@@ -66,6 +67,7 @@
             "remote_button_quadruple_press": "\"{subtype}\" \u6309\u9215\u56db\u9023\u9ede\u64ca",
             "remote_button_quintuple_press": "\"{subtype}\" \u6309\u9215\u4e94\u9023\u9ede\u64ca",
             "remote_button_rotated": "\u65cb\u8f49 \"{subtype}\" \u6309\u9215",
+            "remote_button_rotated_fast": "\u5feb\u901f\u65cb\u8f49 \"{subtype}\" \u6309\u9215",
             "remote_button_rotation_stopped": "\u65cb\u8f49 \"{subtype}\" \u6309\u9215\u5df2\u505c\u6b62",
             "remote_button_short_press": "\"{subtype}\" \u6309\u9215\u5df2\u6309\u4e0b",
             "remote_button_short_release": "\"{subtype}\" \u6309\u9215\u5df2\u91cb\u653e",
diff --git a/homeassistant/components/decora/light.py b/homeassistant/components/decora/light.py
index 4335c99076a..2fc436eda20 100644
--- a/homeassistant/components/decora/light.py
+++ b/homeassistant/components/decora/light.py
@@ -125,11 +125,6 @@ class DecoraLight(LightEntity):
         """Flag supported features."""
         return SUPPORT_DECORA_LED
 
-    @property
-    def should_poll(self):
-        """We can read the device state, so poll."""
-        return True
-
     @property
     def assumed_state(self):
         """We can read the actual state."""
diff --git a/homeassistant/components/default_config/manifest.json b/homeassistant/components/default_config/manifest.json
index c25b9b82c38..8c6a3dde6cf 100644
--- a/homeassistant/components/default_config/manifest.json
+++ b/homeassistant/components/default_config/manifest.json
@@ -25,7 +25,9 @@
     "input_datetime",
     "input_text",
     "input_number",
-    "input_select"
+    "input_select",
+    "counter",
+    "timer"
   ],
   "codeowners": []
 }
diff --git a/homeassistant/components/demo/__init__.py b/homeassistant/components/demo/__init__.py
index afba3e2878a..eea613cc401 100644
--- a/homeassistant/components/demo/__init__.py
+++ b/homeassistant/components/demo/__init__.py
@@ -1,13 +1,11 @@
 """Set up the demo environment that mimics interaction with devices."""
 import asyncio
-import logging
 
 from homeassistant import bootstrap, config_entries
 from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_START
 import homeassistant.core as ha
 
 DOMAIN = "demo"
-_LOGGER = logging.getLogger(__name__)
 
 COMPONENTS_WITH_CONFIG_ENTRY_DEMO_PLATFORM = [
     "air_quality",
@@ -106,7 +104,7 @@ async def async_setup(hass, config):
         )
     )
 
-    # Set up input boolean
+    # Set up input number
     tasks.append(
         bootstrap.async_setup_component(
             hass,
diff --git a/homeassistant/components/demo/camera.py b/homeassistant/components/demo/camera.py
index ce211a47594..56726bba8b7 100644
--- a/homeassistant/components/demo/camera.py
+++ b/homeassistant/components/demo/camera.py
@@ -1,11 +1,8 @@
 """Demo camera platform that has a fake camera."""
-import logging
 from pathlib import Path
 
 from homeassistant.components.camera import SUPPORT_ON_OFF, Camera
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Demo camera platform."""
@@ -40,14 +37,6 @@ class DemoCamera(Camera):
         """Return the name of this camera."""
         return self._name
 
-    @property
-    def should_poll(self):
-        """Demo camera doesn't need poll.
-
-        Need explicitly call async_write_ha_state() after state changed.
-        """
-        return False
-
     @property
     def supported_features(self):
         """Camera support turn on/off features."""
diff --git a/homeassistant/components/demo/climate.py b/homeassistant/components/demo/climate.py
index 57feae64a89..a6d166662ae 100644
--- a/homeassistant/components/demo/climate.py
+++ b/homeassistant/components/demo/climate.py
@@ -1,6 +1,4 @@
 """Demo platform that offers a fake climate device."""
-import logging
-
 from homeassistant.components.climate import ClimateEntity
 from homeassistant.components.climate.const import (
     ATTR_TARGET_TEMP_HIGH,
@@ -26,7 +24,6 @@ from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT
 from . import DOMAIN
 
 SUPPORT_FLAGS = 0
-_LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
diff --git a/homeassistant/components/demo/light.py b/homeassistant/components/demo/light.py
index 640502584f8..3e949138b67 100644
--- a/homeassistant/components/demo/light.py
+++ b/homeassistant/components/demo/light.py
@@ -33,16 +33,27 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     async_add_entities(
         [
             DemoLight(
-                "light_1",
-                "Bed Light",
-                False,
-                True,
+                unique_id="light_1",
+                name="Bed Light",
+                state=False,
+                available=True,
                 effect_list=LIGHT_EFFECT_LIST,
                 effect=LIGHT_EFFECT_LIST[0],
             ),
-            DemoLight("light_2", "Ceiling Lights", True, True, ct=LIGHT_TEMPS[1]),
             DemoLight(
-                "light_3", "Kitchen Lights", True, True, LIGHT_COLORS[1], LIGHT_TEMPS[0]
+                unique_id="light_2",
+                name="Ceiling Lights",
+                state=True,
+                available=True,
+                ct=LIGHT_TEMPS[1],
+            ),
+            DemoLight(
+                unique_id="light_3",
+                name="Kitchen Lights",
+                state=True,
+                available=True,
+                hs_color=LIGHT_COLORS[1],
+                ct=LIGHT_TEMPS[0],
             ),
         ]
     )
diff --git a/homeassistant/components/demo/media_player.py b/homeassistant/components/demo/media_player.py
index f00f1fb781e..2ea360ebb81 100644
--- a/homeassistant/components/demo/media_player.py
+++ b/homeassistant/components/demo/media_player.py
@@ -4,12 +4,14 @@ from homeassistant.components.media_player.const import (
     MEDIA_TYPE_MOVIE,
     MEDIA_TYPE_MUSIC,
     MEDIA_TYPE_TVSHOW,
+    REPEAT_MODE_OFF,
     SUPPORT_CLEAR_PLAYLIST,
     SUPPORT_NEXT_TRACK,
     SUPPORT_PAUSE,
     SUPPORT_PLAY,
     SUPPORT_PLAY_MEDIA,
     SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_REPEAT_SET,
     SUPPORT_SEEK,
     SUPPORT_SELECT_SOUND_MODE,
     SUPPORT_SELECT_SOURCE,
@@ -73,6 +75,7 @@ MUSIC_PLAYER_SUPPORT = (
     | SUPPORT_CLEAR_PLAYLIST
     | SUPPORT_PLAY
     | SUPPORT_SHUFFLE_SET
+    | SUPPORT_REPEAT_SET
     | SUPPORT_VOLUME_STEP
     | SUPPORT_PREVIOUS_TRACK
     | SUPPORT_NEXT_TRACK
@@ -319,6 +322,7 @@ class DemoMusicPlayer(AbstractDemoPlayer):
         """Initialize the demo device."""
         super().__init__("Walkman")
         self._cur_track = 0
+        self._repeat = REPEAT_MODE_OFF
 
     @property
     def media_content_id(self):
@@ -360,6 +364,11 @@ class DemoMusicPlayer(AbstractDemoPlayer):
         """Return the track number of current media (Music track only)."""
         return self._cur_track + 1
 
+    @property
+    def repeat(self):
+        """Return current repeat mode."""
+        return self._repeat
+
     @property
     def supported_features(self):
         """Flag media player features that are supported."""
@@ -384,6 +393,11 @@ class DemoMusicPlayer(AbstractDemoPlayer):
         self._player_state = STATE_OFF
         self.schedule_update_ha_state()
 
+    def set_repeat(self, repeat):
+        """Enable/disable repeat mode."""
+        self._repeat = repeat
+        self.schedule_update_ha_state()
+
 
 class DemoTVShowPlayer(AbstractDemoPlayer):
     """A Demo media player that only supports YouTube."""
diff --git a/homeassistant/components/demo/translations/cs.json b/homeassistant/components/demo/translations/cs.json
index 5fe8151103e..1a9e6570085 100644
--- a/homeassistant/components/demo/translations/cs.json
+++ b/homeassistant/components/demo/translations/cs.json
@@ -5,7 +5,14 @@
                 "data": {
                     "int": "\u010c\u00edseln\u00fd vstup"
                 }
+            },
+            "options_2": {
+                "data": {
+                    "multi": "V\u00edcen\u00e1sobn\u00fd v\u00fdb\u011br",
+                    "select": "Vyberte mo\u017enost"
+                }
             }
         }
-    }
+    },
+    "title": "Demo"
 }
\ No newline at end of file
diff --git a/homeassistant/components/demo/translations/et.json b/homeassistant/components/demo/translations/et.json
new file mode 100644
index 00000000000..ca06ed9c3bd
--- /dev/null
+++ b/homeassistant/components/demo/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "options": {
+        "step": {
+            "options_1": {
+                "data": {
+                    "bool": "Valikuline t\u00f5ev\u00e4\u00e4rtus",
+                    "constant": "P\u00fcsiv\u00e4\u00e4rtus",
+                    "int": "Numbriline sisestus"
+                }
+            },
+            "options_2": {
+                "data": {
+                    "multi": "Mitme valikuga",
+                    "select": "Vali suvand",
+                    "string": "Tekstiline v\u00e4\u00e4rtus"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/demo/translations/pl.json b/homeassistant/components/demo/translations/pl.json
index ea46ae807c6..fb1da06bc1a 100644
--- a/homeassistant/components/demo/translations/pl.json
+++ b/homeassistant/components/demo/translations/pl.json
@@ -5,13 +5,14 @@
                 "data": {
                     "few": "kilka",
                     "many": "wiele",
-                    "one": "jedena",
+                    "one": "jedna",
                     "other": "inne"
                 }
             },
             "options_1": {
                 "data": {
                     "bool": "Warto\u015b\u0107 logiczna",
+                    "constant": "Sta\u0142y(-a)",
                     "int": "Warto\u015b\u0107 numeryczna"
                 }
             },
diff --git a/homeassistant/components/demo/vacuum.py b/homeassistant/components/demo/vacuum.py
index 528944ae27b..ebb6b57ce14 100644
--- a/homeassistant/components/demo/vacuum.py
+++ b/homeassistant/components/demo/vacuum.py
@@ -1,6 +1,4 @@
 """Demo platform for the vacuum component."""
-import logging
-
 from homeassistant.components.vacuum import (
     ATTR_CLEANED_AREA,
     STATE_CLEANING,
@@ -25,8 +23,6 @@ from homeassistant.components.vacuum import (
     VacuumEntity,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_MINIMAL_SERVICES = SUPPORT_TURN_ON | SUPPORT_TURN_OFF
 
 SUPPORT_BASIC_SERVICES = (
diff --git a/homeassistant/components/denonavr/config_flow.py b/homeassistant/components/denonavr/config_flow.py
index af2b7b03103..21c8da01783 100644
--- a/homeassistant/components/denonavr/config_flow.py
+++ b/homeassistant/components/denonavr/config_flow.py
@@ -158,7 +158,7 @@ class DenonAvrFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             self.zone3,
         )
         if not await connect_denonavr.async_connect_receiver():
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
         receiver = connect_denonavr.receiver
 
         mac_address = await self.async_get_mac(self.host)
diff --git a/homeassistant/components/denonavr/manifest.json b/homeassistant/components/denonavr/manifest.json
index afc5a7ef72f..86bee686764 100644
--- a/homeassistant/components/denonavr/manifest.json
+++ b/homeassistant/components/denonavr/manifest.json
@@ -3,7 +3,7 @@
   "name": "Denon AVR Network Receivers",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/denonavr",
-  "requirements": ["denonavr==0.9.4", "getmac==0.8.2"],
+  "requirements": ["denonavr==0.9.5", "getmac==0.8.2"],
   "codeowners": ["@scarface-4711", "@starkillerOG"],
   "ssdp": [
     {
diff --git a/homeassistant/components/denonavr/media_player.py b/homeassistant/components/denonavr/media_player.py
index c28b1a4cab5..b5990dede21 100644
--- a/homeassistant/components/denonavr/media_player.py
+++ b/homeassistant/components/denonavr/media_player.py
@@ -308,14 +308,13 @@ class DenonDevice(MediaPlayerEntity):
     @property
     def device_state_attributes(self):
         """Return device specific state attributes."""
-        attributes = {}
         if (
             self._sound_mode_raw is not None
             and self._sound_mode_support
             and self._power == "ON"
         ):
-            attributes[ATTR_SOUND_MODE_RAW] = self._sound_mode_raw
-        return attributes
+            return {ATTR_SOUND_MODE_RAW: self._sound_mode_raw}
+        return {}
 
     def media_play_pause(self):
         """Play or pause the media player."""
diff --git a/homeassistant/components/denonavr/strings.json b/homeassistant/components/denonavr/strings.json
index 25648d974ab..c754c906062 100644
--- a/homeassistant/components/denonavr/strings.json
+++ b/homeassistant/components/denonavr/strings.json
@@ -6,7 +6,7 @@
         "title": "Denon AVR Network Receivers",
         "description": "Connect to your receiver, if the IP address is not set, auto-discovery is used",
         "data": {
-          "host": "IP address"
+          "host": "[%key:common::config_flow::data::ip%]"
         }
       },
       "confirm": {
@@ -17,7 +17,7 @@
         "title": "Select the receiver that you wish to connect",
         "description": "Run the setup again if you want to connect additional receivers",
         "data": {
-          "select_host": "Receiver IP"
+          "select_host": "Receiver IP address"
         }
       }
     },
@@ -26,8 +26,8 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "Config flow for this Denon AVR is already in progress",
-      "connection_error": "Failed to connect, please try again, disconnecting mains power and ethernet cables and reconnecting them may help",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "cannot_connect": "Failed to connect, please try again, disconnecting mains power and ethernet cables and reconnecting them may help",
       "not_denonavr_manufacturer": "Not a Denon AVR Network Receiver, discovered manafucturer did not match",
       "not_denonavr_missing": "Not a Denon AVR Network Receiver, discovery information not complete"
     }
diff --git a/homeassistant/components/denonavr/translations/ca.json b/homeassistant/components/denonavr/translations/ca.json
index 34e73124056..c11bbbf7ce1 100644
--- a/homeassistant/components/denonavr/translations/ca.json
+++ b/homeassistant/components/denonavr/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "already_configured": "El dispositiu ja est\u00e0 configurat",
-            "already_in_progress": "El flux de dades de configuraci\u00f3 per aquest Denon AVR ja est\u00e0 en curs",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
+            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar. Pot ser \u00fatil desconnectar i tornar a connectar els cables d'Ethernet i d'alimentaci\u00f3",
             "connection_error": "No s'ha pogut connectar, torna-ho a provar. \u00c9s possible que s'arregli si desconnectes i tornes a connectar els cables d'Ethernet i d'alimentaci\u00f3.",
             "not_denonavr_manufacturer": "No \u00e9s un receptor de xarxa Denon AVR, no coincideix el fabricant descobert",
             "not_denonavr_missing": "No \u00e9s un receptor de xarxa Denon AVR, informaci\u00f3 de descobriment no completa"
@@ -18,7 +19,7 @@
             },
             "select": {
                 "data": {
-                    "select_host": "IP del receptor"
+                    "select_host": "Adre\u00e7a IP del receptor"
                 },
                 "description": "Torna a executar la configuraci\u00f3 si vols connectar receptors addicionals",
                 "title": "Selecciona el receptor al qual connectar-te"
diff --git a/homeassistant/components/denonavr/translations/cs.json b/homeassistant/components/denonavr/translations/cs.json
index 1eee6cfc151..0572ece02be 100644
--- a/homeassistant/components/denonavr/translations/cs.json
+++ b/homeassistant/components/denonavr/translations/cs.json
@@ -1,7 +1,28 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "cannot_connect": "P\u0159ipojen\u00ed se nezda\u0159ilo, zkuste to pros\u00edm znovu - odpojen\u00ed napajec\u00edch a ethernetov\u00fdch kabel\u016f a jejich op\u011btovn\u00e9 p\u0159ipojen\u00ed m\u016f\u017ee pomoci",
+            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit, zkuste to pros\u00edm znovu - m\u016f\u017ee pomoci odpojen\u00ed a op\u011btovn\u00e9 p\u0159ipojen\u00ed nap\u00e1jec\u00edho a ethernetov\u00e9ho kabelu"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "IP adresa"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "show_all_sources": "Zobrazit v\u0161echny zdroje",
+                    "zone2": "Nastavte z\u00f3nu 2",
+                    "zone3": "Nastavte z\u00f3nu 3"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/denonavr/translations/en.json b/homeassistant/components/denonavr/translations/en.json
index 91ec0d62a45..b3d7d74b8a1 100644
--- a/homeassistant/components/denonavr/translations/en.json
+++ b/homeassistant/components/denonavr/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "already_configured": "Device is already configured",
-            "already_in_progress": "Config flow for this Denon AVR is already in progress",
+            "already_in_progress": "Configuration flow is already in progress",
+            "cannot_connect": "Failed to connect, please try again, disconnecting mains power and ethernet cables and reconnecting them may help",
             "connection_error": "Failed to connect, please try again, disconnecting mains power and ethernet cables and reconnecting them may help",
             "not_denonavr_manufacturer": "Not a Denon AVR Network Receiver, discovered manafucturer did not match",
             "not_denonavr_missing": "Not a Denon AVR Network Receiver, discovery information not complete"
@@ -18,14 +19,14 @@
             },
             "select": {
                 "data": {
-                    "select_host": "Receiver IP"
+                    "select_host": "Receiver IP address"
                 },
                 "description": "Run the setup again if you want to connect additional receivers",
                 "title": "Select the receiver that you wish to connect"
             },
             "user": {
                 "data": {
-                    "host": "IP address"
+                    "host": "IP Address"
                 },
                 "description": "Connect to your receiver, if the IP address is not set, auto-discovery is used",
                 "title": "Denon AVR Network Receivers"
diff --git a/homeassistant/components/denonavr/translations/es.json b/homeassistant/components/denonavr/translations/es.json
index 2332d61c967..a240420bb1e 100644
--- a/homeassistant/components/denonavr/translations/es.json
+++ b/homeassistant/components/denonavr/translations/es.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "El dispositivo ya est\u00e1 configurado",
-            "already_in_progress": "El flujo de configuraci\u00f3n para este AVR Denon ya est\u00e1 en marcha.",
+            "already_in_progress": "El flujo de configuraci\u00f3n ya est\u00e1 en proceso",
             "connection_error": "Fallo en la conexi\u00f3n, por favor int\u00e9ntalo de nuevo, desconectar la alimentaci\u00f3n y los cables de ethernet y reconectarlos puede ayudar.",
             "not_denonavr_manufacturer": "No es un Receptor AVR Denon AVR en Red, el fabricante detectado no concuerda",
             "not_denonavr_missing": "No es un Receptor AVR Denon AVR en Red, la informaci\u00f3n detectada no est\u00e1 completa"
diff --git a/homeassistant/components/denonavr/translations/et.json b/homeassistant/components/denonavr/translations/et.json
new file mode 100644
index 00000000000..a8f2fceb897
--- /dev/null
+++ b/homeassistant/components/denonavr/translations/et.json
@@ -0,0 +1,44 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "cannot_connect": "\u00dchenduse loomine nurjus. Vooluv\u00f5rgust ja LAN v\u00f5rgust eemaldamine ja taas\u00fchendamine v\u00f5ib aidata",
+            "connection_error": "\u00dchenduse loomine nurjus. Vooluv\u00f5rgust ja LAN v\u00f5rgust eemaldamine ja taas\u00fchendamine v\u00f5ib aidata"
+        },
+        "flow_title": "Denon AVR v\u00f5rguvastuv\u00f5tja: {nimi}",
+        "step": {
+            "confirm": {
+                "description": "Palun kinnita vastuv\u00f5tja lisamine",
+                "title": ""
+            },
+            "select": {
+                "data": {
+                    "select_host": "Ressiiveri IP"
+                },
+                "description": "Kui soovid t\u00e4iendavaid vastuv\u00f5tjaid \u00fchendada, k\u00e4ivitad seadistamine uuesti",
+                "title": "Valivastuv\u00f5tja, millega soovid \u00fchenduda"
+            },
+            "user": {
+                "data": {
+                    "host": "IP aadress"
+                },
+                "description": "Kui IP-aadressi pole m\u00e4\u00e4ratud, kasutatakse automaatset avastamist",
+                "title": ""
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "show_all_sources": "Kuva k\u00f5ik sisendid",
+                    "zone2": "Seadista tsoon 2",
+                    "zone3": "Seadista tsoon 3"
+                },
+                "description": "Valikuliste s\u00e4tete m\u00e4\u00e4ramine",
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/denonavr/translations/it.json b/homeassistant/components/denonavr/translations/it.json
index 4b6359cfce6..9fc4e3cf90f 100644
--- a/homeassistant/components/denonavr/translations/it.json
+++ b/homeassistant/components/denonavr/translations/it.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "Il flusso di configurazione per questo Denon AVR \u00e8 gi\u00e0 in corso",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
             "connection_error": "Impossibile connettersi, si prega di riprovare, pu\u00f2 essere utile scollegare i cavi di alimentazione ed i cavi Ethernet e ricollegarli",
             "not_denonavr_manufacturer": "Non \u00e8 un ricevitore di rete Denon AVR, il produttore rilevato non corrisponde",
             "not_denonavr_missing": "Non \u00e8 un ricevitore di rete Denon AVR, le informazioni di rilevamento non sono complete"
diff --git a/homeassistant/components/denonavr/translations/nl.json b/homeassistant/components/denonavr/translations/nl.json
index 3444568d459..bd7efabf1c7 100644
--- a/homeassistant/components/denonavr/translations/nl.json
+++ b/homeassistant/components/denonavr/translations/nl.json
@@ -2,6 +2,30 @@
     "config": {
         "abort": {
             "connection_error": "Kan geen verbinding maken, probeer het opnieuw, het kan helpen om de netvoeding en ethernetkabels los te koppelen en opnieuw aan te sluiten"
+        },
+        "flow_title": "Denon AVR Network Receiver: {naam}",
+        "step": {
+            "confirm": {
+                "title": "Denon AVR Network Receivers"
+            },
+            "select": {
+                "data": {
+                    "select_host": "Receiver IP-adres"
+                },
+                "title": "Selecteer de receiver waarmee u verbinding wilt maken"
+            },
+            "user": {
+                "data": {
+                    "host": "IP-adres"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "title": "Denon AVR Network Receivers"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/denonavr/translations/no.json b/homeassistant/components/denonavr/translations/no.json
index e156101c378..5e0018118e9 100644
--- a/homeassistant/components/denonavr/translations/no.json
+++ b/homeassistant/components/denonavr/translations/no.json
@@ -2,8 +2,9 @@
     "config": {
         "abort": {
             "already_configured": "Enheten er allerede konfigurert",
-            "already_in_progress": "Konfigurasjonsflyt for denne Denon AVR p\u00e5g\u00e5r allerede",
-            "connection_error": "Kunne ikke koble til, vennligst pr\u00f8v igjen. Koble fra str\u00f8m- og nettverkskablene og koble dem til igjen kan hjelpe",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
+            "cannot_connect": "Kunne ikke koble til, vennligst pr\u00f8v igjen. Det kan hjelpe \u00e5 koble fra str\u00f8m- og Ethernet-kabler og koble dem til igjen",
+            "connection_error": "Kunne ikke koble til, vennligst pr\u00f8v igjen. Det kan hjelpe \u00e5 koble fra str\u00f8m- og Ethernet-kabler og koble dem til igjen",
             "not_denonavr_manufacturer": "Ikke en Denon AVR Network Receiver, oppdaget manafucturer stemte ikke overens",
             "not_denonavr_missing": "Ikke en Denon AVR Network Receiver, oppdagelsesinformasjon ikke fullf\u00f8rt"
         },
@@ -18,7 +19,7 @@
             },
             "select": {
                 "data": {
-                    "select_host": "IP-mottaker"
+                    "select_host": "Receiver IP-adresse"
                 },
                 "description": "Kj\u00f8r oppsettet igjen hvis du vil koble til flere mottakere",
                 "title": "Velg mottakeren du vil koble til"
diff --git a/homeassistant/components/denonavr/translations/pl.json b/homeassistant/components/denonavr/translations/pl.json
index eb396842bf0..b96d02240c0 100644
--- a/homeassistant/components/denonavr/translations/pl.json
+++ b/homeassistant/components/denonavr/translations/pl.json
@@ -2,10 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "already_in_progress": "Konfiguracja urz\u0105dzenia jest ju\u017c w toku.",
-            "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z urz\u0105dzeniem, spr\u00f3buj ponownie, od\u0142\u0105czenie zasilania sieciowego i kabla Ethernet i ponowne pod\u0142\u0105czenie mo\u017ce pom\u00f3c",
-            "not_denonavr_manufacturer": "Nie jest to urz\u0105dzenie AVR firmy Denon, producent wykrytego urz\u0105dzenia nie pasuje.",
-            "not_denonavr_missing": "Nie jest to urz\u0105dzenie AVR firmy Denon, dane z automatycznego wykrywania nie s\u0105 kompletne."
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie. Od\u0142\u0105czenie zasilania oraz kabla sieciowego i ponowne ich pod\u0142\u0105czenie mo\u017ce pom\u00f3c.",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie. Od\u0142\u0105czenie zasilania oraz kabla sieciowego i ponowne ich pod\u0142\u0105czenie mo\u017ce pom\u00f3c.",
+            "not_denonavr_manufacturer": "Nie jest to urz\u0105dzenie AVR firmy Denon, producent wykrytego urz\u0105dzenia nie pasuje",
+            "not_denonavr_missing": "Nie jest to urz\u0105dzenie AVR firmy Denon, dane z automatycznego wykrywania nie s\u0105 kompletne"
         },
         "error": {
             "discovery_error": "Nie uda\u0142o si\u0119 wykry\u0107 urz\u0105dzenia AVR firmy Denon"
diff --git a/homeassistant/components/denonavr/translations/ru.json b/homeassistant/components/denonavr/translations/ru.json
index 79e8c213e5f..c16d5d0a250 100644
--- a/homeassistant/components/denonavr/translations/ru.json
+++ b/homeassistant/components/denonavr/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437. \u0415\u0441\u043b\u0438 \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0432\u0442\u043e\u0440\u044f\u0435\u0442\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u0435\u0440\u0435\u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043a\u0430\u0431\u0435\u043b\u044c Ethernet \u0438 \u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u043a\u0430\u0431\u0435\u043b\u044c.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437. \u0415\u0441\u043b\u0438 \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0432\u0442\u043e\u0440\u044f\u0435\u0442\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u0435\u0440\u0435\u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043a\u0430\u0431\u0435\u043b\u044c Ethernet \u0438 \u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u043a\u0430\u0431\u0435\u043b\u044c.",
             "not_denonavr_manufacturer": "\u042d\u0442\u043e \u043d\u0435 \u0440\u0435\u0441\u0438\u0432\u0435\u0440 Denon. \u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c \u043d\u0435 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442.",
             "not_denonavr_missing": "\u041d\u0435\u043f\u043e\u043b\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u0434\u043b\u044f \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0438\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430."
diff --git a/homeassistant/components/denonavr/translations/zh-Hant.json b/homeassistant/components/denonavr/translations/zh-Hant.json
index 6127d170305..ad398ceee44 100644
--- a/homeassistant/components/denonavr/translations/zh-Hant.json
+++ b/homeassistant/components/denonavr/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "Denon AVR \u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002\u95dc\u9589\u4e3b\u96fb\u6e90\u3001\u5c07\u4e59\u592a\u7db2\u8def\u65b7\u7dda\u5f8c\u91cd\u65b0\u9023\u7dda\uff0c\u53ef\u80fd\u6703\u6709\u6240\u5e6b\u52a9",
             "connection_error": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002\u95dc\u9589\u4e3b\u96fb\u6e90\u3001\u5c07\u4e59\u592a\u7db2\u8def\u65b7\u7dda\u5f8c\u91cd\u65b0\u9023\u7dda\uff0c\u53ef\u80fd\u6703\u6709\u6240\u5e6b\u52a9",
             "not_denonavr_manufacturer": "\u4e26\u975e Denon AVR \u7db2\u8def\u63a5\u6536\u5668\uff0c\u6240\u63a2\u7d22\u4e4b\u88fd\u9020\u5ee0\u5546\u4e0d\u7b26\u5408",
             "not_denonavr_missing": "\u4e26\u975e Denon AVR \u7db2\u8def\u63a5\u6536\u5668\uff0c\u63a2\u7d22\u8cc7\u8a0a\u4e0d\u5b8c\u6574"
@@ -18,7 +19,7 @@
             },
             "select": {
                 "data": {
-                    "select_host": "\u63a5\u6536\u5668 IP"
+                    "select_host": "\u63a5\u6536\u5668 IP \u4f4d\u5740"
                 },
                 "description": "\u8acb\u518d\u6b21\u57f7\u884c\u8a2d\u5b9a\uff0c\u5047\u5982\u9084\u8981\u65b0\u589e\u5176\u4ed6\u63a5\u6536\u5668",
                 "title": "\u9078\u64c7\u6240\u8981\u9023\u7dda\u7684\u63a5\u6536\u5668\u3002"
diff --git a/homeassistant/components/derivative/sensor.py b/homeassistant/components/derivative/sensor.py
index c1369dd0f5b..7c2cc444a5a 100644
--- a/homeassistant/components/derivative/sensor.py
+++ b/homeassistant/components/derivative/sensor.py
@@ -213,8 +213,7 @@ class DerivativeSensor(RestoreEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the sensor."""
-        state_attr = {ATTR_SOURCE_ID: self._sensor_source_id}
-        return state_attr
+        return {ATTR_SOURCE_ID: self._sensor_source_id}
 
     @property
     def icon(self):
diff --git a/homeassistant/components/deutsche_bahn/sensor.py b/homeassistant/components/deutsche_bahn/sensor.py
index bb5adb943e9..01752f0373f 100644
--- a/homeassistant/components/deutsche_bahn/sensor.py
+++ b/homeassistant/components/deutsche_bahn/sensor.py
@@ -1,6 +1,5 @@
 """Support for information about the German train system."""
 from datetime import timedelta
-import logging
 
 import schiene
 import voluptuous as vol
@@ -10,8 +9,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 import homeassistant.util.dt as dt_util
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_DESTINATION = "to"
 CONF_START = "from"
 CONF_OFFSET = "offset"
diff --git a/homeassistant/components/device_automation/__init__.py b/homeassistant/components/device_automation/__init__.py
index 1db4af12f22..bba02147c71 100644
--- a/homeassistant/components/device_automation/__init__.py
+++ b/homeassistant/components/device_automation/__init__.py
@@ -1,7 +1,6 @@
 """Helpers for device automations."""
 import asyncio
 from functools import wraps
-import logging
 from types import ModuleType
 from typing import Any, List, MutableMapping
 
@@ -22,8 +21,6 @@ from .exceptions import DeviceNotFound, InvalidDeviceAutomationConfig
 
 DOMAIN = "device_automation"
 
-_LOGGER = logging.getLogger(__name__)
-
 
 TRIGGER_BASE_SCHEMA = vol.Schema(
     {
diff --git a/homeassistant/components/device_tracker/legacy.py b/homeassistant/components/device_tracker/legacy.py
index 3157a00aa9f..038fad06680 100644
--- a/homeassistant/components/device_tracker/legacy.py
+++ b/homeassistant/components/device_tracker/legacy.py
@@ -479,7 +479,7 @@ class DeviceScanner:
 
     async def async_scan_devices(self) -> Any:
         """Scan for devices."""
-        return await self.hass.async_add_job(self.scan_devices)
+        return await self.hass.async_add_executor_job(self.scan_devices)
 
     def get_device_name(self, device: str) -> str:
         """Get the name of a device."""
@@ -487,7 +487,7 @@ class DeviceScanner:
 
     async def async_get_device_name(self, device: str) -> Any:
         """Get the name of a device."""
-        return await self.hass.async_add_job(self.get_device_name, device)
+        return await self.hass.async_add_executor_job(self.get_device_name, device)
 
     def get_extra_attributes(self, device: str) -> dict:
         """Get the extra attributes of a device."""
@@ -495,7 +495,7 @@ class DeviceScanner:
 
     async def async_get_extra_attributes(self, device: str) -> Any:
         """Get the extra attributes of a device."""
-        return await self.hass.async_add_job(self.get_extra_attributes, device)
+        return await self.hass.async_add_executor_job(self.get_extra_attributes, device)
 
 
 async def async_load_config(
@@ -522,7 +522,7 @@ async def async_load_config(
     )
     result = []
     try:
-        devices = await hass.async_add_job(load_yaml_config_file, path)
+        devices = await hass.async_add_executor_job(load_yaml_config_file, path)
     except HomeAssistantError as err:
         LOGGER.error("Unable to load %s: %s", path, str(err))
         return []
diff --git a/homeassistant/components/device_tracker/setup.py b/homeassistant/components/device_tracker/setup.py
index 6d1d81634bd..133ea4eb414 100644
--- a/homeassistant/components/device_tracker/setup.py
+++ b/homeassistant/components/device_tracker/setup.py
@@ -60,7 +60,7 @@ class DeviceTrackerPlatform:
                     hass, {DOMAIN: self.config}
                 )
             elif hasattr(self.platform, "get_scanner"):
-                scanner = await hass.async_add_job(
+                scanner = await hass.async_add_executor_job(
                     self.platform.get_scanner, hass, {DOMAIN: self.config}
                 )
             elif hasattr(self.platform, "async_setup_scanner"):
@@ -68,7 +68,7 @@ class DeviceTrackerPlatform:
                     hass, self.config, tracker.async_see, discovery_info
                 )
             elif hasattr(self.platform, "setup_scanner"):
-                setup = await hass.async_add_job(
+                setup = await hass.async_add_executor_job(
                     self.platform.setup_scanner,
                     hass,
                     self.config,
diff --git a/homeassistant/components/devolo_home_control/__init__.py b/homeassistant/components/devolo_home_control/__init__.py
index 69327f96510..f1f00e9abe7 100644
--- a/homeassistant/components/devolo_home_control/__init__.py
+++ b/homeassistant/components/devolo_home_control/__init__.py
@@ -5,7 +5,7 @@ from functools import partial
 from devolo_home_control_api.homecontrol import HomeControl
 from devolo_home_control_api.mydevolo import Mydevolo
 
-from homeassistant.components import switch as ha_switch
+from homeassistant.components import zeroconf
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, EVENT_HOMEASSISTANT_STOP
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -13,8 +13,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 
 from .const import CONF_HOMECONTROL, CONF_MYDEVOLO, DOMAIN, PLATFORMS
 
-SUPPORTED_PLATFORMS = [ha_switch.DOMAIN]
-
 
 async def async_setup(hass, config):
     """Get all devices and add them to hass."""
@@ -33,7 +31,6 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
     mydevolo.user = conf[CONF_USERNAME]
     mydevolo.password = conf[CONF_PASSWORD]
     mydevolo.url = conf[CONF_MYDEVOLO]
-    mydevolo.mprm = conf[CONF_HOMECONTROL]
 
     credentials_valid = await hass.async_add_executor_job(mydevolo.credentials_valid)
 
@@ -45,11 +42,16 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
 
     gateway_ids = await hass.async_add_executor_job(mydevolo.get_gateway_ids)
     gateway_id = gateway_ids[0]
-    mprm_url = mydevolo.mprm
 
     try:
+        zeroconf_instance = await zeroconf.async_get_instance(hass)
         hass.data[DOMAIN]["homecontrol"] = await hass.async_add_executor_job(
-            partial(HomeControl, gateway_id=gateway_id, url=mprm_url)
+            partial(
+                HomeControl,
+                gateway_id=gateway_id,
+                zeroconf_instance=zeroconf_instance,
+                url=conf[CONF_HOMECONTROL],
+            )
         )
     except ConnectionError as err:
         raise ConfigEntryNotReady from err
diff --git a/homeassistant/components/devolo_home_control/binary_sensor.py b/homeassistant/components/devolo_home_control/binary_sensor.py
index f884ce0219d..1d581d2c0fb 100644
--- a/homeassistant/components/devolo_home_control/binary_sensor.py
+++ b/homeassistant/components/devolo_home_control/binary_sensor.py
@@ -1,6 +1,4 @@
 """Platform for binary sensor integration."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_DOOR,
     DEVICE_CLASS_HEAT,
@@ -15,8 +13,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from .const import DOMAIN
 from .devolo_device import DevoloDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 DEVICE_CLASS_MAPPING = {
     "Water alarm": DEVICE_CLASS_MOISTURE,
     "Home Security": DEVICE_CLASS_MOTION,
@@ -86,6 +82,9 @@ class DevoloBinaryDeviceEntity(DevoloDeviceEntity, BinarySensorEntity):
 
         self._value = self._binary_sensor_property.state
 
+        if element_uid.startswith("devolo.WarningBinaryFI:"):
+            self._enabled_default = False
+
     @property
     def is_on(self):
         """Return the state."""
diff --git a/homeassistant/components/devolo_home_control/climate.py b/homeassistant/components/devolo_home_control/climate.py
index 297e431e63a..0cc2340dc18 100644
--- a/homeassistant/components/devolo_home_control/climate.py
+++ b/homeassistant/components/devolo_home_control/climate.py
@@ -1,5 +1,4 @@
 """Platform for climate integration."""
-import logging
 from typing import List, Optional
 
 from homeassistant.components.climate import (
@@ -10,14 +9,12 @@ from homeassistant.components.climate import (
     ClimateEntity,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import PRECISION_HALVES
+from homeassistant.const import PRECISION_HALVES, PRECISION_TENTHS
 from homeassistant.helpers.typing import HomeAssistantType
 
 from .const import DOMAIN
 from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
@@ -30,6 +27,7 @@ async def async_setup_entry(
             if device.device_model_uid in [
                 "devolo.model.Thermostat:Valve",
                 "devolo.model.Room:Thermostat",
+                "devolo.model.Eurotronic:Spirit:Device",
             ]:
                 entities.append(
                     DevoloClimateDeviceEntity(
@@ -48,8 +46,28 @@ class DevoloClimateDeviceEntity(DevoloMultiLevelSwitchDeviceEntity, ClimateEntit
     @property
     def current_temperature(self) -> Optional[float]:
         """Return the current temperature."""
+        if hasattr(self._device_instance, "multi_level_sensor_property"):
+            return next(
+                (
+                    multi_level_sensor.value
+                    for multi_level_sensor in self._device_instance.multi_level_sensor_property.values()
+                    if multi_level_sensor.sensor_type == "temperature"
+                ),
+                None,
+            )
+
+        return None
+
+    @property
+    def target_temperature(self) -> Optional[float]:
+        """Return the target temperature."""
         return self._value
 
+    @property
+    def target_temperature_step(self) -> float:
+        """Return the precision of the target temperature."""
+        return PRECISION_HALVES
+
     @property
     def hvac_mode(self) -> str:
         """Return the supported HVAC mode."""
@@ -73,7 +91,7 @@ class DevoloClimateDeviceEntity(DevoloMultiLevelSwitchDeviceEntity, ClimateEntit
     @property
     def precision(self) -> float:
         """Return the precision of the set temperature."""
-        return PRECISION_HALVES
+        return PRECISION_TENTHS
 
     @property
     def supported_features(self):
@@ -85,6 +103,9 @@ class DevoloClimateDeviceEntity(DevoloMultiLevelSwitchDeviceEntity, ClimateEntit
         """Return the supported unit of temperature."""
         return TEMP_CELSIUS
 
+    def set_hvac_mode(self, hvac_mode: str) -> None:
+        """Do nothing as devolo devices do not support changing the hvac mode."""
+
     def set_temperature(self, **kwargs):
         """Set new target temperature."""
         self._multi_level_switch_property.set(kwargs[ATTR_TEMPERATURE])
diff --git a/homeassistant/components/devolo_home_control/config_flow.py b/homeassistant/components/devolo_home_control/config_flow.py
index e596a7628f6..cde55ebb4bf 100644
--- a/homeassistant/components/devolo_home_control/config_flow.py
+++ b/homeassistant/components/devolo_home_control/config_flow.py
@@ -53,15 +53,15 @@ class DevoloHomeControlFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         mydevolo.password = password
         if self.show_advanced_options:
             mydevolo.url = user_input[CONF_MYDEVOLO]
-            mydevolo.mprm = user_input[CONF_HOMECONTROL]
+            mprm = user_input[CONF_HOMECONTROL]
         else:
             mydevolo.url = DEFAULT_MYDEVOLO
-            mydevolo.mprm = DEFAULT_MPRM
+            mprm = DEFAULT_MPRM
         credentials_valid = await self.hass.async_add_executor_job(
             mydevolo.credentials_valid
         )
         if not credentials_valid:
-            return self._show_form({"base": "invalid_credentials"})
+            return self._show_form({"base": "invalid_auth"})
         _LOGGER.debug("Credentials valid")
         gateway_ids = await self.hass.async_add_executor_job(mydevolo.get_gateway_ids)
         await self.async_set_unique_id(gateway_ids[0])
@@ -73,7 +73,7 @@ class DevoloHomeControlFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                 CONF_PASSWORD: password,
                 CONF_USERNAME: user,
                 CONF_MYDEVOLO: mydevolo.url,
-                CONF_HOMECONTROL: mydevolo.mprm,
+                CONF_HOMECONTROL: mprm,
             },
         )
 
diff --git a/homeassistant/components/devolo_home_control/cover.py b/homeassistant/components/devolo_home_control/cover.py
index 21e555e3122..46f3df34314 100644
--- a/homeassistant/components/devolo_home_control/cover.py
+++ b/homeassistant/components/devolo_home_control/cover.py
@@ -1,6 +1,4 @@
 """Platform for cover integration."""
-import logging
-
 from homeassistant.components.cover import (
     DEVICE_CLASS_BLIND,
     SUPPORT_CLOSE,
@@ -14,8 +12,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from .const import DOMAIN
 from .devolo_multi_level_switch import DevoloMultiLevelSwitchDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/devolo_home_control/devolo_device.py b/homeassistant/components/devolo_home_control/devolo_device.py
index 44f3814825e..d0be9543bf4 100644
--- a/homeassistant/components/devolo_home_control/devolo_device.py
+++ b/homeassistant/components/devolo_home_control/devolo_device.py
@@ -21,6 +21,7 @@ class DevoloDeviceEntity(Entity):
         self._device_class = None
         self._value = None
         self._unit = None
+        self._enabled_default = True
 
         # This is not doing I/O. It fetches an internal state of the API
         self._available = device_instance.is_online()
@@ -60,6 +61,11 @@ class DevoloDeviceEntity(Entity):
             "model": self._model,
         }
 
+    @property
+    def entity_registry_enabled_default(self) -> bool:
+        """Return if the entity should be enabled when first added to the entity registry."""
+        return self._enabled_default
+
     @property
     def should_poll(self):
         """Return the polling state."""
@@ -84,8 +90,10 @@ class DevoloDeviceEntity(Entity):
         self.schedule_update_ha_state()
 
     def _generic_message(self, message):
-        """Handle unexpected messages."""
-        if message[0].startswith("hdm"):
+        """Handle generic messages."""
+        if len(message) == 3 and message[2] == "battery_level":
+            self._value = message[1]
+        elif len(message) == 3 and message[2] == "status":
             # Maybe the API wants to tell us, that the device went on- or offline.
             self._available = self._device_instance.is_online()
         else:
diff --git a/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py b/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py
index 8056192340c..482edd51f1e 100644
--- a/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py
+++ b/homeassistant/components/devolo_home_control/devolo_multi_level_switch.py
@@ -1,10 +1,6 @@
 """Base class for multi level switches in devolo Home Control."""
-import logging
-
 from .devolo_device import DevoloDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class DevoloMultiLevelSwitchDeviceEntity(DevoloDeviceEntity):
     """Representation of a multi level switch device within devolo Home Control. Something like a dimmer or a thermostat."""
diff --git a/homeassistant/components/devolo_home_control/light.py b/homeassistant/components/devolo_home_control/light.py
index c2f678425be..9c532be2dc2 100644
--- a/homeassistant/components/devolo_home_control/light.py
+++ b/homeassistant/components/devolo_home_control/light.py
@@ -77,4 +77,7 @@ class DevoloLightDeviceEntity(DevoloMultiLevelSwitchDeviceEntity, LightEntity):
 
     def turn_off(self, **kwargs) -> None:
         """Turn device off."""
-        self._multi_level_switch_property.set(0)
+        if self._binary_switch_property is not None:
+            self._binary_switch_property.set(False)
+        else:
+            self._multi_level_switch_property.set(0)
diff --git a/homeassistant/components/devolo_home_control/manifest.json b/homeassistant/components/devolo_home_control/manifest.json
index d7bc4804ef2..ce61fa121a4 100644
--- a/homeassistant/components/devolo_home_control/manifest.json
+++ b/homeassistant/components/devolo_home_control/manifest.json
@@ -2,7 +2,8 @@
   "domain": "devolo_home_control",
   "name": "devolo Home Control",
   "documentation": "https://www.home-assistant.io/integrations/devolo_home_control",
-  "requirements": ["devolo-home-control-api==0.15.0"],
+  "requirements": ["devolo-home-control-api==0.15.1"],
+  "after_dependencies": ["zeroconf"],
   "config_flow": true,
   "codeowners": ["@2Fake", "@Shutgun"],
   "quality_scale": "silver"
diff --git a/homeassistant/components/devolo_home_control/sensor.py b/homeassistant/components/devolo_home_control/sensor.py
index bbd16dc8560..c5ad9feb88a 100644
--- a/homeassistant/components/devolo_home_control/sensor.py
+++ b/homeassistant/components/devolo_home_control/sensor.py
@@ -1,21 +1,20 @@
 """Platform for sensor integration."""
-import logging
-
 from homeassistant.components.sensor import (
+    DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_ILLUMINANCE,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_TEMPERATURE,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import PERCENTAGE
 from homeassistant.helpers.typing import HomeAssistantType
 
 from .const import DOMAIN
 from .devolo_device import DevoloDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 DEVICE_CLASS_MAPPING = {
+    "battery": DEVICE_CLASS_BATTERY,
     "temperature": DEVICE_CLASS_TEMPERATURE,
     "light": DEVICE_CLASS_ILLUMINANCE,
     "humidity": DEVICE_CLASS_HUMIDITY,
@@ -51,6 +50,14 @@ async def async_setup_entry(
                             consumption=consumption_type,
                         )
                     )
+        if hasattr(device, "battery_level"):
+            entities.append(
+                DevoloBatteryEntity(
+                    homecontrol=hass.data[DOMAIN]["homecontrol"],
+                    device_instance=device,
+                    element_uid=f"devolo.BatterySensor:{device.uid}",
+                )
+            )
     async_add_entities(entities, False)
 
 
@@ -103,6 +110,27 @@ class DevoloGenericMultiLevelDeviceEntity(DevoloMultiLevelDeviceEntity):
         if self._device_class is None:
             self._name += f" {self._multi_level_sensor_property.sensor_type}"
 
+        if element_uid.startswith("devolo.VoltageMultiLevelSensor:"):
+            self._enabled_default = False
+
+
+class DevoloBatteryEntity(DevoloMultiLevelDeviceEntity):
+    """Representation of a battery entity within devolo Home Control."""
+
+    def __init__(self, homecontrol, device_instance, element_uid):
+        """Initialize a battery sensor."""
+
+        super().__init__(
+            homecontrol=homecontrol,
+            device_instance=device_instance,
+            element_uid=element_uid,
+        )
+
+        self._device_class = DEVICE_CLASS_MAPPING.get("battery")
+
+        self._value = device_instance.battery_level
+        self._unit = PERCENTAGE
+
 
 class DevoloConsumptionEntity(DevoloMultiLevelDeviceEntity):
     """Representation of a consumption entity within devolo Home Control."""
diff --git a/homeassistant/components/devolo_home_control/strings.json b/homeassistant/components/devolo_home_control/strings.json
index 620ca421854..8c73831a229 100644
--- a/homeassistant/components/devolo_home_control/strings.json
+++ b/homeassistant/components/devolo_home_control/strings.json
@@ -2,21 +2,21 @@
   "title": "devolo Home Control",
   "config": {
     "abort": {
-      "already_configured": "This Home Control Central Unit is already in use."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     },
     "error": {
-      "invalid_credentials": "Incorrect user name and/or password."
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "step": {
       "user": {
         "data": {
-          "username": "E-Mail-Address / devolo ID",
+          "username": "[%key:common::config_flow::data::email%] / devolo ID",
           "password": "[%key:common::config_flow::data::password%]",
-          "mydevolo_url": "mydevolo URL",
-          "home_control_url": "Home Control URL"
+          "mydevolo_url": "mydevolo [%key:common::config_flow::data::url%]",
+          "home_control_url": "Home Control [%key:common::config_flow::data::url%]"
         },
         "title": "devolo Home Control"
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/devolo_home_control/switch.py b/homeassistant/components/devolo_home_control/switch.py
index bc62dbfe2b9..32da37bcc38 100644
--- a/homeassistant/components/devolo_home_control/switch.py
+++ b/homeassistant/components/devolo_home_control/switch.py
@@ -1,6 +1,4 @@
 """Platform for switch integration."""
-import logging
-
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.typing import HomeAssistantType
@@ -8,8 +6,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from .const import DOMAIN
 from .devolo_device import DevoloDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/devolo_home_control/translations/ca.json b/homeassistant/components/devolo_home_control/translations/ca.json
index af0b4eb105a..593c5098014 100644
--- a/homeassistant/components/devolo_home_control/translations/ca.json
+++ b/homeassistant/components/devolo_home_control/translations/ca.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquesta Central Unit de Home Control ja est\u00e0 en \u00fas."
+            "already_configured": "El compte ja ha estat configurat"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Nom d'usuari i/o contrasenya incorrectes."
         },
         "step": {
diff --git a/homeassistant/components/devolo_home_control/translations/cs.json b/homeassistant/components/devolo_home_control/translations/cs.json
index 66e8cd431a4..1df8420dd2f 100644
--- a/homeassistant/components/devolo_home_control/translations/cs.json
+++ b/homeassistant/components/devolo_home_control/translations/cs.json
@@ -1,11 +1,23 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_credentials": "Nespr\u00e1vn\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no nebo heslo."
+        },
         "step": {
             "user": {
                 "data": {
-                    "password": "Heslo"
-                }
+                    "home_control_url": "Home Control URL",
+                    "mydevolo_url": "mydevolo URL",
+                    "password": "Heslo",
+                    "username": "E-mail / Devolo ID"
+                },
+                "title": "devolo Home Control"
             }
         }
-    }
+    },
+    "title": "devolo Home Control"
 }
\ No newline at end of file
diff --git a/homeassistant/components/devolo_home_control/translations/en.json b/homeassistant/components/devolo_home_control/translations/en.json
index ae888d37f4a..e5c9f84cab0 100644
--- a/homeassistant/components/devolo_home_control/translations/en.json
+++ b/homeassistant/components/devolo_home_control/translations/en.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This Home Control Central Unit is already in use."
+            "already_configured": "Account is already configured"
         },
         "error": {
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Incorrect user name and/or password."
         },
         "step": {
@@ -12,7 +13,7 @@
                     "home_control_url": "Home Control URL",
                     "mydevolo_url": "mydevolo URL",
                     "password": "Password",
-                    "username": "E-Mail-Address / devolo ID"
+                    "username": "Email / devolo ID"
                 },
                 "title": "devolo Home Control"
             }
diff --git a/homeassistant/components/devolo_home_control/translations/es.json b/homeassistant/components/devolo_home_control/translations/es.json
index 9eb7f04f923..8030dd5eaf5 100644
--- a/homeassistant/components/devolo_home_control/translations/es.json
+++ b/homeassistant/components/devolo_home_control/translations/es.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Esta Unidad Central de Home Control ya est\u00e1 en uso."
+            "already_configured": "La cuenta ya ha sido configurada"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_credentials": "Nombre de usuario y/o contrase\u00f1a incorrectos."
         },
         "step": {
@@ -12,7 +13,7 @@
                     "home_control_url": "URL de Home Control",
                     "mydevolo_url": "URL de mydevolo",
                     "password": "Contrase\u00f1a",
-                    "username": "Direcci\u00f3n de correo electr\u00f3nico / ID de devolo"
+                    "username": "Correo electr\u00f3nico / ID de devolo"
                 },
                 "title": "devolo Home Control"
             }
diff --git a/homeassistant/components/devolo_home_control/translations/et.json b/homeassistant/components/devolo_home_control/translations/et.json
new file mode 100644
index 00000000000..c62f5adbd9a
--- /dev/null
+++ b/homeassistant/components/devolo_home_control/translations/et.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_credentials": "Vale kasutajanimi v\u00f5i salas\u00f5na."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "home_control_url": "Home Control'i URL",
+                    "mydevolo_url": "mydevolo URL",
+                    "password": "Salas\u00f5na",
+                    "username": "E-post / devolo ID"
+                },
+                "title": ""
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/devolo_home_control/translations/fr.json b/homeassistant/components/devolo_home_control/translations/fr.json
index 1f9b6f4e28f..acc2b171b63 100644
--- a/homeassistant/components/devolo_home_control/translations/fr.json
+++ b/homeassistant/components/devolo_home_control/translations/fr.json
@@ -4,6 +4,7 @@
             "already_configured": "Cette unit\u00e9 centrale Home Control est d\u00e9j\u00e0 utilis\u00e9e."
         },
         "error": {
+            "invalid_auth": "Authentification invalide",
             "invalid_credentials": "Nom d''utilisateur et/ou mot de passe incorrect."
         },
         "step": {
diff --git a/homeassistant/components/devolo_home_control/translations/it.json b/homeassistant/components/devolo_home_control/translations/it.json
index 89bc030a7c8..8788e3e307a 100644
--- a/homeassistant/components/devolo_home_control/translations/it.json
+++ b/homeassistant/components/devolo_home_control/translations/it.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo Home Control Central \u00e8 gi\u00e0 in uso."
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato"
         },
         "error": {
+            "invalid_auth": "Autenticazione non valida",
             "invalid_credentials": "Nome utente e/o password non corretti."
         },
         "step": {
@@ -12,7 +13,7 @@
                     "home_control_url": "URL di Home Control",
                     "mydevolo_url": "URL di mydevolo",
                     "password": "Password",
-                    "username": "Indirizzo e-mail / devolo ID"
+                    "username": "E-mail / devolo ID"
                 },
                 "title": "devolo Home Control"
             }
diff --git a/homeassistant/components/devolo_home_control/translations/lb.json b/homeassistant/components/devolo_home_control/translations/lb.json
index f071087dba5..0c1946cb126 100644
--- a/homeassistant/components/devolo_home_control/translations/lb.json
+++ b/homeassistant/components/devolo_home_control/translations/lb.json
@@ -4,6 +4,7 @@
             "already_configured": "D\u00ebs Home Control Zentrale g\u00ebtt scho benotzt."
         },
         "error": {
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_credentials": "Ong\u00ebltege Benotzernumm an/oder Passwuert"
         },
         "step": {
diff --git a/homeassistant/components/devolo_home_control/translations/nl.json b/homeassistant/components/devolo_home_control/translations/nl.json
index 10b71ff595a..ad344544984 100644
--- a/homeassistant/components/devolo_home_control/translations/nl.json
+++ b/homeassistant/components/devolo_home_control/translations/nl.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Account is al geconfigureerd"
+        },
         "error": {
             "invalid_credentials": "Verkeerde gebruikersnaam en/of wachtwoord."
         },
diff --git a/homeassistant/components/devolo_home_control/translations/no.json b/homeassistant/components/devolo_home_control/translations/no.json
index 19c8d2653c1..2ec2b0744f2 100644
--- a/homeassistant/components/devolo_home_control/translations/no.json
+++ b/homeassistant/components/devolo_home_control/translations/no.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne hjemmekontrollsentralenheten er allerede i bruk."
+            "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig brukernavn og/eller passord"
         },
         "step": {
@@ -12,7 +13,7 @@
                     "home_control_url": "Home Control URL",
                     "mydevolo_url": "mydevolo URL",
                     "password": "Passord",
-                    "username": "E-postadresse / devolo-ID"
+                    "username": "E-post / devolo ID"
                 },
                 "title": ""
             }
diff --git a/homeassistant/components/devolo_home_control/translations/pl.json b/homeassistant/components/devolo_home_control/translations/pl.json
index 0d1c2338e33..d9bf1de55d1 100644
--- a/homeassistant/components/devolo_home_control/translations/pl.json
+++ b/homeassistant/components/devolo_home_control/translations/pl.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ta jednostka Home Control Central jest ju\u017c w u\u017cyciu."
+            "already_configured": "Konto jest ju\u017c skonfigurowane"
         },
         "error": {
-            "invalid_credentials": "Nieprawid\u0142owa nazwa u\u017cytkownika i/lub has\u0142o."
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "invalid_credentials": "Nieprawid\u0142owa nazwa u\u017cytkownika i/lub has\u0142o"
         },
         "step": {
             "user": {
@@ -12,7 +13,7 @@
                     "home_control_url": "URL Home Control",
                     "mydevolo_url": "URL mydevolo",
                     "password": "Has\u0142o",
-                    "username": "Nazwa u\u017cytkownika"
+                    "username": "Nazwa u\u017cytkownika/identyfikator devolo"
                 },
                 "title": "devolo Home Control"
             }
diff --git a/homeassistant/components/devolo_home_control/translations/ru.json b/homeassistant/components/devolo_home_control/translations/ru.json
index b65a45d7227..71cff94add6 100644
--- a/homeassistant/components/devolo_home_control/translations/ru.json
+++ b/homeassistant/components/devolo_home_control/translations/ru.json
@@ -1,16 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u042d\u0442\u043e\u0442 Home Control Central Unit \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f."
+            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c."
         },
         "step": {
             "user": {
                 "data": {
-                    "home_control_url": "Home Control URL",
-                    "mydevolo_url": "mydevolo URL",
+                    "home_control_url": "Home Control URL-\u0430\u0434\u0440\u0435\u0441",
+                    "mydevolo_url": "mydevolo URL-\u0430\u0434\u0440\u0435\u0441",
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "username": "\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b / devolo ID"
                 },
diff --git a/homeassistant/components/devolo_home_control/translations/zh-Hant.json b/homeassistant/components/devolo_home_control/translations/zh-Hant.json
index ef2407fe5bd..3336d67464a 100644
--- a/homeassistant/components/devolo_home_control/translations/zh-Hant.json
+++ b/homeassistant/components/devolo_home_control/translations/zh-Hant.json
@@ -1,18 +1,19 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64 Home Control Central \u5df2\u7d93\u65bc\u4f7f\u7528\u4e2d\u3002"
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u4f7f\u7528\u8005\u540d\u7a31\u53ca/\u6216\u5bc6\u78bc\u932f\u8aa4\u3002"
         },
         "step": {
             "user": {
                 "data": {
-                    "home_control_url": "Home Control URL",
-                    "mydevolo_url": "mydevolo URL",
+                    "home_control_url": "Home Control \u7db2\u5740",
+                    "mydevolo_url": "mydevolo \u7db2\u5740",
                     "password": "\u5bc6\u78bc",
-                    "username": "E-Mail \u4f4d\u5740 / devolo ID"
+                    "username": "\u96fb\u5b50\u90f5\u4ef6 / devolo ID"
                 },
                 "title": "devolo Home Control"
             }
diff --git a/homeassistant/components/dexcom/config_flow.py b/homeassistant/components/dexcom/config_flow.py
index e2ce9e49186..1d6d52fa0c9 100644
--- a/homeassistant/components/dexcom/config_flow.py
+++ b/homeassistant/components/dexcom/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow for Dexcom integration."""
-import logging
-
 from pydexcom import AccountError, Dexcom, SessionError
 import voluptuous as vol
 
@@ -17,8 +15,6 @@ from .const import (  # pylint:disable=unused-import
     SERVER_US,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 DATA_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_USERNAME): str,
@@ -46,9 +42,9 @@ class DexcomConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                     user_input[CONF_SERVER] == SERVER_OUS,
                 )
             except SessionError:
-                errors["base"] = "session_error"
+                errors["base"] = "cannot_connect"
             except AccountError:
-                errors["base"] = "account_error"
+                errors["base"] = "invalid_auth"
             except Exception:  # pylint: disable=broad-except
                 errors["base"] = "unknown"
 
diff --git a/homeassistant/components/dexcom/strings.json b/homeassistant/components/dexcom/strings.json
index 7b9932ec4de..bb29f814ee8 100644
--- a/homeassistant/components/dexcom/strings.json
+++ b/homeassistant/components/dexcom/strings.json
@@ -12,11 +12,13 @@
       }
     },
     "error": {
-      "session_error": "[%key:common::config_flow::error::cannot_connect%]",
-      "account_error": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
-    "abort": { "already_configured_account": "[%key:common::config_flow::abort::already_configured_account%]" }
+    "abort": {
+      "already_configured_account": "[%key:common::config_flow::abort::already_configured_account%]"
+    }
   },
   "options": {
     "step": {
diff --git a/homeassistant/components/dexcom/translations/ca.json b/homeassistant/components/dexcom/translations/ca.json
index 7be3b94993f..b92d6b7ab06 100644
--- a/homeassistant/components/dexcom/translations/ca.json
+++ b/homeassistant/components/dexcom/translations/ca.json
@@ -5,6 +5,8 @@
         },
         "error": {
             "account_error": "Autenticaci\u00f3 inv\u00e0lida",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "session_error": "Ha fallat la connexi\u00f3",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/dexcom/translations/cs.json b/homeassistant/components/dexcom/translations/cs.json
new file mode 100644
index 00000000000..3eaed9fcbde
--- /dev/null
+++ b/homeassistant/components/dexcom/translations/cs.json
@@ -0,0 +1,32 @@
+{
+    "config": {
+        "abort": {
+            "already_configured_account": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "error": {
+            "account_error": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "session_error": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "server": "Server",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "unit_of_measurement": "Jednotka m\u011b\u0159en\u00ed"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/dexcom/translations/el.json b/homeassistant/components/dexcom/translations/el.json
new file mode 100644
index 00000000000..b30be708065
--- /dev/null
+++ b/homeassistant/components/dexcom/translations/el.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2",
+            "invalid_auth": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b1\u03c5\u03b8\u03b5\u03bd\u03c4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/dexcom/translations/en.json b/homeassistant/components/dexcom/translations/en.json
index 2d2f6aa0834..92ca2d11859 100644
--- a/homeassistant/components/dexcom/translations/en.json
+++ b/homeassistant/components/dexcom/translations/en.json
@@ -5,6 +5,8 @@
         },
         "error": {
             "account_error": "Invalid authentication",
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
             "session_error": "Failed to connect",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/dexcom/translations/es.json b/homeassistant/components/dexcom/translations/es.json
index 146e7763251..95f80f558b3 100644
--- a/homeassistant/components/dexcom/translations/es.json
+++ b/homeassistant/components/dexcom/translations/es.json
@@ -5,6 +5,8 @@
         },
         "error": {
             "account_error": "Autenticaci\u00f3n no v\u00e1lida",
+            "cannot_connect": "No se pudo conectar",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "session_error": "No se pudo conectar",
             "unknown": "Error inesperado"
         },
diff --git a/homeassistant/components/dexcom/translations/et.json b/homeassistant/components/dexcom/translations/et.json
index b1967bf2695..d517cab1362 100644
--- a/homeassistant/components/dexcom/translations/et.json
+++ b/homeassistant/components/dexcom/translations/et.json
@@ -1,4 +1,26 @@
 {
+    "config": {
+        "abort": {
+            "already_configured_account": "Konto on juba seadistatud"
+        },
+        "error": {
+            "account_error": "Tuvastamine nurjus",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga",
+            "session_error": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "server": "",
+                    "username": "Kasutajanimi"
+                },
+                "title": "Seadista Dexcom'i sidumine"
+            }
+        }
+    },
     "options": {
         "step": {
             "init": {
diff --git a/homeassistant/components/dexcom/translations/fr.json b/homeassistant/components/dexcom/translations/fr.json
index 3825a88d322..5ad342c22ff 100644
--- a/homeassistant/components/dexcom/translations/fr.json
+++ b/homeassistant/components/dexcom/translations/fr.json
@@ -5,6 +5,8 @@
         },
         "error": {
             "account_error": "L'authentification ne'st pas valide",
+            "cannot_connect": "\u00c9chec de connexion",
+            "invalid_auth": "Authentification invalide",
             "session_error": "\u00c9chec de connexion",
             "unknown": "Erreur inattendue"
         },
diff --git a/homeassistant/components/dexcom/translations/it.json b/homeassistant/components/dexcom/translations/it.json
index e9695304c92..0042c585cd1 100644
--- a/homeassistant/components/dexcom/translations/it.json
+++ b/homeassistant/components/dexcom/translations/it.json
@@ -5,6 +5,8 @@
         },
         "error": {
             "account_error": "Autenticazione non valida",
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_auth": "Autenticazione non valida",
             "session_error": "Impossibile connettersi",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/dexcom/translations/lb.json b/homeassistant/components/dexcom/translations/lb.json
index a17a218988a..2fb803d73ff 100644
--- a/homeassistant/components/dexcom/translations/lb.json
+++ b/homeassistant/components/dexcom/translations/lb.json
@@ -5,6 +5,8 @@
         },
         "error": {
             "account_error": "Ong\u00eblteg Authentifikatioun",
+            "cannot_connect": "Feeler beim verbannen",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "session_error": "Feeler beim verbannen",
             "unknown": "Onerwaarte"
         },
diff --git a/homeassistant/components/dexcom/translations/nl.json b/homeassistant/components/dexcom/translations/nl.json
index 4d00f0bfc74..4198e0d9fc4 100644
--- a/homeassistant/components/dexcom/translations/nl.json
+++ b/homeassistant/components/dexcom/translations/nl.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/dexcom/translations/no.json b/homeassistant/components/dexcom/translations/no.json
index 61ad015b5a4..231c9393978 100644
--- a/homeassistant/components/dexcom/translations/no.json
+++ b/homeassistant/components/dexcom/translations/no.json
@@ -5,7 +5,9 @@
         },
         "error": {
             "account_error": "Ugyldig godkjenning",
-            "session_error": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning",
+            "session_error": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
         "step": {
diff --git a/homeassistant/components/dexcom/translations/pl.json b/homeassistant/components/dexcom/translations/pl.json
index acc27dc93f4..3897fbb13f9 100644
--- a/homeassistant/components/dexcom/translations/pl.json
+++ b/homeassistant/components/dexcom/translations/pl.json
@@ -5,15 +5,17 @@
         },
         "error": {
             "account_error": "Niepoprawne uwierzytelnienie",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "session_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "user": {
                 "data": {
-                    "password": "[%key_id:common::config_flow::data::password%]",
+                    "password": "Has\u0142o",
                     "server": "Serwer",
-                    "username": "[%key_id:common::config_flow::data::username%]"
+                    "username": "Nazwa u\u017cytkownika"
                 },
                 "description": "Wprowad\u017a dane uwierzytelniaj\u0105ce Dexcom",
                 "title": "Skonfiguruj integracj\u0119 Dexcom"
diff --git a/homeassistant/components/dexcom/translations/ru.json b/homeassistant/components/dexcom/translations/ru.json
index 01bd9a3f0b3..69b79638100 100644
--- a/homeassistant/components/dexcom/translations/ru.json
+++ b/homeassistant/components/dexcom/translations/ru.json
@@ -5,6 +5,8 @@
         },
         "error": {
             "account_error": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "session_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/dexcom/translations/zh-Hans.json b/homeassistant/components/dexcom/translations/zh-Hans.json
index 41e54c84b56..7fd407af3aa 100644
--- a/homeassistant/components/dexcom/translations/zh-Hans.json
+++ b/homeassistant/components/dexcom/translations/zh-Hans.json
@@ -2,6 +2,7 @@
     "config": {
         "error": {
             "account_error": "\u8ba4\u8bc1\u65e0\u6548",
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25",
             "session_error": "\u8fde\u63a5\u5931\u8d25",
             "unknown": "\u672a\u77e5\u9519\u8bef"
         },
@@ -9,7 +10,8 @@
             "user": {
                 "data": {
                     "password": "\u5bc6\u7801",
-                    "server": "\u670d\u52a1\u5668"
+                    "server": "\u670d\u52a1\u5668",
+                    "username": "\u7528\u6237\u540d"
                 }
             }
         }
diff --git a/homeassistant/components/dexcom/translations/zh-Hant.json b/homeassistant/components/dexcom/translations/zh-Hant.json
index f056b92b2de..656e082f7c4 100644
--- a/homeassistant/components/dexcom/translations/zh-Hant.json
+++ b/homeassistant/components/dexcom/translations/zh-Hant.json
@@ -5,6 +5,8 @@
         },
         "error": {
             "account_error": "\u9a57\u8b49\u78bc\u7121\u6548",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "session_error": "\u9023\u7dda\u5931\u6557",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/dialogflow/__init__.py b/homeassistant/components/dialogflow/__init__.py
index b9ba977e422..e623919f099 100644
--- a/homeassistant/components/dialogflow/__init__.py
+++ b/homeassistant/components/dialogflow/__init__.py
@@ -161,7 +161,7 @@ class DialogflowResponse:
         assert self.speech is None
 
         if isinstance(text, template.Template):
-            text = text.async_render(self.parameters)
+            text = text.async_render(self.parameters, parse_result=False)
 
         self.speech = text
 
diff --git a/homeassistant/components/dialogflow/strings.json b/homeassistant/components/dialogflow/strings.json
index d1a691dc92b..f17491a7528 100644
--- a/homeassistant/components/dialogflow/strings.json
+++ b/homeassistant/components/dialogflow/strings.json
@@ -7,7 +7,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive Dialogflow messages."
     },
     "create_entry": {
diff --git a/homeassistant/components/dialogflow/translations/ca.json b/homeassistant/components/dialogflow/translations/ca.json
index 17dd38ffb20..bc62fe1f555 100644
--- a/homeassistant/components/dialogflow/translations/ca.json
+++ b/homeassistant/components/dialogflow/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Dialogflow.",
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar la [integraci\u00f3 webhook de Dialogflow]({dialogflow_url}). \n\n Completa la seg\u00fcent informaci\u00f3: \n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n- Tipus de contingut: application/json\n\nConsulta la [documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
diff --git a/homeassistant/components/dialogflow/translations/cs.json b/homeassistant/components/dialogflow/translations/cs.json
index 3ad8ba78c72..409d63070f7 100644
--- a/homeassistant/components/dialogflow/translations/cs.json
+++ b/homeassistant/components/dialogflow/translations/cs.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Va\u0161e Home Assistant instance mus\u00ed b\u00fdt p\u0159\u00edstupn\u00e1 z internetu aby mohla p\u0159ij\u00edmat zpr\u00e1vy Dialogflow.",
-            "one_instance_allowed": "Povolena je pouze jedna instance."
+            "not_internet_accessible": "V\u00e1\u0161 Home Asistent mus\u00ed b\u00fdt p\u0159\u00edstupn\u00fd z internetu, aby mohl p\u0159ij\u00edmat zpr\u00e1vy od Dialogflow.",
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "create_entry": {
             "default": "Chcete-li odeslat ud\u00e1losti do aplikace Home Assistant, budete muset nastavit [integraci Dialogflow]({dialogflow_url}). \n\n Vypl\u0148te n\u00e1sleduj\u00edc\u00ed informace: \n\n - URL: `{webhook_url}' \n - Metoda: POST \n - Typ obsahu:  application/json\n\n Podrobn\u011bj\u0161\u00ed informace naleznete v [dokumentaci]({docs_url})."
diff --git a/homeassistant/components/dialogflow/translations/el.json b/homeassistant/components/dialogflow/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/dialogflow/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/dialogflow/translations/en.json b/homeassistant/components/dialogflow/translations/en.json
index cc9eda6a968..f78843fd503 100644
--- a/homeassistant/components/dialogflow/translations/en.json
+++ b/homeassistant/components/dialogflow/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive Dialogflow messages.",
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "To send events to Home Assistant, you will need to setup [webhook integration of Dialogflow]({dialogflow_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nSee [the documentation]({docs_url}) for further details."
diff --git a/homeassistant/components/dialogflow/translations/es.json b/homeassistant/components/dialogflow/translations/es.json
index f7131348499..542cbe3d022 100644
--- a/homeassistant/components/dialogflow/translations/es.json
+++ b/homeassistant/components/dialogflow/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Tu instancia de Home Assistant debe ser accesible desde Internet para recibir mensajes de Dialogflow.",
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "S\u00f3lo se necesita una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Para enviar eventos a Home Assistant, necesitas configurar [Integraci\u00f3n de flujos de dialogo de webhook]({dialogflow_url}).\n\nRellena la siguiente informaci\u00f3n:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nVer [Documentaci\u00f3n]({docs_url}) para m\u00e1s detalles."
diff --git a/homeassistant/components/dialogflow/translations/et.json b/homeassistant/components/dialogflow/translations/et.json
index 99298014f71..fafda5352ec 100644
--- a/homeassistant/components/dialogflow/translations/et.json
+++ b/homeassistant/components/dialogflow/translations/et.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Dialogflow teavituste vastuv\u00f5tmiseks peab teie Home Assistant olema Interneti kaudu ligip\u00e4\u00e4setav.",
-            "one_instance_allowed": "Vaja on ainult \u00fchte \u00fcksust."
+            "one_instance_allowed": "Vaja on ainult \u00fchte \u00fcksust.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
         },
         "create_entry": {
             "default": "S\u00fcndmuste saatmiseks Home Assistantile peate seadistama [Dialogflow'i veebihaagii integreerimine] ( {dialogflow_url} ). \n\n Sisestage j\u00e4rgmine teave: \n\n - URL: \" {webhook_url} \" \n - Meetod: POST \n - Sisu t\u00fc\u00fcp: rakendus / json \n\n Lisateavet leiate [dokumentatsioonist] ( {docs_url} )."
diff --git a/homeassistant/components/dialogflow/translations/fr.json b/homeassistant/components/dialogflow/translations/fr.json
index 81de11edbd5..85ace2c378e 100644
--- a/homeassistant/components/dialogflow/translations/fr.json
+++ b/homeassistant/components/dialogflow/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Votre instance de Home Assistant doit \u00eatre accessible depuis Internet pour recevoir les messages Dialogflow.",
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "Pour envoyer des \u00e9v\u00e9nements \u00e0 Home Assistant, vous devez configurer [Webhooks avec Dialogflow] ( {dialogflow_url} ). \n\n Remplissez les informations suivantes: \n\n - URL: ` {webhook_url} ` \n - M\u00e9thode: POST \n - Type de contenu: application / json \n\n Voir [la documentation] ( {docs_url} ) pour savoir comment configurer les automatisations pour g\u00e9rer les donn\u00e9es entrantes."
diff --git a/homeassistant/components/dialogflow/translations/it.json b/homeassistant/components/dialogflow/translations/it.json
index 2c933d09a52..a318633d4e4 100644
--- a/homeassistant/components/dialogflow/translations/it.json
+++ b/homeassistant/components/dialogflow/translations/it.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La tua istanza di Home Assistant deve essere accessibile da Internet per ricevere messaggi da Dialogflow.",
-            "one_instance_allowed": "\u00c8 necessaria una sola istanza."
+            "one_instance_allowed": "\u00c8 necessaria una sola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "Per inviare eventi a Home Assistant, dovrai configurare [l'integrazione webhook di Dialogflow]({dialogflow_url})\n\n Compila le seguenti informazioni: \n\n - URL: `{webhook_url}` \n - Method: POST \n - Content Type: application/json \n\n Vedi [la documentazione]({docs_url}) for ulteriori dettagli."
diff --git a/homeassistant/components/dialogflow/translations/lb.json b/homeassistant/components/dialogflow/translations/lb.json
index a10adda6702..d64fa8bd2e7 100644
--- a/homeassistant/components/dialogflow/translations/lb.json
+++ b/homeassistant/components/dialogflow/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir Dialogflow Noriichten z'empf\u00e4nken.",
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Fir Evenementer un Home Assistant ze sch\u00e9cken, muss [Webhook Integratioun mat Dialogflow]({dialogflow_url}) ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/x-www-form-urlencoded\n\nLiest [Dokumentatioun]({docs_url}) fir w\u00e9ider D\u00e9tailer."
diff --git a/homeassistant/components/dialogflow/translations/nl.json b/homeassistant/components/dialogflow/translations/nl.json
index 47395371797..fed695b4f0d 100644
--- a/homeassistant/components/dialogflow/translations/nl.json
+++ b/homeassistant/components/dialogflow/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Uw Home Assistant instantie moet toegankelijk zijn vanaf het internet om Dialogflow-berichten te ontvangen.",
-            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Om evenementen naar de Home Assistant te verzenden, moet u [webhookintegratie van Dialogflow]({dialogflow_url}) instellen. \n\n Vul de volgende info in: \n\n - URL: `{webhook_url}` \n - Method: POST \n - Content Type: application/json \n\nZie [de documentatie]({docs_url}) voor verdere informatie."
diff --git a/homeassistant/components/dialogflow/translations/no.json b/homeassistant/components/dialogflow/translations/no.json
index 8abbc221b7c..1dc94a53d7e 100644
--- a/homeassistant/components/dialogflow/translations/no.json
+++ b/homeassistant/components/dialogflow/translations/no.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Din Home Assistant forekomst m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 kunne motta Dialogflow meldinger.",
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
             "default": "For \u00e5 sende hendelser til Home Assistant, m\u00e5 du sette opp [webhook integrasjon av Dialogflow]({dialogflow_url}). \n\nFyll ut f\u00f8lgende informasjon: \n\n- URL: `{webhook_url}` \n- Metode: POST\n- Innholdstype: application/json\n\nSe [dokumentasjonen]({docs_url}) for ytterligere detaljer."
diff --git a/homeassistant/components/dialogflow/translations/pl.json b/homeassistant/components/dialogflow/translations/pl.json
index ee3f65ef0b1..510e60edb0e 100644
--- a/homeassistant/components/dialogflow/translations/pl.json
+++ b/homeassistant/components/dialogflow/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty Dialogflow.",
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty Dialogflow",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistanta, musisz skonfigurowa\u0107 [Dialogflow Webhook]({dialogflow_url}). \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n - Typ zawarto\u015bci: application/json\n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
+            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistant, musisz skonfigurowa\u0107 [Dialogflow Webhook]({dialogflow_url}). \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n - Typ zawarto\u015bci: application/json\n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/dialogflow/translations/ru.json b/homeassistant/components/dialogflow/translations/ru.json
index 15ecb63392e..7e0d0087ec7 100644
--- a/homeassistant/components/dialogflow/translations/ru.json
+++ b/homeassistant/components/dialogflow/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 Dialogflow.",
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Webhook \u0434\u043b\u044f [Dialogflow]({dialogflow_url}).\n\n\u0414\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
diff --git a/homeassistant/components/dialogflow/translations/zh-Hant.json b/homeassistant/components/dialogflow/translations/zh-Hant.json
index bf850322480..c03cfbfd72d 100644
--- a/homeassistant/components/dialogflow/translations/zh-Hant.json
+++ b/homeassistant/components/dialogflow/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant \u8a2d\u5099\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 Dialogflow \u8a0a\u606f\u3002",
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u8a2d\u5b9a [webhook integration of Dialogflow]({dialogflow_url})\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
diff --git a/homeassistant/components/digitalloggers/switch.py b/homeassistant/components/digitalloggers/switch.py
index 7448b9fbcf3..f86f6d7f1aa 100644
--- a/homeassistant/components/digitalloggers/switch.py
+++ b/homeassistant/components/digitalloggers/switch.py
@@ -95,11 +95,6 @@ class DINRelay(SwitchEntity):
         """Return true if relay is on."""
         return self._state
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     def turn_on(self, **kwargs):
         """Instruct the relay to turn on."""
         self._outlet.on()
diff --git a/homeassistant/components/directv/media_player.py b/homeassistant/components/directv/media_player.py
index 127fb5c04b2..dfd88ca885b 100644
--- a/homeassistant/components/directv/media_player.py
+++ b/homeassistant/components/directv/media_player.py
@@ -126,14 +126,14 @@ class DIRECTVMediaPlayer(DIRECTVEntity, MediaPlayerEntity):
     @property
     def device_state_attributes(self):
         """Return device specific state attributes."""
-        attributes = {}
-        if not self._is_standby:
-            attributes[ATTR_MEDIA_CURRENTLY_RECORDING] = self.media_currently_recording
-            attributes[ATTR_MEDIA_RATING] = self.media_rating
-            attributes[ATTR_MEDIA_RECORDED] = self.media_recorded
-            attributes[ATTR_MEDIA_START_TIME] = self.media_start_time
-
-        return attributes
+        if self._is_standby:
+            return {}
+        return {
+            ATTR_MEDIA_CURRENTLY_RECORDING: self.media_currently_recording,
+            ATTR_MEDIA_RATING: self.media_rating,
+            ATTR_MEDIA_RECORDED: self.media_recorded,
+            ATTR_MEDIA_START_TIME: self.media_start_time,
+        }
 
     @property
     def name(self):
diff --git a/homeassistant/components/directv/strings.json b/homeassistant/components/directv/strings.json
index 7a07185978b..9e30a366cc0 100644
--- a/homeassistant/components/directv/strings.json
+++ b/homeassistant/components/directv/strings.json
@@ -17,7 +17,7 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "unknown": "Unexpected error"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     }
   }
 }
diff --git a/homeassistant/components/directv/translations/cs.json b/homeassistant/components/directv/translations/cs.json
index 8e0810bb333..891e2ece4a8 100644
--- a/homeassistant/components/directv/translations/cs.json
+++ b/homeassistant/components/directv/translations/cs.json
@@ -1,12 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
         },
+        "flow_title": "DirecTV: {name}",
         "step": {
+            "ssdp_confirm": {
+                "description": "Chcete nastavit {name}?"
+            },
             "user": {
                 "data": {
                     "host": "Hostitel"
diff --git a/homeassistant/components/directv/translations/et.json b/homeassistant/components/directv/translations/et.json
new file mode 100644
index 00000000000..67c0f4c1046
--- /dev/null
+++ b/homeassistant/components/directv/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "flow_title": "DirecTV: {name}",
+        "step": {
+            "ssdp_confirm": {
+                "description": "Kas seadistada {name}?"
+            },
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/directv/translations/no.json b/homeassistant/components/directv/translations/no.json
index c6db33d32d0..e93d3dadf49 100644
--- a/homeassistant/components/directv/translations/no.json
+++ b/homeassistant/components/directv/translations/no.json
@@ -5,7 +5,7 @@
             "unknown": "Uventet feil"
         },
         "error": {
-            "cannot_connect": "Tilkobling feilet"
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "flow_title": "",
         "step": {
diff --git a/homeassistant/components/discovery/__init__.py b/homeassistant/components/discovery/__init__.py
index bf3a50c837e..b97202033bd 100644
--- a/homeassistant/components/discovery/__init__.py
+++ b/homeassistant/components/discovery/__init__.py
@@ -193,7 +193,9 @@ async def async_setup(hass, config):
     async def scan_devices(now):
         """Scan for devices."""
         try:
-            results = await hass.async_add_job(_discover, netdisco, zeroconf_instance)
+            results = await hass.async_add_executor_job(
+                _discover, netdisco, zeroconf_instance
+            )
 
             for result in results:
                 hass.async_create_task(new_service_found(*result))
diff --git a/homeassistant/components/dlib_face_detect/image_processing.py b/homeassistant/components/dlib_face_detect/image_processing.py
index 9e56668eb3e..c2bec855b9b 100644
--- a/homeassistant/components/dlib_face_detect/image_processing.py
+++ b/homeassistant/components/dlib_face_detect/image_processing.py
@@ -1,6 +1,5 @@
 """Component that will help set the Dlib face detect processing."""
 import io
-import logging
 
 import face_recognition  # pylint: disable=import-error
 
@@ -17,8 +16,6 @@ from homeassistant.components.image_processing import (  # noqa: F401, isort:ski
     PLATFORM_SCHEMA,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_LOCATION = "location"
 
 
diff --git a/homeassistant/components/dlna_dmr/media_player.py b/homeassistant/components/dlna_dmr/media_player.py
index acbd69138d4..2b01ad2a4ae 100644
--- a/homeassistant/components/dlna_dmr/media_player.py
+++ b/homeassistant/components/dlna_dmr/media_player.py
@@ -168,7 +168,7 @@ async def async_setup_platform(
     requester = AiohttpSessionRequester(session, True)
 
     # ensure event handler has been started
-    with await hass.data[DLNA_DMR_DATA]["lock"]:
+    async with hass.data[DLNA_DMR_DATA]["lock"]:
         server_host = config.get(CONF_LISTEN_IP)
         if server_host is None:
             server_host = get_local_ip()
@@ -220,7 +220,7 @@ class DlnaDmrDevice(MediaPlayerEntity):
 
     async def _async_on_hass_stop(self, event):
         """Event handler on Home Assistant stop."""
-        with await self.hass.data[DLNA_DMR_DATA]["lock"]:
+        async with self.hass.data[DLNA_DMR_DATA]["lock"]:
             await self._device.async_unsubscribe_services()
 
     async def async_update(self):
diff --git a/homeassistant/components/doorbird/strings.json b/homeassistant/components/doorbird/strings.json
index 6f1f866053e..076124cf095 100644
--- a/homeassistant/components/doorbird/strings.json
+++ b/homeassistant/components/doorbird/strings.json
@@ -22,7 +22,7 @@
       }
     },
     "abort": {
-      "already_configured": "This DoorBird is already configured",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "link_local_address": "Link local addresses are not supported",
       "not_doorbird_device": "This device is not a DoorBird"
     },
@@ -33,4 +33,4 @@
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/doorbird/switch.py b/homeassistant/components/doorbird/switch.py
index 1e4cb81a5eb..358f4172346 100644
--- a/homeassistant/components/doorbird/switch.py
+++ b/homeassistant/components/doorbird/switch.py
@@ -1,6 +1,5 @@
 """Support for powering relays in a DoorBird video doorbell."""
 import datetime
-import logging
 
 from homeassistant.components.switch import SwitchEntity
 import homeassistant.util.dt as dt_util
@@ -8,8 +7,6 @@ import homeassistant.util.dt as dt_util
 from .const import DOMAIN, DOOR_STATION, DOOR_STATION_INFO
 from .entity import DoorBirdEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 IR_RELAY = "__ir_light__"
 
 
@@ -85,7 +82,7 @@ class DoorBirdSwitch(DoorBirdEntity, SwitchEntity):
         """Turn off the relays is not needed. They are time-based."""
         raise NotImplementedError("DoorBird relays cannot be manually turned off.")
 
-    def update(self):
+    async def async_update(self):
         """Wait for the correct amount of assumed time to pass."""
         if self._state and self._assume_off <= dt_util.utcnow():
             self._state = False
diff --git a/homeassistant/components/doorbird/translations/ca.json b/homeassistant/components/doorbird/translations/ca.json
index 1639b471d4d..2adc6227ab4 100644
--- a/homeassistant/components/doorbird/translations/ca.json
+++ b/homeassistant/components/doorbird/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest dispositiu DoorBird ja est\u00e0 configurat",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
             "link_local_address": "L'enlla\u00e7 amb adreces locals no est\u00e0 perm\u00e8s",
             "not_doorbird_device": "Aquest dispositiu no \u00e9s DoorBird"
         },
diff --git a/homeassistant/components/doorbird/translations/cs.json b/homeassistant/components/doorbird/translations/cs.json
index db55b78e689..865850d2085 100644
--- a/homeassistant/components/doorbird/translations/cs.json
+++ b/homeassistant/components/doorbird/translations/cs.json
@@ -1,16 +1,32 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "not_doorbird_device": "Toto za\u0159\u00edzen\u00ed nen\u00ed DoorBird"
+        },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
             "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
+        "flow_title": "DoorBird {name} ({host})",
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel",
+                    "name": "Jm\u00e9no za\u0159\u00edzen\u00ed",
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "title": "P\u0159ipojen\u00ed k DoorBird"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "events": "Seznam ud\u00e1lost\u00ed odd\u011blen\u00fdch \u010d\u00e1rkami."
                 }
             }
         }
diff --git a/homeassistant/components/doorbird/translations/en.json b/homeassistant/components/doorbird/translations/en.json
index adf3127ffa0..8ddf95f3773 100644
--- a/homeassistant/components/doorbird/translations/en.json
+++ b/homeassistant/components/doorbird/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This DoorBird is already configured",
+            "already_configured": "Device is already configured",
             "link_local_address": "Link local addresses are not supported",
             "not_doorbird_device": "This device is not a DoorBird"
         },
diff --git a/homeassistant/components/doorbird/translations/es.json b/homeassistant/components/doorbird/translations/es.json
index 2bf3ff7fc25..95caaafdeea 100644
--- a/homeassistant/components/doorbird/translations/es.json
+++ b/homeassistant/components/doorbird/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "DoorBird ya est\u00e1 configurado",
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
             "link_local_address": "No se admiten direcciones locales",
             "not_doorbird_device": "Este dispositivo no es un DoorBird"
         },
diff --git a/homeassistant/components/doorbird/translations/et.json b/homeassistant/components/doorbird/translations/et.json
new file mode 100644
index 00000000000..017e290021d
--- /dev/null
+++ b/homeassistant/components/doorbird/translations/et.json
@@ -0,0 +1,34 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "link_local_address": "Kohtv\u00f5rgu linke ei toetata",
+            "not_doorbird_device": "See pole DoorBird'i seade"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "title": "Loo \u00fchendus DoorBird-ga"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "events": "Komadega eraldatud s\u00fcndmuste loend."
+                },
+                "description": "Lisa komaga eraldatud s\u00fcndmuse nimi igale j\u00e4lgitavale s\u00fcndmusele. P\u00e4rast nende sisestamist kasuta rakendust DoorBird, et siduda need konkreetse s\u00fcndmusega. Vaata dokumentatsiooni aadressil https://www.home-assistant.io/integrations/doorbird/#events. N\u00e4ide: somebody_pressed_the_button, motion"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/doorbird/translations/it.json b/homeassistant/components/doorbird/translations/it.json
index ee9c603fb13..51b45cb79bb 100644
--- a/homeassistant/components/doorbird/translations/it.json
+++ b/homeassistant/components/doorbird/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo DoorBird \u00e8 gi\u00e0 configurato",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
             "link_local_address": "Gli indirizzi locali di collegamento non sono supportati",
             "not_doorbird_device": "Questo dispositivo non \u00e8 un DoorBird"
         },
diff --git a/homeassistant/components/doorbird/translations/no.json b/homeassistant/components/doorbird/translations/no.json
index 4929e58c61f..b2a8928dc4d 100644
--- a/homeassistant/components/doorbird/translations/no.json
+++ b/homeassistant/components/doorbird/translations/no.json
@@ -1,16 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne DoorBird er allerede konfigurert",
+            "already_configured": "Enheten er allerede konfigurert",
             "link_local_address": "Linking av lokale adresser st\u00f8ttes ikke",
             "not_doorbird_device": "Denne enheten er ikke en DoorBird"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
-        "flow_title": "DoorBird {name} ( {host} )",
+        "flow_title": "",
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/doorbird/translations/pl.json b/homeassistant/components/doorbird/translations/pl.json
index 446fd21626a..79cdb5f5c8b 100644
--- a/homeassistant/components/doorbird/translations/pl.json
+++ b/homeassistant/components/doorbird/translations/pl.json
@@ -1,9 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "BoorBird jest ju\u017c skonfigurowany.",
-            "link_local_address": "Po\u0142\u0105czenie lokalnego adresu nie jest obs\u0142ugiwane.",
-            "not_doorbird_device": "To urz\u0105dzenie nie jest urz\u0105dzeniem DoorBird."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "link_local_address": "Po\u0142\u0105czenie lokalnego adresu nie jest obs\u0142ugiwane",
+            "not_doorbird_device": "To urz\u0105dzenie nie jest urz\u0105dzeniem DoorBird"
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
@@ -29,7 +29,7 @@
                 "data": {
                     "events": "Lista wydarze\u0144 oddzielona przecinkami"
                 },
-                "description": "Dodaj nazwy wydarze\u0144 oddzielonych przecinkami, kt\u00f3re chcesz \u015bledzi\u0107. Po wprowadzeniu ich tutaj u\u017cyj aplikacji DoorBird, aby przypisa\u0107 je do okre\u015blonych zdarze\u0144. Zapoznaj si\u0119 z dokumentacj\u0105 na stronie https://www.home-assistant.io/integrations/doorbird/#events.\nPrzyk\u0142ad: nacisnienie_przycisku, ruch"
+                "description": "Dodaj nazwy wydarze\u0144 oddzielonych przecinkami, kt\u00f3re chcesz \u015bledzi\u0107. Po wprowadzeniu ich tutaj u\u017cyj aplikacji DoorBird, aby przypisa\u0107 je do okre\u015blonych zdarze\u0144. Zapoznaj si\u0119 z dokumentacj\u0105 na stronie https://www.home-assistant.io/integrations/doorbird/#events.\nPrzyk\u0142ad: nacisniecie_przycisku, ruch"
             }
         }
     }
diff --git a/homeassistant/components/doorbird/translations/ru.json b/homeassistant/components/doorbird/translations/ru.json
index 9ca74bd7780..274b88a8b47 100644
--- a/homeassistant/components/doorbird/translations/ru.json
+++ b/homeassistant/components/doorbird/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "link_local_address": "\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0435 \u0430\u0434\u0440\u0435\u0441\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f.",
             "not_doorbird_device": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435 DoorBird."
         },
diff --git a/homeassistant/components/doorbird/translations/sv.json b/homeassistant/components/doorbird/translations/sv.json
index 5adf23a0ef2..b2a809a576e 100644
--- a/homeassistant/components/doorbird/translations/sv.json
+++ b/homeassistant/components/doorbird/translations/sv.json
@@ -7,7 +7,8 @@
             "user": {
                 "data": {
                     "host": "V\u00e4rd (IP-adress)",
-                    "name": "Enhetsnamn"
+                    "name": "Enhetsnamn",
+                    "username": "Anv\u00e4ndarnamn"
                 }
             }
         }
diff --git a/homeassistant/components/doorbird/translations/zh-Hans.json b/homeassistant/components/doorbird/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/doorbird/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/doorbird/translations/zh-Hant.json b/homeassistant/components/doorbird/translations/zh-Hant.json
index 281a6e54ac2..a4b3bd2fd86 100644
--- a/homeassistant/components/doorbird/translations/zh-Hant.json
+++ b/homeassistant/components/doorbird/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64 DoorBird \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "link_local_address": "\u4e0d\u652f\u63f4\u9023\u7d50\u672c\u5730\u7aef\u4f4d\u5740",
             "not_doorbird_device": "\u6b64\u8a2d\u5099\u4e26\u975e DoorBird"
         },
diff --git a/homeassistant/components/dovado/sensor.py b/homeassistant/components/dovado/sensor.py
index 0de159861d6..46ff402788e 100644
--- a/homeassistant/components/dovado/sensor.py
+++ b/homeassistant/components/dovado/sensor.py
@@ -1,6 +1,5 @@
 """Support for sensors from the Dovado router."""
 from datetime import timedelta
-import logging
 import re
 
 import voluptuous as vol
@@ -12,8 +11,6 @@ from homeassistant.helpers.entity import Entity
 
 from . import DOMAIN as DOVADO_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=30)
 
 SENSOR_UPLOAD = "upload"
diff --git a/homeassistant/components/dsmr/__init__.py b/homeassistant/components/dsmr/__init__.py
index 7eaa57fe8d3..01c98496de2 100644
--- a/homeassistant/components/dsmr/__init__.py
+++ b/homeassistant/components/dsmr/__init__.py
@@ -1,15 +1,12 @@
 """The dsmr component."""
 import asyncio
 from asyncio import CancelledError
-import logging
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
 from .const import DATA_TASK, DOMAIN, PLATFORMS
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup(hass, config: dict):
     """Set up the DSMR platform."""
diff --git a/homeassistant/components/dsmr/sensor.py b/homeassistant/components/dsmr/sensor.py
index c98dc316d0d..411088c5091 100644
--- a/homeassistant/components/dsmr/sensor.py
+++ b/homeassistant/components/dsmr/sensor.py
@@ -273,6 +273,16 @@ class DSMREntity(Entity):
         """Return the unit of measurement of this entity, if any."""
         return self.get_dsmr_object_attr("unit")
 
+    @property
+    def force_update(self):
+        """Force update."""
+        return True
+
+    @property
+    def should_poll(self):
+        """Disable polling."""
+        return False
+
     @staticmethod
     def translate_tariff(value, dsmr_version):
         """Convert 2/1 to normal/low depending on DSMR version."""
diff --git a/homeassistant/components/dsmr/translations/cs.json b/homeassistant/components/dsmr/translations/cs.json
new file mode 100644
index 00000000000..33006d6761b
--- /dev/null
+++ b/homeassistant/components/dsmr/translations/cs.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/dsmr/translations/et.json b/homeassistant/components/dsmr/translations/et.json
new file mode 100644
index 00000000000..b610820f45e
--- /dev/null
+++ b/homeassistant/components/dsmr/translations/et.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "one": "\u00fcks",
+            "other": "mitu"
+        },
+        "step": {
+            "one": "\u00fcks",
+            "other": "mitu"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/dsmr/translations/lb.json b/homeassistant/components/dsmr/translations/lb.json
new file mode 100644
index 00000000000..6469543442e
--- /dev/null
+++ b/homeassistant/components/dsmr/translations/lb.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Apparat ass scho konfigur\u00e9iert"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/dsmr/translations/nl.json b/homeassistant/components/dsmr/translations/nl.json
new file mode 100644
index 00000000000..8b2702b6708
--- /dev/null
+++ b/homeassistant/components/dsmr/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/dsmr/translations/pl.json b/homeassistant/components/dsmr/translations/pl.json
index 637a81a3f87..e0a493fc047 100644
--- a/homeassistant/components/dsmr/translations/pl.json
+++ b/homeassistant/components/dsmr/translations/pl.json
@@ -2,6 +2,18 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+        },
+        "error": {
+            "few": "kilka",
+            "many": "wiele",
+            "one": "jeden",
+            "other": "inne"
+        },
+        "step": {
+            "few": "kilka",
+            "many": "wiele",
+            "one": "jeden",
+            "other": "inne"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/dublin_bus_transport/sensor.py b/homeassistant/components/dublin_bus_transport/sensor.py
index 0c0d6c53ed1..96e485a94e6 100644
--- a/homeassistant/components/dublin_bus_transport/sensor.py
+++ b/homeassistant/components/dublin_bus_transport/sensor.py
@@ -5,7 +5,6 @@ For more info on the API see :
 https://data.gov.ie/dataset/real-time-passenger-information-rtpi-for-dublin-bus-bus-eireann-luas-and-irish-rail/resource/4b9f2c4f-6bf5-4958-a43a-f12dab04cf61
 """
 from datetime import datetime, timedelta
-import logging
 
 import requests
 import voluptuous as vol
@@ -16,7 +15,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 import homeassistant.util.dt as dt_util
 
-_LOGGER = logging.getLogger(__name__)
 _RESOURCE = "https://data.dublinked.ie/cgi-bin/rtpi/realtimebusinformation"
 
 ATTR_STOP_ID = "Stop ID"
diff --git a/homeassistant/components/dunehd/strings.json b/homeassistant/components/dunehd/strings.json
index c1daf5288e0..4c0d8879858 100644
--- a/homeassistant/components/dunehd/strings.json
+++ b/homeassistant/components/dunehd/strings.json
@@ -10,7 +10,7 @@
       }
     },
     "error": {
-      "invalid_host": "Invalid hostname or IP address.",
+      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
diff --git a/homeassistant/components/dunehd/translations/ca.json b/homeassistant/components/dunehd/translations/ca.json
index a62d94cfff9..b0da4a8080a 100644
--- a/homeassistant/components/dunehd/translations/ca.json
+++ b/homeassistant/components/dunehd/translations/ca.json
@@ -6,7 +6,7 @@
         "error": {
             "already_configured": "El dispositiu ja est\u00e0 configurat",
             "cannot_connect": "Ha fallat la connexi\u00f3",
-            "invalid_host": "Nom de l'amfitri\u00f3 o l'adre\u00e7a IP inv\u00e0lids."
+            "invalid_host": "Nom de l'amfitri\u00f3 o l'adre\u00e7a IP inv\u00e0lids"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/dunehd/translations/cs.json b/homeassistant/components/dunehd/translations/cs.json
index 6b7bad06c1c..231ff6055b6 100644
--- a/homeassistant/components/dunehd/translations/cs.json
+++ b/homeassistant/components/dunehd/translations/cs.json
@@ -1,17 +1,19 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
         },
         "error": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no",
-            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_host": "Neplatn\u00fd hostitel nebo IP adresa"
         },
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel"
-                }
+                },
+                "title": "Dune HD"
             }
         }
     }
diff --git a/homeassistant/components/dunehd/translations/en.json b/homeassistant/components/dunehd/translations/en.json
index 6bf0cf23e37..41540c987be 100644
--- a/homeassistant/components/dunehd/translations/en.json
+++ b/homeassistant/components/dunehd/translations/en.json
@@ -6,7 +6,7 @@
         "error": {
             "already_configured": "Device is already configured",
             "cannot_connect": "Failed to connect",
-            "invalid_host": "Invalid hostname or IP address."
+            "invalid_host": "Invalid hostname or IP address"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/dunehd/translations/es.json b/homeassistant/components/dunehd/translations/es.json
index f0ae577f649..33f2e026359 100644
--- a/homeassistant/components/dunehd/translations/es.json
+++ b/homeassistant/components/dunehd/translations/es.json
@@ -6,7 +6,7 @@
         "error": {
             "already_configured": "El dispositivo ya est\u00e1 configurado",
             "cannot_connect": "No se pudo conectar",
-            "invalid_host": "Nombre del host o direcci\u00f3n IP no v\u00e1lidos."
+            "invalid_host": "Nombre de host o direcci\u00f3n IP no v\u00e1lidos"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/dunehd/translations/et.json b/homeassistant/components/dunehd/translations/et.json
new file mode 100644
index 00000000000..bb53d124200
--- /dev/null
+++ b/homeassistant/components/dunehd/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_host": "Vigane hostinimi v\u00f5i IP aadress"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": ""
+                },
+                "description": "Seadista Dune HD sidumine. Kui seadistamisega on probleeme, mine aadressile https://www.home-assistant.io/integrations/dunehd\n\n Veendu, et seade on sisse l\u00fclitatud.",
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/dunehd/translations/it.json b/homeassistant/components/dunehd/translations/it.json
index 34086229986..57f94a2753f 100644
--- a/homeassistant/components/dunehd/translations/it.json
+++ b/homeassistant/components/dunehd/translations/it.json
@@ -6,7 +6,7 @@
         "error": {
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
             "cannot_connect": "Impossibile connettersi",
-            "invalid_host": "Nome host o indirizzo IP non valido."
+            "invalid_host": "Nome host o indirizzo IP non valido"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/dunehd/translations/no.json b/homeassistant/components/dunehd/translations/no.json
index e395c28b7a9..a887228c322 100644
--- a/homeassistant/components/dunehd/translations/no.json
+++ b/homeassistant/components/dunehd/translations/no.json
@@ -5,8 +5,8 @@
         },
         "error": {
             "already_configured": "Enheten er allerede konfigurert",
-            "cannot_connect": "Tilkobling mislyktes.",
-            "invalid_host": "Ugyldig vertsnavn eller IP-adresse."
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_host": "Ugyldig vertsnavn eller IP-adresse"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/dunehd/translations/pl.json b/homeassistant/components/dunehd/translations/pl.json
index 893a71d4b70..5def31d1c46 100644
--- a/homeassistant/components/dunehd/translations/pl.json
+++ b/homeassistant/components/dunehd/translations/pl.json
@@ -6,7 +6,7 @@
         "error": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "invalid_host": "Nieprawid\u0142owa nazwa hosta lub adres IP."
+            "invalid_host": "Nieprawid\u0142owa nazwa hosta lub adres IP"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/dunehd/translations/zh-Hant.json b/homeassistant/components/dunehd/translations/zh-Hant.json
index 2370ebaf6b1..855cefaa774 100644
--- a/homeassistant/components/dunehd/translations/zh-Hant.json
+++ b/homeassistant/components/dunehd/translations/zh-Hant.json
@@ -6,7 +6,7 @@
         "error": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "cannot_connect": "\u9023\u7dda\u5931\u6557",
-            "invalid_host": "\u7121\u6548\u4e3b\u6a5f\u540d\u6216 IP \u4f4d\u5740"
+            "invalid_host": "\u7121\u6548\u4e3b\u6a5f\u540d\u7a31\u6216 IP \u4f4d\u5740"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/dyson/air_quality.py b/homeassistant/components/dyson/air_quality.py
index 84876f49127..4bc41e3b8fc 100644
--- a/homeassistant/components/dyson/air_quality.py
+++ b/homeassistant/components/dyson/air_quality.py
@@ -50,9 +50,7 @@ class DysonAirSensor(AirQualityEntity):
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
-        self.hass.async_add_executor_job(
-            self._device.add_message_listener, self.on_message
-        )
+        self._device.add_message_listener(self.on_message)
 
     def on_message(self, message):
         """Handle new messages which are received from the fan."""
diff --git a/homeassistant/components/dyson/climate.py b/homeassistant/components/dyson/climate.py
index b17b510e93f..d2c23f46093 100644
--- a/homeassistant/components/dyson/climate.py
+++ b/homeassistant/components/dyson/climate.py
@@ -97,7 +97,7 @@ class DysonPureHotCoolLinkEntity(ClimateEntity):
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
-        self.hass.async_add_job(self._device.add_message_listener, self.on_message)
+        self._device.add_message_listener(self.on_message)
 
     def on_message(self, message):
         """Call when new messages received from the climate."""
@@ -243,9 +243,7 @@ class DysonPureHotCoolEntity(ClimateEntity):
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
-        self.hass.async_add_executor_job(
-            self._device.add_message_listener, self.on_message
-        )
+        self._device.add_message_listener(self.on_message)
 
     def on_message(self, message):
         """Call when new messages received from the climate device."""
diff --git a/homeassistant/components/dyson/fan.py b/homeassistant/components/dyson/fan.py
index 8613ab3e7af..4d9fe2eba2a 100644
--- a/homeassistant/components/dyson/fan.py
+++ b/homeassistant/components/dyson/fan.py
@@ -190,7 +190,7 @@ class DysonPureCoolLinkDevice(FanEntity):
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
-        self.hass.async_add_job(self._device.add_message_listener, self.on_message)
+        self._device.add_message_listener(self.on_message)
 
     def on_message(self, message):
         """Call when new messages received from the fan."""
@@ -339,9 +339,7 @@ class DysonPureCoolDevice(FanEntity):
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
-        self.hass.async_add_executor_job(
-            self._device.add_message_listener, self.on_message
-        )
+        self._device.add_message_listener(self.on_message)
 
     def on_message(self, message):
         """Call when new messages received from the fan."""
diff --git a/homeassistant/components/dyson/sensor.py b/homeassistant/components/dyson/sensor.py
index 98c69a7a7db..f26d83de45d 100644
--- a/homeassistant/components/dyson/sensor.py
+++ b/homeassistant/components/dyson/sensor.py
@@ -74,9 +74,7 @@ class DysonSensor(Entity):
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
-        self.hass.async_add_executor_job(
-            self._device.add_message_listener, self.on_message
-        )
+        self._device.add_message_listener(self.on_message)
 
     def on_message(self, message):
         """Handle new messages which are received from the fan."""
diff --git a/homeassistant/components/dyson/vacuum.py b/homeassistant/components/dyson/vacuum.py
index 2306e07072d..a3db4f9c4d3 100644
--- a/homeassistant/components/dyson/vacuum.py
+++ b/homeassistant/components/dyson/vacuum.py
@@ -64,7 +64,7 @@ class Dyson360EyeDevice(VacuumEntity):
 
     async def async_added_to_hass(self):
         """Call when entity is added to hass."""
-        self.hass.async_add_job(self._device.add_message_listener, self.on_message)
+        self._device.add_message_listener(self.on_message)
 
     def on_message(self, message):
         """Handle a new messages that was received from the vacuum."""
diff --git a/homeassistant/components/eafm/config_flow.py b/homeassistant/components/eafm/config_flow.py
index f1cf60bb97e..19b10c3e6c5 100644
--- a/homeassistant/components/eafm/config_flow.py
+++ b/homeassistant/components/eafm/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow to configure flood monitoring gauges."""
-import logging
-
 from aioeafm import get_stations
 import voluptuous as vol
 
@@ -10,8 +8,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 # pylint: disable=unused-import
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class UKFloodsFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a UK Environment Agency flood monitoring config flow."""
diff --git a/homeassistant/components/eafm/translations/cs.json b/homeassistant/components/eafm/translations/cs.json
new file mode 100644
index 00000000000..649303ba1dc
--- /dev/null
+++ b/homeassistant/components/eafm/translations/cs.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "station": "Stanice"
+                },
+                "description": "Vyberte stanici, kterou chcete sledovat"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/eafm/translations/et.json b/homeassistant/components/eafm/translations/et.json
new file mode 100644
index 00000000000..1aa9a722b5f
--- /dev/null
+++ b/homeassistant/components/eafm/translations/et.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "no_stations": "\u00dcleujutuste seirejaamu ei leitud."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "station": "Seirejaam"
+                },
+                "description": "Vali j\u00e4lgitav seirejaam",
+                "title": "J\u00e4lgi \u00fcleujutuste seirejaama"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/eafm/translations/pl.json b/homeassistant/components/eafm/translations/pl.json
index 637a81a3f87..94e8b9f139c 100644
--- a/homeassistant/components/eafm/translations/pl.json
+++ b/homeassistant/components/eafm/translations/pl.json
@@ -1,7 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "no_stations": "Nie znaleziono stacji monitorowania powodzi"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "station": "Stacja"
+                },
+                "description": "Wybierz stacj\u0119, kt\u00f3r\u0105 chcesz monitorowa\u0107",
+                "title": "\u015aled\u017a stacj\u0119 monitorowania powodzi"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/ebusd/translations/et.json b/homeassistant/components/ebusd/translations/et.json
new file mode 100644
index 00000000000..d9907245cfa
--- /dev/null
+++ b/homeassistant/components/ebusd/translations/et.json
@@ -0,0 +1,6 @@
+{
+    "state": {
+        "day": "P\u00e4ev",
+        "night": "\u00d6\u00f6"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ecoal_boiler/sensor.py b/homeassistant/components/ecoal_boiler/sensor.py
index f1998dd5b2e..963f547283f 100644
--- a/homeassistant/components/ecoal_boiler/sensor.py
+++ b/homeassistant/components/ecoal_boiler/sensor.py
@@ -1,13 +1,9 @@
 """Allows reading temperatures from ecoal/esterownik.pl controller."""
-import logging
-
 from homeassistant.const import TEMP_CELSIUS
 from homeassistant.helpers.entity import Entity
 
 from . import AVAILABLE_SENSORS, DATA_ECOAL_BOILER
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ecoal sensors."""
diff --git a/homeassistant/components/ecoal_boiler/switch.py b/homeassistant/components/ecoal_boiler/switch.py
index bd3b216d705..57a8d420c43 100644
--- a/homeassistant/components/ecoal_boiler/switch.py
+++ b/homeassistant/components/ecoal_boiler/switch.py
@@ -1,13 +1,10 @@
 """Allows to configuration ecoal (esterownik.pl) pumps as switches."""
-import logging
 from typing import Optional
 
 from homeassistant.components.switch import SwitchEntity
 
 from . import AVAILABLE_PUMPS, DATA_ECOAL_BOILER
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up switches based on ecoal interface."""
diff --git a/homeassistant/components/ecobee/binary_sensor.py b/homeassistant/components/ecobee/binary_sensor.py
index 64c4b07ed1f..9593fc0e497 100644
--- a/homeassistant/components/ecobee/binary_sensor.py
+++ b/homeassistant/components/ecobee/binary_sensor.py
@@ -70,7 +70,7 @@ class EcobeeBinarySensor(BinarySensorEntity):
                     _LOGGER.error(
                         "Model number for ecobee thermostat %s not recognized. "
                         "Please visit this link and provide the following information: "
-                        "https://github.com/home-assistant/home-assistant/issues/27172 "
+                        "https://github.com/home-assistant/core/issues/27172 "
                         "Unrecognized model number: %s",
                         thermostat["name"],
                         thermostat["modelNumber"],
diff --git a/homeassistant/components/ecobee/climate.py b/homeassistant/components/ecobee/climate.py
index dcb21ac41b1..ccfddca4b03 100644
--- a/homeassistant/components/ecobee/climate.py
+++ b/homeassistant/components/ecobee/climate.py
@@ -351,7 +351,7 @@ class Thermostat(ClimateEntity):
             _LOGGER.error(
                 "Model number for ecobee thermostat %s not recognized. "
                 "Please visit this link and provide the following information: "
-                "https://github.com/home-assistant/home-assistant/issues/27172 "
+                "https://github.com/home-assistant/core/issues/27172 "
                 "Unrecognized model number: %s",
                 self.name,
                 self.thermostat["modelNumber"],
diff --git a/homeassistant/components/ecobee/config_flow.py b/homeassistant/components/ecobee/config_flow.py
index cbe16832a34..6641181b7e4 100644
--- a/homeassistant/components/ecobee/config_flow.py
+++ b/homeassistant/components/ecobee/config_flow.py
@@ -29,7 +29,7 @@ class EcobeeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         """Handle a flow initiated by the user."""
         if self._async_current_entries():
             # Config entry already exists, only one allowed.
-            return self.async_abort(reason="one_instance_only")
+            return self.async_abort(reason="single_instance_allowed")
 
         errors = {}
         stored_api_key = (
diff --git a/homeassistant/components/ecobee/sensor.py b/homeassistant/components/ecobee/sensor.py
index a3276c53e3b..cfbaa7a4516 100644
--- a/homeassistant/components/ecobee/sensor.py
+++ b/homeassistant/components/ecobee/sensor.py
@@ -82,7 +82,7 @@ class EcobeeSensor(Entity):
                     _LOGGER.error(
                         "Model number for ecobee thermostat %s not recognized. "
                         "Please visit this link and provide the following information: "
-                        "https://github.com/home-assistant/home-assistant/issues/27172 "
+                        "https://github.com/home-assistant/core/issues/27172 "
                         "Unrecognized model number: %s",
                         thermostat["name"],
                         thermostat["modelNumber"],
diff --git a/homeassistant/components/ecobee/strings.json b/homeassistant/components/ecobee/strings.json
index b80996cb2a3..78f0708134c 100644
--- a/homeassistant/components/ecobee/strings.json
+++ b/homeassistant/components/ecobee/strings.json
@@ -18,7 +18,7 @@
       "token_request_failed": "Error requesting tokens from ecobee; please try again."
     },
     "abort": {
-      "one_instance_only": "This integration currently supports only one ecobee instance."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/ecobee/translations/ca.json b/homeassistant/components/ecobee/translations/ca.json
index b75006483c7..8b20669c76b 100644
--- a/homeassistant/components/ecobee/translations/ca.json
+++ b/homeassistant/components/ecobee/translations/ca.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_only": "Aquesta integraci\u00f3 nom\u00e9s admet una sola inst\u00e0ncia ecobee."
+            "one_instance_only": "Aquesta integraci\u00f3 nom\u00e9s admet una sola inst\u00e0ncia ecobee.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
             "pin_request_failed": "Error al sol\u00b7licitar els PIN d'ecobee; verifica que la clau API \u00e9s correcta.",
diff --git a/homeassistant/components/ecobee/translations/cs.json b/homeassistant/components/ecobee/translations/cs.json
index 757cf90e1e2..9e105bebbd6 100644
--- a/homeassistant/components/ecobee/translations/cs.json
+++ b/homeassistant/components/ecobee/translations/cs.json
@@ -1,10 +1,20 @@
 {
     "config": {
+        "abort": {
+            "one_instance_only": "Tato integrace v sou\u010dasn\u00e9 dob\u011b podporuje pouze jednu instanci ekobee.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
         "step": {
+            "authorize": {
+                "description": "Autorizujte tuto aplikaci na adrese https://www.ecobee.com/consumerportal/index.html pomoc\u00ed PIN k\u00f3du:\n\n{pin}\n\nPot\u00e9 stiskn\u011bte Odeslat.",
+                "title": "Ov\u011b\u0159en\u00ed aplikace na ecobee.com"
+            },
             "user": {
                 "data": {
                     "api_key": "Kl\u00ed\u010d API"
-                }
+                },
+                "description": "Zadejte API kl\u00ed\u010d z\u00edskan\u00fd z webu ecobee.com.",
+                "title": "API kl\u00ed\u010d ecobee"
             }
         }
     }
diff --git a/homeassistant/components/ecobee/translations/en.json b/homeassistant/components/ecobee/translations/en.json
index a105296f813..024ac774133 100644
--- a/homeassistant/components/ecobee/translations/en.json
+++ b/homeassistant/components/ecobee/translations/en.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_only": "This integration currently supports only one ecobee instance."
+            "one_instance_only": "This integration currently supports only one ecobee instance.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
             "pin_request_failed": "Error requesting PIN from ecobee; please verify API key is correct.",
diff --git a/homeassistant/components/ecobee/translations/es.json b/homeassistant/components/ecobee/translations/es.json
index 26260e38ca7..88fbf9ed335 100644
--- a/homeassistant/components/ecobee/translations/es.json
+++ b/homeassistant/components/ecobee/translations/es.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_only": "Esta integraci\u00f3n actualmente solo admite una instancia de ecobee."
+            "one_instance_only": "Esta integraci\u00f3n actualmente solo admite una instancia de ecobee.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
             "pin_request_failed": "Error al solicitar el PIN de ecobee; verifique que la clave API sea correcta.",
diff --git a/homeassistant/components/ecobee/translations/et.json b/homeassistant/components/ecobee/translations/et.json
new file mode 100644
index 00000000000..484e56f6ccc
--- /dev/null
+++ b/homeassistant/components/ecobee/translations/et.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_only": "See sidumine toetab praegu ainult \u00fchte ecobee \u00fcksust.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "pin_request_failed": "Viga ecobee'lt PIN-koodi taotlemisel. Palun veendu, et API v\u00f5ti on \u00f5ige."
+        },
+        "step": {
+            "authorize": {
+                "description": "Tuvasta see rakendus aadressil https://www.ecobee.com/consumerportal/index.html koos PIN-koodiga:\n\n {pin}\n\n Seej\u00e4rel vajuta Esita.",
+                "title": "Rakenduse tuvastamine saidil ecobee.com"
+            },
+            "user": {
+                "data": {
+                    "api_key": "API v\u00f5ti"
+                },
+                "description": "Sisesta saidilt ecobee.com saadud API v\u00f5ti.",
+                "title": "ecobee API v\u00f5ti"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ecobee/translations/it.json b/homeassistant/components/ecobee/translations/it.json
index dce66271b9a..b2436622010 100644
--- a/homeassistant/components/ecobee/translations/it.json
+++ b/homeassistant/components/ecobee/translations/it.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_only": "Questa integrazione supporta attualmente una sola istanza ecobee."
+            "one_instance_only": "Questa integrazione supporta attualmente una sola istanza ecobee.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
             "pin_request_failed": "Errore durante la richiesta del PIN da ecobee; verificare che la chiave API sia corretta.",
diff --git a/homeassistant/components/ecobee/translations/no.json b/homeassistant/components/ecobee/translations/no.json
index 048659ac83d..6a7acc77aec 100644
--- a/homeassistant/components/ecobee/translations/no.json
+++ b/homeassistant/components/ecobee/translations/no.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_only": "Denne integrasjonen st\u00f8tter forel\u00f8pig bare \u00e9n ecobee-forekomst."
+            "one_instance_only": "Denne integrasjonen st\u00f8tter forel\u00f8pig bare \u00e9n ecobee-forekomst.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
             "pin_request_failed": "Feil under foresp\u00f8rsel om PIN-kode fra ecobee. Kontroller at API-n\u00f8kkelen er riktig.",
@@ -17,7 +18,7 @@
                     "api_key": "API-n\u00f8kkel"
                 },
                 "description": "Vennligst fyll inn API-n\u00f8kkel som er innhentet fra ecobee.com.",
-                "title": "ecobee API-n\u00f8kkel"
+                "title": "Ecobee API-n\u00f8kkel"
             }
         }
     }
diff --git a/homeassistant/components/ecobee/translations/pl.json b/homeassistant/components/ecobee/translations/pl.json
index c0fed1d075c..924ebf1d813 100644
--- a/homeassistant/components/ecobee/translations/pl.json
+++ b/homeassistant/components/ecobee/translations/pl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_only": "Komponent obs\u0142uguje tylko jedn\u0105 instancj\u0119 ecobee"
+            "one_instance_only": "Komponent obs\u0142uguje tylko jedn\u0105 instancj\u0119 ecobee",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
             "pin_request_failed": "B\u0142\u0105d podczas \u017c\u0105dania kodu PIN od ecobee; sprawd\u017a, czy klucz API jest poprawny.",
diff --git a/homeassistant/components/ecobee/translations/ru.json b/homeassistant/components/ecobee/translations/ru.json
index 37c1f63822c..f9c12b5b3a3 100644
--- a/homeassistant/components/ecobee/translations/ru.json
+++ b/homeassistant/components/ecobee/translations/ru.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_only": "\u042d\u0442\u0430 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f \u0432 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0432\u0440\u0435\u043c\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 ecobee."
+            "one_instance_only": "\u042d\u0442\u0430 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f \u0432 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0432\u0440\u0435\u043c\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 ecobee.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
             "pin_request_failed": "\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0437\u0430\u043f\u0440\u043e\u0441\u0430 PIN-\u043a\u043e\u0434\u0430 \u0443 ecobee; \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u043a\u043b\u044e\u0447\u0430 API.",
diff --git a/homeassistant/components/ecobee/translations/zh-Hant.json b/homeassistant/components/ecobee/translations/zh-Hant.json
index ad88a20c56b..64d8d32da15 100644
--- a/homeassistant/components/ecobee/translations/zh-Hant.json
+++ b/homeassistant/components/ecobee/translations/zh-Hant.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_only": "\u6b64\u6574\u5408\u76ee\u524d\u50c5\u652f\u63f4\u4e00\u7d44 ecobee \u8a2d\u5099\u3002"
+            "one_instance_only": "\u6b64\u6574\u5408\u76ee\u524d\u50c5\u652f\u63f4\u4e00\u7d44 ecobee \u8a2d\u5099\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
             "pin_request_failed": "ecobee \u6240\u9700\u4ee3\u78bc\u932f\u8aa4\uff0c\u8acb\u78ba\u8a8d\u5bc6\u9470\u6b63\u78ba\u6027\u3002",
diff --git a/homeassistant/components/ecobee/weather.py b/homeassistant/components/ecobee/weather.py
index 71c1d263e02..7774a6648a5 100644
--- a/homeassistant/components/ecobee/weather.py
+++ b/homeassistant/components/ecobee/weather.py
@@ -74,7 +74,7 @@ class EcobeeWeather(WeatherEntity):
             _LOGGER.error(
                 "Model number for ecobee thermostat %s not recognized. "
                 "Please visit this link and provide the following information: "
-                "https://github.com/home-assistant/home-assistant/issues/27172 "
+                "https://github.com/home-assistant/core/issues/27172 "
                 "Unrecognized model number: %s",
                 thermostat["name"],
                 thermostat["modelNumber"],
diff --git a/homeassistant/components/edimax/switch.py b/homeassistant/components/edimax/switch.py
index 17a43f36235..2c51c59fd47 100644
--- a/homeassistant/components/edimax/switch.py
+++ b/homeassistant/components/edimax/switch.py
@@ -1,6 +1,4 @@
 """Support for Edimax switches."""
-import logging
-
 from pyedimax.smartplug import SmartPlug
 import voluptuous as vol
 
@@ -8,8 +6,6 @@ from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "edimax"
 
 DEFAULT_NAME = "Edimax Smart Plug"
diff --git a/homeassistant/components/edl21/sensor.py b/homeassistant/components/edl21/sensor.py
index 0bc4c21fc2f..5eb7542fed9 100644
--- a/homeassistant/components/edl21/sensor.py
+++ b/homeassistant/components/edl21/sensor.py
@@ -145,7 +145,7 @@ class EDL21:
                 elif obis not in self._OBIS_BLACKLIST:
                     _LOGGER.warning(
                         "Unhandled sensor %s detected. Please report at "
-                        'https://github.com/home-assistant/home-assistant/issues?q=is%%3Aissue+label%%3A"integration%%3A+edl21"+',
+                        'https://github.com/home-assistant/core/issues?q=is%%3Aissue+label%%3A"integration%%3A+edl21"+',
                         obis,
                     )
                     self._OBIS_BLACKLIST.add(obis)
diff --git a/homeassistant/components/egardia/binary_sensor.py b/homeassistant/components/egardia/binary_sensor.py
index 6882171b67f..61f43301fd9 100644
--- a/homeassistant/components/egardia/binary_sensor.py
+++ b/homeassistant/components/egardia/binary_sensor.py
@@ -1,6 +1,4 @@
 """Interfaces with Egardia/Woonveilig alarm control panel."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_MOTION,
     DEVICE_CLASS_OPENING,
@@ -10,8 +8,6 @@ from homeassistant.const import STATE_OFF, STATE_ON
 
 from . import ATTR_DISCOVER_DEVICES, EGARDIA_DEVICE
 
-_LOGGER = logging.getLogger(__name__)
-
 EGARDIA_TYPE_TO_DEVICE_CLASS = {
     "IR Sensor": DEVICE_CLASS_MOTION,
     "Door Contact": DEVICE_CLASS_OPENING,
diff --git a/homeassistant/components/eight_sleep/sensor.py b/homeassistant/components/eight_sleep/sensor.py
index 824ea210d69..43bcb4c2f09 100644
--- a/homeassistant/components/eight_sleep/sensor.py
+++ b/homeassistant/components/eight_sleep/sensor.py
@@ -112,11 +112,11 @@ class EightHeatSensor(EightSleepHeatEntity):
     @property
     def device_state_attributes(self):
         """Return device state attributes."""
-        state_attr = {ATTR_TARGET_HEAT: self._usrobj.target_heating_level}
-        state_attr[ATTR_ACTIVE_HEAT] = self._usrobj.now_heating
-        state_attr[ATTR_DURATION_HEAT] = self._usrobj.heating_remaining
-
-        return state_attr
+        return {
+            ATTR_TARGET_HEAT: self._usrobj.target_heating_level,
+            ATTR_ACTIVE_HEAT: self._usrobj.now_heating,
+            ATTR_DURATION_HEAT: self._usrobj.heating_remaining,
+        }
 
 
 class EightUserSensor(EightSleepUserEntity):
diff --git a/homeassistant/components/elgato/__init__.py b/homeassistant/components/elgato/__init__.py
index 31f8c2b59cf..d6c849a4c5a 100644
--- a/homeassistant/components/elgato/__init__.py
+++ b/homeassistant/components/elgato/__init__.py
@@ -1,6 +1,4 @@
 """Support for Elgato Key Lights."""
-import logging
-
 from elgato import Elgato, ElgatoConnectionError
 
 from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
@@ -13,8 +11,6 @@ from homeassistant.helpers.typing import ConfigType
 
 from .const import DATA_ELGATO_CLIENT, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Elgato Key Light components."""
diff --git a/homeassistant/components/elgato/config_flow.py b/homeassistant/components/elgato/config_flow.py
index 687310c2c3e..a6f25b8827c 100644
--- a/homeassistant/components/elgato/config_flow.py
+++ b/homeassistant/components/elgato/config_flow.py
@@ -1,5 +1,4 @@
 """Config flow to configure the Elgato Key Light integration."""
-import logging
 from typing import Any, Dict, Optional
 
 from elgato import Elgato, ElgatoError, Info
@@ -12,8 +11,6 @@ from homeassistant.helpers.typing import ConfigType
 
 from .const import CONF_SERIAL_NUMBER, DOMAIN  # pylint: disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class ElgatoFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a Elgato Key Light config flow."""
@@ -33,7 +30,7 @@ class ElgatoFlowHandler(ConfigFlow, domain=DOMAIN):
                 user_input[CONF_HOST], user_input[CONF_PORT]
             )
         except ElgatoError:
-            return self._show_setup_form({"base": "connection_error"})
+            return self._show_setup_form({"base": "cannot_connect"})
 
         # Check if already configured
         await self.async_set_unique_id(info.serial_number)
@@ -53,14 +50,14 @@ class ElgatoFlowHandler(ConfigFlow, domain=DOMAIN):
     ) -> Dict[str, Any]:
         """Handle zeroconf discovery."""
         if user_input is None:
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
 
         try:
             info = await self._get_elgato_info(
                 user_input[CONF_HOST], user_input[CONF_PORT]
             )
         except ElgatoError:
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
 
         # Check if already configured
         await self.async_set_unique_id(info.serial_number)
@@ -92,7 +89,7 @@ class ElgatoFlowHandler(ConfigFlow, domain=DOMAIN):
                 self.context.get(CONF_HOST), self.context.get(CONF_PORT)
             )
         except ElgatoError:
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
 
         # Check if already configured
         await self.async_set_unique_id(info.serial_number)
diff --git a/homeassistant/components/elgato/strings.json b/homeassistant/components/elgato/strings.json
index a00bf027451..54c5f43a5da 100644
--- a/homeassistant/components/elgato/strings.json
+++ b/homeassistant/components/elgato/strings.json
@@ -15,11 +15,11 @@
       }
     },
     "error": {
-      "connection_error": "Failed to connect to Elgato Key Light device."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "This Elgato Key Light device is already configured.",
-      "connection_error": "Failed to connect to Elgato Key Light device."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/elgato/translations/ca.json b/homeassistant/components/elgato/translations/ca.json
index 1f02dc1f79f..04cf0488dc6 100644
--- a/homeassistant/components/elgato/translations/ca.json
+++ b/homeassistant/components/elgato/translations/ca.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest dispositiu Elgato Key Light ja est\u00e0 configurat.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar amb el dispositiu Elgato Key Light."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar amb el dispositiu Elgato Key Light."
         },
         "flow_title": "Elgato Key Light: {serial_number}",
diff --git a/homeassistant/components/elgato/translations/cs.json b/homeassistant/components/elgato/translations/cs.json
index 406bddd1a12..8da0e6ccb79 100644
--- a/homeassistant/components/elgato/translations/cs.json
+++ b/homeassistant/components/elgato/translations/cs.json
@@ -1,11 +1,25 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed Elgato Key Light se nezda\u0159ilo."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed Elgato Key Light se nezda\u0159ilo."
+        },
+        "flow_title": "Elgato Key Light: {serial_number}",
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel",
                     "port": "Port"
-                }
+                },
+                "description": "Nastavte Elgato Key Light k integraci s Home Assistant."
+            },
+            "zeroconf_confirm": {
+                "title": "Objeven\u00e9 za\u0159\u00edzen\u00ed Elgato Key Light"
             }
         }
     }
diff --git a/homeassistant/components/elgato/translations/el.json b/homeassistant/components/elgato/translations/el.json
new file mode 100644
index 00000000000..58012c1e4e3
--- /dev/null
+++ b/homeassistant/components/elgato/translations/el.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        },
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/elgato/translations/en.json b/homeassistant/components/elgato/translations/en.json
index fea7945ecf4..607ab996406 100644
--- a/homeassistant/components/elgato/translations/en.json
+++ b/homeassistant/components/elgato/translations/en.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This Elgato Key Light device is already configured.",
+            "already_configured": "Device is already configured",
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect to Elgato Key Light device."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect to Elgato Key Light device."
         },
         "flow_title": "Elgato Key Light: {serial_number}",
diff --git a/homeassistant/components/elgato/translations/es.json b/homeassistant/components/elgato/translations/es.json
index 46ced57ad2d..3509c135bb0 100644
--- a/homeassistant/components/elgato/translations/es.json
+++ b/homeassistant/components/elgato/translations/es.json
@@ -2,9 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "Este dispositivo Elgato Key Light ya est\u00e1 configurado.",
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se pudo conectar al dispositivo Elgato Key Light."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se pudo conectar al dispositivo Elgato Key Light."
         },
         "flow_title": "Elgato Key Light: {serial_number}",
@@ -12,7 +14,7 @@
             "user": {
                 "data": {
                     "host": "Host o direcci\u00f3n IP",
-                    "port": "N\u00famero de puerto"
+                    "port": "Puerto"
                 },
                 "description": "Configura tu Elgato Key Light para integrarlo con Home Assistant."
             },
diff --git a/homeassistant/components/elgato/translations/et.json b/homeassistant/components/elgato/translations/et.json
new file mode 100644
index 00000000000..1e7316beb2b
--- /dev/null
+++ b/homeassistant/components/elgato/translations/et.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "Elgato Key Light seadmega \u00fchenduse loomine nurjus."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "Elgato Key Light seadmega \u00fchenduse loomine nurjus."
+        },
+        "flow_title": "Elgato Key Light: {serial_number}",
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                },
+                "description": "Seadista oma Elegato Key Light sidumine Home Assistant-iga."
+            },
+            "zeroconf_confirm": {
+                "description": "Kas soovite lisada Home Assistanti Elegato Key Light'i seerianumbriga \" {serial_number} \"?",
+                "title": "Leitud Elegato Key Light seade"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/elgato/translations/fr.json b/homeassistant/components/elgato/translations/fr.json
index 5a8e2bf46ca..7e054716625 100644
--- a/homeassistant/components/elgato/translations/fr.json
+++ b/homeassistant/components/elgato/translations/fr.json
@@ -2,9 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "Cet appareil Elgato Key Light est d\u00e9j\u00e0 configur\u00e9.",
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "Impossible de se connecter au p\u00e9riph\u00e9rique Elgato Key Light."
         },
         "error": {
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "Impossible de se connecter au p\u00e9riph\u00e9rique Elgato Key Light."
         },
         "flow_title": "Elgato Key Light: {serial_number}",
diff --git a/homeassistant/components/elgato/translations/it.json b/homeassistant/components/elgato/translations/it.json
index 3985bcf6f59..2f1f2130a0b 100644
--- a/homeassistant/components/elgato/translations/it.json
+++ b/homeassistant/components/elgato/translations/it.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo dispositivo Elgato Key Light \u00e8 gi\u00e0 configurato.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi al dispositivo Elgato Key Light."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi al dispositivo Elgato Key Light."
         },
         "flow_title": "Elgato Key Light: {serial_number}",
diff --git a/homeassistant/components/elgato/translations/lb.json b/homeassistant/components/elgato/translations/lb.json
index 4afde6d8798..35aa4aaaa64 100644
--- a/homeassistant/components/elgato/translations/lb.json
+++ b/homeassistant/components/elgato/translations/lb.json
@@ -2,9 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "D\u00ebsen Elgato Key Light Apparat ass scho konfigur\u00e9iert.",
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbannen mam Elgato key Light Apparat."
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbannen mam Elgato key Light Apparat."
         },
         "flow_title": "Elgato Key Light: {serial_number}",
diff --git a/homeassistant/components/elgato/translations/nl.json b/homeassistant/components/elgato/translations/nl.json
index 2e50f63d56e..dadb6b63c39 100644
--- a/homeassistant/components/elgato/translations/nl.json
+++ b/homeassistant/components/elgato/translations/nl.json
@@ -2,9 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "Dit Elgato Key Light apparaat is al geconfigureerd.",
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kan geen verbinding maken met het Elgato Key Light apparaat."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kan geen verbinding maken met het Elgato Key Light apparaat."
         },
         "flow_title": "Elgato Key Light: {serial_number}",
diff --git a/homeassistant/components/elgato/translations/no.json b/homeassistant/components/elgato/translations/no.json
index bb7e56211de..b8946898247 100644
--- a/homeassistant/components/elgato/translations/no.json
+++ b/homeassistant/components/elgato/translations/no.json
@@ -1,18 +1,20 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne Elgato Key Light-enheten er allerede konfigurert.",
+            "already_configured": "Enheten er allerede konfigurert",
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kunne ikke koble til Elgato Key Light-enheten."
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kunne ikke koble til Elgato Key Light-enheten."
         },
-        "flow_title": "Elgato Key Light: {serial_number}",
+        "flow_title": "",
         "step": {
             "user": {
                 "data": {
                     "host": "Vert",
-                    "port": ""
+                    "port": "Port"
                 },
                 "description": "Sett opp Elgato Key Light for \u00e5 integrere med Home Assistant."
             },
diff --git a/homeassistant/components/elgato/translations/pl.json b/homeassistant/components/elgato/translations/pl.json
index 7088ede092a..1ba836cbfce 100644
--- a/homeassistant/components/elgato/translations/pl.json
+++ b/homeassistant/components/elgato/translations/pl.json
@@ -2,10 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z urz\u0105dzeniem Elgato Key Light."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z urz\u0105dzeniem Elgato Key Light"
         },
         "error": {
-            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z urz\u0105dzeniem Elgato Key Light."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z urz\u0105dzeniem Elgato Key Light"
         },
         "flow_title": "Elgato Key Light: {serial_number}",
         "step": {
@@ -14,10 +16,10 @@
                     "host": "Nazwa hosta lub adres IP",
                     "port": "Port"
                 },
-                "description": "Konfiguracja Elgato Key Light w celu integracji z Home Assistantem."
+                "description": "Konfiguracja Elgato Key Light w celu integracji z Home Assistant."
             },
             "zeroconf_confirm": {
-                "description": "Czy chcesz doda\u0107 urz\u0105dzenie Elgato Key Light o numerze seryjnym `{serial_number}` do Home Assistanta?",
+                "description": "Czy chcesz doda\u0107 urz\u0105dzenie Elgato Key Light o numerze seryjnym `{serial_number}` do Home Assistant?",
                 "title": "Wykryto urz\u0105dzenie Elgato Key Light"
             }
         }
diff --git a/homeassistant/components/elgato/translations/ru.json b/homeassistant/components/elgato/translations/ru.json
index 7cd7036b861..b790d2fa66b 100644
--- a/homeassistant/components/elgato/translations/ru.json
+++ b/homeassistant/components/elgato/translations/ru.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443 Elgato Key Light."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443 Elgato Key Light."
         },
         "flow_title": "Elgato Key Light: {serial_number}",
diff --git a/homeassistant/components/elgato/translations/zh-Hans.json b/homeassistant/components/elgato/translations/zh-Hans.json
new file mode 100644
index 00000000000..254f6df9327
--- /dev/null
+++ b/homeassistant/components/elgato/translations/zh-Hans.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        },
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/elgato/translations/zh-Hant.json b/homeassistant/components/elgato/translations/zh-Hant.json
index 596dc530a2f..2ddd8e6b23e 100644
--- a/homeassistant/components/elgato/translations/zh-Hant.json
+++ b/homeassistant/components/elgato/translations/zh-Hant.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Elgato Key \u7167\u660e\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "Elgato Key \u7167\u660e\u8a2d\u5099\u9023\u7dda\u5931\u6557\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "Elgato Key \u7167\u660e\u8a2d\u5099\u9023\u7dda\u5931\u6557\u3002"
         },
         "flow_title": "Elgato Key \u7167\u660e\uff1a{serial_number}",
diff --git a/homeassistant/components/elkm1/__init__.py b/homeassistant/components/elkm1/__init__.py
index dbb45ec317f..146a9a21fb8 100644
--- a/homeassistant/components/elkm1/__init__.py
+++ b/homeassistant/components/elkm1/__init__.py
@@ -19,12 +19,16 @@ from homeassistant.const import (
     TEMP_FAHRENHEIT,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import ConfigType
+import homeassistant.util.dt as dt_util
 
 from .const import (
+    ATTR_KEY,
+    ATTR_KEY_NAME,
+    ATTR_KEYPAD_ID,
     BARE_TEMP_CELSIUS,
     BARE_TEMP_FAHRENHEIT,
     CONF_AREA,
@@ -41,17 +45,13 @@ from .const import (
     CONF_ZONE,
     DOMAIN,
     ELK_ELEMENTS,
+    EVENT_ELKM1_KEYPAD_KEY_PRESSED,
 )
 
 SYNC_TIMEOUT = 120
 
 _LOGGER = logging.getLogger(__name__)
 
-SERVICE_ALARM_DISPLAY_MESSAGE = "alarm_display_message"
-SERVICE_ALARM_ARM_VACATION = "alarm_arm_vacation"
-SERVICE_ALARM_ARM_HOME_INSTANT = "alarm_arm_home_instant"
-SERVICE_ALARM_ARM_NIGHT_INSTANT = "alarm_arm_night_instant"
-
 SUPPORTED_DOMAINS = [
     "alarm_control_panel",
     "climate",
@@ -68,6 +68,12 @@ SPEAK_SERVICE_SCHEMA = vol.Schema(
     }
 )
 
+SET_TIME_SERVICE_SCHEMA = vol.Schema(
+    {
+        vol.Optional("prefix", default=""): cv.string,
+    }
+)
+
 
 def _host_validator(config):
     """Validate that a host is properly configured."""
@@ -226,6 +232,23 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     )
     elk.connect()
 
+    def _element_changed(element, changeset):
+        keypress = changeset.get("last_keypress")
+        if keypress is None:
+            return
+
+        hass.bus.async_fire(
+            EVENT_ELKM1_KEYPAD_KEY_PRESSED,
+            {
+                ATTR_KEYPAD_ID: element.index + 1,
+                ATTR_KEY_NAME: keypress[0],
+                ATTR_KEY: keypress[1],
+            },
+        )
+
+    for keypad in elk.keypads:  # pylint: disable=no-member
+        keypad.add_callback(_element_changed)
+
     if not await async_wait_for_elk_to_sync(elk, SYNC_TIMEOUT):
         _LOGGER.error(
             "Timed out after %d seconds while trying to sync with ElkM1 at %s",
@@ -302,21 +325,21 @@ async def async_wait_for_elk_to_sync(elk, timeout):
 
 
 def _create_elk_services(hass):
-    def _speak_word_service(service):
+    def _getelk(service):
         prefix = service.data["prefix"]
         elk = _find_elk_by_prefix(hass, prefix)
         if elk is None:
-            _LOGGER.error("No elk m1 with prefix for speak_word: '%s'", prefix)
-            return
-        elk.panel.speak_word(service.data["number"])
+            raise HomeAssistantError(f"No ElkM1 with prefix '{prefix}' found")
+        return elk
+
+    def _speak_word_service(service):
+        _getelk(service).panel.speak_word(service.data["number"])
 
     def _speak_phrase_service(service):
-        prefix = service.data["prefix"]
-        elk = _find_elk_by_prefix(hass, prefix)
-        if elk is None:
-            _LOGGER.error("No elk m1 with prefix for speak_phrase: '%s'", prefix)
-            return
-        elk.panel.speak_phrase(service.data["number"])
+        _getelk(service).panel.speak_phrase(service.data["number"])
+
+    def _set_time_service(service):
+        _getelk(service).panel.set_time(dt_util.now())
 
     hass.services.async_register(
         DOMAIN, "speak_word", _speak_word_service, SPEAK_SERVICE_SCHEMA
@@ -324,6 +347,9 @@ def _create_elk_services(hass):
     hass.services.async_register(
         DOMAIN, "speak_phrase", _speak_phrase_service, SPEAK_SERVICE_SCHEMA
     )
+    hass.services.async_register(
+        DOMAIN, "set_time", _set_time_service, SET_TIME_SERVICE_SCHEMA
+    )
 
 
 def create_elk_entities(elk_data, elk_elements, element_type, class_, entities):
diff --git a/homeassistant/components/elkm1/alarm_control_panel.py b/homeassistant/components/elkm1/alarm_control_panel.py
index 3bcacde64b9..8f752cd9adf 100644
--- a/homeassistant/components/elkm1/alarm_control_panel.py
+++ b/homeassistant/components/elkm1/alarm_control_panel.py
@@ -1,6 +1,4 @@
 """Each ElkM1 area will be created as a separate alarm_control_panel."""
-import logging
-
 from elkm1_lib.const import AlarmState, ArmedStatus, ArmLevel, ArmUpState
 from elkm1_lib.util import username
 import voluptuous as vol
@@ -16,7 +14,6 @@ from homeassistant.components.alarm_control_panel.const import (
     SUPPORT_ALARM_ARM_NIGHT,
 )
 from homeassistant.const import (
-    ATTR_CODE,
     ATTR_ENTITY_ID,
     STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_ARMED_HOME,
@@ -30,26 +27,13 @@ from homeassistant.helpers import entity_platform
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from . import (
-    SERVICE_ALARM_ARM_HOME_INSTANT,
-    SERVICE_ALARM_ARM_NIGHT_INSTANT,
-    SERVICE_ALARM_ARM_VACATION,
-    SERVICE_ALARM_DISPLAY_MESSAGE,
-    ElkAttachedEntity,
-    create_elk_entities,
-)
+from . import ElkAttachedEntity, create_elk_entities
 from .const import (
     ATTR_CHANGED_BY_ID,
     ATTR_CHANGED_BY_KEYPAD,
     ATTR_CHANGED_BY_TIME,
     DOMAIN,
-)
-
-ELK_ALARM_SERVICE_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_ENTITY_ID, default=[]): cv.entity_ids,
-        vol.Required(ATTR_CODE): vol.All(vol.Coerce(int), vol.Range(0, 999999)),
-    }
+    ELK_USER_CODE_SERVICE_SCHEMA,
 )
 
 DISPLAY_MESSAGE_SERVICE_SCHEMA = vol.Schema(
@@ -65,41 +49,37 @@ DISPLAY_MESSAGE_SERVICE_SCHEMA = vol.Schema(
     }
 )
 
-_LOGGER = logging.getLogger(__name__)
+SERVICE_ALARM_DISPLAY_MESSAGE = "alarm_display_message"
+SERVICE_ALARM_ARM_VACATION = "alarm_arm_vacation"
+SERVICE_ALARM_ARM_HOME_INSTANT = "alarm_arm_home_instant"
+SERVICE_ALARM_ARM_NIGHT_INSTANT = "alarm_arm_night_instant"
+SERVICE_ALARM_BYPASS = "alarm_bypass"
+SERVICE_ALARM_CLEAR_BYPASS = "alarm_clear_bypass"
 
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the ElkM1 alarm platform."""
     elk_data = hass.data[DOMAIN][config_entry.entry_id]
-    entities = []
-
     elk = elk_data["elk"]
-    areas_with_keypad = set()
-    for keypad in elk.keypads:
-        areas_with_keypad.add(keypad.area)
-
-    areas = []
-    for area in elk.areas:
-        if area.index in areas_with_keypad or elk_data["auto_configure"] is False:
-            areas.append(area)
-    create_elk_entities(elk_data, areas, "area", ElkArea, entities)
+    entities = []
+    create_elk_entities(elk_data, elk.areas, "area", ElkArea, entities)
     async_add_entities(entities, True)
 
     platform = entity_platform.current_platform.get()
 
     platform.async_register_entity_service(
         SERVICE_ALARM_ARM_VACATION,
-        ELK_ALARM_SERVICE_SCHEMA,
+        ELK_USER_CODE_SERVICE_SCHEMA,
         "async_alarm_arm_vacation",
     )
     platform.async_register_entity_service(
         SERVICE_ALARM_ARM_HOME_INSTANT,
-        ELK_ALARM_SERVICE_SCHEMA,
+        ELK_USER_CODE_SERVICE_SCHEMA,
         "async_alarm_arm_home_instant",
     )
     platform.async_register_entity_service(
         SERVICE_ALARM_ARM_NIGHT_INSTANT,
-        ELK_ALARM_SERVICE_SCHEMA,
+        ELK_USER_CODE_SERVICE_SCHEMA,
         "async_alarm_arm_night_instant",
     )
     platform.async_register_entity_service(
@@ -107,6 +87,16 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         DISPLAY_MESSAGE_SERVICE_SCHEMA,
         "async_display_message",
     )
+    platform.async_register_entity_service(
+        SERVICE_ALARM_BYPASS,
+        ELK_USER_CODE_SERVICE_SCHEMA,
+        "async_bypass",
+    )
+    platform.async_register_entity_service(
+        SERVICE_ALARM_CLEAR_BYPASS,
+        ELK_USER_CODE_SERVICE_SCHEMA,
+        "async_clear_bypass",
+    )
 
 
 class ElkArea(ElkAttachedEntity, AlarmControlPanelEntity, RestoreEntity):
@@ -265,3 +255,11 @@ class ElkArea(ElkAttachedEntity, AlarmControlPanelEntity, RestoreEntity):
     async def async_display_message(self, clear, beep, timeout, line1, line2):
         """Display a message on all keypads for the area."""
         self._element.display_message(clear, beep, timeout, line1, line2)
+
+    async def async_bypass(self, code=None):
+        """Bypass all zones in area."""
+        self._element.bypass(code)
+
+    async def async_clear_bypass(self, code=None):
+        """Clear bypass for all zones in area."""
+        self._element.clear_bypass(code)
diff --git a/homeassistant/components/elkm1/const.py b/homeassistant/components/elkm1/const.py
index 27b6445a4c1..71646582c99 100644
--- a/homeassistant/components/elkm1/const.py
+++ b/homeassistant/components/elkm1/const.py
@@ -1,6 +1,9 @@
 """Support the ElkM1 Gold and ElkM1 EZ8 alarm/integration panels."""
 
 from elkm1_lib.const import Max
+import voluptuous as vol
+
+from homeassistant.const import ATTR_CODE
 
 DOMAIN = "elkm1"
 
@@ -33,7 +36,17 @@ ELK_ELEMENTS = {
     CONF_ZONE: Max.ZONES.value,
 }
 
+EVENT_ELKM1_KEYPAD_KEY_PRESSED = "elkm1.keypad_key_pressed"
 
+
+ATTR_KEYPAD_ID = "keypad_id"
+ATTR_KEY = "key"
+ATTR_KEY_NAME = "key_name"
 ATTR_CHANGED_BY_KEYPAD = "changed_by_keypad"
 ATTR_CHANGED_BY_ID = "changed_by_id"
 ATTR_CHANGED_BY_TIME = "changed_by_time"
+ATTR_VALUE = "value"
+
+ELK_USER_CODE_SERVICE_SCHEMA = {
+    vol.Required(ATTR_CODE): vol.All(vol.Coerce(int), vol.Range(0, 999999))
+}
diff --git a/homeassistant/components/elkm1/manifest.json b/homeassistant/components/elkm1/manifest.json
index dd62c3a4989..0e6fdcfa40c 100644
--- a/homeassistant/components/elkm1/manifest.json
+++ b/homeassistant/components/elkm1/manifest.json
@@ -2,7 +2,7 @@
   "domain": "elkm1",
   "name": "Elk-M1 Control",
   "documentation": "https://www.home-assistant.io/integrations/elkm1",
-  "requirements": ["elkm1-lib==0.8.0"],
+  "requirements": ["elkm1-lib==0.8.4"],
   "codeowners": ["@gwww", "@bdraco"],
   "config_flow": true
 }
diff --git a/homeassistant/components/elkm1/sensor.py b/homeassistant/components/elkm1/sensor.py
index 20efb3e956d..c6442af2e44 100644
--- a/homeassistant/components/elkm1/sensor.py
+++ b/homeassistant/components/elkm1/sensor.py
@@ -6,14 +6,25 @@ from elkm1_lib.const import (
     ZoneType,
 )
 from elkm1_lib.util import pretty_const, username
+import voluptuous as vol
 
 from homeassistant.const import VOLT
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_platform
 
 from . import ElkAttachedEntity, create_elk_entities
-from .const import DOMAIN
+from .const import ATTR_VALUE, DOMAIN, ELK_USER_CODE_SERVICE_SCHEMA
 
+SERVICE_SENSOR_COUNTER_REFRESH = "sensor_counter_refresh"
+SERVICE_SENSOR_COUNTER_SET = "sensor_counter_set"
+SERVICE_SENSOR_ZONE_BYPASS = "sensor_zone_bypass"
+SERVICE_SENSOR_ZONE_TRIGGER = "sensor_zone_trigger"
 UNDEFINED_TEMPATURE = -40
 
+ELK_SET_COUNTER_SERVICE_SCHEMA = {
+    vol.Required(ATTR_VALUE): vol.All(vol.Coerce(int), vol.Range(0, 65535))
+}
+
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Create the Elk-M1 sensor platform."""
@@ -27,6 +38,29 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     create_elk_entities(elk_data, elk.zones, "zone", ElkZone, entities)
     async_add_entities(entities, True)
 
+    platform = entity_platform.current_platform.get()
+
+    platform.async_register_entity_service(
+        SERVICE_SENSOR_COUNTER_REFRESH,
+        {},
+        "async_counter_refresh",
+    )
+    platform.async_register_entity_service(
+        SERVICE_SENSOR_COUNTER_SET,
+        ELK_SET_COUNTER_SERVICE_SCHEMA,
+        "async_counter_set",
+    )
+    platform.async_register_entity_service(
+        SERVICE_SENSOR_ZONE_BYPASS,
+        ELK_USER_CODE_SERVICE_SCHEMA,
+        "async_zone_bypass",
+    )
+    platform.async_register_entity_service(
+        SERVICE_SENSOR_ZONE_TRIGGER,
+        {},
+        "async_zone_trigger",
+    )
+
 
 def temperature_to_state(temperature, undefined_temperature):
     """Convert temperature to a state."""
@@ -46,6 +80,30 @@ class ElkSensor(ElkAttachedEntity):
         """Return the state of the sensor."""
         return self._state
 
+    async def async_counter_refresh(self):
+        """Refresh the value of a counter from the panel."""
+        if not isinstance(self, ElkCounter):
+            raise HomeAssistantError("supported only on ElkM1 Counter sensors")
+        self._element.get()
+
+    async def async_counter_set(self, value=None):
+        """Set the value of a counter on the panel."""
+        if not isinstance(self, ElkCounter):
+            raise HomeAssistantError("supported only on ElkM1 Counter sensors")
+        self._element.set(value)
+
+    async def async_zone_bypass(self, code=None):
+        """Bypass zone."""
+        if not isinstance(self, ElkZone):
+            raise HomeAssistantError("supported only on ElkM1 Zone sensors")
+        self._element.bypass(code)
+
+    async def async_zone_trigger(self):
+        """Trigger zone."""
+        if not isinstance(self, ElkZone):
+            raise HomeAssistantError("supported only on ElkM1 Zone sensors")
+        self._element.trigger()
+
 
 class ElkCounter(ElkSensor):
     """Representation of an Elk-M1 Counter."""
@@ -180,7 +238,6 @@ class ElkZone(ElkSensor):
         ).name.lower()
         attrs["definition"] = ZoneType(self._element.definition).name.lower()
         attrs["area"] = self._element.area + 1
-        attrs["bypassed"] = self._element.bypassed
         attrs["triggered_alarm"] = self._element.triggered_alarm
         return attrs
 
diff --git a/homeassistant/components/elkm1/services.yaml b/homeassistant/components/elkm1/services.yaml
index beb4427d14c..9f9fb2c39e5 100644
--- a/homeassistant/components/elkm1/services.yaml
+++ b/homeassistant/components/elkm1/services.yaml
@@ -1,3 +1,23 @@
+alarm_bypass:
+  description: Bypass all zones for the area.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to bypass.
+      example: "alarm_control_panel.main"
+    code:
+      description: An code to authorize the bypass of the alarm control panel.
+      example: 4242
+
+alarm_clear_bypass:
+  description: Remove bypass on all zones for the area.
+  fields:
+    entity_id:
+      description: Name of alarm control panel to clear bypass.
+      example: "alarm_control_panel.main"
+    code:
+      description: An code to authorize the bypass clear of the alarm control panel.
+      example: 4242
+
 alarm_arm_home_instant:
   description: Arm the ElkM1 in home instant mode.
   fields:
@@ -50,6 +70,13 @@ alarm_display_message:
       description: Up to 16 characters of text (truncated if too long). Default blank.
       example: the universe, and everything.
 
+set_time:
+  description: Set the time for the panel.
+  fields:
+    prefix:
+      description: Prefix for the panel.
+      example: gatehouse
+
 speak_phrase:
   description: Speak a phrase. See list of phrases in ElkM1 ASCII Protocol documentation.
   fields:
@@ -63,3 +90,37 @@ speak_word:
     number:
       description: Word number to speak.
       example: 142
+
+sensor_counter_refresh:
+  description: Refresh the value of a counter from the panel.
+  fields:
+    entity_id:
+      description: Name of counter to refresh.
+      example: "sensor.counting_sheep"
+
+sensor_counter_set:
+  description: Set the value of a counter on the panel.
+  fields:
+    entity_id:
+      description: Name of counter to set.
+      example: "sensor.test42"
+    value:
+      description: Value to set the counter to.
+      example: 4242
+
+sensor_zone_bypass:
+  description: Bypass zone.
+  fields:
+    entity_id:
+      description: Name of zone to bypass.
+      example: "sensor.window42"
+    code:
+      description: An code to authorize the bypass of the zone.
+      example: 4242
+
+sensor_zone_trigger:
+  description: Trigger zone.
+  fields:
+    entity_id:
+      description: Name of zone to trigger.
+      example: "sensor.motion42"
diff --git a/homeassistant/components/elkm1/strings.json b/homeassistant/components/elkm1/strings.json
index 223e2ca3fff..bf0da956d44 100644
--- a/homeassistant/components/elkm1/strings.json
+++ b/homeassistant/components/elkm1/strings.json
@@ -15,9 +15,9 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
       "already_configured": "An ElkM1 with this prefix is already configured",
diff --git a/homeassistant/components/elkm1/translations/ca.json b/homeassistant/components/elkm1/translations/ca.json
index fd69a52d16d..ce766c314ed 100644
--- a/homeassistant/components/elkm1/translations/ca.json
+++ b/homeassistant/components/elkm1/translations/ca.json
@@ -5,7 +5,7 @@
             "already_configured": "Ja hi ha un Elk-M1 configurat amb aquest prefix"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/elkm1/translations/cs.json b/homeassistant/components/elkm1/translations/cs.json
index 338ff5d9a44..e3d4fef45de 100644
--- a/homeassistant/components/elkm1/translations/cs.json
+++ b/homeassistant/components/elkm1/translations/cs.json
@@ -1,11 +1,18 @@
 {
     "config": {
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
+                    "protocol": "Protokol",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k ovlada\u010di Elk-M1"
             }
         }
     }
diff --git a/homeassistant/components/elkm1/translations/en.json b/homeassistant/components/elkm1/translations/en.json
index 7fef25d79a6..04fd3c189b5 100644
--- a/homeassistant/components/elkm1/translations/en.json
+++ b/homeassistant/components/elkm1/translations/en.json
@@ -5,7 +5,7 @@
             "already_configured": "An ElkM1 with this prefix is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/elkm1/translations/es.json b/homeassistant/components/elkm1/translations/es.json
index 9dc4f4839b6..eaf987f95e6 100644
--- a/homeassistant/components/elkm1/translations/es.json
+++ b/homeassistant/components/elkm1/translations/es.json
@@ -5,7 +5,7 @@
             "already_configured": "Ya est\u00e1 configurado un Elk-M1 con este prefijo"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo",
+            "cannot_connect": "No se pudo conectar",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "unknown": "Error inesperado"
         },
@@ -13,11 +13,11 @@
             "user": {
                 "data": {
                     "address": "La direcci\u00f3n IP o dominio o puerto serie si se conecta a trav\u00e9s de serie.",
-                    "password": "Contrase\u00f1a (s\u00f3lo seguro)",
+                    "password": "Contrase\u00f1a",
                     "prefix": "Un prefijo \u00fanico (d\u00e9jalo en blanco si s\u00f3lo tienes un Elk-M1).",
                     "protocol": "Protocolo",
                     "temperature_unit": "La temperatura que usa la unidad Elk-M1",
-                    "username": "Usuario (s\u00f3lo seguro)"
+                    "username": "Usuario"
                 },
                 "description": "La cadena de direcci\u00f3n debe estar en el formato 'direcci\u00f3n[:puerto]' para 'seguro' y 'no-seguro'. Ejemplo: '192.168.1.1'. El puerto es opcional y el valor predeterminado es 2101 para 'no-seguro' y 2601 para 'seguro'. Para el protocolo serie, la direcci\u00f3n debe tener la forma 'tty[:baudios]'. Ejemplo: '/dev/ttyS1'. Los baudios son opcionales y el valor predeterminado es 115200.",
                 "title": "Conectar con Control Elk-M1"
diff --git a/homeassistant/components/elkm1/translations/et.json b/homeassistant/components/elkm1/translations/et.json
new file mode 100644
index 00000000000..49a9a1dce8c
--- /dev/null
+++ b/homeassistant/components/elkm1/translations/et.json
@@ -0,0 +1,26 @@
+{
+    "config": {
+        "abort": {
+            "address_already_configured": "Selle aadressiga ElkM1 on juba seadistatud",
+            "already_configured": "Selle eesliitega ElkM1 on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "address": "IP-aadress v\u00f5i domeen v\u00f5i jadaport, kui \u00fchendatakse jadaliidese kaudu.",
+                    "password": "Salas\u00f5na",
+                    "prefix": "Unikaalne eesliide (j\u00e4ta t\u00fchjaks kui on ainult \u00fcks ElkM1).",
+                    "protocol": "Protokoll",
+                    "temperature_unit": "ElkM1'i temperatuuri\u00fchik.",
+                    "username": "Kasutajanimi"
+                },
+                "description": "Aadressistring peab olema kujul \"aadress[:port]\" \"secure\" ja \"non-secure\" puhul. N\u00e4ide: \"192.168.1.1\". Port on valikuline ja vaikimisi 2101 \"secure\" ja 2601 \"non-secure puhul\". Jadaprotokolli puhul peab aadress olema kujul \"tty[:baud]\". N\u00e4ide: \"/dev/ttyS1\". Baud on valikuline ja vaikimisi 115200."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/elkm1/translations/it.json b/homeassistant/components/elkm1/translations/it.json
index e6eeacaf661..18e53997937 100644
--- a/homeassistant/components/elkm1/translations/it.json
+++ b/homeassistant/components/elkm1/translations/it.json
@@ -5,7 +5,7 @@
             "already_configured": "Un ElkM1 con questo prefisso \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/elkm1/translations/no.json b/homeassistant/components/elkm1/translations/no.json
index d00c4ab2eef..39452b58094 100644
--- a/homeassistant/components/elkm1/translations/no.json
+++ b/homeassistant/components/elkm1/translations/no.json
@@ -5,7 +5,7 @@
             "already_configured": "En ElkM1 med dette prefikset er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
@@ -15,7 +15,7 @@
                     "address": "IP-adressen eller domenet eller seriell port hvis du kobler til via seriell.",
                     "password": "Passord",
                     "prefix": "Et unikt prefiks (la v\u00e6re tomt hvis du bare har en ElkM1).",
-                    "protocol": "protokoll",
+                    "protocol": "Protokoll",
                     "temperature_unit": "Temperaturenheten ElkM1 bruker.",
                     "username": "Brukernavn"
                 },
diff --git a/homeassistant/components/elkm1/translations/pl.json b/homeassistant/components/elkm1/translations/pl.json
index c7f21554dee..def260b4bd9 100644
--- a/homeassistant/components/elkm1/translations/pl.json
+++ b/homeassistant/components/elkm1/translations/pl.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_already_configured": "ElkM1 z tym adresem jest ju\u017c skonfigurowany.",
-            "already_configured": "ElkM1 z tym prefiksem jest ju\u017c skonfigurowany."
+            "address_already_configured": "ElkM1 z tym adresem jest ju\u017c skonfigurowany",
+            "already_configured": "ElkM1 z tym prefiksem jest ju\u017c skonfigurowany"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/elkm1/translations/ru.json b/homeassistant/components/elkm1/translations/ru.json
index 94d3a47a8e1..3c84b98b0ca 100644
--- a/homeassistant/components/elkm1/translations/ru.json
+++ b/homeassistant/components/elkm1/translations/ru.json
@@ -5,7 +5,7 @@
             "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0441 \u044d\u0442\u0438\u043c \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u043e\u043c \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/elkm1/translations/zh-Hant.json b/homeassistant/components/elkm1/translations/zh-Hant.json
index 01c1197f66a..0a2f1f60faa 100644
--- a/homeassistant/components/elkm1/translations/zh-Hant.json
+++ b/homeassistant/components/elkm1/translations/zh-Hant.json
@@ -5,7 +5,7 @@
             "already_configured": "\u4f7f\u7528\u6b64 Prefix \u7684\u4e00\u7d44 ElkM1 \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/elv/__init__.py b/homeassistant/components/elv/__init__.py
index b776c7f5453..a3153eee1e4 100644
--- a/homeassistant/components/elv/__init__.py
+++ b/homeassistant/components/elv/__init__.py
@@ -1,15 +1,10 @@
 """The Elv integration."""
-
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_DEVICE
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "elv"
 
 DEFAULT_DEVICE = "/dev/ttyUSB0"
diff --git a/homeassistant/components/emby/manifest.json b/homeassistant/components/emby/manifest.json
index c639d193298..88f5f57e390 100644
--- a/homeassistant/components/emby/manifest.json
+++ b/homeassistant/components/emby/manifest.json
@@ -2,6 +2,6 @@
   "domain": "emby",
   "name": "Emby",
   "documentation": "https://www.home-assistant.io/integrations/emby",
-  "requirements": ["pyemby==1.6"],
+  "requirements": ["pyemby==1.7"],
   "codeowners": ["@mezz64"]
 }
diff --git a/homeassistant/components/emby/media_player.py b/homeassistant/components/emby/media_player.py
index 7872b8215a6..1cbc893f98b 100644
--- a/homeassistant/components/emby/media_player.py
+++ b/homeassistant/components/emby/media_player.py
@@ -44,8 +44,6 @@ DEFAULT_PORT = 8096
 DEFAULT_SSL_PORT = 8920
 DEFAULT_SSL = False
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_EMBY = (
     SUPPORT_PAUSE
     | SUPPORT_PREVIOUS_TRACK
diff --git a/homeassistant/components/emulated_kasa/manifest.json b/homeassistant/components/emulated_kasa/manifest.json
index 678b04bc5c0..c3458093943 100644
--- a/homeassistant/components/emulated_kasa/manifest.json
+++ b/homeassistant/components/emulated_kasa/manifest.json
@@ -2,7 +2,7 @@
   "domain": "emulated_kasa",
   "name": "Emulated Kasa",
   "documentation": "https://www.home-assistant.io/integrations/emulated_kasa",
-  "requirements": ["sense_energy==0.8.0"],
+  "requirements": ["sense_energy==0.8.1"],
   "codeowners": ["@kbickar"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/emulated_roku/config_flow.py b/homeassistant/components/emulated_roku/config_flow.py
index 0f8a82fa893..f002178b40a 100644
--- a/homeassistant/components/emulated_roku/config_flow.py
+++ b/homeassistant/components/emulated_roku/config_flow.py
@@ -31,7 +31,7 @@ class EmulatedRokuFlowHandler(config_entries.ConfigFlow):
             name = user_input[CONF_NAME]
 
             if name in configured_servers(self.hass):
-                return self.async_abort(reason="name_exists")
+                return self.async_abort(reason="already_configured")
 
             return self.async_create_entry(title=name, data=user_input)
 
diff --git a/homeassistant/components/emulated_roku/strings.json b/homeassistant/components/emulated_roku/strings.json
index a47c1c4799b..ef05c1265cc 100644
--- a/homeassistant/components/emulated_roku/strings.json
+++ b/homeassistant/components/emulated_roku/strings.json
@@ -1,15 +1,15 @@
 {
   "title": "Emulated Roku",
   "config": {
-    "abort": { "name_exists": "Name already exists" },
+    "abort": { "already_configured": "[%key:common::config_flow::abort::already_configured_device%]" }, 
     "step": {
       "user": {
         "data": {
-          "advertise_ip": "Advertise IP",
-          "advertise_port": "Advertise port",
-          "host_ip": "Host IP",
-          "listen_port": "Listen port",
-          "name": "Name",
+          "advertise_ip": "Advertise IP Address",
+          "advertise_port": "Advertise Port",
+          "host_ip": "Host IP Address",
+          "listen_port": "Listen Port",
+          "name": "[%key:common::config_flow::data::name%]",
           "upnp_bind_multicast": "Bind multicast (True/False)"
         },
         "title": "Define server configuration"
diff --git a/homeassistant/components/emulated_roku/translations/ca.json b/homeassistant/components/emulated_roku/translations/ca.json
index e54c91b1a48..efc1d250448 100644
--- a/homeassistant/components/emulated_roku/translations/ca.json
+++ b/homeassistant/components/emulated_roku/translations/ca.json
@@ -1,14 +1,15 @@
 {
     "config": {
         "abort": {
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
             "name_exists": "El nom ja existeix"
         },
         "step": {
             "user": {
                 "data": {
-                    "advertise_ip": "IP d'advert\u00e8ncies",
+                    "advertise_ip": "Adre\u00e7a IP d'advert\u00e8ncies",
                     "advertise_port": "Port d'advert\u00e8ncies",
-                    "host_ip": "IP de l'amfitri\u00f3",
+                    "host_ip": "Adre\u00e7a IP de l'amfitri\u00f3",
                     "listen_port": "Port d'escolta",
                     "name": "Nom",
                     "upnp_bind_multicast": "Enlla\u00e7ar multicast (true/false)"
diff --git a/homeassistant/components/emulated_roku/translations/cs.json b/homeassistant/components/emulated_roku/translations/cs.json
new file mode 100644
index 00000000000..156c71040a0
--- /dev/null
+++ b/homeassistant/components/emulated_roku/translations/cs.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "name_exists": "Jm\u00e9no ji\u017e existuje"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host_ip": "IP adresa hostitele",
+                    "name": "Jm\u00e9no"
+                }
+            }
+        }
+    },
+    "title": "Emulovan\u00e9 Roku"
+}
\ No newline at end of file
diff --git a/homeassistant/components/emulated_roku/translations/de.json b/homeassistant/components/emulated_roku/translations/de.json
index ce3d9e40d6c..1277fef44f2 100644
--- a/homeassistant/components/emulated_roku/translations/de.json
+++ b/homeassistant/components/emulated_roku/translations/de.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Ger\u00e4t ist bereits konfiguriert",
             "name_exists": "Name existiert bereits"
         },
         "step": {
diff --git a/homeassistant/components/emulated_roku/translations/en.json b/homeassistant/components/emulated_roku/translations/en.json
index c061f08b178..a8ee5f38e77 100644
--- a/homeassistant/components/emulated_roku/translations/en.json
+++ b/homeassistant/components/emulated_roku/translations/en.json
@@ -1,15 +1,16 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Device is already configured",
             "name_exists": "Name already exists"
         },
         "step": {
             "user": {
                 "data": {
-                    "advertise_ip": "Advertise IP",
-                    "advertise_port": "Advertise port",
-                    "host_ip": "Host IP",
-                    "listen_port": "Listen port",
+                    "advertise_ip": "Advertise IP Address",
+                    "advertise_port": "Advertise Port",
+                    "host_ip": "Host IP Address",
+                    "listen_port": "Listen Port",
                     "name": "Name",
                     "upnp_bind_multicast": "Bind multicast (True/False)"
                 },
diff --git a/homeassistant/components/emulated_roku/translations/es.json b/homeassistant/components/emulated_roku/translations/es.json
index 8cba52b9591..1e3ef31e6ae 100644
--- a/homeassistant/components/emulated_roku/translations/es.json
+++ b/homeassistant/components/emulated_roku/translations/es.json
@@ -17,5 +17,5 @@
             }
         }
     },
-    "title": "EmulatedRoku"
+    "title": "Roku emulado"
 }
\ No newline at end of file
diff --git a/homeassistant/components/emulated_roku/translations/et.json b/homeassistant/components/emulated_roku/translations/et.json
index cc4dd04a9ea..bfbecff709f 100644
--- a/homeassistant/components/emulated_roku/translations/et.json
+++ b/homeassistant/components/emulated_roku/translations/et.json
@@ -1,5 +1,9 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "name_exists": "Nimi on juba kasutusel"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/emulated_roku/translations/no.json b/homeassistant/components/emulated_roku/translations/no.json
index 8bd1d4793a5..f63f7432721 100644
--- a/homeassistant/components/emulated_roku/translations/no.json
+++ b/homeassistant/components/emulated_roku/translations/no.json
@@ -1,14 +1,15 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Enheten er allerede konfigurert",
             "name_exists": "Navnet eksisterer allerede"
         },
         "step": {
             "user": {
                 "data": {
-                    "advertise_ip": "Annonser IP",
+                    "advertise_ip": "Annonser IP-adresse",
                     "advertise_port": "Annonser port",
-                    "host_ip": "Vert IP",
+                    "host_ip": "Vertens IP-adresse",
                     "listen_port": "Lytte port",
                     "name": "Navn",
                     "upnp_bind_multicast": "Bind multicast (Sant/Usant)"
diff --git a/homeassistant/components/emulated_roku/translations/pl.json b/homeassistant/components/emulated_roku/translations/pl.json
index 6ce1c17e5d8..7b66687e79e 100644
--- a/homeassistant/components/emulated_roku/translations/pl.json
+++ b/homeassistant/components/emulated_roku/translations/pl.json
@@ -1,12 +1,13 @@
 {
     "config": {
         "abort": {
-            "name_exists": "Nazwa ju\u017c istnieje."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "name_exists": "Nazwa ju\u017c istnieje"
         },
         "step": {
             "user": {
                 "data": {
-                    "advertise_ip": "IP rozg\u0142aszania",
+                    "advertise_ip": "Adres IP rozg\u0142aszania",
                     "advertise_port": "Port rozg\u0142aszania",
                     "host_ip": "Adres IP",
                     "listen_port": "Port nas\u0142uchu",
@@ -17,5 +18,5 @@
             }
         }
     },
-    "title": "EmulatedRoku"
+    "title": "Emulated Roku"
 }
\ No newline at end of file
diff --git a/homeassistant/components/emulated_roku/translations/ru.json b/homeassistant/components/emulated_roku/translations/ru.json
index 878575788d8..e2db2f51f46 100644
--- a/homeassistant/components/emulated_roku/translations/ru.json
+++ b/homeassistant/components/emulated_roku/translations/ru.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "name_exists": "\u042d\u0442\u043e \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f."
         },
         "step": {
diff --git a/homeassistant/components/emulated_roku/translations/zh-Hant.json b/homeassistant/components/emulated_roku/translations/zh-Hant.json
index b38f471ddff..dc95575e04c 100644
--- a/homeassistant/components/emulated_roku/translations/zh-Hant.json
+++ b/homeassistant/components/emulated_roku/translations/zh-Hant.json
@@ -1,14 +1,15 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "name_exists": "\u8a72\u540d\u7a31\u5df2\u5b58\u5728"
         },
         "step": {
             "user": {
                 "data": {
-                    "advertise_ip": "\u5ee3\u64ad\u901a\u8a0a\u57e0",
+                    "advertise_ip": "\u5ee3\u64ad IP \u4f4d\u5740",
                     "advertise_port": "\u5ee3\u64ad\u901a\u8a0a\u57e0",
-                    "host_ip": "\u4e3b\u6a5f IP",
+                    "host_ip": "\u4e3b\u6a5f IP \u4f4d\u5740",
                     "listen_port": "\u76e3\u807d\u901a\u8a0a\u57e0",
                     "name": "\u540d\u7a31",
                     "upnp_bind_multicast": "\u7d81\u5b9a\u7fa4\u64ad\uff08Multicast\uff09True/False"
diff --git a/homeassistant/components/enigma2/media_player.py b/homeassistant/components/enigma2/media_player.py
index 563b2c5195d..b0d46d76b7b 100644
--- a/homeassistant/components/enigma2/media_player.py
+++ b/homeassistant/components/enigma2/media_player.py
@@ -1,6 +1,4 @@
 """Support for Enigma2 media players."""
-import logging
-
 from openwebif.api import CreateDevice
 import voluptuous as vol
 
@@ -32,8 +30,6 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_MEDIA_CURRENTLY_RECORDING = "media_currently_recording"
 ATTR_MEDIA_DESCRIPTION = "media_description"
 ATTR_MEDIA_END_TIME = "media_end_time"
@@ -253,17 +249,13 @@ class Enigma2Device(MediaPlayerEntity):
         currservice_begin:  is in the format '21:00'.
         currservice_end:    is in the format '21:00'.
         """
-        attributes = {}
-        if not self.e2_box.in_standby:
-            attributes[ATTR_MEDIA_CURRENTLY_RECORDING] = self.e2_box.status_info[
-                "isRecording"
-            ]
-            attributes[ATTR_MEDIA_DESCRIPTION] = self.e2_box.status_info[
+        if self.e2_box.in_standby:
+            return {}
+        return {
+            ATTR_MEDIA_CURRENTLY_RECORDING: self.e2_box.status_info["isRecording"],
+            ATTR_MEDIA_DESCRIPTION: self.e2_box.status_info[
                 "currservice_fulldescription"
-            ]
-            attributes[ATTR_MEDIA_START_TIME] = self.e2_box.status_info[
-                "currservice_begin"
-            ]
-            attributes[ATTR_MEDIA_END_TIME] = self.e2_box.status_info["currservice_end"]
-
-        return attributes
+            ],
+            ATTR_MEDIA_START_TIME: self.e2_box.status_info["currservice_begin"],
+            ATTR_MEDIA_END_TIME: self.e2_box.status_info["currservice_end"],
+        }
diff --git a/homeassistant/components/enocean/binary_sensor.py b/homeassistant/components/enocean/binary_sensor.py
index 31bd6607ae2..cc58103b7ef 100644
--- a/homeassistant/components/enocean/binary_sensor.py
+++ b/homeassistant/components/enocean/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for EnOcean binary sensors."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
@@ -13,8 +11,6 @@ import homeassistant.helpers.config_validation as cv
 
 from .device import EnOceanEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "EnOcean binary sensor"
 DEPENDENCIES = ["enocean"]
 EVENT_BUTTON_PRESSED = "button_pressed"
diff --git a/homeassistant/components/enocean/light.py b/homeassistant/components/enocean/light.py
index 04b234425c1..b8ea753b8d0 100644
--- a/homeassistant/components/enocean/light.py
+++ b/homeassistant/components/enocean/light.py
@@ -1,5 +1,4 @@
 """Support for EnOcean light sources."""
-import logging
 import math
 
 import voluptuous as vol
@@ -15,8 +14,6 @@ import homeassistant.helpers.config_validation as cv
 
 from .device import EnOceanEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_SENDER_ID = "sender_id"
 
 DEFAULT_NAME = "EnOcean Light"
diff --git a/homeassistant/components/enocean/sensor.py b/homeassistant/components/enocean/sensor.py
index 047d0a03986..011dcdafdb6 100644
--- a/homeassistant/components/enocean/sensor.py
+++ b/homeassistant/components/enocean/sensor.py
@@ -1,6 +1,4 @@
 """Support for EnOcean sensors."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA
@@ -22,8 +20,6 @@ from homeassistant.helpers.restore_state import RestoreEntity
 
 from .device import EnOceanEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_MAX_TEMP = "max_temp"
 CONF_MIN_TEMP = "min_temp"
 CONF_RANGE_FROM = "range_from"
diff --git a/homeassistant/components/enocean/switch.py b/homeassistant/components/enocean/switch.py
index 6ce5fbd3180..614bd8f4e43 100644
--- a/homeassistant/components/enocean/switch.py
+++ b/homeassistant/components/enocean/switch.py
@@ -1,6 +1,4 @@
 """Support for EnOcean switches."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA
@@ -10,8 +8,6 @@ from homeassistant.helpers.entity import ToggleEntity
 
 from .device import EnOceanEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_CHANNEL = "channel"
 DEFAULT_NAME = "EnOcean Switch"
 
diff --git a/homeassistant/components/enocean/translations/cs.json b/homeassistant/components/enocean/translations/cs.json
new file mode 100644
index 00000000000..2972ccbae64
--- /dev/null
+++ b/homeassistant/components/enocean/translations/cs.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        }
+    },
+    "title": "EnOcean"
+}
\ No newline at end of file
diff --git a/homeassistant/components/enocean/translations/es.json b/homeassistant/components/enocean/translations/es.json
index fec7e9ec15d..b0f01af2a3b 100644
--- a/homeassistant/components/enocean/translations/es.json
+++ b/homeassistant/components/enocean/translations/es.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "invalid_dongle_path": "Ruta a mochila no v\u00e1lida",
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
             "invalid_dongle_path": "No se ha encontrado ninguna mochila v\u00e1lida en esta ruta"
diff --git a/homeassistant/components/enocean/translations/et.json b/homeassistant/components/enocean/translations/et.json
new file mode 100644
index 00000000000..19ff43ed084
--- /dev/null
+++ b/homeassistant/components/enocean/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "detect": {
+                "data": {
+                    "path": "USB-seadme asukoha rada"
+                }
+            },
+            "manual": {
+                "data": {
+                    "path": "USB-seadme asukoha rada"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/entur_public_transport/sensor.py b/homeassistant/components/entur_public_transport/sensor.py
index 19510337d6a..883b5c43d7e 100644
--- a/homeassistant/components/entur_public_transport/sensor.py
+++ b/homeassistant/components/entur_public_transport/sensor.py
@@ -1,6 +1,5 @@
 """Real-time information about public transport departures in Norway."""
 from datetime import datetime, timedelta
-import logging
 
 from enturclient import EnturPublicTransportData
 import voluptuous as vol
@@ -20,8 +19,6 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 import homeassistant.util.dt as dt_util
 
-_LOGGER = logging.getLogger(__name__)
-
 API_CLIENT_NAME = "homeassistant-homeassistant"
 
 ATTRIBUTION = "Data provided by entur.org under NLOD"
diff --git a/homeassistant/components/environment_canada/camera.py b/homeassistant/components/environment_canada/camera.py
index 706308830f6..87677e85065 100644
--- a/homeassistant/components/environment_canada/camera.py
+++ b/homeassistant/components/environment_canada/camera.py
@@ -1,6 +1,5 @@
 """Support for the Environment Canada radar imagery."""
 import datetime
-import logging
 
 from env_canada import ECRadar  # pylint: disable=import-error
 import voluptuous as vol
@@ -15,8 +14,6 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util import Throttle
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_UPDATED = "updated"
 
 CONF_ATTRIBUTION = "Data provided by Environment Canada"
@@ -86,9 +83,7 @@ class ECCamera(Camera):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the device."""
-        attr = {ATTR_ATTRIBUTION: CONF_ATTRIBUTION, ATTR_UPDATED: self.timestamp}
-
-        return attr
+        return {ATTR_ATTRIBUTION: CONF_ATTRIBUTION, ATTR_UPDATED: self.timestamp}
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):
diff --git a/homeassistant/components/environment_canada/weather.py b/homeassistant/components/environment_canada/weather.py
index ca3c1f13c14..3c3dbfe6ce6 100644
--- a/homeassistant/components/environment_canada/weather.py
+++ b/homeassistant/components/environment_canada/weather.py
@@ -1,6 +1,5 @@
 """Platform for retrieving meteorological data from Environment Canada."""
 import datetime
-import logging
 import re
 
 from env_canada import ECData  # pylint: disable=import-error
@@ -19,8 +18,6 @@ from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, TEMP_C
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.dt as dt
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_FORECAST = "forecast"
 CONF_ATTRIBUTION = "Data provided by Environment Canada"
 CONF_STATION = "station"
diff --git a/homeassistant/components/epson/media_player.py b/homeassistant/components/epson/media_player.py
index df0dcc536b5..235caa8d1a3 100644
--- a/homeassistant/components/epson/media_player.py
+++ b/homeassistant/components/epson/media_player.py
@@ -235,7 +235,6 @@ class EpsonProjector(MediaPlayerEntity):
     @property
     def device_state_attributes(self):
         """Return device specific state attributes."""
-        attributes = {}
-        if self._cmode is not None:
-            attributes[ATTR_CMODE] = self._cmode
-        return attributes
+        if self._cmode is None:
+            return {}
+        return {ATTR_CMODE: self._cmode}
diff --git a/homeassistant/components/epsonworkforce/sensor.py b/homeassistant/components/epsonworkforce/sensor.py
index cee3d00242a..7c6042c8959 100644
--- a/homeassistant/components/epsonworkforce/sensor.py
+++ b/homeassistant/components/epsonworkforce/sensor.py
@@ -1,6 +1,5 @@
 """Support for Epson Workforce Printer."""
 from datetime import timedelta
-import logging
 
 from epsonprinter_pkg.epsonprinterapi import EpsonPrinterAPI
 import voluptuous as vol
@@ -11,7 +10,6 @@ from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
 MONITORED_CONDITIONS = {
     "black": ["Ink level Black", PERCENTAGE, "mdi:water"],
     "photoblack": ["Ink level Photoblack", PERCENTAGE, "mdi:water"],
diff --git a/homeassistant/components/esphome/camera.py b/homeassistant/components/esphome/camera.py
index c3615c4726d..1678281c3de 100644
--- a/homeassistant/components/esphome/camera.py
+++ b/homeassistant/components/esphome/camera.py
@@ -1,6 +1,5 @@
 """Support for ESPHome cameras."""
 import asyncio
-import logging
 from typing import Optional
 
 from aioesphomeapi import CameraInfo, CameraState
@@ -12,8 +11,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 
 from . import EsphomeEntity, platform_async_setup_entry
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/esphome/climate.py b/homeassistant/components/esphome/climate.py
index 46ed214afba..fe171d24fb9 100644
--- a/homeassistant/components/esphome/climate.py
+++ b/homeassistant/components/esphome/climate.py
@@ -1,5 +1,4 @@
 """Support for ESPHome climate devices."""
-import logging
 from typing import List, Optional
 
 from aioesphomeapi import (
@@ -64,8 +63,6 @@ from . import (
     platform_async_setup_entry,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up ESPHome climate devices based on a config entry."""
diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py
index a22256bc69d..1d1fc421bb8 100644
--- a/homeassistant/components/esphome/config_flow.py
+++ b/homeassistant/components/esphome/config_flow.py
@@ -202,6 +202,6 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
             await cli.connect(login=True)
         except APIConnectionError:
             await cli.disconnect(force=True)
-            return "invalid_password"
+            return "invalid_auth"
 
         return None
diff --git a/homeassistant/components/esphome/cover.py b/homeassistant/components/esphome/cover.py
index fcf7c22a2a2..4c42fe0d522 100644
--- a/homeassistant/components/esphome/cover.py
+++ b/homeassistant/components/esphome/cover.py
@@ -1,5 +1,4 @@
 """Support for ESPHome covers."""
-import logging
 from typing import Optional
 
 from aioesphomeapi import CoverInfo, CoverOperation, CoverState
@@ -21,8 +20,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 
 from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/esphome/fan.py b/homeassistant/components/esphome/fan.py
index 8b9b4b4922c..df663f8b10a 100644
--- a/homeassistant/components/esphome/fan.py
+++ b/homeassistant/components/esphome/fan.py
@@ -1,5 +1,4 @@
 """Support for ESPHome fans."""
-import logging
 from typing import List, Optional
 
 from aioesphomeapi import FanInfo, FanSpeed, FanState
@@ -23,8 +22,6 @@ from . import (
     platform_async_setup_entry,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/esphome/light.py b/homeassistant/components/esphome/light.py
index 36c22f28016..adbb36188fd 100644
--- a/homeassistant/components/esphome/light.py
+++ b/homeassistant/components/esphome/light.py
@@ -1,5 +1,4 @@
 """Support for ESPHome lights."""
-import logging
 from typing import List, Optional, Tuple
 
 from aioesphomeapi import LightInfo, LightState
@@ -29,9 +28,6 @@ import homeassistant.util.color as color_util
 
 from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
 
-_LOGGER = logging.getLogger(__name__)
-
-
 FLASH_LENGTHS = {FLASH_SHORT: 2, FLASH_LONG: 10}
 
 
diff --git a/homeassistant/components/esphome/sensor.py b/homeassistant/components/esphome/sensor.py
index 0856f270710..fbf3925953b 100644
--- a/homeassistant/components/esphome/sensor.py
+++ b/homeassistant/components/esphome/sensor.py
@@ -1,5 +1,4 @@
 """Support for esphome sensors."""
-import logging
 import math
 from typing import Optional
 
@@ -10,8 +9,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 
 from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json
index af7515245b5..88072a4d241 100644
--- a/homeassistant/components/esphome/strings.json
+++ b/homeassistant/components/esphome/strings.json
@@ -1,13 +1,13 @@
 {
   "config": {
     "abort": {
-      "already_configured": "ESP is already configured",
-      "already_in_progress": "ESP configuration is already in progress"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
     },
     "error": {
       "resolve_error": "Can't resolve address of the ESP. If this error persists, please set a static IP address: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips",
       "connection_error": "Can't connect to ESP. Please make sure your YAML file contains an 'api:' line.",
-      "invalid_password": "Invalid password!"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "step": {
       "user": {
@@ -30,4 +30,4 @@
     },
     "flow_title": "ESPHome: {name}"
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/esphome/switch.py b/homeassistant/components/esphome/switch.py
index a3c7eeab946..3f8ca90d6c5 100644
--- a/homeassistant/components/esphome/switch.py
+++ b/homeassistant/components/esphome/switch.py
@@ -1,5 +1,4 @@
 """Support for ESPHome switches."""
-import logging
 from typing import Optional
 
 from aioesphomeapi import SwitchInfo, SwitchState
@@ -10,8 +9,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 
 from . import EsphomeEntity, esphome_state_property, platform_async_setup_entry
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/esphome/translations/ca.json b/homeassistant/components/esphome/translations/ca.json
index 8833749d071..79b705db0d8 100644
--- a/homeassistant/components/esphome/translations/ca.json
+++ b/homeassistant/components/esphome/translations/ca.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ESP ja est\u00e0 configurat",
-            "already_in_progress": "La configuraci\u00f3 de l'ESP ja est\u00e0 en curs"
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs"
         },
         "error": {
             "connection_error": "No s'ha pogut connectar amb ESP. Verifica que l'arxiu YAML cont\u00e9 la l\u00ednia 'api:'.",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_password": "Contrasenya inv\u00e0lida!",
             "resolve_error": "No s'ha pogut trobar l'adre\u00e7a de l'ESP. Si l'error persisteix, configura una adre\u00e7a IP est\u00e0tica: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
         },
diff --git a/homeassistant/components/esphome/translations/cs.json b/homeassistant/components/esphome/translations/cs.json
index b437d6d79fd..e34ca009aca 100644
--- a/homeassistant/components/esphome/translations/cs.json
+++ b/homeassistant/components/esphome/translations/cs.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Tento ESP uzel je ji\u017e nakonfigurov\u00e1n",
-            "already_in_progress": "Konfigurace uzlu ESP ji\u017e prob\u00edh\u00e1"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1"
         },
         "error": {
             "connection_error": "Nelze se p\u0159ipojit k ESP. Zkontrolujte, zda va\u0161e YAML konfigurace obsahuje \u0159\u00e1dek 'api:'.",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
             "invalid_password": "Neplatn\u00e9 heslo",
             "resolve_error": "Nelze naj\u00edt IP adresu uzlu ESP. Pokud tato chyba p\u0159etrv\u00e1v\u00e1, nastavte statickou adresu IP: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
         },
@@ -23,7 +24,7 @@
             },
             "user": {
                 "data": {
-                    "host": "Adresa uzlu",
+                    "host": "Hostitel",
                     "port": "Port"
                 },
                 "description": "Zadejte pros\u00edm nastaven\u00ed p\u0159ipojen\u00ed va\u0161eho [ESPHome](https://esphomelib.com/) uzlu."
diff --git a/homeassistant/components/esphome/translations/en.json b/homeassistant/components/esphome/translations/en.json
index 6386e1f7093..71e81083b6c 100644
--- a/homeassistant/components/esphome/translations/en.json
+++ b/homeassistant/components/esphome/translations/en.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ESP is already configured",
-            "already_in_progress": "ESP configuration is already in progress"
+            "already_configured": "Device is already configured",
+            "already_in_progress": "Configuration flow is already in progress"
         },
         "error": {
             "connection_error": "Can't connect to ESP. Please make sure your YAML file contains an 'api:' line.",
+            "invalid_auth": "Invalid authentication",
             "invalid_password": "Invalid password!",
             "resolve_error": "Can't resolve address of the ESP. If this error persists, please set a static IP address: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
         },
diff --git a/homeassistant/components/esphome/translations/es.json b/homeassistant/components/esphome/translations/es.json
index e30825180b4..5ab2ef3b01e 100644
--- a/homeassistant/components/esphome/translations/es.json
+++ b/homeassistant/components/esphome/translations/es.json
@@ -6,6 +6,7 @@
         },
         "error": {
             "connection_error": "No se puede conectar a ESP. Aseg\u00farate de que tu archivo YAML contenga una l\u00ednea 'api:'.",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_password": "\u00a1Contrase\u00f1a incorrecta!",
             "resolve_error": "No se puede resolver la direcci\u00f3n de ESP. Si el error persiste, configura una direcci\u00f3n IP est\u00e1tica: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
         },
diff --git a/homeassistant/components/esphome/translations/et.json b/homeassistant/components/esphome/translations/et.json
new file mode 100644
index 00000000000..58f86d9ffe7
--- /dev/null
+++ b/homeassistant/components/esphome/translations/et.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_password": "Vale salas\u00f5na!"
+        },
+        "flow_title": "ESPHome: {name}",
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "Salas\u00f5na"
+                }
+            },
+            "discovery_confirm": {
+                "description": "Kas soovid lisada ESPHome'i s\u00f5lme '{name}' Home Assistant-ile?"
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": "Port"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/translations/it.json b/homeassistant/components/esphome/translations/it.json
index 19ff26493a8..4095b3bd107 100644
--- a/homeassistant/components/esphome/translations/it.json
+++ b/homeassistant/components/esphome/translations/it.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ESP \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "La configurazione ESP \u00e8 gi\u00e0 in corso"
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso"
         },
         "error": {
             "connection_error": "Impossibile connettersi ad ESP. Assicurati che il tuo file YAML contenga una riga \"api:\".",
+            "invalid_auth": "Autenticazione non valida",
             "invalid_password": "Password non valida!",
             "resolve_error": "Impossibile risolvere l'indirizzo dell'ESP. Se questo errore persiste, impostare un indirizzo IP statico: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
         },
diff --git a/homeassistant/components/esphome/translations/lb.json b/homeassistant/components/esphome/translations/lb.json
index 939385372fa..f7969c6ab71 100644
--- a/homeassistant/components/esphome/translations/lb.json
+++ b/homeassistant/components/esphome/translations/lb.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "ESP ass scho konfigur\u00e9iert",
-            "already_in_progress": "ESP Konfiguratioun ass schonn am gaang."
+            "already_in_progress": "Konfiguratioun's Oflaf ass schonn am gaang."
         },
         "error": {
             "connection_error": "Keng Verbindung zum ESP. Iwwerpr\u00e9ift d'Pr\u00e4sens vun der Zeil api: am YAML Fichier.",
diff --git a/homeassistant/components/esphome/translations/no.json b/homeassistant/components/esphome/translations/no.json
index 3c2dafff34d..fd510fb0488 100644
--- a/homeassistant/components/esphome/translations/no.json
+++ b/homeassistant/components/esphome/translations/no.json
@@ -1,15 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ESP er allerede konfigurert",
-            "already_in_progress": "ESP-konfigurasjon p\u00e5g\u00e5r allerede"
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede"
         },
         "error": {
             "connection_error": "Kan ikke koble til ESP. Kontroller at YAML filen din inneholder en \"api:\" linje.",
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_password": "Ugyldig passord!",
             "resolve_error": "Kan ikke l\u00f8se adressen til ESP. Hvis denne feilen vedvarer, vennligst [sett en statisk IP-adresse](https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips)"
         },
-        "flow_title": "ESPHome: {name}",
+        "flow_title": "",
         "step": {
             "authenticate": {
                 "data": {
@@ -24,7 +25,7 @@
             "user": {
                 "data": {
                     "host": "Vert",
-                    "port": ""
+                    "port": "Port"
                 },
                 "description": "Vennligst fyll inn tilkoblingsinnstillinger for din [ESPHome](https://esphomelib.com/) node."
             }
diff --git a/homeassistant/components/esphome/translations/pl.json b/homeassistant/components/esphome/translations/pl.json
index 1e6da3d4572..248de87e1da 100644
--- a/homeassistant/components/esphome/translations/pl.json
+++ b/homeassistant/components/esphome/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ESP jest ju\u017c skonfigurowane.",
-            "already_in_progress": "Konfiguracja ESP jest ju\u017c w toku."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku"
         },
         "error": {
             "connection_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z ESP. Upewnij si\u0119, \u017ce Tw\u00f3j plik YAML zawiera lini\u0119 'api:'.",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_password": "Nieprawid\u0142owe has\u0142o!",
             "resolve_error": "Nie mo\u017cna rozpozna\u0107 adresu ESP. Je\u015bli ten b\u0142\u0105d b\u0119dzie si\u0119 powtarza\u0142, nale\u017cy ustawi\u0107 statyczny adres IP: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
         },
diff --git a/homeassistant/components/esphome/translations/ru.json b/homeassistant/components/esphome/translations/ru.json
index c03e4619ec9..70b64cc48ba 100644
--- a/homeassistant/components/esphome/translations/ru.json
+++ b/homeassistant/components/esphome/translations/ru.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f."
         },
         "error": {
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a ESP. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0412\u0430\u0448 YAML-\u0444\u0430\u0439\u043b \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0441\u0442\u0440\u043e\u043a\u0443 'api:'.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_password": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c!",
             "resolve_error": "\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0430\u0434\u0440\u0435\u0441 ESP. \u0415\u0441\u043b\u0438 \u044d\u0442\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0432\u0442\u043e\u0440\u044f\u0435\u0442\u0441\u044f, \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435 \u0441\u0442\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 IP-\u0430\u0434\u0440\u0435\u0441: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips."
         },
diff --git a/homeassistant/components/esphome/translations/zh-Hans.json b/homeassistant/components/esphome/translations/zh-Hans.json
index bda2140c4f0..012e4f266d3 100644
--- a/homeassistant/components/esphome/translations/zh-Hans.json
+++ b/homeassistant/components/esphome/translations/zh-Hans.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ESP \u5df2\u914d\u7f6e\u5b8c\u6210"
+            "already_configured": "\u8bbe\u5907\u5df2\u7ecf\u914d\u7f6e\u8fc7\u4e86",
+            "already_in_progress": "\u914d\u7f6e\u6d41\u7a0b\u5df2\u5728\u8fdb\u884c\u4e2d"
         },
         "error": {
             "connection_error": "\u65e0\u6cd5\u8fde\u63a5\u5230 ESP\u3002\u8bf7\u786e\u8ba4\u60a8\u7684 YAML \u6587\u4ef6\u4e2d\u5305\u542b 'api:' \u884c\u3002",
-            "invalid_password": "\u65e0\u6548\u7684\u5bc6\u7801\uff01",
+            "invalid_auth": "\u8eab\u4efd\u8ba4\u8bc1\u65e0\u6548",
+            "invalid_password": "\u5bc6\u7801\u65e0\u6548\uff01",
             "resolve_error": "\u65e0\u6cd5\u89e3\u6790 ESP \u7684\u5730\u5740\u3002\u5982\u679c\u6b64\u9519\u8bef\u6301\u7eed\u5b58\u5728\uff0c\u8bf7\u8bbe\u7f6e\u9759\u6001IP\u5730\u5740\uff1ahttps://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
         },
         "flow_title": "ESPHome: {name}",
diff --git a/homeassistant/components/esphome/translations/zh-Hant.json b/homeassistant/components/esphome/translations/zh-Hant.json
index be25ddd6366..785c68a7667 100644
--- a/homeassistant/components/esphome/translations/zh-Hant.json
+++ b/homeassistant/components/esphome/translations/zh-Hant.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ESP \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "ESP \u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d"
         },
         "error": {
             "connection_error": "\u7121\u6cd5\u9023\u7dda\u81f3 ESP\uff0c\u8acb\u78ba\u5b9a\u60a8\u7684 YAML \u6a94\u6848\u5305\u542b\u300capi:\u300d\u8a2d\u5b9a\u5217\u3002",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_password": "\u5bc6\u78bc\u7121\u6548\uff01",
             "resolve_error": "\u7121\u6cd5\u89e3\u6790 ESP \u4f4d\u5740\uff0c\u5047\u5982\u6b64\u932f\u8aa4\u6301\u7e8c\u767c\u751f\uff0c\u8acb\u53c3\u8003\u8aaa\u660e\u8a2d\u5b9a\u70ba\u975c\u614b\u56fa\u5b9a IP \uff1a https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
         },
diff --git a/homeassistant/components/eufy/__init__.py b/homeassistant/components/eufy/__init__.py
index eca637ec371..2b006deb4e8 100644
--- a/homeassistant/components/eufy/__init__.py
+++ b/homeassistant/components/eufy/__init__.py
@@ -1,6 +1,4 @@
 """Support for Eufy devices."""
-import logging
-
 import lakeside
 import voluptuous as vol
 
@@ -16,8 +14,6 @@ from homeassistant.const import (
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "eufy"
 
 DEVICE_SCHEMA = vol.Schema(
diff --git a/homeassistant/components/eufy/light.py b/homeassistant/components/eufy/light.py
index 2c23eca483f..ceff6775492 100644
--- a/homeassistant/components/eufy/light.py
+++ b/homeassistant/components/eufy/light.py
@@ -1,6 +1,4 @@
 """Support for Eufy lights."""
-import logging
-
 import lakeside
 
 from homeassistant.components.light import (
@@ -18,8 +16,6 @@ from homeassistant.util.color import (
     color_temperature_mired_to_kelvin as mired_to_kelvin,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 EUFY_MAX_KELVIN = 6500
 EUFY_MIN_KELVIN = 2700
 
diff --git a/homeassistant/components/eufy/switch.py b/homeassistant/components/eufy/switch.py
index 586965aa42b..c718c8b7691 100644
--- a/homeassistant/components/eufy/switch.py
+++ b/homeassistant/components/eufy/switch.py
@@ -1,12 +1,8 @@
 """Support for Eufy switches."""
-import logging
-
 import lakeside
 
 from homeassistant.components.switch import SwitchEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Eufy switches."""
diff --git a/homeassistant/components/familyhub/camera.py b/homeassistant/components/familyhub/camera.py
index 2e4e7085927..ea654074a5a 100644
--- a/homeassistant/components/familyhub/camera.py
+++ b/homeassistant/components/familyhub/camera.py
@@ -1,6 +1,4 @@
 """Family Hub camera for Samsung Refrigerators."""
-import logging
-
 from pyfamilyhublocal import FamilyHubCam
 import voluptuous as vol
 
@@ -9,8 +7,6 @@ from homeassistant.const import CONF_IP_ADDRESS, CONF_NAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "FamilyHub Camera"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/fan/__init__.py b/homeassistant/components/fan/__init__.py
index a4518b15f99..789299bd1ac 100644
--- a/homeassistant/components/fan/__init__.py
+++ b/homeassistant/components/fan/__init__.py
@@ -117,7 +117,7 @@ class FanEntity(ToggleEntity):
         if speed == SPEED_OFF:
             await self.async_turn_off()
         else:
-            await self.hass.async_add_job(self.set_speed, speed)
+            await self.hass.async_add_executor_job(self.set_speed, speed)
 
     def set_direction(self, direction: str) -> None:
         """Set the direction of the fan."""
@@ -125,7 +125,7 @@ class FanEntity(ToggleEntity):
 
     async def async_set_direction(self, direction: str):
         """Set the direction of the fan."""
-        await self.hass.async_add_job(self.set_direction, direction)
+        await self.hass.async_add_executor_job(self.set_direction, direction)
 
     # pylint: disable=arguments-differ
     def turn_on(self, speed: Optional[str] = None, **kwargs) -> None:
@@ -138,14 +138,16 @@ class FanEntity(ToggleEntity):
         if speed == SPEED_OFF:
             await self.async_turn_off()
         else:
-            await self.hass.async_add_job(ft.partial(self.turn_on, speed, **kwargs))
+            await self.hass.async_add_executor_job(
+                ft.partial(self.turn_on, speed, **kwargs)
+            )
 
     def oscillate(self, oscillating: bool) -> None:
         """Oscillate the fan."""
 
     async def async_oscillate(self, oscillating: bool):
         """Oscillate the fan."""
-        await self.hass.async_add_job(self.oscillate, oscillating)
+        await self.hass.async_add_executor_job(self.oscillate, oscillating)
 
     @property
     def is_on(self):
diff --git a/homeassistant/components/fan/translations/cs.json b/homeassistant/components/fan/translations/cs.json
index 58f27535d2b..82298304751 100644
--- a/homeassistant/components/fan/translations/cs.json
+++ b/homeassistant/components/fan/translations/cs.json
@@ -1,8 +1,22 @@
 {
+    "device_automation": {
+        "action_type": {
+            "turn_off": "Vypnout {entity_name}",
+            "turn_on": "Zapnout {entity_name}"
+        },
+        "condition_type": {
+            "is_off": "{entity_name} je vypnuto",
+            "is_on": "{entity_name} je zapnuto"
+        },
+        "trigger_type": {
+            "turned_off": "{entity_name} bylo vypnuto",
+            "turned_on": "{entity_name} bylo zapnuto"
+        }
+    },
     "state": {
         "_": {
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed"
+            "off": "Vypnuto",
+            "on": "Zapnuto"
         }
     },
     "title": "Ventil\u00e1tor"
diff --git a/homeassistant/components/fan/translations/pl.json b/homeassistant/components/fan/translations/pl.json
index fcf925e60ea..e99f92ae286 100644
--- a/homeassistant/components/fan/translations/pl.json
+++ b/homeassistant/components/fan/translations/pl.json
@@ -15,8 +15,8 @@
     },
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "Wentylator"
diff --git a/homeassistant/components/fan/translations/ru.json b/homeassistant/components/fan/translations/ru.json
index 8d1bf91ed1e..320b4e280c5 100644
--- a/homeassistant/components/fan/translations/ru.json
+++ b/homeassistant/components/fan/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "device_automation": {
         "action_type": {
-            "turn_off": "\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}",
-            "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}"
+            "turn_off": "{entity_name}: \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_on": "{entity_name}: \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c"
         },
         "condition_type": {
             "is_off": "{entity_name} \u0432 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u043e\u043c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438",
diff --git a/homeassistant/components/fan/translations/zh-Hans.json b/homeassistant/components/fan/translations/zh-Hans.json
index 6dde9459c1a..13b6917f4ad 100644
--- a/homeassistant/components/fan/translations/zh-Hans.json
+++ b/homeassistant/components/fan/translations/zh-Hans.json
@@ -10,7 +10,7 @@
         },
         "trigger_type": {
             "turned_off": "{entity_name} \u88ab\u5173\u95ed",
-            "turned_on": "{entity_name} \u88ab\u5f00\u542f"
+            "turned_on": "{entity_name} \u88ab\u6253\u5f00"
         }
     },
     "state": {
diff --git a/homeassistant/components/fastdotcom/sensor.py b/homeassistant/components/fastdotcom/sensor.py
index fe131e4dab4..ad3711b1319 100644
--- a/homeassistant/components/fastdotcom/sensor.py
+++ b/homeassistant/components/fastdotcom/sensor.py
@@ -1,6 +1,4 @@
 """Support for Fast.com internet speed testing sensor."""
-import logging
-
 from homeassistant.const import DATA_RATE_MEGABITS_PER_SECOND
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -8,8 +6,6 @@ from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import DATA_UPDATED, DOMAIN as FASTDOTCOM_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 ICON = "mdi:speedometer"
 
 
diff --git a/homeassistant/components/fastdotcom/services.yaml b/homeassistant/components/fastdotcom/services.yaml
index f0afb49dbe0..3664f9ece9f 100644
--- a/homeassistant/components/fastdotcom/services.yaml
+++ b/homeassistant/components/fastdotcom/services.yaml
@@ -1,2 +1,2 @@
 speedtest:
-  description: Immediately take a speedest with Fast.com
+  description: Immediately execute a speed test with Fast.com
diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py
index ca752208f12..70ea74dde3f 100644
--- a/homeassistant/components/ffmpeg/__init__.py
+++ b/homeassistant/components/ffmpeg/__init__.py
@@ -1,5 +1,4 @@
 """Support for FFmpeg."""
-import logging
 import re
 
 from haffmpeg.tools import FFVersion
@@ -21,8 +20,6 @@ from homeassistant.helpers.entity import Entity
 
 DOMAIN = "ffmpeg"
 
-_LOGGER = logging.getLogger(__name__)
-
 SERVICE_START = "start"
 SERVICE_STOP = "stop"
 SERVICE_RESTART = "restart"
diff --git a/homeassistant/components/ffmpeg/camera.py b/homeassistant/components/ffmpeg/camera.py
index db3eb5621ff..729c51cf949 100644
--- a/homeassistant/components/ffmpeg/camera.py
+++ b/homeassistant/components/ffmpeg/camera.py
@@ -1,6 +1,5 @@
 """Support for Cameras with FFmpeg as decoder."""
 import asyncio
-import logging
 
 from haffmpeg.camera import CameraMjpeg
 from haffmpeg.tools import IMAGE_JPEG, ImageFrame
@@ -13,8 +12,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import CONF_EXTRA_ARGUMENTS, CONF_INPUT, DATA_FFMPEG
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "FFmpeg"
 DEFAULT_ARGUMENTS = "-pred 1"
 
diff --git a/homeassistant/components/ffmpeg_motion/binary_sensor.py b/homeassistant/components/ffmpeg_motion/binary_sensor.py
index 9b4218c011c..9dbe08ec649 100644
--- a/homeassistant/components/ffmpeg_motion/binary_sensor.py
+++ b/homeassistant/components/ffmpeg_motion/binary_sensor.py
@@ -1,6 +1,4 @@
 """Provides a binary sensor which is a collection of ffmpeg tools."""
-import logging
-
 import haffmpeg.sensor as ffmpeg_sensor
 import voluptuous as vol
 
@@ -20,8 +18,6 @@ from homeassistant.const import CONF_NAME
 from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_RESET = "reset"
 CONF_CHANGES = "changes"
 CONF_REPEAT = "repeat"
diff --git a/homeassistant/components/ffmpeg_noise/binary_sensor.py b/homeassistant/components/ffmpeg_noise/binary_sensor.py
index 387f25afe6e..8425ed173b4 100644
--- a/homeassistant/components/ffmpeg_noise/binary_sensor.py
+++ b/homeassistant/components/ffmpeg_noise/binary_sensor.py
@@ -1,6 +1,4 @@
 """Provides a binary sensor which is a collection of ffmpeg tools."""
-import logging
-
 import haffmpeg.sensor as ffmpeg_sensor
 import voluptuous as vol
 
@@ -16,8 +14,6 @@ from homeassistant.components.ffmpeg_motion.binary_sensor import FFmpegBinarySen
 from homeassistant.const import CONF_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PEAK = "peak"
 CONF_DURATION = "duration"
 CONF_RESET = "reset"
diff --git a/homeassistant/components/fibaro/__init__.py b/homeassistant/components/fibaro/__init__.py
index 4b51c82469e..6b56b146a9c 100644
--- a/homeassistant/components/fibaro/__init__.py
+++ b/homeassistant/components/fibaro/__init__.py
@@ -508,7 +508,7 @@ class FibaroDevice(Entity):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the device."""
-        attr = {}
+        attr = {"fibaro_id": self.fibaro_device.id}
 
         try:
             if "battery" in self.fibaro_device.interfaces:
@@ -528,5 +528,4 @@ class FibaroDevice(Entity):
         except (ValueError, KeyError):
             pass
 
-        attr["fibaro_id"] = self.fibaro_device.id
         return attr
diff --git a/homeassistant/components/fibaro/binary_sensor.py b/homeassistant/components/fibaro/binary_sensor.py
index 21ce22ea8e3..96c688bac16 100644
--- a/homeassistant/components/fibaro/binary_sensor.py
+++ b/homeassistant/components/fibaro/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Fibaro binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_DOOR,
     DEVICE_CLASS_MOTION,
@@ -13,8 +11,6 @@ from homeassistant.const import CONF_DEVICE_CLASS, CONF_ICON
 
 from . import FIBARO_DEVICES, FibaroDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSOR_TYPES = {
     "com.fibaro.floodSensor": ["Flood", "mdi:water", "flood"],
     "com.fibaro.motionSensor": ["Motion", "mdi:run", DEVICE_CLASS_MOTION],
diff --git a/homeassistant/components/fibaro/climate.py b/homeassistant/components/fibaro/climate.py
index eee1c08bd36..6a7a6f145d8 100644
--- a/homeassistant/components/fibaro/climate.py
+++ b/homeassistant/components/fibaro/climate.py
@@ -132,7 +132,10 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
             elif (
                 self._temp_sensor_device is None
                 and "unit" in device.properties
-                and "value" in device.properties
+                and (
+                    "value" in device.properties
+                    or "heatingThermostatSetpoint" in device.properties
+                )
                 and (device.properties.unit == "C" or device.properties.unit == "F")
             ):
                 self._temp_sensor_device = FibaroDevice(device)
@@ -141,6 +144,7 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
             if (
                 "setTargetLevel" in device.actions
                 or "setThermostatSetpoint" in device.actions
+                or "setHeatingThermostatSetpoint" in device.actions
             ):
                 self._target_temp_device = FibaroDevice(device)
                 self._support_flags |= SUPPORT_TARGET_TEMPERATURE
@@ -317,6 +321,8 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
         """Return the current temperature."""
         if self._temp_sensor_device:
             device = self._temp_sensor_device.fibaro_device
+            if device.properties.heatingThermostatSetpoint:
+                return float(device.properties.heatingThermostatSetpoint)
             return float(device.properties.value)
         return None
 
@@ -325,6 +331,8 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
         """Return the temperature we try to reach."""
         if self._target_temp_device:
             device = self._target_temp_device.fibaro_device
+            if device.properties.heatingThermostatSetpointFuture:
+                return float(device.properties.heatingThermostatSetpointFuture)
             return float(device.properties.targetLevel)
         return None
 
@@ -335,5 +343,7 @@ class FibaroThermostat(FibaroDevice, ClimateEntity):
         if temperature is not None:
             if "setThermostatSetpoint" in target.fibaro_device.actions:
                 target.action("setThermostatSetpoint", self.fibaro_op_mode, temperature)
+            elif "setHeatingThermostatSetpoint" in target.fibaro_device.actions:
+                target.action("setHeatingThermostatSetpoint", temperature)
             else:
                 target.action("setTargetLevel", temperature)
diff --git a/homeassistant/components/fibaro/cover.py b/homeassistant/components/fibaro/cover.py
index 943df5b5681..6c6c6ddfe1f 100644
--- a/homeassistant/components/fibaro/cover.py
+++ b/homeassistant/components/fibaro/cover.py
@@ -1,6 +1,4 @@
 """Support for Fibaro cover - curtains, rollershutters etc."""
-import logging
-
 from homeassistant.components.cover import (
     ATTR_POSITION,
     ATTR_TILT_POSITION,
@@ -10,8 +8,6 @@ from homeassistant.components.cover import (
 
 from . import FIBARO_DEVICES, FibaroDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fibaro covers."""
diff --git a/homeassistant/components/fibaro/light.py b/homeassistant/components/fibaro/light.py
index f73347cf356..6dc69df1343 100644
--- a/homeassistant/components/fibaro/light.py
+++ b/homeassistant/components/fibaro/light.py
@@ -1,7 +1,6 @@
 """Support for Fibaro lights."""
 import asyncio
 from functools import partial
-import logging
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
@@ -18,8 +17,6 @@ import homeassistant.util.color as color_util
 
 from . import CONF_COLOR, CONF_DIMMING, CONF_RESET_COLOR, FIBARO_DEVICES, FibaroDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def scaleto255(value):
     """Scale the input value from 0-100 to 0-255."""
diff --git a/homeassistant/components/fibaro/lock.py b/homeassistant/components/fibaro/lock.py
index a0dd60d52fe..17c16a566db 100644
--- a/homeassistant/components/fibaro/lock.py
+++ b/homeassistant/components/fibaro/lock.py
@@ -1,12 +1,8 @@
 """Support for Fibaro locks."""
-import logging
-
 from homeassistant.components.lock import DOMAIN, LockEntity
 
 from . import FIBARO_DEVICES, FibaroDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fibaro locks."""
diff --git a/homeassistant/components/fibaro/scene.py b/homeassistant/components/fibaro/scene.py
index 714f019168d..d1232468620 100644
--- a/homeassistant/components/fibaro/scene.py
+++ b/homeassistant/components/fibaro/scene.py
@@ -1,13 +1,10 @@
 """Support for Fibaro scenes."""
-import logging
 from typing import Any
 
 from homeassistant.components.scene import Scene
 
 from . import FIBARO_DEVICES, FibaroDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Perform the setup for Fibaro scenes."""
diff --git a/homeassistant/components/fibaro/sensor.py b/homeassistant/components/fibaro/sensor.py
index 3c812970022..4e9af8803f2 100644
--- a/homeassistant/components/fibaro/sensor.py
+++ b/homeassistant/components/fibaro/sensor.py
@@ -1,6 +1,4 @@
 """Support for Fibaro sensors."""
-import logging
-
 from homeassistant.components.sensor import DOMAIN
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_MILLION,
@@ -39,8 +37,6 @@ SENSOR_TYPES = {
     "com.fibaro.lightSensor": ["Light", LIGHT_LUX, None, DEVICE_CLASS_ILLUMINANCE],
 }
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fibaro controller devices."""
diff --git a/homeassistant/components/fibaro/switch.py b/homeassistant/components/fibaro/switch.py
index a38f642775f..331d6b8fc95 100644
--- a/homeassistant/components/fibaro/switch.py
+++ b/homeassistant/components/fibaro/switch.py
@@ -1,13 +1,9 @@
 """Support for Fibaro switches."""
-import logging
-
 from homeassistant.components.switch import DOMAIN, SwitchEntity
 from homeassistant.util import convert
 
 from . import FIBARO_DEVICES, FibaroDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Fibaro switches."""
diff --git a/homeassistant/components/file/notify.py b/homeassistant/components/file/notify.py
index 528d44bbb83..35c8ebf7df6 100644
--- a/homeassistant/components/file/notify.py
+++ b/homeassistant/components/file/notify.py
@@ -1,5 +1,4 @@
 """Support for file notification."""
-import logging
 import os
 
 import voluptuous as vol
@@ -23,8 +22,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     }
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def get_service(hass, config, discovery_info=None):
     """Get the file notification service."""
diff --git a/homeassistant/components/filesize/sensor.py b/homeassistant/components/filesize/sensor.py
index 63042ec6292..27122a3cb9c 100644
--- a/homeassistant/components/filesize/sensor.py
+++ b/homeassistant/components/filesize/sensor.py
@@ -78,12 +78,11 @@ class Filesize(Entity):
     @property
     def device_state_attributes(self):
         """Return other details about the sensor state."""
-        attr = {
+        return {
             "path": self._path,
             "last_updated": self._last_updated,
             "bytes": self._size,
         }
-        return attr
 
     @property
     def unit_of_measurement(self):
diff --git a/homeassistant/components/filter/sensor.py b/homeassistant/components/filter/sensor.py
index b0cc08bc945..f1b873d58a8 100644
--- a/homeassistant/components/filter/sensor.py
+++ b/homeassistant/components/filter/sensor.py
@@ -245,7 +245,7 @@ class SensorFilter(Entity):
 
             # Retrieve the largest window_size of each type
             if largest_window_items > 0:
-                filter_history = await self.hass.async_add_job(
+                filter_history = await self.hass.async_add_executor_job(
                     partial(
                         history.get_last_state_changes,
                         self.hass,
@@ -257,7 +257,7 @@ class SensorFilter(Entity):
                     history_list.extend(filter_history[self._entity])
             if largest_window_time > timedelta(seconds=0):
                 start = dt_util.utcnow() - largest_window_time
-                filter_history = await self.hass.async_add_job(
+                filter_history = await self.hass.async_add_executor_job(
                     partial(
                         history.state_changes_during_period,
                         self.hass,
@@ -319,8 +319,7 @@ class SensorFilter(Entity):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the sensor."""
-        state_attr = {ATTR_ENTITY_ID: self._entity}
-        return state_attr
+        return {ATTR_ENTITY_ID: self._entity}
 
 
 class FilterState:
diff --git a/homeassistant/components/fints/sensor.py b/homeassistant/components/fints/sensor.py
index d81f353c222..6cd62333a87 100644
--- a/homeassistant/components/fints/sensor.py
+++ b/homeassistant/components/fints/sensor.py
@@ -169,14 +169,6 @@ class FinTsAccount(Entity):
         self._balance: float = None
         self._currency: str = None
 
-    @property
-    def should_poll(self) -> bool:
-        """Return True.
-
-        Data needs to be polled from the bank servers.
-        """
-        return True
-
     def update(self) -> None:
         """Get the current balance and currency for the account."""
         bank = self._client.client
@@ -229,14 +221,6 @@ class FinTsHoldingsAccount(Entity):
         self._holdings = []
         self._total: float = None
 
-    @property
-    def should_poll(self) -> bool:
-        """Return True.
-
-        Data needs to be polled from the bank servers.
-        """
-        return True
-
     def update(self) -> None:
         """Get the current holdings for the account."""
         bank = self._client.client
diff --git a/homeassistant/components/firmata/strings.json b/homeassistant/components/firmata/strings.json
index 68d7ae8c041..90e62325c2a 100644
--- a/homeassistant/components/firmata/strings.json
+++ b/homeassistant/components/firmata/strings.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "cannot_connect": "Cannot connect to Firmata board during setup"
+            "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
         },
         "step": {}
     }
diff --git a/homeassistant/components/firmata/translations/ca.json b/homeassistant/components/firmata/translations/ca.json
index 29a04d50b3e..cf210681e53 100644
--- a/homeassistant/components/firmata/translations/ca.json
+++ b/homeassistant/components/firmata/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "cannot_connect": "No s'ha pogut connectar a la placa Frimata durant la configuraci\u00f3"
+            "cannot_connect": "Ha fallat la connexi\u00f3"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/firmata/translations/cs.json b/homeassistant/components/firmata/translations/cs.json
new file mode 100644
index 00000000000..70f27aed901
--- /dev/null
+++ b/homeassistant/components/firmata/translations/cs.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/firmata/translations/en.json b/homeassistant/components/firmata/translations/en.json
index 39ea716d975..03668c055d8 100644
--- a/homeassistant/components/firmata/translations/en.json
+++ b/homeassistant/components/firmata/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "cannot_connect": "Cannot connect to Firmata board during setup"
+            "cannot_connect": "Failed to connect"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/firmata/translations/es.json b/homeassistant/components/firmata/translations/es.json
index 3cd5b23ceb6..b36b168f0f3 100644
--- a/homeassistant/components/firmata/translations/es.json
+++ b/homeassistant/components/firmata/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "cannot_connect": "No se ha podido conectar a la placa Firmata durante la configuraci\u00f3n"
+            "cannot_connect": "No se pudo conectar"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/firmata/translations/et.json b/homeassistant/components/firmata/translations/et.json
new file mode 100644
index 00000000000..d71a861b6b5
--- /dev/null
+++ b/homeassistant/components/firmata/translations/et.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/firmata/translations/it.json b/homeassistant/components/firmata/translations/it.json
index 79c4a093140..6c2460ab0b2 100644
--- a/homeassistant/components/firmata/translations/it.json
+++ b/homeassistant/components/firmata/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "cannot_connect": "Impossibile connettersi alla scheda Firmata durante la configurazione"
+            "cannot_connect": "Impossibile connettersi"
         },
         "step": {
             "one": "uno",
diff --git a/homeassistant/components/firmata/translations/lb.json b/homeassistant/components/firmata/translations/lb.json
new file mode 100644
index 00000000000..32098e684df
--- /dev/null
+++ b/homeassistant/components/firmata/translations/lb.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "Feeler beim verbannen"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/firmata/translations/no.json b/homeassistant/components/firmata/translations/no.json
index e1e5c8f1ea4..7b9495ee1b6 100644
--- a/homeassistant/components/firmata/translations/no.json
+++ b/homeassistant/components/firmata/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "cannot_connect": "Kan ikke koble til Firmata Board under installasjonen"
+            "cannot_connect": "Tilkobling mislyktes"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/firmata/translations/pl.json b/homeassistant/components/firmata/translations/pl.json
new file mode 100644
index 00000000000..4bf2618f9ff
--- /dev/null
+++ b/homeassistant/components/firmata/translations/pl.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+        },
+        "step": {
+            "few": "kilka",
+            "many": "wiele",
+            "one": "jeden",
+            "other": "inne"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/firmata/translations/ru.json b/homeassistant/components/firmata/translations/ru.json
index 64737774a2d..6bea2885a8e 100644
--- a/homeassistant/components/firmata/translations/ru.json
+++ b/homeassistant/components/firmata/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u043f\u043b\u0430\u0442\u0435 Firmata \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/firmata/translations/zh-Hant.json b/homeassistant/components/firmata/translations/zh-Hant.json
index d86ad56653c..d587eaf5ab2 100644
--- a/homeassistant/components/firmata/translations/zh-Hant.json
+++ b/homeassistant/components/firmata/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "cannot_connect": "\u65bc\u8a2d\u5b9a\u671f\u9593\uff0c\u7121\u6cd5\u9023\u7dda\u81f3 Firmata \u677f"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/flick_electric/strings.json b/homeassistant/components/flick_electric/strings.json
index d3d1a9d3bdf..a37a803fb6a 100644
--- a/homeassistant/components/flick_electric/strings.json
+++ b/homeassistant/components/flick_electric/strings.json
@@ -13,12 +13,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "That account is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/flick_electric/translations/ca.json b/homeassistant/components/flick_electric/translations/ca.json
index f4eb1bffd45..5bc9684d3b2 100644
--- a/homeassistant/components/flick_electric/translations/ca.json
+++ b/homeassistant/components/flick_electric/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest compte ja est\u00e0 configurat"
+            "already_configured": "El compte ja ha estat configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/flick_electric/translations/cs.json b/homeassistant/components/flick_electric/translations/cs.json
index 338ff5d9a44..bf5db1bd68f 100644
--- a/homeassistant/components/flick_electric/translations/cs.json
+++ b/homeassistant/components/flick_electric/translations/cs.json
@@ -1,12 +1,22 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ihla\u0161ovac\u00ed \u00fadaje k Flick"
             }
         }
-    }
+    },
+    "title": "Flick Electric"
 }
\ No newline at end of file
diff --git a/homeassistant/components/flick_electric/translations/en.json b/homeassistant/components/flick_electric/translations/en.json
index eb1ce7f296d..4a3e4c8fbe6 100644
--- a/homeassistant/components/flick_electric/translations/en.json
+++ b/homeassistant/components/flick_electric/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "That account is already configured"
+            "already_configured": "Account is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/flick_electric/translations/es.json b/homeassistant/components/flick_electric/translations/es.json
index d230ba2ba4f..3642dd0b4d5 100644
--- a/homeassistant/components/flick_electric/translations/es.json
+++ b/homeassistant/components/flick_electric/translations/es.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Esa cuenta ya est\u00e1 configurada"
+            "already_configured": "La cuenta ya ha sido configurada"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo",
+            "cannot_connect": "No se pudo conectar",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "unknown": "Error inesperado"
         },
diff --git a/homeassistant/components/flick_electric/translations/et.json b/homeassistant/components/flick_electric/translations/et.json
new file mode 100644
index 00000000000..11f5060ff69
--- /dev/null
+++ b/homeassistant/components/flick_electric/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/flick_electric/translations/it.json b/homeassistant/components/flick_electric/translations/it.json
index 4adec6d5f69..a955849183a 100644
--- a/homeassistant/components/flick_electric/translations/it.json
+++ b/homeassistant/components/flick_electric/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo account \u00e8 gi\u00e0 configurato."
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/flick_electric/translations/nl.json b/homeassistant/components/flick_electric/translations/nl.json
index c4901d328c3..f252147c776 100644
--- a/homeassistant/components/flick_electric/translations/nl.json
+++ b/homeassistant/components/flick_electric/translations/nl.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Account is al geconfigureerd"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/flick_electric/translations/no.json b/homeassistant/components/flick_electric/translations/no.json
index 706ab084901..604d48a738f 100644
--- a/homeassistant/components/flick_electric/translations/no.json
+++ b/homeassistant/components/flick_electric/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne kontoen er allerede konfigurert"
+            "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
@@ -20,5 +20,5 @@
             }
         }
     },
-    "title": "Flick Electric"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/flick_electric/translations/pl.json b/homeassistant/components/flick_electric/translations/pl.json
index 19c319a366b..1c7d565d232 100644
--- a/homeassistant/components/flick_electric/translations/pl.json
+++ b/homeassistant/components/flick_electric/translations/pl.json
@@ -4,7 +4,7 @@
             "already_configured": "Konto jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/flick_electric/translations/ru.json b/homeassistant/components/flick_electric/translations/ru.json
index 1f88596bfc0..5883c386696 100644
--- a/homeassistant/components/flick_electric/translations/ru.json
+++ b/homeassistant/components/flick_electric/translations/ru.json
@@ -4,7 +4,7 @@
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/flick_electric/translations/sv.json b/homeassistant/components/flick_electric/translations/sv.json
new file mode 100644
index 00000000000..23c825f256f
--- /dev/null
+++ b/homeassistant/components/flick_electric/translations/sv.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "Anv\u00e4ndarnamn"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/flick_electric/translations/zh-Hant.json b/homeassistant/components/flick_electric/translations/zh-Hant.json
index 0f88c07cdaa..9e7b29b4893 100644
--- a/homeassistant/components/flick_electric/translations/zh-Hant.json
+++ b/homeassistant/components/flick_electric/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/flo/binary_sensor.py b/homeassistant/components/flo/binary_sensor.py
index 4af91a8ef77..a8bac498674 100644
--- a/homeassistant/components/flo/binary_sensor.py
+++ b/homeassistant/components/flo/binary_sensor.py
@@ -36,12 +36,13 @@ class FloPendingAlertsBinarySensor(FloEntity, BinarySensorEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {}
-        if self._device.has_alerts:
-            attr["info"] = self._device.pending_info_alerts_count
-            attr["warning"] = self._device.pending_warning_alerts_count
-            attr["critical"] = self._device.pending_critical_alerts_count
-        return attr
+        if not self._device.has_alerts:
+            return {}
+        return {
+            "info": self._device.pending_info_alerts_count,
+            "warning": self._device.pending_warning_alerts_count,
+            "critical": self._device.pending_critical_alerts_count,
+        }
 
     @property
     def device_class(self):
diff --git a/homeassistant/components/flo/translations/cs.json b/homeassistant/components/flo/translations/cs.json
new file mode 100644
index 00000000000..bbb0d3bfe65
--- /dev/null
+++ b/homeassistant/components/flo/translations/cs.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Hostitel",
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            }
+        }
+    },
+    "title": "flo"
+}
\ No newline at end of file
diff --git a/homeassistant/components/flo/translations/et.json b/homeassistant/components/flo/translations/et.json
new file mode 100644
index 00000000000..b926ea91669
--- /dev/null
+++ b/homeassistant/components/flo/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/flo/translations/nl.json b/homeassistant/components/flo/translations/nl.json
index 4d00f0bfc74..c4901d328c3 100644
--- a/homeassistant/components/flo/translations/nl.json
+++ b/homeassistant/components/flo/translations/nl.json
@@ -3,6 +3,7 @@
         "step": {
             "user": {
                 "data": {
+                    "password": "Wachtwoord",
                     "username": "Gebruikersnaam"
                 }
             }
diff --git a/homeassistant/components/flo/translations/no.json b/homeassistant/components/flo/translations/no.json
index d02310c9215..bf7f9170872 100644
--- a/homeassistant/components/flo/translations/no.json
+++ b/homeassistant/components/flo/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
@@ -18,5 +18,5 @@
             }
         }
     },
-    "title": "Flo"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/flo/translations/pl.json b/homeassistant/components/flo/translations/pl.json
index 25dab56796c..561b45d65b1 100644
--- a/homeassistant/components/flo/translations/pl.json
+++ b/homeassistant/components/flo/translations/pl.json
@@ -17,5 +17,6 @@
                 }
             }
         }
-    }
+    },
+    "title": "Flo"
 }
\ No newline at end of file
diff --git a/homeassistant/components/flo/translations/zh-Hans.json b/homeassistant/components/flo/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/flo/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/flume/sensor.py b/homeassistant/components/flume/sensor.py
index 596bf5a0b8b..6b19c9c5476 100644
--- a/homeassistant/components/flume/sensor.py
+++ b/homeassistant/components/flume/sensor.py
@@ -16,8 +16,11 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.entity import Entity
-from homeassistant.util import Throttle
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+    UpdateFailed,
+)
 
 from .const import (
     DEFAULT_NAME,
@@ -88,12 +91,13 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             http_session=http_session,
         )
 
-        flume_data = FlumeSensorData(flume_device)
+        coordinator = _create_flume_device_coordinator(hass, flume_device)
 
         for flume_query_sensor in FLUME_QUERIES_SENSOR.items():
             flume_entity_list.append(
                 FlumeSensor(
-                    flume_data,
+                    coordinator,
+                    flume_device,
                     flume_query_sensor,
                     f"{device_friendly_name} {flume_query_sensor[1]['friendly_name']}",
                     device_id,
@@ -104,17 +108,16 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         async_add_entities(flume_entity_list)
 
 
-class FlumeSensor(Entity):
+class FlumeSensor(CoordinatorEntity):
     """Representation of the Flume sensor."""
 
-    def __init__(self, flume_data, flume_query_sensor, name, device_id):
+    def __init__(self, coordinator, flume_device, flume_query_sensor, name, device_id):
         """Initialize the Flume sensor."""
-        self._flume_data = flume_data
+        super().__init__(coordinator)
+        self._flume_device = flume_device
         self._flume_query_sensor = flume_query_sensor
         self._name = name
         self._device_id = device_id
-        self._undo_track_sensor = None
-        self._available = self._flume_data.available
         self._state = None
 
     @property
@@ -135,7 +138,11 @@ class FlumeSensor(Entity):
     @property
     def state(self):
         """Return the state of the sensor."""
-        return self._state
+        sensor_key = self._flume_query_sensor[0]
+        if sensor_key not in self._flume_device.values:
+            return None
+
+        return _format_state_value(self._flume_device.values[sensor_key])
 
     @property
     def unit_of_measurement(self):
@@ -143,64 +150,47 @@ class FlumeSensor(Entity):
         # This is in gallons per SCAN_INTERVAL
         return self._flume_query_sensor[1]["unit_of_measurement"]
 
-    @property
-    def available(self):
-        """Device is available."""
-        return self._available
-
     @property
     def unique_id(self):
         """Flume query and Device unique ID."""
         return f"{self._flume_query_sensor[0]}_{self._device_id}"
 
-    def update(self):
-        """Get the latest data and updates the states."""
-
-        def format_state_value(value):
-            return round(value, 1) if isinstance(value, Number) else None
-
-        self._flume_data.update()
-        self._state = format_state_value(
-            self._flume_data.flume_device.values[self._flume_query_sensor[0]]
-        )
-        _LOGGER.debug(
-            "Updating sensor: '%s', value: '%s'",
-            self._name,
-            self._flume_data.flume_device.values[self._flume_query_sensor[0]],
-        )
-        self._available = self._flume_data.available
-
     async def async_added_to_hass(self):
         """Request an update when added."""
-        # We do ask for an update with async_add_entities()
+        await super().async_added_to_hass()
+        # We do not ask for an update with async_add_entities()
         # because it will update disabled entities
-        self.async_schedule_update_ha_state()
+        await self.coordinator.async_request_refresh()
 
 
-class FlumeSensorData:
-    """Get the latest data and update the states."""
+def _format_state_value(value):
+    return round(value, 1) if isinstance(value, Number) else None
 
-    def __init__(self, flume_device):
-        """Initialize the data object."""
-        self.flume_device = flume_device
-        self.available = True
 
-    @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    def update(self):
+def _create_flume_device_coordinator(hass, flume_device):
+    """Create a data coordinator for the flume device."""
+
+    async def _async_update_data():
         """Get the latest data from the Flume."""
         _LOGGER.debug("Updating Flume data")
         try:
-            self.flume_device.update_force()
+            await hass.async_add_executor_job(flume_device.update_force)
         except Exception as ex:  # pylint: disable=broad-except
-            if self.available:
-                _LOGGER.error("Update of Flume data failed: %s", ex)
-            self.available = False
-            return
-        self.available = True
+            raise UpdateFailed(f"Error communicating with flume API: {ex}") from ex
         _LOGGER.debug(
             "Flume update details: %s",
             {
-                "values": self.flume_device.values,
-                "query_payload": self.flume_device.query_payload,
+                "values": flume_device.values,
+                "query_payload": flume_device.query_payload,
             },
         )
+
+    return DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        # Name of the data. For logging purposes.
+        name=flume_device.device_id,
+        update_method=_async_update_data,
+        # Polling interval. Will only be polled if there are subscribers.
+        update_interval=SCAN_INTERVAL,
+    )
diff --git a/homeassistant/components/flume/strings.json b/homeassistant/components/flume/strings.json
index 039b0d11d72..67b4a95d069 100644
--- a/homeassistant/components/flume/strings.json
+++ b/homeassistant/components/flume/strings.json
@@ -1,9 +1,9 @@
 {
   "config": {
     "error": {
-      "unknown": "Unexpected error",
-      "invalid_auth": "Invalid authentication",
-      "cannot_connect": "Failed to connect, please try again"
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "step": {
       "user": {
@@ -18,7 +18,7 @@
       }
     },
     "abort": {
-      "already_configured": "This account is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/flume/translations/ca.json b/homeassistant/components/flume/translations/ca.json
index 71ee4fd2345..e612b29db67 100644
--- a/homeassistant/components/flume/translations/ca.json
+++ b/homeassistant/components/flume/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest compte ja est\u00e0 configurat"
+            "already_configured": "El compte ja ha estat configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/flume/translations/cs.json b/homeassistant/components/flume/translations/cs.json
index 338ff5d9a44..23aa89e12f2 100644
--- a/homeassistant/components/flume/translations/cs.json
+++ b/homeassistant/components/flume/translations/cs.json
@@ -1,11 +1,21 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
+                    "client_id": "ID klienta",
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k \u00fa\u010dtu Flume"
             }
         }
     }
diff --git a/homeassistant/components/flume/translations/en.json b/homeassistant/components/flume/translations/en.json
index ed24c552d8f..ac7d4335903 100644
--- a/homeassistant/components/flume/translations/en.json
+++ b/homeassistant/components/flume/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This account is already configured"
+            "already_configured": "Account is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/flume/translations/es.json b/homeassistant/components/flume/translations/es.json
index cf872da6de3..0ff805a3591 100644
--- a/homeassistant/components/flume/translations/es.json
+++ b/homeassistant/components/flume/translations/es.json
@@ -4,7 +4,7 @@
             "already_configured": "Esta cuenta ya est\u00e1 configurada"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo",
+            "cannot_connect": "No se pudo conectar",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "unknown": "Error inesperado"
         },
diff --git a/homeassistant/components/flume/translations/et.json b/homeassistant/components/flume/translations/et.json
new file mode 100644
index 00000000000..6055d02a4d0
--- /dev/null
+++ b/homeassistant/components/flume/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/flume/translations/it.json b/homeassistant/components/flume/translations/it.json
index 6d9974f9481..43b82331840 100644
--- a/homeassistant/components/flume/translations/it.json
+++ b/homeassistant/components/flume/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo account \u00e8 gi\u00e0 configurato."
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/flume/translations/no.json b/homeassistant/components/flume/translations/no.json
index 785f392a255..78dd7e40217 100644
--- a/homeassistant/components/flume/translations/no.json
+++ b/homeassistant/components/flume/translations/no.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne kontoen er allerede konfigurert"
+            "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
         "step": {
             "user": {
                 "data": {
-                    "client_id": "klient-ID",
+                    "client_id": "Klient-ID",
                     "client_secret": "Klienthemmelighet",
                     "password": "Passord",
                     "username": "Brukernavn"
diff --git a/homeassistant/components/flume/translations/pl.json b/homeassistant/components/flume/translations/pl.json
index f899b1446a6..a9ff9bcfd04 100644
--- a/homeassistant/components/flume/translations/pl.json
+++ b/homeassistant/components/flume/translations/pl.json
@@ -4,7 +4,7 @@
             "already_configured": "Konto jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/flume/translations/ru.json b/homeassistant/components/flume/translations/ru.json
index 0ed6e839227..f35579c2dee 100644
--- a/homeassistant/components/flume/translations/ru.json
+++ b/homeassistant/components/flume/translations/ru.json
@@ -4,7 +4,7 @@
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/flume/translations/zh-Hans.json b/homeassistant/components/flume/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/flume/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/flume/translations/zh-Hant.json b/homeassistant/components/flume/translations/zh-Hant.json
index cc7dea80e52..7a585b1b618 100644
--- a/homeassistant/components/flume/translations/zh-Hant.json
+++ b/homeassistant/components/flume/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/flunearyou/config_flow.py b/homeassistant/components/flunearyou/config_flow.py
index 0a55a21f6ed..9918858fd93 100644
--- a/homeassistant/components/flunearyou/config_flow.py
+++ b/homeassistant/components/flunearyou/config_flow.py
@@ -53,8 +53,6 @@ class FluNearYouFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             )
         except FluNearYouError as err:
             LOGGER.error("Error while configuring integration: %s", err)
-            return self.async_show_form(
-                step_id="user", errors={"base": "general_error"}
-            )
+            return self.async_show_form(step_id="user", errors={"base": "unknown"})
 
         return self.async_create_entry(title=unique_id, data=user_input)
diff --git a/homeassistant/components/flunearyou/strings.json b/homeassistant/components/flunearyou/strings.json
index 2a7e59989b0..5736b266e6c 100644
--- a/homeassistant/components/flunearyou/strings.json
+++ b/homeassistant/components/flunearyou/strings.json
@@ -4,12 +4,17 @@
       "user": {
         "title": "Configure Flu Near You",
         "description": "Monitor user-based and CDC repots for a pair of coordinates.",
-        "data": { "latitude": "Latitude", "longitude": "Longitude" }
+        "data": {
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]"
+        }
       }
     },
-    "error": { "general_error": "There was an unknown error." },
+    "error": {
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
     "abort": {
-      "already_configured": "These coordinates are already registered."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/homeassistant/components/flunearyou/translations/ca.json b/homeassistant/components/flunearyou/translations/ca.json
index c26c1f55b2c..e61856a6601 100644
--- a/homeassistant/components/flunearyou/translations/ca.json
+++ b/homeassistant/components/flunearyou/translations/ca.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Les coordenades ja estan registrades"
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada"
         },
         "error": {
-            "general_error": "S'ha produ\u00eft un error desconegut."
+            "general_error": "S'ha produ\u00eft un error desconegut.",
+            "unknown": "Error inesperat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/flunearyou/translations/cs.json b/homeassistant/components/flunearyou/translations/cs.json
new file mode 100644
index 00000000000..3d9f981c65a
--- /dev/null
+++ b/homeassistant/components/flunearyou/translations/cs.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "general_error": "Do\u0161lo k nezn\u00e1m\u00e9 chyb\u011b.",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
+                    "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka"
+                },
+                "title": "Nastaven\u00ed Flu Near You"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/flunearyou/translations/en.json b/homeassistant/components/flunearyou/translations/en.json
index 88997a89c90..d94d5c771f4 100644
--- a/homeassistant/components/flunearyou/translations/en.json
+++ b/homeassistant/components/flunearyou/translations/en.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "These coordinates are already registered."
+            "already_configured": "Location is already configured"
         },
         "error": {
-            "general_error": "There was an unknown error."
+            "general_error": "There was an unknown error.",
+            "unknown": "Unexpected error"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/flunearyou/translations/es.json b/homeassistant/components/flunearyou/translations/es.json
index cdaa475037d..c7306db4ec7 100644
--- a/homeassistant/components/flunearyou/translations/es.json
+++ b/homeassistant/components/flunearyou/translations/es.json
@@ -4,7 +4,8 @@
             "already_configured": "Estas coordenadas ya est\u00e1n registradas."
         },
         "error": {
-            "general_error": "Se ha producido un error desconocido."
+            "general_error": "Se ha producido un error desconocido.",
+            "unknown": "Error inesperado"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/flunearyou/translations/et.json b/homeassistant/components/flunearyou/translations/et.json
index aae3ef835bb..1f745801393 100644
--- a/homeassistant/components/flunearyou/translations/et.json
+++ b/homeassistant/components/flunearyou/translations/et.json
@@ -1,5 +1,12 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Asukoht on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "general_error": "Tekkis tundmatu viga.",
+            "unknown": "Tundmatu viga"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/flunearyou/translations/it.json b/homeassistant/components/flunearyou/translations/it.json
index fc90199664e..1f46a5e140f 100644
--- a/homeassistant/components/flunearyou/translations/it.json
+++ b/homeassistant/components/flunearyou/translations/it.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Queste coordinate sono gi\u00e0 registrate."
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata"
         },
         "error": {
-            "general_error": "Si \u00e8 verificato un errore sconosciuto."
+            "general_error": "Si \u00e8 verificato un errore sconosciuto.",
+            "unknown": "Errore imprevisto"
         },
         "step": {
             "user": {
@@ -12,7 +13,7 @@
                     "latitude": "Latitudine",
                     "longitude": "Logitudine"
                 },
-                "description": "Monitorare i repot basati su utenti e CDC per una coppia di coordinate.",
+                "description": "Monitorare i rapporti basati su utenti e quelli della CDC per una coppia di coordinate.",
                 "title": "Configurare Flu Near You"
             }
         }
diff --git a/homeassistant/components/flunearyou/translations/lb.json b/homeassistant/components/flunearyou/translations/lb.json
index 2692e9219e9..d71fc49be1e 100644
--- a/homeassistant/components/flunearyou/translations/lb.json
+++ b/homeassistant/components/flunearyou/translations/lb.json
@@ -4,7 +4,8 @@
             "already_configured": "D\u00ebs Koordinate si scho registr\u00e9iert"
         },
         "error": {
-            "general_error": "Onbekannten Feeler"
+            "general_error": "Onbekannten Feeler",
+            "unknown": "Onerwaarte Feeler"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/flunearyou/translations/no.json b/homeassistant/components/flunearyou/translations/no.json
index 3b8a17163dc..94fed823761 100644
--- a/homeassistant/components/flunearyou/translations/no.json
+++ b/homeassistant/components/flunearyou/translations/no.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Disse koordinatene er allerede registrert."
+            "already_configured": "Plasseringen er allerede konfigurert"
         },
         "error": {
-            "general_error": "Det oppstod en ukjent feil."
+            "general_error": "Det oppstod en ukjent feil.",
+            "unknown": "Uventet feil"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/flunearyou/translations/pl.json b/homeassistant/components/flunearyou/translations/pl.json
index cde9f39c3f9..47fcf5b5777 100644
--- a/homeassistant/components/flunearyou/translations/pl.json
+++ b/homeassistant/components/flunearyou/translations/pl.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Wsp\u00f3\u0142rz\u0119dne s\u0105 ju\u017c zarejestrowane."
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
         },
         "error": {
-            "general_error": "Nieoczekiwany b\u0142\u0105d"
+            "general_error": "Nieoczekiwany b\u0142\u0105d",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "user": {
@@ -12,7 +13,7 @@
                     "latitude": "Szeroko\u015b\u0107 geograficzna",
                     "longitude": "D\u0142ugo\u015b\u0107 geograficzna"
                 },
-                "description": "Monitoruj repoty oparte na u\u017cytkownikach i CDC dla pary wsp\u00f3\u0142rz\u0119dnych.",
+                "description": "Monitoruj raporty oparte na u\u017cytkownikach i CDC dla pary wsp\u00f3\u0142rz\u0119dnych.",
                 "title": "Skonfiguruj Flu Near You"
             }
         }
diff --git a/homeassistant/components/flunearyou/translations/ru.json b/homeassistant/components/flunearyou/translations/ru.json
index b4ff15d4044..e7d56ae1323 100644
--- a/homeassistant/components/flunearyou/translations/ru.json
+++ b/homeassistant/components/flunearyou/translations/ru.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u044b \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
-            "general_error": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+            "general_error": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/flunearyou/translations/zh-Hant.json b/homeassistant/components/flunearyou/translations/zh-Hant.json
index b10552d0fe3..6b62857244e 100644
--- a/homeassistant/components/flunearyou/translations/zh-Hant.json
+++ b/homeassistant/components/flunearyou/translations/zh-Hant.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u4e9b\u5ea7\u6a19\u5df2\u8a3b\u518a\u3002"
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "general_error": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002"
+            "general_error": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/folder/sensor.py b/homeassistant/components/folder/sensor.py
index 19a5791d7cb..9a062133718 100644
--- a/homeassistant/components/folder/sensor.py
+++ b/homeassistant/components/folder/sensor.py
@@ -94,14 +94,13 @@ class Folder(Entity):
     @property
     def device_state_attributes(self):
         """Return other details about the sensor state."""
-        attr = {
+        return {
             "path": self._folder_path,
             "filter": self._filter_term,
             "number_of_files": self._number_of_files,
             "bytes": self._size,
             "file_list": self._file_list,
         }
-        return attr
 
     @property
     def unit_of_measurement(self):
diff --git a/homeassistant/components/forked_daapd/strings.json b/homeassistant/components/forked_daapd/strings.json
index 33f9c7b91aa..e3be0b6795d 100644
--- a/homeassistant/components/forked_daapd/strings.json
+++ b/homeassistant/components/forked_daapd/strings.json
@@ -6,7 +6,7 @@
         "title": "Set up forked-daapd device",
         "data": {
           "name": "Friendly name",
-          "host": "Host",
+          "host": "[%key:common::config_flow::data::host%]",
           "port": "API port",
           "password": "API password (leave blank if no password)"
         }
@@ -17,10 +17,10 @@
       "wrong_host_or_port": "Unable to connect. Please check host and port.",
       "wrong_password": "Incorrect password.",
       "wrong_server_type": "The forked-daapd integration requires a forked-daapd server with version >= 27.0.",
-      "unknown_error": "Unknown error."
+      "unknown_error": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "Device is already configured.",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "not_forked_daapd": "Device is not a forked-daapd server."
     }
   },
diff --git a/homeassistant/components/forked_daapd/translations/ca.json b/homeassistant/components/forked_daapd/translations/ca.json
index cf58af459f6..1b3792eeb1b 100644
--- a/homeassistant/components/forked_daapd/translations/ca.json
+++ b/homeassistant/components/forked_daapd/translations/ca.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositiu ja est\u00e0 configurat.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
             "not_forked_daapd": "El dispositiu no \u00e9s un servidor de forked-daapd."
         },
         "error": {
-            "unknown_error": "Error desconegut.",
+            "unknown_error": "Error inesperat",
             "websocket_not_enabled": "El websocket de forked-daapd no est\u00e0 activat.",
             "wrong_host_or_port": "No s'ha pogut connectar, verifica l'amfitri\u00f3 i el port.",
             "wrong_password": "Contrasenya incorrecta.",
diff --git a/homeassistant/components/forked_daapd/translations/cs.json b/homeassistant/components/forked_daapd/translations/cs.json
new file mode 100644
index 00000000000..602e5859ca1
--- /dev/null
+++ b/homeassistant/components/forked_daapd/translations/cs.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "not_forked_daapd": "Za\u0159\u00edzen\u00ed nen\u00ed server forked-daapd."
+        },
+        "error": {
+            "unknown_error": "Neo\u010dek\u00e1van\u00e1 chyba",
+            "wrong_password": "Nespr\u00e1vn\u00e9 heslo.",
+            "wrong_server_type": "Integrace forked-daapd vy\u017eaduje server forked-daapd s verz\u00ed >= 27.0."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Hostitel",
+                    "name": "Zobrazovan\u00e9 jm\u00e9no",
+                    "password": "Heslo API (ponechte pr\u00e1zdn\u00e9, pokud \u017e\u00e1dn\u00e9 heslo nen\u00ed)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/forked_daapd/translations/en.json b/homeassistant/components/forked_daapd/translations/en.json
index 0c87c6624ff..397836809da 100644
--- a/homeassistant/components/forked_daapd/translations/en.json
+++ b/homeassistant/components/forked_daapd/translations/en.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Device is already configured.",
+            "already_configured": "Device is already configured",
             "not_forked_daapd": "Device is not a forked-daapd server."
         },
         "error": {
-            "unknown_error": "Unknown error.",
+            "unknown_error": "Unexpected error",
             "websocket_not_enabled": "forked-daapd server websocket not enabled.",
             "wrong_host_or_port": "Unable to connect. Please check host and port.",
             "wrong_password": "Incorrect password.",
diff --git a/homeassistant/components/forked_daapd/translations/et.json b/homeassistant/components/forked_daapd/translations/et.json
new file mode 100644
index 00000000000..3e3952e4f67
--- /dev/null
+++ b/homeassistant/components/forked_daapd/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "unknown_error": "Tundmatu viga",
+            "wrong_password": "Vale salas\u00f5na."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/forked_daapd/translations/it.json b/homeassistant/components/forked_daapd/translations/it.json
index f6d4517c7e7..3f400e0edc5 100644
--- a/homeassistant/components/forked_daapd/translations/it.json
+++ b/homeassistant/components/forked_daapd/translations/it.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
             "not_forked_daapd": "Il dispositivo non \u00e8 un server forked-daapd."
         },
         "error": {
-            "unknown_error": "Errore sconosciuto.",
+            "unknown_error": "Errore imprevisto",
             "websocket_not_enabled": "websocket del server forked-daapd non abilitato.",
             "wrong_host_or_port": "Impossibile connettersi. Si prega di controllare host e porta.",
             "wrong_password": "Password errata",
diff --git a/homeassistant/components/forked_daapd/translations/lb.json b/homeassistant/components/forked_daapd/translations/lb.json
index daa19290219..f5ee557acf9 100644
--- a/homeassistant/components/forked_daapd/translations/lb.json
+++ b/homeassistant/components/forked_daapd/translations/lb.json
@@ -5,7 +5,7 @@
             "not_forked_daapd": "Apparat ass kee forked-daapd server."
         },
         "error": {
-            "unknown_error": "Onbekannten Feeler.",
+            "unknown_error": "Onerwaarte Feeler",
             "websocket_not_enabled": "forked-daapd server websocket net aktiv.",
             "wrong_host_or_port": "Feeler beim verbannen, iwwerpr\u00e9if w.e.g d'Adresse a Port.",
             "wrong_password": "Ong\u00ebltegt Passwuert.",
diff --git a/homeassistant/components/forked_daapd/translations/no.json b/homeassistant/components/forked_daapd/translations/no.json
index ac58ddf9639..4b3a0dfd87d 100644
--- a/homeassistant/components/forked_daapd/translations/no.json
+++ b/homeassistant/components/forked_daapd/translations/no.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Enheten er allerede konfigurert.",
+            "already_configured": "Enheten er allerede konfigurert",
             "not_forked_daapd": "Enheten er ikke en forked-daapd-server."
         },
         "error": {
-            "unknown_error": "Ukjent feil.",
+            "unknown_error": "Uventet feil",
             "websocket_not_enabled": "websocket for forked-daapd server ikke aktivert.",
             "wrong_host_or_port": "Kan ikke koble til. Vennligst sjekk vert og port.",
             "wrong_password": "Feil passord.",
             "wrong_server_type": "Forked-daapd integrasjon krever en gaffel-daapd server med versjon \"= 27.0."
         },
-        "flow_title": "forked-daapd-server: {name} ( {host} )",
+        "flow_title": "",
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/forked_daapd/translations/pl.json b/homeassistant/components/forked_daapd/translations/pl.json
index 7f17565c2cd..3b28e79803c 100644
--- a/homeassistant/components/forked_daapd/translations/pl.json
+++ b/homeassistant/components/forked_daapd/translations/pl.json
@@ -1,13 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "not_forked_daapd": "Urz\u0105dzenie nie jest serwerem forked-daapd"
         },
         "error": {
-            "unknown_error": "Nieznany b\u0142\u0105d.",
+            "unknown_error": "Nieoczekiwany b\u0142\u0105d",
+            "websocket_not_enabled": "Websocket serwera forked-daapd nie jest w\u0142\u0105czony",
             "wrong_host_or_port": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia. Sprawd\u017a adres hosta i port.",
-            "wrong_password": "Nieprawid\u0142owe has\u0142o"
+            "wrong_password": "Nieprawid\u0142owe has\u0142o",
+            "wrong_server_type": "Integracja forked-daapd wymaga serwera forked-daapd w wersji >= 27.0"
         },
+        "flow_title": "Serwer forked-daapd: {name} ( {host})",
         "step": {
             "user": {
                 "data": {
@@ -15,7 +19,22 @@
                     "name": "Przyjazna nazwa",
                     "password": "Has\u0142o API (pozostaw puste, je\u015bli nie ma has\u0142a)",
                     "port": "Port API"
-                }
+                },
+                "title": "Skonfiguruj urz\u0105dzenie forked-daapd"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "librespot_java_port": "Numer portu do kontroli librespot-java (je\u015bli jest u\u017cywany)",
+                    "max_playlists": "Maksymalna liczba list odtwarzania u\u017cywanych jako \u017ar\u00f3d\u0142a",
+                    "tts_pause_time": "Przerwa przed i po TTS (w sekundach)",
+                    "tts_volume": "G\u0142o\u015bno\u015b\u0107 TTS (w zakresie od 0 do 1, np. 0.5 = 50%)"
+                },
+                "description": "Ustawianie r\u00f3\u017cnych opcji dla integracji forked-daapd",
+                "title": "Konfiguracja opcji forked-daapd"
             }
         }
     }
diff --git a/homeassistant/components/forked_daapd/translations/ru.json b/homeassistant/components/forked_daapd/translations/ru.json
index 89bd71cb041..d5111b8f286 100644
--- a/homeassistant/components/forked_daapd/translations/ru.json
+++ b/homeassistant/components/forked_daapd/translations/ru.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "not_forked_daapd": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435 \u0441\u0435\u0440\u0432\u0435\u0440 forked-daapd."
         },
         "error": {
-            "unknown_error": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
+            "unknown_error": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
             "websocket_not_enabled": "\u0412\u0435\u0431-\u0441\u043e\u043a\u0435\u0442 forked-daapd \u043d\u0435 \u0432\u043a\u043b\u044e\u0447\u0435\u043d.",
             "wrong_host_or_port": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0430\u0434\u0440\u0435\u0441 \u0445\u043e\u0441\u0442\u0430.",
             "wrong_password": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.",
diff --git a/homeassistant/components/forked_daapd/translations/sv.json b/homeassistant/components/forked_daapd/translations/sv.json
new file mode 100644
index 00000000000..80f45e2d887
--- /dev/null
+++ b/homeassistant/components/forked_daapd/translations/sv.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "port": "API port"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/forked_daapd/translations/zh-Hant.json b/homeassistant/components/forked_daapd/translations/zh-Hant.json
index ec51bbacea3..2dcced078ed 100644
--- a/homeassistant/components/forked_daapd/translations/zh-Hant.json
+++ b/homeassistant/components/forked_daapd/translations/zh-Hant.json
@@ -5,7 +5,7 @@
             "not_forked_daapd": "\u8a2d\u5099\u4e26\u975e forked-daapd \u4f3a\u670d\u5668\u3002"
         },
         "error": {
-            "unknown_error": "\u672a\u77e5\u932f\u8aa4\u3002",
+            "unknown_error": "\u672a\u9810\u671f\u932f\u8aa4",
             "websocket_not_enabled": "forked-daapd \u4f3a\u670d\u5668 websocket \u672a\u958b\u555f\u3002",
             "wrong_host_or_port": "\u7121\u6cd5\u9023\u7dda\uff0c\u8acb\u78ba\u8a8d\u4e3b\u6a5f\u8207\u901a\u8a0a\u57e0\u3002",
             "wrong_password": "\u5bc6\u78bc\u932f\u8aa4\u3002",
diff --git a/homeassistant/components/freebox/config_flow.py b/homeassistant/components/freebox/config_flow.py
index 0589dfb2ef1..d776c34c4f9 100644
--- a/homeassistant/components/freebox/config_flow.py
+++ b/homeassistant/components/freebox/config_flow.py
@@ -92,7 +92,7 @@ class FreeboxFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
         except HttpRequestError:
             _LOGGER.error("Error connecting to the Freebox router at %s", self._host)
-            errors["base"] = "connection_failed"
+            errors["base"] = "cannot_connect"
 
         except Exception:  # pylint: disable=broad-except
             _LOGGER.exception(
diff --git a/homeassistant/components/freebox/strings.json b/homeassistant/components/freebox/strings.json
index 2257e7bd908..cb48e5322de 100644
--- a/homeassistant/components/freebox/strings.json
+++ b/homeassistant/components/freebox/strings.json
@@ -15,7 +15,7 @@
     },
     "error": {
       "register_failed": "Failed to register, please try again",
-      "connection_failed": "[%key:common::config_flow::error::cannot_connect%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
diff --git a/homeassistant/components/freebox/translations/ca.json b/homeassistant/components/freebox/translations/ca.json
index d5be94be363..2568c3db0b4 100644
--- a/homeassistant/components/freebox/translations/ca.json
+++ b/homeassistant/components/freebox/translations/ca.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "connection_failed": "Ha fallat la connexi\u00f3",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "register_failed": "No s'ha pogut registrar, torna-ho a provar",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/freebox/translations/cs.json b/homeassistant/components/freebox/translations/cs.json
index 406bddd1a12..98d4258ee02 100644
--- a/homeassistant/components/freebox/translations/cs.json
+++ b/homeassistant/components/freebox/translations/cs.json
@@ -1,11 +1,23 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "register_failed": "Registrace se nezda\u0159ila, zkuste to pros\u00edm znovu",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
+            "link": {
+                "title": "Propojte router Freebox"
+            },
             "user": {
                 "data": {
                     "host": "Hostitel",
                     "port": "Port"
-                }
+                },
+                "title": "Freebox"
             }
         }
     }
diff --git a/homeassistant/components/freebox/translations/de.json b/homeassistant/components/freebox/translations/de.json
index cf18dce0870..c21e3c6b67f 100644
--- a/homeassistant/components/freebox/translations/de.json
+++ b/homeassistant/components/freebox/translations/de.json
@@ -4,7 +4,7 @@
             "already_configured": "Host bereits konfiguriert"
         },
         "error": {
-            "connection_failed": "Verbindung fehlgeschlagen, versuchen Sie es erneut",
+            "cannot_connect": "Verbindung fehlgeschlagen, versuchen Sie es erneut",
             "register_failed": "Registrieren fehlgeschlagen, bitte versuche es erneut",
             "unknown": "Unbekannter Fehler: Bitte versuchen Sie es sp\u00e4ter erneut"
         },
diff --git a/homeassistant/components/freebox/translations/en.json b/homeassistant/components/freebox/translations/en.json
index a0b5c98e72f..539cfbcfe1e 100644
--- a/homeassistant/components/freebox/translations/en.json
+++ b/homeassistant/components/freebox/translations/en.json
@@ -4,7 +4,7 @@
             "already_configured": "Device is already configured"
         },
         "error": {
-            "connection_failed": "Failed to connect",
+            "cannot_connect": "Failed to connect",
             "register_failed": "Failed to register, please try again",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/freebox/translations/es-419.json b/homeassistant/components/freebox/translations/es-419.json
index 01583551453..1c99bc8b472 100644
--- a/homeassistant/components/freebox/translations/es-419.json
+++ b/homeassistant/components/freebox/translations/es-419.json
@@ -4,7 +4,7 @@
             "already_configured": "Host ya configurado"
         },
         "error": {
-            "connection_failed": "No se pudo conectar, intente nuevamente",
+            "cannot_connect": "No se pudo conectar, intente nuevamente",
             "register_failed": "No se pudo registrar, intente de nuevo",
             "unknown": "Error desconocido: vuelva a intentarlo m\u00e1s tarde"
         },
diff --git a/homeassistant/components/freebox/translations/es.json b/homeassistant/components/freebox/translations/es.json
index 3c62f33c3be..45926ebc274 100644
--- a/homeassistant/components/freebox/translations/es.json
+++ b/homeassistant/components/freebox/translations/es.json
@@ -4,7 +4,7 @@
             "already_configured": "El host ya est\u00e1 configurado."
         },
         "error": {
-            "connection_failed": "No se ha podido conectar, por favor, int\u00e9ntalo de nuevo.",
+            "cannot_connect": "No se ha podido conectar, por favor, int\u00e9ntalo de nuevo.",
             "register_failed": "No se pudo registrar, int\u00e9ntalo de nuevo",
             "unknown": "Error desconocido: por favor, int\u00e9ntalo de nuevo m\u00e1s"
         },
diff --git a/homeassistant/components/freebox/translations/et.json b/homeassistant/components/freebox/translations/et.json
new file mode 100644
index 00000000000..aac3f2f0155
--- /dev/null
+++ b/homeassistant/components/freebox/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "register_failed": "\u00dchenduse loomine nurjus. Proovi uuesti",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                },
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/freebox/translations/fr.json b/homeassistant/components/freebox/translations/fr.json
index 135d8f4d465..f06cfed6cd7 100644
--- a/homeassistant/components/freebox/translations/fr.json
+++ b/homeassistant/components/freebox/translations/fr.json
@@ -4,7 +4,7 @@
             "already_configured": "H\u00f4te d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
-            "connection_failed": "Impossible de se connecter, veuillez r\u00e9essayer",
+            "cannot_connect": "Impossible de se connecter, veuillez r\u00e9essayer",
             "register_failed": "\u00c9chec de l'inscription, veuillez r\u00e9essayer",
             "unknown": "Erreur inconnue: veuillez r\u00e9essayer plus tard"
         },
diff --git a/homeassistant/components/freebox/translations/it.json b/homeassistant/components/freebox/translations/it.json
index 33f1ccbc1eb..7dd5e279a87 100644
--- a/homeassistant/components/freebox/translations/it.json
+++ b/homeassistant/components/freebox/translations/it.json
@@ -4,7 +4,7 @@
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "connection_failed": "Impossibile connettersi",
+            "cannot_connect": "Impossibile connettersi",
             "register_failed": "Errore in fase di registrazione, si prega di riprovare",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/freebox/translations/ko.json b/homeassistant/components/freebox/translations/ko.json
index ce0bc09989e..986f345b3ec 100644
--- a/homeassistant/components/freebox/translations/ko.json
+++ b/homeassistant/components/freebox/translations/ko.json
@@ -4,7 +4,7 @@
             "already_configured": "\ud638\uc2a4\ud2b8\uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4."
         },
         "error": {
-            "connection_failed": "\uc5f0\uacb0\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4. \ub2e4\uc2dc \uc2dc\ub3c4\ud574\uc8fc\uc138\uc694.",
+            "cannot_connect": "\uc5f0\uacb0\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4. \ub2e4\uc2dc \uc2dc\ub3c4\ud574\uc8fc\uc138\uc694.",
             "register_failed": "\ub4f1\ub85d\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4. \ub2e4\uc2dc \uc2dc\ub3c4\ud574\uc8fc\uc138\uc694.",
             "unknown": "\uc54c \uc218 \uc5c6\ub294 \uc624\ub958\uc785\ub2c8\ub2e4. \ub098\uc911\uc5d0 \ub2e4\uc2dc \uc2dc\ub3c4\ud574\uc8fc\uc138\uc694"
         },
diff --git a/homeassistant/components/freebox/translations/lb.json b/homeassistant/components/freebox/translations/lb.json
index eccc419c79b..e7c1b1148dc 100644
--- a/homeassistant/components/freebox/translations/lb.json
+++ b/homeassistant/components/freebox/translations/lb.json
@@ -4,7 +4,7 @@
             "already_configured": "Apparat ass scho konfigur\u00e9iert"
         },
         "error": {
-            "connection_failed": "Feeler beim verbannen, prob\u00e9ier w.e.g. nach emol.",
+            "cannot_connect": "Feeler beim verbannen, prob\u00e9ier w.e.g. nach emol.",
             "register_failed": "Feeler beim registr\u00e9ieren, prob\u00e9ier w.e.g. nach emol",
             "unknown": "Onbekannte Feeler: prob\u00e9iertsp\u00e9ider nach emol"
         },
diff --git a/homeassistant/components/freebox/translations/nl.json b/homeassistant/components/freebox/translations/nl.json
index 62c69997e17..ea41fcfcd6a 100644
--- a/homeassistant/components/freebox/translations/nl.json
+++ b/homeassistant/components/freebox/translations/nl.json
@@ -4,7 +4,7 @@
             "already_configured": "Host is al geconfigureerd."
         },
         "error": {
-            "connection_failed": "Verbinding mislukt, probeer het opnieuw",
+            "cannot_connect": "Verbinding mislukt, probeer het opnieuw",
             "register_failed": "Registratie is mislukt, probeer het opnieuw",
             "unknown": "Onbekende fout: probeer het later nog eens"
         },
diff --git a/homeassistant/components/freebox/translations/no.json b/homeassistant/components/freebox/translations/no.json
index 6c9d5e2e9fa..69ef2af9c7f 100644
--- a/homeassistant/components/freebox/translations/no.json
+++ b/homeassistant/components/freebox/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "connection_failed": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "register_failed": "Registrering feilet, vennligst pr\u00f8v igjen",
             "unknown": "Uventet feil"
         },
@@ -16,7 +16,7 @@
             "user": {
                 "data": {
                     "host": "Vert",
-                    "port": ""
+                    "port": "Port"
                 },
                 "title": ""
             }
diff --git a/homeassistant/components/freebox/translations/pl.json b/homeassistant/components/freebox/translations/pl.json
index c465e16fcb6..fe6aa517c88 100644
--- a/homeassistant/components/freebox/translations/pl.json
+++ b/homeassistant/components/freebox/translations/pl.json
@@ -1,16 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Nazwa hosta lub adres IP"
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "connection_failed": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "register_failed": "Nie uda\u0142o si\u0119 zarejestrowa\u0107. Spr\u00f3buj ponownie.",
-            "unknown": "Nieznany b\u0142\u0105d, spr\u00f3buj ponownie p\u00f3\u017aniej."
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "link": {
-                "description": "Kliknij \"Zatwierd\u017a\", a nast\u0119pnie naci\u015bnij przycisk strza\u0142ki w prawo na routerze, aby zarejestrowa\u0107 Freebox w Home Assistancie. \n\n ![Lokalizacja przycisku na routerze] (/static/images/config_freebox.png)",
+                "description": "Kliknij \"Zatwierd\u017a\", a nast\u0119pnie naci\u015bnij przycisk strza\u0142ki w prawo na routerze, aby zarejestrowa\u0107 Freebox w Home Assistant.\n\n ![Lokalizacja przycisku na routerze] (/static/images/config_freebox.png)",
                 "title": "Po\u0142\u0105czenie z routerem Freebox"
             },
             "user": {
diff --git a/homeassistant/components/freebox/translations/ru.json b/homeassistant/components/freebox/translations/ru.json
index 377c0e8002f..4ec5b68516c 100644
--- a/homeassistant/components/freebox/translations/ru.json
+++ b/homeassistant/components/freebox/translations/ru.json
@@ -4,7 +4,7 @@
             "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "connection_failed": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "register_failed": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/freebox/translations/sl.json b/homeassistant/components/freebox/translations/sl.json
index 0a36450501b..a161bfa494e 100644
--- a/homeassistant/components/freebox/translations/sl.json
+++ b/homeassistant/components/freebox/translations/sl.json
@@ -4,7 +4,7 @@
             "already_configured": "Gostitelj je \u017ee konfiguriran"
         },
         "error": {
-            "connection_failed": "Povezava ni uspela, poskusite znova",
+            "cannot_connect": "Povezava ni uspela, poskusite znova",
             "register_failed": "Registracija ni uspela, poskusite znova",
             "unknown": "Neznana napaka: poskusite pozneje"
         },
diff --git a/homeassistant/components/freebox/translations/sv.json b/homeassistant/components/freebox/translations/sv.json
index 6c6cc5c64ec..aa43ee66032 100644
--- a/homeassistant/components/freebox/translations/sv.json
+++ b/homeassistant/components/freebox/translations/sv.json
@@ -4,7 +4,7 @@
             "already_configured": "V\u00e4rden \u00e4r redan konfigurerad."
         },
         "error": {
-            "connection_failed": "Det gick inte att ansluta, f\u00f6rs\u00f6k igen",
+            "cannot_connect": "Det gick inte att ansluta, f\u00f6rs\u00f6k igen",
             "register_failed": "Misslyckades med att registrera, v\u00e4nligen f\u00f6rs\u00f6k igen",
             "unknown": "Ok\u00e4nt fel: f\u00f6rs\u00f6k igen senare"
         },
diff --git a/homeassistant/components/freebox/translations/zh-Hant.json b/homeassistant/components/freebox/translations/zh-Hant.json
index 47ccc2e57b8..608c5bbcba7 100644
--- a/homeassistant/components/freebox/translations/zh-Hant.json
+++ b/homeassistant/components/freebox/translations/zh-Hant.json
@@ -4,7 +4,7 @@
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "connection_failed": "\u9023\u7dda\u5931\u6557",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "register_failed": "\u8a3b\u518a\u5931\u6557\uff0c\u8acb\u7a0d\u5f8c\u518d\u8a66",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/fritz/device_tracker.py b/homeassistant/components/fritz/device_tracker.py
index 908cfd98a6e..6eb23d4b85e 100644
--- a/homeassistant/components/fritz/device_tracker.py
+++ b/homeassistant/components/fritz/device_tracker.py
@@ -1,6 +1,7 @@
 """Support for FRITZ!Box routers."""
 import logging
 
+from fritzconnection.core import exceptions as fritzexceptions
 from fritzconnection.lib.fritzhosts import FritzHosts
 import voluptuous as vol
 
@@ -81,7 +82,15 @@ class FritzBoxScanner(DeviceScanner):
 
     def get_extra_attributes(self, device):
         """Return the attributes (ip, mac) of the given device or None if is not known."""
-        ip_device = self.fritz_box.get_specific_host_entry(device).get("NewIPAddress")
+        ip_device = None
+        try:
+            ip_device = self.fritz_box.get_specific_host_entry(device).get(
+                "NewIPAddress"
+            )
+        except fritzexceptions.FritzLookUpError as fritz_lookup_error:
+            _LOGGER.warning(
+                "Host entry for %s not found: %s", device, fritz_lookup_error
+            )
 
         if not ip_device:
             return {}
diff --git a/homeassistant/components/fritzbox/config_flow.py b/homeassistant/components/fritzbox/config_flow.py
index 6f4befab8ff..ee1b3aff241 100644
--- a/homeassistant/components/fritzbox/config_flow.py
+++ b/homeassistant/components/fritzbox/config_flow.py
@@ -31,8 +31,8 @@ DATA_SCHEMA_CONFIRM = vol.Schema(
     }
 )
 
-RESULT_AUTH_FAILED = "auth_failed"
-RESULT_NOT_FOUND = "not_found"
+RESULT_INVALID_AUTH = "invalid_auth"
+RESULT_NO_DEVICES_FOUND = "no_devices_found"
 RESULT_NOT_SUPPORTED = "not_supported"
 RESULT_SUCCESS = "success"
 
@@ -73,11 +73,11 @@ class FritzboxConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             fritzbox.logout()
             return RESULT_SUCCESS
         except LoginError:
-            return RESULT_AUTH_FAILED
+            return RESULT_INVALID_AUTH
         except HTTPError:
             return RESULT_NOT_SUPPORTED
         except OSError:
-            return RESULT_NOT_FOUND
+            return RESULT_NO_DEVICES_FOUND
 
     async def async_step_import(self, user_input=None):
         """Handle configuration by yaml file."""
@@ -102,7 +102,7 @@ class FritzboxConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
             if result == RESULT_SUCCESS:
                 return self._get_entry()
-            if result != RESULT_AUTH_FAILED:
+            if result != RESULT_INVALID_AUTH:
                 return self.async_abort(reason=result)
             errors["base"] = result
 
@@ -150,7 +150,7 @@ class FritzboxConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
             if result == RESULT_SUCCESS:
                 return self._get_entry()
-            if result != RESULT_AUTH_FAILED:
+            if result != RESULT_INVALID_AUTH:
                 return self.async_abort(reason=result)
             errors["base"] = result
 
diff --git a/homeassistant/components/fritzbox/strings.json b/homeassistant/components/fritzbox/strings.json
index 3b287fa38a5..141348583f4 100644
--- a/homeassistant/components/fritzbox/strings.json
+++ b/homeassistant/components/fritzbox/strings.json
@@ -19,13 +19,13 @@
       }
     },
     "abort": {
-      "already_in_progress": "AVM FRITZ!Box configuration is already in progress.",
-      "already_configured": "This AVM FRITZ!Box is already configured.",
-      "not_found": "No supported AVM FRITZ!Box found on the network.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
       "not_supported": "Connected to AVM FRITZ!Box but it's unable to control Smart Home devices."
     },
     "error": {
-      "auth_failed": "Username and/or password are incorrect."
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/fritzbox/translations/ca.json b/homeassistant/components/fritzbox/translations/ca.json
index af82f1fc582..335c25aa602 100644
--- a/homeassistant/components/fritzbox/translations/ca.json
+++ b/homeassistant/components/fritzbox/translations/ca.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest AVM FRITZ!Box ja est\u00e0 configurat.",
-            "already_in_progress": "La configuraci\u00f3 de l'AVM FRITZ!Box ja est\u00e0 en curs.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
             "not_found": "No s'ha trobat cap AVM FRITZ!Box compatible a la xarxa.",
             "not_supported": "Connectat a AVM FRITZ!Box per\u00f2 no es poden controlar dispositius Smart Home."
         },
         "error": {
-            "auth_failed": "Nom d'usuari i/o contrasenya incorrectes."
+            "auth_failed": "Nom d'usuari i/o contrasenya incorrectes.",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
         },
         "flow_title": "AVM FRITZ!Box: {name}",
         "step": {
diff --git a/homeassistant/components/fritzbox/translations/cs.json b/homeassistant/components/fritzbox/translations/cs.json
index 4ba0a24fadd..b2fab27422f 100644
--- a/homeassistant/components/fritzbox/translations/cs.json
+++ b/homeassistant/components/fritzbox/translations/cs.json
@@ -1,18 +1,31 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "not_found": "V s\u00edti nebyl nalezen \u017e\u00e1dn\u00fd podporovan\u00fd AVM FRITZ!Box."
+        },
+        "error": {
+            "auth_failed": "U\u017eivatelsk\u00e9 jm\u00e9no nebo heslo je nespr\u00e1vn\u00e9.",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "flow_title": "AVM FRITZ!Box: {name}",
         "step": {
             "confirm": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "description": "Chcete nastavit {name}?"
             },
             "user": {
                 "data": {
                     "host": "Hostitel",
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "description": "Zadejte informace o sv\u00e9m AVM FRITZ!"
             }
         }
     }
diff --git a/homeassistant/components/fritzbox/translations/en.json b/homeassistant/components/fritzbox/translations/en.json
index cc9b13619a7..95a820c8686 100644
--- a/homeassistant/components/fritzbox/translations/en.json
+++ b/homeassistant/components/fritzbox/translations/en.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This AVM FRITZ!Box is already configured.",
-            "already_in_progress": "AVM FRITZ!Box configuration is already in progress.",
+            "already_configured": "Device is already configured",
+            "already_in_progress": "Configuration flow is already in progress",
+            "no_devices_found": "No devices found on the network",
             "not_found": "No supported AVM FRITZ!Box found on the network.",
             "not_supported": "Connected to AVM FRITZ!Box but it's unable to control Smart Home devices."
         },
         "error": {
-            "auth_failed": "Username and/or password are incorrect."
+            "auth_failed": "Username and/or password are incorrect.",
+            "invalid_auth": "Invalid authentication"
         },
         "flow_title": "AVM FRITZ!Box: {name}",
         "step": {
diff --git a/homeassistant/components/fritzbox/translations/es.json b/homeassistant/components/fritzbox/translations/es.json
index 69dad751e63..2009f16e5fc 100644
--- a/homeassistant/components/fritzbox/translations/es.json
+++ b/homeassistant/components/fritzbox/translations/es.json
@@ -2,12 +2,14 @@
     "config": {
         "abort": {
             "already_configured": "Este AVM FRITZ!Box ya est\u00e1 configurado.",
-            "already_in_progress": "La configuraci\u00f3n del AVM FRITZ!Box ya est\u00e1 en marcha.",
+            "already_in_progress": "El flujo de configuraci\u00f3n ya est\u00e1 en proceso",
+            "no_devices_found": "No se encontraron dispositivos en la red",
             "not_found": "No se encontr\u00f3 ning\u00fan AVM FRITZ!Box compatible en la red.",
             "not_supported": "Conectado a AVM FRITZ!Box pero no es capaz de controlar dispositivos Smart Home."
         },
         "error": {
-            "auth_failed": "Usuario y/o contrase\u00f1a incorrectos."
+            "auth_failed": "Usuario y/o contrase\u00f1a incorrectos.",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
         },
         "flow_title": "AVM FRITZ!Box: {name}",
         "step": {
diff --git a/homeassistant/components/fritzbox/translations/et.json b/homeassistant/components/fritzbox/translations/et.json
new file mode 100644
index 00000000000..0fe0c791d75
--- /dev/null
+++ b/homeassistant/components/fritzbox/translations/et.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid"
+        },
+        "error": {
+            "auth_failed": "Kasutajanimi v\u00f5i salas\u00f5na on vale.",
+            "invalid_auth": "Tuvastamise viga"
+        },
+        "step": {
+            "confirm": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "description": "Kas soovid seadistada {name}?"
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/fritzbox/translations/it.json b/homeassistant/components/fritzbox/translations/it.json
index 3b99e985871..d3c64a08307 100644
--- a/homeassistant/components/fritzbox/translations/it.json
+++ b/homeassistant/components/fritzbox/translations/it.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo AVM FRITZ!Box \u00e8 gi\u00e0 configurato.",
-            "already_in_progress": "La configurazione di AVM FRITZ!Box \u00e8 gi\u00e0 in corso.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
             "not_found": "Nessun AVM FRITZ!Box supportato trovato sulla rete.",
             "not_supported": "Collegato a AVM FRITZ!Box ma non \u00e8 in grado di controllare i dispositivi Smart Home."
         },
         "error": {
-            "auth_failed": "Nome utente e/o password non sono corretti."
+            "auth_failed": "Nome utente e/o password non sono corretti.",
+            "invalid_auth": "Autenticazione non valida"
         },
         "flow_title": "AVM FRITZ!Box: {name}",
         "step": {
diff --git a/homeassistant/components/fritzbox/translations/lb.json b/homeassistant/components/fritzbox/translations/lb.json
index bfbbeb22605..f60c58e8888 100644
--- a/homeassistant/components/fritzbox/translations/lb.json
+++ b/homeassistant/components/fritzbox/translations/lb.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "D\u00ebs AVM FRITZ!Box ass scho konfigur\u00e9iert",
-            "already_in_progress": "AVM FRITZ!Box Konfiguratioun ass schonn am gaang.",
+            "already_in_progress": "Konfiguratioun's Oflaf ass schonn am gaang.",
             "not_found": "Keng \u00ebnnerst\u00ebtzte AVM FRITZ!Box am Netzwierk fonnt.",
             "not_supported": "Mat der AVM FRITZ!Box verbonnen mee sie kann keng Smart Home Apparater kontroll\u00e9ieren."
         },
diff --git a/homeassistant/components/fritzbox/translations/no.json b/homeassistant/components/fritzbox/translations/no.json
index 44d8c28418b..a4436896d94 100644
--- a/homeassistant/components/fritzbox/translations/no.json
+++ b/homeassistant/components/fritzbox/translations/no.json
@@ -1,15 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne AVM FRITZ!Box er allerede konfigurert.",
-            "already_in_progress": "AVM FRITZ!Box-konfigurasjon p\u00e5g\u00e5r allerede.",
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
             "not_found": "Ingen st\u00f8ttet AVM FRITZ!Box funnet p\u00e5 nettverket.",
             "not_supported": "Tilkoblet AVM FRITZ! Box, men den klarer ikke \u00e5 kontrollere Smart Home-enheter."
         },
         "error": {
-            "auth_failed": "Brukernavn og/eller passord er feil."
+            "auth_failed": "Brukernavn og/eller passord er feil.",
+            "invalid_auth": "Ugyldig godkjenning"
         },
-        "flow_title": "AVM FRITZ!Box: {name}",
+        "flow_title": "",
         "step": {
             "confirm": {
                 "data": {
@@ -20,7 +22,7 @@
             },
             "user": {
                 "data": {
-                    "host": "Vert ",
+                    "host": "Vert",
                     "password": "Passord",
                     "username": "Brukernavn"
                 },
diff --git a/homeassistant/components/fritzbox/translations/pl.json b/homeassistant/components/fritzbox/translations/pl.json
index 0c8f96e83a4..359c792bfe4 100644
--- a/homeassistant/components/fritzbox/translations/pl.json
+++ b/homeassistant/components/fritzbox/translations/pl.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane.",
-            "already_in_progress": "Konfiguracja AVM FRITZ!Box jest ju\u017c w toku.",
-            "not_found": "W sieci nie znaleziono obs\u0142ugiwanego urz\u0105dzenia AVM FRITZ!Box.",
-            "not_supported": "Po\u0142\u0105czony z AVM FRITZ! Box, ale nie jest w stanie kontrolowa\u0107 urz\u0105dze\u0144 Smart Home."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "not_found": "W sieci nie znaleziono obs\u0142ugiwanego urz\u0105dzenia AVM FRITZ!Box",
+            "not_supported": "Po\u0142\u0105czony z AVM FRITZ! Box, ale nie jest w stanie kontrolowa\u0107 urz\u0105dze\u0144 Smart Home"
         },
         "error": {
-            "auth_failed": "Nazwa u\u017cytkownika i/lub has\u0142o s\u0105 nieprawid\u0142owe."
+            "auth_failed": "Nazwa u\u017cytkownika i/lub has\u0142o s\u0105 nieprawid\u0142owe",
+            "invalid_auth": "Niepoprawne uwierzytelnienie"
         },
         "flow_title": "AVM FRITZ!Box: {name}",
         "step": {
diff --git a/homeassistant/components/fritzbox/translations/ru.json b/homeassistant/components/fritzbox/translations/ru.json
index 635e0a2b891..0dbaf505571 100644
--- a/homeassistant/components/fritzbox/translations/ru.json
+++ b/homeassistant/components/fritzbox/translations/ru.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
             "not_found": "\u0412 \u0441\u0435\u0442\u0438 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u044b\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432.",
             "not_supported": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a AVM FRITZ! Box \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043e, \u043d\u043e \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430\u043c\u0438 Smart Home \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e."
         },
         "error": {
-            "auth_failed": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c."
+            "auth_failed": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
         },
         "flow_title": "AVM FRITZ!Box: {name}",
         "step": {
diff --git a/homeassistant/components/fritzbox/translations/zh-Hans.json b/homeassistant/components/fritzbox/translations/zh-Hans.json
new file mode 100644
index 00000000000..183c748b2d2
--- /dev/null
+++ b/homeassistant/components/fritzbox/translations/zh-Hans.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "auth_failed": "\u7528\u6237\u540d\u6216\u5bc6\u7801\u9519\u8bef"
+        },
+        "step": {
+            "confirm": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            },
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/fritzbox/translations/zh-Hant.json b/homeassistant/components/fritzbox/translations/zh-Hant.json
index 415ad9c71bd..f1960cee54d 100644
--- a/homeassistant/components/fritzbox/translations/zh-Hant.json
+++ b/homeassistant/components/fritzbox/translations/zh-Hant.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64 AVM FRITZ!Box \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "AVM FRITZ!Box \u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
             "not_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u652f\u63f4\u7684 AVM FRITZ!Box\u3002",
             "not_supported": "\u5df2\u9023\u7dda\u81f3 AVM FRITZ!Box \u4f46\u7121\u6cd5\u63a7\u5236\u667a\u80fd\u5bb6\u5ead\u8a2d\u5099\u3002"
         },
         "error": {
-            "auth_failed": "\u4f7f\u7528\u8005\u53ca/\u6216\u5bc6\u78bc\u932f\u8aa4\u3002"
+            "auth_failed": "\u4f7f\u7528\u8005\u53ca/\u6216\u5bc6\u78bc\u932f\u8aa4\u3002",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548"
         },
         "flow_title": "AVM FRITZ!Box\uff1a{name}",
         "step": {
diff --git a/homeassistant/components/fritzbox_netmonitor/sensor.py b/homeassistant/components/fritzbox_netmonitor/sensor.py
index c0d010cf37e..5601ad5d74f 100644
--- a/homeassistant/components/fritzbox_netmonitor/sensor.py
+++ b/homeassistant/components/fritzbox_netmonitor/sensor.py
@@ -98,7 +98,7 @@ class FritzboxMonitorSensor(Entity):
         # Don't return attributes if FritzBox is unreachable
         if self._state == STATE_UNAVAILABLE:
             return {}
-        attr = {
+        return {
             ATTR_IS_LINKED: self._is_linked,
             ATTR_IS_CONNECTED: self._is_connected,
             ATTR_EXTERNAL_IP: self._external_ip,
@@ -110,7 +110,6 @@ class FritzboxMonitorSensor(Entity):
             ATTR_MAX_BYTE_RATE_UP: self._max_byte_rate_up,
             ATTR_MAX_BYTE_RATE_DOWN: self._max_byte_rate_down,
         }
-        return attr
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):
diff --git a/homeassistant/components/fronius/sensor.py b/homeassistant/components/fronius/sensor.py
index 7c966a6fa4a..130a8d55072 100644
--- a/homeassistant/components/fronius/sensor.py
+++ b/homeassistant/components/fronius/sensor.py
@@ -64,9 +64,7 @@ PLATFORM_SCHEMA = vol.Schema(
                             vol.Optional(CONF_SCOPE, default=DEFAULT_SCOPE): vol.In(
                                 SCOPE_TYPES
                             ),
-                            vol.Optional(CONF_DEVICE): vol.All(
-                                vol.Coerce(int), vol.Range(min=0)
-                            ),
+                            vol.Optional(CONF_DEVICE): cv.positive_int,
                         }
                     ],
                 ),
diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index fd3d4a497ab..ee27bb08d74 100644
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -2,7 +2,7 @@
   "domain": "frontend",
   "name": "Home Assistant Frontend",
   "documentation": "https://www.home-assistant.io/integrations/frontend",
-  "requirements": ["home-assistant-frontend==20201001.2"],
+  "requirements": ["home-assistant-frontend==20201021.3"],
   "dependencies": [
     "api",
     "auth",
diff --git a/homeassistant/components/frontier_silicon/media_player.py b/homeassistant/components/frontier_silicon/media_player.py
index 852528fb3a5..bc9f0f35b57 100644
--- a/homeassistant/components/frontier_silicon/media_player.py
+++ b/homeassistant/components/frontier_silicon/media_player.py
@@ -126,11 +126,6 @@ class AFSAPIDevice(MediaPlayerEntity):
         """
         return AFSAPI(self._device_url, self._password)
 
-    @property
-    def should_poll(self):
-        """Device should be polled."""
-        return True
-
     @property
     def name(self):
         """Return the device name."""
diff --git a/homeassistant/components/futurenow/light.py b/homeassistant/components/futurenow/light.py
index 2bccd38688a..6b05c96416f 100644
--- a/homeassistant/components/futurenow/light.py
+++ b/homeassistant/components/futurenow/light.py
@@ -1,7 +1,4 @@
 """Support for FutureNow Ethernet unit outputs as Lights."""
-
-import logging
-
 import pyfnip
 import voluptuous as vol
 
@@ -14,8 +11,6 @@ from homeassistant.components.light import (
 from homeassistant.const import CONF_DEVICES, CONF_HOST, CONF_NAME, CONF_PORT
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_DRIVER = "driver"
 CONF_DRIVER_FNIP6X10AD = "FNIP6x10ad"
 CONF_DRIVER_FNIP8X10A = "FNIP8x10a"
diff --git a/homeassistant/components/garadget/cover.py b/homeassistant/components/garadget/cover.py
index 34a9a13b8d9..9c089e85811 100644
--- a/homeassistant/components/garadget/cover.py
+++ b/homeassistant/components/garadget/cover.py
@@ -105,14 +105,14 @@ class GaradgetCover(CoverEntity):
                     self._name = doorconfig["nme"]
             self.update()
         except requests.exceptions.ConnectionError as ex:
-            _LOGGER.error("Unable to connect to server: %(reason)s", dict(reason=ex))
+            _LOGGER.error("Unable to connect to server: %(reason)s", {"reason": ex})
             self._state = STATE_OFFLINE
             self._available = False
             self._name = DEFAULT_NAME
         except KeyError:
             _LOGGER.warning(
                 "Garadget device %(device)s seems to be offline",
-                dict(device=self.device_id),
+                {"device": self.device_id},
             )
             self._name = DEFAULT_NAME
             self._state = STATE_OFFLINE
@@ -129,11 +129,6 @@ class GaradgetCover(CoverEntity):
         """Return the name of the cover."""
         return self._name
 
-    @property
-    def should_poll(self):
-        """No polling needed for a demo cover."""
-        return True
-
     @property
     def available(self):
         """Return True if entity is available."""
@@ -235,12 +230,12 @@ class GaradgetCover(CoverEntity):
             self.sensor = status["sensor"]
             self._available = True
         except requests.exceptions.ConnectionError as ex:
-            _LOGGER.error("Unable to connect to server: %(reason)s", dict(reason=ex))
+            _LOGGER.error("Unable to connect to server: %(reason)s", {"reason": ex})
             self._state = STATE_OFFLINE
         except KeyError:
             _LOGGER.warning(
                 "Garadget device %(device)s seems to be offline",
-                dict(device=self.device_id),
+                {"device": self.device_id},
             )
             self._state = STATE_OFFLINE
 
diff --git a/homeassistant/components/garmin_connect/sensor.py b/homeassistant/components/garmin_connect/sensor.py
index 48713789c6e..9b678011053 100644
--- a/homeassistant/components/garmin_connect/sensor.py
+++ b/homeassistant/components/garmin_connect/sensor.py
@@ -121,14 +121,13 @@ class GarminConnectSensor(Entity):
     @property
     def device_state_attributes(self):
         """Return attributes for sensor."""
-        attributes = {}
-        if self._data.data:
-            attributes = {
-                "source": self._data.data["source"],
-                "last_synced": self._data.data["lastSyncTimestampGMT"],
-                ATTR_ATTRIBUTION: ATTRIBUTION,
-            }
-        return attributes
+        if not self._data.data:
+            return {}
+        return {
+            "source": self._data.data["source"],
+            "last_synced": self._data.data["lastSyncTimestampGMT"],
+            ATTR_ATTRIBUTION: ATTRIBUTION,
+        }
 
     @property
     def device_info(self) -> Dict[str, Any]:
diff --git a/homeassistant/components/garmin_connect/strings.json b/homeassistant/components/garmin_connect/strings.json
index 6aac2686a5c..0ec7a3ce04c 100644
--- a/homeassistant/components/garmin_connect/strings.json
+++ b/homeassistant/components/garmin_connect/strings.json
@@ -4,10 +4,10 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again.",
-      "invalid_auth": "Invalid authentication.",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "too_many_requests": "Too many requests, retry later.",
-      "unknown": "Unexpected error."
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "step": {
       "user": {
@@ -20,4 +20,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/garmin_connect/translations/ca.json b/homeassistant/components/garmin_connect/translations/ca.json
index 34d7273ef96..73b12090fcf 100644
--- a/homeassistant/components/garmin_connect/translations/ca.json
+++ b/homeassistant/components/garmin_connect/translations/ca.json
@@ -4,10 +4,10 @@
             "already_configured": "[%key::common::config_flow::abort::already_configured_account%]"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar.",
-            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "too_many_requests": "Massa sol\u00b7licituds, torna-ho a intentar m\u00e9s tard.",
-            "unknown": "Error inesperat."
+            "unknown": "Error inesperat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/garmin_connect/translations/cs.json b/homeassistant/components/garmin_connect/translations/cs.json
index 504c95290e1..86b0ce1ddef 100644
--- a/homeassistant/components/garmin_connect/translations/cs.json
+++ b/homeassistant/components/garmin_connect/translations/cs.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Tento \u00fa\u010det je ji\u017e nakonfigurov\u00e1n."
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
         },
         "error": {
-            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit, zkuste to znovu.",
-            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
             "too_many_requests": "P\u0159\u00edli\u0161 mnoho po\u017eadavk\u016f, opakujte to pozd\u011bji.",
             "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
diff --git a/homeassistant/components/garmin_connect/translations/en.json b/homeassistant/components/garmin_connect/translations/en.json
index 3b3b2fcb865..c1b563d38f3 100644
--- a/homeassistant/components/garmin_connect/translations/en.json
+++ b/homeassistant/components/garmin_connect/translations/en.json
@@ -4,10 +4,10 @@
             "already_configured": "Account is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again.",
-            "invalid_auth": "Invalid authentication.",
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
             "too_many_requests": "Too many requests, retry later.",
-            "unknown": "Unexpected error."
+            "unknown": "Unexpected error"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/garmin_connect/translations/es.json b/homeassistant/components/garmin_connect/translations/es.json
index e14769bc670..bef92af2948 100644
--- a/homeassistant/components/garmin_connect/translations/es.json
+++ b/homeassistant/components/garmin_connect/translations/es.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Esta cuenta ya est\u00e1 configurada."
+            "already_configured": "La cuenta ya ha sido configurada"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntelo de nuevo.",
-            "invalid_auth": "Autenticaci\u00f3n inv\u00e1lida",
+            "cannot_connect": "No se pudo conectar",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "too_many_requests": "Demasiadas solicitudes, vuelva a intentarlo m\u00e1s tarde.",
             "unknown": "Error inesperado"
         },
diff --git a/homeassistant/components/garmin_connect/translations/et.json b/homeassistant/components/garmin_connect/translations/et.json
new file mode 100644
index 00000000000..b46ffd39076
--- /dev/null
+++ b/homeassistant/components/garmin_connect/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/garmin_connect/translations/it.json b/homeassistant/components/garmin_connect/translations/it.json
index 62937ed2ab1..791de295a80 100644
--- a/homeassistant/components/garmin_connect/translations/it.json
+++ b/homeassistant/components/garmin_connect/translations/it.json
@@ -4,10 +4,10 @@
             "already_configured": "L'account \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare.",
-            "invalid_auth": "Autenticazione non valida.",
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_auth": "Autenticazione non valida",
             "too_many_requests": "Troppe richieste, riprovare pi\u00f9 tardi.",
-            "unknown": "Errore imprevisto."
+            "unknown": "Errore imprevisto"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/garmin_connect/translations/no.json b/homeassistant/components/garmin_connect/translations/no.json
index 9058d46d02a..41cc222bb73 100644
--- a/homeassistant/components/garmin_connect/translations/no.json
+++ b/homeassistant/components/garmin_connect/translations/no.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne kontoen er allerede konfigurert."
+            "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Kunne ikke koble til, pr\u00f8v igjen.",
-            "invalid_auth": "Ugyldig godkjenning.",
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning",
             "too_many_requests": "For mange foresp\u00f8rsler, pr\u00f8v p\u00e5 nytt senere.",
-            "unknown": "Uventet feil."
+            "unknown": "Uventet feil"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/garmin_connect/translations/pl.json b/homeassistant/components/garmin_connect/translations/pl.json
index 5aaa67a913e..715258e15f9 100644
--- a/homeassistant/components/garmin_connect/translations/pl.json
+++ b/homeassistant/components/garmin_connect/translations/pl.json
@@ -4,9 +4,9 @@
             "already_configured": "Konto jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
-            "too_many_requests": "Zbyt wiele \u017c\u0105da\u0144, spr\u00f3buj ponownie p\u00f3\u017aniej.",
+            "too_many_requests": "Zbyt wiele \u017c\u0105da\u0144, spr\u00f3buj ponownie p\u00f3\u017aniej",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
diff --git a/homeassistant/components/garmin_connect/translations/ru.json b/homeassistant/components/garmin_connect/translations/ru.json
index c9448e1a3fc..69fa96c2a5e 100644
--- a/homeassistant/components/garmin_connect/translations/ru.json
+++ b/homeassistant/components/garmin_connect/translations/ru.json
@@ -4,7 +4,7 @@
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "too_many_requests": "\u0421\u043b\u0438\u0448\u043a\u043e\u043c \u043c\u043d\u043e\u0433\u043e \u0437\u0430\u043f\u0440\u043e\u0441\u043e\u0432, \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u043f\u043e\u0437\u0436\u0435.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
diff --git a/homeassistant/components/garmin_connect/translations/zh-Hans.json b/homeassistant/components/garmin_connect/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/garmin_connect/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/garmin_connect/translations/zh-Hant.json b/homeassistant/components/garmin_connect/translations/zh-Hant.json
index c7351932734..cbf928152aa 100644
--- a/homeassistant/components/garmin_connect/translations/zh-Hant.json
+++ b/homeassistant/components/garmin_connect/translations/zh-Hant.json
@@ -4,10 +4,10 @@
             "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002",
-            "invalid_auth": "\u9a57\u8b49\u7121\u6548\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "too_many_requests": "\u8acb\u6c42\u6b21\u6578\u904e\u591a\uff0c\u8acb\u7a0d\u5f8c\u91cd\u8a66\u3002",
-            "unknown": "\u672a\u9810\u671f\u932f\u8aa4\u3002"
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/gc100/__init__.py b/homeassistant/components/gc100/__init__.py
index 36779b28df2..77380afc2b5 100644
--- a/homeassistant/components/gc100/__init__.py
+++ b/homeassistant/components/gc100/__init__.py
@@ -1,14 +1,10 @@
 """Support for controlling Global Cache gc100."""
-import logging
-
 import gc100
 import voluptuous as vol
 
 from homeassistant.const import CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PORTS = "ports"
 
 DEFAULT_PORT = 4998
diff --git a/homeassistant/components/gdacs/strings.json b/homeassistant/components/gdacs/strings.json
index 496b996823a..955936cf986 100644
--- a/homeassistant/components/gdacs/strings.json
+++ b/homeassistant/components/gdacs/strings.json
@@ -3,9 +3,13 @@
     "step": {
       "user": {
         "title": "Fill in your filter details.",
-        "data": { "radius": "Radius" }
+        "data": {
+          "radius": "Radius"
+        }
       }
     },
-    "abort": { "already_configured": "Location is already configured." }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/homeassistant/components/gdacs/translations/ca.json b/homeassistant/components/gdacs/translations/ca.json
index db6359c881b..b5c13c0c367 100644
--- a/homeassistant/components/gdacs/translations/ca.json
+++ b/homeassistant/components/gdacs/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada."
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/gdacs/translations/cs.json b/homeassistant/components/gdacs/translations/cs.json
new file mode 100644
index 00000000000..0ddca983798
--- /dev/null
+++ b/homeassistant/components/gdacs/translations/cs.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "radius": "Polom\u011br"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gdacs/translations/en.json b/homeassistant/components/gdacs/translations/en.json
index 8b4d3522ce2..4e68f486e4d 100644
--- a/homeassistant/components/gdacs/translations/en.json
+++ b/homeassistant/components/gdacs/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Location is already configured."
+            "already_configured": "Service is already configured"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/gdacs/translations/es.json b/homeassistant/components/gdacs/translations/es.json
index 816b44ceef0..9b7c2686d6f 100644
--- a/homeassistant/components/gdacs/translations/es.json
+++ b/homeassistant/components/gdacs/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La ubicaci\u00f3n ya est\u00e1 configurada."
+            "already_configured": "El servicio ya est\u00e1 configurado"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/gdacs/translations/et.json b/homeassistant/components/gdacs/translations/et.json
new file mode 100644
index 00000000000..7df1adb08b5
--- /dev/null
+++ b/homeassistant/components/gdacs/translations/et.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gdacs/translations/it.json b/homeassistant/components/gdacs/translations/it.json
index 3fad0146c13..ac5c8ece129 100644
--- a/homeassistant/components/gdacs/translations/it.json
+++ b/homeassistant/components/gdacs/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La posizione \u00e8 gi\u00e0 configurata."
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/gdacs/translations/no.json b/homeassistant/components/gdacs/translations/no.json
index 372a24c0b38..036c660af90 100644
--- a/homeassistant/components/gdacs/translations/no.json
+++ b/homeassistant/components/gdacs/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Plasseringen er allerede konfigurert."
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/gdacs/translations/pl.json b/homeassistant/components/gdacs/translations/pl.json
index 406f8af58f4..e32b7934ef9 100644
--- a/homeassistant/components/gdacs/translations/pl.json
+++ b/homeassistant/components/gdacs/translations/pl.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana."
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
         },
         "step": {
             "user": {
                 "data": {
-                    "radius": "Promie\u0144"
+                    "radius": "Promie\u0144 (km)"
                 },
                 "title": "Wprowad\u017a szczeg\u00f3\u0142owe dane filtra."
             }
diff --git a/homeassistant/components/gdacs/translations/ru.json b/homeassistant/components/gdacs/translations/ru.json
index b9466944037..efad056d304 100644
--- a/homeassistant/components/gdacs/translations/ru.json
+++ b/homeassistant/components/gdacs/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043e."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/gdacs/translations/zh-Hant.json b/homeassistant/components/gdacs/translations/zh-Hant.json
index 3e643c732c8..164d90fdcfd 100644
--- a/homeassistant/components/gdacs/translations/zh-Hant.json
+++ b/homeassistant/components/gdacs/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u4f4d\u7f6e\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geizhals/sensor.py b/homeassistant/components/geizhals/sensor.py
index 0d83921cb2f..43e41e25e5e 100644
--- a/homeassistant/components/geizhals/sensor.py
+++ b/homeassistant/components/geizhals/sensor.py
@@ -1,6 +1,5 @@
 """Parse prices of a device from geizhals."""
 from datetime import timedelta
-import logging
 
 from geizhals import Device, Geizhals
 import voluptuous as vol
@@ -11,8 +10,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_DESCRIPTION = "description"
 CONF_PRODUCT_ID = "product_id"
 CONF_LOCALE = "locale"
diff --git a/homeassistant/components/generic/camera.py b/homeassistant/components/generic/camera.py
index a7ef367a95d..2e798b8cc4b 100644
--- a/homeassistant/components/generic/camera.py
+++ b/homeassistant/components/generic/camera.py
@@ -121,7 +121,7 @@ class GenericCamera(Camera):
     async def async_camera_image(self):
         """Return a still image response from the camera."""
         try:
-            url = self._still_image_url.async_render()
+            url = self._still_image_url.async_render(parse_result=False)
         except TemplateError as err:
             _LOGGER.error("Error parsing template %s: %s", self._still_image_url, err)
             return self._last_image
@@ -145,7 +145,7 @@ class GenericCamera(Camera):
                     )
                     return self._last_image
 
-            self._last_image = await self.hass.async_add_job(fetch)
+            self._last_image = await self.hass.async_add_executor_job(fetch)
         # async
         else:
             try:
@@ -178,7 +178,7 @@ class GenericCamera(Camera):
             return None
 
         try:
-            return self._stream_source.async_render()
+            return self._stream_source.async_render(parse_result=False)
         except TemplateError as err:
             _LOGGER.error("Error parsing template %s: %s", self._stream_source, err)
             return None
diff --git a/homeassistant/components/geo_json_events/geo_location.py b/homeassistant/components/geo_json_events/geo_location.py
index 2fd8466cc19..bb2d86539e9 100644
--- a/homeassistant/components/geo_json_events/geo_location.py
+++ b/homeassistant/components/geo_json_events/geo_location.py
@@ -203,7 +203,6 @@ class GeoJsonLocationEvent(GeolocationEvent):
     @property
     def device_state_attributes(self):
         """Return the device state attributes."""
-        attributes = {}
-        if self._external_id:
-            attributes[ATTR_EXTERNAL_ID] = self._external_id
-        return attributes
+        if not self._external_id:
+            return {}
+        return {ATTR_EXTERNAL_ID: self._external_id}
diff --git a/homeassistant/components/geo_location/trigger.py b/homeassistant/components/geo_location/trigger.py
index dc8879b51e5..aad281da117 100644
--- a/homeassistant/components/geo_location/trigger.py
+++ b/homeassistant/components/geo_location/trigger.py
@@ -2,16 +2,11 @@
 import voluptuous as vol
 
 from homeassistant.components.geo_location import DOMAIN
-from homeassistant.const import (
-    CONF_EVENT,
-    CONF_PLATFORM,
-    CONF_SOURCE,
-    CONF_ZONE,
-    EVENT_STATE_CHANGED,
-)
-from homeassistant.core import callback
+from homeassistant.const import CONF_EVENT, CONF_PLATFORM, CONF_SOURCE, CONF_ZONE
+from homeassistant.core import HassJob, callback
 from homeassistant.helpers import condition, config_validation as cv
 from homeassistant.helpers.config_validation import entity_domain
+from homeassistant.helpers.event import TrackStates, async_track_state_change_filtered
 
 # mypy: allow-untyped-defs, no-check-untyped-defs
 
@@ -41,13 +36,11 @@ async def async_attach_trigger(hass, config, action, automation_info):
     source = config.get(CONF_SOURCE).lower()
     zone_entity_id = config.get(CONF_ZONE)
     trigger_event = config.get(CONF_EVENT)
+    job = HassJob(action)
 
     @callback
     def state_change_listener(event):
         """Handle specific state changes."""
-        # Skip if the event is not a geo_location entity.
-        if not event.data.get("entity_id").startswith(DOMAIN):
-            return
         # Skip if the event's source does not match the trigger's source.
         from_state = event.data.get("old_state")
         to_state = event.data.get("new_state")
@@ -66,8 +59,8 @@ async def async_attach_trigger(hass, config, action, automation_info):
             and from_match
             and not to_match
         ):
-            hass.async_run_job(
-                action,
+            hass.async_run_hass_job(
+                job,
                 {
                     "trigger": {
                         "platform": "geo_location",
@@ -83,4 +76,6 @@ async def async_attach_trigger(hass, config, action, automation_info):
                 event.context,
             )
 
-    return hass.bus.async_listen(EVENT_STATE_CHANGED, state_change_listener)
+    return async_track_state_change_filtered(
+        hass, TrackStates(False, set(), {DOMAIN}), state_change_listener
+    ).async_remove
diff --git a/homeassistant/components/geofency/__init__.py b/homeassistant/components/geofency/__init__.py
index 50a7d8ac577..e0a3dc47818 100644
--- a/homeassistant/components/geofency/__init__.py
+++ b/homeassistant/components/geofency/__init__.py
@@ -1,6 +1,4 @@
 """Support for Geofency."""
-import logging
-
 from aiohttp import web
 import voluptuous as vol
 
@@ -21,8 +19,6 @@ from homeassistant.util import slugify
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_MOBILE_BEACONS = "mobile_beacons"
 
 CONFIG_SCHEMA = vol.Schema(
diff --git a/homeassistant/components/geofency/device_tracker.py b/homeassistant/components/geofency/device_tracker.py
index e730f108f8f..f090f516fb1 100644
--- a/homeassistant/components/geofency/device_tracker.py
+++ b/homeassistant/components/geofency/device_tracker.py
@@ -1,6 +1,4 @@
 """Support for the Geofency device tracker platform."""
-import logging
-
 from homeassistant.components.device_tracker import SOURCE_TYPE_GPS
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
 from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE
@@ -11,8 +9,6 @@ from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import DOMAIN as GF_DOMAIN, TRACKER_UPDATE
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up Geofency config entry."""
diff --git a/homeassistant/components/geofency/strings.json b/homeassistant/components/geofency/strings.json
index 1c6a72f27c8..a7b6649fb6e 100644
--- a/homeassistant/components/geofency/strings.json
+++ b/homeassistant/components/geofency/strings.json
@@ -7,7 +7,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Geofency."
     },
     "create_entry": {
diff --git a/homeassistant/components/geofency/translations/ca.json b/homeassistant/components/geofency/translations/ca.json
index 315b1d3be8d..59eab112331 100644
--- a/homeassistant/components/geofency/translations/ca.json
+++ b/homeassistant/components/geofency/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Geofency.",
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar l'opci\u00f3 webhook de Geofency.\n\nCompleta la seg\u00fcent informaci\u00f3:\n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n\nConsulta la [documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
diff --git a/homeassistant/components/geofency/translations/cs.json b/homeassistant/components/geofency/translations/cs.json
index a91fa1cbb6f..0b7e363d64c 100644
--- a/homeassistant/components/geofency/translations/cs.json
+++ b/homeassistant/components/geofency/translations/cs.json
@@ -1,5 +1,10 @@
 {
     "config": {
+        "abort": {
+            "not_internet_accessible": "V\u00e1\u0161 Home Asistent mus\u00ed b\u00fdt p\u0159\u00edstupn\u00fd z internetu, aby mohl p\u0159ij\u00edmat zpr\u00e1vy od Geofency.",
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
         "create_entry": {
             "default": "Chcete-li odes\u00edlat ud\u00e1losti do aplikace Home Assistant, mus\u00edte v aplikaci Geofency nastavit funkci webhook. \n\n Vypl\u0148te n\u00e1sleduj\u00edc\u00ed informace: \n\n - URL: `{webhook_url}` \n - Metoda: POST \n\n Dal\u0161\u00ed informace viz [dokumentace]({docs_url})."
         },
diff --git a/homeassistant/components/geofency/translations/el.json b/homeassistant/components/geofency/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/geofency/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geofency/translations/en.json b/homeassistant/components/geofency/translations/en.json
index dad5e9c77d4..5fc9983e68c 100644
--- a/homeassistant/components/geofency/translations/en.json
+++ b/homeassistant/components/geofency/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Geofency.",
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "To send events to Home Assistant, you will need to setup the webhook feature in Geofency.\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nSee [the documentation]({docs_url}) for further details."
diff --git a/homeassistant/components/geofency/translations/es.json b/homeassistant/components/geofency/translations/es.json
index 9149d6699be..28856f5d65d 100644
--- a/homeassistant/components/geofency/translations/es.json
+++ b/homeassistant/components/geofency/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Tu Home Assistant debe ser accesible desde Internet para recibir mensajes de GPSLogger.",
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "S\u00f3lo se necesita una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Para enviar eventos a Home Assistant, necesitar\u00e1s configurar la funci\u00f3n de webhook en Geofency.\n\nRellene la siguiente informaci\u00f3n:\n\n- URL: ``{webhook_url}``\n- M\u00e9todo: POST\n\nVer[la documentaci\u00f3n]({docs_url}) para m\u00e1s detalles."
diff --git a/homeassistant/components/geofency/translations/et.json b/homeassistant/components/geofency/translations/et.json
new file mode 100644
index 00000000000..05a493683e1
--- /dev/null
+++ b/homeassistant/components/geofency/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Lubatud on ainult \u00fcks sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid Geofency Webhooki seadistada?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geofency/translations/fr.json b/homeassistant/components/geofency/translations/fr.json
index 142f40754b9..b7940cbe58c 100644
--- a/homeassistant/components/geofency/translations/fr.json
+++ b/homeassistant/components/geofency/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Votre instance Home Assistant doit \u00eatre accessible \u00e0 partir d'Internet pour recevoir les messages Geofency.",
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "Pour envoyer des \u00e9v\u00e9nements \u00e0 Home Assistant, vous devez configurer la fonctionnalit\u00e9 Webhook dans Geofency. \n\n Remplissez les informations suivantes: \n\n - URL: ` {webhook_url} ` \n - M\u00e9thode: POST \n\n Voir [la documentation] ( {docs_url} ) pour plus de d\u00e9tails."
diff --git a/homeassistant/components/geofency/translations/it.json b/homeassistant/components/geofency/translations/it.json
index 4a74e58e5ca..e061e803e28 100644
--- a/homeassistant/components/geofency/translations/it.json
+++ b/homeassistant/components/geofency/translations/it.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La tua istanza di Home Assistant deve essere accessibile da Internet per ricevere messaggi da Geofency.",
-            "one_instance_allowed": "\u00c8 necessaria una sola istanza."
+            "one_instance_allowed": "\u00c8 necessaria una sola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "Per inviare eventi a Home Assistant, dovrai configurare la funzionalit\u00e0 webhook in Geofency.\n\n Compila le seguenti informazioni: \n\n - URL: `{webhook_url}` \n - Method: POST \n\n Vedi [la documentazione]({docs_url}) for ulteriori dettagli."
diff --git a/homeassistant/components/geofency/translations/lb.json b/homeassistant/components/geofency/translations/lb.json
index 16f973e5260..fcf26deb3ad 100644
--- a/homeassistant/components/geofency/translations/lb.json
+++ b/homeassistant/components/geofency/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir Geofency Noriichten z'empf\u00e4nken.",
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Fir Evenementer un Home Assistant ze sch\u00e9cken, muss den Webhook Feature am Geofency ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nLiest [Dokumentatioun]({docs_url}) fir w\u00e9ider D\u00e9tailer."
diff --git a/homeassistant/components/geofency/translations/nl.json b/homeassistant/components/geofency/translations/nl.json
index bedf5f7efb4..06bce326c95 100644
--- a/homeassistant/components/geofency/translations/nl.json
+++ b/homeassistant/components/geofency/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Uw Home Assistant instantie moet toegankelijk zijn vanaf het internet om Geofency-berichten te ontvangen.",
-            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Om locaties naar Home Assistant te sturen, moet u de Webhook-functie instellen in Geofency.\n\n Vul de volgende info in: \n\n - URL: `{webhook_url}` \n - Methode: POST \n\n Zie [de documentatie]({docs_url}) voor meer informatie."
diff --git a/homeassistant/components/geofency/translations/no.json b/homeassistant/components/geofency/translations/no.json
index 8e66cab4c9c..a07a2bcd127 100644
--- a/homeassistant/components/geofency/translations/no.json
+++ b/homeassistant/components/geofency/translations/no.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 kunne motta meldinger fra Geofency.",
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
             "default": "For \u00e5 kunne sende hendelser til Home Assistant, m\u00e5 du sette opp webhook-funksjonen i Geofency. \n\n Fyll ut f\u00f8lgende informasjon: \n\n - URL: `{webhook_url}` \n - Metode: POST \n\n Se [dokumentasjonen]({docs_url}) for ytterligere detaljer."
diff --git a/homeassistant/components/geofency/translations/pl.json b/homeassistant/components/geofency/translations/pl.json
index 698aa515b9a..00608c86467 100644
--- a/homeassistant/components/geofency/translations/pl.json
+++ b/homeassistant/components/geofency/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty z Geofency.",
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty z Geofency",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistanta, musisz skonfigurowa\u0107 webhook w Geofency. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
+            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistant, musisz skonfigurowa\u0107 webhook w Geofency. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geofency/translations/ru.json b/homeassistant/components/geofency/translations/ru.json
index dd2a20ad61c..80304f3eb26 100644
--- a/homeassistant/components/geofency/translations/ru.json
+++ b/homeassistant/components/geofency/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 Geofency.",
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Webhook \u0434\u043b\u044f Geofency.\n\n\u0414\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
diff --git a/homeassistant/components/geofency/translations/zh-Hant.json b/homeassistant/components/geofency/translations/zh-Hant.json
index 95fec4ae15e..494dc8ddf23 100644
--- a/homeassistant/components/geofency/translations/zh-Hant.json
+++ b/homeassistant/components/geofency/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant \u8a2d\u5099\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 Geofency \u8a0a\u606f\u3002",
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u65bc Geofency \u5167\u8a2d\u5b9a webhook \u529f\u80fd\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
diff --git a/homeassistant/components/geonetnz_quakes/__init__.py b/homeassistant/components/geonetnz_quakes/__init__.py
index 9395c9dbe66..a41fe350a11 100644
--- a/homeassistant/components/geonetnz_quakes/__init__.py
+++ b/homeassistant/components/geonetnz_quakes/__init__.py
@@ -48,7 +48,7 @@ CONFIG_SCHEMA = vol.Schema(
                 vol.Optional(CONF_RADIUS, default=DEFAULT_RADIUS): vol.Coerce(float),
                 vol.Optional(
                     CONF_MINIMUM_MAGNITUDE, default=DEFAULT_MINIMUM_MAGNITUDE
-                ): vol.All(vol.Coerce(float), vol.Range(min=0)),
+                ): cv.positive_float,
                 vol.Optional(
                     CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL
                 ): cv.time_period,
diff --git a/homeassistant/components/geonetnz_quakes/strings.json b/homeassistant/components/geonetnz_quakes/strings.json
index fe328c05603..3f2d702492f 100644
--- a/homeassistant/components/geonetnz_quakes/strings.json
+++ b/homeassistant/components/geonetnz_quakes/strings.json
@@ -6,6 +6,6 @@
         "data": { "radius": "Radius", "mmi": "MMI" }
       }
     },
-    "abort": { "already_configured": "Location is already configured." }
+    "abort": { "already_configured": "[%key:common::config_flow::abort::already_configured_service%]" }
   }
 }
diff --git a/homeassistant/components/geonetnz_quakes/translations/ca.json b/homeassistant/components/geonetnz_quakes/translations/ca.json
index e97142a6e3f..2a0aff80dfd 100644
--- a/homeassistant/components/geonetnz_quakes/translations/ca.json
+++ b/homeassistant/components/geonetnz_quakes/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada."
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_quakes/translations/cs.json b/homeassistant/components/geonetnz_quakes/translations/cs.json
new file mode 100644
index 00000000000..0ddca983798
--- /dev/null
+++ b/homeassistant/components/geonetnz_quakes/translations/cs.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "radius": "Polom\u011br"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geonetnz_quakes/translations/en.json b/homeassistant/components/geonetnz_quakes/translations/en.json
index 68f73bcf089..18ba6c06f6d 100644
--- a/homeassistant/components/geonetnz_quakes/translations/en.json
+++ b/homeassistant/components/geonetnz_quakes/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Location is already configured."
+            "already_configured": "Service is already configured"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_quakes/translations/es.json b/homeassistant/components/geonetnz_quakes/translations/es.json
index 0de80cf346a..371dc967a82 100644
--- a/homeassistant/components/geonetnz_quakes/translations/es.json
+++ b/homeassistant/components/geonetnz_quakes/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La ubicaci\u00f3n ya est\u00e1 configurada."
+            "already_configured": "El servicio ya est\u00e1 configurado"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_quakes/translations/et.json b/homeassistant/components/geonetnz_quakes/translations/et.json
new file mode 100644
index 00000000000..7df1adb08b5
--- /dev/null
+++ b/homeassistant/components/geonetnz_quakes/translations/et.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geonetnz_quakes/translations/it.json b/homeassistant/components/geonetnz_quakes/translations/it.json
index c07f04cdb64..a78f8f9fa2d 100644
--- a/homeassistant/components/geonetnz_quakes/translations/it.json
+++ b/homeassistant/components/geonetnz_quakes/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La posizione \u00e8 gi\u00e0 configurata."
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_quakes/translations/no.json b/homeassistant/components/geonetnz_quakes/translations/no.json
index fc3b339d807..24b3fb5d70c 100644
--- a/homeassistant/components/geonetnz_quakes/translations/no.json
+++ b/homeassistant/components/geonetnz_quakes/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Plasseringen er allerede konfigurert."
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_quakes/translations/pl.json b/homeassistant/components/geonetnz_quakes/translations/pl.json
index 80d891a441a..46c9f28102e 100644
--- a/homeassistant/components/geonetnz_quakes/translations/pl.json
+++ b/homeassistant/components/geonetnz_quakes/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_quakes/translations/ru.json b/homeassistant/components/geonetnz_quakes/translations/ru.json
index 7ee4f64431e..6e6fb5fe8ef 100644
--- a/homeassistant/components/geonetnz_quakes/translations/ru.json
+++ b/homeassistant/components/geonetnz_quakes/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_quakes/translations/zh-Hant.json b/homeassistant/components/geonetnz_quakes/translations/zh-Hant.json
index 1d697401b95..f022792121c 100644
--- a/homeassistant/components/geonetnz_quakes/translations/zh-Hant.json
+++ b/homeassistant/components/geonetnz_quakes/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u4f4d\u7f6e\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_volcano/config_flow.py b/homeassistant/components/geonetnz_volcano/config_flow.py
index c19e7d4b303..0658f073503 100644
--- a/homeassistant/components/geonetnz_volcano/config_flow.py
+++ b/homeassistant/components/geonetnz_volcano/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow to configure the GeoNet NZ Volcano integration."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -18,8 +16,6 @@ from homeassistant.helpers import config_validation as cv
 
 from .const import DEFAULT_RADIUS, DEFAULT_SCAN_INTERVAL, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @callback
 def configured_instances(hass):
@@ -61,7 +57,7 @@ class GeonetnzVolcanoFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
         identifier = f"{user_input[CONF_LATITUDE]}, {user_input[CONF_LONGITUDE]}"
         if identifier in configured_instances(self.hass):
-            return await self._show_form({"base": "identifier_exists"})
+            return await self._show_form({"base": "already_configured"})
 
         if self.hass.config.units.name == CONF_UNIT_SYSTEM_IMPERIAL:
             user_input[CONF_UNIT_SYSTEM] = CONF_UNIT_SYSTEM_IMPERIAL
diff --git a/homeassistant/components/geonetnz_volcano/strings.json b/homeassistant/components/geonetnz_volcano/strings.json
index d364d76b2ed..09f523c5266 100644
--- a/homeassistant/components/geonetnz_volcano/strings.json
+++ b/homeassistant/components/geonetnz_volcano/strings.json
@@ -6,6 +6,6 @@
         "data": { "radius": "Radius" }
       }
     },
-    "error": { "identifier_exists": "Location already registered" }
+    "abort": { "already_configured": "[%key:common::config_flow::abort::already_configured_location%]" }
   }
 }
diff --git a/homeassistant/components/geonetnz_volcano/translations/ca.json b/homeassistant/components/geonetnz_volcano/translations/ca.json
index 8af45618a17..5868d9acf93 100644
--- a/homeassistant/components/geonetnz_volcano/translations/ca.json
+++ b/homeassistant/components/geonetnz_volcano/translations/ca.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada"
+        },
         "error": {
             "identifier_exists": "Ubicaci\u00f3 ja registrada"
         },
diff --git a/homeassistant/components/geonetnz_volcano/translations/cs.json b/homeassistant/components/geonetnz_volcano/translations/cs.json
new file mode 100644
index 00000000000..03d10c800a9
--- /dev/null
+++ b/homeassistant/components/geonetnz_volcano/translations/cs.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "identifier_exists": "Um\u00edst\u011bn\u00ed ji\u017e existuje"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "radius": "Polom\u011br"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geonetnz_volcano/translations/en.json b/homeassistant/components/geonetnz_volcano/translations/en.json
index fe24b6dcea0..b6adecdeb7d 100644
--- a/homeassistant/components/geonetnz_volcano/translations/en.json
+++ b/homeassistant/components/geonetnz_volcano/translations/en.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Location is already configured"
+        },
         "error": {
             "identifier_exists": "Location already registered"
         },
diff --git a/homeassistant/components/geonetnz_volcano/translations/et.json b/homeassistant/components/geonetnz_volcano/translations/et.json
new file mode 100644
index 00000000000..413d9e20992
--- /dev/null
+++ b/homeassistant/components/geonetnz_volcano/translations/et.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Asukoht on juba m\u00e4\u00e4ratud"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/geonetnz_volcano/translations/no.json b/homeassistant/components/geonetnz_volcano/translations/no.json
index 646afcc1d16..b7bd20b3eb4 100644
--- a/homeassistant/components/geonetnz_volcano/translations/no.json
+++ b/homeassistant/components/geonetnz_volcano/translations/no.json
@@ -1,7 +1,10 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Plasseringen er allerede konfigurert"
+        },
         "error": {
-            "identifier_exists": "Beliggenhet er allerede registrert"
+            "identifier_exists": "Plasseringen er allerede registrert"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_volcano/translations/pl.json b/homeassistant/components/geonetnz_volcano/translations/pl.json
index 23a5640ae6f..3c3d829f1c7 100644
--- a/homeassistant/components/geonetnz_volcano/translations/pl.json
+++ b/homeassistant/components/geonetnz_volcano/translations/pl.json
@@ -1,7 +1,10 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
+        },
         "error": {
-            "identifier_exists": "Lokalizacja jest ju\u017c zarejestrowana."
+            "identifier_exists": "Lokalizacja jest ju\u017c zarejestrowana"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/geonetnz_volcano/translations/ru.json b/homeassistant/components/geonetnz_volcano/translations/ru.json
index 33a7f90b6a7..8610314b9aa 100644
--- a/homeassistant/components/geonetnz_volcano/translations/ru.json
+++ b/homeassistant/components/geonetnz_volcano/translations/ru.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+        },
         "error": {
             "identifier_exists": "\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043e."
         },
diff --git a/homeassistant/components/geonetnz_volcano/translations/zh-Hant.json b/homeassistant/components/geonetnz_volcano/translations/zh-Hant.json
index a587c9c0fd4..a7962258b75 100644
--- a/homeassistant/components/geonetnz_volcano/translations/zh-Hant.json
+++ b/homeassistant/components/geonetnz_volcano/translations/zh-Hant.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+        },
         "error": {
             "identifier_exists": "\u5ea7\u6a19\u5df2\u8a3b\u518a"
         },
diff --git a/homeassistant/components/gios/strings.json b/homeassistant/components/gios/strings.json
index 2187bcbc998..ce80aa8786a 100644
--- a/homeassistant/components/gios/strings.json
+++ b/homeassistant/components/gios/strings.json
@@ -5,7 +5,7 @@
         "title": "GIO\u015a (Polish Chief Inspectorate Of Environmental Protection)",
         "description": "Set up GIO\u015a (Polish Chief Inspectorate Of Environmental Protection) air quality integration. If you need help with the configuration have a look here: https://www.home-assistant.io/integrations/gios",
         "data": {
-          "name": "Name of the integration",
+          "name": "[%key:common::config_flow::data::name%]",
           "station_id": "ID of the measuring station"
         }
       }
@@ -13,10 +13,10 @@
     "error": {
       "wrong_station_id": "ID of the measuring station is not correct.",
       "invalid_sensors_data": "Invalid sensors' data for this measuring station.",
-      "cannot_connect": "Cannot connect to the GIO\u015a server."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "GIO\u015a integration for this measuring station is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]"
     }
   }
 }
diff --git a/homeassistant/components/gios/translations/ca.json b/homeassistant/components/gios/translations/ca.json
index 29703281b08..0f1e0b522e1 100644
--- a/homeassistant/components/gios/translations/ca.json
+++ b/homeassistant/components/gios/translations/ca.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La integraci\u00f3 GIO\u015a per a aquesta estaci\u00f3 ja est\u00e0 configurada."
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar al servidor de GIO\u015a.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_sensors_data": "Les dades dels sensors d'aquesta estaci\u00f3 de mesura s\u00f3n inv\u00e0lides.",
             "wrong_station_id": "L'ID de l'estaci\u00f3 de mesura \u00e9s incorrecte."
         },
         "step": {
             "user": {
                 "data": {
-                    "name": "Nom de la integraci\u00f3",
+                    "name": "Nom",
                     "station_id": "ID de l'estaci\u00f3 de mesura"
                 },
                 "description": "Integraci\u00f3 de mesura de qualitat de l'aire GIO\u015a (Polish Chief Inspectorate Of Environmental Protection). Si necessites ajuda amb la configuraci\u00f3, fes un cop d'ull a: https://www.home-assistant.io/integrations/gios",
diff --git a/homeassistant/components/gios/translations/cs.json b/homeassistant/components/gios/translations/cs.json
new file mode 100644
index 00000000000..9a552502afa
--- /dev/null
+++ b/homeassistant/components/gios/translations/cs.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_sensors_data": "Neplatn\u00e1 data senzor\u016f pro tuto m\u011b\u0159ic\u00ed stanici.",
+            "wrong_station_id": "ID m\u011b\u0159ic\u00ed stanice nen\u00ed spr\u00e1vn\u00e9."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "name": "Jm\u00e9no",
+                    "station_id": "ID m\u011b\u0159ic\u00ed stanice"
+                },
+                "description": "Nastaven\u00ed integrace kvality ovzdu\u0161\u00ed GIO\u015a (polsk\u00fd hlavn\u00ed inspektor\u00e1t ochrany \u017eivotn\u00edho prost\u0159ed\u00ed). Pokud pot\u0159ebujete pomoc s nastaven\u00edm, pod\u00edvejte se na: https://www.home-assistant.io/integrations/gios",
+                "title": "GIO\u015a (polsk\u00fd hlavn\u00ed inspektor\u00e1t ochrany \u017eivotn\u00edho prost\u0159ed\u00ed)"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gios/translations/en.json b/homeassistant/components/gios/translations/en.json
index 3d07ad843bd..abc49b1f5a0 100644
--- a/homeassistant/components/gios/translations/en.json
+++ b/homeassistant/components/gios/translations/en.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "GIO\u015a integration for this measuring station is already configured."
+            "already_configured": "Location is already configured"
         },
         "error": {
-            "cannot_connect": "Cannot connect to the GIO\u015a server.",
+            "cannot_connect": "Failed to connect",
             "invalid_sensors_data": "Invalid sensors' data for this measuring station.",
             "wrong_station_id": "ID of the measuring station is not correct."
         },
         "step": {
             "user": {
                 "data": {
-                    "name": "Name of the integration",
+                    "name": "Name",
                     "station_id": "ID of the measuring station"
                 },
                 "description": "Set up GIO\u015a (Polish Chief Inspectorate Of Environmental Protection) air quality integration. If you need help with the configuration have a look here: https://www.home-assistant.io/integrations/gios",
diff --git a/homeassistant/components/gios/translations/es.json b/homeassistant/components/gios/translations/es.json
index a7c30cd9d72..6888266716c 100644
--- a/homeassistant/components/gios/translations/es.json
+++ b/homeassistant/components/gios/translations/es.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La integraci\u00f3n de GIO\u015a para esta estaci\u00f3n de medici\u00f3n ya est\u00e1 configurada."
+            "already_configured": "La ubicaci\u00f3n ya est\u00e1 configurada"
         },
         "error": {
-            "cannot_connect": "No se puede conectar al servidor GIO\u015a.",
+            "cannot_connect": "No se pudo conectar",
             "invalid_sensors_data": "Datos de sensores no v\u00e1lidos para esta estaci\u00f3n de medici\u00f3n.",
             "wrong_station_id": "El ID de la estaci\u00f3n de medici\u00f3n no es correcta."
         },
         "step": {
             "user": {
                 "data": {
-                    "name": "Nombre de la integraci\u00f3n",
+                    "name": "Nombre",
                     "station_id": "ID de la estaci\u00f3n de medici\u00f3n"
                 },
                 "description": "Configurar la integraci\u00f3n de la calidad del aire GIO\u015a (Inspecci\u00f3n Jefe de Protecci\u00f3n Ambiental de Polonia). Si necesita ayuda con la configuraci\u00f3n, eche un vistazo aqu\u00ed: https://www.home-assistant.io/integrations/gios",
diff --git a/homeassistant/components/gios/translations/et.json b/homeassistant/components/gios/translations/et.json
new file mode 100644
index 00000000000..3c90c9b3abf
--- /dev/null
+++ b/homeassistant/components/gios/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Asukoht on juba m\u00e4\u00e4ratud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "name": "Nimi"
+                },
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gios/translations/it.json b/homeassistant/components/gios/translations/it.json
index e49fe2ebfe8..f1d7d60315e 100644
--- a/homeassistant/components/gios/translations/it.json
+++ b/homeassistant/components/gios/translations/it.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'integrazione GIO\u015a per questa stazione di misurazione \u00e8 gi\u00e0 configurata."
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi al server GIO\u015a.",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_sensors_data": "Dati dei sensori non validi per questa stazione di misura.",
             "wrong_station_id": "L'ID della stazione di misura non \u00e8 corretto."
         },
         "step": {
             "user": {
                 "data": {
-                    "name": "Nome dell'integrazione",
+                    "name": "Nome",
                     "station_id": "ID della stazione di misura"
                 },
                 "description": "Impostare l'integrazione della qualit\u00e0 dell'aria GIO\u015a (Ispettorato capo polacco di protezione ambientale). Se hai bisogno di aiuto con la configurazione dai un'occhiata qui: https://www.home-assistant.io/integrations/gios",
diff --git a/homeassistant/components/gios/translations/no.json b/homeassistant/components/gios/translations/no.json
index 784b75c9ee5..d80e3bcae1e 100644
--- a/homeassistant/components/gios/translations/no.json
+++ b/homeassistant/components/gios/translations/no.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "GIO\u015a-integrasjon for denne m\u00e5lestasjonen er allerede konfigurert."
+            "already_configured": "Plasseringen er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Kan ikke koble til GIO\u015a-tjeneren",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_sensors_data": "Ugyldig sensordata for denne m\u00e5lestasjonen",
             "wrong_station_id": "ID for m\u00e5lestasjon er ikke korrekt"
         },
         "step": {
             "user": {
                 "data": {
-                    "name": "Navn p\u00e5 integrasjon",
+                    "name": "Navn",
                     "station_id": "ID til m\u00e5lestasjon"
                 },
                 "description": "Sett opp GIO\u015a (Polish Chief Inspectorate Of Environmental Protection) luftkvalitet integrasjon. Hvis du trenger hjelp med konfigurasjonen ta en titt her: https://www.home-assistant.io/integrations/gios",
diff --git a/homeassistant/components/gios/translations/pl.json b/homeassistant/components/gios/translations/pl.json
index 4d4b07f31cc..1b35ab98993 100644
--- a/homeassistant/components/gios/translations/pl.json
+++ b/homeassistant/components/gios/translations/pl.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Integracja GIO\u015a dla tej stacji pomiarowej jest ju\u017c skonfigurowana."
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z serwerem GIO\u015a.",
-            "invalid_sensors_data": "Nieprawid\u0142owe dane sensor\u00f3w dla tej stacji pomiarowej.",
-            "wrong_station_id": "Identyfikator stacji pomiarowej nie jest prawid\u0142owy."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_sensors_data": "Nieprawid\u0142owe dane sensor\u00f3w dla tej stacji pomiarowej",
+            "wrong_station_id": "Identyfikator stacji pomiarowej nie jest prawid\u0142owy"
         },
         "step": {
             "user": {
                 "data": {
-                    "name": "Nazwa integracji",
+                    "name": "Nazwa",
                     "station_id": "Identyfikator stacji pomiarowej"
                 },
                 "description": "Konfiguracja integracji jako\u015bci powietrza GIO\u015a (G\u0142\u00f3wny Inspektorat Ochrony \u015arodowiska). Je\u015bli potrzebujesz pomocy z konfiguracj\u0105, przejd\u017a na stron\u0119: https://www.home-assistant.io/integrations/gios",
diff --git a/homeassistant/components/gios/translations/ru.json b/homeassistant/components/gios/translations/ru.json
index ca94b617c93..826cfc22d4d 100644
--- a/homeassistant/components/gios/translations/ru.json
+++ b/homeassistant/components/gios/translations/ru.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 GIO\u015a.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_sensors_data": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0441\u0435\u043d\u0441\u043e\u0440\u043e\u0432 \u0434\u043b\u044f \u044d\u0442\u043e\u0439 \u0438\u0437\u043c\u0435\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439 \u0441\u0442\u0430\u043d\u0446\u0438\u0438.",
             "wrong_station_id": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 ID \u0438\u0437\u043c\u0435\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439 \u0441\u0442\u0430\u043d\u0446\u0438\u0438."
         },
         "step": {
             "user": {
                 "data": {
-                    "name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438",
+                    "name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
                     "station_id": "ID \u0438\u0437\u043c\u0435\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439 \u0441\u0442\u0430\u043d\u0446\u0438\u0438"
                 },
                 "description": "\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0432\u043e\u0437\u0434\u0443\u0445\u0430 \u043e\u0442 \u041f\u043e\u043b\u044c\u0441\u043a\u043e\u0439 \u0438\u043d\u0441\u043f\u0435\u043a\u0446\u0438\u0438 \u043f\u043e \u043e\u0445\u0440\u0430\u043d\u0435 \u043e\u043a\u0440\u0443\u0436\u0430\u044e\u0449\u0435\u0439 \u0441\u0440\u0435\u0434\u044b (GIO\u015a). \u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u0435\u0439 \u043f\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0435 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438: https://www.home-assistant.io/integrations/gios.",
diff --git a/homeassistant/components/gios/translations/zh-Hant.json b/homeassistant/components/gios/translations/zh-Hant.json
index 0d75f83f9e5..4b8668e08a0 100644
--- a/homeassistant/components/gios/translations/zh-Hant.json
+++ b/homeassistant/components/gios/translations/zh-Hant.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64 GIO\u015a \u76e3\u6e2c\u7ad9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 GIO\u015a \u4f3a\u670d\u5668\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_sensors_data": "\u6b64\u76e3\u6e2c\u7ad9\u50b3\u611f\u5668\u8cc7\u6599\u7121\u6548\u3002",
             "wrong_station_id": "\u76e3\u6e2c\u7ad9 ID \u4e0d\u6b63\u78ba\u3002"
         },
         "step": {
             "user": {
                 "data": {
-                    "name": "\u6574\u5408\u540d\u7a31",
+                    "name": "\u540d\u7a31",
                     "station_id": "\u76e3\u6e2c\u7ad9 ID"
                 },
                 "description": "\u8a2d\u5b9a GIO\u015a\uff08\u6ce2\u862d\u7e3d\u74b0\u5883\u4fdd\u8b77\u7763\u5bdf\u8655\uff09\u7a7a\u6c23\u54c1\u8cea\u6574\u5408\u3002\u5047\u5982\u9700\u8981\u5354\u52a9\uff0c\u8acb\u53c3\u8003\uff1ahttps://www.home-assistant.io/integrations/gios",
diff --git a/homeassistant/components/glances/sensor.py b/homeassistant/components/glances/sensor.py
index deb8650cd4f..fb36312cf1e 100644
--- a/homeassistant/components/glances/sensor.py
+++ b/homeassistant/components/glances/sensor.py
@@ -1,6 +1,4 @@
 """Support gathering system information of hosts which are running glances."""
-import logging
-
 from homeassistant.const import CONF_NAME, STATE_UNAVAILABLE
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -8,8 +6,6 @@ from homeassistant.helpers.entity import Entity
 
 from .const import DATA_UPDATED, DOMAIN, SENSOR_TYPES
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Glances sensors."""
diff --git a/homeassistant/components/glances/strings.json b/homeassistant/components/glances/strings.json
index 68f59c50f98..5d96b1ae57e 100644
--- a/homeassistant/components/glances/strings.json
+++ b/homeassistant/components/glances/strings.json
@@ -4,23 +4,23 @@
       "user": {
         "title": "Setup Glances",
         "data": {
-          "name": "Name",
+          "name": "[%key:common::config_flow::data::name%]",
           "host": "[%key:common::config_flow::data::host%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
           "port": "[%key:common::config_flow::data::port%]",
           "version": "Glances API Version (2 or 3)",
-          "ssl": "Use SSL/TLS to connect to the Glances system",
-          "verify_ssl": "Verify the certification of the system"
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         }
       }
     },
     "error": {
-      "cannot_connect": "Unable to connect to host",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "wrong_version": "Version not supported (2 or 3 only)"
     },
     "abort": {
-      "already_configured": "Host is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
@@ -33,4 +33,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/glances/translations/ca.json b/homeassistant/components/glances/translations/ca.json
index 7da63024f8b..1ef17e201a4 100644
--- a/homeassistant/components/glances/translations/ca.json
+++ b/homeassistant/components/glances/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'amfitri\u00f3 ja est\u00e0 configurat."
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar amb l'amfitri\u00f3",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "wrong_version": "Versi\u00f3 no compatible (2 o 3 necess\u00e0ria)"
         },
         "step": {
@@ -14,9 +14,9 @@
                     "name": "Nom",
                     "password": "Contrasenya",
                     "port": "Port",
-                    "ssl": "Utilitza SSL/TLS per connectar-te al sistema Glances",
+                    "ssl": "Utilitza un certificat SSL",
                     "username": "Nom d'usuari",
-                    "verify_ssl": "Verifica la certificaci\u00f3 del sistema",
+                    "verify_ssl": "Verifica el certificat SSL",
                     "version": "Versi\u00f3 de l'API de Glances (2 o 3)"
                 },
                 "title": "Configuraci\u00f3 de Glances"
diff --git a/homeassistant/components/glances/translations/cs.json b/homeassistant/components/glances/translations/cs.json
index 23ddc89a94d..198731bdb3e 100644
--- a/homeassistant/components/glances/translations/cs.json
+++ b/homeassistant/components/glances/translations/cs.json
@@ -1,13 +1,35 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "wrong_version": "Verze nen\u00ed podporov\u00e1na (pouze 2 nebo 3)"
+        },
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel",
+                    "name": "Jm\u00e9no",
                     "password": "Heslo",
                     "port": "Port",
-                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no",
+                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL",
+                    "version": "Verze API pro Glances (2 nebo 3)"
+                },
+                "title": "Nastavte Glances"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Frekvence aktualizac\u00ed"
+                },
+                "description": "Nastavte mo\u017enosti pro Glances"
             }
         }
     }
diff --git a/homeassistant/components/glances/translations/en.json b/homeassistant/components/glances/translations/en.json
index 0330e8cef65..87c53c3cf48 100644
--- a/homeassistant/components/glances/translations/en.json
+++ b/homeassistant/components/glances/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Host is already configured."
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Unable to connect to host",
+            "cannot_connect": "Failed to connect",
             "wrong_version": "Version not supported (2 or 3 only)"
         },
         "step": {
@@ -14,9 +14,9 @@
                     "name": "Name",
                     "password": "Password",
                     "port": "Port",
-                    "ssl": "Use SSL/TLS to connect to the Glances system",
+                    "ssl": "Uses an SSL certificate",
                     "username": "Username",
-                    "verify_ssl": "Verify the certification of the system",
+                    "verify_ssl": "Verify SSL certificate",
                     "version": "Glances API Version (2 or 3)"
                 },
                 "title": "Setup Glances"
diff --git a/homeassistant/components/glances/translations/es.json b/homeassistant/components/glances/translations/es.json
index 16b768fd922..5560276ff3d 100644
--- a/homeassistant/components/glances/translations/es.json
+++ b/homeassistant/components/glances/translations/es.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El host ya est\u00e1 configurado."
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se puede conectar al host",
+            "cannot_connect": "No se pudo conectar",
             "wrong_version": "Versi\u00f3n no soportada (s\u00f3lo 2 o 3)"
         },
         "step": {
@@ -14,9 +14,9 @@
                     "name": "Nombre",
                     "password": "Contrase\u00f1a",
                     "port": "Puerto",
-                    "ssl": "Utilice SSL/TLS para conectarse al sistema Glances",
+                    "ssl": "Utiliza un certificado SSL",
                     "username": "Usuario",
-                    "verify_ssl": "Verificar la certificaci\u00f3n del sistema",
+                    "verify_ssl": "Verificar certificado SSL",
                     "version": "Versi\u00f3n API Glances (2 o 3)"
                 },
                 "title": "Configurar Glances"
diff --git a/homeassistant/components/glances/translations/et.json b/homeassistant/components/glances/translations/et.json
new file mode 100644
index 00000000000..654196d1020
--- /dev/null
+++ b/homeassistant/components/glances/translations/et.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "name": "Nimi",
+                    "password": "Salas\u00f5na",
+                    "port": "Port",
+                    "ssl": "Kasutab SSL serti",
+                    "username": "Kasutajanimi",
+                    "verify_ssl": "Kontrolli SSL sertifikaati"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/glances/translations/it.json b/homeassistant/components/glances/translations/it.json
index 7e8d5af6d8f..f4806c5d952 100644
--- a/homeassistant/components/glances/translations/it.json
+++ b/homeassistant/components/glances/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'host \u00e8 gi\u00e0 configurato."
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi all'host",
+            "cannot_connect": "Impossibile connettersi",
             "wrong_version": "Versione non supportata (solo 2 o 3)"
         },
         "step": {
@@ -14,9 +14,9 @@
                     "name": "Nome",
                     "password": "Password",
                     "port": "Porta",
-                    "ssl": "Utilizzare SSL/TLS per connettersi al sistema Glances",
+                    "ssl": "Utilizza un certificato SSL",
                     "username": "Nome utente",
-                    "verify_ssl": "Verificare la certificazione del sistema",
+                    "verify_ssl": "Verificare il certificato SSL",
                     "version": "Glances API Version (2 o 3)"
                 },
                 "title": "Impostare Glances"
diff --git a/homeassistant/components/glances/translations/no.json b/homeassistant/components/glances/translations/no.json
index dd593c4add6..073d764f67a 100644
--- a/homeassistant/components/glances/translations/no.json
+++ b/homeassistant/components/glances/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Verten er allerede konfigurert."
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Kan ikke koble til vert",
+            "cannot_connect": "Tilkobling mislyktes",
             "wrong_version": "Versjonen st\u00f8ttes ikke (bare 2 eller 3)"
         },
         "step": {
@@ -13,10 +13,10 @@
                     "host": "Vert",
                     "name": "Navn",
                     "password": "Passord",
-                    "port": "",
-                    "ssl": "Bruk SSL / TLS for \u00e5 koble til Glances-systemet",
+                    "port": "Port",
+                    "ssl": "Bruker et SSL-sertifikat",
                     "username": "Brukernavn",
-                    "verify_ssl": "Bekreft sertifiseringen av systemet",
+                    "verify_ssl": "Verifisere SSL-sertifikat",
                     "version": "Glances API-versjon (2 eller 3)"
                 },
                 "title": "Oppsett av Glances"
diff --git a/homeassistant/components/glances/translations/pl.json b/homeassistant/components/glances/translations/pl.json
index 25179e951ad..abef0a78208 100644
--- a/homeassistant/components/glances/translations/pl.json
+++ b/homeassistant/components/glances/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Host jest ju\u017c skonfigurowany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z hostem",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "wrong_version": "Wersja nieobs\u0142ugiwana (tylko 2 lub 3)"
         },
         "step": {
@@ -14,9 +14,9 @@
                     "name": "Nazwa",
                     "password": "Has\u0142o",
                     "port": "Port",
-                    "ssl": "U\u017cyj SSL/TLS, aby po\u0142\u0105czy\u0107 si\u0119 z systemem Glances",
+                    "ssl": "Certyfikat SSL",
                     "username": "Nazwa u\u017cytkownika",
-                    "verify_ssl": "Sprawd\u017a certyfikacj\u0119 systemu",
+                    "verify_ssl": "Weryfikacja certyfikatu SSL",
                     "version": "Glances wersja API (2 lub 3)"
                 },
                 "title": "Konfiguracja Glances"
diff --git a/homeassistant/components/glances/translations/ru.json b/homeassistant/components/glances/translations/ru.json
index d87bcb536cf..0dc8c72dc9f 100644
--- a/homeassistant/components/glances/translations/ru.json
+++ b/homeassistant/components/glances/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0445\u043e\u0441\u0442\u0443.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "wrong_version": "\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044e\u0442\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0432\u0435\u0440\u0441\u0438\u0438 2 \u0438 3."
         },
         "step": {
@@ -14,9 +14,9 @@
                     "name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c SSL / TLS \u0434\u043b\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f",
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
                     "username": "\u041b\u043e\u0433\u0438\u043d",
-                    "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e \u0441\u0438\u0441\u0442\u0435\u043c\u044b",
+                    "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
                     "version": "\u0412\u0435\u0440\u0441\u0438\u044f API Glances (2 \u0438\u043b\u0438 3)"
                 },
                 "title": "Glances"
diff --git a/homeassistant/components/glances/translations/zh-Hans.json b/homeassistant/components/glances/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/glances/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/glances/translations/zh-Hant.json b/homeassistant/components/glances/translations/zh-Hant.json
index dd7c3711e37..0054edbdb0d 100644
--- a/homeassistant/components/glances/translations/zh-Hant.json
+++ b/homeassistant/components/glances/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u4e3b\u6a5f\u7aef\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3\u4e3b\u6a5f\u7aef",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "wrong_version": "\u7248\u672c\u4e0d\u652f\u63f4\uff08\u50c5 2 \u6216 3\uff09"
         },
         "step": {
@@ -14,9 +14,9 @@
                     "name": "\u540d\u7a31",
                     "password": "\u5bc6\u78bc",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "\u4f7f\u7528 SSL/TLS \u9023\u7dda\u81f3 Glances \u7cfb\u7d71",
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
                     "username": "\u4f7f\u7528\u8005\u540d\u7a31",
-                    "verify_ssl": "\u9a57\u8b49\u7cfb\u7d71\u8a8d\u8b49",
+                    "verify_ssl": "\u78ba\u8a8d SSL \u8a8d\u8b49",
                     "version": "Glances API \u7248\u672c\uff082 \u6216 3\uff09"
                 },
                 "title": "\u8a2d\u5b9a Glances"
diff --git a/homeassistant/components/goalzero/__init__.py b/homeassistant/components/goalzero/__init__.py
index 892ee46982d..ff60a9ac043 100644
--- a/homeassistant/components/goalzero/__init__.py
+++ b/homeassistant/components/goalzero/__init__.py
@@ -3,13 +3,11 @@ import asyncio
 import logging
 
 from goalzero import Yeti, exceptions
-import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -17,33 +15,10 @@ from homeassistant.helpers.update_coordinator import (
     UpdateFailed,
 )
 
-from .const import (
-    DATA_KEY_API,
-    DATA_KEY_COORDINATOR,
-    DEFAULT_NAME,
-    DOMAIN,
-    MIN_TIME_BETWEEN_UPDATES,
-)
+from .const import DATA_KEY_API, DATA_KEY_COORDINATOR, DOMAIN, MIN_TIME_BETWEEN_UPDATES
 
 _LOGGER = logging.getLogger(__name__)
 
-GOALZERO_SCHEMA = vol.Schema(
-    vol.All(
-        {
-            vol.Required(CONF_HOST): cv.matches_regex(
-                r"\A(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2 \
-            [0-4][0-9]|[01]?[0-9][0-9]?)\Z"
-            ),
-            vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        },
-    )
-)
-
-CONFIG_SCHEMA = vol.Schema(
-    {DOMAIN: vol.Schema(vol.All(cv.ensure_list, [GOALZERO_SCHEMA]))},
-    extra=vol.ALLOW_EXTRA,
-)
-
 
 PLATFORMS = ["binary_sensor"]
 
@@ -61,8 +36,6 @@ async def async_setup_entry(hass, entry):
     name = entry.data[CONF_NAME]
     host = entry.data[CONF_HOST]
 
-    _LOGGER.debug("Setting up %s integration with host %s", DOMAIN, host)
-
     session = async_get_clientsession(hass)
     api = Yeti(host, hass.loop, session)
     try:
@@ -76,7 +49,6 @@ async def async_setup_entry(hass, entry):
         try:
             await api.get_state()
         except exceptions.ConnectError as err:
-            _LOGGER.warning("Failed to update data from Yeti")
             raise UpdateFailed(f"Failed to communicating with API: {err}") from err
 
     coordinator = DataUpdateCoordinator(
@@ -117,10 +89,10 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
 class YetiEntity(CoordinatorEntity):
     """Representation of a Goal Zero Yeti entity."""
 
-    def __init__(self, _api, coordinator, name, sensor_name, server_unique_id):
+    def __init__(self, api, coordinator, name, server_unique_id):
         """Initialize a Goal Zero Yeti entity."""
         super().__init__(coordinator)
-        self.api = _api
+        self.api = api
         self._name = name
         self._server_unique_id = server_unique_id
         self._device_class = None
diff --git a/homeassistant/components/goalzero/binary_sensor.py b/homeassistant/components/goalzero/binary_sensor.py
index 25b370c459f..a2af8a18546 100644
--- a/homeassistant/components/goalzero/binary_sensor.py
+++ b/homeassistant/components/goalzero/binary_sensor.py
@@ -30,14 +30,13 @@ class YetiBinarySensor(YetiEntity, BinarySensorEntity):
 
     def __init__(self, api, coordinator, name, sensor_name, server_unique_id):
         """Initialize a Goal Zero Yeti sensor."""
-        super().__init__(api, coordinator, name, sensor_name, server_unique_id)
+        super().__init__(api, coordinator, name, server_unique_id)
 
         self._condition = sensor_name
 
         variable_info = BINARY_SENSOR_DICT[sensor_name]
         self._condition_name = variable_info[0]
         self._icon = variable_info[2]
-        self.api = api
         self._device_class = variable_info[1]
 
     @property
@@ -55,6 +54,7 @@ class YetiBinarySensor(YetiEntity, BinarySensorEntity):
         """Return if the service is on."""
         if self.api.data:
             return self.api.data[self._condition] == 1
+        return False
 
     @property
     def icon(self):
diff --git a/homeassistant/components/goalzero/config_flow.py b/homeassistant/components/goalzero/config_flow.py
index 31c1a51efeb..35b6953865c 100644
--- a/homeassistant/components/goalzero/config_flow.py
+++ b/homeassistant/components/goalzero/config_flow.py
@@ -34,19 +34,20 @@ class GoalZeroFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
             try:
                 await self._async_try_connect(host)
+            except exceptions.ConnectError:
+                errors["base"] = "cannot_connect"
+                _LOGGER.error("Error connecting to device at %s", host)
+            except exceptions.InvalidHost:
+                errors["base"] = "invalid_host"
+                _LOGGER.error("Invalid host at %s", host)
+            except Exception:  # pylint: disable=broad-except
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
+            else:
                 return self.async_create_entry(
                     title=name,
                     data={CONF_HOST: host, CONF_NAME: name},
                 )
-            except exceptions.ConnectError:
-                errors["base"] = "cannot_connect"
-                _LOGGER.exception("Error connecting to device at %s", host)
-            except exceptions.InvalidHost:
-                errors["base"] = "invalid_host"
-                _LOGGER.exception("Invalid data received from device at %s", host)
-            except Exception:  # pylint: disable=broad-except
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
 
         user_input = user_input or {}
         return self.async_show_form(
@@ -67,7 +68,8 @@ class GoalZeroFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     async def _async_endpoint_existed(self, endpoint):
         for entry in self._async_current_entries():
             if endpoint == entry.data.get(CONF_HOST):
-                return endpoint
+                return True
+        return False
 
     async def _async_try_connect(self, host):
         session = async_get_clientsession(self.hass)
diff --git a/homeassistant/components/goalzero/strings.json b/homeassistant/components/goalzero/strings.json
index e7a134c01ec..0a1b8909f54 100644
--- a/homeassistant/components/goalzero/strings.json
+++ b/homeassistant/components/goalzero/strings.json
@@ -6,14 +6,14 @@
         "description": "First, you need to download the Goal Zero app: https://www.goalzero.com/product-features/yeti-app/\n\nFollow the instructions to connect your Yeti to your Wifi network. Then get the host ip from your router. DHCP must be set up in your router settings for the device to ensure the host ip does not change. Refer to your router's user manual.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
-          "name": "Name"
+          "name": "[%key:common::config_flow::data::name%]"
         }
       }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_host": "This is not the Yeti you are looking for",
-      "unknown": "Unknown Error"
+      "invalid_host": "[%key:common::config_flow::error::invalid_host%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
diff --git a/homeassistant/components/goalzero/translations/ca.json b/homeassistant/components/goalzero/translations/ca.json
index 56d181f5d98..2d301d5ef07 100644
--- a/homeassistant/components/goalzero/translations/ca.json
+++ b/homeassistant/components/goalzero/translations/ca.json
@@ -5,14 +5,14 @@
         },
         "error": {
             "cannot_connect": "Ha fallat la connexi\u00f3",
-            "invalid_host": "Aquest no \u00e9s el Yeti que est\u00e0s buscant",
-            "unknown": "Error desconegut"
+            "invalid_host": "Nom de l'amfitri\u00f3 o l'adre\u00e7a IP inv\u00e0lids",
+            "unknown": "Error inesperat"
         },
         "step": {
             "user": {
                 "data": {
                     "host": "Amfitri\u00f3",
-                    "name": "Name"
+                    "name": "Nom"
                 },
                 "description": "En primer lloc, has de baixar-te l'aplicaci\u00f3 Goal Zero: https://www.goalzero.com/product-features/yeti-app/ \n\nSegueix les instruccions per connectar el teu Yeti a la teva xarxa Wifi. A continuaci\u00f3, has d'obtenir la IP d'amfitri\u00f3 del teu encaminador (router). Cal que aquest tingui la configuraci\u00f3 DHCP activada per al teu dispositiu per aix\u00ed garantir que la IP no canvi\u00ef. Si cal, consulta el manual del teu encaminador.",
                 "title": "Goal Zero Yeti"
diff --git a/homeassistant/components/goalzero/translations/cs.json b/homeassistant/components/goalzero/translations/cs.json
new file mode 100644
index 00000000000..db33844a04d
--- /dev/null
+++ b/homeassistant/components/goalzero/translations/cs.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_host": "Neplatn\u00fd hostitel nebo IP adresa",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Hostitel",
+                    "name": "Jm\u00e9no"
+                },
+                "title": "Goal Zero Yeti"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/goalzero/translations/en.json b/homeassistant/components/goalzero/translations/en.json
index 98cfa4f6f33..08c823e2ad2 100644
--- a/homeassistant/components/goalzero/translations/en.json
+++ b/homeassistant/components/goalzero/translations/en.json
@@ -5,8 +5,8 @@
         },
         "error": {
             "cannot_connect": "Failed to connect",
-            "invalid_host": "This is not the Yeti you are looking for",
-            "unknown": "Unknown Error"
+            "invalid_host": "Invalid hostname or IP address",
+            "unknown": "Unexpected error"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/goalzero/translations/es.json b/homeassistant/components/goalzero/translations/es.json
index 4897899d8c3..4a2c7eeca62 100644
--- a/homeassistant/components/goalzero/translations/es.json
+++ b/homeassistant/components/goalzero/translations/es.json
@@ -5,8 +5,8 @@
         },
         "error": {
             "cannot_connect": "No se pudo conectar",
-            "invalid_host": "Este no es el Yeti que est\u00e1s buscando",
-            "unknown": "Error desconocido"
+            "invalid_host": "Nombre de host o direcci\u00f3n IP no v\u00e1lidos",
+            "unknown": "Error inesperado"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/goalzero/translations/et.json b/homeassistant/components/goalzero/translations/et.json
new file mode 100644
index 00000000000..4479ba8669e
--- /dev/null
+++ b/homeassistant/components/goalzero/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_host": "Vale hostinimi v\u00f5i IP aadress",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "name": "Nimi"
+                },
+                "description": "Alustuseks peate alla laadima rakenduse Goal Zero: https://www.goalzero.com/product-features/yeti-app/\n\n Yeti Wifi-v\u00f5rguga \u00fchendamiseks j\u00e4rgige juhiseid. Seej\u00e4rel hankige oma ruuterilt host IP. DHCP peab olema ruuteri seadetes seadistatud, et tagada, et host-IP ei muutuks. Vaadake ruuteri kasutusjuhendit.",
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/goalzero/translations/it.json b/homeassistant/components/goalzero/translations/it.json
index 2a76a68ace5..10df269d59a 100644
--- a/homeassistant/components/goalzero/translations/it.json
+++ b/homeassistant/components/goalzero/translations/it.json
@@ -4,13 +4,18 @@
             "already_configured": "L'account \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi"
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_host": "Nome host o indirizzo IP non valido",
+            "unknown": "Errore imprevisto"
         },
         "step": {
             "user": {
                 "data": {
-                    "host": "Host"
-                }
+                    "host": "Host",
+                    "name": "Nome"
+                },
+                "description": "Innanzitutto, devi scaricare l'app Goal Zero: https://www.goalzero.com/product-features/yeti-app/\n\nSegui le istruzioni per connettere il tuo Yeti alla tua rete Wifi. Quindi ottieni l'ip host dal tuo router. Il DHCP deve essere configurato nelle impostazioni del router affinch\u00e9 il dispositivo assicuri che l'ip host non cambi. Fare riferimento al manuale utente del router.",
+                "title": "Goal Zero Yeti"
             }
         }
     }
diff --git a/homeassistant/components/goalzero/translations/lb.json b/homeassistant/components/goalzero/translations/lb.json
index 5972c69873b..87a5590bfe4 100644
--- a/homeassistant/components/goalzero/translations/lb.json
+++ b/homeassistant/components/goalzero/translations/lb.json
@@ -5,8 +5,8 @@
         },
         "error": {
             "cannot_connect": "Feeler beim verbannen",
-            "invalid_host": "D\u00ebst ass net de gesichte Yeti",
-            "unknown": "Onbekannte Feeler"
+            "invalid_host": "Ong\u00ebltege Numm oder IP Adresse",
+            "unknown": "Onerwaarte Feeler"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/goalzero/translations/nl.json b/homeassistant/components/goalzero/translations/nl.json
new file mode 100644
index 00000000000..50f6dcd1b87
--- /dev/null
+++ b/homeassistant/components/goalzero/translations/nl.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Account is al geconfigureerd"
+        },
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken",
+            "invalid_host": "Onjuiste hostnaam of IP-adres",
+            "unknown": "Onverwachte fout"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "name": "Naam"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/goalzero/translations/no.json b/homeassistant/components/goalzero/translations/no.json
index eafe3e7715a..1aaf27d1b09 100644
--- a/homeassistant/components/goalzero/translations/no.json
+++ b/homeassistant/components/goalzero/translations/no.json
@@ -4,9 +4,9 @@
             "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
-            "invalid_host": "Dette er ikke Yetien du leter etter",
-            "unknown": "Ukjent feil"
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_host": "Ugyldig vertsnavn eller IP-adresse",
+            "unknown": "Uventet feil"
         },
         "step": {
             "user": {
@@ -15,7 +15,7 @@
                     "name": "Navn"
                 },
                 "description": "F\u00f8rst m\u00e5 du laste ned appen Goal Zero: https://www.goalzero.com/product-features/yeti-app/ \n\n F\u00f8lg instruksjonene for \u00e5 koble Yeti til Wifi-nettverket. S\u00e5 f\u00e5 verts-ip fra ruteren din. DHCP m\u00e5 v\u00e6re satt opp i ruteren innstillinger for enheten for \u00e5 sikre at verts-IP ikke endres. Se brukerh\u00e5ndboken til ruteren.",
-                "title": "Goal Zero Yeti"
+                "title": ""
             }
         }
     }
diff --git a/homeassistant/components/goalzero/translations/pl.json b/homeassistant/components/goalzero/translations/pl.json
index 5a196f56b03..c71b35d54a6 100644
--- a/homeassistant/components/goalzero/translations/pl.json
+++ b/homeassistant/components/goalzero/translations/pl.json
@@ -4,13 +4,18 @@
             "already_configured": "Konto jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_host": "Nieprawid\u0142owa nazwa hosta lub adres IP",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "user": {
                 "data": {
-                    "host": "Nazwa hosta lub adres IP"
-                }
+                    "host": "Nazwa hosta lub adres IP",
+                    "name": "Nazwa"
+                },
+                "description": "Najpierw musisz pobra\u0107 aplikacj\u0119 Goal Zero: https://www.goalzero.com/product-features/yeti-app/\n\nPost\u0119puj zgodnie z instrukcjami, aby pod\u0142\u0105czy\u0107 Yeti do sieci Wi-Fi. Nast\u0119pnie uzyskaj adres IP hosta z routera. W ustawieniach routera nale\u017cy skonfigurowa\u0107 DHCP, aby upewni\u0107 si\u0119, \u017ce adres IP hosta nie ulegnie zmianie. Post\u0119puj wg instrukcji obs\u0142ugi routera.",
+                "title": "Goal Zero Yeti"
             }
         }
     }
diff --git a/homeassistant/components/goalzero/translations/ru.json b/homeassistant/components/goalzero/translations/ru.json
index 96f77605d82..5eee4e70e98 100644
--- a/homeassistant/components/goalzero/translations/ru.json
+++ b/homeassistant/components/goalzero/translations/ru.json
@@ -5,8 +5,8 @@
         },
         "error": {
             "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
-            "invalid_host": "\u042d\u0442\u043e \u043d\u0435 \u0442\u043e\u0442 Yeti, \u043a\u043e\u0442\u043e\u0440\u043e\u0433\u043e \u0412\u044b \u0438\u0449\u0435\u0442\u0435.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+            "invalid_host": "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0434\u043e\u043c\u0435\u043d\u043d\u043e\u0435 \u0438\u043c\u044f \u0438\u043b\u0438 IP-\u0430\u0434\u0440\u0435\u0441.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/goalzero/translations/zh-Hant.json b/homeassistant/components/goalzero/translations/zh-Hant.json
index cde1a763b6b..b033c16afb6 100644
--- a/homeassistant/components/goalzero/translations/zh-Hant.json
+++ b/homeassistant/components/goalzero/translations/zh-Hant.json
@@ -5,8 +5,8 @@
         },
         "error": {
             "cannot_connect": "\u9023\u7dda\u5931\u6557",
-            "invalid_host": "\u4e26\u4e0d\u662f\u6240\u8981\u641c\u5c0b\u7684 Yeti",
-            "unknown": "\u672a\u77e5\u932f\u8aa4"
+            "invalid_host": "\u7121\u6548\u4e3b\u6a5f\u540d\u7a31\u6216 IP \u4f4d\u5740",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/gogogate2/common.py b/homeassistant/components/gogogate2/common.py
index bf333ab5898..d17dd7033fe 100644
--- a/homeassistant/components/gogogate2/common.py
+++ b/homeassistant/components/gogogate2/common.py
@@ -3,7 +3,6 @@ from datetime import timedelta
 import logging
 from typing import Awaitable, Callable, NamedTuple, Optional
 
-import async_timeout
 from gogogate2_api import AbstractGateApi, GogoGate2Api, ISmartGateApi
 from gogogate2_api.common import AbstractDoor
 
@@ -71,8 +70,7 @@ def get_data_update_coordinator(
 
         async def async_update_data():
             try:
-                async with async_timeout.timeout(3):
-                    return await hass.async_add_executor_job(api.info)
+                return await hass.async_add_executor_job(api.info)
             except Exception as exception:
                 raise UpdateFailed(
                     f"Error communicating with API: {exception}"
diff --git a/homeassistant/components/gogogate2/config_flow.py b/homeassistant/components/gogogate2/config_flow.py
index 3642e28ccac..5779ccaaa65 100644
--- a/homeassistant/components/gogogate2/config_flow.py
+++ b/homeassistant/components/gogogate2/config_flow.py
@@ -1,6 +1,5 @@
 """Config flow for Gogogate2."""
 import dataclasses
-import logging
 import re
 
 from gogogate2_api.common import AbstractInfoResponse, ApiError
@@ -20,8 +19,6 @@ from .common import get_api
 from .const import DEVICE_TYPE_GOGOGATE2, DEVICE_TYPE_ISMARTGATE
 from .const import DOMAIN  # pylint: disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class Gogogate2FlowHandler(ConfigFlow, domain=DOMAIN):
     """Gogogate2 config flow."""
diff --git a/homeassistant/components/gogogate2/cover.py b/homeassistant/components/gogogate2/cover.py
index e748b420edb..08520ad46ee 100644
--- a/homeassistant/components/gogogate2/cover.py
+++ b/homeassistant/components/gogogate2/cover.py
@@ -1,5 +1,4 @@
 """Support for Gogogate2 garage Doors."""
-import logging
 from typing import Callable, List, Optional
 
 from gogogate2_api.common import (
@@ -36,9 +35,6 @@ from .common import (
 )
 from .const import DEVICE_TYPE_GOGOGATE2, DEVICE_TYPE_ISMARTGATE, DOMAIN, MANUFACTURER
 
-_LOGGER = logging.getLogger(__name__)
-
-
 COVER_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_IP_ADDRESS): cv.string,
diff --git a/homeassistant/components/gogogate2/strings.json b/homeassistant/components/gogogate2/strings.json
index 47a53d0d320..f5385ff5d54 100644
--- a/homeassistant/components/gogogate2/strings.json
+++ b/homeassistant/components/gogogate2/strings.json
@@ -12,7 +12,7 @@
         "title": "Setup GogoGate2 or iSmartGate",
         "description": "Provide requisite information below.",
         "data": {
-          "ip_address": "IP Address",
+          "ip_address": "[%key:common::config_flow::data::ip%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
         }
diff --git a/homeassistant/components/gogogate2/translations/cs.json b/homeassistant/components/gogogate2/translations/cs.json
index c46cedfa272..bf8a20ba409 100644
--- a/homeassistant/components/gogogate2/translations/cs.json
+++ b/homeassistant/components/gogogate2/translations/cs.json
@@ -10,9 +10,12 @@
         "step": {
             "user": {
                 "data": {
+                    "ip_address": "IP adresa",
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "description": "N\u00ed\u017ee zadejte po\u017eadovan\u00e9 informace.",
+                "title": "Nastaven\u00ed GogoGate2 nebo iSmartGate"
             }
         }
     }
diff --git a/homeassistant/components/gogogate2/translations/et.json b/homeassistant/components/gogogate2/translations/et.json
new file mode 100644
index 00000000000..5c68fd43010
--- /dev/null
+++ b/homeassistant/components/gogogate2/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP aadress",
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gogogate2/translations/lb.json b/homeassistant/components/gogogate2/translations/lb.json
index 4183e7dcbc7..796fef2c487 100644
--- a/homeassistant/components/gogogate2/translations/lb.json
+++ b/homeassistant/components/gogogate2/translations/lb.json
@@ -15,7 +15,7 @@
                     "username": "Benotzernumm"
                 },
                 "description": "G\u00ebff noutwendeg Informatioun hei \u00ebnnen un.",
-                "title": "GogoGate 2 ariichten"
+                "title": "GogoGate 2 oder iSmartGate ariichten"
             }
         }
     }
diff --git a/homeassistant/components/gogogate2/translations/no.json b/homeassistant/components/gogogate2/translations/no.json
index b050a2eadd1..315a5fa9e2a 100644
--- a/homeassistant/components/gogogate2/translations/no.json
+++ b/homeassistant/components/gogogate2/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "cannot_connect": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning"
         },
         "step": {
diff --git a/homeassistant/components/gogogate2/translations/zh-Hans.json b/homeassistant/components/gogogate2/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/gogogate2/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/google_assistant/helpers.py b/homeassistant/components/google_assistant/helpers.py
index 8ec2bce4602..48664bff395 100644
--- a/homeassistant/components/google_assistant/helpers.py
+++ b/homeassistant/components/google_assistant/helpers.py
@@ -343,6 +343,15 @@ class GoogleEntity:
         state = self.state
         domain = state.domain
         features = state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
+
+        if not isinstance(features, int):
+            _LOGGER.warning(
+                "Entity %s contains invalid supported_features value %s",
+                self.entity_id,
+                features,
+            )
+            return []
+
         device_class = state.attributes.get(ATTR_DEVICE_CLASS)
 
         self._traits = [
diff --git a/homeassistant/components/google_assistant/report_state.py b/homeassistant/components/google_assistant/report_state.py
index 6fc9de53e4a..8ffdad14140 100644
--- a/homeassistant/components/google_assistant/report_state.py
+++ b/homeassistant/components/google_assistant/report_state.py
@@ -45,8 +45,14 @@ def async_enable_report_state(hass: HomeAssistant, google_config: AbstractConfig
             old_entity = GoogleEntity(hass, google_config, old_state)
 
             # Only report to Google if data that Google cares about has changed
-            if entity_data == old_entity.query_serialize():
-                return
+            try:
+                if entity_data == old_entity.query_serialize():
+                    return
+            except SmartHomeError:
+                # Happens if old state could not be serialized.
+                # In that case the data is different and should be
+                # reported.
+                pass
 
         _LOGGER.debug("Reporting state for %s: %s", changed_entity, entity_data)
 
diff --git a/homeassistant/components/google_translate/manifest.json b/homeassistant/components/google_translate/manifest.json
index 452a5352aac..c949e514d87 100644
--- a/homeassistant/components/google_translate/manifest.json
+++ b/homeassistant/components/google_translate/manifest.json
@@ -3,5 +3,5 @@
   "name": "Google Translate Text-to-Speech",
   "documentation": "https://www.home-assistant.io/integrations/google_translate",
   "requirements": ["gTTS-token==1.1.3"],
-  "codeowners": ["@awarecan"]
+  "codeowners": []
 }
diff --git a/homeassistant/components/google_translate/tts.py b/homeassistant/components/google_translate/tts.py
index a040da0dccd..66c00008046 100644
--- a/homeassistant/components/google_translate/tts.py
+++ b/homeassistant/components/google_translate/tts.py
@@ -123,7 +123,14 @@ class GoogleProvider(Provider):
 
         data = b""
         for idx, part in enumerate(message_parts):
-            part_token = await self.hass.async_add_job(token.calculate_token, part)
+            try:
+                part_token = await self.hass.async_add_executor_job(
+                    token.calculate_token, part
+                )
+            except ValueError as err:
+                # If token seed fetching fails.
+                _LOGGER.warning(err)
+                return None, None
 
             url_param = {
                 "ie": "UTF-8",
diff --git a/homeassistant/components/gpslogger/__init__.py b/homeassistant/components/gpslogger/__init__.py
index f09a7f86d2a..d230d3dedc5 100644
--- a/homeassistant/components/gpslogger/__init__.py
+++ b/homeassistant/components/gpslogger/__init__.py
@@ -1,6 +1,4 @@
 """Support for GPSLogger."""
-import logging
-
 from aiohttp import web
 import voluptuous as vol
 
@@ -30,8 +28,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 TRACKER_UPDATE = f"{DOMAIN}_tracker_update"
 
 
diff --git a/homeassistant/components/gpslogger/device_tracker.py b/homeassistant/components/gpslogger/device_tracker.py
index d294b07ebc7..6999f26d752 100644
--- a/homeassistant/components/gpslogger/device_tracker.py
+++ b/homeassistant/components/gpslogger/device_tracker.py
@@ -1,6 +1,4 @@
 """Support for the GPSLogger device tracking."""
-import logging
-
 from homeassistant.components.device_tracker import SOURCE_TYPE_GPS
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
 from homeassistant.const import (
@@ -24,8 +22,6 @@ from .const import (
     ATTR_SPEED,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass: HomeAssistantType, entry, async_add_entities):
     """Configure a dispatcher connection based on a config entry."""
diff --git a/homeassistant/components/gpslogger/strings.json b/homeassistant/components/gpslogger/strings.json
index f3d4344cd49..b757e5c46cb 100644
--- a/homeassistant/components/gpslogger/strings.json
+++ b/homeassistant/components/gpslogger/strings.json
@@ -7,7 +7,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from GPSLogger."
     },
     "create_entry": {
diff --git a/homeassistant/components/gpslogger/translations/ca.json b/homeassistant/components/gpslogger/translations/ca.json
index aebd839a837..96edeea6ccb 100644
--- a/homeassistant/components/gpslogger/translations/ca.json
+++ b/homeassistant/components/gpslogger/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de GPSLogger.",
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar l'opci\u00f3 webhook de GPSLogger.\n\nCompleta la seg\u00fcent informaci\u00f3:\n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n\nConsulta la [documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
diff --git a/homeassistant/components/gpslogger/translations/cs.json b/homeassistant/components/gpslogger/translations/cs.json
index d3420c011ca..33cc75fda46 100644
--- a/homeassistant/components/gpslogger/translations/cs.json
+++ b/homeassistant/components/gpslogger/translations/cs.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Instalace dom\u00e1c\u00edho asistenta mus\u00ed b\u00fdt p\u0159\u00edstupn\u00e1 z internetu, aby p\u0159ij\u00edmala zpr\u00e1vy od spole\u010dnosti GPSLogger.",
-            "one_instance_allowed": "Povolena je pouze jedna instance."
+            "not_internet_accessible": "V\u00e1\u0161 Home Asistent mus\u00ed b\u00fdt p\u0159\u00edstupn\u00fd z internetu, aby mohl p\u0159ij\u00edmat zpr\u00e1vy od GPSLogger.",
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "create_entry": {
             "default": "Chcete-li odeslat ud\u00e1losti do aplikace Home Assistant, budete muset nastavit funkci Webhook v n\u00e1stroji GPSLogger. \n\n Vypl\u0148te n\u00e1sleduj\u00edc\u00ed informace: \n\n - URL: ` {webhook_url} ' \n - Metoda: POST \n\n Dal\u0161\u00ed podrobnosti naleznete v [dokumentaci] ( {docs_url} )."
diff --git a/homeassistant/components/gpslogger/translations/el.json b/homeassistant/components/gpslogger/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/gpslogger/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/translations/en.json b/homeassistant/components/gpslogger/translations/en.json
index 46bbb231483..197c012ed40 100644
--- a/homeassistant/components/gpslogger/translations/en.json
+++ b/homeassistant/components/gpslogger/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from GPSLogger.",
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "To send events to Home Assistant, you will need to setup the webhook feature in GPSLogger.\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nSee [the documentation]({docs_url}) for further details."
diff --git a/homeassistant/components/gpslogger/translations/es.json b/homeassistant/components/gpslogger/translations/es.json
index 8ac817cacbf..ae4a9c310b7 100644
--- a/homeassistant/components/gpslogger/translations/es.json
+++ b/homeassistant/components/gpslogger/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Tu Home Assistant debe ser accesible desde Internet para recibir mensajes de GPSLogger.",
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "S\u00f3lo se necesita una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Para enviar eventos a Home Assistant, necesitar\u00e1s configurar la funci\u00f3n de webhook en GPSLogger.\n\nRellena la siguiente informaci\u00f3n:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nEcha un vistazo a [la documentaci\u00f3n]({docs_url}) para m\u00e1s detalles."
diff --git a/homeassistant/components/gpslogger/translations/et.json b/homeassistant/components/gpslogger/translations/et.json
new file mode 100644
index 00000000000..8e56840d74b
--- /dev/null
+++ b/homeassistant/components/gpslogger/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Lubatud on ainult \u00fcks sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid seadistada GPSLogger Webhooki?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/gpslogger/translations/fr.json b/homeassistant/components/gpslogger/translations/fr.json
index 65db2a5a300..bb9321c5fcc 100644
--- a/homeassistant/components/gpslogger/translations/fr.json
+++ b/homeassistant/components/gpslogger/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Votre instance Home Assistant doit \u00eatre accessible \u00e0 partir d'Internet pour recevoir les messages GPSLogger.",
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "Pour envoyer des \u00e9v\u00e9nements \u00e0 Home Assistant, vous devez configurer la fonction Webhook dans GPSLogger. \n\n Remplissez les informations suivantes: \n\n - URL: ` {webhook_url} ` \n - M\u00e9thode: POST \n\n Voir [la documentation] ( {docs_url} ) pour plus de d\u00e9tails."
diff --git a/homeassistant/components/gpslogger/translations/it.json b/homeassistant/components/gpslogger/translations/it.json
index 32e6b574096..dac92f90262 100644
--- a/homeassistant/components/gpslogger/translations/it.json
+++ b/homeassistant/components/gpslogger/translations/it.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La tua istanza di Home Assistant deve essere accessibile da Internet per ricevere messaggi da GPSLogger.",
-            "one_instance_allowed": "\u00c8 necessaria una sola istanza."
+            "one_instance_allowed": "\u00c8 necessaria una sola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "Per inviare eventi a Home Assistant, dovrai configurare la funzionalit\u00e0 webhook in GPSLogger.\n\n Compila le seguenti informazioni: \n\n - URL: `{webhook_url}` \n - Method: POST \n\n Vedi [la documentazione]({docs_url}) for ulteriori dettagli."
diff --git a/homeassistant/components/gpslogger/translations/lb.json b/homeassistant/components/gpslogger/translations/lb.json
index a69ac61bc98..2e4362b18e2 100644
--- a/homeassistant/components/gpslogger/translations/lb.json
+++ b/homeassistant/components/gpslogger/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir GPSLogger Noriichten z'empf\u00e4nken.",
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Fir Evenementer un Home Assistant ze sch\u00e9cken, muss den Webhook Feature am GPSLogger ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nLiest [Dokumentatioun]({docs_url}) fir w\u00e9ider D\u00e9tailer."
diff --git a/homeassistant/components/gpslogger/translations/nl.json b/homeassistant/components/gpslogger/translations/nl.json
index c5cb3b737db..34b9739707b 100644
--- a/homeassistant/components/gpslogger/translations/nl.json
+++ b/homeassistant/components/gpslogger/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Uw Home Assistant-instantie moet via internet toegankelijk zijn om berichten van GPSLogger te ontvangen.",
-            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Om evenementen naar Home Assistant te verzenden, moet u de webhook-functie instellen in GPSLogger. \n\n Vul de volgende info in: \n\n - URL: ` {webhook_url} ` \n - Methode: POST \n\n Zie [de documentatie] ( {docs_url} ) voor meer informatie."
diff --git a/homeassistant/components/gpslogger/translations/no.json b/homeassistant/components/gpslogger/translations/no.json
index 2b3dc0f67fc..f940330d4e6 100644
--- a/homeassistant/components/gpslogger/translations/no.json
+++ b/homeassistant/components/gpslogger/translations/no.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 kunne motta meldinger fra GPSLogger.",
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
             "default": "For \u00e5 sende hendelser til Home Assistant, m\u00e5 du sette opp webhook-funksjonen i GPSLogger. \n\n Fyll ut f\u00f8lgende informasjon: \n\n - URL: `{webhook_url}` \n - Metode: POST \n\n Se [dokumentasjonen]({docs_url}) for ytterligere detaljer."
diff --git a/homeassistant/components/gpslogger/translations/pl.json b/homeassistant/components/gpslogger/translations/pl.json
index 8b3486496a0..8d17896ceeb 100644
--- a/homeassistant/components/gpslogger/translations/pl.json
+++ b/homeassistant/components/gpslogger/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z GPSlogger.",
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z GPSlogger",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Aby wysy\u0142a\u0107 lokalizacje do Home Assistanta, musisz skonfigurowa\u0107 webhook w aplikacji GPSLogger. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
+            "default": "Aby wysy\u0142a\u0107 lokalizacje do Home Assistant, musisz skonfigurowa\u0107 webhook w aplikacji GPSLogger. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/gpslogger/translations/ru.json b/homeassistant/components/gpslogger/translations/ru.json
index fabf2477590..bfa6a4850b3 100644
--- a/homeassistant/components/gpslogger/translations/ru.json
+++ b/homeassistant/components/gpslogger/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 GPSLogger.",
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Webhook \u0434\u043b\u044f GPSLogger.\n\n\u0414\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
diff --git a/homeassistant/components/gpslogger/translations/zh-Hant.json b/homeassistant/components/gpslogger/translations/zh-Hant.json
index f648d20df9f..59aa99d1689 100644
--- a/homeassistant/components/gpslogger/translations/zh-Hant.json
+++ b/homeassistant/components/gpslogger/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant \u8a2d\u5099\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 GPSLogger \u8a0a\u606f\u3002",
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u65bc GPSLogger \u5167\u8a2d\u5b9a webhook \u529f\u80fd\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
diff --git a/homeassistant/components/gree/__init__.py b/homeassistant/components/gree/__init__.py
new file mode 100644
index 00000000000..96f2401e8d7
--- /dev/null
+++ b/homeassistant/components/gree/__init__.py
@@ -0,0 +1,62 @@
+"""The Gree Climate integration."""
+import logging
+
+from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+
+from .bridge import CannotConnect, DeviceHelper
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup(hass: HomeAssistant, config: dict):
+    """Set up the Gree Climate component."""
+    hass.data[DOMAIN] = {}
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Set up Gree Climate from a config entry."""
+    devices = []
+
+    # First we'll grab as many devices as we can find on the network
+    # it's necessary to bind static devices anyway
+    _LOGGER.debug("Scanning network for Gree devices")
+
+    for device_info in await DeviceHelper.find_devices():
+        try:
+            device = await DeviceHelper.try_bind_device(device_info)
+        except CannotConnect:
+            _LOGGER.error("Unable to bind to gree device: %s", device_info)
+            continue
+
+        _LOGGER.debug(
+            "Adding Gree device at %s:%i (%s)",
+            device.device_info.ip,
+            device.device_info.port,
+            device.device_info.name,
+        )
+        devices.append(device)
+
+    hass.data[DOMAIN]["devices"] = devices
+    hass.data[DOMAIN]["pending"] = devices
+    hass.async_create_task(
+        hass.config_entries.async_forward_entry_setup(entry, CLIMATE_DOMAIN)
+    )
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Unload a config entry."""
+    unload_ok = await hass.config_entries.async_forward_entry_unload(
+        entry, CLIMATE_DOMAIN
+    )
+
+    if unload_ok:
+        hass.data[DOMAIN].pop("devices", None)
+        hass.data[DOMAIN].pop("pending", None)
+
+    return unload_ok
diff --git a/homeassistant/components/gree/bridge.py b/homeassistant/components/gree/bridge.py
new file mode 100644
index 00000000000..44adaf970b8
--- /dev/null
+++ b/homeassistant/components/gree/bridge.py
@@ -0,0 +1,35 @@
+"""Helper and wrapper classes for Gree module."""
+from typing import List
+
+from greeclimate.device import Device, DeviceInfo
+from greeclimate.discovery import Discovery
+from greeclimate.exceptions import DeviceNotBoundError
+
+from homeassistant import exceptions
+
+
+class DeviceHelper:
+    """Device search and bind wrapper for Gree platform."""
+
+    @staticmethod
+    async def try_bind_device(device_info: DeviceInfo) -> Device:
+        """Try and bing with a discovered device.
+
+        Note the you must bind with the device very quickly after it is discovered, or the
+        process may not be completed correctly, raising a `CannotConnect` error.
+        """
+        device = Device(device_info)
+        try:
+            await device.bind()
+        except DeviceNotBoundError as exception:
+            raise CannotConnect from exception
+        return device
+
+    @staticmethod
+    async def find_devices() -> List[DeviceInfo]:
+        """Gather a list of device infos from the local network."""
+        return await Discovery.search_devices()
+
+
+class CannotConnect(exceptions.HomeAssistantError):
+    """Error to indicate we cannot connect."""
diff --git a/homeassistant/components/gree/climate.py b/homeassistant/components/gree/climate.py
new file mode 100644
index 00000000000..724903ef360
--- /dev/null
+++ b/homeassistant/components/gree/climate.py
@@ -0,0 +1,398 @@
+"""Support for interface with a Gree climate systems."""
+from datetime import timedelta
+import logging
+from typing import List
+
+from greeclimate.device import (
+    FanSpeed,
+    HorizontalSwing,
+    Mode,
+    TemperatureUnits,
+    VerticalSwing,
+)
+from greeclimate.exceptions import DeviceTimeoutError
+
+from homeassistant.components.climate import ClimateEntity
+from homeassistant.components.climate.const import (
+    FAN_AUTO,
+    FAN_HIGH,
+    FAN_LOW,
+    FAN_MEDIUM,
+    HVAC_MODE_AUTO,
+    HVAC_MODE_COOL,
+    HVAC_MODE_DRY,
+    HVAC_MODE_FAN_ONLY,
+    HVAC_MODE_HEAT,
+    HVAC_MODE_OFF,
+    PRESET_AWAY,
+    PRESET_BOOST,
+    PRESET_ECO,
+    PRESET_NONE,
+    PRESET_SLEEP,
+    SUPPORT_FAN_MODE,
+    SUPPORT_PRESET_MODE,
+    SUPPORT_SWING_MODE,
+    SUPPORT_TARGET_TEMPERATURE,
+    SWING_BOTH,
+    SWING_HORIZONTAL,
+    SWING_OFF,
+    SWING_VERTICAL,
+)
+from homeassistant.const import (
+    ATTR_TEMPERATURE,
+    PRECISION_WHOLE,
+    TEMP_CELSIUS,
+    TEMP_FAHRENHEIT,
+)
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+
+from .const import (
+    DOMAIN,
+    FAN_MEDIUM_HIGH,
+    FAN_MEDIUM_LOW,
+    MAX_ERRORS,
+    MAX_TEMP,
+    MIN_TEMP,
+    TARGET_TEMPERATURE_STEP,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+SCAN_INTERVAL = timedelta(seconds=60)
+PARALLEL_UPDATES = 0
+
+HVAC_MODES = {
+    Mode.Auto: HVAC_MODE_AUTO,
+    Mode.Cool: HVAC_MODE_COOL,
+    Mode.Dry: HVAC_MODE_DRY,
+    Mode.Fan: HVAC_MODE_FAN_ONLY,
+    Mode.Heat: HVAC_MODE_HEAT,
+}
+HVAC_MODES_REVERSE = {v: k for k, v in HVAC_MODES.items()}
+
+PRESET_MODES = [
+    PRESET_ECO,  # Power saving mode
+    PRESET_AWAY,  # Steady heat, or 8C mode on gree units
+    PRESET_BOOST,  # Turbo mode
+    PRESET_NONE,  # Default operating mode
+    PRESET_SLEEP,  # Sleep mode
+]
+
+FAN_MODES = {
+    FanSpeed.Auto: FAN_AUTO,
+    FanSpeed.Low: FAN_LOW,
+    FanSpeed.MediumLow: FAN_MEDIUM_LOW,
+    FanSpeed.Medium: FAN_MEDIUM,
+    FanSpeed.MediumHigh: FAN_MEDIUM_HIGH,
+    FanSpeed.High: FAN_HIGH,
+}
+FAN_MODES_REVERSE = {v: k for k, v in FAN_MODES.items()}
+
+SWING_MODES = [SWING_OFF, SWING_VERTICAL, SWING_HORIZONTAL, SWING_BOTH]
+
+SUPPORTED_FEATURES = (
+    SUPPORT_TARGET_TEMPERATURE
+    | SUPPORT_FAN_MODE
+    | SUPPORT_PRESET_MODE
+    | SUPPORT_SWING_MODE
+)
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up the Gree HVAC device from a config entry."""
+    async_add_entities(
+        GreeClimateEntity(device) for device in hass.data[DOMAIN].pop("pending")
+    )
+
+
+class GreeClimateEntity(ClimateEntity):
+    """Representation of a Gree HVAC device."""
+
+    def __init__(self, device):
+        """Initialize the Gree device."""
+        self._device = device
+        self._name = device.device_info.name
+        self._mac = device.device_info.mac
+        self._available = False
+        self._error_count = 0
+
+    async def async_update(self):
+        """Update the state of the device."""
+        try:
+            await self._device.update_state()
+
+            if not self._available and self._error_count:
+                _LOGGER.warning(
+                    "Device is available: %s (%s)",
+                    self._name,
+                    str(self._device.device_info),
+                )
+
+            self._available = True
+            self._error_count = 0
+        except DeviceTimeoutError:
+            self._error_count += 1
+
+            # Under normal conditions GREE units timeout every once in a while
+            if self._available and self._error_count >= MAX_ERRORS:
+                self._available = False
+                _LOGGER.warning(
+                    "Device is unavailable: %s (%s)",
+                    self._name,
+                    self._device.device_info,
+                )
+        except Exception:  # pylint: disable=broad-except
+            # Under normal conditions GREE units timeout every once in a while
+            if self._available:
+                self._available = False
+                _LOGGER.exception(
+                    "Unknown exception caught during update by gree device: %s (%s)",
+                    self._name,
+                    self._device.device_info,
+                )
+
+    async def _push_state_update(self):
+        """Send state updates to the physical device."""
+        try:
+            return await self._device.push_state_update()
+        except DeviceTimeoutError:
+            self._error_count += 1
+
+            # Under normal conditions GREE units timeout every once in a while
+            if self._available and self._error_count >= MAX_ERRORS:
+                self._available = False
+                _LOGGER.warning(
+                    "Device timedout while sending state update: %s (%s)",
+                    self._name,
+                    self._device.device_info,
+                )
+        except Exception:  # pylint: disable=broad-except
+            # Under normal conditions GREE units timeout every once in a while
+            if self._available:
+                self._available = False
+                _LOGGER.exception(
+                    "Unknown exception caught while sending state update to: %s (%s)",
+                    self._name,
+                    self._device.device_info,
+                )
+
+    @property
+    def available(self) -> bool:
+        """Return if the device is available."""
+        return self._available
+
+    @property
+    def name(self) -> str:
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def unique_id(self) -> str:
+        """Return a unique id for the device."""
+        return self._mac
+
+    @property
+    def device_info(self):
+        """Return device specific attributes."""
+        return {
+            "name": self._name,
+            "identifiers": {(DOMAIN, self._mac)},
+            "manufacturer": "Gree",
+            "connections": {(CONNECTION_NETWORK_MAC, self._mac)},
+        }
+
+    @property
+    def temperature_unit(self) -> str:
+        """Return the temperature units for the device."""
+        units = self._device.temperature_units
+        return TEMP_CELSIUS if units == TemperatureUnits.C else TEMP_FAHRENHEIT
+
+    @property
+    def precision(self) -> float:
+        """Return the precision of temperature for the device."""
+        return PRECISION_WHOLE
+
+    @property
+    def current_temperature(self) -> float:
+        """Return the target temperature, gree devices don't provide internal temp."""
+        return self.target_temperature
+
+    @property
+    def target_temperature(self) -> float:
+        """Return the target temperature for the device."""
+        return self._device.target_temperature
+
+    async def async_set_temperature(self, **kwargs):
+        """Set new target temperature."""
+        if ATTR_TEMPERATURE not in kwargs:
+            raise ValueError(f"Missing parameter {ATTR_TEMPERATURE}")
+
+        temperature = kwargs[ATTR_TEMPERATURE]
+        _LOGGER.debug(
+            "Setting temperature to %d for %s",
+            temperature,
+            self._name,
+        )
+
+        self._device.target_temperature = round(temperature)
+        await self._push_state_update()
+
+    @property
+    def min_temp(self) -> float:
+        """Return the minimum temperature supported by the device."""
+        return MIN_TEMP
+
+    @property
+    def max_temp(self) -> float:
+        """Return the maximum temperature supported by the device."""
+        return MAX_TEMP
+
+    @property
+    def target_temperature_step(self) -> float:
+        """Return the target temperature step support by the device."""
+        return TARGET_TEMPERATURE_STEP
+
+    @property
+    def hvac_mode(self) -> str:
+        """Return the current HVAC mode for the device."""
+        if not self._device.power:
+            return HVAC_MODE_OFF
+
+        return HVAC_MODES.get(self._device.mode)
+
+    async def async_set_hvac_mode(self, hvac_mode):
+        """Set new target hvac mode."""
+        if hvac_mode not in self.hvac_modes:
+            raise ValueError(f"Invalid hvac_mode: {hvac_mode}")
+
+        _LOGGER.debug(
+            "Setting HVAC mode to %s for device %s",
+            hvac_mode,
+            self._name,
+        )
+
+        if hvac_mode == HVAC_MODE_OFF:
+            self._device.power = False
+            await self._push_state_update()
+            return
+
+        if not self._device.power:
+            self._device.power = True
+
+        self._device.mode = HVAC_MODES_REVERSE.get(hvac_mode)
+        await self._push_state_update()
+
+    @property
+    def hvac_modes(self) -> List[str]:
+        """Return the HVAC modes support by the device."""
+        modes = [*HVAC_MODES_REVERSE]
+        modes.append(HVAC_MODE_OFF)
+        return modes
+
+    @property
+    def preset_mode(self) -> str:
+        """Return the current preset mode for the device."""
+        if self._device.steady_heat:
+            return PRESET_AWAY
+        if self._device.power_save:
+            return PRESET_ECO
+        if self._device.sleep:
+            return PRESET_SLEEP
+        if self._device.turbo:
+            return PRESET_BOOST
+        return PRESET_NONE
+
+    async def async_set_preset_mode(self, preset_mode):
+        """Set new preset mode."""
+        if preset_mode not in PRESET_MODES:
+            raise ValueError(f"Invalid preset mode: {preset_mode}")
+
+        _LOGGER.debug(
+            "Setting preset mode to %s for device %s",
+            preset_mode,
+            self._name,
+        )
+
+        self._device.steady_heat = False
+        self._device.power_save = False
+        self._device.turbo = False
+        self._device.sleep = False
+
+        if preset_mode == PRESET_AWAY:
+            self._device.steady_heat = True
+        elif preset_mode == PRESET_ECO:
+            self._device.power_save = True
+        elif preset_mode == PRESET_BOOST:
+            self._device.turbo = True
+        elif preset_mode == PRESET_SLEEP:
+            self._device.sleep = True
+
+        await self._push_state_update()
+
+    @property
+    def preset_modes(self) -> List[str]:
+        """Return the preset modes support by the device."""
+        return PRESET_MODES
+
+    @property
+    def fan_mode(self) -> str:
+        """Return the current fan mode for the device."""
+        speed = self._device.fan_speed
+        return FAN_MODES.get(speed)
+
+    async def async_set_fan_mode(self, fan_mode):
+        """Set new target fan mode."""
+        if fan_mode not in FAN_MODES_REVERSE:
+            raise ValueError(f"Invalid fan mode: {fan_mode}")
+
+        self._device.fan_speed = FAN_MODES_REVERSE.get(fan_mode)
+        await self._push_state_update()
+
+    @property
+    def fan_modes(self) -> List[str]:
+        """Return the fan modes support by the device."""
+        return [*FAN_MODES_REVERSE]
+
+    @property
+    def swing_mode(self) -> str:
+        """Return the current swing mode for the device."""
+        h_swing = self._device.horizontal_swing == HorizontalSwing.FullSwing
+        v_swing = self._device.vertical_swing == VerticalSwing.FullSwing
+
+        if h_swing and v_swing:
+            return SWING_BOTH
+        if h_swing:
+            return SWING_HORIZONTAL
+        if v_swing:
+            return SWING_VERTICAL
+        return SWING_OFF
+
+    async def async_set_swing_mode(self, swing_mode):
+        """Set new target swing operation."""
+        if swing_mode not in SWING_MODES:
+            raise ValueError(f"Invalid swing mode: {swing_mode}")
+
+        _LOGGER.debug(
+            "Setting swing mode to %s for device %s",
+            swing_mode,
+            self._name,
+        )
+
+        self._device.horizontal_swing = HorizontalSwing.Center
+        self._device.vertical_swing = VerticalSwing.FixedMiddle
+        if swing_mode in (SWING_BOTH, SWING_HORIZONTAL):
+            self._device.horizontal_swing = HorizontalSwing.FullSwing
+        if swing_mode in (SWING_BOTH, SWING_VERTICAL):
+            self._device.vertical_swing = VerticalSwing.FullSwing
+
+        await self._push_state_update()
+
+    @property
+    def swing_modes(self) -> List[str]:
+        """Return the swing modes currently supported for this device."""
+        return SWING_MODES
+
+    @property
+    def supported_features(self) -> int:
+        """Return the supported features for this device integration."""
+        return SUPPORTED_FEATURES
diff --git a/homeassistant/components/gree/config_flow.py b/homeassistant/components/gree/config_flow.py
new file mode 100644
index 00000000000..76ea2159e2f
--- /dev/null
+++ b/homeassistant/components/gree/config_flow.py
@@ -0,0 +1,17 @@
+"""Config flow for Gree."""
+from homeassistant import config_entries
+from homeassistant.helpers import config_entry_flow
+
+from .bridge import DeviceHelper
+from .const import DOMAIN
+
+
+async def _async_has_devices(hass) -> bool:
+    """Return if there are devices that can be discovered."""
+    devices = await DeviceHelper.find_devices()
+    return len(devices) > 0
+
+
+config_entry_flow.register_discovery_flow(
+    DOMAIN, "Gree Climate", _async_has_devices, config_entries.CONN_CLASS_LOCAL_POLL
+)
diff --git a/homeassistant/components/gree/const.py b/homeassistant/components/gree/const.py
new file mode 100644
index 00000000000..95435bb3bd9
--- /dev/null
+++ b/homeassistant/components/gree/const.py
@@ -0,0 +1,13 @@
+"""Constants for the Gree Climate integration."""
+
+DOMAIN = "gree"
+
+FAN_MEDIUM_LOW = "medium low"
+FAN_MEDIUM_HIGH = "medium high"
+
+MIN_TEMP = 16
+MAX_TEMP = 30
+
+MAX_ERRORS = 2
+
+TARGET_TEMPERATURE_STEP = 1
diff --git a/homeassistant/components/gree/manifest.json b/homeassistant/components/gree/manifest.json
new file mode 100644
index 00000000000..ea04eb12f51
--- /dev/null
+++ b/homeassistant/components/gree/manifest.json
@@ -0,0 +1,8 @@
+{
+  "domain": "gree",
+  "name": "Gree Climate",
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/gree",
+  "requirements": ["greeclimate==0.9.0"],
+  "codeowners": ["@cmroche"]
+}
diff --git a/homeassistant/components/gree/strings.json b/homeassistant/components/gree/strings.json
new file mode 100644
index 00000000000..878ebc3bbd7
--- /dev/null
+++ b/homeassistant/components/gree/strings.json
@@ -0,0 +1,14 @@
+{
+  "title": "Gree Climate",
+  "config": {
+    "step": {
+      "confirm": {
+        "description": "[%key:common::config_flow::description::confirm_setup%]"
+      }
+    },
+    "abort": {
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
+    }
+  }
+}
diff --git a/homeassistant/components/gree/translations/ca.json b/homeassistant/components/gree/translations/ca.json
new file mode 100644
index 00000000000..88c94cfe41b
--- /dev/null
+++ b/homeassistant/components/gree/translations/ca.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
+        },
+        "step": {
+            "confirm": {
+                "description": "Vols comen\u00e7ar la configuraci\u00f3?"
+            }
+        }
+    },
+    "title": "Gree Climate"
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/cs.json b/homeassistant/components/gree/translations/cs.json
new file mode 100644
index 00000000000..fdc367097eb
--- /dev/null
+++ b/homeassistant/components/gree/translations/cs.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "confirm": {
+                "description": "Chcete za\u010d\u00edt nastavovat?"
+            }
+        }
+    },
+    "title": "Gree Climate"
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/en.json b/homeassistant/components/gree/translations/en.json
new file mode 100644
index 00000000000..996292cde3f
--- /dev/null
+++ b/homeassistant/components/gree/translations/en.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "No devices found on the network",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
+        },
+        "step": {
+            "confirm": {
+                "description": "Do you want to start set up?"
+            }
+        }
+    },
+    "title": "Gree Climate"
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/es.json b/homeassistant/components/gree/translations/es.json
new file mode 100644
index 00000000000..2a6d217e5e5
--- /dev/null
+++ b/homeassistant/components/gree/translations/es.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "No se encontraron dispositivos en la red",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
+        },
+        "step": {
+            "confirm": {
+                "description": "\u00bfQuieres iniciar la configuraci\u00f3n?"
+            }
+        }
+    },
+    "title": "Gree Climate"
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/et.json b/homeassistant/components/gree/translations/et.json
new file mode 100644
index 00000000000..d10de355646
--- /dev/null
+++ b/homeassistant/components/gree/translations/et.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid",
+            "single_instance_allowed": "Seade on juba lisatud. Lubatud on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas alustan Gree seadistamist?"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/it.json b/homeassistant/components/gree/translations/it.json
new file mode 100644
index 00000000000..5bb4f9a3ee9
--- /dev/null
+++ b/homeassistant/components/gree/translations/it.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
+        },
+        "step": {
+            "confirm": {
+                "description": "Vuoi iniziare la configurazione?"
+            }
+        }
+    },
+    "title": "Gree Climate"
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/no.json b/homeassistant/components/gree/translations/no.json
new file mode 100644
index 00000000000..602a81af2f5
--- /dev/null
+++ b/homeassistant/components/gree/translations/no.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
+        },
+        "step": {
+            "confirm": {
+                "description": "Vil du starte oppsettet?"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/pl.json b/homeassistant/components/gree/translations/pl.json
new file mode 100644
index 00000000000..b754e529248
--- /dev/null
+++ b/homeassistant/components/gree/translations/pl.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
+        },
+        "step": {
+            "confirm": {
+                "description": "Czy chcesz rozpocz\u0105\u0107 konfiguracj\u0119?"
+            }
+        }
+    },
+    "title": "Klimatyzacja Gree"
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/ru.json b/homeassistant/components/gree/translations/ru.json
new file mode 100644
index 00000000000..ee7bf509773
--- /dev/null
+++ b/homeassistant/components/gree/translations/ru.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
+        },
+        "step": {
+            "confirm": {
+                "description": "\u0425\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443?"
+            }
+        }
+    },
+    "title": "Gree Climate"
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/zh-Hans.json b/homeassistant/components/gree/translations/zh-Hans.json
new file mode 100644
index 00000000000..c6d2c4c7cfb
--- /dev/null
+++ b/homeassistant/components/gree/translations/zh-Hans.json
@@ -0,0 +1,3 @@
+{
+    "title": "\u683c\u529b\u7a7a\u8c03"
+}
\ No newline at end of file
diff --git a/homeassistant/components/gree/translations/zh-Hant.json b/homeassistant/components/gree/translations/zh-Hant.json
new file mode 100644
index 00000000000..138912467bd
--- /dev/null
+++ b/homeassistant/components/gree/translations/zh-Hant.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
+        },
+        "step": {
+            "confirm": {
+                "description": "\u662f\u5426\u8981\u958b\u59cb\u8a2d\u5b9a\uff1f"
+            }
+        }
+    },
+    "title": "\u683c\u529b\u6eab\u63a7"
+}
\ No newline at end of file
diff --git a/homeassistant/components/greeneye_monitor/manifest.json b/homeassistant/components/greeneye_monitor/manifest.json
index 304233438c5..ddced4d168b 100644
--- a/homeassistant/components/greeneye_monitor/manifest.json
+++ b/homeassistant/components/greeneye_monitor/manifest.json
@@ -2,6 +2,6 @@
   "domain": "greeneye_monitor",
   "name": "GreenEye Monitor (GEM)",
   "documentation": "https://www.home-assistant.io/integrations/greeneye_monitor",
-  "requirements": ["greeneye_monitor==2.0"],
+  "requirements": ["greeneye_monitor==2.1"],
   "codeowners": ["@jkeljo"]
 }
diff --git a/homeassistant/components/greeneye_monitor/sensor.py b/homeassistant/components/greeneye_monitor/sensor.py
index 42f7c0334b3..c8cd1669f05 100644
--- a/homeassistant/components/greeneye_monitor/sensor.py
+++ b/homeassistant/components/greeneye_monitor/sensor.py
@@ -1,6 +1,4 @@
 """Support for the sensors in a GreenEye Monitor."""
-import logging
-
 from homeassistant.const import (
     CONF_NAME,
     CONF_TEMPERATURE_UNIT,
@@ -27,8 +25,6 @@ from . import (
     SENSOR_TYPE_VOLTAGE,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 DATA_PULSES = "pulses"
 DATA_WATT_SECONDS = "watt_seconds"
 
diff --git a/homeassistant/components/griddy/sensor.py b/homeassistant/components/griddy/sensor.py
index 7a155586fac..f8a900d92be 100644
--- a/homeassistant/components/griddy/sensor.py
+++ b/homeassistant/components/griddy/sensor.py
@@ -1,13 +1,9 @@
 """Support for August sensors."""
-import logging
-
 from homeassistant.const import CURRENCY_CENT, ENERGY_KILO_WATT_HOUR
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import CONF_LOADZONE, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the August sensors."""
diff --git a/homeassistant/components/griddy/strings.json b/homeassistant/components/griddy/strings.json
index d8ccb94fae7..99bd8946c34 100644
--- a/homeassistant/components/griddy/strings.json
+++ b/homeassistant/components/griddy/strings.json
@@ -1,8 +1,8 @@
 {
   "config": {
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "step": {
       "user": {
@@ -11,6 +11,6 @@
         "title": "Setup your Griddy Load Zone"
       }
     },
-    "abort": { "already_configured": "This Load Zone is already configured" }
+    "abort": { "already_configured": "[%key:common::config_flow::abort::already_configured_location%]" }
   }
 }
diff --git a/homeassistant/components/griddy/translations/ca.json b/homeassistant/components/griddy/translations/ca.json
index cb363a7dfab..33aca3cd302 100644
--- a/homeassistant/components/griddy/translations/ca.json
+++ b/homeassistant/components/griddy/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquesta zona de c\u00e0rrega ja est\u00e0 configurada"
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "unknown": "Error inesperat"
         },
         "step": {
diff --git a/homeassistant/components/griddy/translations/cs.json b/homeassistant/components/griddy/translations/cs.json
new file mode 100644
index 00000000000..fa5918fa5da
--- /dev/null
+++ b/homeassistant/components/griddy/translations/cs.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/griddy/translations/en.json b/homeassistant/components/griddy/translations/en.json
index bb1e217133a..2a82421dd7c 100644
--- a/homeassistant/components/griddy/translations/en.json
+++ b/homeassistant/components/griddy/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This Load Zone is already configured"
+            "already_configured": "Location is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "unknown": "Unexpected error"
         },
         "step": {
diff --git a/homeassistant/components/griddy/translations/et.json b/homeassistant/components/griddy/translations/et.json
new file mode 100644
index 00000000000..0f7df7bd156
--- /dev/null
+++ b/homeassistant/components/griddy/translations/et.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "See Load Zone on juba m\u00e4\u00e4ratud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/griddy/translations/it.json b/homeassistant/components/griddy/translations/it.json
index 2b573170e69..40fa69b1229 100644
--- a/homeassistant/components/griddy/translations/it.json
+++ b/homeassistant/components/griddy/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questa Zona di Carico \u00e8 gi\u00e0 configurata"
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "unknown": "Errore imprevisto"
         },
         "step": {
diff --git a/homeassistant/components/griddy/translations/no.json b/homeassistant/components/griddy/translations/no.json
index 000b5dae306..7f01fa198a3 100644
--- a/homeassistant/components/griddy/translations/no.json
+++ b/homeassistant/components/griddy/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne Load Zone er allerede konfigurert"
+            "already_configured": "Plasseringen er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
         "step": {
diff --git a/homeassistant/components/griddy/translations/pl.json b/homeassistant/components/griddy/translations/pl.json
index 4fe11d213e8..40b2c88803a 100644
--- a/homeassistant/components/griddy/translations/pl.json
+++ b/homeassistant/components/griddy/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ta strefa obci\u0105\u017cenia jest ju\u017c skonfigurowana."
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
diff --git a/homeassistant/components/griddy/translations/ru.json b/homeassistant/components/griddy/translations/ru.json
index 9fe98107510..3483953fce1 100644
--- a/homeassistant/components/griddy/translations/ru.json
+++ b/homeassistant/components/griddy/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
diff --git a/homeassistant/components/griddy/translations/zh-Hant.json b/homeassistant/components/griddy/translations/zh-Hant.json
index e112a2c682f..4918c1e818e 100644
--- a/homeassistant/components/griddy/translations/zh-Hant.json
+++ b/homeassistant/components/griddy/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u8ca0\u8f09\u5340\u57df\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
diff --git a/homeassistant/components/group/cover.py b/homeassistant/components/group/cover.py
index ab2ad65713d..25a8665db9f 100644
--- a/homeassistant/components/group/cover.py
+++ b/homeassistant/components/group/cover.py
@@ -1,5 +1,4 @@
 """This platform allows several cover to be grouped into one cover."""
-import logging
 from typing import Dict, Optional, Set
 
 import voluptuous as vol
@@ -48,8 +47,6 @@ from . import GroupEntity
 # mypy: allow-incomplete-defs, allow-untyped-calls, allow-untyped-defs
 # mypy: no-check-untyped-defs
 
-_LOGGER = logging.getLogger(__name__)
-
 KEY_OPEN_CLOSE = "open_close"
 KEY_STOP = "stop"
 KEY_POSITION = "position"
diff --git a/homeassistant/components/group/light.py b/homeassistant/components/group/light.py
index 007e05edfbb..00b7321076f 100644
--- a/homeassistant/components/group/light.py
+++ b/homeassistant/components/group/light.py
@@ -2,7 +2,6 @@
 import asyncio
 from collections import Counter
 import itertools
-import logging
 from typing import Any, Callable, Iterator, List, Optional, Tuple, cast
 
 import voluptuous as vol
@@ -47,8 +46,6 @@ from . import GroupEntity
 # mypy: allow-incomplete-defs, allow-untyped-calls, allow-untyped-defs
 # mypy: no-check-untyped-defs
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Light Group"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
@@ -87,6 +84,7 @@ class LightGroup(GroupEntity, light.LightEntity):
         self._entity_ids = entity_ids
         self._is_on = False
         self._available = False
+        self._icon = "mdi:lightbulb-group"
         self._brightness: Optional[int] = None
         self._hs_color: Optional[Tuple[float, float]] = None
         self._color_temp: Optional[int] = None
@@ -133,6 +131,11 @@ class LightGroup(GroupEntity, light.LightEntity):
         """Return whether the light group is available."""
         return self._available
 
+    @property
+    def icon(self):
+        """Return the light group icon."""
+        return self._icon
+
     @property
     def brightness(self) -> Optional[int]:
         """Return the brightness of this light group between 0..255."""
diff --git a/homeassistant/components/group/notify.py b/homeassistant/components/group/notify.py
index 2209e0e2333..97c019163e8 100644
--- a/homeassistant/components/group/notify.py
+++ b/homeassistant/components/group/notify.py
@@ -2,7 +2,6 @@
 import asyncio
 from collections.abc import Mapping
 from copy import deepcopy
-import logging
 
 import voluptuous as vol
 
@@ -18,8 +17,6 @@ import homeassistant.helpers.config_validation as cv
 
 # mypy: allow-untyped-calls, allow-untyped-defs, no-check-untyped-defs
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_SERVICES = "services"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/group/translations/cs.json b/homeassistant/components/group/translations/cs.json
index b33ff28448b..d35e48058e7 100644
--- a/homeassistant/components/group/translations/cs.json
+++ b/homeassistant/components/group/translations/cs.json
@@ -5,9 +5,9 @@
             "home": "Doma",
             "locked": "Zam\u010deno",
             "not_home": "Pry\u010d",
-            "off": "Neaktivn\u00ed",
+            "off": "Vypnuto",
             "ok": "V po\u0159\u00e1dku",
-            "on": "Aktivn\u00ed",
+            "on": "Zapnuto",
             "open": "Otev\u0159eno",
             "problem": "Probl\u00e9m",
             "unlocked": "Odem\u010deno"
diff --git a/homeassistant/components/group/translations/pl.json b/homeassistant/components/group/translations/pl.json
index b82492d83d0..ce231ebaad9 100644
--- a/homeassistant/components/group/translations/pl.json
+++ b/homeassistant/components/group/translations/pl.json
@@ -5,9 +5,9 @@
             "home": "w domu",
             "locked": "Zablokowane",
             "not_home": "poza domem",
-            "off": "wy\u0142\u0105czony",
+            "off": "wy\u0142.",
             "ok": "ok",
-            "on": "w\u0142\u0105czony",
+            "on": "w\u0142.",
             "open": "otwarte",
             "problem": "problem",
             "unlocked": "Odblokowany"
diff --git a/homeassistant/components/gtfs/sensor.py b/homeassistant/components/gtfs/sensor.py
index e4e00c7c2ec..d21ab67f053 100644
--- a/homeassistant/components/gtfs/sensor.py
+++ b/homeassistant/components/gtfs/sensor.py
@@ -76,6 +76,80 @@ ICONS = {
     5: "mdi:train-variant",
     6: "mdi:gondola",
     7: "mdi:stairs",
+    100: "mdi:train",
+    101: "mdi:train",
+    102: "mdi:train",
+    103: "mdi:train",
+    104: "mdi:train-car",
+    105: "mdi:train",
+    106: "mdi:train",
+    107: "mdi:train",
+    108: "mdi:train",
+    109: "mdi:train",
+    110: "mdi:train-variant",
+    111: "mdi:train-variant",
+    112: "mdi:train-variant",
+    113: "mdi:train-variant",
+    114: "mdi:train-variant",
+    115: "mdi:train-variant",
+    116: "mdi:train-variant",
+    117: "mdi:train-variant",
+    200: "mdi:bus",
+    201: "mdi:bus",
+    202: "mdi:bus",
+    203: "mdi:bus",
+    204: "mdi:bus",
+    205: "mdi:bus",
+    206: "mdi:bus",
+    207: "mdi:bus",
+    208: "mdi:bus",
+    209: "mdi:bus",
+    400: "mdi:subway-variant",
+    401: "mdi:subway-variant",
+    402: "mdi:subway",
+    403: "mdi:subway-variant",
+    404: "mdi:subway-variant",
+    405: "mdi:subway-variant",
+    700: "mdi:bus",
+    701: "mdi:bus",
+    702: "mdi:bus",
+    703: "mdi:bus",
+    704: "mdi:bus",
+    705: "mdi:bus",
+    706: "mdi:bus",
+    707: "mdi:bus",
+    708: "mdi:bus",
+    709: "mdi:bus",
+    710: "mdi:bus",
+    711: "mdi:bus",
+    712: "mdi:bus-school",
+    713: "mdi:bus-school",
+    714: "mdi:bus",
+    715: "mdi:bus",
+    716: "mdi:bus",
+    800: "mdi:bus",
+    900: "mdi:tram",
+    901: "mdi:tram",
+    902: "mdi:tram",
+    903: "mdi:tram",
+    904: "mdi:tram",
+    905: "mdi:tram",
+    906: "mdi:tram",
+    1000: "mdi:ferry",
+    1100: "mdi:airplane",
+    1200: "mdi:ferry",
+    1300: "mdi:airplane",
+    1400: "mdi:gondola",
+    1500: "mdi:taxi",
+    1501: "mdi:taxi",
+    1502: "mdi:ferry",
+    1503: "mdi:train-variant",
+    1504: "mdi:bicycle-basket",
+    1505: "mdi:taxi",
+    1506: "mdi:car-multiple",
+    1507: "mdi:taxi",
+    1700: "mdi:train-car",
+    1702: "mdi:horse-variant",
 }
 LOCATION_TYPE_DEFAULT = "Stop"
 LOCATION_TYPE_OPTIONS = {
@@ -100,6 +174,80 @@ ROUTE_TYPE_OPTIONS = {
     5: "Cable Tram",
     6: "Aerial Lift",
     7: "Funicular",
+    100: "Railway Service",
+    101: "High Speed Rail Service",
+    102: "Long Distance Trains",
+    103: "Inter Regional Rail Service",
+    104: "Car Transport Rail Service",
+    105: "Sleeper Rail Service",
+    106: "Regional Rail Service",
+    107: "Tourist Railway Service",
+    108: "Rail Shuttle (Within Complex)",
+    109: "Suburban Railway",
+    110: "Replacement Rail Service",
+    111: "Special Rail Service",
+    112: "Lorry Transport Rail Service",
+    113: "All Rail Services",
+    114: "Cross-Country Rail Service",
+    115: "Vehicle Transport Rail Service",
+    116: "Rack and Pinion Railway",
+    117: "Additional Rail Service",
+    200: "Coach Service",
+    201: "International Coach Service",
+    202: "National Coach Service",
+    203: "Shuttle Coach Service",
+    204: "Regional Coach Service",
+    205: "Special Coach Service",
+    206: "Sightseeing Coach Service",
+    207: "Tourist Coach Service",
+    208: "Commuter Coach Service",
+    209: "All Coach Services",
+    400: "Urban Railway Service",
+    401: "Metro Service",
+    402: "Underground Service",
+    403: "Urban Railway Service",
+    404: "All Urban Railway Services",
+    405: "Monorail",
+    700: "Bus Service",
+    701: "Regional Bus Service",
+    702: "Express Bus Service",
+    703: "Stopping Bus Service",
+    704: "Local Bus Service",
+    705: "Night Bus Service",
+    706: "Post Bus Service",
+    707: "Special Needs Bus",
+    708: "Mobility Bus Service",
+    709: "Mobility Bus for Registered Disabled",
+    710: "Sightseeing Bus",
+    711: "Shuttle Bus",
+    712: "School Bus",
+    713: "School and Public Service Bus",
+    714: "Rail Replacement Bus Service",
+    715: "Demand and Response Bus Service",
+    716: "All Bus Services",
+    800: "Trolleybus Service",
+    900: "Tram Service",
+    901: "City Tram Service",
+    902: "Local Tram Service",
+    903: "Regional Tram Service",
+    904: "Sightseeing Tram Service",
+    905: "Shuttle Tram Service",
+    906: "All Tram Services",
+    1000: "Water Transport Service",
+    1100: "Air Service",
+    1200: "Ferry Service",
+    1300: "Aerial Lift Service",
+    1400: "Funicular Service",
+    1500: "Taxi Service",
+    1501: "Communal Taxi Service",
+    1502: "Water Taxi Service",
+    1503: "Rail Taxi Service",
+    1504: "Bike Taxi Service",
+    1505: "Licensed Taxi Service",
+    1506: "Private Hire Service Vehicle",
+    1507: "All Taxi Services",
+    1700: "Miscellaneous Service",
+    1702: "Horse-drawn Carriage",
 }
 TIMEPOINT_DEFAULT = True
 TIMEPOINT_OPTIONS = {0: False, 1: True}
diff --git a/homeassistant/components/guardian/__init__.py b/homeassistant/components/guardian/__init__.py
index 03796415d65..fdc82f14778 100644
--- a/homeassistant/components/guardian/__init__.py
+++ b/homeassistant/components/guardian/__init__.py
@@ -1,6 +1,5 @@
 """The Elexa Guardian integration."""
 import asyncio
-from datetime import timedelta
 from typing import Dict
 
 from aioguardian import Client
@@ -8,10 +7,15 @@ from aioguardian import Client
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_ATTRIBUTION, CONF_IP_ADDRESS, CONF_PORT
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
 
 from .const import (
+    API_SENSOR_PAIR_DUMP,
+    API_SENSOR_PAIRED_SENSOR_STATUS,
     API_SYSTEM_DIAGNOSTICS,
     API_SYSTEM_ONBOARD_SENSOR_STATUS,
     API_VALVE_STATUS,
@@ -19,18 +23,28 @@ from .const import (
     CONF_UID,
     DATA_CLIENT,
     DATA_COORDINATOR,
+    DATA_PAIRED_SENSOR_MANAGER,
+    DATA_UNSUB_DISPATCHER_CONNECT,
     DOMAIN,
+    LOGGER,
+    SIGNAL_PAIRED_SENSOR_COORDINATOR_ADDED,
 )
 from .util import GuardianDataUpdateCoordinator
 
-DEFAULT_UPDATE_INTERVAL = timedelta(seconds=30)
+DATA_LAST_SENSOR_PAIR_DUMP = "last_sensor_pair_dump"
 
 PLATFORMS = ["binary_sensor", "sensor", "switch"]
 
 
 async def async_setup(hass: HomeAssistant, config: dict) -> bool:
     """Set up the Elexa Guardian component."""
-    hass.data[DOMAIN] = {DATA_CLIENT: {}, DATA_COORDINATOR: {}}
+    hass.data[DOMAIN] = {
+        DATA_CLIENT: {},
+        DATA_COORDINATOR: {},
+        DATA_LAST_SENSOR_PAIR_DUMP: {},
+        DATA_PAIRED_SENSOR_MANAGER: {},
+        DATA_UNSUB_DISPATCHER_CONNECT: {},
+    }
     return True
 
 
@@ -39,20 +53,25 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     client = hass.data[DOMAIN][DATA_CLIENT][entry.entry_id] = Client(
         entry.data[CONF_IP_ADDRESS], port=entry.data[CONF_PORT]
     )
-    hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id] = {}
+    hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id] = {
+        API_SENSOR_PAIRED_SENSOR_STATUS: {}
+    }
+    hass.data[DOMAIN][DATA_UNSUB_DISPATCHER_CONNECT][entry.entry_id] = []
 
     # The valve controller's UDP-based API can't handle concurrent requests very well,
     # so we use a lock to ensure that only one API request is reaching it at a time:
     api_lock = asyncio.Lock()
-    initial_fetch_tasks = []
 
+    # Set up DataUpdateCoordinators for the valve controller:
+    init_valve_controller_tasks = []
     for api, api_coro in [
+        (API_SENSOR_PAIR_DUMP, client.sensor.pair_dump),
         (API_SYSTEM_DIAGNOSTICS, client.system.diagnostics),
         (API_SYSTEM_ONBOARD_SENSOR_STATUS, client.system.onboard_sensor_status),
         (API_VALVE_STATUS, client.valve.status),
         (API_WIFI_STATUS, client.wifi.status),
     ]:
-        hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][
+        coordinator = hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][
             api
         ] = GuardianDataUpdateCoordinator(
             hass,
@@ -62,12 +81,29 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             api_lock=api_lock,
             valve_controller_uid=entry.data[CONF_UID],
         )
-        initial_fetch_tasks.append(
-            hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][api].async_refresh()
+        init_valve_controller_tasks.append(coordinator.async_refresh())
+
+    await asyncio.gather(*init_valve_controller_tasks)
+
+    # Set up an object to evaluate each batch of paired sensor UIDs and add/remove
+    # devices as appropriate:
+    paired_sensor_manager = hass.data[DOMAIN][DATA_PAIRED_SENSOR_MANAGER][
+        entry.entry_id
+    ] = PairedSensorManager(hass, entry, client, api_lock)
+    await paired_sensor_manager.async_process_latest_paired_sensor_uids()
+
+    @callback
+    def async_process_paired_sensor_uids():
+        """Define a callback for when new paired sensor data is received."""
+        hass.async_create_task(
+            paired_sensor_manager.async_process_latest_paired_sensor_uids()
         )
 
-    await asyncio.gather(*initial_fetch_tasks)
+    hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][
+        API_SENSOR_PAIR_DUMP
+    ].async_add_listener(async_process_paired_sensor_uids)
 
+    # Set up all of the Guardian entity platforms:
     for component in PLATFORMS:
         hass.async_create_task(
             hass.config_entries.async_forward_entry_setup(entry, component)
@@ -89,33 +125,115 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     if unload_ok:
         hass.data[DOMAIN][DATA_CLIENT].pop(entry.entry_id)
         hass.data[DOMAIN][DATA_COORDINATOR].pop(entry.entry_id)
+        hass.data[DOMAIN][DATA_LAST_SENSOR_PAIR_DUMP].pop(entry.entry_id)
+        for unsub in hass.data[DOMAIN][DATA_UNSUB_DISPATCHER_CONNECT][entry.entry_id]:
+            unsub()
+        hass.data[DOMAIN][DATA_UNSUB_DISPATCHER_CONNECT].pop(entry.entry_id)
 
     return unload_ok
 
 
-class GuardianEntity(Entity):
-    """Define a base Guardian entity."""
+class PairedSensorManager:
+    """Define an object that manages the addition/removal of paired sensors."""
 
     def __init__(
         self,
+        hass: HomeAssistant,
         entry: ConfigEntry,
         client: Client,
-        coordinators: Dict[str, DataUpdateCoordinator],
-        kind: str,
-        name: str,
-        device_class: str,
-        icon: str,
+        api_lock: asyncio.Lock,
+    ) -> None:
+        """Initialize."""
+        self._api_lock = api_lock
+        self._client = client
+        self._entry = entry
+        self._hass = hass
+        self._listeners = []
+        self._paired_uids = set()
+
+    async def async_pair_sensor(self, uid: str) -> None:
+        """Add a new paired sensor coordinator."""
+        LOGGER.debug("Adding paired sensor: %s", uid)
+
+        self._paired_uids.add(uid)
+
+        coordinator = self._hass.data[DOMAIN][DATA_COORDINATOR][self._entry.entry_id][
+            API_SENSOR_PAIRED_SENSOR_STATUS
+        ][uid] = GuardianDataUpdateCoordinator(
+            self._hass,
+            client=self._client,
+            api_name=f"{API_SENSOR_PAIRED_SENSOR_STATUS}_{uid}",
+            api_coro=lambda: self._client.sensor.paired_sensor_status(uid),
+            api_lock=self._api_lock,
+            valve_controller_uid=self._entry.data[CONF_UID],
+        )
+        await coordinator.async_request_refresh()
+
+        async_dispatcher_send(
+            self._hass,
+            SIGNAL_PAIRED_SENSOR_COORDINATOR_ADDED.format(self._entry.data[CONF_UID]),
+            uid,
+        )
+
+    async def async_process_latest_paired_sensor_uids(self) -> None:
+        """Process a list of new UIDs."""
+        try:
+            uids = set(
+                self._hass.data[DOMAIN][DATA_COORDINATOR][self._entry.entry_id][
+                    API_SENSOR_PAIR_DUMP
+                ].data["paired_uids"]
+            )
+        except KeyError:
+            # Sometimes the paired_uids key can fail to exist; the user can't do anything
+            # about it, so in this case, we quietly abort and return:
+            return
+
+        if uids == self._paired_uids:
+            return
+
+        old = self._paired_uids
+        new = self._paired_uids = set(uids)
+
+        tasks = [self.async_pair_sensor(uid) for uid in new.difference(old)]
+        tasks += [self.async_unpair_sensor(uid) for uid in old.difference(new)]
+
+        if tasks:
+            await asyncio.gather(*tasks)
+
+    async def async_unpair_sensor(self, uid: str) -> None:
+        """Remove a paired sensor coordinator."""
+        LOGGER.debug("Removing paired sensor: %s", uid)
+
+        # Clear out objects related to this paired sensor:
+        self._paired_uids.remove(uid)
+        self._hass.data[DOMAIN][DATA_COORDINATOR][self._entry.entry_id][
+            API_SENSOR_PAIRED_SENSOR_STATUS
+        ].pop(uid)
+
+        # Remove the paired sensor device from the device registry (which will
+        # clean up entities and the entity registry):
+        dev_reg = await self._hass.helpers.device_registry.async_get_registry()
+        device = dev_reg.async_get_or_create(
+            config_entry_id=self._entry.entry_id, identifiers={(DOMAIN, uid)}
+        )
+        dev_reg.async_remove_device(device.id)
+
+
+class GuardianEntity(CoordinatorEntity):
+    """Define a base Guardian entity."""
+
+    def __init__(  # pylint: disable=super-init-not-called
+        self, entry: ConfigEntry, kind: str, name: str, device_class: str, icon: str
     ) -> None:
         """Initialize."""
         self._attrs = {ATTR_ATTRIBUTION: "Data provided by Elexa"}
         self._available = True
-        self._client = client
-        self._coordinators = coordinators
+        self._entry = entry
         self._device_class = device_class
+        self._device_info = {"manufacturer": "Elexa"}
         self._icon = icon
         self._kind = kind
         self._name = name
-        self._valve_controller_uid = entry.data[CONF_UID]
 
     @property
     def device_class(self) -> str:
@@ -125,12 +243,7 @@ class GuardianEntity(Entity):
     @property
     def device_info(self) -> dict:
         """Return device registry information for this entity."""
-        return {
-            "identifiers": {(DOMAIN, self._valve_controller_uid)},
-            "manufacturer": "Elexa",
-            "model": self._coordinators[API_SYSTEM_DIAGNOSTICS].data["firmware"],
-            "name": f"Guardian {self._valve_controller_uid}",
-        }
+        return self._device_info
 
     @property
     def device_state_attributes(self) -> dict:
@@ -142,28 +255,6 @@ class GuardianEntity(Entity):
         """Return the icon."""
         return self._icon
 
-    @property
-    def name(self) -> str:
-        """Return the name of the entity."""
-        return f"Guardian {self._valve_controller_uid}: {self._name}"
-
-    @property
-    def should_poll(self) -> bool:
-        """Return True if entity has to be polled for state."""
-        return False
-
-    @property
-    def unique_id(self):
-        """Return the unique ID of the entity."""
-        return f"{self._valve_controller_uid}_{self._kind}"
-
-    async def _async_internal_added_to_hass(self):
-        """Perform additional, internal tasks when the entity is about to be added.
-
-        This should be extended by Guardian platforms.
-        """
-        raise NotImplementedError
-
     @callback
     def _async_update_from_latest_data(self):
         """Update the entity.
@@ -173,19 +264,121 @@ class GuardianEntity(Entity):
         raise NotImplementedError
 
     @callback
-    def async_add_coordinator_update_listener(self, api: str) -> None:
-        """Add a listener to a DataUpdateCoordinator based on the API referenced."""
+    def _async_update_state_callback(self):
+        """Update the entity's state."""
+        self._async_update_from_latest_data()
+        self.async_write_ha_state()
 
-        @callback
-        def async_update():
-            """Update the entity's state."""
-            self._async_update_from_latest_data()
-            self.async_write_ha_state()
 
-        self.async_on_remove(self._coordinators[api].async_add_listener(async_update))
+class PairedSensorEntity(GuardianEntity):
+    """Define a Guardian paired sensor entity."""
+
+    def __init__(
+        self,
+        entry: ConfigEntry,
+        coordinator: DataUpdateCoordinator,
+        kind: str,
+        name: str,
+        device_class: str,
+        icon: str,
+    ) -> None:
+        """Initialize."""
+        super().__init__(entry, kind, name, device_class, icon)
+
+        self.coordinator = coordinator
+
+        self._paired_sensor_uid = coordinator.data["uid"]
+
+        self._device_info["identifiers"] = {(DOMAIN, self._paired_sensor_uid)}
+        self._device_info["name"] = f"Guardian Paired Sensor {self._paired_sensor_uid}"
+        self._device_info["via_device"] = (DOMAIN, self._entry.data[CONF_UID])
+
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return f"Guardian Paired Sensor {self._paired_sensor_uid}: {self._name}"
+
+    @property
+    def unique_id(self):
+        """Return the unique ID of the entity."""
+        return f"{self._paired_sensor_uid}_{self._kind}"
 
     async def async_added_to_hass(self) -> None:
         """Perform tasks when the entity is added."""
-        await self._async_internal_added_to_hass()
+        self._async_update_from_latest_data()
+
+
+class ValveControllerEntity(GuardianEntity):
+    """Define a Guardian valve controller entity."""
+
+    def __init__(
+        self,
+        entry: ConfigEntry,
+        coordinators: Dict[str, DataUpdateCoordinator],
+        kind: str,
+        name: str,
+        device_class: str,
+        icon: str,
+    ) -> None:
+        """Initialize."""
+        super().__init__(entry, kind, name, device_class, icon)
+
+        self.coordinators = coordinators
+
+        self._device_info["identifiers"] = {(DOMAIN, self._entry.data[CONF_UID])}
+        self._device_info[
+            "name"
+        ] = f"Guardian Valve Controller {self._entry.data[CONF_UID]}"
+        self._device_info["model"] = self.coordinators[API_SYSTEM_DIAGNOSTICS].data[
+            "firmware"
+        ]
+
+    @property
+    def availabile(self) -> bool:
+        """Return if entity is available."""
+        return any(coordinator.last_update_success for coordinator in self.coordinators)
+
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return f"Guardian {self._entry.data[CONF_UID]}: {self._name}"
+
+    @property
+    def unique_id(self):
+        """Return the unique ID of the entity."""
+        return f"{self._entry.data[CONF_UID]}_{self._kind}"
+
+    async def _async_continue_entity_setup(self):
+        """Perform additional, internal tasks when the entity is about to be added.
+
+        This should be extended by Guardian platforms.
+        """
+        raise NotImplementedError
+
+    @callback
+    def async_add_coordinator_update_listener(self, api: str) -> None:
+        """Add a listener to a DataUpdateCoordinator based on the API referenced."""
+        self.async_on_remove(
+            self.coordinators[api].async_add_listener(self._async_update_state_callback)
+        )
+
+    async def async_added_to_hass(self) -> None:
+        """Perform tasks when the entity is added."""
+        await self._async_continue_entity_setup()
         self.async_add_coordinator_update_listener(API_SYSTEM_DIAGNOSTICS)
         self._async_update_from_latest_data()
+
+    async def async_update(self) -> None:
+        """Update the entity.
+
+        Only used by the generic entity update service.
+        """
+
+        # Ignore manual update requests if the entity is disabled
+        if not self.enabled:
+            return
+
+        refresh_tasks = [
+            coordinator.async_request_refresh() for coordinator in self.coordinators
+        ]
+        await asyncio.gather(*refresh_tasks)
diff --git a/homeassistant/components/guardian/binary_sensor.py b/homeassistant/components/guardian/binary_sensor.py
index 7942dba361e..d8d0498304d 100644
--- a/homeassistant/components/guardian/binary_sensor.py
+++ b/homeassistant/components/guardian/binary_sensor.py
@@ -1,70 +1,168 @@
 """Binary sensors for the Elexa Guardian integration."""
-from typing import Callable, Dict
-
-from aioguardian import Client
+from typing import Callable, Dict, Optional
 
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_MOISTURE,
+    DEVICE_CLASS_MOVING,
     BinarySensorEntity,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
-from . import GuardianEntity
+from . import PairedSensorEntity, ValveControllerEntity
 from .const import (
+    API_SENSOR_PAIRED_SENSOR_STATUS,
     API_SYSTEM_ONBOARD_SENSOR_STATUS,
     API_WIFI_STATUS,
-    DATA_CLIENT,
+    CONF_UID,
     DATA_COORDINATOR,
+    DATA_UNSUB_DISPATCHER_CONNECT,
     DOMAIN,
+    SIGNAL_PAIRED_SENSOR_COORDINATOR_ADDED,
 )
 
 ATTR_CONNECTED_CLIENTS = "connected_clients"
 
 SENSOR_KIND_AP_INFO = "ap_enabled"
 SENSOR_KIND_LEAK_DETECTED = "leak_detected"
-SENSORS = [
-    (SENSOR_KIND_AP_INFO, "Onboard AP Enabled", DEVICE_CLASS_CONNECTIVITY),
-    (SENSOR_KIND_LEAK_DETECTED, "Leak Detected", DEVICE_CLASS_MOISTURE),
-]
+SENSOR_KIND_MOVED = "moved"
+
+SENSOR_ATTRS_MAP = {
+    SENSOR_KIND_AP_INFO: ("Onboard AP Enabled", DEVICE_CLASS_CONNECTIVITY),
+    SENSOR_KIND_LEAK_DETECTED: ("Leak Detected", DEVICE_CLASS_MOISTURE),
+    SENSOR_KIND_MOVED: ("Recently Moved", DEVICE_CLASS_MOVING),
+}
+
+PAIRED_SENSOR_SENSORS = [SENSOR_KIND_LEAK_DETECTED, SENSOR_KIND_MOVED]
+VALVE_CONTROLLER_SENSORS = [SENSOR_KIND_AP_INFO, SENSOR_KIND_LEAK_DETECTED]
 
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: Callable
 ) -> None:
     """Set up Guardian switches based on a config entry."""
-    async_add_entities(
-        [
-            GuardianBinarySensor(
+
+    @callback
+    def add_new_paired_sensor(uid: str) -> None:
+        """Add a new paired sensor."""
+        coordinator = hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][
+            API_SENSOR_PAIRED_SENSOR_STATUS
+        ][uid]
+
+        entities = []
+        for kind in PAIRED_SENSOR_SENSORS:
+            name, device_class = SENSOR_ATTRS_MAP[kind]
+            entities.append(
+                PairedSensorBinarySensor(
+                    entry,
+                    coordinator,
+                    kind,
+                    name,
+                    device_class,
+                    None,
+                )
+            )
+
+        async_add_entities(entities)
+
+    # Handle adding paired sensors after HASS startup:
+    hass.data[DOMAIN][DATA_UNSUB_DISPATCHER_CONNECT][entry.entry_id].append(
+        async_dispatcher_connect(
+            hass,
+            SIGNAL_PAIRED_SENSOR_COORDINATOR_ADDED.format(entry.data[CONF_UID]),
+            add_new_paired_sensor,
+        )
+    )
+
+    sensors = []
+
+    # Add all valve controller-specific binary sensors:
+    for kind in VALVE_CONTROLLER_SENSORS:
+        name, device_class = SENSOR_ATTRS_MAP[kind]
+        sensors.append(
+            ValveControllerBinarySensor(
                 entry,
-                hass.data[DOMAIN][DATA_CLIENT][entry.entry_id],
                 hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id],
                 kind,
                 name,
                 device_class,
+                None,
             )
-            for kind, name, device_class in SENSORS
-        ],
-        True,
-    )
+        )
+
+    # Add all paired sensor-specific binary sensors:
+    for coordinator in hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][
+        API_SENSOR_PAIRED_SENSOR_STATUS
+    ].values():
+        for kind in PAIRED_SENSOR_SENSORS:
+            name, device_class = SENSOR_ATTRS_MAP[kind]
+            sensors.append(
+                PairedSensorBinarySensor(
+                    entry,
+                    coordinator,
+                    kind,
+                    name,
+                    device_class,
+                    None,
+                )
+            )
+
+    async_add_entities(sensors)
 
 
-class GuardianBinarySensor(GuardianEntity, BinarySensorEntity):
-    """Define a generic Guardian sensor."""
+class PairedSensorBinarySensor(PairedSensorEntity, BinarySensorEntity):
+    """Define a binary sensor related to a Guardian valve controller."""
+
+    def __init__(
+        self,
+        entry: ConfigEntry,
+        coordinator: DataUpdateCoordinator,
+        kind: str,
+        name: str,
+        device_class: Optional[str],
+        icon: Optional[str],
+    ) -> None:
+        """Initialize."""
+        super().__init__(entry, coordinator, kind, name, device_class, icon)
+
+        self._is_on = True
+
+    @property
+    def available(self) -> bool:
+        """Return whether the entity is available."""
+        return self.coordinator.last_update_success
+
+    @property
+    def is_on(self) -> bool:
+        """Return True if the binary sensor is on."""
+        return self._is_on
+
+    @callback
+    def _async_update_from_latest_data(self) -> None:
+        """Update the entity."""
+        if self._kind == SENSOR_KIND_LEAK_DETECTED:
+            self._is_on = self.coordinator.data["wet"]
+        elif self._kind == SENSOR_KIND_MOVED:
+            self._is_on = self.coordinator.data["moved"]
+
+
+class ValveControllerBinarySensor(ValveControllerEntity, BinarySensorEntity):
+    """Define a binary sensor related to a Guardian valve controller."""
 
     def __init__(
         self,
         entry: ConfigEntry,
-        client: Client,
         coordinators: Dict[str, DataUpdateCoordinator],
         kind: str,
         name: str,
-        device_class: str,
+        device_class: Optional[str],
+        icon: Optional[str],
     ) -> None:
         """Initialize."""
-        super().__init__(entry, client, coordinators, kind, name, device_class, None)
+        super().__init__(entry, coordinators, kind, name, device_class, icon)
 
         self._is_on = True
 
@@ -72,9 +170,9 @@ class GuardianBinarySensor(GuardianEntity, BinarySensorEntity):
     def available(self) -> bool:
         """Return whether the entity is available."""
         if self._kind == SENSOR_KIND_AP_INFO:
-            return self._coordinators[API_WIFI_STATUS].last_update_success
+            return self.coordinators[API_WIFI_STATUS].last_update_success
         if self._kind == SENSOR_KIND_LEAK_DETECTED:
-            return self._coordinators[
+            return self.coordinators[
                 API_SYSTEM_ONBOARD_SENSOR_STATUS
             ].last_update_success
         return False
@@ -84,7 +182,8 @@ class GuardianBinarySensor(GuardianEntity, BinarySensorEntity):
         """Return True if the binary sensor is on."""
         return self._is_on
 
-    async def _async_internal_added_to_hass(self) -> None:
+    async def _async_continue_entity_setup(self) -> None:
+        """Add an API listener."""
         if self._kind == SENSOR_KIND_AP_INFO:
             self.async_add_coordinator_update_listener(API_WIFI_STATUS)
         elif self._kind == SENSOR_KIND_LEAK_DETECTED:
@@ -94,15 +193,15 @@ class GuardianBinarySensor(GuardianEntity, BinarySensorEntity):
     def _async_update_from_latest_data(self) -> None:
         """Update the entity."""
         if self._kind == SENSOR_KIND_AP_INFO:
-            self._is_on = self._coordinators[API_WIFI_STATUS].data["station_connected"]
+            self._is_on = self.coordinators[API_WIFI_STATUS].data["station_connected"]
             self._attrs.update(
                 {
-                    ATTR_CONNECTED_CLIENTS: self._coordinators[API_WIFI_STATUS].data[
+                    ATTR_CONNECTED_CLIENTS: self.coordinators[API_WIFI_STATUS].data.get(
                         "ap_clients"
-                    ]
+                    )
                 }
             )
         elif self._kind == SENSOR_KIND_LEAK_DETECTED:
-            self._is_on = self._coordinators[API_SYSTEM_ONBOARD_SENSOR_STATUS].data[
+            self._is_on = self.coordinators[API_SYSTEM_ONBOARD_SENSOR_STATUS].data[
                 "wet"
             ]
diff --git a/homeassistant/components/guardian/config_flow.py b/homeassistant/components/guardian/config_flow.py
index 71ec271753e..760cf960e43 100644
--- a/homeassistant/components/guardian/config_flow.py
+++ b/homeassistant/components/guardian/config_flow.py
@@ -83,7 +83,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_zeroconf(self, discovery_info):
         """Handle the configuration via zeroconf."""
         if discovery_info is None:
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
 
         pin = async_get_pin_from_discovery_hostname(discovery_info["hostname"])
         await self._async_set_unique_id(pin)
diff --git a/homeassistant/components/guardian/const.py b/homeassistant/components/guardian/const.py
index 321a46a3ffc..750a8c407ca 100644
--- a/homeassistant/components/guardian/const.py
+++ b/homeassistant/components/guardian/const.py
@@ -5,6 +5,8 @@ DOMAIN = "guardian"
 
 LOGGER = logging.getLogger(__package__)
 
+API_SENSOR_PAIRED_SENSOR_STATUS = "sensor_paired_sensor_status"
+API_SENSOR_PAIR_DUMP = "sensor_pair_dump"
 API_SYSTEM_DIAGNOSTICS = "system_diagnostics"
 API_SYSTEM_ONBOARD_SENSOR_STATUS = "system_onboard_sensor_status"
 API_VALVE_STATUS = "valve_status"
@@ -14,3 +16,7 @@ CONF_UID = "uid"
 
 DATA_CLIENT = "client"
 DATA_COORDINATOR = "coordinator"
+DATA_PAIRED_SENSOR_MANAGER = "paired_sensor_manager"
+DATA_UNSUB_DISPATCHER_CONNECT = "unsub_dispatcher_connect"
+
+SIGNAL_PAIRED_SENSOR_COORDINATOR_ADDED = "guardian_paired_sensor_coordinator_added_{0}"
diff --git a/homeassistant/components/guardian/sensor.py b/homeassistant/components/guardian/sensor.py
index eadfd2b946f..160246b2014 100644
--- a/homeassistant/components/guardian/sensor.py
+++ b/homeassistant/components/guardian/sensor.py
@@ -1,45 +1,89 @@
 """Sensors for the Elexa Guardian integration."""
-from typing import Callable, Dict
-
-from aioguardian import Client
+from typing import Callable, Dict, Optional
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_CLASS_TEMPERATURE, TEMP_FAHRENHEIT, TIME_MINUTES
+from homeassistant.const import (
+    DEVICE_CLASS_BATTERY,
+    DEVICE_CLASS_TEMPERATURE,
+    PERCENTAGE,
+    TEMP_FAHRENHEIT,
+    TIME_MINUTES,
+)
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
-from . import GuardianEntity
+from . import PairedSensorEntity, ValveControllerEntity
 from .const import (
+    API_SENSOR_PAIRED_SENSOR_STATUS,
     API_SYSTEM_DIAGNOSTICS,
     API_SYSTEM_ONBOARD_SENSOR_STATUS,
-    DATA_CLIENT,
+    CONF_UID,
     DATA_COORDINATOR,
+    DATA_UNSUB_DISPATCHER_CONNECT,
     DOMAIN,
+    SIGNAL_PAIRED_SENSOR_COORDINATOR_ADDED,
 )
 
+SENSOR_KIND_BATTERY = "battery"
 SENSOR_KIND_TEMPERATURE = "temperature"
 SENSOR_KIND_UPTIME = "uptime"
-SENSORS = [
-    (
-        SENSOR_KIND_TEMPERATURE,
+
+SENSOR_ATTRS_MAP = {
+    SENSOR_KIND_BATTERY: ("Battery", DEVICE_CLASS_BATTERY, None, PERCENTAGE),
+    SENSOR_KIND_TEMPERATURE: (
         "Temperature",
         DEVICE_CLASS_TEMPERATURE,
         None,
         TEMP_FAHRENHEIT,
     ),
-    (SENSOR_KIND_UPTIME, "Uptime", None, "mdi:timer-outline", TIME_MINUTES),
-]
+    SENSOR_KIND_UPTIME: ("Uptime", None, "mdi:timer", TIME_MINUTES),
+}
+
+PAIRED_SENSOR_SENSORS = [SENSOR_KIND_BATTERY, SENSOR_KIND_TEMPERATURE]
+VALVE_CONTROLLER_SENSORS = [SENSOR_KIND_TEMPERATURE, SENSOR_KIND_UPTIME]
 
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: Callable
 ) -> None:
     """Set up Guardian switches based on a config entry."""
-    async_add_entities(
-        [
-            GuardianSensor(
+
+    @callback
+    def add_new_paired_sensor(uid: str) -> None:
+        """Add a new paired sensor."""
+        coordinator = hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][
+            API_SENSOR_PAIRED_SENSOR_STATUS
+        ][uid]
+
+        entities = []
+        for kind in PAIRED_SENSOR_SENSORS:
+            name, device_class, icon, unit = SENSOR_ATTRS_MAP[kind]
+            entities.append(
+                PairedSensorSensor(
+                    entry, coordinator, kind, name, device_class, icon, unit
+                )
+            )
+
+        async_add_entities(entities, True)
+
+    # Handle adding paired sensors after HASS startup:
+    hass.data[DOMAIN][DATA_UNSUB_DISPATCHER_CONNECT][entry.entry_id].append(
+        async_dispatcher_connect(
+            hass,
+            SIGNAL_PAIRED_SENSOR_COORDINATOR_ADDED.format(entry.data[CONF_UID]),
+            add_new_paired_sensor,
+        )
+    )
+
+    sensors = []
+
+    # Add all valve controller-specific binary sensors:
+    for kind in VALVE_CONTROLLER_SENSORS:
+        name, device_class, icon, unit = SENSOR_ATTRS_MAP[kind]
+        sensors.append(
+            ValveControllerSensor(
                 entry,
-                hass.data[DOMAIN][DATA_CLIENT][entry.entry_id],
                 hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id],
                 kind,
                 name,
@@ -47,28 +91,81 @@ async def async_setup_entry(
                 icon,
                 unit,
             )
-            for kind, name, device_class, icon, unit in SENSORS
-        ],
-        True,
-    )
+        )
+
+    # Add all paired sensor-specific binary sensors:
+    for coordinator in hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][
+        API_SENSOR_PAIRED_SENSOR_STATUS
+    ].values():
+        for kind in PAIRED_SENSOR_SENSORS:
+            name, device_class, icon, unit = SENSOR_ATTRS_MAP[kind]
+            sensors.append(
+                PairedSensorSensor(
+                    entry, coordinator, kind, name, device_class, icon, unit
+                )
+            )
+
+    async_add_entities(sensors)
 
 
-class GuardianSensor(GuardianEntity):
+class PairedSensorSensor(PairedSensorEntity):
+    """Define a binary sensor related to a Guardian valve controller."""
+
+    def __init__(
+        self,
+        entry: ConfigEntry,
+        coordinator: DataUpdateCoordinator,
+        kind: str,
+        name: str,
+        device_class: Optional[str],
+        icon: Optional[str],
+        unit: Optional[str],
+    ) -> None:
+        """Initialize."""
+        super().__init__(entry, coordinator, kind, name, device_class, icon)
+
+        self._state = None
+        self._unit = unit
+
+    @property
+    def available(self) -> bool:
+        """Return whether the entity is available."""
+        return self.coordinator.last_update_success
+
+    @property
+    def state(self) -> str:
+        """Return the sensor state."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self) -> str:
+        """Return the unit of measurement of this entity, if any."""
+        return self._unit
+
+    @callback
+    def _async_update_from_latest_data(self) -> None:
+        """Update the entity."""
+        if self._kind == SENSOR_KIND_BATTERY:
+            self._state = self.coordinator.data["battery"]
+        elif self._kind == SENSOR_KIND_TEMPERATURE:
+            self._state = self.coordinator.data["temperature"]
+
+
+class ValveControllerSensor(ValveControllerEntity):
     """Define a generic Guardian sensor."""
 
     def __init__(
         self,
         entry: ConfigEntry,
-        client: Client,
         coordinators: Dict[str, DataUpdateCoordinator],
         kind: str,
         name: str,
-        device_class: str,
-        icon: str,
-        unit: str,
+        device_class: Optional[str],
+        icon: Optional[str],
+        unit: Optional[str],
     ) -> None:
         """Initialize."""
-        super().__init__(entry, client, coordinators, kind, name, device_class, icon)
+        super().__init__(entry, coordinators, kind, name, device_class, icon)
 
         self._state = None
         self._unit = unit
@@ -77,11 +174,11 @@ class GuardianSensor(GuardianEntity):
     def available(self) -> bool:
         """Return whether the entity is available."""
         if self._kind == SENSOR_KIND_TEMPERATURE:
-            return self._coordinators[
+            return self.coordinators[
                 API_SYSTEM_ONBOARD_SENSOR_STATUS
             ].last_update_success
         if self._kind == SENSOR_KIND_UPTIME:
-            return self._coordinators[API_SYSTEM_DIAGNOSTICS].last_update_success
+            return self.coordinators[API_SYSTEM_DIAGNOSTICS].last_update_success
         return False
 
     @property
@@ -94,7 +191,7 @@ class GuardianSensor(GuardianEntity):
         """Return the unit of measurement of this entity, if any."""
         return self._unit
 
-    async def _async_internal_added_to_hass(self) -> None:
+    async def _async_continue_entity_setup(self) -> None:
         """Register API interest (and related tasks) when the entity is added."""
         if self._kind == SENSOR_KIND_TEMPERATURE:
             self.async_add_coordinator_update_listener(API_SYSTEM_ONBOARD_SENSOR_STATUS)
@@ -103,8 +200,8 @@ class GuardianSensor(GuardianEntity):
     def _async_update_from_latest_data(self) -> None:
         """Update the entity."""
         if self._kind == SENSOR_KIND_TEMPERATURE:
-            self._state = self._coordinators[API_SYSTEM_ONBOARD_SENSOR_STATUS].data[
+            self._state = self.coordinators[API_SYSTEM_ONBOARD_SENSOR_STATUS].data[
                 "temperature"
             ]
         elif self._kind == SENSOR_KIND_UPTIME:
-            self._state = self._coordinators[API_SYSTEM_DIAGNOSTICS].data["uptime"]
+            self._state = self.coordinators[API_SYSTEM_DIAGNOSTICS].data["uptime"]
diff --git a/homeassistant/components/guardian/services.yaml b/homeassistant/components/guardian/services.yaml
index 6e20e2aca9d..dc78503eb12 100644
--- a/homeassistant/components/guardian/services.yaml
+++ b/homeassistant/components/guardian/services.yaml
@@ -11,6 +11,15 @@ enable_ap:
     entity_id:
       description: The Guardian valve controller to affect.
       example: switch.guardian_abcde_valve
+pair_sensor:
+  description: Add a new paired sensor to the valve controller.
+  fields:
+    entity_id:
+      description: The Guardian valve controller to affect.
+      example: switch.guardian_abcde_valve
+    uid:
+      description: The UID of the paired sensor
+      example: 5410EC688BCF
 reboot:
   description: Reboot the device.
   fields:
@@ -23,6 +32,15 @@ reset_valve_diagnostics:
     entity_id:
       description: The Guardian valve controller to affect.
       example: switch.guardian_abcde_valve
+unpair_sensor:
+  description: Remove a paired sensor from the valve controller.
+  fields:
+    entity_id:
+      description: The Guardian valve controller to affect.
+      example: switch.guardian_abcde_valve
+    uid:
+      description: The UID of the paired sensor
+      example: 5410EC688BCF
 upgrade_firmware:
   description: Upgrade the device firmware.
   fields:
diff --git a/homeassistant/components/guardian/strings.json b/homeassistant/components/guardian/strings.json
index 3f87d3260f4..47abe35037d 100644
--- a/homeassistant/components/guardian/strings.json
+++ b/homeassistant/components/guardian/strings.json
@@ -5,8 +5,8 @@
       "user": {
         "description": "Configure a local Elexa Guardian device.",
         "data": {
-          "ip_address": "IP Address",
-          "port": "Port"
+          "ip_address": "[%key:common::config_flow::data::ip%]",
+          "port": "[%key:common::config_flow::data::port%]"
         }
       },
       "zeroconf_confirm": {
@@ -14,9 +14,9 @@
       }
     },
     "abort": {
-      "already_configured": "This Guardian device has already been configured.",
-      "already_in_progress": "Guardian device configuration is already in process.",
-      "connection_error": "Failed to connect to the Guardian device."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   }
 }
diff --git a/homeassistant/components/guardian/switch.py b/homeassistant/components/guardian/switch.py
index 8aebd078e04..20a38ea5ce7 100644
--- a/homeassistant/components/guardian/switch.py
+++ b/homeassistant/components/guardian/switch.py
@@ -12,8 +12,16 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
-from . import GuardianEntity
-from .const import API_VALVE_STATUS, DATA_CLIENT, DATA_COORDINATOR, DOMAIN, LOGGER
+from . import ValveControllerEntity
+from .const import (
+    API_VALVE_STATUS,
+    CONF_UID,
+    DATA_CLIENT,
+    DATA_COORDINATOR,
+    DATA_PAIRED_SENSOR_MANAGER,
+    DOMAIN,
+    LOGGER,
+)
 
 ATTR_AVG_CURRENT = "average_current"
 ATTR_INST_CURRENT = "instantaneous_current"
@@ -22,8 +30,10 @@ ATTR_TRAVEL_COUNT = "travel_count"
 
 SERVICE_DISABLE_AP = "disable_ap"
 SERVICE_ENABLE_AP = "enable_ap"
+SERVICE_PAIR_SENSOR = "pair_sensor"
 SERVICE_REBOOT = "reboot"
 SERVICE_RESET_VALVE_DIAGNOSTICS = "reset_valve_diagnostics"
+SERVICE_UNPAIR_SENSOR = "unpair_sensor"
 SERVICE_UPGRADE_FIRMWARE = "upgrade_firmware"
 
 
@@ -36,6 +46,7 @@ async def async_setup_entry(
     for service_name, schema, method in [
         (SERVICE_DISABLE_AP, {}, "async_disable_ap"),
         (SERVICE_ENABLE_AP, {}, "async_enable_ap"),
+        (SERVICE_PAIR_SENSOR, {vol.Required(CONF_UID): cv.string}, "async_pair_sensor"),
         (SERVICE_REBOOT, {}, "async_reboot"),
         (SERVICE_RESET_VALVE_DIAGNOSTICS, {}, "async_reset_valve_diagnostics"),
         (
@@ -47,22 +58,26 @@ async def async_setup_entry(
             },
             "async_upgrade_firmware",
         ),
+        (
+            SERVICE_UNPAIR_SENSOR,
+            {vol.Required(CONF_UID): cv.string},
+            "async_unpair_sensor",
+        ),
     ]:
         platform.async_register_entity_service(service_name, schema, method)
 
     async_add_entities(
         [
-            GuardianSwitch(
+            ValveControllerSwitch(
                 entry,
                 hass.data[DOMAIN][DATA_CLIENT][entry.entry_id],
                 hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id],
             )
-        ],
-        True,
+        ]
     )
 
 
-class GuardianSwitch(GuardianEntity, SwitchEntity):
+class ValveControllerSwitch(ValveControllerEntity, SwitchEntity):
     """Define a switch to open/close the Guardian valve."""
 
     def __init__(
@@ -73,29 +88,30 @@ class GuardianSwitch(GuardianEntity, SwitchEntity):
     ):
         """Initialize."""
         super().__init__(
-            entry, client, coordinators, "valve", "Valve", None, "mdi:water"
+            entry, coordinators, "valve", "Valve Controller", None, "mdi:water"
         )
 
+        self._client = client
         self._is_on = True
 
     @property
     def available(self) -> bool:
         """Return whether the entity is available."""
-        return self._coordinators[API_VALVE_STATUS].last_update_success
+        return self.coordinators[API_VALVE_STATUS].last_update_success
 
     @property
     def is_on(self) -> bool:
         """Return True if the valve is open."""
         return self._is_on
 
-    async def _async_internal_added_to_hass(self):
+    async def _async_continue_entity_setup(self):
         """Register API interest (and related tasks) when the entity is added."""
         self.async_add_coordinator_update_listener(API_VALVE_STATUS)
 
     @callback
     def _async_update_from_latest_data(self) -> None:
         """Update the entity."""
-        self._is_on = self._coordinators[API_VALVE_STATUS].data["state"] in (
+        self._is_on = self.coordinators[API_VALVE_STATUS].data["state"] in (
             "start_opening",
             "opening",
             "finish_opening",
@@ -104,16 +120,16 @@ class GuardianSwitch(GuardianEntity, SwitchEntity):
 
         self._attrs.update(
             {
-                ATTR_AVG_CURRENT: self._coordinators[API_VALVE_STATUS].data[
+                ATTR_AVG_CURRENT: self.coordinators[API_VALVE_STATUS].data[
                     "average_current"
                 ],
-                ATTR_INST_CURRENT: self._coordinators[API_VALVE_STATUS].data[
+                ATTR_INST_CURRENT: self.coordinators[API_VALVE_STATUS].data[
                     "instantaneous_current"
                 ],
-                ATTR_INST_CURRENT_DDT: self._coordinators[API_VALVE_STATUS].data[
+                ATTR_INST_CURRENT_DDT: self.coordinators[API_VALVE_STATUS].data[
                     "instantaneous_current_ddt"
                 ],
-                ATTR_TRAVEL_COUNT: self._coordinators[API_VALVE_STATUS].data[
+                ATTR_TRAVEL_COUNT: self.coordinators[API_VALVE_STATUS].data[
                     "travel_count"
                 ],
             }
@@ -125,7 +141,7 @@ class GuardianSwitch(GuardianEntity, SwitchEntity):
             async with self._client:
                 await self._client.wifi.disable_ap()
         except GuardianError as err:
-            LOGGER.error("Error during service call: %s", err)
+            LOGGER.error("Error while disabling valve controller AP: %s", err)
 
     async def async_enable_ap(self):
         """Enable the device's onboard access point."""
@@ -133,7 +149,20 @@ class GuardianSwitch(GuardianEntity, SwitchEntity):
             async with self._client:
                 await self._client.wifi.enable_ap()
         except GuardianError as err:
-            LOGGER.error("Error during service call: %s", err)
+            LOGGER.error("Error while enabling valve controller AP: %s", err)
+
+    async def async_pair_sensor(self, *, uid):
+        """Add a new paired sensor."""
+        try:
+            async with self._client:
+                await self._client.sensor.pair_sensor(uid)
+        except GuardianError as err:
+            LOGGER.error("Error while adding paired sensor: %s", err)
+            return
+
+        await self.hass.data[DOMAIN][DATA_PAIRED_SENSOR_MANAGER][
+            self._entry.entry_id
+        ].async_pair_sensor(uid)
 
     async def async_reboot(self):
         """Reboot the device."""
@@ -141,7 +170,7 @@ class GuardianSwitch(GuardianEntity, SwitchEntity):
             async with self._client:
                 await self._client.system.reboot()
         except GuardianError as err:
-            LOGGER.error("Error during service call: %s", err)
+            LOGGER.error("Error while rebooting valve controller: %s", err)
 
     async def async_reset_valve_diagnostics(self):
         """Fully reset system motor diagnostics."""
@@ -149,7 +178,20 @@ class GuardianSwitch(GuardianEntity, SwitchEntity):
             async with self._client:
                 await self._client.valve.reset()
         except GuardianError as err:
-            LOGGER.error("Error during service call: %s", err)
+            LOGGER.error("Error while resetting valve diagnostics: %s", err)
+
+    async def async_unpair_sensor(self, *, uid):
+        """Add a new paired sensor."""
+        try:
+            async with self._client:
+                await self._client.sensor.unpair_sensor(uid)
+        except GuardianError as err:
+            LOGGER.error("Error while removing paired sensor: %s", err)
+            return
+
+        await self.hass.data[DOMAIN][DATA_PAIRED_SENSOR_MANAGER][
+            self._entry.entry_id
+        ].async_unpair_sensor(uid)
 
     async def async_upgrade_firmware(self, *, url, port, filename):
         """Upgrade the device firmware."""
@@ -161,7 +203,7 @@ class GuardianSwitch(GuardianEntity, SwitchEntity):
                     filename=filename,
                 )
         except GuardianError as err:
-            LOGGER.error("Error during service call: %s", err)
+            LOGGER.error("Error while upgrading firmware: %s", err)
 
     async def async_turn_off(self, **kwargs) -> None:
         """Turn the valve off (closed)."""
diff --git a/homeassistant/components/guardian/translations/ca.json b/homeassistant/components/guardian/translations/ca.json
index a94126753be..207242e32c3 100644
--- a/homeassistant/components/guardian/translations/ca.json
+++ b/homeassistant/components/guardian/translations/ca.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest dispositiu Guardian ja est\u00e0 configurat.",
-            "already_in_progress": "La configuraci\u00f3 del dispositiu Guardian ja est\u00e0 en curs.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar amb el dispositiu Guardian."
         },
         "step": {
diff --git a/homeassistant/components/guardian/translations/cs.json b/homeassistant/components/guardian/translations/cs.json
new file mode 100644
index 00000000000..084dbf1a728
--- /dev/null
+++ b/homeassistant/components/guardian/translations/cs.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed Guardian se nezda\u0159ilo."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP adresa",
+                    "port": "Port"
+                }
+            },
+            "zeroconf_confirm": {
+                "description": "Chcete nastavit toto za\u0159\u00edzen\u00ed Guardian?"
+            }
+        }
+    },
+    "title": "Elexa Guardian"
+}
\ No newline at end of file
diff --git a/homeassistant/components/guardian/translations/el.json b/homeassistant/components/guardian/translations/el.json
new file mode 100644
index 00000000000..eb707f48797
--- /dev/null
+++ b/homeassistant/components/guardian/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/guardian/translations/en.json b/homeassistant/components/guardian/translations/en.json
index 40a8a003c12..2e47f4d28aa 100644
--- a/homeassistant/components/guardian/translations/en.json
+++ b/homeassistant/components/guardian/translations/en.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This Guardian device has already been configured.",
-            "already_in_progress": "Guardian device configuration is already in process.",
+            "already_configured": "Device is already configured",
+            "already_in_progress": "Configuration flow is already in progress",
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect to the Guardian device."
         },
         "step": {
diff --git a/homeassistant/components/guardian/translations/es.json b/homeassistant/components/guardian/translations/es.json
index ec2a724e944..657261f213e 100644
--- a/homeassistant/components/guardian/translations/es.json
+++ b/homeassistant/components/guardian/translations/es.json
@@ -3,6 +3,7 @@
         "abort": {
             "already_configured": "Este dispositivo Guardian ya ha sido configurado",
             "already_in_progress": "La configuraci\u00f3n del dispositivo Guardian ya est\u00e1 en proceso.",
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se ha podido conectar con el dispositivo Guardian."
         },
         "step": {
diff --git a/homeassistant/components/guardian/translations/et.json b/homeassistant/components/guardian/translations/et.json
new file mode 100644
index 00000000000..93df5eb12d2
--- /dev/null
+++ b/homeassistant/components/guardian/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "Guardian seadmega \u00fchenduse loomine nurjus."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP aadress",
+                    "port": ""
+                }
+            },
+            "zeroconf_confirm": {
+                "description": "Kas soovid seadistada seda Guardian'i seadet?"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/guardian/translations/fr.json b/homeassistant/components/guardian/translations/fr.json
index 52742b4e816..427c34e6ca1 100644
--- a/homeassistant/components/guardian/translations/fr.json
+++ b/homeassistant/components/guardian/translations/fr.json
@@ -3,6 +3,7 @@
         "abort": {
             "already_configured": "Ce p\u00e9riph\u00e9rique Guardian a d\u00e9j\u00e0 \u00e9t\u00e9 configur\u00e9.",
             "already_in_progress": "La configuration de l'appareil Guardian est d\u00e9j\u00e0 en cours.",
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "Impossible de se connecter au p\u00e9riph\u00e9rique Guardian."
         },
         "step": {
diff --git a/homeassistant/components/guardian/translations/it.json b/homeassistant/components/guardian/translations/it.json
index 3f1999be761..24647fff40e 100644
--- a/homeassistant/components/guardian/translations/it.json
+++ b/homeassistant/components/guardian/translations/it.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo dispositivo Guardian \u00e8 gi\u00e0 stato configurato",
-            "already_in_progress": "La configurazione del dispositivo Guardian \u00e8 gi\u00e0 in corso.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi al dispositivo Guardian."
         },
         "step": {
diff --git a/homeassistant/components/guardian/translations/lb.json b/homeassistant/components/guardian/translations/lb.json
index 1de8bb9baea..f1bf72b9d0c 100644
--- a/homeassistant/components/guardian/translations/lb.json
+++ b/homeassistant/components/guardian/translations/lb.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "D\u00ebse Guardian Apparat ass scho konfigur\u00e9iert.",
-            "already_in_progress": "Guardian Apparat Konfiguratioun ass schonn am gaang.",
+            "already_configured": "Apparat ass scho konfigur\u00e9iert.",
+            "already_in_progress": "Konfiguratioun's Oflaf ass schonn am gaang.",
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbannen mam Guardian Apparat."
         },
         "step": {
diff --git a/homeassistant/components/guardian/translations/nl.json b/homeassistant/components/guardian/translations/nl.json
index a1cd1def87a..69a69cf9c60 100644
--- a/homeassistant/components/guardian/translations/nl.json
+++ b/homeassistant/components/guardian/translations/nl.json
@@ -3,6 +3,7 @@
         "abort": {
             "already_configured": "Dit Guardian-apparaat is al geconfigureerd.",
             "already_in_progress": "De configuratie van het Guardian-apparaat is al bezig.",
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kan geen verbinding maken met het Guardian-apparaat."
         },
         "step": {
diff --git a/homeassistant/components/guardian/translations/no.json b/homeassistant/components/guardian/translations/no.json
index fbe5f881124..e1904e11091 100644
--- a/homeassistant/components/guardian/translations/no.json
+++ b/homeassistant/components/guardian/translations/no.json
@@ -1,15 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne Guardian-enheten er allerede konfigurert.",
-            "already_in_progress": "Konfigurasjon av Guardian-enheter er allerede i gang.",
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kan ikke koble til Guardian-enheten."
         },
         "step": {
             "user": {
                 "data": {
                     "ip_address": "IP adresse",
-                    "port": ""
+                    "port": "Port"
                 },
                 "description": "Konfigurer en lokal Elexa Guardian-enhet."
             },
@@ -18,5 +19,5 @@
             }
         }
     },
-    "title": "Elexa Guardian"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/guardian/translations/pl.json b/homeassistant/components/guardian/translations/pl.json
index 9c918c69796..2c5a4370abd 100644
--- a/homeassistant/components/guardian/translations/pl.json
+++ b/homeassistant/components/guardian/translations/pl.json
@@ -2,15 +2,22 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z urz\u0105dzeniem Guardian, spr\u00f3buj ponownie."
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z urz\u0105dzeniem Guardian"
         },
         "step": {
             "user": {
                 "data": {
                     "ip_address": "Adres IP",
                     "port": "Port"
-                }
+                },
+                "description": "Skonfiguruj lokalne urz\u0105dzenie Elexa Guardian."
+            },
+            "zeroconf_confirm": {
+                "description": "Czy chcesz skonfigurowa\u0107 to urz\u0105dzenie Guardian?"
             }
         }
-    }
+    },
+    "title": "Elexa Guardian"
 }
\ No newline at end of file
diff --git a/homeassistant/components/guardian/translations/ru.json b/homeassistant/components/guardian/translations/ru.json
index c9fe3b07ff7..36eefd1a4cd 100644
--- a/homeassistant/components/guardian/translations/ru.json
+++ b/homeassistant/components/guardian/translations/ru.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
         },
         "step": {
diff --git a/homeassistant/components/guardian/translations/zh-Hans.json b/homeassistant/components/guardian/translations/zh-Hans.json
new file mode 100644
index 00000000000..6e842e66fab
--- /dev/null
+++ b/homeassistant/components/guardian/translations/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/guardian/translations/zh-Hant.json b/homeassistant/components/guardian/translations/zh-Hant.json
index d91c0c3ba8c..1b0ca0090d9 100644
--- a/homeassistant/components/guardian/translations/zh-Hant.json
+++ b/homeassistant/components/guardian/translations/zh-Hant.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Guardian \u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "Guardian \u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "Guardian \u8a2d\u5099\u9023\u7dda\u5931\u6557\u3002"
         },
         "step": {
diff --git a/homeassistant/components/habitica/sensor.py b/homeassistant/components/habitica/sensor.py
index 1fa4ad63b36..f885aa832c7 100644
--- a/homeassistant/components/habitica/sensor.py
+++ b/homeassistant/components/habitica/sensor.py
@@ -1,13 +1,10 @@
 """Support for Habitica sensors."""
 from datetime import timedelta
-import logging
 
 from homeassistant.components import habitica
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 
-_LOGGER = logging.getLogger(__name__)
-
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
 
 
diff --git a/homeassistant/components/hangouts/notify.py b/homeassistant/components/hangouts/notify.py
index 01e4208fd48..77dcec8111a 100644
--- a/homeassistant/components/hangouts/notify.py
+++ b/homeassistant/components/hangouts/notify.py
@@ -1,6 +1,4 @@
 """Support for Hangouts notifications."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.notify import (
@@ -18,8 +16,6 @@ from .const import (
     TARGETS_SCHEMA,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {vol.Required(CONF_DEFAULT_CONVERSATIONS): [TARGETS_SCHEMA]}
 )
diff --git a/homeassistant/components/hangouts/strings.json b/homeassistant/components/hangouts/strings.json
index 0133bf421ff..bed46e823d9 100644
--- a/homeassistant/components/hangouts/strings.json
+++ b/homeassistant/components/hangouts/strings.json
@@ -1,8 +1,8 @@
 {
   "config": {
     "abort": {
-      "already_configured": "Google Hangouts is already configured",
-      "unknown": "Unknown error occurred."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "error": {
       "invalid_login": "Invalid Login, please try again.",
@@ -26,4 +26,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/hangouts/translations/ca.json b/homeassistant/components/hangouts/translations/ca.json
index 7daa1b4f671..2d1d81bb08d 100644
--- a/homeassistant/components/hangouts/translations/ca.json
+++ b/homeassistant/components/hangouts/translations/ca.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Google Hangouts ja est\u00e0 configurat",
-            "unknown": "S'ha produ\u00eft un error desconegut."
+            "already_configured": "El servei ja est\u00e0 configurat",
+            "unknown": "Error inesperat"
         },
         "error": {
             "invalid_2fa": "La verificaci\u00f3 en dos passos no \u00e9s v\u00e0lida, torna-ho a provar.",
diff --git a/homeassistant/components/hangouts/translations/cs.json b/homeassistant/components/hangouts/translations/cs.json
index 6b6d430307e..8e721ed5ff1 100644
--- a/homeassistant/components/hangouts/translations/cs.json
+++ b/homeassistant/components/hangouts/translations/cs.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Slu\u017eba Google Hangouts je ji\u017e nakonfigurov\u00e1na",
-            "unknown": "Do\u0161lo k nezn\u00e1m\u00e9 chyb\u011b"
+            "already_configured": "Slu\u017eba je ji\u017e nastavena",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "error": {
             "invalid_2fa": "Dfoufaktorov\u00e9 ov\u011b\u0159en\u00ed se nezda\u0159ilo. Zkuste to znovu.",
@@ -18,7 +18,8 @@
             },
             "user": {
                 "data": {
-                    "email": "E-mailov\u00e1 adresa",
+                    "authorization_code": "Autoriza\u010dn\u00ed k\u00f3d (vy\u017eadov\u00e1n pro ru\u010dn\u00ed ov\u011b\u0159en\u00ed)",
+                    "email": "E-mail",
                     "password": "Heslo"
                 },
                 "title": "P\u0159ihl\u00e1\u0161en\u00ed do slu\u017eby Google Hangouts"
diff --git a/homeassistant/components/hangouts/translations/de.json b/homeassistant/components/hangouts/translations/de.json
index 5602713d245..5c8ab51cf4e 100644
--- a/homeassistant/components/hangouts/translations/de.json
+++ b/homeassistant/components/hangouts/translations/de.json
@@ -7,7 +7,7 @@
         "error": {
             "invalid_2fa": "Ung\u00fcltige 2-Faktor Authentifizierung, bitte versuche es erneut.",
             "invalid_2fa_method": "Ung\u00fcltige 2FA Methode (mit Telefon verifizieren)",
-            "invalid_login": "Ung\u00fcltige Daten, bitte erneut versuchen."
+            "invalid_login": "Ung\u00fcltiges Login, bitte versuche es erneut."
         },
         "step": {
             "2fa": {
diff --git a/homeassistant/components/hangouts/translations/en.json b/homeassistant/components/hangouts/translations/en.json
index 0c2c91d1ac8..5de8ac24970 100644
--- a/homeassistant/components/hangouts/translations/en.json
+++ b/homeassistant/components/hangouts/translations/en.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Google Hangouts is already configured",
-            "unknown": "Unknown error occurred."
+            "already_configured": "Service is already configured",
+            "unknown": "Unexpected error"
         },
         "error": {
             "invalid_2fa": "Invalid 2 Factor Authentication, please try again.",
diff --git a/homeassistant/components/hangouts/translations/et.json b/homeassistant/components/hangouts/translations/et.json
index e8293aff79f..c5b1ff734b4 100644
--- a/homeassistant/components/hangouts/translations/et.json
+++ b/homeassistant/components/hangouts/translations/et.json
@@ -1,5 +1,9 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud",
+            "unknown": "Tundmatu viga"
+        },
         "error": {
             "invalid_2fa": "Vale 2-teguriline autentimine, proovige uuesti.",
             "invalid_2fa_method": "Kehtetu 2FA meetod (kontrollige telefoni teel).",
@@ -16,7 +20,8 @@
                 "data": {
                     "email": "E-posti aadress",
                     "password": "Salas\u00f5na"
-                }
+                },
+                "title": "Google Hangoutsi sisselogimine"
             }
         }
     }
diff --git a/homeassistant/components/hangouts/translations/it.json b/homeassistant/components/hangouts/translations/it.json
index 29ddab24913..4831d51ef12 100644
--- a/homeassistant/components/hangouts/translations/it.json
+++ b/homeassistant/components/hangouts/translations/it.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Google Hangouts \u00e8 gi\u00e0 configurato",
-            "unknown": "Si \u00e8 verificato un errore sconosciuto."
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato",
+            "unknown": "Errore imprevisto"
         },
         "error": {
             "invalid_2fa": "Autenticazione a 2 fattori non valida, riprovare.",
diff --git a/homeassistant/components/hangouts/translations/no.json b/homeassistant/components/hangouts/translations/no.json
index 8818898c0b4..1ea5c9020e7 100644
--- a/homeassistant/components/hangouts/translations/no.json
+++ b/homeassistant/components/hangouts/translations/no.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Google Hangouts er allerede konfigurert",
-            "unknown": "Ukjent feil oppstod."
+            "already_configured": "Tjenesten er allerede konfigurert",
+            "unknown": "Uventet feil"
         },
         "error": {
             "invalid_2fa": "Ugyldig totrinnsbekreftelse, vennligst pr\u00f8v igjen.",
@@ -14,16 +14,16 @@
                 "data": {
                     "2fa": "2FA Pin"
                 },
-                "description": "Tom",
+                "description": "",
                 "title": "Totrinnsbekreftelse"
             },
             "user": {
                 "data": {
                     "authorization_code": "Godkjenningskode (kreves for manuell godkjenning)",
-                    "email": "E-postadresse",
+                    "email": "E-post",
                     "password": "Passord"
                 },
-                "description": "Tom",
+                "description": "",
                 "title": "Google Hangouts p\u00e5logging"
             }
         }
diff --git a/homeassistant/components/hangouts/translations/pl.json b/homeassistant/components/hangouts/translations/pl.json
index 2dd3364bd53..ff60deeece2 100644
--- a/homeassistant/components/hangouts/translations/pl.json
+++ b/homeassistant/components/hangouts/translations/pl.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Google Hangouts jest ju\u017c skonfigurowany.",
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
-            "invalid_2fa": "Nieprawid\u0142owe uwierzytelnienie dwusk\u0142adnikowe, spr\u00f3buj ponownie.",
-            "invalid_2fa_method": "Nieprawid\u0142owa metoda uwierzytelniania dwusk\u0142adnikowego (u\u017cyj weryfikacji przez telefon).",
-            "invalid_login": "Nieprawid\u0142owy login, spr\u00f3buj ponownie."
+            "invalid_2fa": "Nieprawid\u0142owe uwierzytelnienie dwusk\u0142adnikowe, spr\u00f3buj ponownie",
+            "invalid_2fa_method": "Nieprawid\u0142owa metoda uwierzytelniania dwusk\u0142adnikowego (u\u017cyj weryfikacji przez telefon)",
+            "invalid_login": "Nieprawid\u0142owy login, spr\u00f3buj ponownie"
         },
         "step": {
             "2fa": {
diff --git a/homeassistant/components/hangouts/translations/ru.json b/homeassistant/components/hangouts/translations/ru.json
index 580c858d15f..d352258ba33 100644
--- a/homeassistant/components/hangouts/translations/ru.json
+++ b/homeassistant/components/hangouts/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "error": {
             "invalid_2fa": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044f, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430.",
diff --git a/homeassistant/components/hangouts/translations/zh-Hant.json b/homeassistant/components/hangouts/translations/zh-Hant.json
index 1619eaddb63..62a220eaa94 100644
--- a/homeassistant/components/hangouts/translations/zh-Hant.json
+++ b/homeassistant/components/hangouts/translations/zh-Hant.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Google Hangouts \u5df2\u7d93\u8a2d\u5b9a",
-            "unknown": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "error": {
             "invalid_2fa": "\u96d9\u91cd\u9a57\u8b49\u7121\u6548\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002",
diff --git a/homeassistant/components/harman_kardon_avr/media_player.py b/homeassistant/components/harman_kardon_avr/media_player.py
index 30a857f8b99..bd804fbe77a 100644
--- a/homeassistant/components/harman_kardon_avr/media_player.py
+++ b/homeassistant/components/harman_kardon_avr/media_player.py
@@ -1,6 +1,4 @@
 """Support for interface with an Harman/Kardon or JBL AVR."""
-import logging
-
 import hkavr
 import voluptuous as vol
 
@@ -15,8 +13,6 @@ from homeassistant.components.media_player.const import (
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF, STATE_ON
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Harman Kardon AVR"
 DEFAULT_PORT = 10025
 
diff --git a/homeassistant/components/harmony/__init__.py b/homeassistant/components/harmony/__init__.py
index 5bc4a132914..e425b5ce94a 100644
--- a/homeassistant/components/harmony/__init__.py
+++ b/homeassistant/components/harmony/__init__.py
@@ -1,6 +1,5 @@
 """The Logitech Harmony Hub integration."""
 import asyncio
-import logging
 
 from homeassistant.components.remote import (
     ATTR_ACTIVITY,
@@ -16,8 +15,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 from .const import DOMAIN, HARMONY_OPTIONS_UPDATE, PLATFORMS
 from .remote import HarmonyRemote
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup(hass: HomeAssistant, config: dict):
     """Set up the Logitech Harmony Hub component."""
diff --git a/homeassistant/components/harmony/strings.json b/homeassistant/components/harmony/strings.json
index 86de34672be..f953639e22d 100644
--- a/homeassistant/components/harmony/strings.json
+++ b/homeassistant/components/harmony/strings.json
@@ -15,11 +15,11 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
@@ -33,4 +33,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/harmony/translations/ca.json b/homeassistant/components/harmony/translations/ca.json
index 5bb279c0482..8111fe3b344 100644
--- a/homeassistant/components/harmony/translations/ca.json
+++ b/homeassistant/components/harmony/translations/ca.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositiu ja est\u00e0 configurat"
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_configured_device": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "unknown": "Error inesperat"
         },
         "flow_title": "Logitech Harmony Hub {name}",
diff --git a/homeassistant/components/harmony/translations/cs.json b/homeassistant/components/harmony/translations/cs.json
index d7737722cc3..4ff689252ff 100644
--- a/homeassistant/components/harmony/translations/cs.json
+++ b/homeassistant/components/harmony/translations/cs.json
@@ -1,6 +1,17 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_configured_device": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
+            "link": {
+                "description": "Chcete nastavit {name} ({host})?"
+            },
             "user": {
                 "data": {
                     "host": "Hostitel"
diff --git a/homeassistant/components/harmony/translations/en.json b/homeassistant/components/harmony/translations/en.json
index ce13e79e279..8843d741154 100644
--- a/homeassistant/components/harmony/translations/en.json
+++ b/homeassistant/components/harmony/translations/en.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Device is already configured"
+            "already_configured": "Device is already configured",
+            "already_configured_device": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "unknown": "Unexpected error"
         },
         "flow_title": "Logitech Harmony Hub {name}",
diff --git a/homeassistant/components/harmony/translations/es.json b/homeassistant/components/harmony/translations/es.json
index 39305d30680..ffd165e5d7a 100644
--- a/homeassistant/components/harmony/translations/es.json
+++ b/homeassistant/components/harmony/translations/es.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositivo ya est\u00e1 configurado"
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
+            "already_configured_device": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
             "cannot_connect": "No se ha podido conectar, por favor, int\u00e9ntalo de nuevo",
diff --git a/homeassistant/components/harmony/translations/et.json b/homeassistant/components/harmony/translations/et.json
new file mode 100644
index 00000000000..01736201773
--- /dev/null
+++ b/homeassistant/components/harmony/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_configured_device": "Seade on juba h\u00e4\u00e4letatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchenduse loomine nurjus. Proovi uuesti",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "link": {
+                "description": "Kas soovid seadistada {name}({host})?"
+            },
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/harmony/translations/fr.json b/homeassistant/components/harmony/translations/fr.json
index 4343ec3139d..ed838ed0115 100644
--- a/homeassistant/components/harmony/translations/fr.json
+++ b/homeassistant/components/harmony/translations/fr.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9"
+            "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9",
+            "already_configured_device": "L'appareil est d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
             "cannot_connect": "Impossible de se connecter, veuillez r\u00e9essayer",
diff --git a/homeassistant/components/harmony/translations/it.json b/homeassistant/components/harmony/translations/it.json
index c658e69e0c0..ea28a617ff3 100644
--- a/homeassistant/components/harmony/translations/it.json
+++ b/homeassistant/components/harmony/translations/it.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_configured_device": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "unknown": "Errore imprevisto"
         },
         "flow_title": "Logitech Harmony Hub {name}",
diff --git a/homeassistant/components/harmony/translations/no.json b/homeassistant/components/harmony/translations/no.json
index c3518792851..eca9136205c 100644
--- a/homeassistant/components/harmony/translations/no.json
+++ b/homeassistant/components/harmony/translations/no.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Enheten er allerede konfigurert"
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_configured_device": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
-        "flow_title": "Logitech Harmony Hub {name}",
+        "flow_title": "",
         "step": {
             "link": {
                 "description": "Vil du konfigurere {name} ({host})?",
diff --git a/homeassistant/components/harmony/translations/pl.json b/homeassistant/components/harmony/translations/pl.json
index 664a849061a..17dd1f2418e 100644
--- a/homeassistant/components/harmony/translations/pl.json
+++ b/homeassistant/components/harmony/translations/pl.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_configured_device": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "flow_title": "Logitech Harmony Hub {name}",
diff --git a/homeassistant/components/harmony/translations/ru.json b/homeassistant/components/harmony/translations/ru.json
index 4e995a26c48..e7ff5241a12 100644
--- a/homeassistant/components/harmony/translations/ru.json
+++ b/homeassistant/components/harmony/translations/ru.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_configured_device": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "flow_title": "Logitech Harmony Hub {name}",
diff --git a/homeassistant/components/harmony/translations/sv.json b/homeassistant/components/harmony/translations/sv.json
index 6e9c861763b..1f240051056 100644
--- a/homeassistant/components/harmony/translations/sv.json
+++ b/homeassistant/components/harmony/translations/sv.json
@@ -17,5 +17,12 @@
                 }
             }
         }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "description": "Justera inst\u00e4llningarna f\u00f6r Harmony Hub"
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/harmony/translations/zh-Hant.json b/homeassistant/components/harmony/translations/zh-Hant.json
index dfd1249d629..01af1b23af7 100644
--- a/homeassistant/components/harmony/translations/zh-Hant.json
+++ b/homeassistant/components/harmony/translations/zh-Hant.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured_device": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "flow_title": "\u7f85\u6280 Harmony Hub {name}",
diff --git a/homeassistant/components/hassio/__init__.py b/homeassistant/components/hassio/__init__.py
index 9604507fcf0..2e50207fe53 100644
--- a/homeassistant/components/hassio/__init__.py
+++ b/homeassistant/components/hassio/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.util.dt import utcnow
 from .addon_panel import async_setup_addon_panel
 from .auth import async_setup_auth_view
 from .discovery import async_setup_discovery_view
-from .handler import HassIO, HassioAPIError
+from .handler import HassIO, HassioAPIError, api_data
 from .http import HassIOView
 from .ingress import async_setup_ingress_view
 
@@ -137,47 +137,65 @@ async def async_get_addon_info(hass: HomeAssistantType, slug: str) -> dict:
 
 
 @bind_hass
-async def async_install_addon(hass: HomeAssistantType, slug: str) -> None:
+@api_data
+async def async_install_addon(hass: HomeAssistantType, slug: str) -> dict:
     """Install add-on.
 
     The caller of the function should handle HassioAPIError.
     """
     hassio = hass.data[DOMAIN]
     command = f"/addons/{slug}/install"
-    await hassio.send_command(command)
+    return await hassio.send_command(command)
 
 
 @bind_hass
-async def async_uninstall_addon(hass: HomeAssistantType, slug: str) -> None:
+@api_data
+async def async_uninstall_addon(hass: HomeAssistantType, slug: str) -> dict:
     """Uninstall add-on.
 
     The caller of the function should handle HassioAPIError.
     """
     hassio = hass.data[DOMAIN]
     command = f"/addons/{slug}/uninstall"
-    await hassio.send_command(command)
+    return await hassio.send_command(command)
 
 
 @bind_hass
-async def async_start_addon(hass: HomeAssistantType, slug: str) -> None:
+@api_data
+async def async_start_addon(hass: HomeAssistantType, slug: str) -> dict:
     """Start add-on.
 
     The caller of the function should handle HassioAPIError.
     """
     hassio = hass.data[DOMAIN]
     command = f"/addons/{slug}/start"
-    await hassio.send_command(command)
+    return await hassio.send_command(command)
 
 
 @bind_hass
-async def async_stop_addon(hass: HomeAssistantType, slug: str) -> None:
+@api_data
+async def async_stop_addon(hass: HomeAssistantType, slug: str) -> dict:
     """Stop add-on.
 
     The caller of the function should handle HassioAPIError.
     """
     hassio = hass.data[DOMAIN]
     command = f"/addons/{slug}/stop"
-    await hassio.send_command(command)
+    return await hassio.send_command(command)
+
+
+@bind_hass
+@api_data
+async def async_set_addon_options(
+    hass: HomeAssistantType, slug: str, options: dict
+) -> dict:
+    """Set add-on options.
+
+    The caller of the function should handle HassioAPIError.
+    """
+    hassio = hass.data[DOMAIN]
+    command = f"/addons/{slug}/options"
+    return await hassio.send_command(command, payload=options)
 
 
 @callback
diff --git a/homeassistant/components/hassio/handler.py b/homeassistant/components/hassio/handler.py
index e96ed613324..58dd9db6623 100644
--- a/homeassistant/components/hassio/handler.py
+++ b/homeassistant/components/hassio/handler.py
@@ -36,7 +36,7 @@ def _api_bool(funct):
     return _wrapper
 
 
-def _api_data(funct):
+def api_data(funct):
     """Return data of an api."""
 
     async def _wrapper(*argv, **kwargs):
@@ -66,7 +66,7 @@ class HassIO:
         """
         return self.send_command("/supervisor/ping", method="get", timeout=15)
 
-    @_api_data
+    @api_data
     def get_info(self):
         """Return generic Supervisor information.
 
@@ -74,7 +74,7 @@ class HassIO:
         """
         return self.send_command("/info", method="get")
 
-    @_api_data
+    @api_data
     def get_host_info(self):
         """Return data for Host.
 
@@ -82,7 +82,7 @@ class HassIO:
         """
         return self.send_command("/host/info", method="get")
 
-    @_api_data
+    @api_data
     def get_core_info(self):
         """Return data for Home Asssistant Core.
 
@@ -90,7 +90,7 @@ class HassIO:
         """
         return self.send_command("/core/info", method="get")
 
-    @_api_data
+    @api_data
     def get_addon_info(self, addon):
         """Return data for a Add-on.
 
@@ -98,7 +98,7 @@ class HassIO:
         """
         return self.send_command(f"/addons/{addon}/info", method="get")
 
-    @_api_data
+    @api_data
     def get_ingress_panels(self):
         """Return data for Add-on ingress panels.
 
@@ -122,7 +122,7 @@ class HassIO:
         """
         return self.send_command("/homeassistant/stop")
 
-    @_api_data
+    @api_data
     def retrieve_discovery_messages(self):
         """Return all discovery data from Hass.io API.
 
@@ -130,7 +130,7 @@ class HassIO:
         """
         return self.send_command("/discovery", method="get")
 
-    @_api_data
+    @api_data
     def get_discovery_message(self, uuid):
         """Return a single discovery data message.
 
diff --git a/homeassistant/components/hassio/http.py b/homeassistant/components/hassio/http.py
index e42a7378b3c..2c1445dd456 100644
--- a/homeassistant/components/hassio/http.py
+++ b/homeassistant/components/hassio/http.py
@@ -111,7 +111,7 @@ class HassIOView(HomeAssistantView):
                 )
 
             # Stream response
-            response = web.StreamResponse(status=client.status)
+            response = web.StreamResponse(status=client.status, headers=client.headers)
             response.content_type = client.content_type
 
             await response.prepare(request)
diff --git a/homeassistant/components/heos/config_flow.py b/homeassistant/components/heos/config_flow.py
index 138d1c4462c..efffb93e978 100644
--- a/homeassistant/components/heos/config_flow.py
+++ b/homeassistant/components/heos/config_flow.py
@@ -32,7 +32,7 @@ class HeosFlowHandler(config_entries.ConfigFlow):
         self.hass.data[DATA_DISCOVERED_HOSTS][friendly_name] = hostname
         # Abort if other flows in progress or an entry already exists
         if self._async_in_progress() or self._async_current_entries():
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="single_instance_allowed")
         await self.async_set_unique_id(DOMAIN)
         # Show selection form
         return self.async_show_form(step_id="user")
@@ -50,7 +50,7 @@ class HeosFlowHandler(config_entries.ConfigFlow):
         self.hass.data.setdefault(DATA_DISCOVERED_HOSTS, {})
         # Only a single entry is needed for all devices
         if self._async_current_entries():
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="single_instance_allowed")
         # Try connecting to host if provided
         errors = {}
         host = None
@@ -64,7 +64,7 @@ class HeosFlowHandler(config_entries.ConfigFlow):
                 self.hass.data.pop(DATA_DISCOVERED_HOSTS)
                 return await self.async_step_import({CONF_HOST: host})
             except HeosError:
-                errors[CONF_HOST] = "connection_failure"
+                errors[CONF_HOST] = "cannot_connect"
             finally:
                 await heos.disconnect()
 
diff --git a/homeassistant/components/heos/strings.json b/homeassistant/components/heos/strings.json
index b633b3c82b6..09ada292afd 100644
--- a/homeassistant/components/heos/strings.json
+++ b/homeassistant/components/heos/strings.json
@@ -10,10 +10,10 @@
       }
     },
     "error": {
-      "connection_failure": "Unable to connect to the specified host."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_setup": "You can only configure a single Heos connection as it will support all devices on the network."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   }
 }
diff --git a/homeassistant/components/heos/translations/ca.json b/homeassistant/components/heos/translations/ca.json
index d8bcf494615..f12e18ac999 100644
--- a/homeassistant/components/heos/translations/ca.json
+++ b/homeassistant/components/heos/translations/ca.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Nom\u00e9s pots configurar una \u00fanica connexi\u00f3 de Heos tot i que aquesta ja pot controlar tots els dispositius de la xarxa."
+            "already_setup": "Nom\u00e9s pots configurar una \u00fanica connexi\u00f3 de Heos tot i que aquesta ja pot controlar tots els dispositius de la xarxa.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_failure": "No s'ha pogut connectar amb l'amfitri\u00f3 especificat."
         },
         "step": {
diff --git a/homeassistant/components/heos/translations/cs.json b/homeassistant/components/heos/translations/cs.json
index d7737722cc3..97b722b0b75 100644
--- a/homeassistant/components/heos/translations/cs.json
+++ b/homeassistant/components/heos/translations/cs.json
@@ -1,10 +1,20 @@
 {
     "config": {
+        "abort": {
+            "already_setup": "M\u016f\u017eete nastavit pouze jedno p\u0159ipojen\u00ed Heos, proto\u017ee bude podporovat v\u0161echna za\u0159\u00edzen\u00ed v s\u00edti.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_failure": "Nelze se p\u0159ipojit k uveden\u00e9mu hostiteli."
+        },
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel"
-                }
+                },
+                "description": "Zadejte hostitele nebo IP adresu za\u0159\u00edzen\u00ed Heos (nejl\u00e9pe za\u0159\u00edzen\u00ed p\u0159ipojen\u00e9 k s\u00edti kabelem).",
+                "title": "P\u0159ipojen\u00ed k Heos"
             }
         }
     }
diff --git a/homeassistant/components/heos/translations/en.json b/homeassistant/components/heos/translations/en.json
index be84c08fa5e..ed82022c969 100644
--- a/homeassistant/components/heos/translations/en.json
+++ b/homeassistant/components/heos/translations/en.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "You can only configure a single Heos connection as it will support all devices on the network."
+            "already_setup": "You can only configure a single Heos connection as it will support all devices on the network.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_failure": "Unable to connect to the specified host."
         },
         "step": {
diff --git a/homeassistant/components/heos/translations/es.json b/homeassistant/components/heos/translations/es.json
index ecde21aaf6b..4810c7afd31 100644
--- a/homeassistant/components/heos/translations/es.json
+++ b/homeassistant/components/heos/translations/es.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Solo puedes configurar una \u00fanica conexi\u00f3n Heos, ya que admitir\u00e1 todos los dispositivos de la red."
+            "already_setup": "Solo puedes configurar una \u00fanica conexi\u00f3n Heos, ya que admitir\u00e1 todos los dispositivos de la red.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_failure": "No se puede conectar al host especificado."
         },
         "step": {
diff --git a/homeassistant/components/heos/translations/et.json b/homeassistant/components/heos/translations/et.json
new file mode 100644
index 00000000000..f9ece4ea62b
--- /dev/null
+++ b/homeassistant/components/heos/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Saad seadistada ainult \u00fche Heosi \u00fchenduse kuna see toetab k\u00f5iki v\u00f5rgus olevaid seadmeid.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/heos/translations/it.json b/homeassistant/components/heos/translations/it.json
index 81350edf9ad..353d0a7e319 100644
--- a/homeassistant/components/heos/translations/it.json
+++ b/homeassistant/components/heos/translations/it.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "\u00c8 possibile configurare una singola connessione Heos poich\u00e9 supporta tutti i dispositivi sulla rete."
+            "already_setup": "\u00c8 possibile configurare una singola connessione Heos poich\u00e9 supporta tutti i dispositivi sulla rete.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_failure": "Impossibile connettersi all'host specificato."
         },
         "step": {
diff --git a/homeassistant/components/heos/translations/lb.json b/homeassistant/components/heos/translations/lb.json
index e7997f68b8c..a18ec58e4a9 100644
--- a/homeassistant/components/heos/translations/lb.json
+++ b/homeassistant/components/heos/translations/lb.json
@@ -4,6 +4,7 @@
             "already_setup": "Dir k\u00ebnnt n\u00ebmmen eng eenzeg Heos Verbindung konfigur\u00e9ieren, well se all Apparater am Netzwierk \u00ebnnerst\u00ebtzen."
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_failure": "Kann sech net mat dem spezifiz\u00e9ierten Apparat verbannen."
         },
         "step": {
diff --git a/homeassistant/components/heos/translations/nl.json b/homeassistant/components/heos/translations/nl.json
index 2b85788f7af..7b9aa21b613 100644
--- a/homeassistant/components/heos/translations/nl.json
+++ b/homeassistant/components/heos/translations/nl.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "U kunt alleen een enkele Heos-verbinding configureren, omdat deze alle apparaten in het netwerk ondersteunt."
+            "already_setup": "U kunt alleen een enkele Heos-verbinding configureren, omdat deze alle apparaten in het netwerk ondersteunt.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_failure": "Kan geen verbinding maken met de opgegeven host."
         },
         "step": {
diff --git a/homeassistant/components/heos/translations/no.json b/homeassistant/components/heos/translations/no.json
index 7a8a9ccb7f1..defb1f72e8e 100644
--- a/homeassistant/components/heos/translations/no.json
+++ b/homeassistant/components/heos/translations/no.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Du kan kun konfigurere en Heos tilkobling, da den st\u00f8tter alle enhetene p\u00e5 nettverket."
+            "already_setup": "Du kan kun konfigurere en Heos tilkobling, da den st\u00f8tter alle enhetene p\u00e5 nettverket.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_failure": "Kan ikke koble til den angitte verten."
         },
         "step": {
diff --git a/homeassistant/components/heos/translations/pl.json b/homeassistant/components/heos/translations/pl.json
index 5394d57bb74..04266204c3b 100644
--- a/homeassistant/components/heos/translations/pl.json
+++ b/homeassistant/components/heos/translations/pl.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno po\u0142\u0105czenie Heos, poniewa\u017c b\u0119dzie ono obs\u0142ugiwa\u0107 wszystkie urz\u0105dzenia w sieci."
+            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno po\u0142\u0105czenie Heos, poniewa\u017c b\u0119dzie ono obs\u0142ugiwa\u0107 wszystkie urz\u0105dzenia w sieci",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
-            "connection_failure": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z okre\u015blonym hostem."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_failure": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z okre\u015blonym hostem"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/heos/translations/ru.json b/homeassistant/components/heos/translations/ru.json
index b92ea253ebe..2ee40afbe0c 100644
--- a/homeassistant/components/heos/translations/ru.json
+++ b/homeassistant/components/heos/translations/ru.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "\u041d\u0443\u0436\u043d\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u043e \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435, \u043f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u043e\u043d\u043e \u0431\u0443\u0434\u0435\u0442 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044c \u0432\u0441\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 HEOS \u0432 \u0441\u0435\u0442\u0438."
+            "already_setup": "\u041d\u0443\u0436\u043d\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u043e \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435, \u043f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u043e\u043d\u043e \u0431\u0443\u0434\u0435\u0442 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044c \u0432\u0441\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 HEOS \u0432 \u0441\u0435\u0442\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_failure": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u043c\u0443 \u0445\u043e\u0441\u0442\u0443."
         },
         "step": {
diff --git a/homeassistant/components/heos/translations/zh-Hant.json b/homeassistant/components/heos/translations/zh-Hant.json
index 937a53a1e9f..24099a77735 100644
--- a/homeassistant/components/heos/translations/zh-Hant.json
+++ b/homeassistant/components/heos/translations/zh-Hant.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44 Heos \u9023\u7dda\uff0c\u5c07\u652f\u63f4\u7db2\u8def\u4e2d\u6240\u6709\u5c0d\u61c9\u8a2d\u5099\u3002"
+            "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44 Heos \u9023\u7dda\uff0c\u5c07\u652f\u63f4\u7db2\u8def\u4e2d\u6240\u6709\u5c0d\u61c9\u8a2d\u5099\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_failure": "\u7121\u6cd5\u9023\u7dda\u81f3\u6307\u5b9a\u4e3b\u6a5f\u7aef\u3002"
         },
         "step": {
diff --git a/homeassistant/components/hikvision/binary_sensor.py b/homeassistant/components/hikvision/binary_sensor.py
index c0da593a039..359f966d119 100644
--- a/homeassistant/components/hikvision/binary_sensor.py
+++ b/homeassistant/components/hikvision/binary_sensor.py
@@ -255,8 +255,7 @@ class HikvisionBinarySensor(BinarySensorEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {}
-        attr[ATTR_LAST_TRIP_TIME] = self._sensor_last_update()
+        attr = {ATTR_LAST_TRIP_TIME: self._sensor_last_update()}
 
         if self._delay != 0:
             attr[ATTR_DELAY] = self._delay
diff --git a/homeassistant/components/hikvision/manifest.json b/homeassistant/components/hikvision/manifest.json
index e6dec7b8e89..8abe4519166 100644
--- a/homeassistant/components/hikvision/manifest.json
+++ b/homeassistant/components/hikvision/manifest.json
@@ -2,6 +2,6 @@
   "domain": "hikvision",
   "name": "Hikvision",
   "documentation": "https://www.home-assistant.io/integrations/hikvision",
-  "requirements": ["pyhik==0.2.7"],
+  "requirements": ["pyhik==0.2.8"],
   "codeowners": ["@mezz64"]
 }
diff --git a/homeassistant/components/hikvisioncam/switch.py b/homeassistant/components/hikvisioncam/switch.py
index 2e924135bd4..2f1f89cd261 100644
--- a/homeassistant/components/hikvisioncam/switch.py
+++ b/homeassistant/components/hikvisioncam/switch.py
@@ -68,11 +68,6 @@ class HikvisionMotionSwitch(SwitchEntity):
         self._hikvision_cam = hikvision_cam
         self._state = STATE_OFF
 
-    @property
-    def should_poll(self):
-        """Poll for status regularly."""
-        return True
-
     @property
     def name(self):
         """Return the name of the device if any."""
diff --git a/homeassistant/components/hisense_aehw4a1/config_flow.py b/homeassistant/components/hisense_aehw4a1/config_flow.py
index 52926ba7968..326b5c5895d 100644
--- a/homeassistant/components/hisense_aehw4a1/config_flow.py
+++ b/homeassistant/components/hisense_aehw4a1/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow for Hisense AEH-W4A1 integration."""
-import logging
-
 from pyaehw4a1.aehw4a1 import AehW4a1
 
 from homeassistant import config_entries
@@ -8,8 +6,6 @@ from homeassistant.helpers import config_entry_flow
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def _async_has_devices(hass):
     """Return if there are devices that can be discovered."""
diff --git a/homeassistant/components/hisense_aehw4a1/strings.json b/homeassistant/components/hisense_aehw4a1/strings.json
index 5d9b6f1ef96..58e6b057c12 100644
--- a/homeassistant/components/hisense_aehw4a1/strings.json
+++ b/homeassistant/components/hisense_aehw4a1/strings.json
@@ -6,8 +6,8 @@
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of Hisense AEH-W4A1 is possible.",
-      "no_devices_found": "No Hisense AEH-W4A1 devices found on the network."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   }
 }
diff --git a/homeassistant/components/hisense_aehw4a1/translations/ca.json b/homeassistant/components/hisense_aehw4a1/translations/ca.json
index 3a05c1d6123..4ead6779df6 100644
--- a/homeassistant/components/hisense_aehw4a1/translations/ca.json
+++ b/homeassistant/components/hisense_aehw4a1/translations/ca.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No s'ha trobat cap dispositiu AEH-W4A1 a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s \u00e9s possible una \u00fanica configuraci\u00f3 del AEH-W4A1 de Hisense."
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/hisense_aehw4a1/translations/cs.json b/homeassistant/components/hisense_aehw4a1/translations/cs.json
new file mode 100644
index 00000000000..884182821df
--- /dev/null
+++ b/homeassistant/components/hisense_aehw4a1/translations/cs.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "confirm": {
+                "description": "Chcete nastavit Hisense AEH-W4A1?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hisense_aehw4a1/translations/en.json b/homeassistant/components/hisense_aehw4a1/translations/en.json
index 4b292600249..abdf245c854 100644
--- a/homeassistant/components/hisense_aehw4a1/translations/en.json
+++ b/homeassistant/components/hisense_aehw4a1/translations/en.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No Hisense AEH-W4A1 devices found on the network.",
-            "single_instance_allowed": "Only a single configuration of Hisense AEH-W4A1 is possible."
+            "no_devices_found": "No devices found on the network",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/hisense_aehw4a1/translations/et.json b/homeassistant/components/hisense_aehw4a1/translations/et.json
new file mode 100644
index 00000000000..21b8f68976f
--- /dev/null
+++ b/homeassistant/components/hisense_aehw4a1/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas soovid seadistada Hisense AEH-W4A1?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hisense_aehw4a1/translations/it.json b/homeassistant/components/hisense_aehw4a1/translations/it.json
index 0da43b27a82..b6951f4d647 100644
--- a/homeassistant/components/hisense_aehw4a1/translations/it.json
+++ b/homeassistant/components/hisense_aehw4a1/translations/it.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nessun dispositivo Hisense AEH-W4A1 trovato sulla rete.",
-            "single_instance_allowed": "\u00c8 consentita solo una configurazione di Hisense AEH-W4A1"
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/hisense_aehw4a1/translations/no.json b/homeassistant/components/hisense_aehw4a1/translations/no.json
index 6a8d6cbe443..9be1a735d51 100644
--- a/homeassistant/components/hisense_aehw4a1/translations/no.json
+++ b/homeassistant/components/hisense_aehw4a1/translations/no.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Ingen Hisense AEH-W4A1-enheter funnet p\u00e5 nettverket.",
-            "single_instance_allowed": "Bare en enkelt konfigurasjon av Hisense AEH-W4A1 er mulig."
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/hisense_aehw4a1/translations/pl.json b/homeassistant/components/hisense_aehw4a1/translations/pl.json
index 61f15a99806..feab528e03a 100644
--- a/homeassistant/components/hisense_aehw4a1/translations/pl.json
+++ b/homeassistant/components/hisense_aehw4a1/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nie znaleziono w sieci urz\u0105dze\u0144 Hisense AEH-W4A1.",
-            "single_instance_allowed": "Dozwolona jest tylko jedna konfiguracja Hisense AEH-W4A1."
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/hisense_aehw4a1/translations/ru.json b/homeassistant/components/hisense_aehw4a1/translations/ru.json
index 0d982c13eb0..e26dcfb42c0 100644
--- a/homeassistant/components/hisense_aehw4a1/translations/ru.json
+++ b/homeassistant/components/hisense_aehw4a1/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 Hisense AEH-W4A1e \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/hisense_aehw4a1/translations/zh-Hant.json b/homeassistant/components/hisense_aehw4a1/translations/zh-Hant.json
index 296fbb5d9d5..56ad5128d97 100644
--- a/homeassistant/components/hisense_aehw4a1/translations/zh-Hant.json
+++ b/homeassistant/components/hisense_aehw4a1/translations/zh-Hant.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u6d77\u4fe1 AEH-W4A1 \u8a2d\u5099\u3002",
-            "single_instance_allowed": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44\u6d77\u4fe1 AEH-W4A1\u3002"
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/history/__init__.py b/homeassistant/components/history/__init__.py
index 79c60572ba5..a8ea18770d9 100644
--- a/homeassistant/components/history/__init__.py
+++ b/homeassistant/components/history/__init__.py
@@ -1,11 +1,11 @@
 """Provide pre-made queries on top of the recorder component."""
 from collections import defaultdict
-from datetime import timedelta
+from datetime import datetime as dt, timedelta
 from itertools import groupby
 import json
 import logging
 import time
-from typing import Optional, cast
+from typing import Iterable, Optional, cast
 
 from aiohttp import web
 from sqlalchemy import and_, bindparam, func, not_, or_
@@ -33,6 +33,7 @@ from homeassistant.helpers.entityfilter import (
     CONF_ENTITY_GLOBS,
     INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA,
 )
+from homeassistant.helpers.typing import HomeAssistantType
 import homeassistant.util.dt as dt_util
 
 # mypy: allow-untyped-defs, no-check-untyped-defs
@@ -502,6 +503,13 @@ class HistoryPeriodView(HomeAssistantView):
 
         hass = request.app["hass"]
 
+        if (
+            not include_start_time_state
+            and entity_ids
+            and not _entities_may_have_state_changes_after(hass, entity_ids, start_time)
+        ):
+            return self.json([])
+
         return cast(
             web.Response,
             await hass.async_add_executor_job(
@@ -660,6 +668,19 @@ def _glob_to_like(glob_str):
     return States.entity_id.like(glob_str.translate(GLOB_TO_SQL_CHARS))
 
 
+def _entities_may_have_state_changes_after(
+    hass: HomeAssistantType, entity_ids: Iterable, start_time: dt
+) -> bool:
+    """Check the state machine to see if entities have changed since start time."""
+    for entity_id in entity_ids:
+        state = hass.states.get(entity_id)
+
+        if state is None or state.last_changed > start_time:
+            return True
+
+    return False
+
+
 class LazyState(State):
     """A lazy version of core State."""
 
diff --git a/homeassistant/components/history_stats/sensor.py b/homeassistant/components/history_stats/sensor.py
index 8b993b0e837..9f59f67eb95 100644
--- a/homeassistant/components/history_stats/sensor.py
+++ b/homeassistant/components/history_stats/sensor.py
@@ -174,11 +174,6 @@ class HistoryStatsSensor(Entity):
         """Return the unit the value is expressed in."""
         return self._unit_of_measurement
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def device_state_attributes(self):
         """Return the state attributes of the sensor."""
@@ -276,7 +271,8 @@ class HistoryStatsSensor(Entity):
             except (TemplateError, TypeError) as ex:
                 HistoryStatsHelper.handle_template_exception(ex, "start")
                 return
-            start = dt_util.parse_datetime(start_rendered)
+            if isinstance(start_rendered, str):
+                start = dt_util.parse_datetime(start_rendered)
             if start is None:
                 try:
                     start = dt_util.as_local(
@@ -295,7 +291,8 @@ class HistoryStatsSensor(Entity):
             except (TemplateError, TypeError) as ex:
                 HistoryStatsHelper.handle_template_exception(ex, "end")
                 return
-            end = dt_util.parse_datetime(end_rendered)
+            if isinstance(end_rendered, str):
+                end = dt_util.parse_datetime(end_rendered)
             if end is None:
                 try:
                     end = dt_util.as_local(
diff --git a/homeassistant/components/hlk_sw16/translations/cs.json b/homeassistant/components/hlk_sw16/translations/cs.json
index 480a7187a7a..1801c0d3b92 100644
--- a/homeassistant/components/hlk_sw16/translations/cs.json
+++ b/homeassistant/components/hlk_sw16/translations/cs.json
@@ -1,14 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed ji\u017e je nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed ji\u017e je nastaveno"
         },
         "error": {
-            "cannot_connect": "Nelze se p\u0159ipojit"
+            "cannot_connect": "Nelze se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "step": {
             "user": {
                 "data": {
+                    "host": "Hostitel",
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
                 }
diff --git a/homeassistant/components/hlk_sw16/translations/et.json b/homeassistant/components/hlk_sw16/translations/et.json
new file mode 100644
index 00000000000..7898215ded8
--- /dev/null
+++ b/homeassistant/components/hlk_sw16/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hlk_sw16/translations/no.json b/homeassistant/components/hlk_sw16/translations/no.json
index 1cb08943e34..249711bb912 100644
--- a/homeassistant/components/hlk_sw16/translations/no.json
+++ b/homeassistant/components/hlk_sw16/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
diff --git a/homeassistant/components/hlk_sw16/translations/zh-Hans.json b/homeassistant/components/hlk_sw16/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/hlk_sw16/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/home_connect/config_flow.py b/homeassistant/components/home_connect/config_flow.py
index 4a714bac73f..9d7cefc00e8 100644
--- a/homeassistant/components/home_connect/config_flow.py
+++ b/homeassistant/components/home_connect/config_flow.py
@@ -6,8 +6,6 @@ from homeassistant.helpers import config_entry_oauth2_flow
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class OAuth2FlowHandler(
     config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
diff --git a/homeassistant/components/home_connect/manifest.json b/homeassistant/components/home_connect/manifest.json
index 5c330f760b0..11cf7e3e0cd 100644
--- a/homeassistant/components/home_connect/manifest.json
+++ b/homeassistant/components/home_connect/manifest.json
@@ -4,6 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/home_connect",
   "dependencies": ["http"],
   "codeowners": ["@DavidMStraub"],
-  "requirements": ["homeconnect==0.5"],
+  "requirements": ["homeconnect==0.6.3"],
   "config_flow": true
 }
diff --git a/homeassistant/components/home_connect/strings.json b/homeassistant/components/home_connect/strings.json
index 2c624f8b0a3..79455783edf 100644
--- a/homeassistant/components/home_connect/strings.json
+++ b/homeassistant/components/home_connect/strings.json
@@ -6,11 +6,11 @@
       }
     },
     "abort": {
-      "missing_configuration": "The Home Connect component is not configured. Please follow the documentation.",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]"
     },
     "create_entry": {
-      "default": "Successfully authenticated with Home Connect."
+      "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
   }
 }
diff --git a/homeassistant/components/home_connect/translations/ca.json b/homeassistant/components/home_connect/translations/ca.json
index 6553ce7e24d..c8790ca38dc 100644
--- a/homeassistant/components/home_connect/translations/ca.json
+++ b/homeassistant/components/home_connect/translations/ca.json
@@ -1,15 +1,15 @@
 {
     "config": {
         "abort": {
-            "missing_configuration": "El component Home Connect no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
+            "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
             "no_url_available": "No hi ha cap URL disponible. Per a m\u00e9s informaci\u00f3 sobre aquest error, [consulta la secci\u00f3 d'ajuda]({docs_url})"
         },
         "create_entry": {
-            "default": "Autenticaci\u00f3 exitosa amb Home Connect."
+            "default": "Autenticaci\u00f3 exitosa"
         },
         "step": {
             "pick_implementation": {
-                "title": "Selecci\u00f3 del m\u00e8tode d'autenticaci\u00f3"
+                "title": "Selecciona el m\u00e8tode d'autenticaci\u00f3"
             }
         }
     }
diff --git a/homeassistant/components/home_connect/translations/cs.json b/homeassistant/components/home_connect/translations/cs.json
new file mode 100644
index 00000000000..1bb0601b1fd
--- /dev/null
+++ b/homeassistant/components/home_connect/translations/cs.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "abort": {
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "no_url_available": "Nen\u00ed k dispozici \u017e\u00e1dn\u00e1 adresa URL. Informace o t\u00e9to chyb\u011b naleznete [v sekci n\u00e1pov\u011bdy]({docs_url})"
+        },
+        "create_entry": {
+            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Vyberte metodu ov\u011b\u0159en\u00ed"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/home_connect/translations/en.json b/homeassistant/components/home_connect/translations/en.json
index 24190814216..d44b51a0b97 100644
--- a/homeassistant/components/home_connect/translations/en.json
+++ b/homeassistant/components/home_connect/translations/en.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "missing_configuration": "The Home Connect component is not configured. Please follow the documentation.",
+            "missing_configuration": "The component is not configured. Please follow the documentation.",
             "no_url_available": "No URL available. For information about this error, [check the help section]({docs_url})"
         },
         "create_entry": {
-            "default": "Successfully authenticated with Home Connect."
+            "default": "Successfully authenticated"
         },
         "step": {
             "pick_implementation": {
diff --git a/homeassistant/components/home_connect/translations/es.json b/homeassistant/components/home_connect/translations/es.json
index 8c60c994df0..10b49c96926 100644
--- a/homeassistant/components/home_connect/translations/es.json
+++ b/homeassistant/components/home_connect/translations/es.json
@@ -5,11 +5,11 @@
             "no_url_available": "No hay URL disponible. Para obtener informaci\u00f3n sobre este error, [consulta la secci\u00f3n de ayuda]({docs_url})"
         },
         "create_entry": {
-            "default": "Autenticado correctamente con Home Assistant."
+            "default": "Autenticado correctamente"
         },
         "step": {
             "pick_implementation": {
-                "title": "Selecciona el M\u00e9todo de Autenticaci\u00f3n"
+                "title": "Selecciona el m\u00e9todo de autenticaci\u00f3n"
             }
         }
     }
diff --git a/homeassistant/components/home_connect/translations/et.json b/homeassistant/components/home_connect/translations/et.json
new file mode 100644
index 00000000000..f18810a8460
--- /dev/null
+++ b/homeassistant/components/home_connect/translations/et.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "abort": {
+            "missing_configuration": "Osis pole seadistatud. Palun vaata dokumentatsiooni.",
+            "no_url_available": "URL pole saadaval. Rohkem teavet [check the help section]({docs_url})"
+        },
+        "create_entry": {
+            "default": "Tuvastamine \u00f5nnestus"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Vali tuvastusmeetod"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/home_connect/translations/it.json b/homeassistant/components/home_connect/translations/it.json
index 98aa955b020..3dc834bfd85 100644
--- a/homeassistant/components/home_connect/translations/it.json
+++ b/homeassistant/components/home_connect/translations/it.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "missing_configuration": "Il componente Home Connect non \u00e8 configurato. Si prega di seguire la documentazione.",
+            "missing_configuration": "Il componente non \u00e8 configurato. Si prega di seguire la documentazione.",
             "no_url_available": "Nessun URL disponibile. Per informazioni su questo errore, [controlla la sezione della guida]({docs_url})"
         },
         "create_entry": {
-            "default": "Autenticazione riuscita con Home Connect."
+            "default": "Autenticazione riuscita"
         },
         "step": {
             "pick_implementation": {
diff --git a/homeassistant/components/home_connect/translations/no.json b/homeassistant/components/home_connect/translations/no.json
index 185ba6264e9..3d95664d0ab 100644
--- a/homeassistant/components/home_connect/translations/no.json
+++ b/homeassistant/components/home_connect/translations/no.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "missing_configuration": "Home Connect-komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
-            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk {docs_url} ] ( {docs_url} )"
+            "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
+            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk hjelpseksjonen]({docs_url})"
         },
         "create_entry": {
-            "default": "Vellykket godkjenning med Home Connect"
+            "default": "Vellykket godkjenning"
         },
         "step": {
             "pick_implementation": {
diff --git a/homeassistant/components/home_connect/translations/pl.json b/homeassistant/components/home_connect/translations/pl.json
index 054fe071e74..ba4ba17493b 100644
--- a/homeassistant/components/home_connect/translations/pl.json
+++ b/homeassistant/components/home_connect/translations/pl.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105."
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_url_available": "Brak dost\u0119pnego adresu URL. Aby uzyska\u0107 informacje na temat tego b\u0142\u0119du, [sprawd\u017a sekcj\u0119 pomocy] ({docs_url})"
         },
         "create_entry": {
-            "default": "Pomy\u015blnie uwierzytelniono z Home Connect."
+            "default": "Pomy\u015blnie uwierzytelniono"
         },
         "step": {
             "pick_implementation": {
diff --git a/homeassistant/components/home_connect/translations/zh-Hant.json b/homeassistant/components/home_connect/translations/zh-Hant.json
index 1d68766d2c7..56f8fd16874 100644
--- a/homeassistant/components/home_connect/translations/zh-Hant.json
+++ b/homeassistant/components/home_connect/translations/zh-Hant.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "missing_configuration": "Home Connect \u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
+            "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
             "no_url_available": "\u6c92\u6709\u53ef\u7528\u7684\u7db2\u5740\u3002\u95dc\u65bc\u6b64\u932f\u8aa4\u66f4\u8a73\u7d30\u8a0a\u606f\uff0c[\u9ede\u9078\u5354\u52a9\u7ae0\u7bc0]({docs_url})"
         },
         "create_entry": {
-            "default": "\u5df2\u6210\u529f\u8a8d\u8b49 Home Connect \u8a2d\u5099\u3002"
+            "default": "\u5df2\u6210\u529f\u8a8d\u8b49"
         },
         "step": {
             "pick_implementation": {
diff --git a/homeassistant/components/homeassistant/triggers/event.py b/homeassistant/components/homeassistant/triggers/event.py
index 800d6bb5f77..c5baf6ca4b2 100644
--- a/homeassistant/components/homeassistant/triggers/event.py
+++ b/homeassistant/components/homeassistant/triggers/event.py
@@ -1,33 +1,39 @@
 """Offer event listening automation rules."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_PLATFORM
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 from homeassistant.helpers import config_validation as cv
 
 # mypy: allow-untyped-defs
 
 CONF_EVENT_TYPE = "event_type"
 CONF_EVENT_DATA = "event_data"
-
-_LOGGER = logging.getLogger(__name__)
+CONF_EVENT_CONTEXT = "context"
 
 TRIGGER_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_PLATFORM): "event",
         vol.Required(CONF_EVENT_TYPE): cv.string,
         vol.Optional(CONF_EVENT_DATA): dict,
+        vol.Optional(CONF_EVENT_CONTEXT): dict,
     }
 )
 
 
+def _schema_value(value):
+    if isinstance(value, list):
+        return vol.In(value)
+
+    return value
+
+
 async def async_attach_trigger(
     hass, config, action, automation_info, *, platform_type="event"
 ):
     """Listen for events based on configuration."""
     event_type = config.get(CONF_EVENT_TYPE)
+
     event_data_schema = None
     if config.get(CONF_EVENT_DATA):
         event_data_schema = vol.Schema(
@@ -38,20 +44,34 @@ async def async_attach_trigger(
             extra=vol.ALLOW_EXTRA,
         )
 
+    event_context_schema = None
+    if config.get(CONF_EVENT_CONTEXT):
+        event_context_schema = vol.Schema(
+            {
+                vol.Required(key): _schema_value(value)
+                for key, value in config.get(CONF_EVENT_CONTEXT).items()
+            },
+            extra=vol.ALLOW_EXTRA,
+        )
+
+    job = HassJob(action)
+
     @callback
     def handle_event(event):
         """Listen for events and calls the action when data matches."""
-        if event_data_schema:
-            # Check that the event data matches the configured
+        try:
+            # Check that the event data and context match the configured
             # schema if one was provided
-            try:
+            if event_data_schema:
                 event_data_schema(event.data)
-            except vol.Invalid:
-                # If event data doesn't match requested schema, skip event
-                return
+            if event_context_schema:
+                event_context_schema(event.context.as_dict())
+        except vol.Invalid:
+            # If event doesn't match, skip event
+            return
 
-        hass.async_run_job(
-            action,
+        hass.async_run_hass_job(
+            job,
             {
                 "trigger": {
                     "platform": platform_type,
diff --git a/homeassistant/components/homeassistant/triggers/homeassistant.py b/homeassistant/components/homeassistant/triggers/homeassistant.py
index baca145e19c..2f3ebfb82d9 100644
--- a/homeassistant/components/homeassistant/triggers/homeassistant.py
+++ b/homeassistant/components/homeassistant/triggers/homeassistant.py
@@ -1,16 +1,13 @@
 """Offer Home Assistant core automation rules."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_EVENT, CONF_PLATFORM, EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 
 # mypy: allow-untyped-defs
 
 EVENT_START = "start"
 EVENT_SHUTDOWN = "shutdown"
-_LOGGER = logging.getLogger(__name__)
 
 TRIGGER_SCHEMA = vol.Schema(
     {
@@ -23,14 +20,15 @@ TRIGGER_SCHEMA = vol.Schema(
 async def async_attach_trigger(hass, config, action, automation_info):
     """Listen for events based on configuration."""
     event = config.get(CONF_EVENT)
+    job = HassJob(action)
 
     if event == EVENT_SHUTDOWN:
 
         @callback
         def hass_shutdown(event):
             """Execute when Home Assistant is shutting down."""
-            hass.async_run_job(
-                action,
+            hass.async_run_hass_job(
+                job,
                 {
                     "trigger": {
                         "platform": "homeassistant",
@@ -46,8 +44,8 @@ async def async_attach_trigger(hass, config, action, automation_info):
     # Automation are enabled while hass is starting up, fire right away
     # Check state because a config reload shouldn't trigger it.
     if automation_info["home_assistant_start"]:
-        hass.async_run_job(
-            action,
+        hass.async_run_hass_job(
+            job,
             {
                 "trigger": {
                     "platform": "homeassistant",
diff --git a/homeassistant/components/homeassistant/triggers/numeric_state.py b/homeassistant/components/homeassistant/triggers/numeric_state.py
index b5a21aa8404..a6e3b33ae97 100644
--- a/homeassistant/components/homeassistant/triggers/numeric_state.py
+++ b/homeassistant/components/homeassistant/triggers/numeric_state.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     CONF_PLATFORM,
     CONF_VALUE_TEMPLATE,
 )
-from homeassistant.core import CALLBACK_TYPE, callback
+from homeassistant.core import CALLBACK_TYPE, HassJob, callback
 from homeassistant.helpers import condition, config_validation as cv, template
 from homeassistant.helpers.event import (
     async_track_same_state,
@@ -73,6 +73,7 @@ async def async_attach_trigger(
     entities_triggered = set()
     period: dict = {}
     attribute = config.get(CONF_ATTRIBUTE)
+    job = HassJob(action)
 
     if value_template is not None:
         value_template.hass = hass
@@ -106,8 +107,8 @@ async def async_attach_trigger(
         @callback
         def call_action():
             """Call action with right context."""
-            hass.async_run_job(
-                action,
+            hass.async_run_hass_job(
+                job,
                 {
                     "trigger": {
                         "platform": platform_type,
diff --git a/homeassistant/components/homeassistant/triggers/state.py b/homeassistant/components/homeassistant/triggers/state.py
index 915856951d2..5dd7335f56e 100644
--- a/homeassistant/components/homeassistant/triggers/state.py
+++ b/homeassistant/components/homeassistant/triggers/state.py
@@ -7,7 +7,7 @@ import voluptuous as vol
 
 from homeassistant import exceptions
 from homeassistant.const import CONF_ATTRIBUTE, CONF_FOR, CONF_PLATFORM, MATCH_ALL
-from homeassistant.core import CALLBACK_TYPE, HomeAssistant, State, callback
+from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, State, callback
 from homeassistant.helpers import config_validation as cv, template
 from homeassistant.helpers.event import (
     Event,
@@ -83,6 +83,7 @@ async def async_attach_trigger(
     match_from_state = process_state_match(from_state)
     match_to_state = process_state_match(to_state)
     attribute = config.get(CONF_ATTRIBUTE)
+    job = HassJob(action)
 
     @callback
     def state_automation_listener(event: Event):
@@ -122,8 +123,8 @@ async def async_attach_trigger(
         @callback
         def call_action():
             """Call action with right context."""
-            hass.async_run_job(
-                action,
+            hass.async_run_hass_job(
+                job,
                 {
                     "trigger": {
                         "platform": platform_type,
diff --git a/homeassistant/components/homeassistant/triggers/time.py b/homeassistant/components/homeassistant/triggers/time.py
index a152b1e8571..adfe592319b 100644
--- a/homeassistant/components/homeassistant/triggers/time.py
+++ b/homeassistant/components/homeassistant/triggers/time.py
@@ -1,12 +1,11 @@
 """Offer time listening automation rules."""
 from datetime import datetime
 from functools import partial
-import logging
 
 import voluptuous as vol
 
 from homeassistant.const import CONF_AT, CONF_PLATFORM
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import (
     async_track_point_in_time,
@@ -17,8 +16,6 @@ import homeassistant.util.dt as dt_util
 
 # mypy: allow-untyped-defs, no-check-untyped-defs
 
-_LOGGER = logging.getLogger(__name__)
-
 _TIME_TRIGGER_SCHEMA = vol.Any(
     cv.time,
     vol.All(str, cv.entity_domain("input_datetime")),
@@ -37,13 +34,21 @@ async def async_attach_trigger(hass, config, action, automation_info):
     """Listen for state changes based on configuration."""
     entities = {}
     removes = []
+    job = HassJob(action)
 
     @callback
-    def time_automation_listener(description, now):
+    def time_automation_listener(description, now, *, entity_id=None):
         """Listen for time changes and calls action."""
-        hass.async_run_job(
-            action,
-            {"trigger": {"platform": "time", "now": now, "description": description}},
+        hass.async_run_hass_job(
+            job,
+            {
+                "trigger": {
+                    "platform": "time",
+                    "now": now,
+                    "description": description,
+                    "entity_id": entity_id,
+                }
+            },
         )
 
     @callback
@@ -86,14 +91,22 @@ async def async_attach_trigger(hass, config, action, automation_info):
                 if trigger_dt >= dt_util.now():
                     remove = async_track_point_in_time(
                         hass,
-                        partial(time_automation_listener, f"time set in {entity_id}"),
+                        partial(
+                            time_automation_listener,
+                            f"time set in {entity_id}",
+                            entity_id=entity_id,
+                        ),
                         trigger_dt,
                     )
             elif has_time:
                 # Else if it has time, then track time change.
                 remove = async_track_time_change(
                     hass,
-                    partial(time_automation_listener, f"time set in {entity_id}"),
+                    partial(
+                        time_automation_listener,
+                        f"time set in {entity_id}",
+                        entity_id=entity_id,
+                    ),
                     hour=hour,
                     minute=minute,
                     second=second,
diff --git a/homeassistant/components/homeassistant/triggers/time_pattern.py b/homeassistant/components/homeassistant/triggers/time_pattern.py
index 5f03fb593d6..3107d590d91 100644
--- a/homeassistant/components/homeassistant/triggers/time_pattern.py
+++ b/homeassistant/components/homeassistant/triggers/time_pattern.py
@@ -1,10 +1,8 @@
 """Offer time listening automation rules."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_PLATFORM
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import async_track_time_change
 
@@ -14,8 +12,6 @@ CONF_HOURS = "hours"
 CONF_MINUTES = "minutes"
 CONF_SECONDS = "seconds"
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class TimePattern:
     """Validate a time pattern value.
@@ -64,6 +60,7 @@ async def async_attach_trigger(hass, config, action, automation_info):
     hours = config.get(CONF_HOURS)
     minutes = config.get(CONF_MINUTES)
     seconds = config.get(CONF_SECONDS)
+    job = HassJob(action)
 
     # If larger units are specified, default the smaller units to zero
     if minutes is None and hours is not None:
@@ -74,8 +71,8 @@ async def async_attach_trigger(hass, config, action, automation_info):
     @callback
     def time_automation_listener(now):
         """Listen for time changes and calls action."""
-        hass.async_run_job(
-            action,
+        hass.async_run_hass_job(
+            job,
             {
                 "trigger": {
                     "platform": "time_pattern",
diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index acc96397601..742e41213a7 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -5,6 +5,7 @@ import logging
 import os
 
 from aiohttp import web
+from pyhap.const import STANDALONE_AID
 import voluptuous as vol
 
 from homeassistant.components import zeroconf
@@ -56,6 +57,7 @@ from .const import (
     CONF_ENTITY_CONFIG,
     CONF_ENTRY_INDEX,
     CONF_FILTER,
+    CONF_HOMEKIT_MODE,
     CONF_LINKED_BATTERY_CHARGING_SENSOR,
     CONF_LINKED_BATTERY_SENSOR,
     CONF_LINKED_DOORBELL_SENSOR,
@@ -65,10 +67,13 @@ from .const import (
     CONF_ZEROCONF_DEFAULT_INTERFACE,
     CONFIG_OPTIONS,
     DEFAULT_AUTO_START,
+    DEFAULT_HOMEKIT_MODE,
     DEFAULT_PORT,
     DEFAULT_SAFE_MODE,
     DOMAIN,
     HOMEKIT,
+    HOMEKIT_MODE_ACCESSORY,
+    HOMEKIT_MODES,
     HOMEKIT_PAIRING_QR,
     HOMEKIT_PAIRING_QR_SECRET,
     MANUFACTURER,
@@ -111,6 +116,9 @@ BRIDGE_SCHEMA = vol.All(
     cv.deprecated(CONF_ZEROCONF_DEFAULT_INTERFACE),
     vol.Schema(
         {
+            vol.Optional(CONF_HOMEKIT_MODE, default=DEFAULT_HOMEKIT_MODE): vol.In(
+                HOMEKIT_MODES
+            ),
             vol.Optional(CONF_NAME, default=BRIDGE_NAME): vol.All(
                 cv.string, vol.Length(min=3, max=25)
             ),
@@ -228,7 +236,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     # ip_address and advertise_ip are yaml only
     ip_address = conf.get(CONF_IP_ADDRESS)
     advertise_ip = conf.get(CONF_ADVERTISE_IP)
-
+    homekit_mode = options.get(CONF_HOMEKIT_MODE, DEFAULT_HOMEKIT_MODE)
     entity_config = options.get(CONF_ENTITY_CONFIG, {}).copy()
     auto_start = options.get(CONF_AUTO_START, DEFAULT_AUTO_START)
     safe_mode = options.get(CONF_SAFE_MODE, DEFAULT_SAFE_MODE)
@@ -242,6 +250,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
         entity_filter,
         entity_config,
         safe_mode,
+        homekit_mode,
         advertise_ip,
         entry.entry_id,
     )
@@ -404,6 +413,7 @@ class HomeKit:
         entity_filter,
         entity_config,
         safe_mode,
+        homekit_mode,
         advertise_ip=None,
         entry_id=None,
     ):
@@ -417,6 +427,7 @@ class HomeKit:
         self._safe_mode = safe_mode
         self._advertise_ip = advertise_ip
         self._entry_id = entry_id
+        self._homekit_mode = homekit_mode
         self.status = STATUS_READY
 
         self.bridge = None
@@ -425,7 +436,7 @@ class HomeKit:
     def setup(self, zeroconf_instance):
         """Set up bridge and accessory driver."""
         # pylint: disable=import-outside-toplevel
-        from .accessories import HomeBridge, HomeDriver
+        from .accessories import HomeDriver
 
         self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.async_stop)
         ip_addr = self._ip_address or get_local_ip()
@@ -450,13 +461,16 @@ class HomeKit:
         else:
             self.driver.persist()
 
-        self.bridge = HomeBridge(self.hass, self.driver, self._name)
         if self._safe_mode:
             _LOGGER.debug("Safe_mode selected for %s", self._name)
             self.driver.safe_mode = True
 
     def reset_accessories(self, entity_ids):
         """Reset the accessory to load the latest configuration."""
+        if not self.bridge:
+            self.driver.config_changed()
+            return
+
         aid_storage = self.hass.data[DOMAIN][self._entry_id][AID_STORAGE]
         removed = []
         for entity_id in entity_ids:
@@ -602,7 +616,8 @@ class HomeKit:
             dev_reg.async_remove_device(device_id)
 
     def _start(self, bridged_states):
-        from . import (  # noqa: F401 pylint: disable=unused-import, import-outside-toplevel
+        # pylint: disable=unused-import, import-outside-toplevel
+        from . import (  # noqa: F401
             type_cameras,
             type_covers,
             type_fans,
@@ -616,10 +631,18 @@ class HomeKit:
             type_thermostats,
         )
 
-        for state in bridged_states:
-            self.add_bridge_accessory(state)
+        if self._homekit_mode == HOMEKIT_MODE_ACCESSORY:
+            state = bridged_states[0]
+            conf = self._config.pop(state.entity_id, {})
+            acc = get_accessory(self.hass, self.driver, state, STANDALONE_AID, conf)
+            self.driver.add_accessory(acc)
+        else:
+            from .accessories import HomeBridge
 
-        self.driver.add_accessory(self.bridge)
+            self.bridge = HomeBridge(self.hass, self.driver, self._name)
+            for state in bridged_states:
+                self.add_bridge_accessory(state)
+            self.driver.add_accessory(self.bridge)
 
         if not self.driver.state.paired:
             show_setup_message(
@@ -627,7 +650,7 @@ class HomeKit:
                 self._entry_id,
                 self._name,
                 self.driver.state.pincode,
-                self.bridge.xhm_uri(),
+                self.driver.accessory.xhm_uri(),
             )
 
     async def async_stop(self, *args):
@@ -637,8 +660,11 @@ class HomeKit:
         self.status = STATUS_STOPPED
         _LOGGER.debug("Driver stop for %s", self._name)
         await self.driver.async_stop()
-        for acc in self.bridge.accessories.values():
-            acc.async_stop()
+        if self.bridge:
+            for acc in self.bridge.accessories.values():
+                acc.async_stop()
+        else:
+            self.driver.accessory.async_stop()
 
     @callback
     def _async_configure_linked_sensors(self, ent_reg_ent, device_lookup, state):
diff --git a/homeassistant/components/homekit/aidmanager.py b/homeassistant/components/homekit/aidmanager.py
index 31c341c9144..220014d7d4e 100644
--- a/homeassistant/components/homekit/aidmanager.py
+++ b/homeassistant/components/homekit/aidmanager.py
@@ -9,7 +9,6 @@ can't change the hash without causing breakages for HA users.
 
 This module generates and stores them in a HA storage.
 """
-import logging
 import random
 
 from fnvhash import fnv1a_32
@@ -32,8 +31,6 @@ INVALID_AIDS = (0, 1)
 AID_MIN = 2
 AID_MAX = 18446744073709551615
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def get_system_unique_id(entity: RegistryEntry):
     """Determine the system wide unique_id for an entity."""
diff --git a/homeassistant/components/homekit/config_flow.py b/homeassistant/components/homekit/config_flow.py
index 3d35b685271..65b70a8463f 100644
--- a/homeassistant/components/homekit/config_flow.py
+++ b/homeassistant/components/homekit/config_flow.py
@@ -1,5 +1,4 @@
 """Config flow for HomeKit integration."""
-import logging
 import random
 import string
 
@@ -7,7 +6,7 @@ import voluptuous as vol
 
 from homeassistant import config_entries
 from homeassistant.config_entries import SOURCE_IMPORT
-from homeassistant.const import CONF_NAME, CONF_PORT
+from homeassistant.const import CONF_DOMAINS, CONF_ENTITIES, CONF_NAME, CONF_PORT
 from homeassistant.core import callback, split_entity_id
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entityfilter import (
@@ -21,21 +20,28 @@ from .const import (
     CONF_AUTO_START,
     CONF_ENTITY_CONFIG,
     CONF_FILTER,
+    CONF_HOMEKIT_MODE,
     CONF_SAFE_MODE,
     CONF_VIDEO_CODEC,
     DEFAULT_AUTO_START,
     DEFAULT_CONFIG_FLOW_PORT,
+    DEFAULT_HOMEKIT_MODE,
     DEFAULT_SAFE_MODE,
+    HOMEKIT_MODE_ACCESSORY,
+    HOMEKIT_MODES,
     SHORT_BRIDGE_NAME,
     VIDEO_CODEC_COPY,
 )
 from .const import DOMAIN  # pylint:disable=unused-import
 from .util import find_next_available_port
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_CAMERA_COPY = "camera_copy"
-CONF_DOMAINS = "domains"
+CONF_INCLUDE_EXCLUDE_MODE = "include_exclude_mode"
+
+MODE_INCLUDE = "include"
+MODE_EXCLUDE = "exclude"
+
+INCLUDE_EXCLUDE_MODES = [MODE_EXCLUDE, MODE_INCLUDE]
 
 SUPPORTED_DOMAINS = [
     "alarm_control_panel",
@@ -67,6 +73,7 @@ DEFAULT_DOMAINS = [
     "climate",
     "cover",
     "humidifier",
+    "fan",
     "light",
     "lock",
     "media_player",
@@ -213,7 +220,9 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
         """Choose advanced options."""
         if user_input is not None:
             self.homekit_options.update(user_input)
-            del self.homekit_options[CONF_INCLUDE_DOMAINS]
+            for key in (CONF_DOMAINS, CONF_ENTITIES):
+                if key in self.homekit_options:
+                    del self.homekit_options[key]
             return self.async_create_entry(title="", data=self.homekit_options)
 
         schema_base = {}
@@ -278,46 +287,85 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
         )
         return self.async_show_form(step_id="cameras", data_schema=data_schema)
 
-    async def async_step_exclude(self, user_input=None):
-        """Choose entities to exclude from the domain."""
+    async def async_step_include_exclude(self, user_input=None):
+        """Choose entities to include or exclude from the domain."""
         if user_input is not None:
-            self.homekit_options[CONF_FILTER] = {
-                CONF_INCLUDE_DOMAINS: self.homekit_options[CONF_INCLUDE_DOMAINS],
-                CONF_EXCLUDE_DOMAINS: self.homekit_options.get(
-                    CONF_EXCLUDE_DOMAINS, []
-                ),
-                CONF_INCLUDE_ENTITIES: self.homekit_options.get(
-                    CONF_INCLUDE_ENTITIES, []
-                ),
-                CONF_EXCLUDE_ENTITIES: user_input[CONF_EXCLUDE_ENTITIES],
+            entity_filter = {
+                CONF_INCLUDE_DOMAINS: [],
+                CONF_EXCLUDE_DOMAINS: [],
+                CONF_INCLUDE_ENTITIES: [],
+                CONF_EXCLUDE_ENTITIES: [],
             }
-            for entity_id in user_input[CONF_EXCLUDE_ENTITIES]:
-                if entity_id in self.included_cameras:
-                    self.included_cameras.remove(entity_id)
+            if isinstance(user_input[CONF_ENTITIES], list):
+                entities = user_input[CONF_ENTITIES]
+            else:
+                entities = [user_input[CONF_ENTITIES]]
+
+            if (
+                self.homekit_options[CONF_HOMEKIT_MODE] == HOMEKIT_MODE_ACCESSORY
+                or user_input[CONF_INCLUDE_EXCLUDE_MODE] == MODE_INCLUDE
+            ):
+                entity_filter[CONF_INCLUDE_ENTITIES] = entities
+                # Include all of the domain if there are no entities
+                # explicitly included as the user selected the domain
+                domains_with_entities_selected = _domains_set_from_entities(entities)
+                entity_filter[CONF_INCLUDE_DOMAINS] = [
+                    domain
+                    for domain in self.homekit_options[CONF_DOMAINS]
+                    if domain not in domains_with_entities_selected
+                ]
+
+                for entity_id in list(self.included_cameras):
+                    if entity_id not in entities:
+                        self.included_cameras.remove(entity_id)
+            else:
+                entity_filter[CONF_INCLUDE_DOMAINS] = self.homekit_options[CONF_DOMAINS]
+                entity_filter[CONF_EXCLUDE_ENTITIES] = entities
+                for entity_id in entities:
+                    if entity_id in self.included_cameras:
+                        self.included_cameras.remove(entity_id)
+
+            self.homekit_options[CONF_FILTER] = entity_filter
+
             if self.included_cameras:
                 return await self.async_step_cameras()
+
             return await self.async_step_advanced()
 
         entity_filter = self.homekit_options.get(CONF_FILTER, {})
         all_supported_entities = await self.hass.async_add_executor_job(
             _get_entities_matching_domains,
             self.hass,
-            self.homekit_options[CONF_INCLUDE_DOMAINS],
+            self.homekit_options[CONF_DOMAINS],
         )
         self.included_cameras = {
             entity_id
             for entity_id in all_supported_entities
             if entity_id.startswith("camera.")
         }
-        data_schema = vol.Schema(
-            {
-                vol.Optional(
-                    CONF_EXCLUDE_ENTITIES,
-                    default=entity_filter.get(CONF_EXCLUDE_ENTITIES, []),
-                ): cv.multi_select(all_supported_entities),
-            }
+
+        data_schema = {}
+        entities = entity_filter.get(CONF_INCLUDE_ENTITIES, [])
+        if self.homekit_options[CONF_HOMEKIT_MODE] == HOMEKIT_MODE_ACCESSORY:
+            entity_schema = vol.In
+        else:
+            if entities:
+                include_exclude_mode = MODE_INCLUDE
+            else:
+                include_exclude_mode = MODE_EXCLUDE
+                entities = entity_filter.get(CONF_EXCLUDE_ENTITIES, [])
+            data_schema[
+                vol.Required(CONF_INCLUDE_EXCLUDE_MODE, default=include_exclude_mode)
+            ] = vol.In(INCLUDE_EXCLUDE_MODES)
+            entity_schema = cv.multi_select
+
+        data_schema[vol.Optional(CONF_ENTITIES, default=entities)] = entity_schema(
+            all_supported_entities
+        )
+
+        return self.async_show_form(
+            step_id="include_exclude", data_schema=vol.Schema(data_schema)
         )
-        return self.async_show_form(step_id="exclude", data_schema=data_schema)
 
     async def async_step_init(self, user_input=None):
         """Handle options flow."""
@@ -326,17 +374,26 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
 
         if user_input is not None:
             self.homekit_options.update(user_input)
-            return await self.async_step_exclude()
+            return await self.async_step_include_exclude()
 
         self.homekit_options = dict(self.config_entry.options)
         entity_filter = self.homekit_options.get(CONF_FILTER, {})
 
+        homekit_mode = self.homekit_options.get(CONF_HOMEKIT_MODE, DEFAULT_HOMEKIT_MODE)
+        domains = entity_filter.get(CONF_INCLUDE_DOMAINS, [])
+        include_entities = entity_filter.get(CONF_INCLUDE_ENTITIES)
+        if include_entities:
+            domains.extend(_domains_set_from_entities(include_entities))
+
         data_schema = vol.Schema(
             {
+                vol.Optional(CONF_HOMEKIT_MODE, default=homekit_mode): vol.In(
+                    HOMEKIT_MODES
+                ),
                 vol.Optional(
-                    CONF_INCLUDE_DOMAINS,
-                    default=entity_filter.get(CONF_INCLUDE_DOMAINS, []),
-                ): cv.multi_select(SUPPORTED_DOMAINS)
+                    CONF_DOMAINS,
+                    default=domains,
+                ): cv.multi_select(SUPPORTED_DOMAINS),
             }
         )
         return self.async_show_form(step_id="init", data_schema=data_schema)
@@ -352,3 +409,11 @@ def _get_entities_matching_domains(hass, domains):
     ]
     entity_ids.sort()
     return entity_ids
+
+
+def _domains_set_from_entities(entity_ids):
+    """Build a set of domains for the given entity ids."""
+    domains = set()
+    for entity_id in entity_ids:
+        domains.add(split_entity_id(entity_id)[0])
+    return domains
diff --git a/homeassistant/components/homekit/const.py b/homeassistant/components/homekit/const.py
index 9a2bc37a5a9..3a0ba43e9cb 100644
--- a/homeassistant/components/homekit/const.py
+++ b/homeassistant/components/homekit/const.py
@@ -30,6 +30,7 @@ ATTR_SOFTWARE_VERSION = "sw_version"
 ATTR_KEY_NAME = "key_name"
 
 # #### Config ####
+CONF_HOMEKIT_MODE = "mode"
 CONF_ADVERTISE_IP = "advertise_ip"
 CONF_AUDIO_CODEC = "audio_codec"
 CONF_AUDIO_MAP = "audio_map"
@@ -86,6 +87,12 @@ FEATURE_TOGGLE_MUTE = "toggle_mute"
 EVENT_HOMEKIT_CHANGED = "homekit_state_change"
 EVENT_HOMEKIT_TV_REMOTE_KEY_PRESSED = "homekit_tv_remote_key_pressed"
 
+# #### HomeKit Modes ####
+HOMEKIT_MODE_ACCESSORY = "accessory"
+HOMEKIT_MODE_BRIDGE = "bridge"
+DEFAULT_HOMEKIT_MODE = HOMEKIT_MODE_BRIDGE
+HOMEKIT_MODES = [HOMEKIT_MODE_BRIDGE, HOMEKIT_MODE_ACCESSORY]
+
 # #### HomeKit Component Services ####
 SERVICE_HOMEKIT_START = "start"
 SERVICE_HOMEKIT_RESET_ACCESSORY = "reset_accessory"
@@ -283,4 +290,5 @@ CONFIG_OPTIONS = [
     CONF_AUTO_START,
     CONF_SAFE_MODE,
     CONF_ENTITY_CONFIG,
+    CONF_HOMEKIT_MODE,
 ]
diff --git a/homeassistant/components/homekit/strings.json b/homeassistant/components/homekit/strings.json
index 39011d75719..9b453949027 100644
--- a/homeassistant/components/homekit/strings.json
+++ b/homeassistant/components/homekit/strings.json
@@ -1,24 +1,25 @@
 {
-    "title": "HomeKit Bridge",
     "options": {
         "step": {
             "yaml": {
-                "title": "Adjust HomeKit Bridge Options",
+                "title": "Adjust HomeKit Options",
                 "description": "This entry is controlled via YAML"
             },
             "init": {
                 "data": {
+                    "mode": "Mode",
                     "include_domains": "[%key:component::homekit::config::step::user::data::include_domains%]"
                 },
-                "description": "Entities in the \u201cDomains to include\u201d will be bridged to HomeKit. You will be able to select which entities to exclude from this list on the next screen.",
-                "title": "Select domains to bridge."
+                "description": "HomeKit can be configured expose a bridge or a single accessory. In accessory mode, only a single entity can be used. Accessory mode is required for media players with the TV device class to function properly. Entities in the \u201cDomains to include\u201d will be exposed to HomeKit. You will be able to select which entities to include or exclude from this list on the next screen.",
+                "title": "Select domains to expose."
             },
-            "exclude": {
+            "include_exclude": {
                 "data": {
-                    "exclude_entities": "Entities to exclude"
+                    "mode": "Mode",
+                    "entities": "Entities"
                 },
-                "description": "Choose the entities that you do NOT want to be bridged.",
-                "title": "Exclude entities in selected domains from bridge"
+                "description": "Choose the entities to be exposed. In accessory mode, only a single entity is exposed. In bridge include mode, all entities in the domain will be exposed unless specific entities are selected. In bridge exclude mode, all entities in the domain will be exposed except for the excluded entities.",
+                "title": "Select entities to be exposed"
             },
             "cameras": {
                 "data": {
@@ -32,7 +33,7 @@
                     "auto_start": "[%key:component::homekit::config::step::user::data::auto_start%]",
                     "safe_mode": "Safe Mode (enable only if pairing fails)"
                 },
-                "description": "These settings only need to be adjusted if the HomeKit bridge is not functional.",
+                "description": "These settings only need to be adjusted if HomeKit is not functional.",
                 "title": "Advanced Configuration"
             }
         }
@@ -44,16 +45,16 @@
                     "auto_start": "Autostart (disable if using Z-Wave or other delayed start system)",
                     "include_domains": "Domains to include"
                 },
-                "description": "A HomeKit Bridge will allow you to access your Home Assistant entities in HomeKit. HomeKit Bridges are limited to 150 accessories per instance including the bridge itself. If you wish to bridge more than the maximum number of accessories, it is recommended that you use multiple HomeKit bridges for different domains. Detailed entity configuration is only available via YAML for the primary bridge.",
-                "title": "Activate HomeKit Bridge"
+                "description": "The HomeKit integration will allow you to access your Home Assistant entities in HomeKit. In bridge mode, HomeKit Bridges are limited to 150 accessories per instance including the bridge itself. If you wish to bridge more than the maximum number of accessories, it is recommended that you use multiple HomeKit bridges for different domains. Detailed entity configuration is only available via YAML for the primary bridge.",
+                "title": "Activate HomeKit"
             },
             "pairing": {
-                "title": "Pair HomeKit Bridge",
-                "description": "As soon as the {name} bridge is ready, pairing will be available in \u201cNotifications\u201d as \u201cHomeKit Bridge Setup\u201d."
+                "title": "Pair HomeKit",
+                "description": "As soon as the {name} is ready, pairing will be available in \u201cNotifications\u201d as \u201cHomeKit Bridge Setup\u201d."
             }
         },
         "abort": {
-            "port_name_in_use": "A bridge with the same name or port is already configured."
+            "port_name_in_use": "An accessory or bridge with the same name or port is already configured."
         }
     }
 }
diff --git a/homeassistant/components/homekit/translations/ca.json b/homeassistant/components/homekit/translations/ca.json
index 6389de72e4e..452cfc33365 100644
--- a/homeassistant/components/homekit/translations/ca.json
+++ b/homeassistant/components/homekit/translations/ca.json
@@ -1,20 +1,20 @@
 {
     "config": {
         "abort": {
-            "port_name_in_use": "Ja hi ha un enlla\u00e7 configurat amb aquest nom o port."
+            "port_name_in_use": "Ja hi ha un enlla\u00e7 o accessori configurat amb aquest nom o port."
         },
         "step": {
             "pairing": {
-                "description": "Tan aviat com l'enlla\u00e7 {name} estigui llest, rebr\u00e0s una \"Notificaci\u00f3\" de configuraci\u00f3 de l'enlla\u00e7 HomeKit informan-te de que la vinculaci\u00f3 est\u00e0 disponible.",
-                "title": "Vinculaci\u00f3 de l'enlla\u00e7 HomeKit"
+                "description": "Tan aviat com {name} estigui llest, la vinculaci\u00f3 estar\u00e0 disponible a \"Notificacions\" com a \"Configuraci\u00f3 de l'enlla\u00e7 HomeKit\".",
+                "title": "Vinculaci\u00f3 HomeKit"
             },
             "user": {
                 "data": {
                     "auto_start": "Autoarrencada (desactiva-ho si fas servir Z-Wave o algun altre sistema d'inici lent)",
                     "include_domains": "Dominis a incloure"
                 },
-                "description": "L'enlla\u00e7 HomeKit et permet accedir a les teves entitats de Home Assistant directament a HomeKit. Aquests enll\u00e7os estan limitats a un m\u00e0xim de 150 accessoris per inst\u00e0ncia (incl\u00f2s el propi enlla\u00e7). Si volguessis enlla\u00e7ar m\u00e9s accessoris, \u00e9s recomanable que utilitzis diferents enlla\u00e7os HomeKit per a dominis diferents. La configuraci\u00f3 avan\u00e7ada d'entitat per l'enlla\u00e7 prinipal nom\u00e9s est\u00e0 disponible amb YAML.",
-                "title": "Activaci\u00f3 de l'enlla\u00e7 HomeKit"
+                "description": "La integraci\u00f3 HomeKit et permet l'acc\u00e9s a les teves entitats de Home Assistant a HomeKit. En mode enlla\u00e7, els enlla\u00e7os HomeKit estan limitats a un m\u00e0xim de 150 accessoris per inst\u00e0ncia (incl\u00f2s el propi enlla\u00e7). Si volguessis enlla\u00e7ar m\u00e9s accessoris que el m\u00e0xim perm\u00e8s, \u00e9s recomanable que utilitzis diferents enlla\u00e7os HomeKit per a dominis diferents. La configuraci\u00f3 avan\u00e7ada d'entitat nom\u00e9s est\u00e0 disponible en YAML per l'enlla\u00e7 prinipal.",
+                "title": "Activaci\u00f3 de HomeKit"
             }
         }
     },
@@ -25,7 +25,7 @@
                     "auto_start": "[%key::component::homekit::config::step::user::data::auto_start%]",
                     "safe_mode": "Mode segur (habilita-ho nom\u00e9s si falla la vinculaci\u00f3)"
                 },
-                "description": "Aquests par\u00e0metres nom\u00e9s s'han d'ajustar si l'enlla\u00e7 HomeKit no \u00e9s funcional.",
+                "description": "Aquests par\u00e0metres nom\u00e9s s'han d'ajustar si HomeKit no \u00e9s funcional.",
                 "title": "Configuraci\u00f3 avan\u00e7ada"
             },
             "cameras": {
@@ -42,16 +42,25 @@
                 "description": "Selecciona les entitats que NO vulguis que siguin enlla\u00e7ades.",
                 "title": "Exclusi\u00f3 d'entitats de l'enlla\u00e7 en dominis seleccionats"
             },
+            "include_exclude": {
+                "data": {
+                    "entities": "Entitats",
+                    "mode": "Mode"
+                },
+                "description": "Tria les entitats que vulguis exposar. En mode accessori, nom\u00e9s s'exposa una sola entitat. En mode enlla\u00e7 inclusiu, s'exposaran totes les entitats del domini tret que se seleccionin algunes en concret. En mode enlla\u00e7 excusiu, s'exposaran totes les entitats del domini excepte les entitats excloses.",
+                "title": "Selecci\u00f3 de les entitats a exposar"
+            },
             "init": {
                 "data": {
-                    "include_domains": "[%key::component::homekit::config::step::user::data::include_domains%]"
+                    "include_domains": "[%key::component::homekit::config::step::user::data::include_domains%]",
+                    "mode": "Mode"
                 },
-                "description": "Les entitats a \"Dominis a incloure\" s'enlla\u00e7aran a HomeKit. A la seg\u00fcent pantalla podr\u00e0s seleccionar quines entitats vols excloure d'aquesta llista.",
-                "title": "Selecci\u00f3 dels dominis a enlla\u00e7ar."
+                "description": "HomeKit es pot configurar per exposar un enlla\u00e7 o un sol accessori. En mode accessori, nom\u00e9s es pot utilitzar una entitat. El mode accessori \u00e9s necessari en reproductors multim\u00e8dia amb classe de dispositiu TV perqu\u00e8 funcionin correctament. Les entitats a \"Dominis a incloure\" s'exposaran a HomeKit. A la seg\u00fcent pantalla podr\u00e0s seleccionar quines entitats vols incloure o excloure d'aquesta llista.",
+                "title": "Selecci\u00f3 dels dominis a exposar."
             },
             "yaml": {
                 "description": "Aquesta entrada es controla en YAML",
-                "title": "Ajusta les opcions de l'enlla\u00e7 HomeKit"
+                "title": "Ajusta les opcions de HomeKit"
             }
         }
     },
diff --git a/homeassistant/components/homekit/translations/cs.json b/homeassistant/components/homekit/translations/cs.json
index 3e96cd44af8..d0bb01c9887 100644
--- a/homeassistant/components/homekit/translations/cs.json
+++ b/homeassistant/components/homekit/translations/cs.json
@@ -1,3 +1,62 @@
 {
+    "config": {
+        "abort": {
+            "port_name_in_use": "P\u0159\u00edslu\u0161enstv\u00ed nebo p\u0159emost\u011bn\u00ed se stejn\u00fdm n\u00e1zvem nebo portem je ji\u017e nastaveno."
+        },
+        "step": {
+            "pairing": {
+                "title": "P\u00e1rov\u00e1n\u00ed s HomeKit"
+            },
+            "user": {
+                "data": {
+                    "include_domains": "Dom\u00e9ny, kter\u00e9 maj\u00ed b\u00fdt zahrnuty"
+                },
+                "title": "Aktivace HomeKit"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "advanced": {
+                "data": {
+                    "safe_mode": "Nouzov\u00fd re\u017eim (povolit pouze v p\u0159\u00edpad\u011b, \u017ee p\u00e1rov\u00e1n\u00ed sel\u017ee)"
+                },
+                "description": "Tato nastaven\u00ed je t\u0159eba upravit pouze v p\u0159\u00edpad\u011b, \u017ee HomeKit nen\u00ed funk\u010dn\u00ed.",
+                "title": "Pokro\u010dil\u00e9 nastaven\u00ed"
+            },
+            "cameras": {
+                "data": {
+                    "camera_copy": "Kamery, kter\u00e9 podporuj\u00ed nativn\u00ed streamy H.264"
+                },
+                "description": "Zkontrolujte v\u0161echny kamery, kter\u00e9 podporuj\u00ed nativn\u00ed streamy H.264. Pokud kamera nepodporuje stream H.264, syst\u00e9m video p\u0159ek\u00f3duje pro HomeKit na H.264. P\u0159ek\u00f3dov\u00e1n\u00ed vy\u017eaduje v\u00fdkonn\u00fd procesor a je pravd\u011bpodobn\u00e9, \u017ee nebude fungovat na po\u010d\u00edta\u010d\u00edch s jednou z\u00e1kladn\u00ed deskou.",
+                "title": "Vyberte videokodek kamery."
+            },
+            "exclude": {
+                "data": {
+                    "exclude_entities": "Entity, kter\u00e9 maj\u00ed b\u00fdt vylou\u010deny"
+                },
+                "description": "Vyberte entity, kter\u00e9 NECHCETE p\u0159emostit.",
+                "title": "Vylou\u010dit entity ve vybran\u00fdch dom\u00e9n\u00e1ch z p\u0159emost\u011bn\u00ed"
+            },
+            "include_exclude": {
+                "data": {
+                    "entities": "Entity",
+                    "mode": "Re\u017eim"
+                },
+                "title": "Vyberte entity, kter\u00e9 chcete vystavit"
+            },
+            "init": {
+                "data": {
+                    "include_domains": "Dom\u00e9ny, kter\u00e9 maj\u00ed b\u00fdt zahrnuty",
+                    "mode": "Re\u017eim"
+                },
+                "title": "Vyberte dom\u00e9ny, kter\u00e9 chcete vystavit."
+            },
+            "yaml": {
+                "description": "Tento z\u00e1znam je \u0159\u00edzen pomoc\u00ed YAML",
+                "title": "Upravte mo\u017enosti HomeKit"
+            }
+        }
+    },
     "title": "HomeKit Bridge"
 }
\ No newline at end of file
diff --git a/homeassistant/components/homekit/translations/de.json b/homeassistant/components/homekit/translations/de.json
index 70774806cf8..2a5b3ff8978 100644
--- a/homeassistant/components/homekit/translations/de.json
+++ b/homeassistant/components/homekit/translations/de.json
@@ -34,7 +34,16 @@
                     "exclude_entities": "Auszuschlie\u00dfende Entit\u00e4ten"
                 }
             },
+            "include_exclude": {
+                "data": {
+                    "entities": "Entit\u00e4ten",
+                    "mode": "Modus"
+                }
+            },
             "init": {
+                "data": {
+                    "mode": "Modus"
+                },
                 "title": "W\u00e4hlen Sie die zu \u00fcberbr\u00fcckenden Dom\u00e4nen aus."
             },
             "yaml": {
diff --git a/homeassistant/components/homekit/translations/en.json b/homeassistant/components/homekit/translations/en.json
index a70f9e90ed7..00a59d7dbd9 100644
--- a/homeassistant/components/homekit/translations/en.json
+++ b/homeassistant/components/homekit/translations/en.json
@@ -1,20 +1,20 @@
 {
     "config": {
         "abort": {
-            "port_name_in_use": "A bridge with the same name or port is already configured."
+            "port_name_in_use": "An accessory or bridge with the same name or port is already configured."
         },
         "step": {
             "pairing": {
-                "description": "As soon as the {name} bridge is ready, pairing will be available in \u201cNotifications\u201d as \u201cHomeKit Bridge Setup\u201d.",
-                "title": "Pair HomeKit Bridge"
+                "description": "As soon as the {name} is ready, pairing will be available in \u201cNotifications\u201d as \u201cHomeKit Bridge Setup\u201d.",
+                "title": "Pair HomeKit"
             },
             "user": {
                 "data": {
                     "auto_start": "Autostart (disable if using Z-Wave or other delayed start system)",
                     "include_domains": "Domains to include"
                 },
-                "description": "A HomeKit Bridge will allow you to access your Home Assistant entities in HomeKit. HomeKit Bridges are limited to 150 accessories per instance including the bridge itself. If you wish to bridge more than the maximum number of accessories, it is recommended that you use multiple HomeKit bridges for different domains. Detailed entity configuration is only available via YAML for the primary bridge.",
-                "title": "Activate HomeKit Bridge"
+                "description": "The HomeKit integration will allow you to access your Home Assistant entities in HomeKit. In bridge mode, HomeKit Bridges are limited to 150 accessories per instance including the bridge itself. If you wish to bridge more than the maximum number of accessories, it is recommended that you use multiple HomeKit bridges for different domains. Detailed entity configuration is only available via YAML for the primary bridge.",
+                "title": "Activate HomeKit"
             }
         }
     },
@@ -25,7 +25,7 @@
                     "auto_start": "Autostart (disable if using Z-Wave or other delayed start system)",
                     "safe_mode": "Safe Mode (enable only if pairing fails)"
                 },
-                "description": "These settings only need to be adjusted if the HomeKit bridge is not functional.",
+                "description": "These settings only need to be adjusted if HomeKit is not functional.",
                 "title": "Advanced Configuration"
             },
             "cameras": {
@@ -42,16 +42,25 @@
                 "description": "Choose the entities that you do NOT want to be bridged.",
                 "title": "Exclude entities in selected domains from bridge"
             },
+            "include_exclude": {
+                "data": {
+                    "entities": "Entities",
+                    "mode": "Mode"
+                },
+                "description": "Choose the entities to be exposed. In accessory mode, only a single entity is exposed. In bridge include mode, all entities in the domain will be exposed unless specific entities are selected. In bridge exclude mode, all entities in the domain will be exposed except for the excluded entities.",
+                "title": "Select entities to be exposed"
+            },
             "init": {
                 "data": {
-                    "include_domains": "Domains to include"
+                    "include_domains": "Domains to include",
+                    "mode": "Mode"
                 },
-                "description": "Entities in the \u201cDomains to include\u201d will be bridged to HomeKit. You will be able to select which entities to exclude from this list on the next screen.",
-                "title": "Select domains to bridge."
+                "description": "HomeKit can be configured expose a bridge or a single accessory. In accessory mode, only a single entity can be used. Accessory mode is required for media players with the TV device class to function properly. Entities in the \u201cDomains to include\u201d will be exposed to HomeKit. You will be able to select which entities to include or exclude from this list on the next screen.",
+                "title": "Select domains to expose."
             },
             "yaml": {
                 "description": "This entry is controlled via YAML",
-                "title": "Adjust HomeKit Bridge Options"
+                "title": "Adjust HomeKit Options"
             }
         }
     },
diff --git a/homeassistant/components/homekit/translations/es.json b/homeassistant/components/homekit/translations/es.json
index b7172574b12..7b8b7dbacc3 100644
--- a/homeassistant/components/homekit/translations/es.json
+++ b/homeassistant/components/homekit/translations/es.json
@@ -42,9 +42,18 @@
                 "description": "Elija las entidades que NO desea puentear.",
                 "title": "Excluir entidades en dominios seleccionados de bridge"
             },
+            "include_exclude": {
+                "data": {
+                    "entities": "Entidades",
+                    "mode": "Modo"
+                },
+                "description": "Selecciona las entidades que deseas exponer. En el modo de accesorio, solo se expone una \u00fanica entidad. En el modo de inclusi\u00f3n de puente, todas las entidades del dominio se expondr\u00e1n a menos que se seleccionen entidades espec\u00edficas. En el modo de exclusi\u00f3n de puentes, todas las entidades del dominio se expondr\u00e1n excepto las entidades excluidas.",
+                "title": "Seleccionar entidades para exponer"
+            },
             "init": {
                 "data": {
-                    "include_domains": "Dominios para incluir"
+                    "include_domains": "Dominios para incluir",
+                    "mode": "Modo"
                 },
                 "description": "Las entidades de los \"Dominios que se van a incluir\" se establecer\u00e1n en HomeKit. Podr\u00e1 seleccionar qu\u00e9 entidades excluir de esta lista en la siguiente pantalla.",
                 "title": "Seleccione los dominios que desea establecer un puente."
diff --git a/homeassistant/components/homekit/translations/et.json b/homeassistant/components/homekit/translations/et.json
new file mode 100644
index 00000000000..a712eee9438
--- /dev/null
+++ b/homeassistant/components/homekit/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "options": {
+        "step": {
+            "include_exclude": {
+                "data": {
+                    "entities": "Olemid",
+                    "mode": "Re\u017eiim"
+                },
+                "description": "Vali avaldatavad olemid. Tarvikute re\u017eiimis on avaldatav ainult \u00fcks olem. Silla re\u017eiimis, kuvatakse k\u00f5ik domeeni olemid, v\u00e4lja arvatud juhul, kui valitud on kindlad olemid. Silla v\u00e4listamisre\u017eiimis avaldatakse k\u00f5ik domeeni olemid, v\u00e4lja arvatud v\u00e4listatud olemid.",
+                "title": "Vali avaldatavad olemid"
+            },
+            "init": {
+                "data": {
+                    "mode": "Re\u017eiim"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/homekit/translations/it.json b/homeassistant/components/homekit/translations/it.json
index 9c139c46290..7f85eb85c63 100644
--- a/homeassistant/components/homekit/translations/it.json
+++ b/homeassistant/components/homekit/translations/it.json
@@ -1,20 +1,20 @@
 {
     "config": {
         "abort": {
-            "port_name_in_use": "Un bridge con lo stesso nome o porta \u00e8 gi\u00e0 configurato."
+            "port_name_in_use": "Un accessorio o un bridge con lo stesso nome o porta \u00e8 gi\u00e0 configurato."
         },
         "step": {
             "pairing": {
-                "description": "Non appena il bridge {name} \u00e8 pronto, l'associazione sar\u00e0 disponibile in \"Notifiche\" come \"HomeKit Bridge Setup\".",
-                "title": "Associa HomeKit Bridge"
+                "description": "Non appena il {name} \u00e8 pronto, l'associazione sar\u00e0 disponibile in \"Notifiche\" come \"Configurazione HomeKit Bridge\".",
+                "title": "Associa HomeKit"
             },
             "user": {
                 "data": {
                     "auto_start": "Avvio automatico (disabilitare se si utilizza Z-Wave o un altro sistema di avvio ritardato)",
                     "include_domains": "Domini da includere"
                 },
-                "description": "Un HomeKit Bridge ti permetter\u00e0 di accedere alle tue entit\u00e0 Home Assistant in HomeKit. Gli HomeKit Bridges sono limitati a 150 accessori per istanza, incluso il bridge stesso. Se si desidera collegare un numero di accessori superiore al massimo consentito, si consiglia di utilizzare pi\u00f9 HomeKit Bridge per domini diversi. La configurazione dettagliata delle entit\u00e0 \u00e8 disponibile solo tramite YAML per il bridge primario.",
-                "title": "Attiva HomeKit Bridge"
+                "description": "L'integrazione di HomeKit ti consentir\u00e0 di accedere alle entit\u00e0 di Home Assistant in HomeKit. In modalit\u00e0 bridge, i bridge HomeKit sono limitati a 150 accessori per istanza, incluso il bridge stesso. Se desideri eseguire il bridge di un numero di accessori superiore a quello massimo, si consiglia di utilizzare pi\u00f9 bridge HomeKit per domini diversi. La configurazione dettagliata dell'entit\u00e0 \u00e8 disponibile solo tramite YAML per il bridge principale.",
+                "title": "Attiva HomeKit"
             }
         }
     },
@@ -25,7 +25,7 @@
                     "auto_start": "Avvio automatico (disabilitare se si utilizza Z-Wave o un altro sistema di avvio ritardato)",
                     "safe_mode": "Modalit\u00e0 provvisoria (attivare solo in caso di errore di associazione)"
                 },
-                "description": "Queste impostazioni devono essere modificate solo se il bridge HomeKit non funziona.",
+                "description": "Queste impostazioni devono essere regolate solo se HomeKit non funziona.",
                 "title": "Configurazione Avanzata"
             },
             "cameras": {
@@ -42,16 +42,25 @@
                 "description": "Scegliere le entit\u00e0 che NON si desidera collegare.",
                 "title": "Escludere le entit\u00e0 dal bridge nei domini selezionati "
             },
+            "include_exclude": {
+                "data": {
+                    "entities": "Entit\u00e0",
+                    "mode": "Modalit\u00e0"
+                },
+                "description": "Scegliere le entit\u00e0 da esporre. In modalit\u00e0 accessorio, \u00e8 esposta una sola entit\u00e0. In modalit\u00e0 di inclusione bridge, tutte le entit\u00e0 nel dominio saranno esposte, a meno che non siano selezionate entit\u00e0 specifiche. In modalit\u00e0 di esclusione bridge, tutte le entit\u00e0 nel dominio saranno esposte, ad eccezione delle entit\u00e0 escluse.",
+                "title": "Selezionare le entit\u00e0 da esporre"
+            },
             "init": {
                 "data": {
-                    "include_domains": "Domini da includere"
+                    "include_domains": "Domini da includere",
+                    "mode": "Modalit\u00e0"
                 },
-                "description": "Le entit\u00e0 nei \"Domini da includere\" saranno collegate a HomeKit. Sarai in grado di selezionare quali entit\u00e0 escludere da questo elenco nella schermata successiva.",
-                "title": "Selezionare i domini al bridge."
+                "description": "HomeKit pu\u00f2 essere configurato esponendo un bridge o un singolo accessorio. In modalit\u00e0 accessorio, pu\u00f2 essere utilizzata solo una singola entit\u00e0. La modalit\u00e0 accessorio \u00e8 necessaria per il corretto funzionamento dei lettori multimediali con la classe di apparecchi TV. Le entit\u00e0 nei \"Domini da includere\" saranno esposte ad HomeKit. Sar\u00e0 possibile selezionare quali entit\u00e0 includere o escludere da questo elenco nella schermata successiva.",
+                "title": "Selezionare i domini da esporre."
             },
             "yaml": {
                 "description": "Questa voce \u00e8 controllata tramite YAML",
-                "title": "Regolare le opzioni di HomeKit Bridge"
+                "title": "Modifica le opzioni di HomeKit"
             }
         }
     },
diff --git a/homeassistant/components/homekit/translations/nl.json b/homeassistant/components/homekit/translations/nl.json
index 538aa000172..3c3a019c3ed 100644
--- a/homeassistant/components/homekit/translations/nl.json
+++ b/homeassistant/components/homekit/translations/nl.json
@@ -1,7 +1,27 @@
 {
+    "config": {
+        "abort": {
+            "port_name_in_use": "Er is al een bridge met dezelfde naam of poort geconfigureerd."
+        },
+        "step": {
+            "pairing": {
+                "title": "Koppel HomeKit Bridge"
+            },
+            "user": {
+                "data": {
+                    "auto_start": "Automatisch starten (uitschakelen als u Z-Wave of een ander vertraagd startsysteem gebruikt)"
+                },
+                "title": "Activeer HomeKit Bridge"
+            }
+        }
+    },
     "options": {
         "step": {
             "advanced": {
+                "data": {
+                    "safe_mode": "Veilige modus (alleen inschakelen als het koppelen mislukt)"
+                },
+                "description": "Deze instellingen hoeven alleen te worden aangepast als HomeKit niet functioneert.",
                 "title": "Geavanceerde configuratie"
             },
             "exclude": {
@@ -14,8 +34,14 @@
             "init": {
                 "data": {
                     "include_domains": "Op te nemen domeinen"
-                }
+                },
+                "title": "Selecteer domeinen om zichtbaar te maken."
+            },
+            "yaml": {
+                "description": "Deze invoer wordt beheerd via YAML",
+                "title": "Pas de HomeKit Bridge-opties aan"
             }
         }
-    }
+    },
+    "title": "HomeKit Bridge"
 }
\ No newline at end of file
diff --git a/homeassistant/components/homekit/translations/no.json b/homeassistant/components/homekit/translations/no.json
index 1e59d947e60..6380493d67c 100644
--- a/homeassistant/components/homekit/translations/no.json
+++ b/homeassistant/components/homekit/translations/no.json
@@ -1,20 +1,20 @@
 {
     "config": {
         "abort": {
-            "port_name_in_use": "En bro med samme navn eller port er allerede konfigurert."
+            "port_name_in_use": "Et tilbeh\u00f8r eller bro med samme navn eller port er allerede konfigurert."
         },
         "step": {
             "pairing": {
-                "description": "S\u00e5 snart {name} bridge er klar, vil sammenkoblingen v\u00e6re tilgjengelig i \u201cVarsler\u201d som \u201cHomeKit Bridge Setup\u201d.",
-                "title": "Par HomeKit Bridge"
+                "description": "S\u00e5 snart {name} er klart, vil sammenkobling v\u00e6re tilgjengelig i \"Notifications\" som \"HomeKit Bridge Setup\".",
+                "title": "Koble sammen HomeKit"
             },
             "user": {
                 "data": {
                     "auto_start": "Autostart (deaktiver hvis du bruker Z-Wave eller annet forsinket startsystem)",
                     "include_domains": "Domener \u00e5 inkludere"
                 },
-                "description": "En HomeKit Bridge gir deg tilgang til home assistant-enhetene dine i HomeKit. HomeKit Bridges er begrenset til 150 tilbeh\u00f8r per forekomst, inkludert selve broen. Hvis du \u00f8nsker \u00e5 bygge bro over mer enn maksimalt antall tilbeh\u00f8r, anbefales det at du bruker flere HomeKit-broer for forskjellige domener. Detaljert enhetskonfigurasjon er bare tilgjengelig via YAML for hovedbroen.",
-                "title": "Aktiver HomeKit Bridge"
+                "description": "HomeKit-integrasjonen gir deg tilgang til Home Assistant-entitetene dine i HomeKit. I bromodus er HomeKit Broer begrenset til 150 tilbeh\u00f8rsenhet per forekomst inkludert selve broen. Hvis du \u00f8nsker \u00e5 \u00f8ke maksimalt antall tilbeh\u00f8rsenheter, anbefales det at du bruker flere HomeKit-broer for forskjellige domener. Detaljert entitetskonfigurasjon er bare tilgjengelig via YAML for den prim\u00e6re broen.",
+                "title": "Aktiver HomeKit"
             }
         }
     },
@@ -25,7 +25,7 @@
                     "auto_start": "Autostart (deaktiver hvis du bruker Z-Wave eller annet forsinket startsystem)",
                     "safe_mode": "Sikker modus (aktiver bare hvis sammenkoblingen mislykkes)"
                 },
-                "description": "Disse innstillingene m\u00e5 bare justeres dersom HomeKit bridge er ikke i bruk.",
+                "description": "Disse innstillingene m\u00e5 bare justeres hvis HomeKit ikke fungerer.",
                 "title": "Avansert konfigurasjon"
             },
             "cameras": {
@@ -37,23 +37,32 @@
             },
             "exclude": {
                 "data": {
-                    "exclude_entities": "Enheter \u00e5 ekskludere"
+                    "exclude_entities": "Entiteter \u00e5 ekskludere"
                 },
-                "description": "Velg enhetene du IKKE vil skal bygges inn.",
-                "title": "Ekskluder enheter i utvalgte domener fra bridge"
+                "description": "Velg entitetene du IKKE vil koble til broen.",
+                "title": "Ekskluder entiteter i utvalgte domener fra bro"
+            },
+            "include_exclude": {
+                "data": {
+                    "entities": "Entiteter",
+                    "mode": "Modus"
+                },
+                "description": "Velg entitene som skal eksponeres. I tilbeh\u00f8rsmodus er bare en enkelt entitet eksponert. I bro-inkluderingsmodus vil alle entiteter i domenet bli eksponert med mindre spesifikke entiteter er valgt. I bro-ekskluderingsmodus vil alle entiteter i domenet bli eksponert bortsett fra de ekskluderte entitetene.",
+                "title": "Velg entiteter som skal eksponeres"
             },
             "init": {
                 "data": {
-                    "include_domains": "Domener \u00e5 inkludere"
+                    "include_domains": "Domener \u00e5 inkludere",
+                    "mode": "Modus"
                 },
-                "description": "Enheter i \"Domener som skal inkluderes\" vil bli brolagt til HomeKit. Du kan velge hvilke enheter som skal utelates fra denne listen p\u00e5 neste skjermbilde.",
-                "title": "Velg domener du vil bygge bro."
+                "description": "HomeKit kan konfigureres for \u00e5 eksponere en bro eller en enkelt tilbeh\u00f8rsenhet. I tilbeh\u00f8rsmodus kan bare en enkelt entitet brukes. Tilbeh\u00f8rsmodus er n\u00f8dvendig for at mediaspillere med TV-enhetsklasse skal fungere skikkelig. Entiteter i \u201cDomains to include\u201d vil bli eksponert for HomeKit. Du vil kunne velge hvilke entiteter du vil inkludere eller ekskludere fra denne listen p\u00e5 neste skjermbilde.",
+                "title": "Velg domener du vil eksponere."
             },
             "yaml": {
                 "description": "Denne oppf\u00f8ringen kontrolleres via YAML",
-                "title": "Juster alternativene for HomeKit Bridge"
+                "title": "Juster HomeKit-alternativer"
             }
         }
     },
-    "title": "HomeKit Bridge"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/homekit/translations/pl.json b/homeassistant/components/homekit/translations/pl.json
index 3a3dfc22448..218ff81d402 100644
--- a/homeassistant/components/homekit/translations/pl.json
+++ b/homeassistant/components/homekit/translations/pl.json
@@ -1,18 +1,20 @@
 {
     "config": {
         "abort": {
-            "port_name_in_use": "Mostek o okre\u015blonej nazwie lub adresie IP jest ju\u017c skonfigurowany."
+            "port_name_in_use": "Akcesorium lub mostek o tej samej nazwie lub adresie IP jest ju\u017c skonfigurowany"
         },
         "step": {
             "pairing": {
-                "title": "Sparuj z mostkiem HomeKit"
+                "description": "Gdy tylko {name} b\u0119dzie gotowy, opcja parowania b\u0119dzie dost\u0119pna w \u201ePowiadomieniach\u201d jako \u201eKonfiguracja mostka HomeKit\u201d.",
+                "title": "Sparuj z HomeKit"
             },
             "user": {
                 "data": {
                     "auto_start": "Automatyczne uruchomienie (wy\u0142\u0105cz, je\u015bli u\u017cywasz Z-Wave lub innej integracji op\u00f3\u017aniaj\u0105cej start systemu)",
                     "include_domains": "Domeny do uwzgl\u0119dnienia"
                 },
-                "title": "Aktywowanie mostka HomeKit"
+                "description": "Integracja HomeKit pozwala na dost\u0119p do Twoich encji Home Assistant w HomeKit. W trybie \"Mostka\", mostki HomeKit s\u0105 ograniczone do 150 urz\u0105dze\u0144, w\u0142\u0105czaj\u0105c w to sam mostek. Je\u015bli chcesz wi\u0119cej ni\u017c dozwolona maksymalna liczba urz\u0105dze\u0144, zaleca si\u0119 u\u017cywanie wielu most\u00f3w HomeKit dla r\u00f3\u017cnych domen. Szczeg\u00f3\u0142owa konfiguracja encji jest dost\u0119pna tylko w trybie YAML dla g\u0142\u00f3wnego mostka.",
+                "title": "Aktywacja HomeKit"
             }
         }
     },
@@ -23,6 +25,7 @@
                     "auto_start": "Automatyczne uruchomienie (wy\u0142\u0105cz, je\u015bli u\u017cywasz Z-Wave lub innej integracji op\u00f3\u017aniaj\u0105cej start systemu)",
                     "safe_mode": "Tryb awaryjny (w\u0142\u0105cz tylko wtedy, gdy parowanie nie powiedzie si\u0119)"
                 },
+                "description": "Te ustawienia nale\u017cy dostosowa\u0107 tylko wtedy, gdy HomeKit nie dzia\u0142a.",
                 "title": "Konfiguracja zaawansowana"
             },
             "cameras": {
@@ -36,18 +39,28 @@
                 "data": {
                     "exclude_entities": "Wykluczone encje"
                 },
+                "description": "Wybierz encje, kt\u00f3rych NIE chcesz zmostkowa\u0107.",
                 "title": "Wykluczenie encji z wybranych domen"
             },
+            "include_exclude": {
+                "data": {
+                    "entities": "Encje",
+                    "mode": "Tryb"
+                },
+                "description": "Wybierz encje, kt\u00f3re maj\u0105 by\u0107 widoczne. W trybie \"Akcesorium\", tylko jedna encja jest widoczna. W trybie \"Uwzgl\u0119dnij mostek\", wszystkie encje w danej domenie b\u0119d\u0105 widoczne, chyba \u017ce wybrane s\u0105 tylko konkretne encje. W trybie \"Wyklucz mostek\", wszystkie encje b\u0119d\u0105 widoczne, z wyj\u0105tkiem tych wybranych.",
+                "title": "Wybierz encje, kt\u00f3re maj\u0105 by\u0107 widoczne"
+            },
             "init": {
                 "data": {
-                    "include_domains": "Wykluczone domeny"
+                    "include_domains": "Domeny do uwzgl\u0119dnienia",
+                    "mode": "Tryb"
                 },
-                "description": "Encje w \"uwzgl\u0119dnionych domenach\" zostan\u0105 po\u0142\u0105czone z HomeKit. B\u0119dziesz m\u00f3g\u0142 wybra\u0107, kt\u00f3re encje maj\u0105 zosta\u0107 wykluczone z tej listy na nast\u0119pnym ekranie.",
+                "description": "HomeKit mo\u017ce by\u0107 skonfigurowany, by pokaza\u0142 mostek lub pojedyncze akcesorium. W trybie \"Akcesorium\", tylko pojedyncza encja mo\u017ce by\u0107 u\u017cyta. Tryb ten jest wymagany w przypadku odtwarzaczy multimedialnych z klas\u0105 urz\u0105dzenia TV, by dzia\u0142a\u0142 prawid\u0142owo. Encje w \"uwzgl\u0119dnionych domenach\" b\u0119d\u0105 widoczne w HomeKit. B\u0119dziesz m\u00f3g\u0142 wybra\u0107, kt\u00f3re encje maj\u0105 zosta\u0107 uwzgl\u0119dnione lub wykluczone z tej listy na nast\u0119pnym ekranie.",
                 "title": "Domeny do uwzgl\u0119dnienia."
             },
             "yaml": {
                 "description": "Ten wpis jest kontrolowany przez YAML",
-                "title": "Dostosowywanie opcji mostka HomeKit"
+                "title": "Dostosowywanie opcji HomeKit"
             }
         }
     },
diff --git a/homeassistant/components/homekit/translations/ru.json b/homeassistant/components/homekit/translations/ru.json
index 240031ef5f1..87175265299 100644
--- a/homeassistant/components/homekit/translations/ru.json
+++ b/homeassistant/components/homekit/translations/ru.json
@@ -5,16 +5,16 @@
         },
         "step": {
             "pairing": {
-                "description": "\u041a\u0430\u043a \u0442\u043e\u043b\u044c\u043a\u043e \u0431\u0440\u0438\u0434\u0436 {name} \u0431\u0443\u0434\u0435\u0442 \u0433\u043e\u0442\u043e\u0432, \u0441\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u0435 \u0431\u0443\u0434\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e \u0432 \"\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f\u0445\" \u043a\u0430\u043a \"HomeKit Bridge Setup\".",
-                "title": "\u0421\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u0435 \u0441 HomeKit Bridge"
+                "description": "\u041a\u0430\u043a \u0442\u043e\u043b\u044c\u043a\u043e {name} \u0431\u0443\u0434\u0435\u0442 \u0433\u043e\u0442\u043e\u0432\u043e, \u0441\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u0435 \u0431\u0443\u0434\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e \u0432 \"\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f\u0445\" \u043a\u0430\u043a \"HomeKit Bridge Setup\".",
+                "title": "\u0421\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u0435 \u0441 HomeKit"
             },
             "user": {
                 "data": {
                     "auto_start": "\u0410\u0432\u0442\u043e\u0437\u0430\u043f\u0443\u0441\u043a (\u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u0440\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 Z-Wave \u0438\u043b\u0438 \u0434\u0440\u0443\u0433\u043e\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u044b \u043e\u0442\u043b\u043e\u0436\u0435\u043d\u043d\u043e\u0433\u043e \u0437\u0430\u043f\u0443\u0441\u043a\u0430)",
                     "include_domains": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0434\u043e\u043c\u0435\u043d\u044b"
                 },
-                "description": "HomeKit Bridge \u043f\u043e\u0437\u0432\u043e\u043b\u0438\u0442 \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043e\u0431\u044a\u0435\u043a\u0442\u0430\u043c Home Assistant \u0447\u0435\u0440\u0435\u0437  HomeKit. HomeKit Bridge \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d 150 \u0430\u043a\u0441\u0435\u0441\u0441\u0443\u0430\u0440\u0430\u043c\u0438 \u043d\u0430 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440, \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u0441\u0430\u043c \u0431\u0440\u0438\u0434\u0436. \u0415\u0441\u043b\u0438 \u0412\u0430\u043c \u043d\u0443\u0436\u043d\u043e \u0431\u043e\u043b\u044c\u0448\u0435, \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u0442\u0441\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e HomeKit Bridge \u0434\u043b\u044f \u0440\u0430\u0437\u043d\u044b\u0445 \u0434\u043e\u043c\u0435\u043d\u043e\u0432. \u0414\u0435\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430 \u0442\u043e\u043b\u044c\u043a\u043e \u0447\u0435\u0440\u0435\u0437 YAML \u0434\u043b\u044f \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0431\u0440\u0438\u0434\u0436\u0430.",
-                "title": "HomeKit Bridge"
+                "description": "\u042d\u0442\u0430 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043e\u0431\u044a\u0435\u043a\u0442\u0430\u043c Home Assistant \u0447\u0435\u0440\u0435\u0437 HomeKit. HomeKit Bridge \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d 150 \u0430\u043a\u0441\u0435\u0441\u0441\u0443\u0430\u0440\u0430\u043c\u0438 \u043d\u0430 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440, \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u0441\u0430\u043c \u0431\u0440\u0438\u0434\u0436. \u0415\u0441\u043b\u0438 \u0412\u0430\u043c \u043d\u0443\u0436\u043d\u043e \u0431\u043e\u043b\u044c\u0448\u0435, \u0440\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u0442\u0441\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e HomeKit Bridge \u0434\u043b\u044f \u0440\u0430\u0437\u043d\u044b\u0445 \u0434\u043e\u043c\u0435\u043d\u043e\u0432. \u0414\u0435\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430 \u0442\u043e\u043b\u044c\u043a\u043e \u0447\u0435\u0440\u0435\u0437 YAML \u0434\u043b\u044f \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0431\u0440\u0438\u0434\u0436\u0430.",
+                "title": "HomeKit"
             }
         }
     },
@@ -25,7 +25,7 @@
                     "auto_start": "\u0410\u0432\u0442\u043e\u0437\u0430\u043f\u0443\u0441\u043a (\u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u0440\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 Z-Wave \u0438\u043b\u0438 \u0434\u0440\u0443\u0433\u043e\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u044b \u043e\u0442\u043b\u043e\u0436\u0435\u043d\u043d\u043e\u0433\u043e \u0437\u0430\u043f\u0443\u0441\u043a\u0430)",
                     "safe_mode": "\u0411\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c (\u0432\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0442\u043e\u043b\u044c\u043a\u043e \u0432 \u0441\u043b\u0443\u0447\u0430\u0435 \u0441\u0431\u043e\u044f \u0441\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u044f)"
                 },
-                "description": "\u042d\u0442\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u044b, \u0442\u043e\u043b\u044c\u043a\u043e \u0435\u0441\u043b\u0438 HomeKit Bridge \u043d\u0435 \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442.",
+                "description": "\u042d\u0442\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u044b, \u0442\u043e\u043b\u044c\u043a\u043e \u0435\u0441\u043b\u0438 HomeKit \u043d\u0435 \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442.",
                 "title": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430"
             },
             "cameras": {
@@ -42,16 +42,25 @@
                 "description": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u041d\u0415 \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u044b \u0432 HomeKit.",
                 "title": "\u0418\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 \u0432 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0445 \u0434\u043e\u043c\u0435\u043d\u0430\u0445"
             },
+            "include_exclude": {
+                "data": {
+                    "entities": "\u041e\u0431\u044a\u0435\u043a\u0442\u044b",
+                    "mode": "\u0420\u0435\u0436\u0438\u043c"
+                },
+                "description": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b \u0434\u043b\u044f \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0432 HomeKit. \u0412 \u0440\u0435\u0436\u0438\u043c\u0435 \u0430\u043a\u0441\u0435\u0441\u0441\u0443\u0430\u0440\u0430 \u043c\u043e\u0436\u043d\u043e \u043f\u0435\u0440\u0435\u0434\u0430\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u043e\u0431\u044a\u0435\u043a\u0442. \u0412 \u0440\u0435\u0436\u0438\u043c\u0435 \u043c\u043e\u0441\u0442\u0430 \u0431\u0443\u0434\u0443\u0442 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u044b \u0432\u0441\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b, \u043f\u0440\u0438\u043d\u0430\u0434\u043b\u0435\u0436\u0430\u0449\u0438\u0435 \u0434\u043e\u043c\u0435\u043d\u0443, \u0435\u0441\u043b\u0438 \u043d\u0435 \u0432\u044b\u0431\u0440\u0430\u043d\u044b \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b. \u0412 \u0440\u0435\u0436\u0438\u043c\u0435 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0431\u0443\u0434\u0443\u0442 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u044b \u0432\u0441\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b, \u043f\u0440\u0438\u043d\u0430\u0434\u043b\u0435\u0436\u0430\u0449\u0438\u0435 \u0434\u043e\u043c\u0435\u043d\u0443, \u043a\u0440\u043e\u043c\u0435 \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u044b\u0445.",
+                "title": "\u0412\u044b\u0431\u043e\u0440 \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432 \u0434\u043b\u044f \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0432 HomeKit"
+            },
             "init": {
                 "data": {
-                    "include_domains": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0434\u043e\u043c\u0435\u043d\u044b"
+                    "include_domains": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0434\u043e\u043c\u0435\u043d\u044b",
+                    "mode": "\u0420\u0435\u0436\u0438\u043c"
                 },
-                "description": "\u041e\u0431\u044a\u0435\u043a\u0442\u044b, \u043f\u0440\u0438\u043d\u0430\u0434\u043b\u0435\u0436\u0430\u0449\u0438\u0435 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u043c \u0434\u043e\u043c\u0435\u043d\u0430\u043c, \u0431\u0443\u0434\u0443\u0442 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u044b \u0432 HomeKit. \u041d\u0430 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c \u044d\u0442\u0430\u043f\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0412\u044b \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u044b\u0431\u0440\u0430\u0442\u044c, \u043a\u0430\u043a\u0438\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b \u0438\u0441\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0438\u0437 \u044d\u0442\u0438\u0445 \u0434\u043e\u043c\u0435\u043d\u043e\u0432.",
+                "description": "\u0418\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f \u0441 HomeKit \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0432 \u0440\u0435\u0436\u0438\u043c\u0435 \u043c\u043e\u0441\u0442\u0430 \u0438\u043b\u0438 \u043a\u0430\u043a \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u044b\u0439 \u0430\u043a\u0441\u0435\u0441\u0441\u0443\u0430\u0440. \u0412 \u0440\u0435\u0436\u0438\u043c\u0435 \u0430\u043a\u0441\u0435\u0441\u0441\u0443\u0430\u0440\u0430 \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u043e\u0431\u044a\u0435\u043a\u0442. \u041c\u0435\u0434\u0438\u0430\u043f\u043b\u0435\u0435\u0440\u044b, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0435 \u0432 Home Assistant \u0441 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u043c 'device_class: tv', \u0434\u043b\u044f \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0439 \u0440\u0430\u0431\u043e\u0442\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u0438\u043d\u0442\u0435\u0433\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b \u0432 Homekit \u0432 \u0440\u0435\u0436\u0438\u043c\u0435 \u0430\u043a\u0441\u0435\u0441\u0441\u0443\u0430\u0440\u0430. \u041e\u0431\u044a\u0435\u043a\u0442\u044b, \u043f\u0440\u0438\u043d\u0430\u0434\u043b\u0435\u0436\u0430\u0449\u0438\u0435 \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u043c \u0434\u043e\u043c\u0435\u043d\u0430\u043c, \u0431\u0443\u0434\u0443\u0442 \u043f\u0435\u0440\u0435\u0434\u0430\u043d\u044b \u0432 HomeKit. \u041d\u0430 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c \u044d\u0442\u0430\u043f\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0412\u044b \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u044b\u0431\u0440\u0430\u0442\u044c, \u043a\u0430\u043a\u0438\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b \u0438\u0441\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0438\u0437 \u044d\u0442\u0438\u0445 \u0434\u043e\u043c\u0435\u043d\u043e\u0432.",
                 "title": "\u0412\u044b\u0431\u043e\u0440 \u0434\u043e\u043c\u0435\u043d\u043e\u0432 \u0434\u043b\u044f \u043f\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0432 HomeKit"
             },
             "yaml": {
                 "description": "\u042d\u0442\u0430 \u0437\u0430\u043f\u0438\u0441\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u0447\u0435\u0440\u0435\u0437 YAML",
-                "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 HomeKit Bridge"
+                "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 HomeKit"
             }
         }
     },
diff --git a/homeassistant/components/homekit/translations/uk.json b/homeassistant/components/homekit/translations/uk.json
new file mode 100644
index 00000000000..10cd42ccecb
--- /dev/null
+++ b/homeassistant/components/homekit/translations/uk.json
@@ -0,0 +1,11 @@
+{
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "mode": "\u0420\u0435\u0436\u0438\u043c"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/homekit/translations/zh-Hans.json b/homeassistant/components/homekit/translations/zh-Hans.json
index 0c2d49149ef..4e421f3261a 100644
--- a/homeassistant/components/homekit/translations/zh-Hans.json
+++ b/homeassistant/components/homekit/translations/zh-Hans.json
@@ -5,16 +5,16 @@
         },
         "step": {
             "pairing": {
-                "description": "\u4e00\u65e6\u6865\u63a5\u5668 {name} \u51c6\u5907\u5c31\u7eea\uff0c\u5c31\u53ef\u4ee5\u5728\u201c\u901a\u77e5\u201d\u627e\u5230\u201cHomeKit \u6865\u63a5\u5668\u914d\u7f6e\u201d\u8fdb\u884c\u914d\u5bf9\u3002",
-                "title": "\u914d\u5bf9 HomeKit \u6865\u63a5\u5668"
+                "description": "\u4e00\u65e6 {name} \u51c6\u5907\u5c31\u7eea\uff0c\u5c31\u53ef\u4ee5\u5728\u201c\u901a\u77e5\u201d\u627e\u5230\u201cHomeKit \u6865\u63a5\u5668\u914d\u7f6e\u201d\u8fdb\u884c\u914d\u5bf9\u3002",
+                "title": "\u4e0e HomeKit \u914d\u5bf9"
             },
             "user": {
                 "data": {
                     "auto_start": "\u81ea\u52a8\u542f\u52a8\uff08\u5982\u679c\u4f7f\u7528 Z-Wave \u6216\u5176\u4ed6\u5ef6\u8fdf\u542f\u52a8\u7cfb\u7edf\uff0c\u8bf7\u7981\u7528\u6b64\u9879\uff09",
                     "include_domains": "\u8981\u5305\u542b\u7684\u57df"
                 },
-                "description": "HomeKit \u6865\u63a5\u5668\u53ef\u4ee5\u8ba9\u60a8\u901a\u8fc7 HomeKit \u8bbf\u95ee Home Assistant \u4e2d\u7684\u5b9e\u4f53\u3002\u6bcf\u4e2a\u6865\u63a5\u5668\u5b9e\u4f8b\u6700\u591a\u53ef\u6a21\u62df 150 \u4e2a\u914d\u4ef6\uff0c\u5305\u62ec\u6865\u63a5\u5668\u672c\u8eab\u3002\u5982\u679c\u60a8\u5e0c\u671b\u6865\u63a5\u7684\u914d\u4ef6\u591a\u4e8e\u6b64\u6570\u91cf\uff0c\u5efa\u8bae\u4e3a\u4e0d\u540c\u7684\u57df\u4f7f\u7528\u591a\u4e2a HomeKit \u6865\u63a5\u5668\u3002\u8be6\u7ec6\u7684\u5b9e\u4f53\u914d\u7f6e\u4ec5\u53ef\u7528\u4e8e\u4e3b\u6865\u63a5\u5668\uff0c\u4e14\u987b\u901a\u8fc7 YAML \u914d\u7f6e\u3002",
-                "title": "\u6fc0\u6d3b HomeKit \u6865\u63a5\u5668"
+                "description": "HomeKit \u96c6\u6210\u53ef\u4ee5\u8ba9\u60a8\u901a\u8fc7 HomeKit \u8bbf\u95ee Home Assistant \u4e2d\u7684\u5b9e\u4f53\u3002\u5728\u6865\u63a5\u6a21\u5f0f\u4e2d\uff0c\u6bcf\u4e2a\u6865\u63a5\u5668\u5b9e\u4f8b\u6700\u591a\u53ef\u6a21\u62df 150 \u4e2a\u914d\u4ef6\uff0c\u5305\u62ec\u6865\u63a5\u5668\u672c\u8eab\u3002\u5982\u679c\u60a8\u5e0c\u671b\u6865\u63a5\u7684\u914d\u4ef6\u591a\u4e8e\u6b64\u6570\u91cf\uff0c\u5efa\u8bae\u4e3a\u4e0d\u540c\u7684\u57df\u4f7f\u7528\u591a\u4e2a HomeKit \u6865\u63a5\u5668\u3002\u8be6\u7ec6\u7684\u5b9e\u4f53\u914d\u7f6e\u4ec5\u53ef\u7528\u4e8e\u4e3b\u6865\u63a5\u5668\uff0c\u4e14\u987b\u901a\u8fc7 YAML \u914d\u7f6e\u3002",
+                "title": "\u6fc0\u6d3b HomeKit"
             }
         }
     },
@@ -25,7 +25,7 @@
                     "auto_start": "\u81ea\u52a8\u542f\u52a8\uff08\u5982\u679c\u4f7f\u7528 Z-Wave \u6216\u5176\u4ed6\u5ef6\u8fdf\u542f\u52a8\u7cfb\u7edf\uff0c\u8bf7\u7981\u7528\u6b64\u9879\uff09",
                     "safe_mode": "\u5b89\u5168\u6a21\u5f0f\uff08\u4ec5\u5728\u914d\u5bf9\u5931\u8d25\u65f6\u542f\u7528\uff09"
                 },
-                "description": "\u8fd9\u4e9b\u8bbe\u7f6e\u53ea\u6709\u5f53 HomeKit \u6865\u63a5\u5668\u529f\u80fd\u4e0d\u6b63\u5e38\u65f6\u624d\u9700\u8981\u8c03\u6574\u3002",
+                "description": "\u8fd9\u4e9b\u8bbe\u7f6e\u53ea\u6709\u5f53 HomeKit \u529f\u80fd\u4e0d\u6b63\u5e38\u65f6\u624d\u9700\u8981\u8c03\u6574\u3002",
                 "title": "\u9ad8\u7ea7\u914d\u7f6e"
             },
             "cameras": {
@@ -42,16 +42,25 @@
                 "description": "\u9009\u62e9\u4e0d\u9700\u8981\u6865\u63a5\u7684\u5b9e\u4f53\u3002",
                 "title": "\u5bf9\u9009\u62e9\u7684\u57df\u6392\u9664\u5b9e\u4f53"
             },
+            "include_exclude": {
+                "data": {
+                    "entities": "\u5b9e\u4f53",
+                    "mode": "\u6a21\u5f0f"
+                },
+                "description": "\u9009\u62e9\u8981\u5f00\u653e\u7684\u5b9e\u4f53\u3002\u5728\u9644\u4ef6\u6a21\u5f0f\u4e2d\uff0c\u53ea\u80fd\u5f00\u653e\u4e00\u4e2a\u5b9e\u4f53\u3002\u5728\u6865\u63a5\u5305\u542b\u6a21\u5f0f\u4e2d\uff0c\u5982\u679c\u4e0d\u9009\u62e9\u5305\u542b\u7684\u5b9e\u4f53\uff0c\u57df\u4e2d\u6240\u6709\u5b9e\u4f53\u90fd\u4f1a\u5f00\u653e\u3002\u5728\u6865\u63a5\u6392\u9664\u6a21\u5f0f\u4e2d\uff0c\u5982\u679c\u4e0d\u9009\u62e9\u6392\u9664\u7684\u5b9e\u4f53\uff0c\u57df\u4e2d\u6240\u6709\u5b9e\u4f53\u4e5f\u90fd\u4f1a\u5f00\u653e\u3002",
+                "title": "\u9009\u62e9\u8981\u5f00\u653e\u7684\u5b9e\u4f53"
+            },
             "init": {
                 "data": {
-                    "include_domains": "\u8981\u5305\u542b\u7684\u57df"
+                    "include_domains": "\u8981\u5305\u542b\u7684\u57df",
+                    "mode": "\u6a21\u5f0f"
                 },
-                "description": "\u201c\u8981\u5305\u542b\u7684\u57df\u201d\u4e2d\u7684\u5b9e\u4f53\u5c06\u88ab\u6865\u63a5\u5230 HomeKit\u3002\u5728\u4e0b\u4e00\u9875\u53ef\u4ee5\u9009\u62e9\u8981\u6392\u9664\u5176\u4e2d\u7684\u54ea\u4e9b\u5b9e\u4f53\u3002",
-                "title": "\u9009\u62e9\u8981\u6865\u63a5\u7684\u57df\u3002"
+                "description": "HomeKit \u53ef\u4ee5\u88ab\u914d\u7f6e\u4e3a\u5bf9\u5916\u5c55\u793a\u4e00\u4e2a\u6865\u63a5\u5668\u6216\u5355\u4e2a\u914d\u4ef6\u3002\u5728\u914d\u4ef6\u6a21\u5f0f\u4e2d\uff0c\u53ea\u80fd\u4f7f\u7528\u4e00\u4e2a\u5b9e\u4f53\u3002\u8bbe\u5907\u7c7b\u578b\u4e3a\u201c\u7535\u89c6\u201d\u7684\u5a92\u4f53\u64ad\u653e\u5668\u5fc5\u987b\u4f7f\u7528\u914d\u4ef6\u6a21\u5f0f\u624d\u80fd\u6b63\u5e38\u5de5\u4f5c\u3002\u201c\u8981\u5305\u542b\u7684\u57df\u201d\u4e2d\u7684\u5b9e\u4f53\u5c06\u5411 HomeKit \u5f00\u653e\u3002\u5728\u4e0b\u4e00\u9875\u53ef\u4ee5\u9009\u62e9\u8981\u5305\u542b\u6216\u6392\u9664\u5176\u4e2d\u7684\u54ea\u4e9b\u5b9e\u4f53\u3002",
+                "title": "\u9009\u62e9\u8981\u5f00\u653e\u7684\u57df\u3002"
             },
             "yaml": {
                 "description": "\u8be5\u6761\u76ee\u662f\u901a\u8fc7 YAML \u63a7\u5236\u7684",
-                "title": "\u8c03\u6574 HomeKit \u6865\u63a5\u5668\u9009\u9879"
+                "title": "\u8c03\u6574 HomeKit \u9009\u9879"
             }
         }
     },
diff --git a/homeassistant/components/homekit/translations/zh-Hant.json b/homeassistant/components/homekit/translations/zh-Hant.json
index a36ecdff1b2..f8c78e39b25 100644
--- a/homeassistant/components/homekit/translations/zh-Hant.json
+++ b/homeassistant/components/homekit/translations/zh-Hant.json
@@ -1,20 +1,20 @@
 {
     "config": {
         "abort": {
-            "port_name_in_use": "\u4f7f\u7528\u76f8\u540c\u540d\u7a31\u6216\u901a\u8a0a\u57e0\u7684 Bridge \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "port_name_in_use": "\u4f7f\u7528\u76f8\u540c\u540d\u7a31\u6216\u901a\u8a0a\u57e0\u7684\u914d\u4ef6\u6216 Bridge \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
         },
         "step": {
             "pairing": {
-                "description": "\u65bc {name} bridge \u5c31\u7dd2\u5f8c\u3001\u5c07\u6703\u65bc\u300c\u901a\u77e5\u300d\u4e2d\u986f\u793a\u300cHomeKit Bridge \u8a2d\u5b9a\u300d\u7684\u914d\u5c0d\u8cc7\u8a0a\u3002",
-                "title": "\u914d\u5c0d HomeKit Bridge"
+                "description": "\u65bc {name} \u5c31\u7dd2\u5f8c\u3001\u5c07\u6703\u65bc\u300c\u901a\u77e5\u300d\u4e2d\u986f\u793a\u300cHomeKit Bridge \u8a2d\u5b9a\u300d\u7684\u914d\u5c0d\u8cc7\u8a0a\u3002",
+                "title": "\u914d\u5c0d HomeKit"
             },
             "user": {
                 "data": {
                     "auto_start": "\u81ea\u52d5\u555f\u52d5\uff08\u5047\u5982\u4f7f\u7528 Z-Wave \u6216\u5176\u4ed6\u5ef6\u9072\u555f\u52d5\u7cfb\u7d71\u6642\u3001\u8acb\u95dc\u9589\uff09",
                     "include_domains": "\u5305\u542b Domain"
                 },
-                "description": "HomeKit Bridge \u5c07\u53ef\u5141\u8a31\u65bc  Homekit \u4e2d\u4f7f\u7528 Home Assistant \u5be6\u9ad4\u3002HomeKit Bridges \u6700\u9ad8\u9650\u5236\u70ba 150 \u500b\u914d\u4ef6\u3001\u5305\u542b Bridge \u672c\u8eab\u3002\u5047\u5982\u60f3\u8981\u4f7f\u7528\u8d85\u904e\u9650\u5236\u4ee5\u4e0a\u7684\u914d\u4ef6\uff0c\u5efa\u8b70\u53ef\u4ee5\u4e0d\u540c Domain \u4f7f\u7528\u591a\u500b HomeKit bridges \u9054\u5230\u6b64\u9700\u6c42\u3002\u50c5\u80fd\u65bc\u4e3b Bridge \u4ee5 YAML \u8a2d\u5b9a\u8a73\u7d30\u5be6\u9ad4\u3002",
-                "title": "\u555f\u7528 HomeKit Bridge"
+                "description": "HomeKit \u6574\u5408\u5c07\u53ef\u5141\u8a31\u65bc  Homekit \u4e2d\u4f7f\u7528 Home Assistant \u5be6\u9ad4\u3002\u65bc\u6a4b\u63a5\u6a21\u5f0f\u4e0b\u3001HomeKit Bridges \u6700\u9ad8\u9650\u5236\u70ba 150 \u500b\u914d\u4ef6\u3001\u5305\u542b Bridge \u672c\u8eab\u3002\u5047\u5982\u60f3\u8981\u4f7f\u7528\u8d85\u904e\u9650\u5236\u4ee5\u4e0a\u7684\u914d\u4ef6\uff0c\u5efa\u8b70\u53ef\u4ee5\u4e0d\u540c Domain \u4f7f\u7528\u591a\u500b HomeKit bridges \u9054\u5230\u6b64\u9700\u6c42\u3002\u50c5\u80fd\u65bc\u4e3b Bridge \u4ee5 YAML \u8a2d\u5b9a\u8a73\u7d30\u5be6\u9ad4\u3002",
+                "title": "\u555f\u7528 HomeKit"
             }
         }
     },
@@ -25,7 +25,7 @@
                     "auto_start": "\u81ea\u52d5\u555f\u52d5\uff08\u5047\u5982\u4f7f\u7528 Z-Wave \u6216\u5176\u4ed6\u5ef6\u9072\u555f\u52d5\u7cfb\u7d71\u6642\u3001\u8acb\u95dc\u9589\uff09",
                     "safe_mode": "\u5b89\u5168\u6a21\u5f0f\uff08\u50c5\u65bc\u914d\u5c0d\u5931\u6557\u6642\u4f7f\u7528\uff09"
                 },
-                "description": "\u50c5\u65bc Homekit bridge \u7121\u6cd5\u6b63\u5e38\u4f7f\u7528\u6642\uff0c\u8abf\u6574\u6b64\u4e9b\u8a2d\u5b9a\u3002",
+                "description": "\u50c5\u65bc Homekit \u7121\u6cd5\u6b63\u5e38\u4f7f\u7528\u6642\uff0c\u8abf\u6574\u6b64\u4e9b\u8a2d\u5b9a\u3002",
                 "title": "\u9032\u968e\u8a2d\u5b9a"
             },
             "cameras": {
@@ -42,16 +42,25 @@
                 "description": "\u9078\u64c7\u4e0d\u9032\u884c\u6a4b\u63a5\u7684\u5be6\u9ad4\u3002",
                 "title": "\u65bc\u6240\u9078 Domain \u4e2d\u6240\u8981\u6392\u9664\u7684\u5be6\u9ad4"
             },
+            "include_exclude": {
+                "data": {
+                    "entities": "\u5be6\u9ad4",
+                    "mode": "\u6a21\u5f0f"
+                },
+                "description": "\u9078\u64c7\u9032\u884c\u63a5\u901a\u7684\u5be6\u9ad4\u3002\u65bc\u5305\u542b\u6a21\u5f0f\u4e2d\u3001\u6240\u6709\u7db2\u57df\u7684\u5be6\u9ad4\u90fd\u5c07\u9032\u884c\u63a5\u901a\uff0c\u9664\u975e\u9078\u64c7\u7279\u5b9a\u7684\u5be6\u9ad4\u3002\u65bc\u6392\u9664\u6a21\u5f0f\u4e2d\u3001\u6240\u6709\u7db2\u57df\u4e2d\u7684\u9032\u884c\u63a5\u901a\uff0c\u9664\u4e86\u6392\u9664\u7684\u5be6\u9ad4\u3002",
+                "title": "\u9078\u64c7\u8981\u63a5\u901a\u7684\u5be6\u9ad4"
+            },
             "init": {
                 "data": {
-                    "include_domains": "\u5305\u542b Domain"
+                    "include_domains": "\u5305\u542b Domain",
+                    "mode": "\u6a21\u5f0f"
                 },
-                "description": "\u300c\u5305\u542b Domain\u300d\u4e2d\u7684\u5be6\u9ad4\u5c07\u6703\u6a4b\u63a5\u81f3 Homekit\u3001\u53ef\u4ee5\u65bc\u4e0b\u4e00\u500b\u756b\u9762\u4e2d\u9078\u64c7\u6240\u8981\u5305\u542b\u6216\u6392\u9664\u7684\u5be6\u9ad4\u5217\u8868\u3002",
-                "title": "\u9078\u64c7\u6240\u8981\u6a4b\u63a5\u7684 Domain\u3002"
+                "description": "HomeKit \u80fd\u5920\u8a2d\u5b9a\u63a5\u901a\u6a4b\u63a5\u6216\u55ae\u4e00\u914d\u4ef6\u6a21\u5f0f\u3002\u5a92\u9ad4\u64ad\u653e\u5668\u9700\u8981\u4ee5\u96fb\u8996\u8a2d\u5099\u914d\u4ef6\u6a21\u5f0f\u624d\u80fd\u6b63\u5e38\u4f7f\u7528\u3002\"\u5305\u542b Domains\"\u4e2d\u7684\u5be6\u9ad4\u5c07\u6703\u6a4b\u63a5\u81f3 Homekit\u3001\u53ef\u4ee5\u65bc\u4e0b\u4e00\u500b\u756b\u9762\u4e2d\u9078\u64c7\u6240\u8981\u5305\u542b\u6216\u6392\u9664\u7684\u5be6\u9ad4\u5217\u8868\u3002",
+                "title": "\u9078\u64c7\u6240\u8981\u63a5\u901a\u7684 Domain\u3002"
             },
             "yaml": {
                 "description": "\u6b64\u5be6\u9ad4\u70ba\u900f\u904e YAML \u63a7\u5236",
-                "title": "\u8abf\u6574 HomeKit Bridge \u9078\u9805"
+                "title": "\u8abf\u6574 HomeKit \u9078\u9805"
             }
         }
     },
diff --git a/homeassistant/components/homekit/type_cameras.py b/homeassistant/components/homekit/type_cameras.py
index 0febd7461e5..fc9d20d61aa 100644
--- a/homeassistant/components/homekit/type_cameras.py
+++ b/homeassistant/components/homekit/type_cameras.py
@@ -109,6 +109,7 @@ RESOLUTIONS = [
     (1280, 720),
     (1280, 960),
     (1920, 1080),
+    (1600, 1200),
 ]
 
 VIDEO_PROFILE_NAMES = ["baseline", "main", "high"]
diff --git a/homeassistant/components/homekit/type_media_players.py b/homeassistant/components/homekit/type_media_players.py
index c278322f77e..901ac2173f4 100644
--- a/homeassistant/components/homekit/type_media_players.py
+++ b/homeassistant/components/homekit/type_media_players.py
@@ -280,6 +280,7 @@ class TelevisionMediaPlayer(HomeAccessory):
 
         serv_tv = self.add_preload_service(SERV_TELEVISION, self.chars_tv)
         self.set_primary_service(serv_tv)
+        serv_tv.configure_char(CHAR_CONFIGURED_NAME, value=self.display_name)
         serv_tv.configure_char(CHAR_SLEEP_DISCOVER_MODE, value=True)
         self.char_active = serv_tv.configure_char(
             CHAR_ACTIVE, setter_callback=self.set_on_off
diff --git a/homeassistant/components/homekit_controller/__init__.py b/homeassistant/components/homekit_controller/__init__.py
index 6a9fb126c21..b7139741be2 100644
--- a/homeassistant/components/homekit_controller/__init__.py
+++ b/homeassistant/components/homekit_controller/__init__.py
@@ -1,5 +1,4 @@
 """Support for Homekit device discovery."""
-import logging
 from typing import Any, Dict
 
 import aiohomekit
@@ -20,8 +19,6 @@ from .connection import HKDevice
 from .const import CONTROLLER, DOMAIN, ENTITY_MAP, KNOWN_DEVICES, TRIGGERS
 from .storage import EntityMapStorage
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def escape_characteristic_name(char_name):
     """Escape any dash or dots in a characteristics name."""
diff --git a/homeassistant/components/homekit_controller/alarm_control_panel.py b/homeassistant/components/homekit_controller/alarm_control_panel.py
index 0b8f0b3b2f8..bf3a5f27142 100644
--- a/homeassistant/components/homekit_controller/alarm_control_panel.py
+++ b/homeassistant/components/homekit_controller/alarm_control_panel.py
@@ -1,6 +1,4 @@
 """Support for Homekit Alarm Control Panel."""
-import logging
-
 from aiohomekit.model.characteristics import CharacteristicsTypes
 
 from homeassistant.components.alarm_control_panel import AlarmControlPanelEntity
@@ -23,8 +21,6 @@ from . import KNOWN_DEVICES, HomeKitEntity
 
 ICON = "mdi:security"
 
-_LOGGER = logging.getLogger(__name__)
-
 CURRENT_STATE_MAP = {
     0: STATE_ALARM_ARMED_HOME,
     1: STATE_ALARM_ARMED_AWAY,
@@ -110,10 +106,8 @@ class HomeKitAlarmControlPanelEntity(HomeKitEntity, AlarmControlPanelEntity):
     @property
     def device_state_attributes(self):
         """Return the optional state attributes."""
-        attributes = {}
-
         battery_level = self.service.value(CharacteristicsTypes.BATTERY_LEVEL)
-        if battery_level:
-            attributes[ATTR_BATTERY_LEVEL] = battery_level
 
-        return attributes
+        if not battery_level:
+            return {}
+        return {ATTR_BATTERY_LEVEL: battery_level}
diff --git a/homeassistant/components/homekit_controller/binary_sensor.py b/homeassistant/components/homekit_controller/binary_sensor.py
index 29fddf99189..c718f7dc11a 100644
--- a/homeassistant/components/homekit_controller/binary_sensor.py
+++ b/homeassistant/components/homekit_controller/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Homekit motion sensors."""
-import logging
-
 from aiohomekit.model.characteristics import CharacteristicsTypes
 
 from homeassistant.components.binary_sensor import (
@@ -16,8 +14,6 @@ from homeassistant.core import callback
 
 from . import KNOWN_DEVICES, HomeKitEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class HomeKitMotionSensor(HomeKitEntity, BinarySensorEntity):
     """Representation of a Homekit motion sensor."""
diff --git a/homeassistant/components/homekit_controller/cover.py b/homeassistant/components/homekit_controller/cover.py
index 086f780b816..db824ea060d 100644
--- a/homeassistant/components/homekit_controller/cover.py
+++ b/homeassistant/components/homekit_controller/cover.py
@@ -1,6 +1,4 @@
 """Support for Homekit covers."""
-import logging
-
 from aiohomekit.model.characteristics import CharacteristicsTypes
 
 from homeassistant.components.cover import (
@@ -22,8 +20,6 @@ from . import KNOWN_DEVICES, HomeKitEntity
 
 STATE_STOPPED = "stopped"
 
-_LOGGER = logging.getLogger(__name__)
-
 CURRENT_GARAGE_STATE_MAP = {
     0: STATE_OPEN,
     1: STATE_CLOSED,
@@ -117,15 +113,12 @@ class HomeKitGarageDoorCover(HomeKitEntity, CoverEntity):
     @property
     def device_state_attributes(self):
         """Return the optional state attributes."""
-        attributes = {}
-
         obstruction_detected = self.service.value(
             CharacteristicsTypes.OBSTRUCTION_DETECTED
         )
-        if obstruction_detected:
-            attributes["obstruction-detected"] = obstruction_detected
-
-        return attributes
+        if not obstruction_detected:
+            return {}
+        return {"obstruction-detected": obstruction_detected}
 
 
 class HomeKitWindowCover(HomeKitEntity, CoverEntity):
@@ -249,12 +242,9 @@ class HomeKitWindowCover(HomeKitEntity, CoverEntity):
     @property
     def device_state_attributes(self):
         """Return the optional state attributes."""
-        attributes = {}
-
         obstruction_detected = self.service.value(
             CharacteristicsTypes.OBSTRUCTION_DETECTED
         )
-        if obstruction_detected:
-            attributes["obstruction-detected"] = obstruction_detected
-
-        return attributes
+        if not obstruction_detected:
+            return {}
+        return {"obstruction-detected": obstruction_detected}
diff --git a/homeassistant/components/homekit_controller/fan.py b/homeassistant/components/homekit_controller/fan.py
index e3b392ea107..5fe119f65b7 100644
--- a/homeassistant/components/homekit_controller/fan.py
+++ b/homeassistant/components/homekit_controller/fan.py
@@ -1,6 +1,4 @@
 """Support for Homekit fans."""
-import logging
-
 from aiohomekit.model.characteristics import CharacteristicsTypes
 
 from homeassistant.components.fan import (
@@ -19,8 +17,6 @@ from homeassistant.core import callback
 
 from . import KNOWN_DEVICES, HomeKitEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 # 0 is clockwise, 1 is counter-clockwise. The match to forward and reverse is so that
 # its consistent with homeassistant.components.homekit.
 DIRECTION_TO_HK = {
diff --git a/homeassistant/components/homekit_controller/light.py b/homeassistant/components/homekit_controller/light.py
index b024efe6121..3f9f6f3de29 100644
--- a/homeassistant/components/homekit_controller/light.py
+++ b/homeassistant/components/homekit_controller/light.py
@@ -1,6 +1,4 @@
 """Support for Homekit lights."""
-import logging
-
 from aiohomekit.model.characteristics import CharacteristicsTypes
 
 from homeassistant.components.light import (
@@ -16,8 +14,6 @@ from homeassistant.core import callback
 
 from . import KNOWN_DEVICES, HomeKitEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up Homekit lightbulb."""
diff --git a/homeassistant/components/homekit_controller/lock.py b/homeassistant/components/homekit_controller/lock.py
index 93bb4f1568f..52e9947d986 100644
--- a/homeassistant/components/homekit_controller/lock.py
+++ b/homeassistant/components/homekit_controller/lock.py
@@ -1,6 +1,4 @@
 """Support for HomeKit Controller locks."""
-import logging
-
 from aiohomekit.model.characteristics import CharacteristicsTypes
 
 from homeassistant.components.lock import LockEntity
@@ -9,8 +7,6 @@ from homeassistant.core import callback
 
 from . import KNOWN_DEVICES, HomeKitEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 STATE_JAMMED = "jammed"
 
 CURRENT_STATE_MAP = {0: STATE_UNLOCKED, 1: STATE_LOCKED, 2: STATE_JAMMED, 3: None}
diff --git a/homeassistant/components/homekit_controller/strings.json b/homeassistant/components/homekit_controller/strings.json
index 62fb51709bc..3c6b8405e31 100644
--- a/homeassistant/components/homekit_controller/strings.json
+++ b/homeassistant/components/homekit_controller/strings.json
@@ -45,27 +45,27 @@
       "invalid_config_entry": "This device is showing as ready to pair but there is already a conflicting configuration entry for it in Home Assistant that must first be removed.",
       "accessory_not_found_error": "Cannot add pairing as device can no longer be found.",
       "invalid_properties": "Invalid properties announced by device.",
-      "already_in_progress": "Config flow for device is already in progress."
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
     }
   },
   "device_automation": {
     "trigger_type": {
-        "single_press": "\"{subtype}\" pressed",
-        "double_press": "\"{subtype}\" pressed twice",
-        "long_press": "\"{subtype}\" pressed and held"
+      "single_press": "\"{subtype}\" pressed",
+      "double_press": "\"{subtype}\" pressed twice",
+      "long_press": "\"{subtype}\" pressed and held"
     },
     "trigger_subtype": {
-        "doorbell": "Doorbell",
-        "button1": "Button 1",
-        "button2": "Button 2",
-        "button3": "Button 3",
-        "button4": "Button 4",
-        "button5": "Button 5",
-        "button6": "Button 6",
-        "button7": "Button 7",
-        "button8": "Button 8",
-        "button9": "Button 9",
-        "button10": "Button 10"
+      "doorbell": "Doorbell",
+      "button1": "Button 1",
+      "button2": "Button 2",
+      "button3": "Button 3",
+      "button4": "Button 4",
+      "button5": "Button 5",
+      "button6": "Button 6",
+      "button7": "Button 7",
+      "button8": "Button 8",
+      "button9": "Button 9",
+      "button10": "Button 10"
     }
   }
 }
diff --git a/homeassistant/components/homekit_controller/switch.py b/homeassistant/components/homekit_controller/switch.py
index 32c7fd8515e..3408d036b58 100644
--- a/homeassistant/components/homekit_controller/switch.py
+++ b/homeassistant/components/homekit_controller/switch.py
@@ -1,6 +1,4 @@
 """Support for Homekit switches."""
-import logging
-
 from aiohomekit.model.characteristics import (
     CharacteristicsTypes,
     InUseValues,
@@ -14,8 +12,6 @@ from . import KNOWN_DEVICES, HomeKitEntity
 
 OUTLET_IN_USE = "outlet_in_use"
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_IN_USE = "in_use"
 ATTR_IS_CONFIGURED = "is_configured"
 ATTR_REMAINING_DURATION = "remaining_duration"
diff --git a/homeassistant/components/homekit_controller/translations/ca.json b/homeassistant/components/homekit_controller/translations/ca.json
index 0f05710a778..8b1dd8eca18 100644
--- a/homeassistant/components/homekit_controller/translations/ca.json
+++ b/homeassistant/components/homekit_controller/translations/ca.json
@@ -3,7 +3,7 @@
         "abort": {
             "accessory_not_found_error": "No s'ha pogut vincular, no s'ha trobat el dispositiu.",
             "already_configured": "Accessori ja configurat amb aquest controlador.",
-            "already_in_progress": "El flux de dades de configuraci\u00f3 pel dispositiu ja est\u00e0 en curs.",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
             "already_paired": "Aquest accessori ja est\u00e0 vinculat amb un altre dispositiu. Reinicia l'accessori i torna-ho a provar.",
             "ignored_model": "La disponibilitat de HomeKit per aquest model est\u00e0 bloquejada ja que, de moment, no hi ha una integraci\u00f3 nativa completa.",
             "invalid_config_entry": "Aquest dispositiu s'est\u00e0 mostrant com a llest per a ser vinculat per\u00f2 ja hi ha una entrada de configuraci\u00f3 conflictiva a Home Assistant que s'ha d'eliminar primer.",
diff --git a/homeassistant/components/homekit_controller/translations/cs.json b/homeassistant/components/homekit_controller/translations/cs.json
index e70ed3973d2..3b38689af5a 100644
--- a/homeassistant/components/homekit_controller/translations/cs.json
+++ b/homeassistant/components/homekit_controller/translations/cs.json
@@ -1,19 +1,76 @@
 {
     "config": {
         "abort": {
-            "accessory_not_found_error": "P\u00e1rov\u00e1n\u00ed nelze p\u0159idat, proto\u017ee za\u0159\u00edzen\u00ed ji\u017e nelze nal\u00e9zt."
+            "accessory_not_found_error": "P\u00e1rov\u00e1n\u00ed nelze p\u0159idat, proto\u017ee za\u0159\u00edzen\u00ed ji\u017e nelze nal\u00e9zt.",
+            "already_configured": "P\u0159\u00edslu\u0161enstv\u00ed je ji\u017e nastaveno s t\u00edmto ovlada\u010dem.",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "already_paired": "Toto p\u0159\u00edslu\u0161enstv\u00ed je ji\u017e sp\u00e1rov\u00e1no s jin\u00fdm za\u0159\u00edzen\u00edm. Resetujte p\u0159\u00edslu\u0161enstv\u00ed a zkuste to znovu.",
+            "ignored_model": "Podpora pro tento model je v HomeKit blokov\u00e1na, proto\u017ee je k dispozici nativn\u00ed integrace s v\u00edce funkcemi.",
+            "invalid_config_entry": "Toto za\u0159\u00edzen\u00ed vypad\u00e1, \u017ee je p\u0159ipraven\u00e9 ke sp\u00e1rov\u00e1n\u00ed, ale v Home Assistant ji\u017e existuje konfliktn\u00ed polo\u017eka konfigurace, kterou je t\u0159eba nejprve odebrat.",
+            "no_devices": "Nebyla nalezena \u017e\u00e1dn\u00e1 nesp\u00e1rov\u00e1 za\u0159\u00edzen\u00ed"
         },
         "error": {
-            "busy_error": "Za\u0159\u00edzen\u00ed odm\u00edtlo p\u0159idat p\u00e1rov\u00e1n\u00ed, proto\u017ee je ji\u017e sp\u00e1rov\u00e1no s jin\u00fdm \u0159adi\u010dem.",
+            "authentication_error": "Nespr\u00e1vn\u00fd HomeKit k\u00f3d. Zkontrolujte to a zkuste to znovu.",
+            "busy_error": "Za\u0159\u00edzen\u00ed odm\u00edtlo p\u0159idat p\u00e1rov\u00e1n\u00ed, proto\u017ee je ji\u017e sp\u00e1rov\u00e1no s jin\u00fdm ovlada\u010dem.",
             "max_peers_error": "Za\u0159\u00edzen\u00ed odm\u00edtlo p\u0159idat p\u00e1rov\u00e1n\u00ed, proto\u017ee nem\u00e1 voln\u00e9 \u00falo\u017ei\u0161t\u011b pro p\u00e1rov\u00e1n\u00ed.",
             "max_tries_error": "Za\u0159\u00edzen\u00ed odm\u00edtlo p\u0159idat p\u00e1rov\u00e1n\u00ed, proto\u017ee p\u0159ijalo v\u00edce ne\u017e 100 ne\u00fasp\u011b\u0161n\u00fdch pokus\u016f o ov\u011b\u0159en\u00ed.",
-            "pairing_failed": "P\u0159i pokusu o sp\u00e1rov\u00e1n\u00ed s t\u00edmto za\u0159\u00edzen\u00edm do\u0161lo k neo\u0161et\u0159en\u00e9 chyb\u011b. M\u016f\u017ee se jednat o do\u010dasn\u00e9 selh\u00e1n\u00ed nebo za\u0159\u00edzen\u00ed nen\u00ed aktu\u00e1ln\u011b podporov\u00e1no."
+            "pairing_failed": "P\u0159i pokusu o sp\u00e1rov\u00e1n\u00ed s t\u00edmto za\u0159\u00edzen\u00edm do\u0161lo k neo\u010dek\u00e1van\u00e9 chyb\u011b. M\u016f\u017ee se jednat o do\u010dasn\u00e9 selh\u00e1n\u00ed nebo va\u0161e za\u0159\u00edzen\u00ed nemus\u00ed b\u00fdt aktu\u00e1ln\u011b podporov\u00e1no.",
+            "protocol_error": "P\u0159i komunikaci s p\u0159\u00edslu\u0161enstv\u00edm do\u0161lo k chyb\u011b. Za\u0159\u00edzen\u00ed nemus\u00ed b\u00fdt v re\u017eimu p\u00e1rov\u00e1n\u00ed a m\u016f\u017ee vy\u017eadovat fyzick\u00e9 nebo virtu\u00e1ln\u00ed stisknut\u00ed tla\u010d\u00edtka.",
+            "unable_to_pair": "Nelze sp\u00e1rovat, zkuste to pros\u00edm znovu.",
+            "unknown_error": "Za\u0159\u00edzen\u00ed nahl\u00e1silo nezn\u00e1mou chybu. P\u00e1rov\u00e1n\u00ed se nezda\u0159ilo."
         },
+        "flow_title": "{name} prost\u0159ednictv\u00edm protokolu HomeKit p\u0159\u00edslu\u0161enstv\u00ed",
         "step": {
+            "busy_error": {
+                "description": "P\u0159eru\u0161te p\u00e1rov\u00e1n\u00ed na v\u0161ech ovlada\u010d\u00edch, nebo zkuste restartovat za\u0159\u00edzen\u00ed a pokra\u010dujte v p\u00e1rov\u00e1n\u00ed.",
+                "title": "Za\u0159\u00edzen\u00ed je ji\u017e sp\u00e1rov\u00e1no s jin\u00fdm ovlada\u010dem"
+            },
+            "max_tries_error": {
+                "description": "Za\u0159\u00edzen\u00ed p\u0159ijalo v\u00edce ne\u017e 100 ne\u00fasp\u011b\u0161n\u00fdch pokus\u016f o ov\u011b\u0159en\u00ed. Zkuste restartovat za\u0159\u00edzen\u00ed a pot\u00e9 pokra\u010dujte v p\u00e1rov\u00e1n\u00ed.",
+                "title": "Byl p\u0159ekro\u010den maxim\u00e1ln\u00ed po\u010det pokus\u016f o ov\u011b\u0159en\u00ed"
+            },
             "pair": {
-                "description": "Chcete-li pou\u017e\u00edt toto p\u0159\u00edslu\u0161enstv\u00ed, zadejte k\u00f3d p\u00e1rov\u00e1n\u00ed HomeKit (ve form\u00e1tu XXX-XX-XXX)",
-                "title": "P\u00e1rov\u00e1n\u00ed s dopl\u0148kem HomeKit"
+                "data": {
+                    "pairing_code": "P\u00e1rovac\u00ed k\u00f3d"
+                },
+                "description": "Ovlada\u010d HomeKit komunikuje s {name} p\u0159es m\u00edstn\u00ed s\u00ed\u0165 pomoc\u00ed zabezpe\u010den\u00e9ho \u0161ifrovan\u00e9ho p\u0159ipojen\u00ed bez samostatn\u00e9ho ovlada\u010de HomeKit nebo iCloud. Chcete-li pou\u017e\u00edvat toto p\u0159\u00edslu\u0161enstv\u00ed, zadejte sv\u016fj p\u00e1rovac\u00ed k\u00f3d HomeKit (ve form\u00e1tu XXX-XX-XXX). Tento k\u00f3d se obvykle nach\u00e1z\u00ed na samotn\u00e9m za\u0159\u00edzen\u00ed nebo v obalu.",
+                "title": "Sp\u00e1rujte prost\u0159ednictv\u00edm protokolu HomeKit p\u0159\u00edslu\u0161enstv\u00ed"
+            },
+            "protocol_error": {
+                "description": "Za\u0159\u00edzen\u00ed nemus\u00ed b\u00fdt v re\u017eimu p\u00e1rov\u00e1n\u00ed a m\u016f\u017ee vy\u017eadovat fyzick\u00e9 nebo virtu\u00e1ln\u00ed stisknut\u00ed tla\u010d\u00edtka. Ujist\u011bte se, \u017ee je za\u0159\u00edzen\u00ed v re\u017eimu p\u00e1rov\u00e1n\u00ed, nebo zkuste za\u0159\u00edzen\u00ed restartovat a pot\u00e9 pokra\u010dujte v p\u00e1rov\u00e1n\u00ed.",
+                "title": "P\u0159i komunikaci s p\u0159\u00edslu\u0161enstv\u00edm do\u0161lo k chyb\u011b"
+            },
+            "try_pair_later": {
+                "title": "P\u00e1rov\u00e1n\u00ed nen\u00ed k dispozici"
+            },
+            "user": {
+                "data": {
+                    "device": "Za\u0159\u00edzen\u00ed"
+                },
+                "description": "Ovlada\u010d HomeKit komunikuje p\u0159es m\u00edstn\u00ed s\u00ed\u0165 pomoc\u00ed zabezpe\u010den\u00e9ho \u0161ifrovan\u00e9ho p\u0159ipojen\u00ed bez samostatn\u00e9ho ovlada\u010de HomeKit nebo iCloud. Vyberte za\u0159\u00edzen\u00ed, kter\u00e9 chcete sp\u00e1rovat:",
+                "title": "V\u00fdb\u011br za\u0159\u00edzen\u00ed"
             }
         }
-    }
+    },
+    "device_automation": {
+        "trigger_subtype": {
+            "button1": "Tla\u010d\u00edtko 1",
+            "button10": "Tla\u010d\u00edtko 10",
+            "button2": "Tla\u010d\u00edtko 2",
+            "button3": "Tla\u010d\u00edtko 3",
+            "button4": "Tla\u010d\u00edtko 4",
+            "button5": "Tla\u010d\u00edtko 5",
+            "button6": "Tla\u010d\u00edtko 6",
+            "button7": "Tla\u010d\u00edtko 7",
+            "button8": "Tla\u010d\u00edtko 8",
+            "button9": "Tla\u010d\u00edtko 9",
+            "doorbell": "Zvonek"
+        },
+        "trigger_type": {
+            "double_press": "Dvakr\u00e1t stisknuto \"{subtype}\"",
+            "long_press": "Stisknuto a podr\u017eeno \"{subtype}\"",
+            "single_press": "Stisknuto \"{subtype}\""
+        }
+    },
+    "title": "HomeKit ovlada\u010d"
 }
\ No newline at end of file
diff --git a/homeassistant/components/homekit_controller/translations/el.json b/homeassistant/components/homekit_controller/translations/el.json
index 55f468c0fe8..41ab3bf6704 100644
--- a/homeassistant/components/homekit_controller/translations/el.json
+++ b/homeassistant/components/homekit_controller/translations/el.json
@@ -1,4 +1,17 @@
 {
+    "config": {
+        "abort": {
+            "invalid_properties": "\u0391\u03bd\u03b1\u03ba\u03bf\u03b9\u03bd\u03ce\u03b8\u03b7\u03ba\u03b1\u03bd \u03bc\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b5\u03c2 \u03b9\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b1\u03c0\u03cc \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae."
+        },
+        "step": {
+            "busy_error": {
+                "description": "\u039c\u03b1\u03c4\u03b1\u03b9\u03ce\u03c3\u03c4\u03b5 \u03c4\u03b7 \u03b6\u03b5\u03cd\u03be\u03b7 \u03c3\u03b5 \u03cc\u03bb\u03bf\u03c5\u03c2 \u03c4\u03bf\u03c5\u03c2 \u03b5\u03bb\u03b5\u03b3\u03ba\u03c4\u03ad\u03c2 \u03ae \u03b4\u03bf\u03ba\u03b9\u03bc\u03ac\u03c3\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b1\u03bd\u03b5\u03ba\u03ba\u03b9\u03bd\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03ba\u03b1\u03b9, \u03c3\u03c4\u03b7 \u03c3\u03c5\u03bd\u03ad\u03c7\u03b5\u03b9\u03b1, \u03c3\u03c5\u03bd\u03b5\u03c7\u03af\u03c3\u03c4\u03b5 \u03c4\u03b7 \u03c3\u03cd\u03b6\u03b5\u03c5\u03be\u03b7."
+            },
+            "max_tries_error": {
+                "description": "\u0397 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03ad\u03c7\u03b5\u03b9 \u03bb\u03ac\u03b2\u03b5\u03b9 \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b5\u03c2 \u03b1\u03c0\u03cc 100 \u03b1\u03c0\u03bf\u03c4\u03c5\u03c7\u03b7\u03bc\u03ad\u03bd\u03b5\u03c2 \u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b5\u03b9\u03b5\u03c2 \u03b5\u03bb\u03ad\u03b3\u03c7\u03bf\u03c5 \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2. \u0394\u03bf\u03ba\u03b9\u03bc\u03ac\u03c3\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b1\u03bd\u03b5\u03ba\u03ba\u03b9\u03bd\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03ba\u03b1\u03b9, \u03c3\u03c4\u03b7 \u03c3\u03c5\u03bd\u03ad\u03c7\u03b5\u03b9\u03b1, \u03c3\u03c5\u03bd\u03b5\u03c7\u03af\u03c3\u03c4\u03b5 \u03c4\u03b7 \u03c3\u03cd\u03b6\u03b5\u03c5\u03be\u03b7."
+            }
+        }
+    },
     "device_automation": {
         "trigger_subtype": {
             "button1": "\u039a\u03bf\u03c5\u03bc\u03c0\u03af 1",
@@ -10,9 +23,12 @@
             "button6": "\u039a\u03bf\u03c5\u03bc\u03c0\u03af 6",
             "button7": "\u039a\u03bf\u03c5\u03bc\u03c0\u03af 7",
             "button8": "\u039a\u03bf\u03c5\u03bc\u03c0\u03af 8",
-            "button9": "\u039a\u03bf\u03c5\u03bc\u03c0\u03af 9"
+            "button9": "\u039a\u03bf\u03c5\u03bc\u03c0\u03af 9",
+            "doorbell": "\u039a\u03bf\u03c5\u03b4\u03bf\u03cd\u03bd\u03b9"
         },
         "trigger_type": {
+            "double_press": "\u03a0\u03b9\u03ad\u03c3\u03c4\u03b7\u03ba\u03b5 \u03b4\u03cd\u03bf \u03c6\u03bf\u03c1\u03ad\u03c2 \u03c4\u03bf \" {subtype} \"",
+            "long_press": "\u03a0\u03b1\u03c4\u03ae\u03b8\u03b7\u03ba\u03b5 \u03ba\u03b1\u03b9 \u03ba\u03c1\u03b1\u03c4\u03ae\u03b8\u03b7\u03ba\u03b5 \u03c4\u03bf \" {subtype} \"",
             "single_press": "\u03a0\u03b1\u03c4\u03ae\u03b8\u03b7\u03ba\u03b5 \u03c4\u03bf \" {subtype} \""
         }
     }
diff --git a/homeassistant/components/homekit_controller/translations/en.json b/homeassistant/components/homekit_controller/translations/en.json
index ac4b3a13251..3d7e237c733 100644
--- a/homeassistant/components/homekit_controller/translations/en.json
+++ b/homeassistant/components/homekit_controller/translations/en.json
@@ -3,7 +3,7 @@
         "abort": {
             "accessory_not_found_error": "Cannot add pairing as device can no longer be found.",
             "already_configured": "Accessory is already configured with this controller.",
-            "already_in_progress": "Config flow for device is already in progress.",
+            "already_in_progress": "Configuration flow is already in progress",
             "already_paired": "This accessory is already paired to another device. Please reset the accessory and try again.",
             "ignored_model": "HomeKit support for this model is blocked as a more feature complete native integration is available.",
             "invalid_config_entry": "This device is showing as ready to pair but there is already a conflicting configuration entry for it in Home Assistant that must first be removed.",
diff --git a/homeassistant/components/homekit_controller/translations/es.json b/homeassistant/components/homekit_controller/translations/es.json
index b1daa4e50cc..a1e61245ace 100644
--- a/homeassistant/components/homekit_controller/translations/es.json
+++ b/homeassistant/components/homekit_controller/translations/es.json
@@ -34,8 +34,8 @@
                 "data": {
                     "pairing_code": "C\u00f3digo de vinculaci\u00f3n"
                 },
-                "description": "Introduce tu c\u00f3digo de vinculaci\u00f3n de HomeKit (en este formato XXX-XX-XXX) para usar este accesorio",
-                "title": "Vincular con accesorio HomeKit"
+                "description": "El controlador de HomeKit se comunica con {name} a trav\u00e9s de la red de \u00e1rea local usando una conexi\u00f3n encriptada segura sin un controlador HomeKit separado o iCloud. Introduce el c\u00f3digo de vinculaci\u00f3n de tu HomeKit (con el formato XXX-XX-XXX) para usar este accesorio. Este c\u00f3digo suele encontrarse en el propio dispositivo o en el embalaje.",
+                "title": "Vincular un dispositivo a trav\u00e9s del protocolo de accesorios HomeKit"
             },
             "protocol_error": {
                 "description": "Es posible que el dispositivo no est\u00e9 en modo de emparejamiento y que requiera que se presione un bot\u00f3n f\u00edsico o virtual. Aseg\u00farate de que el dispositivo est\u00e1 en modo de emparejamiento o intenta reiniciar el dispositivo, luego contin\u00faa para reanudar el emparejamiento.",
@@ -49,8 +49,8 @@
                 "data": {
                     "device": "Dispositivo"
                 },
-                "description": "Selecciona el dispositivo que quieres vincular",
-                "title": "Vincular con accesorio HomeKit"
+                "description": "El controlador de HomeKit se comunica a trav\u00e9s de la red de \u00e1rea local usando una conexi\u00f3n encriptada segura sin un controlador HomeKit separado o iCloud. Selecciona el dispositivo que quieres vincular:",
+                "title": "Selecci\u00f3n del dispositivo"
             }
         }
     },
diff --git a/homeassistant/components/homekit_controller/translations/et.json b/homeassistant/components/homekit_controller/translations/et.json
index 31788215005..51977a7fcfd 100644
--- a/homeassistant/components/homekit_controller/translations/et.json
+++ b/homeassistant/components/homekit_controller/translations/et.json
@@ -1,4 +1,12 @@
 {
+    "config": {
+        "abort": {
+            "already_configured": "Lisaseade on selle kontrolleriga juba seadistatud.",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "already_paired": "See lisaseade on juba teise seadmega seotud. L\u00e4htesta lisaseade ja proovi uuesti.",
+            "invalid_properties": "Seade tagastas vigase oleku."
+        }
+    },
     "device_automation": {
         "trigger_subtype": {
             "button1": "Nupp 1",
diff --git a/homeassistant/components/homekit_controller/translations/it.json b/homeassistant/components/homekit_controller/translations/it.json
index 1867d51d7df..e3f0a5c820e 100644
--- a/homeassistant/components/homekit_controller/translations/it.json
+++ b/homeassistant/components/homekit_controller/translations/it.json
@@ -3,7 +3,7 @@
         "abort": {
             "accessory_not_found_error": "Impossibile aggiungere l'abbinamento in quanto non \u00e8 pi\u00f9 possibile trovare il dispositivo.",
             "already_configured": "L'accessorio \u00e8 gi\u00e0 configurato con questo controller.",
-            "already_in_progress": "Il flusso di configurazione per il dispositivo \u00e8 gi\u00e0 in corso.",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
             "already_paired": "Questo accessorio \u00e8 gi\u00e0 associato a un altro dispositivo. Si prega di resettare l'accessorio e riprovare.",
             "ignored_model": "Il supporto di HomeKit per questo modello \u00e8 bloccato poich\u00e9 \u00e8 disponibile un'integrazione nativa con pi\u00f9 funzionalit\u00e0.",
             "invalid_config_entry": "Questo dispositivo viene visualizzato come pronto per l'associazione, ma c'\u00e8 gi\u00e0 una voce di configurazione in conflitto in Home Assistant che prima deve essere rimossa.",
diff --git a/homeassistant/components/homekit_controller/translations/lb.json b/homeassistant/components/homekit_controller/translations/lb.json
index 7aef753e0dd..7625d0c561e 100644
--- a/homeassistant/components/homekit_controller/translations/lb.json
+++ b/homeassistant/components/homekit_controller/translations/lb.json
@@ -7,6 +7,7 @@
             "already_paired": "D\u00ebsen Accessoire ass schonn mat engem aneren Apparat verbonnen. S\u00ebtzt den Apparat op Wierksastellungen zer\u00e9ck an prob\u00e9iert nach emol w.e.g.",
             "ignored_model": "HomeKit Support fir d\u00ebse Modell ass block\u00e9iert well eng m\u00e9i komplett nativ Integratioun disponibel ass.",
             "invalid_config_entry": "D\u00ebsen Apparat mellt sech prett fir ze verbanne mee et g\u00ebtt schonn eng Entr\u00e9e am Home Assistant d\u00e9i ee Konflikt duerstellt welch fir d'\u00e9ischt muss erausgeholl ginn.",
+            "invalid_properties": "Ong\u00eblteg Eegeschafte vum Apparat annonc\u00e9iert",
             "no_devices": "Keng net verbonnen Apparater fonnt"
         },
         "error": {
diff --git a/homeassistant/components/homekit_controller/translations/no.json b/homeassistant/components/homekit_controller/translations/no.json
index 86e247a1572..ac09303a349 100644
--- a/homeassistant/components/homekit_controller/translations/no.json
+++ b/homeassistant/components/homekit_controller/translations/no.json
@@ -3,7 +3,7 @@
         "abort": {
             "accessory_not_found_error": "Kan ikke legge til sammenkobling da enheten ikke lenger kan bli funnet.",
             "already_configured": "Tilbeh\u00f8r er allerede konfigurert med denne kontrolleren.",
-            "already_in_progress": "Konfigurasjonsflyt for enhet p\u00e5g\u00e5r allerede.",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
             "already_paired": "Dette tilbeh\u00f8ret er allerede sammenkoblet med en annen enhet. Vennligst tilbakestill tilbeh\u00f8ret og pr\u00f8v igjen.",
             "ignored_model": "HomeKit st\u00f8tte for denne modellen er blokkert da en mer funksjonsrik standard integrasjon er tilgjengelig.",
             "invalid_config_entry": "Denne enheten vises som klar til sammenkobling, men det er allerede en motstridende konfigurasjonsoppf\u00f8ring for den i Hjelpeassistenten som f\u00f8rst m\u00e5 fjernes.",
@@ -20,7 +20,7 @@
             "unable_to_pair": "Kunne ikke koble til, vennligst pr\u00f8v igjen.",
             "unknown_error": "Enheten rapporterte en ukjent feil. Sammenkobling mislyktes."
         },
-        "flow_title": "{name} via HomeKit Accessory Protocol",
+        "flow_title": "{name} via HomeKit tilbeh\u00f8rsprotokoll",
         "step": {
             "busy_error": {
                 "description": "Avbryt sammenkobling p\u00e5 alle kontrollere, eller pr\u00f8v \u00e5 starte enheten p\u00e5 nytt, og fortsett deretter med \u00e5 fortsette sammenkoblingen.",
@@ -66,12 +66,12 @@
             "button7": "Knapp 7",
             "button8": "Knapp 8",
             "button9": "Knapp 9",
-            "doorbell": "D\u00f8r-klokke"
+            "doorbell": "D\u00f8rklokke"
         },
         "trigger_type": {
-            "double_press": "{subtype} trykket to ganger",
-            "long_press": "{subtype} trykket og holdt",
-            "single_press": "{subtype}\u00bb trykket"
+            "double_press": "\"{subtype}\" trykket to ganger",
+            "long_press": "\"{subtype}\" trykket og holdt",
+            "single_press": "\"{subtype}\" trykket"
         }
     },
     "title": "HomeKit-kontroller"
diff --git a/homeassistant/components/homekit_controller/translations/pl.json b/homeassistant/components/homekit_controller/translations/pl.json
index b8dc1b190ec..359b3b4b02c 100644
--- a/homeassistant/components/homekit_controller/translations/pl.json
+++ b/homeassistant/components/homekit_controller/translations/pl.json
@@ -1,41 +1,56 @@
 {
     "config": {
         "abort": {
-            "accessory_not_found_error": "Nie mo\u017cna rozpocz\u0105\u0107 parowania, poniewa\u017c nie znaleziono urz\u0105dzenia.",
-            "already_configured": "Akcesorium jest ju\u017c skonfigurowane z tym kontrolerem.",
-            "already_in_progress": "Konfiguracja urz\u0105dzenia jest ju\u017c w toku.",
+            "accessory_not_found_error": "Nie mo\u017cna rozpocz\u0105\u0107 parowania, poniewa\u017c nie znaleziono urz\u0105dzenia",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
             "already_paired": "To akcesorium jest ju\u017c sparowane z innym urz\u0105dzeniem. Zresetuj akcesorium i spr\u00f3buj ponownie.",
-            "ignored_model": "Obs\u0142uga HomeKit dla tego modelu jest zablokowana, poniewa\u017c dost\u0119pna jest pe\u0142niejsza integracja natywna.",
+            "ignored_model": "Obs\u0142uga HomeKit dla tego modelu jest zablokowana, poniewa\u017c dost\u0119pna jest pe\u0142niejsza integracja natywna",
             "invalid_config_entry": "To urz\u0105dzenie jest wy\u015bwietlane jako gotowe do sparowania, ale istnieje ju\u017c konfliktowy wpis konfiguracyjny dla niego w Home Assistant, kt\u00f3ry musi zosta\u0107 najpierw usuni\u0119ty.",
-            "no_devices": "Nie znaleziono niesparowanych urz\u0105dze\u0144."
+            "invalid_properties": "Urz\u0105dzenie zg\u0142osi\u0142o nieprawid\u0142owe w\u0142a\u015bciwo\u015bci",
+            "no_devices": "Nie znaleziono niesparowanych urz\u0105dze\u0144"
         },
         "error": {
             "authentication_error": "Niepoprawny kod parowania HomeKit. Sprawd\u017a go i spr\u00f3buj ponownie.",
-            "busy_error": "Urz\u0105dzenie odm\u00f3wi\u0142o parowania, poniewa\u017c jest ju\u017c powi\u0105zane z innym kontrolerem.",
-            "max_peers_error": "Urz\u0105dzenie odm\u00f3wi\u0142o parowania, poniewa\u017c nie ma wolnej pami\u0119ci parowania.",
-            "max_tries_error": "Urz\u0105dzenie odm\u00f3wi\u0142o dodania parowania, poniewa\u017c otrzyma\u0142o ponad 100 nieudanych pr\u00f3b uwierzytelnienia.",
+            "busy_error": "Urz\u0105dzenie odm\u00f3wi\u0142o parowania, poniewa\u017c jest ju\u017c powi\u0105zane z innym kontrolerem",
+            "max_peers_error": "Urz\u0105dzenie odm\u00f3wi\u0142o parowania, poniewa\u017c nie ma wolnej pami\u0119ci parowania",
+            "max_tries_error": "Urz\u0105dzenie odm\u00f3wi\u0142o dodania parowania, poniewa\u017c otrzyma\u0142o ponad 100 nieudanych pr\u00f3b uwierzytelnienia",
             "pairing_failed": "Wyst\u0105pi\u0142 nieobs\u0142ugiwany b\u0142\u0105d podczas pr\u00f3by sparowania z tym urz\u0105dzeniem. Mo\u017ce to by\u0107 tymczasowa awaria lub urz\u0105dzenie mo\u017ce nie by\u0107 obecnie obs\u0142ugiwane.",
-            "unable_to_pair": "Nie mo\u017cna sparowa\u0107, spr\u00f3buj ponownie.",
+            "protocol_error": "B\u0142\u0105d w komunikacji z urz\u0105dzeniem. Urz\u0105dzenie mo\u017ce nie by\u0107 w trybie parowania i mo\u017ce wymaga\u0107 fizycznego lub wirtualnego naci\u015bni\u0119cia przycisku.",
+            "unable_to_pair": "Nie mo\u017cna sparowa\u0107, spr\u00f3buj ponownie",
             "unknown_error": "Urz\u0105dzenie zg\u0142osi\u0142o nieznany b\u0142\u0105d. Parowanie nie powiod\u0142o si\u0119."
         },
-        "flow_title": "Akcesoria HomeKit: {name}",
+        "flow_title": "{name} poprzez akcesorium HomeKit",
         "step": {
+            "busy_error": {
+                "description": "Przerwij parowanie we wszystkich kontrolerach lub spr\u00f3buj ponownie uruchomi\u0107 urz\u0105dzenie, a nast\u0119pnie wzn\u00f3w parowanie",
+                "title": "Urz\u0105dzenie jest ju\u017c sparowane z innym kontrolerem"
+            },
+            "max_tries_error": {
+                "description": "Urz\u0105dzenie otrzyma\u0142o ponad 100 nieudanych pr\u00f3b uwierzytelnienia. Spr\u00f3buj ponownie uruchomi\u0107 urz\u0105dzenie, a nast\u0119pnie wzn\u00f3w parowanie.",
+                "title": "Przekroczono maksymaln\u0105 liczb\u0119 pr\u00f3b uwierzytelnienia"
+            },
             "pair": {
                 "data": {
                     "pairing_code": "Kod parowania"
                 },
-                "description": "Wprowad\u017a kod parowania HomeKit, aby u\u017cy\u0107 tego akcesorium",
-                "title": "Sparuj z akcesorium HomeKit"
+                "description": "Kontroler HomeKit komunikuje si\u0119 z {name} poprzez sie\u0107 lokaln\u0105 za pomoc\u0105 bezpiecznego, szyfrowanego po\u0142\u0105czenia bez oddzielnego kontrolera HomeKit lub iCloud. Wprowad\u017a kod parowania (w formacie XXX-XX-XXX), aby u\u017cy\u0107 tego akcesorium. Ten kod zazwyczaj znajduje si\u0119 na samym urz\u0105dzeniu lub w jego opakowaniu.",
+                "title": "Sparuj z urz\u0105dzeniem poprzez akcesorium HomeKit"
             },
             "protocol_error": {
-                "description": "Urz\u0105dzenie mo\u017ce nie by\u0107 w trybie parowania i wymaga\u0107 "
+                "description": "Urz\u0105dzenie mo\u017ce nie by\u0107 w trybie parowania i mo\u017ce wymaga\u0107 fizycznego lub wirtualnego naci\u015bni\u0119cia przycisku. Upewnij si\u0119, \u017ce urz\u0105dzenie jest w trybie parowania lub spr\u00f3buj je ponownie uruchomi\u0107, a nast\u0119pnie wzn\u00f3w parowanie.",
+                "title": "B\u0142\u0105d komunikacji z akcesorium"
+            },
+            "try_pair_later": {
+                "description": "Upewnij si\u0119, \u017ce urz\u0105dzenie jest w trybie parowania lub spr\u00f3buj ponownie uruchomi\u0107 urz\u0105dzenie, a nast\u0119pnie spr\u00f3buj ponownego parowania.",
+                "title": "Parowanie niedost\u0119pne"
             },
             "user": {
                 "data": {
                     "device": "Urz\u0105dzenie"
                 },
-                "description": "Wybierz urz\u0105dzenie, kt\u00f3re chcesz sparowa\u0107",
-                "title": "Sparuj z akcesorium HomeKit"
+                "description": "Kontroler HomeKit komunikuje si\u0119 poprzez sie\u0107 lokaln\u0105 za pomoc\u0105 bezpiecznego, szyfrowanego po\u0142\u0105czenia bez oddzielnego kontrolera HomeKit lub iCloud. Wybierz urz\u0105dzenie, kt\u00f3re chcesz sparowa\u0107:",
+                "title": "Wyb\u00f3r urz\u0105dzenia"
             }
         }
     },
@@ -52,7 +67,12 @@
             "button8": "Przycisk 8",
             "button9": "Przycisk 9",
             "doorbell": "Dzwonek do drzwi"
+        },
+        "trigger_type": {
+            "double_press": "\"{subtype}\" naci\u015bni\u0119ty dwukrotnie",
+            "long_press": "\"{subtype}\" naci\u015bni\u0119ty i przytrzymany",
+            "single_press": "\"{subtype}\" naci\u015bni\u0119ty"
         }
     },
-    "title": "Akcesorium HomeKit"
+    "title": "Kontroler HomeKit"
 }
\ No newline at end of file
diff --git a/homeassistant/components/homekit_controller/translations/ru.json b/homeassistant/components/homekit_controller/translations/ru.json
index 2c631b99c6b..791dfc36cb4 100644
--- a/homeassistant/components/homekit_controller/translations/ru.json
+++ b/homeassistant/components/homekit_controller/translations/ru.json
@@ -3,7 +3,7 @@
         "abort": {
             "accessory_not_found_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0441\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u0435, \u0442\u0430\u043a \u043a\u0430\u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0431\u043e\u043b\u044c\u0448\u0435 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043d\u0430\u0439\u0434\u0435\u043d\u043e.",
             "already_configured": "\u0410\u043a\u0441\u0435\u0441\u0441\u0443\u0430\u0440 \u0443\u0436\u0435 \u0441\u0432\u044f\u0437\u0430\u043d \u0441 \u044d\u0442\u0438\u043c \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440\u043e\u043c.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
             "already_paired": "\u042d\u0442\u043e\u0442 \u0430\u043a\u0441\u0435\u0441\u0441\u0443\u0430\u0440 \u0443\u0436\u0435 \u0441\u0432\u044f\u0437\u0430\u043d \u0441 \u0434\u0440\u0443\u0433\u0438\u043c \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u0441\u0431\u0440\u043e\u0441 \u0430\u043a\u0441\u0435\u0441\u0441\u0443\u0430\u0440\u0430 \u0438 \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430.",
             "ignored_model": "\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 HomeKit \u0434\u043b\u044f \u044d\u0442\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438 \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0430, \u0442\u0430\u043a \u043a\u0430\u043a \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430 \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u043b\u043d\u0430\u044f \u043d\u0430\u0442\u0438\u0432\u043d\u0430\u044f \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f.",
             "invalid_config_entry": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\u044f \u043a\u0430\u043a \u0433\u043e\u0442\u043e\u0432\u043e\u0435 \u043a \u0441\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u044e, \u043d\u043e \u0432 Home Assistant \u0443\u0436\u0435 \u0435\u0441\u0442\u044c \u043a\u043e\u043d\u0444\u043b\u0438\u043a\u0442\u0443\u044e\u0449\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0434\u043b\u044f \u043d\u0435\u0433\u043e, \u043a\u043e\u0442\u043e\u0440\u0443\u044e \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c.",
diff --git a/homeassistant/components/homekit_controller/translations/zh-Hans.json b/homeassistant/components/homekit_controller/translations/zh-Hans.json
index 3cf753b41f5..ee7df324f44 100644
--- a/homeassistant/components/homekit_controller/translations/zh-Hans.json
+++ b/homeassistant/components/homekit_controller/translations/zh-Hans.json
@@ -7,6 +7,7 @@
             "already_paired": "\u6b64\u914d\u4ef6\u5df2\u4e0e\u53e6\u4e00\u53f0\u8bbe\u5907\u914d\u5bf9\u3002\u8bf7\u91cd\u7f6e\u914d\u4ef6\uff0c\u7136\u540e\u91cd\u8bd5\u3002",
             "ignored_model": "HomeKit \u5bf9\u6b64\u8bbe\u5907\u7684\u652f\u6301\u5df2\u88ab\u963b\u6b62\uff0c\u56e0\u4e3a\u6709\u529f\u80fd\u66f4\u5b8c\u6574\u7684\u539f\u751f\u96c6\u6210\u53ef\u4ee5\u4f7f\u7528\u3002",
             "invalid_config_entry": "\u6b64\u8bbe\u5907\u5df2\u51c6\u5907\u597d\u914d\u5bf9\uff0c\u4f46\u662f Home Assistant \u4e2d\u5b58\u5728\u4e0e\u4e4b\u51b2\u7a81\u7684\u914d\u7f6e\uff0c\u5fc5\u987b\u5148\u5c06\u5176\u5220\u9664\u3002",
+            "invalid_properties": "\u8bbe\u5907\u901a\u544a\u7684\u5c5e\u6027\u65e0\u6548\u3002",
             "no_devices": "\u6ca1\u6709\u627e\u5230\u672a\u914d\u5bf9\u7684\u8bbe\u5907"
         },
         "error": {
@@ -15,6 +16,7 @@
             "max_peers_error": "\u8bbe\u5907\u62d2\u7edd\u914d\u5bf9\uff0c\u56e0\u4e3a\u5b83\u6ca1\u6709\u7a7a\u95f2\u7684\u914d\u5bf9\u5b58\u50a8\u7a7a\u95f4\u3002",
             "max_tries_error": "\u8bbe\u5907\u62d2\u7edd\u914d\u5bf9\uff0c\u56e0\u4e3a\u5b83\u5df2\u6536\u5230\u8d85\u8fc7 100 \u6b21\u5931\u8d25\u7684\u8eab\u4efd\u8ba4\u8bc1\u3002",
             "pairing_failed": "\u5c1d\u8bd5\u4e0e\u6b64\u8bbe\u5907\u914d\u5bf9\u65f6\u53d1\u751f\u672a\u5904\u7406\u7684\u9519\u8bef\u3002\u8fd9\u53ef\u80fd\u662f\u6682\u65f6\u6027\u6545\u969c\uff0c\u4e5f\u53ef\u80fd\u662f\u60a8\u7684\u8bbe\u5907\u76ee\u524d\u4e0d\u88ab\u652f\u6301\u3002",
+            "protocol_error": "\u4e0e\u914d\u4ef6\u901a\u8baf\u65f6\u51fa\u9519\u3002\u8bbe\u5907\u53ef\u80fd\u672a\u5904\u4e8e\u914d\u5bf9\u6a21\u5f0f\uff0c\u53ef\u80fd\u9700\u8981\u6309\u4e0b\u7269\u7406\u6216\u865a\u62df\u6309\u94ae\u3002",
             "unable_to_pair": "\u65e0\u6cd5\u914d\u5bf9\uff0c\u8bf7\u518d\u8bd5\u4e00\u6b21\u3002",
             "unknown_error": "\u8bbe\u5907\u62a5\u544a\u4e86\u672a\u77e5\u9519\u8bef\u3002\u914d\u5bf9\u5931\u8d25\u3002"
         },
@@ -22,10 +24,10 @@
         "step": {
             "busy_error": {
                 "description": "\u4e2d\u6b62\u6240\u6709\u63a7\u5236\u5668\u4e0a\u7684\u914d\u5bf9\uff0c\u6216\u5c1d\u8bd5\u5148\u91cd\u542f\u8bbe\u5907\uff0c\u7136\u540e\u7ee7\u7eed\u914d\u5bf9\u3002",
-                "title": "\u6b64\u914d\u4ef6\u5df2\u4e0e\u53e6\u4e00\u53f0\u8bbe\u5907\u914d\u5bf9\u3002\u8bf7\u91cd\u7f6e\u914d\u4ef6\uff0c\u7136\u540e\u91cd\u8bd5\u3002"
+                "title": "\u8bbe\u5907\u5df2\u4e0e\u53e6\u4e00\u4e2a\u63a7\u5236\u5668\u914d\u5bf9"
             },
             "max_tries_error": {
-                "description": "\u8bbe\u5907\u5df2\u6536\u5230100\u591a\u6b21\u5931\u8d25\u7684\u8eab\u4efd\u9a8c\u8bc1\u5c1d\u8bd5\u3002\u5c1d\u8bd5\u91cd\u65b0\u542f\u52a8\u8bbe\u5907\uff0c\u7136\u540e\u7ee7\u7eed\u6062\u590d\u914d\u5bf9\u3002",
+                "description": "\u8bbe\u5907\u5df2\u6536\u5230\u591a\u4e8e 100 \u6b21\u5931\u8d25\u7684\u8eab\u4efd\u9a8c\u8bc1\u5c1d\u8bd5\u3002\u8bf7\u5c1d\u8bd5\u91cd\u65b0\u542f\u52a8\u8bbe\u5907\uff0c\u7136\u540e\u7ee7\u7eed\u914d\u5bf9\u3002",
                 "title": "\u8d85\u8fc7\u6700\u5927\u8eab\u4efd\u9a8c\u8bc1\u5c1d\u8bd5\u6b21\u6570"
             },
             "pair": {
@@ -36,8 +38,12 @@
                 "title": "\u4e0e HomeKit \u914d\u4ef6\u914d\u5bf9"
             },
             "protocol_error": {
-                "description": "\u8bbe\u5907\u53ef\u80fd\u672a\u5904\u4e8e\u914d\u5bf9\u6a21\u5f0f\uff0c\u53ef\u80fd\u9700\u8981\u6309\u4e0b\u7269\u7406\u6216\u865a\u62df\u6309\u94ae\u3002\u786e\u4fdd\u8bbe\u5907\u5904\u4e8e\u914d\u5bf9\u6a21\u5f0f\uff0c\u6216\u5c1d\u8bd5\u91cd\u65b0\u542f\u52a8\u8bbe\u5907\uff0c\u7136\u540e\u7ee7\u7eed\u6062\u590d\u914d\u5bf9\u3002",
-                "title": "\u4e0e HomeKit \u914d\u4ef6\u914d\u5bf9\u5931\u8d25"
+                "description": "\u8bbe\u5907\u53ef\u80fd\u672a\u5904\u4e8e\u914d\u5bf9\u6a21\u5f0f\uff0c\u53ef\u80fd\u9700\u8981\u6309\u4e0b\u7269\u7406\u6216\u865a\u62df\u6309\u94ae\u3002\u8bf7\u786e\u4fdd\u8bbe\u5907\u5904\u4e8e\u914d\u5bf9\u6a21\u5f0f\uff0c\u6216\u5c1d\u8bd5\u91cd\u65b0\u542f\u52a8\u8bbe\u5907\uff0c\u7136\u540e\u7ee7\u7eed\u914d\u5bf9\u3002",
+                "title": "\u4e0e\u914d\u4ef6\u901a\u4fe1\u65f6\u51fa\u9519"
+            },
+            "try_pair_later": {
+                "description": "\u8bf7\u786e\u4fdd\u8bbe\u5907\u5904\u4e8e\u914d\u5bf9\u6a21\u5f0f\uff0c\u6216\u5c1d\u8bd5\u91cd\u65b0\u542f\u52a8\u8bbe\u5907\uff0c\u7136\u540e\u91cd\u65b0\u542f\u52a8\u914d\u5bf9\u3002",
+                "title": "\u65e0\u6cd5\u914d\u5bf9"
             },
             "user": {
                 "data": {
@@ -48,5 +54,25 @@
             }
         }
     },
+    "device_automation": {
+        "trigger_subtype": {
+            "button1": "\u6309\u94ae 1",
+            "button10": "\u6309\u94ae 10",
+            "button2": "\u6309\u94ae 2",
+            "button3": "\u6309\u94ae 3",
+            "button4": "\u6309\u94ae 4",
+            "button5": "\u6309\u94ae 5",
+            "button6": "\u6309\u94ae 6",
+            "button7": "\u6309\u94ae 7",
+            "button8": "\u6309\u94ae 8",
+            "button9": "\u6309\u94ae 9",
+            "doorbell": "\u95e8\u94c3"
+        },
+        "trigger_type": {
+            "double_press": "\"{subtype}\" \u53cc\u51fb",
+            "long_press": "\"{subtype}\" \u957f\u6309",
+            "single_press": "\"{subtype}\" \u6309\u4e0b"
+        }
+    },
     "title": "HomeKit \u63a7\u5236\u5668"
 }
\ No newline at end of file
diff --git a/homeassistant/components/homekit_controller/translations/zh-Hant.json b/homeassistant/components/homekit_controller/translations/zh-Hant.json
index 69c14bc8b00..ded672bd838 100644
--- a/homeassistant/components/homekit_controller/translations/zh-Hant.json
+++ b/homeassistant/components/homekit_controller/translations/zh-Hant.json
@@ -3,7 +3,7 @@
         "abort": {
             "accessory_not_found_error": "\u627e\u4e0d\u5230\u8a2d\u5099\uff0c\u7121\u6cd5\u65b0\u589e\u914d\u5c0d\u3002",
             "already_configured": "\u914d\u4ef6\u5df2\u7d93\u7531\u6b64\u63a7\u5236\u5668\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "\u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
             "already_paired": "\u914d\u4ef6\u5df2\u7d93\u8207\u5176\u4ed6\u8a2d\u5099\u914d\u5c0d\uff0c\u8acb\u91cd\u7f6e\u914d\u4ef6\u5f8c\u518d\u8a66\u4e00\u6b21\u3002",
             "ignored_model": "\u7531\u65bc\u6b64\u578b\u865f\u53ef\u539f\u751f\u652f\u63f4\u66f4\u5b8c\u6574\u529f\u80fd\uff0c\u56e0\u6b64 Homekit \u652f\u63f4\u5df2\u88ab\u7981\u6b62\u3002",
             "invalid_config_entry": "\u6b64\u8a2d\u5099\u986f\u793a\u7b49\u5f85\u9032\u884c\u914d\u5c0d\uff0c\u4f46 Home Assistant \u986f\u793a\u6709\u76f8\u885d\u7a81\u8a2d\u5b9a\u5be6\u9ad4\u5fc5\u9808\u5148\u884c\u79fb\u9664\u3002",
diff --git a/homeassistant/components/homematic/__init__.py b/homeassistant/components/homematic/__init__.py
index 97f3bf05205..2dd8349dcfc 100644
--- a/homeassistant/components/homematic/__init__.py
+++ b/homeassistant/components/homematic/__init__.py
@@ -36,6 +36,7 @@ from .const import (
     ATTR_PARAM,
     ATTR_PARAMSET,
     ATTR_PARAMSET_KEY,
+    ATTR_RX_MODE,
     ATTR_TIME,
     ATTR_UNIQUE_ID,
     ATTR_VALUE,
@@ -201,6 +202,7 @@ SCHEMA_SERVICE_PUT_PARAMSET = vol.Schema(
         vol.Required(ATTR_ADDRESS): vol.All(cv.string, vol.Upper),
         vol.Required(ATTR_PARAMSET_KEY): vol.All(cv.string, vol.Upper),
         vol.Required(ATTR_PARAMSET): dict,
+        vol.Optional(ATTR_RX_MODE): vol.All(cv.string, vol.Upper),
     }
 )
 
@@ -392,15 +394,17 @@ def setup(hass, config):
         # here instead of a dict, so add this explicit cast.
         # The service schema makes sure that this cast works.
         paramset = dict(service.data.get(ATTR_PARAMSET))
+        rx_mode = service.data.get(ATTR_RX_MODE)
 
         _LOGGER.debug(
-            "Calling putParamset: %s, %s, %s, %s",
+            "Calling putParamset: %s, %s, %s, %s, %s",
             interface,
             address,
             paramset_key,
             paramset,
+            rx_mode,
         )
-        homematic.putParamset(interface, address, paramset_key, paramset)
+        homematic.putParamset(interface, address, paramset_key, paramset, rx_mode)
 
     hass.services.register(
         DOMAIN,
diff --git a/homeassistant/components/homematic/binary_sensor.py b/homeassistant/components/homematic/binary_sensor.py
index 7315a266a30..286c7372fd2 100644
--- a/homeassistant/components/homematic/binary_sensor.py
+++ b/homeassistant/components/homematic/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for HomeMatic binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_MOTION,
@@ -13,8 +11,6 @@ from homeassistant.components.binary_sensor import (
 from .const import ATTR_DISCOVER_DEVICES, ATTR_DISCOVERY_TYPE, DISCOVER_BATTERY
 from .entity import HMDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSOR_TYPES_CLASS = {
     "IPShutterContact": DEVICE_CLASS_OPENING,
     "IPShutterContactSabotage": DEVICE_CLASS_OPENING,
diff --git a/homeassistant/components/homematic/climate.py b/homeassistant/components/homematic/climate.py
index 243e1782a37..3b77b90ff25 100644
--- a/homeassistant/components/homematic/climate.py
+++ b/homeassistant/components/homematic/climate.py
@@ -1,6 +1,4 @@
 """Support for Homematic thermostats."""
-import logging
-
 from homeassistant.components.climate import ClimateEntity
 from homeassistant.components.climate.const import (
     HVAC_MODE_AUTO,
@@ -17,8 +15,6 @@ from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS
 from .const import ATTR_DISCOVER_DEVICES, HM_ATTRIBUTE_SUPPORT
 from .entity import HMDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 HM_TEMP_MAP = ["ACTUAL_TEMPERATURE", "TEMPERATURE"]
 
 HM_HUMI_MAP = ["ACTUAL_HUMIDITY", "HUMIDITY"]
diff --git a/homeassistant/components/homematic/const.py b/homeassistant/components/homematic/const.py
index 1ce18a8e759..cd474428113 100644
--- a/homeassistant/components/homematic/const.py
+++ b/homeassistant/components/homematic/const.py
@@ -25,6 +25,7 @@ ATTR_TIME = "time"
 ATTR_UNIQUE_ID = "unique_id"
 ATTR_PARAMSET_KEY = "paramset_key"
 ATTR_PARAMSET = "paramset"
+ATTR_RX_MODE = "rx_mode"
 ATTR_DISCOVERY_TYPE = "discovery_type"
 ATTR_LOW_BAT = "LOW_BAT"
 ATTR_LOWBAT = "LOWBAT"
@@ -57,6 +58,8 @@ HM_DEVICE_TYPES = {
         "IPKeySwitchLevel",
         "IPMultiIO",
         "IPWSwitch",
+        "IOSwitchWireless",
+        "IPWIODevice",
     ],
     DISCOVER_LIGHTS: [
         "Dimmer",
@@ -111,7 +114,7 @@ HM_DEVICE_TYPES = {
         "IPThermostatWall2",
         "IPRemoteMotionV2",
         "HBUNISenWEA",
-        "IPWMotionDection",
+        "PresenceIPW",
     ],
     DISCOVER_CLIMATE: [
         "Thermostat",
@@ -154,6 +157,7 @@ HM_DEVICE_TYPES = {
         "IPRemoteMotionV2",
         "IPWInputDevice",
         "IPWMotionDection",
+        "IPAlarmSensor",
     ],
     DISCOVER_COVER: [
         "Blind",
diff --git a/homeassistant/components/homematic/cover.py b/homeassistant/components/homematic/cover.py
index c0074d349d1..e9f2943b53b 100644
--- a/homeassistant/components/homematic/cover.py
+++ b/homeassistant/components/homematic/cover.py
@@ -1,6 +1,4 @@
 """Support for  HomeMatic covers."""
-import logging
-
 from homeassistant.components.cover import (
     ATTR_POSITION,
     ATTR_TILT_POSITION,
@@ -11,8 +9,6 @@ from homeassistant.components.cover import (
 from .const import ATTR_DEVICE_TYPE, ATTR_DISCOVER_DEVICES
 from .entity import HMDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 HM_GARAGE = ("IPGarage",)
 
 
diff --git a/homeassistant/components/homematic/entity.py b/homeassistant/components/homematic/entity.py
index 49d3ee1f170..a391fa80461 100644
--- a/homeassistant/components/homematic/entity.py
+++ b/homeassistant/components/homematic/entity.py
@@ -48,7 +48,7 @@ class HMDevice(Entity):
 
     async def async_added_to_hass(self):
         """Load data init callbacks."""
-        await self.hass.async_add_job(self._subscribe_homematic_events)
+        self._subscribe_homematic_events()
 
     @property
     def unique_id(self):
@@ -73,7 +73,12 @@ class HMDevice(Entity):
     @property
     def device_state_attributes(self):
         """Return device specific state attributes."""
-        attr = {}
+
+        # Static attributes
+        attr = {
+            "id": self._hmdevice.ADDRESS,
+            "interface": self._interface,
+        }
 
         # Generate a dictionary with attributes
         for node, data in HM_ATTRIBUTE_SUPPORT.items():
@@ -82,10 +87,6 @@ class HMDevice(Entity):
                 value = data[1].get(self._data[node], self._data[node])
                 attr[data[0]] = value
 
-        # Static attributes
-        attr["id"] = self._hmdevice.ADDRESS
-        attr["interface"] = self._interface
-
         return attr
 
     def update(self):
@@ -233,8 +234,7 @@ class HMHub(Entity):
     @property
     def state_attributes(self):
         """Return the state attributes."""
-        attr = self._variables.copy()
-        return attr
+        return self._variables.copy()
 
     @property
     def icon(self):
diff --git a/homeassistant/components/homematic/light.py b/homeassistant/components/homematic/light.py
index 7ef632dae81..11731e2ae5f 100644
--- a/homeassistant/components/homematic/light.py
+++ b/homeassistant/components/homematic/light.py
@@ -1,6 +1,4 @@
 """Support for Homematic lights."""
-import logging
-
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_COLOR_TEMP,
@@ -17,8 +15,6 @@ from homeassistant.components.light import (
 from .const import ATTR_DISCOVER_DEVICES
 from .entity import HMDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_HOMEMATIC = SUPPORT_BRIGHTNESS
 
 
diff --git a/homeassistant/components/homematic/lock.py b/homeassistant/components/homematic/lock.py
index 9a705627fa4..fa907ce9393 100644
--- a/homeassistant/components/homematic/lock.py
+++ b/homeassistant/components/homematic/lock.py
@@ -1,13 +1,9 @@
 """Support for Homematic locks."""
-import logging
-
 from homeassistant.components.lock import SUPPORT_OPEN, LockEntity
 
 from .const import ATTR_DISCOVER_DEVICES
 from .entity import HMDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Homematic lock platform."""
diff --git a/homeassistant/components/homematic/manifest.json b/homeassistant/components/homematic/manifest.json
index d8c60c0f976..63e33a60c53 100644
--- a/homeassistant/components/homematic/manifest.json
+++ b/homeassistant/components/homematic/manifest.json
@@ -2,6 +2,6 @@
   "domain": "homematic",
   "name": "Homematic",
   "documentation": "https://www.home-assistant.io/integrations/homematic",
-  "requirements": ["pyhomematic==0.1.68"],
+  "requirements": ["pyhomematic==0.1.70"],
   "codeowners": ["@pvizeli", "@danielperna84"]
 }
diff --git a/homeassistant/components/homematic/notify.py b/homeassistant/components/homematic/notify.py
index 3d48adc6df2..a8ae59d4c31 100644
--- a/homeassistant/components/homematic/notify.py
+++ b/homeassistant/components/homematic/notify.py
@@ -1,6 +1,4 @@
 """Notification support for Homematic."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.notify import (
@@ -21,8 +19,6 @@ from .const import (
     SERVICE_SET_DEVICE_VALUE,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Required(ATTR_ADDRESS): vol.All(cv.string, vol.Upper),
diff --git a/homeassistant/components/homematic/services.yaml b/homeassistant/components/homematic/services.yaml
index d2a14101666..2dc850330f0 100644
--- a/homeassistant/components/homematic/services.yaml
+++ b/homeassistant/components/homematic/services.yaml
@@ -82,3 +82,6 @@ put_paramset:
     paramset:
       description: A paramset dictionary
       example: '{"WEEK_PROGRAM_POINTER": 1}'
+    rx_mode:
+      description: The receive mode used.
+      example: BURST
diff --git a/homeassistant/components/homematic/switch.py b/homeassistant/components/homematic/switch.py
index afde1ac8527..ff3bbe61039 100644
--- a/homeassistant/components/homematic/switch.py
+++ b/homeassistant/components/homematic/switch.py
@@ -1,13 +1,9 @@
 """Support for HomeMatic switches."""
-import logging
-
 from homeassistant.components.switch import SwitchEntity
 
 from .const import ATTR_DISCOVER_DEVICES
 from .entity import HMDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the HomeMatic switch platform."""
diff --git a/homeassistant/components/homematicip_cloud/__init__.py b/homeassistant/components/homematicip_cloud/__init__.py
index 47da33e86da..2b078966ee8 100644
--- a/homeassistant/components/homematicip_cloud/__init__.py
+++ b/homeassistant/components/homematicip_cloud/__init__.py
@@ -1,6 +1,4 @@
 """Support for HomematicIP Cloud devices."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -22,8 +20,6 @@ from .generic_entity import HomematicipGenericEntity  # noqa: F401
 from .hap import HomematicipAuth, HomematicipHAP  # noqa: F401
 from .services import async_setup_services, async_unload_services
 
-_LOGGER = logging.getLogger(__name__)
-
 CONFIG_SCHEMA = vol.Schema(
     {
         vol.Optional(DOMAIN, default=[]): vol.All(
@@ -99,7 +95,7 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
     # Add the HAP name from configuration if set.
     hapname = home.label if not home.name else f"{home.name} {home.label}"
     device_registry.async_get_or_create(
-        config_entry_id=home.id,
+        config_entry_id=entry.entry_id,
         identifiers={(DOMAIN, home.id)},
         manufacturer="eQ-3",
         name=hapname,
diff --git a/homeassistant/components/homematicip_cloud/binary_sensor.py b/homeassistant/components/homematicip_cloud/binary_sensor.py
index 440dc31788f..da5bf844e08 100644
--- a/homeassistant/components/homematicip_cloud/binary_sensor.py
+++ b/homeassistant/components/homematicip_cloud/binary_sensor.py
@@ -1,5 +1,4 @@
 """Support for HomematicIP Cloud binary sensor."""
-import logging
 from typing import Any, Dict
 
 from homematicip.aio.device import (
@@ -45,8 +44,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from . import DOMAIN as HMIPC_DOMAIN, HomematicipGenericEntity
 from .hap import HomematicipHAP
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_ACCELERATION_SENSOR_MODE = "acceleration_sensor_mode"
 ATTR_ACCELERATION_SENSOR_NEUTRAL_POSITION = "acceleration_sensor_neutral_position"
 ATTR_ACCELERATION_SENSOR_SENSITIVITY = "acceleration_sensor_sensitivity"
@@ -128,9 +125,9 @@ async def async_setup_entry(
 
     for group in hap.home.groups:
         if isinstance(group, AsyncSecurityGroup):
-            entities.append(HomematicipSecuritySensorGroup(hap, group))
+            entities.append(HomematicipSecuritySensorGroup(hap, device=group))
         elif isinstance(group, AsyncSecurityZoneGroup):
-            entities.append(HomematicipSecurityZoneSensorGroup(hap, group))
+            entities.append(HomematicipSecurityZoneSensorGroup(hap, device=group))
 
     if entities:
         async_add_entities(entities)
@@ -361,7 +358,7 @@ class HomematicipSunshineSensor(HomematicipGenericEntity, BinarySensorEntity):
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize sunshine sensor."""
-        super().__init__(hap, device, "Sunshine")
+        super().__init__(hap, device, post="Sunshine")
 
     @property
     def device_class(self) -> str:
@@ -390,7 +387,7 @@ class HomematicipBatterySensor(HomematicipGenericEntity, BinarySensorEntity):
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize battery sensor."""
-        super().__init__(hap, device, "Battery")
+        super().__init__(hap, device, post="Battery")
 
     @property
     def device_class(self) -> str:
@@ -429,7 +426,7 @@ class HomematicipSecurityZoneSensorGroup(HomematicipGenericEntity, BinarySensorE
     def __init__(self, hap: HomematicipHAP, device, post: str = "SecurityZone") -> None:
         """Initialize security zone group."""
         device.modelType = f"HmIP-{post}"
-        super().__init__(hap, device, post)
+        super().__init__(hap, device, post=post)
 
     @property
     def device_class(self) -> str:
@@ -485,7 +482,7 @@ class HomematicipSecuritySensorGroup(
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize security group."""
-        super().__init__(hap, device, "Sensors")
+        super().__init__(hap, device, post="Sensors")
 
     @property
     def device_state_attributes(self) -> Dict[str, Any]:
diff --git a/homeassistant/components/homematicip_cloud/climate.py b/homeassistant/components/homematicip_cloud/climate.py
index 3f9cdcbcbdd..dcd5aeb284e 100644
--- a/homeassistant/components/homematicip_cloud/climate.py
+++ b/homeassistant/components/homematicip_cloud/climate.py
@@ -1,5 +1,4 @@
 """Support for HomematicIP Cloud climate devices."""
-import logging
 from typing import Any, Dict, List, Optional, Union
 
 from homematicip.aio.device import AsyncHeatingThermostat, AsyncHeatingThermostatCompact
@@ -33,8 +32,6 @@ from .hap import HomematicipHAP
 HEATING_PROFILES = {"PROFILE_1": 0, "PROFILE_2": 1, "PROFILE_3": 2}
 COOLING_PROFILES = {"PROFILE_4": 3, "PROFILE_5": 4, "PROFILE_6": 5}
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_PRESET_END_TIME = "preset_end_time"
 PERMANENT_END_TIME = "permanent"
 
diff --git a/homeassistant/components/homematicip_cloud/cover.py b/homeassistant/components/homematicip_cloud/cover.py
index 5b2f02e8a2d..60d3867d05a 100644
--- a/homeassistant/components/homematicip_cloud/cover.py
+++ b/homeassistant/components/homematicip_cloud/cover.py
@@ -1,5 +1,4 @@
 """Support for HomematicIP Cloud cover devices."""
-import logging
 from typing import Optional
 
 from homematicip.aio.device import (
@@ -22,8 +21,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from . import DOMAIN as HMIPC_DOMAIN, HomematicipGenericEntity
 from .hap import HomematicipHAP
 
-_LOGGER = logging.getLogger(__name__)
-
 HMIP_COVER_OPEN = 0
 HMIP_COVER_CLOSED = 1
 HMIP_SLATS_OPEN = 0
diff --git a/homeassistant/components/homematicip_cloud/generic_entity.py b/homeassistant/components/homematicip_cloud/generic_entity.py
index 3a19c1b2afe..ce8b44f5702 100644
--- a/homeassistant/components/homematicip_cloud/generic_entity.py
+++ b/homeassistant/components/homematicip_cloud/generic_entity.py
@@ -70,12 +70,19 @@ GROUP_ATTRIBUTES = {
 class HomematicipGenericEntity(Entity):
     """Representation of the HomematicIP generic entity."""
 
-    def __init__(self, hap: HomematicipHAP, device, post: Optional[str] = None) -> None:
+    def __init__(
+        self,
+        hap: HomematicipHAP,
+        device,
+        post: Optional[str] = None,
+        channel: Optional[int] = None,
+    ) -> None:
         """Initialize the generic entity."""
         self._hap = hap
         self._home = hap.home
         self._device = device
-        self.post = post
+        self._post = post
+        self._channel = channel
         # Marker showing that the HmIP device hase been removed.
         self.hmip_device_removed = False
         _LOGGER.info("Setting up %s (%s)", self.name, self._device.modelType)
@@ -94,6 +101,7 @@ class HomematicipGenericEntity(Entity):
                 "manufacturer": self._device.oem,
                 "model": self._device.modelType,
                 "sw_version": self._device.firmwareVersion,
+                # Link to the homematic ip access point.
                 "via_device": (HMIPC_DOMAIN, self._device.homeId),
             }
         return None
@@ -167,18 +175,28 @@ class HomematicipGenericEntity(Entity):
     @property
     def name(self) -> str:
         """Return the name of the generic entity."""
-        name = self._device.label
-        if name and self._home.name:
-            name = f"{self._home.name} {name}"
-        if name and self.post:
-            name = f"{name} {self.post}"
-        return name
 
-    def _get_label_by_channel(self, channel: int) -> str:
-        """Return the name of the channel."""
-        name = self._device.functionalChannels[channel].label
+        name = None
+        # Try to get a label from a channel.
+        if hasattr(self._device, "functionalChannels"):
+            if self._channel:
+                name = self._device.functionalChannels[self._channel].label
+            else:
+                if len(self._device.functionalChannels) > 1:
+                    name = self._device.functionalChannels[1].label
+
+        # Use device label, if name is not defined by channel label.
+        if not name:
+            name = self._device.label
+            if self._post:
+                name = f"{name} {self._post}"
+            elif self._channel:
+                name = f"{name} Channel{self._channel}"
+
+        # Add a prefix to the name if the homematic ip home has a name.
         if name and self._home.name:
             name = f"{self._home.name} {name}"
+
         return name
 
     @property
@@ -194,7 +212,13 @@ class HomematicipGenericEntity(Entity):
     @property
     def unique_id(self) -> str:
         """Return a unique ID."""
-        return f"{self.__class__.__name__}_{self._device.id}"
+        unique_id = f"{self.__class__.__name__}_{self._device.id}"
+        if self._channel:
+            unique_id = (
+                f"{self.__class__.__name__}_Channel{self._channel}_{self._device.id}"
+            )
+
+        return unique_id
 
     @property
     def icon(self) -> Optional[str]:
diff --git a/homeassistant/components/homematicip_cloud/light.py b/homeassistant/components/homematicip_cloud/light.py
index 72737122372..f387e7bfda3 100644
--- a/homeassistant/components/homematicip_cloud/light.py
+++ b/homeassistant/components/homematicip_cloud/light.py
@@ -1,5 +1,4 @@
 """Support for HomematicIP Cloud lights."""
-import logging
 from typing import Any, Dict
 
 from homematicip.aio.device import (
@@ -29,8 +28,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from . import DOMAIN as HMIPC_DOMAIN, HomematicipGenericEntity
 from .hap import HomematicipHAP
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_TODAY_ENERGY_KWH = "today_energy_kwh"
 ATTR_CURRENT_POWER_W = "current_power_w"
 
@@ -71,14 +68,6 @@ class HomematicipLight(HomematicipGenericEntity, LightEntity):
         """Initialize the light entity."""
         super().__init__(hap, device)
 
-    @property
-    def name(self) -> str:
-        """Return the name of the multi switch channel."""
-        label = self._get_label_by_channel(1)
-        if label:
-            return label
-        return super().name
-
     @property
     def is_on(self) -> bool:
         """Return true if light is on."""
@@ -149,11 +138,10 @@ class HomematicipNotificationLight(HomematicipGenericEntity, LightEntity):
 
     def __init__(self, hap: HomematicipHAP, device, channel: int) -> None:
         """Initialize the notification light entity."""
-        self.channel = channel
-        if self.channel == 2:
-            super().__init__(hap, device, "Top")
+        if channel == 2:
+            super().__init__(hap, device, post="Top", channel=channel)
         else:
-            super().__init__(hap, device, "Bottom")
+            super().__init__(hap, device, post="Bottom", channel=channel)
 
         self._color_switcher = {
             RGBColorState.WHITE: [0.0, 0.0],
@@ -167,7 +155,7 @@ class HomematicipNotificationLight(HomematicipGenericEntity, LightEntity):
 
     @property
     def _func_channel(self) -> NotificationLightChannel:
-        return self._device.functionalChannels[self.channel]
+        return self._device.functionalChannels[self._channel]
 
     @property
     def is_on(self) -> bool:
@@ -198,14 +186,6 @@ class HomematicipNotificationLight(HomematicipGenericEntity, LightEntity):
 
         return state_attr
 
-    @property
-    def name(self) -> str:
-        """Return the name of the notification light sensor."""
-        label = self._get_label_by_channel(self.channel)
-        if label:
-            return label
-        return f"{super().name} Notification"
-
     @property
     def supported_features(self) -> int:
         """Flag supported features."""
@@ -214,7 +194,7 @@ class HomematicipNotificationLight(HomematicipGenericEntity, LightEntity):
     @property
     def unique_id(self) -> str:
         """Return a unique ID."""
-        return f"{self.__class__.__name__}_{self.post}_{self._device.id}"
+        return f"{self.__class__.__name__}_{self._post}_{self._device.id}"
 
     async def async_turn_on(self, **kwargs) -> None:
         """Turn the light on."""
@@ -237,7 +217,7 @@ class HomematicipNotificationLight(HomematicipGenericEntity, LightEntity):
         transition = kwargs.get(ATTR_TRANSITION, 0.5)
 
         await self._device.set_rgb_dim_level_with_time(
-            channelIndex=self.channel,
+            channelIndex=self._channel,
             rgb=simple_rgb_color,
             dimLevel=dim_level,
             onTime=0,
@@ -250,7 +230,7 @@ class HomematicipNotificationLight(HomematicipGenericEntity, LightEntity):
         transition = kwargs.get(ATTR_TRANSITION, 0.5)
 
         await self._device.set_rgb_dim_level_with_time(
-            channelIndex=self.channel,
+            channelIndex=self._channel,
             rgb=simple_rgb_color,
             dimLevel=0.0,
             onTime=0,
diff --git a/homeassistant/components/homematicip_cloud/sensor.py b/homeassistant/components/homematicip_cloud/sensor.py
index 082d7e9e355..66e0e1afd70 100644
--- a/homeassistant/components/homematicip_cloud/sensor.py
+++ b/homeassistant/components/homematicip_cloud/sensor.py
@@ -1,5 +1,4 @@
 """Support for HomematicIP Cloud sensors."""
-import logging
 from typing import Any, Dict
 
 from homematicip.aio.device import (
@@ -43,8 +42,6 @@ from . import DOMAIN as HMIPC_DOMAIN, HomematicipGenericEntity
 from .generic_entity import ATTR_IS_GROUP, ATTR_MODEL_TYPE
 from .hap import HomematicipHAP
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_CURRENT_ILLUMINATION = "current_illumination"
 ATTR_LOWEST_ILLUMINATION = "lowest_illumination"
 ATTR_HIGHEST_ILLUMINATION = "highest_illumination"
@@ -127,7 +124,7 @@ class HomematicipAccesspointStatus(HomematicipGenericEntity):
 
     def __init__(self, hap: HomematicipHAP) -> None:
         """Initialize access point status entity."""
-        super().__init__(hap, hap.home, "Duty Cycle")
+        super().__init__(hap, device=hap.home, post="Duty Cycle")
 
     @property
     def device_info(self) -> Dict[str, Any]:
@@ -176,7 +173,7 @@ class HomematicipHeatingThermostat(HomematicipGenericEntity):
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize heating thermostat device."""
-        super().__init__(hap, device, "Heating")
+        super().__init__(hap, device, post="Heating")
 
     @property
     def icon(self) -> str:
@@ -205,7 +202,7 @@ class HomematicipHumiditySensor(HomematicipGenericEntity):
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize the thermometer device."""
-        super().__init__(hap, device, "Humidity")
+        super().__init__(hap, device, post="Humidity")
 
     @property
     def device_class(self) -> str:
@@ -228,7 +225,7 @@ class HomematicipTemperatureSensor(HomematicipGenericEntity):
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize the thermometer device."""
-        super().__init__(hap, device, "Temperature")
+        super().__init__(hap, device, post="Temperature")
 
     @property
     def device_class(self) -> str:
@@ -265,7 +262,7 @@ class HomematicipIlluminanceSensor(HomematicipGenericEntity):
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize the  device."""
-        super().__init__(hap, device, "Illuminance")
+        super().__init__(hap, device, post="Illuminance")
 
     @property
     def device_class(self) -> str:
@@ -303,7 +300,7 @@ class HomematicipPowerSensor(HomematicipGenericEntity):
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize the  device."""
-        super().__init__(hap, device, "Power")
+        super().__init__(hap, device, post="Power")
 
     @property
     def device_class(self) -> str:
@@ -326,7 +323,7 @@ class HomematicipWindspeedSensor(HomematicipGenericEntity):
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize the windspeed sensor."""
-        super().__init__(hap, device, "Windspeed")
+        super().__init__(hap, device, post="Windspeed")
 
     @property
     def state(self) -> float:
@@ -359,7 +356,7 @@ class HomematicipTodayRainSensor(HomematicipGenericEntity):
 
     def __init__(self, hap: HomematicipHAP, device) -> None:
         """Initialize the  device."""
-        super().__init__(hap, device, "Today Rain")
+        super().__init__(hap, device, post="Today Rain")
 
     @property
     def state(self) -> float:
diff --git a/homeassistant/components/homematicip_cloud/strings.json b/homeassistant/components/homematicip_cloud/strings.json
index fddb2b85df6..794bc2d12e0 100644
--- a/homeassistant/components/homematicip_cloud/strings.json
+++ b/homeassistant/components/homematicip_cloud/strings.json
@@ -5,8 +5,8 @@
         "title": "Pick HomematicIP Access point",
         "data": {
           "hapid": "Access point ID (SGTIN)",
-          "pin": "Pin Code (optional)",
-          "name": "Name (optional, used as name prefix for all devices)"
+          "pin": "[%key:common::config_flow::data::pin%]",
+          "name": "[%key:common::config_flow::data::name%] (optional, used as name prefix for all devices)"
         }
       },
       "link": {
@@ -16,14 +16,14 @@
     },
     "error": {
       "register_failed": "Failed to register, please try again.",
-      "invalid_sgtin_or_pin": "Invalid SGTIN or PIN, please try again.",
+      "invalid_sgtin_or_pin": "Invalid SGTIN or [%key:common::config_flow::data::pin%], please try again.",
       "press_the_button": "Please press the blue button.",
       "timeout_button": "Blue button press timeout, please try again."
     },
     "abort": {
-      "unknown": "Unknown error occurred.",
-      "connection_aborted": "Could not connect to HMIP server",
-      "already_configured": "Access point is already configured"
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "connection_aborted": "[%key:common::config_flow::error::cannot_connect%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
 }
diff --git a/homeassistant/components/homematicip_cloud/switch.py b/homeassistant/components/homematicip_cloud/switch.py
index 64ee862b2d2..22fd1c25078 100644
--- a/homeassistant/components/homematicip_cloud/switch.py
+++ b/homeassistant/components/homematicip_cloud/switch.py
@@ -1,5 +1,4 @@
 """Support for HomematicIP Cloud switches."""
-import logging
 from typing import Any, Dict
 
 from homematicip.aio.device import (
@@ -24,8 +23,6 @@ from . import DOMAIN as HMIPC_DOMAIN, HomematicipGenericEntity
 from .generic_entity import ATTR_GROUP_MEMBER_UNREACHABLE
 from .hap import HomematicipHAP
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, config_entry: ConfigEntry, async_add_entities
@@ -54,16 +51,16 @@ async def async_setup_entry(
             entities.append(HomematicipSwitch(hap, device))
         elif isinstance(device, AsyncOpenCollector8Module):
             for channel in range(1, 9):
-                entities.append(HomematicipMultiSwitch(hap, device, channel))
+                entities.append(HomematicipMultiSwitch(hap, device, channel=channel))
         elif isinstance(device, AsyncHeatingSwitch2):
             for channel in range(1, 3):
-                entities.append(HomematicipMultiSwitch(hap, device, channel))
+                entities.append(HomematicipMultiSwitch(hap, device, channel=channel))
         elif isinstance(device, AsyncMultiIOBox):
             for channel in range(1, 3):
-                entities.append(HomematicipMultiSwitch(hap, device, channel))
+                entities.append(HomematicipMultiSwitch(hap, device, channel=channel))
         elif isinstance(device, AsyncPrintedCircuitBoardSwitch2):
             for channel in range(1, 3):
-                entities.append(HomematicipMultiSwitch(hap, device, channel))
+                entities.append(HomematicipMultiSwitch(hap, device, channel=channel))
 
     for group in hap.home.groups:
         if isinstance(group, (AsyncExtendedLinkedSwitchingGroup, AsyncSwitchingGroup)):
@@ -156,31 +153,17 @@ class HomematicipMultiSwitch(HomematicipGenericEntity, SwitchEntity):
 
     def __init__(self, hap: HomematicipHAP, device, channel: int) -> None:
         """Initialize the multi switch device."""
-        self.channel = channel
-        super().__init__(hap, device, f"Channel{channel}")
-
-    @property
-    def name(self) -> str:
-        """Return the name of the multi switch channel."""
-        label = self._get_label_by_channel(self.channel)
-        if label:
-            return label
-        return super().name
-
-    @property
-    def unique_id(self) -> str:
-        """Return a unique ID."""
-        return f"{self.__class__.__name__}_{self.post}_{self._device.id}"
+        super().__init__(hap, device, channel=channel)
 
     @property
     def is_on(self) -> bool:
         """Return true if switch is on."""
-        return self._device.functionalChannels[self.channel].on
+        return self._device.functionalChannels[self._channel].on
 
     async def async_turn_on(self, **kwargs) -> None:
         """Turn the switch on."""
-        await self._device.turn_on(self.channel)
+        await self._device.turn_on(self._channel)
 
     async def async_turn_off(self, **kwargs) -> None:
         """Turn the switch off."""
-        await self._device.turn_off(self.channel)
+        await self._device.turn_off(self._channel)
diff --git a/homeassistant/components/homematicip_cloud/translations/ca.json b/homeassistant/components/homematicip_cloud/translations/ca.json
index 871af68e360..0725ee11afb 100644
--- a/homeassistant/components/homematicip_cloud/translations/ca.json
+++ b/homeassistant/components/homematicip_cloud/translations/ca.json
@@ -1,9 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El punt d'acc\u00e9s ja est\u00e0 configurat",
-            "connection_aborted": "No s'ha pogut connectar al servidor HMIP",
-            "unknown": "S'ha produ\u00eft un error desconegut."
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "connection_aborted": "Ha fallat la connexi\u00f3",
+            "unknown": "Error inesperat"
         },
         "error": {
             "invalid_pin": "Codi PIN inv\u00e0lid, torna-ho a provar.",
@@ -16,8 +16,8 @@
             "init": {
                 "data": {
                     "hapid": "Identificador del punt d'acc\u00e9s (SGTIN)",
-                    "name": "Nom (opcional, s'utilitza com a nom prefix per a tots els dispositius)",
-                    "pin": "Codi PIN (opcional)"
+                    "name": "Nom (opcional, s'utilitza com a prefix de nom per a tots els dispositius)",
+                    "pin": "Codi PIN"
                 },
                 "title": "Tria el punt d'acc\u00e9s HomematicIP"
             },
diff --git a/homeassistant/components/homematicip_cloud/translations/cs.json b/homeassistant/components/homematicip_cloud/translations/cs.json
index 36b6cd00e98..4fd386ba37a 100644
--- a/homeassistant/components/homematicip_cloud/translations/cs.json
+++ b/homeassistant/components/homematicip_cloud/translations/cs.json
@@ -1,12 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "P\u0159\u00edstupov\u00fd bod je ji\u017e nakonfigurov\u00e1n",
-            "connection_aborted": "Nelze se p\u0159ipojit k HMIP serveru",
-            "unknown": "Do\u0161lo k nezn\u00e1m\u00e9 chyb\u011b"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "connection_aborted": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "error": {
-            "invalid_sgtin_or_pin": "Neplatn\u00fd k\u00f3d PIN, zkuste to znovu.",
+            "invalid_pin": "Neplatn\u00fd PIN, zkuste to pros\u00edm znovu.",
+            "invalid_sgtin_or_pin": "Neplatn\u00fd k\u00f3d SGTIN nebo PIN, zkuste to pros\u00edm znovu.",
             "press_the_button": "Stiskn\u011bte modr\u00e9 tla\u010d\u00edtko.",
             "register_failed": "Registrace se nezda\u0159ila, zkuste to znovu.",
             "timeout_button": "\u010casov\u00fd limit stisknut\u00ed modr\u00e9ho tla\u010d\u00edtka vypr\u0161el. Zkuste to znovu."
@@ -15,8 +16,8 @@
             "init": {
                 "data": {
                     "hapid": "ID p\u0159\u00edstupov\u00e9ho bodu (SGTIN)",
-                    "name": "N\u00e1zev (nepovinn\u00e9, pou\u017e\u00edv\u00e1 se jako p\u0159edpona n\u00e1zvu pro v\u0161echna za\u0159\u00edzen\u00ed)",
-                    "pin": "Pin k\u00f3d (nepovinn\u00e9)"
+                    "name": "Jm\u00e9no (nepovinn\u00e9, pou\u017e\u00edv\u00e1 se jako p\u0159edpona n\u00e1zvu pro v\u0161echna za\u0159\u00edzen\u00ed)",
+                    "pin": "PIN k\u00f3d"
                 },
                 "title": "Vyberte p\u0159\u00edstupov\u00fd bod HomematicIP"
             },
diff --git a/homeassistant/components/homematicip_cloud/translations/de.json b/homeassistant/components/homematicip_cloud/translations/de.json
index c421620fd98..0718f629164 100644
--- a/homeassistant/components/homematicip_cloud/translations/de.json
+++ b/homeassistant/components/homematicip_cloud/translations/de.json
@@ -6,6 +6,7 @@
             "unknown": "Ein unbekannter Fehler ist aufgetreten."
         },
         "error": {
+            "invalid_pin": "Ung\u00fcltige PIN, bitte versuche es erneut.",
             "invalid_sgtin_or_pin": "Ung\u00fcltige PIN, bitte versuche es erneut.",
             "press_the_button": "Bitte dr\u00fccke die blaue Taste.",
             "register_failed": "Registrierung fehlgeschlagen, bitte versuche es erneut.",
diff --git a/homeassistant/components/homematicip_cloud/translations/el.json b/homeassistant/components/homematicip_cloud/translations/el.json
new file mode 100644
index 00000000000..843d590e7e0
--- /dev/null
+++ b/homeassistant/components/homematicip_cloud/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "invalid_pin": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03bf PIN, \u03b4\u03bf\u03ba\u03b9\u03bc\u03ac\u03c3\u03c4\u03b5 \u03be\u03b1\u03bd\u03ac."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/homematicip_cloud/translations/en.json b/homeassistant/components/homematicip_cloud/translations/en.json
index 97cfd1e3f4e..bf469d406ea 100644
--- a/homeassistant/components/homematicip_cloud/translations/en.json
+++ b/homeassistant/components/homematicip_cloud/translations/en.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Access point is already configured",
-            "connection_aborted": "Could not connect to HMIP server",
-            "unknown": "Unknown error occurred."
+            "already_configured": "Device is already configured",
+            "connection_aborted": "Failed to connect",
+            "unknown": "Unexpected error"
         },
         "error": {
             "invalid_pin": "Invalid PIN, please try again.",
-            "invalid_sgtin_or_pin": "Invalid SGTIN or PIN, please try again.",
+            "invalid_sgtin_or_pin": "Invalid SGTIN or PIN Code, please try again.",
             "press_the_button": "Please press the blue button.",
             "register_failed": "Failed to register, please try again.",
             "timeout_button": "Blue button press timeout, please try again."
@@ -17,7 +17,7 @@
                 "data": {
                     "hapid": "Access point ID (SGTIN)",
                     "name": "Name (optional, used as name prefix for all devices)",
-                    "pin": "Pin Code (optional)"
+                    "pin": "PIN Code"
                 },
                 "title": "Pick HomematicIP Access point"
             },
diff --git a/homeassistant/components/homematicip_cloud/translations/es.json b/homeassistant/components/homematicip_cloud/translations/es.json
index cd300d4e4b3..980b0964d83 100644
--- a/homeassistant/components/homematicip_cloud/translations/es.json
+++ b/homeassistant/components/homematicip_cloud/translations/es.json
@@ -9,8 +9,8 @@
             "invalid_pin": "PIN no v\u00e1lido, por favor int\u00e9ntalo de nuevo.",
             "invalid_sgtin_or_pin": "PIN no v\u00e1lido, por favor int\u00e9ntalo de nuevo.",
             "press_the_button": "Por favor, pulsa el bot\u00f3n azul",
-            "register_failed": "No se pudo registrar, por favor intentelo de nuevo.",
-            "timeout_button": "Tiempo de espera agotado desde que se apret\u00f3 el bot\u00f3n azul, por favor, int\u00e9ntalo de nuevo."
+            "register_failed": "No se pudo registrar, por favor int\u00e9ntalo de nuevo.",
+            "timeout_button": "Se agot\u00f3 el tiempo de espera para presionar el bot\u00f3n azul. Vuelve a intentarlo."
         },
         "step": {
             "init": {
diff --git a/homeassistant/components/homematicip_cloud/translations/et.json b/homeassistant/components/homematicip_cloud/translations/et.json
index 4f97508c045..3d88f62eedc 100644
--- a/homeassistant/components/homematicip_cloud/translations/et.json
+++ b/homeassistant/components/homematicip_cloud/translations/et.json
@@ -1,13 +1,22 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "connection_aborted": "\u00dchendus nurjus",
+            "unknown": "Tundmatu viga"
+        },
         "error": {
             "invalid_pin": "Vale PIN-kood. Palun  proovige uuesti.",
-            "invalid_sgtin_or_pin": "Vale PIN, palun proovige uuesti"
+            "invalid_sgtin_or_pin": "Vale PIN, palun proovige uuesti",
+            "press_the_button": "Palun vajuta sinist nuppu.",
+            "register_failed": "Registreerimine nurjus, proovi uuesti.",
+            "timeout_button": "Sinise nupu vajutamise ajal\u00f5pp, proovi uuesti."
         },
         "step": {
             "init": {
                 "data": {
                     "hapid": "P\u00e4\u00e4supunkti ID (SGTIN)",
+                    "name": "Nimi (valikuline, kasutatakse k\u00f5igi seadmete nime eesliitena)",
                     "pin": "PIN-kood (valikuline)"
                 }
             }
diff --git a/homeassistant/components/homematicip_cloud/translations/it.json b/homeassistant/components/homematicip_cloud/translations/it.json
index 4e7bfd1108c..11b21f8cbe4 100644
--- a/homeassistant/components/homematicip_cloud/translations/it.json
+++ b/homeassistant/components/homematicip_cloud/translations/it.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il punto di accesso \u00e8 gi\u00e0 configurato",
-            "connection_aborted": "Impossibile connettersi al server HMIP",
-            "unknown": "Si \u00e8 verificato un errore sconosciuto."
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "connection_aborted": "Impossibile connettersi",
+            "unknown": "Errore imprevisto"
         },
         "error": {
             "invalid_pin": "PIN non valido, riprova.",
-            "invalid_sgtin_or_pin": "SGTIN o PIN non valido, riprovare.",
+            "invalid_sgtin_or_pin": "SGTIN o Codice PIN non valido, si prega di riprovare.",
             "press_the_button": "Si prega di premere il pulsante blu.",
             "register_failed": "Registrazione fallita, si prega di riprovare.",
             "timeout_button": "Timeout della pressione del pulsante blu, riprovare."
@@ -17,7 +17,7 @@
                 "data": {
                     "hapid": "ID del punto di accesso (SGTIN)",
                     "name": "Nome (opzionale, usato come prefisso del nome per tutti i dispositivi)",
-                    "pin": "Codice Pin (opzionale)"
+                    "pin": "Codice PIN"
                 },
                 "title": "Scegli punto di accesso HomematicIP"
             },
diff --git a/homeassistant/components/homematicip_cloud/translations/no.json b/homeassistant/components/homematicip_cloud/translations/no.json
index 9a20243c1b9..0c045c61db8 100644
--- a/homeassistant/components/homematicip_cloud/translations/no.json
+++ b/homeassistant/components/homematicip_cloud/translations/no.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Tilgangspunktet er allerede konfigurert",
-            "connection_aborted": "Kunne ikke koble til HMIP serveren",
-            "unknown": "Ukjent feil oppstod."
+            "already_configured": "Enheten er allerede konfigurert",
+            "connection_aborted": "Tilkobling mislyktes",
+            "unknown": "Uventet feil"
         },
         "error": {
             "invalid_pin": "Ugyldig PIN kode, pr\u00f8v igjen.",
-            "invalid_sgtin_or_pin": "Ugyldig SGTIN eller PIN-kode. Pr\u00f8v p\u00e5 nytt.",
+            "invalid_sgtin_or_pin": "Ugyldig SGTIN eller PIN-kode , pr\u00f8v igjen.",
             "press_the_button": "Vennligst trykk p\u00e5 den bl\u00e5 knappen.",
             "register_failed": "Kunne ikke registrere, vennligst pr\u00f8v igjen.",
             "timeout_button": "Bl\u00e5 knapp-trykk tok for lang tid, vennligst pr\u00f8v igjen."
@@ -16,8 +16,8 @@
             "init": {
                 "data": {
                     "hapid": "Tilgangspunkt-ID (SGTIN)",
-                    "name": "Navn (valgfritt, brukes som prefiks for alle enheter)",
-                    "pin": "PIN kode (valgfritt)"
+                    "name": "Navn (valgfritt, brukes som navneprefiks for alle enheter)",
+                    "pin": "PIN-kode"
                 },
                 "title": "Velg HomematicIP tilgangspunkt"
             },
diff --git a/homeassistant/components/homematicip_cloud/translations/pl.json b/homeassistant/components/homematicip_cloud/translations/pl.json
index c317bbddd26..a4ce55ce3d8 100644
--- a/homeassistant/components/homematicip_cloud/translations/pl.json
+++ b/homeassistant/components/homematicip_cloud/translations/pl.json
@@ -1,28 +1,28 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Punkt dost\u0119pu jest ju\u017c skonfigurowany.",
-            "connection_aborted": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z serwerem HMIP",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "connection_aborted": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
-            "invalid_pin": "Nieprawid\u0142owy kod PIN, spr\u00f3buj ponownie.",
-            "invalid_sgtin_or_pin": "Nieprawid\u0142owy kod PIN, spr\u00f3buj ponownie.",
-            "press_the_button": "Prosz\u0119 nacisn\u0105\u0107 niebieski przycisk.",
-            "register_failed": "Nie uda\u0142o si\u0119 zarejestrowa\u0107, spr\u00f3buj ponownie.",
-            "timeout_button": "Oczekiwania na naci\u015bni\u0119cie niebieskiego przycisku zako\u0144czone, spr\u00f3buj ponownie."
+            "invalid_pin": "Nieprawid\u0142owy kod PIN, spr\u00f3buj ponownie",
+            "invalid_sgtin_or_pin": "Nieprawid\u0142owy SGTIN lub kod PIN, spr\u00f3buj ponownie",
+            "press_the_button": "Prosz\u0119 nacisn\u0105\u0107 niebieski przycisk",
+            "register_failed": "Nie uda\u0142o si\u0119 zarejestrowa\u0107, spr\u00f3buj ponownie",
+            "timeout_button": "Oczekiwania na naci\u015bni\u0119cie niebieskiego przycisku zako\u0144czone, spr\u00f3buj ponownie"
         },
         "step": {
             "init": {
                 "data": {
                     "hapid": "ID punktu dost\u0119pu (SGTIN)",
                     "name": "Nazwa (opcjonalnie, u\u017cywana jako prefiks nazwy dla wszystkich urz\u0105dze\u0144)",
-                    "pin": "Kod PIN (opcjonalnie)"
+                    "pin": "Kod PIN"
                 },
                 "title": "Wybierz punkt dost\u0119pu HomematicIP"
             },
             "link": {
-                "description": "Naci\u015bnij niebieski przycisk na punkcie dost\u0119pu i przycisk przesy\u0142ania, aby zarejestrowa\u0107 HomematicIP w Home Assistant. \n\n![Location of button on bridge](/static/images/config_flows/config_homematicip_cloud.png)",
+                "description": "Naci\u015bnij niebieski przycisk na punkcie dost\u0119pu i przycisk przesy\u0142ania, aby zarejestrowa\u0107 HomematicIP w Home Assistant. \n\n![Umiejscowienie przycisku na mostku](/static/images/config_flows/config_homematicip_cloud.png)",
                 "title": "Po\u0142\u0105czenie z punktem dost\u0119pu"
             }
         }
diff --git a/homeassistant/components/homematicip_cloud/translations/ru.json b/homeassistant/components/homematicip_cloud/translations/ru.json
index b307140ef02..6a012260909 100644
--- a/homeassistant/components/homematicip_cloud/translations/ru.json
+++ b/homeassistant/components/homematicip_cloud/translations/ru.json
@@ -1,9 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "connection_aborted": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 HMIP.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "connection_aborted": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "error": {
             "invalid_pin": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 PIN-\u043a\u043e\u0434, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430.",
@@ -17,7 +17,7 @@
                 "data": {
                     "hapid": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0442\u043e\u0447\u043a\u0438 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 (SGTIN)",
                     "name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 (\u043d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u043a\u0430\u043a \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u0434\u043b\u044f \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u044f \u0432\u0441\u0435\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432)",
-                    "pin": "PIN-\u043a\u043e\u0434 (\u043d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e)"
+                    "pin": "PIN-\u043a\u043e\u0434"
                 },
                 "title": "HomematicIP Cloud"
             },
diff --git a/homeassistant/components/homematicip_cloud/translations/zh-Hant.json b/homeassistant/components/homematicip_cloud/translations/zh-Hant.json
index d339d3ec6a8..b49c1d6348d 100644
--- a/homeassistant/components/homematicip_cloud/translations/zh-Hant.json
+++ b/homeassistant/components/homematicip_cloud/translations/zh-Hant.json
@@ -1,9 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Access point \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "connection_aborted": "\u7121\u6cd5\u9023\u7dda\u81f3 HMIP \u4f3a\u670d\u5668",
-            "unknown": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "connection_aborted": "\u9023\u7dda\u5931\u6557",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "error": {
             "invalid_pin": "PIN \u78bc\u7121\u6548\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002",
@@ -17,7 +17,7 @@
                 "data": {
                     "hapid": "Access point ID (SGTIN)",
                     "name": "\u540d\u7a31\uff08\u9078\u9805\uff0c\u7528\u4ee5\u4f5c\u70ba\u6240\u6709\u8a2d\u5099\u7684\u5b57\u9996\u7528\uff09",
-                    "pin": "PIN \u78bc\uff08\u9078\u9805\uff09"
+                    "pin": "PIN \u78bc"
                 },
                 "title": "\u9078\u64c7 HomematicIP Access point"
             },
diff --git a/homeassistant/components/homematicip_cloud/weather.py b/homeassistant/components/homematicip_cloud/weather.py
index c845343c030..b880cfdf1cc 100644
--- a/homeassistant/components/homematicip_cloud/weather.py
+++ b/homeassistant/components/homematicip_cloud/weather.py
@@ -1,6 +1,4 @@
 """Support for HomematicIP Cloud weather devices."""
-import logging
-
 from homematicip.aio.device import (
     AsyncWeatherSensor,
     AsyncWeatherSensorPlus,
@@ -16,8 +14,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from . import DOMAIN as HMIPC_DOMAIN, HomematicipGenericEntity
 from .hap import HomematicipHAP
 
-_LOGGER = logging.getLogger(__name__)
-
 HOME_WEATHER_CONDITION = {
     WeatherCondition.CLEAR: "sunny",
     WeatherCondition.LIGHT_CLOUDY: "partlycloudy",
diff --git a/homeassistant/components/hp_ilo/sensor.py b/homeassistant/components/hp_ilo/sensor.py
index 1cb65292c7d..da597acb8b7 100644
--- a/homeassistant/components/hp_ilo/sensor.py
+++ b/homeassistant/components/hp_ilo/sensor.py
@@ -157,7 +157,9 @@ class HpIloSensor(Entity):
         ilo_data = getattr(self.hp_ilo_data.data, self._ilo_function)()
 
         if self._sensor_value_template is not None:
-            ilo_data = self._sensor_value_template.render(ilo_data=ilo_data)
+            ilo_data = self._sensor_value_template.render(
+                ilo_data=ilo_data, parse_result=False
+            )
 
         self._state = ilo_data
 
diff --git a/homeassistant/components/html5/notify.py b/homeassistant/components/html5/notify.py
index 6970ebbedb4..c07cddb7a9c 100644
--- a/homeassistant/components/html5/notify.py
+++ b/homeassistant/components/html5/notify.py
@@ -242,7 +242,9 @@ class HTML5PushRegistrationView(HomeAssistantView):
         try:
             hass = request.app["hass"]
 
-            await hass.async_add_job(save_json, self.json_path, self.registrations)
+            await hass.async_add_executor_job(
+                save_json, self.json_path, self.registrations
+            )
             return self.json_message("Push notification subscriber registered.")
         except HomeAssistantError:
             if previous_registration is not None:
@@ -288,7 +290,9 @@ class HTML5PushRegistrationView(HomeAssistantView):
         try:
             hass = request.app["hass"]
 
-            await hass.async_add_job(save_json, self.json_path, self.registrations)
+            await hass.async_add_executor_job(
+                save_json, self.json_path, self.registrations
+            )
         except HomeAssistantError:
             self.registrations[found] = reg
             return self.json_message(
diff --git a/homeassistant/components/http/ban.py b/homeassistant/components/http/ban.py
index 979fe7981f4..2c02cc7391f 100644
--- a/homeassistant/components/http/ban.py
+++ b/homeassistant/components/http/ban.py
@@ -137,7 +137,7 @@ async def process_wrong_login(request):
         new_ban = IpBan(remote_addr)
         request.app[KEY_BANNED_IPS].append(new_ban)
 
-        await hass.async_add_job(
+        await hass.async_add_executor_job(
             update_ip_bans_config, hass.config.path(IP_BANS_FILE), new_ban
         )
 
diff --git a/homeassistant/components/htu21d/sensor.py b/homeassistant/components/htu21d/sensor.py
index 5a0c81b083c..a9b235faa0b 100644
--- a/homeassistant/components/htu21d/sensor.py
+++ b/homeassistant/components/htu21d/sensor.py
@@ -41,12 +41,12 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     temp_unit = hass.config.units.temperature_unit
 
     bus = smbus.SMBus(config.get(CONF_I2C_BUS))
-    sensor = await hass.async_add_job(partial(HTU21D, bus, logger=_LOGGER))
+    sensor = await hass.async_add_executor_job(partial(HTU21D, bus, logger=_LOGGER))
     if not sensor.sample_ok:
         _LOGGER.error("HTU21D sensor not detected in bus %s", bus_number)
         return False
 
-    sensor_handler = await hass.async_add_job(HTU21DHandler, sensor)
+    sensor_handler = await hass.async_add_executor_job(HTU21DHandler, sensor)
 
     dev = [
         HTU21DSensor(sensor_handler, name, SENSOR_TEMPERATURE, temp_unit),
@@ -98,7 +98,7 @@ class HTU21DSensor(Entity):
 
     async def async_update(self):
         """Get the latest data from the HTU21D sensor and update the state."""
-        await self.hass.async_add_job(self._client.update)
+        await self.hass.async_add_executor_job(self._client.update)
         if self._client.sensor.sample_ok:
             if self._variable == SENSOR_TEMPERATURE:
                 value = round(self._client.sensor.temperature, 1)
diff --git a/homeassistant/components/huawei_lte/__init__.py b/homeassistant/components/huawei_lte/__init__.py
index c0db281d768..c341f75c2e5 100644
--- a/homeassistant/components/huawei_lte/__init__.py
+++ b/homeassistant/components/huawei_lte/__init__.py
@@ -6,7 +6,7 @@ from functools import partial
 import ipaddress
 import logging
 import time
-from typing import Any, Callable, Dict, List, Set, Tuple
+from typing import Any, Callable, Dict, List, Set, Tuple, cast
 from urllib.parse import urlparse
 
 import attr
@@ -23,7 +23,9 @@ from url_normalize import url_normalize
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
-from homeassistant.components.device_tracker import DOMAIN as DEVICE_TRACKER_DOMAIN
+from homeassistant.components.device_tracker.const import (
+    DOMAIN as DEVICE_TRACKER_DOMAIN,
+)
 from homeassistant.components.notify import DOMAIN as NOTIFY_DOMAIN
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
@@ -36,7 +38,7 @@ from homeassistant.const import (
     CONF_USERNAME,
     EVENT_HOMEASSISTANT_STOP,
 )
-from homeassistant.core import CALLBACK_TYPE
+from homeassistant.core import CALLBACK_TYPE, ServiceCall
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import (
     config_validation as cv,
@@ -50,7 +52,7 @@ from homeassistant.helpers.dispatcher import (
 )
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import async_track_time_interval
-from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.typing import ConfigType, HomeAssistantType
 
 from .const import (
     ADMIN_SERVICES,
@@ -146,7 +148,7 @@ class Router:
     suspended = attr.ib(init=False, default=False)
     notify_last_attempt: float = attr.ib(init=False, default=-1)
 
-    def __attrs_post_init__(self):
+    def __attrs_post_init__(self) -> None:
         """Set up internal state on init."""
         self.client = Client(self.connection)
 
@@ -158,7 +160,7 @@ class Router:
             (KEY_DEVICE_INFORMATION, "DeviceName"),
         ):
             try:
-                return self.data[key][item]
+                return cast(str, self.data[key][item])
             except (KeyError, TypeError):
                 pass
         return DEFAULT_DEVICE_NAME
@@ -176,7 +178,7 @@ class Router:
         """Get router connections for device registry."""
         return {(dr.CONNECTION_NETWORK_MAC, self.mac)} if self.mac else set()
 
-    def _get_data(self, key: str, func: Callable[[None], Any]) -> None:
+    def _get_data(self, key: str, func: Callable[[], Any]) -> None:
         if not self.subscriptions.get(key):
             return
         if key in self.inflight_gets:
@@ -275,7 +277,7 @@ class Router:
         except Exception:  # pylint: disable=broad-except
             _LOGGER.warning("Logout error", exc_info=True)
 
-    def cleanup(self, *_) -> None:
+    def cleanup(self, *_: Any) -> None:
         """Clean up resources."""
 
         self.subscriptions.clear()
@@ -359,7 +361,7 @@ async def async_setup_entry(hass: HomeAssistantType, config_entry: ConfigEntry)
         username = config_entry.data.get(CONF_USERNAME)
         password = config_entry.data.get(CONF_PASSWORD)
         if username or password:
-            connection = AuthorizedConnection(
+            connection: Connection = AuthorizedConnection(
                 url, username=username, password=password, timeout=CONNECTION_TIMEOUT
             )
         else:
@@ -465,7 +467,7 @@ async def async_unload_entry(
     return True
 
 
-async def async_setup(hass: HomeAssistantType, config) -> bool:
+async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
     """Set up Huawei LTE component."""
 
     # dicttoxml (used by huawei-lte-api) has uselessly verbose INFO level.
@@ -473,13 +475,13 @@ async def async_setup(hass: HomeAssistantType, config) -> bool:
     logging.getLogger("dicttoxml").setLevel(logging.WARNING)
 
     # Arrange our YAML config to dict with normalized URLs as keys
-    domain_config = {}
+    domain_config: Dict[str, Dict[str, Any]] = {}
     if DOMAIN not in hass.data:
         hass.data[DOMAIN] = HuaweiLteData(hass_config=config, config=domain_config)
     for router_config in config.get(DOMAIN, []):
         domain_config[url_normalize(router_config.pop(CONF_URL))] = router_config
 
-    def service_handler(service) -> None:
+    def service_handler(service: ServiceCall) -> None:
         """Apply a service."""
         url = service.data.get(CONF_URL)
         routers = hass.data[DOMAIN].routers
@@ -555,10 +557,12 @@ async def async_signal_options_update(
     async_dispatcher_send(hass, UPDATE_OPTIONS_SIGNAL, config_entry)
 
 
-async def async_migrate_entry(hass: HomeAssistantType, config_entry: ConfigEntry):
+async def async_migrate_entry(
+    hass: HomeAssistantType, config_entry: ConfigEntry
+) -> bool:
     """Migrate config entry to new version."""
     if config_entry.version == 1:
-        options = config_entry.options
+        options = dict(config_entry.options)
         recipient = options.get(CONF_RECIPIENT)
         if isinstance(recipient, str):
             options[CONF_RECIPIENT] = [x.strip() for x in recipient.split(",")]
@@ -623,6 +627,7 @@ class HuaweiLteBaseEntity(Entity):
 
     async def async_added_to_hass(self) -> None:
         """Connect to update signals."""
+        assert self.hass is not None
         self._unsub_handlers.append(
             async_dispatcher_connect(self.hass, UPDATE_SIGNAL, self._async_maybe_update)
         )
diff --git a/homeassistant/components/huawei_lte/binary_sensor.py b/homeassistant/components/huawei_lte/binary_sensor.py
index 2b55245719b..9a5f148d138 100644
--- a/homeassistant/components/huawei_lte/binary_sensor.py
+++ b/homeassistant/components/huawei_lte/binary_sensor.py
@@ -1,7 +1,7 @@
 """Support for Huawei LTE binary sensors."""
 
 import logging
-from typing import Optional
+from typing import Any, Callable, Dict, List, Optional
 
 import attr
 from huawei_lte_api.enums.cradle import ConnectionStatusEnum
@@ -10,7 +10,10 @@ from homeassistant.components.binary_sensor import (
     DOMAIN as BINARY_SENSOR_DOMAIN,
     BinarySensorEntity,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_URL
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.typing import HomeAssistantType
 
 from . import HuaweiLteBaseEntity
 from .const import (
@@ -23,10 +26,14 @@ from .const import (
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass, config_entry, async_add_entities):
+async def async_setup_entry(
+    hass: HomeAssistantType,
+    config_entry: ConfigEntry,
+    async_add_entities: Callable[[List[Entity], bool], None],
+) -> None:
     """Set up from config entry."""
     router = hass.data[DOMAIN].routers[config_entry.data[CONF_URL]]
-    entities = []
+    entities: List[Entity] = []
 
     if router.data.get(KEY_MONITORING_STATUS):
         entities.append(HuaweiLteMobileConnectionBinarySensor(router))
@@ -57,28 +64,31 @@ class HuaweiLteBaseBinarySensor(HuaweiLteBaseEntity, BinarySensorEntity):
     def _device_unique_id(self) -> str:
         return f"{self.key}.{self.item}"
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Subscribe to needed data on add."""
         await super().async_added_to_hass()
         self.router.subscriptions[self.key].add(f"{BINARY_SENSOR_DOMAIN}/{self.item}")
 
-    async def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self) -> None:
         """Unsubscribe from needed data on remove."""
         await super().async_will_remove_from_hass()
         self.router.subscriptions[self.key].remove(
             f"{BINARY_SENSOR_DOMAIN}/{self.item}"
         )
 
-    async def async_update(self):
+    async def async_update(self) -> None:
         """Update state."""
         try:
             value = self.router.data[self.key][self.item]
         except KeyError:
+            value = None
             _LOGGER.debug("%s[%s] not in data", self.key, self.item)
+        if value is None:
+            self._raw_state = value
             self._available = False
-            return
-        self._available = True
-        self._raw_state = str(value)
+        else:
+            self._raw_state = str(value)
+            self._available = True
 
 
 CONNECTION_STATE_ATTRIBUTES = {
@@ -94,7 +104,7 @@ CONNECTION_STATE_ATTRIBUTES = {
 class HuaweiLteMobileConnectionBinarySensor(HuaweiLteBaseBinarySensor):
     """Huawei LTE mobile connection binary sensor."""
 
-    def __attrs_post_init__(self):
+    def __attrs_post_init__(self) -> None:
         """Initialize identifiers."""
         self.key = KEY_MONITORING_STATUS
         self.item = "ConnectionStatus"
@@ -106,9 +116,10 @@ class HuaweiLteMobileConnectionBinarySensor(HuaweiLteBaseBinarySensor):
     @property
     def is_on(self) -> bool:
         """Return whether the binary sensor is on."""
-        return self._raw_state and int(self._raw_state) in (
-            ConnectionStatusEnum.CONNECTED,
-            ConnectionStatusEnum.DISCONNECTING,
+        return bool(
+            self._raw_state
+            and int(self._raw_state)
+            in (ConnectionStatusEnum.CONNECTED, ConnectionStatusEnum.DISCONNECTING)
         )
 
     @property
@@ -121,7 +132,7 @@ class HuaweiLteMobileConnectionBinarySensor(HuaweiLteBaseBinarySensor):
         )
 
     @property
-    def icon(self):
+    def icon(self) -> str:
         """Return mobile connectivity sensor icon."""
         return "mdi:signal" if self.is_on else "mdi:signal-off"
 
@@ -131,7 +142,7 @@ class HuaweiLteMobileConnectionBinarySensor(HuaweiLteBaseBinarySensor):
         return True
 
     @property
-    def device_state_attributes(self):
+    def device_state_attributes(self) -> Optional[Dict[str, Any]]:
         """Get additional attributes related to connection status."""
         attributes = super().device_state_attributes
         if self._raw_state in CONNECTION_STATE_ATTRIBUTES:
@@ -157,7 +168,7 @@ class HuaweiLteBaseWifiStatusBinarySensor(HuaweiLteBaseBinarySensor):
         return self._raw_state is None
 
     @property
-    def icon(self):
+    def icon(self) -> str:
         """Return WiFi status sensor icon."""
         return "mdi:wifi" if self.is_on else "mdi:wifi-off"
 
@@ -166,7 +177,7 @@ class HuaweiLteBaseWifiStatusBinarySensor(HuaweiLteBaseBinarySensor):
 class HuaweiLteWifiStatusBinarySensor(HuaweiLteBaseWifiStatusBinarySensor):
     """Huawei LTE WiFi status binary sensor."""
 
-    def __attrs_post_init__(self):
+    def __attrs_post_init__(self) -> None:
         """Initialize identifiers."""
         self.key = KEY_MONITORING_STATUS
         self.item = "WifiStatus"
@@ -180,7 +191,7 @@ class HuaweiLteWifiStatusBinarySensor(HuaweiLteBaseWifiStatusBinarySensor):
 class HuaweiLteWifi24ghzStatusBinarySensor(HuaweiLteBaseWifiStatusBinarySensor):
     """Huawei LTE 2.4GHz WiFi status binary sensor."""
 
-    def __attrs_post_init__(self):
+    def __attrs_post_init__(self) -> None:
         """Initialize identifiers."""
         self.key = KEY_WLAN_WIFI_FEATURE_SWITCH
         self.item = "wifi24g_switch_enable"
@@ -194,7 +205,7 @@ class HuaweiLteWifi24ghzStatusBinarySensor(HuaweiLteBaseWifiStatusBinarySensor):
 class HuaweiLteWifi5ghzStatusBinarySensor(HuaweiLteBaseWifiStatusBinarySensor):
     """Huawei LTE 5GHz WiFi status binary sensor."""
 
-    def __attrs_post_init__(self):
+    def __attrs_post_init__(self) -> None:
         """Initialize identifiers."""
         self.key = KEY_WLAN_WIFI_FEATURE_SWITCH
         self.item = "wifi5g_enabled"
@@ -208,7 +219,7 @@ class HuaweiLteWifi5ghzStatusBinarySensor(HuaweiLteBaseWifiStatusBinarySensor):
 class HuaweiLteSmsStorageFullBinarySensor(HuaweiLteBaseBinarySensor):
     """Huawei LTE SMS storage full binary sensor."""
 
-    def __attrs_post_init__(self):
+    def __attrs_post_init__(self) -> None:
         """Initialize identifiers."""
         self.key = KEY_MONITORING_CHECK_NOTIFICATIONS
         self.item = "SmsStorageFull"
@@ -228,6 +239,6 @@ class HuaweiLteSmsStorageFullBinarySensor(HuaweiLteBaseBinarySensor):
         return self._raw_state is None
 
     @property
-    def icon(self):
+    def icon(self) -> str:
         """Return WiFi status sensor icon."""
         return "mdi:email-alert" if self.is_on else "mdi:email-off"
diff --git a/homeassistant/components/huawei_lte/config_flow.py b/homeassistant/components/huawei_lte/config_flow.py
index 9d5ce40074d..ba8baedcaf7 100644
--- a/homeassistant/components/huawei_lte/config_flow.py
+++ b/homeassistant/components/huawei_lte/config_flow.py
@@ -2,7 +2,7 @@
 
 from collections import OrderedDict
 import logging
-from typing import Optional
+from typing import Any, Dict, Optional
 from urllib.parse import urlparse
 
 from huawei_lte_api.AuthorizedConnection import AuthorizedConnection
@@ -46,11 +46,17 @@ class ConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
     @staticmethod
     @callback
-    def async_get_options_flow(config_entry):
+    def async_get_options_flow(
+        config_entry: config_entries.ConfigEntry,
+    ) -> "OptionsFlowHandler":
         """Get options flow."""
         return OptionsFlowHandler(config_entry)
 
-    async def _async_show_user_form(self, user_input=None, errors=None):
+    async def _async_show_user_form(
+        self,
+        user_input: Optional[Dict[str, Any]] = None,
+        errors: Optional[Dict[str, str]] = None,
+    ) -> Dict[str, Any]:
         if user_input is None:
             user_input = {}
         return self.async_show_form(
@@ -89,11 +95,13 @@ class ConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             errors=errors or {},
         )
 
-    async def async_step_import(self, user_input=None):
+    async def async_step_import(
+        self, user_input: Optional[Dict[str, Any]] = None
+    ) -> Dict[str, Any]:
         """Handle import initiated config flow."""
         return await self.async_step_user(user_input)
 
-    def _already_configured(self, user_input):
+    def _already_configured(self, user_input: Dict[str, Any]) -> bool:
         """See if we already have a router matching user input configured."""
         existing_urls = {
             url_normalize(entry.data[CONF_URL], default_scheme="http")
@@ -101,7 +109,9 @@ class ConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         }
         return user_input[CONF_URL] in existing_urls
 
-    async def async_step_user(self, user_input=None):
+    async def async_step_user(
+        self, user_input: Optional[Dict[str, Any]] = None
+    ) -> Dict[str, Any]:
         """Handle user initiated config flow."""
         if user_input is None:
             return await self._async_show_user_form()
@@ -121,17 +131,20 @@ class ConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         if self._already_configured(user_input):
             return self.async_abort(reason="already_configured")
 
-        conn = None
+        conn: Optional[Connection] = None
 
-        def logout():
-            if hasattr(conn, "user"):
+        def logout() -> None:
+            if isinstance(conn, AuthorizedConnection):
                 try:
                     conn.user.logout()
                 except Exception:  # pylint: disable=broad-except
                     _LOGGER.debug("Could not logout", exc_info=True)
 
-        def try_connect(username: Optional[str], password: Optional[str]) -> Connection:
+        def try_connect(user_input: Dict[str, Any]) -> Connection:
             """Try connecting with given credentials."""
+            username = user_input.get(CONF_USERNAME)
+            password = user_input.get(CONF_PASSWORD)
+            conn: Connection
             if username or password:
                 conn = AuthorizedConnection(
                     user_input[CONF_URL],
@@ -178,18 +191,15 @@ class ConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                     title = info.get("DeviceName")
             return title or DEFAULT_DEVICE_NAME
 
-        username = user_input.get(CONF_USERNAME)
-        password = user_input.get(CONF_PASSWORD)
+        assert self.hass is not None
         try:
-            conn = await self.hass.async_add_executor_job(
-                try_connect, username, password
-            )
+            conn = await self.hass.async_add_executor_job(try_connect, user_input)
         except LoginErrorUsernameWrongException:
             errors[CONF_USERNAME] = "incorrect_username"
         except LoginErrorPasswordWrongException:
             errors[CONF_PASSWORD] = "incorrect_password"
         except LoginErrorUsernamePasswordWrongException:
-            errors[CONF_USERNAME] = "incorrect_username_or_password"
+            errors[CONF_USERNAME] = "invalid_auth"
         except LoginErrorUsernamePasswordOverrunException:
             errors["base"] = "login_attempts_exceeded"
         except ResponseErrorException:
@@ -200,7 +210,7 @@ class ConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             errors[CONF_URL] = "connection_timeout"
         except Exception:  # pylint: disable=broad-except
             _LOGGER.warning("Unknown error connecting to device", exc_info=True)
-            errors[CONF_URL] = "unknown_connection_error"
+            errors[CONF_URL] = "unknown"
         if errors:
             await self.hass.async_add_executor_job(logout)
             return await self._async_show_user_form(
@@ -215,7 +225,9 @@ class ConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
         return self.async_create_entry(title=title, data=user_input)
 
-    async def async_step_ssdp(self, discovery_info):
+    async def async_step_ssdp(  # type: ignore  # mypy says signature incompatible with supertype, but it's the same?
+        self, discovery_info: Dict[str, Any]
+    ) -> Dict[str, Any]:
         """Handle SSDP initiated config flow."""
         await self.async_set_unique_id(discovery_info[ssdp.ATTR_UPNP_UDN])
         self._abort_if_unique_id_configured()
@@ -256,7 +268,9 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
         """Initialize options flow."""
         self.config_entry = config_entry
 
-    async def async_step_init(self, user_input=None):
+    async def async_step_init(
+        self, user_input: Optional[Dict[str, Any]] = None
+    ) -> Dict[str, Any]:
         """Handle options flow."""
 
         # Recipients are persisted as a list, but handled as comma separated string in UI
diff --git a/homeassistant/components/huawei_lte/device_tracker.py b/homeassistant/components/huawei_lte/device_tracker.py
index 80578fce7d9..52e59b713dd 100644
--- a/homeassistant/components/huawei_lte/device_tracker.py
+++ b/homeassistant/components/huawei_lte/device_tracker.py
@@ -2,20 +2,23 @@
 
 import logging
 import re
-from typing import Any, Dict, List, Optional, Set
+from typing import Any, Callable, Dict, List, Optional, Set, cast
 
 import attr
 from stringcase import snakecase
 
-from homeassistant.components.device_tracker import (
+from homeassistant.components.device_tracker.config_entry import ScannerEntity
+from homeassistant.components.device_tracker.const import (
     DOMAIN as DEVICE_TRACKER_DOMAIN,
     SOURCE_TYPE_ROUTER,
 )
-from homeassistant.components.device_tracker.config_entry import ScannerEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_URL
 from homeassistant.core import callback
 from homeassistant.helpers import entity_registry
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.typing import HomeAssistantType
 
 from . import HuaweiLteBaseEntity
 from .const import DOMAIN, KEY_WLAN_HOST_LIST, UPDATE_SIGNAL
@@ -25,7 +28,11 @@ _LOGGER = logging.getLogger(__name__)
 _DEVICE_SCAN = f"{DEVICE_TRACKER_DOMAIN}/device_scan"
 
 
-async def async_setup_entry(hass, config_entry, async_add_entities):
+async def async_setup_entry(
+    hass: HomeAssistantType,
+    config_entry: ConfigEntry,
+    async_add_entities: Callable[[List[Entity], bool], None],
+) -> None:
     """Set up from config entry."""
 
     # Grab hosts list once to examine whether the initial fetch has got some data for
@@ -41,7 +48,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     # Initialize already tracked entities
     tracked: Set[str] = set()
     registry = await entity_registry.async_get_registry(hass)
-    known_entities: List[HuaweiLteScannerEntity] = []
+    known_entities: List[Entity] = []
     for entity in registry.entities.values():
         if (
             entity.domain == DEVICE_TRACKER_DOMAIN
@@ -72,7 +79,12 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
 
 @callback
-def async_add_new_entities(hass, router_url, async_add_entities, tracked):
+def async_add_new_entities(
+    hass: HomeAssistantType,
+    router_url: str,
+    async_add_entities: Callable[[List[Entity], bool], None],
+    tracked: Set[str],
+) -> None:
     """Add new entities that are not already being tracked."""
     router = hass.data[DOMAIN].routers[router_url]
     try:
@@ -81,7 +93,7 @@ def async_add_new_entities(hass, router_url, async_add_entities, tracked):
         _LOGGER.debug("%s[%s][%s] not in data", KEY_WLAN_HOST_LIST, "Hosts", "Host")
         return
 
-    new_entities = []
+    new_entities: List[Entity] = []
     for host in (x for x in hosts if x.get("MacAddress")):
         entity = HuaweiLteScannerEntity(router, host["MacAddress"])
         if entity.unique_id in tracked:
@@ -103,7 +115,7 @@ def _better_snakecase(text: str) -> str:
             lambda match: f"{match.group(1)}{match.group(2).lower()}{match.group(3)}",
             text,
         )
-    return snakecase(text)
+    return cast(str, snakecase(text))
 
 
 @attr.s
@@ -116,7 +128,7 @@ class HuaweiLteScannerEntity(HuaweiLteBaseEntity, ScannerEntity):
     _hostname: Optional[str] = attr.ib(init=False, default=None)
     _device_state_attributes: Dict[str, Any] = attr.ib(init=False, factory=dict)
 
-    def __attrs_post_init__(self):
+    def __attrs_post_init__(self) -> None:
         """Initialize internal state."""
         self._device_state_attributes["mac_address"] = self.mac
 
@@ -148,7 +160,7 @@ class HuaweiLteScannerEntity(HuaweiLteBaseEntity, ScannerEntity):
         hosts = self.router.data[KEY_WLAN_HOST_LIST]["Hosts"]["Host"]
         host = next((x for x in hosts if x.get("MacAddress") == self.mac), None)
         self._is_connected = host is not None
-        if self._is_connected:
+        if host is not None:
             self._hostname = host.get("HostName")
             self._device_state_attributes = {
                 _better_snakecase(k): v for k, v in host.items() if k != "HostName"
diff --git a/homeassistant/components/huawei_lte/notify.py b/homeassistant/components/huawei_lte/notify.py
index 375ced911c8..5659e66ea98 100644
--- a/homeassistant/components/huawei_lte/notify.py
+++ b/homeassistant/components/huawei_lte/notify.py
@@ -2,13 +2,14 @@
 
 import logging
 import time
-from typing import Any, List
+from typing import Any, Dict, List, Optional
 
 import attr
 from huawei_lte_api.exceptions import ResponseErrorException
 
 from homeassistant.components.notify import ATTR_TARGET, BaseNotificationService
 from homeassistant.const import CONF_RECIPIENT, CONF_URL
+from homeassistant.helpers.typing import HomeAssistantType
 
 from . import Router
 from .const import DOMAIN
@@ -16,7 +17,11 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_get_service(hass, config, discovery_info=None):
+async def async_get_service(
+    hass: HomeAssistantType,
+    config: Dict[str, Any],
+    discovery_info: Optional[Dict[str, Any]] = None,
+) -> Optional["HuaweiLteSmsNotificationService"]:
     """Get the notification service."""
     if discovery_info is None:
         return None
diff --git a/homeassistant/components/huawei_lte/sensor.py b/homeassistant/components/huawei_lte/sensor.py
index 591506df652..3815ac831b5 100644
--- a/homeassistant/components/huawei_lte/sensor.py
+++ b/homeassistant/components/huawei_lte/sensor.py
@@ -1,23 +1,28 @@
 """Support for Huawei LTE sensors."""
 
+from bisect import bisect
 import logging
 import re
-from typing import Callable, Dict, NamedTuple, Optional, Pattern, Tuple, Union
+from typing import Callable, Dict, List, NamedTuple, Optional, Pattern, Tuple, Union
 
 import attr
 
 from homeassistant.components.sensor import (
+    DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_SIGNAL_STRENGTH,
     DOMAIN as SENSOR_DOMAIN,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_URL,
     DATA_BYTES,
     DATA_RATE_BYTES_PER_SECOND,
+    PERCENTAGE,
     STATE_UNKNOWN,
     TIME_SECONDS,
 )
-from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.typing import HomeAssistantType, StateType
 
 from . import HuaweiLteBaseEntity
 from .const import (
@@ -65,11 +70,11 @@ SENSOR_META: Dict[Union[str, Tuple[str, str]], SensorMeta] = {
     (KEY_DEVICE_SIGNAL, "dl_mcs"): SensorMeta(name="Downlink MCS"),
     (KEY_DEVICE_SIGNAL, "dlbandwidth"): SensorMeta(
         name="Downlink bandwidth",
-        icon=lambda x: (x is None or x < 8)
-        and "mdi:speedometer-slow"
-        or x < 15
-        and "mdi:speedometer-medium"
-        or "mdi:speedometer",
+        icon=lambda x: (
+            "mdi:speedometer-slow",
+            "mdi:speedometer-medium",
+            "mdi:speedometer",
+        )[bisect((8, 15), x if x is not None else -1000)],
     ),
     (KEY_DEVICE_SIGNAL, "earfcn"): SensorMeta(name="EARFCN"),
     (KEY_DEVICE_SIGNAL, "lac"): SensorMeta(name="LAC", icon="mdi:map-marker"),
@@ -85,11 +90,11 @@ SENSOR_META: Dict[Union[str, Tuple[str, str]], SensorMeta] = {
     (KEY_DEVICE_SIGNAL, "ul_mcs"): SensorMeta(name="Uplink MCS"),
     (KEY_DEVICE_SIGNAL, "ulbandwidth"): SensorMeta(
         name="Uplink bandwidth",
-        icon=lambda x: (x is None or x < 8)
-        and "mdi:speedometer-slow"
-        or x < 15
-        and "mdi:speedometer-medium"
-        or "mdi:speedometer",
+        icon=lambda x: (
+            "mdi:speedometer-slow",
+            "mdi:speedometer-medium",
+            "mdi:speedometer",
+        )[bisect((8, 15), x if x is not None else -1000)],
     ),
     (KEY_DEVICE_SIGNAL, "mode"): SensorMeta(
         name="Mode",
@@ -100,77 +105,71 @@ SENSOR_META: Dict[Union[str, Tuple[str, str]], SensorMeta] = {
         name="RSRQ",
         device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
         # http://www.lte-anbieter.info/technik/rsrq.php
-        icon=lambda x: (x is None or x < -11)
-        and "mdi:signal-cellular-outline"
-        or x < -8
-        and "mdi:signal-cellular-1"
-        or x < -5
-        and "mdi:signal-cellular-2"
-        or "mdi:signal-cellular-3",
+        icon=lambda x: (
+            "mdi:signal-cellular-outline",
+            "mdi:signal-cellular-1",
+            "mdi:signal-cellular-2",
+            "mdi:signal-cellular-3",
+        )[bisect((-11, -8, -5), x if x is not None else -1000)],
         enabled_default=True,
     ),
     (KEY_DEVICE_SIGNAL, "rsrp"): SensorMeta(
         name="RSRP",
         device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
         # http://www.lte-anbieter.info/technik/rsrp.php
-        icon=lambda x: (x is None or x < -110)
-        and "mdi:signal-cellular-outline"
-        or x < -95
-        and "mdi:signal-cellular-1"
-        or x < -80
-        and "mdi:signal-cellular-2"
-        or "mdi:signal-cellular-3",
+        icon=lambda x: (
+            "mdi:signal-cellular-outline",
+            "mdi:signal-cellular-1",
+            "mdi:signal-cellular-2",
+            "mdi:signal-cellular-3",
+        )[bisect((-110, -95, -80), x if x is not None else -1000)],
         enabled_default=True,
     ),
     (KEY_DEVICE_SIGNAL, "rssi"): SensorMeta(
         name="RSSI",
         device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
         # https://eyesaas.com/wi-fi-signal-strength/
-        icon=lambda x: (x is None or x < -80)
-        and "mdi:signal-cellular-outline"
-        or x < -70
-        and "mdi:signal-cellular-1"
-        or x < -60
-        and "mdi:signal-cellular-2"
-        or "mdi:signal-cellular-3",
+        icon=lambda x: (
+            "mdi:signal-cellular-outline",
+            "mdi:signal-cellular-1",
+            "mdi:signal-cellular-2",
+            "mdi:signal-cellular-3",
+        )[bisect((-80, -70, -60), x if x is not None else -1000)],
         enabled_default=True,
     ),
     (KEY_DEVICE_SIGNAL, "sinr"): SensorMeta(
         name="SINR",
         device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
         # http://www.lte-anbieter.info/technik/sinr.php
-        icon=lambda x: (x is None or x < 0)
-        and "mdi:signal-cellular-outline"
-        or x < 5
-        and "mdi:signal-cellular-1"
-        or x < 10
-        and "mdi:signal-cellular-2"
-        or "mdi:signal-cellular-3",
+        icon=lambda x: (
+            "mdi:signal-cellular-outline",
+            "mdi:signal-cellular-1",
+            "mdi:signal-cellular-2",
+            "mdi:signal-cellular-3",
+        )[bisect((0, 5, 10), x if x is not None else -1000)],
         enabled_default=True,
     ),
     (KEY_DEVICE_SIGNAL, "rscp"): SensorMeta(
         name="RSCP",
         device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
         # https://wiki.teltonika.lt/view/RSCP
-        icon=lambda x: (x is None or x < -95)
-        and "mdi:signal-cellular-outline"
-        or x < -85
-        and "mdi:signal-cellular-1"
-        or x < -75
-        and "mdi:signal-cellular-2"
-        or "mdi:signal-cellular-3",
+        icon=lambda x: (
+            "mdi:signal-cellular-outline",
+            "mdi:signal-cellular-1",
+            "mdi:signal-cellular-2",
+            "mdi:signal-cellular-3",
+        )[bisect((-95, -85, -75), x if x is not None else -1000)],
     ),
     (KEY_DEVICE_SIGNAL, "ecio"): SensorMeta(
         name="EC/IO",
         device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
         # https://wiki.teltonika.lt/view/EC/IO
-        icon=lambda x: (x is None or x < -20)
-        and "mdi:signal-cellular-outline"
-        or x < -10
-        and "mdi:signal-cellular-1"
-        or x < -6
-        and "mdi:signal-cellular-2"
-        or "mdi:signal-cellular-3",
+        icon=lambda x: (
+            "mdi:signal-cellular-outline",
+            "mdi:signal-cellular-1",
+            "mdi:signal-cellular-2",
+            "mdi:signal-cellular-3",
+        )[bisect((-20, -10, -6), x if x is not None else -1000)],
     ),
     KEY_MONITORING_CHECK_NOTIFICATIONS: SensorMeta(
         exclude=re.compile(
@@ -192,9 +191,15 @@ SENSOR_META: Dict[Union[str, Tuple[str, str]], SensorMeta] = {
     ),
     KEY_MONITORING_STATUS: SensorMeta(
         include=re.compile(
-            r"^(currentwifiuser|(primary|secondary).*dns)$", re.IGNORECASE
+            r"^(batterypercent|currentwifiuser|(primary|secondary).*dns)$",
+            re.IGNORECASE,
         )
     ),
+    (KEY_MONITORING_STATUS, "BatteryPercent"): SensorMeta(
+        name="Battery",
+        device_class=DEVICE_CLASS_BATTERY,
+        unit=PERCENTAGE,
+    ),
     (KEY_MONITORING_STATUS, "CurrentWifiUser"): SensorMeta(
         name="WiFi clients connected", icon="mdi:wifi"
     ),
@@ -321,10 +326,14 @@ SENSOR_META: Dict[Union[str, Tuple[str, str]], SensorMeta] = {
 }
 
 
-async def async_setup_entry(hass, config_entry, async_add_entities):
+async def async_setup_entry(
+    hass: HomeAssistantType,
+    config_entry: ConfigEntry,
+    async_add_entities: Callable[[List[Entity], bool], None],
+) -> None:
     """Set up from config entry."""
     router = hass.data[DOMAIN].routers[config_entry.data[CONF_URL]]
-    sensors = []
+    sensors: List[Entity] = []
     for key in SENSOR_KEYS:
         items = router.data.get(key)
         if not items:
@@ -345,7 +354,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities(sensors, True)
 
 
-def format_default(value):
+def format_default(value: StateType) -> Tuple[StateType, Optional[str]]:
     """Format value."""
     unit = None
     if value is not None:
@@ -370,15 +379,15 @@ class HuaweiLteSensor(HuaweiLteBaseEntity):
     item: str = attr.ib()
     meta: SensorMeta = attr.ib()
 
-    _state = attr.ib(init=False, default=STATE_UNKNOWN)
-    _unit: str = attr.ib(init=False)
+    _state: StateType = attr.ib(init=False, default=STATE_UNKNOWN)
+    _unit: Optional[str] = attr.ib(init=False)
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Subscribe to needed data on add."""
         await super().async_added_to_hass()
         self.router.subscriptions[self.key].add(f"{SENSOR_DOMAIN}/{self.item}")
 
-    async def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self) -> None:
         """Unsubscribe from needed data on remove."""
         await super().async_will_remove_from_hass()
         self.router.subscriptions[self.key].remove(f"{SENSOR_DOMAIN}/{self.item}")
@@ -392,7 +401,7 @@ class HuaweiLteSensor(HuaweiLteBaseEntity):
         return f"{self.key}.{self.item}"
 
     @property
-    def state(self):
+    def state(self) -> StateType:
         """Return sensor state."""
         return self._state
 
@@ -402,12 +411,12 @@ class HuaweiLteSensor(HuaweiLteBaseEntity):
         return self.meta.device_class
 
     @property
-    def unit_of_measurement(self):
+    def unit_of_measurement(self) -> Optional[str]:
         """Return sensor's unit of measurement."""
         return self.meta.unit or self._unit
 
     @property
-    def icon(self):
+    def icon(self) -> Optional[str]:
         """Return icon for sensor."""
         icon = self.meta.icon
         if callable(icon):
@@ -419,18 +428,17 @@ class HuaweiLteSensor(HuaweiLteBaseEntity):
         """Return if the entity should be enabled when first added to the entity registry."""
         return self.meta.enabled_default
 
-    async def async_update(self):
+    async def async_update(self) -> None:
         """Update state."""
         try:
             value = self.router.data[self.key][self.item]
         except KeyError:
             _LOGGER.debug("%s[%s] not in data", self.key, self.item)
-            self._available = False
-            return
-        self._available = True
+            value = None
 
         formatter = self.meta.formatter
         if not callable(formatter):
             formatter = format_default
 
         self._state, self._unit = formatter(value)
+        self._available = value is not None
diff --git a/homeassistant/components/huawei_lte/strings.json b/homeassistant/components/huawei_lte/strings.json
index 8435d0a5347..00994f8b0a0 100644
--- a/homeassistant/components/huawei_lte/strings.json
+++ b/homeassistant/components/huawei_lte/strings.json
@@ -1,20 +1,19 @@
 {
   "config": {
     "abort": {
-      "already_configured": "This device has already been configured",
-      "already_in_progress": "This device is already being configured",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "not_huawei_lte": "Not a Huawei LTE device"
     },
     "error": {
-      "connection_failed": "Connection failed",
       "connection_timeout": "Connection timeout",
       "incorrect_password": "Incorrect password",
       "incorrect_username": "Incorrect username",
-      "incorrect_username_or_password": "Incorrect username or password",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "invalid_url": "Invalid URL",
       "login_attempts_exceeded": "Maximum login attempts exceeded, please try again later",
       "response_error": "Unknown error from device",
-      "unknown_connection_error": "Unknown error connecting to device"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "flow_title": "Huawei LTE: {name}",
     "step": {
diff --git a/homeassistant/components/huawei_lte/switch.py b/homeassistant/components/huawei_lte/switch.py
index 45b179f470f..4dfa1e32df2 100644
--- a/homeassistant/components/huawei_lte/switch.py
+++ b/homeassistant/components/huawei_lte/switch.py
@@ -1,7 +1,7 @@
 """Support for Huawei LTE switches."""
 
 import logging
-from typing import Optional
+from typing import Any, Callable, List, Optional
 
 import attr
 
@@ -10,7 +10,10 @@ from homeassistant.components.switch import (
     DOMAIN as SWITCH_DOMAIN,
     SwitchEntity,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_URL
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.typing import HomeAssistantType
 
 from . import HuaweiLteBaseEntity
 from .const import DOMAIN, KEY_DIALUP_MOBILE_DATASWITCH
@@ -18,10 +21,14 @@ from .const import DOMAIN, KEY_DIALUP_MOBILE_DATASWITCH
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_entry(hass, config_entry, async_add_entities):
+async def async_setup_entry(
+    hass: HomeAssistantType,
+    config_entry: ConfigEntry,
+    async_add_entities: Callable[[List[Entity], bool], None],
+) -> None:
     """Set up from config entry."""
     router = hass.data[DOMAIN].routers[config_entry.data[CONF_URL]]
-    switches = []
+    switches: List[Entity] = []
 
     if router.data.get(KEY_DIALUP_MOBILE_DATASWITCH):
         switches.append(HuaweiLteMobileDataSwitch(router))
@@ -40,30 +47,30 @@ class HuaweiLteBaseSwitch(HuaweiLteBaseEntity, SwitchEntity):
     def _turn(self, state: bool) -> None:
         raise NotImplementedError
 
-    def turn_on(self, **kwargs):
+    def turn_on(self, **kwargs: Any) -> None:
         """Turn switch on."""
         self._turn(state=True)
 
-    def turn_off(self, **kwargs):
+    def turn_off(self, **kwargs: Any) -> None:
         """Turn switch off."""
         self._turn(state=False)
 
     @property
-    def device_class(self):
+    def device_class(self) -> str:
         """Return device class."""
         return DEVICE_CLASS_SWITCH
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Subscribe to needed data on add."""
         await super().async_added_to_hass()
         self.router.subscriptions[self.key].add(f"{SWITCH_DOMAIN}/{self.item}")
 
-    async def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self) -> None:
         """Unsubscribe from needed data on remove."""
         await super().async_will_remove_from_hass()
         self.router.subscriptions[self.key].remove(f"{SWITCH_DOMAIN}/{self.item}")
 
-    async def async_update(self):
+    async def async_update(self) -> None:
         """Update state."""
         try:
             value = self.router.data[self.key][self.item]
@@ -79,7 +86,7 @@ class HuaweiLteBaseSwitch(HuaweiLteBaseEntity, SwitchEntity):
 class HuaweiLteMobileDataSwitch(HuaweiLteBaseSwitch):
     """Huawei LTE mobile data switch device."""
 
-    def __attrs_post_init__(self):
+    def __attrs_post_init__(self) -> None:
         """Initialize identifiers."""
         self.key = KEY_DIALUP_MOBILE_DATASWITCH
         self.item = "dataswitch"
@@ -104,6 +111,6 @@ class HuaweiLteMobileDataSwitch(HuaweiLteBaseSwitch):
         self.schedule_update_ha_state()
 
     @property
-    def icon(self):
+    def icon(self) -> str:
         """Return switch icon."""
         return "mdi:signal" if self.is_on else "mdi:signal-off"
diff --git a/homeassistant/components/huawei_lte/translations/ca.json b/homeassistant/components/huawei_lte/translations/ca.json
index 1a7b245c9fe..856c3986ed0 100644
--- a/homeassistant/components/huawei_lte/translations/ca.json
+++ b/homeassistant/components/huawei_lte/translations/ca.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest dispositiu ja ha estat configurat",
-            "already_in_progress": "Aquest dispositiu ja s'est\u00e0 configurant",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
             "not_huawei_lte": "No \u00e9s un dispositiu Huawei LTE"
         },
         "error": {
@@ -11,9 +11,11 @@
             "incorrect_password": "Contrasenya incorrecta",
             "incorrect_username": "Nom d'usuari incorrecte",
             "incorrect_username_or_password": "Nom d'usuari o contrasenya incorrectes",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_url": "URL inv\u00e0lid",
             "login_attempts_exceeded": "Nombre m\u00e0xim d'intents d'inici de sessi\u00f3 superat, torna-ho a provar m\u00e9s tard",
             "response_error": "S'ha produ\u00eft un error desconegut del dispositiu",
+            "unknown": "Error inesperat",
             "unknown_connection_error": "S'ha produ\u00eft un error desconegut en connectar-se al dispositiu"
         },
         "flow_title": "Huawei LTE: {name}",
diff --git a/homeassistant/components/huawei_lte/translations/cs.json b/homeassistant/components/huawei_lte/translations/cs.json
index 9593c27d76a..e8b09e670b0 100644
--- a/homeassistant/components/huawei_lte/translations/cs.json
+++ b/homeassistant/components/huawei_lte/translations/cs.json
@@ -1,22 +1,29 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Toto za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "not_huawei_lte": "Nejedn\u00e1 se o za\u0159\u00edzen\u00ed Huawei LTE"
         },
         "error": {
             "connection_failed": "P\u0159ipojen\u00ed se nezda\u0159ilo",
+            "connection_timeout": "\u010casov\u00fd limit spojen\u00ed",
             "incorrect_password": "Nespr\u00e1vn\u00e9 heslo",
             "incorrect_username": "Nespr\u00e1vn\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no",
-            "incorrect_username_or_password": "Nespr\u00e1vn\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no \u010di heslo",
+            "incorrect_username_or_password": "Nespr\u00e1vn\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no nebo heslo",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
             "invalid_url": "Neplatn\u00e1 adresa URL",
             "login_attempts_exceeded": "Maxim\u00e1ln\u00ed pokus o p\u0159ihl\u00e1\u0161en\u00ed byl p\u0159ekro\u010den, zkuste to znovu pozd\u011bji",
             "response_error": "Nezn\u00e1m\u00e1 chyba ze za\u0159\u00edzen\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba",
             "unknown_connection_error": "Nezn\u00e1m\u00e1 chyba p\u0159i p\u0159ipojov\u00e1n\u00ed k za\u0159\u00edzen\u00ed"
         },
+        "flow_title": "Huawei LTE: {name}",
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
+                    "url": "URL",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
                 },
                 "title": "Konfigurovat Huawei LTE"
@@ -27,6 +34,7 @@
         "step": {
             "init": {
                 "data": {
+                    "name": "Jm\u00e9no slu\u017eby ozn\u00e1men\u00ed (zm\u011bna vy\u017eaduje restart)",
                     "recipient": "P\u0159\u00edjemci ozn\u00e1men\u00ed SMS",
                     "track_new_devices": "Sledovat nov\u00e1 za\u0159\u00edzen\u00ed"
                 }
diff --git a/homeassistant/components/huawei_lte/translations/el.json b/homeassistant/components/huawei_lte/translations/el.json
new file mode 100644
index 00000000000..0957ca085d7
--- /dev/null
+++ b/homeassistant/components/huawei_lte/translations/el.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "error": {
+            "invalid_auth": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b1\u03c5\u03b8\u03b5\u03bd\u03c4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+            "unknown": "\u039c\u03b7 \u03b1\u03bd\u03b1\u03bc\u03b5\u03bd\u03cc\u03bc\u03b5\u03bd\u03bf \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/huawei_lte/translations/en.json b/homeassistant/components/huawei_lte/translations/en.json
index 022328ea2ea..fa66aebeba8 100644
--- a/homeassistant/components/huawei_lte/translations/en.json
+++ b/homeassistant/components/huawei_lte/translations/en.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This device has already been configured",
-            "already_in_progress": "This device is already being configured",
+            "already_configured": "Device is already configured",
+            "already_in_progress": "Configuration flow is already in progress",
             "not_huawei_lte": "Not a Huawei LTE device"
         },
         "error": {
@@ -11,9 +11,11 @@
             "incorrect_password": "Incorrect password",
             "incorrect_username": "Incorrect username",
             "incorrect_username_or_password": "Incorrect username or password",
+            "invalid_auth": "Invalid authentication",
             "invalid_url": "Invalid URL",
             "login_attempts_exceeded": "Maximum login attempts exceeded, please try again later",
             "response_error": "Unknown error from device",
+            "unknown": "Unexpected error",
             "unknown_connection_error": "Unknown error connecting to device"
         },
         "flow_title": "Huawei LTE: {name}",
diff --git a/homeassistant/components/huawei_lte/translations/es.json b/homeassistant/components/huawei_lte/translations/es.json
index 268fdf8eff5..289bd7c534c 100644
--- a/homeassistant/components/huawei_lte/translations/es.json
+++ b/homeassistant/components/huawei_lte/translations/es.json
@@ -11,9 +11,11 @@
             "incorrect_password": "Contrase\u00f1a incorrecta",
             "incorrect_username": "Nombre de usuario incorrecto",
             "incorrect_username_or_password": "Nombre de usuario o contrase\u00f1a incorrectos",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_url": "URL no v\u00e1lida",
             "login_attempts_exceeded": "Se han superado los intentos de inicio de sesi\u00f3n m\u00e1ximos, int\u00e9ntelo de nuevo m\u00e1s tarde.",
             "response_error": "Error desconocido del dispositivo",
+            "unknown": "Error inesperado",
             "unknown_connection_error": "Error desconocido al conectarse al dispositivo"
         },
         "flow_title": "Huawei LTE: {name}",
diff --git a/homeassistant/components/huawei_lte/translations/et.json b/homeassistant/components/huawei_lte/translations/et.json
new file mode 100644
index 00000000000..cfacbf7b57d
--- /dev/null
+++ b/homeassistant/components/huawei_lte/translations/et.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba seadistatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas"
+        },
+        "error": {
+            "incorrect_password": "Vale salas\u00f5na",
+            "incorrect_username": "Vale kasutajanimi",
+            "incorrect_username_or_password": "Vale kasutajanimi v\u00f5i salas\u00f5na",
+            "invalid_auth": "Tuvastamise viga",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "url": "URL",
+                    "username": "Kasutajanimi"
+                },
+                "description": "Sisesta seadmele juurdep\u00e4\u00e4su \u00fcksikasjad. Kasutajanime ja salas\u00f5na m\u00e4\u00e4ramine on valikuline kuid v\u00f5imaldab rohkemate sidumisfunktsioonide toetamist. Teisest k\u00fcljest v\u00f5ib volitatud \u00fchenduse kasutamine p\u00f5hjustada probleeme seadme veebiliidese ligip\u00e4\u00e4suga v\u00e4ljastpoolt Home assistant'i kui sidumine on aktiivne ja vastupidi."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/huawei_lte/translations/fr.json b/homeassistant/components/huawei_lte/translations/fr.json
index 2c7437d9a14..0662843a918 100644
--- a/homeassistant/components/huawei_lte/translations/fr.json
+++ b/homeassistant/components/huawei_lte/translations/fr.json
@@ -11,9 +11,11 @@
             "incorrect_password": "Mot de passe incorrect",
             "incorrect_username": "Nom d'utilisateur incorrect",
             "incorrect_username_or_password": "identifiant ou mot de passe incorrect",
+            "invalid_auth": "Authentification invalide",
             "invalid_url": "URL invalide",
             "login_attempts_exceeded": "Nombre maximal de tentatives de connexion d\u00e9pass\u00e9, veuillez r\u00e9essayer ult\u00e9rieurement",
             "response_error": "Erreur inconnue de l'appareil",
+            "unknown": "Erreur inattendue",
             "unknown_connection_error": "Erreur inconnue lors de la connexion \u00e0 l'appareil"
         },
         "flow_title": "Huawei LTE: {nom}",
diff --git a/homeassistant/components/huawei_lte/translations/it.json b/homeassistant/components/huawei_lte/translations/it.json
index 53a91afab06..cf6e97846d3 100644
--- a/homeassistant/components/huawei_lte/translations/it.json
+++ b/homeassistant/components/huawei_lte/translations/it.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo dispositivo \u00e8 gi\u00e0 stato configurato",
-            "already_in_progress": "Questo dispositivo \u00e8 gi\u00e0 in fase di configurazione",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
             "not_huawei_lte": "Non \u00e8 un dispositivo Huawei LTE"
         },
         "error": {
@@ -11,9 +11,11 @@
             "incorrect_password": "Password errata",
             "incorrect_username": "Nome utente errato",
             "incorrect_username_or_password": "Nome utente o password errati",
+            "invalid_auth": "Autenticazione non valida",
             "invalid_url": "URL non valido",
             "login_attempts_exceeded": "Superati i tentativi di accesso massimi, riprovare pi\u00f9 tardi",
             "response_error": "Errore sconosciuto dal dispositivo",
+            "unknown": "Errore imprevisto",
             "unknown_connection_error": "Errore sconosciuto durante la connessione al dispositivo"
         },
         "flow_title": "Huawei LTE: {name}",
diff --git a/homeassistant/components/huawei_lte/translations/lb.json b/homeassistant/components/huawei_lte/translations/lb.json
index 8c38dffacf7..4aa8a29bfc2 100644
--- a/homeassistant/components/huawei_lte/translations/lb.json
+++ b/homeassistant/components/huawei_lte/translations/lb.json
@@ -11,6 +11,7 @@
             "incorrect_password": "Ong\u00ebltegt Passwuert",
             "incorrect_username": "Ong\u00ebltege Benotzernumm",
             "incorrect_username_or_password": "Ong\u00ebltege Benotzernumm oder Passwuert",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_url": "Ong\u00eblteg URL",
             "login_attempts_exceeded": "Maximal Login Versich iwwerschratt, w.e.g. m\u00e9i sp\u00e9it nach eng K\u00e9ier",
             "response_error": "Onbekannte Feeler vum Apparat",
diff --git a/homeassistant/components/huawei_lte/translations/no.json b/homeassistant/components/huawei_lte/translations/no.json
index 710a318d966..f33b8862278 100644
--- a/homeassistant/components/huawei_lte/translations/no.json
+++ b/homeassistant/components/huawei_lte/translations/no.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne enheten er allerede konfigurert",
-            "already_in_progress": "Denne enheten blir allerede konfigurert",
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
             "not_huawei_lte": "Ikke en Huawei LTE-enhet"
         },
         "error": {
@@ -11,9 +11,11 @@
             "incorrect_password": "Feil passord",
             "incorrect_username": "Feil brukernavn",
             "incorrect_username_or_password": "Feil brukernavn eller passord",
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_url": "Ugyldig URL-adresse",
             "login_attempts_exceeded": "Maksimalt antall p\u00e5loggingsfors\u00f8k er overskredet, vennligst pr\u00f8v igjen senere",
             "response_error": "Ukjent feil fra enheten",
+            "unknown": "Uventet feil",
             "unknown_connection_error": "Ukjent feil under tilkobling til enhet"
         },
         "flow_title": "",
diff --git a/homeassistant/components/huawei_lte/translations/pl.json b/homeassistant/components/huawei_lte/translations/pl.json
index 405ffdf0343..5fe46e184d3 100644
--- a/homeassistant/components/huawei_lte/translations/pl.json
+++ b/homeassistant/components/huawei_lte/translations/pl.json
@@ -1,19 +1,21 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane.",
-            "already_in_progress": "Urz\u0105dzenie jest ju\u017c skonfigurowane.",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
             "not_huawei_lte": "To nie jest urz\u0105dzenie Huawei LTE"
         },
         "error": {
             "connection_failed": "Po\u0142\u0105czenie nie powiod\u0142o si\u0119",
-            "connection_timeout": "Przekroczono limit czasu pr\u00f3by po\u0142\u0105czenia.",
+            "connection_timeout": "Przekroczono limit czasu pr\u00f3by po\u0142\u0105czenia",
             "incorrect_password": "Nieprawid\u0142owe has\u0142o",
             "incorrect_username": "Nieprawid\u0142owa nazwa u\u017cytkownika",
             "incorrect_username_or_password": "Nieprawid\u0142owa nazwa u\u017cytkownika lub has\u0142o",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_url": "Nieprawid\u0142owy URL",
             "login_attempts_exceeded": "Przekroczono maksymaln\u0105 liczb\u0119 pr\u00f3b logowania. Spr\u00f3buj ponownie p\u00f3\u017aniej.",
-            "response_error": "Wyst\u0105pi\u0142 nieznany b\u0142\u0105d w urz\u0105dzeniu.",
+            "response_error": "Wyst\u0105pi\u0142 nieznany b\u0142\u0105d w urz\u0105dzeniu",
+            "unknown": "Nieoczekiwany b\u0142\u0105d",
             "unknown_connection_error": "Nieznany b\u0142\u0105d podczas \u0142\u0105czenia z urz\u0105dzeniem"
         },
         "flow_title": "Huawei LTE: {name}",
@@ -24,7 +26,7 @@
                     "url": "URL",
                     "username": "Nazwa u\u017cytkownika"
                 },
-                "description": "Wprowad\u017a szczeg\u00f3\u0142y dost\u0119pu do urz\u0105dzenia. Okre\u015blenie nazwy u\u017cytkownika i has\u0142a jest opcjonalne, ale umo\u017cliwia obs\u0142ug\u0119 wi\u0119kszej liczby funkcji integracji. Z drugiej strony u\u017cycie autoryzowanego po\u0142\u0105czenia mo\u017ce powodowa\u0107 problemy z dost\u0119pem do interfejsu internetowego urz\u0105dzenia z zewn\u0105trz Home Assistanta gdy integracja jest aktywna.",
+                "description": "Wprowad\u017a szczeg\u00f3\u0142y dost\u0119pu do urz\u0105dzenia. Okre\u015blenie nazwy u\u017cytkownika i has\u0142a jest opcjonalne, ale umo\u017cliwia obs\u0142ug\u0119 wi\u0119kszej liczby funkcji integracji. Z drugiej strony u\u017cycie autoryzowanego po\u0142\u0105czenia mo\u017ce powodowa\u0107 problemy z dost\u0119pem do interfejsu internetowego urz\u0105dzenia zewn\u0105trz Home Assistant, gdy integracja jest aktywna.",
                 "title": "Konfiguracja Huawei LTE"
             }
         }
diff --git a/homeassistant/components/huawei_lte/translations/ru.json b/homeassistant/components/huawei_lte/translations/ru.json
index 5830cb8ccb3..68c025894cd 100644
--- a/homeassistant/components/huawei_lte/translations/ru.json
+++ b/homeassistant/components/huawei_lte/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
             "not_huawei_lte": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e\u043c Huawei LTE"
         },
         "error": {
@@ -11,9 +11,11 @@
             "incorrect_password": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.",
             "incorrect_username": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d.",
             "incorrect_username_or_password": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_url": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 URL-\u0430\u0434\u0440\u0435\u0441.",
             "login_attempts_exceeded": "\u041f\u0440\u0435\u0432\u044b\u0448\u0435\u043d\u043e \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u043f\u044b\u0442\u043e\u043a \u0432\u0445\u043e\u0434\u0430, \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u043f\u043e\u0437\u0436\u0435.",
             "response_error": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
             "unknown_connection_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
         },
         "flow_title": "Huawei LTE: {name}",
diff --git a/homeassistant/components/huawei_lte/translations/zh-Hans.json b/homeassistant/components/huawei_lte/translations/zh-Hans.json
new file mode 100644
index 00000000000..2f499964108
--- /dev/null
+++ b/homeassistant/components/huawei_lte/translations/zh-Hans.json
@@ -0,0 +1,9 @@
+{
+    "config": {
+        "error": {
+            "connection_failed": "\u8fde\u63a5\u5931\u8d25",
+            "incorrect_username": "\u7528\u6237\u540d\u9519\u8bef",
+            "incorrect_username_or_password": "\u7528\u6237\u540d\u6216\u5bc6\u7801\u9519\u8bef"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/huawei_lte/translations/zh-Hant.json b/homeassistant/components/huawei_lte/translations/zh-Hant.json
index 55cc0b6acf6..7dcc0f8851d 100644
--- a/homeassistant/components/huawei_lte/translations/zh-Hant.json
+++ b/homeassistant/components/huawei_lte/translations/zh-Hant.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "\u6b64\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
             "not_huawei_lte": "\u4e26\u975e\u83ef\u70ba LTE \u8a2d\u5099"
         },
         "error": {
@@ -11,9 +11,11 @@
             "incorrect_password": "\u5bc6\u78bc\u932f\u8aa4",
             "incorrect_username": "\u4f7f\u7528\u8005\u540d\u7a31\u932f\u8aa4",
             "incorrect_username_or_password": "\u4f7f\u7528\u8005\u540d\u7a31\u6216\u5bc6\u78bc\u932f\u8aa4",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_url": "\u7db2\u5740\u7121\u6548",
             "login_attempts_exceeded": "\u5df2\u9054\u5617\u8a66\u767b\u5165\u6700\u5927\u6b21\u6578\uff0c\u8acb\u7a0d\u5f8c\u518d\u8a66",
             "response_error": "\u4f86\u81ea\u8a2d\u5099\u672a\u77e5\u932f\u8aa4",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4",
             "unknown_connection_error": "\u9023\u7dda\u81f3\u8a2d\u5099\u672a\u77e5\u932f\u8aa4"
         },
         "flow_title": "\u83ef\u70ba LTE\uff1a{name}",
diff --git a/homeassistant/components/huawei_router/device_tracker.py b/homeassistant/components/huawei_router/device_tracker.py
index be34b26be0d..69278ed6574 100644
--- a/homeassistant/components/huawei_router/device_tracker.py
+++ b/homeassistant/components/huawei_router/device_tracker.py
@@ -50,7 +50,7 @@ class HuaweiDeviceScanner(DeviceScanner):
         '"(?P<IPv4Enabled>.*?)","(?P<IPv6Enabled>.*?)",'
         '"(?P<DeviceType>.*?)"'
     )
-    LOGIN_COOKIE = dict(Cookie="body:Language:portuguese:id=-1")
+    LOGIN_COOKIE = {"Cookie": "body:Language:portuguese:id=-1"}
 
     def __init__(self, config):
         """Initialize the scanner."""
diff --git a/homeassistant/components/hue/__init__.py b/homeassistant/components/hue/__init__.py
index fb277ee7a67..7e749b70396 100644
--- a/homeassistant/components/hue/__init__.py
+++ b/homeassistant/components/hue/__init__.py
@@ -1,4 +1,5 @@
 """Support for the Philips Hue system."""
+import asyncio
 import logging
 
 from aiohue.util import normalize_bridge_id
@@ -7,7 +8,13 @@ from homeassistant import config_entries, core
 from homeassistant.components import persistent_notification
 from homeassistant.helpers import device_registry as dr
 
-from .bridge import HueBridge
+from .bridge import (
+    ATTR_GROUP_NAME,
+    ATTR_SCENE_NAME,
+    SCENE_SCHEMA,
+    SERVICE_HUE_SCENE,
+    HueBridge,
+)
 from .const import (
     CONF_ALLOW_HUE_GROUPS,
     CONF_ALLOW_UNREACHABLE,
@@ -21,6 +28,40 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup(hass, config):
     """Set up the Hue platform."""
+
+    async def hue_activate_scene(call, skip_reload=True):
+        """Handle activation of Hue scene."""
+        # Get parameters
+        group_name = call.data[ATTR_GROUP_NAME]
+        scene_name = call.data[ATTR_SCENE_NAME]
+
+        # Call the set scene function on each bridge
+        tasks = [
+            bridge.hue_activate_scene(
+                call, updated=skip_reload, hide_warnings=skip_reload
+            )
+            for bridge in hass.data[DOMAIN].values()
+            if isinstance(bridge, HueBridge)
+        ]
+        results = await asyncio.gather(*tasks)
+
+        # Did *any* bridge succeed? If not, refresh / retry
+        # Note that we'll get a "None" value for a successful call
+        if None not in results:
+            if skip_reload:
+                await hue_activate_scene(call, skip_reload=False)
+                return
+            _LOGGER.warning(
+                "No bridge was able to activate " "scene %s in group %s",
+                scene_name,
+                group_name,
+            )
+
+    # Register a local handler for scene activation
+    hass.services.async_register(
+        DOMAIN, SERVICE_HUE_SCENE, hue_activate_scene, schema=SCENE_SCHEMA
+    )
+
     hass.data[DOMAIN] = {}
     return True
 
@@ -131,4 +172,5 @@ async def async_setup_entry(
 async def async_unload_entry(hass, entry):
     """Unload a config entry."""
     bridge = hass.data[DOMAIN].pop(entry.entry_id)
+    hass.services.async_remove(DOMAIN, SERVICE_HUE_SCENE)
     return await bridge.async_reset()
diff --git a/homeassistant/components/hue/bridge.py b/homeassistant/components/hue/bridge.py
index 3eb894552ab..880d9abcc35 100644
--- a/homeassistant/components/hue/bridge.py
+++ b/homeassistant/components/hue/bridge.py
@@ -19,7 +19,6 @@ from .const import (
     CONF_ALLOW_UNREACHABLE,
     DEFAULT_ALLOW_HUE_GROUPS,
     DEFAULT_ALLOW_UNREACHABLE,
-    DOMAIN,
     LOGGER,
 )
 from .errors import AuthenticationRequired, CannotConnect
@@ -117,10 +116,6 @@ class HueBridge:
             hass.config_entries.async_forward_entry_setup(self.config_entry, "sensor")
         )
 
-        hass.services.async_register(
-            DOMAIN, SERVICE_HUE_SCENE, self.hue_activate_scene, schema=SCENE_SCHEMA
-        )
-
         self.parallel_updates_semaphore = asyncio.Semaphore(
             3 if self.api.config.modelid == "BSB001" else 10
         )
@@ -179,8 +174,6 @@ class HueBridge:
         if self.api is None:
             return True
 
-        self.hass.services.async_remove(DOMAIN, SERVICE_HUE_SCENE)
-
         while self.reset_jobs:
             self.reset_jobs.pop()()
 
@@ -204,7 +197,7 @@ class HueBridge:
         # None and True are OK
         return False not in results
 
-    async def hue_activate_scene(self, call, updated=False):
+    async def hue_activate_scene(self, call, updated=False, hide_warnings=False):
         """Service to call directly into bridge to set scenes."""
         group_name = call.data[ATTR_GROUP_NAME]
         scene_name = call.data[ATTR_SCENE_NAME]
@@ -230,18 +223,20 @@ class HueBridge:
         if not updated and (group is None or scene is None):
             await self.async_request_call(self.api.groups.update)
             await self.async_request_call(self.api.scenes.update)
-            await self.hue_activate_scene(call, updated=True)
-            return
+            return await self.hue_activate_scene(call, updated=True)
 
         if group is None:
-            LOGGER.warning("Unable to find group %s", group_name)
-            return
+            if not hide_warnings:
+                LOGGER.warning(
+                    "Unable to find group %s" " on bridge %s", group_name, self.host
+                )
+            return False
 
         if scene is None:
             LOGGER.warning("Unable to find scene %s", scene_name)
-            return
+            return False
 
-        await self.async_request_call(partial(group.set_action, scene=scene.id))
+        return await self.async_request_call(partial(group.set_action, scene=scene.id))
 
     async def handle_unauthorized_error(self):
         """Create a new config flow when the authorization is no longer valid."""
diff --git a/homeassistant/components/hue/config_flow.py b/homeassistant/components/hue/config_flow.py
index f16d1f74cf6..ecb3fd8c489 100644
--- a/homeassistant/components/hue/config_flow.py
+++ b/homeassistant/components/hue/config_flow.py
@@ -122,7 +122,7 @@ class HueFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             )
 
         if any(
-            user_input["host"] == entry.data["host"]
+            user_input["host"] == entry.data.get("host")
             for entry in self._async_current_entries()
         ):
             return self.async_abort(reason="already_configured")
@@ -216,7 +216,7 @@ class HueFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         """
         # Check if host exists, abort if so.
         if any(
-            import_info["host"] == entry.data["host"]
+            import_info["host"] == entry.data.get("host")
             for entry in self._async_current_entries()
         ):
             return self.async_abort(reason="already_configured")
diff --git a/homeassistant/components/hue/device_trigger.py b/homeassistant/components/hue/device_trigger.py
index 9e56a253a58..c3dc18cd5df 100644
--- a/homeassistant/components/hue/device_trigger.py
+++ b/homeassistant/components/hue/device_trigger.py
@@ -1,6 +1,4 @@
 """Provides device automations for Philips Hue events."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.device_automation import TRIGGER_BASE_SCHEMA
@@ -20,8 +18,6 @@ from homeassistant.const import (
 from . import DOMAIN
 from .hue_event import CONF_HUE_EVENT
 
-_LOGGER = logging.getLogger(__file__)
-
 CONF_SUBTYPE = "subtype"
 
 CONF_SHORT_PRESS = "remote_button_short_press"
diff --git a/homeassistant/components/hue/light.py b/homeassistant/components/hue/light.py
index 20066bd1be2..821d482ec25 100644
--- a/homeassistant/components/hue/light.py
+++ b/homeassistant/components/hue/light.py
@@ -458,7 +458,6 @@ class HueLight(CoordinatorEntity, LightEntity):
     @property
     def device_state_attributes(self):
         """Return the device state attributes."""
-        attributes = {}
-        if self.is_group:
-            attributes[ATTR_IS_HUE_GROUP] = self.is_group
-        return attributes
+        if not self.is_group:
+            return {}
+        return {ATTR_IS_HUE_GROUP: self.is_group}
diff --git a/homeassistant/components/hue/strings.json b/homeassistant/components/hue/strings.json
index a16d5e3a632..678b7c2cad2 100644
--- a/homeassistant/components/hue/strings.json
+++ b/homeassistant/components/hue/strings.json
@@ -20,16 +20,16 @@
     },
     "error": {
       "register_failed": "Failed to register, please try again",
-      "linking": "Unknown linking error occurred."
+      "linking": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
       "discover_timeout": "Unable to discover Hue bridges",
       "no_bridges": "No Philips Hue bridges discovered",
       "all_configured": "All Philips Hue bridges are already configured",
-      "unknown": "Unknown error occurred",
-      "cannot_connect": "Unable to connect to the bridge",
-      "already_configured": "Bridge is already configured",
-      "already_in_progress": "Config flow for bridge is already in progress.",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "not_hue_bridge": "Not a Hue bridge"
     }
   },
diff --git a/homeassistant/components/hue/translations/ca.json b/homeassistant/components/hue/translations/ca.json
index 97098b21db7..47bb10b2abb 100644
--- a/homeassistant/components/hue/translations/ca.json
+++ b/homeassistant/components/hue/translations/ca.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "all_configured": "Tots els enlla\u00e7os Philips Hue ja estan configurats",
-            "already_configured": "L'enlla\u00e7 ja est\u00e0 configurat",
-            "already_in_progress": "El flux de dades de configuraci\u00f3 per l'enlla\u00e7 ja est\u00e0 en curs.",
-            "cannot_connect": "No s'ha pogut connectar amb l'enlla\u00e7",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "discover_timeout": "No s'han pogut descobrir enlla\u00e7os Hue",
             "no_bridges": "No s'han trobat enlla\u00e7os Philips Hue",
             "not_hue_bridge": "No \u00e9s un enlla\u00e7 Hue",
-            "unknown": "S'ha produ\u00eft un error desconegut"
+            "unknown": "Error inesperat"
         },
         "error": {
-            "linking": "S'ha produ\u00eft un error desconegut al vincular.",
+            "linking": "Error inesperat",
             "register_failed": "No s'ha pogut registrar, torna-ho a provar"
         },
         "step": {
diff --git a/homeassistant/components/hue/translations/cs.json b/homeassistant/components/hue/translations/cs.json
index d9070c7c295..3143924caa0 100644
--- a/homeassistant/components/hue/translations/cs.json
+++ b/homeassistant/components/hue/translations/cs.json
@@ -1,15 +1,17 @@
 {
     "config": {
         "abort": {
-            "all_configured": "V\u0161echny Philips Hue p\u0159emost\u011bn\u00ed jsou ji\u017e nakonfigurov\u00e1ny",
-            "already_configured": "P\u0159emost\u011bn\u00ed je ji\u017e nakonfigurov\u00e1no",
-            "cannot_connect": "Nelze se p\u0159ipojit k p\u0159emost\u011bn\u00ed",
+            "all_configured": "V\u0161echny Philips Hue p\u0159emost\u011bn\u00ed jsou ji\u017e nastaveny",
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "discover_timeout": "Nelze nal\u00e9zt p\u0159emost\u011bn\u00ed Hue",
             "no_bridges": "Nebyly nalezeny \u017e\u00e1dn\u00e9 p\u0159emost\u011bn\u00ed Philips Hue",
-            "unknown": "Do\u0161lo k nezn\u00e1m\u00e9 chyb\u011b"
+            "not_hue_bridge": "Nejedn\u00e1 se o Hue p\u0159emost\u011bn\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "error": {
-            "linking": "Do\u0161lo k nezn\u00e1m\u00e9 chyb\u011b propojen\u00ed.",
+            "linking": "Neo\u010dek\u00e1van\u00e1 chyba",
             "register_failed": "Registrace se nezda\u0159ila, zkuste to pros\u00edm znovu"
         },
         "step": {
@@ -22,6 +24,41 @@
             "link": {
                 "description": "Stiskn\u011bte tla\u010d\u00edtko na p\u0159emost\u011bn\u00ed k registraci Philips Hue v Home Assistant.\n\n! [Um\u00edst\u011bn\u00ed tla\u010d\u00edtka na p\u0159emost\u011bn\u00ed](/ static/images/config_philips_hue.jpg)",
                 "title": "P\u0159ipojit Hub"
+            },
+            "manual": {
+                "data": {
+                    "host": "Hostitel"
+                },
+                "title": "Ru\u010dn\u00ed nastaven\u00ed p\u0159emost\u011bn\u00ed Hue"
+            }
+        }
+    },
+    "device_automation": {
+        "trigger_subtype": {
+            "button_1": "Prvn\u00ed tla\u010d\u00edtko",
+            "button_2": "Druh\u00e9 tla\u010d\u00edtko",
+            "button_3": "T\u0159et\u00ed tla\u010d\u00edtko",
+            "button_4": "\u010ctvrt\u00e9 tla\u010d\u00edtko",
+            "dim_down": "Sn\u00ed\u017eit ztlumen\u00ed",
+            "dim_up": "Zv\u00fd\u0161it ztlumen\u00ed",
+            "double_buttons_1_3": "Prvn\u00ed a t\u0159et\u00ed tla\u010d\u00edtko",
+            "double_buttons_2_4": "Druh\u00e9 a \u010dtvrt\u00e9 tla\u010d\u00edtko",
+            "turn_off": "Vypnout",
+            "turn_on": "Zapnout"
+        },
+        "trigger_type": {
+            "remote_button_short_press": "Stisknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_short_release": "Uvoln\u011bno tla\u010d\u00edtko \"{subtype}\"",
+            "remote_double_button_long_press": "Oba \"{subtype}\" uvoln\u011bny po dlouh\u00e9m stisku",
+            "remote_double_button_short_press": "Oba \"{subtype}\" uvoln\u011bny"
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "allow_hue_groups": "Povolit skupiny Hue"
+                }
             }
         }
     }
diff --git a/homeassistant/components/hue/translations/en.json b/homeassistant/components/hue/translations/en.json
index 9f3a96f2da3..e03eabd3d23 100644
--- a/homeassistant/components/hue/translations/en.json
+++ b/homeassistant/components/hue/translations/en.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "all_configured": "All Philips Hue bridges are already configured",
-            "already_configured": "Bridge is already configured",
-            "already_in_progress": "Config flow for bridge is already in progress.",
-            "cannot_connect": "Unable to connect to the bridge",
+            "already_configured": "Device is already configured",
+            "already_in_progress": "Configuration flow is already in progress",
+            "cannot_connect": "Failed to connect",
             "discover_timeout": "Unable to discover Hue bridges",
             "no_bridges": "No Philips Hue bridges discovered",
             "not_hue_bridge": "Not a Hue bridge",
-            "unknown": "Unknown error occurred"
+            "unknown": "Unexpected error"
         },
         "error": {
-            "linking": "Unknown linking error occurred.",
+            "linking": "Unexpected error",
             "register_failed": "Failed to register, please try again"
         },
         "step": {
diff --git a/homeassistant/components/hue/translations/es.json b/homeassistant/components/hue/translations/es.json
index 767c883a87b..91bbfb3771d 100644
--- a/homeassistant/components/hue/translations/es.json
+++ b/homeassistant/components/hue/translations/es.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "all_configured": "Ya se han configurado todas las pasarelas Philips Hue",
-            "already_configured": "La pasarela ya esta configurada",
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
             "already_in_progress": "El flujo de configuraci\u00f3n para la pasarela ya est\u00e1 en marcha.",
-            "cannot_connect": "No se puede conectar a la pasarela",
+            "cannot_connect": "No se pudo conectar",
             "discover_timeout": "Imposible encontrar pasarelas Philips Hue",
             "no_bridges": "No se han encontrado pasarelas Philips Hue.",
             "not_hue_bridge": "No es una pasarela Hue",
-            "unknown": "Se produjo un error desconocido"
+            "unknown": "Error inesperado"
         },
         "error": {
-            "linking": "Se produjo un error de enlace desconocido.",
+            "linking": "Error inesperado",
             "register_failed": "No se pudo registrar, intente de nuevo"
         },
         "step": {
diff --git a/homeassistant/components/hue/translations/et.json b/homeassistant/components/hue/translations/et.json
index 0aeea7286d9..53695563f8b 100644
--- a/homeassistant/components/hue/translations/et.json
+++ b/homeassistant/components/hue/translations/et.json
@@ -2,6 +2,9 @@
     "config": {
         "abort": {
             "all_configured": "K\u00f5ik Philips Hue sillad on juba konfigureeritud",
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "cannot_connect": "\u00dchendus nurjus",
             "discover_timeout": "Ei leia Philips Hue sildu",
             "no_bridges": "Philips Hue sildu ei avastatud",
             "unknown": "Ilmnes tundmatu viga"
@@ -15,10 +18,16 @@
                 "data": {
                     "host": ""
                 },
-                "title": "Valige Hue sild"
+                "title": "Vali Hue sild"
             },
             "link": {
-                "description": "Vajutage silla nuppu, et registreerida Philips Hue Home Assistant abil. \n\n ! [Nupu asukoht sillal] (/ static / images / config_philips_hue.jpg)"
+                "description": "Vajutage silla nuppu, et registreerida Philips Hue Home Assistant abil. \n\n ! [Nupu asukoht sillal] (/ static / images / config_philips_hue.jpg)",
+                "title": "\u00dchenda jaotusseade"
+            },
+            "manual": {
+                "data": {
+                    "host": ""
+                }
             }
         }
     },
diff --git a/homeassistant/components/hue/translations/it.json b/homeassistant/components/hue/translations/it.json
index 6fc4554b384..f49e64b9b68 100644
--- a/homeassistant/components/hue/translations/it.json
+++ b/homeassistant/components/hue/translations/it.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "all_configured": "Tutti i bridge di Philips Hue sono gi\u00e0 configurati",
-            "already_configured": "Il bridge \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "Il flusso di configurazione per bridge \u00e8 gi\u00e0 in corso.",
-            "cannot_connect": "Impossibile connettersi al bridge",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
+            "cannot_connect": "Impossibile connettersi",
             "discover_timeout": "Impossibile trovare i bridge Hue",
             "no_bridges": "Nessun bridge di Philips Hue trovato",
             "not_hue_bridge": "Non \u00e8 un bridge Hue",
-            "unknown": "Si \u00e8 verificato un errore"
+            "unknown": "Errore imprevisto"
         },
         "error": {
-            "linking": "Si \u00e8 verificato un errore sconosciuto in fase di collegamento.",
+            "linking": "Errore imprevisto",
             "register_failed": "Errore in fase di registrazione, riprova"
         },
         "step": {
diff --git a/homeassistant/components/hue/translations/nl.json b/homeassistant/components/hue/translations/nl.json
index bfe70ae53ab..73817f52488 100644
--- a/homeassistant/components/hue/translations/nl.json
+++ b/homeassistant/components/hue/translations/nl.json
@@ -44,8 +44,8 @@
             "remote_button_long_release": "\"{subtype}\" knop losgelaten na lang drukken",
             "remote_button_short_press": "\"{subtype}\" knop ingedrukt",
             "remote_button_short_release": "\"{subtype}\" knop losgelaten",
-            "remote_double_button_long_press": "Beide \"{subtype}\" vrijgegeven na lang indrukken",
-            "remote_double_button_short_press": "Beide \"{subtype}\" vrijgegeven"
+            "remote_double_button_long_press": "Beide \"{subtype}\" losgelaten na lang indrukken",
+            "remote_double_button_short_press": "Beide \"{subtype}\" losgelaten"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/translations/no.json b/homeassistant/components/hue/translations/no.json
index 2d51ee26452..e2b52628749 100644
--- a/homeassistant/components/hue/translations/no.json
+++ b/homeassistant/components/hue/translations/no.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "all_configured": "Alle Philips Hue Bridger er allerede konfigurert",
-            "already_configured": "Bridge er allerede konfigurert",
-            "already_in_progress": "Konfigurasjonsflyt for bro p\u00e5g\u00e5r allerede.",
-            "cannot_connect": "Kan ikke koble til Bridge",
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
+            "cannot_connect": "Tilkobling mislyktes",
             "discover_timeout": "Kunne ikke oppdage Hue Bridger",
             "no_bridges": "Ingen Philips Hue Bridger oppdaget",
             "not_hue_bridge": "Ikke en Hue bro",
-            "unknown": "Ukjent feil oppstod"
+            "unknown": "Uventet feil"
         },
         "error": {
-            "linking": "Ukjent koblingsfeil oppstod.",
+            "linking": "Uventet feil",
             "register_failed": "Registrering feilet, vennligst pr\u00f8v igjen"
         },
         "step": {
@@ -43,15 +43,15 @@
             "dim_up": "Dimm opp",
             "double_buttons_1_3": "F\u00f8rste og tredje knapper",
             "double_buttons_2_4": "Andre og fjerde knapper",
-            "turn_off": "Skru av",
+            "turn_off": "Sl\u00e5 av",
             "turn_on": "Sl\u00e5 p\u00e5"
         },
         "trigger_type": {
             "remote_button_long_release": "\"{subtype}\"-knappen sluppet etter langt trykk",
             "remote_button_short_press": "\"{subtype}\" -knappen ble trykket",
             "remote_button_short_release": "\"{subtype}\"-knappen sluppet",
-            "remote_double_button_long_press": "Begge \" {subtype} \" utgitt etter lang trykk",
-            "remote_double_button_short_press": "Begge \" {subtype} \" utgitt"
+            "remote_double_button_long_press": "Begge \"{subtype}\" utgitt etter lang trykk",
+            "remote_double_button_short_press": "Begge \"{subtype}\" utgitt"
         }
     },
     "options": {
diff --git a/homeassistant/components/hue/translations/pl.json b/homeassistant/components/hue/translations/pl.json
index 6e2623d23ac..4c101ae9386 100644
--- a/homeassistant/components/hue/translations/pl.json
+++ b/homeassistant/components/hue/translations/pl.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "all_configured": "Wszystkie mostki Hue s\u0105 ju\u017c skonfigurowane",
-            "already_configured": "Mostek jest ju\u017c skonfigurowany",
-            "already_in_progress": "Konfiguracja mostka jest ju\u017c w toku.",
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z mostkiem",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "discover_timeout": "Nie mo\u017cna wykry\u0107 \u017cadnych mostk\u00f3w Hue",
             "no_bridges": "Nie wykryto mostk\u00f3w Hue",
             "not_hue_bridge": "To nie jest mostek Hue",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
-            "linking": "Wyst\u0105pi\u0142 nieznany b\u0142\u0105d w trakcie \u0142\u0105czenia.",
+            "linking": "Nieoczekiwany b\u0142\u0105d",
             "register_failed": "Nie uda\u0142o si\u0119 zarejestrowa\u0107. Spr\u00f3buj ponownie"
         },
         "step": {
@@ -58,6 +58,7 @@
         "step": {
             "init": {
                 "data": {
+                    "allow_hue_groups": "Zezwalaj na grupowanie Hue",
                     "allow_unreachable": "Zezwalaj nieosi\u0105galnym \u017car\u00f3wkom na poprawne raportowanie ich stanu"
                 }
             }
diff --git a/homeassistant/components/hue/translations/ru.json b/homeassistant/components/hue/translations/ru.json
index f302eeaa473..12313583030 100644
--- a/homeassistant/components/hue/translations/ru.json
+++ b/homeassistant/components/hue/translations/ru.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "all_configured": "\u0412\u0441\u0435 Philips Hue \u0448\u043b\u044e\u0437\u044b \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u044b.",
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0448\u043b\u044e\u0437\u0443.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "discover_timeout": "\u0428\u043b\u044e\u0437 Philips Hue \u043d\u0435 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d.",
             "no_bridges": "\u0428\u043b\u044e\u0437\u044b Philips Hue \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b.",
             "not_hue_bridge": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0448\u043b\u044e\u0437\u043e\u043c Hue.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "error": {
-            "linking": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u0441\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u044f.",
+            "linking": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
             "register_failed": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430."
         },
         "step": {
diff --git a/homeassistant/components/hue/translations/zh-Hans.json b/homeassistant/components/hue/translations/zh-Hans.json
index f3b763c7b0c..c34bd68aad8 100644
--- a/homeassistant/components/hue/translations/zh-Hans.json
+++ b/homeassistant/components/hue/translations/zh-Hans.json
@@ -25,5 +25,10 @@
                 "title": "\u8fde\u63a5\u4e2d\u67a2"
             }
         }
+    },
+    "device_automation": {
+        "trigger_subtype": {
+            "turn_off": "\u5173\u95ed"
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/translations/zh-Hant.json b/homeassistant/components/hue/translations/zh-Hant.json
index 2442ae30d10..9a5c0b2b54f 100644
--- a/homeassistant/components/hue/translations/zh-Hant.json
+++ b/homeassistant/components/hue/translations/zh-Hant.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "all_configured": "\u6240\u6709 Philips Hue Bridge \u7686\u5df2\u8a2d\u5b9a\u5b8c\u6210",
-            "already_configured": "Bridge \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "Bridge \u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 Bridge",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "discover_timeout": "\u7121\u6cd5\u641c\u5c0b\u5230 Hue Bridge",
             "no_bridges": "\u672a\u641c\u5c0b\u5230 Philips Hue Bridge",
             "not_hue_bridge": "\u975e Hue Bridge \u8a2d\u5099",
-            "unknown": "\u767c\u751f\u672a\u77e5\u932f\u8aa4"
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "error": {
-            "linking": "\u767c\u751f\u672a\u77e5\u9023\u7d50\u932f\u8aa4\u3002",
+            "linking": "\u672a\u9810\u671f\u932f\u8aa4",
             "register_failed": "\u8a3b\u518a\u5931\u6557\uff0c\u8acb\u7a0d\u5f8c\u518d\u8a66"
         },
         "step": {
diff --git a/homeassistant/components/humidifier/translations/cs.json b/homeassistant/components/humidifier/translations/cs.json
index 5f05202a2e3..2e373587afc 100644
--- a/homeassistant/components/humidifier/translations/cs.json
+++ b/homeassistant/components/humidifier/translations/cs.json
@@ -1,8 +1,28 @@
 {
+    "device_automation": {
+        "action_type": {
+            "set_humidity": "Nastavit vlhkost pro {entity_name}",
+            "set_mode": "Zm\u011bnit re\u017eim na {entity_name}",
+            "toggle": "P\u0159epnout {entity_name}",
+            "turn_off": "Vypnout {entity_name}",
+            "turn_on": "Zapnout {entity_name}"
+        },
+        "condition_type": {
+            "is_mode": "{entity_name} je nastaven na konkr\u00e9tn\u00ed re\u017eim",
+            "is_off": "{entity_name} je vypnuto",
+            "is_on": "{entity_name} je zapnuto"
+        },
+        "trigger_type": {
+            "target_humidity_changed": "C\u00edlov\u00e1 vlhkost {entity_name} zm\u011bn\u011bna",
+            "turned_off": "{entity_name} vypnuto",
+            "turned_on": "{entity_name} zapnuto"
+        }
+    },
     "state": {
         "_": {
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed"
+            "off": "Vypnuto",
+            "on": "Zapnuto"
         }
-    }
+    },
+    "title": "Zvlh\u010dova\u010d"
 }
\ No newline at end of file
diff --git a/homeassistant/components/humidifier/translations/de.json b/homeassistant/components/humidifier/translations/de.json
index 04a67dd7da3..24d8b01353e 100644
--- a/homeassistant/components/humidifier/translations/de.json
+++ b/homeassistant/components/humidifier/translations/de.json
@@ -5,6 +5,10 @@
             "toggle": "{entity_name} umschalten",
             "turn_off": "Schalte {entity_name} aus",
             "turn_on": "Schalte {entity_name} an"
+        },
+        "trigger_type": {
+            "turned_off": "{entity_name} ausgeschaltet",
+            "turned_on": "{entity_name} eingeschaltet"
         }
     },
     "state": {
diff --git a/homeassistant/components/humidifier/translations/et.json b/homeassistant/components/humidifier/translations/et.json
index 303edb781b6..8e401417a38 100644
--- a/homeassistant/components/humidifier/translations/et.json
+++ b/homeassistant/components/humidifier/translations/et.json
@@ -17,5 +17,11 @@
             "turned_off": "{entity_name} l\u00fclitus v\u00e4lja",
             "turned_on": "{entity_name} l\u00fclitus sisse"
         }
+    },
+    "state": {
+        "_": {
+            "off": "V\u00e4ljas",
+            "on": "Sees"
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/humidifier/translations/nl.json b/homeassistant/components/humidifier/translations/nl.json
index d74d37d20ad..311943bbd23 100644
--- a/homeassistant/components/humidifier/translations/nl.json
+++ b/homeassistant/components/humidifier/translations/nl.json
@@ -1,9 +1,19 @@
 {
     "device_automation": {
+        "action_type": {
+            "turn_off": "{entity_name} uitschakelen",
+            "turn_on": "{entity_name} inschakelen"
+        },
         "trigger_type": {
             "target_humidity_changed": "{entity_name} doel luchtvochtigheid gewijzigd",
             "turned_off": "{entity_name} is uitgeschakeld",
             "turned_on": "{entity_name} is ingeschakeld"
         }
+    },
+    "state": {
+        "_": {
+            "off": "Uit",
+            "on": "Aan"
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/humidifier/translations/pl.json b/homeassistant/components/humidifier/translations/pl.json
index 77b3241fab9..af049417782 100644
--- a/homeassistant/components/humidifier/translations/pl.json
+++ b/homeassistant/components/humidifier/translations/pl.json
@@ -13,15 +13,15 @@
             "is_on": "nawil\u017cacz{entity_name} jest w\u0142\u0105czony"
         },
         "trigger_type": {
-            "target_humidity_changed": "zmieni si\u0119 wilgotno\u015b\u0107 docelowa{entity_name}",
+            "target_humidity_changed": "zmieni si\u0119 wilgotno\u015b\u0107 docelowa {entity_name}",
             "turned_off": "nast\u0105pi wy\u0142\u0105czenie {entity_name}",
             "turned_on": "nast\u0105pi w\u0142\u0105czenie {entity_name}"
         }
     },
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "Nawil\u017cacz"
diff --git a/homeassistant/components/humidifier/translations/ru.json b/homeassistant/components/humidifier/translations/ru.json
index 8c2bcde5565..7845a3d36a3 100644
--- a/homeassistant/components/humidifier/translations/ru.json
+++ b/homeassistant/components/humidifier/translations/ru.json
@@ -1,11 +1,11 @@
 {
     "device_automation": {
         "action_type": {
-            "set_humidity": "\u0417\u0430\u0434\u0430\u0442\u044c \u0446\u0435\u043b\u0435\u0432\u0443\u044e \u0432\u043b\u0430\u0436\u043d\u043e\u0441\u0442\u044c {entity_name}",
-            "set_mode": "\u0421\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u0440\u0430\u0431\u043e\u0442\u044b \u043e\u0431\u044a\u0435\u043a\u0442\u0430 \"{entity_name}\"",
-            "toggle": "\u041f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}",
-            "turn_off": "\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}",
-            "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}"
+            "set_humidity": "{entity_name}: \u0437\u0430\u0434\u0430\u0442\u044c \u0432\u043b\u0430\u0436\u043d\u043e\u0441\u0442\u044c",
+            "set_mode": "{entity_name}: \u0441\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c",
+            "toggle": "{entity_name}: \u043f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_off": "{entity_name}: \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_on": "{entity_name}: \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c"
         },
         "condition_type": {
             "is_mode": "{entity_name} \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432 \u0437\u0430\u0434\u0430\u043d\u043d\u043e\u043c \u0440\u0435\u0436\u0438\u043c\u0435 \u0440\u0430\u0431\u043e\u0442\u044b",
diff --git a/homeassistant/components/humidifier/translations/zh-Hans.json b/homeassistant/components/humidifier/translations/zh-Hans.json
index 0a6aa709bcc..8fa6b0be0da 100644
--- a/homeassistant/components/humidifier/translations/zh-Hans.json
+++ b/homeassistant/components/humidifier/translations/zh-Hans.json
@@ -6,6 +6,13 @@
             "toggle": "\u5207\u6362 {entity_name} \u5f00\u5173",
             "turn_off": "\u5173\u95ed {entity_name}",
             "turn_on": "\u6253\u5f00 {entity_name}"
+        },
+        "condition_type": {
+            "is_off": "{entity_name} \u5df2\u5173\u95ed"
+        },
+        "trigger_type": {
+            "turned_off": "{entity_name} \u88ab\u5173\u95ed",
+            "turned_on": "{entity_name} \u88ab\u6253\u5f00"
         }
     },
     "state": {
diff --git a/homeassistant/components/hunterdouglas_powerview/cover.py b/homeassistant/components/hunterdouglas_powerview/cover.py
index 48b5f86cd02..d96beec53ae 100644
--- a/homeassistant/components/hunterdouglas_powerview/cover.py
+++ b/homeassistant/components/hunterdouglas_powerview/cover.py
@@ -217,7 +217,7 @@ class PowerViewShade(ShadeEntity, CoverEntity):
         _LOGGER.debug("Raw data update: %s", self._shade.raw_data)
         position_data = self._shade.raw_data.get(ATTR_POSITION_DATA, {})
         if ATTR_POSITION1 in position_data:
-            self._current_cover_position = position_data[ATTR_POSITION1]
+            self._current_cover_position = int(position_data[ATTR_POSITION1])
         self._is_opening = False
         self._is_closing = False
 
diff --git a/homeassistant/components/hunterdouglas_powerview/scene.py b/homeassistant/components/hunterdouglas_powerview/scene.py
index 89e723a02ac..61c93078aa1 100644
--- a/homeassistant/components/hunterdouglas_powerview/scene.py
+++ b/homeassistant/components/hunterdouglas_powerview/scene.py
@@ -1,5 +1,4 @@
 """Support for Powerview scenes from a Powerview hub."""
-import logging
 from typing import Any
 
 from aiopvapi.resources.scene import Scene as PvScene
@@ -23,8 +22,6 @@ from .const import (
 )
 from .entity import HDEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = vol.Schema(
     {vol.Required(CONF_PLATFORM): DOMAIN, vol.Required(HUB_ADDRESS): cv.string}
 )
diff --git a/homeassistant/components/hunterdouglas_powerview/sensor.py b/homeassistant/components/hunterdouglas_powerview/sensor.py
index 589665b5a10..6241ddd4d62 100644
--- a/homeassistant/components/hunterdouglas_powerview/sensor.py
+++ b/homeassistant/components/hunterdouglas_powerview/sensor.py
@@ -1,6 +1,4 @@
 """Support for hunterdouglass_powerview sensors."""
-import logging
-
 from aiopvapi.resources.shade import factory as PvShade
 
 from homeassistant.const import DEVICE_CLASS_BATTERY, PERCENTAGE
@@ -17,8 +15,6 @@ from .const import (
 )
 from .entity import ShadeEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up the hunter douglas shades sensors."""
diff --git a/homeassistant/components/hunterdouglas_powerview/strings.json b/homeassistant/components/hunterdouglas_powerview/strings.json
index 4cba22b60fb..5d0b042454d 100644
--- a/homeassistant/components/hunterdouglas_powerview/strings.json
+++ b/homeassistant/components/hunterdouglas_powerview/strings.json
@@ -14,11 +14,11 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
 }
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/ca.json b/homeassistant/components/hunterdouglas_powerview/translations/ca.json
index de30d18bfff..cba63e0d12f 100644
--- a/homeassistant/components/hunterdouglas_powerview/translations/ca.json
+++ b/homeassistant/components/hunterdouglas_powerview/translations/ca.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "unknown": "Error inesperat"
         },
         "step": {
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/cs.json b/homeassistant/components/hunterdouglas_powerview/translations/cs.json
index 5656d8635a0..fb71c85166c 100644
--- a/homeassistant/components/hunterdouglas_powerview/translations/cs.json
+++ b/homeassistant/components/hunterdouglas_powerview/translations/cs.json
@@ -1,11 +1,24 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
+            "link": {
+                "description": "Chcete nastavit {name} ({host})?",
+                "title": "P\u0159ipojen\u00ed k rozbo\u010dova\u010di PowerView"
+            },
             "user": {
                 "data": {
                     "host": "IP adresa"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k rozbo\u010dova\u010di PowerView"
             }
         }
-    }
+    },
+    "title": "Hunter Douglas PowerView"
 }
\ No newline at end of file
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/en.json b/homeassistant/components/hunterdouglas_powerview/translations/en.json
index 888ca60c791..7188e296bce 100644
--- a/homeassistant/components/hunterdouglas_powerview/translations/en.json
+++ b/homeassistant/components/hunterdouglas_powerview/translations/en.json
@@ -4,7 +4,7 @@
             "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "unknown": "Unexpected error"
         },
         "step": {
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/et.json b/homeassistant/components/hunterdouglas_powerview/translations/et.json
new file mode 100644
index 00000000000..8294722585b
--- /dev/null
+++ b/homeassistant/components/hunterdouglas_powerview/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "link": {
+                "description": "Kas soovid seadistada {name}({host})?"
+            },
+            "user": {
+                "data": {
+                    "host": "IP aadress"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/it.json b/homeassistant/components/hunterdouglas_powerview/translations/it.json
index 2dcb2a72c8b..2042fced9af 100644
--- a/homeassistant/components/hunterdouglas_powerview/translations/it.json
+++ b/homeassistant/components/hunterdouglas_powerview/translations/it.json
@@ -4,7 +4,7 @@
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "unknown": "Errore imprevisto"
         },
         "step": {
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/lb.json b/homeassistant/components/hunterdouglas_powerview/translations/lb.json
index a32c15e57d1..f9c13256409 100644
--- a/homeassistant/components/hunterdouglas_powerview/translations/lb.json
+++ b/homeassistant/components/hunterdouglas_powerview/translations/lb.json
@@ -4,7 +4,7 @@
             "already_configured": "Apparat ass scho konfigur\u00e9iert"
         },
         "error": {
-            "cannot_connect": "Feeler beim verbannen, prob\u00e9ier w.e.g. nach emol.",
+            "cannot_connect": "Feeler beim verbannen",
             "unknown": "Onerwaarte Feeler"
         },
         "step": {
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/no.json b/homeassistant/components/hunterdouglas_powerview/translations/no.json
index 836ecb64446..97b295dae32 100644
--- a/homeassistant/components/hunterdouglas_powerview/translations/no.json
+++ b/homeassistant/components/hunterdouglas_powerview/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
         "step": {
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/pl.json b/homeassistant/components/hunterdouglas_powerview/translations/pl.json
index 87d7b8a915e..fc48aa17d35 100644
--- a/homeassistant/components/hunterdouglas_powerview/translations/pl.json
+++ b/homeassistant/components/hunterdouglas_powerview/translations/pl.json
@@ -4,19 +4,19 @@
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "link": {
                 "description": "Czy chcesz skonfigurowa\u0107 {name} ({host})?",
-                "title": "Po\u0142\u0105cz si\u0119 z hubem PowerView"
+                "title": "Po\u0142\u0105czenie z hubem PowerView"
             },
             "user": {
                 "data": {
                     "host": "Adres IP"
                 },
-                "title": "Po\u0142\u0105cz si\u0119 z hubem PowerView"
+                "title": "Po\u0142\u0105czenie z hubem PowerView"
             }
         }
     },
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/ru.json b/homeassistant/components/hunterdouglas_powerview/translations/ru.json
index 88d363c63da..75b264b087f 100644
--- a/homeassistant/components/hunterdouglas_powerview/translations/ru.json
+++ b/homeassistant/components/hunterdouglas_powerview/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
diff --git a/homeassistant/components/hunterdouglas_powerview/translations/zh-Hant.json b/homeassistant/components/hunterdouglas_powerview/translations/zh-Hant.json
index 0eb5a4d3d37..1bb4093ad60 100644
--- a/homeassistant/components/hunterdouglas_powerview/translations/zh-Hant.json
+++ b/homeassistant/components/hunterdouglas_powerview/translations/zh-Hant.json
@@ -4,7 +4,7 @@
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
diff --git a/homeassistant/components/hvv_departures/config_flow.py b/homeassistant/components/hvv_departures/config_flow.py
index 720114413d9..1a49bffd2f5 100644
--- a/homeassistant/components/hvv_departures/config_flow.py
+++ b/homeassistant/components/hvv_departures/config_flow.py
@@ -34,7 +34,7 @@ SCHEMA_STEP_STATION = vol.Schema({vol.Required(CONF_STATION): str})
 SCHEMA_STEP_OPTIONS = vol.Schema(
     {
         vol.Required(CONF_FILTER): vol.In([]),
-        vol.Required(CONF_OFFSET, default=0): vol.All(int, vol.Range(min=0)),
+        vol.Required(CONF_OFFSET, default=0): cv.positive_int,
         vol.Optional(CONF_REAL_TIME, default=True): bool,
     }
 )
@@ -207,7 +207,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
                     vol.Required(
                         CONF_OFFSET,
                         default=self.config_entry.options.get(CONF_OFFSET, 0),
-                    ): vol.All(int, vol.Range(min=0)),
+                    ): cv.positive_int,
                     vol.Optional(
                         CONF_REAL_TIME,
                         default=self.config_entry.options.get(CONF_REAL_TIME, True),
diff --git a/homeassistant/components/hvv_departures/manifest.json b/homeassistant/components/hvv_departures/manifest.json
index cdb8ed2524f..a07181c4a95 100644
--- a/homeassistant/components/hvv_departures/manifest.json
+++ b/homeassistant/components/hvv_departures/manifest.json
@@ -3,10 +3,6 @@
   "name": "HVV Departures",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/hvv_departures",
-  "requirements": [
-    "pygti==0.6.0"
-  ],
-  "codeowners": [
-    "@vigonotion"
-  ]
-}
\ No newline at end of file
+  "requirements": ["pygti==0.9.2"],
+  "codeowners": ["@vigonotion"]
+}
diff --git a/homeassistant/components/hvv_departures/sensor.py b/homeassistant/components/hvv_departures/sensor.py
index d3a02462eb9..d6957e6beec 100644
--- a/homeassistant/components/hvv_departures/sensor.py
+++ b/homeassistant/components/hvv_departures/sensor.py
@@ -4,6 +4,7 @@ import logging
 
 from aiohttp import ClientConnectorError
 from pygti.exceptions import InvalidAuth
+from pytz import timezone
 
 from homeassistant.const import ATTR_ATTRIBUTION, ATTR_ID, DEVICE_CLASS_TIMESTAMP
 from homeassistant.helpers import aiohttp_client
@@ -65,11 +66,13 @@ class HVVDepartureSensor(Entity):
             minutes=self.config_entry.options.get("offset", 0)
         )
 
+        departure_time_tz_berlin = departure_time.astimezone(timezone("Europe/Berlin"))
+
         payload = {
             "station": self.config_entry.data[CONF_STATION],
             "time": {
-                "date": departure_time.strftime("%d.%m.%Y"),
-                "time": departure_time.strftime("%H:%M"),
+                "date": departure_time_tz_berlin.strftime("%d.%m.%Y"),
+                "time": departure_time_tz_berlin.strftime("%H:%M"),
             },
             "maxList": MAX_LIST,
             "maxTimeOffset": MAX_TIME_OFFSET,
diff --git a/homeassistant/components/hvv_departures/strings.json b/homeassistant/components/hvv_departures/strings.json
index dfd6484f7d8..c29ad6cc694 100644
--- a/homeassistant/components/hvv_departures/strings.json
+++ b/homeassistant/components/hvv_departures/strings.json
@@ -5,9 +5,9 @@
       "user": {
         "title": "Connect to the HVV API",
         "data": {
-          "host": "Host",
-          "username": "Username",
-          "password": "Password"
+          "host": "[%key:common::config_flow::data::host%]",
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
         }
       },
       "station": {
@@ -24,12 +24,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "no_results": "No results. Try with a different station/address"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
diff --git a/homeassistant/components/hvv_departures/translations/ca.json b/homeassistant/components/hvv_departures/translations/ca.json
index 4b295512feb..7a6025459c9 100644
--- a/homeassistant/components/hvv_departures/translations/ca.json
+++ b/homeassistant/components/hvv_departures/translations/ca.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "no_results": "Sense resultats. Prova-ho amb una altra estaci\u00f3/adre\u00e7a"
         },
diff --git a/homeassistant/components/hvv_departures/translations/cs.json b/homeassistant/components/hvv_departures/translations/cs.json
new file mode 100644
index 00000000000..dbe0007c2a1
--- /dev/null
+++ b/homeassistant/components/hvv_departures/translations/cs.json
@@ -0,0 +1,31 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Hostitel",
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "title": "P\u0159ipojen\u00ed k HVV API"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "offset": "Posun (v minut\u00e1ch)"
+                },
+                "title": "Mo\u017enosti"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hvv_departures/translations/en.json b/homeassistant/components/hvv_departures/translations/en.json
index ede3ece2f4a..846457196e5 100644
--- a/homeassistant/components/hvv_departures/translations/en.json
+++ b/homeassistant/components/hvv_departures/translations/en.json
@@ -4,7 +4,7 @@
             "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "no_results": "No results. Try with a different station/address"
         },
diff --git a/homeassistant/components/hvv_departures/translations/es.json b/homeassistant/components/hvv_departures/translations/es.json
index 7c9e9384e95..fbfe63e4042 100644
--- a/homeassistant/components/hvv_departures/translations/es.json
+++ b/homeassistant/components/hvv_departures/translations/es.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se ha podido conectar, por favor, int\u00e9ntelo de nuevo.",
+            "cannot_connect": "No se pudo conectar",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "no_results": "No hay resultados. Int\u00e9ntalo con una estaci\u00f3n/direcci\u00f3n diferente"
         },
diff --git a/homeassistant/components/hvv_departures/translations/et.json b/homeassistant/components/hvv_departures/translations/et.json
new file mode 100644
index 00000000000..0c0dcc2adc6
--- /dev/null
+++ b/homeassistant/components/hvv_departures/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hvv_departures/translations/it.json b/homeassistant/components/hvv_departures/translations/it.json
index f1dd507a0d5..2b9419f70cc 100644
--- a/homeassistant/components/hvv_departures/translations/it.json
+++ b/homeassistant/components/hvv_departures/translations/it.json
@@ -4,7 +4,7 @@
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "no_results": "Nessun risultato. Prova con un'altra stazione/indirizzo"
         },
diff --git a/homeassistant/components/hvv_departures/translations/nl.json b/homeassistant/components/hvv_departures/translations/nl.json
index 4d00f0bfc74..46399483e18 100644
--- a/homeassistant/components/hvv_departures/translations/nl.json
+++ b/homeassistant/components/hvv_departures/translations/nl.json
@@ -1,8 +1,12 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        },
         "step": {
             "user": {
                 "data": {
+                    "password": "Wachtwoord",
                     "username": "Gebruikersnaam"
                 }
             }
diff --git a/homeassistant/components/hvv_departures/translations/no.json b/homeassistant/components/hvv_departures/translations/no.json
index 52b91ef31d4..2c7743d61e7 100644
--- a/homeassistant/components/hvv_departures/translations/no.json
+++ b/homeassistant/components/hvv_departures/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "no_results": "Ingen resultater. Pr\u00f8v med en annen stasjon/adresse"
         },
diff --git a/homeassistant/components/hvv_departures/translations/pl.json b/homeassistant/components/hvv_departures/translations/pl.json
index 7ea22e48d54..99bc564319a 100644
--- a/homeassistant/components/hvv_departures/translations/pl.json
+++ b/homeassistant/components/hvv_departures/translations/pl.json
@@ -24,8 +24,8 @@
             "user": {
                 "data": {
                     "host": "Nazwa hosta lub adres IP",
-                    "password": "[%key_id:common::config_flow::data::password%]",
-                    "username": "[%key_id:common::config_flow::data::username%]"
+                    "password": "Has\u0142o",
+                    "username": "Nazwa u\u017cytkownika"
                 },
                 "title": "Po\u0142\u0105czenie z API HVV"
             }
diff --git a/homeassistant/components/hvv_departures/translations/ru.json b/homeassistant/components/hvv_departures/translations/ru.json
index b83981ae76f..354faf167a7 100644
--- a/homeassistant/components/hvv_departures/translations/ru.json
+++ b/homeassistant/components/hvv_departures/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "no_results": "\u041d\u0435\u0442 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441 \u0434\u0440\u0443\u0433\u043e\u0439 \u0441\u0442\u0430\u043d\u0446\u0438\u0435\u0439 / \u0430\u0434\u0440\u0435\u0441\u043e\u043c."
         },
diff --git a/homeassistant/components/hvv_departures/translations/sv.json b/homeassistant/components/hvv_departures/translations/sv.json
new file mode 100644
index 00000000000..ff31d1c1484
--- /dev/null
+++ b/homeassistant/components/hvv_departures/translations/sv.json
@@ -0,0 +1,11 @@
+{
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "real_time": "Anv\u00e4nd realtidsdata"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hvv_departures/translations/zh-Hans.json b/homeassistant/components/hvv_departures/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/hvv_departures/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/hvv_departures/translations/zh-Hant.json b/homeassistant/components/hvv_departures/translations/zh-Hant.json
index ee22830c030..5859493eeab 100644
--- a/homeassistant/components/hvv_departures/translations/zh-Hant.json
+++ b/homeassistant/components/hvv_departures/translations/zh-Hant.json
@@ -4,7 +4,7 @@
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "no_results": "\u6c92\u6709\u7d50\u679c\u3002\u8acb\u5617\u8a66\u5176\u4ed6\u8eca\u7ad9/\u5730\u5740"
         },
diff --git a/homeassistant/components/hyperion/light.py b/homeassistant/components/hyperion/light.py
index db34a21dada..e68ad8e31ee 100644
--- a/homeassistant/components/hyperion/light.py
+++ b/homeassistant/components/hyperion/light.py
@@ -74,7 +74,7 @@ PLATFORM_SCHEMA = vol.All(
 
 ICON_LIGHTBULB = "mdi:lightbulb"
 ICON_EFFECT = "mdi:lava-lamp"
-ICON_EXTERNAL_SOURCE = "mdi:video-input-hdmi"
+ICON_EXTERNAL_SOURCE = "mdi:television-ambient-light"
 
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
diff --git a/homeassistant/components/iaqualink/binary_sensor.py b/homeassistant/components/iaqualink/binary_sensor.py
index 669188c473f..07edc2dd2ea 100644
--- a/homeassistant/components/iaqualink/binary_sensor.py
+++ b/homeassistant/components/iaqualink/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Aqualink temperature sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_COLD,
     DOMAIN,
@@ -12,8 +10,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from . import AqualinkEntity
 from .const import DOMAIN as AQUALINK_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 0
 
 
diff --git a/homeassistant/components/iaqualink/config_flow.py b/homeassistant/components/iaqualink/config_flow.py
index d64ec711198..c083aee7c1c 100644
--- a/homeassistant/components/iaqualink/config_flow.py
+++ b/homeassistant/components/iaqualink/config_flow.py
@@ -23,7 +23,7 @@ class AqualinkFlowHandler(config_entries.ConfigFlow):
         # Supporting a single account.
         entries = self.hass.config_entries.async_entries(DOMAIN)
         if entries:
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="single_instance_allowed")
 
         errors = {}
 
@@ -36,7 +36,7 @@ class AqualinkFlowHandler(config_entries.ConfigFlow):
                 await aqualink.login()
                 return self.async_create_entry(title=username, data=user_input)
             except AqualinkLoginException:
-                errors["base"] = "connection_failure"
+                errors["base"] = "cannot_connect"
 
         return self.async_show_form(
             step_id="user",
diff --git a/homeassistant/components/iaqualink/light.py b/homeassistant/components/iaqualink/light.py
index 362ef8b8b8e..b86b2c00f57 100644
--- a/homeassistant/components/iaqualink/light.py
+++ b/homeassistant/components/iaqualink/light.py
@@ -1,6 +1,4 @@
 """Support for Aqualink pool lights."""
-import logging
-
 from iaqualink import AqualinkLightEffect
 
 from homeassistant.components.light import (
@@ -17,8 +15,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from . import AqualinkEntity, refresh_system
 from .const import DOMAIN as AQUALINK_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 0
 
 
diff --git a/homeassistant/components/iaqualink/sensor.py b/homeassistant/components/iaqualink/sensor.py
index 80f18dc8191..50f2a832211 100644
--- a/homeassistant/components/iaqualink/sensor.py
+++ b/homeassistant/components/iaqualink/sensor.py
@@ -1,5 +1,4 @@
 """Support for Aqualink temperature sensors."""
-import logging
 from typing import Optional
 
 from homeassistant.components.sensor import DOMAIN
@@ -10,8 +9,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from . import AqualinkEntity
 from .const import DOMAIN as AQUALINK_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 0
 
 
diff --git a/homeassistant/components/iaqualink/strings.json b/homeassistant/components/iaqualink/strings.json
index a861fd35420..5e7fcf6aa7a 100644
--- a/homeassistant/components/iaqualink/strings.json
+++ b/homeassistant/components/iaqualink/strings.json
@@ -11,10 +11,10 @@
       }
     },
     "error": {
-      "connection_failure": "Unable to connect to iAqualink. Check your username and password."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_setup": "You can only configure a single iAqualink connection."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/iaqualink/switch.py b/homeassistant/components/iaqualink/switch.py
index b71253ade12..d19c334b461 100644
--- a/homeassistant/components/iaqualink/switch.py
+++ b/homeassistant/components/iaqualink/switch.py
@@ -1,6 +1,4 @@
 """Support for Aqualink pool feature switches."""
-import logging
-
 from homeassistant.components.switch import DOMAIN, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.helpers.typing import HomeAssistantType
@@ -8,8 +6,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from . import AqualinkEntity, refresh_system
 from .const import DOMAIN as AQUALINK_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 0
 
 
diff --git a/homeassistant/components/iaqualink/translations/ca.json b/homeassistant/components/iaqualink/translations/ca.json
index 196f4970f93..f0ca2ef59e0 100644
--- a/homeassistant/components/iaqualink/translations/ca.json
+++ b/homeassistant/components/iaqualink/translations/ca.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Nom\u00e9s pots configurar una \u00fanica connexi\u00f3 d'iAqualink."
+            "already_setup": "Nom\u00e9s pots configurar una \u00fanica connexi\u00f3 d'iAqualink.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_failure": "No s'ha pogut connectar amb iAqualink. Comprova el nom d'usuari i la contrasenya."
         },
         "step": {
diff --git a/homeassistant/components/iaqualink/translations/cs.json b/homeassistant/components/iaqualink/translations/cs.json
index 338ff5d9a44..6bedd60afd8 100644
--- a/homeassistant/components/iaqualink/translations/cs.json
+++ b/homeassistant/components/iaqualink/translations/cs.json
@@ -1,11 +1,21 @@
 {
     "config": {
+        "abort": {
+            "already_setup": "M\u016f\u017eete nastavit pouze jedno p\u0159ipojen\u00ed iAqualink.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_failure": "Nelze se p\u0159ipojit k iAqualink. Zkontrolujte sv\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no a heslo."
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "description": "Zadejte pros\u00edm u\u017eivatelsk\u00e9 jm\u00e9no a heslo pro v\u00e1\u0161 \u00fa\u010det iAqualink.",
+                "title": "P\u0159ipojen\u00ed k iAqualink"
             }
         }
     }
diff --git a/homeassistant/components/iaqualink/translations/en.json b/homeassistant/components/iaqualink/translations/en.json
index 8c66ad88e6b..3ddc3a13924 100644
--- a/homeassistant/components/iaqualink/translations/en.json
+++ b/homeassistant/components/iaqualink/translations/en.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "You can only configure a single iAqualink connection."
+            "already_setup": "You can only configure a single iAqualink connection.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_failure": "Unable to connect to iAqualink. Check your username and password."
         },
         "step": {
diff --git a/homeassistant/components/iaqualink/translations/es.json b/homeassistant/components/iaqualink/translations/es.json
index 95ebdf89c98..b91ad03b297 100644
--- a/homeassistant/components/iaqualink/translations/es.json
+++ b/homeassistant/components/iaqualink/translations/es.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Solo puede configurar una \u00fanica conexi\u00f3n iAqualink."
+            "already_setup": "Solo puede configurar una \u00fanica conexi\u00f3n iAqualink.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_failure": "No se puede conectar a iAqualink. Verifica tu nombre de usuario y contrase\u00f1a."
         },
         "step": {
diff --git a/homeassistant/components/iaqualink/translations/et.json b/homeassistant/components/iaqualink/translations/et.json
new file mode 100644
index 00000000000..7a2b5e92aae
--- /dev/null
+++ b/homeassistant/components/iaqualink/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Saad h\u00e4\u00e4lestada ainult \u00fche iAqualink konto.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_failure": "IAqualink'iga ei saa \u00fchendust luua. Kontrolli oma kasutajanime ja salas\u00f5na."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "description": "Sisesta oma iAqualinki konto kasutajanimi ja salas\u00f5na."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/iaqualink/translations/it.json b/homeassistant/components/iaqualink/translations/it.json
index 568f91961f2..f1abb66006f 100644
--- a/homeassistant/components/iaqualink/translations/it.json
+++ b/homeassistant/components/iaqualink/translations/it.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "\u00c8 possibile configurare una sola connessione iAqualink."
+            "already_setup": "\u00c8 possibile configurare una sola connessione iAqualink.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_failure": "Impossibile connettersi a iAqualink. Controllare il nome utente e la password."
         },
         "step": {
diff --git a/homeassistant/components/iaqualink/translations/lb.json b/homeassistant/components/iaqualink/translations/lb.json
index 5af83e1da82..9a9082841ad 100644
--- a/homeassistant/components/iaqualink/translations/lb.json
+++ b/homeassistant/components/iaqualink/translations/lb.json
@@ -4,6 +4,7 @@
             "already_setup": "Dir k\u00ebnnt n\u00ebmmen eng eenzeg iAqualink Verbindung konfigur\u00e9ieren."
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_failure": "Kann sech net mat iAqualink verbannen. Iwwerpr\u00e9ift \u00e4ren Benotzernumm an Passwuert"
         },
         "step": {
diff --git a/homeassistant/components/iaqualink/translations/nl.json b/homeassistant/components/iaqualink/translations/nl.json
index a83dfe806e7..e2034d74fcd 100644
--- a/homeassistant/components/iaqualink/translations/nl.json
+++ b/homeassistant/components/iaqualink/translations/nl.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "U kunt slechts \u00e9\u00e9n iAqualink-verbinding configureren."
+            "already_setup": "U kunt slechts \u00e9\u00e9n iAqualink-verbinding configureren.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_failure": "Kan geen verbinding maken met iAqualink. Controleer je gebruikersnaam en wachtwoord."
         },
         "step": {
diff --git a/homeassistant/components/iaqualink/translations/no.json b/homeassistant/components/iaqualink/translations/no.json
index 530d3c50575..1a8cc479de8 100644
--- a/homeassistant/components/iaqualink/translations/no.json
+++ b/homeassistant/components/iaqualink/translations/no.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Du kan bare konfigurere en enkel iAqualink-tilkobling."
+            "already_setup": "Du kan bare konfigurere en enkel iAqualink-tilkobling.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_failure": "Kan ikke koble til iAqualink. Sjekk brukernavnet og passordet ditt."
         },
         "step": {
diff --git a/homeassistant/components/iaqualink/translations/pl.json b/homeassistant/components/iaqualink/translations/pl.json
index f0582b633f1..558a9f82006 100644
--- a/homeassistant/components/iaqualink/translations/pl.json
+++ b/homeassistant/components/iaqualink/translations/pl.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno po\u0142\u0105czenie iAqualink."
+            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno po\u0142\u0105czenie iAqualink",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_failure": "Nie mo\u017cna po\u0142\u0105czy\u0107 z iAqualink. Sprawd\u017a nazw\u0119 u\u017cytkownika i has\u0142o."
         },
         "step": {
diff --git a/homeassistant/components/iaqualink/translations/ru.json b/homeassistant/components/iaqualink/translations/ru.json
index 14c12efcf47..ac065354124 100644
--- a/homeassistant/components/iaqualink/translations/ru.json
+++ b/homeassistant/components/iaqualink/translations/ru.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_failure": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a iAqualink. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0412\u0430\u0448 \u043b\u043e\u0433\u0438\u043d \u0438 \u043f\u0430\u0440\u043e\u043b\u044c."
         },
         "step": {
diff --git a/homeassistant/components/iaqualink/translations/zh-Hans.json b/homeassistant/components/iaqualink/translations/zh-Hans.json
new file mode 100644
index 00000000000..d13c8a6b46a
--- /dev/null
+++ b/homeassistant/components/iaqualink/translations/zh-Hans.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "error": {
+            "connection_failure": "\u65e0\u6cd5\u8fde\u63a5\u5230iAqualink\u3002\u68c0\u67e5\u60a8\u7684\u7528\u6237\u540d\u548c\u5bc6\u7801\u3002"
+        },
+        "step": {
+            "user": {
+                "description": "\u8bf7\u8f93\u5165\u60a8\u7684iAqualink\u5e10\u6237\u7684\u7528\u6237\u540d\u548c\u5bc6\u7801\u3002"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/iaqualink/translations/zh-Hant.json b/homeassistant/components/iaqualink/translations/zh-Hant.json
index 99d5f434380..7a8eddeb129 100644
--- a/homeassistant/components/iaqualink/translations/zh-Hant.json
+++ b/homeassistant/components/iaqualink/translations/zh-Hant.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44 iAqualink \u9023\u7dda\u3002"
+            "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44 iAqualink \u9023\u7dda\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_failure": "\u7121\u6cd5\u9023\u7dda\u81f3 iAqualink\uff0c\u8acb\u78ba\u8a8d\u60a8\u7684\u4f7f\u7528\u8005\u540d\u7a31\u8207\u5bc6\u78bc\u3002"
         },
         "step": {
diff --git a/homeassistant/components/icloud/__init__.py b/homeassistant/components/icloud/__init__.py
index 3879d15cda8..6a3897a54c0 100644
--- a/homeassistant/components/icloud/__init__.py
+++ b/homeassistant/components/icloud/__init__.py
@@ -1,6 +1,5 @@
 """The iCloud component."""
 import asyncio
-import logging
 
 import voluptuous as vol
 
@@ -86,8 +85,6 @@ CONFIG_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
     """Set up iCloud from legacy config file."""
@@ -131,6 +128,7 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
         with_family,
         max_interval,
         gps_accuracy_threshold,
+        entry,
     )
     await hass.async_add_executor_job(account.setup)
 
@@ -189,7 +187,7 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
         icloud_account = hass.data[DOMAIN].get(account_identifier)
         if icloud_account is None:
             for account in hass.data[DOMAIN].values():
-                if account.name == account_identifier:
+                if account.username == account_identifier:
                     icloud_account = account
 
         if icloud_account is None:
diff --git a/homeassistant/components/icloud/account.py b/homeassistant/components/icloud/account.py
index 683d59e9281..e6337085e04 100644
--- a/homeassistant/components/icloud/account.py
+++ b/homeassistant/components/icloud/account.py
@@ -2,7 +2,7 @@
 from datetime import timedelta
 import logging
 import operator
-from typing import Dict
+from typing import Dict, Optional
 
 from pyicloud import PyiCloudService
 from pyicloud.exceptions import (
@@ -13,7 +13,8 @@ from pyicloud.exceptions import (
 from pyicloud.services.findmyiphone import AppleDevice
 
 from homeassistant.components.zone import async_active_zone
-from homeassistant.const import ATTR_ATTRIBUTION
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry
+from homeassistant.const import ATTR_ATTRIBUTION, CONF_USERNAME
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.event import track_point_in_utc_time
@@ -81,6 +82,7 @@ class IcloudAccount:
         with_family: bool,
         max_interval: int,
         gps_accuracy_threshold: int,
+        config_entry: ConfigEntry,
     ):
         """Initialize an iCloud account."""
         self.hass = hass
@@ -93,11 +95,12 @@ class IcloudAccount:
 
         self._icloud_dir = icloud_dir
 
-        self.api: PyiCloudService = None
+        self.api: Optional[PyiCloudService] = None
         self._owner_fullname = None
         self._family_members_fullname = {}
         self._devices = {}
         self._retried_fetch = False
+        self._config_entry = config_entry
 
         self.listeners = []
 
@@ -110,9 +113,28 @@ class IcloudAccount:
                 self._icloud_dir.path,
                 with_family=self._with_family,
             )
-        except PyiCloudFailedLoginException as error:
+        except PyiCloudFailedLoginException:
             self.api = None
-            _LOGGER.error("Error logging into iCloud Service: %s", error)
+            # Login failed which means credentials need to be updated.
+            _LOGGER.error(
+                (
+                    "Your password for '%s' is no longer working. Go to the "
+                    "Integrations menu and click on Configure on the discovered Apple "
+                    "iCloud card to login again."
+                ),
+                self._config_entry.data[CONF_USERNAME],
+            )
+
+            self.hass.add_job(
+                self.hass.config_entries.flow.async_init(
+                    DOMAIN,
+                    context={"source": SOURCE_REAUTH},
+                    data={
+                        **self._config_entry.data,
+                        "unique_id": self._config_entry.unique_id,
+                    },
+                )
+            )
             return
 
         try:
diff --git a/homeassistant/components/icloud/config_flow.py b/homeassistant/components/icloud/config_flow.py
index 052e5b98379..d447790e432 100644
--- a/homeassistant/components/icloud/config_flow.py
+++ b/homeassistant/components/icloud/config_flow.py
@@ -50,48 +50,57 @@ class IcloudFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         self._trusted_device = None
         self._verification_code = None
 
-    async def _show_setup_form(self, user_input=None, errors=None):
+        self._existing_entry = None
+        self._description_placeholders = None
+
+    def _show_setup_form(self, user_input=None, errors=None, step_id="user"):
         """Show the setup form to the user."""
 
         if user_input is None:
             user_input = {}
 
+        if step_id == "user":
+            schema = {
+                vol.Required(
+                    CONF_USERNAME, default=user_input.get(CONF_USERNAME, "")
+                ): str,
+                vol.Required(
+                    CONF_PASSWORD, default=user_input.get(CONF_PASSWORD, "")
+                ): str,
+                vol.Optional(
+                    CONF_WITH_FAMILY,
+                    default=user_input.get(CONF_WITH_FAMILY, DEFAULT_WITH_FAMILY),
+                ): bool,
+            }
+        else:
+            schema = {
+                vol.Required(
+                    CONF_PASSWORD, default=user_input.get(CONF_PASSWORD, "")
+                ): str,
+            }
+
         return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(
-                        CONF_USERNAME, default=user_input.get(CONF_USERNAME, "")
-                    ): str,
-                    vol.Required(
-                        CONF_PASSWORD, default=user_input.get(CONF_PASSWORD, "")
-                    ): str,
-                    vol.Optional(
-                        CONF_WITH_FAMILY,
-                        default=user_input.get(CONF_WITH_FAMILY, DEFAULT_WITH_FAMILY),
-                    ): bool,
-                }
-            ),
+            step_id=step_id,
+            data_schema=vol.Schema(schema),
             errors=errors or {},
+            description_placeholders=self._description_placeholders,
         )
 
-    async def async_step_user(self, user_input=None):
-        """Handle a flow initiated by the user."""
-        errors = {}
-
-        icloud_dir = self.hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
-
-        if not os.path.exists(icloud_dir.path):
-            await self.hass.async_add_executor_job(os.makedirs, icloud_dir.path)
-
-        if user_input is None:
-            return await self._show_setup_form(user_input, errors)
-
-        self._username = user_input[CONF_USERNAME]
+    async def _validate_and_create_entry(self, user_input, step_id):
+        """Check if config is valid and create entry if so."""
         self._password = user_input[CONF_PASSWORD]
-        self._with_family = user_input.get(CONF_WITH_FAMILY, DEFAULT_WITH_FAMILY)
-        self._max_interval = user_input.get(CONF_MAX_INTERVAL, DEFAULT_MAX_INTERVAL)
-        self._gps_accuracy_threshold = user_input.get(
+
+        extra_inputs = user_input
+
+        # If an existing entry was found, meaning this is a password update attempt,
+        # use those to get config values that aren't changing
+        if self._existing_entry:
+            extra_inputs = self._existing_entry
+
+        self._username = extra_inputs[CONF_USERNAME]
+        self._with_family = extra_inputs.get(CONF_WITH_FAMILY, DEFAULT_WITH_FAMILY)
+        self._max_interval = extra_inputs.get(CONF_MAX_INTERVAL, DEFAULT_MAX_INTERVAL)
+        self._gps_accuracy_threshold = extra_inputs.get(
             CONF_GPS_ACCURACY_THRESHOLD, DEFAULT_GPS_ACCURACY_THRESHOLD
         )
 
@@ -105,7 +114,7 @@ class IcloudFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                 PyiCloudService,
                 self._username,
                 self._password,
-                icloud_dir.path,
+                self.hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY).path,
                 True,
                 None,
                 self._with_family,
@@ -113,8 +122,8 @@ class IcloudFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         except PyiCloudFailedLoginException as error:
             _LOGGER.error("Error logging into iCloud service: %s", error)
             self.api = None
-            errors[CONF_USERNAME] = "login"
-            return await self._show_setup_form(user_input, errors)
+            errors = {CONF_PASSWORD: "invalid_auth"}
+            return self._show_setup_form(user_input, errors, step_id)
 
         if self.api.requires_2sa:
             return await self.async_step_trusted_device()
@@ -130,21 +139,59 @@ class IcloudFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             self.api = None
             return self.async_abort(reason="no_device")
 
-        return self.async_create_entry(
-            title=self._username,
-            data={
-                CONF_USERNAME: self._username,
-                CONF_PASSWORD: self._password,
-                CONF_WITH_FAMILY: self._with_family,
-                CONF_MAX_INTERVAL: self._max_interval,
-                CONF_GPS_ACCURACY_THRESHOLD: self._gps_accuracy_threshold,
-            },
-        )
+        data = {
+            CONF_USERNAME: self._username,
+            CONF_PASSWORD: self._password,
+            CONF_WITH_FAMILY: self._with_family,
+            CONF_MAX_INTERVAL: self._max_interval,
+            CONF_GPS_ACCURACY_THRESHOLD: self._gps_accuracy_threshold,
+        }
+
+        # If this is a password update attempt, update the entry instead of creating one
+        if step_id == "user":
+            return self.async_create_entry(title=self._username, data=data)
+
+        for entry in self.hass.config_entries.async_entries(DOMAIN):
+            if entry.unique_id == self.unique_id:
+                self.hass.config_entries.async_update_entry(entry, data=data)
+                await self.hass.config_entries.async_reload(entry.entry_id)
+                return self.async_abort(reason="reauth_successful")
+
+    async def async_step_user(self, user_input=None):
+        """Handle a flow initiated by the user."""
+        errors = {}
+
+        icloud_dir = self.hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
+
+        if not os.path.exists(icloud_dir.path):
+            await self.hass.async_add_executor_job(os.makedirs, icloud_dir.path)
+
+        if user_input is None:
+            return self._show_setup_form(user_input, errors)
+
+        return await self._validate_and_create_entry(user_input, "user")
 
     async def async_step_import(self, user_input):
         """Import a config entry."""
         return await self.async_step_user(user_input)
 
+    async def async_step_reauth(self, user_input=None):
+        """Update password for a config entry that can't authenticate."""
+        # Store existing entry data so it can be used later and set unique ID
+        # so existing config entry can be updated
+        if not self._existing_entry:
+            await self.async_set_unique_id(user_input.pop("unique_id"))
+            self._existing_entry = user_input.copy()
+            self._description_placeholders = {"username": user_input[CONF_USERNAME]}
+            user_input = None
+
+        if user_input is None:
+            return self._show_setup_form(step_id=config_entries.SOURCE_REAUTH)
+
+        return await self._validate_and_create_entry(
+            user_input, config_entries.SOURCE_REAUTH
+        )
+
     async def async_step_trusted_device(self, user_input=None, errors=None):
         """We need a trusted device."""
         if errors is None:
diff --git a/homeassistant/components/icloud/device_tracker.py b/homeassistant/components/icloud/device_tracker.py
index 0b245416887..59554c001ef 100644
--- a/homeassistant/components/icloud/device_tracker.py
+++ b/homeassistant/components/icloud/device_tracker.py
@@ -1,5 +1,4 @@
 """Support for tracking for iCloud devices."""
-import logging
 from typing import Dict
 
 from homeassistant.components.device_tracker import SOURCE_TYPE_GPS
@@ -17,8 +16,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_scanner(
     hass: HomeAssistantType, config, see, discovery_info=None
diff --git a/homeassistant/components/icloud/sensor.py b/homeassistant/components/icloud/sensor.py
index 37bbdf69703..859148d8190 100644
--- a/homeassistant/components/icloud/sensor.py
+++ b/homeassistant/components/icloud/sensor.py
@@ -1,5 +1,4 @@
 """Support for iCloud sensors."""
-import logging
 from typing import Dict
 
 from homeassistant.config_entries import ConfigEntry
@@ -13,8 +12,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from .account import IcloudAccount, IcloudDevice
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/icloud/strings.json b/homeassistant/components/icloud/strings.json
index 7153bb9340e..d07b3c3b870 100644
--- a/homeassistant/components/icloud/strings.json
+++ b/homeassistant/components/icloud/strings.json
@@ -10,6 +10,13 @@
           "with_family": "With family"
         }
       },
+      "reauth": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "Your previously entered password for {username} is no longer working. Update your password to keep using this integration.",
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      },
       "trusted_device": {
         "title": "iCloud trusted device",
         "description": "Select your trusted device",
@@ -26,13 +33,14 @@
       }
     },
     "error": {
-      "login": "Login error: please check your email & password",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "send_verification_code": "Failed to send verification code",
       "validate_verification_code": "Failed to verify your verification code, choose a trust device and start the verification again"
     },
     "abort": {
-      "already_configured": "Account already configured",
-      "no_device": "None of your devices have \"Find my iPhone\" activated"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "no_device": "None of your devices have \"Find my iPhone\" activated",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/icloud/translations/ca.json b/homeassistant/components/icloud/translations/ca.json
index 5fa4ee6626d..c6f634c7e6f 100644
--- a/homeassistant/components/icloud/translations/ca.json
+++ b/homeassistant/components/icloud/translations/ca.json
@@ -2,14 +2,23 @@
     "config": {
         "abort": {
             "already_configured": "El compte ja ha estat configurat",
-            "no_device": "Cap dels teus dispositius t\u00e9 activada la opci\u00f3 \"Troba el meu iPhone\""
+            "no_device": "Cap dels teus dispositius t\u00e9 activada la opci\u00f3 \"Troba el meu iPhone\"",
+            "reauth_successful": "Re-autenticaci\u00f3 realitzada correctament"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "login": "Error d'inici de sessi\u00f3: comprova el correu electr\u00f2nic i la contrasenya",
             "send_verification_code": "No s'ha pogut enviar el codi de verificaci\u00f3",
             "validate_verification_code": "No s'ha pogut verificar el codi de verificaci\u00f3, tria un dispositiu de confian\u00e7a i torna a iniciar el proc\u00e9s"
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "Contrasenya"
+                },
+                "description": "La contrasenya introdu\u00efda anteriorment per a {username} ja no funciona. Actualitza la contrasenya per continuar utilitzant aquesta integraci\u00f3.",
+                "title": "Reautenticaci\u00f3 de la integraci\u00f3"
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "Dispositiu de confian\u00e7a"
diff --git a/homeassistant/components/icloud/translations/cs.json b/homeassistant/components/icloud/translations/cs.json
index e20e44aec6e..d3c012e2359 100644
--- a/homeassistant/components/icloud/translations/cs.json
+++ b/homeassistant/components/icloud/translations/cs.json
@@ -1,11 +1,46 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "no_device": "\u017d\u00e1dn\u00e9 z va\u0161ich za\u0159\u00edzen\u00ed nem\u00e1 aktivovan\u00e9 \"Naj\u00edt m\u016fj iPhone\"",
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9"
+        },
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "login": "Chyba p\u0159ihl\u00e1\u0161en\u00ed: zkontrolujte pros\u00edm sv\u016fj e-mail a heslo",
+            "send_verification_code": "Odesl\u00e1n\u00ed ov\u011b\u0159ovac\u00edho k\u00f3du se nezda\u0159ilo",
+            "validate_verification_code": "Nepoda\u0159ilo se ov\u011b\u0159it v\u00e1\u0161 ov\u011b\u0159ovac\u00ed k\u00f3d, vyberte d\u016fv\u011bryhodn\u00e9 za\u0159\u00edzen\u00ed a spus\u0165te ov\u011b\u0159en\u00ed znovu"
+        },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "Heslo"
+                },
+                "description": "Va\u0161e zadan\u00e9 heslo pro {username} ji\u017e nefunguje. Chcete-li tuto d\u00e1le integraci pou\u017e\u00edvat, aktualizujte sv\u00e9 heslo.",
+                "title": "Znovu ov\u011b\u0159it integraci"
+            },
+            "trusted_device": {
+                "data": {
+                    "trusted_device": "D\u016fv\u011bryhodn\u00e9 za\u0159\u00edzen\u00ed"
+                },
+                "description": "Vyberte sv\u00e9 d\u016fv\u011bryhodn\u00e9 za\u0159\u00edzen\u00ed",
+                "title": "D\u016fv\u011bryhodn\u00e9 za\u0159\u00edzen\u00ed iCloud"
+            },
             "user": {
                 "data": {
                     "password": "Heslo",
-                    "username": "E-mail"
-                }
+                    "username": "E-mail",
+                    "with_family": "S rodinou"
+                },
+                "description": "Zadejte sv\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje",
+                "title": "P\u0159ihla\u0161ovac\u00ed \u00fadaje k iCloud"
+            },
+            "verification_code": {
+                "data": {
+                    "verification_code": "Ov\u011b\u0159ovac\u00ed k\u00f3d"
+                },
+                "description": "Zadejte ov\u011b\u0159ovac\u00ed k\u00f3d, kter\u00fd jste pr\u00e1v\u011b obdr\u017eeli z iCloudu",
+                "title": "Ov\u011b\u0159ovac\u00ed k\u00f3d iCloudu"
             }
         }
     }
diff --git a/homeassistant/components/icloud/translations/de.json b/homeassistant/components/icloud/translations/de.json
index 5857c3b34f0..ea2096c3c00 100644
--- a/homeassistant/components/icloud/translations/de.json
+++ b/homeassistant/components/icloud/translations/de.json
@@ -10,6 +10,11 @@
             "validate_verification_code": "Verifizierung des Verifizierungscodes fehlgeschlagen. W\u00e4hle ein vertrauensw\u00fcrdiges Ger\u00e4t aus und starte die Verifizierung erneut"
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "Passwort"
+                }
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "Vertrauensw\u00fcrdiges Ger\u00e4t"
diff --git a/homeassistant/components/icloud/translations/en.json b/homeassistant/components/icloud/translations/en.json
index 0e944188222..0421cfe3902 100644
--- a/homeassistant/components/icloud/translations/en.json
+++ b/homeassistant/components/icloud/translations/en.json
@@ -1,15 +1,24 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Account already configured",
-            "no_device": "None of your devices have \"Find my iPhone\" activated"
+            "already_configured": "Account is already configured",
+            "no_device": "None of your devices have \"Find my iPhone\" activated",
+            "reauth_successful": "Re-authentication was successful"
         },
         "error": {
+            "invalid_auth": "Invalid authentication",
             "login": "Login error: please check your email & password",
             "send_verification_code": "Failed to send verification code",
             "validate_verification_code": "Failed to verify your verification code, choose a trust device and start the verification again"
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "Password"
+                },
+                "description": "Your previously entered password for {username} is no longer working. Update your password to keep using this integration.",
+                "title": "Reauthenticate Integration"
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "Trusted device"
diff --git a/homeassistant/components/icloud/translations/es.json b/homeassistant/components/icloud/translations/es.json
index 49bd9d612eb..dbbdaae376e 100644
--- a/homeassistant/components/icloud/translations/es.json
+++ b/homeassistant/components/icloud/translations/es.json
@@ -1,15 +1,24 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Cuenta ya configurada",
-            "no_device": "Ninguno de tus dispositivos tiene activado \"Buscar mi iPhone\""
+            "already_configured": "La cuenta ya ha sido configurada",
+            "no_device": "Ninguno de tus dispositivos tiene activado \"Buscar mi iPhone\"",
+            "reauth_successful": "La reautenticaci\u00f3n se realiz\u00f3 correctamente"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "login": "Error de inicio de sesi\u00f3n: comprueba tu direcci\u00f3n de correo electr\u00f3nico y contrase\u00f1a",
             "send_verification_code": "Error al enviar el c\u00f3digo de verificaci\u00f3n",
             "validate_verification_code": "No se pudo verificar el c\u00f3digo de verificaci\u00f3n, elegir un dispositivo de confianza e iniciar la verificaci\u00f3n de nuevo"
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "Contrase\u00f1a"
+                },
+                "description": "La contrase\u00f1a introducida anteriormente para {username} ya no funciona. Actualiza tu contrase\u00f1a para seguir usando esta integraci\u00f3n.",
+                "title": "Credenciales de iCloud"
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "Dispositivo de confianza"
diff --git a/homeassistant/components/icloud/translations/et.json b/homeassistant/components/icloud/translations/et.json
new file mode 100644
index 00000000000..41bc069f6a4
--- /dev/null
+++ b/homeassistant/components/icloud/translations/et.json
@@ -0,0 +1,26 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud",
+            "reauth_successful": "Taastuvastamine \u00f5nnestus"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga"
+        },
+        "step": {
+            "reauth": {
+                "data": {
+                    "password": "Salas\u00f5na"
+                },
+                "description": "Varem sisestatud salas\u00f5na kasutajale {username} ei t\u00f6\u00f6ta enam. Selle sidumise kasutamise j\u00e4tkamiseks v\u00e4rskendage oma salas\u00f5na.",
+                "title": "iCloudi tuvastusandmed"
+            },
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "E-post"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/icloud/translations/fr.json b/homeassistant/components/icloud/translations/fr.json
index 0ede270fd79..000696d5b7d 100644
--- a/homeassistant/components/icloud/translations/fr.json
+++ b/homeassistant/components/icloud/translations/fr.json
@@ -5,6 +5,7 @@
             "no_device": "Aucun de vos appareils n'a activ\u00e9 \"Find my iPhone\""
         },
         "error": {
+            "invalid_auth": "Authentification invalide",
             "login": "Erreur de connexion: veuillez v\u00e9rifier votre e-mail et votre mot de passe",
             "send_verification_code": "\u00c9chec de l'envoi du code de v\u00e9rification",
             "validate_verification_code": "Impossible de v\u00e9rifier votre code de v\u00e9rification, choisissez un appareil de confiance et recommencez la v\u00e9rification"
diff --git a/homeassistant/components/icloud/translations/it.json b/homeassistant/components/icloud/translations/it.json
index 27429081e1e..98d3ca2f780 100644
--- a/homeassistant/components/icloud/translations/it.json
+++ b/homeassistant/components/icloud/translations/it.json
@@ -1,15 +1,24 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Account gi\u00e0 configurato",
-            "no_device": "Nessuno dei tuoi dispositivi ha attivato \"Trova il mio iPhone\""
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato",
+            "no_device": "Nessuno dei tuoi dispositivi ha attivato \"Trova il mio iPhone\"",
+            "reauth_successful": "La riautenticazione ha avuto successo"
         },
         "error": {
+            "invalid_auth": "Autenticazione non valida",
             "login": "Errore di accesso: si prega di controllare la tua e-mail e la password",
             "send_verification_code": "Impossibile inviare il codice di verifica",
             "validate_verification_code": "Impossibile verificare il codice di verifica, scegliere un dispositivo attendibile e riavviare la verifica"
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "Password"
+                },
+                "description": "La password inserita in precedenza per {username} non funziona pi\u00f9. Aggiorna la tua password per continuare a utilizzare questa integrazione.",
+                "title": "Credenziali iCloud"
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "Dispositivo attendibile"
diff --git a/homeassistant/components/icloud/translations/lb.json b/homeassistant/components/icloud/translations/lb.json
index b6e9abe94bc..f47ffdbb64b 100644
--- a/homeassistant/components/icloud/translations/lb.json
+++ b/homeassistant/components/icloud/translations/lb.json
@@ -5,6 +5,7 @@
             "no_device": "Kee vun dengen Apparater huet \"Find my iPhone\" aktiv\u00e9iert"
         },
         "error": {
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "login": "Feeler beim Login: iwwerpr\u00e9ift \u00e4r E-Mail & Passwuert",
             "send_verification_code": "Feeler beim sch\u00e9cken vum Verifikatiouns Code",
             "validate_verification_code": "Feeler beim iwwerpr\u00e9iwe vum Verifikatiouns Code, wielt ee vertrauten Apparat aus a start d'Iwwerpr\u00e9iwung nei"
diff --git a/homeassistant/components/icloud/translations/no.json b/homeassistant/components/icloud/translations/no.json
index 9805c769a67..b1024920d65 100644
--- a/homeassistant/components/icloud/translations/no.json
+++ b/homeassistant/components/icloud/translations/no.json
@@ -2,14 +2,23 @@
     "config": {
         "abort": {
             "already_configured": "Kontoen er allerede konfigurert",
-            "no_device": "Ingen av enhetene dine har \"Finn min iPhone\" aktivert"
+            "no_device": "Ingen av enhetene dine har \"Finn min iPhone\" aktivert",
+            "reauth_successful": "Reautentisering var vellykket"
         },
         "error": {
+            "invalid_auth": "Ugyldig godkjenning",
             "login": "Innloggingsfeil: vennligst sjekk e-postadressen og passordet ditt",
             "send_verification_code": "Kunne ikke sende bekreftelseskode",
             "validate_verification_code": "Kunne ikke bekrefte bekreftelseskoden din, velg en tillitsenhet og start bekreftelsen p\u00e5 nytt"
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "Passord"
+                },
+                "description": "Ditt tidligere angitte passord for {username} fungerer ikke lenger. Oppdater passordet ditt for \u00e5 fortsette \u00e5 bruke denne integrasjonen.",
+                "title": "Bekreft integrering p\u00e5 nytt"
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "P\u00e5litelig enhet"
diff --git a/homeassistant/components/icloud/translations/pl.json b/homeassistant/components/icloud/translations/pl.json
index 74d9fa42c27..5ac18305140 100644
--- a/homeassistant/components/icloud/translations/pl.json
+++ b/homeassistant/components/icloud/translations/pl.json
@@ -1,15 +1,24 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Konto jest ju\u017c skonfigurowane.",
-            "no_device": "\u017badne z Twoich urz\u0105dze\u0144 nie ma aktywowanej funkcji \"Znajd\u017a m\u00f3j iPhone\"."
+            "already_configured": "Konto jest ju\u017c skonfigurowane",
+            "no_device": "\u017badne z Twoich urz\u0105dze\u0144 nie ma aktywowanej funkcji \"Znajd\u017a m\u00f3j iPhone\"",
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119"
         },
         "error": {
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "login": "B\u0142\u0105d logowania: sprawd\u017a adres e-mail i has\u0142o",
             "send_verification_code": "Nie uda\u0142o si\u0119 wys\u0142a\u0107 kodu weryfikacyjnego",
             "validate_verification_code": "Nie uda\u0142o si\u0119 zweryfikowa\u0107 kodu weryfikacyjnego, wybierz urz\u0105dzenie zaufane i ponownie rozpocznij weryfikacj\u0119"
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "Has\u0142o"
+                },
+                "description": "Twoje poprzednio wprowadzone has\u0142o dla {username} ju\u017c nie dzia\u0142a. Zaktualizuj swoje has\u0142o, aby nadal korzysta\u0107 z tej integracji.",
+                "title": "Ponownie uwierzytelnij integracj\u0119"
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "Zaufane urz\u0105dzenie"
diff --git a/homeassistant/components/icloud/translations/ru.json b/homeassistant/components/icloud/translations/ru.json
index 9066961ce29..5270ffe531b 100644
--- a/homeassistant/components/icloud/translations/ru.json
+++ b/homeassistant/components/icloud/translations/ru.json
@@ -2,14 +2,23 @@
     "config": {
         "abort": {
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
-            "no_device": "\u041d\u0438 \u043d\u0430 \u043e\u0434\u043d\u043e\u043c \u0438\u0437 \u0412\u0430\u0448\u0438\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432 \u043d\u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u044f \"\u041d\u0430\u0439\u0442\u0438 iPhone\"."
+            "no_device": "\u041d\u0438 \u043d\u0430 \u043e\u0434\u043d\u043e\u043c \u0438\u0437 \u0412\u0430\u0448\u0438\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432 \u043d\u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u044f \"\u041d\u0430\u0439\u0442\u0438 iPhone\".",
+            "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
         },
         "error": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "login": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0445\u043e\u0434\u0430: \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0430\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b \u0438 \u043f\u0430\u0440\u043e\u043b\u044c.",
             "send_verification_code": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u043a\u043e\u0434 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f.",
             "validate_verification_code": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c \u043a\u043e\u0434 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u043e\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0438 \u043d\u0430\u0447\u043d\u0438\u0442\u0435 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0443 \u0441\u043d\u043e\u0432\u0430."
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "\u041f\u0430\u0440\u043e\u043b\u044c"
+                },
+                "description": "\u0420\u0430\u043d\u0435\u0435 \u0432\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f {username} \u0431\u043e\u043b\u044c\u0448\u0435 \u043d\u0435 \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442. \u0410\u0432\u0442\u043e\u0440\u0438\u0437\u0443\u0439\u0442\u0435\u0441\u044c, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u044d\u0442\u0443 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044e.",
+                "title": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0444\u0438\u043b\u044f"
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "\u0414\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u043e\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e"
diff --git a/homeassistant/components/icloud/translations/sv.json b/homeassistant/components/icloud/translations/sv.json
index 9f11709fcb4..31dbf29c89d 100644
--- a/homeassistant/components/icloud/translations/sv.json
+++ b/homeassistant/components/icloud/translations/sv.json
@@ -18,7 +18,8 @@
             },
             "user": {
                 "data": {
-                    "password": "L\u00f6senord"
+                    "password": "L\u00f6senord",
+                    "username": "Email"
                 },
                 "description": "Ange dina autentiseringsuppgifter",
                 "title": "iCloud-autentiseringsuppgifter"
diff --git a/homeassistant/components/icloud/translations/zh-Hans.json b/homeassistant/components/icloud/translations/zh-Hans.json
index 0fed17b7ce1..82927dc54b5 100644
--- a/homeassistant/components/icloud/translations/zh-Hans.json
+++ b/homeassistant/components/icloud/translations/zh-Hans.json
@@ -9,6 +9,11 @@
             "validate_verification_code": "\u65e0\u6cd5\u9a8c\u8bc1\u9a8c\u8bc1\u7801\uff0c\u8bf7\u9009\u62e9\u53d7\u4fe1\u4efb\u7684\u8bbe\u5907\u5e76\u91cd\u65b0\u5f00\u59cb\u9a8c\u8bc1"
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "\u5bc6\u7801"
+                }
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "\u53d7\u4fe1\u4efb\u7684\u8bbe\u5907"
@@ -18,7 +23,8 @@
             },
             "user": {
                 "data": {
-                    "password": "\u5bc6\u7801"
+                    "password": "\u5bc6\u7801",
+                    "username": "\u90ae\u7bb1"
                 },
                 "description": "\u8bf7\u8f93\u5165\u51ed\u636e",
                 "title": "iCloud \u51ed\u636e"
diff --git a/homeassistant/components/icloud/translations/zh-Hant.json b/homeassistant/components/icloud/translations/zh-Hant.json
index f917bfedd60..a48f0a74e85 100644
--- a/homeassistant/components/icloud/translations/zh-Hant.json
+++ b/homeassistant/components/icloud/translations/zh-Hant.json
@@ -2,14 +2,23 @@
     "config": {
         "abort": {
             "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "no_device": "\u8a2d\u5099\u7686\u672a\u958b\u555f\u300c\u5c0b\u627e\u6211\u7684 iPhone\u300d\u529f\u80fd\u3002"
+            "no_device": "\u8a2d\u5099\u7686\u672a\u958b\u555f\u300c\u5c0b\u627e\u6211\u7684 iPhone\u300d\u529f\u80fd\u3002",
+            "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f"
         },
         "error": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "login": "\u767b\u5165\u932f\u8aa4\uff1a\u8acb\u78ba\u8a8d\u96fb\u5b50\u90f5\u4ef6\u8207\u5bc6\u78bc",
             "send_verification_code": "\u50b3\u9001\u9a57\u8b49\u78bc\u5931\u6557",
             "validate_verification_code": "\u7121\u6cd5\u9a57\u8b49\u8f38\u5165\u9a57\u8b49\u78bc\uff0c\u9078\u64c7\u4e00\u90e8\u4fe1\u4efb\u8a2d\u5099\u3001\u7136\u5f8c\u91cd\u65b0\u57f7\u884c\u9a57\u8b49\u3002"
         },
         "step": {
+            "reauth": {
+                "data": {
+                    "password": "\u5bc6\u78bc"
+                },
+                "description": "\u5148\u524d\u91dd\u5c0d\u5e33\u865f {username} \u6240\u8f38\u5165\u7684\u5bc6\u78bc\u5df2\u5931\u6548\u3002\u8acb\u66f4\u65b0\u5bc6\u78bc\u4ee5\u4f7f\u7528\u6b64\u6574\u5408\u3002",
+                "title": "\u91cd\u65b0\u8a8d\u8b49\u6574\u5408"
+            },
             "trusted_device": {
                 "data": {
                     "trusted_device": "\u4fe1\u4efb\u8a2d\u5099"
diff --git a/homeassistant/components/ifttt/strings.json b/homeassistant/components/ifttt/strings.json
index b637e0de13d..9002cf30756 100644
--- a/homeassistant/components/ifttt/strings.json
+++ b/homeassistant/components/ifttt/strings.json
@@ -7,7 +7,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive IFTTT messages."
     },
     "create_entry": {
diff --git a/homeassistant/components/ifttt/translations/ca.json b/homeassistant/components/ifttt/translations/ca.json
index 29f9fa29fe9..8706b5655dc 100644
--- a/homeassistant/components/ifttt/translations/ca.json
+++ b/homeassistant/components/ifttt/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de IFTTT.",
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "Per enviar esdeveniments a Home Assistant, necessitar\u00e0s utilitzar l'acci\u00f3 \"Make a web resquest\" de [IFTTT Webhook applet]({applet_url}). \n\nCompleta la seg\u00fcent informaci\u00f3: \n\n- URL: `{webhook_url}` \n- Method: POST \n- Content Type: application/json \n\nConsulta la [documentaci\u00f3]({docs_url}) sobre com configurar les automatitzacions per gestionar dades entrants."
diff --git a/homeassistant/components/ifttt/translations/cs.json b/homeassistant/components/ifttt/translations/cs.json
index 1f14283a05e..7ce666724e8 100644
--- a/homeassistant/components/ifttt/translations/cs.json
+++ b/homeassistant/components/ifttt/translations/cs.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Va\u0161e Home Assistant instance mus\u00ed b\u00fdt p\u0159\u00edstupn\u00e1 z internetu aby mohla p\u0159ij\u00edmat zpr\u00e1vy IFTTT.",
-            "one_instance_allowed": "Povolena je pouze jedna instance."
+            "not_internet_accessible": "V\u00e1\u0161 Home Asistent mus\u00ed b\u00fdt p\u0159\u00edstupn\u00fd z internetu, aby mohl p\u0159ij\u00edmat zpr\u00e1vy od IFTTT.",
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "create_entry": {
             "default": "Chcete-li odeslat ud\u00e1losti do aplikace Home Assistant, budete muset pou\u017e\u00edt akci \"Vytvo\u0159it webovou \u017e\u00e1dost\" z [IFTTT Webhook appletu]({applet_url}). \n\n Vypl\u0148te n\u00e1sleduj\u00edc\u00ed informace: \n\n - URL: ` {webhook_url} ' \n - Metoda: POST \n - Typ obsahu: aplikace/json \n\n Viz [dokumentace]({docs_url}), jak konfigurovat automatizace pro zpracov\u00e1n\u00ed p\u0159\u00edchoz\u00edch dat."
diff --git a/homeassistant/components/ifttt/translations/el.json b/homeassistant/components/ifttt/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/ifttt/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ifttt/translations/en.json b/homeassistant/components/ifttt/translations/en.json
index 5a54f5a9aa5..006680f9402 100644
--- a/homeassistant/components/ifttt/translations/en.json
+++ b/homeassistant/components/ifttt/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive IFTTT messages.",
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "To send events to Home Assistant, you will need to use the \"Make a web request\" action from the [IFTTT Webhook applet]({applet_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nSee [the documentation]({docs_url}) on how to configure automations to handle incoming data."
diff --git a/homeassistant/components/ifttt/translations/es.json b/homeassistant/components/ifttt/translations/es.json
index 713cff93847..acc74410df5 100644
--- a/homeassistant/components/ifttt/translations/es.json
+++ b/homeassistant/components/ifttt/translations/es.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Su instancia de Home Assistant debe estar accesible desde Internet para recibir mensajes IFTTT.",
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "not_internet_accessible": "Tu instancia de Home Assistant debe ser accesible desde Internet para recibir mensajes IFTTT.",
+            "one_instance_allowed": "S\u00f3lo se necesita una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Para enviar eventos a Home Assistant debes usar la acci\u00f3n \"Make a web request\" del [applet IFTTT Webhook]({applet_url}).\n\nCompleta la siguiente informaci\u00f3n: \n\n- URL: `{webhook_url}`\n- M\u00e9todo: POST\n- Tipo de contenido: application/json\n\nConsulta [la documentaci\u00f3n]({docs_url}) sobre c\u00f3mo configurar las automatizaciones para manejar los datos entrantes."
diff --git a/homeassistant/components/ifttt/translations/et.json b/homeassistant/components/ifttt/translations/et.json
index 6425b216b9e..1ab718c48f1 100644
--- a/homeassistant/components/ifttt/translations/et.json
+++ b/homeassistant/components/ifttt/translations/et.json
@@ -1,7 +1,15 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
         "create_entry": {
             "default": "S\u00fcndmuste saatmiseks Home Assistantile peate kasutama toimingut \"Make a web request\" [IFTTT Webhooki apletilt] ({applet_url}).\n\nSisestage j\u00e4rgmine teave:\n\n- URL: {webhook_url}.\n- Method: POST\n- Content Type: application/json\n\nVaadake [dokumentatsiooni]({docs_url}) kuidas seadistada sissetulevate andmete t\u00f6\u00f6tlemiseks automatiseerimisi."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid kindlasti IFTTT seadistada?"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/ifttt/translations/fr.json b/homeassistant/components/ifttt/translations/fr.json
index 823801e9743..b8782f1452e 100644
--- a/homeassistant/components/ifttt/translations/fr.json
+++ b/homeassistant/components/ifttt/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Votre instance Home Assistant doit \u00eatre accessible \u00e0 partir d'Internet pour recevoir les messages IFTTT.",
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "Pour envoyer des \u00e9v\u00e9nements \u00e0 Home Assistant, vous devez utiliser l'action \"Effectuer une demande Web\" \u00e0 partir de [l'applet IFTTT Webhook]({applet_url}). \n\n Remplissez les informations suivantes: \n\n - URL: ` {webhook_url} ` \n - M\u00e9thode: POST \n - Type de contenu: application / json \n\n Voir [la documentation]({docs_url}) pour savoir comment configurer les automatisations pour g\u00e9rer les donn\u00e9es entrantes."
diff --git a/homeassistant/components/ifttt/translations/it.json b/homeassistant/components/ifttt/translations/it.json
index 1989efd733c..101e91e7f98 100644
--- a/homeassistant/components/ifttt/translations/it.json
+++ b/homeassistant/components/ifttt/translations/it.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La tua istanza di Home Assistant deve essere accessibile da Internet per ricevere messaggi IFTTT.",
-            "one_instance_allowed": "\u00c8 necessaria una sola istanza."
+            "one_instance_allowed": "\u00c8 necessaria una sola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "Per inviare eventi a Home Assistant, \u00e8 necessario utilizzare l'azione \"Crea una richiesta web\" dall'[applet IFTTT Webhook]({applet_url}). \n\n Compilare le seguenti informazioni: \n\n - URL: `{webhook_url}` \n - Metodo: POST \n - Tipo di contenuto: application/json \n\nVedere [la documentazione]({docs_url}) su come configurare le automazioni per gestire i dati in arrivo."
diff --git a/homeassistant/components/ifttt/translations/lb.json b/homeassistant/components/ifttt/translations/lb.json
index a13dd946a3e..7ff324b45a2 100644
--- a/homeassistant/components/ifttt/translations/lb.json
+++ b/homeassistant/components/ifttt/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir IFTTT Noriichten z'empf\u00e4nken.",
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Fir Evenementer un Home Assistant ze sch\u00e9ckemusst dir d'Aktioun \"Make a web request\" vum [IFTTT Webhook applet] ({applet_url}) benotzen.\n\nGitt folgend Informatiounen un:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nKuckt iech [Dokumentatioun]({docs_url}) w\u00e9i een Automatisatioune mat empfaangene Donn\u00e9e konfigur\u00e9iert."
diff --git a/homeassistant/components/ifttt/translations/nl.json b/homeassistant/components/ifttt/translations/nl.json
index f6ebaa0e7c4..8415509b941 100644
--- a/homeassistant/components/ifttt/translations/nl.json
+++ b/homeassistant/components/ifttt/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Uw Home Assistant-instantie moet via internet toegankelijk zijn om IFTTT-berichten te ontvangen.",
-            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Om evenementen naar de Home Assistant te verzenden, moet u de actie \"Een webverzoek doen\" gebruiken vanuit de [IFTTT Webhook-applet]({applet_url}). \n\n Vul de volgende info in: \n\n - URL: `{webhook_url}` \n - Method: POST \n - Content Type: application/json \n\nZie [the documentation]({docs_url}) voor informatie over het configureren van automatiseringen om inkomende gegevens te verwerken."
diff --git a/homeassistant/components/ifttt/translations/no.json b/homeassistant/components/ifttt/translations/no.json
index 54c2f71f40b..af3f14ac087 100644
--- a/homeassistant/components/ifttt/translations/no.json
+++ b/homeassistant/components/ifttt/translations/no.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Din Home Assistant enhet m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 kunne motta IFTTT-meldinger.",
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
             "default": "For \u00e5 sende hendelser til Home Assistant, m\u00e5 du bruke \"Make a web request\" handlingen fra [IFTTT Webhook applet]({applet_url}).\n\nFyll ut f\u00f8lgende informasjon:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nSe [dokumentasjonen]({docs_url}) om hvordan du konfigurerer automatiseringer for \u00e5 h\u00e5ndtere innkommende data."
diff --git a/homeassistant/components/ifttt/translations/pl.json b/homeassistant/components/ifttt/translations/pl.json
index d35b30cbf8f..321c31142ca 100644
--- a/homeassistant/components/ifttt/translations/pl.json
+++ b/homeassistant/components/ifttt/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty IFTTT.",
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty IFTTT",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistanta, musisz u\u017cy\u0107 akcji \"Make a web request\" z [IFTTT Webhook apletu]({applet_url}). \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}`\n - Metoda: POST\n - Typ zawarto\u015bci: application/json\n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) na temat konfiguracji automatyzacji, by obs\u0142u\u017cy\u0107 przychodz\u0105ce dane."
+            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistant, musisz u\u017cy\u0107 akcji \"Make a web request\" z [apletu IFTTT Webhook]({applet_url}). \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}`\n - Metoda: POST\n - Typ zawarto\u015bci: application/json\n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) na temat konfiguracji automatyzacji, by obs\u0142u\u017cy\u0107 przychodz\u0105ce dane."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ifttt/translations/ru.json b/homeassistant/components/ifttt/translations/ru.json
index c78fd1090ad..4f3efe9e267 100644
--- a/homeassistant/components/ifttt/translations/ru.json
+++ b/homeassistant/components/ifttt/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 IFTTT.",
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \"Make a web request\" \u0438\u0437 [IFTTT Webhook applet]({applet_url}).\n\n\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0437\u0430\u0446\u0438\u0439 \u043f\u043e \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0435 \u043f\u043e\u0441\u0442\u0443\u043f\u0430\u044e\u0449\u0438\u0445 \u0434\u0430\u043d\u043d\u044b\u0445."
diff --git a/homeassistant/components/ifttt/translations/zh-Hant.json b/homeassistant/components/ifttt/translations/zh-Hant.json
index 8337aa82479..cb57097e4f2 100644
--- a/homeassistant/components/ifttt/translations/zh-Hant.json
+++ b/homeassistant/components/ifttt/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant \u7269\u4ef6\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 IFTTT \u8a0a\u606f\u3002",
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u8981\u7531 [IFTTT Webhook applet]({applet_url}) \u547c\u53eb\u300c\u9032\u884c Web \u8acb\u6c42\u300d\u52d5\u4f5c\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\n\u95dc\u65bc\u5982\u4f55\u50b3\u5165\u8cc7\u6599\u81ea\u52d5\u5316\u8a2d\u5b9a\uff0c\u8acb\u53c3\u95b1[\u6587\u4ef6]({docs_url})\u4ee5\u9032\u884c\u4e86\u89e3\u3002"
diff --git a/homeassistant/components/iglo/light.py b/homeassistant/components/iglo/light.py
index f6f681d8b60..dbabc3261b5 100644
--- a/homeassistant/components/iglo/light.py
+++ b/homeassistant/components/iglo/light.py
@@ -1,5 +1,4 @@
 """Support for lights under the iGlo brand."""
-import logging
 import math
 
 from iglo import Lamp
@@ -21,8 +20,6 @@ from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.color as color_util
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "iGlo Light"
 DEFAULT_PORT = 8080
 
diff --git a/homeassistant/components/ign_sismologia/geo_location.py b/homeassistant/components/ign_sismologia/geo_location.py
index 6ed3af285a3..cc06110c111 100644
--- a/homeassistant/components/ign_sismologia/geo_location.py
+++ b/homeassistant/components/ign_sismologia/geo_location.py
@@ -46,7 +46,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
         vol.Optional(CONF_RADIUS, default=DEFAULT_RADIUS_IN_KM): vol.Coerce(float),
         vol.Optional(
             CONF_MINIMUM_MAGNITUDE, default=DEFAULT_MINIMUM_MAGNITUDE
-        ): vol.All(vol.Coerce(float), vol.Range(min=0)),
+        ): cv.positive_float,
     }
 )
 
diff --git a/homeassistant/components/ihc/light.py b/homeassistant/components/ihc/light.py
index c35cb2224cf..86aaca9e296 100644
--- a/homeassistant/components/ihc/light.py
+++ b/homeassistant/components/ihc/light.py
@@ -1,6 +1,4 @@
 """Support for IHC lights."""
-import logging
-
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     SUPPORT_BRIGHTNESS,
@@ -12,8 +10,6 @@ from .const import CONF_DIMMABLE, CONF_OFF_ID, CONF_ON_ID
 from .ihcdevice import IHCDevice
 from .util import async_pulse, async_set_bool, async_set_int
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the IHC lights platform."""
diff --git a/homeassistant/components/image_processing/__init__.py b/homeassistant/components/image_processing/__init__.py
index 84ba5b45fc4..82672c22015 100644
--- a/homeassistant/components/image_processing/__init__.py
+++ b/homeassistant/components/image_processing/__init__.py
@@ -109,7 +109,7 @@ class ImageProcessingEntity(Entity):
 
     async def async_process_image(self, image):
         """Process image."""
-        return await self.hass.async_add_job(self.process_image, image)
+        return await self.hass.async_add_executor_job(self.process_image, image)
 
     async def async_update(self):
         """Update image and process it.
@@ -173,9 +173,7 @@ class ImageProcessingFaceEntity(ImageProcessingEntity):
     @property
     def state_attributes(self):
         """Return device specific state attributes."""
-        attr = {ATTR_FACES: self.faces, ATTR_TOTAL_FACES: self.total_faces}
-
-        return attr
+        return {ATTR_FACES: self.faces, ATTR_TOTAL_FACES: self.total_faces}
 
     def process_faces(self, faces, total):
         """Send event with detected faces and store data."""
diff --git a/homeassistant/components/imap/sensor.py b/homeassistant/components/imap/sensor.py
index a824d5f8ee9..4917abc6028 100644
--- a/homeassistant/components/imap/sensor.py
+++ b/homeassistant/components/imap/sensor.py
@@ -58,7 +58,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     if not await sensor.connection():
         raise PlatformNotReady
 
-    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, sensor.shutdown())
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, sensor.shutdown)
     async_add_entities([sensor], True)
 
 
@@ -173,7 +173,7 @@ class ImapSensor(Entity):
         _LOGGER.warning("Lost %s (will attempt to reconnect)", self._server)
         self._connection = None
 
-    async def shutdown(self):
+    async def shutdown(self, *_):
         """Close resources."""
         if self._connection:
             if self._connection.has_pending_idle():
diff --git a/homeassistant/components/imap_email_content/sensor.py b/homeassistant/components/imap_email_content/sensor.py
index 21b535450a1..04d4ca97c5a 100644
--- a/homeassistant/components/imap_email_content/sensor.py
+++ b/homeassistant/components/imap_email_content/sensor.py
@@ -183,7 +183,7 @@ class EmailContentSensor(Entity):
             ATTR_DATE: email_message["Date"],
             ATTR_BODY: EmailContentSensor.get_msg_text(email_message),
         }
-        return self._value_template.render(variables)
+        return self._value_template.render(variables, parse_result=False)
 
     def sender_allowed(self, email_message):
         """Check if the sender is in the allowed senders list."""
diff --git a/homeassistant/components/influxdb/__init__.py b/homeassistant/components/influxdb/__init__.py
index 45d3a4f5a25..16b6971b11f 100644
--- a/homeassistant/components/influxdb/__init__.py
+++ b/homeassistant/components/influxdb/__init__.py
@@ -26,6 +26,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
+from homeassistant.core import callback
 from homeassistant.helpers import event as event_helper, state as state_helper
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_values import EntityValues
@@ -52,6 +53,7 @@ from .const import (
     CONF_DEFAULT_MEASUREMENT,
     CONF_HOST,
     CONF_IGNORE_ATTRIBUTES,
+    CONF_MEASUREMENT_ATTR,
     CONF_ORG,
     CONF_OVERRIDE_MEASUREMENT,
     CONF_PASSWORD,
@@ -68,6 +70,7 @@ from .const import (
     CONNECTION_ERROR,
     DEFAULT_API_VERSION,
     DEFAULT_HOST_V2,
+    DEFAULT_MEASUREMENT_ATTR,
     DEFAULT_SSL_V2,
     DOMAIN,
     EVENT_NEW_STATE,
@@ -154,6 +157,9 @@ _INFLUX_BASE_SCHEMA = INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA.extend(
     {
         vol.Optional(CONF_RETRY_COUNT, default=0): cv.positive_int,
         vol.Optional(CONF_DEFAULT_MEASUREMENT): cv.string,
+        vol.Optional(CONF_MEASUREMENT_ATTR, default=DEFAULT_MEASUREMENT_ATTR): vol.In(
+            ["unit_of_measurement", "domain__device_class", "entity_id"]
+        ),
         vol.Optional(CONF_OVERRIDE_MEASUREMENT): cv.string,
         vol.Optional(CONF_TAGS, default={}): vol.Schema({cv.string: cv.string}),
         vol.Optional(CONF_TAGS_ATTRIBUTES, default=[]): vol.All(
@@ -192,6 +198,7 @@ def _generate_event_to_json(conf: Dict) -> Callable[[Dict], str]:
     tags = conf.get(CONF_TAGS)
     tags_attributes = conf.get(CONF_TAGS_ATTRIBUTES)
     default_measurement = conf.get(CONF_DEFAULT_MEASUREMENT)
+    measurement_attr = conf.get(CONF_MEASUREMENT_ATTR)
     override_measurement = conf.get(CONF_OVERRIDE_MEASUREMENT)
     global_ignore_attributes = set(conf[CONF_IGNORE_ATTRIBUTES])
     component_config = EntityValues(
@@ -223,20 +230,32 @@ def _generate_event_to_json(conf: Dict) -> Callable[[Dict], str]:
                 _include_state = True
 
         include_uom = True
+        include_dc = True
         entity_config = component_config.get(state.entity_id)
         measurement = entity_config.get(CONF_OVERRIDE_MEASUREMENT)
         if measurement in (None, ""):
             if override_measurement:
                 measurement = override_measurement
             else:
-                measurement = state.attributes.get(CONF_UNIT_OF_MEASUREMENT)
+                if measurement_attr == "entity_id":
+                    measurement = state.entity_id
+                elif measurement_attr == "domain__device_class":
+                    device_class = state.attributes.get("device_class")
+                    if device_class is None:
+                        # This entity doesn't have a device_class set, use only domain
+                        measurement = state.domain
+                    else:
+                        measurement = f"{state.domain}__{device_class}"
+                        include_dc = False
+                else:
+                    measurement = state.attributes.get(measurement_attr)
                 if measurement in (None, ""):
                     if default_measurement:
                         measurement = default_measurement
                     else:
                         measurement = state.entity_id
                 else:
-                    include_uom = False
+                    include_uom = measurement_attr != "unit_of_measurement"
 
         json = {
             INFLUX_CONF_MEASUREMENT: measurement,
@@ -258,8 +277,10 @@ def _generate_event_to_json(conf: Dict) -> Callable[[Dict], str]:
             if key in tags_attributes:
                 json[INFLUX_CONF_TAGS][key] = value
             elif (
-                key != CONF_UNIT_OF_MEASUREMENT or include_uom
-            ) and key not in ignore_attributes:
+                (key != CONF_UNIT_OF_MEASUREMENT or include_uom)
+                and (key != "device_class" or include_dc)
+                and key not in ignore_attributes
+            ):
                 # If the key is already in fields
                 if key in json[INFLUX_CONF_FIELDS]:
                     key = f"{key}_"
@@ -322,8 +343,13 @@ def get_influx_connection(conf, test_write=False, test_read=False):
 
         def write_v2(json):
             """Write data to V2 influx."""
+            data = {"bucket": bucket, "record": json}
+
+            if precision is not None:
+                data["write_precision"] = precision
+
             try:
-                write_api.write(bucket=bucket, record=json, write_precision=precision)
+                write_api.write(**data)
             except (urllib3.exceptions.HTTPError, OSError) as exc:
                 raise ConnectionError(CONNECTION_ERROR % exc) from exc
             except ApiException as exc:
@@ -475,6 +501,7 @@ class InfluxThread(threading.Thread):
         self.shutdown = False
         hass.bus.listen(EVENT_STATE_CHANGED, self._event_listener)
 
+    @callback
     def _event_listener(self, event):
         """Listen for new messages on the bus and queue them for Influx."""
         item = (time.monotonic(), event)
diff --git a/homeassistant/components/influxdb/const.py b/homeassistant/components/influxdb/const.py
index 029e4d482e8..1a827c1b63c 100644
--- a/homeassistant/components/influxdb/const.py
+++ b/homeassistant/components/influxdb/const.py
@@ -22,6 +22,7 @@ CONF_BUCKET = "bucket"
 CONF_ORG = "organization"
 CONF_TAGS = "tags"
 CONF_DEFAULT_MEASUREMENT = "default_measurement"
+CONF_MEASUREMENT_ATTR = "measurement_attr"
 CONF_OVERRIDE_MEASUREMENT = "override_measurement"
 CONF_TAGS_ATTRIBUTES = "tags_attributes"
 CONF_COMPONENT_CONFIG = "component_config"
@@ -56,6 +57,7 @@ DEFAULT_FIELD = "value"
 DEFAULT_RANGE_START = "-15m"
 DEFAULT_RANGE_STOP = "now()"
 DEFAULT_FUNCTION_FLUX = "|> limit(n: 1)"
+DEFAULT_MEASUREMENT_ATTR = "unit_of_measurement"
 
 INFLUX_CONF_MEASUREMENT = "measurement"
 INFLUX_CONF_TAGS = "tags"
diff --git a/homeassistant/components/influxdb/sensor.py b/homeassistant/components/influxdb/sensor.py
index eb5b0ce6091..ff9f6f93153 100644
--- a/homeassistant/components/influxdb/sensor.py
+++ b/homeassistant/components/influxdb/sensor.py
@@ -224,11 +224,6 @@ class InfluxSensor(Entity):
         """Return the unit of measurement of this entity, if any."""
         return self._unit_of_measurement
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     def update(self):
         """Get the latest data from Influxdb and updates the states."""
         self.data.update()
@@ -273,7 +268,7 @@ class InfluxFluxSensorData:
         """Get the latest data by querying influx."""
         _LOGGER.debug(RENDERING_QUERY_MESSAGE, self.query)
         try:
-            rendered_query = self.query.render()
+            rendered_query = self.query.render(parse_result=False)
         except TemplateError as ex:
             _LOGGER.error(RENDERING_QUERY_ERROR_MESSAGE, ex)
             return
@@ -317,7 +312,7 @@ class InfluxQLSensorData:
         """Get the latest data with a shell command."""
         _LOGGER.debug(RENDERING_WHERE_MESSAGE, self.where)
         try:
-            where_clause = self.where.render()
+            where_clause = self.where.render(parse_result=False)
         except TemplateError as ex:
             _LOGGER.error(RENDERING_WHERE_ERROR_MESSAGE, ex)
             return
diff --git a/homeassistant/components/input_boolean/translations/cs.json b/homeassistant/components/input_boolean/translations/cs.json
index 4a7d1a8e8c3..8c3f0dc65a7 100644
--- a/homeassistant/components/input_boolean/translations/cs.json
+++ b/homeassistant/components/input_boolean/translations/cs.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed"
+            "off": "Vypnuto",
+            "on": "Zapnuto"
         }
     },
     "title": "Pomocn\u00edci - p\u0159ep\u00edna\u010de"
diff --git a/homeassistant/components/input_boolean/translations/pl.json b/homeassistant/components/input_boolean/translations/pl.json
index 031c361aeec..c50d1981595 100644
--- a/homeassistant/components/input_boolean/translations/pl.json
+++ b/homeassistant/components/input_boolean/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "Pole warto\u015bci logicznej"
diff --git a/homeassistant/components/insteon/__init__.py b/homeassistant/components/insteon/__init__.py
index b0e6b8d10a2..0188671e07f 100644
--- a/homeassistant/components/insteon/__init__.py
+++ b/homeassistant/components/insteon/__init__.py
@@ -159,7 +159,7 @@ async def async_setup_entry(hass, entry):
         identifiers={(DOMAIN, str(devices.modem.address))},
         manufacturer="Smart Home",
         name=f"{devices.modem.description} {devices.modem.address}",
-        model=f"{devices.modem.model} (0x{devices.modem.cat:02x}, 0x{devices.modem.subcat:02x})",
+        model=f"{devices.modem.model} ({devices.modem.cat!r}, 0x{devices.modem.subcat:02x})",
         sw_version=f"{devices.modem.firmware:02x} Engine Version: {devices.modem.engine_version}",
     )
 
diff --git a/homeassistant/components/insteon/binary_sensor.py b/homeassistant/components/insteon/binary_sensor.py
index 259fe20f7bc..ad87c69bd0f 100644
--- a/homeassistant/components/insteon/binary_sensor.py
+++ b/homeassistant/components/insteon/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for INSTEON dimmers via PowerLinc Modem."""
-import logging
-
 from pyinsteon.groups import (
     CO_SENSOR,
     DOOR_SENSOR,
@@ -35,8 +33,6 @@ from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
 from .utils import async_add_insteon_entities
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSOR_TYPES = {
     OPEN_CLOSE_SENSOR: DEVICE_CLASS_OPENING,
     MOTION_SENSOR: DEVICE_CLASS_MOTION,
diff --git a/homeassistant/components/insteon/climate.py b/homeassistant/components/insteon/climate.py
index 1b30554b82d..f05cf9d2940 100644
--- a/homeassistant/components/insteon/climate.py
+++ b/homeassistant/components/insteon/climate.py
@@ -1,5 +1,4 @@
 """Support for Insteon thermostat."""
-import logging
 from typing import List, Optional
 
 from pyinsteon.constants import ThermostatMode
@@ -32,8 +31,6 @@ from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
 from .utils import async_add_insteon_entities
 
-_LOGGER = logging.getLogger(__name__)
-
 COOLING = 1
 HEATING = 2
 DEHUMIDIFYING = 3
diff --git a/homeassistant/components/insteon/cover.py b/homeassistant/components/insteon/cover.py
index 9d480937c9c..498d194667c 100644
--- a/homeassistant/components/insteon/cover.py
+++ b/homeassistant/components/insteon/cover.py
@@ -1,5 +1,4 @@
 """Support for Insteon covers via PowerLinc Modem."""
-import logging
 import math
 
 from homeassistant.components.cover import (
@@ -16,8 +15,6 @@ from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
 from .utils import async_add_insteon_entities
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORTED_FEATURES = SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_SET_POSITION
 
 
diff --git a/homeassistant/components/insteon/fan.py b/homeassistant/components/insteon/fan.py
index 74271acfd4a..fb741d7a4b0 100644
--- a/homeassistant/components/insteon/fan.py
+++ b/homeassistant/components/insteon/fan.py
@@ -1,6 +1,4 @@
 """Support for INSTEON fans via PowerLinc Modem."""
-import logging
-
 from pyinsteon.constants import FanSpeed
 
 from homeassistant.components.fan import (
@@ -18,7 +16,6 @@ from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
 from .utils import async_add_insteon_entities
 
-_LOGGER = logging.getLogger(__name__)
 FAN_SPEEDS = [SPEED_OFF, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]
 SPEED_TO_VALUE = {
     SPEED_OFF: FanSpeed.OFF,
diff --git a/homeassistant/components/insteon/ipdb.py b/homeassistant/components/insteon/ipdb.py
index a3e79fcd6d4..48223981103 100644
--- a/homeassistant/components/insteon/ipdb.py
+++ b/homeassistant/components/insteon/ipdb.py
@@ -1,6 +1,4 @@
 """Utility methods for the Insteon platform."""
-import logging
-
 from pyinsteon.device_types import (
     ClimateControl_Thermostat,
     ClimateControl_WirelessThermostat,
@@ -50,8 +48,6 @@ from homeassistant.components.switch import DOMAIN as SWITCH
 
 from .const import ON_OFF_EVENTS
 
-_LOGGER = logging.getLogger(__name__)
-
 DEVICE_PLATFORM = {
     DimmableLightingControl: {LIGHT: [1], ON_OFF_EVENTS: [1]},
     DimmableLightingControl_DinRail: {LIGHT: [1], ON_OFF_EVENTS: [1]},
diff --git a/homeassistant/components/insteon/light.py b/homeassistant/components/insteon/light.py
index a0ec04cda1b..f49dafed2fe 100644
--- a/homeassistant/components/insteon/light.py
+++ b/homeassistant/components/insteon/light.py
@@ -1,5 +1,4 @@
 """Support for Insteon lights via PowerLinc Modem."""
-import logging
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
@@ -13,8 +12,6 @@ from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
 from .utils import async_add_insteon_entities
 
-_LOGGER = logging.getLogger(__name__)
-
 MAX_BRIGHTNESS = 255
 
 
diff --git a/homeassistant/components/insteon/switch.py b/homeassistant/components/insteon/switch.py
index f0daf54990e..43430ceb7a0 100644
--- a/homeassistant/components/insteon/switch.py
+++ b/homeassistant/components/insteon/switch.py
@@ -1,6 +1,4 @@
 """Support for INSTEON dimmers via PowerLinc Modem."""
-import logging
-
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN, SwitchEntity
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
@@ -8,8 +6,6 @@ from .const import SIGNAL_ADD_ENTITIES
 from .insteon_entity import InsteonEntity
 from .utils import async_add_insteon_entities
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Insteon switches from a config entry."""
diff --git a/homeassistant/components/insteon/translations/cs.json b/homeassistant/components/insteon/translations/cs.json
index 354a7eb70b8..1bd9fd60f72 100644
--- a/homeassistant/components/insteon/translations/cs.json
+++ b/homeassistant/components/insteon/translations/cs.json
@@ -1,10 +1,118 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "P\u0159ipojen\u00ed modemu Insteon je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "select_single": "Vyberte jednu mo\u017enost."
+        },
         "step": {
+            "hub1": {
+                "data": {
+                    "host": "IP adresa rozbo\u010dova\u010de"
+                },
+                "description": "Nastavte Insteon Hub verze 1 (p\u0159ed rokem 2014).",
+                "title": "Insteon Hub verze 1"
+            },
             "hub2": {
                 "data": {
-                    "password": "Heslo"
+                    "host": "IP adresa rozbo\u010dova\u010de",
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "description": "Nastavte Insteon Hub verze 2.",
+                "title": "Insteon Hub verze 2"
+            },
+            "hubv1": {
+                "data": {
+                    "host": "IP adresa",
+                    "port": "Port"
+                },
+                "description": "Nastavte Insteon Hub verze 1 (p\u0159ed rokem 2014).",
+                "title": "Insteon Hub verze 1"
+            },
+            "hubv2": {
+                "data": {
+                    "host": "IP adresa",
+                    "password": "Heslo",
+                    "port": "Port",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "description": "Nastavte Insteon Hub verze 2.",
+                "title": "Insteon Hub verze 2"
+            },
+            "init": {
+                "data": {
+                    "hubv1": "Hub verze 1 (p\u0159ed rokem 2014)",
+                    "hubv2": "Hub verze 2"
+                },
+                "description": "Vyberte typ modemu Insteon.",
+                "title": "Insteon"
+            },
+            "plm": {
+                "data": {
+                    "device": "Cesta k USB za\u0159\u00edzen\u00ed"
                 }
+            },
+            "user": {
+                "data": {
+                    "modem_type": "Typ modemu."
+                },
+                "description": "Vyberte typ modemu Insteon.",
+                "title": "Insteon"
+            }
+        }
+    },
+    "options": {
+        "abort": {
+            "cannot_connect": "Nelze se p\u0159ipojit k modemu Insteon"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "select_single": "Vyberte jednu mo\u017enost."
+        },
+        "step": {
+            "add_override": {
+                "data": {
+                    "address": "Adresa za\u0159\u00edzen\u00ed (tj. 1a2b3c)",
+                    "cat": "Kategorie za\u0159\u00edzen\u00ed (tj. 0x10)"
+                },
+                "title": "Insteon"
+            },
+            "add_x10": {
+                "data": {
+                    "platform": "Platforma"
+                },
+                "title": "Insteon"
+            },
+            "change_hub_config": {
+                "data": {
+                    "host": "IP adresa",
+                    "password": "Heslo",
+                    "port": "Port",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "title": "Insteon"
+            },
+            "init": {
+                "data": {
+                    "add_x10": "P\u0159idejte za\u0159\u00edzen\u00ed X10.",
+                    "remove_x10": "Odeberte za\u0159\u00edzen\u00ed X10."
+                },
+                "title": "Insteon"
+            },
+            "remove_override": {
+                "title": "Insteon"
+            },
+            "remove_x10": {
+                "data": {
+                    "address": "Vyberte adresu za\u0159\u00edzen\u00ed, kter\u00e9 chcete odebrat"
+                },
+                "description": "Odeberte za\u0159\u00edzen\u00ed X10",
+                "title": "Insteon"
             }
         }
     }
diff --git a/homeassistant/components/insteon/translations/de.json b/homeassistant/components/insteon/translations/de.json
index dfefff8c559..c7f2ad94313 100644
--- a/homeassistant/components/insteon/translations/de.json
+++ b/homeassistant/components/insteon/translations/de.json
@@ -33,6 +33,9 @@
         }
     },
     "options": {
+        "error": {
+            "select_single": "W\u00e4hle eine Option aus."
+        },
         "step": {
             "add_override": {
                 "title": "Insteon"
diff --git a/homeassistant/components/insteon/translations/el.json b/homeassistant/components/insteon/translations/el.json
new file mode 100644
index 00000000000..f35d5bad343
--- /dev/null
+++ b/homeassistant/components/insteon/translations/el.json
@@ -0,0 +1,44 @@
+{
+    "config": {
+        "step": {
+            "hubv1": {
+                "data": {
+                    "port": "\u0398\u03cd\u03c1\u03b1"
+                },
+                "description": "\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd \u03c4\u03bf\u03c5 Insteon Hub Version 1 (\u03c0\u03c1\u03b9\u03bd \u03b1\u03c0\u03cc \u03c4\u03bf 2014).",
+                "title": "Insteon Hub Version 1"
+            },
+            "hubv2": {
+                "data": {
+                    "host": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 IP",
+                    "password": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
+                    "port": "\u0398\u03cd\u03c1\u03b1"
+                },
+                "description": "\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd \u03c4\u03bf\u03c5 Insteon Hub Version 2.",
+                "title": "Insteon Hub Version 2"
+            },
+            "user": {
+                "data": {
+                    "modem_type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03bc\u03cc\u03bd\u03c4\u03b5\u03bc."
+                },
+                "description": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03bf\u03bd \u03c4\u03cd\u03c0\u03bf \u03bc\u03cc\u03bd\u03c4\u03b5\u03bc Insteon.",
+                "title": "Insteon"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "remove_override": {
+                "description": "\u039a\u03b1\u03c4\u03ac\u03c1\u03b3\u03b7\u03c3\u03b7 \u03c0\u03b1\u03c1\u03ac\u03ba\u03b1\u03bc\u03c8\u03b7\u03c2 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2",
+                "title": "Insteon"
+            },
+            "remove_x10": {
+                "data": {
+                    "address": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2 \u03b3\u03b9\u03b1 \u03ba\u03b1\u03c4\u03ac\u03c1\u03b3\u03b7\u03c3\u03b7"
+                },
+                "description": "\u039a\u03b1\u03c4\u03ac\u03c1\u03b3\u03b7\u03c3\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2 X10",
+                "title": "Insteon"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/insteon/translations/es.json b/homeassistant/components/insteon/translations/es.json
index 40b87768cd4..093311b7b82 100644
--- a/homeassistant/components/insteon/translations/es.json
+++ b/homeassistant/components/insteon/translations/es.json
@@ -57,7 +57,7 @@
             },
             "plm": {
                 "data": {
-                    "device": "Dispositivo PLM (es decir, /dev/ttyUSB0 o COM3)"
+                    "device": "Ruta del dispositivo USB"
                 },
                 "description": "Configure el M\u00f3dem Insteon PowerLink (PLM).",
                 "title": "Insteon PLM"
@@ -77,7 +77,7 @@
             "cannot_connect": "No se puede conectar al m\u00f3dem Insteon"
         },
         "error": {
-            "cannot_connect": "No se conect\u00f3 al m\u00f3dem Insteon, por favor, int\u00e9ntelo de nuevo.",
+            "cannot_connect": "No se pudo conectar",
             "input_error": "Entradas no v\u00e1lidas, compruebe sus valores.",
             "select_single": "Selecciona una opci\u00f3n"
         },
@@ -103,10 +103,10 @@
             },
             "change_hub_config": {
                 "data": {
-                    "host": "Nuevo nombre del host o direcci\u00f3n IP",
-                    "password": "Nueva contrase\u00f1a",
-                    "port": "Nuevo n\u00famero de puerto",
-                    "username": "Nuevo nombre de usuario"
+                    "host": "Direcci\u00f3n IP",
+                    "password": "Contrase\u00f1a",
+                    "port": "Puerto",
+                    "username": "Usuario"
                 },
                 "description": "Cambiar la informaci\u00f3n de la conexi\u00f3n del Hub Insteon. Debes reiniciar el Home Assistant despu\u00e9s de hacer este cambio. Esto no cambia la configuraci\u00f3n del Hub en s\u00ed. Para cambiar la configuraci\u00f3n del Hub usa la aplicaci\u00f3n Hub.",
                 "title": "Insteon"
diff --git a/homeassistant/components/insteon/translations/et.json b/homeassistant/components/insteon/translations/et.json
new file mode 100644
index 00000000000..33a6848f7e3
--- /dev/null
+++ b/homeassistant/components/insteon/translations/et.json
@@ -0,0 +1,83 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Insteoni modemi \u00fchendus on juba seadistatud",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "hub1": {
+                "title": ""
+            },
+            "hub2": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "title": ""
+            },
+            "hubv1": {
+                "data": {
+                    "host": "IP aagress",
+                    "port": ""
+                },
+                "description": "Insteon Hub ver 1 seadistamine (enne 2104).",
+                "title": ""
+            },
+            "hubv2": {
+                "data": {
+                    "host": "IP aadress",
+                    "password": "Salas\u00f5na",
+                    "port": "",
+                    "username": "Kasutajanimi"
+                },
+                "description": "Insteon Hub ver 2 seadistamine.",
+                "title": ""
+            },
+            "init": {
+                "title": ""
+            },
+            "plm": {
+                "data": {
+                    "device": "USB seadme rada"
+                },
+                "title": ""
+            },
+            "user": {
+                "data": {
+                    "modem_type": "Modemi mudel."
+                },
+                "description": "Vali Insteoni modemi mudel.",
+                "title": ""
+            }
+        }
+    },
+    "options": {
+        "abort": {
+            "already_configured": "Insteoni modemi \u00fchendus on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "input_error": "Vigane sisestus, kontrolli andmeid"
+        },
+        "step": {
+            "add_override": {
+                "title": ""
+            },
+            "change_hub_config": {
+                "data": {
+                    "host": "IP aadress",
+                    "password": "Salas\u00f5na",
+                    "port": "",
+                    "username": "Kasutajanimi"
+                }
+            },
+            "remove_x10": {
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/insteon/translations/lb.json b/homeassistant/components/insteon/translations/lb.json
index 367b626a6d0..d6b8bf13b5b 100644
--- a/homeassistant/components/insteon/translations/lb.json
+++ b/homeassistant/components/insteon/translations/lb.json
@@ -2,10 +2,10 @@
     "config": {
         "abort": {
             "already_configured": "Eng Insteon Modem Verbindung ass scho konfigur\u00e9iert",
-            "cannot_connect": "Keng Verbindung mam Insteon Modem m\u00e9iglech"
+            "cannot_connect": "Feeler beim verbannen"
         },
         "error": {
-            "cannot_connect": "Feeler beim verbannen mam Insteon Modem, prob\u00e9ier w.e.g. nach emol.",
+            "cannot_connect": "Feeler beim verbannen mam",
             "select_single": "Eng Optioun auswielen."
         },
         "step": {
@@ -56,7 +56,7 @@
             },
             "plm": {
                 "data": {
-                    "device": "PLM Apparat (Beispill /dev/ttyUSB0 oder COM3)"
+                    "device": "Pad vum USB Apparat"
                 },
                 "description": "Insteon PowerLink Modem (PLM) konfigur\u00e9ieren.",
                 "title": "Insteon PLM"
@@ -65,6 +65,7 @@
                 "data": {
                     "modem_type": "Typ vu Modem."
                 },
+                "description": "Insteon Modem Typ auswielen.",
                 "title": "Insteon"
             }
         }
@@ -75,7 +76,7 @@
             "cannot_connect": "Keng Verbindung mam Insteon Modem m\u00e9iglech"
         },
         "error": {
-            "cannot_connect": "Feeler beim verbannen mam Insteon Modem, prob\u00e9ier w.e.g. nach emol.",
+            "cannot_connect": "Feeler beim verbannen",
             "input_error": "Ong\u00eblteg Entr\u00e9e\u00ebn, iwwerpr\u00e9if deng W\u00e4erter.",
             "select_single": "Eng Optioun auswielen."
         },
@@ -101,10 +102,10 @@
             },
             "change_hub_config": {
                 "data": {
-                    "host": "Neien Host Numm oder IP Adresse",
-                    "password": "Neit Passwuert",
-                    "port": "Nei Port Nummer",
-                    "username": "Neie Benotzernumm"
+                    "host": "IP Adresse",
+                    "password": "Passwuert",
+                    "port": "Port",
+                    "username": "Benotzernumm"
                 },
                 "description": "Insteon Hub Verbindungs Informatiounen \u00e4nneren. Du muss Home Assistant no der \u00c4nnerung fr\u00ebsch starten. D\u00ebst \u00e4nnert net d'Konfiguratioun vum Hub selwer. Fir d'Konfiguratioun vum Hub ze \u00e4nnere benotz d'Hub App.",
                 "title": "Insteon"
diff --git a/homeassistant/components/insteon/translations/nl.json b/homeassistant/components/insteon/translations/nl.json
index 538755dd013..5c8ffa91cff 100644
--- a/homeassistant/components/insteon/translations/nl.json
+++ b/homeassistant/components/insteon/translations/nl.json
@@ -1,13 +1,26 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
+        },
         "step": {
             "hub2": {
                 "data": {
+                    "password": "Wachtwoord",
                     "username": "Gebruikersnaam"
                 }
             },
+            "hubv1": {
+                "data": {
+                    "host": "IP-adres",
+                    "port": "Poort"
+                }
+            },
             "hubv2": {
                 "data": {
+                    "host": "IP-adres",
+                    "password": "Wachtwoord",
+                    "port": "Poort",
                     "username": "Gebruikersnaam"
                 }
             },
diff --git a/homeassistant/components/insteon/translations/no.json b/homeassistant/components/insteon/translations/no.json
index 09a16e67162..4e0e4e01cc5 100644
--- a/homeassistant/components/insteon/translations/no.json
+++ b/homeassistant/components/insteon/translations/no.json
@@ -2,18 +2,18 @@
     "config": {
         "abort": {
             "already_configured": "En Insteon-modemtilkobling er allerede konfigurert",
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "select_single": "Velg ett alternativ."
         },
         "step": {
             "hub1": {
                 "data": {
                     "host": "Hub-IP-adresse",
-                    "port": "IP-port"
+                    "port": ""
                 },
                 "description": "Konfigurer Insteon Hub versjon 1 (f\u00f8r 2014).",
                 "title": "Insteon Hub versjon 1"
@@ -22,7 +22,7 @@
                 "data": {
                     "host": "Hub-IP-adresse",
                     "password": "Passord",
-                    "port": "IP-port",
+                    "port": "",
                     "username": "Brukernavn"
                 },
                 "description": "Konfigurer Insteon Hub versjon 2.",
@@ -53,21 +53,21 @@
                     "plm": "PowerLink-modem (PLM)"
                 },
                 "description": "Velg Insteon modemtype.",
-                "title": "Insteon"
+                "title": ""
             },
             "plm": {
                 "data": {
                     "device": "USB enhetsbane"
                 },
                 "description": "Konfigurer Insteon PowerLink-modem (PLM).",
-                "title": "Insteon PLM"
+                "title": ""
             },
             "user": {
                 "data": {
                     "modem_type": "Modemtype."
                 },
                 "description": "Velg Insteon modemtype.",
-                "title": "Insteon"
+                "title": ""
             }
         }
     },
@@ -77,7 +77,7 @@
             "cannot_connect": "Kan ikke koble til Insteon-modemet"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "input_error": "Ugyldige oppf\u00f8ringer, vennligst sjekk verdiene dine.",
             "select_single": "Velg ett alternativ."
         },
@@ -89,7 +89,7 @@
                     "subcat": "Underkategori for enhet (dvs. 0x0a)"
                 },
                 "description": "Legg til en enhetsoverstyring.",
-                "title": "Insteon"
+                "title": ""
             },
             "add_x10": {
                 "data": {
@@ -99,7 +99,7 @@
                     "unitcode": "Enhetskode (1 - 16)"
                 },
                 "description": "Endre insteon hub-passordet.",
-                "title": "Insteon"
+                "title": ""
             },
             "change_hub_config": {
                 "data": {
@@ -109,7 +109,7 @@
                     "username": "Brukernavn"
                 },
                 "description": "Endre Insteon Hub-tilkoblingsinformasjonen. Du m\u00e5 starte Home Assistant p\u00e5 nytt n\u00e5r du har gjort denne endringen. Dette endrer ikke konfigurasjonen av selve huben. For \u00e5 endre konfigurasjonen i huben bruker du hub-appen.",
-                "title": "Insteon"
+                "title": ""
             },
             "init": {
                 "data": {
@@ -120,21 +120,21 @@
                     "remove_x10": "Fjern en X10-enhet."
                 },
                 "description": "Velg et alternativ for \u00e5 konfigurere.",
-                "title": "Insteon"
+                "title": ""
             },
             "remove_override": {
                 "data": {
                     "address": "Velg en enhetsadresse du vil fjerne"
                 },
                 "description": "Fjerne en enhetsoverstyring",
-                "title": "Insteon"
+                "title": ""
             },
             "remove_x10": {
                 "data": {
                     "address": "Velg en enhetsadresse du vil fjerne"
                 },
                 "description": "Fjern en X10-enhet",
-                "title": "Insteon"
+                "title": ""
             }
         }
     }
diff --git a/homeassistant/components/insteon/translations/pl.json b/homeassistant/components/insteon/translations/pl.json
index baf2397d00e..688fae3ed74 100644
--- a/homeassistant/components/insteon/translations/pl.json
+++ b/homeassistant/components/insteon/translations/pl.json
@@ -1,24 +1,40 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Po\u0142\u0105czenie z modemem Insteon jest ju\u017c skonfigurowane",
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "select_single": "Wybierz jedn\u0105 z opcji"
         },
         "step": {
+            "hub1": {
+                "data": {
+                    "host": "Adres IP Huba",
+                    "port": "Numer portu IP"
+                },
+                "description": "Konfiguracja Huba Insteon \u2014 wersja 1 (sprzed 2014r.)",
+                "title": "Hub Insteon \u2014 wersja 1"
+            },
             "hub2": {
                 "data": {
-                    "password": "[%key_id:common::config_flow::data::password%]",
-                    "username": "[%key_id:common::config_flow::data::username%]"
-                }
+                    "host": "Adres IP Huba",
+                    "password": "Has\u0142o",
+                    "port": "Numer portu IP",
+                    "username": "Nazwa u\u017cytkownika"
+                },
+                "description": "Konfiguracja Huba Insteon \u2014 wersja 2.",
+                "title": "Hub Insteon \u2014 wersja 2"
             },
             "hubv1": {
                 "data": {
                     "host": "Adres IP",
                     "port": "Port"
-                }
+                },
+                "description": "Konfiguracja Huba Insteon \u2014 wersja 1 (sprzed 2014r.)",
+                "title": "Hub Insteon \u2014 wersja 1"
             },
             "hubv2": {
                 "data": {
@@ -26,30 +42,99 @@
                     "password": "Has\u0142o",
                     "port": "Port",
                     "username": "Nazwa u\u017cytkownika"
-                }
+                },
+                "description": "Konfiguracja Huba Insteon \u2014 wersja 2.",
+                "title": "Hub Insteon \u2014 wersja 2"
+            },
+            "init": {
+                "data": {
+                    "hubv1": "Hub \u2014 wersja 1 (sprzed 2014r.)",
+                    "hubv2": "Hub \u2014 wersja 2",
+                    "plm": "Modem PowerLink (PLM)"
+                },
+                "description": "Wybierz typ modemu Insteon.",
+                "title": "Insteon"
             },
             "plm": {
                 "data": {
                     "device": "\u015acie\u017cka urz\u0105dzenia USB"
-                }
+                },
+                "description": "Konfiguracja modemu Insteon PowerLink (PLM).",
+                "title": "Insteon PLM"
             },
             "user": {
+                "data": {
+                    "modem_type": "Typ modemu."
+                },
+                "description": "Wybierz typ modemu Insteon.",
                 "title": "Insteon"
             }
         }
     },
     "options": {
+        "abort": {
+            "already_configured": "Po\u0142\u0105czenie z modemem Insteon jest ju\u017c skonfigurowane",
+            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z modemem Insteon"
+        },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "input_error": "Nieprawid\u0142owe wpisy, sprawd\u017a wpisane warto\u015bci",
+            "select_single": "Wybierz jedn\u0105 z opcji"
         },
         "step": {
+            "add_override": {
+                "data": {
+                    "address": "Adres urz\u0105dzenia (np. 1a2b3c)",
+                    "cat": "Kategoria urz\u0105dzenia (np. 0x10)",
+                    "subcat": "Podkategoria urz\u0105dzenia (np. 0x0a)"
+                },
+                "description": "Dodawanie nadpisanie urz\u0105dzenia.",
+                "title": "Insteon"
+            },
+            "add_x10": {
+                "data": {
+                    "housecode": "Housecode (a \u2014 p)",
+                    "platform": "Platforma",
+                    "steps": "Kroki \u015bciemniacza (tylko dla urz\u0105dze\u0144 o\u015bwietleniowych, domy\u015blnie 22)",
+                    "unitcode": "Unitcode (1\u201316)"
+                },
+                "description": "Zmie\u0144 has\u0142o Huba Insteon.",
+                "title": "Insteon"
+            },
             "change_hub_config": {
                 "data": {
                     "host": "Adres IP",
                     "password": "Has\u0142o",
                     "port": "Port",
                     "username": "Nazwa u\u017cytkownika"
-                }
+                },
+                "description": "Zmie\u0144 informacje o po\u0142\u0105czeniu Huba Insteon. Po wprowadzeniu tej zmiany musisz ponownie uruchomi\u0107 Home Assistant. Nie zmienia to konfiguracji samego Huba. Aby zmieni\u0107 jego konfiguracj\u0119, u\u017cyj aplikacji Hub.",
+                "title": "Insteon"
+            },
+            "init": {
+                "data": {
+                    "add_override": "Dodawanie nadpisanie urz\u0105dzenia.",
+                    "add_x10": "Dodaj urz\u0105dzenie X10.",
+                    "change_hub_config": "Zmie\u0144 konfiguracj\u0119 Huba.",
+                    "remove_override": "Usu\u0144 nadpisanie urz\u0105dzenia.",
+                    "remove_x10": "Usu\u0144 urz\u0105dzenie X10."
+                },
+                "description": "Wybierz opcj\u0119 do skonfigurowania.",
+                "title": "Insteon"
+            },
+            "remove_override": {
+                "data": {
+                    "address": "Wybierz adres urz\u0105dzenia do usuni\u0119cia"
+                },
+                "description": "Usu\u0144 nadpisanie urz\u0105dzenia",
+                "title": "Insteon"
+            },
+            "remove_x10": {
+                "data": {
+                    "address": "Wybierz adres urz\u0105dzenia do usuni\u0119cia"
+                },
+                "description": "Usu\u0144 urz\u0105dzenie X10",
+                "title": "Insteon"
             }
         }
     }
diff --git a/homeassistant/components/insteon/translations/zh-Hans.json b/homeassistant/components/insteon/translations/zh-Hans.json
new file mode 100644
index 00000000000..eb9facef178
--- /dev/null
+++ b/homeassistant/components/insteon/translations/zh-Hans.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "step": {
+            "hub2": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            },
+            "hubv2": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/integration/sensor.py b/homeassistant/components/integration/sensor.py
index 6169e084a02..a776920b8e6 100644
--- a/homeassistant/components/integration/sensor.py
+++ b/homeassistant/components/integration/sensor.py
@@ -203,8 +203,7 @@ class IntegrationSensor(RestoreEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the sensor."""
-        state_attr = {ATTR_SOURCE_ID: self._sensor_source_id}
-        return state_attr
+        return {ATTR_SOURCE_ID: self._sensor_source_id}
 
     @property
     def icon(self):
diff --git a/homeassistant/components/intent/__init__.py b/homeassistant/components/intent/__init__.py
index 37761e88347..8410303ac81 100644
--- a/homeassistant/components/intent/__init__.py
+++ b/homeassistant/components/intent/__init__.py
@@ -1,6 +1,4 @@
 """The Intent integration."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components import http
@@ -12,7 +10,6 @@ from homeassistant.helpers import config_validation as cv, integration_platform,
 from .const import DOMAIN
 
 CONFIG_SCHEMA = vol.Schema({DOMAIN: vol.Schema({})}, extra=vol.ALLOW_EXTRA)
-_LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup(hass: HomeAssistant, config: dict):
diff --git a/homeassistant/components/intent_script/__init__.py b/homeassistant/components/intent_script/__init__.py
index 3bde4a3122f..892ea83982c 100644
--- a/homeassistant/components/intent_script/__init__.py
+++ b/homeassistant/components/intent_script/__init__.py
@@ -1,6 +1,5 @@
 """Handle intents with scripts."""
 import copy
-import logging
 
 import voluptuous as vol
 
@@ -44,8 +43,6 @@ CONFIG_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup(hass, config):
     """Activate Alexa component."""
@@ -90,13 +87,14 @@ class ScriptIntentHandler(intent.IntentHandler):
 
         if speech is not None:
             response.async_set_speech(
-                speech[CONF_TEXT].async_render(slots), speech[CONF_TYPE]
+                speech[CONF_TEXT].async_render(slots, parse_result=False),
+                speech[CONF_TYPE],
             )
 
         if card is not None:
             response.async_set_card(
-                card[CONF_TITLE].async_render(slots),
-                card[CONF_CONTENT].async_render(slots),
+                card[CONF_TITLE].async_render(slots, parse_result=False),
+                card[CONF_CONTENT].async_render(slots, parse_result=False),
                 card[CONF_TYPE],
             )
 
diff --git a/homeassistant/components/ios/__init__.py b/homeassistant/components/ios/__init__.py
index cb8603d5669..bc5c5ec1c4e 100644
--- a/homeassistant/components/ios/__init__.py
+++ b/homeassistant/components/ios/__init__.py
@@ -1,6 +1,5 @@
 """Native Home Assistant iOS app component."""
 import datetime
-import logging
 
 import voluptuous as vol
 
@@ -25,8 +24,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PUSH = "push"
 CONF_PUSH_CATEGORIES = "categories"
 CONF_PUSH_CATEGORIES_NAME = "name"
diff --git a/homeassistant/components/ios/sensor.py b/homeassistant/components/ios/sensor.py
index 89082a80830..01520063ccb 100644
--- a/homeassistant/components/ios/sensor.py
+++ b/homeassistant/components/ios/sensor.py
@@ -114,7 +114,7 @@ class IOSSensor(Entity):
             return icon_state
         return icon_for_battery_level(battery_level=battery_level, charging=charging)
 
-    def update(self):
+    async def async_update(self):
         """Get the latest state of the sensor."""
         self._device = ios.devices(self.hass).get(self._device_name)
         self._state = self._device[ios.ATTR_BATTERY][self.type]
diff --git a/homeassistant/components/ios/strings.json b/homeassistant/components/ios/strings.json
index b09bd4a777f..2b486cc0c04 100644
--- a/homeassistant/components/ios/strings.json
+++ b/homeassistant/components/ios/strings.json
@@ -2,11 +2,11 @@
   "config": {
     "step": {
       "confirm": {
-        "description": "Do you want to set up the Home Assistant iOS component?"
+        "description": "[%key:common::config_flow::description::confirm_setup%]"
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of Home Assistant iOS is necessary."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   }
 }
diff --git a/homeassistant/components/ios/translations/ca.json b/homeassistant/components/ios/translations/ca.json
index 4b90303b435..c82258bc62b 100644
--- a/homeassistant/components/ios/translations/ca.json
+++ b/homeassistant/components/ios/translations/ca.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Nom\u00e9s cal una sola configuraci\u00f3 de Home Assistant iOS."
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "confirm": {
-                "description": "Vols configurar el component Home Assistant iOS?"
+                "description": "Vols comen\u00e7ar la configuraci\u00f3?"
             }
         }
     }
diff --git a/homeassistant/components/ios/translations/cs.json b/homeassistant/components/ios/translations/cs.json
index a215b9fe13c..f04465341e3 100644
--- a/homeassistant/components/ios/translations/cs.json
+++ b/homeassistant/components/ios/translations/cs.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Povolena je pouze jedna instance Home Assistant iOS."
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "step": {
             "confirm": {
-                "description": "Chcete nastavit komponenty Home Assistant iOS?"
+                "description": "Chcete za\u010d\u00edt nastavovat?"
             }
         }
     }
diff --git a/homeassistant/components/ios/translations/en.json b/homeassistant/components/ios/translations/en.json
index 46857921642..051b032e82b 100644
--- a/homeassistant/components/ios/translations/en.json
+++ b/homeassistant/components/ios/translations/en.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Only a single configuration of Home Assistant iOS is necessary."
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "confirm": {
-                "description": "Do you want to set up the Home Assistant iOS component?"
+                "description": "Do you want to start set up?"
             }
         }
     }
diff --git a/homeassistant/components/ios/translations/es.json b/homeassistant/components/ios/translations/es.json
index e66c48a2355..3c4064280e7 100644
--- a/homeassistant/components/ios/translations/es.json
+++ b/homeassistant/components/ios/translations/es.json
@@ -5,7 +5,7 @@
         },
         "step": {
             "confirm": {
-                "description": "\u00bfDesea configurar el componente iOS de Home Assistant?"
+                "description": "\u00bfQuieres configurar el componente iOS de Home Assistant?"
             }
         }
     }
diff --git a/homeassistant/components/ios/translations/et.json b/homeassistant/components/ios/translations/et.json
new file mode 100644
index 00000000000..1049fc21bce
--- /dev/null
+++ b/homeassistant/components/ios/translations/et.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas alustan seadistamist?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ios/translations/it.json b/homeassistant/components/ios/translations/it.json
index 763293d6b54..35d906f2276 100644
--- a/homeassistant/components/ios/translations/it.json
+++ b/homeassistant/components/ios/translations/it.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u00c8 necessaria una sola configurazione di Home Assistant iOS."
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "confirm": {
-                "description": "Vuoi configurare il componente Home Assistant iOS?"
+                "description": "Vuoi iniziare la configurazione?"
             }
         }
     }
diff --git a/homeassistant/components/ios/translations/no.json b/homeassistant/components/ios/translations/no.json
index 1b8dd7b3c8e..4d6f6f5c80c 100644
--- a/homeassistant/components/ios/translations/no.json
+++ b/homeassistant/components/ios/translations/no.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Kun en konfigurasjon av Home Assistant iOS er n\u00f8dvendig."
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "confirm": {
-                "description": "\u00d8nsker du \u00e5 sette opp Home Assistant iOS-komponenten?"
+                "description": "Vil du starte oppsettet?"
             }
         }
     }
diff --git a/homeassistant/components/ios/translations/pl.json b/homeassistant/components/ios/translations/pl.json
index 4defef3926c..4f466e3455f 100644
--- a/homeassistant/components/ios/translations/pl.json
+++ b/homeassistant/components/ios/translations/pl.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Wymagana jest tylko jedna konfiguracja Home Assistant iOS."
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "confirm": {
-                "description": "Czy chcesz skonfigurowa\u0107 Home Assistant iOS?"
+                "description": "Czy chcesz rozpocz\u0105\u0107 konfiguracj\u0119?"
             }
         }
     }
diff --git a/homeassistant/components/ios/translations/ru.json b/homeassistant/components/ios/translations/ru.json
index 11df628045d..6b49eb8ce4a 100644
--- a/homeassistant/components/ios/translations/ru.json
+++ b/homeassistant/components/ios/translations/ru.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "confirm": {
-                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Home Assistant iOS?"
+                "description": "\u0425\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443?"
             }
         }
     }
diff --git a/homeassistant/components/ios/translations/zh-Hant.json b/homeassistant/components/ios/translations/zh-Hant.json
index 8ca797ecf84..ea5e5afce21 100644
--- a/homeassistant/components/ios/translations/zh-Hant.json
+++ b/homeassistant/components/ios/translations/zh-Hant.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u6b21 Home Assistant iOS \u5373\u53ef\u3002"
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "confirm": {
-                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Home Assistant iOS \u5143\u4ef6\uff1f"
+                "description": "\u662f\u5426\u8981\u958b\u59cb\u8a2d\u5b9a\uff1f"
             }
         }
     }
diff --git a/homeassistant/components/iota/__init__.py b/homeassistant/components/iota/__init__.py
index 497e94a08d6..41c5ad35d83 100644
--- a/homeassistant/components/iota/__init__.py
+++ b/homeassistant/components/iota/__init__.py
@@ -1,6 +1,5 @@
 """Support for IOTA wallets."""
 from datetime import timedelta
-import logging
 
 from iota import Iota
 import voluptuous as vol
@@ -9,8 +8,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_IRI = "iri"
 CONF_TESTNET = "testnet"
 CONF_WALLET_NAME = "name"
@@ -72,8 +69,7 @@ class IotaDevice(Entity):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the device."""
-        attr = {CONF_WALLET_NAME: self._name}
-        return attr
+        return {CONF_WALLET_NAME: self._name}
 
     @property
     def api(self):
diff --git a/homeassistant/components/iota/sensor.py b/homeassistant/components/iota/sensor.py
index 8a0b17aa63b..a6f689e8c2d 100644
--- a/homeassistant/components/iota/sensor.py
+++ b/homeassistant/components/iota/sensor.py
@@ -1,13 +1,10 @@
 """Support for IOTA wallet sensors."""
 from datetime import timedelta
-import logging
 
 from homeassistant.const import CONF_NAME
 
 from . import CONF_WALLETS, IotaDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_TESTNET = "testnet"
 ATTR_URL = "url"
 
diff --git a/homeassistant/components/iperf3/services.yaml b/homeassistant/components/iperf3/services.yaml
index a3f645f5085..aaa88c2341c 100644
--- a/homeassistant/components/iperf3/services.yaml
+++ b/homeassistant/components/iperf3/services.yaml
@@ -1,5 +1,5 @@
 speedtest:
-  description: Immediately take a speedest with iperf3
+  description: Immediately execute a speed test with iperf3
   fields:
     host:
       description: The host name of the iperf3 server (already configured) to run a test with.
diff --git a/homeassistant/components/ipma/strings.json b/homeassistant/components/ipma/strings.json
index 5b325938411..e3825bd4b27 100644
--- a/homeassistant/components/ipma/strings.json
+++ b/homeassistant/components/ipma/strings.json
@@ -5,9 +5,9 @@
         "title": "Location",
         "description": "Instituto Portugu\u00eas do Mar e Atmosfera",
         "data": {
-          "name": "Name",
-          "latitude": "Latitude",
-          "longitude": "Longitude",
+          "name": "[%key:common::config_flow::data::name%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]",
           "mode": "Mode"
         }
       }
diff --git a/homeassistant/components/ipma/translations/cs.json b/homeassistant/components/ipma/translations/cs.json
new file mode 100644
index 00000000000..90b457c1ddc
--- /dev/null
+++ b/homeassistant/components/ipma/translations/cs.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "name_exists": "Jm\u00e9no ji\u017e existuje"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
+                    "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka",
+                    "mode": "Re\u017eim",
+                    "name": "Jm\u00e9no"
+                },
+                "description": "Instituto Portugu\u00eas do Mar e Atmosfera",
+                "title": "Um\u00edst\u011bn\u00ed"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ipma/translations/et.json b/homeassistant/components/ipma/translations/et.json
index 32fab1be8df..9147ada7b5e 100644
--- a/homeassistant/components/ipma/translations/et.json
+++ b/homeassistant/components/ipma/translations/et.json
@@ -4,7 +4,8 @@
             "user": {
                 "data": {
                     "latitude": "Laiuskraad",
-                    "longitude": "Pikkuskraad"
+                    "longitude": "Pikkuskraad",
+                    "name": "Nimi"
                 },
                 "title": "Asukoht"
             }
diff --git a/homeassistant/components/ipma/translations/it.json b/homeassistant/components/ipma/translations/it.json
index 5ab6af8d218..ceee3c9091f 100644
--- a/homeassistant/components/ipma/translations/it.json
+++ b/homeassistant/components/ipma/translations/it.json
@@ -7,7 +7,7 @@
             "user": {
                 "data": {
                     "latitude": "Latitudine",
-                    "longitude": "Longitudine",
+                    "longitude": "Logitudine",
                     "mode": "Modalit\u00e0",
                     "name": "Nome"
                 },
diff --git a/homeassistant/components/ipma/translations/pl.json b/homeassistant/components/ipma/translations/pl.json
index f87f915c247..405b9fa81c6 100644
--- a/homeassistant/components/ipma/translations/pl.json
+++ b/homeassistant/components/ipma/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "name_exists": "Nazwa ju\u017c istnieje."
+            "name_exists": "Nazwa ju\u017c istnieje"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ipp/config_flow.py b/homeassistant/components/ipp/config_flow.py
index 476756ddc61..feed7e7b528 100644
--- a/homeassistant/components/ipp/config_flow.py
+++ b/homeassistant/components/ipp/config_flow.py
@@ -73,7 +73,7 @@ class IPPFlowHandler(ConfigFlow, domain=DOMAIN):
             return self._show_setup_form({"base": "connection_upgrade"})
         except (IPPConnectionError, IPPResponseError):
             _LOGGER.debug("IPP Connection/Response Error", exc_info=True)
-            return self._show_setup_form({"base": "connection_error"})
+            return self._show_setup_form({"base": "cannot_connect"})
         except IPPParseError:
             _LOGGER.debug("IPP Parse Error", exc_info=True)
             return self.async_abort(reason="parse_error")
@@ -127,7 +127,7 @@ class IPPFlowHandler(ConfigFlow, domain=DOMAIN):
             return self.async_abort(reason="connection_upgrade")
         except (IPPConnectionError, IPPResponseError):
             _LOGGER.debug("IPP Connection/Response Error", exc_info=True)
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
         except IPPParseError:
             _LOGGER.debug("IPP Parse Error", exc_info=True)
             return self.async_abort(reason="parse_error")
diff --git a/homeassistant/components/ipp/strings.json b/homeassistant/components/ipp/strings.json
index 09c2424151f..b61c89f6df1 100644
--- a/homeassistant/components/ipp/strings.json
+++ b/homeassistant/components/ipp/strings.json
@@ -9,8 +9,8 @@
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]",
           "base_path": "Relative path to the printer",
-          "ssl": "Printer supports communication over SSL/TLS",
-          "verify_ssl": "Printer uses a proper SSL certificate"
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         }
       },
       "zeroconf_confirm": {
@@ -19,12 +19,12 @@
       }
     },
     "error": {
-      "connection_error": "[%key:common::config_flow::error::cannot_connect%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "connection_upgrade": "Failed to connect to printer. Please try again with SSL/TLS option checked."
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "connection_error": "[%key:common::config_flow::error::cannot_connect%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "connection_upgrade": "Failed to connect to printer due to connection upgrade being required.",
       "ipp_error": "Encountered IPP error.",
       "ipp_version_error": "IPP version not supported by printer.",
diff --git a/homeassistant/components/ipp/translations/ca.json b/homeassistant/components/ipp/translations/ca.json
index 6e3185767d5..f282838a757 100644
--- a/homeassistant/components/ipp/translations/ca.json
+++ b/homeassistant/components/ipp/translations/ca.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "Ha fallat la connexi\u00f3",
             "connection_upgrade": "No s'ha pogut connectar amb la impressora, es necessita actualitzar la connexi\u00f3.",
             "ipp_error": "S'ha produ\u00eft un error IPP.",
@@ -10,6 +11,7 @@
             "unique_id_required": "Falta la identificaci\u00f3 \u00fanica al dispositiu, necess\u00e0ria per al descobriment."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "Ha fallat la connexi\u00f3",
             "connection_upgrade": "No s'ha pogut connectar amb la impressora. Prova-ho novament amb l'opci\u00f3 SSL/TLS activada."
         },
@@ -20,8 +22,8 @@
                     "base_path": "Ruta relativa a la impressora",
                     "host": "Amfitri\u00f3",
                     "port": "Port",
-                    "ssl": "La impressora \u00e9s compatible amb comunicaci\u00f3 SSL/TLS",
-                    "verify_ssl": "La impressora utilitza un certificat SSL adequat"
+                    "ssl": "Utilitza un certificat SSL",
+                    "verify_ssl": "Verifica el certificat SSL"
                 },
                 "description": "Configura la impressora amb el protocol d'impressi\u00f3 per Internet (IPP) per integrar-la amb Home Assistant.",
                 "title": "Enlla\u00e7 d'impressora"
diff --git a/homeassistant/components/ipp/translations/cs.json b/homeassistant/components/ipp/translations/cs.json
index 2048e1a0681..1e62dbefbcf 100644
--- a/homeassistant/components/ipp/translations/cs.json
+++ b/homeassistant/components/ipp/translations/cs.json
@@ -1,18 +1,29 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no",
-            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit",
+            "ipp_version_error": "Verze IPP nen\u00ed tisk\u00e1rnou podporov\u00e1na."
         },
         "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "connection_error": "Nepoda\u0159ilo se p\u0159ipojit"
         },
+        "flow_title": "Tisk\u00e1rna: {name}",
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel",
-                    "port": "Port"
-                }
+                    "port": "Port",
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
+                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL"
+                },
+                "title": "Propojte svou tisk\u00e1rnu"
+            },
+            "zeroconf_confirm": {
+                "description": "Chcete nastavit {name}?",
+                "title": "Zji\u0161t\u011bn\u00e1 tisk\u00e1rna"
             }
         }
     }
diff --git a/homeassistant/components/ipp/translations/en.json b/homeassistant/components/ipp/translations/en.json
index 0267c5b5091..85233866f0d 100644
--- a/homeassistant/components/ipp/translations/en.json
+++ b/homeassistant/components/ipp/translations/en.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Device is already configured",
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect",
             "connection_upgrade": "Failed to connect to printer due to connection upgrade being required.",
             "ipp_error": "Encountered IPP error.",
@@ -10,6 +11,7 @@
             "unique_id_required": "Device missing unique identification required for discovery."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect",
             "connection_upgrade": "Failed to connect to printer. Please try again with SSL/TLS option checked."
         },
@@ -20,8 +22,8 @@
                     "base_path": "Relative path to the printer",
                     "host": "Host",
                     "port": "Port",
-                    "ssl": "Printer supports communication over SSL/TLS",
-                    "verify_ssl": "Printer uses a proper SSL certificate"
+                    "ssl": "Uses an SSL certificate",
+                    "verify_ssl": "Verify SSL certificate"
                 },
                 "description": "Set up your printer via Internet Printing Protocol (IPP) to integrate with Home Assistant.",
                 "title": "Link your printer"
diff --git a/homeassistant/components/ipp/translations/es.json b/homeassistant/components/ipp/translations/es.json
index 51c7e63677d..b357768b191 100644
--- a/homeassistant/components/ipp/translations/es.json
+++ b/homeassistant/components/ipp/translations/es.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Dispositivo ya configurado",
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "Error al conectar",
             "connection_upgrade": "No se pudo conectar con la impresora debido a que se requiere una actualizaci\u00f3n de la conexi\u00f3n.",
             "ipp_error": "Error IPP encontrado.",
@@ -10,6 +11,7 @@
             "unique_id_required": "El dispositivo no tiene identificaci\u00f3n \u00fanica necesaria para el descubrimiento."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "Error al conectar",
             "connection_upgrade": "No se pudo conectar con la impresora. Int\u00e9ntalo de nuevo con la opci\u00f3n SSL/TLS marcada."
         },
@@ -18,10 +20,10 @@
             "user": {
                 "data": {
                     "base_path": "Ruta relativa a la impresora",
-                    "host": "Host o direcci\u00f3n IP",
+                    "host": "Host",
                     "port": "Puerto",
-                    "ssl": "La impresora admite la comunicaci\u00f3n a trav\u00e9s de SSL/TLS",
-                    "verify_ssl": "La impresora usa un certificado SSL adecuado"
+                    "ssl": "Utiliza un certificado SSL",
+                    "verify_ssl": "Verificar certificado SSL"
                 },
                 "description": "Configura tu impresora a trav\u00e9s del Protocolo de Impresi\u00f3n de Internet (IPP) para integrarla con Home Assistant.",
                 "title": "Vincula tu impresora"
diff --git a/homeassistant/components/ipp/translations/et.json b/homeassistant/components/ipp/translations/et.json
index 44e9fc8218f..aef1e90129d 100644
--- a/homeassistant/components/ipp/translations/et.json
+++ b/homeassistant/components/ipp/translations/et.json
@@ -2,15 +2,17 @@
     "config": {
         "abort": {
             "already_configured": "Seade on juba seadistatud",
-            "connection_error": "\u00dchendumine eba\u00f5nnestus",
-            "connection_upgrade": "Printeriga \u00fchenduse loomine eba\u00f5nnestus kuna \u00fchenduse uuendamine on vajalik.",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "\u00dchendamine nurjus",
+            "connection_upgrade": "Printeriga \u00fchenduse loomine nurjus kuna vajalik on \u00fchenduse uuendamine.",
             "ipp_error": "Ilmnes IPP viga.",
             "ipp_version_error": "Printer ei toeta seda IPP versiooni.",
             "parse_error": "Printeri vastuse s\u00f5elumine nurjus.",
             "unique_id_required": "Seadmel puudub avastamiseks vajalik kordumatu ID."
         },
         "error": {
-            "connection_error": "\u00dchendumine eba\u00f5nnestus",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "\u00dchendamine nurjus",
             "connection_upgrade": "Printeriga \u00fchenduse loomine nurjus. Proovige uuesti kui SSL/TLS-i suvand on m\u00e4rgitud."
         },
         "flow_title": "Printer: {name}",
diff --git a/homeassistant/components/ipp/translations/it.json b/homeassistant/components/ipp/translations/it.json
index c1eacf00c28..1223705bacc 100644
--- a/homeassistant/components/ipp/translations/it.json
+++ b/homeassistant/components/ipp/translations/it.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi",
             "connection_upgrade": "Impossibile connettersi alla stampante a causa della necessit\u00e0 dell'aggiornamento della connessione.",
             "ipp_error": "Si \u00e8 verificato un errore IPP.",
@@ -10,6 +11,7 @@
             "unique_id_required": "Identificazione univoca del dispositivo mancante necessaria per l'individuazione."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi",
             "connection_upgrade": "Impossibile connettersi alla stampante. Riprovare selezionando l'opzione SSL/TLS."
         },
@@ -20,8 +22,8 @@
                     "base_path": "Percorso relativo alla stampante",
                     "host": "Host",
                     "port": "Porta",
-                    "ssl": "La stampante supporta la comunicazione su SSL/TLS",
-                    "verify_ssl": "La stampante utilizza un certificato SSL adeguato"
+                    "ssl": "Utilizza un certificato SSL",
+                    "verify_ssl": "Verificare il certificato SSL"
                 },
                 "description": "Configurare la stampante tramite Internet Printing Protocol (IPP) per l'integrazione con Home Assistant.",
                 "title": "Collegare la stampante"
diff --git a/homeassistant/components/ipp/translations/nl.json b/homeassistant/components/ipp/translations/nl.json
index e021c8a0010..fbcfac358ea 100644
--- a/homeassistant/components/ipp/translations/nl.json
+++ b/homeassistant/components/ipp/translations/nl.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Deze printer is al geconfigureerd.",
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kan geen verbinding maken met de printer.",
             "connection_upgrade": "Kan geen verbinding maken met de printer omdat een upgrade van de verbinding vereist is.",
             "ipp_error": "Er is een IPP-fout opgetreden.",
@@ -10,6 +11,7 @@
             "unique_id_required": "Apparaat ontbreekt een unieke identificatie die nodig is voor de ontdekking."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kan geen verbinding maken met de printer.",
             "connection_upgrade": "Kan geen verbinding maken met de printer. Probeer het opnieuw met SSL / TLS-optie aangevinkt."
         },
diff --git a/homeassistant/components/ipp/translations/no.json b/homeassistant/components/ipp/translations/no.json
index 4e94efe71c1..65837f6a632 100644
--- a/homeassistant/components/ipp/translations/no.json
+++ b/homeassistant/components/ipp/translations/no.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Enheten er allerede konfigurert.",
+            "already_configured": "Enheten er allerede konfigurert",
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Tilkobling mislyktes",
             "connection_upgrade": "Kunne ikke koble til skriveren fordi tilkoblingsoppgradering var n\u00f8dvendig.",
             "ipp_error": "Oppdaget IPP-feil.",
@@ -10,6 +11,7 @@
             "unique_id_required": "Enheten mangler unik identifikasjon som kreves for oppdagelse."
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Tilkobling mislyktes",
             "connection_upgrade": "Kunne ikke koble til skriveren. Vennligst pr\u00f8v igjen med alternativet SSL / TLS merket."
         },
@@ -19,9 +21,9 @@
                 "data": {
                     "base_path": "Relativ bane til skriveren",
                     "host": "Vert",
-                    "port": "",
-                    "ssl": "Skriveren st\u00f8tter kommunikasjon over SSL/TLS",
-                    "verify_ssl": "Skriveren bruker et riktig SSL-sertifikat"
+                    "port": "Port",
+                    "ssl": "Bruker et SSL-sertifikat",
+                    "verify_ssl": "Verifisere SSL-sertifikat"
                 },
                 "description": "Sett opp skriveren din via Internet Printing Protocol (IPP) for \u00e5 integrere med Home Assistant.",
                 "title": "Koble til skriveren din"
diff --git a/homeassistant/components/ipp/translations/pl.json b/homeassistant/components/ipp/translations/pl.json
index c5096f6af8e..3ed47613bce 100644
--- a/homeassistant/components/ipp/translations/pl.json
+++ b/homeassistant/components/ipp/translations/pl.json
@@ -2,14 +2,16 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "connection_upgrade": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z drukark\u0105 z powodu konieczno\u015bci uaktualnienia po\u0142\u0105czenia.",
-            "ipp_error": "Wyst\u0105pi\u0142 b\u0142\u0105d IPP.",
-            "ipp_version_error": "Wersja IPP nieobs\u0142ugiwana przez drukark\u0119.",
-            "parse_error": "Nie mo\u017cna przeanalizowa\u0107 odpowiedzi z drukarki.",
-            "unique_id_required": "Urz\u0105dzenie nie posiada unikalnej identyfikacji wymaganej do wykrycia."
+            "connection_upgrade": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z drukark\u0105 z powodu konieczno\u015bci uaktualnienia po\u0142\u0105czenia",
+            "ipp_error": "Wyst\u0105pi\u0142 b\u0142\u0105d IPP",
+            "ipp_version_error": "Wersja IPP nieobs\u0142ugiwana przez drukark\u0119",
+            "parse_error": "Nie mo\u017cna przeanalizowa\u0107 odpowiedzi z drukarki",
+            "unique_id_required": "Urz\u0105dzenie nie posiada unikalnej identyfikacji wymaganej do wykrycia"
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_upgrade": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z drukark\u0105. Spr\u00f3buj ponownie z zaznaczon\u0105 opcj\u0105 SSL/TLS."
         },
@@ -20,14 +22,14 @@
                     "base_path": "\u015acie\u017cka wzgl\u0119dna do drukarki",
                     "host": "Nazwa hosta lub adres IP",
                     "port": "Port",
-                    "ssl": "Drukarka obs\u0142uguje komunikacj\u0119 przez SSL/TLS",
-                    "verify_ssl": "Drukarka u\u017cywa prawid\u0142owego certyfikatu"
+                    "ssl": "Certyfikat SSL",
+                    "verify_ssl": "Weryfikacja certyfikatu SSL"
                 },
                 "description": "Skonfiguruj drukark\u0119 za pomoc\u0105 protoko\u0142u IPP (Internet Printing Protocol) w celu integracji z Home Assistant.",
                 "title": "Po\u0142\u0105cz swoj\u0105 drukark\u0119"
             },
             "zeroconf_confirm": {
-                "description": "Czy chcesz doda\u0107 drukark\u0119 o nazwie `{name}` do Home Assistanta?",
+                "description": "Czy chcesz doda\u0107 drukark\u0119 o nazwie `{name}` do Home Assistant?",
                 "title": "Wykryto drukark\u0119"
             }
         }
diff --git a/homeassistant/components/ipp/translations/ru.json b/homeassistant/components/ipp/translations/ru.json
index 4953c9dae5c..37502ccf9b0 100644
--- a/homeassistant/components/ipp/translations/ru.json
+++ b/homeassistant/components/ipp/translations/ru.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_upgrade": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u043f\u0440\u0438\u043d\u0442\u0435\u0440\u0443 \u0438\u0437-\u0437\u0430 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e\u0441\u0442\u0438 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u044f.",
             "ipp_error": "\u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 IPP.",
@@ -10,6 +11,7 @@
             "unique_id_required": "\u041d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f, \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0430\u044f \u0434\u043b\u044f \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0438\u044f."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_upgrade": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u043f\u0440\u0438\u043d\u0442\u0435\u0440\u0443. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u0447\u0435\u0440\u0435\u0437 SSL/TLS."
         },
@@ -20,8 +22,8 @@
                     "base_path": "\u041e\u0442\u043d\u043e\u0441\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0443\u0442\u044c \u043a \u043f\u0440\u0438\u043d\u0442\u0435\u0440\u0443",
                     "host": "\u0425\u043e\u0441\u0442",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "\u041f\u0440\u0438\u043d\u0442\u0435\u0440 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0441\u0432\u044f\u0437\u044c \u043f\u043e SSL/TLS",
-                    "verify_ssl": "\u041f\u0440\u0438\u043d\u0442\u0435\u0440 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
+                    "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 },
                 "description": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435 Home Assistant \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438 \u043f\u0440\u0438\u043d\u0442\u0435\u0440\u0430 \u043f\u043e \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0443 IPP.",
                 "title": "Internet Printing Protocol (IPP)"
diff --git a/homeassistant/components/ipp/translations/zh-Hans.json b/homeassistant/components/ipp/translations/zh-Hans.json
new file mode 100644
index 00000000000..254f6df9327
--- /dev/null
+++ b/homeassistant/components/ipp/translations/zh-Hans.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        },
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ipp/translations/zh-Hant.json b/homeassistant/components/ipp/translations/zh-Hant.json
index d1c9c00bdb8..335ae984414 100644
--- a/homeassistant/components/ipp/translations/zh-Hant.json
+++ b/homeassistant/components/ipp/translations/zh-Hant.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "\u9023\u7dda\u5931\u6557",
             "connection_upgrade": "\u7531\u65bc\u9700\u8981\u5148\u5347\u7d1a\u9023\u7dda\u3001\u9023\u7dda\u81f3\u5370\u8868\u6a5f\u5931\u6557\u3002",
             "ipp_error": "\u767c\u751f IPP \u932f\u8aa4\u3002",
@@ -10,6 +11,7 @@
             "unique_id_required": "\u8a2d\u5099\u7f3a\u5c11\u641c\u5c0b\u6240\u9700\u7368\u4e00\u8b58\u5225\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "\u9023\u7dda\u5931\u6557",
             "connection_upgrade": "\u9023\u7dda\u81f3\u5370\u8868\u6a5f\u5931\u6557\u3002\u8acb\u52fe\u9078 SSL/TLS \u9078\u9805\u5f8c\u518d\u8a66\u4e00\u6b21\u3002"
         },
@@ -20,8 +22,8 @@
                     "base_path": "\u5370\u8868\u6a5f\u76f8\u5c0d\u8def\u5f91",
                     "host": "\u4e3b\u6a5f\u7aef",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "\u5370\u8868\u6a5f\u652f\u63f4 SSL/TLS \u901a\u8a0a",
-                    "verify_ssl": "\u5370\u8868\u6a5f\u4f7f\u7528\u5c0d\u61c9\u8a8d\u8b49"
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
+                    "verify_ssl": "\u78ba\u8a8d SSL \u8a8d\u8b49"
                 },
                 "description": "\u900f\u904e\u7db2\u969b\u7db2\u8def\u5217\u5370\u5354\u5b9a\uff08IPP\uff09\u8a2d\u5b9a\u5370\u8868\u6a5f\u4ee5\u6574\u5408\u81f3 Home Assistant\u3002",
                 "title": "\u9023\u7d50\u5370\u8868\u6a5f"
diff --git a/homeassistant/components/iqvia/__init__.py b/homeassistant/components/iqvia/__init__.py
index 171e7977e95..9aa00ef3f3f 100644
--- a/homeassistant/components/iqvia/__init__.py
+++ b/homeassistant/components/iqvia/__init__.py
@@ -1,238 +1,125 @@
 """Support for IQVIA."""
 import asyncio
 from datetime import timedelta
-import logging
 
 from pyiqvia import Client
-from pyiqvia.errors import InvalidZipError, IQVIAError
+from pyiqvia.errors import IQVIAError
 
 from homeassistant.const import ATTR_ATTRIBUTION
 from homeassistant.core import callback
 from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.dispatcher import (
-    async_dispatcher_connect,
-    async_dispatcher_send,
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+    UpdateFailed,
 )
-from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.event import async_track_time_interval
 
 from .const import (
     CONF_ZIP_CODE,
-    DATA_CLIENT,
-    DATA_LISTENER,
+    DATA_COORDINATOR,
     DOMAIN,
-    TOPIC_DATA_UPDATE,
+    LOGGER,
     TYPE_ALLERGY_FORECAST,
     TYPE_ALLERGY_INDEX,
     TYPE_ALLERGY_OUTLOOK,
-    TYPE_ALLERGY_TODAY,
-    TYPE_ALLERGY_TOMORROW,
     TYPE_ASTHMA_FORECAST,
     TYPE_ASTHMA_INDEX,
-    TYPE_ASTHMA_TODAY,
-    TYPE_ASTHMA_TOMORROW,
     TYPE_DISEASE_FORECAST,
     TYPE_DISEASE_INDEX,
-    TYPE_DISEASE_TODAY,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
-API_CATEGORY_MAPPING = {
-    TYPE_ALLERGY_TODAY: TYPE_ALLERGY_INDEX,
-    TYPE_ALLERGY_TOMORROW: TYPE_ALLERGY_INDEX,
-    TYPE_ALLERGY_TOMORROW: TYPE_ALLERGY_INDEX,
-    TYPE_ASTHMA_TODAY: TYPE_ASTHMA_INDEX,
-    TYPE_ASTHMA_TOMORROW: TYPE_ALLERGY_INDEX,
-    TYPE_DISEASE_TODAY: TYPE_DISEASE_INDEX,
-}
-
-DATA_CONFIG = "config"
-
 DEFAULT_ATTRIBUTION = "Data provided by IQVIA™"
 DEFAULT_SCAN_INTERVAL = timedelta(minutes=30)
 
-
-@callback
-def async_get_api_category(sensor_type):
-    """Return the API category that a particular sensor type should use."""
-    return API_CATEGORY_MAPPING.get(sensor_type, sensor_type)
+PLATFORMS = ["sensor"]
 
 
 async def async_setup(hass, config):
     """Set up the IQVIA component."""
-    hass.data[DOMAIN] = {}
-    hass.data[DOMAIN][DATA_CLIENT] = {}
-    hass.data[DOMAIN][DATA_LISTENER] = {}
-
+    hass.data[DOMAIN] = {DATA_COORDINATOR: {}}
     return True
 
 
-async def async_setup_entry(hass, config_entry):
+async def async_setup_entry(hass, entry):
     """Set up IQVIA as config entry."""
-    websession = aiohttp_client.async_get_clientsession(hass)
+    hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id] = {}
 
-    if not config_entry.unique_id:
+    if not entry.unique_id:
         # If the config entry doesn't already have a unique ID, set one:
         hass.config_entries.async_update_entry(
-            config_entry, **{"unique_id": config_entry.data[CONF_ZIP_CODE]}
+            entry, **{"unique_id": entry.data[CONF_ZIP_CODE]}
         )
 
-    iqvia = IQVIAData(hass, Client(config_entry.data[CONF_ZIP_CODE], websession))
+    websession = aiohttp_client.async_get_clientsession(hass)
+    client = Client(entry.data[CONF_ZIP_CODE], websession)
 
-    try:
-        await iqvia.async_update()
-    except InvalidZipError:
-        _LOGGER.error("Invalid ZIP code provided: %s", config_entry.data[CONF_ZIP_CODE])
-        return False
+    async def async_get_data_from_api(api_coro):
+        """Get data from a particular API coroutine."""
+        try:
+            return await api_coro()
+        except IQVIAError as err:
+            raise UpdateFailed from err
 
-    hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id] = iqvia
+    init_data_update_tasks = []
+    for sensor_type, api_coro in [
+        (TYPE_ALLERGY_FORECAST, client.allergens.extended),
+        (TYPE_ALLERGY_INDEX, client.allergens.current),
+        (TYPE_ALLERGY_OUTLOOK, client.allergens.outlook),
+        (TYPE_ASTHMA_FORECAST, client.asthma.extended),
+        (TYPE_ASTHMA_INDEX, client.asthma.current),
+        (TYPE_DISEASE_FORECAST, client.disease.extended),
+        (TYPE_DISEASE_INDEX, client.disease.current),
+    ]:
+        coordinator = hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][
+            sensor_type
+        ] = DataUpdateCoordinator(
+            hass,
+            LOGGER,
+            name=f"{entry.data[CONF_ZIP_CODE]} {sensor_type}",
+            update_interval=DEFAULT_SCAN_INTERVAL,
+            update_method=lambda coro=api_coro: async_get_data_from_api(coro),
+        )
+        init_data_update_tasks.append(coordinator.async_refresh())
 
-    hass.async_create_task(
-        hass.config_entries.async_forward_entry_setup(config_entry, "sensor")
+    await asyncio.gather(*init_data_update_tasks)
+
+    for component in PLATFORMS:
+        hass.async_create_task(
+            hass.config_entries.async_forward_entry_setup(entry, component)
+        )
+
+    return True
+
+
+async def async_unload_entry(hass, entry):
+    """Unload an OpenUV config entry."""
+    unload_ok = all(
+        await asyncio.gather(
+            *[
+                hass.config_entries.async_forward_entry_unload(entry, component)
+                for component in PLATFORMS
+            ]
+        )
     )
 
-    return True
+    if unload_ok:
+        hass.data[DOMAIN][DATA_COORDINATOR].pop(entry.entry_id)
+
+    return unload_ok
 
 
-async def async_unload_entry(hass, config_entry):
-    """Unload an OpenUV config entry."""
-    hass.data[DOMAIN][DATA_CLIENT].pop(config_entry.entry_id)
-
-    remove_listener = hass.data[DOMAIN][DATA_LISTENER].pop(config_entry.entry_id)
-    remove_listener()
-
-    await hass.config_entries.async_forward_entry_unload(config_entry, "sensor")
-
-    return True
-
-
-class IQVIAData:
-    """Define a data object to retrieve info from IQVIA."""
-
-    def __init__(self, hass, client):
-        """Initialize."""
-        self._async_cancel_time_interval_listener = None
-        self._client = client
-        self._hass = hass
-        self.data = {}
-        self.zip_code = client.zip_code
-
-        self._api_coros = {
-            TYPE_ALLERGY_FORECAST: client.allergens.extended,
-            TYPE_ALLERGY_INDEX: client.allergens.current,
-            TYPE_ALLERGY_OUTLOOK: client.allergens.outlook,
-            TYPE_ASTHMA_FORECAST: client.asthma.extended,
-            TYPE_ASTHMA_INDEX: client.asthma.current,
-            TYPE_DISEASE_FORECAST: client.disease.extended,
-            TYPE_DISEASE_INDEX: client.disease.current,
-        }
-        self._api_category_count = {
-            TYPE_ALLERGY_FORECAST: 0,
-            TYPE_ALLERGY_INDEX: 0,
-            TYPE_ALLERGY_OUTLOOK: 0,
-            TYPE_ASTHMA_FORECAST: 0,
-            TYPE_ASTHMA_INDEX: 0,
-            TYPE_DISEASE_FORECAST: 0,
-            TYPE_DISEASE_INDEX: 0,
-        }
-        self._api_category_locks = {
-            TYPE_ALLERGY_FORECAST: asyncio.Lock(),
-            TYPE_ALLERGY_INDEX: asyncio.Lock(),
-            TYPE_ALLERGY_OUTLOOK: asyncio.Lock(),
-            TYPE_ASTHMA_FORECAST: asyncio.Lock(),
-            TYPE_ASTHMA_INDEX: asyncio.Lock(),
-            TYPE_DISEASE_FORECAST: asyncio.Lock(),
-            TYPE_DISEASE_INDEX: asyncio.Lock(),
-        }
-
-    async def _async_get_data_from_api(self, api_category):
-        """Update and save data for a particular API category."""
-        if self._api_category_count[api_category] == 0:
-            return
-
-        try:
-            self.data[api_category] = await self._api_coros[api_category]()
-        except IQVIAError as err:
-            _LOGGER.error("Unable to get %s data: %s", api_category, err)
-            self.data[api_category] = None
-
-    async def _async_update_listener_action(self, now):
-        """Define an async_track_time_interval action to update data."""
-        await self.async_update()
-
-    @callback
-    def async_deregister_api_interest(self, sensor_type):
-        """Decrement the number of entities with data needs from an API category."""
-        # If this deregistration should leave us with no registration at all, remove the
-        # time interval:
-        if sum(self._api_category_count.values()) == 0:
-            if self._async_cancel_time_interval_listener:
-                self._async_cancel_time_interval_listener()
-                self._async_cancel_time_interval_listener = None
-            return
-
-        api_category = async_get_api_category(sensor_type)
-        self._api_category_count[api_category] -= 1
-
-    async def async_register_api_interest(self, sensor_type):
-        """Increment the number of entities with data needs from an API category."""
-        # If this is the first registration we have, start a time interval:
-        if not self._async_cancel_time_interval_listener:
-            self._async_cancel_time_interval_listener = async_track_time_interval(
-                self._hass,
-                self._async_update_listener_action,
-                DEFAULT_SCAN_INTERVAL,
-            )
-
-        api_category = async_get_api_category(sensor_type)
-        self._api_category_count[api_category] += 1
-
-        # If a sensor registers interest in a particular API call and the data doesn't
-        # exist for it yet, make the API call and grab the data:
-        async with self._api_category_locks[api_category]:
-            if api_category not in self.data:
-                await self._async_get_data_from_api(api_category)
-
-    async def async_update(self):
-        """Update IQVIA data."""
-        tasks = [
-            self._async_get_data_from_api(api_category)
-            for api_category in self._api_coros
-        ]
-
-        await asyncio.gather(*tasks)
-
-        _LOGGER.debug("Received new data")
-        async_dispatcher_send(self._hass, TOPIC_DATA_UPDATE)
-
-
-class IQVIAEntity(Entity):
+class IQVIAEntity(CoordinatorEntity):
     """Define a base IQVIA entity."""
 
-    def __init__(self, iqvia, sensor_type, name, icon, zip_code):
-        """Initialize the sensor."""
+    def __init__(self, coordinator, entry, sensor_type, name, icon):
+        """Initialize."""
+        super().__init__(coordinator)
         self._attrs = {ATTR_ATTRIBUTION: DEFAULT_ATTRIBUTION}
+        self._entry = entry
         self._icon = icon
-        self._iqvia = iqvia
         self._name = name
         self._state = None
         self._type = sensor_type
-        self._zip_code = zip_code
-
-    @property
-    def available(self):
-        """Return True if entity is available."""
-        if self._type in (TYPE_ALLERGY_TODAY, TYPE_ALLERGY_TOMORROW):
-            return self._iqvia.data.get(TYPE_ALLERGY_INDEX) is not None
-
-        if self._type in (TYPE_ASTHMA_TODAY, TYPE_ASTHMA_TOMORROW):
-            return self._iqvia.data.get(TYPE_ASTHMA_INDEX) is not None
-
-        if self._type == TYPE_DISEASE_TODAY:
-            return self._iqvia.data.get(TYPE_DISEASE_INDEX) is not None
-
-        return self._iqvia.data.get(self._type) is not None
 
     @property
     def device_state_attributes(self):
@@ -257,7 +144,7 @@ class IQVIAEntity(Entity):
     @property
     def unique_id(self):
         """Return a unique, Home Assistant friendly identifier for this entity."""
-        return f"{self._zip_code}_{self._type}"
+        return f"{self._entry.data[CONF_ZIP_CODE]}_{self._type}"
 
     @property
     def unit_of_measurement(self):
@@ -273,27 +160,17 @@ class IQVIAEntity(Entity):
             self.update_from_latest_data()
             self.async_write_ha_state()
 
-        self.async_on_remove(
-            async_dispatcher_connect(self.hass, TOPIC_DATA_UPDATE, update)
-        )
+        self.async_on_remove(self.coordinator.async_add_listener(update))
 
-        await self._iqvia.async_register_api_interest(self._type)
         if self._type == TYPE_ALLERGY_FORECAST:
-            # Entities that express interest in allergy forecast data should also
-            # express interest in allergy outlook data:
-            await self._iqvia.async_register_api_interest(TYPE_ALLERGY_OUTLOOK)
+            outlook_coordinator = self.hass.data[DOMAIN][DATA_COORDINATOR][
+                self._entry.entry_id
+            ][TYPE_ALLERGY_OUTLOOK]
+            self.async_on_remove(outlook_coordinator.async_add_listener(update))
 
         self.update_from_latest_data()
 
-    async def async_will_remove_from_hass(self):
-        """Disconnect dispatcher listener when removed."""
-        self._iqvia.async_deregister_api_interest(self._type)
-        if self._type == TYPE_ALLERGY_FORECAST:
-            # Entities that lose interest in allergy forecast data should also lose
-            # interest in allergy outlook data:
-            self._iqvia.async_deregister_api_interest(TYPE_ALLERGY_OUTLOOK)
-
     @callback
     def update_from_latest_data(self):
-        """Update the entity's state."""
-        raise NotImplementedError()
+        """Update the entity from the latest data."""
+        raise NotImplementedError
diff --git a/homeassistant/components/iqvia/const.py b/homeassistant/components/iqvia/const.py
index 95b03485597..10b2ae30220 100644
--- a/homeassistant/components/iqvia/const.py
+++ b/homeassistant/components/iqvia/const.py
@@ -1,12 +1,13 @@
 """Define IQVIA constants."""
+import logging
+
+LOGGER = logging.getLogger(__package__)
+
 DOMAIN = "iqvia"
 
 CONF_ZIP_CODE = "zip_code"
 
-DATA_CLIENT = "client"
-DATA_LISTENER = "listener"
-
-TOPIC_DATA_UPDATE = f"{DOMAIN}_data_update"
+DATA_COORDINATOR = "coordinator"
 
 TYPE_ALLERGY_FORECAST = "allergy_average_forecasted"
 TYPE_ALLERGY_INDEX = "allergy_index"
diff --git a/homeassistant/components/iqvia/sensor.py b/homeassistant/components/iqvia/sensor.py
index 5db4456b3c6..e53ee96b1c4 100644
--- a/homeassistant/components/iqvia/sensor.py
+++ b/homeassistant/components/iqvia/sensor.py
@@ -1,12 +1,16 @@
 """Support for IQVIA sensors."""
-import logging
 from statistics import mean
 
 import numpy as np
 
-from homeassistant.components.iqvia import (
-    DATA_CLIENT,
+from homeassistant.const import ATTR_STATE
+from homeassistant.core import callback
+
+from . import IQVIAEntity
+from .const import (
+    DATA_COORDINATOR,
     DOMAIN,
+    SENSORS,
     TYPE_ALLERGY_FORECAST,
     TYPE_ALLERGY_INDEX,
     TYPE_ALLERGY_OUTLOOK,
@@ -19,14 +23,7 @@ from homeassistant.components.iqvia import (
     TYPE_DISEASE_FORECAST,
     TYPE_DISEASE_INDEX,
     TYPE_DISEASE_TODAY,
-    IQVIAEntity,
 )
-from homeassistant.const import ATTR_STATE
-from homeassistant.core import callback
-
-from .const import SENSORS
-
-_LOGGER = logging.getLogger(__name__)
 
 ATTR_ALLERGEN_AMOUNT = "allergen_amount"
 ATTR_ALLERGEN_GENUS = "allergen_genus"
@@ -39,6 +36,15 @@ ATTR_SEASON = "season"
 ATTR_TREND = "trend"
 ATTR_ZIP_CODE = "zip_code"
 
+API_CATEGORY_MAPPING = {
+    TYPE_ALLERGY_TODAY: TYPE_ALLERGY_INDEX,
+    TYPE_ALLERGY_TOMORROW: TYPE_ALLERGY_INDEX,
+    TYPE_ALLERGY_TOMORROW: TYPE_ALLERGY_INDEX,
+    TYPE_ASTHMA_TODAY: TYPE_ASTHMA_INDEX,
+    TYPE_ASTHMA_TOMORROW: TYPE_ASTHMA_INDEX,
+    TYPE_DISEASE_TODAY: TYPE_DISEASE_INDEX,
+}
+
 RATING_MAPPING = [
     {"label": "Low", "minimum": 0.0, "maximum": 2.4},
     {"label": "Low/Medium", "minimum": 2.5, "maximum": 4.8},
@@ -54,8 +60,6 @@ TREND_SUBSIDING = "Subsiding"
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up IQVIA sensors based on a config entry."""
-    iqvia = hass.data[DOMAIN][DATA_CLIENT][entry.entry_id]
-
     sensor_class_mapping = {
         TYPE_ALLERGY_FORECAST: ForecastSensor,
         TYPE_ALLERGY_TODAY: IndexSensor,
@@ -67,14 +71,15 @@ async def async_setup_entry(hass, entry, async_add_entities):
         TYPE_DISEASE_TODAY: IndexSensor,
     }
 
-    async_add_entities(
-        [
-            sensor_class_mapping[sensor_type](
-                iqvia, sensor_type, name, icon, iqvia.zip_code
-            )
-            for sensor_type, (name, icon) in SENSORS.items()
-        ]
-    )
+    sensors = []
+    for sensor_type, (name, icon) in SENSORS.items():
+        api_category = API_CATEGORY_MAPPING.get(sensor_type, sensor_type)
+        coordinator = hass.data[DOMAIN][DATA_COORDINATOR][entry.entry_id][api_category]
+        sensor_class = sensor_class_mapping[sensor_type]
+
+        sensors.append(sensor_class(coordinator, entry, sensor_type, name, icon))
+
+    async_add_entities(sensors)
 
 
 def calculate_trend(indices):
@@ -99,10 +104,7 @@ class ForecastSensor(IQVIAEntity):
     @callback
     def update_from_latest_data(self):
         """Update the sensor."""
-        if not self._iqvia.data.get(self._type):
-            return
-
-        data = self._iqvia.data[self._type].get("Location")
+        data = self.coordinator.data.get("Location")
         if not data or not data.get("periods"):
             return
 
@@ -125,9 +127,11 @@ class ForecastSensor(IQVIAEntity):
         )
 
         if self._type == TYPE_ALLERGY_FORECAST:
-            outlook = self._iqvia.data[TYPE_ALLERGY_OUTLOOK]
-            self._attrs[ATTR_OUTLOOK] = outlook.get("Outlook")
-            self._attrs[ATTR_SEASON] = outlook.get("Season")
+            outlook_coordinator = self.hass.data[DOMAIN][DATA_COORDINATOR][
+                self._entry.entry_id
+            ][TYPE_ALLERGY_OUTLOOK]
+            self._attrs[ATTR_OUTLOOK] = outlook_coordinator.data.get("Outlook")
+            self._attrs[ATTR_SEASON] = outlook_coordinator.data.get("Season")
 
         self._state = average
 
@@ -138,16 +142,13 @@ class IndexSensor(IQVIAEntity):
     @callback
     def update_from_latest_data(self):
         """Update the sensor."""
-        if not self._iqvia.data:
-            return
-
         try:
             if self._type in (TYPE_ALLERGY_TODAY, TYPE_ALLERGY_TOMORROW):
-                data = self._iqvia.data[TYPE_ALLERGY_INDEX].get("Location")
+                data = self.coordinator.data.get("Location")
             elif self._type in (TYPE_ASTHMA_TODAY, TYPE_ASTHMA_TOMORROW):
-                data = self._iqvia.data[TYPE_ASTHMA_INDEX].get("Location")
+                data = self.coordinator.data.get("Location")
             elif self._type == TYPE_DISEASE_TODAY:
-                data = self._iqvia.data[TYPE_DISEASE_INDEX].get("Location")
+                data = self.coordinator.data.get("Location")
         except KeyError:
             return
 
diff --git a/homeassistant/components/iqvia/strings.json b/homeassistant/components/iqvia/strings.json
index b0d82430ef7..7e16d3ae6e3 100644
--- a/homeassistant/components/iqvia/strings.json
+++ b/homeassistant/components/iqvia/strings.json
@@ -13,7 +13,7 @@
       "invalid_zip_code": "ZIP code is invalid"
     },
     "abort": {
-      "already_configured": "This ZIP code has already been configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   }
 }
diff --git a/homeassistant/components/iqvia/translations/ca.json b/homeassistant/components/iqvia/translations/ca.json
index 68774277482..0e062e192cf 100644
--- a/homeassistant/components/iqvia/translations/ca.json
+++ b/homeassistant/components/iqvia/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest codi postal ja est\u00e0 configurat."
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "error": {
             "invalid_zip_code": "Codi postal incorrecte"
diff --git a/homeassistant/components/iqvia/translations/cs.json b/homeassistant/components/iqvia/translations/cs.json
index eb0fdc62f01..6754cdc84af 100644
--- a/homeassistant/components/iqvia/translations/cs.json
+++ b/homeassistant/components/iqvia/translations/cs.json
@@ -1,7 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Toto PS\u010c ji\u017e bylo nakonfigurov\u00e1no."
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "error": {
+            "invalid_zip_code": "PS\u010c je neplatn\u00e9"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "zip_code": "PS\u010c"
+                },
+                "title": "IQVIA"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/iqvia/translations/en.json b/homeassistant/components/iqvia/translations/en.json
index c9b3526102b..46b9189660b 100644
--- a/homeassistant/components/iqvia/translations/en.json
+++ b/homeassistant/components/iqvia/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This ZIP code has already been configured."
+            "already_configured": "Service is already configured"
         },
         "error": {
             "invalid_zip_code": "ZIP code is invalid"
diff --git a/homeassistant/components/iqvia/translations/et.json b/homeassistant/components/iqvia/translations/et.json
new file mode 100644
index 00000000000..13ebab64c86
--- /dev/null
+++ b/homeassistant/components/iqvia/translations/et.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        },
+        "step": {
+            "user": {
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/iqvia/translations/it.json b/homeassistant/components/iqvia/translations/it.json
index fb88883eb0f..67d537bab5f 100644
--- a/homeassistant/components/iqvia/translations/it.json
+++ b/homeassistant/components/iqvia/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo codice di avviamento postale \u00e8 gi\u00e0 stato configurato."
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "error": {
             "invalid_zip_code": "Il CAP non \u00e8 valido"
diff --git a/homeassistant/components/iqvia/translations/lb.json b/homeassistant/components/iqvia/translations/lb.json
index 54a6bbce24d..02fa61fe5cc 100644
--- a/homeassistant/components/iqvia/translations/lb.json
+++ b/homeassistant/components/iqvia/translations/lb.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "D\u00ebs Postleitzuel ass scho konfigur\u00e9iert."
+            "already_configured": "Service ass scho konfigur\u00e9iert."
         },
         "error": {
             "invalid_zip_code": "Postleitzuel ass ong\u00eblteg"
diff --git a/homeassistant/components/iqvia/translations/no.json b/homeassistant/components/iqvia/translations/no.json
index 98526dfed24..5e073cefead 100644
--- a/homeassistant/components/iqvia/translations/no.json
+++ b/homeassistant/components/iqvia/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne postnummeren er allerede konfigurert."
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "error": {
             "invalid_zip_code": "Postnummeret er ugyldig"
diff --git a/homeassistant/components/iqvia/translations/pl.json b/homeassistant/components/iqvia/translations/pl.json
index f33a5257a60..b5d10e9cc09 100644
--- a/homeassistant/components/iqvia/translations/pl.json
+++ b/homeassistant/components/iqvia/translations/pl.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
+        },
         "error": {
             "invalid_zip_code": "Kod pocztowy jest nieprawid\u0142owy"
         },
diff --git a/homeassistant/components/iqvia/translations/ru.json b/homeassistant/components/iqvia/translations/ru.json
index dc320a69eb6..6e2ddb93698 100644
--- a/homeassistant/components/iqvia/translations/ru.json
+++ b/homeassistant/components/iqvia/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0441 \u044d\u0442\u0438\u043c \u043f\u043e\u0447\u0442\u043e\u0432\u044b\u043c \u0438\u043d\u0434\u0435\u043a\u0441\u043e\u043c \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
             "invalid_zip_code": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043f\u043e\u0447\u0442\u043e\u0432\u044b\u0439 \u0438\u043d\u0434\u0435\u043a\u0441."
diff --git a/homeassistant/components/iqvia/translations/zh-Hant.json b/homeassistant/components/iqvia/translations/zh-Hant.json
index f6a71960c0a..12d1edce896 100644
--- a/homeassistant/components/iqvia/translations/zh-Hant.json
+++ b/homeassistant/components/iqvia/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u90f5\u905e\u5340\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
             "invalid_zip_code": "\u90f5\u905e\u5340\u865f\u7121\u6548"
diff --git a/homeassistant/components/irish_rail_transport/sensor.py b/homeassistant/components/irish_rail_transport/sensor.py
index 76f8d0dfaab..fba69a6f578 100644
--- a/homeassistant/components/irish_rail_transport/sensor.py
+++ b/homeassistant/components/irish_rail_transport/sensor.py
@@ -1,6 +1,5 @@
 """Support for Irish Rail RTPI information."""
 from datetime import timedelta
-import logging
 
 from pyirishrail.pyirishrail import IrishRailRTPI
 import voluptuous as vol
@@ -10,8 +9,6 @@ from homeassistant.const import ATTR_ATTRIBUTION, CONF_NAME, TIME_MINUTES
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_STATION = "Station"
 ATTR_ORIGIN = "Origin"
 ATTR_DESTINATION = "Destination"
diff --git a/homeassistant/components/islamic_prayer_times/config_flow.py b/homeassistant/components/islamic_prayer_times/config_flow.py
index d45997af76f..065af0bd611 100644
--- a/homeassistant/components/islamic_prayer_times/config_flow.py
+++ b/homeassistant/components/islamic_prayer_times/config_flow.py
@@ -23,7 +23,7 @@ class IslamicPrayerFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_user(self, user_input=None):
         """Handle a flow initialized by the user."""
         if self._async_current_entries():
-            return self.async_abort(reason="one_instance_allowed")
+            return self.async_abort(reason="single_instance_allowed")
 
         if user_input is None:
             return self.async_show_form(step_id="user")
diff --git a/homeassistant/components/islamic_prayer_times/sensor.py b/homeassistant/components/islamic_prayer_times/sensor.py
index e0c2cf16f68..41b3cf4c667 100644
--- a/homeassistant/components/islamic_prayer_times/sensor.py
+++ b/homeassistant/components/islamic_prayer_times/sensor.py
@@ -1,5 +1,4 @@
 """Platform to retrieve Islamic prayer times information for Home Assistant."""
-import logging
 
 from homeassistant.const import DEVICE_CLASS_TIMESTAMP
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -8,8 +7,6 @@ import homeassistant.util.dt as dt_util
 
 from .const import DATA_UPDATED, DOMAIN, PRAYER_TIMES_ICON, SENSOR_TYPES
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Islamic prayer times sensor platform."""
diff --git a/homeassistant/components/islamic_prayer_times/strings.json b/homeassistant/components/islamic_prayer_times/strings.json
index b57c338ecea..73998913f41 100644
--- a/homeassistant/components/islamic_prayer_times/strings.json
+++ b/homeassistant/components/islamic_prayer_times/strings.json
@@ -8,7 +8,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   },
   "options": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/ca.json b/homeassistant/components/islamic_prayer_times/translations/ca.json
index d9f0801bc66..436534f1a3b 100644
--- a/homeassistant/components/islamic_prayer_times/translations/ca.json
+++ b/homeassistant/components/islamic_prayer_times/translations/ca.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
+            "one_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/cs.json b/homeassistant/components/islamic_prayer_times/translations/cs.json
new file mode 100644
index 00000000000..f48b2736bfa
--- /dev/null
+++ b/homeassistant/components/islamic_prayer_times/translations/cs.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "user": {
+                "description": "Chcete nastavit isl\u00e1msk\u00e9 modlitebn\u00ed \u010dasy?",
+                "title": "Nastavte isl\u00e1msk\u00e9 modlitebn\u00ed \u010dasy"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "calculation_method": "Metoda v\u00fdpo\u010dtu modlitby"
+                }
+            }
+        }
+    },
+    "title": "Isl\u00e1msk\u00e9 modlitebn\u00ed \u010dasy"
+}
\ No newline at end of file
diff --git a/homeassistant/components/islamic_prayer_times/translations/el.json b/homeassistant/components/islamic_prayer_times/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/islamic_prayer_times/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/islamic_prayer_times/translations/en.json b/homeassistant/components/islamic_prayer_times/translations/en.json
index 9e8125ed141..e028ee8fdf6 100644
--- a/homeassistant/components/islamic_prayer_times/translations/en.json
+++ b/homeassistant/components/islamic_prayer_times/translations/en.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Already configured. Only a single configuration possible."
+            "one_instance_allowed": "Already configured. Only a single configuration possible.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/es.json b/homeassistant/components/islamic_prayer_times/translations/es.json
index 8dc6c5e5cf8..6460d121f60 100644
--- a/homeassistant/components/islamic_prayer_times/translations/es.json
+++ b/homeassistant/components/islamic_prayer_times/translations/es.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/et.json b/homeassistant/components/islamic_prayer_times/translations/et.json
new file mode 100644
index 00000000000..0557547563e
--- /dev/null
+++ b/homeassistant/components/islamic_prayer_times/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovitd seadistada Islam Prayer Times?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/islamic_prayer_times/translations/fr.json b/homeassistant/components/islamic_prayer_times/translations/fr.json
index 6499df244ab..6270620a412 100644
--- a/homeassistant/components/islamic_prayer_times/translations/fr.json
+++ b/homeassistant/components/islamic_prayer_times/translations/fr.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/it.json b/homeassistant/components/islamic_prayer_times/translations/it.json
index ff1d085a58d..a8a5f389f90 100644
--- a/homeassistant/components/islamic_prayer_times/translations/it.json
+++ b/homeassistant/components/islamic_prayer_times/translations/it.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "\u00c8 necessaria solo una singola istanza."
+            "one_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/lb.json b/homeassistant/components/islamic_prayer_times/translations/lb.json
index 7ba93417436..20cec66ded5 100644
--- a/homeassistant/components/islamic_prayer_times/translations/lb.json
+++ b/homeassistant/components/islamic_prayer_times/translations/lb.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun m\u00e9iglech.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/nl.json b/homeassistant/components/islamic_prayer_times/translations/nl.json
index 2f69b417998..9cfc67e2049 100644
--- a/homeassistant/components/islamic_prayer_times/translations/nl.json
+++ b/homeassistant/components/islamic_prayer_times/translations/nl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Slechts \u00e9\u00e9n exemplaar is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n exemplaar is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/no.json b/homeassistant/components/islamic_prayer_times/translations/no.json
index 66398ddd473..5fc3230390e 100644
--- a/homeassistant/components/islamic_prayer_times/translations/no.json
+++ b/homeassistant/components/islamic_prayer_times/translations/no.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/pl.json b/homeassistant/components/islamic_prayer_times/translations/pl.json
index b0f87a15404..b203b6096a8 100644
--- a/homeassistant/components/islamic_prayer_times/translations/pl.json
+++ b/homeassistant/components/islamic_prayer_times/translations/pl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/ru.json b/homeassistant/components/islamic_prayer_times/translations/ru.json
index 252eb042416..696671eeb7e 100644
--- a/homeassistant/components/islamic_prayer_times/translations/ru.json
+++ b/homeassistant/components/islamic_prayer_times/translations/ru.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/islamic_prayer_times/translations/zh-Hant.json b/homeassistant/components/islamic_prayer_times/translations/zh-Hant.json
index f03cd67c650..2a2325bfc35 100644
--- a/homeassistant/components/islamic_prayer_times/translations/zh-Hant.json
+++ b/homeassistant/components/islamic_prayer_times/translations/zh-Hant.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
+            "one_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/isy994/__init__.py b/homeassistant/components/isy994/__init__.py
index 6399cbe46e1..9fd844521d7 100644
--- a/homeassistant/components/isy994/__init__.py
+++ b/homeassistant/components/isy994/__init__.py
@@ -156,13 +156,15 @@ async def async_setup_entry(
             password=password,
             use_https=https,
             tls_ver=tls_version,
-            log=_LOGGER,
             webroot=host.path,
         )
     )
     if not isy.connected:
         return False
 
+    # Trigger a status update for all nodes, not done automatically in PyISY v2.x
+    await hass.async_add_executor_job(isy.nodes.update)
+
     _categorize_nodes(hass_isy_data, isy.nodes, ignore_identifier, sensor_identifier)
     _categorize_programs(hass_isy_data, isy.programs)
     _categorize_variables(hass_isy_data, isy.variables, variable_identifier)
diff --git a/homeassistant/components/isy994/config_flow.py b/homeassistant/components/isy994/config_flow.py
index bc589a3aa11..6049b8c6ec3 100644
--- a/homeassistant/components/isy994/config_flow.py
+++ b/homeassistant/components/isy994/config_flow.py
@@ -94,13 +94,12 @@ def _fetch_isy_configuration(
             password,
             use_https,
             tls_ver,
-            log=_LOGGER,
             webroot=webroot,
         )
     except ValueError as err:
         raise InvalidAuth(err.args[0]) from err
 
-    return Configuration(log=_LOGGER, xml=isy_conn.get_config())
+    return Configuration(xml=isy_conn.get_config())
 
 
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
diff --git a/homeassistant/components/isy994/const.py b/homeassistant/components/isy994/const.py
index e003a52c91f..3b129776b31 100644
--- a/homeassistant/components/isy994/const.py
+++ b/homeassistant/components/isy994/const.py
@@ -200,7 +200,7 @@ UOM_ON_OFF = "2"
 # Z-Wave Categories: https://www.universal-devices.com/developers/wsdk/5.0.4/4_fam.xml
 NODE_FILTERS = {
     BINARY_SENSOR: {
-        FILTER_UOM: [],
+        FILTER_UOM: [UOM_ON_OFF],
         FILTER_STATES: [],
         FILTER_NODE_DEF_ID: [
             "BinaryAlarm",
@@ -282,7 +282,7 @@ NODE_FILTERS = {
         FILTER_ZWAVE_CAT: ["109", "119"],
     },
     SWITCH: {
-        FILTER_UOM: [UOM_ON_OFF, "78"],
+        FILTER_UOM: ["78"],
         FILTER_STATES: ["on", "off"],
         FILTER_NODE_DEF_ID: [
             "AlertModuleArmed",
@@ -322,6 +322,7 @@ NODE_FILTERS = {
 
 UOM_FRIENDLY_NAME = {
     "1": "A",
+    UOM_ON_OFF: "",  # Binary, no unit
     "3": f"btu/{TIME_HOURS}",
     "4": TEMP_CELSIUS,
     "5": LENGTH_CENTIMETERS,
diff --git a/homeassistant/components/isy994/helpers.py b/homeassistant/components/isy994/helpers.py
index a2550f6746c..e1ab689eb7a 100644
--- a/homeassistant/components/isy994/helpers.py
+++ b/homeassistant/components/isy994/helpers.py
@@ -402,7 +402,7 @@ async def migrate_old_unique_ids(
 def convert_isy_value_to_hass(
     value: Union[int, float, None],
     uom: str,
-    precision: str,
+    precision: Union[int, str],
     fallback_precision: Optional[int] = None,
 ) -> Union[float, int]:
     """Fix ISY Reported Values.
@@ -418,7 +418,7 @@ def convert_isy_value_to_hass(
         return None
     if uom in [UOM_DOUBLE_TEMP, UOM_ISYV4_DEGREES]:
         return round(float(value) / 2.0, 1)
-    if precision != "0":
+    if precision not in ("0", 0):
         return round(float(value) / 10 ** int(precision), int(precision))
     if fallback_precision:
         return round(float(value), fallback_precision)
diff --git a/homeassistant/components/isy994/manifest.json b/homeassistant/components/isy994/manifest.json
index 2effed0c06c..9e22b3533d7 100644
--- a/homeassistant/components/isy994/manifest.json
+++ b/homeassistant/components/isy994/manifest.json
@@ -2,7 +2,7 @@
   "domain": "isy994",
   "name": "Universal Devices ISY994",
   "documentation": "https://www.home-assistant.io/integrations/isy994",
-  "requirements": ["pyisy==2.0.2"],
+  "requirements": ["pyisy==2.1.0"],
   "codeowners": ["@bdraco", "@shbatm"],
   "config_flow": true,
   "ssdp": [
diff --git a/homeassistant/components/isy994/sensor.py b/homeassistant/components/isy994/sensor.py
index b4eba10fd34..d3d192b1b3b 100644
--- a/homeassistant/components/isy994/sensor.py
+++ b/homeassistant/components/isy994/sensor.py
@@ -15,6 +15,8 @@ from .const import (
     ISY994_VARIABLES,
     UOM_DOUBLE_TEMP,
     UOM_FRIENDLY_NAME,
+    UOM_INDEX,
+    UOM_ON_OFF,
     UOM_TO_STATES,
 )
 from .entity import ISYEntity, ISYNodeEntity
@@ -58,6 +60,9 @@ class ISYSensorEntity(ISYNodeEntity):
         if isy_states:
             return isy_states
 
+        if uom in [UOM_ON_OFF, UOM_INDEX]:
+            return uom
+
         return UOM_FRIENDLY_NAME.get(uom)
 
     @property
@@ -74,6 +79,9 @@ class ISYSensorEntity(ISYNodeEntity):
         if isinstance(uom, dict):
             return uom.get(value, value)
 
+        if uom in [UOM_INDEX, UOM_ON_OFF]:
+            return self._node.formatted
+
         # Handle ISY precision and rounding
         value = convert_isy_value_to_hass(value, uom, self._node.prec)
 
@@ -88,7 +96,7 @@ class ISYSensorEntity(ISYNodeEntity):
         """Get the Home Assistant unit of measurement for the device."""
         raw_units = self.raw_unit_of_measurement
         # Check if this is a known index pair UOM
-        if isinstance(raw_units, dict):
+        if isinstance(raw_units, dict) or raw_units in [UOM_ON_OFF, UOM_INDEX]:
             return None
         if raw_units in (TEMP_FAHRENHEIT, TEMP_CELSIUS, UOM_DOUBLE_TEMP):
             return self.hass.config.units.temperature_unit
@@ -106,12 +114,16 @@ class ISYSensorVariableEntity(ISYEntity):
     @property
     def state(self):
         """Return the state of the variable."""
-        return self._node.status
+        return convert_isy_value_to_hass(self._node.status, "", self._node.prec)
 
     @property
     def device_state_attributes(self) -> Dict:
         """Get the state attributes for the device."""
-        return {"init_value": int(self._node.init)}
+        return {
+            "init_value": convert_isy_value_to_hass(
+                self._node.init, "", self._node.prec
+            )
+        }
 
     @property
     def icon(self):
diff --git a/homeassistant/components/isy994/strings.json b/homeassistant/components/isy994/strings.json
index ce9818bc0c8..18e08b65009 100644
--- a/homeassistant/components/isy994/strings.json
+++ b/homeassistant/components/isy994/strings.json
@@ -6,7 +6,7 @@
       "user": {
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
-          "host": "URL",
+          "host": "[%key:common::config_flow::data::url%]",
           "password": "[%key:common::config_flow::data::password%]",
           "tls": "The TLS version of the ISY controller."
         },
diff --git a/homeassistant/components/isy994/translations/cs.json b/homeassistant/components/isy994/translations/cs.json
index 78bf9ea9af1..f5024d177fd 100644
--- a/homeassistant/components/isy994/translations/cs.json
+++ b/homeassistant/components/isy994/translations/cs.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
@@ -11,9 +11,22 @@
         "step": {
             "user": {
                 "data": {
+                    "host": "URL",
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k ISY994"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "restore_light_state": "Obnoven\u00ed jasu sv\u011btla"
+                },
+                "description": "Nastavte mo\u017enosti pro integraci ISY:\n \u2022 \u0158et\u011bzec pro sensory uzl\u016f: S ka\u017ed\u00fdm za\u0159\u00edzen\u00edm nebo slo\u017ekou, jeji\u017e n\u00e1zev obsahuje tento \u0159et\u011bzec, bude zach\u00e1zeno jako se senzorem nebo bin\u00e1rn\u00edm senzorem.\n \u2022 Ignorovat \u0159et\u011bzec: Ka\u017ed\u00e9 za\u0159\u00edzen\u00ed, jeho\u017e jm\u00e9no obsahuje tento \u0159et\u011bzec, bude ignorov\u00e1no.\n \u2022 Prom\u011bnn\u00fd \u0159et\u011bzec senzoru: Jak\u00e1koli prom\u011bnn\u00e1, kter\u00e1 obsahuje \"Prom\u011bnn\u00fd \u0159et\u011bzec senzoru\", bude p\u0159id\u00e1na jako senzor.\n \u2022 Obnovit jas sv\u011btla: Pokud je povoleno, obnov\u00ed se p\u0159edchoz\u00ed jas p\u0159i zapnut\u00ed sv\u011btla nam\u00edsto vestav\u011bn\u00e9ho On-Level za\u0159\u00edzen\u00ed.",
+                "title": "Mo\u017enosti ISY994"
             }
         }
     }
diff --git a/homeassistant/components/isy994/translations/et.json b/homeassistant/components/isy994/translations/et.json
new file mode 100644
index 00000000000..4554a58c3ff
--- /dev/null
+++ b/homeassistant/components/isy994/translations/et.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "invalid_host": "Hostikirje ei olnud sobivas URL-vormingus, nt http://192.168.10.100:80",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/isy994/translations/nl.json b/homeassistant/components/isy994/translations/nl.json
index b252dde3257..d22d721de0f 100644
--- a/homeassistant/components/isy994/translations/nl.json
+++ b/homeassistant/components/isy994/translations/nl.json
@@ -4,6 +4,7 @@
         "step": {
             "user": {
                 "data": {
+                    "host": "URL",
                     "username": "Gebruikersnaam"
                 }
             }
diff --git a/homeassistant/components/isy994/translations/no.json b/homeassistant/components/isy994/translations/no.json
index da5b2fe3711..694669d7864 100644
--- a/homeassistant/components/isy994/translations/no.json
+++ b/homeassistant/components/isy994/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "invalid_host": "Vertsoppf\u00f8ringen var ikke i fullstendig URL-format, for eksempel http://192.168.10.100:80",
             "unknown": "Uventet feil"
diff --git a/homeassistant/components/isy994/translations/pl.json b/homeassistant/components/isy994/translations/pl.json
index d35b9e91eb6..b4c9bfa639e 100644
--- a/homeassistant/components/isy994/translations/pl.json
+++ b/homeassistant/components/isy994/translations/pl.json
@@ -6,7 +6,7 @@
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
-            "invalid_host": "Wpis hosta nie by\u0142 w pe\u0142nym formacie URL, np. http://192.168.10.100:80.",
+            "invalid_host": "Wpis hosta nie by\u0142 w pe\u0142nym formacie URL, np. http://192.168.10.100:80",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "flow_title": "Urz\u0105dzenia uniwersalne ISY994 {name} ({host})",
diff --git a/homeassistant/components/isy994/translations/sv.json b/homeassistant/components/isy994/translations/sv.json
new file mode 100644
index 00000000000..23c825f256f
--- /dev/null
+++ b/homeassistant/components/isy994/translations/sv.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "Anv\u00e4ndarnamn"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/isy994/translations/zh-Hans.json b/homeassistant/components/isy994/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/isy994/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/itunes/media_player.py b/homeassistant/components/itunes/media_player.py
index a62930ff9dc..29ec7eb4558 100644
--- a/homeassistant/components/itunes/media_player.py
+++ b/homeassistant/components/itunes/media_player.py
@@ -1,6 +1,4 @@
 """Support for interfacing to iTunes API."""
-import logging
-
 import requests
 import voluptuous as vol
 
@@ -33,8 +31,6 @@ from homeassistant.const import (
 )
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "iTunes"
 DEFAULT_PORT = 8181
 DEFAULT_SSL = False
diff --git a/homeassistant/components/izone/__init__.py b/homeassistant/components/izone/__init__.py
index 1b4d2f19d1c..95aad189899 100644
--- a/homeassistant/components/izone/__init__.py
+++ b/homeassistant/components/izone/__init__.py
@@ -1,6 +1,4 @@
 """Platform for the iZone AC."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -11,8 +9,6 @@ from homeassistant.helpers.typing import ConfigType, HomeAssistantType
 from .const import DATA_CONFIG, IZONE
 from .discovery import async_start_discovery_service, async_stop_discovery_service
 
-_LOGGER = logging.getLogger(__name__)
-
 CONFIG_SCHEMA = vol.Schema(
     {
         IZONE: vol.Schema(
diff --git a/homeassistant/components/izone/strings.json b/homeassistant/components/izone/strings.json
index 9772bd4c93c..7d1e8f1d476 100644
--- a/homeassistant/components/izone/strings.json
+++ b/homeassistant/components/izone/strings.json
@@ -6,8 +6,8 @@
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of iZone is necessary.",
-      "no_devices_found": "No iZone devices found on the network."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   }
 }
diff --git a/homeassistant/components/izone/translations/ca.json b/homeassistant/components/izone/translations/ca.json
index 811b3cc8c29..6c05ec8ce8b 100644
--- a/homeassistant/components/izone/translations/ca.json
+++ b/homeassistant/components/izone/translations/ca.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No s'han trobat dispositius iZone a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s cal una \u00fanica configuraci\u00f3 de iZone."
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/izone/translations/cs.json b/homeassistant/components/izone/translations/cs.json
new file mode 100644
index 00000000000..c05e13171f0
--- /dev/null
+++ b/homeassistant/components/izone/translations/cs.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "confirm": {
+                "description": "Chcete nastavit iZone?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/izone/translations/en.json b/homeassistant/components/izone/translations/en.json
index 03cc003752b..f0ab3077adf 100644
--- a/homeassistant/components/izone/translations/en.json
+++ b/homeassistant/components/izone/translations/en.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No iZone devices found on the network.",
-            "single_instance_allowed": "Only a single configuration of iZone is necessary."
+            "no_devices_found": "No devices found on the network",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/izone/translations/es.json b/homeassistant/components/izone/translations/es.json
index 0ae7e16a512..ebd41ca9717 100644
--- a/homeassistant/components/izone/translations/es.json
+++ b/homeassistant/components/izone/translations/es.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No se han encontrado dispositivos iZone en la red.",
-            "single_instance_allowed": "Solo es necesaria una \u00fanica configuraci\u00f3n de iZone."
+            "no_devices_found": "No se encontraron dispositivos en la red",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/izone/translations/et.json b/homeassistant/components/izone/translations/et.json
new file mode 100644
index 00000000000..41c10b2fe52
--- /dev/null
+++ b/homeassistant/components/izone/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas soovid iZone'i seadistada?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/izone/translations/it.json b/homeassistant/components/izone/translations/it.json
index 79151ca44a4..c141fadc270 100644
--- a/homeassistant/components/izone/translations/it.json
+++ b/homeassistant/components/izone/translations/it.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nessun dispositivo iZone trovato in rete.",
-            "single_instance_allowed": "\u00c8 necessaria una sola configurazione di iZone."
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/izone/translations/no.json b/homeassistant/components/izone/translations/no.json
index 5c3e4248339..84c50c19f77 100644
--- a/homeassistant/components/izone/translations/no.json
+++ b/homeassistant/components/izone/translations/no.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Finner ingen iZone-enheter p\u00e5 nettverket.",
-            "single_instance_allowed": "Bare en konfigurasjon av iZone er n\u00f8dvendig."
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/izone/translations/pl.json b/homeassistant/components/izone/translations/pl.json
index de8eff21232..38a2b3858fc 100644
--- a/homeassistant/components/izone/translations/pl.json
+++ b/homeassistant/components/izone/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nie znaleziono w sieci urz\u0105dze\u0144 iZone.",
-            "single_instance_allowed": "Wymagana jest tylko jedna konfiguracja iZone."
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/izone/translations/ru.json b/homeassistant/components/izone/translations/ru.json
index 23b0a85370c..d57ba2d0fca 100644
--- a/homeassistant/components/izone/translations/ru.json
+++ b/homeassistant/components/izone/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 iZone \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/izone/translations/zh-Hant.json b/homeassistant/components/izone/translations/zh-Hant.json
index 283136b5c86..f49de8669d1 100644
--- a/homeassistant/components/izone/translations/zh-Hant.json
+++ b/homeassistant/components/izone/translations/zh-Hant.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230 iZone \u8a2d\u5099\u3002",
-            "single_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u6b21 iZone \u5373\u53ef\u3002"
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/jewish_calendar/__init__.py b/homeassistant/components/jewish_calendar/__init__.py
index dfde274faa8..70d55a74b98 100644
--- a/homeassistant/components/jewish_calendar/__init__.py
+++ b/homeassistant/components/jewish_calendar/__init__.py
@@ -1,5 +1,4 @@
 """The jewish_calendar component."""
-import logging
 from typing import Optional
 
 import hdate
@@ -9,8 +8,6 @@ from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "jewish_calendar"
 
 SENSOR_TYPES = {
diff --git a/homeassistant/components/jewish_calendar/binary_sensor.py b/homeassistant/components/jewish_calendar/binary_sensor.py
index d736be0d578..6edcc7b27c3 100644
--- a/homeassistant/components/jewish_calendar/binary_sensor.py
+++ b/homeassistant/components/jewish_calendar/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Jewish Calendar binary sensors."""
-import logging
-
 import hdate
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
@@ -8,8 +6,6 @@ import homeassistant.util.dt as dt_util
 
 from . import DOMAIN, SENSOR_TYPES
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Jewish Calendar binary sensor devices."""
diff --git a/homeassistant/components/jewish_calendar/manifest.json b/homeassistant/components/jewish_calendar/manifest.json
index 9f0d55433f0..500d98dbe9f 100644
--- a/homeassistant/components/jewish_calendar/manifest.json
+++ b/homeassistant/components/jewish_calendar/manifest.json
@@ -2,6 +2,6 @@
   "domain": "jewish_calendar",
   "name": "Jewish Calendar",
   "documentation": "https://www.home-assistant.io/integrations/jewish_calendar",
-  "requirements": ["hdate==0.9.5"],
+  "requirements": ["hdate==0.9.12"],
   "codeowners": ["@tsvi"]
 }
diff --git a/homeassistant/components/jewish_calendar/sensor.py b/homeassistant/components/jewish_calendar/sensor.py
index 606f4fffab1..7b3a3af9c11 100644
--- a/homeassistant/components/jewish_calendar/sensor.py
+++ b/homeassistant/components/jewish_calendar/sensor.py
@@ -113,10 +113,9 @@ class JewishCalendarSensor(Entity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        if self._type == "holiday":
-            return self._holiday_attrs
-
-        return {}
+        if self._type != "holiday":
+            return {}
+        return self._holiday_attrs
 
     def get_state(self, daytime_date, after_shkia_date, after_tzais_date):
         """For a given type of sensor, return the state."""
diff --git a/homeassistant/components/juicenet/device.py b/homeassistant/components/juicenet/device.py
index 37d36a2b24c..86e1c92e4da 100644
--- a/homeassistant/components/juicenet/device.py
+++ b/homeassistant/components/juicenet/device.py
@@ -1,9 +1,5 @@
 """Adapter to wrap the pyjuicenet api for home assistant."""
 
-import logging
-
-_LOGGER = logging.getLogger(__name__)
-
 
 class JuiceNetApi:
     """Represent a connection to JuiceNet."""
diff --git a/homeassistant/components/juicenet/sensor.py b/homeassistant/components/juicenet/sensor.py
index b6704516e3b..10008f30e7c 100644
--- a/homeassistant/components/juicenet/sensor.py
+++ b/homeassistant/components/juicenet/sensor.py
@@ -1,6 +1,4 @@
 """Support for monitoring juicenet/juicepoint/juicebox based EVSE sensors."""
-import logging
-
 from homeassistant.const import (
     ELECTRICAL_CURRENT_AMPERE,
     ENERGY_WATT_HOUR,
@@ -14,8 +12,6 @@ from homeassistant.helpers.entity import Entity
 from .const import DOMAIN, JUICENET_API, JUICENET_COORDINATOR
 from .entity import JuiceNetDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSOR_TYPES = {
     "status": ["Charging Status", None],
     "temperature": ["Temperature", TEMP_CELSIUS],
diff --git a/homeassistant/components/juicenet/strings.json b/homeassistant/components/juicenet/strings.json
index 4c8ffb8c62f..bc4a66e72d4 100644
--- a/homeassistant/components/juicenet/strings.json
+++ b/homeassistant/components/juicenet/strings.json
@@ -1,17 +1,17 @@
 {
   "config": {
     "abort": {
-      "already_configured": "This JuiceNet account is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "step": {
       "user": {
         "data": {
-          "api_token": "JuiceNet API Token"
+          "api_token": "[%key:common::config_flow::data::api_token%]"
         },
         "description": "You will need the API Token from https://home.juice.net/Manage.",
         "title": "Connect to JuiceNet"
diff --git a/homeassistant/components/juicenet/switch.py b/homeassistant/components/juicenet/switch.py
index f09ec5559eb..64c367740ac 100644
--- a/homeassistant/components/juicenet/switch.py
+++ b/homeassistant/components/juicenet/switch.py
@@ -1,13 +1,9 @@
 """Support for monitoring juicenet/juicepoint/juicebox based EVSE switches."""
-import logging
-
 from homeassistant.components.switch import SwitchEntity
 
 from .const import DOMAIN, JUICENET_API, JUICENET_COORDINATOR
 from .entity import JuiceNetDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the JuiceNet switches."""
diff --git a/homeassistant/components/juicenet/translations/ca.json b/homeassistant/components/juicenet/translations/ca.json
index 1d7cad2111b..f5df6921062 100644
--- a/homeassistant/components/juicenet/translations/ca.json
+++ b/homeassistant/components/juicenet/translations/ca.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest compte de JuiceNet ja est\u00e0 configurat"
+            "already_configured": "El compte ja ha estat configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_token": "Token de l'API de JuiceNet"
+                    "api_token": "Token d'API"
                 },
                 "description": "Necessitar\u00e0s la clau API de https://home.juice.net/Manage.",
                 "title": "Connexi\u00f3 amb JuiceNet"
diff --git a/homeassistant/components/juicenet/translations/cs.json b/homeassistant/components/juicenet/translations/cs.json
new file mode 100644
index 00000000000..af12efef452
--- /dev/null
+++ b/homeassistant/components/juicenet/translations/cs.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_token": "API token"
+                },
+                "description": "Budete pot\u0159ebovat API token z https://home.juice.net/Manage.",
+                "title": "P\u0159ipojen\u00ed k JuiceNet"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/juicenet/translations/en.json b/homeassistant/components/juicenet/translations/en.json
index faf21a8d617..3d11f5de63a 100644
--- a/homeassistant/components/juicenet/translations/en.json
+++ b/homeassistant/components/juicenet/translations/en.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This JuiceNet account is already configured"
+            "already_configured": "Account is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_token": "JuiceNet API Token"
+                    "api_token": "API Token"
                 },
                 "description": "You will need the API Token from https://home.juice.net/Manage.",
                 "title": "Connect to JuiceNet"
diff --git a/homeassistant/components/juicenet/translations/es.json b/homeassistant/components/juicenet/translations/es.json
index b8e3d3444c2..12b5159c99c 100644
--- a/homeassistant/components/juicenet/translations/es.json
+++ b/homeassistant/components/juicenet/translations/es.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Esta cuenta de JuiceNet ya est\u00e1 configurada"
+            "already_configured": "La cuenta ya ha sido configurada"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo",
+            "cannot_connect": "No se pudo conectar",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "unknown": "Error inesperado"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_token": "Token API de JuiceNet"
+                    "api_token": "Token API"
                 },
                 "description": "Necesitar\u00e1s el Token API de https://home.juice.net/Manage.",
                 "title": "Conectar a JuiceNet"
diff --git a/homeassistant/components/juicenet/translations/et.json b/homeassistant/components/juicenet/translations/et.json
new file mode 100644
index 00000000000..aecf63a3b9b
--- /dev/null
+++ b/homeassistant/components/juicenet/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_token": "API string"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/juicenet/translations/it.json b/homeassistant/components/juicenet/translations/it.json
index be8eee9745d..90e3ccd3c17 100644
--- a/homeassistant/components/juicenet/translations/it.json
+++ b/homeassistant/components/juicenet/translations/it.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo account JuiceNet \u00e8 gi\u00e0 configurato"
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_token": "Token API JuiceNet"
+                    "api_token": "Token API"
                 },
                 "description": "Avrete bisogno del Token API da https://home.juice.net/Manage.",
                 "title": "Connettersi a JuiceNet"
diff --git a/homeassistant/components/juicenet/translations/nl.json b/homeassistant/components/juicenet/translations/nl.json
new file mode 100644
index 00000000000..42978a06b37
--- /dev/null
+++ b/homeassistant/components/juicenet/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Account is al geconfigureerd"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/juicenet/translations/no.json b/homeassistant/components/juicenet/translations/no.json
index 1d0e3a15f5b..99f19b8eba0 100644
--- a/homeassistant/components/juicenet/translations/no.json
+++ b/homeassistant/components/juicenet/translations/no.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne JuiceNet-kontoen er allerede konfigurert"
+            "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_token": "JuiceNet API-token"
+                    "api_token": "API-token"
                 },
                 "description": "Du trenger API-tokenet fra https://home.juice.net/Manage.",
                 "title": "Koble til JuiceNet"
diff --git a/homeassistant/components/juicenet/translations/pl.json b/homeassistant/components/juicenet/translations/pl.json
index c308ad2524a..64583cd4a5e 100644
--- a/homeassistant/components/juicenet/translations/pl.json
+++ b/homeassistant/components/juicenet/translations/pl.json
@@ -4,14 +4,14 @@
             "already_configured": "Konto jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_token": "Token API JuiceNet"
+                    "api_token": "Token API"
                 },
                 "description": "B\u0119dziesz potrzebowa\u0142 klucza API ze strony https://home.juice.net/Manage.",
                 "title": "Po\u0142\u0105czenie z JuiceNet"
diff --git a/homeassistant/components/juicenet/translations/ru.json b/homeassistant/components/juicenet/translations/ru.json
index 69b68f82990..2fec7d485c4 100644
--- a/homeassistant/components/juicenet/translations/ru.json
+++ b/homeassistant/components/juicenet/translations/ru.json
@@ -4,7 +4,7 @@
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/juicenet/translations/zh-Hant.json b/homeassistant/components/juicenet/translations/zh-Hant.json
index b54bb3d4676..815edb1fb27 100644
--- a/homeassistant/components/juicenet/translations/zh-Hant.json
+++ b/homeassistant/components/juicenet/translations/zh-Hant.json
@@ -1,17 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "JuiceNet \u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_token": "JuiceNet API \u5bc6\u9470"
+                    "api_token": "API \u5bc6\u9470"
                 },
                 "description": "\u5c07\u9700\u8981\u7531 https://home.juice.net/Manage \u53d6\u5f97 API \u5bc6\u9470\u3002",
                 "title": "\u9023\u7dda\u81f3 JuiceNet"
diff --git a/homeassistant/components/kankun/switch.py b/homeassistant/components/kankun/switch.py
index ce179515e88..d1a616f86fa 100644
--- a/homeassistant/components/kankun/switch.py
+++ b/homeassistant/components/kankun/switch.py
@@ -94,11 +94,6 @@ class KankunSwitch(SwitchEntity):
         except requests.RequestException:
             _LOGGER.error("State query failed")
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def name(self):
         """Return the name of the switch."""
diff --git a/homeassistant/components/keba/binary_sensor.py b/homeassistant/components/keba/binary_sensor.py
index 5c9edfa7793..3fed7bbf5ab 100644
--- a/homeassistant/components/keba/binary_sensor.py
+++ b/homeassistant/components/keba/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for KEBA charging station binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_PLUG,
@@ -11,8 +9,6 @@ from homeassistant.components.binary_sensor import (
 
 from . import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the KEBA charging station platform."""
diff --git a/homeassistant/components/keba/lock.py b/homeassistant/components/keba/lock.py
index 385adf662be..15cc00839fc 100644
--- a/homeassistant/components/keba/lock.py
+++ b/homeassistant/components/keba/lock.py
@@ -1,12 +1,8 @@
 """Support for KEBA charging station switch."""
-import logging
-
 from homeassistant.components.lock import LockEntity
 
 from . import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the KEBA charging station platform."""
diff --git a/homeassistant/components/keba/notify.py b/homeassistant/components/keba/notify.py
index 7b3f23277a6..e0c37efec51 100644
--- a/homeassistant/components/keba/notify.py
+++ b/homeassistant/components/keba/notify.py
@@ -1,12 +1,8 @@
 """Support for Keba notifications."""
-import logging
-
 from homeassistant.components.notify import ATTR_DATA, BaseNotificationService
 
 from . import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_get_service(hass, config, discovery_info=None):
     """Return the notify service."""
diff --git a/homeassistant/components/keba/sensor.py b/homeassistant/components/keba/sensor.py
index 443e1bcd1bc..f7993c28393 100644
--- a/homeassistant/components/keba/sensor.py
+++ b/homeassistant/components/keba/sensor.py
@@ -1,6 +1,4 @@
 """Support for KEBA charging station sensors."""
-import logging
-
 from homeassistant.const import (
     DEVICE_CLASS_POWER,
     ELECTRICAL_CURRENT_AMPERE,
@@ -10,8 +8,6 @@ from homeassistant.helpers.entity import Entity
 
 from . import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the KEBA charging station platform."""
diff --git a/homeassistant/components/kef/media_player.py b/homeassistant/components/kef/media_player.py
index 892bb0adac0..a36fe11ef65 100644
--- a/homeassistant/components/kef/media_player.py
+++ b/homeassistant/components/kef/media_player.py
@@ -85,6 +85,16 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 )
 
 
+def get_ip_mode(host):
+    """Get the 'mode' used to retrieve the MAC address."""
+    try:
+        if ipaddress.ip_address(host).version == 6:
+            return "ip6"
+        return "ip"
+    except ValueError:
+        return "hostname"
+
+
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the KEF platform."""
     if DOMAIN not in hass.data:
@@ -111,13 +121,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
         sources,
     )
 
-    try:
-        if ipaddress.ip_address(host).version == 6:
-            mode = "ip6"
-        else:
-            mode = "ip"
-    except ValueError:
-        mode = "hostname"
+    mode = get_ip_mode(host)
     mac = await hass.async_add_executor_job(partial(get_mac_address, **{mode: host}))
     unique_id = f"kef-{mac}" if mac is not None else None
 
diff --git a/homeassistant/components/kira/remote.py b/homeassistant/components/kira/remote.py
index 330813a7bff..c9b51fd7ab7 100644
--- a/homeassistant/components/kira/remote.py
+++ b/homeassistant/components/kira/remote.py
@@ -50,6 +50,6 @@ class KiraRemote(Entity):
 
     async def async_send_command(self, command, **kwargs):
         """Send a command to a device."""
-        return await self.hass.async_add_job(
+        return await self.hass.async_add_executor_job(
             ft.partial(self.send_command, command, **kwargs)
         )
diff --git a/homeassistant/components/kodi/browse_media.py b/homeassistant/components/kodi/browse_media.py
index c174cf28406..bdbac4ab762 100644
--- a/homeassistant/components/kodi/browse_media.py
+++ b/homeassistant/components/kodi/browse_media.py
@@ -67,95 +67,101 @@ async def build_item_response(media_library, payload):
     title = None
     media = None
 
-    query = {"properties": ["thumbnail"]}
-    # pylint: disable=protected-access
+    properties = ["thumbnail"]
     if search_type == MEDIA_TYPE_ALBUM:
         if search_id:
-            query.update({"filter": {"albumid": int(search_id)}})
-            query["properties"].extend(
-                ["albumid", "artist", "duration", "album", "track"]
-            )
-            album = await media_library._server.AudioLibrary.GetAlbumDetails(
-                {"albumid": int(search_id), "properties": ["thumbnail"]}
+            album = await media_library.get_album_details(
+                album_id=int(search_id), properties=properties
             )
             thumbnail = media_library.thumbnail_url(
                 album["albumdetails"].get("thumbnail")
             )
             title = album["albumdetails"]["label"]
-            media = await media_library._server.AudioLibrary.GetSongs(query)
+            media = await media_library.get_songs(
+                album_id=int(search_id),
+                properties=[
+                    "albumid",
+                    "artist",
+                    "duration",
+                    "album",
+                    "thumbnail",
+                    "track",
+                ],
+            )
             media = media.get("songs")
         else:
-            media = await media_library._server.AudioLibrary.GetAlbums(query)
+            media = await media_library.get_albums(properties=properties)
             media = media.get("albums")
             title = "Albums"
+
     elif search_type == MEDIA_TYPE_ARTIST:
         if search_id:
-            query.update({"filter": {"artistid": int(search_id)}})
-            media = await media_library._server.AudioLibrary.GetAlbums(query)
+            media = await media_library.get_albums(
+                artist_id=int(search_id), properties=properties
+            )
             media = media.get("albums")
-            artist = await media_library._server.AudioLibrary.GetArtistDetails(
-                {"artistid": int(search_id), "properties": ["thumbnail"]}
+            artist = await media_library.get_artist_details(
+                artist_id=int(search_id), properties=properties
             )
             thumbnail = media_library.thumbnail_url(
                 artist["artistdetails"].get("thumbnail")
             )
             title = artist["artistdetails"]["label"]
         else:
-            media = await media_library._server.AudioLibrary.GetArtists(query)
+            media = await media_library.get_artists(properties)
             media = media.get("artists")
             title = "Artists"
+
     elif search_type == "library_music":
         library = {MEDIA_TYPE_ALBUM: "Albums", MEDIA_TYPE_ARTIST: "Artists"}
         media = [{"label": name, "type": type_} for type_, name in library.items()]
         title = "Music Library"
+
     elif search_type == MEDIA_TYPE_MOVIE:
-        media = await media_library._server.VideoLibrary.GetMovies(query)
+        media = await media_library.get_movies(properties)
         media = media.get("movies")
         title = "Movies"
+
     elif search_type == MEDIA_TYPE_TVSHOW:
         if search_id:
-            media = await media_library._server.VideoLibrary.GetSeasons(
-                {
-                    "tvshowid": int(search_id),
-                    "properties": ["thumbnail", "season", "tvshowid"],
-                }
+            media = await media_library.get_seasons(
+                tv_show_id=int(search_id),
+                properties=["thumbnail", "season", "tvshowid"],
             )
             media = media.get("seasons")
-            tvshow = await media_library._server.VideoLibrary.GetTVShowDetails(
-                {"tvshowid": int(search_id), "properties": ["thumbnail"]}
+            tvshow = await media_library.get_tv_show_details(
+                tv_show_id=int(search_id), properties=properties
             )
             thumbnail = media_library.thumbnail_url(
                 tvshow["tvshowdetails"].get("thumbnail")
             )
             title = tvshow["tvshowdetails"]["label"]
         else:
-            media = await media_library._server.VideoLibrary.GetTVShows(query)
+            media = await media_library.get_tv_shows(properties)
             media = media.get("tvshows")
             title = "TV Shows"
+
     elif search_type == MEDIA_TYPE_SEASON:
         tv_show_id, season_id = search_id.split("/", 1)
-        media = await media_library._server.VideoLibrary.GetEpisodes(
-            {
-                "tvshowid": int(tv_show_id),
-                "season": int(season_id),
-                "properties": ["thumbnail", "tvshowid", "seasonid"],
-            }
+        media = await media_library.get_episodes(
+            tv_show_id=int(tv_show_id),
+            season_id=int(season_id),
+            properties=["thumbnail", "tvshowid", "seasonid"],
         )
         media = media.get("episodes")
         if media:
-            season = await media_library._server.VideoLibrary.GetSeasonDetails(
-                {"seasonid": int(media[0]["seasonid"]), "properties": ["thumbnail"]}
+            season = await media_library.get_season_details(
+                season_id=int(media[0]["seasonid"]), properties=properties
             )
             thumbnail = media_library.thumbnail_url(
                 season["seasondetails"].get("thumbnail")
             )
             title = season["seasondetails"]["label"]
+
     elif search_type == MEDIA_TYPE_CHANNEL:
-        media = await media_library._server.PVR.GetChannels(
-            {
-                "channelgroupid": "alltv",
-                "properties": ["thumbnail", "channeltype", "channel", "broadcastnow"],
-            }
+        media = await media_library.get_channels(
+            channel_group_id="alltv",
+            properties=["thumbnail", "channeltype", "channel", "broadcastnow"],
         )
         media = media.get("channels")
         title = "Channels"
@@ -170,6 +176,9 @@ async def build_item_response(media_library, payload):
         except UnknownMediaType:
             pass
 
+    if search_type in (MEDIA_TYPE_TVSHOW, MEDIA_TYPE_MOVIE) and search_id == "":
+        children.sort(key=lambda x: x.title.replace("The ", "", 1), reverse=False)
+
     response = BrowseMedia(
         media_class=CONTAINER_TYPES_SPECIFIC_MEDIA_CLASS.get(
             search_type, MEDIA_CLASS_DIRECTORY
diff --git a/homeassistant/components/kodi/device_trigger.py b/homeassistant/components/kodi/device_trigger.py
index 85065a8bfe3..314f73a927e 100644
--- a/homeassistant/components/kodi/device_trigger.py
+++ b/homeassistant/components/kodi/device_trigger.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     CONF_PLATFORM,
     CONF_TYPE,
 )
-from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
+from homeassistant.core import CALLBACK_TYPE, Event, HassJob, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry
 from homeassistant.helpers.typing import ConfigType
 
@@ -63,11 +63,13 @@ async def async_get_triggers(hass: HomeAssistant, device_id: str) -> List[dict]:
 def _attach_trigger(
     hass: HomeAssistant, config: ConfigType, action: AutomationActionType, event_type
 ):
+    job = HassJob(action)
+
     @callback
     def _handle_event(event: Event):
         if event.data[ATTR_ENTITY_ID] == config[CONF_ENTITY_ID]:
-            hass.async_run_job(
-                action,
+            hass.async_run_hass_job(
+                job,
                 {"trigger": {**config, "description": event_type}},
                 event.context,
             )
diff --git a/homeassistant/components/kodi/manifest.json b/homeassistant/components/kodi/manifest.json
index a9df9718f8c..24d3393d7c3 100644
--- a/homeassistant/components/kodi/manifest.json
+++ b/homeassistant/components/kodi/manifest.json
@@ -2,11 +2,15 @@
   "domain": "kodi",
   "name": "Kodi",
   "documentation": "https://www.home-assistant.io/integrations/kodi",
-  "requirements": ["pykodi==0.2.0"],
+  "requirements": [
+    "pykodi==0.2.1"
+  ],
   "codeowners": [
     "@OnFreund",
     "@cgtobi"
   ],
-  "zeroconf": ["_xbmc-jsonrpc-h._tcp.local."],
+  "zeroconf": [
+    "_xbmc-jsonrpc-h._tcp.local."
+  ],
   "config_flow": true
-}
+}
\ No newline at end of file
diff --git a/homeassistant/components/kodi/media_player.py b/homeassistant/components/kodi/media_player.py
index a1b9987b5c9..68809559cbf 100644
--- a/homeassistant/components/kodi/media_player.py
+++ b/homeassistant/components/kodi/media_player.py
@@ -677,17 +677,10 @@ class KodiEntity(MediaPlayerEntity):
         elif media_type_lower in [
             MEDIA_TYPE_ARTIST,
             MEDIA_TYPE_ALBUM,
+            MEDIA_TYPE_TRACK,
         ]:
             await self.async_clear_playlist()
-            params = {"playlistid": 0, "item": {f"{media_type}id": int(media_id)}}
-            # pylint: disable=protected-access
-            await self._kodi._server.Playlist.Add(params)
-            await self._kodi.play_playlist(0)
-        elif media_type_lower == MEDIA_TYPE_TRACK:
-            await self._kodi.clear_playlist()
-            params = {"playlistid": 0, "item": {"songid": int(media_id)}}
-            # pylint: disable=protected-access
-            await self._kodi._server.Playlist.Add(params)
+            await self.async_add_to_playlist(media_type_lower, media_id)
             await self._kodi.play_playlist(0)
         elif media_type_lower in [
             MEDIA_TYPE_MOVIE,
@@ -695,8 +688,7 @@ class KodiEntity(MediaPlayerEntity):
             MEDIA_TYPE_SEASON,
             MEDIA_TYPE_TVSHOW,
         ]:
-            # pylint: disable=protected-access
-            await self._kodi._play_item(
+            await self._kodi.play_item(
                 {MAP_KODI_MEDIA_TYPES[media_type_lower]: int(media_id)}
             )
         else:
@@ -751,6 +743,15 @@ class KodiEntity(MediaPlayerEntity):
         """Clear default playlist (i.e. playlistid=0)."""
         await self._kodi.clear_playlist()
 
+    async def async_add_to_playlist(self, media_type, media_id):
+        """Add media item to default playlist (i.e. playlistid=0)."""
+        if media_type == MEDIA_TYPE_ARTIST:
+            await self._kodi.add_artist_to_playlist(int(media_id))
+        elif media_type == MEDIA_TYPE_ALBUM:
+            await self._kodi.add_album_to_playlist(int(media_id))
+        elif media_type == MEDIA_TYPE_TRACK:
+            await self._kodi.add_song_to_playlist(int(media_id))
+
     async def async_add_media_to_playlist(
         self, media_type, media_id=None, media_name="ALL", artist_name=""
     ):
@@ -766,7 +767,7 @@ class KodiEntity(MediaPlayerEntity):
             if media_id is None:
                 media_id = await self._async_find_song(media_name, artist_name)
             if media_id:
-                self._kodi.add_song_to_playlist(int(media_id))
+                await self._kodi.add_song_to_playlist(int(media_id))
 
         elif media_type == "ALBUM":
             if media_id is None:
@@ -776,7 +777,7 @@ class KodiEntity(MediaPlayerEntity):
 
                 media_id = await self._async_find_album(media_name, artist_name)
             if media_id:
-                self._kodi.add_album_to_playlist(int(media_id))
+                await self._kodi.add_album_to_playlist(int(media_id))
 
         else:
             raise RuntimeError("Unrecognized media type.")
diff --git a/homeassistant/components/kodi/strings.json b/homeassistant/components/kodi/strings.json
index 56a637e54ce..cf2f265f577 100644
--- a/homeassistant/components/kodi/strings.json
+++ b/homeassistant/components/kodi/strings.json
@@ -7,7 +7,7 @@
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]",
-          "ssl": "Connect over SSL"
+          "ssl": "[%key:common::config_flow::data::ssl%]"
         }
       },
       "discovery_confirm": {
diff --git a/homeassistant/components/kodi/translations/ca.json b/homeassistant/components/kodi/translations/ca.json
index d9993e01f54..09b16682083 100644
--- a/homeassistant/components/kodi/translations/ca.json
+++ b/homeassistant/components/kodi/translations/ca.json
@@ -36,7 +36,7 @@
                 "data": {
                     "host": "Amfitri\u00f3",
                     "port": "Port",
-                    "ssl": "Connexi\u00f3 mitjan\u00e7ant SSL"
+                    "ssl": "Utilitza un certificat SSL"
                 },
                 "description": "Informaci\u00f3 de connexi\u00f3 de Kodi. Assegura't d'activar \"Permet el control de Kodi via HTTP\" a Sistema/Configuraci\u00f3/Xarxa/Serveis."
             },
diff --git a/homeassistant/components/kodi/translations/cs.json b/homeassistant/components/kodi/translations/cs.json
index 3857095fce2..5075f9e1335 100644
--- a/homeassistant/components/kodi/translations/cs.json
+++ b/homeassistant/components/kodi/translations/cs.json
@@ -1,16 +1,54 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "flow_title": "Kodi: {name}",
         "step": {
+            "credentials": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "description": "Zadejte sv\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no a heslo pro Kodi. To lze nal\u00e9zt v Syst\u00e9m/Nastaven\u00ed/S\u00ed\u0165/Slu\u017eby."
+            },
+            "discovery_confirm": {
+                "description": "Chcete p\u0159idat Kodi (\"{name}\") do Home Assistant?",
+                "title": "Objeven\u00e9 Kodi"
+            },
             "host": {
                 "data": {
+                    "host": "Hostitel",
+                    "port": "Port",
                     "ssl": "P\u0159ipojen\u00ed p\u0159es SSL"
                 }
             },
             "user": {
                 "data": {
-                    "ssl": "P\u0159ipojen\u00ed p\u0159es SSL"
+                    "host": "Hostitel",
+                    "port": "Port",
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t"
+                }
+            },
+            "ws_port": {
+                "data": {
+                    "ws_port": "Port"
                 }
             }
         }
+    },
+    "device_automation": {
+        "trigger_type": {
+            "turn_off": "{entity_name} bylo po\u017e\u00e1d\u00e1no o vypnut\u00ed",
+            "turn_on": "{entity_name} bylo po\u017e\u00e1d\u00e1no o zapnut\u00ed"
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/kodi/translations/de.json b/homeassistant/components/kodi/translations/de.json
index ac98f2016b4..d8db0e86137 100644
--- a/homeassistant/components/kodi/translations/de.json
+++ b/homeassistant/components/kodi/translations/de.json
@@ -6,12 +6,17 @@
                 "data": {
                     "password": "Passwort",
                     "username": "Benutzername"
-                }
+                },
+                "description": "Bitte gib deinen Kodi-Benutzernamen und Passwort ein. Diese findest du unter System/Einstellungen/Netzwerk/Dienste."
+            },
+            "discovery_confirm": {
+                "description": "M\u00f6chtest du Kodi (` {name} `) zu Home Assistant hinzuf\u00fcgen?"
             },
             "host": {
                 "data": {
                     "host": "Host",
-                    "port": "Port"
+                    "port": "Port",
+                    "ssl": "\u00dcber SSL verbinden"
                 }
             },
             "user": {
diff --git a/homeassistant/components/kodi/translations/el.json b/homeassistant/components/kodi/translations/el.json
new file mode 100644
index 00000000000..93b077fbe1d
--- /dev/null
+++ b/homeassistant/components/kodi/translations/el.json
@@ -0,0 +1,39 @@
+{
+    "config": {
+        "flow_title": "Kodi: {\u03cc\u03bd\u03bf\u03bc\u03b1}",
+        "step": {
+            "credentials": {
+                "description": "\u0395\u03b9\u03c3\u03b1\u03b3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7 \u03ba\u03b1\u03b9 \u03c4\u03bf\u03bd \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 \u03c4\u03bf\u03c5 Kodi. \u0391\u03c5\u03c4\u03ac \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03b2\u03c1\u03b5\u03af\u03c4\u03b5 \u03c3\u03c4\u03bf \u03a3\u03cd\u03c3\u03c4\u03b7\u03bc\u03b1 / \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 / \u0394\u03af\u03ba\u03c4\u03c5\u03bf / \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b5\u03c2."
+            },
+            "discovery_confirm": {
+                "description": "\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf Kodi ('{name}') \u03c3\u03c4\u03bf Home Assistant;",
+                "title": "\u0391\u03bd\u03b1\u03ba\u03b1\u03bb\u03cd\u03c6\u03b8\u03b7\u03ba\u03b5 Kodi"
+            },
+            "host": {
+                "data": {
+                    "port": "\u0398\u03cd\u03c1\u03b1",
+                    "ssl": "\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03bc\u03ad\u03c3\u03c9 SSL"
+                },
+                "description": "\u03a0\u03bb\u03b7\u03c1\u03bf\u03c6\u03bf\u03c1\u03af\u03b5\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2 Kodi. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03bf\u03cd\u03bc\u03b5 \u03b2\u03b5\u03b2\u03b1\u03b9\u03c9\u03b8\u03b5\u03af\u03c4\u03b5 \u03cc\u03c4\u03b9 \u03ad\u03c7\u03b5\u03c4\u03b5 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03b9 \u03c4\u03bf \"\u039d\u03b1 \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9 \u03bf \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 \u03c4\u03bf\u03c5 Kodi \u03bc\u03ad\u03c3\u03c9 HTTP\" \u03c3\u03c4\u03bf \u03a3\u03cd\u03c3\u03c4\u03b7\u03bc\u03b1/\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2/\u0394\u03af\u03ba\u03c4\u03c5\u03bf/\u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b5\u03c2."
+            },
+            "user": {
+                "data": {
+                    "ssl": "\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03bc\u03ad\u03c3\u03c9 SSL"
+                },
+                "description": "\u03a0\u03bb\u03b7\u03c1\u03bf\u03c6\u03bf\u03c1\u03af\u03b5\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2 Kodi. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03bf\u03cd\u03bc\u03b5 \u03b2\u03b5\u03b2\u03b1\u03b9\u03c9\u03b8\u03b5\u03af\u03c4\u03b5 \u03cc\u03c4\u03b9 \u03ad\u03c7\u03b5\u03c4\u03b5 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03b9 \u03c4\u03bf \"\u039d\u03b1 \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9 \u03bf \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 \u03c4\u03bf\u03c5 Kodi \u03bc\u03ad\u03c3\u03c9 HTTP\" \u03c3\u03c4\u03bf \u03a3\u03cd\u03c3\u03c4\u03b7\u03bc\u03b1/\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2/\u0394\u03af\u03ba\u03c4\u03c5\u03bf/\u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b5\u03c2."
+            },
+            "ws_port": {
+                "data": {
+                    "ws_port": "\u0398\u03cd\u03c1\u03b1"
+                },
+                "description": "\u0397 \u03b8\u03cd\u03c1\u03b1 WebSocket (\u03bc\u03b5\u03c1\u03b9\u03ba\u03ad\u03c2 \u03c6\u03bf\u03c1\u03ad\u03c2 \u03bf\u03bd\u03bf\u03bc\u03ac\u03b6\u03b5\u03c4\u03b1\u03b9 \u03b8\u03cd\u03c1\u03b1 TCP \u03c3\u03c4\u03bf Kodi). \u0393\u03b9\u03b1 \u03bd\u03b1 \u03c3\u03c5\u03bd\u03b4\u03b5\u03b8\u03b5\u03af\u03c4\u03b5 \u03bc\u03ad\u03c3\u03c9 \u03c4\u03bf\u03c5 WebSocket, \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \"\u039d\u03b1 \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03bf\u03bd\u03c4\u03b1\u03b9 \u03c0\u03c1\u03bf\u03b3\u03c1\u03ac\u03bc\u03bc\u03b1\u03c4\u03b1 ... \u03b3\u03b9\u03b1 \u03c4\u03bf\u03bd \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03bf\u03c5 Kodi\" \u03c3\u03c4\u03bf \u03a3\u03cd\u03c3\u03c4\u03b7\u03bc\u03b1 / \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 / \u0394\u03af\u03ba\u03c4\u03c5\u03bf / \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b5\u03c2. \u0395\u03ac\u03bd \u03c4\u03bf WebSocket \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf, \u03b1\u03c6\u03b1\u03b9\u03c1\u03ad\u03c3\u03c4\u03b5 \u03c4\u03b7 \u03b8\u03cd\u03c1\u03b1 \u03ba\u03b1\u03b9 \u03b1\u03c6\u03ae\u03c3\u03c4\u03b5 \u03ba\u03b5\u03bd\u03cc."
+            }
+        }
+    },
+    "device_automation": {
+        "trigger_type": {
+            "turn_off": "\u0396\u03b7\u03c4\u03ae\u03b8\u03b7\u03ba\u03b5 \u03b1\u03c0\u03cc \u03c4\u03bf {entity_name} \u03bd\u03b1 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af",
+            "turn_on": "\u0396\u03b7\u03c4\u03ae\u03b8\u03b7\u03ba\u03b5 \u03b1\u03c0\u03cc \u03c4\u03bf {entity_name} \u03bd\u03b1 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/kodi/translations/en.json b/homeassistant/components/kodi/translations/en.json
index 4a9a48ea9ca..0f703057dcf 100644
--- a/homeassistant/components/kodi/translations/en.json
+++ b/homeassistant/components/kodi/translations/en.json
@@ -36,7 +36,7 @@
                 "data": {
                     "host": "Host",
                     "port": "Port",
-                    "ssl": "Connect over SSL"
+                    "ssl": "Uses an SSL certificate"
                 },
                 "description": "Kodi connection information. Please make sure to enable \"Allow control of Kodi via HTTP\" in System/Settings/Network/Services."
             },
diff --git a/homeassistant/components/kodi/translations/es.json b/homeassistant/components/kodi/translations/es.json
index aabc87cb41d..79324509e3b 100644
--- a/homeassistant/components/kodi/translations/es.json
+++ b/homeassistant/components/kodi/translations/es.json
@@ -36,7 +36,7 @@
                 "data": {
                     "host": "Host",
                     "port": "Puerto",
-                    "ssl": "Conectar a trav\u00e9s de SSL"
+                    "ssl": "Utiliza un certificado SSL"
                 },
                 "description": "Informaci\u00f3n de la conexi\u00f3n de Kodi. Por favor, aseg\u00farese de habilitar \"Permitir el control de Kodi v\u00eda HTTP\" en Sistema/Configuraci\u00f3n/Red/Servicios."
             },
diff --git a/homeassistant/components/kodi/translations/et.json b/homeassistant/components/kodi/translations/et.json
index 9d7c8e2a028..691cc085dd6 100644
--- a/homeassistant/components/kodi/translations/et.json
+++ b/homeassistant/components/kodi/translations/et.json
@@ -1,4 +1,46 @@
 {
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "credentials": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            },
+            "discovery_confirm": {
+                "description": "Kas soovid lisada Kodi {name} Home Assistanti?"
+            },
+            "host": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                }
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": "",
+                    "ssl": "Kasutab SSL serti"
+                }
+            },
+            "ws_port": {
+                "data": {
+                    "ws_port": ""
+                }
+            }
+        }
+    },
     "device_automation": {
         "trigger_type": {
             "turn_off": "{entity_name} paluti v\u00e4lja l\u00fclitada",
diff --git a/homeassistant/components/kodi/translations/it.json b/homeassistant/components/kodi/translations/it.json
index a48d8ca9bb0..565aaa9d39a 100644
--- a/homeassistant/components/kodi/translations/it.json
+++ b/homeassistant/components/kodi/translations/it.json
@@ -36,7 +36,7 @@
                 "data": {
                     "host": "Host",
                     "port": "Porta",
-                    "ssl": "Connettiti tramite SSL"
+                    "ssl": "Utilizza un certificato SSL"
                 },
                 "description": "Informazioni sulla connessione Kodi. Assicurati di abilitare \"Consenti il controllo di Kodi tramite HTTP\" in Sistema/Impostazioni/Rete/Servizi."
             },
diff --git a/homeassistant/components/kodi/translations/lb.json b/homeassistant/components/kodi/translations/lb.json
index adbae8fafe0..0fde1e6ffdf 100644
--- a/homeassistant/components/kodi/translations/lb.json
+++ b/homeassistant/components/kodi/translations/lb.json
@@ -43,7 +43,8 @@
             "ws_port": {
                 "data": {
                     "ws_port": "Port"
-                }
+                },
+                "description": "De Websocket Port (heiansdo TCP port am Kodi genannt). Fir sech k\u00ebnnen iwwer Websocket ze verbannen muss du \"Allow programs ... to control Kodi\" an de System/Settings/Network/Services aktiv\u00e9ieren. Falls Websocket net aktiv\u00e9iert ass, l\u00e4sch de Port a loss eidel."
             }
         }
     },
diff --git a/homeassistant/components/kodi/translations/nl.json b/homeassistant/components/kodi/translations/nl.json
index 235d5a50be6..c47fd73eea8 100644
--- a/homeassistant/components/kodi/translations/nl.json
+++ b/homeassistant/components/kodi/translations/nl.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Apparaat is al geconfigureerd",
             "unknown": "Onverwachte fout"
         },
         "step": {
@@ -9,12 +10,22 @@
                     "username": "Gebruikersnaam"
                 }
             },
+            "host": {
+                "data": {
+                    "port": "Poort"
+                }
+            },
             "user": {
                 "data": {
                     "host": "Host",
                     "port": "Poort",
                     "ssl": "Maak verbinding via SSL"
                 }
+            },
+            "ws_port": {
+                "data": {
+                    "ws_port": "Poort"
+                }
             }
         }
     }
diff --git a/homeassistant/components/kodi/translations/no.json b/homeassistant/components/kodi/translations/no.json
index 1c8bc3d6a53..c29f47e0957 100644
--- a/homeassistant/components/kodi/translations/no.json
+++ b/homeassistant/components/kodi/translations/no.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "already_configured": "Enheten er allerede konfigurert",
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
-        "flow_title": "Kodi: {name}",
+        "flow_title": "",
         "step": {
             "credentials": {
                 "data": {
@@ -36,7 +36,7 @@
                 "data": {
                     "host": "Vert",
                     "port": "Port",
-                    "ssl": "Koble til via SSL"
+                    "ssl": "Bruker et SSL-sertifikat"
                 },
                 "description": "Kodi-tilkoblingsinformasjon. Vennligst s\u00f8rg for \u00e5 aktivere \"Tillat kontroll av Kodi via HTTP\" i System / Innstillinger / Nettverk / Tjenester."
             },
diff --git a/homeassistant/components/kodi/translations/pl.json b/homeassistant/components/kodi/translations/pl.json
index 28dc89056f3..9ea8c664510 100644
--- a/homeassistant/components/kodi/translations/pl.json
+++ b/homeassistant/components/kodi/translations/pl.json
@@ -11,30 +11,47 @@
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
+        "flow_title": "Kodi: {name}",
         "step": {
             "credentials": {
                 "data": {
                     "password": "Has\u0142o",
                     "username": "Nazwa u\u017cytkownika"
-                }
+                },
+                "description": "Wprowad\u017a nazw\u0119 u\u017cytkownika i has\u0142o Kodi. Mo\u017cna je znale\u017a\u0107 w System/Ustawienia/Sie\u0107/Us\u0142ugi."
+            },
+            "discovery_confirm": {
+                "description": "Czy chcesz doda\u0107 Kodi (\"{name}\") do Home Assistant?",
+                "title": "Wykryte urz\u0105dzenia Kodi"
             },
             "host": {
                 "data": {
                     "host": "Nazwa hosta lub adres IP",
-                    "port": "Port"
-                }
+                    "port": "Port",
+                    "ssl": "Po\u0142\u0105cz przez SSL"
+                },
+                "description": "Informacje o po\u0142\u0105czeniu Kodi. Upewnij si\u0119, \u017ce w\u0142\u0105czy\u0142e\u015b \"Zezwalaj na zdalne sterowanie przez HTTP\" w System/Ustawienia/Sieci/Us\u0142ugi."
             },
             "user": {
                 "data": {
                     "host": "Nazwa hosta lub adres IP",
-                    "port": "Port"
-                }
+                    "port": "Port",
+                    "ssl": "Certyfikat SSL"
+                },
+                "description": "Informacje o po\u0142\u0105czeniu Kodi. Upewnij si\u0119, \u017ce w\u0142\u0105czy\u0142e\u015b \"Zezwalaj na zdalne sterowanie przez HTTP\" w System/Ustawienia/Sieci/Us\u0142ugi."
             },
             "ws_port": {
                 "data": {
                     "ws_port": "Port"
-                }
+                },
+                "description": "Port WebSocket (czasami nazywany portem TCP w Kodi). Aby po\u0142\u0105czy\u0107 si\u0119 przez WebSocket, musisz w\u0142\u0105czy\u0107 opcj\u0119 \u201eZezwalaj ... programom na kontrolowanie Kodi\u201d w System / Ustawienia / Sie\u0107 / Us\u0142ugi. Je\u015bli us\u0142uga WebSocket nie jest w\u0142\u0105czona, usu\u0144 port i pozostaw pusty."
             }
         }
+    },
+    "device_automation": {
+        "trigger_type": {
+            "turn_off": "{entity_name} zostanie poproszony o wy\u0142\u0105czenie",
+            "turn_on": "{entity_name} zostanie poproszony o w\u0142\u0105czenie"
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/kodi/translations/ru.json b/homeassistant/components/kodi/translations/ru.json
index 8702c016871..3e6a898bf43 100644
--- a/homeassistant/components/kodi/translations/ru.json
+++ b/homeassistant/components/kodi/translations/ru.json
@@ -36,7 +36,7 @@
                 "data": {
                     "host": "\u0425\u043e\u0441\u0442",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u043e SSL"
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 },
                 "description": "\u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0432\u043a\u043b\u044e\u0447\u0435\u043d \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 \"\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u0443\u0434\u0430\u043b\u0451\u043d\u043d\u043e\u0435 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e HTTP\" \u0432 \u0440\u0430\u0437\u0434\u0435\u043b\u0435 \"\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\" - \"\u0421\u043b\u0443\u0436\u0431\u044b\" - \"\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435\"."
             },
diff --git a/homeassistant/components/kodi/translations/sv.json b/homeassistant/components/kodi/translations/sv.json
new file mode 100644
index 00000000000..bb3424b4d45
--- /dev/null
+++ b/homeassistant/components/kodi/translations/sv.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "host": {
+                "data": {
+                    "ssl": "Anslut med SSL"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/kodi/translations/zh-Hans.json b/homeassistant/components/kodi/translations/zh-Hans.json
new file mode 100644
index 00000000000..6fe91b6e995
--- /dev/null
+++ b/homeassistant/components/kodi/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "credentials": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/kodi/translations/zh-Hant.json b/homeassistant/components/kodi/translations/zh-Hant.json
index b00f6245366..c36fe96740b 100644
--- a/homeassistant/components/kodi/translations/zh-Hant.json
+++ b/homeassistant/components/kodi/translations/zh-Hant.json
@@ -36,7 +36,7 @@
                 "data": {
                     "host": "\u4e3b\u6a5f\u7aef",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "\u901a\u904e SSL \u9023\u7dda"
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49"
                 },
                 "description": "Kodi \u9023\u7dda\u8cc7\u8a0a\uff0c\u8acb\u78ba\u5b9a\u5df2\u65bc\u300c\u7cfb\u7d71/\u8a2d\u5b9a/\u7db2\u8def/\u670d\u52d9\u300d\u4e2d\u958b\u555f \"\u5141\u8a31\u900f\u904e HTTP \u63a7\u5236 Kodi\"\u3002"
             },
diff --git a/homeassistant/components/konnected/binary_sensor.py b/homeassistant/components/konnected/binary_sensor.py
index 20494eee424..dc7a15758d9 100644
--- a/homeassistant/components/konnected/binary_sensor.py
+++ b/homeassistant/components/konnected/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for wired binary sensors attached to a Konnected device."""
-import logging
-
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -15,8 +13,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .const import DOMAIN as KONNECTED_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up binary sensors attached to a Konnected device from a config entry."""
diff --git a/homeassistant/components/konnected/sensor.py b/homeassistant/components/konnected/sensor.py
index 12c786c5aef..dece8d06c87 100644
--- a/homeassistant/components/konnected/sensor.py
+++ b/homeassistant/components/konnected/sensor.py
@@ -1,6 +1,4 @@
 """Support for DHT and DS18B20 sensors attached to a Konnected device."""
-import logging
-
 from homeassistant.const import (
     CONF_DEVICES,
     CONF_NAME,
@@ -18,8 +16,6 @@ from homeassistant.helpers.entity import Entity
 
 from .const import DOMAIN as KONNECTED_DOMAIN, SIGNAL_DS18B20_NEW
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSOR_TYPES = {
     DEVICE_CLASS_TEMPERATURE: ["Temperature", TEMP_CELSIUS],
     DEVICE_CLASS_HUMIDITY: ["Humidity", PERCENTAGE],
diff --git a/homeassistant/components/konnected/strings.json b/homeassistant/components/konnected/strings.json
index 281de6032ee..4fd62dee8e7 100644
--- a/homeassistant/components/konnected/strings.json
+++ b/homeassistant/components/konnected/strings.json
@@ -18,12 +18,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Unable to connect to a Konnected Panel at {host}:{port}"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "unknown": "Unknown error occurred",
-      "already_configured": "Device is already configured",
-      "already_in_progress": "Config flow for device is already in progress.",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "not_konn_panel": "Not a recognized Konnected.io device"
     }
   },
@@ -62,7 +62,7 @@
         "description": "{zone} options",
         "data": {
           "type": "Binary Sensor Type",
-          "name": "Name (optional)",
+          "name": "[%key:common::config_flow::data::name%] (optional)",
           "inverse": "Invert the open/close state"
         }
       },
@@ -71,7 +71,7 @@
         "description": "{zone} options",
         "data": {
           "type": "Sensor Type",
-          "name": "Name (optional)",
+          "name": "[%key:common::config_flow::data::name%] (optional)",
           "poll_interval": "Poll Interval (minutes) (optional)"
         }
       },
@@ -79,7 +79,7 @@
         "title": "Configure Switchable Output",
         "description": "{zone} options: state {state}",
         "data": {
-          "name": "Name (optional)",
+          "name": "[%key:common::config_flow::data::name%] (optional)",
           "activation": "Output when on",
           "momentary": "Pulse duration (ms) (optional)",
           "pause": "Pause between pulses (ms) (optional)",
diff --git a/homeassistant/components/konnected/translations/ca.json b/homeassistant/components/konnected/translations/ca.json
index 8938db2621b..878ecf32d09 100644
--- a/homeassistant/components/konnected/translations/ca.json
+++ b/homeassistant/components/konnected/translations/ca.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "El dispositiu ja est\u00e0 configurat",
-            "already_in_progress": "El flux de dades de configuraci\u00f3 pel dispositiu ja est\u00e0 en curs.",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
             "not_konn_panel": "No s'ha reconegut com a un dispositiu Konnected.io",
-            "unknown": "S'ha produ\u00eft un error desconegut"
+            "unknown": "Error inesperat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar amb el panell Konnected a {host}:{port}"
+            "cannot_connect": "Ha fallat la connexi\u00f3"
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/konnected/translations/cs.json b/homeassistant/components/konnected/translations/cs.json
index df1519035c6..774d1c70851 100644
--- a/homeassistant/components/konnected/translations/cs.json
+++ b/homeassistant/components/konnected/translations/cs.json
@@ -1,21 +1,81 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "not_konn_panel": "Nejedn\u00e1 se o rozpoznan\u00e9 Konnected.io za\u0159\u00edzen\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
         "step": {
+            "confirm": {
+                "description": "Model: {model}\nID: {id}\nHostitel: {host}\nPort: {port}\n\nChov\u00e1n\u00ed vstupu/v\u00fdstupu a panelu m\u016f\u017eete nastavit v ovl\u00e1dac\u00edm panelu alarmu Konnected.",
+                "title": "Za\u0159\u00edzen\u00ed Konnected je p\u0159ipraveno"
+            },
+            "import_confirm": {
+                "title": "Importovat za\u0159\u00edzen\u00ed Konnected"
+            },
             "user": {
                 "data": {
                     "host": "IP adresa",
                     "port": "Port"
-                }
+                },
+                "description": "Zadejte pros\u00edm informace o hostiteli va\u0161eho panelu Konnected."
             }
         }
     },
     "options": {
+        "abort": {
+            "not_konn_panel": "Nejedn\u00e1 se o rozpoznan\u00e9 Konnected.io za\u0159\u00edzen\u00ed"
+        },
         "step": {
+            "options_binary": {
+                "data": {
+                    "inverse": "Prohodit stav otev\u0159en\u00ed/zav\u0159en\u00ed",
+                    "name": "Jm\u00e9no (voliteln\u00e9)",
+                    "type": "Typ bin\u00e1rn\u00edho senzoru"
+                },
+                "description": "Mo\u017enosti {zone}",
+                "title": "Nastavte bin\u00e1rn\u00ed senzor"
+            },
+            "options_digital": {
+                "data": {
+                    "name": "Jm\u00e9no (voliteln\u00e9)",
+                    "poll_interval": "Interval dotazov\u00e1n\u00ed (v sekund\u00e1ch) (voliteln\u00e9)",
+                    "type": "Typ senzoru"
+                },
+                "description": "Mo\u017enosti {zone}",
+                "title": "Nastavte digit\u00e1ln\u00ed senzor"
+            },
+            "options_io": {
+                "data": {
+                    "1": "Z\u00f3na 1",
+                    "2": "Z\u00f3na 2",
+                    "3": "Z\u00f3na 3",
+                    "4": "Z\u00f3na 4",
+                    "5": "Z\u00f3na 5",
+                    "6": "Z\u00f3na 6",
+                    "7": "Z\u00f3na 7"
+                }
+            },
             "options_io_ext": {
                 "data": {
+                    "10": "Z\u00f3na 10",
+                    "11": "Z\u00f3na 11",
+                    "12": "Z\u00f3na 12",
+                    "8": "Z\u00f3na 8",
+                    "9": "Z\u00f3na 9",
                     "alarm1": "ALARM1",
                     "alarm2_out2": "OUT2/ALARM2"
                 }
+            },
+            "options_switch": {
+                "data": {
+                    "name": "Jm\u00e9no (voliteln\u00e9)"
+                },
+                "description": "Mo\u017enosti {zone} : stav {state}"
             }
         }
     }
diff --git a/homeassistant/components/konnected/translations/en.json b/homeassistant/components/konnected/translations/en.json
index 3b9b422c903..920e1453e49 100644
--- a/homeassistant/components/konnected/translations/en.json
+++ b/homeassistant/components/konnected/translations/en.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "Device is already configured",
-            "already_in_progress": "Config flow for device is already in progress.",
+            "already_in_progress": "Configuration flow is already in progress",
             "not_konn_panel": "Not a recognized Konnected.io device",
-            "unknown": "Unknown error occurred"
+            "unknown": "Unexpected error"
         },
         "error": {
-            "cannot_connect": "Unable to connect to a Konnected Panel at {host}:{port}"
+            "cannot_connect": "Failed to connect"
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/konnected/translations/et.json b/homeassistant/components/konnected/translations/et.json
new file mode 100644
index 00000000000..21a01329fce
--- /dev/null
+++ b/homeassistant/components/konnected/translations/et.json
@@ -0,0 +1,55 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "confirm": {
+                "description": ""
+            },
+            "user": {
+                "data": {
+                    "host": "IP aadress",
+                    "port": ""
+                },
+                "description": "Palun sisesta oma Konnected Paneli hostiinfo."
+            }
+        }
+    },
+    "options": {
+        "error": {
+            "bad_host": "Sobimatu API hosti alistamise URL"
+        },
+        "step": {
+            "options_binary": {
+                "data": {
+                    "name": "Nimi (valikuline)"
+                }
+            },
+            "options_digital": {
+                "data": {
+                    "name": "Nimi (valikuline)"
+                }
+            },
+            "options_io": {
+                "description": "Avastati {model} kohas {host}. Vali iga allpool oleva I/O baaskonfiguratsioon \u2013 s\u00f5ltuvalt I/O-st v\u00f5ib see lubada binaarsensoreid (avatud/suletud), digitaalseid andureid (dht ja ds18b20) v\u00f5i vahetatavaid v\u00e4ljundeid. Saad konfigureerida \u00fcksikasjalikke suvandeid j\u00e4rgmistes etappides."
+            },
+            "options_misc": {
+                "data": {
+                    "api_host": "Alista API hosti URL (valikuline)",
+                    "override_api_host": "Alista Home Assistanti API hostipaneeli vaikimisi URL"
+                }
+            },
+            "options_switch": {
+                "data": {
+                    "name": "Nimi (valikuline)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/konnected/translations/it.json b/homeassistant/components/konnected/translations/it.json
index ff8b6da9e3d..35cc0f1a4c2 100644
--- a/homeassistant/components/konnected/translations/it.json
+++ b/homeassistant/components/konnected/translations/it.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "Il flusso di configurazione per il dispositivo \u00e8 gi\u00e0 in corso.",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
             "not_konn_panel": "Non \u00e8 un dispositivo Konnected.io riconosciuto",
-            "unknown": "Si \u00e8 verificato un errore sconosciuto"
+            "unknown": "Errore imprevisto"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi ad un Pannello Konnected su {host}:{port}."
+            "cannot_connect": "Impossibile connettersi"
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/konnected/translations/nl.json b/homeassistant/components/konnected/translations/nl.json
index 8e9eba0d134..43e86642727 100644
--- a/homeassistant/components/konnected/translations/nl.json
+++ b/homeassistant/components/konnected/translations/nl.json
@@ -11,6 +11,7 @@
         },
         "step": {
             "confirm": {
+                "description": "Model: {model}\nID: {id}\nHost: {host}\nPoort: {port}\n\nJe kan de IO en de paneelwerking configureren in de Konnected Alarm Panel instellingen.",
                 "title": "Konnected Apparaat Klaar"
             },
             "import_confirm": {
@@ -42,13 +43,17 @@
                     "name": "Naam (optioneel)",
                     "type": "Type binaire sensor"
                 },
+                "description": "{zone} opties",
                 "title": "Binaire sensor configureren"
             },
             "options_digital": {
                 "data": {
                     "name": "Naam (optioneel)",
+                    "poll_interval": "Poll interval (minuten) (optioneel)",
                     "type": "Type sensor"
-                }
+                },
+                "description": "{zone} opties",
+                "title": "Configureer digitale sensor"
             },
             "options_io": {
                 "data": {
@@ -58,8 +63,10 @@
                     "4": "Zone 4",
                     "5": "Zone 5",
                     "6": "Zone 6",
-                    "7": "Zone 7"
-                }
+                    "7": "Zone 7",
+                    "out": "UIT"
+                },
+                "title": "Configureer I/O"
             },
             "options_io_ext": {
                 "data": {
@@ -71,7 +78,8 @@
                     "alarm1": "ALARM1",
                     "alarm2_out2": "OUT2 / ALARM2",
                     "out1": "OUT1"
-                }
+                },
+                "title": "Configureer uitgebreide I/O"
             },
             "options_misc": {
                 "data": {
@@ -83,9 +91,13 @@
             },
             "options_switch": {
                 "data": {
+                    "momentary": "Pulsduur (ms) (optioneel)",
                     "more_states": "Aanvullende statussen voor deze zone configureren",
-                    "name": "Naam (optioneel)"
+                    "name": "Naam (optioneel)",
+                    "pause": "Pauze tussen de pulsen (ms) (optioneel)",
+                    "repeat": "Aantal herhalingen (-1=oneindig) (optioneel)"
                 },
+                "description": "{zone} opties: status {state}",
                 "title": "Schakelbare uitgang configureren"
             }
         }
diff --git a/homeassistant/components/konnected/translations/no.json b/homeassistant/components/konnected/translations/no.json
index af39b9750a4..1a11c7c76d3 100644
--- a/homeassistant/components/konnected/translations/no.json
+++ b/homeassistant/components/konnected/translations/no.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "Enheten er allerede konfigurert",
-            "already_in_progress": "Konfigurasjonsflyt for enhet p\u00e5g\u00e5r allerede.",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
             "not_konn_panel": "Ikke en anerkjent Konnected.io-enhet",
-            "unknown": "Ukjent feil oppstod"
+            "unknown": "Uventet feil"
         },
         "error": {
-            "cannot_connect": "Kan ikke koble til et Konnected Panel p\u00e5 {host} : {port}"
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "confirm": {
@@ -21,7 +21,7 @@
             "user": {
                 "data": {
                     "host": "IP adresse",
-                    "port": ""
+                    "port": "Port"
                 },
                 "description": "Vennligst skriv inn verten informasjon for din Konnected Panel."
             }
@@ -41,7 +41,7 @@
                     "name": "Navn (valgfritt)",
                     "type": "Bin\u00e6r sensortype"
                 },
-                "description": "{zone} -alternativer",
+                "description": "{zone}-alternativer",
                 "title": "Konfigurer bin\u00e6r sensor"
             },
             "options_digital": {
@@ -50,7 +50,7 @@
                     "poll_interval": "Avstemningsintervall (minutter) (valgfritt)",
                     "type": "Sensortype"
                 },
-                "description": "{zone} -alternativer",
+                "description": "{zone}-alternativer",
                 "title": "Konfigurere Digital Sensor"
             },
             "options_io": {
diff --git a/homeassistant/components/konnected/translations/pl.json b/homeassistant/components/konnected/translations/pl.json
index 95b3a9f5d5e..a6a2a715237 100644
--- a/homeassistant/components/konnected/translations/pl.json
+++ b/homeassistant/components/konnected/translations/pl.json
@@ -2,16 +2,16 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "already_in_progress": "Konfiguracja urz\u0105dzenia jest ju\u017c w toku.",
-            "not_konn_panel": "Nie rozpoznano urz\u0105dzenia Konnected.io.",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "not_konn_panel": "Nie rozpoznano urz\u0105dzenia Konnected.io",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z panelem Konnected na {host}:{port}"
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "step": {
             "confirm": {
-                "description": "Model: {model} \nHost: {host} \nPort: {port} \n\nMo\u017cesz skonfigurowa\u0107 IO i zachowanie  panelu w ustawieniach Konnected Alarm Panel.",
+                "description": "Model: {model} \nIdentyfikator: {id}\nHost: {host} \nPort: {port} \n\nMo\u017cesz skonfigurowa\u0107 IO i zachowanie panelu w ustawieniach Konnected Alarm Panel.",
                 "title": "Urz\u0105dzenie Konnected gotowe"
             },
             "import_confirm": {
@@ -89,7 +89,8 @@
                 "data": {
                     "api_host": "Zast\u0119powanie adresu URL hosta API (opcjonalnie)",
                     "blink": "Miganie diody LED panelu podczas wysy\u0142ania zmiany stanu",
-                    "override_api_host": "Zast\u0105p domy\u015blny adres URL API Home Assistanta"
+                    "discovery": "Odpowiadaj na \u017c\u0105dania wykrywania w Twojej sieci",
+                    "override_api_host": "Zast\u0105p domy\u015blny adres URL API Home Assistant"
                 },
                 "description": "Wybierz po\u017c\u0105dane zachowanie dla swojego panelu",
                 "title": "R\u00f3\u017cne opcje"
@@ -103,7 +104,7 @@
                     "pause": "Przerwa mi\u0119dzy impulsami (ms) (opcjonalnie)",
                     "repeat": "Ilo\u015b\u0107 powt\u00f3rze\u0144 (-1=niesko\u0144czenie) (opcjonalnie)"
                 },
-                "description": "Wybierz opcje wyj\u015bcia dla {zone}",
+                "description": "Opcje {zone}: stan {state}",
                 "title": "Konfiguracja prze\u0142\u0105czalne wyj\u015bcie"
             }
         }
diff --git a/homeassistant/components/konnected/translations/ru.json b/homeassistant/components/konnected/translations/ru.json
index 433d6bad4c9..931f0802dc0 100644
--- a/homeassistant/components/konnected/translations/ru.json
+++ b/homeassistant/components/konnected/translations/ru.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
             "not_konn_panel": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e Konnected.io \u043d\u0435 \u0440\u0430\u0441\u043f\u043e\u0437\u043d\u0430\u043d\u043e.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u043f\u0430\u043d\u0435\u043b\u0438 Konnected {host}:{port}."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/konnected/translations/sv.json b/homeassistant/components/konnected/translations/sv.json
index 3b875e17738..ba135ccfdbb 100644
--- a/homeassistant/components/konnected/translations/sv.json
+++ b/homeassistant/components/konnected/translations/sv.json
@@ -14,6 +14,9 @@
                 "description": "Modell: {modell}\nV\u00e4rd: {host}\nPort: {port}\n\nDu kan konfigurera IO- och panelbeteendet i inst\u00e4llningarna f\u00f6r Konnected Alarm Panel.",
                 "title": "Konnected-enheten redo"
             },
+            "import_confirm": {
+                "title": "Importera Konnected enhet"
+            },
             "user": {
                 "data": {
                     "host": "Konnected-enhetens IP-adress",
diff --git a/homeassistant/components/konnected/translations/zh-Hant.json b/homeassistant/components/konnected/translations/zh-Hant.json
index c2c63e20c38..e4b38a6d109 100644
--- a/homeassistant/components/konnected/translations/zh-Hant.json
+++ b/homeassistant/components/konnected/translations/zh-Hant.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "\u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
             "not_konn_panel": "\u4e26\u975e\u53ef\u8b58\u5225 Konnected.io \u8a2d\u5099",
-            "unknown": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002"
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "error": {
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 Konnected \u9762\u677f\uff1a{host}:{port}"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
         },
         "step": {
             "confirm": {
@@ -38,7 +38,7 @@
             "options_binary": {
                 "data": {
                     "inverse": "\u53cd\u8f49\u958b\u555f/\u95dc\u9589\u72c0\u614b",
-                    "name": "\u540d\u7a31\uff08\u9078\u9805\uff09",
+                    "name": "\u540d\u7a31 \uff08\u9078\u9805\uff09",
                     "type": "\u4e8c\u9032\u4f4d\u611f\u61c9\u5668\u985e\u578b"
                 },
                 "description": "{zone}\u9078\u9805",
@@ -46,7 +46,7 @@
             },
             "options_digital": {
                 "data": {
-                    "name": "\u540d\u7a31\uff08\u9078\u9805\uff09",
+                    "name": "\u540d\u7a31 \uff08\u9078\u9805\uff09",
                     "poll_interval": "\u66f4\u65b0\u9593\u8ddd\uff08\u5206\u9418\uff09\uff08\u9078\u9805\uff09",
                     "type": "\u611f\u61c9\u5668\u985e\u578b"
                 },
@@ -96,7 +96,7 @@
                     "activation": "\u958b\u555f\u6642\u8f38\u51fa",
                     "momentary": "\u6301\u7e8c\u6642\u9593\uff08ms\uff09\uff08\u9078\u9805\uff09",
                     "more_states": "\u8a2d\u5b9a\u6b64\u5340\u57df\u7684\u9644\u52a0\u72c0\u614b",
-                    "name": "\u540d\u7a31\uff08\u9078\u9805\uff09",
+                    "name": "\u540d\u7a31 \uff08\u9078\u9805\uff09",
                     "pause": "\u66ab\u505c\u9593\u8ddd\uff08ms\uff09\uff08\u9078\u9805\uff09",
                     "repeat": "\u91cd\u8907\u6642\u9593\uff08-1=\u7121\u9650\uff09\uff08\u9078\u9805\uff09"
                 },
diff --git a/homeassistant/components/kwb/sensor.py b/homeassistant/components/kwb/sensor.py
index b7872ca1ab4..bd0430f9786 100644
--- a/homeassistant/components/kwb/sensor.py
+++ b/homeassistant/components/kwb/sensor.py
@@ -1,6 +1,4 @@
 """Support for KWB Easyfire."""
-import logging
-
 from pykwb import kwb
 import voluptuous as vol
 
@@ -15,8 +13,6 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_RAW = False
 DEFAULT_NAME = "KWB"
 
diff --git a/homeassistant/components/lcn/cover.py b/homeassistant/components/lcn/cover.py
index a4fa0a19b76..512a7978c8c 100644
--- a/homeassistant/components/lcn/cover.py
+++ b/homeassistant/components/lcn/cover.py
@@ -89,7 +89,7 @@ class LcnOutputsCover(LcnDevice, CoverEntity):
         self._is_opening = False
         self._is_closing = True
         state = pypck.lcn_defs.MotorStateModifier.DOWN
-        self.address_connection.control_motors_outputs(state)
+        self.address_connection.control_motors_outputs(state, self.reverse_time)
         self.async_write_ha_state()
 
     async def async_open_cover(self, **kwargs):
@@ -106,7 +106,7 @@ class LcnOutputsCover(LcnDevice, CoverEntity):
         self._is_closing = False
         self._is_opening = False
         state = pypck.lcn_defs.MotorStateModifier.STOP
-        self.address_connection.control_motors_outputs(state, self.reverse_time)
+        self.address_connection.control_motors_outputs(state)
         self.async_write_ha_state()
 
     def input_received(self, input_obj):
diff --git a/homeassistant/components/lcn/services.py b/homeassistant/components/lcn/services.py
index 1a5d4475b0e..baa318f891f 100644
--- a/homeassistant/components/lcn/services.py
+++ b/homeassistant/components/lcn/services.py
@@ -187,9 +187,7 @@ class VarAbs(LcnServiceCall):
             vol.Required(CONF_VARIABLE): vol.All(
                 vol.Upper, vol.In(VARIABLES + SETPOINTS)
             ),
-            vol.Optional(CONF_VALUE, default=0): vol.All(
-                vol.Coerce(int), vol.Range(min=0)
-            ),
+            vol.Optional(CONF_VALUE, default=0): cv.positive_int,
             vol.Optional(CONF_UNIT_OF_MEASUREMENT, default="native"): vol.All(
                 vol.Upper, vol.In(VAR_UNITS)
             ),
@@ -281,7 +279,7 @@ class SendKeys(LcnServiceCall):
             vol.Optional(CONF_STATE, default="hit"): vol.All(
                 vol.Upper, vol.In(SENDKEYCOMMANDS)
             ),
-            vol.Optional(CONF_TIME, default=0): vol.All(int, vol.Range(min=0)),
+            vol.Optional(CONF_TIME, default=0): cv.positive_int,
             vol.Optional(CONF_TIME_UNIT, default=TIME_SECONDS): vol.All(
                 vol.Upper, vol.In(TIME_UNITS)
             ),
@@ -324,7 +322,7 @@ class LockKeys(LcnServiceCall):
                 vol.Upper, cv.matches_regex(r"^[A-D]$")
             ),
             vol.Required(CONF_STATE): is_key_lock_states_string,
-            vol.Optional(CONF_TIME, default=0): vol.All(int, vol.Range(min=0)),
+            vol.Optional(CONF_TIME, default=0): cv.positive_int,
             vol.Optional(CONF_TIME_UNIT, default=TIME_SECONDS): vol.All(
                 vol.Upper, vol.In(TIME_UNITS)
             ),
diff --git a/homeassistant/components/lg_netcast/media_player.py b/homeassistant/components/lg_netcast/media_player.py
index 5a2f289ff32..f3e7e44fe5a 100644
--- a/homeassistant/components/lg_netcast/media_player.py
+++ b/homeassistant/components/lg_netcast/media_player.py
@@ -1,6 +1,5 @@
 """Support for LG TV running on NetCast 3 or 4."""
 from datetime import datetime, timedelta
-import logging
 
 from pylgnetcast import LgNetCastClient, LgNetCastError
 from requests import RequestException
@@ -31,8 +30,6 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.script import Script
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "LG TV Remote"
 
 CONF_ON_ACTION = "turn_on_action"
@@ -211,7 +208,7 @@ class LgTVDevice(MediaPlayerEntity):
     def turn_on(self):
         """Turn on the media player."""
         if self._on_action_script:
-            self._on_action_script.run()
+            self._on_action_script.run(context=self._context)
 
     def volume_up(self):
         """Volume up the media player."""
diff --git a/homeassistant/components/lg_soundbar/media_player.py b/homeassistant/components/lg_soundbar/media_player.py
index 448b4d3bb97..9bc0ba08e25 100644
--- a/homeassistant/components/lg_soundbar/media_player.py
+++ b/homeassistant/components/lg_soundbar/media_player.py
@@ -1,6 +1,4 @@
 """Support for LG soundbars."""
-import logging
-
 import temescal
 
 from homeassistant.components.media_player import MediaPlayerEntity
@@ -12,8 +10,6 @@ from homeassistant.components.media_player.const import (
 )
 from homeassistant.const import STATE_ON
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_LG = (
     SUPPORT_VOLUME_SET
     | SUPPORT_VOLUME_MUTE
diff --git a/homeassistant/components/life360/__init__.py b/homeassistant/components/life360/__init__.py
index 8338cbf7f11..75ffffc521e 100644
--- a/homeassistant/components/life360/__init__.py
+++ b/homeassistant/components/life360/__init__.py
@@ -1,6 +1,4 @@
 """Life360 integration."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -37,8 +35,6 @@ from .const import (
 )
 from .helpers import get_api
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_PREFIX = DOMAIN
 
 CONF_ACCOUNTS = "accounts"
diff --git a/homeassistant/components/life360/config_flow.py b/homeassistant/components/life360/config_flow.py
index e24bb3639b6..83ad4138de8 100644
--- a/homeassistant/components/life360/config_flow.py
+++ b/homeassistant/components/life360/config_flow.py
@@ -53,7 +53,7 @@ class Life360ConfigFlow(config_entries.ConfigFlow):
             except vol.Invalid:
                 errors[CONF_USERNAME] = "invalid_username"
             except LoginError:
-                errors["base"] = "invalid_credentials"
+                errors["base"] = "invalid_auth"
             except Life360Error as error:
                 _LOGGER.error(
                     "Unexpected error communicating with Life360 server: %s", error
@@ -94,7 +94,7 @@ class Life360ConfigFlow(config_entries.ConfigFlow):
             )
         except LoginError:
             _LOGGER.error("Invalid credentials for %s", username)
-            return self.async_abort(reason="invalid_credentials")
+            return self.async_abort(reason="invalid_auth")
         except Life360Error as error:
             _LOGGER.error(
                 "Unexpected error communicating with Life360 server: %s", error
diff --git a/homeassistant/components/life360/strings.json b/homeassistant/components/life360/strings.json
index 0e91856c8fc..4018a899f44 100644
--- a/homeassistant/components/life360/strings.json
+++ b/homeassistant/components/life360/strings.json
@@ -12,7 +12,7 @@
     },
     "error": {
       "invalid_username": "Invalid username",
-      "invalid_credentials": "Invalid credentials",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "user_already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
       "unexpected": "Unexpected error communicating with Life360 server"
     },
@@ -20,7 +20,7 @@
       "default": "To set advanced options, see [Life360 documentation]({docs_url})."
     },
     "abort": {
-      "invalid_credentials": "Invalid credentials",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "user_already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
   }
diff --git a/homeassistant/components/life360/translations/ca.json b/homeassistant/components/life360/translations/ca.json
index 0c4b760df0b..5c379e4fecf 100644
--- a/homeassistant/components/life360/translations/ca.json
+++ b/homeassistant/components/life360/translations/ca.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Credencials inv\u00e0lides",
             "user_already_configured": "[%key::common::config_flow::abort::already_configured_account%]"
         },
@@ -8,6 +9,7 @@
             "default": "Per configurar les opcions avan\u00e7ades mira la [documentaci\u00f3 de Life360]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Credencials inv\u00e0lides",
             "invalid_username": "Nom d'usuari incorrecte",
             "unexpected": "S'ha produ\u00eft un error inesperat en comunicar-se amb el servidor de Life360.",
diff --git a/homeassistant/components/life360/translations/cs.json b/homeassistant/components/life360/translations/cs.json
index dc105084202..b574685ba21 100644
--- a/homeassistant/components/life360/translations/cs.json
+++ b/homeassistant/components/life360/translations/cs.json
@@ -1,17 +1,26 @@
 {
     "config": {
         "abort": {
-            "user_already_configured": "\u00da\u010det je ji\u017e nakonfigurov\u00e1n"
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje",
+            "user_already_configured": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "create_entry": {
+            "default": "Chcete-li nastavit pokro\u010dil\u00e9 mo\u017enosti, pod\u00edvejte se do [dokumentace Life360]({docs_url})."
         },
         "error": {
-            "user_already_configured": "\u00da\u010det je ji\u017e nakonfigurov\u00e1n"
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje",
+            "invalid_username": "Neplatn\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no",
+            "user_already_configured": "\u00da\u010det je ji\u017e nastaven"
         },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "Informace o \u00fa\u010dtu Life360"
             }
         }
     }
diff --git a/homeassistant/components/life360/translations/en.json b/homeassistant/components/life360/translations/en.json
index a305dacc8c3..1d7b80db4c9 100644
--- a/homeassistant/components/life360/translations/en.json
+++ b/homeassistant/components/life360/translations/en.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid credentials",
             "user_already_configured": "Account is already configured"
         },
@@ -8,6 +9,7 @@
             "default": "To set advanced options, see [Life360 documentation]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid credentials",
             "invalid_username": "Invalid username",
             "unexpected": "Unexpected error communicating with Life360 server",
diff --git a/homeassistant/components/life360/translations/et.json b/homeassistant/components/life360/translations/et.json
new file mode 100644
index 00000000000..b621ef129d4
--- /dev/null
+++ b/homeassistant/components/life360/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "invalid_auth": "Tuvastamise viga",
+            "user_already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_username": "Vale kasutajanimi",
+            "unexpected": "Ootamatu t\u00f5rge Life360 serveriga suhtlemisel",
+            "user_already_configured": "Konto on juba seadistatud"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/life360/translations/nl.json b/homeassistant/components/life360/translations/nl.json
index fac13b7b3da..ad1ececc858 100644
--- a/homeassistant/components/life360/translations/nl.json
+++ b/homeassistant/components/life360/translations/nl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "invalid_credentials": "Ongeldige gebruikersgegevens"
+            "invalid_credentials": "Ongeldige gebruikersgegevens",
+            "user_already_configured": "Account is al geconfigureerd"
         },
         "create_entry": {
             "default": "Om geavanceerde opties in te stellen, zie [Life360 documentatie]({docs_url})."
diff --git a/homeassistant/components/life360/translations/no.json b/homeassistant/components/life360/translations/no.json
index dc1db8a9206..eb30640bf64 100644
--- a/homeassistant/components/life360/translations/no.json
+++ b/homeassistant/components/life360/translations/no.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig legitimasjon",
-            "user_already_configured": "Konto er allerede konfigurert"
+            "user_already_configured": "Kontoen er allerede konfigurert"
         },
         "create_entry": {
             "default": "For \u00e5 angi avanserte alternativer, se [Life360 dokumentasjon]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig legitimasjon",
             "invalid_username": "Ugyldig brukernavn",
             "unexpected": "Uventet feil under kommunikasjon med Life360-servern",
diff --git a/homeassistant/components/life360/translations/pl.json b/homeassistant/components/life360/translations/pl.json
index b0a5785a320..54ca11f2bd4 100644
--- a/homeassistant/components/life360/translations/pl.json
+++ b/homeassistant/components/life360/translations/pl.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_credentials": "Nieprawid\u0142owe dane uwierzytelniaj\u0105ce",
             "user_already_configured": "Konto jest ju\u017c skonfigurowane"
         },
@@ -8,6 +9,7 @@
             "default": "Aby skonfigurowa\u0107 zaawansowane ustawienia, zapoznaj si\u0119 z [dokumentacj\u0105 Life360]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_credentials": "Nieprawid\u0142owe dane uwierzytelniaj\u0105ce",
             "invalid_username": "Nieprawid\u0142owa nazwa u\u017cytkownika",
             "unexpected": "Nieoczekiwany b\u0142\u0105d komunikacji z serwerem Life360",
diff --git a/homeassistant/components/life360/translations/ru.json b/homeassistant/components/life360/translations/ru.json
index 685aee2f59c..f71fce78a85 100644
--- a/homeassistant/components/life360/translations/ru.json
+++ b/homeassistant/components/life360/translations/ru.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.",
             "user_already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
@@ -8,6 +9,7 @@
             "default": "\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0439 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438."
         },
         "error": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.",
             "invalid_username": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d.",
             "unexpected": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u0441\u0432\u044f\u0437\u0438 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c Life360.",
diff --git a/homeassistant/components/life360/translations/zh-Hans.json b/homeassistant/components/life360/translations/zh-Hans.json
index 9495323aa1c..14e6d907861 100644
--- a/homeassistant/components/life360/translations/zh-Hans.json
+++ b/homeassistant/components/life360/translations/zh-Hans.json
@@ -1,6 +1,10 @@
 {
     "config": {
+        "abort": {
+            "invalid_auth": "\u65e0\u6548\u7684\u8eab\u4efd\u9a8c\u8bc1"
+        },
         "error": {
+            "invalid_auth": "\u65e0\u6548\u7684\u8eab\u4efd\u9a8c\u8bc1",
             "invalid_credentials": "\u65e0\u6548\u7684\u8eab\u4efd\u8ba4\u8bc1",
             "invalid_username": "\u65e0\u6548\u7684\u7528\u6237\u540d"
         },
diff --git a/homeassistant/components/life360/translations/zh-Hant.json b/homeassistant/components/life360/translations/zh-Hant.json
index 025ee202696..886710f4788 100644
--- a/homeassistant/components/life360/translations/zh-Hant.json
+++ b/homeassistant/components/life360/translations/zh-Hant.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u6191\u8b49\u7121\u6548",
             "user_already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
@@ -8,6 +9,7 @@
             "default": "\u6b32\u8a2d\u5b9a\u9032\u968e\u9078\u9805\uff0c\u8acb\u53c3\u95b1 [Life360 \u6587\u4ef6]({docs_url})\u3002"
         },
         "error": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u6191\u8b49\u7121\u6548",
             "invalid_username": "\u4f7f\u7528\u8005\u540d\u7a31\u7121\u6548",
             "unexpected": "\u8207 Life360 \u4f3a\u670d\u5668\u901a\u8a0a\u767c\u751f\u672a\u77e5\u932f\u8aa4",
diff --git a/homeassistant/components/lifx/light.py b/homeassistant/components/lifx/light.py
index a6dbdb557dc..444bfe31480 100644
--- a/homeassistant/components/lifx/light.py
+++ b/homeassistant/components/lifx/light.py
@@ -127,9 +127,7 @@ LIFX_EFFECT_PULSE_SCHEMA = cv.make_entity_service_schema(
         vol.Exclusive(ATTR_COLOR_TEMP, COLOR_GROUP): vol.All(
             vol.Coerce(int), vol.Range(min=1)
         ),
-        vol.Exclusive(ATTR_KELVIN, COLOR_GROUP): vol.All(
-            vol.Coerce(int), vol.Range(min=0)
-        ),
+        vol.Exclusive(ATTR_KELVIN, COLOR_GROUP): cv.positive_int,
         ATTR_PERIOD: vol.All(vol.Coerce(float), vol.Range(min=0.05)),
         ATTR_CYCLES: vol.All(vol.Coerce(float), vol.Range(min=1)),
         ATTR_MODE: vol.In(PULSE_MODES),
@@ -144,7 +142,7 @@ LIFX_EFFECT_COLORLOOP_SCHEMA = cv.make_entity_service_schema(
         ATTR_PERIOD: vol.All(vol.Coerce(float), vol.Clamp(min=0.05)),
         ATTR_CHANGE: vol.All(vol.Coerce(float), vol.Clamp(min=0, max=360)),
         ATTR_SPREAD: vol.All(vol.Coerce(float), vol.Clamp(min=0, max=360)),
-        ATTR_TRANSITION: vol.All(vol.Coerce(float), vol.Range(min=0)),
+        ATTR_TRANSITION: cv.positive_float,
     }
 )
 
diff --git a/homeassistant/components/lifx/strings.json b/homeassistant/components/lifx/strings.json
index c35dcf3eb26..ebb8b39a8bc 100644
--- a/homeassistant/components/lifx/strings.json
+++ b/homeassistant/components/lifx/strings.json
@@ -6,8 +6,8 @@
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of LIFX is possible.",
-      "no_devices_found": "No LIFX devices found on the network."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   }
 }
diff --git a/homeassistant/components/lifx/translations/ca.json b/homeassistant/components/lifx/translations/ca.json
index edc525a92cb..28c25cde70a 100644
--- a/homeassistant/components/lifx/translations/ca.json
+++ b/homeassistant/components/lifx/translations/ca.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No s'han trobat dispositius LIFX a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s \u00e9s possible una \u00fanica configuraci\u00f3 de LIFX."
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/lifx/translations/cs.json b/homeassistant/components/lifx/translations/cs.json
index 7deccd0eac8..4b2e480e4bb 100644
--- a/homeassistant/components/lifx/translations/cs.json
+++ b/homeassistant/components/lifx/translations/cs.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "V s\u00edti nejsou nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed LIFX.",
-            "single_instance_allowed": "K dispozici je pouze jedna konfigurace LIFX."
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/lifx/translations/en.json b/homeassistant/components/lifx/translations/en.json
index ab4d5458d82..154101995ac 100644
--- a/homeassistant/components/lifx/translations/en.json
+++ b/homeassistant/components/lifx/translations/en.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No LIFX devices found on the network.",
-            "single_instance_allowed": "Only a single configuration of LIFX is possible."
+            "no_devices_found": "No devices found on the network",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/lifx/translations/et.json b/homeassistant/components/lifx/translations/et.json
new file mode 100644
index 00000000000..ba833f79f8b
--- /dev/null
+++ b/homeassistant/components/lifx/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid",
+            "single_instance_allowed": "Juba seadistatud, lubatud on ainult \u00fcks sidumine."
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas soovid seadistada LIFX-i?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/lifx/translations/it.json b/homeassistant/components/lifx/translations/it.json
index 40b4c98f490..be167ec9994 100644
--- a/homeassistant/components/lifx/translations/it.json
+++ b/homeassistant/components/lifx/translations/it.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nessun dispositivo LIFX trovato in rete.",
-            "single_instance_allowed": "\u00c8 consentita solo una singola configurazione di LIFX."
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/lifx/translations/no.json b/homeassistant/components/lifx/translations/no.json
index 708efba9cc7..4771b4c05d7 100644
--- a/homeassistant/components/lifx/translations/no.json
+++ b/homeassistant/components/lifx/translations/no.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Ingen LIFX-enheter funnet p\u00e5 nettverket.",
-            "single_instance_allowed": "Kun en konfigurasjon av LIFX er mulig."
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/lifx/translations/pl.json b/homeassistant/components/lifx/translations/pl.json
index d24cfd2473e..5f78d90078d 100644
--- a/homeassistant/components/lifx/translations/pl.json
+++ b/homeassistant/components/lifx/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nie znaleziono w sieci urz\u0105dze\u0144 LIFX.",
-            "single_instance_allowed": "Dozwolona jest tylko jedna konfiguracja LIFX."
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/lifx/translations/ru.json b/homeassistant/components/lifx/translations/ru.json
index 9ffd9a95270..0d50dec498b 100644
--- a/homeassistant/components/lifx/translations/ru.json
+++ b/homeassistant/components/lifx/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 LIFX \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/lifx/translations/zh-Hant.json b/homeassistant/components/lifx/translations/zh-Hant.json
index bc20e93c596..ed704711a66 100644
--- a/homeassistant/components/lifx/translations/zh-Hant.json
+++ b/homeassistant/components/lifx/translations/zh-Hant.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230 LIFX \u8a2d\u5099\u3002",
-            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44 LIFX\u3002"
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py
index 723967b3d51..a179eca6957 100644
--- a/homeassistant/components/light/__init__.py
+++ b/homeassistant/components/light/__init__.py
@@ -115,7 +115,7 @@ LIGHT_TURN_ON_SCHEMA = {
     vol.Exclusive(ATTR_COLOR_TEMP, COLOR_GROUP): vol.All(
         vol.Coerce(int), vol.Range(min=1)
     ),
-    vol.Exclusive(ATTR_KELVIN, COLOR_GROUP): vol.All(vol.Coerce(int), vol.Range(min=0)),
+    vol.Exclusive(ATTR_KELVIN, COLOR_GROUP): cv.positive_int,
     ATTR_WHITE_VALUE: vol.All(vol.Coerce(int), vol.Range(min=0, max=255)),
     ATTR_FLASH: VALID_FLASH,
     ATTR_EFFECT: cv.string,
@@ -343,7 +343,7 @@ class Profiles:
                         return None
             return profiles
 
-        cls._all = await hass.async_add_job(load_profile_data, hass)
+        cls._all = await hass.async_add_executor_job(load_profile_data, hass)
         return cls._all is not None
 
     @classmethod
diff --git a/homeassistant/components/light/translations/cs.json b/homeassistant/components/light/translations/cs.json
index fad25c00e79..5f43c684b09 100644
--- a/homeassistant/components/light/translations/cs.json
+++ b/homeassistant/components/light/translations/cs.json
@@ -1,8 +1,26 @@
 {
+    "device_automation": {
+        "action_type": {
+            "brightness_decrease": "Sn\u00ed\u017eit jas {entity_name}",
+            "brightness_increase": "Zv\u00fd\u0161it jas {entity_name}",
+            "flash": "Bliknout {entity_name}",
+            "toggle": "P\u0159epnout {entity_name}",
+            "turn_off": "Vypnout {entity_name}",
+            "turn_on": "Zapnout {entity_name}"
+        },
+        "condition_type": {
+            "is_off": "{entity_name} je vypnuto",
+            "is_on": "{entity_name} je zapnuto"
+        },
+        "trigger_type": {
+            "turned_off": "{entity_name} vypnuto",
+            "turned_on": "{entity_name} zapnuto"
+        }
+    },
     "state": {
         "_": {
-            "off": "Nesv\u00edt\u00ed",
-            "on": "Sv\u00edt\u00ed"
+            "off": "Vypnuto",
+            "on": "Zapnuto"
         }
     },
     "title": "Sv\u011btlo"
diff --git a/homeassistant/components/light/translations/es.json b/homeassistant/components/light/translations/es.json
index 51e09168241..790fd0e34ef 100644
--- a/homeassistant/components/light/translations/es.json
+++ b/homeassistant/components/light/translations/es.json
@@ -19,7 +19,7 @@
     },
     "state": {
         "_": {
-            "off": "Apagada",
+            "off": "Apagado",
             "on": "Encendida"
         }
     },
diff --git a/homeassistant/components/light/translations/pl.json b/homeassistant/components/light/translations/pl.json
index 3bb887b8d67..3b26bfcafd8 100644
--- a/homeassistant/components/light/translations/pl.json
+++ b/homeassistant/components/light/translations/pl.json
@@ -19,8 +19,8 @@
     },
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "\u015awiat\u0142o"
diff --git a/homeassistant/components/light/translations/ru.json b/homeassistant/components/light/translations/ru.json
index cc95d2d47ce..3237a2812c1 100644
--- a/homeassistant/components/light/translations/ru.json
+++ b/homeassistant/components/light/translations/ru.json
@@ -1,12 +1,12 @@
 {
     "device_automation": {
         "action_type": {
-            "brightness_decrease": "\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u044f\u0440\u043a\u043e\u0441\u0442\u044c {entity_name}",
-            "brightness_increase": "\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u044f\u0440\u043a\u043e\u0441\u0442\u044c {entity_name}",
-            "flash": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043c\u0438\u0433\u0430\u043d\u0438\u0435 {entity_name}",
-            "toggle": "\u041f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}",
-            "turn_off": "\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}",
-            "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}"
+            "brightness_decrease": "{entity_name}: \u0443\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u044f\u0440\u043a\u043e\u0441\u0442\u044c",
+            "brightness_increase": "{entity_name}: \u0443\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u044f\u0440\u043a\u043e\u0441\u0442\u044c",
+            "flash": "{entity_name}: \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043c\u0438\u0433\u0430\u043d\u0438\u0435",
+            "toggle": "{entity_name}: \u043f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_off": "{entity_name}: \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_on": "{entity_name}: \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c"
         },
         "condition_type": {
             "is_off": "{entity_name} \u0432 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u043e\u043c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438",
diff --git a/homeassistant/components/lightwave/manifest.json b/homeassistant/components/lightwave/manifest.json
index a80136b3fec..ffe2ca065fe 100644
--- a/homeassistant/components/lightwave/manifest.json
+++ b/homeassistant/components/lightwave/manifest.json
@@ -2,6 +2,6 @@
   "domain": "lightwave",
   "name": "Lightwave",
   "documentation": "https://www.home-assistant.io/integrations/lightwave",
-  "requirements": ["lightwave==0.18"],
+  "requirements": ["lightwave==0.19"],
   "codeowners": []
 }
diff --git a/homeassistant/components/litejet/__init__.py b/homeassistant/components/litejet/__init__.py
index 1d3ab4f6b19..9977bb9bdb4 100644
--- a/homeassistant/components/litejet/__init__.py
+++ b/homeassistant/components/litejet/__init__.py
@@ -1,6 +1,4 @@
 """Support for the LiteJet lighting system."""
-import logging
-
 from pylitejet import LiteJet
 import voluptuous as vol
 
@@ -8,8 +6,6 @@ from homeassistant.const import CONF_PORT
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_EXCLUDE_NAMES = "exclude_names"
 CONF_INCLUDE_SWITCHES = "include_switches"
 
diff --git a/homeassistant/components/litejet/scene.py b/homeassistant/components/litejet/scene.py
index 466ca7296f8..3311b8d86a0 100644
--- a/homeassistant/components/litejet/scene.py
+++ b/homeassistant/components/litejet/scene.py
@@ -1,5 +1,4 @@
 """Support for LiteJet scenes."""
-import logging
 from typing import Any
 
 from homeassistant.components import litejet
@@ -7,8 +6,6 @@ from homeassistant.components.scene import Scene
 
 ATTR_NUMBER = "number"
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up scenes for the LiteJet platform."""
diff --git a/homeassistant/components/litejet/trigger.py b/homeassistant/components/litejet/trigger.py
index d8b8ede8339..0b0117465df 100644
--- a/homeassistant/components/litejet/trigger.py
+++ b/homeassistant/components/litejet/trigger.py
@@ -1,18 +1,14 @@
 """Trigger an automation when a LiteJet switch is released."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_PLATFORM
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import track_point_in_utc_time
 import homeassistant.util.dt as dt_util
 
 # mypy: allow-untyped-defs, no-check-untyped-defs
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_NUMBER = "number"
 CONF_HELD_MORE_THAN = "held_more_than"
 CONF_HELD_LESS_THAN = "held_less_than"
@@ -38,12 +34,13 @@ async def async_attach_trigger(hass, config, action, automation_info):
     held_less_than = config.get(CONF_HELD_LESS_THAN)
     pressed_time = None
     cancel_pressed_more_than = None
+    job = HassJob(action)
 
     @callback
     def call_action():
         """Call action with right context."""
-        hass.async_run_job(
-            action,
+        hass.async_run_hass_job(
+            job,
             {
                 "trigger": {
                     CONF_PLATFORM: "litejet",
diff --git a/homeassistant/components/local_ip/strings.json b/homeassistant/components/local_ip/strings.json
index 2c571be1a0a..1859223e657 100644
--- a/homeassistant/components/local_ip/strings.json
+++ b/homeassistant/components/local_ip/strings.json
@@ -10,7 +10,7 @@
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of Local IP is allowed."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   }
 }
diff --git a/homeassistant/components/local_ip/translations/ca.json b/homeassistant/components/local_ip/translations/ca.json
index e0df6934361..7be2a2d70d6 100644
--- a/homeassistant/components/local_ip/translations/ca.json
+++ b/homeassistant/components/local_ip/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Nom\u00e9s \u00e9s possible configurar una sola IP local."
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/local_ip/translations/cs.json b/homeassistant/components/local_ip/translations/cs.json
index 8130726dad9..239d312b3f9 100644
--- a/homeassistant/components/local_ip/translations/cs.json
+++ b/homeassistant/components/local_ip/translations/cs.json
@@ -1,11 +1,16 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
         "step": {
             "user": {
                 "data": {
                     "name": "N\u00e1zev senzoru"
-                }
+                },
+                "title": "M\u00edstn\u00ed IP adresa"
             }
         }
-    }
+    },
+    "title": "M\u00edstn\u00ed IP adresa"
 }
\ No newline at end of file
diff --git a/homeassistant/components/local_ip/translations/en.json b/homeassistant/components/local_ip/translations/en.json
index 5a4077352e7..7f823968f9c 100644
--- a/homeassistant/components/local_ip/translations/en.json
+++ b/homeassistant/components/local_ip/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Only a single configuration of Local IP is allowed."
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/local_ip/translations/es.json b/homeassistant/components/local_ip/translations/es.json
index 7af25649769..570a566d033 100644
--- a/homeassistant/components/local_ip/translations/es.json
+++ b/homeassistant/components/local_ip/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Solo se permite una \u00fanica configuraci\u00f3n de IP Local."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/local_ip/translations/et.json b/homeassistant/components/local_ip/translations/et.json
index 70493aee468..7bd74eff99c 100644
--- a/homeassistant/components/local_ip/translations/et.json
+++ b/homeassistant/components/local_ip/translations/et.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/local_ip/translations/it.json b/homeassistant/components/local_ip/translations/it.json
index 3e159254600..9173584c9f8 100644
--- a/homeassistant/components/local_ip/translations/it.json
+++ b/homeassistant/components/local_ip/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u00c8 consentita una sola configurazione dell'IP locale."
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/local_ip/translations/no.json b/homeassistant/components/local_ip/translations/no.json
index 0b12afbcbb3..cf229e06877 100644
--- a/homeassistant/components/local_ip/translations/no.json
+++ b/homeassistant/components/local_ip/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Bare en enkelt konfigurasjon av lokal IP er tillatt."
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/local_ip/translations/pl.json b/homeassistant/components/local_ip/translations/pl.json
index 5f8b977dc6e..2002b250883 100644
--- a/homeassistant/components/local_ip/translations/pl.json
+++ b/homeassistant/components/local_ip/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Dozwolona jest tylko jedna konfiguracja z lokalnym adresem IP."
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/local_ip/translations/ru.json b/homeassistant/components/local_ip/translations/ru.json
index e7e7a5647b7..15648bf3f7f 100644
--- a/homeassistant/components/local_ip/translations/ru.json
+++ b/homeassistant/components/local_ip/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/local_ip/translations/zh-Hant.json b/homeassistant/components/local_ip/translations/zh-Hant.json
index 15103177179..3ab8f2b7592 100644
--- a/homeassistant/components/local_ip/translations/zh-Hant.json
+++ b/homeassistant/components/local_ip/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44\u672c\u5730  IP\u3002"
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/locative/device_tracker.py b/homeassistant/components/locative/device_tracker.py
index 49983d44eb9..84719d08e4a 100644
--- a/homeassistant/components/locative/device_tracker.py
+++ b/homeassistant/components/locative/device_tracker.py
@@ -1,6 +1,4 @@
 """Support for the Locative platform."""
-import logging
-
 from homeassistant.components.device_tracker import SOURCE_TYPE_GPS
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
 from homeassistant.core import callback
@@ -8,8 +6,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from . import DOMAIN as LT_DOMAIN, TRACKER_UPDATE
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Configure a dispatcher connection based on a config entry."""
diff --git a/homeassistant/components/locative/strings.json b/homeassistant/components/locative/strings.json
index 53a0c160e99..3a5821f40b1 100644
--- a/homeassistant/components/locative/strings.json
+++ b/homeassistant/components/locative/strings.json
@@ -7,7 +7,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Geofency."
     },
     "create_entry": {
diff --git a/homeassistant/components/locative/translations/ca.json b/homeassistant/components/locative/translations/ca.json
index 61c6a6c48af..89dcafd65d5 100644
--- a/homeassistant/components/locative/translations/ca.json
+++ b/homeassistant/components/locative/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Geofency.",
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "Per enviar ubicacions a Home Assistant, haur\u00e0s de configurar l'opci\u00f3 webhook de l'aplicaci\u00f3 Locative.\n\nCompleta la seg\u00fcent informaci\u00f3:\n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n\nConsulta la [documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
diff --git a/homeassistant/components/locative/translations/cs.json b/homeassistant/components/locative/translations/cs.json
index 074443908f4..4459aac99c8 100644
--- a/homeassistant/components/locative/translations/cs.json
+++ b/homeassistant/components/locative/translations/cs.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Va\u0161e instanci dom\u00e1c\u00edho asistenta mus\u00ed b\u00fdt p\u0159\u00edstupn\u00e1 z internetu a p\u0159ij\u00edmat zpr\u00e1vy od spole\u010dnosti Geofency.",
-            "one_instance_allowed": "Povolena je pouze jedna instance."
+            "not_internet_accessible": "V\u00e1\u0161 Home Asistent mus\u00ed b\u00fdt p\u0159\u00edstupn\u00fd z internetu, aby mohl p\u0159ij\u00edmat zpr\u00e1vy od Geofency.",
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "create_entry": {
             "default": "Chcete-li odes\u00edlat um\u00edst\u011bn\u00ed do aplikace Home Assistant, budete muset nastavit funkci Webhook v aplikaci Locative. \n\n Vypl\u0148te n\u00e1sleduj\u00edc\u00ed informace: \n\n - URL: ` {webhook_url} ' \n - Metoda: POST \n\n Dal\u0161\u00ed podrobnosti naleznete v [dokumentaci] ( {docs_url} )."
diff --git a/homeassistant/components/locative/translations/el.json b/homeassistant/components/locative/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/locative/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/translations/en.json b/homeassistant/components/locative/translations/en.json
index 750797e535b..59ff777603e 100644
--- a/homeassistant/components/locative/translations/en.json
+++ b/homeassistant/components/locative/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Geofency.",
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "To send locations to Home Assistant, you will need to setup the webhook feature in the Locative app.\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nSee [the documentation]({docs_url}) for further details."
diff --git a/homeassistant/components/locative/translations/es.json b/homeassistant/components/locative/translations/es.json
index 53188cd7be2..11c789ddaed 100644
--- a/homeassistant/components/locative/translations/es.json
+++ b/homeassistant/components/locative/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Tu Home Assistant debe ser accesible desde Internet para recibir mensajes de Geofency.",
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "S\u00f3lo se necesita una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Para enviar ubicaciones a Home Assistant, es necesario configurar la caracter\u00edstica webhook en la app de Locative.\n\nRellena la siguiente informaci\u00f3n:\n\n- URL: `{webhook_url}`\n- M\u00e9todo: POST\n\nRevisa [la documentaci\u00f3n]({docs_url}) para m\u00e1s detalles."
diff --git a/homeassistant/components/locative/translations/et.json b/homeassistant/components/locative/translations/et.json
new file mode 100644
index 00000000000..6fcb3233725
--- /dev/null
+++ b/homeassistant/components/locative/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Lubatud on ainult \u00fcks sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid seadistada Locative Webhook'i?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/locative/translations/fr.json b/homeassistant/components/locative/translations/fr.json
index 4e65415b1b3..1327b2d0f8b 100644
--- a/homeassistant/components/locative/translations/fr.json
+++ b/homeassistant/components/locative/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Votre instance Home Assistant doit \u00eatre accessible \u00e0 partir d'Internet pour recevoir les messages Geofency.",
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "Pour envoyer des localisations \u00e0 Home Assistant, vous devez configurer la fonctionnalit\u00e9 Webhook dans l'application Locative. \n\n Remplissez les informations suivantes: \n\n - URL: ` {webhook_url} ` \n - M\u00e9thode: POST \n\n Voir [la documentation] ( {docs_url} ) pour plus de d\u00e9tails."
diff --git a/homeassistant/components/locative/translations/it.json b/homeassistant/components/locative/translations/it.json
index 210fbfe4c28..37e47c11aef 100644
--- a/homeassistant/components/locative/translations/it.json
+++ b/homeassistant/components/locative/translations/it.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La tua istanza di Home Assistant deve essere accessibile da Internet per ricevere messaggi da Geofency.",
-            "one_instance_allowed": "\u00c8 necessaria una sola istanza."
+            "one_instance_allowed": "\u00c8 necessaria una sola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "Per inviare localit\u00e0 a Home Assistant, dovrai configurare la funzionalit\u00e0 Webhook nell'app Locative.\n\n Compila le seguenti informazioni: \n\n - URL: `{webhook_url}` \n - Method: POST \n\n Vedi [la documentazione]({docs_url}) for ulteriori dettagli."
diff --git a/homeassistant/components/locative/translations/lb.json b/homeassistant/components/locative/translations/lb.json
index 42086f5cfe5..06d303ff0b1 100644
--- a/homeassistant/components/locative/translations/lb.json
+++ b/homeassistant/components/locative/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir Geofency Noriichten z'empf\u00e4nken.",
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Fir Plazen un Home Assistant ze sch\u00e9cken, muss den Webhook Feature an der Locative App ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nLiest [Dokumentatioun]({docs_url}) fir w\u00e9ider D\u00e9tailer."
diff --git a/homeassistant/components/locative/translations/nl.json b/homeassistant/components/locative/translations/nl.json
index 655752b6e69..340eeecb0a6 100644
--- a/homeassistant/components/locative/translations/nl.json
+++ b/homeassistant/components/locative/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Je Home Assistant instance moet bereikbaar zijn vanuit het internet om berichten van Geofency te ontvangen.",
-            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Om locaties naar Home Assistant te sturen, moet u de Webhook-functie instellen in de Locative app. \n\n Vul de volgende info in: \n\n - URL: `{webhook_url}` \n - Methode: POST \n\n Zie [de documentatie]({docs_url}) voor meer informatie."
diff --git a/homeassistant/components/locative/translations/no.json b/homeassistant/components/locative/translations/no.json
index 46f9f413236..d061448ddfe 100644
--- a/homeassistant/components/locative/translations/no.json
+++ b/homeassistant/components/locative/translations/no.json
@@ -2,10 +2,11 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 kunne motta meldinger fra Geofency.",
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
-            "default": "For \u00e5 kunne sende steder til Home Assistant, m\u00e5 du sette opp webhook-funksjonen i Locative. \n\n Fyll ut f\u00f8lgende informasjon: \n\n - URL: `{webhook_url}` \n - Metode: POST \n\n Se [dokumentasjonen]({docs_url}) for ytterligere detaljer."
+            "default": "For \u00e5 kunne sende plasseringer til Home Assistant, m\u00e5 du sette opp webhook-funksjonen i Locative appen. \n\n Fyll ut f\u00f8lgende informasjon: \n\n - URL: `{webhook_url}` \n - Metode: POST \n\nSe [dokumentasjonen]({docs_url}) for ytterligere detaljer."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/locative/translations/pl.json b/homeassistant/components/locative/translations/pl.json
index 1323b1e284b..a35913198ab 100644
--- a/homeassistant/components/locative/translations/pl.json
+++ b/homeassistant/components/locative/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z Geofency.",
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z Geofency",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Aby wysy\u0142a\u0107 lokalizacje do Home Assistanta, musisz skonfigurowa\u0107 webhook w aplikacji Locative. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
+            "default": "Aby wysy\u0142a\u0107 lokalizacje do Home Assistant, musisz skonfigurowa\u0107 webhook w aplikacji Locative. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/locative/translations/ru.json b/homeassistant/components/locative/translations/ru.json
index 591f2f42302..0981c9f2f1c 100644
--- a/homeassistant/components/locative/translations/ru.json
+++ b/homeassistant/components/locative/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 Locative.",
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Webhook \u0434\u043b\u044f Locative.\n\n\u0414\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
diff --git a/homeassistant/components/locative/translations/zh-Hant.json b/homeassistant/components/locative/translations/zh-Hant.json
index 3b0089ed220..f84a40c1152 100644
--- a/homeassistant/components/locative/translations/zh-Hant.json
+++ b/homeassistant/components/locative/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant \u8a2d\u5099\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 Locative \u8a0a\u606f\u3002",
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\u6b32\u50b3\u9001\u5ea7\u6a19\u81f3 Home Assistant\uff0c\u5c07\u9700\u65bc Locative App \u5167\u8a2d\u5b9a webhook \u529f\u80fd\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
diff --git a/homeassistant/components/lock/__init__.py b/homeassistant/components/lock/__init__.py
index addd5d9a257..bc7dc10ba8d 100644
--- a/homeassistant/components/lock/__init__.py
+++ b/homeassistant/components/lock/__init__.py
@@ -41,8 +41,6 @@ LOCK_SERVICE_SCHEMA = make_entity_service_schema({vol.Optional(ATTR_CODE): cv.st
 # Bitfield of features supported by the lock entity
 SUPPORT_OPEN = 1
 
-_LOGGER = logging.getLogger(__name__)
-
 PROP_TO_ATTR = {"changed_by": ATTR_CHANGED_BY, "code_format": ATTR_CODE_FORMAT}
 
 
@@ -101,7 +99,7 @@ class LockEntity(Entity):
 
     async def async_lock(self, **kwargs):
         """Lock the lock."""
-        await self.hass.async_add_job(ft.partial(self.lock, **kwargs))
+        await self.hass.async_add_executor_job(ft.partial(self.lock, **kwargs))
 
     def unlock(self, **kwargs):
         """Unlock the lock."""
@@ -109,7 +107,7 @@ class LockEntity(Entity):
 
     async def async_unlock(self, **kwargs):
         """Unlock the lock."""
-        await self.hass.async_add_job(ft.partial(self.unlock, **kwargs))
+        await self.hass.async_add_executor_job(ft.partial(self.unlock, **kwargs))
 
     def open(self, **kwargs):
         """Open the door latch."""
@@ -117,7 +115,7 @@ class LockEntity(Entity):
 
     async def async_open(self, **kwargs):
         """Open the door latch."""
-        await self.hass.async_add_job(ft.partial(self.open, **kwargs))
+        await self.hass.async_add_executor_job(ft.partial(self.open, **kwargs))
 
     @property
     def state_attributes(self):
diff --git a/homeassistant/components/lock/translations/cs.json b/homeassistant/components/lock/translations/cs.json
index ce9edd13c52..84d2966cde7 100644
--- a/homeassistant/components/lock/translations/cs.json
+++ b/homeassistant/components/lock/translations/cs.json
@@ -8,6 +8,10 @@
         "condition_type": {
             "is_locked": "{entity_name} je uzam\u010deno",
             "is_unlocked": "{entity_name} je odem\u010deno"
+        },
+        "trigger_type": {
+            "locked": "{entity_name} zam\u010deno",
+            "unlocked": "{entity_name} odem\u010deno"
         }
     },
     "state": {
diff --git a/homeassistant/components/lock/translations/pl.json b/homeassistant/components/lock/translations/pl.json
index d67adc8c9a1..3bdada017ff 100644
--- a/homeassistant/components/lock/translations/pl.json
+++ b/homeassistant/components/lock/translations/pl.json
@@ -16,8 +16,8 @@
     },
     "state": {
         "_": {
-            "locked": "Zablokowany",
-            "unlocked": "Odblokowanie"
+            "locked": "zamkni\u0119ty",
+            "unlocked": "otwarty"
         }
     },
     "title": "Zamek"
diff --git a/homeassistant/components/lock/translations/ru.json b/homeassistant/components/lock/translations/ru.json
index 3b82c1f78cc..27d12cd8054 100644
--- a/homeassistant/components/lock/translations/ru.json
+++ b/homeassistant/components/lock/translations/ru.json
@@ -1,9 +1,9 @@
 {
     "device_automation": {
         "action_type": {
-            "lock": "\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c {entity_name}",
-            "open": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c {entity_name}",
-            "unlock": "\u0420\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c {entity_name}"
+            "lock": "{entity_name}: \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
+            "open": "{entity_name}: \u043e\u0442\u043a\u0440\u044b\u0442\u044c",
+            "unlock": "{entity_name}: \u0440\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
         },
         "condition_type": {
             "is_locked": "{entity_name} \u0432 \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u043c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438",
diff --git a/homeassistant/components/logbook/__init__.py b/homeassistant/components/logbook/__init__.py
index 9eb3c80435c..254d99ed848 100644
--- a/homeassistant/components/logbook/__init__.py
+++ b/homeassistant/components/logbook/__init__.py
@@ -2,7 +2,6 @@
 from datetime import timedelta
 from itertools import groupby
 import json
-import logging
 import re
 
 import sqlalchemy
@@ -53,8 +52,6 @@ ENTITY_ID_JSON_EXTRACT = re.compile('"entity_id": "([^"]+)"')
 DOMAIN_JSON_EXTRACT = re.compile('"domain": "([^"]+)"')
 ICON_JSON_EXTRACT = re.compile('"icon": "([^"]+)"')
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_MESSAGE = "message"
 
 CONF_DOMAINS = "domains"
@@ -147,7 +144,7 @@ async def async_setup(hass, config):
             domain = DOMAIN
 
         message.hass = hass
-        message = message.async_render()
+        message = message.async_render(parse_result=False)
         async_log_entry(hass, name, message, domain, entity_id)
 
     hass.components.frontend.async_register_built_in_panel(
diff --git a/homeassistant/components/logi_circle/__init__.py b/homeassistant/components/logi_circle/__init__.py
index 87ee2e6e384..d3551765079 100644
--- a/homeassistant/components/logi_circle/__init__.py
+++ b/homeassistant/components/logi_circle/__init__.py
@@ -1,6 +1,5 @@
 """Support for Logi Circle devices."""
 import asyncio
-import logging
 
 from aiohttp.client_exceptions import ClientResponseError
 import async_timeout
@@ -39,7 +38,6 @@ from .const import (
 NOTIFICATION_ID = "logi_circle_notification"
 NOTIFICATION_TITLE = "Logi Circle Setup"
 
-_LOGGER = logging.getLogger(__name__)
 _TIMEOUT = 15  # seconds
 
 SERVICE_SET_CONFIG = "set_config"
diff --git a/homeassistant/components/logi_circle/config_flow.py b/homeassistant/components/logi_circle/config_flow.py
index 55b617c0748..279c3052010 100644
--- a/homeassistant/components/logi_circle/config_flow.py
+++ b/homeassistant/components/logi_circle/config_flow.py
@@ -67,7 +67,7 @@ class LogiCircleFlowHandler(config_entries.ConfigFlow):
     async def async_step_import(self, user_input=None):
         """Handle external yaml configuration."""
         if self.hass.config_entries.async_entries(DOMAIN):
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="already_configured")
 
         self.flow_impl = DOMAIN
 
@@ -78,10 +78,10 @@ class LogiCircleFlowHandler(config_entries.ConfigFlow):
         flows = self.hass.data.get(DATA_FLOW_IMPL, {})
 
         if self.hass.config_entries.async_entries(DOMAIN):
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="already_configured")
 
         if not flows:
-            return self.async_abort(reason="no_flows")
+            return self.async_abort(reason="missing_configuration")
 
         if len(flows) == 1:
             self.flow_impl = list(flows)[0]
@@ -141,7 +141,7 @@ class LogiCircleFlowHandler(config_entries.ConfigFlow):
     async def async_step_code(self, code=None):
         """Received code for authentication."""
         if self.hass.config_entries.async_entries(DOMAIN):
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="already_configured")
 
         return await self._async_create_session(code)
 
@@ -167,10 +167,12 @@ class LogiCircleFlowHandler(config_entries.ConfigFlow):
             with async_timeout.timeout(_TIMEOUT):
                 await logi_session.authorize(code)
         except AuthorizationFailed:
-            (self.hass.data[DATA_FLOW_IMPL][DOMAIN][EXTERNAL_ERRORS]) = "auth_error"
+            (self.hass.data[DATA_FLOW_IMPL][DOMAIN][EXTERNAL_ERRORS]) = "invalid_auth"
             return self.async_abort(reason="external_error")
         except asyncio.TimeoutError:
-            (self.hass.data[DATA_FLOW_IMPL][DOMAIN][EXTERNAL_ERRORS]) = "auth_timeout"
+            (
+                self.hass.data[DATA_FLOW_IMPL][DOMAIN][EXTERNAL_ERRORS]
+            ) = "authorize_url_timeout"
             return self.async_abort(reason="external_error")
 
         account_id = (await logi_session.account)["accountId"]
diff --git a/homeassistant/components/logi_circle/strings.json b/homeassistant/components/logi_circle/strings.json
index d96f0e041a1..a73ade9311c 100644
--- a/homeassistant/components/logi_circle/strings.json
+++ b/homeassistant/components/logi_circle/strings.json
@@ -11,19 +11,16 @@
         "description": "Please follow the link below and **Accept** access to your Logi Circle account, then come back and press **Submit** below.\n\n[Link]({authorization_url})"
       }
     },
-    "create_entry": {
-      "default": "Successfully authenticated with Logi Circle."
-    },
     "error": {
-      "auth_error": "API authorization failed.",
-      "auth_timeout": "Authorization timed out when requesting access token.",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
       "follow_link": "Please follow the link and authenticate before pressing Submit."
     },
     "abort": {
-      "already_setup": "You can only configure a single Logi Circle account.",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
       "external_error": "Exception occurred from another flow.",
       "external_setup": "Logi Circle successfully configured from another flow.",
-      "no_flows": "You need to configure Logi Circle before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/logi_circle/)."
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]"
     }
   }
 }
diff --git a/homeassistant/components/logi_circle/translations/ca.json b/homeassistant/components/logi_circle/translations/ca.json
index 97fcaf575fc..5ce57701408 100644
--- a/homeassistant/components/logi_circle/translations/ca.json
+++ b/homeassistant/components/logi_circle/translations/ca.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
+            "already_configured": "El compte ja ha estat configurat",
             "already_setup": "Nom\u00e9s pots configurar un \u00fanic compte de Logi Circule.",
             "external_error": "S'ha produ\u00eft una excepci\u00f3 d'un altre flux de dades.",
             "external_setup": "Logi Circle s'ha configurat correctament des d'un altre flux de dades.",
+            "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
             "no_flows": "Necessites configurar Logi Circle abans de poder autenticar-t'hi. Llegeix les [instruccions](https://www.home-assistant.io/components/logi_circle/)."
         },
         "create_entry": {
@@ -12,7 +14,9 @@
         "error": {
             "auth_error": "Ha fallat l'autoritzaci\u00f3 de l'API.",
             "auth_timeout": "L'autoritzaci\u00f3 ha expirat durant l'obtenci\u00f3 del token d'acc\u00e9s.",
-            "follow_link": "V\u00e9s a l'enlla\u00e7 i autentica't abans de pr\u00e9mer Envia"
+            "authorize_url_timeout": "Temps d'espera esgotat durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
+            "follow_link": "V\u00e9s a l'enlla\u00e7 i autentica't abans de pr\u00e9mer Envia",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/logi_circle/translations/cs.json b/homeassistant/components/logi_circle/translations/cs.json
new file mode 100644
index 00000000000..26a2ef1eb0d
--- /dev/null
+++ b/homeassistant/components/logi_circle/translations/cs.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "already_setup": "M\u016f\u017eete nastavit pouze jeden \u00fa\u010det Logi Circle.",
+            "external_setup": "Logi Circle \u00fasp\u011b\u0161n\u011b nastaveno jin\u00fdm zp\u016fsobem.",
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace."
+        },
+        "create_entry": {
+            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno pomoc\u00ed Logi Circle."
+        },
+        "error": {
+            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "step": {
+            "auth": {
+                "description": "Postupujte podle n\u00ed\u017ee uveden\u00e9ho odkazu a **P\u0159ijm\u011bte** p\u0159\u00edstup k \u00fa\u010dtu Logi Circle, pot\u00e9 se vra\u0165te zp\u011bt a stiskn\u011bte n\u00ed\u017ee **Odeslat**. \n\n[Odkaz]({authorization_url})",
+                "title": "Ov\u011b\u0159en\u00ed pomoc\u00ed Logi Circle"
+            },
+            "user": {
+                "data": {
+                    "flow_impl": "Poskytovatel"
+                },
+                "title": "Poskytovatel ov\u011b\u0159en\u00ed"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/logi_circle/translations/en.json b/homeassistant/components/logi_circle/translations/en.json
index 48e33359bdc..999347768d3 100644
--- a/homeassistant/components/logi_circle/translations/en.json
+++ b/homeassistant/components/logi_circle/translations/en.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Account is already configured",
             "already_setup": "You can only configure a single Logi Circle account.",
             "external_error": "Exception occurred from another flow.",
             "external_setup": "Logi Circle successfully configured from another flow.",
+            "missing_configuration": "The component is not configured. Please follow the documentation.",
             "no_flows": "You need to configure Logi Circle before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/logi_circle/)."
         },
         "create_entry": {
@@ -12,7 +14,9 @@
         "error": {
             "auth_error": "API authorization failed.",
             "auth_timeout": "Authorization timed out when requesting access token.",
-            "follow_link": "Please follow the link and authenticate before pressing Submit."
+            "authorize_url_timeout": "Timeout generating authorize URL.",
+            "follow_link": "Please follow the link and authenticate before pressing Submit.",
+            "invalid_auth": "Invalid authentication"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/logi_circle/translations/es.json b/homeassistant/components/logi_circle/translations/es.json
index d262a9659d1..58044b73335 100644
--- a/homeassistant/components/logi_circle/translations/es.json
+++ b/homeassistant/components/logi_circle/translations/es.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
+            "already_configured": "La cuenta ya ha sido configurada",
             "already_setup": "Solo puedes configurar una cuenta de Logi Circle.",
             "external_error": "Se produjo una excepci\u00f3n de otro flujo.",
             "external_setup": "Logi Circle se ha configurado correctamente a partir de otro flujo.",
+            "missing_configuration": "El componente no est\u00e1 configurado. Consulta la documentaci\u00f3n.",
             "no_flows": "Es necesario configurar Logi Circle antes de poder autenticarse con \u00e9l. [Echa un vistazo a las instrucciones] (https://www.home-assistant.io/components/logi_circle/)."
         },
         "create_entry": {
@@ -12,7 +14,9 @@
         "error": {
             "auth_error": "Error en la autorizaci\u00f3n de la API.",
             "auth_timeout": "Se ha agotado el tiempo de espera de la autorizaci\u00f3n al solicitar el token de acceso.",
-            "follow_link": "Accede al enlace e identif\u00edcate antes de pulsar Enviar."
+            "authorize_url_timeout": "Tiempo de espera agotado generando la url de autorizaci\u00f3n.",
+            "follow_link": "Accede al enlace e identif\u00edcate antes de pulsar Enviar.",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/logi_circle/translations/et.json b/homeassistant/components/logi_circle/translations/et.json
new file mode 100644
index 00000000000..9508a1b2571
--- /dev/null
+++ b/homeassistant/components/logi_circle/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud",
+            "already_setup": "Saad h\u00e4\u00e4lestada ainult \u00fche Logi Circle konto.",
+            "missing_configuration": "Osis pole seadistatud. Palun vaata dokumentatsiooni."
+        },
+        "error": {
+            "authorize_url_timeout": "Tuvastamise URL'i loomise ajal\u00f5pp.",
+            "invalid_auth": "Tuvastamine eba\u00f5nnestus"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/logi_circle/translations/it.json b/homeassistant/components/logi_circle/translations/it.json
index 6bb23254cda..d1dc253e79c 100644
--- a/homeassistant/components/logi_circle/translations/it.json
+++ b/homeassistant/components/logi_circle/translations/it.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato",
             "already_setup": "\u00c8 possibile configurare solo un singolo account Logi Circle.",
             "external_error": "Si \u00e8 verificata un'eccezione da un altro flusso.",
             "external_setup": "Logi Circle configurato con successo da un altro flusso.",
+            "missing_configuration": "Il componente non \u00e8 configurato. Si prega di seguire la documentazione.",
             "no_flows": "Devi configurare Logi Circle prima di poter eseguire l'autenticazione. [Si prega di leggere le istruzioni](https://www.home-assistant.io/components/logi_circle/)."
         },
         "create_entry": {
@@ -12,7 +14,9 @@
         "error": {
             "auth_error": "Autorizzazione API fallita.",
             "auth_timeout": "Timeout dell'autorizzazione durante la richiesta del token di accesso.",
-            "follow_link": "Segui il link e autenticati prima di premere Invia"
+            "authorize_url_timeout": "Tempo scaduto nel generare l'URL di autorizzazione.",
+            "follow_link": "Segui il link e autenticati prima di premere Invia",
+            "invalid_auth": "Autenticazione non valida"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/logi_circle/translations/no.json b/homeassistant/components/logi_circle/translations/no.json
index 82fa73d492d..181697d95f6 100644
--- a/homeassistant/components/logi_circle/translations/no.json
+++ b/homeassistant/components/logi_circle/translations/no.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Kontoen er allerede konfigurert",
             "already_setup": "Du kan bare konfigurere en Logi Circle konto.",
             "external_error": "Det oppstod et unntak fra en annen flow.",
             "external_setup": "Logi Circle er vellykket konfigurert fra en annen flow.",
+            "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
             "no_flows": "Du m\u00e5 konfigurere Logi Circle f\u00f8r du kan godkjenne den. [Vennligst les instruksjonene](https://www.home-assistant.io/components/logi_circle/)."
         },
         "create_entry": {
@@ -12,7 +14,9 @@
         "error": {
             "auth_error": "API-godkjenning mislyktes.",
             "auth_timeout": "Godkjenningen ble tidsavbrutt ved foresp\u00f8rsel om token.",
-            "follow_link": "Vennligst f\u00f8lg lenken og godkjenn f\u00f8r du trykker send."
+            "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
+            "follow_link": "Vennligst f\u00f8lg lenken og godkjenn f\u00f8r du trykker send.",
+            "invalid_auth": "Ugyldig godkjenning"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/logi_circle/translations/pl.json b/homeassistant/components/logi_circle/translations/pl.json
index 80d075c3589..19a1d945a83 100644
--- a/homeassistant/components/logi_circle/translations/pl.json
+++ b/homeassistant/components/logi_circle/translations/pl.json
@@ -1,22 +1,26 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Logi Circle.",
-            "external_error": "Wyst\u0105pi\u0142 wyj\u0105tek z innego przep\u0142ywu.",
-            "external_setup": "Logi Circle zosta\u0142o pomy\u015blnie skonfigurowane z innego przep\u0142ywu.",
-            "no_flows": "Musisz skonfigurowa\u0107 Logi Circle, aby m\u00f3c si\u0119 z nim uwierzytelni\u0107. Zapoznaj si\u0119 z [instrukcj\u0105](https://www.home-assistant.io/components/logi_circle/)."
+            "already_configured": "Konto jest ju\u017c skonfigurowane",
+            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Logi Circle",
+            "external_error": "Wyst\u0105pi\u0142 wyj\u0105tek z innego przep\u0142ywu",
+            "external_setup": "Logi Circle zosta\u0142o pomy\u015blnie skonfigurowane z innego przep\u0142ywu",
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_flows": "Musisz skonfigurowa\u0107 Logi Circle, aby m\u00f3c si\u0119 z nim uwierzytelni\u0107. Zapoznaj si\u0119 z [instrukcj\u0105](https://www.home-assistant.io/components/logi_circle/)"
         },
         "create_entry": {
             "default": "Pomy\u015blnie uwierzytelniono z Logi Circle."
         },
         "error": {
-            "auth_error": "Autoryzacja API nie powiod\u0142a si\u0119.",
-            "auth_timeout": "Przekroczono limit czasu \u017c\u0105dania tokena dost\u0119pu.",
-            "follow_link": "Post\u0119puj zgodnie z linkiem i uwierzytelnij si\u0119 przed naci\u015bni\u0119ciem przycisku \"Zatwierd\u017a\"."
+            "auth_error": "Autoryzacja API nie powiod\u0142a si\u0119",
+            "auth_timeout": "Przekroczono limit czasu \u017c\u0105dania tokena dost\u0119pu",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
+            "follow_link": "Post\u0119puj zgodnie z linkiem i uwierzytelnij si\u0119 przed naci\u015bni\u0119ciem przycisku \"Zatwierd\u017a\"",
+            "invalid_auth": "Niepoprawne uwierzytelnienie"
         },
         "step": {
             "auth": {
-                "description": "Kliknij poni\u017cszy link i <b>Zaakceptuj</b> dost\u0119p do konta Logi Circle, a nast\u0119pnie wr\u00f3\u0107 i naci\u015bnij <b>Zatwierd\u017a</b> poni\u017cej. \n\n [Link]({authorization_url})",
+                "description": "Kliknij poni\u017cszy link i **Zaakceptuj** dost\u0119p do konta Logi Circle, a nast\u0119pnie wr\u00f3\u0107 i naci\u015bnij **Zatwierd\u017a** poni\u017cej. \n\n [Link]({authorization_url})",
                 "title": "Uwierzytelnij za pomoc\u0105 Logi Circle"
             },
             "user": {
diff --git a/homeassistant/components/logi_circle/translations/ru.json b/homeassistant/components/logi_circle/translations/ru.json
index 60db9528cef..96699da2762 100644
--- a/homeassistant/components/logi_circle/translations/ru.json
+++ b/homeassistant/components/logi_circle/translations/ru.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
             "external_error": "\u0418\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u043e \u0438\u0437 \u0434\u0440\u0443\u0433\u043e\u0433\u043e \u043f\u043e\u0442\u043e\u043a\u0430.",
             "external_setup": "Logi Circle \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d \u0438\u0437 \u0434\u0440\u0443\u0433\u043e\u0433\u043e \u043f\u043e\u0442\u043e\u043a\u0430.",
+            "missing_configuration": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
             "no_flows": "\u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 Logi Circle \u043f\u0435\u0440\u0435\u0434 \u043f\u0440\u043e\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0435\u043c \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438](https://www.home-assistant.io/components/logi_circle/)."
         },
         "create_entry": {
@@ -12,7 +14,9 @@
         "error": {
             "auth_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438 API.",
             "auth_timeout": "\u041f\u0440\u0438 \u0437\u0430\u043f\u0440\u043e\u0441\u0435 \u0442\u043e\u043a\u0435\u043d\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u0438\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
-            "follow_link": "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043f\u043e \u0441\u0441\u044b\u043b\u043a\u0435 \u0438 \u043f\u0440\u043e\u0439\u0434\u0438\u0442\u0435 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e, \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u043d\u0430\u0436\u0430\u0442\u044c \"\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c\"."
+            "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
+            "follow_link": "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043f\u043e \u0441\u0441\u044b\u043b\u043a\u0435 \u0438 \u043f\u0440\u043e\u0439\u0434\u0438\u0442\u0435 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e, \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u043d\u0430\u0436\u0430\u0442\u044c \"\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c\".",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/logi_circle/translations/zh-Hant.json b/homeassistant/components/logi_circle/translations/zh-Hant.json
index 6602491c8a2..5f2d37a8421 100644
--- a/homeassistant/components/logi_circle/translations/zh-Hant.json
+++ b/homeassistant/components/logi_circle/translations/zh-Hant.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44 Logi Circle \u5e33\u865f\u3002",
             "external_error": "\u5176\u4ed6\u6d41\u7a0b\u767c\u751f\u7570\u5e38\u3002",
             "external_setup": "\u5df2\u7531\u5176\u4ed6\u6d41\u7a0b\u6210\u529f\u8a2d\u5b9a Logi Circle\u3002",
+            "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
             "no_flows": "\u5fc5\u9808\u5148\u8a2d\u5b9a Logi Circle \u65b9\u80fd\u9032\u884c\u8a8d\u8b49\u3002[\u8acb\u53c3\u95b1\u6559\u5b78\u6307\u5f15]\uff08https://www.home-assistant.io/components/logi_circle/\uff09\u3002"
         },
         "create_entry": {
@@ -12,7 +14,9 @@
         "error": {
             "auth_error": "API \u8a8d\u8b49\u5931\u6557\u3002",
             "auth_timeout": "\u8acb\u6c42\u5b58\u53d6\u5bc6\u9470\u8a8d\u8b49\u903e\u6642\u3002",
-            "follow_link": "\u8acb\u65bc\u50b3\u9001\u524d\uff0c\u5148\u4f7f\u7528\u9023\u7d50\u4e26\u9032\u884c\u8a8d\u8b49\u3002"
+            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
+            "follow_link": "\u8acb\u65bc\u50b3\u9001\u524d\uff0c\u5148\u4f7f\u7528\u9023\u7d50\u4e26\u9032\u884c\u8a8d\u8b49\u3002",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/london_underground/sensor.py b/homeassistant/components/london_underground/sensor.py
index 12f40f7b461..c39ef2885b0 100644
--- a/homeassistant/components/london_underground/sensor.py
+++ b/homeassistant/components/london_underground/sensor.py
@@ -1,6 +1,5 @@
 """Sensor for checking the status of London Underground tube lines."""
 from datetime import timedelta
-import logging
 
 from london_tube_status import TubeData
 import voluptuous as vol
@@ -10,8 +9,6 @@ from homeassistant.const import ATTR_ATTRIBUTION
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTRIBUTION = "Powered by TfL Open Data"
 
 CONF_LINE = "line"
diff --git a/homeassistant/components/luftdaten/translations/pl.json b/homeassistant/components/luftdaten/translations/pl.json
index 1a5b58586df..12a56344bba 100644
--- a/homeassistant/components/luftdaten/translations/pl.json
+++ b/homeassistant/components/luftdaten/translations/pl.json
@@ -3,7 +3,7 @@
         "error": {
             "communication_error": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z API Luftdaten",
             "invalid_sensor": "Sensor niedost\u0119pny lub nieprawid\u0142owy",
-            "sensor_exists": "Sensor zosta\u0142 ju\u017c zarejestrowany."
+            "sensor_exists": "Sensor zosta\u0142 ju\u017c zarejestrowany"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/lupusec/binary_sensor.py b/homeassistant/components/lupusec/binary_sensor.py
index 30af5743aa0..963c82da5fa 100644
--- a/homeassistant/components/lupusec/binary_sensor.py
+++ b/homeassistant/components/lupusec/binary_sensor.py
@@ -1,6 +1,5 @@
 """Support for Lupusec Security System binary sensors."""
 from datetime import timedelta
-import logging
 
 import lupupy.constants as CONST
 
@@ -10,8 +9,6 @@ from . import DOMAIN as LUPUSEC_DOMAIN, LupusecDevice
 
 SCAN_INTERVAL = timedelta(seconds=2)
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a sensor for an Lupusec device."""
diff --git a/homeassistant/components/lupusec/switch.py b/homeassistant/components/lupusec/switch.py
index d18fcd7c1f7..f35322eb773 100644
--- a/homeassistant/components/lupusec/switch.py
+++ b/homeassistant/components/lupusec/switch.py
@@ -1,6 +1,5 @@
 """Support for Lupusec Security System switches."""
 from datetime import timedelta
-import logging
 
 import lupupy.constants as CONST
 
@@ -10,8 +9,6 @@ from . import DOMAIN as LUPUSEC_DOMAIN, LupusecDevice
 
 SCAN_INTERVAL = timedelta(seconds=2)
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up Lupusec switch devices."""
diff --git a/homeassistant/components/lutron/binary_sensor.py b/homeassistant/components/lutron/binary_sensor.py
index e2e143da435..f77a2b120da 100644
--- a/homeassistant/components/lutron/binary_sensor.py
+++ b/homeassistant/components/lutron/binary_sensor.py
@@ -51,6 +51,4 @@ class LutronOccupancySensor(LutronDevice, BinarySensorEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {}
-        attr["lutron_integration_id"] = self._lutron_device.id
-        return attr
+        return {"lutron_integration_id": self._lutron_device.id}
diff --git a/homeassistant/components/lutron/cover.py b/homeassistant/components/lutron/cover.py
index 438a433fb0f..1ec7c07aac0 100644
--- a/homeassistant/components/lutron/cover.py
+++ b/homeassistant/components/lutron/cover.py
@@ -66,6 +66,4 @@ class LutronCover(LutronDevice, CoverEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {}
-        attr["Lutron Integration ID"] = self._lutron_device.id
-        return attr
+        return {"Lutron Integration ID": self._lutron_device.id}
diff --git a/homeassistant/components/lutron/light.py b/homeassistant/components/lutron/light.py
index 2b5bff7d848..d74d24f71a1 100644
--- a/homeassistant/components/lutron/light.py
+++ b/homeassistant/components/lutron/light.py
@@ -1,6 +1,4 @@
 """Support for Lutron lights."""
-import logging
-
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     SUPPORT_BRIGHTNESS,
@@ -9,8 +7,6 @@ from homeassistant.components.light import (
 
 from . import LUTRON_CONTROLLER, LUTRON_DEVICES, LutronDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Lutron lights."""
@@ -71,8 +67,7 @@ class LutronLight(LutronDevice, LightEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {"lutron_integration_id": self._lutron_device.id}
-        return attr
+        return {"lutron_integration_id": self._lutron_device.id}
 
     @property
     def is_on(self):
diff --git a/homeassistant/components/lutron/scene.py b/homeassistant/components/lutron/scene.py
index 468597ba5ea..eaadc4197fe 100644
--- a/homeassistant/components/lutron/scene.py
+++ b/homeassistant/components/lutron/scene.py
@@ -1,13 +1,10 @@
 """Support for Lutron scenes."""
-import logging
 from typing import Any
 
 from homeassistant.components.scene import Scene
 
 from . import LUTRON_CONTROLLER, LUTRON_DEVICES, LutronDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Lutron scenes."""
diff --git a/homeassistant/components/lutron/switch.py b/homeassistant/components/lutron/switch.py
index d03cb4a1953..21586aaa266 100644
--- a/homeassistant/components/lutron/switch.py
+++ b/homeassistant/components/lutron/switch.py
@@ -1,12 +1,8 @@
 """Support for Lutron switches."""
-import logging
-
 from homeassistant.components.switch import SwitchEntity
 
 from . import LUTRON_CONTROLLER, LUTRON_DEVICES, LutronDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Lutron switches."""
@@ -48,9 +44,7 @@ class LutronSwitch(LutronDevice, SwitchEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {}
-        attr["lutron_integration_id"] = self._lutron_device.id
-        return attr
+        return {"lutron_integration_id": self._lutron_device.id}
 
     @property
     def is_on(self):
@@ -83,12 +77,11 @@ class LutronLed(LutronDevice, SwitchEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {
+        return {
             "keypad": self._keypad_name,
             "scene": self._scene_name,
             "led": self._lutron_device.name,
         }
-        return attr
 
     @property
     def is_on(self):
diff --git a/homeassistant/components/lutron_caseta/__init__.py b/homeassistant/components/lutron_caseta/__init__.py
index 40b65293f1d..612c6a26d1b 100644
--- a/homeassistant/components/lutron_caseta/__init__.py
+++ b/homeassistant/components/lutron_caseta/__init__.py
@@ -64,9 +64,9 @@ async def async_setup_entry(hass, config_entry):
     """Set up a bridge from a config entry."""
 
     host = config_entry.data[CONF_HOST]
-    keyfile = config_entry.data[CONF_KEYFILE]
-    certfile = config_entry.data[CONF_CERTFILE]
-    ca_certs = config_entry.data[CONF_CA_CERTS]
+    keyfile = hass.config.path(config_entry.data[CONF_KEYFILE])
+    certfile = hass.config.path(config_entry.data[CONF_CERTFILE])
+    ca_certs = hass.config.path(config_entry.data[CONF_CA_CERTS])
 
     bridge = Smartbridge.create_tls(
         hostname=host, keyfile=keyfile, certfile=certfile, ca_certs=ca_certs
@@ -140,8 +140,7 @@ class LutronCasetaDevice(Entity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {"device_id": self.device_id, "zone_id": self._device["zone"]}
-        return attr
+        return {"device_id": self.device_id, "zone_id": self._device["zone"]}
 
     @property
     def should_poll(self):
diff --git a/homeassistant/components/lutron_caseta/config_flow.py b/homeassistant/components/lutron_caseta/config_flow.py
index 3a5a4a151a1..1290d88b09c 100644
--- a/homeassistant/components/lutron_caseta/config_flow.py
+++ b/homeassistant/components/lutron_caseta/config_flow.py
@@ -83,9 +83,9 @@ class LutronCasetaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         try:
             bridge = Smartbridge.create_tls(
                 hostname=self.data[CONF_HOST],
-                keyfile=self.data[CONF_KEYFILE],
-                certfile=self.data[CONF_CERTFILE],
-                ca_certs=self.data[CONF_CA_CERTS],
+                keyfile=self.hass.config.path(self.data[CONF_KEYFILE]),
+                certfile=self.hass.config.path(self.data[CONF_CERTFILE]),
+                ca_certs=self.hass.config.path(self.data[CONF_CA_CERTS]),
             )
 
             await bridge.connect()
diff --git a/homeassistant/components/lutron_caseta/cover.py b/homeassistant/components/lutron_caseta/cover.py
index 81a65786900..5eabfcd16fe 100644
--- a/homeassistant/components/lutron_caseta/cover.py
+++ b/homeassistant/components/lutron_caseta/cover.py
@@ -7,6 +7,7 @@ from homeassistant.components.cover import (
     SUPPORT_CLOSE,
     SUPPORT_OPEN,
     SUPPORT_SET_POSITION,
+    SUPPORT_STOP,
     CoverEntity,
 )
 
@@ -39,7 +40,7 @@ class LutronCasetaCover(LutronCasetaDevice, CoverEntity):
     @property
     def supported_features(self):
         """Flag supported features."""
-        return SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_SET_POSITION
+        return SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_STOP | SUPPORT_SET_POSITION
 
     @property
     def is_closed(self):
@@ -51,19 +52,27 @@ class LutronCasetaCover(LutronCasetaDevice, CoverEntity):
         """Return the current position of cover."""
         return self._device["current_state"]
 
+    async def async_stop_cover(self, **kwargs):
+        """Top the cover."""
+        await self._smartbridge.stop_cover(self.device_id)
+
     async def async_close_cover(self, **kwargs):
         """Close the cover."""
-        self._smartbridge.set_value(self.device_id, 0)
+        await self._smartbridge.lower_cover(self.device_id)
+        self.async_update()
+        self.async_write_ha_state()
 
     async def async_open_cover(self, **kwargs):
         """Open the cover."""
-        self._smartbridge.set_value(self.device_id, 100)
+        await self._smartbridge.raise_cover(self.device_id)
+        self.async_update()
+        self.async_write_ha_state()
 
     async def async_set_cover_position(self, **kwargs):
         """Move the shade to a specific position."""
         if ATTR_POSITION in kwargs:
             position = kwargs[ATTR_POSITION]
-            self._smartbridge.set_value(self.device_id, position)
+            await self._smartbridge.set_value(self.device_id, position)
 
     async def async_update(self):
         """Call when forcing a refresh of the device."""
diff --git a/homeassistant/components/lutron_caseta/fan.py b/homeassistant/components/lutron_caseta/fan.py
index aa6ab1c7144..90728c5f2fe 100644
--- a/homeassistant/components/lutron_caseta/fan.py
+++ b/homeassistant/components/lutron_caseta/fan.py
@@ -84,7 +84,7 @@ class LutronCasetaFan(LutronCasetaDevice, FanEntity):
 
     async def async_set_speed(self, speed: str) -> None:
         """Set the speed of the fan."""
-        self._smartbridge.set_fan(self.device_id, SPEED_TO_VALUE[speed])
+        await self._smartbridge.set_fan(self.device_id, SPEED_TO_VALUE[speed])
 
     @property
     def is_on(self):
diff --git a/homeassistant/components/lutron_caseta/light.py b/homeassistant/components/lutron_caseta/light.py
index 471be51219b..c46e8931390 100644
--- a/homeassistant/components/lutron_caseta/light.py
+++ b/homeassistant/components/lutron_caseta/light.py
@@ -1,10 +1,13 @@
 """Support for Lutron Caseta lights."""
+from datetime import timedelta
 import logging
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
+    ATTR_TRANSITION,
     DOMAIN,
     SUPPORT_BRIGHTNESS,
+    SUPPORT_TRANSITION,
     LightEntity,
 )
 
@@ -47,21 +50,31 @@ class LutronCasetaLight(LutronCasetaDevice, LightEntity):
     @property
     def supported_features(self):
         """Flag supported features."""
-        return SUPPORT_BRIGHTNESS
+        return SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION
 
     @property
     def brightness(self):
         """Return the brightness of the light."""
         return to_hass_level(self._device["current_state"])
 
+    async def _set_brightness(self, brightness, **kwargs):
+        args = {}
+        if ATTR_TRANSITION in kwargs:
+            args["fade_time"] = timedelta(seconds=kwargs[ATTR_TRANSITION])
+
+        await self._smartbridge.set_value(
+            self.device_id, to_lutron_level(brightness), **args
+        )
+
     async def async_turn_on(self, **kwargs):
         """Turn the light on."""
-        brightness = kwargs.get(ATTR_BRIGHTNESS, 255)
-        self._smartbridge.set_value(self.device_id, to_lutron_level(brightness))
+        brightness = kwargs.pop(ATTR_BRIGHTNESS, 255)
+
+        await self._set_brightness(brightness, **kwargs)
 
     async def async_turn_off(self, **kwargs):
         """Turn the light off."""
-        self._smartbridge.set_value(self.device_id, 0)
+        await self._set_brightness(0, **kwargs)
 
     @property
     def is_on(self):
diff --git a/homeassistant/components/lutron_caseta/manifest.json b/homeassistant/components/lutron_caseta/manifest.json
index 34fc326425c..f80e34a6b5c 100644
--- a/homeassistant/components/lutron_caseta/manifest.json
+++ b/homeassistant/components/lutron_caseta/manifest.json
@@ -3,9 +3,9 @@
   "name": "Lutron Caséta",
   "documentation": "https://www.home-assistant.io/integrations/lutron_caseta",
   "requirements": [
-    "pylutron-caseta==0.6.1"
+    "pylutron-caseta==0.7.0"
   ],
   "codeowners": [
     "@swails"
   ]
-}
+}
\ No newline at end of file
diff --git a/homeassistant/components/lutron_caseta/scene.py b/homeassistant/components/lutron_caseta/scene.py
index c74f60bc88c..51dff935d93 100644
--- a/homeassistant/components/lutron_caseta/scene.py
+++ b/homeassistant/components/lutron_caseta/scene.py
@@ -1,13 +1,10 @@
 """Support for Lutron Caseta scenes."""
-import logging
 from typing import Any
 
 from homeassistant.components.scene import Scene
 
 from . import DOMAIN as CASETA_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Lutron Caseta scene platform.
@@ -43,4 +40,4 @@ class LutronCasetaScene(Scene):
 
     async def async_activate(self, **kwargs: Any) -> None:
         """Activate the scene."""
-        self._bridge.activate_scene(self._scene_id)
+        await self._bridge.activate_scene(self._scene_id)
diff --git a/homeassistant/components/lutron_caseta/strings.json b/homeassistant/components/lutron_caseta/strings.json
index 082497b1bf2..a03cdd8c9d6 100644
--- a/homeassistant/components/lutron_caseta/strings.json
+++ b/homeassistant/components/lutron_caseta/strings.json
@@ -7,11 +7,11 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect to Caséta bridge; check your host and certificate configuration."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "Caséta bridge already configured.",
-      "cannot_connect": "Cancelled setup of Caséta bridge due to connection failure."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/lutron_caseta/switch.py b/homeassistant/components/lutron_caseta/switch.py
index d7f9246feeb..1cccd485524 100644
--- a/homeassistant/components/lutron_caseta/switch.py
+++ b/homeassistant/components/lutron_caseta/switch.py
@@ -32,11 +32,11 @@ class LutronCasetaLight(LutronCasetaDevice, SwitchEntity):
 
     async def async_turn_on(self, **kwargs):
         """Turn the switch on."""
-        self._smartbridge.turn_on(self.device_id)
+        await self._smartbridge.turn_on(self.device_id)
 
     async def async_turn_off(self, **kwargs):
         """Turn the switch off."""
-        self._smartbridge.turn_off(self.device_id)
+        await self._smartbridge.turn_off(self.device_id)
 
     @property
     def is_on(self):
diff --git a/homeassistant/components/lutron_caseta/translations/ca.json b/homeassistant/components/lutron_caseta/translations/ca.json
index 4b6be6e3a6e..c3b0e686cc4 100644
--- a/homeassistant/components/lutron_caseta/translations/ca.json
+++ b/homeassistant/components/lutron_caseta/translations/ca.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'enlla\u00e7 de Cas\u00e9ta ja configurat.",
-            "cannot_connect": "S'ha cancel\u00b7lat la configuraci\u00f3 de l'enlla\u00e7 de Cas\u00e9ta per un error en la connexi\u00f3."
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "cannot_connect": "Ha fallat la connexi\u00f3"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar a l'enlla\u00e7 de Cas\u00e9ta; comprova la configuraci\u00f3 de l'amfitri\u00f3 i del certificat."
+            "cannot_connect": "Ha fallat la connexi\u00f3"
         },
         "step": {
             "import_failed": {
diff --git a/homeassistant/components/lutron_caseta/translations/cs.json b/homeassistant/components/lutron_caseta/translations/cs.json
new file mode 100644
index 00000000000..60fa7fddced
--- /dev/null
+++ b/homeassistant/components/lutron_caseta/translations/cs.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/lutron_caseta/translations/en.json b/homeassistant/components/lutron_caseta/translations/en.json
index 469bcae37c7..3797d476db3 100644
--- a/homeassistant/components/lutron_caseta/translations/en.json
+++ b/homeassistant/components/lutron_caseta/translations/en.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Cas\u00e9ta bridge already configured.",
-            "cannot_connect": "Cancelled setup of Cas\u00e9ta bridge due to connection failure."
+            "already_configured": "Device is already configured",
+            "cannot_connect": "Failed to connect"
         },
         "error": {
-            "cannot_connect": "Failed to connect to Cas\u00e9ta bridge; check your host and certificate configuration."
+            "cannot_connect": "Failed to connect"
         },
         "step": {
             "import_failed": {
diff --git a/homeassistant/components/lutron_caseta/translations/es.json b/homeassistant/components/lutron_caseta/translations/es.json
index 3440342d40f..cfd8551bab9 100644
--- a/homeassistant/components/lutron_caseta/translations/es.json
+++ b/homeassistant/components/lutron_caseta/translations/es.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El bridge Cas\u00e9ta ya est\u00e1 configurado.",
-            "cannot_connect": "Configuraci\u00f3n cancelada para el bridge Cas\u00e9ta debido a un error en la conexi\u00f3n."
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
+            "cannot_connect": "No se pudo conectar"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar con el bridge Cas\u00e9ta; compruebe la configuraci\u00f3n del host y del certificado."
+            "cannot_connect": "No se pudo conectar"
         },
         "step": {
             "import_failed": {
diff --git a/homeassistant/components/lutron_caseta/translations/et.json b/homeassistant/components/lutron_caseta/translations/et.json
new file mode 100644
index 00000000000..48afb13b828
--- /dev/null
+++ b/homeassistant/components/lutron_caseta/translations/et.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "import_failed": {
+                "description": "Silla (host: {host} ) seadistamine configuration.yaml kirje teabest nurjus."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/lutron_caseta/translations/it.json b/homeassistant/components/lutron_caseta/translations/it.json
index 9e4cb9ec02c..5bdcf87607d 100644
--- a/homeassistant/components/lutron_caseta/translations/it.json
+++ b/homeassistant/components/lutron_caseta/translations/it.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il bridge Cas\u00e9ta \u00e8 gi\u00e0 configurato.",
-            "cannot_connect": "Configurazione annullata del bridge Cas\u00e9ta a causa di un errore di connessione."
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "cannot_connect": "Impossibile connettersi"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi al bridge Cas\u00e9ta; controllare la configurazione dell'host e del certificato."
+            "cannot_connect": "Impossibile connettersi"
         },
         "step": {
             "import_failed": {
diff --git a/homeassistant/components/lutron_caseta/translations/no.json b/homeassistant/components/lutron_caseta/translations/no.json
index b63e8fb4111..7afac9c51a5 100644
--- a/homeassistant/components/lutron_caseta/translations/no.json
+++ b/homeassistant/components/lutron_caseta/translations/no.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Cas\u00e9ta bridge allerede konfigurert.",
-            "cannot_connect": "Avbrutt oppsett av Cas\u00e9ta bridge p\u00e5 grunn av tilkoblingssvikt."
+            "already_configured": "Enheten er allerede konfigurert",
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "error": {
-            "cannot_connect": "Kunne ikke koble til Cas\u00e9ta bridge; sjekk verts- og sertifikatkonfigurasjonen."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "import_failed": {
diff --git a/homeassistant/components/lutron_caseta/translations/pl.json b/homeassistant/components/lutron_caseta/translations/pl.json
index 9559e7f0e83..d50293af89b 100644
--- a/homeassistant/components/lutron_caseta/translations/pl.json
+++ b/homeassistant/components/lutron_caseta/translations/pl.json
@@ -1,7 +1,17 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+        },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia mostkiem Cas\u00e9ta, sprawd\u017a konfiguracj\u0119 hosta i certyfikatu."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+        },
+        "step": {
+            "import_failed": {
+                "description": "Nie mo\u017cna skonfigurowa\u0107 mostka (host: {host} ) zaimportowanego z pliku configuration.yaml.",
+                "title": "Nie uda\u0142o si\u0119 zaimportowa\u0107 konfiguracji mostka Cas\u00e9ta."
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/lutron_caseta/translations/ru.json b/homeassistant/components/lutron_caseta/translations/ru.json
index f7f566b1f54..05bd4f51c70 100644
--- a/homeassistant/components/lutron_caseta/translations/ru.json
+++ b/homeassistant/components/lutron_caseta/translations/ru.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "cannot_connect": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0448\u043b\u044e\u0437\u0430 \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u0430 \u0438\u0437-\u0437\u0430 \u0441\u0431\u043e\u044f \u0432 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0438."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0448\u043b\u044e\u0437\u0443, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0430\u0434\u0440\u0435\u0441 \u0445\u043e\u0441\u0442\u0430 \u0438 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "step": {
             "import_failed": {
diff --git a/homeassistant/components/lutron_caseta/translations/zh-Hant.json b/homeassistant/components/lutron_caseta/translations/zh-Hant.json
index f975949e6e7..ab4e0832ed6 100644
--- a/homeassistant/components/lutron_caseta/translations/zh-Hant.json
+++ b/homeassistant/components/lutron_caseta/translations/zh-Hant.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Cas\u00e9ta \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
-            "cannot_connect": "\u7531\u65bc\u9023\u7dda\u5931\u6557\uff0c\u5df2\u53d6\u6d88 Cas\u00e9ta bridge \u8a2d\u5b9a\u3002"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u81f3 Cas\u00e9ta bridge \u5931\u6557\uff0c\u8acb\u6aa2\u67e5\u4e3b\u6a5f\u8207\u8a8d\u8b49\u8a2d\u5b9a\u3002"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
         },
         "step": {
             "import_failed": {
diff --git a/homeassistant/components/mailgun/strings.json b/homeassistant/components/mailgun/strings.json
index 29ea3c0b952..a948c6165e7 100644
--- a/homeassistant/components/mailgun/strings.json
+++ b/homeassistant/components/mailgun/strings.json
@@ -7,7 +7,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive Mailgun messages."
     },
     "create_entry": {
diff --git a/homeassistant/components/mailgun/translations/ca.json b/homeassistant/components/mailgun/translations/ca.json
index 629205b276d..496894090a7 100644
--- a/homeassistant/components/mailgun/translations/ca.json
+++ b/homeassistant/components/mailgun/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Mailgun.",
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar [Webhooks amb Mailgun]({mailgun_url}). \n\nCompleta la seg\u00fcent informaci\u00f3: \n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n- Tipus de contingut: application/json\n\nConsulta la [documentaci\u00f3]({docs_url}) sobre com configurar les automatitzacions per gestionar dades entrants."
diff --git a/homeassistant/components/mailgun/translations/cs.json b/homeassistant/components/mailgun/translations/cs.json
index 110364427d8..810483ec4ae 100644
--- a/homeassistant/components/mailgun/translations/cs.json
+++ b/homeassistant/components/mailgun/translations/cs.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Va\u0161e Home Assistant instance mus\u00ed b\u00fdt p\u0159\u00edstupn\u00e1 z internetu aby mohla p\u0159ij\u00edmat zpr\u00e1vy Mailgun.",
-            "one_instance_allowed": "Povolena je pouze jedna instance."
+            "not_internet_accessible": "V\u00e1\u0161 Home Asistent mus\u00ed b\u00fdt p\u0159\u00edstupn\u00fd z internetu, aby mohl p\u0159ij\u00edmat zpr\u00e1vy od Mailgun.",
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "create_entry": {
             "default": "Chcete-li odeslat ud\u00e1losti do aplikace Home Assistant, budete muset nastavit [Webhooks with Mailgun]({mailgun_url}). \n\n Vypl\u0148te n\u00e1sleduj\u00edc\u00ed informace: \n\n - URL: `{webhook_url}`\n - Metoda: POST \n - Typ obsahu: application/json\n\n Viz [dokumentace]({docs_url}), jak konfigurovat automatizace pro zpracov\u00e1n\u00ed p\u0159\u00edchoz\u00edch dat."
diff --git a/homeassistant/components/mailgun/translations/el.json b/homeassistant/components/mailgun/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/mailgun/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mailgun/translations/en.json b/homeassistant/components/mailgun/translations/en.json
index 85044505c84..bcb3556087d 100644
--- a/homeassistant/components/mailgun/translations/en.json
+++ b/homeassistant/components/mailgun/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive Mailgun messages.",
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "To send events to Home Assistant, you will need to setup [Webhooks with Mailgun]({mailgun_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nSee [the documentation]({docs_url}) on how to configure automations to handle incoming data."
diff --git a/homeassistant/components/mailgun/translations/es.json b/homeassistant/components/mailgun/translations/es.json
index f2e5638dcc3..d7622a5c218 100644
--- a/homeassistant/components/mailgun/translations/es.json
+++ b/homeassistant/components/mailgun/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Tu instancia de Home Assistant debe ser accesible desde Internet para recibir mensajes de Mailgun.",
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "Solo es necesaria una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Para enviar eventos a Home Assistant debes configurar los [Webhooks en Mailgun]({mailgun_url}). \n\n Completa la siguiente informaci\u00f3n: \n\n - URL: `{webhook_url}` \n - M\u00e9todo: POST \n - Tipo de contenido: application/json \n\n Consulta [la documentaci\u00f3n]({docs_url}) sobre c\u00f3mo configurar las automatizaciones para manejar los datos entrantes."
diff --git a/homeassistant/components/mailgun/translations/et.json b/homeassistant/components/mailgun/translations/et.json
new file mode 100644
index 00000000000..077504e9d77
--- /dev/null
+++ b/homeassistant/components/mailgun/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Lubatud on ainult \u00fcks sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovidi Mailguni seadistada?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mailgun/translations/fr.json b/homeassistant/components/mailgun/translations/fr.json
index 266c48f91a5..edb9f01be3d 100644
--- a/homeassistant/components/mailgun/translations/fr.json
+++ b/homeassistant/components/mailgun/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Votre instance Home Assistant doit \u00eatre accessible \u00e0 partir d'Internet pour recevoir les messages Mailgun.",
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "Pour envoyer des \u00e9v\u00e9nements \u00e0 Home Assistant, vous devez configurer [Webhooks avec Mailgun]({mailgun_url}). \n\n Remplissez les informations suivantes: \n\n - URL: `{webhook_url}` \n - M\u00e9thode: POST \n - Type de contenu: application/json \n\n Voir [la documentation]({docs_url}) pour savoir comment configurer les automatisations pour g\u00e9rer les donn\u00e9es entrantes."
diff --git a/homeassistant/components/mailgun/translations/it.json b/homeassistant/components/mailgun/translations/it.json
index 624301a14d1..0373d686744 100644
--- a/homeassistant/components/mailgun/translations/it.json
+++ b/homeassistant/components/mailgun/translations/it.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La tua istanza di Home Assistant deve essere accessibile da Internet per ricevere messaggi da Mailgun.",
-            "one_instance_allowed": "\u00c8 necessaria una sola istanza."
+            "one_instance_allowed": "\u00c8 necessaria una sola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "Per inviare eventi a Home Assistant, dovrai configurare [Webhooks con Mailgun]({mailgun_url})\n\n Compila le seguenti informazioni: \n\n - URL: `{webhook_url}` \n - Method: POST \n - Content Type: application/json\n\n Vedi [la documentazione]({docs_url}) su come configurare le automazioni per gestire i dati in arrivo."
diff --git a/homeassistant/components/mailgun/translations/lb.json b/homeassistant/components/mailgun/translations/lb.json
index 10504b88214..42e3c98d837 100644
--- a/homeassistant/components/mailgun/translations/lb.json
+++ b/homeassistant/components/mailgun/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir Mailgun Noriichten z'empf\u00e4nken.",
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Fir Evenementer un Home Assistant ze sch\u00e9cken, mussen [Webhooks mat Mailgun]({mailgun_url}) ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\nLiest [Dokumentatioun]({docs_url}) w\u00e9i een Automatiounen ariicht welch eingehend Donn\u00e9\u00eb trait\u00e9ieren."
diff --git a/homeassistant/components/mailgun/translations/nl.json b/homeassistant/components/mailgun/translations/nl.json
index 24d10647e32..7cfebddcdbd 100644
--- a/homeassistant/components/mailgun/translations/nl.json
+++ b/homeassistant/components/mailgun/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Uw Home Assistant instantie moet toegankelijk zijn vanaf het internet om Mailgun-berichten te ontvangen.",
-            "one_instance_allowed": "Slechts \u00e9\u00e9n enkele instantie is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n enkele instantie is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Om evenementen naar Home Assistant te verzenden, moet u [Webhooks with Mailgun]({mailgun_url}) instellen. \n\n Vul de volgende info in: \n\n - URL: `{webhook_url}` \n - Methode: POST \n - Inhoudstype: application/json \n\n Zie [de documentatie]({docs_url}) voor informatie over het configureren van automatiseringen om binnenkomende gegevens te verwerken."
diff --git a/homeassistant/components/mailgun/translations/no.json b/homeassistant/components/mailgun/translations/no.json
index 9f26892e703..557979f84c2 100644
--- a/homeassistant/components/mailgun/translations/no.json
+++ b/homeassistant/components/mailgun/translations/no.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Din Home Assistant forekomst m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 motta Mailgun-meldinger.",
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
             "default": "For \u00e5 sende hendelser til Home Assistant, m\u00e5 du sette opp [Webhooks with Mailgun]({mailgun_url}).\n\nFyll ut f\u00f8lgende informasjon:\n\n- URL: `{webhook_url}`\n- Metode: POST\n- Innholdstype: application/json\n\nSe [dokumentasjonen]({docs_url}) om hvordan du konfigurerer automatiseringer for \u00e5 h\u00e5ndtere innkommende data."
diff --git a/homeassistant/components/mailgun/translations/pl.json b/homeassistant/components/mailgun/translations/pl.json
index 5a6b92505b7..6d71f9d9880 100644
--- a/homeassistant/components/mailgun/translations/pl.json
+++ b/homeassistant/components/mailgun/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty Mailgun.",
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty Mailgun",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistanta, musisz skonfigurowa\u0107 [Mailgun Webhook]({mailgun_url}). \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n - Typ zawarto\u015bci: application/json\n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) na temat konfiguracji automatyzacji, by obs\u0142u\u017cy\u0107 przychodz\u0105ce dane."
+            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistant, musisz skonfigurowa\u0107 [Mailgun Webhook]({mailgun_url}). \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n - Typ zawarto\u015bci: application/json\n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) na temat konfiguracji automatyzacji, by obs\u0142u\u017cy\u0107 przychodz\u0105ce dane."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/mailgun/translations/ru.json b/homeassistant/components/mailgun/translations/ru.json
index 1d469c4692d..f8a7c451819 100644
--- a/homeassistant/components/mailgun/translations/ru.json
+++ b/homeassistant/components/mailgun/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 Mailgun.",
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Webhook \u0434\u043b\u044f [Mailgun]({mailgun_url}).\n\n\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0437\u0430\u0446\u0438\u0439 \u043f\u043e \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0435 \u043f\u043e\u0441\u0442\u0443\u043f\u0430\u044e\u0449\u0438\u0445 \u0434\u0430\u043d\u043d\u044b\u0445."
diff --git a/homeassistant/components/mailgun/translations/zh-Hant.json b/homeassistant/components/mailgun/translations/zh-Hant.json
index cd39d7a4d83..51b859cb73f 100644
--- a/homeassistant/components/mailgun/translations/zh-Hant.json
+++ b/homeassistant/components/mailgun/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant \u8a2d\u5099\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 Mailgun \u8a0a\u606f\u3002",
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u8a2d\u5b9a [Webhooks with Mailgun]({mailgun_url}) \u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/json\n\n\u95dc\u65bc\u5982\u4f55\u50b3\u5165\u8cc7\u6599\u81ea\u52d5\u5316\u8a2d\u5b9a\uff0c\u8acb\u53c3\u95b1[\u6587\u4ef6]({docs_url})\u4ee5\u9032\u884c\u4e86\u89e3\u3002"
diff --git a/homeassistant/components/manual/alarm_control_panel.py b/homeassistant/components/manual/alarm_control_panel.py
index 4e361b5086c..2313bcace19 100644
--- a/homeassistant/components/manual/alarm_control_panel.py
+++ b/homeassistant/components/manual/alarm_control_panel.py
@@ -385,7 +385,9 @@ class ManualAlarm(alarm.AlarmControlPanelEntity, RestoreEntity):
         if isinstance(self._code, str):
             alarm_code = self._code
         else:
-            alarm_code = self._code.render(from_state=self._state, to_state=state)
+            alarm_code = self._code.render(
+                parse_result=False, from_state=self._state, to_state=state
+            )
         check = not alarm_code or code == alarm_code
         if not check:
             _LOGGER.warning("Invalid code given for %s", state)
@@ -394,13 +396,12 @@ class ManualAlarm(alarm.AlarmControlPanelEntity, RestoreEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        state_attr = {}
-
         if self.state == STATE_ALARM_PENDING or self.state == STATE_ALARM_ARMING:
-            state_attr[ATTR_PREVIOUS_STATE] = self._previous_state
-            state_attr[ATTR_NEXT_STATE] = self._state
-
-        return state_attr
+            return {
+                ATTR_PREVIOUS_STATE: self._previous_state,
+                ATTR_NEXT_STATE: self._state,
+            }
+        return {}
 
     @callback
     def async_scheduled_update(self, now):
diff --git a/homeassistant/components/manual_mqtt/alarm_control_panel.py b/homeassistant/components/manual_mqtt/alarm_control_panel.py
index 4c760d3dab0..f11938396a7 100644
--- a/homeassistant/components/manual_mqtt/alarm_control_panel.py
+++ b/homeassistant/components/manual_mqtt/alarm_control_panel.py
@@ -406,7 +406,9 @@ class ManualMQTTAlarm(alarm.AlarmControlPanelEntity):
         if isinstance(self._code, str):
             alarm_code = self._code
         else:
-            alarm_code = self._code.render(from_state=self._state, to_state=state)
+            alarm_code = self._code.render(
+                from_state=self._state, to_state=state, parse_result=False
+            )
         check = not alarm_code or code == alarm_code
         if not check:
             _LOGGER.warning("Invalid code given for %s", state)
@@ -415,13 +417,12 @@ class ManualMQTTAlarm(alarm.AlarmControlPanelEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        state_attr = {}
-
-        if self.state == STATE_ALARM_PENDING:
-            state_attr[ATTR_PRE_PENDING_STATE] = self._previous_state
-            state_attr[ATTR_POST_PENDING_STATE] = self._state
-
-        return state_attr
+        if self.state != STATE_ALARM_PENDING:
+            return {}
+        return {
+            ATTR_PRE_PENDING_STATE: self._previous_state,
+            ATTR_POST_PENDING_STATE: self._state,
+        }
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
diff --git a/homeassistant/components/marytts/tts.py b/homeassistant/components/marytts/tts.py
index f04f98896a5..0f75fbcee35 100644
--- a/homeassistant/components/marytts/tts.py
+++ b/homeassistant/components/marytts/tts.py
@@ -1,6 +1,4 @@
 """Support for the MaryTTS service."""
-import logging
-
 from speak2mary import MaryTTS
 import voluptuous as vol
 
@@ -8,8 +6,6 @@ from homeassistant.components.tts import CONF_LANG, PLATFORM_SCHEMA, Provider
 from homeassistant.const import CONF_EFFECT, CONF_HOST, CONF_PORT
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_VOICE = "voice"
 CONF_CODEC = "codec"
 
@@ -25,6 +21,8 @@ DEFAULT_VOICE = "cmu-slt-hsmm"
 DEFAULT_CODEC = "WAVE_FILE"
 DEFAULT_EFFECTS = {}
 
+MAP_MARYTTS_CODEC = {"WAVE_FILE": "wav", "AIFF_FILE": "aiff", "AU_FILE": "au"}
+
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
@@ -85,5 +83,6 @@ class MaryTTSProvider(Provider):
         effects = options[CONF_EFFECT]
 
         data = self._mary.speak(message, effects)
+        audiotype = MAP_MARYTTS_CODEC[self._mary.codec]
 
-        return self._mary.codec, data
+        return audiotype, data
diff --git a/homeassistant/components/matrix/notify.py b/homeassistant/components/matrix/notify.py
index 9f1f0eb992a..0965783bf4d 100644
--- a/homeassistant/components/matrix/notify.py
+++ b/homeassistant/components/matrix/notify.py
@@ -1,6 +1,4 @@
 """Support for Matrix notifications."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.notify import (
@@ -13,8 +11,6 @@ import homeassistant.helpers.config_validation as cv
 
 from .const import DOMAIN, SERVICE_SEND_MESSAGE
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_DEFAULT_ROOM = "default_room"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({vol.Required(CONF_DEFAULT_ROOM): cv.string})
diff --git a/homeassistant/components/maxcube/binary_sensor.py b/homeassistant/components/maxcube/binary_sensor.py
index 1897f3b7465..06b53456973 100644
--- a/homeassistant/components/maxcube/binary_sensor.py
+++ b/homeassistant/components/maxcube/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for MAX! binary sensors via MAX! Cube."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_WINDOW,
     BinarySensorEntity,
@@ -8,8 +6,6 @@ from homeassistant.components.binary_sensor import (
 
 from . import DATA_KEY
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Iterate through all MAX! Devices and add window shutters."""
@@ -38,11 +34,6 @@ class MaxCubeShutter(BinarySensorEntity):
         self._cubehandle = handler
         self._state = None
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def name(self):
         """Return the name of the BinarySensorEntity."""
diff --git a/homeassistant/components/maxcube/climate.py b/homeassistant/components/maxcube/climate.py
index 69d9177da5d..e222784ca57 100644
--- a/homeassistant/components/maxcube/climate.py
+++ b/homeassistant/components/maxcube/climate.py
@@ -40,6 +40,11 @@ OFF_TEMPERATURE = 4.5
 # On (valve fully open)
 ON_TEMPERATURE = 30.5
 
+# Lowest Value without turning off
+MIN_TEMPERATURE = 5.0
+# Largest Value without fully opening
+MAX_TEMPERATURE = 30.0
+
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_PRESET_MODE
 
 HASS_PRESET_TO_MAX_MODE = {
@@ -100,13 +105,17 @@ class MaxCubeClimate(ClimateEntity):
     def min_temp(self):
         """Return the minimum temperature."""
         device = self._cubehandle.cube.device_by_rf(self._rf_address)
-        return self.map_temperature_max_hass(device.min_temperature)
+        if device.min_temperature is None:
+            return MIN_TEMPERATURE
+        return device.min_temperature
 
     @property
     def max_temp(self):
         """Return the maximum temperature."""
         device = self._cubehandle.cube.device_by_rf(self._rf_address)
-        return self.map_temperature_max_hass(device.max_temperature)
+        if device.max_temperature is None:
+            return MAX_TEMPERATURE
+        return device.max_temperature
 
     @property
     def temperature_unit(self):
@@ -117,9 +126,7 @@ class MaxCubeClimate(ClimateEntity):
     def current_temperature(self):
         """Return the current temperature."""
         device = self._cubehandle.cube.device_by_rf(self._rf_address)
-
-        # Map and return current temperature
-        return self.map_temperature_max_hass(device.actual_temperature)
+        return device.actual_temperature
 
     @property
     def hvac_mode(self):
@@ -195,7 +202,13 @@ class MaxCubeClimate(ClimateEntity):
     def target_temperature(self):
         """Return the temperature we try to reach."""
         device = self._cubehandle.cube.device_by_rf(self._rf_address)
-        return self.map_temperature_max_hass(device.target_temperature)
+        if (
+            device.target_temperature is None
+            or device.target_temperature < self.min_temp
+            or device.target_temperature > self.max_temp
+        ):
+            return None
+        return device.target_temperature
 
     def set_temperature(self, **kwargs):
         """Set new target temperatures."""
@@ -273,21 +286,11 @@ class MaxCubeClimate(ClimateEntity):
         """Return the optional state attributes."""
         cube = self._cubehandle.cube
         device = cube.device_by_rf(self._rf_address)
-        attributes = {}
 
-        if cube.is_thermostat(device):
-            attributes[ATTR_VALVE_POSITION] = device.valve_position
-
-        return attributes
+        if not cube.is_thermostat(device):
+            return {}
+        return {ATTR_VALVE_POSITION: device.valve_position}
 
     def update(self):
         """Get latest data from MAX! Cube."""
         self._cubehandle.update()
-
-    @staticmethod
-    def map_temperature_max_hass(temperature):
-        """Map Temperature from MAX! to Home Assistant."""
-        if temperature is None:
-            return 0.0
-
-        return temperature
diff --git a/homeassistant/components/mcp23017/binary_sensor.py b/homeassistant/components/mcp23017/binary_sensor.py
index 8cc50fa9dfa..f6dafad43ac 100644
--- a/homeassistant/components/mcp23017/binary_sensor.py
+++ b/homeassistant/components/mcp23017/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for binary sensor using I2C MCP23017 chip."""
-import logging
-
 from adafruit_mcp230xx.mcp23017 import MCP23017  # pylint: disable=import-error
 import board  # pylint: disable=import-error
 import busio  # pylint: disable=import-error
@@ -11,8 +9,6 @@ from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensor
 from homeassistant.const import DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_I2C_ADDRESS = "i2c_address"
 CONF_PINS = "pins"
diff --git a/homeassistant/components/mcp23017/manifest.json b/homeassistant/components/mcp23017/manifest.json
index 3f7cf97e64e..aeda638710e 100644
--- a/homeassistant/components/mcp23017/manifest.json
+++ b/homeassistant/components/mcp23017/manifest.json
@@ -4,7 +4,6 @@
   "documentation": "https://www.home-assistant.io/integrations/mcp23017",
   "requirements": [
     "RPi.GPIO==0.7.0",
-    "adafruit-blinka==3.9.0",
     "adafruit-circuitpython-mcp230xx==2.2.2"
   ],
   "codeowners": ["@jardiamj"]
diff --git a/homeassistant/components/mcp23017/switch.py b/homeassistant/components/mcp23017/switch.py
index fe76f4ce632..d22593a4c3e 100644
--- a/homeassistant/components/mcp23017/switch.py
+++ b/homeassistant/components/mcp23017/switch.py
@@ -1,6 +1,4 @@
 """Support for switch sensor using I2C MCP23017 chip."""
-import logging
-
 from adafruit_mcp230xx.mcp23017 import MCP23017  # pylint: disable=import-error
 import board  # pylint: disable=import-error
 import busio  # pylint: disable=import-error
@@ -12,8 +10,6 @@ from homeassistant.const import DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import ToggleEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_I2C_ADDRESS = "i2c_address"
 CONF_PINS = "pins"
diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py
index 1bf0e213a25..410d69c22c3 100644
--- a/homeassistant/components/media_player/__init__.py
+++ b/homeassistant/components/media_player/__init__.py
@@ -35,6 +35,7 @@ from homeassistant.const import (
     SERVICE_MEDIA_PREVIOUS_TRACK,
     SERVICE_MEDIA_SEEK,
     SERVICE_MEDIA_STOP,
+    SERVICE_REPEAT_SET,
     SERVICE_SHUFFLE_SET,
     SERVICE_TOGGLE,
     SERVICE_TURN_OFF,
@@ -76,6 +77,7 @@ from .const import (
     ATTR_MEDIA_PLAYLIST,
     ATTR_MEDIA_POSITION,
     ATTR_MEDIA_POSITION_UPDATED_AT,
+    ATTR_MEDIA_REPEAT,
     ATTR_MEDIA_SEASON,
     ATTR_MEDIA_SEEK_POSITION,
     ATTR_MEDIA_SERIES_TITLE,
@@ -88,6 +90,7 @@ from .const import (
     ATTR_SOUND_MODE_LIST,
     DOMAIN,
     MEDIA_CLASS_DIRECTORY,
+    REPEAT_MODES,
     SERVICE_CLEAR_PLAYLIST,
     SERVICE_PLAY_MEDIA,
     SERVICE_SELECT_SOUND_MODE,
@@ -99,6 +102,7 @@ from .const import (
     SUPPORT_PLAY,
     SUPPORT_PLAY_MEDIA,
     SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_REPEAT_SET,
     SUPPORT_SEEK,
     SUPPORT_SELECT_SOUND_MODE,
     SUPPORT_SELECT_SOURCE,
@@ -167,6 +171,7 @@ ATTR_TO_PROPERTY = [
     ATTR_INPUT_SOURCE,
     ATTR_SOUND_MODE,
     ATTR_MEDIA_SHUFFLE,
+    ATTR_MEDIA_REPEAT,
 ]
 
 
@@ -286,11 +291,7 @@ async def async_setup(hass, config):
         SERVICE_MEDIA_SEEK,
         vol.All(
             cv.make_entity_service_schema(
-                {
-                    vol.Required(ATTR_MEDIA_SEEK_POSITION): vol.All(
-                        vol.Coerce(float), vol.Range(min=0)
-                    )
-                }
+                {vol.Required(ATTR_MEDIA_SEEK_POSITION): cv.positive_float}
             ),
             _rename_keys(position=ATTR_MEDIA_SEEK_POSITION),
         ),
@@ -329,6 +330,13 @@ async def async_setup(hass, config):
         [SUPPORT_SHUFFLE_SET],
     )
 
+    component.async_register_entity_service(
+        SERVICE_REPEAT_SET,
+        {vol.Required(ATTR_MEDIA_REPEAT): vol.In(REPEAT_MODES)},
+        "async_set_repeat",
+        [SUPPORT_REPEAT_SET],
+    )
+
     return True
 
 
@@ -512,6 +520,11 @@ class MediaPlayerEntity(Entity):
         """Boolean if shuffle is enabled."""
         return None
 
+    @property
+    def repeat(self):
+        """Return current repeat mode."""
+        return None
+
     @property
     def supported_features(self):
         """Flag media player features that are supported."""
@@ -523,7 +536,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_turn_on(self):
         """Turn the media player on."""
-        await self.hass.async_add_job(self.turn_on)
+        await self.hass.async_add_executor_job(self.turn_on)
 
     def turn_off(self):
         """Turn the media player off."""
@@ -531,7 +544,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_turn_off(self):
         """Turn the media player off."""
-        await self.hass.async_add_job(self.turn_off)
+        await self.hass.async_add_executor_job(self.turn_off)
 
     def mute_volume(self, mute):
         """Mute the volume."""
@@ -539,7 +552,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_mute_volume(self, mute):
         """Mute the volume."""
-        await self.hass.async_add_job(self.mute_volume, mute)
+        await self.hass.async_add_executor_job(self.mute_volume, mute)
 
     def set_volume_level(self, volume):
         """Set volume level, range 0..1."""
@@ -547,7 +560,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_set_volume_level(self, volume):
         """Set volume level, range 0..1."""
-        await self.hass.async_add_job(self.set_volume_level, volume)
+        await self.hass.async_add_executor_job(self.set_volume_level, volume)
 
     def media_play(self):
         """Send play command."""
@@ -555,7 +568,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_media_play(self):
         """Send play command."""
-        await self.hass.async_add_job(self.media_play)
+        await self.hass.async_add_executor_job(self.media_play)
 
     def media_pause(self):
         """Send pause command."""
@@ -563,7 +576,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_media_pause(self):
         """Send pause command."""
-        await self.hass.async_add_job(self.media_pause)
+        await self.hass.async_add_executor_job(self.media_pause)
 
     def media_stop(self):
         """Send stop command."""
@@ -571,7 +584,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_media_stop(self):
         """Send stop command."""
-        await self.hass.async_add_job(self.media_stop)
+        await self.hass.async_add_executor_job(self.media_stop)
 
     def media_previous_track(self):
         """Send previous track command."""
@@ -579,7 +592,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_media_previous_track(self):
         """Send previous track command."""
-        await self.hass.async_add_job(self.media_previous_track)
+        await self.hass.async_add_executor_job(self.media_previous_track)
 
     def media_next_track(self):
         """Send next track command."""
@@ -587,7 +600,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_media_next_track(self):
         """Send next track command."""
-        await self.hass.async_add_job(self.media_next_track)
+        await self.hass.async_add_executor_job(self.media_next_track)
 
     def media_seek(self, position):
         """Send seek command."""
@@ -595,7 +608,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_media_seek(self, position):
         """Send seek command."""
-        await self.hass.async_add_job(self.media_seek, position)
+        await self.hass.async_add_executor_job(self.media_seek, position)
 
     def play_media(self, media_type, media_id, **kwargs):
         """Play a piece of media."""
@@ -603,7 +616,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_play_media(self, media_type, media_id, **kwargs):
         """Play a piece of media."""
-        await self.hass.async_add_job(
+        await self.hass.async_add_executor_job(
             ft.partial(self.play_media, media_type, media_id, **kwargs)
         )
 
@@ -613,7 +626,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_select_source(self, source):
         """Select input source."""
-        await self.hass.async_add_job(self.select_source, source)
+        await self.hass.async_add_executor_job(self.select_source, source)
 
     def select_sound_mode(self, sound_mode):
         """Select sound mode."""
@@ -621,7 +634,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_select_sound_mode(self, sound_mode):
         """Select sound mode."""
-        await self.hass.async_add_job(self.select_sound_mode, sound_mode)
+        await self.hass.async_add_executor_job(self.select_sound_mode, sound_mode)
 
     def clear_playlist(self):
         """Clear players playlist."""
@@ -629,7 +642,7 @@ class MediaPlayerEntity(Entity):
 
     async def async_clear_playlist(self):
         """Clear players playlist."""
-        await self.hass.async_add_job(self.clear_playlist)
+        await self.hass.async_add_executor_job(self.clear_playlist)
 
     def set_shuffle(self, shuffle):
         """Enable/disable shuffle mode."""
@@ -637,7 +650,15 @@ class MediaPlayerEntity(Entity):
 
     async def async_set_shuffle(self, shuffle):
         """Enable/disable shuffle mode."""
-        await self.hass.async_add_job(self.set_shuffle, shuffle)
+        await self.hass.async_add_executor_job(self.set_shuffle, shuffle)
+
+    def set_repeat(self, repeat):
+        """Set repeat mode."""
+        raise NotImplementedError()
+
+    async def async_set_repeat(self, repeat):
+        """Set repeat mode."""
+        await self.hass.async_add_executor_job(self.set_repeat, repeat)
 
     # No need to overwrite these.
     @property
@@ -709,7 +730,7 @@ class MediaPlayerEntity(Entity):
         """Toggle the power on the media player."""
         if hasattr(self, "toggle"):
             # pylint: disable=no-member
-            await self.hass.async_add_job(self.toggle)
+            await self.hass.async_add_executor_job(self.toggle)
             return
 
         if self.state in [STATE_OFF, STATE_IDLE]:
@@ -724,7 +745,7 @@ class MediaPlayerEntity(Entity):
         """
         if hasattr(self, "volume_up"):
             # pylint: disable=no-member
-            await self.hass.async_add_job(self.volume_up)
+            await self.hass.async_add_executor_job(self.volume_up)
             return
 
         if self.volume_level < 1 and self.supported_features & SUPPORT_VOLUME_SET:
@@ -737,7 +758,7 @@ class MediaPlayerEntity(Entity):
         """
         if hasattr(self, "volume_down"):
             # pylint: disable=no-member
-            await self.hass.async_add_job(self.volume_down)
+            await self.hass.async_add_executor_job(self.volume_down)
             return
 
         if self.volume_level > 0 and self.supported_features & SUPPORT_VOLUME_SET:
@@ -747,7 +768,7 @@ class MediaPlayerEntity(Entity):
         """Play or pause the media player."""
         if hasattr(self, "media_play_pause"):
             # pylint: disable=no-member
-            await self.hass.async_add_job(self.media_play_pause)
+            await self.hass.async_add_executor_job(self.media_play_pause)
             return
 
         if self.state == STATE_PLAYING:
diff --git a/homeassistant/components/media_player/const.py b/homeassistant/components/media_player/const.py
index 3db31006341..87ccca75d36 100644
--- a/homeassistant/components/media_player/const.py
+++ b/homeassistant/components/media_player/const.py
@@ -17,6 +17,7 @@ ATTR_MEDIA_EPISODE = "media_episode"
 ATTR_MEDIA_PLAYLIST = "media_playlist"
 ATTR_MEDIA_POSITION = "media_position"
 ATTR_MEDIA_POSITION_UPDATED_AT = "media_position_updated_at"
+ATTR_MEDIA_REPEAT = "repeat"
 ATTR_MEDIA_SEASON = "media_season"
 ATTR_MEDIA_SEEK_POSITION = "seek_position"
 ATTR_MEDIA_SERIES_TITLE = "media_series_title"
@@ -78,6 +79,11 @@ SERVICE_PLAY_MEDIA = "play_media"
 SERVICE_SELECT_SOUND_MODE = "select_sound_mode"
 SERVICE_SELECT_SOURCE = "select_source"
 
+REPEAT_MODE_ALL = "all"
+REPEAT_MODE_OFF = "off"
+REPEAT_MODE_ONE = "one"
+REPEAT_MODES = [REPEAT_MODE_OFF, REPEAT_MODE_ALL, REPEAT_MODE_ONE]
+
 SUPPORT_PAUSE = 1
 SUPPORT_SEEK = 2
 SUPPORT_VOLUME_SET = 4
@@ -96,3 +102,4 @@ SUPPORT_PLAY = 16384
 SUPPORT_SHUFFLE_SET = 32768
 SUPPORT_SELECT_SOUND_MODE = 65536
 SUPPORT_BROWSE_MEDIA = 131072
+SUPPORT_REPEAT_SET = 262144
diff --git a/homeassistant/components/media_player/services.yaml b/homeassistant/components/media_player/services.yaml
index 99fdb30b5c5..08637df0745 100644
--- a/homeassistant/components/media_player/services.yaml
+++ b/homeassistant/components/media_player/services.yaml
@@ -156,3 +156,13 @@ shuffle_set:
     shuffle:
       description: True/false for enabling/disabling shuffle.
       example: true
+
+repeat_set:
+  description: Set repeat mode.
+  fields:
+    entity_id:
+      description: Name(s) of entities to set.
+      example: "media_player.sonos"
+    repeat:
+      description: Repeat mode to set (off, all, one).
+      example: "off"
diff --git a/homeassistant/components/media_player/translations/cs.json b/homeassistant/components/media_player/translations/cs.json
index ea2579d798a..e20ec750f79 100644
--- a/homeassistant/components/media_player/translations/cs.json
+++ b/homeassistant/components/media_player/translations/cs.json
@@ -11,10 +11,10 @@
     "state": {
         "_": {
             "idle": "Ne\u010dinn\u00fd",
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed",
+            "off": "Vypnuto",
+            "on": "Zapnuto",
             "paused": "Pozastaveno",
-            "playing": "P\u0159ehr\u00e1v\u00e1n\u00ed",
+            "playing": "P\u0159ehr\u00e1v\u00e1",
             "standby": "Pohotovostn\u00ed re\u017eim"
         }
     },
diff --git a/homeassistant/components/media_player/translations/pl.json b/homeassistant/components/media_player/translations/pl.json
index 8d4f42a1a61..865d2e1df2c 100644
--- a/homeassistant/components/media_player/translations/pl.json
+++ b/homeassistant/components/media_player/translations/pl.json
@@ -11,8 +11,8 @@
     "state": {
         "_": {
             "idle": "nieaktywny",
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony",
+            "off": "wy\u0142.",
+            "on": "w\u0142.",
             "paused": "wstrzymany",
             "playing": "odtwarzanie",
             "standby": "tryb czuwania"
diff --git a/homeassistant/components/media_source/const.py b/homeassistant/components/media_source/const.py
index 739af47e653..d146cd953f8 100644
--- a/homeassistant/components/media_source/const.py
+++ b/homeassistant/components/media_source/const.py
@@ -16,5 +16,5 @@ MEDIA_CLASS_MAP = {
 }
 URI_SCHEME = "media-source://"
 URI_SCHEME_REGEX = re.compile(
-    r"^media-source:\/\/(?:(?P<domain>(?!.+__)(?!_)[\da-z_]+(?<!_))(?:\/(?P<identifier>(?!\/).+))?)?$"
+    r"^media-source:\/\/(?:(?P<domain>(?!_)[\da-z_]+(?<!_))(?:\/(?P<identifier>(?!\/).+))?)?$"
 )
diff --git a/homeassistant/components/melcloud/climate.py b/homeassistant/components/melcloud/climate.py
index ed2fefc823d..4c409ec5a4d 100644
--- a/homeassistant/components/melcloud/climate.py
+++ b/homeassistant/components/melcloud/climate.py
@@ -1,6 +1,5 @@
 """Platform for climate integration."""
 from datetime import timedelta
-import logging
 from typing import Any, Dict, List, Optional
 
 from pymelcloud import DEVICE_TYPE_ATA, DEVICE_TYPE_ATW, AtaDevice, AtwDevice
@@ -47,8 +46,6 @@ from .const import (
 
 SCAN_INTERVAL = timedelta(seconds=60)
 
-_LOGGER = logging.getLogger(__name__)
-
 
 ATA_HVAC_MODE_LOOKUP = {
     ata.OPERATION_MODE_HEAT: HVAC_MODE_HEAT,
diff --git a/homeassistant/components/melcloud/config_flow.py b/homeassistant/components/melcloud/config_flow.py
index 8813883c151..41ce24989a5 100644
--- a/homeassistant/components/melcloud/config_flow.py
+++ b/homeassistant/components/melcloud/config_flow.py
@@ -1,6 +1,5 @@
 """Config flow for the MELCloud platform."""
 import asyncio
-import logging
 from typing import Optional
 
 from aiohttp import ClientError, ClientResponseError
@@ -19,8 +18,6 @@ from homeassistant.const import (
 
 from .const import DOMAIN  # pylint: disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class FlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
diff --git a/homeassistant/components/melcloud/sensor.py b/homeassistant/components/melcloud/sensor.py
index 774b66ab67e..c96433f17df 100644
--- a/homeassistant/components/melcloud/sensor.py
+++ b/homeassistant/components/melcloud/sensor.py
@@ -1,6 +1,4 @@
 """Support for MelCloud device sensors."""
-import logging
-
 from pymelcloud import DEVICE_TYPE_ATA, DEVICE_TYPE_ATW
 from pymelcloud.atw_device import Zone
 
@@ -84,8 +82,6 @@ ATW_ZONE_SENSORS = {
     },
 }
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up MELCloud device sensors based on config_entry."""
diff --git a/homeassistant/components/melcloud/strings.json b/homeassistant/components/melcloud/strings.json
index c4161a87ff8..a1bce80d7ad 100644
--- a/homeassistant/components/melcloud/strings.json
+++ b/homeassistant/components/melcloud/strings.json
@@ -11,12 +11,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
       "already_configured": "MELCloud integration already configured for this email. Access token has been refreshed."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/melcloud/translations/ca.json b/homeassistant/components/melcloud/translations/ca.json
index 2da4f4b57f3..b31698d28ce 100644
--- a/homeassistant/components/melcloud/translations/ca.json
+++ b/homeassistant/components/melcloud/translations/ca.json
@@ -4,7 +4,7 @@
             "already_configured": "La integraci\u00f3 MELCloud ja est\u00e0 configurada amb aquest correu electr\u00f2nic. El token d'acc\u00e9s s'ha actualitzat."
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/melcloud/translations/cs.json b/homeassistant/components/melcloud/translations/cs.json
index e20e44aec6e..fe9df6f8625 100644
--- a/homeassistant/components/melcloud/translations/cs.json
+++ b/homeassistant/components/melcloud/translations/cs.json
@@ -1,11 +1,21 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Integrace MELCloud ji\u017e pro tento e-mail nastavena. P\u0159\u00edstupov\u00fd token byl aktualizov\u00e1n."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "E-mail"
-                }
+                },
+                "description": "P\u0159ipojte se pomoc\u00ed sv\u00e9ho \u00fa\u010dtu MELCloud.",
+                "title": "P\u0159ipojen\u00ed k MELCloud"
             }
         }
     }
diff --git a/homeassistant/components/melcloud/translations/en.json b/homeassistant/components/melcloud/translations/en.json
index 6e701fecf55..e21fe15f304 100644
--- a/homeassistant/components/melcloud/translations/en.json
+++ b/homeassistant/components/melcloud/translations/en.json
@@ -4,7 +4,7 @@
             "already_configured": "MELCloud integration already configured for this email. Access token has been refreshed."
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/melcloud/translations/et.json b/homeassistant/components/melcloud/translations/et.json
new file mode 100644
index 00000000000..8905edc111e
--- /dev/null
+++ b/homeassistant/components/melcloud/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Selle kasutaja jaoks on MELCloudi sidumine juba seadistatud. Juurdep\u00e4\u00e4suluba on v\u00e4rskendatud."
+        },
+        "error": {
+            "cannot_connect": "\u00dchenduse loomine nurjus. Proovi uuesti",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "E-post"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/melcloud/translations/it.json b/homeassistant/components/melcloud/translations/it.json
index 2a312561932..15d9f0d06fc 100644
--- a/homeassistant/components/melcloud/translations/it.json
+++ b/homeassistant/components/melcloud/translations/it.json
@@ -4,7 +4,7 @@
             "already_configured": "Integrazione MELCloud gi\u00e0 configurata per questa e-mail. Il token di accesso \u00e8 stato aggiornato."
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare.",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/melcloud/translations/no.json b/homeassistant/components/melcloud/translations/no.json
index e96fdb171e7..037b06f5d2d 100644
--- a/homeassistant/components/melcloud/translations/no.json
+++ b/homeassistant/components/melcloud/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "MELCloud integrasjon er allerede konfigurert p\u00e5 denne e-posten. Access token har blitt oppdatert."
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
diff --git a/homeassistant/components/melcloud/translations/pl.json b/homeassistant/components/melcloud/translations/pl.json
index cd0c961089e..c41dcac5bda 100644
--- a/homeassistant/components/melcloud/translations/pl.json
+++ b/homeassistant/components/melcloud/translations/pl.json
@@ -4,7 +4,7 @@
             "already_configured": "Integracja MELCloud jest ju\u017c skonfigurowana dla tego adresu e-mail. Token dost\u0119pu zosta\u0142 od\u015bwie\u017cony."
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/melcloud/translations/ru.json b/homeassistant/components/melcloud/translations/ru.json
index 7fd6d31a753..e904ea4e8b7 100644
--- a/homeassistant/components/melcloud/translations/ru.json
+++ b/homeassistant/components/melcloud/translations/ru.json
@@ -4,7 +4,7 @@
             "already_configured": "\u0418\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f MELCloud \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u0430\u0434\u0440\u0435\u0441\u0430 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b. \u0422\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/melcloud/translations/zh-Hant.json b/homeassistant/components/melcloud/translations/zh-Hant.json
index 1e6e1d880c7..9947b5ac990 100644
--- a/homeassistant/components/melcloud/translations/zh-Hant.json
+++ b/homeassistant/components/melcloud/translations/zh-Hant.json
@@ -4,7 +4,7 @@
             "already_configured": "\u5df2\u4f7f\u7528\u6b64\u90f5\u4ef6\u8a2d\u5b9a MELCloud \u6574\u5408\u3002\u5b58\u53d6\u5bc6\u9470\u5df2\u66f4\u65b0\u3002"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/melissa/__init__.py b/homeassistant/components/melissa/__init__.py
index c03939e3e9c..dfbe2f27fcb 100644
--- a/homeassistant/components/melissa/__init__.py
+++ b/homeassistant/components/melissa/__init__.py
@@ -1,6 +1,4 @@
 """Support for Melissa climate."""
-import logging
-
 import melissa
 import voluptuous as vol
 
@@ -8,8 +6,6 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "melissa"
 DATA_MELISSA = "MELISSA"
 
diff --git a/homeassistant/components/met/config_flow.py b/homeassistant/components/met/config_flow.py
index b9a992bb823..6b3d6735f46 100644
--- a/homeassistant/components/met/config_flow.py
+++ b/homeassistant/components/met/config_flow.py
@@ -47,7 +47,7 @@ class MetFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                 return self.async_create_entry(
                     title=user_input[CONF_NAME], data=user_input
                 )
-            self._errors[CONF_NAME] = "name_exists"
+            self._errors[CONF_NAME] = "already_configured"
 
         return await self._show_config_form(
             name=HOME_LOCATION_NAME,
diff --git a/homeassistant/components/met/strings.json b/homeassistant/components/met/strings.json
index 814df01b49e..c3e28d98eff 100644
--- a/homeassistant/components/met/strings.json
+++ b/homeassistant/components/met/strings.json
@@ -5,13 +5,13 @@
         "title": "Location",
         "description": "Meteorologisk institutt",
         "data": {
-          "name": "Name",
-          "latitude": "Latitude",
-          "longitude": "Longitude",
+          "name": "[%key:common::config_flow::data::name%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]",
           "elevation": "Elevation"
         }
       }
     },
-    "error": { "name_exists": "Location already exists" }
+    "error": { "already_configured": "[%key:common::config_flow::abort::already_configured_service%]" }
   }
 }
diff --git a/homeassistant/components/met/translations/ca.json b/homeassistant/components/met/translations/ca.json
index 242232663f0..d33e905e721 100644
--- a/homeassistant/components/met/translations/ca.json
+++ b/homeassistant/components/met/translations/ca.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "already_configured": "El servei ja est\u00e0 configurat",
             "name_exists": "El nom ja existeix"
         },
         "step": {
diff --git a/homeassistant/components/met/translations/cs.json b/homeassistant/components/met/translations/cs.json
new file mode 100644
index 00000000000..520a14ef9ab
--- /dev/null
+++ b/homeassistant/components/met/translations/cs.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "error": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena",
+            "name_exists": "Um\u00edst\u011bn\u00ed ji\u017e existuje"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "elevation": "Nadmo\u0159sk\u00e1 v\u00fd\u0161ka",
+                    "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
+                    "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka",
+                    "name": "Jm\u00e9no"
+                },
+                "description": "Meteorologick\u00fd \u00fastav",
+                "title": "Um\u00edst\u011bn\u00ed"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/met/translations/en.json b/homeassistant/components/met/translations/en.json
index 8c57e4226a0..012557d917a 100644
--- a/homeassistant/components/met/translations/en.json
+++ b/homeassistant/components/met/translations/en.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "already_configured": "Service is already configured",
             "name_exists": "Location already exists"
         },
         "step": {
diff --git a/homeassistant/components/met/translations/es.json b/homeassistant/components/met/translations/es.json
index e9cfbce5291..9306bd03022 100644
--- a/homeassistant/components/met/translations/es.json
+++ b/homeassistant/components/met/translations/es.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "already_configured": "El servicio ya est\u00e1 configurado",
             "name_exists": "La ubicaci\u00f3n ya existe"
         },
         "step": {
diff --git a/homeassistant/components/met/translations/et.json b/homeassistant/components/met/translations/et.json
index 3d66c2a532e..df6a380a5e7 100644
--- a/homeassistant/components/met/translations/et.json
+++ b/homeassistant/components/met/translations/et.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "already_configured": "Teenus on juba h\u00e4\u00e4lestatud",
             "name_exists": "See asukoht on juba m\u00e4\u00e4ratud"
         },
         "step": {
diff --git a/homeassistant/components/met/translations/fr.json b/homeassistant/components/met/translations/fr.json
index 9f43be5d93b..fc712cb6912 100644
--- a/homeassistant/components/met/translations/fr.json
+++ b/homeassistant/components/met/translations/fr.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "already_configured": "Le service est d\u00e9j\u00e0 configur\u00e9",
             "name_exists": "Emplacement d\u00e9j\u00e0 existant"
         },
         "step": {
diff --git a/homeassistant/components/met/translations/it.json b/homeassistant/components/met/translations/it.json
index 18433ab1697..16d68553ab4 100644
--- a/homeassistant/components/met/translations/it.json
+++ b/homeassistant/components/met/translations/it.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato",
             "name_exists": "La posizione esiste gi\u00e0"
         },
         "step": {
@@ -8,7 +9,7 @@
                 "data": {
                     "elevation": "Altitudine",
                     "latitude": "Latitudine",
-                    "longitude": "Longitudine",
+                    "longitude": "Logitudine",
                     "name": "Nome"
                 },
                 "description": "Meteorologisk institutt",
diff --git a/homeassistant/components/met/translations/no.json b/homeassistant/components/met/translations/no.json
index 90489288b62..daab4665bca 100644
--- a/homeassistant/components/met/translations/no.json
+++ b/homeassistant/components/met/translations/no.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "error": {
-            "name_exists": "Lokasjonen finnes allerede"
+            "already_configured": "Tjenesten er allerede konfigurert",
+            "name_exists": "Plasseringen finnes allerede"
         },
         "step": {
             "user": {
@@ -12,7 +13,7 @@
                     "name": "Navn"
                 },
                 "description": "",
-                "title": "Lokasjon"
+                "title": "Plassering"
             }
         }
     }
diff --git a/homeassistant/components/met/translations/pl.json b/homeassistant/components/met/translations/pl.json
index a0438b6af8c..8d7ca7d2bad 100644
--- a/homeassistant/components/met/translations/pl.json
+++ b/homeassistant/components/met/translations/pl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "error": {
-            "name_exists": "Lokalizacja ju\u017c istnieje."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana",
+            "name_exists": "Lokalizacja ju\u017c istnieje"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/met/translations/ru.json b/homeassistant/components/met/translations/ru.json
index 85333490f3c..149e085057b 100644
--- a/homeassistant/components/met/translations/ru.json
+++ b/homeassistant/components/met/translations/ru.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "name_exists": "\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043e."
         },
         "step": {
diff --git a/homeassistant/components/met/translations/zh-Hant.json b/homeassistant/components/met/translations/zh-Hant.json
index 0128f0ad448..bb5d2df412a 100644
--- a/homeassistant/components/met/translations/zh-Hant.json
+++ b/homeassistant/components/met/translations/zh-Hant.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "name_exists": "\u8a72\u5ea7\u6a19\u5df2\u5b58\u5728"
         },
         "step": {
diff --git a/homeassistant/components/met/weather.py b/homeassistant/components/met/weather.py
index e4c64f9aeda..f505d1db1a3 100644
--- a/homeassistant/components/met/weather.py
+++ b/homeassistant/components/met/weather.py
@@ -225,3 +225,14 @@ class MetWeather(CoordinatorEntity, WeatherEntity):
                 )
             ha_forecast.append(ha_item)
         return ha_forecast
+
+    @property
+    def device_info(self):
+        """Device info."""
+        return {
+            "identifiers": {(DOMAIN,)},
+            "manufacturer": "Met.no",
+            "model": "Forecast",
+            "default_name": "Forecast",
+            "entry_type": "service",
+        }
diff --git a/homeassistant/components/meteo_france/const.py b/homeassistant/components/meteo_france/const.py
index 59524ed1a80..3ae24cbc71b 100644
--- a/homeassistant/components/meteo_france/const.py
+++ b/homeassistant/components/meteo_france/const.py
@@ -133,6 +133,7 @@ CONDITION_CLASSES = {
         "Brume",
         "Brouillard",
         "Brouillard givrant",
+        "Bancs de Brouillard",
     ],
     "hail": ["Risque de grêle", "Risque de grèle"],
     "lightning": ["Risque d'orages", "Orages"],
diff --git a/homeassistant/components/meteo_france/strings.json b/homeassistant/components/meteo_france/strings.json
index 611d1ca054c..9cb68a0ca73 100644
--- a/homeassistant/components/meteo_france/strings.json
+++ b/homeassistant/components/meteo_france/strings.json
@@ -20,8 +20,8 @@
       "empty": "No result in city search: please check the city field"
     },
     "abort": {
-      "already_configured": "City already configured",
-      "unknown": "Unknown error: please retry later"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     }
   },
   "options": {
@@ -33,4 +33,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/meteo_france/translations/ca.json b/homeassistant/components/meteo_france/translations/ca.json
index 81f2e6f2d20..3fb28025f99 100644
--- a/homeassistant/components/meteo_france/translations/ca.json
+++ b/homeassistant/components/meteo_france/translations/ca.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ciutat ja configurada",
-            "unknown": "Error desconegut: torna-ho a provar m\u00e9s tard"
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada",
+            "unknown": "Error inesperat"
         },
         "error": {
             "empty": "No s'ha trobat cap resultat en la cerca de la ciutat: comprova el camp ciutat"
diff --git a/homeassistant/components/meteo_france/translations/cs.json b/homeassistant/components/meteo_france/translations/cs.json
index da3388bd558..d1c8f632220 100644
--- a/homeassistant/components/meteo_france/translations/cs.json
+++ b/homeassistant/components/meteo_france/translations/cs.json
@@ -1,5 +1,9 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "error": {
             "empty": "\u017d\u00e1dn\u00fd v\u00fdsledek p\u0159i hled\u00e1n\u00ed m\u011bsta: zkontrolujte pros\u00edm pole m\u011bsta"
         },
@@ -8,7 +12,15 @@
                 "data": {
                     "city": "M\u011bsto"
                 },
-                "description": "Vyberte m\u011bsto ze seznamu"
+                "description": "Vyberte m\u011bsto ze seznamu",
+                "title": "M\u00e9t\u00e9o-France"
+            },
+            "user": {
+                "data": {
+                    "city": "M\u011bsto"
+                },
+                "description": "Zadejte PS\u010c (pouze pro Francii, doporu\u010deno) nebo jm\u00e9no m\u011bsta.",
+                "title": "M\u00e9t\u00e9o-France"
             }
         }
     },
diff --git a/homeassistant/components/meteo_france/translations/de.json b/homeassistant/components/meteo_france/translations/de.json
index 1c05beac361..65313f16c41 100644
--- a/homeassistant/components/meteo_france/translations/de.json
+++ b/homeassistant/components/meteo_france/translations/de.json
@@ -4,7 +4,16 @@
             "already_configured": "Stadt bereits konfiguriert",
             "unknown": "Unbekannter Fehler: Bitte versuchen Sie es sp\u00e4ter erneut"
         },
+        "error": {
+            "empty": "Kein Ergebnis bei der Stadtsuche: Bitte \u00fcberpr\u00fcfe das Stadtfeld"
+        },
         "step": {
+            "cities": {
+                "data": {
+                    "city": "Stadt"
+                },
+                "description": "W\u00e4hle deine Stadt aus der Liste"
+            },
             "user": {
                 "data": {
                     "city": "Stadt"
diff --git a/homeassistant/components/meteo_france/translations/en.json b/homeassistant/components/meteo_france/translations/en.json
index 979f705cc5b..b1c4a7c0216 100644
--- a/homeassistant/components/meteo_france/translations/en.json
+++ b/homeassistant/components/meteo_france/translations/en.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "City already configured",
-            "unknown": "Unknown error: please retry later"
+            "already_configured": "Location is already configured",
+            "unknown": "Unexpected error"
         },
         "error": {
             "empty": "No result in city search: please check the city field"
diff --git a/homeassistant/components/meteo_france/translations/et.json b/homeassistant/components/meteo_france/translations/et.json
new file mode 100644
index 00000000000..2579507ab00
--- /dev/null
+++ b/homeassistant/components/meteo_france/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Asukoht on juba m\u00e4\u00e4ratud",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/meteo_france/translations/it.json b/homeassistant/components/meteo_france/translations/it.json
index df5cf4a6375..a8a538ddba3 100644
--- a/homeassistant/components/meteo_france/translations/it.json
+++ b/homeassistant/components/meteo_france/translations/it.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Citt\u00e0 gi\u00e0 configurata",
-            "unknown": "Errore sconosciuto: riprovare pi\u00f9 tardi"
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata",
+            "unknown": "Errore imprevisto"
         },
         "error": {
             "empty": "Nessun risultato nella ricerca della citt\u00e0: si prega di controllare il campo citt\u00e0"
diff --git a/homeassistant/components/meteo_france/translations/no.json b/homeassistant/components/meteo_france/translations/no.json
index 91eea1fcec7..e323d5426da 100644
--- a/homeassistant/components/meteo_france/translations/no.json
+++ b/homeassistant/components/meteo_france/translations/no.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Byen er allerede konfigurert",
-            "unknown": "Ukjent feil: pr\u00f8v p\u00e5 nytt senere"
+            "already_configured": "Plasseringen er allerede konfigurert",
+            "unknown": "Uventet feil"
         },
         "error": {
             "empty": "Ingen resultater i bys\u00f8k: vennligst sjekk byfeltet"
@@ -13,7 +13,7 @@
                     "city": "By"
                 },
                 "description": "Velg din by fra listen",
-                "title": "M\u00e9t\u00e9o-France"
+                "title": ""
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/meteo_france/translations/pl.json b/homeassistant/components/meteo_france/translations/pl.json
index 8ff70e51de5..0030aa83865 100644
--- a/homeassistant/components/meteo_france/translations/pl.json
+++ b/homeassistant/components/meteo_france/translations/pl.json
@@ -1,15 +1,19 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Miasto jest ju\u017c skonfigurowane.",
-            "unknown": "Nieznany b\u0142\u0105d: spr\u00f3buj ponownie p\u00f3\u017aniej."
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
+        },
+        "error": {
+            "empty": "Brak wynik\u00f3w: sprawd\u017a nazw\u0119 w polu miasta"
         },
         "step": {
             "cities": {
                 "data": {
                     "city": "Miasto"
                 },
-                "description": "Wybierz swoje miasto z listy"
+                "description": "Wybierz swoje miasto z listy",
+                "title": "M\u00e9t\u00e9o-France"
             },
             "user": {
                 "data": {
@@ -19,5 +23,14 @@
                 "title": "M\u00e9t\u00e9o-France"
             }
         }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "mode": "Tryb prognozy"
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/meteo_france/translations/ru.json b/homeassistant/components/meteo_france/translations/ru.json
index ba0bf1df3c2..6f42dae3b49 100644
--- a/homeassistant/components/meteo_france/translations/ru.json
+++ b/homeassistant/components/meteo_france/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0441 \u0442\u0430\u043a\u0438\u043c\u0438 \u0436\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0430\u043c\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430: \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u043f\u043e\u0437\u0436\u0435."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "error": {
             "empty": "\u041d\u0435\u0442 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u043f\u043e\u0438\u0441\u043a\u0430. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043f\u043e\u043b\u0435 \"\u0413\u043e\u0440\u043e\u0434\"."
diff --git a/homeassistant/components/meteo_france/translations/sv.json b/homeassistant/components/meteo_france/translations/sv.json
index a3aac5f013a..70fb537fc82 100644
--- a/homeassistant/components/meteo_france/translations/sv.json
+++ b/homeassistant/components/meteo_france/translations/sv.json
@@ -5,6 +5,11 @@
             "unknown": "Ok\u00e4nt fel: f\u00f6rs\u00f6k igen senare"
         },
         "step": {
+            "cities": {
+                "data": {
+                    "city": "Stad"
+                }
+            },
             "user": {
                 "data": {
                     "city": "Stad"
diff --git a/homeassistant/components/meteo_france/translations/zh-Hant.json b/homeassistant/components/meteo_france/translations/zh-Hant.json
index 0179f5ad7d1..32d92956d73 100644
--- a/homeassistant/components/meteo_france/translations/zh-Hant.json
+++ b/homeassistant/components/meteo_france/translations/zh-Hant.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u57ce\u5e02\u5df2\u8a2d\u5b9a\u5b8c\u6210",
-            "unknown": "\u672a\u77e5\u932f\u8aa4\uff1a\u8acb\u7a0d\u5f8c\u518d\u8a66"
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "error": {
             "empty": "\u627e\u4e0d\u5230\u76f8\u7b26\u7684\u57ce\u5e02\uff1a\u8acb\u78ba\u8a8d\u57ce\u5e02\u6b04\u4f4d"
diff --git a/homeassistant/components/metoffice/sensor.py b/homeassistant/components/metoffice/sensor.py
index f8fabd56dce..aed763ca4a4 100644
--- a/homeassistant/components/metoffice/sensor.py
+++ b/homeassistant/components/metoffice/sensor.py
@@ -1,7 +1,4 @@
 """Support for UK Met Office weather service."""
-
-import logging
-
 from homeassistant.const import (
     ATTR_ATTRIBUTION,
     DEVICE_CLASS_HUMIDITY,
@@ -27,8 +24,6 @@ from .const import (
     VISIBILITY_DISTANCE_CLASSES,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_LAST_UPDATE = "last_update"
 ATTR_SENSOR_ID = "sensor_id"
 ATTR_SITE_ID = "site_id"
diff --git a/homeassistant/components/metoffice/strings.json b/homeassistant/components/metoffice/strings.json
index 74d8b16542a..5a1c59bcfb7 100644
--- a/homeassistant/components/metoffice/strings.json
+++ b/homeassistant/components/metoffice/strings.json
@@ -5,9 +5,9 @@
         "description": "The latitude and longitude will be used to find the closest weather station.",
         "title": "Connect to the UK Met Office",
         "data": {
-          "api_key": "Met Office DataPoint API key",
-          "latitude": "Latitude",
-          "longitude": "Longitude"
+          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]"
         }
       }
     },
@@ -16,7 +16,7 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/metoffice/translations/ca.json b/homeassistant/components/metoffice/translations/ca.json
index b37b2994a6b..a17c5c87644 100644
--- a/homeassistant/components/metoffice/translations/ca.json
+++ b/homeassistant/components/metoffice/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositiu ja est\u00e0 configurat"
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "error": {
             "cannot_connect": "Ha fallat la connexi\u00f3",
@@ -10,7 +10,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Clau API DataPoint de Met Office",
+                    "api_key": "Clau API",
                     "latitude": "Latitud",
                     "longitude": "Longitud"
                 },
diff --git a/homeassistant/components/metoffice/translations/cs.json b/homeassistant/components/metoffice/translations/cs.json
index bdede2be02a..e88b4b40667 100644
--- a/homeassistant/components/metoffice/translations/cs.json
+++ b/homeassistant/components/metoffice/translations/cs.json
@@ -1,11 +1,21 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Kl\u00ed\u010d API",
+                    "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
+                    "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka"
+                },
+                "title": "P\u0159ipojen\u00ed k UK Met Office"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/metoffice/translations/en.json b/homeassistant/components/metoffice/translations/en.json
index 341102b688d..de2fe1bb9dd 100644
--- a/homeassistant/components/metoffice/translations/en.json
+++ b/homeassistant/components/metoffice/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Device is already configured"
+            "already_configured": "Service is already configured"
         },
         "error": {
             "cannot_connect": "Failed to connect",
@@ -10,7 +10,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Met Office DataPoint API key",
+                    "api_key": "API Key",
                     "latitude": "Latitude",
                     "longitude": "Longitude"
                 },
diff --git a/homeassistant/components/metoffice/translations/es.json b/homeassistant/components/metoffice/translations/es.json
index 8412a08d55d..098e8fb0335 100644
--- a/homeassistant/components/metoffice/translations/es.json
+++ b/homeassistant/components/metoffice/translations/es.json
@@ -10,7 +10,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Clave API de Met Office DataPoint",
+                    "api_key": "Clave API",
                     "latitude": "Latitud",
                     "longitude": "Longitud"
                 },
diff --git a/homeassistant/components/metoffice/translations/et.json b/homeassistant/components/metoffice/translations/et.json
index c6ad082c40e..48d9e11150d 100644
--- a/homeassistant/components/metoffice/translations/et.json
+++ b/homeassistant/components/metoffice/translations/et.json
@@ -1,5 +1,12 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/metoffice/translations/it.json b/homeassistant/components/metoffice/translations/it.json
index ef2a25b5eea..5b1e885c743 100644
--- a/homeassistant/components/metoffice/translations/it.json
+++ b/homeassistant/components/metoffice/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "error": {
             "cannot_connect": "Impossibile connettersi",
@@ -10,7 +10,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Chiave API Met Office DataPoint",
+                    "api_key": "Chiave API",
                     "latitude": "Latitudine",
                     "longitude": "Logitudine"
                 },
diff --git a/homeassistant/components/metoffice/translations/lb.json b/homeassistant/components/metoffice/translations/lb.json
index da135fc6b78..56ab865f030 100644
--- a/homeassistant/components/metoffice/translations/lb.json
+++ b/homeassistant/components/metoffice/translations/lb.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Apparat ass scho konfigur\u00e9iert"
+            "already_configured": "Service ass scho konfigur\u00e9iert"
         },
         "error": {
             "cannot_connect": "Feeler beim verbannen",
@@ -10,7 +10,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Met Office DataPoint API Schl\u00ebssel",
+                    "api_key": "API Schl\u00ebssel",
                     "latitude": "Breedegrad",
                     "longitude": "L\u00e4ngegrad"
                 },
diff --git a/homeassistant/components/metoffice/translations/nl.json b/homeassistant/components/metoffice/translations/nl.json
new file mode 100644
index 00000000000..ca0c4269579
--- /dev/null
+++ b/homeassistant/components/metoffice/translations/nl.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "latitude": "Breedtegraad",
+                    "longitude": "Lengtegraad"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/metoffice/translations/no.json b/homeassistant/components/metoffice/translations/no.json
index 0dc9d305d97..e8f48906340 100644
--- a/homeassistant/components/metoffice/translations/no.json
+++ b/homeassistant/components/metoffice/translations/no.json
@@ -1,16 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Enheten er allerede konfigurert"
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Met Office DataPoint API-n\u00f8kkel",
+                    "api_key": "API-n\u00f8kkel",
                     "latitude": "Breddegrad",
                     "longitude": "Lengdegrad"
                 },
diff --git a/homeassistant/components/metoffice/translations/pl.json b/homeassistant/components/metoffice/translations/pl.json
index 6b129f2965c..6e068cbb3b5 100644
--- a/homeassistant/components/metoffice/translations/pl.json
+++ b/homeassistant/components/metoffice/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
diff --git a/homeassistant/components/metoffice/translations/ru.json b/homeassistant/components/metoffice/translations/ru.json
index 68c5ef6268d..5fee8461e7c 100644
--- a/homeassistant/components/metoffice/translations/ru.json
+++ b/homeassistant/components/metoffice/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
             "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
@@ -10,7 +10,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "\u041a\u043b\u044e\u0447 API Met Office DataPoint",
+                    "api_key": "\u041a\u043b\u044e\u0447 API",
                     "latitude": "\u0428\u0438\u0440\u043e\u0442\u0430",
                     "longitude": "\u0414\u043e\u043b\u0433\u043e\u0442\u0430"
                 },
diff --git a/homeassistant/components/metoffice/translations/zh-Hans.json b/homeassistant/components/metoffice/translations/zh-Hans.json
new file mode 100644
index 00000000000..597bfc38a86
--- /dev/null
+++ b/homeassistant/components/metoffice/translations/zh-Hans.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25",
+            "unknown": "\u672a\u77e5\u9519\u8bef"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "latitude": "\u7eac\u5ea6",
+                    "longitude": "\u7ecf\u5ea6"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/metoffice/translations/zh-Hant.json b/homeassistant/components/metoffice/translations/zh-Hant.json
index 3b89a94f6b0..381e2b36d80 100644
--- a/homeassistant/components/metoffice/translations/zh-Hant.json
+++ b/homeassistant/components/metoffice/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
             "cannot_connect": "\u9023\u7dda\u5931\u6557",
@@ -10,7 +10,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Met Office DataPoint API \u5bc6\u9470",
+                    "api_key": "API \u5bc6\u9470",
                     "latitude": "\u7def\u5ea6",
                     "longitude": "\u7d93\u5ea6"
                 },
diff --git a/homeassistant/components/metoffice/weather.py b/homeassistant/components/metoffice/weather.py
index 809943c616f..351065226af 100644
--- a/homeassistant/components/metoffice/weather.py
+++ b/homeassistant/components/metoffice/weather.py
@@ -1,7 +1,4 @@
 """Support for UK Met Office weather service."""
-
-import logging
-
 from homeassistant.components.weather import WeatherEntity
 from homeassistant.const import LENGTH_KILOMETERS, TEMP_CELSIUS
 from homeassistant.core import callback
@@ -19,8 +16,6 @@ from .const import (
     VISIBILITY_DISTANCE_CLASSES,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigType, async_add_entities
diff --git a/homeassistant/components/mfi/switch.py b/homeassistant/components/mfi/switch.py
index d2ba2371303..21963140547 100644
--- a/homeassistant/components/mfi/switch.py
+++ b/homeassistant/components/mfi/switch.py
@@ -69,11 +69,6 @@ class MfiSwitch(SwitchEntity):
         self._port = port
         self._target_state = None
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def unique_id(self):
         """Return the unique ID of the device."""
@@ -114,7 +109,7 @@ class MfiSwitch(SwitchEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes for the device."""
-        attr = {}
-        attr["volts"] = round(self._port.data.get("v_rms", 0), 1)
-        attr["amps"] = round(self._port.data.get("i_rms", 0), 1)
-        return attr
+        return {
+            "volts": round(self._port.data.get("v_rms", 0), 1),
+            "amps": round(self._port.data.get("i_rms", 0), 1),
+        }
diff --git a/homeassistant/components/miflora/sensor.py b/homeassistant/components/miflora/sensor.py
index 94db0417ddb..6583f5f7e0c 100644
--- a/homeassistant/components/miflora/sensor.py
+++ b/homeassistant/components/miflora/sensor.py
@@ -16,6 +16,9 @@ from homeassistant.const import (
     CONF_MONITORED_CONDITIONS,
     CONF_NAME,
     CONF_SCAN_INTERVAL,
+    DEVICE_CLASS_BATTERY,
+    DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_TEMPERATURE,
     EVENT_HOMEASSISTANT_START,
     LIGHT_LUX,
     PERCENTAGE,
@@ -51,13 +54,13 @@ SCAN_INTERVAL = timedelta(seconds=1200)
 
 ATTR_LAST_SUCCESSFUL_UPDATE = "last_successful_update"
 
-# Sensor types are defined like: Name, units, icon
+# Sensor types are defined like: Name, units, icon, device_class
 SENSOR_TYPES = {
-    "temperature": ["Temperature", TEMP_CELSIUS, "mdi:thermometer"],
-    "light": ["Light intensity", LIGHT_LUX, "mdi:white-balance-sunny"],
-    "moisture": ["Moisture", PERCENTAGE, "mdi:water-percent"],
-    "conductivity": ["Conductivity", CONDUCTIVITY, "mdi:flash-circle"],
-    "battery": ["Battery", PERCENTAGE, "mdi:battery-charging"],
+    "temperature": ["Temperature", TEMP_CELSIUS, None, DEVICE_CLASS_TEMPERATURE],
+    "light": ["Light intensity", LIGHT_LUX, None, DEVICE_CLASS_ILLUMINANCE],
+    "moisture": ["Moisture", PERCENTAGE, "mdi:water-percent", None],
+    "conductivity": ["Conductivity", CONDUCTIVITY, "mdi:flash-circle", None],
+    "battery": ["Battery", PERCENTAGE, None, DEVICE_CLASS_BATTERY],
 }
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
@@ -104,6 +107,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
             else SENSOR_TYPES[parameter][1]
         )
         icon = SENSOR_TYPES[parameter][2]
+        device_class = SENSOR_TYPES[parameter][3]
 
         prefix = config.get(CONF_NAME)
         if prefix:
@@ -116,6 +120,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
                 name,
                 unit,
                 icon,
+                device_class,
                 force_update,
                 median,
                 go_unavailable_timeout,
@@ -135,6 +140,7 @@ class MiFloraSensor(Entity):
         name,
         unit,
         icon,
+        device_class,
         force_update,
         median,
         go_unavailable_timeout,
@@ -146,6 +152,7 @@ class MiFloraSensor(Entity):
         self._icon = icon
         self._name = name
         self._state = None
+        self._device_class = device_class
         self.data = []
         self._force_update = force_update
         self.go_unavailable_timeout = go_unavailable_timeout
@@ -184,8 +191,12 @@ class MiFloraSensor(Entity):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the device."""
-        attr = {ATTR_LAST_SUCCESSFUL_UPDATE: self.last_successful_update}
-        return attr
+        return {ATTR_LAST_SUCCESSFUL_UPDATE: self.last_successful_update}
+
+    @property
+    def device_class(self):
+        """Return the device class."""
+        return self._device_class
 
     @property
     def unit_of_measurement(self):
diff --git a/homeassistant/components/mikrotik/config_flow.py b/homeassistant/components/mikrotik/config_flow.py
index c1a41abf0d0..91e0f366b4d 100644
--- a/homeassistant/components/mikrotik/config_flow.py
+++ b/homeassistant/components/mikrotik/config_flow.py
@@ -53,8 +53,8 @@ class MikrotikFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             except CannotConnect:
                 errors["base"] = "cannot_connect"
             except LoginError:
-                errors[CONF_USERNAME] = "wrong_credentials"
-                errors[CONF_PASSWORD] = "wrong_credentials"
+                errors[CONF_USERNAME] = "invalid_auth"
+                errors[CONF_PASSWORD] = "invalid_auth"
 
             if not errors:
                 return self.async_create_entry(
diff --git a/homeassistant/components/mikrotik/strings.json b/homeassistant/components/mikrotik/strings.json
index 9fa665add80..6d421cb1838 100644
--- a/homeassistant/components/mikrotik/strings.json
+++ b/homeassistant/components/mikrotik/strings.json
@@ -4,7 +4,7 @@
       "user": {
         "title": "Set up Mikrotik Router",
         "data": {
-          "name": "Name",
+          "name": "[%key:common::config_flow::data::name%]",
           "host": "[%key:common::config_flow::data::host%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
@@ -15,11 +15,11 @@
     },
     "error": {
       "name_exists": "Name exists",
-      "cannot_connect": "Connection Unsuccessful",
-      "wrong_credentials": "Wrong Credentials"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "abort": {
-      "already_configured": "Mikrotik is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
@@ -33,4 +33,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/mikrotik/translations/ca.json b/homeassistant/components/mikrotik/translations/ca.json
index 10589dac474..8556a3c7765 100644
--- a/homeassistant/components/mikrotik/translations/ca.json
+++ b/homeassistant/components/mikrotik/translations/ca.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mikrotik ja est\u00e0 configurat"
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_configured_device": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "La connexi\u00f3 no ha tingut \u00e8xit",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "name_exists": "El nom existeix",
             "wrong_credentials": "Credencials incorrectes"
         },
diff --git a/homeassistant/components/mikrotik/translations/cs.json b/homeassistant/components/mikrotik/translations/cs.json
index 23ddc89a94d..c6bf8f26181 100644
--- a/homeassistant/components/mikrotik/translations/cs.json
+++ b/homeassistant/components/mikrotik/translations/cs.json
@@ -1,12 +1,34 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_configured_device": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "name_exists": "Jm\u00e9no ji\u017e existuje",
+            "wrong_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje"
+        },
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel",
+                    "name": "Jm\u00e9no",
                     "password": "Heslo",
                     "port": "Port",
-                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no",
+                    "verify_ssl": "Pou\u017e\u00edt SSL"
+                },
+                "title": "Nastaven\u00ed routeru Mikrotik"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "device_tracker": {
+                "data": {
+                    "force_dhcp": "Vynutit skenov\u00e1n\u00ed pomoc\u00ed DHCP"
                 }
             }
         }
diff --git a/homeassistant/components/mikrotik/translations/en.json b/homeassistant/components/mikrotik/translations/en.json
index 692d1247fcb..cad279a7afa 100644
--- a/homeassistant/components/mikrotik/translations/en.json
+++ b/homeassistant/components/mikrotik/translations/en.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mikrotik is already configured"
+            "already_configured": "Device is already configured",
+            "already_configured_device": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Connection Unsuccessful",
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
             "name_exists": "Name exists",
             "wrong_credentials": "Wrong Credentials"
         },
diff --git a/homeassistant/components/mikrotik/translations/es.json b/homeassistant/components/mikrotik/translations/es.json
index b575db70f11..d1b8a208a41 100644
--- a/homeassistant/components/mikrotik/translations/es.json
+++ b/homeassistant/components/mikrotik/translations/es.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mikrotik ya est\u00e1 configurado"
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
+            "already_configured_device": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
             "cannot_connect": "Conexi\u00f3n fallida",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "name_exists": "El nombre ya existe",
             "wrong_credentials": "Credenciales incorrectas"
         },
diff --git a/homeassistant/components/mikrotik/translations/et.json b/homeassistant/components/mikrotik/translations/et.json
new file mode 100644
index 00000000000..b79cc13da27
--- /dev/null
+++ b/homeassistant/components/mikrotik/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_configured_device": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "port": "",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mikrotik/translations/fr.json b/homeassistant/components/mikrotik/translations/fr.json
index 31fad4b081c..9b773d3f336 100644
--- a/homeassistant/components/mikrotik/translations/fr.json
+++ b/homeassistant/components/mikrotik/translations/fr.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mikrotik est d\u00e9j\u00e0 configur\u00e9"
+            "already_configured": "Mikrotik est d\u00e9j\u00e0 configur\u00e9",
+            "already_configured_device": "L'appareil est d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
             "cannot_connect": "\u00c9chec de la connexion",
+            "invalid_auth": "Authentification invalide",
             "name_exists": "Le nom existe",
             "wrong_credentials": "Identifiants erron\u00e9s"
         },
diff --git a/homeassistant/components/mikrotik/translations/it.json b/homeassistant/components/mikrotik/translations/it.json
index 104392236b2..a1bf16d643d 100644
--- a/homeassistant/components/mikrotik/translations/it.json
+++ b/homeassistant/components/mikrotik/translations/it.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mikrotik \u00e8 gi\u00e0 configurato"
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_configured_device": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Connessione Non Riuscita",
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_auth": "Autenticazione non valida",
             "name_exists": "Il Nome esiste gi\u00e0",
             "wrong_credentials": "Credenziali Errate"
         },
diff --git a/homeassistant/components/mikrotik/translations/lb.json b/homeassistant/components/mikrotik/translations/lb.json
index b3864ad2106..affd538d517 100644
--- a/homeassistant/components/mikrotik/translations/lb.json
+++ b/homeassistant/components/mikrotik/translations/lb.json
@@ -5,6 +5,7 @@
         },
         "error": {
             "cannot_connect": "Verbindung net erfollegr\u00e4ich",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "name_exists": "Numm g\u00ebtt et schonn",
             "wrong_credentials": "Falsch Login Informatiounen"
         },
diff --git a/homeassistant/components/mikrotik/translations/no.json b/homeassistant/components/mikrotik/translations/no.json
index 1e528fa4986..3b1a7dcd7b7 100644
--- a/homeassistant/components/mikrotik/translations/no.json
+++ b/homeassistant/components/mikrotik/translations/no.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mikrotik er allerede konfigurert"
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_configured_device": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislykket",
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning",
             "name_exists": "Navnet eksisterer",
             "wrong_credentials": "Feil legitimasjon"
         },
@@ -14,9 +16,9 @@
                     "host": "Vert",
                     "name": "Navn",
                     "password": "Passord",
-                    "port": "",
+                    "port": "Port",
                     "username": "Brukernavn",
-                    "verify_ssl": "Bruk ssl"
+                    "verify_ssl": "Bruk SSL"
                 },
                 "title": "Sett opp Mikrotik-ruter"
             }
diff --git a/homeassistant/components/mikrotik/translations/pl.json b/homeassistant/components/mikrotik/translations/pl.json
index 20b0348570c..37682fdaf8a 100644
--- a/homeassistant/components/mikrotik/translations/pl.json
+++ b/homeassistant/components/mikrotik/translations/pl.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mikronik jest ju\u017c skonfigurowany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_configured_device": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Po\u0142\u0105czenie nie powiod\u0142o si\u0119",
-            "name_exists": "Nazwa ju\u017c istnieje.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "name_exists": "Nazwa ju\u017c istnieje",
             "wrong_credentials": "B\u0142\u0119dne dane uwierzytelniaj\u0105ce"
         },
         "step": {
diff --git a/homeassistant/components/mikrotik/translations/ru.json b/homeassistant/components/mikrotik/translations/ru.json
index e21472d4da7..a4596cc70d9 100644
--- a/homeassistant/components/mikrotik/translations/ru.json
+++ b/homeassistant/components/mikrotik/translations/ru.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_configured_device": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "name_exists": "\u042d\u0442\u043e \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f.",
             "wrong_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435."
         },
diff --git a/homeassistant/components/mikrotik/translations/zh-Hant.json b/homeassistant/components/mikrotik/translations/zh-Hant.json
index caca14b79ed..5285d089fc6 100644
--- a/homeassistant/components/mikrotik/translations/zh-Hant.json
+++ b/homeassistant/components/mikrotik/translations/zh-Hant.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mikrotik \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured_device": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u672a\u6210\u529f",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "name_exists": "\u8a72\u540d\u7a31\u5df2\u5b58\u5728",
             "wrong_credentials": "\u6191\u8b49\u932f\u8aa4"
         },
diff --git a/homeassistant/components/mill/__init__.py b/homeassistant/components/mill/__init__.py
index 652153f9a8c..117f2bcb5aa 100644
--- a/homeassistant/components/mill/__init__.py
+++ b/homeassistant/components/mill/__init__.py
@@ -1,7 +1,4 @@
 """The mill component."""
-import logging
-
-_LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup(hass, config):
diff --git a/homeassistant/components/mill/climate.py b/homeassistant/components/mill/climate.py
index ee7fc8cffb7..67ed692691b 100644
--- a/homeassistant/components/mill/climate.py
+++ b/homeassistant/components/mill/climate.py
@@ -1,6 +1,4 @@
 """Support for mill wifi-enabled home heaters."""
-import logging
-
 from mill import Mill
 import voluptuous as vol
 
@@ -36,8 +34,6 @@ from .const import (
     SERVICE_SET_ROOM_TEMP,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_FAN_MODE
 
 SET_ROOM_TEMP_SCHEMA = vol.Schema(
diff --git a/homeassistant/components/mill/config_flow.py b/homeassistant/components/mill/config_flow.py
index 230849cc78d..f1b94ab2ac8 100644
--- a/homeassistant/components/mill/config_flow.py
+++ b/homeassistant/components/mill/config_flow.py
@@ -1,6 +1,4 @@
 """Adds config flow for Mill integration."""
-import logging
-
 from mill import Mill
 import voluptuous as vol
 
@@ -10,8 +8,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN  # pylint:disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 DATA_SCHEMA = vol.Schema(
     {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
 )
@@ -44,7 +40,7 @@ class MillConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         errors = {}
 
         if not await mill_data_connection.connect():
-            errors["connection_error"] = "connection_error"
+            errors["cannot_connect"] = "cannot_connect"
             return self.async_show_form(
                 step_id="user",
                 data_schema=DATA_SCHEMA,
diff --git a/homeassistant/components/mill/strings.json b/homeassistant/components/mill/strings.json
index f9126c30f78..ab09f3f59b6 100644
--- a/homeassistant/components/mill/strings.json
+++ b/homeassistant/components/mill/strings.json
@@ -4,7 +4,7 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     },
     "error": {
-      "connection_error": "[%key:common::config_flow::error::cannot_connect%]"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "step": {
       "user": {
diff --git a/homeassistant/components/mill/translations/ca.json b/homeassistant/components/mill/translations/ca.json
index e7f97e600d0..8bffe056c7e 100644
--- a/homeassistant/components/mill/translations/ca.json
+++ b/homeassistant/components/mill/translations/ca.json
@@ -4,6 +4,7 @@
             "already_configured": "El compte ja ha estat configurat"
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "Ha fallat la connexi\u00f3"
         },
         "step": {
diff --git a/homeassistant/components/mill/translations/cs.json b/homeassistant/components/mill/translations/cs.json
index deeab584855..8c03d31bb60 100644
--- a/homeassistant/components/mill/translations/cs.json
+++ b/homeassistant/components/mill/translations/cs.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u00da\u010det je ji\u017e nakonfigurov\u00e1n"
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
         },
         "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "connection_error": "Nepoda\u0159ilo se p\u0159ipojit"
         },
         "step": {
diff --git a/homeassistant/components/mill/translations/en.json b/homeassistant/components/mill/translations/en.json
index 231a9752d36..05bdd11cbd9 100644
--- a/homeassistant/components/mill/translations/en.json
+++ b/homeassistant/components/mill/translations/en.json
@@ -4,6 +4,7 @@
             "already_configured": "Account is already configured"
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect"
         },
         "step": {
diff --git a/homeassistant/components/mill/translations/es.json b/homeassistant/components/mill/translations/es.json
index e6b30851b80..38f5a65ce86 100644
--- a/homeassistant/components/mill/translations/es.json
+++ b/homeassistant/components/mill/translations/es.json
@@ -4,6 +4,7 @@
             "already_configured": "La cuenta ya ha sido configurada"
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se pudo conectar"
         },
         "step": {
diff --git a/homeassistant/components/mill/translations/et.json b/homeassistant/components/mill/translations/et.json
new file mode 100644
index 00000000000..777f234f6c3
--- /dev/null
+++ b/homeassistant/components/mill/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendus nurjus",
+            "connection_error": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mill/translations/no.json b/homeassistant/components/mill/translations/no.json
index 0f698cbbddb..e87ab803fb3 100644
--- a/homeassistant/components/mill/translations/no.json
+++ b/homeassistant/components/mill/translations/no.json
@@ -4,7 +4,8 @@
             "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
-            "connection_error": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes",
+            "connection_error": "Tilkobling mislyktes"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/mill/translations/pl.json b/homeassistant/components/mill/translations/pl.json
index eaf1da95e9e..a7f80d4046d 100644
--- a/homeassistant/components/mill/translations/pl.json
+++ b/homeassistant/components/mill/translations/pl.json
@@ -4,6 +4,7 @@
             "already_configured": "Konto jest ju\u017c skonfigurowane"
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "step": {
diff --git a/homeassistant/components/mill/translations/ru.json b/homeassistant/components/mill/translations/ru.json
index bf836c6014e..e2c01e293ab 100644
--- a/homeassistant/components/mill/translations/ru.json
+++ b/homeassistant/components/mill/translations/ru.json
@@ -4,6 +4,7 @@
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "step": {
diff --git a/homeassistant/components/mill/translations/sv.json b/homeassistant/components/mill/translations/sv.json
new file mode 100644
index 00000000000..23c825f256f
--- /dev/null
+++ b/homeassistant/components/mill/translations/sv.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "Anv\u00e4ndarnamn"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mill/translations/zh-Hans.json b/homeassistant/components/mill/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/mill/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mill/translations/zh-Hant.json b/homeassistant/components/mill/translations/zh-Hant.json
index 9682d5981df..37d766700bd 100644
--- a/homeassistant/components/mill/translations/zh-Hant.json
+++ b/homeassistant/components/mill/translations/zh-Hant.json
@@ -4,6 +4,7 @@
             "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "\u9023\u7dda\u5931\u6557"
         },
         "step": {
diff --git a/homeassistant/components/min_max/sensor.py b/homeassistant/components/min_max/sensor.py
index a54fa3e2d46..d2ffb9f5ec0 100644
--- a/homeassistant/components/min_max/sensor.py
+++ b/homeassistant/components/min_max/sensor.py
@@ -77,10 +77,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
 
     await async_setup_reload_service(hass, DOMAIN, PLATFORMS)
 
-    async_add_entities(
-        [MinMaxSensor(hass, entity_ids, name, sensor_type, round_digits)], True
-    )
-    return True
+    async_add_entities([MinMaxSensor(entity_ids, name, sensor_type, round_digits)])
 
 
 def calc_min(sensor_values):
@@ -137,9 +134,8 @@ def calc_median(sensor_values, round_digits):
 class MinMaxSensor(Entity):
     """Representation of a min/max sensor."""
 
-    def __init__(self, hass, entity_ids, name, sensor_type, round_digits):
+    def __init__(self, entity_ids, name, sensor_type, round_digits):
         """Initialize the min/max sensor."""
-        self._hass = hass
         self._entity_ids = entity_ids
         self._sensor_type = sensor_type
         self._round_digits = round_digits
@@ -155,50 +151,16 @@ class MinMaxSensor(Entity):
         self.count_sensors = len(self._entity_ids)
         self.states = {}
 
-        @callback
-        def async_min_max_sensor_state_listener(event):
-            """Handle the sensor state changes."""
-            new_state = event.data.get("new_state")
-            entity = event.data.get("entity_id")
-
-            if new_state.state is None or new_state.state in [
-                STATE_UNKNOWN,
-                STATE_UNAVAILABLE,
-            ]:
-                self.states[entity] = STATE_UNKNOWN
-                hass.async_add_job(self.async_update_ha_state, True)
-                return
-
-            if self._unit_of_measurement is None:
-                self._unit_of_measurement = new_state.attributes.get(
-                    ATTR_UNIT_OF_MEASUREMENT
-                )
-
-            if self._unit_of_measurement != new_state.attributes.get(
-                ATTR_UNIT_OF_MEASUREMENT
-            ):
-                _LOGGER.warning(
-                    "Units of measurement do not match for entity %s", self.entity_id
-                )
-                self._unit_of_measurement_mismatch = True
-
-            try:
-                self.states[entity] = float(new_state.state)
-                self.last = float(new_state.state)
-                self.last_entity_id = entity
-            except ValueError:
-                _LOGGER.warning(
-                    "Unable to store state. Only numerical states are supported"
-                )
-
-            hass.async_add_job(self.async_update_ha_state, True)
-
+    async def async_added_to_hass(self):
+        """Handle added to Hass."""
         self.async_on_remove(
             async_track_state_change_event(
-                hass, entity_ids, async_min_max_sensor_state_listener
+                self.hass, self._entity_ids, self._async_min_max_sensor_state_listener
             )
         )
 
+        self._calc_values()
+
     @property
     def name(self):
         """Return the name of the sensor."""
@@ -228,20 +190,60 @@ class MinMaxSensor(Entity):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the sensor."""
-        state_attr = {
+        return {
             attr: getattr(self, attr)
             for attr in ATTR_TO_PROPERTY
             if getattr(self, attr) is not None
         }
-        return state_attr
 
     @property
     def icon(self):
         """Return the icon to use in the frontend, if any."""
         return ICON
 
-    async def async_update(self):
-        """Get the latest data and updates the states."""
+    @callback
+    def _async_min_max_sensor_state_listener(self, event):
+        """Handle the sensor state changes."""
+        new_state = event.data.get("new_state")
+        entity = event.data.get("entity_id")
+
+        if new_state.state is None or new_state.state in [
+            STATE_UNKNOWN,
+            STATE_UNAVAILABLE,
+        ]:
+            self.states[entity] = STATE_UNKNOWN
+            self._calc_values()
+            self.async_write_ha_state()
+            return
+
+        if self._unit_of_measurement is None:
+            self._unit_of_measurement = new_state.attributes.get(
+                ATTR_UNIT_OF_MEASUREMENT
+            )
+
+        if self._unit_of_measurement != new_state.attributes.get(
+            ATTR_UNIT_OF_MEASUREMENT
+        ):
+            _LOGGER.warning(
+                "Units of measurement do not match for entity %s", self.entity_id
+            )
+            self._unit_of_measurement_mismatch = True
+
+        try:
+            self.states[entity] = float(new_state.state)
+            self.last = float(new_state.state)
+            self.last_entity_id = entity
+        except ValueError:
+            _LOGGER.warning(
+                "Unable to store state. Only numerical states are supported"
+            )
+
+        self._calc_values()
+        self.async_write_ha_state()
+
+    @callback
+    def _calc_values(self):
+        """Calculate the values."""
         sensor_values = [
             (entity_id, self.states[entity_id])
             for entity_id in self._entity_ids
diff --git a/homeassistant/components/minecraft_server/sensor.py b/homeassistant/components/minecraft_server/sensor.py
index 20f9e98e530..171ff9d1701 100644
--- a/homeassistant/components/minecraft_server/sensor.py
+++ b/homeassistant/components/minecraft_server/sensor.py
@@ -1,6 +1,4 @@
 """The Minecraft Server sensor platform."""
-
-import logging
 from typing import Any, Dict
 
 from homeassistant.config_entries import ConfigEntry
@@ -27,8 +25,6 @@ from .const import (
     UNIT_VERSION,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, config_entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/minecraft_server/strings.json b/homeassistant/components/minecraft_server/strings.json
index c0a0c78d5d9..9e546a3cdfa 100644
--- a/homeassistant/components/minecraft_server/strings.json
+++ b/homeassistant/components/minecraft_server/strings.json
@@ -5,7 +5,7 @@
         "title": "Link your Minecraft Server",
         "description": "Set up your Minecraft Server instance to allow monitoring.",
         "data": {
-          "name": "Name",
+          "name": "[%key:common::config_flow::data::name%]",
           "host": "[%key:common::config_flow::data::host%]"
         }
       }
@@ -16,7 +16,7 @@
       "invalid_ip": "IP address is invalid (MAC address could not be determined). Please correct it and try again."
     },
     "abort": {
-      "already_configured": "Host is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/minecraft_server/translations/ca.json b/homeassistant/components/minecraft_server/translations/ca.json
index ce395b75713..b06229a1b1a 100644
--- a/homeassistant/components/minecraft_server/translations/ca.json
+++ b/homeassistant/components/minecraft_server/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'amfitri\u00f3 ja est\u00e0 configurat."
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "error": {
             "cannot_connect": "Ha fallat la connexi\u00f3 amb el servidor. Comprova l'amfitri\u00f3 i el port i torna-ho a provar. Assegurat que estas utilitzant la versi\u00f3 del servidor 1.7 o superior.",
diff --git a/homeassistant/components/minecraft_server/translations/cs.json b/homeassistant/components/minecraft_server/translations/cs.json
index d7737722cc3..6fac0ec4599 100644
--- a/homeassistant/components/minecraft_server/translations/cs.json
+++ b/homeassistant/components/minecraft_server/translations/cs.json
@@ -1,10 +1,21 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "error": {
+            "cannot_connect": "P\u0159ipojen\u00ed k serveru se nezda\u0159ilo. Zkontrolujte hostitele a port a akci opakujte. Tak\u00e9 se ujist\u011bte, \u017ee na serveru pou\u017e\u00edv\u00e1te alespo\u0148 Minecraft verze 1.7.",
+            "invalid_ip": "IP adresa je neplatn\u00e1 (nelze ur\u010dit MAC adresu). Opravte ji a akci opakujte.",
+            "invalid_port": "Port mus\u00ed b\u00fdt v rozsahu od 1024 do 65535. Opravte jej a zkuste to znovu."
+        },
         "step": {
             "user": {
                 "data": {
-                    "host": "Hostitel"
-                }
+                    "host": "Hostitel",
+                    "name": "Jm\u00e9no"
+                },
+                "description": "Nastavte instanci serveru Minecraft tak, aby umo\u017e\u0148oval monitorov\u00e1n\u00ed.",
+                "title": "Propojte sv\u016fj server Minecraft"
             }
         }
     }
diff --git a/homeassistant/components/minecraft_server/translations/en.json b/homeassistant/components/minecraft_server/translations/en.json
index fc736c667be..471118773a1 100644
--- a/homeassistant/components/minecraft_server/translations/en.json
+++ b/homeassistant/components/minecraft_server/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Host is already configured."
+            "already_configured": "Service is already configured"
         },
         "error": {
             "cannot_connect": "Failed to connect to server. Please check the host and port and try again. Also ensure that you are running at least Minecraft version 1.7 on your server.",
diff --git a/homeassistant/components/minecraft_server/translations/et.json b/homeassistant/components/minecraft_server/translations/et.json
new file mode 100644
index 00000000000..f8bdff71bb3
--- /dev/null
+++ b/homeassistant/components/minecraft_server/translations/et.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "Serveriga \u00fchenduse loomine nurjus. Kontrollige hosti ja porti ning proovige uuesti. Samuti veenduge, et kasutate oma serveris v\u00e4hemalt Minecrafti versiooni 1.7."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/minecraft_server/translations/it.json b/homeassistant/components/minecraft_server/translations/it.json
index 7f214c47743..8aaee8d8b31 100644
--- a/homeassistant/components/minecraft_server/translations/it.json
+++ b/homeassistant/components/minecraft_server/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'host \u00e8 gi\u00e0 configurato."
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "error": {
             "cannot_connect": "Impossibile connettersi al server. Controllare l'host e la porta e riprovare. Assicurarsi inoltre che si esegue almeno Minecraft versione 1.7 sul server.",
diff --git a/homeassistant/components/minecraft_server/translations/no.json b/homeassistant/components/minecraft_server/translations/no.json
index 4d2ecc6dbaa..5230401a3c3 100644
--- a/homeassistant/components/minecraft_server/translations/no.json
+++ b/homeassistant/components/minecraft_server/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Verten er allerede konfigurert."
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "error": {
             "cannot_connect": "Kan ikke koble til serveren. Kontroller verten og porten, og pr\u00f8v p\u00e5 nytt. S\u00f8rg ogs\u00e5 for at du kj\u00f8rer minst Minecraft versjon 1.7 p\u00e5 serveren din.",
diff --git a/homeassistant/components/minecraft_server/translations/pl.json b/homeassistant/components/minecraft_server/translations/pl.json
index 77d83f37174..eeba0ed860d 100644
--- a/homeassistant/components/minecraft_server/translations/pl.json
+++ b/homeassistant/components/minecraft_server/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Host jest ju\u017c skonfigurowany."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
             "cannot_connect": "B\u0142\u0105d po\u0142\u0105czenia z serwerem. Sprawd\u017a adres hosta i port i spr\u00f3buj ponownie. Upewnij si\u0119 tak\u017ce, \u017ce na serwerze dzia\u0142a Minecraft w wersji przynajmniej 1.7.",
diff --git a/homeassistant/components/minecraft_server/translations/ru.json b/homeassistant/components/minecraft_server/translations/ru.json
index b95c12a1d80..93e182a4dfa 100644
--- a/homeassistant/components/minecraft_server/translations/ru.json
+++ b/homeassistant/components/minecraft_server/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
             "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0445 \u0434\u0430\u043d\u043d\u044b\u0445 \u0438 \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430. \u0422\u0430\u043a\u0436\u0435 \u0443\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u043d\u0430 \u0412\u0430\u0448\u0435\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d Minecraft \u0432\u0435\u0440\u0441\u0438\u0438 1.7, \u0438\u043b\u0438 \u0432\u044b\u0448\u0435.",
diff --git a/homeassistant/components/minecraft_server/translations/zh-Hant.json b/homeassistant/components/minecraft_server/translations/zh-Hant.json
index 6dc996fa67d..b8bd401d13e 100644
--- a/homeassistant/components/minecraft_server/translations/zh-Hant.json
+++ b/homeassistant/components/minecraft_server/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u4e3b\u6a5f\u7aef\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
             "cannot_connect": "\u4f3a\u670d\u5668\u9023\u7dda\u5931\u6557\u3002\u8acb\u6aa2\u67e5\u4e3b\u6a5f\u7aef\u8207\u901a\u8a0a\u57e0\u5f8c\u518d\u8a66\u4e00\u6b21\u3002\u53e6\u8acb\u78ba\u8a8d\u65bc\u4f3a\u670d\u5668\u4e0a\u57f7\u884c\u6700\u65b0\u7248\u672c Minecraft 1.7 \u7248\u3002",
diff --git a/homeassistant/components/minio/__init__.py b/homeassistant/components/minio/__init__.py
index 24e7049dd18..178058986cc 100644
--- a/homeassistant/components/minio/__init__.py
+++ b/homeassistant/components/minio/__init__.py
@@ -124,7 +124,7 @@ def setup(hass, config):
     def _render_service_value(service, key):
         value = service.data[key]
         value.hass = hass
-        return value.async_render()
+        return value.async_render(parse_result=False)
 
     def put_file(service):
         """Upload file service."""
diff --git a/homeassistant/components/mjpeg/camera.py b/homeassistant/components/mjpeg/camera.py
index c42901cd6c5..1a8b1327093 100644
--- a/homeassistant/components/mjpeg/camera.py
+++ b/homeassistant/components/mjpeg/camera.py
@@ -110,7 +110,7 @@ class MjpegCamera(Camera):
             self._authentication == HTTP_DIGEST_AUTHENTICATION
             or self._still_image_url is None
         ):
-            image = await self.hass.async_add_job(self.camera_image)
+            image = await self.hass.async_add_executor_job(self.camera_image)
             return image
 
         websession = async_get_clientsession(self.hass, verify_ssl=self._verify_ssl)
diff --git a/homeassistant/components/mobile_app/device_tracker.py b/homeassistant/components/mobile_app/device_tracker.py
index 850d17212fd..d2e987066ef 100644
--- a/homeassistant/components/mobile_app/device_tracker.py
+++ b/homeassistant/components/mobile_app/device_tracker.py
@@ -1,6 +1,4 @@
 """Device tracker platform that adds support for OwnTracks over MQTT."""
-import logging
-
 from homeassistant.components.device_tracker import (
     ATTR_BATTERY,
     ATTR_GPS,
@@ -24,7 +22,6 @@ from .const import (
 )
 from .helpers import device_info
 
-_LOGGER = logging.getLogger(__name__)
 ATTR_KEYS = (ATTR_ALTITUDE, ATTR_COURSE, ATTR_SPEED, ATTR_VERTICAL_ACCURACY)
 
 
diff --git a/homeassistant/components/mobile_app/webhook.py b/homeassistant/components/mobile_app/webhook.py
index bbeea2e9521..043a555b6b7 100644
--- a/homeassistant/components/mobile_app/webhook.py
+++ b/homeassistant/components/mobile_app/webhook.py
@@ -32,10 +32,13 @@ from homeassistant.const import (
     HTTP_CREATED,
 )
 from homeassistant.core import EventOrigin
-from homeassistant.exceptions import HomeAssistantError, ServiceNotFound, TemplateError
-from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.exceptions import HomeAssistantError, ServiceNotFound
+from homeassistant.helpers import (
+    config_validation as cv,
+    device_registry as dr,
+    template,
+)
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.template import attach
 from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.util.decorator import Registry
 
@@ -285,7 +288,7 @@ async def webhook_stream_camera(hass, config_entry, data):
 @validate_schema(
     {
         str: {
-            vol.Required(ATTR_TEMPLATE): cv.template,
+            vol.Required(ATTR_TEMPLATE): cv.string,
             vol.Optional(ATTR_TEMPLATE_VARIABLES, default={}): dict,
         }
     }
@@ -295,10 +298,9 @@ async def webhook_render_template(hass, config_entry, data):
     resp = {}
     for key, item in data.items():
         try:
-            tpl = item[ATTR_TEMPLATE]
-            attach(hass, tpl)
+            tpl = template.Template(item[ATTR_TEMPLATE], hass)
             resp[key] = tpl.async_render(item.get(ATTR_TEMPLATE_VARIABLES))
-        except TemplateError as ex:
+        except template.TemplateError as ex:
             resp[key] = {"error": str(ex)}
 
     return webhook_response(resp, registration=config_entry.data)
diff --git a/homeassistant/components/mochad/light.py b/homeassistant/components/mochad/light.py
index a2264a65b16..90af33bd0cd 100644
--- a/homeassistant/components/mochad/light.py
+++ b/homeassistant/components/mochad/light.py
@@ -1,6 +1,4 @@
 """Support for X10 dimmer over Mochad."""
-import logging
-
 from pymochad import device
 import voluptuous as vol
 
@@ -15,8 +13,6 @@ from homeassistant.helpers import config_validation as cv
 
 from . import CONF_COMM_TYPE, DOMAIN, REQ_LOCK
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_BRIGHTNESS_LEVELS = "brightness_levels"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/modbus/__init__.py b/homeassistant/components/modbus/__init__.py
index 822000cb56a..77e9b6f7ca9 100644
--- a/homeassistant/components/modbus/__init__.py
+++ b/homeassistant/components/modbus/__init__.py
@@ -20,6 +20,7 @@ from homeassistant.const import (
     CONF_PORT,
     CONF_SCAN_INTERVAL,
     CONF_SLAVE,
+    CONF_STRUCTURE,
     CONF_TIMEOUT,
     CONF_TYPE,
     EVENT_HOMEASSISTANT_STOP,
@@ -37,19 +38,38 @@ from .const import (
     CALL_TYPE_REGISTER_INPUT,
     CONF_BAUDRATE,
     CONF_BYTESIZE,
+    CONF_CLIMATES,
+    CONF_CURRENT_TEMP,
+    CONF_CURRENT_TEMP_REGISTER_TYPE,
+    CONF_DATA_COUNT,
+    CONF_DATA_TYPE,
     CONF_INPUT_TYPE,
+    CONF_MAX_TEMP,
+    CONF_MIN_TEMP,
+    CONF_OFFSET,
     CONF_PARITY,
+    CONF_PRECISION,
     CONF_REGISTER,
+    CONF_SCALE,
     CONF_STATE_CLOSED,
     CONF_STATE_CLOSING,
     CONF_STATE_OPEN,
     CONF_STATE_OPENING,
     CONF_STATUS_REGISTER,
     CONF_STATUS_REGISTER_TYPE,
+    CONF_STEP,
     CONF_STOPBITS,
+    CONF_TARGET_TEMP,
+    CONF_UNIT,
+    DATA_TYPE_CUSTOM,
+    DATA_TYPE_FLOAT,
+    DATA_TYPE_INT,
+    DATA_TYPE_UINT,
     DEFAULT_HUB,
     DEFAULT_SCAN_INTERVAL,
     DEFAULT_SLAVE,
+    DEFAULT_STRUCTURE_PREFIX,
+    DEFAULT_TEMP_UNIT,
     MODBUS_DOMAIN as DOMAIN,
     SERVICE_WRITE_COIL,
     SERVICE_WRITE_REGISTER,
@@ -59,6 +79,33 @@ _LOGGER = logging.getLogger(__name__)
 
 BASE_SCHEMA = vol.Schema({vol.Optional(CONF_NAME, default=DEFAULT_HUB): cv.string})
 
+CLIMATE_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_CURRENT_TEMP): cv.positive_int,
+        vol.Required(CONF_NAME): cv.string,
+        vol.Required(CONF_SLAVE): cv.positive_int,
+        vol.Required(CONF_TARGET_TEMP): cv.positive_int,
+        vol.Optional(CONF_DATA_COUNT, default=2): cv.positive_int,
+        vol.Optional(
+            CONF_CURRENT_TEMP_REGISTER_TYPE, default=CALL_TYPE_REGISTER_HOLDING
+        ): vol.In([CALL_TYPE_REGISTER_HOLDING, CALL_TYPE_REGISTER_INPUT]),
+        vol.Optional(CONF_DATA_TYPE, default=DATA_TYPE_FLOAT): vol.In(
+            [DATA_TYPE_INT, DATA_TYPE_UINT, DATA_TYPE_FLOAT, DATA_TYPE_CUSTOM]
+        ),
+        vol.Optional(CONF_PRECISION, default=1): cv.positive_int,
+        vol.Optional(CONF_SCALE, default=1): vol.Coerce(float),
+        vol.Optional(CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL): vol.All(
+            cv.time_period, lambda value: value.total_seconds()
+        ),
+        vol.Optional(CONF_OFFSET, default=0): vol.Coerce(float),
+        vol.Optional(CONF_MAX_TEMP, default=35): cv.positive_int,
+        vol.Optional(CONF_MIN_TEMP, default=5): cv.positive_int,
+        vol.Optional(CONF_STEP, default=0.5): vol.Coerce(float),
+        vol.Optional(CONF_STRUCTURE, default=DEFAULT_STRUCTURE_PREFIX): cv.string,
+        vol.Optional(CONF_UNIT, default=DEFAULT_TEMP_UNIT): cv.string,
+    }
+)
+
 COVERS_SCHEMA = vol.All(
     cv.has_at_least_one_key(CALL_TYPE_COIL, CONF_REGISTER),
     vol.Schema(
@@ -94,6 +141,7 @@ SERIAL_SCHEMA = BASE_SCHEMA.extend(
         vol.Required(CONF_STOPBITS): vol.Any(1, 2),
         vol.Required(CONF_TYPE): "serial",
         vol.Optional(CONF_TIMEOUT, default=3): cv.socket_timeout,
+        vol.Optional(CONF_CLIMATES): vol.All(cv.ensure_list, [CLIMATE_SCHEMA]),
         vol.Optional(CONF_COVERS): vol.All(cv.ensure_list, [COVERS_SCHEMA]),
     }
 )
@@ -105,6 +153,7 @@ ETHERNET_SCHEMA = BASE_SCHEMA.extend(
         vol.Required(CONF_TYPE): vol.Any("tcp", "udp", "rtuovertcp"),
         vol.Optional(CONF_TIMEOUT, default=3): cv.socket_timeout,
         vol.Optional(CONF_DELAY, default=0): cv.positive_int,
+        vol.Optional(CONF_CLIMATES): vol.All(cv.ensure_list, [CLIMATE_SCHEMA]),
         vol.Optional(CONF_COVERS): vol.All(cv.ensure_list, [COVERS_SCHEMA]),
     }
 )
@@ -150,7 +199,10 @@ def setup(hass, config):
         hub_collect[conf_hub[CONF_NAME]] = ModbusHub(conf_hub)
 
         # load platforms
-        for component, conf_key in (("cover", CONF_COVERS),):
+        for component, conf_key in (
+            ("climate", CONF_CLIMATES),
+            ("cover", CONF_COVERS),
+        ):
             if conf_key in conf_hub:
                 load_platform(hass, component, DOMAIN, conf_hub, config)
 
diff --git a/homeassistant/components/modbus/binary_sensor.py b/homeassistant/components/modbus/binary_sensor.py
index ce66b7aecdb..c9e9cc4196a 100644
--- a/homeassistant/components/modbus/binary_sensor.py
+++ b/homeassistant/components/modbus/binary_sensor.py
@@ -1,5 +1,4 @@
 """Support for Modbus Coil and Discrete Input sensors."""
-import logging
 from typing import Optional
 
 from pymodbus.exceptions import ConnectionException, ModbusException
@@ -26,8 +25,6 @@ from .const import (
     MODBUS_DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = vol.All(
     cv.deprecated(CONF_COILS, CONF_INPUTS),
     PLATFORM_SCHEMA.extend(
@@ -122,5 +119,5 @@ class ModbusBinarySensor(BinarySensorEntity):
             self._available = False
             return
 
-        self._value = result.bits[0]
+        self._value = result.bits[0] & 1
         self._available = True
diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py
index 5498ed61738..d57d0f761c6 100644
--- a/homeassistant/components/modbus/climate.py
+++ b/homeassistant/components/modbus/climate.py
@@ -1,13 +1,13 @@
 """Support for Generic Modbus Thermostats."""
+from datetime import timedelta
 import logging
 import struct
-from typing import Optional
+from typing import Any, Dict, Optional
 
 from pymodbus.exceptions import ConnectionException, ModbusException
 from pymodbus.pdu import ExceptionResponse
-import voluptuous as vol
 
-from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateEntity
+from homeassistant.components.climate import ClimateEntity
 from homeassistant.components.climate.const import (
     HVAC_MODE_AUTO,
     SUPPORT_TARGET_TEMPERATURE,
@@ -15,20 +15,28 @@ from homeassistant.components.climate.const import (
 from homeassistant.const import (
     ATTR_TEMPERATURE,
     CONF_NAME,
+    CONF_SCAN_INTERVAL,
     CONF_SLAVE,
+    CONF_STRUCTURE,
     TEMP_CELSIUS,
     TEMP_FAHRENHEIT,
 )
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.typing import (
+    ConfigType,
+    DiscoveryInfoType,
+    HomeAssistantType,
+)
 
+from . import ModbusHub
 from .const import (
     CALL_TYPE_REGISTER_HOLDING,
     CALL_TYPE_REGISTER_INPUT,
+    CONF_CLIMATES,
     CONF_CURRENT_TEMP,
     CONF_CURRENT_TEMP_REGISTER_TYPE,
     CONF_DATA_COUNT,
     CONF_DATA_TYPE,
-    CONF_HUB,
     CONF_MAX_TEMP,
     CONF_MIN_TEMP,
     CONF_OFFSET,
@@ -37,82 +45,61 @@ from .const import (
     CONF_STEP,
     CONF_TARGET_TEMP,
     CONF_UNIT,
-    DATA_TYPE_FLOAT,
-    DATA_TYPE_INT,
-    DATA_TYPE_UINT,
-    DEFAULT_HUB,
+    DATA_TYPE_CUSTOM,
+    DEFAULT_STRUCT_FORMAT,
     MODBUS_DOMAIN,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_CURRENT_TEMP): cv.positive_int,
-        vol.Required(CONF_NAME): cv.string,
-        vol.Required(CONF_SLAVE): cv.positive_int,
-        vol.Required(CONF_TARGET_TEMP): cv.positive_int,
-        vol.Optional(CONF_DATA_COUNT, default=2): cv.positive_int,
-        vol.Optional(
-            CONF_CURRENT_TEMP_REGISTER_TYPE, default=CALL_TYPE_REGISTER_HOLDING
-        ): vol.In([CALL_TYPE_REGISTER_HOLDING, CALL_TYPE_REGISTER_INPUT]),
-        vol.Optional(CONF_DATA_TYPE, default=DATA_TYPE_FLOAT): vol.In(
-            [DATA_TYPE_INT, DATA_TYPE_UINT, DATA_TYPE_FLOAT]
-        ),
-        vol.Optional(CONF_HUB, default=DEFAULT_HUB): cv.string,
-        vol.Optional(CONF_PRECISION, default=1): cv.positive_int,
-        vol.Optional(CONF_SCALE, default=1): vol.Coerce(float),
-        vol.Optional(CONF_OFFSET, default=0): vol.Coerce(float),
-        vol.Optional(CONF_MAX_TEMP, default=35): cv.positive_int,
-        vol.Optional(CONF_MIN_TEMP, default=5): cv.positive_int,
-        vol.Optional(CONF_STEP, default=0.5): vol.Coerce(float),
-        vol.Optional(CONF_UNIT, default="C"): cv.string,
-    }
-)
+async def async_setup_platform(
+    hass: HomeAssistantType,
+    config: ConfigType,
+    async_add_entities,
+    discovery_info: Optional[DiscoveryInfoType] = None,
+):
+    """Read configuration and create Modbus climate."""
+    if discovery_info is None:
+        return
 
+    entities = []
+    for entity in discovery_info[CONF_CLIMATES]:
+        hub: ModbusHub = hass.data[MODBUS_DOMAIN][discovery_info[CONF_NAME]]
+        count = entity[CONF_DATA_COUNT]
+        data_type = entity[CONF_DATA_TYPE]
+        name = entity[CONF_NAME]
+        structure = entity[CONF_STRUCTURE]
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Modbus Thermostat Platform."""
-    name = config[CONF_NAME]
-    modbus_slave = config[CONF_SLAVE]
-    target_temp_register = config[CONF_TARGET_TEMP]
-    current_temp_register = config[CONF_CURRENT_TEMP]
-    current_temp_register_type = config[CONF_CURRENT_TEMP_REGISTER_TYPE]
-    data_type = config[CONF_DATA_TYPE]
-    count = config[CONF_DATA_COUNT]
-    precision = config[CONF_PRECISION]
-    scale = config[CONF_SCALE]
-    offset = config[CONF_OFFSET]
-    unit = config[CONF_UNIT]
-    max_temp = config[CONF_MAX_TEMP]
-    min_temp = config[CONF_MIN_TEMP]
-    temp_step = config[CONF_STEP]
-    hub_name = config[CONF_HUB]
-    hub = hass.data[MODBUS_DOMAIN][hub_name]
+        if data_type != DATA_TYPE_CUSTOM:
+            try:
+                structure = f">{DEFAULT_STRUCT_FORMAT[data_type][count]}"
+            except KeyError:
+                _LOGGER.error(
+                    "Climate %s: Unable to find a data type matching count value %s, try a custom type",
+                    name,
+                    count,
+                )
+                continue
 
-    add_entities(
-        [
-            ModbusThermostat(
-                hub,
-                name,
-                modbus_slave,
-                target_temp_register,
-                current_temp_register,
-                current_temp_register_type,
-                data_type,
+        try:
+            size = struct.calcsize(structure)
+        except struct.error as err:
+            _LOGGER.error("Error in sensor %s structure: %s", name, err)
+            continue
+
+        if count * 2 != size:
+            _LOGGER.error(
+                "Structure size (%d bytes) mismatch registers count (%d words)",
+                size,
                 count,
-                precision,
-                scale,
-                offset,
-                unit,
-                max_temp,
-                min_temp,
-                temp_step,
             )
-        ],
-        True,
-    )
+            continue
+
+        entity[CONF_STRUCTURE] = structure
+        entities.append(ModbusThermostat(hub, entity))
+
+    async_add_entities(entities)
 
 
 class ModbusThermostat(ClimateEntity):
@@ -120,65 +107,54 @@ class ModbusThermostat(ClimateEntity):
 
     def __init__(
         self,
-        hub,
-        name,
-        modbus_slave,
-        target_temp_register,
-        current_temp_register,
-        current_temp_register_type,
-        data_type,
-        count,
-        precision,
-        scale,
-        offset,
-        unit,
-        max_temp,
-        min_temp,
-        temp_step,
+        hub: ModbusHub,
+        config: Dict[str, Any],
     ):
-        """Initialize the unit."""
-        self._hub = hub
-        self._name = name
-        self._slave = modbus_slave
-        self._target_temperature_register = target_temp_register
-        self._current_temperature_register = current_temp_register
-        self._current_temperature_register_type = current_temp_register_type
+        """Initialize the modbus thermostat."""
+        self._hub: ModbusHub = hub
+        self._name = config[CONF_NAME]
+        self._slave = config[CONF_SLAVE]
+        self._target_temperature_register = config[CONF_TARGET_TEMP]
+        self._current_temperature_register = config[CONF_CURRENT_TEMP]
+        self._current_temperature_register_type = config[
+            CONF_CURRENT_TEMP_REGISTER_TYPE
+        ]
         self._target_temperature = None
         self._current_temperature = None
-        self._data_type = data_type
-        self._count = int(count)
-        self._precision = precision
-        self._scale = scale
-        self._offset = offset
-        self._unit = unit
-        self._max_temp = max_temp
-        self._min_temp = min_temp
-        self._temp_step = temp_step
-        self._structure = ">f"
+        self._data_type = config[CONF_DATA_TYPE]
+        self._structure = config[CONF_STRUCTURE]
+        self._count = config[CONF_DATA_COUNT]
+        self._precision = config[CONF_PRECISION]
+        self._scale = config[CONF_SCALE]
+        self._scan_interval = timedelta(seconds=config[CONF_SCAN_INTERVAL])
+        self._offset = config[CONF_OFFSET]
+        self._unit = config[CONF_UNIT]
+        self._max_temp = config[CONF_MAX_TEMP]
+        self._min_temp = config[CONF_MIN_TEMP]
+        self._temp_step = config[CONF_STEP]
         self._available = True
 
-        data_types = {
-            DATA_TYPE_INT: {1: "h", 2: "i", 4: "q"},
-            DATA_TYPE_UINT: {1: "H", 2: "I", 4: "Q"},
-            DATA_TYPE_FLOAT: {1: "e", 2: "f", 4: "d"},
-        }
+    async def async_added_to_hass(self):
+        """Handle entity which will be added."""
+        async_track_time_interval(
+            self.hass, lambda arg: self._update(), self._scan_interval
+        )
 
-        self._structure = f">{data_types[self._data_type][self._count]}"
+    @property
+    def should_poll(self):
+        """Return True if entity has to be polled for state.
+
+        False if entity pushes its state to HA.
+        """
+
+        # Handle polling directly in this entity
+        return False
 
     @property
     def supported_features(self):
         """Return the list of supported features."""
         return SUPPORT_TARGET_TEMPERATURE
 
-    def update(self):
-        """Update Target & Current Temperature."""
-        self._target_temperature = self._read_register(
-            CALL_TYPE_REGISTER_HOLDING, self._target_temperature_register
-        )
-        self._current_temperature = self._read_register(
-            self._current_temperature_register_type, self._current_temperature_register
-        )
-
     @property
     def hvac_mode(self):
         """Return the current HVAC mode."""
@@ -189,6 +165,11 @@ class ModbusThermostat(ClimateEntity):
         """Return the possible HVAC modes."""
         return [HVAC_MODE_AUTO]
 
+    def set_hvac_mode(self, hvac_mode: str) -> None:
+        """Set new target hvac mode."""
+        # Home Assistant expects this method.
+        # We'll keep it here to avoid getting exceptions.
+
     @property
     def name(self):
         """Return the name of the climate device."""
@@ -234,12 +215,24 @@ class ModbusThermostat(ClimateEntity):
         byte_string = struct.pack(self._structure, target_temperature)
         register_value = struct.unpack(">h", byte_string[0:2])[0]
         self._write_register(self._target_temperature_register, register_value)
+        self._update()
 
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
         return self._available
 
+    def _update(self):
+        """Update Target & Current Temperature."""
+        self._target_temperature = self._read_register(
+            CALL_TYPE_REGISTER_HOLDING, self._target_temperature_register
+        )
+        self._current_temperature = self._read_register(
+            self._current_temperature_register_type, self._current_temperature_register
+        )
+
+        self.schedule_update_ha_state()
+
     def _read_register(self, register_type, register) -> Optional[float]:
         """Read register using the Modbus hub slave."""
         try:
diff --git a/homeassistant/components/modbus/const.py b/homeassistant/components/modbus/const.py
index dc29dd626ae..e79b69bbb87 100644
--- a/homeassistant/components/modbus/const.py
+++ b/homeassistant/components/modbus/const.py
@@ -55,6 +55,11 @@ CONF_ADDRESS = "address"
 
 # sensor.py
 # CONF_DATA_TYPE = "data_type"
+DEFAULT_STRUCT_FORMAT = {
+    DATA_TYPE_INT: {1: "h", 2: "i", 4: "q"},
+    DATA_TYPE_UINT: {1: "H", 2: "I", 4: "Q"},
+    DATA_TYPE_FLOAT: {1: "e", 2: "f", 4: "d"},
+}
 
 # switch.py
 CONF_STATE_OFF = "state_off"
@@ -63,6 +68,7 @@ CONF_VERIFY_REGISTER = "verify_register"
 CONF_VERIFY_STATE = "verify_state"
 
 # climate.py
+CONF_CLIMATES = "climates"
 CONF_TARGET_TEMP = "target_temp_register"
 CONF_CURRENT_TEMP = "current_temp_register"
 CONF_CURRENT_TEMP_REGISTER_TYPE = "current_temp_register_type"
@@ -72,6 +78,8 @@ CONF_UNIT = "temperature_unit"
 CONF_MAX_TEMP = "max_temp"
 CONF_MIN_TEMP = "min_temp"
 CONF_STEP = "temp_step"
+DEFAULT_STRUCTURE_PREFIX = ">f"
+DEFAULT_TEMP_UNIT = "C"
 
 # cover.py
 CONF_STATE_OPEN = "state_open"
diff --git a/homeassistant/components/modbus/cover.py b/homeassistant/components/modbus/cover.py
index a7c9c301ac5..ab16e5306f1 100644
--- a/homeassistant/components/modbus/cover.py
+++ b/homeassistant/components/modbus/cover.py
@@ -1,6 +1,5 @@
 """Support for Modbus covers."""
 from datetime import timedelta
-import logging
 from typing import Any, Dict, Optional
 
 from pymodbus.exceptions import ConnectionException, ModbusException
@@ -37,8 +36,6 @@ from .const import (
     MODBUS_DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(
     hass: HomeAssistantType,
@@ -228,7 +225,7 @@ class ModbusCover(CoverEntity, RestoreEntity):
             self._available = False
             return
 
-        value = bool(result.bits[0])
+        value = bool(result.bits[0] & 1)
         self._available = True
 
         return value
diff --git a/homeassistant/components/modbus/sensor.py b/homeassistant/components/modbus/sensor.py
index 9b367292fcf..bd6b5e349c3 100644
--- a/homeassistant/components/modbus/sensor.py
+++ b/homeassistant/components/modbus/sensor.py
@@ -37,6 +37,7 @@ from .const import (
     DATA_TYPE_STRING,
     DATA_TYPE_UINT,
     DEFAULT_HUB,
+    DEFAULT_STRUCT_FORMAT,
     MODBUS_DOMAIN,
 )
 
@@ -99,21 +100,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Modbus sensors."""
     sensors = []
-    data_types = {
-        DATA_TYPE_INT: {1: "h", 2: "i", 4: "q"},
-        DATA_TYPE_UINT: {1: "H", 2: "I", 4: "Q"},
-        DATA_TYPE_FLOAT: {1: "e", 2: "f", 4: "d"},
-    }
 
     for register in config[CONF_REGISTERS]:
-        structure = ">i"
         if register[CONF_DATA_TYPE] == DATA_TYPE_STRING:
             structure = str(register[CONF_COUNT] * 2) + "s"
         elif register[CONF_DATA_TYPE] != DATA_TYPE_CUSTOM:
             try:
-                structure = (
-                    f">{data_types[register[CONF_DATA_TYPE]][register[CONF_COUNT]]}"
-                )
+                structure = f">{DEFAULT_STRUCT_FORMAT[register[CONF_DATA_TYPE]][register[CONF_COUNT]]}"
             except KeyError:
                 _LOGGER.error(
                     "Unable to detect data type for %s sensor, try a custom type",
diff --git a/homeassistant/components/modbus/switch.py b/homeassistant/components/modbus/switch.py
index fa5b42807b0..8fe1f886c3e 100644
--- a/homeassistant/components/modbus/switch.py
+++ b/homeassistant/components/modbus/switch.py
@@ -1,12 +1,13 @@
 """Support for Modbus switches."""
+from abc import ABC
 import logging
-from typing import Optional
+from typing import Any, Dict, Optional
 
 from pymodbus.exceptions import ConnectionException, ModbusException
 from pymodbus.pdu import ExceptionResponse
 import voluptuous as vol
 
-from homeassistant.components.switch import PLATFORM_SCHEMA
+from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
 from homeassistant.const import (
     CONF_COMMAND_OFF,
     CONF_COMMAND_ON,
@@ -17,7 +18,9 @@ from homeassistant.const import (
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import ToggleEntity
 from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.typing import ConfigType, HomeAssistantType
 
+from . import ModbusHub
 from .const import (
     CALL_TYPE_COIL,
     CALL_TYPE_REGISTER_HOLDING,
@@ -76,51 +79,31 @@ PLATFORM_SCHEMA = vol.All(
 )
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Read configuration and create Modbus devices."""
+async def async_setup_platform(
+    hass: HomeAssistantType, config: ConfigType, async_add_entities, discovery_info=None
+):
+    """Read configuration and create Modbus switches."""
     switches = []
     if CONF_COILS in config:
         for coil in config[CONF_COILS]:
-            hub_name = coil[CONF_HUB]
-            hub = hass.data[MODBUS_DOMAIN][hub_name]
-            switches.append(
-                ModbusCoilSwitch(
-                    hub, coil[CONF_NAME], coil[CONF_SLAVE], coil[CALL_TYPE_COIL]
-                )
-            )
+            hub: ModbusHub = hass.data[MODBUS_DOMAIN][coil[CONF_HUB]]
+            switches.append(ModbusCoilSwitch(hub, coil))
     if CONF_REGISTERS in config:
         for register in config[CONF_REGISTERS]:
-            hub_name = register[CONF_HUB]
-            hub = hass.data[MODBUS_DOMAIN][hub_name]
+            hub: ModbusHub = hass.data[MODBUS_DOMAIN][register[CONF_HUB]]
+            switches.append(ModbusRegisterSwitch(hub, register))
 
-            switches.append(
-                ModbusRegisterSwitch(
-                    hub,
-                    register[CONF_NAME],
-                    register.get(CONF_SLAVE),
-                    register[CONF_REGISTER],
-                    register[CONF_COMMAND_ON],
-                    register[CONF_COMMAND_OFF],
-                    register[CONF_VERIFY_STATE],
-                    register.get(CONF_VERIFY_REGISTER),
-                    register[CONF_REGISTER_TYPE],
-                    register.get(CONF_STATE_ON),
-                    register.get(CONF_STATE_OFF),
-                )
-            )
-
-    add_entities(switches)
+    async_add_entities(switches)
 
 
-class ModbusCoilSwitch(ToggleEntity, RestoreEntity):
-    """Representation of a Modbus coil switch."""
+class ModbusBaseSwitch(ToggleEntity, RestoreEntity, ABC):
+    """Base class representing a Modbus switch."""
 
-    def __init__(self, hub, name, slave, coil):
-        """Initialize the coil switch."""
-        self._hub = hub
-        self._name = name
-        self._slave = int(slave) if slave else None
-        self._coil = int(coil)
+    def __init__(self, hub: ModbusHub, config: Dict[str, Any]):
+        """Initialize the switch."""
+        self._hub: ModbusHub = hub
+        self._name = config[CONF_NAME]
+        self._slave = config.get(CONF_SLAVE)
         self._is_on = None
         self._available = True
 
@@ -146,13 +129,24 @@ class ModbusCoilSwitch(ToggleEntity, RestoreEntity):
         """Return True if entity is available."""
         return self._available
 
+
+class ModbusCoilSwitch(ModbusBaseSwitch, SwitchEntity):
+    """Representation of a Modbus coil switch."""
+
+    def __init__(self, hub: ModbusHub, config: Dict[str, Any]):
+        """Initialize the coil switch."""
+        super().__init__(hub, config)
+        self._coil = config[CALL_TYPE_COIL]
+
     def turn_on(self, **kwargs):
         """Set switch on."""
         self._write_coil(self._coil, True)
+        self._is_on = True
 
     def turn_off(self, **kwargs):
         """Set switch off."""
         self._write_coil(self._coil, False)
+        self._is_on = False
 
     def update(self):
         """Update the state of the switch."""
@@ -172,9 +166,9 @@ class ModbusCoilSwitch(ToggleEntity, RestoreEntity):
 
         self._available = True
         # bits[0] select the lowest bit in result,
-        # is_on for a binary_sensor is true if the bit are 1
+        # is_on for a binary_sensor is true if the bit is 1
         # The other bits are not considered.
-        return bool(result.bits[0])
+        return bool(result.bits[0] & 1)
 
     def _write_coil(self, coil, value):
         """Write coil using the Modbus hub slave."""
@@ -187,46 +181,21 @@ class ModbusCoilSwitch(ToggleEntity, RestoreEntity):
         self._available = True
 
 
-class ModbusRegisterSwitch(ModbusCoilSwitch):
+class ModbusRegisterSwitch(ModbusBaseSwitch, SwitchEntity):
     """Representation of a Modbus register switch."""
 
-    # pylint: disable=super-init-not-called
-    def __init__(
-        self,
-        hub,
-        name,
-        slave,
-        register,
-        command_on,
-        command_off,
-        verify_state,
-        verify_register,
-        register_type,
-        state_on,
-        state_off,
-    ):
+    def __init__(self, hub: ModbusHub, config: Dict[str, Any]):
         """Initialize the register switch."""
-        self._hub = hub
-        self._name = name
-        self._slave = slave
-        self._register = register
-        self._command_on = command_on
-        self._command_off = command_off
-        self._verify_state = verify_state
-        self._verify_register = verify_register if verify_register else self._register
-        self._register_type = register_type
+        super().__init__(hub, config)
+        self._register = config[CONF_REGISTER]
+        self._command_on = config[CONF_COMMAND_ON]
+        self._command_off = config[CONF_COMMAND_OFF]
+        self._state_on = config.get(CONF_STATE_ON, self._command_on)
+        self._state_off = config.get(CONF_STATE_OFF, self._command_off)
+        self._verify_state = config[CONF_VERIFY_STATE]
+        self._verify_register = config.get(CONF_VERIFY_REGISTER, self._register)
+        self._register_type = config[CONF_REGISTER_TYPE]
         self._available = True
-
-        if state_on is not None:
-            self._state_on = state_on
-        else:
-            self._state_on = self._command_on
-
-        if state_off is not None:
-            self._state_off = state_off
-        else:
-            self._state_off = self._command_off
-
         self._is_on = None
 
     def turn_on(self, **kwargs):
diff --git a/homeassistant/components/monoprice/translations/cs.json b/homeassistant/components/monoprice/translations/cs.json
index 892b8b2cd91..52bf2bf731e 100644
--- a/homeassistant/components/monoprice/translations/cs.json
+++ b/homeassistant/components/monoprice/translations/cs.json
@@ -1,10 +1,39 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
-                    "port": "Port"
-                }
+                    "port": "Port",
+                    "source_1": "Jm\u00e9no zdroje #1",
+                    "source_2": "Jm\u00e9no zdroje #2",
+                    "source_3": "Jm\u00e9no zdroje #3",
+                    "source_4": "Jm\u00e9no zdroje #4",
+                    "source_5": "Jm\u00e9no zdroje #5",
+                    "source_6": "Jm\u00e9no zdroje #6"
+                },
+                "title": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "source_1": "Jm\u00e9no zdroje #1",
+                    "source_2": "Jm\u00e9no zdroje #2",
+                    "source_3": "Jm\u00e9no zdroje #3",
+                    "source_4": "Jm\u00e9no zdroje #4",
+                    "source_5": "Jm\u00e9no zdroje #5",
+                    "source_6": "Jm\u00e9no zdroje #6"
+                },
+                "title": "Nastaven\u00ed zdroj\u016f"
             }
         }
     }
diff --git a/homeassistant/components/monoprice/translations/es.json b/homeassistant/components/monoprice/translations/es.json
index 549b7134234..e32631c5efe 100644
--- a/homeassistant/components/monoprice/translations/es.json
+++ b/homeassistant/components/monoprice/translations/es.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor int\u00e9ntalo de nuevo",
+            "cannot_connect": "No se pudo conectar",
             "unknown": "Error inesperado"
         },
         "step": {
diff --git a/homeassistant/components/monoprice/translations/et.json b/homeassistant/components/monoprice/translations/et.json
new file mode 100644
index 00000000000..4f67d402c52
--- /dev/null
+++ b/homeassistant/components/monoprice/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "port": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/monoprice/translations/no.json b/homeassistant/components/monoprice/translations/no.json
index 93efecbf54a..d48b080d827 100644
--- a/homeassistant/components/monoprice/translations/no.json
+++ b/homeassistant/components/monoprice/translations/no.json
@@ -4,13 +4,13 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
         "step": {
             "user": {
                 "data": {
-                    "port": "",
+                    "port": "Port",
                     "source_1": "Navn p\u00e5 kilden #1",
                     "source_2": "Navn p\u00e5 kilden #2",
                     "source_3": "Navn p\u00e5 kilden #3",
diff --git a/homeassistant/components/monoprice/translations/pl.json b/homeassistant/components/monoprice/translations/pl.json
index 020e0f2c554..db2b1633ddd 100644
--- a/homeassistant/components/monoprice/translations/pl.json
+++ b/homeassistant/components/monoprice/translations/pl.json
@@ -4,7 +4,7 @@
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
diff --git a/homeassistant/components/monoprice/translations/sv.json b/homeassistant/components/monoprice/translations/sv.json
index 3531253b136..95b7bce9e8c 100644
--- a/homeassistant/components/monoprice/translations/sv.json
+++ b/homeassistant/components/monoprice/translations/sv.json
@@ -9,6 +9,9 @@
         },
         "step": {
             "user": {
+                "data": {
+                    "port": "Port"
+                },
                 "title": "Anslut till enheten"
             }
         }
diff --git a/homeassistant/components/moon/sensor.py b/homeassistant/components/moon/sensor.py
index 3a25b68eeac..f7914177f8a 100644
--- a/homeassistant/components/moon/sensor.py
+++ b/homeassistant/components/moon/sensor.py
@@ -1,6 +1,4 @@
 """Support for tracking the moon phases."""
-import logging
-
 from astral import Astral
 import voluptuous as vol
 
@@ -10,8 +8,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 import homeassistant.util.dt as dt_util
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Moon"
 
 STATE_FIRST_QUARTER = "first_quarter"
diff --git a/homeassistant/components/moon/translations/sensor.cs.json b/homeassistant/components/moon/translations/sensor.cs.json
index ff430618ff9..337c7eb650d 100644
--- a/homeassistant/components/moon/translations/sensor.cs.json
+++ b/homeassistant/components/moon/translations/sensor.cs.json
@@ -3,8 +3,12 @@
         "moon__phase": {
             "first_quarter": "Prvn\u00ed \u010dtvr\u0165",
             "full_moon": "\u00dapln\u011bk",
+            "last_quarter": "Posledn\u00ed \u010dtvrt",
+            "new_moon": "Nov",
+            "waning_crescent": "Couvaj\u00edc\u00ed srpek",
+            "waning_gibbous": "Couvaj\u00edc\u00ed m\u011bs\u00edc",
             "waxing_crescent": "Dor\u016fstaj\u00edc\u00ed srpek",
-            "waxing_gibbous": "Prvn\u00ed \u010dtvr\u0165"
+            "waxing_gibbous": "Dor\u016fstaj\u00edc\u00ed m\u011bs\u00edc"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 74a664532df..09655ababda 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -1,6 +1,6 @@
 """Support for MQTT message handling."""
 import asyncio
-from functools import partial, wraps
+from functools import lru_cache, partial, wraps
 import inspect
 from itertools import groupby
 import json
@@ -31,7 +31,7 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.const import CONF_UNIQUE_ID  # noqa: F401
-from homeassistant.core import CoreState, Event, ServiceCall, callback
+from homeassistant.core import CoreState, Event, HassJob, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError, Unauthorized
 from homeassistant.helpers import config_validation as cv, event, template
 from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send
@@ -69,6 +69,7 @@ from .const import (
     DEFAULT_QOS,
     DEFAULT_RETAIN,
     DEFAULT_WILL,
+    DOMAIN,
     MQTT_CONNECTED,
     MQTT_DISCONNECTED,
     PROTOCOL_311,
@@ -86,8 +87,6 @@ from .util import _VALID_QOS_SCHEMA, valid_publish_topic, valid_subscribe_topic
 
 _LOGGER = logging.getLogger(__name__)
 
-DOMAIN = "mqtt"
-
 DATA_MQTT = "mqtt"
 
 SERVICE_PUBLISH = "publish"
@@ -323,7 +322,7 @@ MQTT_RW_PLATFORM_SCHEMA = MQTT_BASE_PLATFORM_SCHEMA.extend(
 MQTT_PUBLISH_SCHEMA = vol.Schema(
     {
         vol.Required(ATTR_TOPIC): valid_publish_topic,
-        vol.Exclusive(ATTR_PAYLOAD, CONF_PAYLOAD): object,
+        vol.Exclusive(ATTR_PAYLOAD, CONF_PAYLOAD): cv.string,
         vol.Exclusive(ATTR_PAYLOAD_TEMPLATE, CONF_PAYLOAD): cv.string,
         vol.Optional(ATTR_QOS, default=DEFAULT_QOS): _VALID_QOS_SCHEMA,
         vol.Optional(ATTR_RETAIN, default=DEFAULT_RETAIN): cv.boolean,
@@ -568,7 +567,9 @@ async def async_setup_entry(hass, entry):
         retain: bool = call.data[ATTR_RETAIN]
         if payload_template is not None:
             try:
-                payload = template.Template(payload_template, hass).async_render()
+                payload = template.Template(payload_template, hass).async_render(
+                    parse_result=False
+                )
             except template.jinja2.TemplateError as exc:
                 _LOGGER.error(
                     "Unable to publish to %s: rendering payload template of "
@@ -631,7 +632,7 @@ class Subscription:
 
     topic: str = attr.ib()
     matcher: Any = attr.ib()
-    callback: MessageCallbackType = attr.ib()
+    job: HassJob = attr.ib()
     qos: int = attr.ib(default=0)
     encoding: str = attr.ib(default="utf-8")
 
@@ -840,9 +841,10 @@ class MQTT:
             raise HomeAssistantError("Topic needs to be a string!")
 
         subscription = Subscription(
-            topic, _matcher_for_topic(topic), msg_callback, qos, encoding
+            topic, _matcher_for_topic(topic), HassJob(msg_callback), qos, encoding
         )
         self.subscriptions.append(subscription)
+        self._matching_subscriptions.cache_clear()
 
         # Only subscribe if currently connected.
         if self.connected:
@@ -855,6 +857,7 @@ class MQTT:
             if subscription not in self.subscriptions:
                 raise HomeAssistantError("Can't remove subscription twice")
             self.subscriptions.remove(subscription)
+            self._matching_subscriptions.cache_clear()
 
             if any(other.topic == topic for other in self.subscriptions):
                 # Other subscriptions on topic remaining - don't unsubscribe.
@@ -945,6 +948,14 @@ class MQTT:
         """Message received callback."""
         self.hass.add_job(self._mqtt_handle_message, msg)
 
+    @lru_cache(2048)
+    def _matching_subscriptions(self, topic):
+        subscriptions = []
+        for subscription in self.subscriptions:
+            if subscription.matcher(topic):
+                subscriptions.append(subscription)
+        return subscriptions
+
     @callback
     def _mqtt_handle_message(self, msg) -> None:
         _LOGGER.debug(
@@ -955,9 +966,9 @@ class MQTT:
         )
         timestamp = dt_util.utcnow()
 
-        for subscription in self.subscriptions:
-            if not subscription.matcher(msg.topic):
-                continue
+        subscriptions = self._matching_subscriptions(msg.topic)
+
+        for subscription in subscriptions:
 
             payload: SubscribePayloadType = msg.payload
             if subscription.encoding is not None:
@@ -969,12 +980,12 @@ class MQTT:
                         msg.payload,
                         msg.topic,
                         subscription.encoding,
-                        subscription.callback,
+                        subscription.job,
                     )
                     continue
 
-            self.hass.async_run_job(
-                subscription.callback,
+            self.hass.async_run_hass_job(
+                subscription.job,
                 Message(
                     msg.topic,
                     payload,
@@ -1277,7 +1288,6 @@ class MqttDiscoveryUpdate(Entity):
             else:
                 await self.async_remove()
 
-        @callback
         async def discovery_callback(payload):
             """Handle discovery update."""
             _LOGGER.info(
@@ -1465,3 +1475,35 @@ async def websocket_subscribe(hass, connection, msg):
     )
 
     connection.send_message(websocket_api.result_message(msg["id"]))
+
+
+@callback
+def async_subscribe_connection_status(hass, connection_status_callback):
+    """Subscribe to MQTT connection changes."""
+
+    connection_status_callback_job = HassJob(connection_status_callback)
+
+    @callback
+    def connected():
+        hass.async_add_hass_job(connection_status_callback_job, True)
+
+    @callback
+    def disconnected():
+        _LOGGER.error("Calling connection_status_callback, False")
+        hass.async_add_hass_job(connection_status_callback_job, False)
+
+    subscriptions = {
+        "connect": async_dispatcher_connect(hass, MQTT_CONNECTED, connected),
+        "disconnect": async_dispatcher_connect(hass, MQTT_DISCONNECTED, disconnected),
+    }
+
+    def unsubscribe():
+        subscriptions["connect"]()
+        subscriptions["disconnect"]()
+
+    return unsubscribe
+
+
+def is_connected(hass):
+    """Return if MQTT client is connected."""
+    return hass.data[DATA_MQTT].connected
diff --git a/homeassistant/components/mqtt/alarm_control_panel.py b/homeassistant/components/mqtt/alarm_control_panel.py
index 6d33175e6ca..35d0e1fb42e 100644
--- a/homeassistant/components/mqtt/alarm_control_panel.py
+++ b/homeassistant/components/mqtt/alarm_control_panel.py
@@ -338,7 +338,7 @@ class MqttAlarm(
         """Publish via mqtt."""
         command_template = self._config[CONF_COMMAND_TEMPLATE]
         values = {"action": action, "code": code}
-        payload = command_template.async_render(**values)
+        payload = command_template.async_render(**values, parse_result=False)
         mqtt.async_publish(
             self.hass,
             self._config[CONF_COMMAND_TOPIC],
diff --git a/homeassistant/components/mqtt/binary_sensor.py b/homeassistant/components/mqtt/binary_sensor.py
index cf7b0fc3ca6..339b41a9ddc 100644
--- a/homeassistant/components/mqtt/binary_sensor.py
+++ b/homeassistant/components/mqtt/binary_sensor.py
@@ -60,7 +60,7 @@ PLATFORM_SCHEMA = (
             vol.Optional(CONF_EXPIRE_AFTER): cv.positive_int,
             vol.Optional(CONF_FORCE_UPDATE, default=DEFAULT_FORCE_UPDATE): cv.boolean,
             vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-            vol.Optional(CONF_OFF_DELAY): vol.All(vol.Coerce(int), vol.Range(min=0)),
+            vol.Optional(CONF_OFF_DELAY): cv.positive_int,
             vol.Optional(CONF_PAYLOAD_OFF, default=DEFAULT_PAYLOAD_OFF): cv.string,
             vol.Optional(CONF_PAYLOAD_ON, default=DEFAULT_PAYLOAD_ON): cv.string,
             vol.Optional(CONF_UNIQUE_ID): cv.string,
diff --git a/homeassistant/components/mqtt/const.py b/homeassistant/components/mqtt/const.py
index 5ab3f756311..3e56ab6caf9 100644
--- a/homeassistant/components/mqtt/const.py
+++ b/homeassistant/components/mqtt/const.py
@@ -21,7 +21,7 @@ DATA_MQTT_CONFIG = "mqtt_config"
 
 DEFAULT_PREFIX = "homeassistant"
 DEFAULT_BIRTH_WILL_TOPIC = DEFAULT_PREFIX + "/status"
-DEFAULT_DISCOVERY = False
+DEFAULT_DISCOVERY = True
 DEFAULT_QOS = 0
 DEFAULT_PAYLOAD_AVAILABLE = "online"
 DEFAULT_PAYLOAD_NOT_AVAILABLE = "offline"
@@ -41,6 +41,8 @@ DEFAULT_WILL = {
     ATTR_RETAIN: DEFAULT_RETAIN,
 }
 
+DOMAIN = "mqtt"
+
 MQTT_CONNECTED = "mqtt_connected"
 MQTT_DISCONNECTED = "mqtt_disconnected"
 
diff --git a/homeassistant/components/mqtt/cover.py b/homeassistant/components/mqtt/cover.py
index 20146b0b7d6..c3a78133246 100644
--- a/homeassistant/components/mqtt/cover.py
+++ b/homeassistant/components/mqtt/cover.py
@@ -557,7 +557,7 @@ class MqttCover(
         position = kwargs[ATTR_POSITION]
         percentage_position = position
         if set_position_template is not None:
-            position = set_position_template.async_render(**kwargs)
+            position = set_position_template.async_render(parse_result=False, **kwargs)
         else:
             position = self.find_in_range_from_percent(position, COVER_PAYLOAD)
 
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index 6c4cbfd212f..7a478733826 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -1,5 +1,6 @@
 """Support for MQTT discovery."""
 import asyncio
+import functools
 import json
 import logging
 import re
@@ -9,9 +10,15 @@ from homeassistant.components import mqtt
 from homeassistant.const import CONF_DEVICE, CONF_PLATFORM
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.loader import async_get_mqtt
 
 from .abbreviations import ABBREVIATIONS, DEVICE_ABBREVIATIONS
-from .const import ATTR_DISCOVERY_HASH, ATTR_DISCOVERY_PAYLOAD, ATTR_DISCOVERY_TOPIC
+from .const import (
+    ATTR_DISCOVERY_HASH,
+    ATTR_DISCOVERY_PAYLOAD,
+    ATTR_DISCOVERY_TOPIC,
+    DOMAIN,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -39,7 +46,9 @@ SUPPORTED_COMPONENTS = [
 ALREADY_DISCOVERED = "mqtt_discovered_components"
 CONFIG_ENTRY_IS_SETUP = "mqtt_config_entry_is_setup"
 DATA_CONFIG_ENTRY_LOCK = "mqtt_config_entry_lock"
+DATA_CONFIG_FLOW_LOCK = "mqtt_discovery_config_flow_lock"
 DISCOVERY_UNSUBSCRIBE = "mqtt_discovery_unsubscribe"
+INTEGRATION_UNSUBSCRIBE = "mqtt_integration_discovery_unsubscribe"
 MQTT_DISCOVERY_UPDATED = "mqtt_discovery_updated_{}"
 MQTT_DISCOVERY_NEW = "mqtt_discovery_new_{}_{}"
 LAST_DISCOVERY = "mqtt_last_discovery"
@@ -65,8 +74,9 @@ async def async_start(
     hass: HomeAssistantType, discovery_topic, config_entry=None
 ) -> bool:
     """Start MQTT Discovery."""
+    mqtt_integrations = {}
 
-    async def async_device_message_received(msg):
+    async def async_entity_message_received(msg):
         """Process the received message."""
         hass.data[LAST_DISCOVERY] = time.time()
         payload = msg.payload
@@ -172,12 +182,52 @@ async def async_start(
             )
 
     hass.data[DATA_CONFIG_ENTRY_LOCK] = asyncio.Lock()
+    hass.data[DATA_CONFIG_FLOW_LOCK] = asyncio.Lock()
     hass.data[CONFIG_ENTRY_IS_SETUP] = set()
 
     hass.data[DISCOVERY_UNSUBSCRIBE] = await mqtt.async_subscribe(
-        hass, f"{discovery_topic}/#", async_device_message_received, 0
+        hass, f"{discovery_topic}/#", async_entity_message_received, 0
     )
     hass.data[LAST_DISCOVERY] = time.time()
+    mqtt_integrations = await async_get_mqtt(hass)
+
+    hass.data[INTEGRATION_UNSUBSCRIBE] = {}
+
+    for (integration, topics) in mqtt_integrations.items():
+
+        async def async_integration_message_received(integration, msg):
+            """Process the received message."""
+            key = f"{integration}_{msg.subscribed_topic}"
+
+            # Lock to prevent initiating many parallel config flows.
+            # Note: The lock is not intended to prevent a race, only for performance
+            async with hass.data[DATA_CONFIG_FLOW_LOCK]:
+                # Already unsubscribed
+                if key not in hass.data[INTEGRATION_UNSUBSCRIBE]:
+                    return
+
+                result = await hass.config_entries.flow.async_init(
+                    integration, context={"source": DOMAIN}, data=msg
+                )
+                if (
+                    result
+                    and result["type"] == "abort"
+                    and result["reason"]
+                    in ["already_configured", "single_instance_allowed"]
+                ):
+                    unsub = hass.data[INTEGRATION_UNSUBSCRIBE].pop(key, None)
+                    if unsub is None:
+                        return
+                    unsub()
+
+        for topic in topics:
+            key = f"{integration}_{topic}"
+            hass.data[INTEGRATION_UNSUBSCRIBE][key] = await mqtt.async_subscribe(
+                hass,
+                topic,
+                functools.partial(async_integration_message_received, integration),
+                0,
+            )
 
     return True
 
@@ -187,3 +237,7 @@ async def async_stop(hass: HomeAssistantType) -> bool:
     if DISCOVERY_UNSUBSCRIBE in hass.data and hass.data[DISCOVERY_UNSUBSCRIBE]:
         hass.data[DISCOVERY_UNSUBSCRIBE]()
         hass.data[DISCOVERY_UNSUBSCRIBE] = None
+    if INTEGRATION_UNSUBSCRIBE in hass.data:
+        for key, unsub in list(hass.data[INTEGRATION_UNSUBSCRIBE].items()):
+            unsub()
+            hass.data[INTEGRATION_UNSUBSCRIBE].pop(key)
diff --git a/homeassistant/components/mqtt/light/schema_basic.py b/homeassistant/components/mqtt/light/schema_basic.py
index d7c373bf72b..6fa6d70a665 100644
--- a/homeassistant/components/mqtt/light/schema_basic.py
+++ b/homeassistant/components/mqtt/light/schema_basic.py
@@ -348,17 +348,12 @@ class MqttLight(
                 "msg_callback": brightness_received,
                 "qos": self._config[CONF_QOS],
             }
-            self._brightness = 255
         elif (
             self._optimistic_brightness
             and last_state
             and last_state.attributes.get(ATTR_BRIGHTNESS)
         ):
             self._brightness = last_state.attributes.get(ATTR_BRIGHTNESS)
-        elif self._topic[CONF_BRIGHTNESS_COMMAND_TOPIC] is not None:
-            self._brightness = 255
-        else:
-            self._brightness = None
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -382,15 +377,12 @@ class MqttLight(
                 "msg_callback": rgb_received,
                 "qos": self._config[CONF_QOS],
             }
-            self._hs = (0, 0)
         if (
             self._optimistic_rgb
             and last_state
             and last_state.attributes.get(ATTR_HS_COLOR)
         ):
             self._hs = last_state.attributes.get(ATTR_HS_COLOR)
-        elif self._topic[CONF_RGB_COMMAND_TOPIC] is not None:
-            self._hs = (0, 0)
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -412,17 +404,12 @@ class MqttLight(
                 "msg_callback": color_temp_received,
                 "qos": self._config[CONF_QOS],
             }
-            self._color_temp = 150
         if (
             self._optimistic_color_temp
             and last_state
             and last_state.attributes.get(ATTR_COLOR_TEMP)
         ):
             self._color_temp = last_state.attributes.get(ATTR_COLOR_TEMP)
-        elif self._topic[CONF_COLOR_TEMP_COMMAND_TOPIC] is not None:
-            self._color_temp = 150
-        else:
-            self._color_temp = None
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -444,17 +431,12 @@ class MqttLight(
                 "msg_callback": effect_received,
                 "qos": self._config[CONF_QOS],
             }
-            self._effect = "none"
         if (
             self._optimistic_effect
             and last_state
             and last_state.attributes.get(ATTR_EFFECT)
         ):
             self._effect = last_state.attributes.get(ATTR_EFFECT)
-        elif self._topic[CONF_EFFECT_COMMAND_TOPIC] is not None:
-            self._effect = "none"
-        else:
-            self._effect = None
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -478,15 +460,12 @@ class MqttLight(
                 "msg_callback": hs_received,
                 "qos": self._config[CONF_QOS],
             }
-            self._hs = (0, 0)
         if (
             self._optimistic_hs
             and last_state
             and last_state.attributes.get(ATTR_HS_COLOR)
         ):
             self._hs = last_state.attributes.get(ATTR_HS_COLOR)
-        elif self._topic[CONF_HS_COMMAND_TOPIC] is not None:
-            self._hs = (0, 0)
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -510,17 +489,12 @@ class MqttLight(
                 "msg_callback": white_value_received,
                 "qos": self._config[CONF_QOS],
             }
-            self._white_value = 255
         elif (
             self._optimistic_white_value
             and last_state
             and last_state.attributes.get(ATTR_WHITE_VALUE)
         ):
             self._white_value = last_state.attributes.get(ATTR_WHITE_VALUE)
-        elif self._topic[CONF_WHITE_VALUE_COMMAND_TOPIC] is not None:
-            self._white_value = 255
-        else:
-            self._white_value = None
 
         @callback
         @log_messages(self.hass, self.entity_id)
@@ -541,15 +515,12 @@ class MqttLight(
                 "msg_callback": xy_received,
                 "qos": self._config[CONF_QOS],
             }
-            self._hs = (0, 0)
         if (
             self._optimistic_xy
             and last_state
             and last_state.attributes.get(ATTR_HS_COLOR)
         ):
             self._hs = last_state.attributes.get(ATTR_HS_COLOR)
-        elif self._topic[CONF_XY_COMMAND_TOPIC] is not None:
-            self._hs = (0, 0)
 
         self._sub_state = await subscription.async_subscribe_topics(
             self.hass, self._sub_state, topics
@@ -781,8 +752,9 @@ class MqttLight(
             and ATTR_HS_COLOR not in kwargs
             and self._topic[CONF_RGB_COMMAND_TOPIC] is not None
         ):
+            hs_color = self._hs if self._hs is not None else (0, 0)
             rgb = color_util.color_hsv_to_RGB(
-                self._hs[0], self._hs[1], kwargs[ATTR_BRIGHTNESS] / 255 * 100
+                hs_color[0], hs_color[1], kwargs[ATTR_BRIGHTNESS] / 255 * 100
             )
             tpl = self._command_templates[CONF_RGB_COMMAND_TEMPLATE]
             if tpl:
diff --git a/homeassistant/components/mqtt/light/schema_json.py b/homeassistant/components/mqtt/light/schema_json.py
index 39ea550d877..bba5605348b 100644
--- a/homeassistant/components/mqtt/light/schema_json.py
+++ b/homeassistant/components/mqtt/light/schema_json.py
@@ -192,35 +192,6 @@ class MqttLightJson(
         optimistic = config[CONF_OPTIMISTIC]
         self._optimistic = optimistic or self._topic[CONF_STATE_TOPIC] is None
 
-        brightness = config[CONF_BRIGHTNESS]
-        if brightness:
-            self._brightness = 255
-        else:
-            self._brightness = None
-
-        color_temp = config[CONF_COLOR_TEMP]
-        if color_temp:
-            self._color_temp = 150
-        else:
-            self._color_temp = None
-
-        effect = config[CONF_EFFECT]
-        if effect:
-            self._effect = "none"
-        else:
-            self._effect = None
-
-        white_value = config[CONF_WHITE_VALUE]
-        if white_value:
-            self._white_value = 255
-        else:
-            self._white_value = None
-
-        if config[CONF_HS] or config[CONF_RGB] or config[CONF_XY]:
-            self._hs = [0, 0]
-        else:
-            self._hs = None
-
         self._flash_times = {
             key: config.get(key)
             for key in (CONF_FLASH_TIME_SHORT, CONF_FLASH_TIME_LONG)
@@ -228,10 +199,10 @@ class MqttLightJson(
 
         self._supported_features = SUPPORT_TRANSITION | SUPPORT_FLASH
         self._supported_features |= config[CONF_RGB] and SUPPORT_COLOR
-        self._supported_features |= brightness and SUPPORT_BRIGHTNESS
-        self._supported_features |= color_temp and SUPPORT_COLOR_TEMP
-        self._supported_features |= effect and SUPPORT_EFFECT
-        self._supported_features |= white_value and SUPPORT_WHITE_VALUE
+        self._supported_features |= config[CONF_BRIGHTNESS] and SUPPORT_BRIGHTNESS
+        self._supported_features |= config[CONF_COLOR_TEMP] and SUPPORT_COLOR_TEMP
+        self._supported_features |= config[CONF_EFFECT] and SUPPORT_EFFECT
+        self._supported_features |= config[CONF_WHITE_VALUE] and SUPPORT_WHITE_VALUE
         self._supported_features |= config[CONF_XY] and SUPPORT_COLOR
         self._supported_features |= config[CONF_HS] and SUPPORT_COLOR
 
@@ -250,7 +221,7 @@ class MqttLightJson(
             elif values["state"] == "OFF":
                 self._state = False
 
-            if self._hs is not None:
+            if self._supported_features and SUPPORT_COLOR:
                 try:
                     red = int(values["color"]["r"])
                     green = int(values["color"]["g"])
@@ -282,7 +253,7 @@ class MqttLightJson(
                 except ValueError:
                     _LOGGER.warning("Invalid HS color value received")
 
-            if self._brightness is not None:
+            if self._supported_features and SUPPORT_BRIGHTNESS:
                 try:
                     self._brightness = int(
                         values["brightness"]
@@ -294,7 +265,7 @@ class MqttLightJson(
                 except (TypeError, ValueError):
                     _LOGGER.warning("Invalid brightness value received")
 
-            if self._color_temp is not None:
+            if self._supported_features and SUPPORT_COLOR_TEMP:
                 try:
                     self._color_temp = int(values["color_temp"])
                 except KeyError:
@@ -302,13 +273,13 @@ class MqttLightJson(
                 except ValueError:
                     _LOGGER.warning("Invalid color temp value received")
 
-            if self._effect is not None:
+            if self._supported_features and SUPPORT_EFFECT:
                 try:
                     self._effect = values["effect"]
                 except KeyError:
                     pass
 
-            if self._white_value is not None:
+            if self._supported_features and SUPPORT_WHITE_VALUE:
                 try:
                     self._white_value = int(values["white_value"])
                 except KeyError:
@@ -440,7 +411,7 @@ class MqttLightJson(
             if self._config[CONF_RGB]:
                 # If there's a brightness topic set, we don't want to scale the
                 # RGB values given using the brightness.
-                if self._brightness is not None:
+                if self._config[CONF_BRIGHTNESS]:
                     brightness = 255
                 else:
                     brightness = kwargs.get(ATTR_BRIGHTNESS, 255)
@@ -473,7 +444,7 @@ class MqttLightJson(
         if ATTR_TRANSITION in kwargs:
             message["transition"] = kwargs[ATTR_TRANSITION]
 
-        if ATTR_BRIGHTNESS in kwargs and self._brightness is not None:
+        if ATTR_BRIGHTNESS in kwargs and self._config[CONF_BRIGHTNESS]:
             brightness_normalized = kwargs[ATTR_BRIGHTNESS] / DEFAULT_BRIGHTNESS_SCALE
             brightness_scale = self._config[CONF_BRIGHTNESS_SCALE]
             device_brightness = min(
diff --git a/homeassistant/components/mqtt/light/schema_template.py b/homeassistant/components/mqtt/light/schema_template.py
index 9c2758524a3..44a87f2af2c 100644
--- a/homeassistant/components/mqtt/light/schema_template.py
+++ b/homeassistant/components/mqtt/light/schema_template.py
@@ -185,32 +185,6 @@ class MqttLightTemplate(
             or self._templates[CONF_STATE_TEMPLATE] is None
         )
 
-        # features
-        if self._templates[CONF_BRIGHTNESS_TEMPLATE] is not None:
-            self._brightness = 255
-        else:
-            self._brightness = None
-
-        if self._templates[CONF_COLOR_TEMP_TEMPLATE] is not None:
-            self._color_temp = 255
-        else:
-            self._color_temp = None
-
-        if self._templates[CONF_WHITE_VALUE_TEMPLATE] is not None:
-            self._white_value = 255
-        else:
-            self._white_value = None
-
-        if (
-            self._templates[CONF_RED_TEMPLATE] is not None
-            and self._templates[CONF_GREEN_TEMPLATE] is not None
-            and self._templates[CONF_BLUE_TEMPLATE] is not None
-        ):
-            self._hs = [0, 0]
-        else:
-            self._hs = None
-        self._effect = None
-
     async def _subscribe_topics(self):
         """(Re)Subscribe to topics."""
         for tpl in self._templates.values():
@@ -233,7 +207,7 @@ class MqttLightTemplate(
             else:
                 _LOGGER.warning("Invalid state value received")
 
-            if self._brightness is not None:
+            if self._templates[CONF_BRIGHTNESS_TEMPLATE] is not None:
                 try:
                     self._brightness = int(
                         self._templates[
@@ -243,7 +217,7 @@ class MqttLightTemplate(
                 except ValueError:
                     _LOGGER.warning("Invalid brightness value received")
 
-            if self._color_temp is not None:
+            if self._templates[CONF_COLOR_TEMP_TEMPLATE] is not None:
                 try:
                     self._color_temp = int(
                         self._templates[
@@ -253,7 +227,11 @@ class MqttLightTemplate(
                 except ValueError:
                     _LOGGER.warning("Invalid color temperature value received")
 
-            if self._hs is not None:
+            if (
+                self._templates[CONF_RED_TEMPLATE] is not None
+                and self._templates[CONF_GREEN_TEMPLATE] is not None
+                and self._templates[CONF_BLUE_TEMPLATE] is not None
+            ):
                 try:
                     red = int(
                         self._templates[
@@ -274,7 +252,7 @@ class MqttLightTemplate(
                 except ValueError:
                     _LOGGER.warning("Invalid color value received")
 
-            if self._white_value is not None:
+            if self._templates[CONF_COLOR_TEMP_TEMPLATE] is not None:
                 try:
                     self._white_value = int(
                         self._templates[
@@ -429,7 +407,8 @@ class MqttLightTemplate(
                 brightness = 255
             else:
                 brightness = kwargs.get(
-                    ATTR_BRIGHTNESS, self._brightness if self._brightness else 255
+                    ATTR_BRIGHTNESS,
+                    self._brightness if self._brightness is not None else 255,
                 )
             rgb = color_util.color_hsv_to_RGB(
                 hs_color[0], hs_color[1], brightness / 255 * 100
@@ -462,7 +441,9 @@ class MqttLightTemplate(
         mqtt.async_publish(
             self.hass,
             self._topics[CONF_COMMAND_TOPIC],
-            self._templates[CONF_COMMAND_ON_TEMPLATE].async_render(**values),
+            self._templates[CONF_COMMAND_ON_TEMPLATE].async_render(
+                parse_result=False, **values
+            ),
             self._config[CONF_QOS],
             self._config[CONF_RETAIN],
         )
@@ -485,7 +466,9 @@ class MqttLightTemplate(
         mqtt.async_publish(
             self.hass,
             self._topics[CONF_COMMAND_TOPIC],
-            self._templates[CONF_COMMAND_OFF_TEMPLATE].async_render(**values),
+            self._templates[CONF_COMMAND_OFF_TEMPLATE].async_render(
+                parse_result=False, **values
+            ),
             self._config[CONF_QOS],
             self._config[CONF_RETAIN],
         )
@@ -497,15 +480,19 @@ class MqttLightTemplate(
     def supported_features(self):
         """Flag supported features."""
         features = SUPPORT_FLASH | SUPPORT_TRANSITION
-        if self._brightness is not None:
+        if self._templates[CONF_BRIGHTNESS_TEMPLATE] is not None:
             features = features | SUPPORT_BRIGHTNESS
-        if self._hs is not None:
+        if (
+            self._templates[CONF_RED_TEMPLATE] is not None
+            and self._templates[CONF_GREEN_TEMPLATE] is not None
+            and self._templates[CONF_BLUE_TEMPLATE] is not None
+        ):
             features = features | SUPPORT_COLOR
         if self._config.get(CONF_EFFECT_LIST) is not None:
             features = features | SUPPORT_EFFECT
-        if self._color_temp is not None:
+        if self._templates[CONF_COLOR_TEMP_TEMPLATE] is not None:
             features = features | SUPPORT_COLOR_TEMP
-        if self._white_value is not None:
+        if self._templates[CONF_WHITE_VALUE_TEMPLATE] is not None:
             features = features | SUPPORT_WHITE_VALUE
 
         return features
diff --git a/homeassistant/components/mqtt/strings.json b/homeassistant/components/mqtt/strings.json
index d2d18af6e60..8c3db8e5b61 100644
--- a/homeassistant/components/mqtt/strings.json
+++ b/homeassistant/components/mqtt/strings.json
@@ -20,10 +20,10 @@
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of MQTT is allowed."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     },
     "error": {
-      "cannot_connect": "Unable to connect to the broker."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   },
   "device_automation": {
@@ -77,7 +77,7 @@
       }
     },
     "error": {
-      "cannot_connect": "Unable to connect to the broker.",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "bad_birth": "Invalid birth topic.",
       "bad_will": "Invalid will topic."
     }
diff --git a/homeassistant/components/mqtt/translations/ca.json b/homeassistant/components/mqtt/translations/ca.json
index 7709c784b9f..f72ee30cdcf 100644
--- a/homeassistant/components/mqtt/translations/ca.json
+++ b/homeassistant/components/mqtt/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Nom\u00e9s es permet una \u00fanica configuraci\u00f3 de MQTT."
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar amb el broker."
+            "cannot_connect": "Ha fallat la connexi\u00f3"
         },
         "step": {
             "broker": {
@@ -52,7 +52,7 @@
         "error": {
             "bad_birth": "Topic missatge de naixement inv\u00e0lid.",
             "bad_will": "Topic missatge d'\u00faltima voluntat inv\u00e0lid.",
-            "cannot_connect": "No es pot connectar amb el broker."
+            "cannot_connect": "Ha fallat la connexi\u00f3"
         },
         "step": {
             "broker": {
diff --git a/homeassistant/components/mqtt/translations/cs.json b/homeassistant/components/mqtt/translations/cs.json
index 87ab2de60d3..2f0e67a9772 100644
--- a/homeassistant/components/mqtt/translations/cs.json
+++ b/homeassistant/components/mqtt/translations/cs.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Je povolena pouze jedin\u00e1 konfigurace MQTT."
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "error": {
-            "cannot_connect": "Nelze se p\u0159ipojit k brokeru."
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
         },
         "step": {
             "broker": {
@@ -21,14 +21,35 @@
                 "data": {
                     "discovery": "Povolit automatick\u00e9 vyhled\u00e1v\u00e1n\u00ed za\u0159\u00edzen\u00ed"
                 },
-                "description": "Chcete nakonfigurovat slu\u017ebu Home Assistant pro p\u0159ipojen\u00ed k zprost\u0159edkovateli MQTT poskytovan\u00e9mu dopl\u0148kem hass.io {addon}?",
+                "description": "Chcete nakonfigurovat Home Assistant pro p\u0159ipojen\u00ed k MQTT poskytovan\u00e9mu dopl\u0148kem {addon} z Hass.io?",
                 "title": "MQTT Broker prost\u0159ednictv\u00edm dopl\u0148ku Hass.io"
             }
         }
     },
+    "device_automation": {
+        "trigger_subtype": {
+            "button_1": "Prvn\u00ed tla\u010d\u00edtko",
+            "button_2": "Druh\u00e9 tla\u010d\u00edtko",
+            "button_3": "T\u0159et\u00ed tla\u010d\u00edtko",
+            "button_4": "\u010ctvrt\u00e9 tla\u010d\u00edtko",
+            "button_5": "P\u00e1t\u00e9 tla\u010d\u00edtko",
+            "button_6": "\u0160est\u00e9 tla\u010d\u00edtko",
+            "turn_off": "Vypnout",
+            "turn_on": "Zapnout"
+        },
+        "trigger_type": {
+            "button_double_press": "Dvakr\u00e1t stisknuto \"{subtype}\"",
+            "button_long_release": "Uvoln\u011bno \"{subtype}\" po dlouh\u00e9m stisku",
+            "button_quadruple_press": "\u010cty\u0159ikr\u00e1t stisknuto \"{subtype}\"",
+            "button_quintuple_press": "P\u011btkr\u00e1t stisknuto \"{subtype}\"",
+            "button_short_press": "Stiknuto \"{subtype}\"",
+            "button_short_release": "Uvoln\u011bno \"{subtype}\"",
+            "button_triple_press": "T\u0159ikr\u00e1t stisknuto \"{subtype}\""
+        }
+    },
     "options": {
         "error": {
-            "cannot_connect": "Nelze se p\u0159ipojit k brokeru."
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
         },
         "step": {
             "broker": {
diff --git a/homeassistant/components/mqtt/translations/en.json b/homeassistant/components/mqtt/translations/en.json
index 7ccdf153c13..362e51b4405 100644
--- a/homeassistant/components/mqtt/translations/en.json
+++ b/homeassistant/components/mqtt/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Only a single configuration of MQTT is allowed."
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
-            "cannot_connect": "Unable to connect to the broker."
+            "cannot_connect": "Failed to connect"
         },
         "step": {
             "broker": {
@@ -52,7 +52,7 @@
         "error": {
             "bad_birth": "Invalid birth topic.",
             "bad_will": "Invalid will topic.",
-            "cannot_connect": "Unable to connect to the broker."
+            "cannot_connect": "Failed to connect"
         },
         "step": {
             "broker": {
diff --git a/homeassistant/components/mqtt/translations/es.json b/homeassistant/components/mqtt/translations/es.json
index 4ebf1e11c77..d36cfbc9694 100644
--- a/homeassistant/components/mqtt/translations/es.json
+++ b/homeassistant/components/mqtt/translations/es.json
@@ -52,7 +52,7 @@
         "error": {
             "bad_birth": "Tema de nacimiento inv\u00e1lido.",
             "bad_will": "Tema deseado inv\u00e1lido.",
-            "cannot_connect": "No se puede conectar con el agente."
+            "cannot_connect": "No se pudo conectar"
         },
         "step": {
             "broker": {
diff --git a/homeassistant/components/mqtt/translations/et.json b/homeassistant/components/mqtt/translations/et.json
index e8a9fac81d7..586d96a78ac 100644
--- a/homeassistant/components/mqtt/translations/et.json
+++ b/homeassistant/components/mqtt/translations/et.json
@@ -52,7 +52,7 @@
         "error": {
             "bad_birth": "Kehtetu loomise teavitus.",
             "bad_will": "Kehtetu l\u00f5petamise teavitus.",
-            "cannot_connect": "Vahendajaga ei saa \u00fchendust luua."
+            "cannot_connect": "\u00dchendamine nurjus"
         },
         "step": {
             "broker": {
diff --git a/homeassistant/components/mqtt/translations/it.json b/homeassistant/components/mqtt/translations/it.json
index 3488c323911..845d0efabc7 100644
--- a/homeassistant/components/mqtt/translations/it.json
+++ b/homeassistant/components/mqtt/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u00c8 consentita solo una singola configurazione di MQTT."
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi al broker."
+            "cannot_connect": "Impossibile connettersi"
         },
         "step": {
             "broker": {
@@ -52,7 +52,7 @@
         "error": {
             "bad_birth": "Argomento birth non valido.",
             "bad_will": "Argomento will non valido.",
-            "cannot_connect": "Impossibile connettersi al broker."
+            "cannot_connect": "Impossibile connettersi"
         },
         "step": {
             "broker": {
@@ -72,7 +72,7 @@
                     "birth_retain": "Persistenza del messaggio birth",
                     "birth_topic": "Argomento del messaggio birth",
                     "discovery": "Attiva l'individuazione",
-                    "will_enable": "Abilita messaggio di nascita",
+                    "will_enable": "Abilita messaggio di ultima volont\u00e0 e testamento",
                     "will_payload": "Payload del messaggio will",
                     "will_qos": "QoS del messaggio will",
                     "will_retain": "Persistenza del messaggio will",
diff --git a/homeassistant/components/mqtt/translations/lb.json b/homeassistant/components/mqtt/translations/lb.json
index ce1bbabfdc9..955dda7ff9c 100644
--- a/homeassistant/components/mqtt/translations/lb.json
+++ b/homeassistant/components/mqtt/translations/lb.json
@@ -52,7 +52,7 @@
         "error": {
             "bad_birth": "Ong\u00ebltege birth topic.",
             "bad_will": "Ong\u00ebltege will topic.",
-            "cannot_connect": "Kann sech net mam Broker verbannen."
+            "cannot_connect": "Feeler beim verbannen"
         },
         "step": {
             "broker": {
diff --git a/homeassistant/components/mqtt/translations/nl.json b/homeassistant/components/mqtt/translations/nl.json
index 2b8119aca4d..cedab89e3e2 100644
--- a/homeassistant/components/mqtt/translations/nl.json
+++ b/homeassistant/components/mqtt/translations/nl.json
@@ -36,14 +36,32 @@
             "button_6": "Zesde knop",
             "turn_off": "Uitschakelen",
             "turn_on": "Inschakelen"
+        },
+        "trigger_type": {
+            "button_double_press": "\"{subtype}\" dubbel geklikt",
+            "button_long_press": "\"{subtype}\" continu ingedrukt",
+            "button_long_release": "\"{subtype}\" losgelaten na lang indrukken",
+            "button_quadruple_press": "\"{subtype}\" viermaal geklikt",
+            "button_quintuple_press": "\"{subtype}\" vijfmaal geklikt",
+            "button_short_press": "\" {subtype} \" ingedrukt",
+            "button_short_release": "\"{subtype}\" losgelaten",
+            "button_triple_press": "\" {subtype} \" driemaal geklikt"
         }
     },
     "options": {
         "step": {
             "broker": {
                 "data": {
+                    "password": "Wachtwoord",
+                    "port": "Poort",
                     "username": "Gebruikersnaam"
                 }
+            },
+            "options": {
+                "data": {
+                    "birth_payload": "Birth message payload",
+                    "birth_topic": "Birth message onderwerp"
+                }
             }
         }
     }
diff --git a/homeassistant/components/mqtt/translations/no.json b/homeassistant/components/mqtt/translations/no.json
index 5f91b68b9b8..2a9372b3fb0 100644
--- a/homeassistant/components/mqtt/translations/no.json
+++ b/homeassistant/components/mqtt/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Kun en konfigurasjon av MQTT er tillatt."
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
-            "cannot_connect": "Kan ikke koble til megleren."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "broker": {
@@ -12,7 +12,7 @@
                     "broker": "Megler",
                     "discovery": "Aktiver oppdagelse",
                     "password": "Passord",
-                    "port": "",
+                    "port": "Port",
                     "username": "Brukernavn"
                 },
                 "description": "Vennligst fyll ut tilkoblingsinformasjonen for din MQTT megler."
@@ -34,7 +34,7 @@
             "button_4": "Fjerde knapp",
             "button_5": "Femte knapp",
             "button_6": "Sjette knapp",
-            "turn_off": "Skru av",
+            "turn_off": "Sl\u00e5 av",
             "turn_on": "Sl\u00e5 p\u00e5"
         },
         "trigger_type": {
@@ -52,14 +52,14 @@
         "error": {
             "bad_birth": "Ugyldig f\u00f8dselsemne.",
             "bad_will": "Ugyldig emne.",
-            "cannot_connect": "Kan ikke koble til megleren."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "broker": {
                 "data": {
                     "broker": "Megler",
                     "password": "Passord",
-                    "port": "",
+                    "port": "Port",
                     "username": "Brukernavn"
                 },
                 "description": "Vennligst oppgi tilkoblingsinformasjonen for din MQTT megler."
diff --git a/homeassistant/components/mqtt/translations/pl.json b/homeassistant/components/mqtt/translations/pl.json
index 92c6d49e677..7d0e0361edc 100644
--- a/homeassistant/components/mqtt/translations/pl.json
+++ b/homeassistant/components/mqtt/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Dozwolona jest tylko jedna konfiguracja MQTT."
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z po\u015brednikiem."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "step": {
             "broker": {
@@ -21,7 +21,7 @@
                 "data": {
                     "discovery": "W\u0142\u0105cz wykrywanie"
                 },
-                "description": "Czy chcesz skonfigurowa\u0107 Home Assistanta, aby po\u0142\u0105czy\u0142 si\u0119 z po\u015brednikiem MQTT dostarczonym przez dodatek Hass.io {addon}?",
+                "description": "Czy chcesz skonfigurowa\u0107 Home Assistant, aby po\u0142\u0105czy\u0142 si\u0119 z po\u015brednikiem MQTT dostarczonym przez dodatek Hass.io {addon}?",
                 "title": "Po\u015brednik MQTT za po\u015brednictwem dodatku Hass.io"
             }
         }
@@ -50,31 +50,33 @@
     },
     "options": {
         "error": {
-            "bad_birth": "Nieprawid\u0142owy temat \"birth\".",
-            "bad_will": "Nieprawid\u0142owy temat \"will\".",
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z po\u015brednikiem."
+            "bad_birth": "Nieprawid\u0142owy temat \"birth\"",
+            "bad_will": "Nieprawid\u0142owy temat \"will\"",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "step": {
             "broker": {
                 "data": {
                     "broker": "Po\u015brednik",
-                    "password": "[%key_id:common::config_flow::data::password%]",
+                    "password": "Has\u0142o",
                     "port": "Port",
-                    "username": "[%key_id:common::config_flow::data::username%]"
+                    "username": "Nazwa u\u017cytkownika"
                 },
                 "description": "Wprowad\u017a informacje o po\u0142\u0105czeniu po\u015brednika MQTT"
             },
             "options": {
                 "data": {
+                    "birth_enable": "W\u0142\u0105cz wiadomo\u015b\u0107 \"birth\"",
                     "birth_payload": "Warto\u015b\u0107 wiadomo\u015bci \"birth\"",
                     "birth_qos": "QoS wiadomo\u015bci \"birth\"",
                     "birth_retain": "Flaga \"retain\" wiadomo\u015bci \"birth\"",
                     "birth_topic": "Temat wiadomo\u015bci \"birth\"",
                     "discovery": "W\u0142\u0105cz wykrywanie",
+                    "will_enable": "W\u0142\u0105cz wiadomo\u015b\u0107 \"will\"",
                     "will_payload": "Warto\u015b\u0107 wiadomo\u015bci \"will\"",
                     "will_qos": "QoS wiadomo\u015bci \"will\"",
                     "will_retain": "Flaga \"retain\" wiadomo\u015bci \"will\"",
-                    "will_topic": "Temat "
+                    "will_topic": "Temat wiadomo\u015bci \"will\""
                 },
                 "description": "Opcje MQTT"
             }
diff --git a/homeassistant/components/mqtt/translations/ru.json b/homeassistant/components/mqtt/translations/ru.json
index d6540e702e4..bfac4cadecc 100644
--- a/homeassistant/components/mqtt/translations/ru.json
+++ b/homeassistant/components/mqtt/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0431\u0440\u043e\u043a\u0435\u0440\u0443."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "step": {
             "broker": {
@@ -52,7 +52,7 @@
         "error": {
             "bad_birth": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0442\u043e\u043f\u0438\u043a \u043e \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438.",
             "bad_will": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0442\u043e\u043f\u0438\u043a \u043e\u0431 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438.",
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0431\u0440\u043e\u043a\u0435\u0440\u0443"
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "step": {
             "broker": {
diff --git a/homeassistant/components/mqtt/translations/sv.json b/homeassistant/components/mqtt/translations/sv.json
index d5d73c4ae55..c74979bb6bb 100644
--- a/homeassistant/components/mqtt/translations/sv.json
+++ b/homeassistant/components/mqtt/translations/sv.json
@@ -37,5 +37,14 @@
             "turn_off": "St\u00e4ng av",
             "turn_on": "Starta"
         }
+    },
+    "options": {
+        "step": {
+            "broker": {
+                "data": {
+                    "username": "Anv\u00e4ndarnamn"
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/translations/zh-Hans.json b/homeassistant/components/mqtt/translations/zh-Hans.json
index 4a9b860f873..e508f2cb29e 100644
--- a/homeassistant/components/mqtt/translations/zh-Hans.json
+++ b/homeassistant/components/mqtt/translations/zh-Hans.json
@@ -47,5 +47,14 @@
             "button_short_release": "\"{subtype}\" \u91ca\u653e",
             "button_triple_press": "\"{subtype}\" \u4e09\u8fde\u51fb"
         }
+    },
+    "options": {
+        "step": {
+            "broker": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/mqtt/translations/zh-Hant.json b/homeassistant/components/mqtt/translations/zh-Hant.json
index 0483ad35cd3..de92aee3171 100644
--- a/homeassistant/components/mqtt/translations/zh-Hant.json
+++ b/homeassistant/components/mqtt/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44 MQTT\u3002"
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 Broker\u3002"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
         },
         "step": {
             "broker": {
@@ -52,7 +52,7 @@
         "error": {
             "bad_birth": "Birth \u4e3b\u984c\u7121\u6548\u3002",
             "bad_will": "Will \u4e3b\u984c\u7121\u6548\u3002",
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 Broker\u3002"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
         },
         "step": {
             "broker": {
diff --git a/homeassistant/components/mqtt/trigger.py b/homeassistant/components/mqtt/trigger.py
index 1ba7905120f..58ec51c4b1b 100644
--- a/homeassistant/components/mqtt/trigger.py
+++ b/homeassistant/components/mqtt/trigger.py
@@ -5,7 +5,7 @@ import voluptuous as vol
 
 from homeassistant.components import mqtt
 from homeassistant.const import CONF_PAYLOAD, CONF_PLATFORM
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 import homeassistant.helpers.config_validation as cv
 
 # mypy: allow-untyped-defs
@@ -35,6 +35,7 @@ async def async_attach_trigger(hass, config, action, automation_info):
     payload = config.get(CONF_PAYLOAD)
     encoding = config[CONF_ENCODING] or None
     qos = config[CONF_QOS]
+    job = HassJob(action)
 
     @callback
     def mqtt_automation_listener(mqttmsg):
@@ -53,7 +54,7 @@ async def async_attach_trigger(hass, config, action, automation_info):
             except ValueError:
                 pass
 
-            hass.async_run_job(action, {"trigger": data})
+            hass.async_run_hass_job(job, {"trigger": data})
 
     remove = await mqtt.async_subscribe(
         hass, topic, mqtt_automation_listener, encoding=encoding, qos=qos
diff --git a/homeassistant/components/mychevy/binary_sensor.py b/homeassistant/components/mychevy/binary_sensor.py
index b009fe3b3f4..eb28dd26b06 100644
--- a/homeassistant/components/mychevy/binary_sensor.py
+++ b/homeassistant/components/mychevy/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for MyChevy binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DOMAIN as BINARY_SENSOR_DOMAIN,
     BinarySensorEntity,
@@ -10,8 +8,6 @@ from homeassistant.util import slugify
 
 from . import DOMAIN as MYCHEVY_DOMAIN, UPDATE_TOPIC, EVBinarySensorConfig
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSORS = [EVBinarySensorConfig("Plugged In", "plugged_in", "plug")]
 
 
diff --git a/homeassistant/components/mycroft/__init__.py b/homeassistant/components/mycroft/__init__.py
index a7d63095469..86983092ad0 100644
--- a/homeassistant/components/mycroft/__init__.py
+++ b/homeassistant/components/mycroft/__init__.py
@@ -1,14 +1,10 @@
 """Support for Mycroft AI."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_HOST
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "mycroft"
 
 CONFIG_SCHEMA = vol.Schema(
diff --git a/homeassistant/components/myq/binary_sensor.py b/homeassistant/components/myq/binary_sensor.py
index e5f8fbd057e..57bd2451d2a 100644
--- a/homeassistant/components/myq/binary_sensor.py
+++ b/homeassistant/components/myq/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for MyQ gateways."""
-import logging
-
 from pymyq.const import (
     DEVICE_FAMILY as MYQ_DEVICE_FAMILY,
     DEVICE_FAMILY_GATEWAY as MYQ_DEVICE_FAMILY_GATEWAY,
@@ -18,8 +16,6 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MYQ_COORDINATOR, MYQ_GATEWAY
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up mysq covers."""
diff --git a/homeassistant/components/myq/cover.py b/homeassistant/components/myq/cover.py
index cccce36f314..59a7fb5bb2e 100644
--- a/homeassistant/components/myq/cover.py
+++ b/homeassistant/components/myq/cover.py
@@ -1,5 +1,4 @@
 """Support for MyQ-Enabled Garage Doors."""
-import logging
 import time
 
 from pymyq.const import (
@@ -43,9 +42,6 @@ from .const import (
     TRANSITION_START_DURATION,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_USERNAME): cv.string,
diff --git a/homeassistant/components/myq/manifest.json b/homeassistant/components/myq/manifest.json
index 540f08c0776..12afcb97d56 100644
--- a/homeassistant/components/myq/manifest.json
+++ b/homeassistant/components/myq/manifest.json
@@ -2,7 +2,7 @@
   "domain": "myq",
   "name": "MyQ",
   "documentation": "https://www.home-assistant.io/integrations/myq",
-  "requirements": ["pymyq==2.0.5"],
+  "requirements": ["pymyq==2.0.8"],
   "codeowners": ["@bdraco"],
   "config_flow": true,
   "homekit": {
diff --git a/homeassistant/components/myq/strings.json b/homeassistant/components/myq/strings.json
index 566b6a0fdac..19717907b0f 100644
--- a/homeassistant/components/myq/strings.json
+++ b/homeassistant/components/myq/strings.json
@@ -10,12 +10,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "MyQ is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/myq/translations/ca.json b/homeassistant/components/myq/translations/ca.json
index d22f3a39085..2b6549586a4 100644
--- a/homeassistant/components/myq/translations/ca.json
+++ b/homeassistant/components/myq/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "MyQ ja est\u00e0 configurat"
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/myq/translations/cs.json b/homeassistant/components/myq/translations/cs.json
index 338ff5d9a44..7c0c1ae503c 100644
--- a/homeassistant/components/myq/translations/cs.json
+++ b/homeassistant/components/myq/translations/cs.json
@@ -1,11 +1,20 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k br\u00e1n\u011b MyQ"
             }
         }
     }
diff --git a/homeassistant/components/myq/translations/en.json b/homeassistant/components/myq/translations/en.json
index 54392f3e293..9dad2d10cad 100644
--- a/homeassistant/components/myq/translations/en.json
+++ b/homeassistant/components/myq/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "MyQ is already configured"
+            "already_configured": "Service is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/myq/translations/et.json b/homeassistant/components/myq/translations/et.json
new file mode 100644
index 00000000000..9f5acce2c14
--- /dev/null
+++ b/homeassistant/components/myq/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchenduse loomine nurjus. Proovi uuesti",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/myq/translations/it.json b/homeassistant/components/myq/translations/it.json
index 9e0484dd6bb..ac793e62c6d 100644
--- a/homeassistant/components/myq/translations/it.json
+++ b/homeassistant/components/myq/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "MyQ \u00e8 gi\u00e0 configurato"
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/myq/translations/no.json b/homeassistant/components/myq/translations/no.json
index 4db38e2b91f..c639088917a 100644
--- a/homeassistant/components/myq/translations/no.json
+++ b/homeassistant/components/myq/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "MyQ er allerede konfigurert"
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
diff --git a/homeassistant/components/myq/translations/pl.json b/homeassistant/components/myq/translations/pl.json
index d01f9e588fa..ee87eb52294 100644
--- a/homeassistant/components/myq/translations/pl.json
+++ b/homeassistant/components/myq/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "MyQ jest ju\u017c skonfigurowane."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/myq/translations/ru.json b/homeassistant/components/myq/translations/ru.json
index 81ec65f0d63..daa3148beef 100644
--- a/homeassistant/components/myq/translations/ru.json
+++ b/homeassistant/components/myq/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/myq/translations/zh-Hans.json b/homeassistant/components/myq/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/myq/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/myq/translations/zh-Hant.json b/homeassistant/components/myq/translations/zh-Hant.json
index 5ed6e4c2f95..d50ff1810e3 100644
--- a/homeassistant/components/myq/translations/zh-Hant.json
+++ b/homeassistant/components/myq/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "MyQ \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/mysensors/gateway.py b/homeassistant/components/mysensors/gateway.py
index 3bb6326f78d..f9450b798ac 100644
--- a/homeassistant/components/mysensors/gateway.py
+++ b/homeassistant/components/mysensors/gateway.py
@@ -129,7 +129,7 @@ async def _get_gateway(hass, config, gateway_conf, persistence_file):
         )
     else:
         try:
-            await hass.async_add_job(is_serial_port, device)
+            await hass.async_add_executor_job(is_serial_port, device)
             gateway = mysensors.AsyncSerialGateway(
                 device,
                 baud=baud_rate,
@@ -141,7 +141,7 @@ async def _get_gateway(hass, config, gateway_conf, persistence_file):
             )
         except vol.Invalid:
             try:
-                await hass.async_add_job(is_socket_address, device)
+                await hass.async_add_executor_job(is_socket_address, device)
                 # valid ip address
                 gateway = mysensors.AsyncTCPGateway(
                     device,
diff --git a/homeassistant/components/mysensors/handler.py b/homeassistant/components/mysensors/handler.py
index 31e836f4767..b5b8b511aee 100644
--- a/homeassistant/components/mysensors/handler.py
+++ b/homeassistant/components/mysensors/handler.py
@@ -1,6 +1,4 @@
 """Handle MySensors messages."""
-import logging
-
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.util import decorator
@@ -9,7 +7,6 @@ from .const import CHILD_CALLBACK, MYSENSORS_GATEWAY_READY, NODE_CALLBACK
 from .device import get_mysensors_devices
 from .helpers import discover_mysensors_platform, validate_set_msg
 
-_LOGGER = logging.getLogger(__name__)
 HANDLERS = decorator.Registry()
 
 
diff --git a/homeassistant/components/mythicbeastsdns/__init__.py b/homeassistant/components/mythicbeastsdns/__init__.py
index d961c2e6e3d..3ab173ea43a 100644
--- a/homeassistant/components/mythicbeastsdns/__init__.py
+++ b/homeassistant/components/mythicbeastsdns/__init__.py
@@ -1,6 +1,5 @@
 """Support for Mythic Beasts Dynamic DNS service."""
 from datetime import timedelta
-import logging
 
 import mbddns
 import voluptuous as vol
@@ -15,8 +14,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_time_interval
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "mythicbeastsdns"
 
 DEFAULT_INTERVAL = timedelta(minutes=10)
diff --git a/homeassistant/components/n26/sensor.py b/homeassistant/components/n26/sensor.py
index 7752efe82ea..b9a8b21f9d0 100644
--- a/homeassistant/components/n26/sensor.py
+++ b/homeassistant/components/n26/sensor.py
@@ -1,13 +1,9 @@
 """Support for N26 bank account sensors."""
-import logging
-
 from homeassistant.helpers.entity import Entity
 
 from . import DEFAULT_SCAN_INTERVAL, DOMAIN, timestamp_ms_to_date
 from .const import DATA
 
-_LOGGER = logging.getLogger(__name__)
-
 SCAN_INTERVAL = DEFAULT_SCAN_INTERVAL
 
 ATTR_IBAN = "account"
diff --git a/homeassistant/components/n26/switch.py b/homeassistant/components/n26/switch.py
index 155c9c0091b..910aa96ca49 100644
--- a/homeassistant/components/n26/switch.py
+++ b/homeassistant/components/n26/switch.py
@@ -1,13 +1,9 @@
 """Support for N26 switches."""
-import logging
-
 from homeassistant.components.switch import SwitchEntity
 
 from . import DEFAULT_SCAN_INTERVAL, DOMAIN
 from .const import CARD_STATE_ACTIVE, CARD_STATE_BLOCKED, DATA
 
-_LOGGER = logging.getLogger(__name__)
-
 SCAN_INTERVAL = DEFAULT_SCAN_INTERVAL
 
 
diff --git a/homeassistant/components/nad/media_player.py b/homeassistant/components/nad/media_player.py
index a98e4eafe2d..7d8537db6c6 100644
--- a/homeassistant/components/nad/media_player.py
+++ b/homeassistant/components/nad/media_player.py
@@ -1,6 +1,4 @@
 """Support for interfacing with NAD receivers through RS-232."""
-import logging
-
 from nad_receiver import NADReceiver, NADReceiverTCP, NADReceiverTelnet
 import voluptuous as vol
 
@@ -16,8 +14,6 @@ from homeassistant.components.media_player.const import (
 from homeassistant.const import CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_TYPE = "RS232"
 DEFAULT_SERIAL_PORT = "/dev/ttyUSB0"
 DEFAULT_PORT = 53
diff --git a/homeassistant/components/neato/config_flow.py b/homeassistant/components/neato/config_flow.py
index 88a2085b339..f74364bc8bc 100644
--- a/homeassistant/components/neato/config_flow.py
+++ b/homeassistant/components/neato/config_flow.py
@@ -105,8 +105,8 @@ class NeatoConfigFlow(config_entries.ConfigFlow, domain=NEATO_DOMAIN):
         try:
             Account(username, password, this_vendor)
         except NeatoLoginException:
-            return "invalid_credentials"
+            return "invalid_auth"
         except NeatoRobotException:
-            return "unexpected_error"
+            return "unknown"
 
         return None
diff --git a/homeassistant/components/neato/strings.json b/homeassistant/components/neato/strings.json
index 024a30a8e2d..5d71d4889ac 100644
--- a/homeassistant/components/neato/strings.json
+++ b/homeassistant/components/neato/strings.json
@@ -12,15 +12,15 @@
       }
     },
     "error": {
-      "invalid_credentials": "Invalid credentials",
-      "unexpected_error": "Unexpected error"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "create_entry": {
       "default": "See [Neato documentation]({docs_url})."
     },
     "abort": {
-      "already_configured": "Already configured",
-      "invalid_credentials": "Invalid credentials"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     }
   }
 }
\ No newline at end of file
diff --git a/homeassistant/components/neato/translations/ca.json b/homeassistant/components/neato/translations/ca.json
index d1cfe9f7a91..c3d3426eb99 100644
--- a/homeassistant/components/neato/translations/ca.json
+++ b/homeassistant/components/neato/translations/ca.json
@@ -1,15 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ja configurat",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Credencials inv\u00e0lides"
         },
         "create_entry": {
             "default": "Consulta la [documentaci\u00f3 de Neato]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Credencials inv\u00e0lides",
-            "unexpected_error": "Error inesperat"
+            "unexpected_error": "Error inesperat",
+            "unknown": "Error inesperat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/neato/translations/cs.json b/homeassistant/components/neato/translations/cs.json
index a3c86fa605f..d1669791991 100644
--- a/homeassistant/components/neato/translations/cs.json
+++ b/homeassistant/components/neato/translations/cs.json
@@ -1,14 +1,27 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje"
+        },
+        "create_entry": {
+            "default": "Viz [dokumentace Neato]({docs_url})."
+        },
         "error": {
-            "unexpected_error": "Neo\u010dek\u00e1van\u00e1 chyba"
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje",
+            "unexpected_error": "Neo\u010dek\u00e1van\u00e1 chyba",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "description": "Viz [dokumentace Neato]({docs_url}).",
+                "title": "Informace o \u00fa\u010dtu Neato"
             }
         }
     }
diff --git a/homeassistant/components/neato/translations/el.json b/homeassistant/components/neato/translations/el.json
new file mode 100644
index 00000000000..36bd6653da6
--- /dev/null
+++ b/homeassistant/components/neato/translations/el.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "abort": {
+            "invalid_auth": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b1\u03c5\u03b8\u03b5\u03bd\u03c4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7"
+        },
+        "error": {
+            "invalid_auth": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b1\u03c5\u03b8\u03b5\u03bd\u03c4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+            "unknown": "\u039c\u03b7 \u03b1\u03bd\u03b1\u03bc\u03b5\u03bd\u03cc\u03bc\u03b5\u03bd\u03bf \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/neato/translations/en.json b/homeassistant/components/neato/translations/en.json
index d41faddcc66..5cc832f39b7 100644
--- a/homeassistant/components/neato/translations/en.json
+++ b/homeassistant/components/neato/translations/en.json
@@ -1,15 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Already configured",
+            "already_configured": "Device is already configured",
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid credentials"
         },
         "create_entry": {
             "default": "See [Neato documentation]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid credentials",
-            "unexpected_error": "Unexpected error"
+            "unexpected_error": "Unexpected error",
+            "unknown": "Unexpected error"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/neato/translations/es.json b/homeassistant/components/neato/translations/es.json
index 766f05d31bf..f4eddbd5800 100644
--- a/homeassistant/components/neato/translations/es.json
+++ b/homeassistant/components/neato/translations/es.json
@@ -1,15 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ya est\u00e1 configurado",
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_credentials": "Credenciales no v\u00e1lidas"
         },
         "create_entry": {
             "default": "Ver [documentaci\u00f3n Neato]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_credentials": "Credenciales no v\u00e1lidas",
-            "unexpected_error": "Error inesperado"
+            "unexpected_error": "Error inesperado",
+            "unknown": "Error inesperado"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/neato/translations/et.json b/homeassistant/components/neato/translations/et.json
index 6a45426e3d0..8eed7850b4b 100644
--- a/homeassistant/components/neato/translations/et.json
+++ b/homeassistant/components/neato/translations/et.json
@@ -1,7 +1,15 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_credentials": "Sobimatu mandaat"
+        },
         "error": {
-            "unexpected_error": "Ootamatu t\u00f5rge"
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_credentials": "Sobimatu mandaat",
+            "unexpected_error": "Ootamatu t\u00f5rge",
+            "unknown": "Ootamatu t\u00f5rge"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/neato/translations/fr.json b/homeassistant/components/neato/translations/fr.json
index 66f1bb52804..11c06cd1c97 100644
--- a/homeassistant/components/neato/translations/fr.json
+++ b/homeassistant/components/neato/translations/fr.json
@@ -2,14 +2,17 @@
     "config": {
         "abort": {
             "already_configured": "D\u00e9j\u00e0 configur\u00e9",
+            "invalid_auth": "Authentification invalide",
             "invalid_credentials": "Informations d'identification invalides"
         },
         "create_entry": {
             "default": "Voir [Documentation Neato]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Authentification invalide",
             "invalid_credentials": "Informations d'identification invalides",
-            "unexpected_error": "Erreur inattendue"
+            "unexpected_error": "Erreur inattendue",
+            "unknown": "Erreur inattendue"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/neato/translations/it.json b/homeassistant/components/neato/translations/it.json
index a456a2688e0..654862f0259 100644
--- a/homeassistant/components/neato/translations/it.json
+++ b/homeassistant/components/neato/translations/it.json
@@ -1,15 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Gi\u00e0 configurato",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "invalid_auth": "Autenticazione non valida",
             "invalid_credentials": "Credenziali non valide"
         },
         "create_entry": {
             "default": "Vedere la [Documentazione di Neato]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Autenticazione non valida",
             "invalid_credentials": "Credenziali non valide",
-            "unexpected_error": "Errore inaspettato"
+            "unexpected_error": "Errore inaspettato",
+            "unknown": "Errore imprevisto"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/neato/translations/lb.json b/homeassistant/components/neato/translations/lb.json
index a62009f19b0..a2c2343f5ac 100644
--- a/homeassistant/components/neato/translations/lb.json
+++ b/homeassistant/components/neato/translations/lb.json
@@ -2,12 +2,14 @@
     "config": {
         "abort": {
             "already_configured": "Scho konfigur\u00e9iert",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_credentials": "Ong\u00eblteg Login Informatioune"
         },
         "create_entry": {
             "default": "Kuckt [Neato Dokumentatioun]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_credentials": "Ong\u00eblteg Login Informatioune",
             "unexpected_error": "Onerwaarte Feeler"
         },
diff --git a/homeassistant/components/neato/translations/no.json b/homeassistant/components/neato/translations/no.json
index de8932cd570..57116666454 100644
--- a/homeassistant/components/neato/translations/no.json
+++ b/homeassistant/components/neato/translations/no.json
@@ -1,15 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Allerede konfigurert",
+            "already_configured": "Enheten er allerede konfigurert",
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig legitimasjon"
         },
         "create_entry": {
             "default": "Se [Neato dokumentasjon]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig legitimasjon",
-            "unexpected_error": "Uventet feil"
+            "unexpected_error": "Uventet feil",
+            "unknown": "Uventet feil"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/neato/translations/pl.json b/homeassistant/components/neato/translations/pl.json
index 821cf79c971..f857f1c3370 100644
--- a/homeassistant/components/neato/translations/pl.json
+++ b/homeassistant/components/neato/translations/pl.json
@@ -1,15 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Konto jest ju\u017c skonfigurowane.",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_credentials": "Nieprawid\u0142owe dane uwierzytelniaj\u0105ce"
         },
         "create_entry": {
             "default": "Zapoznaj si\u0119 z [dokumentacj\u0105 Neato]({docs_url})."
         },
         "error": {
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_credentials": "Nieprawid\u0142owe dane uwierzytelniaj\u0105ce",
-            "unexpected_error": "Nieoczekiwany b\u0142\u0105d"
+            "unexpected_error": "Nieoczekiwany b\u0142\u0105d",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/neato/translations/ru.json b/homeassistant/components/neato/translations/ru.json
index 92935906a86..cb899e4614a 100644
--- a/homeassistant/components/neato/translations/ru.json
+++ b/homeassistant/components/neato/translations/ru.json
@@ -1,15 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435."
         },
         "create_entry": {
             "default": "\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0439 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438."
         },
         "error": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.",
-            "unexpected_error": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+            "unexpected_error": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/neato/translations/zh-Hans.json b/homeassistant/components/neato/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/neato/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/neato/translations/zh-Hant.json b/homeassistant/components/neato/translations/zh-Hant.json
index 8d8fe629030..84d31b35e6d 100644
--- a/homeassistant/components/neato/translations/zh-Hant.json
+++ b/homeassistant/components/neato/translations/zh-Hant.json
@@ -1,15 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u5df2\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u6191\u8b49\u7121\u6548"
         },
         "create_entry": {
             "default": "\u8acb\u53c3\u95b1 [Neato \u6587\u4ef6]({docs_url})\u3002"
         },
         "error": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u6191\u8b49\u7121\u6548",
-            "unexpected_error": "\u672a\u9810\u671f\u932f\u8aa4"
+            "unexpected_error": "\u672a\u9810\u671f\u932f\u8aa4",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/nello/manifest.json b/homeassistant/components/nello/manifest.json
index b7ae9237f3d..c8324022b63 100644
--- a/homeassistant/components/nello/manifest.json
+++ b/homeassistant/components/nello/manifest.json
@@ -2,6 +2,6 @@
   "domain": "nello",
   "name": "Nello",
   "documentation": "https://www.home-assistant.io/integrations/nello",
-  "requirements": ["pynello==2.0.2"],
+  "requirements": ["pynello==2.0.3"],
   "codeowners": ["@pschmitt"]
 }
diff --git a/homeassistant/components/ness_alarm/__init__.py b/homeassistant/components/ness_alarm/__init__.py
index 7e5df865aa0..e17e63ee46c 100644
--- a/homeassistant/components/ness_alarm/__init__.py
+++ b/homeassistant/components/ness_alarm/__init__.py
@@ -1,7 +1,6 @@
 """Support for Ness D8X/D16X devices."""
 from collections import namedtuple
 import datetime
-import logging
 
 from nessclient import ArmingState, Client
 import voluptuous as vol
@@ -18,8 +17,6 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "ness_alarm"
 DATA_NESS = "ness_alarm"
 
diff --git a/homeassistant/components/ness_alarm/binary_sensor.py b/homeassistant/components/ness_alarm/binary_sensor.py
index d7e7851792e..ebe5face235 100644
--- a/homeassistant/components/ness_alarm/binary_sensor.py
+++ b/homeassistant/components/ness_alarm/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Ness D8X/D16X zone states - represented as binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -14,8 +12,6 @@ from . import (
     ZoneChangedData,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Ness Alarm binary sensor devices."""
diff --git a/homeassistant/components/nest/__init__.py b/homeassistant/components/nest/__init__.py
index 185bf7c78ef..16ff05f9091 100644
--- a/homeassistant/components/nest/__init__.py
+++ b/homeassistant/components/nest/__init__.py
@@ -1,13 +1,18 @@
 """Support for Nest devices."""
+
+import asyncio
 from datetime import datetime, timedelta
 import logging
 import threading
 
+from google_nest_sdm.event import EventCallback, EventMessage
+from google_nest_sdm.google_nest_subscriber import GoogleNestSubscriber
 from nest import Nest
 from nest.nest import APIError, AuthorizationError
 import voluptuous as vol
 
 from homeassistant import config_entries
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_BINARY_SENSORS,
     CONF_CLIENT_ID,
@@ -19,25 +24,42 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_START,
     EVENT_HOMEASSISTANT_STOP,
 )
-from homeassistant.core import callback
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import (
+    aiohttp_client,
+    config_entry_oauth2_flow,
+    config_validation as cv,
+)
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect,
+    async_dispatcher_send,
+    dispatcher_send,
+)
 from homeassistant.helpers.entity import Entity
 
-from . import local_auth
-from .const import DOMAIN
+from . import api, config_flow, local_auth
+from .const import (
+    API_URL,
+    DATA_SDM,
+    DOMAIN,
+    OAUTH2_AUTHORIZE,
+    OAUTH2_TOKEN,
+    SIGNAL_NEST_UPDATE,
+)
 
 _CONFIGURING = {}
 _LOGGER = logging.getLogger(__name__)
 
+CONF_PROJECT_ID = "project_id"
+CONF_SUBSCRIBER_ID = "subscriber_id"
+
+# Configuration for the legacy nest API
 SERVICE_CANCEL_ETA = "cancel_eta"
 SERVICE_SET_ETA = "set_eta"
 
 DATA_NEST = "nest"
 DATA_NEST_CONFIG = "nest_config"
 
-SIGNAL_NEST_UPDATE = "nest_update"
-
 NEST_CONFIG_FILE = "nest.conf"
 
 ATTR_ETA = "eta"
@@ -61,6 +83,10 @@ CONFIG_SCHEMA = vol.Schema(
             {
                 vol.Required(CONF_CLIENT_ID): cv.string,
                 vol.Required(CONF_CLIENT_SECRET): cv.string,
+                # Required to use the new API (optional for compatibility)
+                vol.Optional(CONF_PROJECT_ID): cv.string,
+                vol.Optional(CONF_SUBSCRIBER_ID): cv.string,
+                # Config that only currently works on the old API
                 vol.Optional(CONF_STRUCTURE): vol.All(cv.ensure_list, [cv.string]),
                 vol.Optional(CONF_SENSORS): SENSOR_SCHEMA,
                 vol.Optional(CONF_BINARY_SENSORS): SENSOR_SCHEMA,
@@ -70,6 +96,10 @@ CONFIG_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
+PLATFORMS = ["sensor"]
+
+# Services for the legacy API
+
 SET_AWAY_MODE_SCHEMA = vol.Schema(
     {
         vol.Required(ATTR_AWAY_MODE): vol.In([AWAY_MODE_AWAY, AWAY_MODE_HOME]),
@@ -94,10 +124,128 @@ CANCEL_ETA_SCHEMA = vol.Schema(
 )
 
 
+async def async_setup(hass: HomeAssistant, config: dict):
+    """Set up Nest components with dispatch between old/new flows."""
+    hass.data[DOMAIN] = {}
+
+    if DOMAIN not in config:
+        return True
+
+    if CONF_PROJECT_ID not in config[DOMAIN]:
+        return await async_setup_legacy(hass, config)
+
+    if CONF_SUBSCRIBER_ID not in config[DOMAIN]:
+        _LOGGER.error("Configuration option '{CONF_SUBSCRIBER_ID}' required")
+        return False
+
+    # For setup of ConfigEntry below
+    hass.data[DOMAIN][DATA_NEST_CONFIG] = config[DOMAIN]
+    project_id = config[DOMAIN][CONF_PROJECT_ID]
+    config_flow.NestFlowHandler.register_sdm_api(hass)
+    config_flow.NestFlowHandler.async_register_implementation(
+        hass,
+        config_entry_oauth2_flow.LocalOAuth2Implementation(
+            hass,
+            DOMAIN,
+            config[DOMAIN][CONF_CLIENT_ID],
+            config[DOMAIN][CONF_CLIENT_SECRET],
+            OAUTH2_AUTHORIZE.format(project_id=project_id),
+            OAUTH2_TOKEN,
+        ),
+    )
+
+    return True
+
+
+class SignalUpdateCallback(EventCallback):
+    """An EventCallback invoked when new events arrive from subscriber."""
+
+    def __init__(self, hass: HomeAssistant):
+        """Initialize EventCallback."""
+        self._hass = hass
+
+    def handle_event(self, event_message: EventMessage):
+        """Process an incoming EventMessage."""
+        _LOGGER.debug("Update %s @ %s", event_message.event_id, event_message.timestamp)
+        traits = event_message.resource_update_traits
+        if traits:
+            _LOGGER.debug("Trait update %s", traits.keys())
+        events = event_message.resource_update_events
+        if events:
+            _LOGGER.debug("Event Update %s", events.keys())
+
+        if not event_message.resource_update_traits:
+            # Note: Currently ignoring events like camera motion
+            return
+        # This event triggered an update to a device that changed some
+        # properties which the DeviceManager should already have received.
+        # Send a signal to refresh state of all listening devices.
+        async_dispatcher_send(self._hass, SIGNAL_NEST_UPDATE)
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Set up Nest from a config entry with dispatch between old/new flows."""
+
+    if DATA_SDM not in entry.data:
+        return await async_setup_legacy_entry(hass, entry)
+
+    implementation = (
+        await config_entry_oauth2_flow.async_get_config_entry_implementation(
+            hass, entry
+        )
+    )
+
+    config = hass.data[DOMAIN][DATA_NEST_CONFIG]
+
+    session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
+    auth = api.AsyncConfigEntryAuth(
+        aiohttp_client.async_get_clientsession(hass),
+        session,
+        API_URL,
+    )
+    subscriber = GoogleNestSubscriber(
+        auth, config[CONF_PROJECT_ID], config[CONF_SUBSCRIBER_ID]
+    )
+    subscriber.set_update_callback(SignalUpdateCallback(hass))
+    asyncio.create_task(subscriber.start_async())
+    hass.data[DOMAIN][entry.entry_id] = subscriber
+
+    for component in PLATFORMS:
+        hass.async_create_task(
+            hass.config_entries.async_forward_entry_setup(entry, component)
+        )
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Unload a config entry."""
+    if DATA_SDM not in entry.data:
+        # Legacy API
+        return True
+
+    subscriber = hass.data[DOMAIN][entry.entry_id]
+    subscriber.stop_async()
+    unload_ok = all(
+        await asyncio.gather(
+            *[
+                hass.config_entries.async_forward_entry_unload(entry, component)
+                for component in PLATFORMS
+            ]
+        )
+    )
+    if unload_ok:
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
+
+
 def nest_update_event_broker(hass, nest):
     """
     Dispatch SIGNAL_NEST_UPDATE to devices when nest stream API received data.
 
+    Used for the legacy nest API.
+
     Runs in its own thread.
     """
     _LOGGER.debug("Listening for nest.update_event")
@@ -115,8 +263,8 @@ def nest_update_event_broker(hass, nest):
     _LOGGER.debug("Stop listening for nest.update_event")
 
 
-async def async_setup(hass, config):
-    """Set up Nest components."""
+async def async_setup_legacy(hass, config):
+    """Set up Nest components using the legacy nest API."""
     if DOMAIN not in config:
         return True
 
@@ -141,15 +289,15 @@ async def async_setup(hass, config):
     return True
 
 
-async def async_setup_entry(hass, entry):
-    """Set up Nest from a config entry."""
+async def async_setup_legacy_entry(hass, entry):
+    """Set up Nest from legacy config entry."""
 
     nest = Nest(access_token=entry.data["tokens"]["access_token"])
 
     _LOGGER.debug("proceeding with setup")
     conf = hass.data.get(DATA_NEST_CONFIG, {})
-    hass.data[DATA_NEST] = NestDevice(hass, conf, nest)
-    if not await hass.async_add_job(hass.data[DATA_NEST].initialize):
+    hass.data[DATA_NEST] = NestLegacyDevice(hass, conf, nest)
+    if not await hass.async_add_executor_job(hass.data[DATA_NEST].initialize):
         return False
 
     for component in "climate", "camera", "sensor", "binary_sensor":
@@ -275,8 +423,8 @@ async def async_setup_entry(hass, entry):
     return True
 
 
-class NestDevice:
-    """Structure Nest functions for hass."""
+class NestLegacyDevice:
+    """Structure Nest functions for hass for legacy API."""
 
     def __init__(self, hass, conf, nest):
         """Init Nest Devices."""
diff --git a/homeassistant/components/nest/api.py b/homeassistant/components/nest/api.py
new file mode 100644
index 00000000000..46138469d6d
--- /dev/null
+++ b/homeassistant/components/nest/api.py
@@ -0,0 +1,35 @@
+"""API for Google Nest Device Access bound to Home Assistant OAuth."""
+
+from aiohttp import ClientSession
+from google.oauth2.credentials import Credentials
+from google_nest_sdm.auth import AbstractAuth
+
+from homeassistant.helpers import config_entry_oauth2_flow
+
+# See https://developers.google.com/nest/device-access/registration
+
+
+class AsyncConfigEntryAuth(AbstractAuth):
+    """Provide Google Nest Device Access authentication tied to an OAuth2 based config entry."""
+
+    def __init__(
+        self,
+        websession: ClientSession,
+        oauth_session: config_entry_oauth2_flow.OAuth2Session,
+        api_url: str,
+    ):
+        """Initialize Google Nest Device Access auth."""
+        super().__init__(websession, api_url)
+        self._oauth_session = oauth_session
+
+    async def async_get_access_token(self):
+        """Return a valid access token."""
+        if not self._oauth_session.valid_token:
+            await self._oauth_session.async_ensure_token_valid()
+
+        return self._oauth_session.token["access_token"]
+
+    async def async_get_creds(self):
+        """Return a minimal OAuth credential."""
+        token = await self.async_get_access_token()
+        return Credentials(token=token)
diff --git a/homeassistant/components/nest/binary_sensor.py b/homeassistant/components/nest/binary_sensor.py
index 0e9198a0220..56d4ac31b78 100644
--- a/homeassistant/components/nest/binary_sensor.py
+++ b/homeassistant/components/nest/binary_sensor.py
@@ -117,7 +117,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
 
         return sensors
 
-    async_add_entities(await hass.async_add_job(get_binary_sensors), True)
+    async_add_entities(await hass.async_add_executor_job(get_binary_sensors), True)
 
 
 class NestBinarySensor(NestSensorDevice, BinarySensorEntity):
diff --git a/homeassistant/components/nest/camera.py b/homeassistant/components/nest/camera.py
index caa78a56a11..28188d11e2f 100644
--- a/homeassistant/components/nest/camera.py
+++ b/homeassistant/components/nest/camera.py
@@ -24,7 +24,9 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up a Nest sensor based on a config entry."""
-    camera_devices = await hass.async_add_job(hass.data[nest.DATA_NEST].cameras)
+    camera_devices = await hass.async_add_executor_job(
+        hass.data[nest.DATA_NEST].cameras
+    )
     cameras = [NestCamera(structure, device) for structure, device in camera_devices]
     async_add_entities(cameras, True)
 
diff --git a/homeassistant/components/nest/climate.py b/homeassistant/components/nest/climate.py
index 9a84010a3bc..7571845e66e 100644
--- a/homeassistant/components/nest/climate.py
+++ b/homeassistant/components/nest/climate.py
@@ -33,7 +33,8 @@ from homeassistant.const import (
 )
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
-from . import DATA_NEST, DOMAIN as NEST_DOMAIN, SIGNAL_NEST_UPDATE
+from . import DATA_NEST, DOMAIN as NEST_DOMAIN
+from .const import SIGNAL_NEST_UPDATE
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -78,7 +79,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
     """Set up the Nest climate device based on a config entry."""
     temp_unit = hass.config.units.temperature_unit
 
-    thermostats = await hass.async_add_job(hass.data[DATA_NEST].thermostats)
+    thermostats = await hass.async_add_executor_job(hass.data[DATA_NEST].thermostats)
 
     all_devices = [
         NestThermostat(structure, device, temp_unit)
diff --git a/homeassistant/components/nest/config_flow.py b/homeassistant/components/nest/config_flow.py
index 8f7a0909f33..e792b496da5 100644
--- a/homeassistant/components/nest/config_flow.py
+++ b/homeassistant/components/nest/config_flow.py
@@ -1,8 +1,22 @@
-"""Config flow to configure Nest."""
+"""Config flow to configure Nest.
+
+This configuration flow supports two APIs:
+  - The new Device Access program and the Smart Device Management API
+  - The legacy nest API
+
+NestFlowHandler is an implementation of AbstractOAuth2FlowHandler with
+some overrides to support the old APIs auth flow.  That is, for the new
+API this class has hardly any special config other than url parameters,
+and everything else custom is for the old api.  When configured with the
+new api via NestFlowHandler.register_sdm_api, the custom methods just
+invoke the AbstractOAuth2FlowHandler methods.
+"""
+
 import asyncio
 from collections import OrderedDict
 import logging
 import os
+from typing import Dict
 
 import async_timeout
 import voluptuous as vol
@@ -10,9 +24,10 @@ import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_entry_oauth2_flow
 from homeassistant.util.json import load_json
 
-from .const import DOMAIN
+from .const import DATA_SDM, DOMAIN, SDM_SCOPES
 
 DATA_FLOW_IMPL = "nest_flow_implementation"
 _LOGGER = logging.getLogger(__name__)
@@ -20,7 +35,7 @@ _LOGGER = logging.getLogger(__name__)
 
 @callback
 def register_flow_implementation(hass, domain, name, gen_authorize_url, convert_code):
-    """Register a flow implementation.
+    """Register a flow implementation for legacy api.
 
     domain: Domain of the component responsible for the implementation.
     name: Name of the component.
@@ -46,30 +61,69 @@ class CodeInvalid(NestAuthError):
     """Raised when invalid authorization code."""
 
 
-@config_entries.HANDLERS.register(DOMAIN)
-class NestFlowHandler(config_entries.ConfigFlow):
-    """Handle a Nest config flow."""
+class UnexpectedStateError(HomeAssistantError):
+    """Raised when the config flow is invoked in a 'should not happen' case."""
 
+
+@config_entries.HANDLERS.register(DOMAIN)
+class NestFlowHandler(
+    config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
+):
+    """Config flow to handle authentication for both APIs."""
+
+    DOMAIN = DOMAIN
     VERSION = 1
     CONNECTION_CLASS = config_entries.CONN_CLASS_CLOUD_PUSH
 
-    def __init__(self):
-        """Initialize the Nest config flow."""
-        self.flow_impl = None
+    @classmethod
+    def register_sdm_api(cls, hass):
+        """Configure the flow handler to use the SDM API."""
+        if DOMAIN not in hass.data:
+            hass.data[DOMAIN] = {}
+        hass.data[DOMAIN][DATA_SDM] = {}
+
+    def is_sdm_api(self):
+        """Return true if this flow is setup to use SDM API."""
+        return DOMAIN in self.hass.data and DATA_SDM in self.hass.data[DOMAIN]
+
+    @property
+    def logger(self) -> logging.Logger:
+        """Return logger."""
+        return logging.getLogger(__name__)
+
+    @property
+    def extra_authorize_data(self) -> Dict[str, str]:
+        """Extra data that needs to be appended to the authorize url."""
+        return {
+            "scope": " ".join(SDM_SCOPES),
+            # Add params to ensure we get back a refresh token
+            "access_type": "offline",
+            "prompt": "consent",
+        }
+
+    async def async_oauth_create_entry(self, data: dict) -> dict:
+        """Create an entry for the SDM flow."""
+        data[DATA_SDM] = {}
+        return await super().async_oauth_create_entry(data)
 
     async def async_step_user(self, user_input=None):
         """Handle a flow initialized by the user."""
+        if self.is_sdm_api():
+            return await super().async_step_user(user_input)
         return await self.async_step_init(user_input)
 
     async def async_step_init(self, user_input=None):
         """Handle a flow start."""
+        if self.is_sdm_api():
+            raise UnexpectedStateError("Step only supported for legacy API")
+
         flows = self.hass.data.get(DATA_FLOW_IMPL, {})
 
         if self.hass.config_entries.async_entries(DOMAIN):
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="single_instance_allowed")
 
         if not flows:
-            return self.async_abort(reason="no_flows")
+            return self.async_abort(reason="missing_configuration")
 
         if len(flows) == 1:
             self.flow_impl = list(flows)[0]
@@ -91,6 +145,9 @@ class NestFlowHandler(config_entries.ConfigFlow):
         implementation type we expect a pin or an external component to
         deliver the authentication code.
         """
+        if self.is_sdm_api():
+            raise UnexpectedStateError("Step only supported for legacy API")
+
         flow = self.hass.data[DATA_FLOW_IMPL][self.flow_impl]
 
         errors = {}
@@ -106,7 +163,7 @@ class NestFlowHandler(config_entries.ConfigFlow):
             except asyncio.TimeoutError:
                 errors["code"] = "timeout"
             except CodeInvalid:
-                errors["code"] = "invalid_code"
+                errors["code"] = "invalid_pin"
             except NestAuthError:
                 errors["code"] = "unknown"
             except Exception:  # pylint: disable=broad-except
@@ -131,17 +188,20 @@ class NestFlowHandler(config_entries.ConfigFlow):
 
     async def async_step_import(self, info):
         """Import existing auth from Nest."""
+        if self.is_sdm_api():
+            raise UnexpectedStateError("Step only supported for legacy API")
+
         if self.hass.config_entries.async_entries(DOMAIN):
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="single_instance_allowed")
 
         config_path = info["nest_conf_path"]
 
-        if not await self.hass.async_add_job(os.path.isfile, config_path):
+        if not await self.hass.async_add_executor_job(os.path.isfile, config_path):
             self.flow_impl = DOMAIN
             return await self.async_step_link()
 
         flow = self.hass.data[DATA_FLOW_IMPL][DOMAIN]
-        tokens = await self.hass.async_add_job(load_json, config_path)
+        tokens = await self.hass.async_add_executor_job(load_json, config_path)
 
         return self._entry_from_tokens(
             "Nest (import from configuration.yaml)", flow, tokens
diff --git a/homeassistant/components/nest/const.py b/homeassistant/components/nest/const.py
index fab77c6b5a6..b418df97bba 100644
--- a/homeassistant/components/nest/const.py
+++ b/homeassistant/components/nest/const.py
@@ -1,2 +1,17 @@
 """Constants used by the Nest component."""
+
 DOMAIN = "nest"
+DATA_SDM = "sdm"
+
+SIGNAL_NEST_UPDATE = "nest_update"
+
+# For the Google Nest Device Access API
+OAUTH2_AUTHORIZE = (
+    "https://nestservices.google.com/partnerconnections/{project_id}/auth"
+)
+OAUTH2_TOKEN = "https://www.googleapis.com/oauth2/v4/token"
+SDM_SCOPES = [
+    "https://www.googleapis.com/auth/sdm.service",
+    "https://www.googleapis.com/auth/pubsub",
+]
+API_URL = "https://smartdevicemanagement.googleapis.com/v1"
diff --git a/homeassistant/components/nest/local_auth.py b/homeassistant/components/nest/local_auth.py
index df03c054398..8be2693325e 100644
--- a/homeassistant/components/nest/local_auth.py
+++ b/homeassistant/components/nest/local_auth.py
@@ -1,4 +1,4 @@
-"""Local Nest authentication."""
+"""Local Nest authentication for the legacy api."""
 import asyncio
 from functools import partial
 
@@ -40,7 +40,7 @@ async def resolve_auth_code(hass, client_id, client_secret, code):
     auth.pin = code
 
     try:
-        await hass.async_add_job(auth.login)
+        await hass.async_add_executor_job(auth.login)
         return await result
     except AuthorizationError as err:
         if err.response.status_code == HTTP_UNAUTHORIZED:
diff --git a/homeassistant/components/nest/manifest.json b/homeassistant/components/nest/manifest.json
index 610e80d9a6a..0686b5add1d 100644
--- a/homeassistant/components/nest/manifest.json
+++ b/homeassistant/components/nest/manifest.json
@@ -2,7 +2,14 @@
   "domain": "nest",
   "name": "Nest",
   "config_flow": true,
+  "dependencies": ["http"],
   "documentation": "https://www.home-assistant.io/integrations/nest",
-  "requirements": ["python-nest==4.1.0"],
-  "codeowners": ["@awarecan"]
+  "requirements": [
+      "python-nest==4.1.0",
+      "google-nest-sdm==0.1.6"
+  ],
+  "codeowners": [
+      "@awarecan",
+      "@allenporter"
+  ]
 }
diff --git a/homeassistant/components/nest/sensor.py b/homeassistant/components/nest/sensor.py
index 6844269400a..6245c5d83d0 100644
--- a/homeassistant/components/nest/sensor.py
+++ b/homeassistant/components/nest/sensor.py
@@ -1,208 +1,19 @@
-"""Support for Nest Thermostat sensors."""
-import logging
+"""Support for Nest sensors that dispatches between API versions."""
 
-from homeassistant.const import (
-    CONF_MONITORED_CONDITIONS,
-    DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_TEMPERATURE,
-    PERCENTAGE,
-    STATE_OFF,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
-)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.helpers.typing import HomeAssistantType
 
-from . import CONF_SENSORS, DATA_NEST, DATA_NEST_CONFIG, NestSensorDevice
-
-SENSOR_TYPES = ["humidity", "operation_mode", "hvac_state"]
-
-TEMP_SENSOR_TYPES = ["temperature", "target"]
-
-PROTECT_SENSOR_TYPES = [
-    "co_status",
-    "smoke_status",
-    "battery_health",
-    # color_status: "gray", "green", "yellow", "red"
-    "color_status",
-]
-
-STRUCTURE_SENSOR_TYPES = ["eta"]
-
-STATE_HEAT = "heat"
-STATE_COOL = "cool"
-
-# security_state is structure level sensor, but only meaningful when
-# Nest Cam exist
-STRUCTURE_CAMERA_SENSOR_TYPES = ["security_state"]
-
-_VALID_SENSOR_TYPES = (
-    SENSOR_TYPES
-    + TEMP_SENSOR_TYPES
-    + PROTECT_SENSOR_TYPES
-    + STRUCTURE_SENSOR_TYPES
-    + STRUCTURE_CAMERA_SENSOR_TYPES
-)
-
-SENSOR_UNITS = {"humidity": PERCENTAGE}
-
-SENSOR_DEVICE_CLASSES = {"humidity": DEVICE_CLASS_HUMIDITY}
-
-VARIABLE_NAME_MAPPING = {"eta": "eta_begin", "operation_mode": "mode"}
-
-VALUE_MAPPING = {
-    "hvac_state": {"heating": STATE_HEAT, "cooling": STATE_COOL, "off": STATE_OFF}
-}
-
-SENSOR_TYPES_DEPRECATED = ["last_ip", "local_ip", "last_connection", "battery_level"]
-
-DEPRECATED_WEATHER_VARS = [
-    "weather_humidity",
-    "weather_temperature",
-    "weather_condition",
-    "wind_speed",
-    "wind_direction",
-]
-
-_SENSOR_TYPES_DEPRECATED = SENSOR_TYPES_DEPRECATED + DEPRECATED_WEATHER_VARS
-
-_LOGGER = logging.getLogger(__name__)
+from .const import DATA_SDM
+from .sensor_legacy import async_setup_legacy_entry
+from .sensor_sdm import async_setup_sdm_entry
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Nest Sensor.
+async def async_setup_entry(
+    hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
+) -> None:
+    """Set up the sensors."""
+    if DATA_SDM not in entry.data:
+        await async_setup_legacy_entry(hass, entry, async_add_entities)
+        return
 
-    No longer used.
-    """
-
-
-async def async_setup_entry(hass, entry, async_add_entities):
-    """Set up a Nest sensor based on a config entry."""
-    nest = hass.data[DATA_NEST]
-
-    discovery_info = hass.data.get(DATA_NEST_CONFIG, {}).get(CONF_SENSORS, {})
-
-    # Add all available sensors if no Nest sensor config is set
-    if discovery_info == {}:
-        conditions = _VALID_SENSOR_TYPES
-    else:
-        conditions = discovery_info.get(CONF_MONITORED_CONDITIONS, {})
-
-    for variable in conditions:
-        if variable in _SENSOR_TYPES_DEPRECATED:
-            if variable in DEPRECATED_WEATHER_VARS:
-                wstr = (
-                    "Nest no longer provides weather data like %s. See "
-                    "https://www.home-assistant.io/integrations/#weather "
-                    "for a list of other weather integrations to use." % variable
-                )
-            else:
-                wstr = (
-                    f"{variable} is no a longer supported "
-                    "monitored_conditions. See "
-                    "https://www.home-assistant.io/integrations/"
-                    "binary_sensor.nest/ for valid options."
-                )
-            _LOGGER.error(wstr)
-
-    def get_sensors():
-        """Get the Nest sensors."""
-        all_sensors = []
-        for structure in nest.structures():
-            all_sensors += [
-                NestBasicSensor(structure, None, variable)
-                for variable in conditions
-                if variable in STRUCTURE_SENSOR_TYPES
-            ]
-
-        for structure, device in nest.thermostats():
-            all_sensors += [
-                NestBasicSensor(structure, device, variable)
-                for variable in conditions
-                if variable in SENSOR_TYPES
-            ]
-            all_sensors += [
-                NestTempSensor(structure, device, variable)
-                for variable in conditions
-                if variable in TEMP_SENSOR_TYPES
-            ]
-
-        for structure, device in nest.smoke_co_alarms():
-            all_sensors += [
-                NestBasicSensor(structure, device, variable)
-                for variable in conditions
-                if variable in PROTECT_SENSOR_TYPES
-            ]
-
-        structures_has_camera = {}
-        for structure, device in nest.cameras():
-            structures_has_camera[structure] = True
-        for structure in structures_has_camera:
-            all_sensors += [
-                NestBasicSensor(structure, None, variable)
-                for variable in conditions
-                if variable in STRUCTURE_CAMERA_SENSOR_TYPES
-            ]
-
-        return all_sensors
-
-    async_add_entities(await hass.async_add_job(get_sensors), True)
-
-
-class NestBasicSensor(NestSensorDevice):
-    """Representation a basic Nest sensor."""
-
-    @property
-    def state(self):
-        """Return the state of the sensor."""
-        return self._state
-
-    @property
-    def device_class(self):
-        """Return the device class of the sensor."""
-        return SENSOR_DEVICE_CLASSES.get(self.variable)
-
-    def update(self):
-        """Retrieve latest state."""
-        self._unit = SENSOR_UNITS.get(self.variable)
-
-        if self.variable in VARIABLE_NAME_MAPPING:
-            self._state = getattr(self.device, VARIABLE_NAME_MAPPING[self.variable])
-        elif self.variable in VALUE_MAPPING:
-            state = getattr(self.device, self.variable)
-            self._state = VALUE_MAPPING[self.variable].get(state, state)
-        elif self.variable in PROTECT_SENSOR_TYPES and self.variable != "color_status":
-            # keep backward compatibility
-            state = getattr(self.device, self.variable)
-            self._state = state.capitalize() if state is not None else None
-        else:
-            self._state = getattr(self.device, self.variable)
-
-
-class NestTempSensor(NestSensorDevice):
-    """Representation of a Nest Temperature sensor."""
-
-    @property
-    def state(self):
-        """Return the state of the sensor."""
-        return self._state
-
-    @property
-    def device_class(self):
-        """Return the device class of the sensor."""
-        return DEVICE_CLASS_TEMPERATURE
-
-    def update(self):
-        """Retrieve latest state."""
-        if self.device.temperature_scale == "C":
-            self._unit = TEMP_CELSIUS
-        else:
-            self._unit = TEMP_FAHRENHEIT
-
-        temp = getattr(self.device, self.variable)
-        if temp is None:
-            self._state = None
-
-        if isinstance(temp, tuple):
-            low, high = temp
-            self._state = f"{int(low)}-{int(high)}"
-        else:
-            self._state = round(temp, 1)
+    await async_setup_sdm_entry(hass, entry, async_add_entities)
diff --git a/homeassistant/components/nest/sensor_legacy.py b/homeassistant/components/nest/sensor_legacy.py
new file mode 100644
index 00000000000..2df668513e1
--- /dev/null
+++ b/homeassistant/components/nest/sensor_legacy.py
@@ -0,0 +1,208 @@
+"""Support for Nest Thermostat sensors for the legacy API."""
+import logging
+
+from homeassistant.const import (
+    CONF_MONITORED_CONDITIONS,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    PERCENTAGE,
+    STATE_OFF,
+    TEMP_CELSIUS,
+    TEMP_FAHRENHEIT,
+)
+
+from . import CONF_SENSORS, DATA_NEST, DATA_NEST_CONFIG, NestSensorDevice
+
+SENSOR_TYPES = ["humidity", "operation_mode", "hvac_state"]
+
+TEMP_SENSOR_TYPES = ["temperature", "target"]
+
+PROTECT_SENSOR_TYPES = [
+    "co_status",
+    "smoke_status",
+    "battery_health",
+    # color_status: "gray", "green", "yellow", "red"
+    "color_status",
+]
+
+STRUCTURE_SENSOR_TYPES = ["eta"]
+
+STATE_HEAT = "heat"
+STATE_COOL = "cool"
+
+# security_state is structure level sensor, but only meaningful when
+# Nest Cam exist
+STRUCTURE_CAMERA_SENSOR_TYPES = ["security_state"]
+
+_VALID_SENSOR_TYPES = (
+    SENSOR_TYPES
+    + TEMP_SENSOR_TYPES
+    + PROTECT_SENSOR_TYPES
+    + STRUCTURE_SENSOR_TYPES
+    + STRUCTURE_CAMERA_SENSOR_TYPES
+)
+
+SENSOR_UNITS = {"humidity": PERCENTAGE}
+
+SENSOR_DEVICE_CLASSES = {"humidity": DEVICE_CLASS_HUMIDITY}
+
+VARIABLE_NAME_MAPPING = {"eta": "eta_begin", "operation_mode": "mode"}
+
+VALUE_MAPPING = {
+    "hvac_state": {"heating": STATE_HEAT, "cooling": STATE_COOL, "off": STATE_OFF}
+}
+
+SENSOR_TYPES_DEPRECATED = ["last_ip", "local_ip", "last_connection", "battery_level"]
+
+DEPRECATED_WEATHER_VARS = [
+    "weather_humidity",
+    "weather_temperature",
+    "weather_condition",
+    "wind_speed",
+    "wind_direction",
+]
+
+_SENSOR_TYPES_DEPRECATED = SENSOR_TYPES_DEPRECATED + DEPRECATED_WEATHER_VARS
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Nest Sensor.
+
+    No longer used.
+    """
+
+
+async def async_setup_legacy_entry(hass, entry, async_add_entities):
+    """Set up a Nest sensor based on a config entry."""
+    nest = hass.data[DATA_NEST]
+
+    discovery_info = hass.data.get(DATA_NEST_CONFIG, {}).get(CONF_SENSORS, {})
+
+    # Add all available sensors if no Nest sensor config is set
+    if discovery_info == {}:
+        conditions = _VALID_SENSOR_TYPES
+    else:
+        conditions = discovery_info.get(CONF_MONITORED_CONDITIONS, {})
+
+    for variable in conditions:
+        if variable in _SENSOR_TYPES_DEPRECATED:
+            if variable in DEPRECATED_WEATHER_VARS:
+                wstr = (
+                    "Nest no longer provides weather data like %s. See "
+                    "https://www.home-assistant.io/integrations/#weather "
+                    "for a list of other weather integrations to use." % variable
+                )
+            else:
+                wstr = (
+                    f"{variable} is no a longer supported "
+                    "monitored_conditions. See "
+                    "https://www.home-assistant.io/integrations/"
+                    "binary_sensor.nest/ for valid options."
+                )
+            _LOGGER.error(wstr)
+
+    def get_sensors():
+        """Get the Nest sensors."""
+        all_sensors = []
+        for structure in nest.structures():
+            all_sensors += [
+                NestBasicSensor(structure, None, variable)
+                for variable in conditions
+                if variable in STRUCTURE_SENSOR_TYPES
+            ]
+
+        for structure, device in nest.thermostats():
+            all_sensors += [
+                NestBasicSensor(structure, device, variable)
+                for variable in conditions
+                if variable in SENSOR_TYPES
+            ]
+            all_sensors += [
+                NestTempSensor(structure, device, variable)
+                for variable in conditions
+                if variable in TEMP_SENSOR_TYPES
+            ]
+
+        for structure, device in nest.smoke_co_alarms():
+            all_sensors += [
+                NestBasicSensor(structure, device, variable)
+                for variable in conditions
+                if variable in PROTECT_SENSOR_TYPES
+            ]
+
+        structures_has_camera = {}
+        for structure, device in nest.cameras():
+            structures_has_camera[structure] = True
+        for structure in structures_has_camera:
+            all_sensors += [
+                NestBasicSensor(structure, None, variable)
+                for variable in conditions
+                if variable in STRUCTURE_CAMERA_SENSOR_TYPES
+            ]
+
+        return all_sensors
+
+    async_add_entities(await hass.async_add_executor_job(get_sensors), True)
+
+
+class NestBasicSensor(NestSensorDevice):
+    """Representation a basic Nest sensor."""
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def device_class(self):
+        """Return the device class of the sensor."""
+        return SENSOR_DEVICE_CLASSES.get(self.variable)
+
+    def update(self):
+        """Retrieve latest state."""
+        self._unit = SENSOR_UNITS.get(self.variable)
+
+        if self.variable in VARIABLE_NAME_MAPPING:
+            self._state = getattr(self.device, VARIABLE_NAME_MAPPING[self.variable])
+        elif self.variable in VALUE_MAPPING:
+            state = getattr(self.device, self.variable)
+            self._state = VALUE_MAPPING[self.variable].get(state, state)
+        elif self.variable in PROTECT_SENSOR_TYPES and self.variable != "color_status":
+            # keep backward compatibility
+            state = getattr(self.device, self.variable)
+            self._state = state.capitalize() if state is not None else None
+        else:
+            self._state = getattr(self.device, self.variable)
+
+
+class NestTempSensor(NestSensorDevice):
+    """Representation of a Nest Temperature sensor."""
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def device_class(self):
+        """Return the device class of the sensor."""
+        return DEVICE_CLASS_TEMPERATURE
+
+    def update(self):
+        """Retrieve latest state."""
+        if self.device.temperature_scale == "C":
+            self._unit = TEMP_CELSIUS
+        else:
+            self._unit = TEMP_FAHRENHEIT
+
+        temp = getattr(self.device, self.variable)
+        if temp is None:
+            self._state = None
+
+        if isinstance(temp, tuple):
+            low, high = temp
+            self._state = f"{int(low)}-{int(high)}"
+        else:
+            self._state = round(temp, 1)
diff --git a/homeassistant/components/nest/sensor_sdm.py b/homeassistant/components/nest/sensor_sdm.py
new file mode 100644
index 00000000000..6c4e37e57b3
--- /dev/null
+++ b/homeassistant/components/nest/sensor_sdm.py
@@ -0,0 +1,168 @@
+"""Support for Google Nest SDM sensors."""
+
+from typing import Optional
+
+from google_nest_sdm.device import Device
+from google_nest_sdm.device_traits import HumidityTrait, InfoTrait, TemperatureTrait
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    PERCENTAGE,
+    TEMP_CELSIUS,
+)
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.typing import HomeAssistantType
+
+from .const import DOMAIN, SIGNAL_NEST_UPDATE
+
+DEVICE_TYPE_MAP = {
+    "sdm.devices.types.CAMERA": "Camera",
+    "sdm.devices.types.DISPLAY": "Display",
+    "sdm.devices.types.DOORBELL": "Doorbell",
+    "sdm.devices.types.THERMOSTAT": "Thermostat",
+}
+
+
+async def async_setup_sdm_entry(
+    hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
+) -> None:
+    """Set up the sensors."""
+
+    subscriber = hass.data[DOMAIN][entry.entry_id]
+    device_manager = await subscriber.async_device_manager
+
+    # Fetch initial data so we have data when entities subscribe.
+
+    entities = []
+    for device in device_manager.devices.values():
+        if TemperatureTrait.NAME in device.traits:
+            entities.append(TemperatureSensor(device))
+        if HumidityTrait.NAME in device.traits:
+            entities.append(HumiditySensor(device))
+    async_add_entities(entities)
+
+
+class SensorBase(Entity):
+    """Representation of a dynamically updated Sensor."""
+
+    def __init__(self, device: Device):
+        """Initialize the sensor."""
+        self._device = device
+
+    @property
+    def should_poll(self) -> bool:
+        """Disable polling since entities have state pushed via pubsub."""
+        return False
+
+    @property
+    def unique_id(self) -> Optional[str]:
+        """Return a unique ID."""
+        # The API "name" field is a unique device identifier.
+        return f"{self._device.name}-{self.device_class}"
+
+    @property
+    def device_name(self):
+        """Return the name of the physical device that includes the sensor."""
+        if InfoTrait.NAME in self._device.traits:
+            trait = self._device.traits[InfoTrait.NAME]
+            if trait.custom_name:
+                return trait.custom_name
+        # Build a name from the room/structure.  Note: This room/structure name
+        # is not associated with a home assistant Area.
+        parent_relations = self._device.parent_relations
+        if parent_relations:
+            items = sorted(parent_relations.items())
+            names = [name for id, name in items]
+            return " ".join(names)
+        return self.unique_id
+
+    @property
+    def device_info(self):
+        """Return device specific attributes."""
+        return {
+            # The API "name" field is a unique device identifier.
+            "identifiers": {(DOMAIN, self._device.name)},
+            "name": self.device_name,
+            "manufacturer": "Google Nest",
+            "model": self.device_model,
+        }
+
+    @property
+    def device_model(self):
+        """Return device model information."""
+        # The API intentionally returns minimal information about specific
+        # devices, instead relying on traits, but we can infer a generic model
+        # name based on the type
+        return DEVICE_TYPE_MAP.get(self._device.type)
+
+    async def async_added_to_hass(self):
+        """Run when entity is added to register update signal handler."""
+        # Event messages trigger the SIGNAL_NEST_UPDATE, which is intercepted
+        # here to re-fresh the signals from _device.  Unregister this callback
+        # when the entity is removed.
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                SIGNAL_NEST_UPDATE,
+                self.async_write_ha_state,
+            )
+        )
+
+
+class TemperatureSensor(SensorBase):
+    """Representation of a Temperature Sensor."""
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return f"{self.device_name} Temperature"
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        trait = self._device.traits[TemperatureTrait.NAME]
+        return trait.ambient_temperature_celsius
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return TEMP_CELSIUS
+
+    @property
+    def device_class(self):
+        """Return the class of this device."""
+        return DEVICE_CLASS_TEMPERATURE
+
+
+class HumiditySensor(SensorBase):
+    """Representation of a Humidity Sensor."""
+
+    @property
+    def unique_id(self) -> Optional[str]:
+        """Return a unique ID."""
+        # The API returns the identifier under the name field.
+        return f"{self._device.name}-humidity"
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return f"{self.device_name} Humidity"
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        trait = self._device.traits[HumidityTrait.NAME]
+        return trait.ambient_humidity_percent
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return PERCENTAGE
+
+    @property
+    def device_class(self):
+        """Return the class of this device."""
+        return DEVICE_CLASS_HUMIDITY
diff --git a/homeassistant/components/nest/strings.json b/homeassistant/components/nest/strings.json
index 015df164533..6882e8f55e7 100644
--- a/homeassistant/components/nest/strings.json
+++ b/homeassistant/components/nest/strings.json
@@ -1,28 +1,35 @@
 {
   "config": {
     "step": {
+      "pick_implementation": {
+        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      },
       "init": {
         "title": "Authentication Provider",
-        "description": "Pick via which authentication provider you want to authenticate with Nest.",
+        "description": "[%key:common::config_flow::title::oauth2_pick_implementation%]",
         "data": { "flow_impl": "Provider" }
       },
       "link": {
         "title": "Link Nest Account",
         "description": "To link your Nest account, [authorize your account]({url}).\n\nAfter authorization, copy-paste the provided pin code below.",
-        "data": { "code": "Pin code" }
+        "data": { "code": "[%key:common::config_flow::data::pin%]" }
       }
     },
     "error": {
       "timeout": "Timeout validating code",
-      "invalid_code": "Invalid code",
-      "unknown": "Unknown error validating code",
+      "invalid_pin": "Invalid [%key:common::config_flow::data::pin%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
       "internal_error": "Internal error validating code"
     },
     "abort": {
-      "already_setup": "You can only configure a single Nest account.",
-      "no_flows": "You need to configure Nest before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/nest/).",
-      "authorize_url_timeout": "Timeout generating authorize url.",
-      "authorize_url_fail": "Unknown error generating an authorize url."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "authorize_url_fail": "Unknown error generating an authorize url.",
+      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]"
+    },
+    "create_entry": {
+      "default": "[%key:common::config_flow::create_entry::authenticated%]"
     }
   }
 }
diff --git a/homeassistant/components/nest/translations/ca.json b/homeassistant/components/nest/translations/ca.json
index 375b6847f56..ecb15329348 100644
--- a/homeassistant/components/nest/translations/ca.json
+++ b/homeassistant/components/nest/translations/ca.json
@@ -3,21 +3,27 @@
         "abort": {
             "already_setup": "Nom\u00e9s pots configurar un \u00fanic compte Nest.",
             "authorize_url_fail": "S'ha produ\u00eft un error desconegut al generar l'URL d'autoritzaci\u00f3.",
-            "authorize_url_timeout": "S'ha acabat el temps d'espera durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
-            "no_flows": "Necessites configurar Nest abans de poder autenticar-t'hi. Llegeix les [instruccions](https://www.home-assistant.io/components/nest/)."
+            "authorize_url_timeout": "Temps d'espera esgotat durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
+            "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
+            "no_flows": "Necessites configurar Nest abans de poder autenticar-t'hi. Llegeix les [instruccions](https://www.home-assistant.io/components/nest/).",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
+        },
+        "create_entry": {
+            "default": "Autenticaci\u00f3 exitosa"
         },
         "error": {
             "internal_error": "Error intern al validar el codi",
             "invalid_code": "Codi inv\u00e0lid",
+            "invalid_pin": "Codi PIN inv\u00e0lid",
             "timeout": "S'ha acabat el temps d'espera durant la validaci\u00f3 del codi.",
-            "unknown": "Error desconegut al validar el codi"
+            "unknown": "Error inesperat"
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "Prove\u00efdor"
                 },
-                "description": "Tria quin prove\u00efdor d'autenticaci\u00f3 vols utilitzar per autenticar-te amb Nest.",
+                "description": "Selecciona el m\u00e8tode d'autenticaci\u00f3",
                 "title": "Prove\u00efdor d'autenticaci\u00f3"
             },
             "link": {
@@ -26,6 +32,9 @@
                 },
                 "description": "Per enlla\u00e7ar el teu compte de Nest, [autoritza el teu compte]({url}). \n\nDespr\u00e9s de l'autoritzaci\u00f3, copia i enganxa el codi pin que es mostra a sota.",
                 "title": "Enlla\u00e7 amb el compte de Nest"
+            },
+            "pick_implementation": {
+                "title": "Selecciona el m\u00e8tode d'autenticaci\u00f3"
             }
         }
     }
diff --git a/homeassistant/components/nest/translations/cs.json b/homeassistant/components/nest/translations/cs.json
index 82a894ffb3b..dd9240270a1 100644
--- a/homeassistant/components/nest/translations/cs.json
+++ b/homeassistant/components/nest/translations/cs.json
@@ -3,29 +3,38 @@
         "abort": {
             "already_setup": "M\u016f\u017eete nastavit pouze jeden Nest \u00fa\u010det.",
             "authorize_url_fail": "Nezn\u00e1m\u00e1 chyba p\u0159i generov\u00e1n\u00ed autoriza\u010dn\u00ed URL.",
-            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00ed URL vypr\u0161el",
-            "no_flows": "Pot\u0159ebujete nakonfigurovat Nest, abyste se s n\u00edm mohli autentizovat. [P\u0159e\u010dt\u011bte si pros\u00edm pokyny] (https://www.home-assistant.io/components/nest/)."
+            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "no_flows": "Pot\u0159ebujete nakonfigurovat Nest, abyste se s n\u00edm mohli autentizovat. [P\u0159e\u010dt\u011bte si pros\u00edm pokyny] (https://www.home-assistant.io/components/nest/).",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "create_entry": {
+            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno"
         },
         "error": {
             "internal_error": "Intern\u00ed chyba ov\u011b\u0159en\u00ed k\u00f3du",
             "invalid_code": "Neplatn\u00fd k\u00f3d",
+            "invalid_pin": "Neplatn\u00fd PIN k\u00f3d",
             "timeout": "\u010casov\u00fd limit ov\u011b\u0159ov\u00e1n\u00ed k\u00f3du vypr\u0161el",
-            "unknown": "Nezn\u00e1m\u00e1 chyba ov\u011b\u0159en\u00ed k\u00f3du"
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "Poskytovatel"
                 },
-                "description": "Zvolte pomoc\u00ed kter\u00e9ho poskytovatele ov\u011b\u0159en\u00ed chcete ov\u011b\u0159it slu\u017ebu Nest.",
+                "description": "Vyberte metodu ov\u011b\u0159en\u00ed",
                 "title": "Poskytovatel ov\u011b\u0159en\u00ed"
             },
             "link": {
                 "data": {
-                    "code": "K\u00f3d PIN"
+                    "code": "PIN k\u00f3d"
                 },
                 "description": "Chcete-li propojit \u00fa\u010det Nest, [autorizujte sv\u016fj \u00fa\u010det]({url}). \n\n Po autorizaci zkop\u00edrujte n\u00ed\u017ee uveden\u00fd k\u00f3d PIN.",
                 "title": "Propojit s Nest \u00fa\u010dtem"
+            },
+            "pick_implementation": {
+                "title": "Vyberte metodu ov\u011b\u0159en\u00ed"
             }
         }
     }
diff --git a/homeassistant/components/nest/translations/de.json b/homeassistant/components/nest/translations/de.json
index 27b9b398e78..ccad67ea97c 100644
--- a/homeassistant/components/nest/translations/de.json
+++ b/homeassistant/components/nest/translations/de.json
@@ -9,6 +9,7 @@
         "error": {
             "internal_error": "Ein interner Fehler ist aufgetreten",
             "invalid_code": "Ung\u00fcltiger Code",
+            "invalid_pin": "Ung\u00fcltiger PIN-Code",
             "timeout": "Ein zeit\u00fcberschreitungs Fehler ist aufgetreten",
             "unknown": "Ein unbekannter Fehler ist aufgetreten"
         },
diff --git a/homeassistant/components/nest/translations/en.json b/homeassistant/components/nest/translations/en.json
index 2ea9b419501..4243926a55e 100644
--- a/homeassistant/components/nest/translations/en.json
+++ b/homeassistant/components/nest/translations/en.json
@@ -3,29 +3,38 @@
         "abort": {
             "already_setup": "You can only configure a single Nest account.",
             "authorize_url_fail": "Unknown error generating an authorize url.",
-            "authorize_url_timeout": "Timeout generating authorize url.",
-            "no_flows": "You need to configure Nest before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/nest/)."
+            "authorize_url_timeout": "Timeout generating authorize URL.",
+            "missing_configuration": "The component is not configured. Please follow the documentation.",
+            "no_flows": "You need to configure Nest before being able to authenticate with it. [Please read the instructions](https://www.home-assistant.io/components/nest/).",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
+        },
+        "create_entry": {
+            "default": "Successfully authenticated"
         },
         "error": {
             "internal_error": "Internal error validating code",
             "invalid_code": "Invalid code",
+            "invalid_pin": "Invalid PIN Code",
             "timeout": "Timeout validating code",
-            "unknown": "Unknown error validating code"
+            "unknown": "Unexpected error"
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "Provider"
                 },
-                "description": "Pick via which authentication provider you want to authenticate with Nest.",
+                "description": "Pick Authentication Method",
                 "title": "Authentication Provider"
             },
             "link": {
                 "data": {
-                    "code": "Pin code"
+                    "code": "PIN Code"
                 },
                 "description": "To link your Nest account, [authorize your account]({url}).\n\nAfter authorization, copy-paste the provided pin code below.",
                 "title": "Link Nest Account"
+            },
+            "pick_implementation": {
+                "title": "Pick Authentication Method"
             }
         }
     }
diff --git a/homeassistant/components/nest/translations/es.json b/homeassistant/components/nest/translations/es.json
index 773a2d8c59c..8003c3e98f7 100644
--- a/homeassistant/components/nest/translations/es.json
+++ b/homeassistant/components/nest/translations/es.json
@@ -4,11 +4,14 @@
             "already_setup": "S\u00f3lo puedes configurar una \u00fanica cuenta de Nest.",
             "authorize_url_fail": "Error desconocido generando la url de autorizaci\u00f3n",
             "authorize_url_timeout": "Tiempo de espera agotado generando la url de autorizaci\u00f3n.",
-            "no_flows": "Debes configurar Nest antes de poder autenticarte con \u00e9l. [Lee las instrucciones](https://www.home-assistant.io/components/nest/)."
+            "missing_configuration": "El componente no est\u00e1 configurado. Consulta la documentaci\u00f3n.",
+            "no_flows": "Debes configurar Nest antes de poder autenticarte con \u00e9l. [Lee las instrucciones](https://www.home-assistant.io/components/nest/).",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
             "internal_error": "Error interno validando el c\u00f3digo",
             "invalid_code": "C\u00f3digo inv\u00e1lido",
+            "invalid_pin": "C\u00f3digo PIN no v\u00e1lido",
             "timeout": "Tiempo de espera agotado validando el c\u00f3digo",
             "unknown": "Error desconocido validando el c\u00f3digo"
         },
diff --git a/homeassistant/components/nest/translations/et.json b/homeassistant/components/nest/translations/et.json
index 238ac5711f5..1389bbb5c14 100644
--- a/homeassistant/components/nest/translations/et.json
+++ b/homeassistant/components/nest/translations/et.json
@@ -1,13 +1,37 @@
 {
     "config": {
+        "abort": {
+            "already_setup": "Saate konfigureerida ainult \u00fche Nest-i konto.",
+            "authorize_url_fail": "Tundmatu viga tuvastamise URL-i loomisel.",
+            "authorize_url_timeout": "Tuvastamise URL- i loomise ajal\u00f5pp.",
+            "missing_configuration": "Osis pole seadistatud. Vaata dokumentatsiooni.",
+            "no_flows": "Enne tuvastamist pead Nesti konfigureerima. [Palun lugege juhiseid] (https://www.home-assistant.io/components/nest/).",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
         "error": {
-            "invalid_code": "Kehtetu kood"
+            "internal_error": "Sisemine viga tuvastuskoodi kinnitamisel",
+            "invalid_code": "Kehtetu kood",
+            "invalid_pin": "Vale PIN kood",
+            "timeout": "Tuvastuskoodi ajal\u00f5pp",
+            "unknown": "Tundmatu viga tuvastuskoodi kinnitamisel"
         },
         "step": {
+            "init": {
+                "data": {
+                    "flow_impl": "Pakkuja"
+                },
+                "description": "Vali millise autentimisteenuse pakkujaga soovid Nest-i autentida.",
+                "title": "Autentimisteenuse pakkuja"
+            },
             "link": {
                 "data": {
                     "code": "PIN-kood"
-                }
+                },
+                "description": "Nest-i konto linkimiseks [authorize your account] ({url}).\n\nP\u00e4rast autoriseerimist kopeeri allolev PIN kood.",
+                "title": "Lingi Nesti konto"
+            },
+            "pick_implementation": {
+                "title": "Vali tuvastusmeetod"
             }
         }
     }
diff --git a/homeassistant/components/nest/translations/it.json b/homeassistant/components/nest/translations/it.json
index b525781fdeb..516b055a355 100644
--- a/homeassistant/components/nest/translations/it.json
+++ b/homeassistant/components/nest/translations/it.json
@@ -3,21 +3,24 @@
         "abort": {
             "already_setup": "\u00c8 possibile configurare un solo account Nest.",
             "authorize_url_fail": "Errore sconosciuto nel generare l'url di autorizzazione",
-            "authorize_url_timeout": "Tempo scaduto nel generare l'url di autorizzazione",
-            "no_flows": "Devi configurare Nest prima di poter eseguire l'autenticazione. [Si prega di leggere le istruzioni](https://www.home-assistant.io/components/nest/)."
+            "authorize_url_timeout": "Tempo scaduto nel generare l'URL di autorizzazione.",
+            "missing_configuration": "Il componente non \u00e8 configurato. Si prega di seguire la documentazione.",
+            "no_flows": "Devi configurare Nest prima di poter eseguire l'autenticazione. [Si prega di leggere le istruzioni](https://www.home-assistant.io/components/nest/).",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
             "internal_error": "Errore interno nella convalida del codice",
             "invalid_code": "Codice non valido",
+            "invalid_pin": "Codice PIN non valido",
             "timeout": "Tempo scaduto per l'inserimento del codice di convalida",
-            "unknown": "Errore sconosciuto durante la convalida del codice"
+            "unknown": "Errore imprevisto"
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "Provider"
                 },
-                "description": "Scegli tramite quale provider di autenticazione desideri autenticarti con Nest.",
+                "description": "Scegli il metodo di autenticazione",
                 "title": "Fornitore di autenticazione"
             },
             "link": {
diff --git a/homeassistant/components/nest/translations/no.json b/homeassistant/components/nest/translations/no.json
index 70b6ca569a7..67e7f2ca9d3 100644
--- a/homeassistant/components/nest/translations/no.json
+++ b/homeassistant/components/nest/translations/no.json
@@ -3,26 +3,29 @@
         "abort": {
             "already_setup": "Du kan bare konfigurere en Nest konto.",
             "authorize_url_fail": "Ukjent feil ved oppretting av godkjenningsadresse.",
-            "authorize_url_timeout": "Tidsavbrudd ved oppretting av godkjenningsadresse.",
-            "no_flows": "Du m\u00e5 konfigurere Nest f\u00f8r du kan godkjenne den. [Vennligst les instruksjonene](https://www.home-assistant.io/components/nest/)."
+            "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
+            "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
+            "no_flows": "Du m\u00e5 konfigurere Nest f\u00f8r du kan godkjenne den. [Vennligst les instruksjonene](https://www.home-assistant.io/components/nest/).",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
             "internal_error": "Intern feil ved validering av kode",
             "invalid_code": "Ugyldig kode",
+            "invalid_pin": "Ugyldig PIN-kode",
             "timeout": "Tidsavbrudd ved validering av kode",
-            "unknown": "Ukjent feil ved validering av kode"
+            "unknown": "Uventet feil"
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "Tilbyder"
                 },
-                "description": "Velg fra hvilken godkjenningsleverand\u00f8r du vil godkjenne med Nest.",
+                "description": "Velg godkjenningsmetode",
                 "title": "Godkjenningsleverand\u00f8r"
             },
             "link": {
                 "data": {
-                    "code": "PIN kode"
+                    "code": "PIN-kode"
                 },
                 "description": "For \u00e5 koble din Nest-konto, [bekreft kontoen din]({url}). \n\nEtter bekreftelse, kopier og lim inn den oppgitte PIN koden nedenfor.",
                 "title": "Koble til Nest konto"
diff --git a/homeassistant/components/nest/translations/pl.json b/homeassistant/components/nest/translations/pl.json
index 75d0d99f5d8..3b9f87a3f72 100644
--- a/homeassistant/components/nest/translations/pl.json
+++ b/homeassistant/components/nest/translations/pl.json
@@ -1,23 +1,29 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Nest.",
-            "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania url autoryzacji.",
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
-            "no_flows": "Musisz skonfigurowa\u0107 Nest, aby m\u00f3c si\u0119 z nim uwierzytelni\u0107. Zapoznaj si\u0119 z [instrukcj\u0105](https://www.home-assistant.io/components/nest/)."
+            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Nest",
+            "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania url autoryzacji",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_flows": "Musisz skonfigurowa\u0107 Nest, aby m\u00f3c si\u0119 z nim uwierzytelni\u0107. Zapoznaj si\u0119 z [instrukcj\u0105](https://www.home-assistant.io/components/nest/).",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
+        },
+        "create_entry": {
+            "default": "Pomy\u015blnie uwierzytelniono"
         },
         "error": {
             "internal_error": "Wewn\u0119trzny b\u0142\u0105d sprawdzania poprawno\u015bci kodu",
             "invalid_code": "Nieprawid\u0142owy kod",
-            "timeout": "Przekroczono limit czasu sprawdzania poprawno\u015bci kodu.",
-            "unknown": "Nieznany b\u0142\u0105d sprawdzania poprawno\u015bci kodu"
+            "invalid_pin": "Nieprawid\u0142owy kod PIN",
+            "timeout": "Przekroczono limit czasu sprawdzania poprawno\u015bci kodu",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "Dostawca"
                 },
-                "description": "Wybierz, kt\u00f3rego dostawc\u0119 uwierzytelnienia chcesz u\u017cywa\u0107 z Nest.",
+                "description": "Wybierz metod\u0119 uwierzytelniania",
                 "title": "Dostawca uwierzytelnienia"
             },
             "link": {
@@ -26,6 +32,9 @@
                 },
                 "description": "Aby po\u0142\u0105czy\u0107 z kontem Nest, [wykonaj autoryzacj\u0119]({url}). \n\n Po autoryzacji skopiuj i wklej podany kod PIN poni\u017cej.",
                 "title": "Po\u0142\u0105czenie z kontem Nest"
+            },
+            "pick_implementation": {
+                "title": "Wybierz metod\u0119 uwierzytelniania"
             }
         }
     }
diff --git a/homeassistant/components/nest/translations/ru.json b/homeassistant/components/nest/translations/ru.json
index 674a01556c5..82c50bab5ee 100644
--- a/homeassistant/components/nest/translations/ru.json
+++ b/homeassistant/components/nest/translations/ru.json
@@ -4,20 +4,26 @@
             "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
             "authorize_url_fail": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
             "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
-            "no_flows": "\u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 Nest \u043f\u0435\u0440\u0435\u0434 \u043f\u0440\u043e\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0435\u043c \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438](https://www.home-assistant.io/components/nest/)."
+            "missing_configuration": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
+            "no_flows": "\u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 Nest \u043f\u0435\u0440\u0435\u0434 \u043f\u0440\u043e\u0445\u043e\u0436\u0434\u0435\u043d\u0438\u0435\u043c \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438](https://www.home-assistant.io/components/nest/).",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
+        },
+        "create_entry": {
+            "default": "\u0410\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0439\u0434\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
         },
         "error": {
             "internal_error": "\u0412\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u044f\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u043a\u043e\u0434\u0430.",
             "invalid_code": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043e\u0434.",
+            "invalid_pin": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 PIN-\u043a\u043e\u0434.",
             "timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u043a\u043e\u0434\u0430.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u043a\u043e\u0434\u0430."
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "\u041f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440"
                 },
-                "description": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438, \u0447\u0435\u0440\u0435\u0437 \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0431\u0443\u0434\u0435\u0442 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d \u0432\u0445\u043e\u0434.",
+                "description": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u043f\u043e\u0441\u043e\u0431 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438",
                 "title": "\u041f\u0440\u043e\u0432\u0430\u0439\u0434\u0435\u0440 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438"
             },
             "link": {
@@ -26,6 +32,9 @@
                 },
                 "description": "[\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u0443\u0439\u0442\u0435\u0441\u044c]({url}), \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u0438\u0432\u044f\u0437\u0430\u0442\u044c \u0441\u0432\u043e\u044e \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c Nest. \n\n \u041f\u043e\u0441\u043b\u0435 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438 \u0441\u043a\u043e\u043f\u0438\u0440\u0443\u0439\u0442\u0435 \u043f\u0440\u0438\u043b\u0430\u0433\u0430\u0435\u043c\u044b\u0439 \u043f\u0438\u043d-\u043a\u043e\u0434.",
                 "title": "\u041f\u0440\u0438\u0432\u044f\u0437\u0430\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c Nest"
+            },
+            "pick_implementation": {
+                "title": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u043f\u043e\u0441\u043e\u0431 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438"
             }
         }
     }
diff --git a/homeassistant/components/nest/translations/zh-Hans.json b/homeassistant/components/nest/translations/zh-Hans.json
index ce0824075b2..55d610219a6 100644
--- a/homeassistant/components/nest/translations/zh-Hans.json
+++ b/homeassistant/components/nest/translations/zh-Hans.json
@@ -9,6 +9,7 @@
         "error": {
             "internal_error": "\u9a8c\u8bc1\u4ee3\u7801\u65f6\u53d1\u751f\u5185\u90e8\u9519\u8bef",
             "invalid_code": "\u9a8c\u8bc1\u7801\u65e0\u6548",
+            "invalid_pin": "PIN\u7801\u65e0\u6548",
             "timeout": "\u9a8c\u8bc1\u7801\u8d85\u65f6",
             "unknown": "\u9a8c\u8bc1\u7801\u672a\u77e5\u9519\u8bef"
         },
diff --git a/homeassistant/components/nest/translations/zh-Hant.json b/homeassistant/components/nest/translations/zh-Hant.json
index 3d8e88d2d04..87f8b62427a 100644
--- a/homeassistant/components/nest/translations/zh-Hant.json
+++ b/homeassistant/components/nest/translations/zh-Hant.json
@@ -3,21 +3,27 @@
         "abort": {
             "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44 Nest \u5e33\u865f\u3002",
             "authorize_url_fail": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u767c\u751f\u672a\u77e5\u932f\u8aa4",
-            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642",
-            "no_flows": "\u5fc5\u9808\u5148\u8a2d\u5b9a Nest \u65b9\u80fd\u9032\u884c\u8a8d\u8b49\u3002[\u8acb\u53c3\u95b1\u6559\u5b78\u6307\u5f15](https://www.home-assistant.io/components/nest/)\u3002"
+            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
+            "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
+            "no_flows": "\u5fc5\u9808\u5148\u8a2d\u5b9a Nest \u65b9\u80fd\u9032\u884c\u8a8d\u8b49\u3002[\u8acb\u53c3\u95b1\u6559\u5b78\u6307\u5f15](https://www.home-assistant.io/components/nest/)\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
+        },
+        "create_entry": {
+            "default": "\u5df2\u6210\u529f\u8a8d\u8b49"
         },
         "error": {
             "internal_error": "\u8a8d\u8b49\u78bc\u5167\u90e8\u932f\u8aa4",
             "invalid_code": "\u8a8d\u8b49\u78bc\u7121\u6548",
+            "invalid_pin": "\u7121\u6548\u7684 PIN \u78bc",
             "timeout": "\u8a8d\u8b49\u78bc\u903e\u6642",
-            "unknown": "\u8a8d\u8b49\u78bc\u672a\u77e5\u932f\u8aa4"
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "init": {
                 "data": {
                     "flow_impl": "\u8a8d\u8b49\u63d0\u4f9b\u8005"
                 },
-                "description": "\u65bc\u8a8d\u8b49\u63d0\u4f9b\u8005\u4e2d\u6311\u9078\u6240\u8981\u9032\u884c Nest \u8a8d\u8b49\u63d0\u4f9b\u8005\u3002",
+                "description": "\u9078\u64c7\u9a57\u8b49\u6a21\u5f0f",
                 "title": "\u8a8d\u8b49\u63d0\u4f9b\u8005"
             },
             "link": {
@@ -26,6 +32,9 @@
                 },
                 "description": "\u6b32\u9023\u7d50 Nest \u5e33\u865f\uff0c[\u8a8d\u8b49\u5e33\u865f]({url}).\n\n\u65bc\u8a8d\u8b49\u5f8c\uff0c\u8907\u88fd\u4e26\u8cbc\u4e0a\u4e0b\u65b9\u7684\u8a8d\u8b49\u78bc\u3002",
                 "title": "\u9023\u7d50 Nest \u5e33\u865f"
+            },
+            "pick_implementation": {
+                "title": "\u9078\u64c7\u9a57\u8b49\u6a21\u5f0f"
             }
         }
     }
diff --git a/homeassistant/components/netatmo/api.py b/homeassistant/components/netatmo/api.py
index 6c5aee818d5..c13a0b899c7 100644
--- a/homeassistant/components/netatmo/api.py
+++ b/homeassistant/components/netatmo/api.py
@@ -1,14 +1,11 @@
 """API for Netatmo bound to HASS OAuth."""
 from asyncio import run_coroutine_threadsafe
-import logging
 
 import pyatmo
 
 from homeassistant import config_entries, core
 from homeassistant.helpers import config_entry_oauth2_flow
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class ConfigEntryNetatmoAuth(pyatmo.auth.NetatmoOAuth2):
     """Provide Netatmo authentication tied to an OAuth2 based config entry."""
diff --git a/homeassistant/components/netatmo/camera.py b/homeassistant/components/netatmo/camera.py
index dff6013c7c6..6e55b884d4d 100644
--- a/homeassistant/components/netatmo/camera.py
+++ b/homeassistant/components/netatmo/camera.py
@@ -21,6 +21,7 @@ from .const import (
     DATA_HANDLER,
     DATA_PERSONS,
     DOMAIN,
+    EVENT_TYPE_LIGHT_MODE,
     EVENT_TYPE_OFF,
     EVENT_TYPE_ON,
     MANUFACTURER,
@@ -145,12 +146,13 @@ class NetatmoCamera(NetatmoBase, Camera):
         self._sd_status = None
         self._alim_status = None
         self._is_local = None
+        self._light_state = None
 
     async def async_added_to_hass(self) -> None:
         """Entity created."""
         await super().async_added_to_hass()
 
-        for event_type in (EVENT_TYPE_OFF, EVENT_TYPE_ON):
+        for event_type in (EVENT_TYPE_LIGHT_MODE, EVENT_TYPE_OFF, EVENT_TYPE_ON):
             self._listeners.append(
                 async_dispatcher_connect(
                     self.hass,
@@ -176,6 +178,8 @@ class NetatmoCamera(NetatmoBase, Camera):
             elif data["push_type"] in ["NACamera-on", "NACamera-connection"]:
                 self.is_streaming = True
                 self._status = "on"
+            elif data["push_type"] == "NOC-light_mode":
+                self._light_state = data["sub_type"]
 
             self.async_write_ha_state()
             return
@@ -219,6 +223,7 @@ class NetatmoCamera(NetatmoBase, Camera):
             "is_local": self._is_local,
             "vpn_url": self._vpnurl,
             "local_url": self._localurl,
+            "light_state": self._light_state,
         }
 
     @property
diff --git a/homeassistant/components/netatmo/config_flow.py b/homeassistant/components/netatmo/config_flow.py
index 6ae1fd864df..6217ef1a0e6 100644
--- a/homeassistant/components/netatmo/config_flow.py
+++ b/homeassistant/components/netatmo/config_flow.py
@@ -22,8 +22,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class NetatmoFlowHandler(
     config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
diff --git a/homeassistant/components/netatmo/sensor.py b/homeassistant/components/netatmo/sensor.py
index e20ce91d844..84e18ba7241 100644
--- a/homeassistant/components/netatmo/sensor.py
+++ b/homeassistant/components/netatmo/sensor.py
@@ -48,41 +48,53 @@ SUPPORTED_PUBLIC_SENSOR_TYPES = [
 ]
 
 SENSOR_TYPES = {
-    "temperature": ["Temperature", TEMP_CELSIUS, None, DEVICE_CLASS_TEMPERATURE],
-    "co2": ["CO2", CONCENTRATION_PARTS_PER_MILLION, "mdi:molecule-co2", None],
-    "pressure": ["Pressure", PRESSURE_MBAR, None, DEVICE_CLASS_PRESSURE],
-    "noise": ["Noise", "dB", "mdi:volume-high", None],
-    "humidity": ["Humidity", PERCENTAGE, None, DEVICE_CLASS_HUMIDITY],
-    "rain": ["Rain", LENGTH_MILLIMETERS, "mdi:weather-rainy", None],
-    "sum_rain_1": ["Rain last hour", LENGTH_MILLIMETERS, "mdi:weather-rainy", None],
-    "sum_rain_24": ["Rain last 24h", LENGTH_MILLIMETERS, "mdi:weather-rainy", None],
-    "battery_vp": ["Battery", "", "mdi:battery", None],
-    "battery_lvl": ["Battery Level", "", "mdi:battery", None],
-    "battery_percent": ["Battery Percent", PERCENTAGE, None, DEVICE_CLASS_BATTERY],
-    "min_temp": ["Min Temp.", TEMP_CELSIUS, None, DEVICE_CLASS_TEMPERATURE],
-    "max_temp": ["Max Temp.", TEMP_CELSIUS, None, DEVICE_CLASS_TEMPERATURE],
-    "windangle": ["Direction", None, "mdi:compass-outline", None],
-    "windangle_value": ["Angle", DEGREE, "mdi:compass-outline", None],
+    "temperature": ["Temperature", TEMP_CELSIUS, None, DEVICE_CLASS_TEMPERATURE, True],
+    "temp_trend": ["Temperature trend", None, "mdi:trending-up", None, False],
+    "co2": ["CO2", CONCENTRATION_PARTS_PER_MILLION, "mdi:molecule-co2", None, True],
+    "pressure": ["Pressure", PRESSURE_MBAR, None, DEVICE_CLASS_PRESSURE, True],
+    "pressure_trend": ["Pressure trend", None, "mdi:trending-up", None, False],
+    "noise": ["Noise", "dB", "mdi:volume-high", None, True],
+    "humidity": ["Humidity", PERCENTAGE, None, DEVICE_CLASS_HUMIDITY, True],
+    "rain": ["Rain", LENGTH_MILLIMETERS, "mdi:weather-rainy", None, True],
+    "sum_rain_1": [
+        "Rain last hour",
+        LENGTH_MILLIMETERS,
+        "mdi:weather-rainy",
+        None,
+        False,
+    ],
+    "sum_rain_24": ["Rain today", LENGTH_MILLIMETERS, "mdi:weather-rainy", None, True],
+    "battery_percent": [
+        "Battery Percent",
+        PERCENTAGE,
+        None,
+        DEVICE_CLASS_BATTERY,
+        True,
+    ],
+    "windangle": ["Direction", None, "mdi:compass-outline", None, True],
+    "windangle_value": ["Angle", DEGREE, "mdi:compass-outline", None, False],
     "windstrength": [
         "Wind Strength",
         SPEED_KILOMETERS_PER_HOUR,
         "mdi:weather-windy",
         None,
+        True,
     ],
-    "gustangle": ["Gust Direction", None, "mdi:compass-outline", None],
-    "gustangle_value": ["Gust Angle", DEGREE, "mdi:compass-outline", None],
+    "gustangle": ["Gust Direction", None, "mdi:compass-outline", None, False],
+    "gustangle_value": ["Gust Angle", DEGREE, "mdi:compass-outline", None, False],
     "guststrength": [
         "Gust Strength",
         SPEED_KILOMETERS_PER_HOUR,
         "mdi:weather-windy",
         None,
+        False,
     ],
-    "reachable": ["Reachability", None, "mdi:signal", None],
-    "rf_status": ["Radio", None, "mdi:signal", None],
-    "rf_status_lvl": ["Radio Level", "", None, DEVICE_CLASS_SIGNAL_STRENGTH],
-    "wifi_status": ["Wifi", None, "mdi:wifi", None],
-    "wifi_status_lvl": ["Wifi Level", "dBm", None, DEVICE_CLASS_SIGNAL_STRENGTH],
-    "health_idx": ["Health", None, "mdi:cloud", None],
+    "reachable": ["Reachability", None, "mdi:signal", None, False],
+    "rf_status": ["Radio", None, "mdi:signal", None, False],
+    "rf_status_lvl": ["Radio Level", "", None, DEVICE_CLASS_SIGNAL_STRENGTH, False],
+    "wifi_status": ["Wifi", None, "mdi:wifi", None, False],
+    "wifi_status_lvl": ["Wifi Level", "dBm", None, DEVICE_CLASS_SIGNAL_STRENGTH, False],
+    "health_idx": ["Health", None, "mdi:cloud", None, True],
 }
 
 MODULE_TYPE_OUTDOOR = "NAModule1"
@@ -143,8 +155,6 @@ async def async_setup_entry(hass, entry, async_add_entities):
                     conditions.append(f"{condition}_value")
                 elif f"{condition}_lvl" in SENSOR_TYPES:
                     conditions.append(f"{condition}_lvl")
-                elif condition == "battery_vp":
-                    conditions.append("battery_lvl")
 
             for condition in conditions:
                 entities.append(
@@ -161,7 +171,6 @@ async def async_setup_entry(hass, entry, async_add_entities):
 
     device_registry = await hass.helpers.device_registry.async_get_registry()
 
-    @callback
     async def add_public_entities(update=True):
         """Retrieve Netatmo public weather entities."""
         entities = {
@@ -247,7 +256,10 @@ class NetatmoSensor(NetatmoBase):
         if device["type"] in ("NHC", "NAMain"):
             self._device_name = module_info["station_name"]
         else:
-            self._device_name = f"{station['station_name']} {module_info.get('module_name', device['type'])}"
+            self._device_name = (
+                f"{station['station_name']} "
+                f"{module_info.get('module_name', device['type'])}"
+            )
 
         self._name = (
             f"{MANUFACTURER} {self._device_name} {SENSOR_TYPES[sensor_type][0]}"
@@ -259,6 +271,7 @@ class NetatmoSensor(NetatmoBase):
         self._unit_of_measurement = SENSOR_TYPES[self.type][1]
         self._model = device["type"]
         self._unique_id = f"{self._id}-{self.type}"
+        self._enabled_default = SENSOR_TYPES[self.type][4]
 
     @property
     def icon(self):
@@ -285,6 +298,11 @@ class NetatmoSensor(NetatmoBase):
         """Return entity availability."""
         return self._state is not None
 
+    @property
+    def entity_registry_enabled_default(self) -> bool:
+        """Return if the entity should be enabled when first added to the entity registry."""
+        return self._enabled_default
+
     @callback
     def async_update_callback(self):
         """Update the entity's state."""
@@ -313,6 +331,8 @@ class NetatmoSensor(NetatmoBase):
         try:
             if self.type == "temperature":
                 self._state = round(data["Temperature"], 1)
+            elif self.type == "temp_trend":
+                self._state = data["temp_trend"]
             elif self.type == "humidity":
                 self._state = data["Humidity"]
             elif self.type == "rain":
@@ -327,26 +347,20 @@ class NetatmoSensor(NetatmoBase):
                 self._state = data["CO2"]
             elif self.type == "pressure":
                 self._state = round(data["Pressure"], 1)
+            elif self.type == "pressure_trend":
+                self._state = data["pressure_trend"]
             elif self.type == "battery_percent":
                 self._state = data["battery_percent"]
-            elif self.type == "battery_lvl":
-                self._state = data["battery_vp"]
-            elif self.type == "battery_vp":
-                self._state = process_battery(data["battery_vp"], self._model)
-            elif self.type == "min_temp":
-                self._state = data["min_temp"]
-            elif self.type == "max_temp":
-                self._state = data["max_temp"]
             elif self.type == "windangle_value":
-                self._state = data["WindAngle"]
+                self._state = fix_angle(data["WindAngle"])
             elif self.type == "windangle":
-                self._state = process_angle(data["WindAngle"])
+                self._state = process_angle(fix_angle(data["WindAngle"]))
             elif self.type == "windstrength":
                 self._state = data["WindStrength"]
             elif self.type == "gustangle_value":
-                self._state = data["GustAngle"]
+                self._state = fix_angle(data["GustAngle"])
             elif self.type == "gustangle":
-                self._state = process_angle(data["GustAngle"])
+                self._state = process_angle(fix_angle(data["GustAngle"]))
             elif self.type == "guststrength":
                 self._state = data["GustStrength"]
             elif self.type == "reachable":
@@ -368,6 +382,13 @@ class NetatmoSensor(NetatmoBase):
             return
 
 
+def fix_angle(angle: int) -> int:
+    """Fix angle when value is negative."""
+    if angle < 0:
+        return 360 + angle
+    return angle
+
+
 def process_angle(angle: int) -> str:
     """Process angle and return string for display."""
     if angle >= 330:
diff --git a/homeassistant/components/netatmo/strings.json b/homeassistant/components/netatmo/strings.json
index 6e88d191610..60fdab5f22c 100644
--- a/homeassistant/components/netatmo/strings.json
+++ b/homeassistant/components/netatmo/strings.json
@@ -20,10 +20,10 @@
       "public_weather": {
         "data": {
           "area_name": "Name of the area",
-          "lat_ne": "Latitude North-East corner",
-          "lon_ne": "Longitude North-East corner",
-          "lat_sw": "Latitude South-West corner",
-          "lon_sw": "Longitude South-West corner",
+          "lat_ne": "[%key:common::config_flow::data::latitude%] North-East corner",
+          "lon_ne": "[%key:common::config_flow::data::longitude%] North-East corner",
+          "lat_sw": "[%key:common::config_flow::data::latitude%] South-West corner",
+          "lon_sw": "[%key:common::config_flow::data::longitude%] South-West corner",
           "mode": "Calculation",
           "show_on_map": "Show on map"
         },
diff --git a/homeassistant/components/netatmo/translations/ca.json b/homeassistant/components/netatmo/translations/ca.json
index f1c91932c7e..a6b8b5c2b82 100644
--- a/homeassistant/components/netatmo/translations/ca.json
+++ b/homeassistant/components/netatmo/translations/ca.json
@@ -20,7 +20,7 @@
             "public_weather": {
                 "data": {
                     "area_name": "Nom de l'\u00e0rea",
-                    "lat_ne": "Latitud cantonada nord-est",
+                    "lat_ne": "Longitud cantonada nord-est",
                     "lat_sw": "Latitud cantonada sud-oest",
                     "lon_ne": "Longitud cantonada nord-est",
                     "lon_sw": "Longitud cantonada sud-oest",
diff --git a/homeassistant/components/netatmo/translations/cs.json b/homeassistant/components/netatmo/translations/cs.json
index 5aedb333d6c..74a31f4199d 100644
--- a/homeassistant/components/netatmo/translations/cs.json
+++ b/homeassistant/components/netatmo/translations/cs.json
@@ -2,7 +2,9 @@
     "config": {
         "abort": {
             "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
-            "missing_configuration": "Komponenta nen\u00ed nakonfigurov\u00e1na. Postupujte podle dokumentace."
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "no_url_available": "Nen\u00ed k dispozici \u017e\u00e1dn\u00e1 adresa URL. Informace o t\u00e9to chyb\u011b naleznete [v sekci n\u00e1pov\u011bdy]({docs_url})",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "create_entry": {
             "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno"
@@ -12,5 +14,26 @@
                 "title": "Vyberte metodu ov\u011b\u0159en\u00ed"
             }
         }
+    },
+    "options": {
+        "step": {
+            "public_weather": {
+                "data": {
+                    "area_name": "Jm\u00e9no oblasti",
+                    "lat_ne": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka Severov\u00fdchodn\u00ed roh",
+                    "lat_sw": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka Jihoz\u00e1padn\u00ed roh",
+                    "lon_ne": "Zem\u011bpisn\u00e1 d\u00e9lka Severov\u00fdchodn\u00ed roh",
+                    "lon_sw": "Zem\u011bpisn\u00e1 d\u00e9lka Jihoz\u00e1padn\u00ed roh",
+                    "mode": "V\u00fdpo\u010det",
+                    "show_on_map": "Zobrazit na map\u011b"
+                }
+            },
+            "public_weather_areas": {
+                "data": {
+                    "new_area": "Jm\u00e9no oblasti",
+                    "weather_areas": "Oblasti po\u010das\u00ed"
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/netatmo/translations/es.json b/homeassistant/components/netatmo/translations/es.json
index 1ad29ab080d..556fe2626d4 100644
--- a/homeassistant/components/netatmo/translations/es.json
+++ b/homeassistant/components/netatmo/translations/es.json
@@ -4,7 +4,7 @@
             "authorize_url_timeout": "Tiempo excedido generando la url de autorizaci\u00f3n.",
             "missing_configuration": "El componente no est\u00e1 configurado. Por favor, consulta la documentaci\u00f3n.",
             "no_url_available": "No hay URL disponible. Para obtener informaci\u00f3n sobre este error, [consulta la secci\u00f3n de ayuda]({docs_url})",
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Autenticado correctamente"
diff --git a/homeassistant/components/netatmo/translations/et.json b/homeassistant/components/netatmo/translations/et.json
index cf0944dbe0e..7e3a8ad5a8b 100644
--- a/homeassistant/components/netatmo/translations/et.json
+++ b/homeassistant/components/netatmo/translations/et.json
@@ -1,4 +1,15 @@
 {
+    "config": {
+        "abort": {
+            "no_url_available": "URL pole saadaval. Rohkem teavet [check the help section]({docs_url})",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Vali tuvastusmeetod"
+            }
+        }
+    },
     "options": {
         "step": {
             "public_weather": {
diff --git a/homeassistant/components/netatmo/translations/it.json b/homeassistant/components/netatmo/translations/it.json
index 1b98b7d01bc..46c2d7d2721 100644
--- a/homeassistant/components/netatmo/translations/it.json
+++ b/homeassistant/components/netatmo/translations/it.json
@@ -22,8 +22,8 @@
                     "area_name": "Nome dell'area",
                     "lat_ne": "Latitudine angolo Nord-Est",
                     "lat_sw": "Latitudine angolo Sud-Ovest",
-                    "lon_ne": "Longitudine angolo Nord-Est",
-                    "lon_sw": "Longitudine angolo Sud-Ovest",
+                    "lon_ne": "Logitudine angolo Nord-Est",
+                    "lon_sw": "Logitudine angolo Sud-Ovest",
                     "mode": "Calcolo",
                     "show_on_map": "Mostra sulla mappa"
                 },
diff --git a/homeassistant/components/netatmo/translations/lb.json b/homeassistant/components/netatmo/translations/lb.json
index 7dad13d085a..6f71b98fd93 100644
--- a/homeassistant/components/netatmo/translations/lb.json
+++ b/homeassistant/components/netatmo/translations/lb.json
@@ -29,7 +29,8 @@
                 "data": {
                     "new_area": "Numm vum Ber\u00e4ich",
                     "weather_areas": "Wieder Ber\u00e4icher"
-                }
+                },
+                "title": "Netatmo public weather sensor"
             }
         }
     }
diff --git a/homeassistant/components/netatmo/translations/no.json b/homeassistant/components/netatmo/translations/no.json
index 98e3206f46a..9f18963dcb9 100644
--- a/homeassistant/components/netatmo/translations/no.json
+++ b/homeassistant/components/netatmo/translations/no.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "abort": {
-            "authorize_url_timeout": "Tidsavbrutt ved oppretting av godkjennings url.",
-            "missing_configuration": "Komponeneten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
-            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk {docs_url} ] ( {docs_url} )",
+            "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
+            "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
+            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk hjelpseksjonen]({docs_url})",
             "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
-            "default": "Vellykket godkjenning med Netatmo."
+            "default": "Vellykket godkjenning"
         },
         "step": {
             "pick_implementation": {
@@ -20,10 +20,10 @@
             "public_weather": {
                 "data": {
                     "area_name": "Navn p\u00e5 omr\u00e5det",
-                    "lat_ne": "Breddegrad nord-\u00f8st",
-                    "lat_sw": "Breddegrad s\u00f8r-vest",
-                    "lon_ne": "Lengdegrad nord-\u00f8st",
-                    "lon_sw": "Lengdegrad s\u00f8r-vest",
+                    "lat_ne": "Breddegrad Nord-\u00d8st hj\u00f8rne",
+                    "lat_sw": "Breddegrad S\u00f8r-Vest hj\u00f8rne",
+                    "lon_ne": "Lengdegrad Nord-\u00d8st hj\u00f8rne",
+                    "lon_sw": "Lengdegrad S\u00f8r-Vest hj\u00f8rne",
                     "mode": "Beregning",
                     "show_on_map": "Vis p\u00e5 kart"
                 },
diff --git a/homeassistant/components/netatmo/translations/pl.json b/homeassistant/components/netatmo/translations/pl.json
index 721c3a2a946..b41689a9f8c 100644
--- a/homeassistant/components/netatmo/translations/pl.json
+++ b/homeassistant/components/netatmo/translations/pl.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
             "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_url_available": "Brak dost\u0119pnego adresu URL. Aby uzyska\u0107 informacje na temat tego b\u0142\u0119du, [sprawd\u017a sekcj\u0119 pomocy] ({docs_url})",
             "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
@@ -19,6 +20,10 @@
             "public_weather": {
                 "data": {
                     "area_name": "Nazwa obszaru",
+                    "lat_ne": "Szeroko\u015b\u0107 geograficzna \u2014 cz\u0119\u015b\u0107 p\u00f3\u0142nocno-wschodnia",
+                    "lat_sw": "Szeroko\u015b\u0107 geograficzna \u2014 cz\u0119\u015b\u0107 po\u0142udniowo-zachodnia",
+                    "lon_ne": "D\u0142ugo\u015b\u0107 geograficzna \u2014 cz\u0119\u015b\u0107 p\u00f3\u0142nocno-wschodnia",
+                    "lon_sw": "D\u0142ugo\u015b\u0107 geograficzna \u2014 cz\u0119\u015b\u0107 po\u0142udniowo-zachodnia",
                     "mode": "Obliczenia",
                     "show_on_map": "Poka\u017c na mapie"
                 },
diff --git a/homeassistant/components/netgear_lte/binary_sensor.py b/homeassistant/components/netgear_lte/binary_sensor.py
index f18c7a2ff86..e18c63ff5c0 100644
--- a/homeassistant/components/netgear_lte/binary_sensor.py
+++ b/homeassistant/components/netgear_lte/binary_sensor.py
@@ -1,14 +1,10 @@
 """Support for Netgear LTE binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import DOMAIN, BinarySensorEntity
 from homeassistant.exceptions import PlatformNotReady
 
 from . import CONF_MONITORED_CONDITIONS, DATA_KEY, LTEEntity
 from .sensor_types import BINARY_SENSOR_CLASSES
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info):
     """Set up Netgear LTE binary sensor devices."""
diff --git a/homeassistant/components/netgear_lte/sensor.py b/homeassistant/components/netgear_lte/sensor.py
index 49301a61e4f..abbedf79d64 100644
--- a/homeassistant/components/netgear_lte/sensor.py
+++ b/homeassistant/components/netgear_lte/sensor.py
@@ -1,14 +1,10 @@
 """Support for Netgear LTE sensors."""
-import logging
-
 from homeassistant.components.sensor import DOMAIN
 from homeassistant.exceptions import PlatformNotReady
 
 from . import CONF_MONITORED_CONDITIONS, DATA_KEY, LTEEntity
 from .sensor_types import SENSOR_SMS, SENSOR_SMS_TOTAL, SENSOR_UNITS, SENSOR_USAGE
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info):
     """Set up Netgear LTE sensor devices."""
diff --git a/homeassistant/components/netgear_lte/sensor_types.py b/homeassistant/components/netgear_lte/sensor_types.py
index e354c84e715..644fe35c8c3 100644
--- a/homeassistant/components/netgear_lte/sensor_types.py
+++ b/homeassistant/components/netgear_lte/sensor_types.py
@@ -1,7 +1,11 @@
 """Define possible sensor types."""
 
 from homeassistant.components.binary_sensor import DEVICE_CLASS_CONNECTIVITY
-from homeassistant.const import DATA_MEBIBYTES, PERCENTAGE
+from homeassistant.const import (
+    DATA_MEBIBYTES,
+    PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+)
 
 SENSOR_SMS = "sms"
 SENSOR_SMS_TOTAL = "sms_total"
@@ -12,8 +16,8 @@ SENSOR_UNITS = {
     SENSOR_SMS_TOTAL: "messages",
     SENSOR_USAGE: DATA_MEBIBYTES,
     "radio_quality": PERCENTAGE,
-    "rx_level": "dBm",
-    "tx_level": "dBm",
+    "rx_level": SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    "tx_level": SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     "upstream": None,
     "connection_text": None,
     "connection_type": None,
diff --git a/homeassistant/components/nexia/__init__.py b/homeassistant/components/nexia/__init__.py
index 37a141407a4..54e6ddd92b3 100644
--- a/homeassistant/components/nexia/__init__.py
+++ b/homeassistant/components/nexia/__init__.py
@@ -87,7 +87,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
 
     async def _async_update_data():
         """Fetch data from API endpoint."""
-        return await hass.async_add_job(nexia_home.update)
+        return await hass.async_add_executor_job(nexia_home.update)
 
     coordinator = DataUpdateCoordinator(
         hass,
diff --git a/homeassistant/components/nexia/climate.py b/homeassistant/components/nexia/climate.py
index 5085242e6d7..2b3f7de4489 100644
--- a/homeassistant/components/nexia/climate.py
+++ b/homeassistant/components/nexia/climate.py
@@ -1,6 +1,4 @@
 """Support for Nexia / Trane XL thermostats."""
-import logging
-
 from nexia.const import (
     OPERATION_MODE_AUTO,
     OPERATION_MODE_COOL,
@@ -82,8 +80,6 @@ SET_HUMIDITY_SCHEMA = vol.Schema(
 )
 
 
-_LOGGER = logging.getLogger(__name__)
-
 #
 # Nexia has two bits to determine hvac mode
 # There are actually eight states so we map to
diff --git a/homeassistant/components/nexia/strings.json b/homeassistant/components/nexia/strings.json
index dcfb40b898a..876ea2d656f 100644
--- a/homeassistant/components/nexia/strings.json
+++ b/homeassistant/components/nexia/strings.json
@@ -10,12 +10,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "This nexia home is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/nexia/translations/ca.json b/homeassistant/components/nexia/translations/ca.json
index fcbb879548c..beb5b1a1d9d 100644
--- a/homeassistant/components/nexia/translations/ca.json
+++ b/homeassistant/components/nexia/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest dispositiu nexia home ja est\u00e0 configurat"
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/nexia/translations/cs.json b/homeassistant/components/nexia/translations/cs.json
index 338ff5d9a44..0196d0d03ed 100644
--- a/homeassistant/components/nexia/translations/cs.json
+++ b/homeassistant/components/nexia/translations/cs.json
@@ -1,11 +1,20 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k mynexia.com"
             }
         }
     }
diff --git a/homeassistant/components/nexia/translations/en.json b/homeassistant/components/nexia/translations/en.json
index 016518495dc..fad0b8e542a 100644
--- a/homeassistant/components/nexia/translations/en.json
+++ b/homeassistant/components/nexia/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This nexia home is already configured"
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/nexia/translations/et.json b/homeassistant/components/nexia/translations/et.json
new file mode 100644
index 00000000000..207eae740f6
--- /dev/null
+++ b/homeassistant/components/nexia/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchenduse loomine nurjus. Proovi uuesti",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nexia/translations/it.json b/homeassistant/components/nexia/translations/it.json
index 034aff83ecd..254617d718b 100644
--- a/homeassistant/components/nexia/translations/it.json
+++ b/homeassistant/components/nexia/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo Nexia Home \u00e8 gi\u00e0 configurato"
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/nexia/translations/no.json b/homeassistant/components/nexia/translations/no.json
index 335d8834ec3..a3f143898f8 100644
--- a/homeassistant/components/nexia/translations/no.json
+++ b/homeassistant/components/nexia/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Dette nexia hjem er allerede konfigurert"
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
diff --git a/homeassistant/components/nexia/translations/pl.json b/homeassistant/components/nexia/translations/pl.json
index 7f09569418d..fc1bdf7f273 100644
--- a/homeassistant/components/nexia/translations/pl.json
+++ b/homeassistant/components/nexia/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "nexia jest ju\u017c skonfigurowane."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/nexia/translations/ru.json b/homeassistant/components/nexia/translations/ru.json
index 1dd3be26fd1..a19d16e3a7e 100644
--- a/homeassistant/components/nexia/translations/ru.json
+++ b/homeassistant/components/nexia/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/nexia/translations/zh-Hans.json b/homeassistant/components/nexia/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/nexia/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nexia/translations/zh-Hant.json b/homeassistant/components/nexia/translations/zh-Hant.json
index a57dbfa7e05..34450afc84b 100644
--- a/homeassistant/components/nexia/translations/zh-Hant.json
+++ b/homeassistant/components/nexia/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Nexia home \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/nextcloud/binary_sensor.py b/homeassistant/components/nextcloud/binary_sensor.py
index 67bc580bfdf..c1f1dbf3076 100644
--- a/homeassistant/components/nextcloud/binary_sensor.py
+++ b/homeassistant/components/nextcloud/binary_sensor.py
@@ -1,12 +1,8 @@
 """Summary binary data from Nextcoud."""
-import logging
-
 from homeassistant.components.binary_sensor import BinarySensorEntity
 
 from . import BINARY_SENSORS, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Nextcloud sensors."""
diff --git a/homeassistant/components/nextcloud/sensor.py b/homeassistant/components/nextcloud/sensor.py
index aacd33ec3e8..e0be9dde69e 100644
--- a/homeassistant/components/nextcloud/sensor.py
+++ b/homeassistant/components/nextcloud/sensor.py
@@ -1,12 +1,8 @@
 """Summary data from Nextcoud."""
-import logging
-
 from homeassistant.helpers.entity import Entity
 
 from . import DOMAIN, SENSORS
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Nextcloud sensors."""
diff --git a/homeassistant/components/nfandroidtv/notify.py b/homeassistant/components/nfandroidtv/notify.py
index 369a5c875ac..e71d81f2b79 100644
--- a/homeassistant/components/nfandroidtv/notify.py
+++ b/homeassistant/components/nfandroidtv/notify.py
@@ -158,26 +158,26 @@ class NFAndroidTVNotificationService(BaseNotificationService):
         """Send a message to a Android TV device."""
         _LOGGER.debug("Sending notification to: %s", self._target)
 
-        payload = dict(
-            filename=(
+        payload = {
+            "filename": (
                 "icon.png",
                 self._icon_file,
                 "application/octet-stream",
                 {"Expires": "0"},
             ),
-            type="0",
-            title=kwargs.get(ATTR_TITLE, ATTR_TITLE_DEFAULT),
-            msg=message,
-            duration="%i" % self._default_duration,
-            fontsize="%i" % FONTSIZES.get(self._default_fontsize),
-            position="%i" % POSITIONS.get(self._default_position),
-            bkgcolor="%s" % COLORS.get(self._default_color),
-            transparency="%i" % TRANSPARENCIES.get(self._default_transparency),
-            offset="0",
-            app=ATTR_TITLE_DEFAULT,
-            force="true",
-            interrupt="%i" % self._default_interrupt,
-        )
+            "type": "0",
+            "title": kwargs.get(ATTR_TITLE, ATTR_TITLE_DEFAULT),
+            "msg": message,
+            "duration": "%i" % self._default_duration,
+            "fontsize": "%i" % FONTSIZES.get(self._default_fontsize),
+            "position": "%i" % POSITIONS.get(self._default_position),
+            "bkgcolor": "%s" % COLORS.get(self._default_color),
+            "transparency": "%i" % TRANSPARENCIES.get(self._default_transparency),
+            "offset": "0",
+            "app": ATTR_TITLE_DEFAULT,
+            "force": "true",
+            "interrupt": "%i" % self._default_interrupt,
+        }
 
         data = kwargs.get(ATTR_DATA)
         if data:
diff --git a/homeassistant/components/nightscout/__init__.py b/homeassistant/components/nightscout/__init__.py
index 1b67963bcc3..4c8ab756ddf 100644
--- a/homeassistant/components/nightscout/__init__.py
+++ b/homeassistant/components/nightscout/__init__.py
@@ -1,7 +1,6 @@
 """The Nightscout integration."""
 import asyncio
 from asyncio import TimeoutError as AsyncIOTimeoutError
-import logging
 
 from aiohttp import ClientError
 from py_nightscout import Api as NightscoutAPI
@@ -16,7 +15,6 @@ from homeassistant.helpers.entity import SLOW_UPDATE_WARNING
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
 PLATFORMS = ["sensor"]
 _API_TIMEOUT = SLOW_UPDATE_WARNING - 1
 
diff --git a/homeassistant/components/nightscout/translations/cs.json b/homeassistant/components/nightscout/translations/cs.json
new file mode 100644
index 00000000000..dac121c7fb1
--- /dev/null
+++ b/homeassistant/components/nightscout/translations/cs.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "flow_title": "Nightscout",
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Kl\u00ed\u010d API",
+                    "url": "URL"
+                },
+                "title": "Zadejte informace o serveru Nightscout."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nightscout/translations/el.json b/homeassistant/components/nightscout/translations/el.json
index 2a4ee09725b..42762bfddce 100644
--- a/homeassistant/components/nightscout/translations/el.json
+++ b/homeassistant/components/nightscout/translations/el.json
@@ -5,6 +5,7 @@
                 "data": {
                     "api_key": "\u039a\u03bb\u03b5\u03b9\u03b4\u03af API"
                 },
+                "description": "- \u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL: \u03b7 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 \u03c4\u03b7\u03c2 \u03c0\u03b1\u03c1\u03bf\u03c5\u03c3\u03af\u03b1\u03c2 \u03c4\u03bf\u03c5 nightcout. \u0394\u03b7\u03bb\u03b1\u03b4\u03ae: https://myhomeassistant.duckdns.org:5423\n - \u039a\u03bb\u03b5\u03b9\u03b4\u03af API (\u03a0\u03c1\u03bf\u03b1\u03b9\u03c1\u03b5\u03c4\u03b9\u03ba\u03cc): \u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03bc\u03cc\u03bd\u03bf \u03b5\u03ac\u03bd \u03b7 \u03c0\u03b1\u03c1\u03bf\u03c5\u03c3\u03af\u03b1 \u03c3\u03b1\u03c2 \u03c0\u03c1\u03bf\u03c3\u03c4\u03b1\u03c4\u03b5\u03cd\u03b5\u03c4\u03b1\u03b9 (auth_default_roles! = readable).",
                 "title": "\u0395\u03b9\u03c3\u03b1\u03b3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03c0\u03bb\u03b7\u03c1\u03bf\u03c6\u03bf\u03c1\u03af\u03b5\u03c2 \u03c4\u03bf\u03c5 \u03b4\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae Nightscout."
             }
         }
diff --git a/homeassistant/components/nightscout/translations/es.json b/homeassistant/components/nightscout/translations/es.json
index 307b8ede5aa..1731cd7f48c 100644
--- a/homeassistant/components/nightscout/translations/es.json
+++ b/homeassistant/components/nightscout/translations/es.json
@@ -15,7 +15,7 @@
                     "api_key": "Clave API",
                     "url": "URL"
                 },
-                "description": "- URL: la direcci\u00f3n de tu instancia de nightscout. Por ejemplo: https://myhomeassistant.duckdns.org:5423 \n - Clave API (opcional): util\u00edzala s\u00f3lo si tu instancia est\u00e1 protegida (auth_default_roles! = readable).",
+                "description": "- URL: la direcci\u00f3n de tu instancia de nightscout. Por ejemplo: https://myhomeassistant.duckdns.org:5423 \n- Clave API (opcional): util\u00edzala s\u00f3lo si tu instancia est\u00e1 protegida (auth_default_roles! = readable).",
                 "title": "Introduce la informaci\u00f3n del servidor de Nightscout."
             }
         }
diff --git a/homeassistant/components/nightscout/translations/et.json b/homeassistant/components/nightscout/translations/et.json
new file mode 100644
index 00000000000..f072bf6f84c
--- /dev/null
+++ b/homeassistant/components/nightscout/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga",
+            "unknown": "Tundmatu viga"
+        },
+        "flow_title": "",
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API v\u00f5ti"
+                },
+                "description": "- URL: NightScout eksemplari aadress. St: https://myhomeassistant.duckdns.org:5423\n - API v\u00f5ti (valikuline): kasutage ainult siis kui teie eksemplar on kaitstud (auth_default_roles! = readable).",
+                "title": "Sisesta oma Nightscouti serveri teave."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nightscout/translations/it.json b/homeassistant/components/nightscout/translations/it.json
index d9c90233a3a..8a1bfc826e2 100644
--- a/homeassistant/components/nightscout/translations/it.json
+++ b/homeassistant/components/nightscout/translations/it.json
@@ -14,7 +14,9 @@
                 "data": {
                     "api_key": "Chiave API",
                     "url": "URL"
-                }
+                },
+                "description": "- URL: l'indirizzo della tua istanza nightscout. Ad es.: https://myhomeassistant.duckdns.org:5423\n- Chiave API (opzionale): utilizzare solo se l'istanza \u00e8 protetta (auth_default_roles != readable).",
+                "title": "Inserisci le informazioni del tuo server Nightscout."
             }
         }
     }
diff --git a/homeassistant/components/nightscout/translations/lb.json b/homeassistant/components/nightscout/translations/lb.json
index 9bd337962c0..cc1f048e84e 100644
--- a/homeassistant/components/nightscout/translations/lb.json
+++ b/homeassistant/components/nightscout/translations/lb.json
@@ -15,7 +15,8 @@
                     "api_key": "API Schl\u00ebssel",
                     "url": "URL"
                 },
-                "description": "- URL. Adresse vun denger Nightscout Instanz: beispill: \nhttps://myhomeassistant.duckdns.org:5423\n- API Schl\u00ebssel (optionell): N\u00ebmmen benotzen wann deng Instanz proteg\u00e9iert ass. \n(auth_default_roles != readable)"
+                "description": "- URL. Adresse vun denger Nightscout Instanz: beispill: \nhttps://myhomeassistant.duckdns.org:5423\n- API Schl\u00ebssel (optionell): N\u00ebmmen benotzen wann deng Instanz proteg\u00e9iert ass. \n(auth_default_roles != readable)",
+                "title": "F\u00ebll d\u00e9ng Nightscout Server Informatiounen aus."
             }
         }
     }
diff --git a/homeassistant/components/nightscout/translations/nl.json b/homeassistant/components/nightscout/translations/nl.json
new file mode 100644
index 00000000000..cfa9719c677
--- /dev/null
+++ b/homeassistant/components/nightscout/translations/nl.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "url": "URL"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nightscout/translations/no.json b/homeassistant/components/nightscout/translations/no.json
index 7f600268e88..db7b8f811ca 100644
--- a/homeassistant/components/nightscout/translations/no.json
+++ b/homeassistant/components/nightscout/translations/no.json
@@ -4,11 +4,11 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
-        "flow_title": "Nightscout",
+        "flow_title": "",
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/nightscout/translations/pl.json b/homeassistant/components/nightscout/translations/pl.json
index a307f3fc77d..a21e509eec7 100644
--- a/homeassistant/components/nightscout/translations/pl.json
+++ b/homeassistant/components/nightscout/translations/pl.json
@@ -8,11 +8,15 @@
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
+        "flow_title": "Nightscout",
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Klucz API"
-                }
+                    "api_key": "Klucz API",
+                    "url": "URL"
+                },
+                "description": "- URL: adres url Twojej instancji Nightscout. Np: https://myhomeassistant.duckdns.org:5423\n- Klucz API (opcjonalny): u\u017cywaj tylko wtedy, gdy Twoja instancja jest chroniona (auth_default_roles! = readable).",
+                "title": "Wprowad\u017a informacje o serwerze Nightscout."
             }
         }
     }
diff --git a/homeassistant/components/notify/__init__.py b/homeassistant/components/notify/__init__.py
index 9a4ec681aab..08219567ed6 100644
--- a/homeassistant/components/notify/__init__.py
+++ b/homeassistant/components/notify/__init__.py
@@ -6,6 +6,7 @@ from typing import Any, Dict, Optional
 
 import voluptuous as vol
 
+import homeassistant.components.persistent_notification as pn
 from homeassistant.const import CONF_NAME, CONF_PLATFORM
 from homeassistant.core import ServiceCall
 from homeassistant.exceptions import HomeAssistantError
@@ -36,6 +37,7 @@ ATTR_TITLE_DEFAULT = "Home Assistant"
 DOMAIN = "notify"
 
 SERVICE_NOTIFY = "notify"
+SERVICE_PERSISTENT_NOTIFICATION = "persistent_notification"
 
 NOTIFY_SERVICES = "notify_services"
 
@@ -53,6 +55,13 @@ NOTIFY_SERVICE_SCHEMA = vol.Schema(
     }
 )
 
+PERSISTENT_NOTIFICATION_SERVICE_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_MESSAGE): cv.template,
+        vol.Optional(ATTR_TITLE): cv.template,
+    }
+)
+
 
 @bind_hass
 async def async_reload(hass: HomeAssistantType, integration_name: str) -> None:
@@ -114,7 +123,7 @@ class BaseNotificationService:
 
         kwargs can contain ATTR_TITLE to specify a title.
         """
-        await self.hass.async_add_job(partial(self.send_message, message, **kwargs))  # type: ignore
+        await self.hass.async_add_executor_job(partial(self.send_message, message, **kwargs))  # type: ignore
 
     async def _async_notify_message_service(self, service: ServiceCall) -> None:
         """Handle sending notification message service calls."""
@@ -124,7 +133,7 @@ class BaseNotificationService:
 
         if title:
             title.hass = self.hass
-            kwargs[ATTR_TITLE] = title.async_render()
+            kwargs[ATTR_TITLE] = title.async_render(parse_result=False)
 
         if self._registered_targets.get(service.service) is not None:
             kwargs[ATTR_TARGET] = [self._registered_targets[service.service]]
@@ -132,7 +141,7 @@ class BaseNotificationService:
             kwargs[ATTR_TARGET] = service.data.get(ATTR_TARGET)
 
         message.hass = self.hass
-        kwargs[ATTR_MESSAGE] = message.async_render()
+        kwargs[ATTR_MESSAGE] = message.async_render(parse_result=False)
         kwargs[ATTR_DATA] = service.data.get(ATTR_DATA)
 
         await self.async_send_message(**kwargs)
@@ -215,6 +224,22 @@ async def async_setup(hass, config):
     """Set up the notify services."""
     hass.data.setdefault(NOTIFY_SERVICES, {})
 
+    async def persistent_notification(service: ServiceCall) -> None:
+        """Send notification via the built-in persistsent_notify integration."""
+        payload = {}
+        message = service.data[ATTR_MESSAGE]
+        message.hass = hass
+        payload[ATTR_MESSAGE] = message.async_render(parse_result=False)
+
+        title = service.data.get(ATTR_TITLE)
+        if title:
+            title.hass = hass
+            payload[ATTR_TITLE] = title.async_render(parse_result=False)
+
+        await hass.services.async_call(
+            pn.DOMAIN, pn.SERVICE_CREATE, payload, blocking=True
+        )
+
     async def async_setup_platform(
         integration_name, p_config=None, discovery_info=None
     ):
@@ -238,7 +263,7 @@ async def async_setup(hass, config):
                     hass, p_config, discovery_info
                 )
             elif hasattr(platform, "get_service"):
-                notify_service = await hass.async_add_job(
+                notify_service = await hass.async_add_executor_job(
                     platform.get_service, hass, p_config, discovery_info
                 )
             else:
@@ -274,6 +299,13 @@ async def async_setup(hass, config):
 
         return True
 
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_PERSISTENT_NOTIFICATION,
+        persistent_notification,
+        schema=PERSISTENT_NOTIFICATION_SERVICE_SCHEMA,
+    )
+
     setup_tasks = [
         async_setup_platform(integration_name, p_config)
         for integration_name, p_config in config_per_platform(config, DOMAIN)
diff --git a/homeassistant/components/notify/services.yaml b/homeassistant/components/notify/services.yaml
index e80c7c85677..8c75c94e34a 100644
--- a/homeassistant/components/notify/services.yaml
+++ b/homeassistant/components/notify/services.yaml
@@ -16,6 +16,16 @@ notify:
       description: Extended information for notification. Optional depending on the platform.
       example: platform specific
 
+persistent_notification:
+  description: Sends a notification to the visible in the front-end.
+  fields:
+    message:
+      description: Message body of the notification.
+      example: The garage door has been open for 10 minutes.
+    title:
+      description: Optional title for your notification.
+      example: "Your Garage Door Friend"
+
 apns_register:
   description: Registers a device to receive push notifications.
   fields:
diff --git a/homeassistant/components/notion/binary_sensor.py b/homeassistant/components/notion/binary_sensor.py
index 3702688eb94..1597957c1f5 100644
--- a/homeassistant/components/notion/binary_sensor.py
+++ b/homeassistant/components/notion/binary_sensor.py
@@ -1,5 +1,4 @@
 """Support for Notion binary sensors."""
-import logging
 from typing import Callable
 
 from homeassistant.components.binary_sensor import (
@@ -29,8 +28,6 @@ from .const import (
     SENSOR_WINDOW_HINGED_VERTICAL,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 BINARY_SENSOR_TYPES = {
     SENSOR_BATTERY: ("Low Battery", "battery"),
     SENSOR_DOOR: ("Door", DEVICE_CLASS_DOOR),
diff --git a/homeassistant/components/notion/config_flow.py b/homeassistant/components/notion/config_flow.py
index 58c5c0d44ee..bcbd22bccc6 100644
--- a/homeassistant/components/notion/config_flow.py
+++ b/homeassistant/components/notion/config_flow.py
@@ -47,6 +47,6 @@ class NotionFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                 user_input[CONF_USERNAME], user_input[CONF_PASSWORD], session
             )
         except NotionError:
-            return await self._show_form({"base": "invalid_credentials"})
+            return await self._show_form({"base": "invalid_auth"})
 
         return self.async_create_entry(title=user_input[CONF_USERNAME], data=user_input)
diff --git a/homeassistant/components/notion/strings.json b/homeassistant/components/notion/strings.json
index 1fbe4837f7e..401f0095e30 100644
--- a/homeassistant/components/notion/strings.json
+++ b/homeassistant/components/notion/strings.json
@@ -10,11 +10,11 @@
       }
     },
     "error": {
-      "invalid_credentials": "Invalid username or password",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "no_devices": "No devices found in account"
     },
     "abort": {
-      "already_configured": "This username is already in use."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/notion/translations/ca.json b/homeassistant/components/notion/translations/ca.json
index 05626cbd483..7abc95e5990 100644
--- a/homeassistant/components/notion/translations/ca.json
+++ b/homeassistant/components/notion/translations/ca.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest nom d'usuari ja est\u00e0 en \u00fas."
+            "already_configured": "El compte ja ha estat configurat"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Nom d'usuari o contrasenya incorrectes",
             "no_devices": "No s'han trobat dispositius al compte"
         },
diff --git a/homeassistant/components/notion/translations/cs.json b/homeassistant/components/notion/translations/cs.json
index 338ff5d9a44..7440c390a62 100644
--- a/homeassistant/components/notion/translations/cs.json
+++ b/homeassistant/components/notion/translations/cs.json
@@ -1,11 +1,20 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_credentials": "Neplatn\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no nebo heslo",
+            "no_devices": "V \u00fa\u010dtu nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "Vypl\u0148te sv\u00e9 \u00fadaje"
             }
         }
     }
diff --git a/homeassistant/components/notion/translations/en.json b/homeassistant/components/notion/translations/en.json
index d70aa73824a..b092cc000d9 100644
--- a/homeassistant/components/notion/translations/en.json
+++ b/homeassistant/components/notion/translations/en.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This username is already in use."
+            "already_configured": "Account is already configured"
         },
         "error": {
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid username or password",
             "no_devices": "No devices found in account"
         },
diff --git a/homeassistant/components/notion/translations/es.json b/homeassistant/components/notion/translations/es.json
index 2ea7fbb0db7..ef4aa8e22db 100644
--- a/homeassistant/components/notion/translations/es.json
+++ b/homeassistant/components/notion/translations/es.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Este nombre de usuario ya est\u00e1 en uso."
+            "already_configured": "La cuenta ya ha sido configurada"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_credentials": "Usuario o contrase\u00f1a no v\u00e1lido",
             "no_devices": "No se han encontrado dispositivos en la cuenta"
         },
diff --git a/homeassistant/components/notion/translations/et.json b/homeassistant/components/notion/translations/et.json
new file mode 100644
index 00000000000..eec98de1f08
--- /dev/null
+++ b/homeassistant/components/notion/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_credentials": "Vale kasutajanimi v\u00f5i salas\u00f5na"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/notion/translations/it.json b/homeassistant/components/notion/translations/it.json
index c7626f59202..73298227868 100644
--- a/homeassistant/components/notion/translations/it.json
+++ b/homeassistant/components/notion/translations/it.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo nome utente \u00e8 gi\u00e0 in uso."
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato"
         },
         "error": {
+            "invalid_auth": "Autenticazione non valida",
             "invalid_credentials": "Nome utente o password non validi",
             "no_devices": "Nessun dispositivo trovato nell'account"
         },
diff --git a/homeassistant/components/notion/translations/lb.json b/homeassistant/components/notion/translations/lb.json
index 5746e428ab7..7a86336eac0 100644
--- a/homeassistant/components/notion/translations/lb.json
+++ b/homeassistant/components/notion/translations/lb.json
@@ -4,6 +4,7 @@
             "already_configured": "D\u00ebse Benotzernumm g\u00ebtt scho benotzt."
         },
         "error": {
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_credentials": "Ong\u00ebltege Benotzernumm oder Passwuert",
             "no_devices": "Keng Apparater am Kont fonnt"
         },
diff --git a/homeassistant/components/notion/translations/no.json b/homeassistant/components/notion/translations/no.json
index 5490a942278..82424f2738a 100644
--- a/homeassistant/components/notion/translations/no.json
+++ b/homeassistant/components/notion/translations/no.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Dette brukernavnet er allerede i bruk."
+            "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig brukernavn eller passord",
             "no_devices": "Ingen enheter funnet i kontoen"
         },
diff --git a/homeassistant/components/notion/translations/pl.json b/homeassistant/components/notion/translations/pl.json
index 8e3c60b6956..efe1154f49d 100644
--- a/homeassistant/components/notion/translations/pl.json
+++ b/homeassistant/components/notion/translations/pl.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ta nazwa u\u017cytkownika jest ju\u017c w u\u017cyciu."
+            "already_configured": "Konto jest ju\u017c skonfigurowane"
         },
         "error": {
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_credentials": "Nieprawid\u0142owa nazwa u\u017cytkownika lub has\u0142o",
             "no_devices": "Nie znaleziono urz\u0105dze\u0144 na koncie"
         },
diff --git a/homeassistant/components/notion/translations/ru.json b/homeassistant/components/notion/translations/ru.json
index 907ee235c96..0ac19623c1a 100644
--- a/homeassistant/components/notion/translations/ru.json
+++ b/homeassistant/components/notion/translations/ru.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f."
+            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.",
             "no_devices": "\u041d\u0435\u0442 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432, \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0441 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u044c\u044e."
         },
diff --git a/homeassistant/components/notion/translations/zh-Hant.json b/homeassistant/components/notion/translations/zh-Hant.json
index b8713524e3c..55b4d6a2e5d 100644
--- a/homeassistant/components/notion/translations/zh-Hant.json
+++ b/homeassistant/components/notion/translations/zh-Hant.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u4f7f\u7528\u8005\u540d\u7a31\u5df2\u88ab\u4f7f\u7528\u3002"
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u4f7f\u7528\u8005\u540d\u7a31\u6216\u5bc6\u78bc\u7121\u6548",
             "no_devices": "\u5e33\u865f\u4e2d\u627e\u4e0d\u5230\u4efb\u4f55\u8a2d\u5099"
         },
diff --git a/homeassistant/components/nuheat/__init__.py b/homeassistant/components/nuheat/__init__.py
index 80765d88866..0bb8ed2ddaa 100644
--- a/homeassistant/components/nuheat/__init__.py
+++ b/homeassistant/components/nuheat/__init__.py
@@ -1,5 +1,6 @@
 """Support for NuHeat thermostats."""
 import asyncio
+from datetime import timedelta
 import logging
 
 import nuheat
@@ -17,6 +18,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import CONF_SERIAL_NUMBER, DOMAIN, PLATFORMS
 
@@ -68,6 +70,12 @@ async def async_setup(hass: HomeAssistant, config: dict):
     return True
 
 
+def _get_thermostat(api, serial_number):
+    """Authenticate and create the thermostat object."""
+    api.authenticate()
+    return api.get_thermostat(serial_number)
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     """Set up NuHeat from a config entry."""
 
@@ -80,7 +88,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     api = nuheat.NuHeat(username, password)
 
     try:
-        await hass.async_add_executor_job(api.authenticate)
+        thermostat = await hass.async_add_executor_job(
+            _get_thermostat, api, serial_number
+        )
     except requests.exceptions.Timeout as ex:
         raise ConfigEntryNotReady from ex
     except requests.exceptions.HTTPError as ex:
@@ -95,7 +105,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
         _LOGGER.error("Failed to login to nuheat: %s", ex)
         return False
 
-    hass.data[DOMAIN][entry.entry_id] = (api, serial_number)
+    async def _async_update_data():
+        """Fetch data from API endpoint."""
+        await hass.async_add_executor_job(thermostat.get_data)
+
+    coordinator = DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        name=f"nuheat {serial_number}",
+        update_method=_async_update_data,
+        update_interval=timedelta(minutes=5),
+    )
+
+    hass.data[DOMAIN][entry.entry_id] = (thermostat, coordinator)
 
     for component in PLATFORMS:
         hass.async_create_task(
diff --git a/homeassistant/components/nuheat/climate.py b/homeassistant/components/nuheat/climate.py
index 417beecee9a..e8f21fc89c2 100644
--- a/homeassistant/components/nuheat/climate.py
+++ b/homeassistant/components/nuheat/climate.py
@@ -1,5 +1,5 @@
 """Support for NuHeat thermostats."""
-from datetime import datetime, timedelta
+from datetime import datetime
 import logging
 import time
 
@@ -22,8 +22,9 @@ from homeassistant.components.climate.const import (
     SUPPORT_TARGET_TEMPERATURE,
 )
 from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.core import callback
 from homeassistant.helpers import event as event_helper
-from homeassistant.util import Throttle
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
     DOMAIN,
@@ -38,7 +39,6 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
-MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
 
 # The device does not have an off function.
 # To turn it off set to min_temp and PRESET_PERMANENT_HOLD
@@ -65,11 +65,10 @@ SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_PRESET_MODE
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the NuHeat thermostat(s)."""
-    api, serial_number = hass.data[DOMAIN][config_entry.entry_id]
+    thermostat, coordinator = hass.data[DOMAIN][config_entry.entry_id]
 
     temperature_unit = hass.config.units.temperature_unit
-    thermostat = await hass.async_add_executor_job(api.get_thermostat, serial_number)
-    entity = NuHeatThermostat(thermostat, temperature_unit)
+    entity = NuHeatThermostat(coordinator, thermostat, temperature_unit)
 
     # No longer need a service as set_hvac_mode to auto does this
     # since climate 1.0 has been implemented
@@ -77,16 +76,16 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     async_add_entities([entity], True)
 
 
-class NuHeatThermostat(ClimateEntity):
+class NuHeatThermostat(CoordinatorEntity, ClimateEntity):
     """Representation of a NuHeat Thermostat."""
 
-    def __init__(self, thermostat, temperature_unit):
+    def __init__(self, coordinator, thermostat, temperature_unit):
         """Initialize the thermostat."""
+        super().__init__(coordinator)
         self._thermostat = thermostat
         self._temperature_unit = temperature_unit
         self._schedule_mode = None
         self._target_temperature = None
-        self._force_update = False
 
     @property
     def name(self):
@@ -122,7 +121,7 @@ class NuHeatThermostat(ClimateEntity):
     @property
     def available(self):
         """Return the unique id."""
-        return self._thermostat.online
+        return self.coordinator.last_update_success and self._thermostat.online
 
     def set_hvac_mode(self, hvac_mode):
         """Set the system mode."""
@@ -260,28 +259,30 @@ class NuHeatThermostat(ClimateEntity):
         # in the future to make sure the change actually
         # took effect
         event_helper.call_later(
-            self.hass, NUHEAT_API_STATE_SHIFT_DELAY, self._schedule_force_refresh
+            self.hass, NUHEAT_API_STATE_SHIFT_DELAY, self._forced_refresh
         )
 
-    def _schedule_force_refresh(self, _):
-        self._force_update = True
-        self.schedule_update_ha_state(True)
+    async def _forced_refresh(self, *_) -> None:
+        """Force a refresh."""
+        await self.coordinator.async_refresh()
 
-    def update(self):
-        """Get the latest state from the thermostat."""
-        if self._force_update:
-            self._throttled_update(no_throttle=True)
-            self._force_update = False
-        else:
-            self._throttled_update()
+    async def async_added_to_hass(self) -> None:
+        """When entity is added to hass."""
+        await super().async_added_to_hass()
+        self._update_internal_state()
 
-    @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    def _throttled_update(self, **kwargs):
-        """Get the latest state from the thermostat with a throttle."""
-        self._thermostat.get_data()
+    @callback
+    def _update_internal_state(self):
+        """Update our internal state from the last api response."""
         self._schedule_mode = self._thermostat.schedule_mode
         self._target_temperature = self._thermostat.target_temperature
 
+    @callback
+    def _handle_coordinator_update(self):
+        """Get the latest state from the thermostat."""
+        self._update_internal_state()
+        self.async_write_ha_state()
+
     @property
     def device_info(self):
         """Return the device_info of the device."""
diff --git a/homeassistant/components/nuheat/const.py b/homeassistant/components/nuheat/const.py
index bd44dcb1711..9c4fc368226 100644
--- a/homeassistant/components/nuheat/const.py
+++ b/homeassistant/components/nuheat/const.py
@@ -8,7 +8,7 @@ CONF_SERIAL_NUMBER = "serial_number"
 
 MANUFACTURER = "NuHeat"
 
-NUHEAT_API_STATE_SHIFT_DELAY = 1
+NUHEAT_API_STATE_SHIFT_DELAY = 2
 
 TEMP_HOLD_TIME_SEC = 43200
 
diff --git a/homeassistant/components/nuheat/strings.json b/homeassistant/components/nuheat/strings.json
index 367420178e6..aebad40e6a9 100644
--- a/homeassistant/components/nuheat/strings.json
+++ b/homeassistant/components/nuheat/strings.json
@@ -1,13 +1,13 @@
 {
   "config": {
     "error": {
-      "unknown": "Unexpected error",
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "invalid_thermostat": "The thermostat serial number is invalid."
     },
     "abort": {
-      "already_configured": "The thermostat is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
     "step": {
       "user": {
@@ -21,4 +21,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/nuheat/translations/ca.json b/homeassistant/components/nuheat/translations/ca.json
index c7821838f4f..cba3a76ad8f 100644
--- a/homeassistant/components/nuheat/translations/ca.json
+++ b/homeassistant/components/nuheat/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El term\u00f2stat ja est\u00e0 configurat"
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_thermostat": "El n\u00famero de s\u00e8rie del term\u00f2stat no \u00e9s v\u00e0lid.",
             "unknown": "Error inesperat"
diff --git a/homeassistant/components/nuheat/translations/cs.json b/homeassistant/components/nuheat/translations/cs.json
index 338ff5d9a44..9c956bc68af 100644
--- a/homeassistant/components/nuheat/translations/cs.json
+++ b/homeassistant/components/nuheat/translations/cs.json
@@ -1,11 +1,22 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_thermostat": "S\u00e9riov\u00e9 \u010d\u00edslo termostatu je neplatn\u00e9.",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
+                    "serial_number": "S\u00e9riov\u00e9 \u010d\u00edslo termostatu.",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k NuHeat"
             }
         }
     }
diff --git a/homeassistant/components/nuheat/translations/en.json b/homeassistant/components/nuheat/translations/en.json
index d7b2697d5e0..73d6caa94e3 100644
--- a/homeassistant/components/nuheat/translations/en.json
+++ b/homeassistant/components/nuheat/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "The thermostat is already configured"
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "invalid_thermostat": "The thermostat serial number is invalid.",
             "unknown": "Unexpected error"
diff --git a/homeassistant/components/nuheat/translations/es.json b/homeassistant/components/nuheat/translations/es.json
index 6b11fe39500..088978d4c50 100644
--- a/homeassistant/components/nuheat/translations/es.json
+++ b/homeassistant/components/nuheat/translations/es.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El termostato ya est\u00e1 configurado."
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor int\u00e9ntalo de nuevo",
+            "cannot_connect": "No se pudo conectar",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_thermostat": "El n\u00famero de serie del termostato no es v\u00e1lido.",
             "unknown": "Error inesperado"
diff --git a/homeassistant/components/nuheat/translations/et.json b/homeassistant/components/nuheat/translations/et.json
new file mode 100644
index 00000000000..207eae740f6
--- /dev/null
+++ b/homeassistant/components/nuheat/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchenduse loomine nurjus. Proovi uuesti",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nuheat/translations/it.json b/homeassistant/components/nuheat/translations/it.json
index 973ff695acb..1e17ce8ecf8 100644
--- a/homeassistant/components/nuheat/translations/it.json
+++ b/homeassistant/components/nuheat/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il termostato \u00e8 gi\u00e0 configurato"
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "invalid_thermostat": "Il numero di serie del termostato non \u00e8 valido.",
             "unknown": "Errore imprevisto"
diff --git a/homeassistant/components/nuheat/translations/no.json b/homeassistant/components/nuheat/translations/no.json
index 7ec631197cc..03fa9a85fe3 100644
--- a/homeassistant/components/nuheat/translations/no.json
+++ b/homeassistant/components/nuheat/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Termostaten er allerede konfigurert"
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "invalid_thermostat": "Termostatens serienummer er ugyldig.",
             "unknown": "Uventet feil"
diff --git a/homeassistant/components/nuheat/translations/pl.json b/homeassistant/components/nuheat/translations/pl.json
index d992afe9cc0..872c0112f5e 100644
--- a/homeassistant/components/nuheat/translations/pl.json
+++ b/homeassistant/components/nuheat/translations/pl.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Termostat jest ju\u017c skonfigurowany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
-            "invalid_thermostat": "Numer seryjny termostatu jest nieprawid\u0142owy.",
+            "invalid_thermostat": "Numer seryjny termostatu jest nieprawid\u0142owy",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
diff --git a/homeassistant/components/nuheat/translations/ru.json b/homeassistant/components/nuheat/translations/ru.json
index f4d06e8eca6..09e74c0e4cb 100644
--- a/homeassistant/components/nuheat/translations/ru.json
+++ b/homeassistant/components/nuheat/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_thermostat": "\u0421\u0435\u0440\u0438\u0439\u043d\u044b\u0439 \u043d\u043e\u043c\u0435\u0440 \u0442\u0435\u0440\u043c\u043e\u0441\u0442\u0430\u0442\u0430 \u043d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u0435\u043d.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
diff --git a/homeassistant/components/nuheat/translations/zh-Hans.json b/homeassistant/components/nuheat/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/nuheat/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nuheat/translations/zh-Hant.json b/homeassistant/components/nuheat/translations/zh-Hant.json
index f912b81f4c4..eac51c4cf8f 100644
--- a/homeassistant/components/nuheat/translations/zh-Hant.json
+++ b/homeassistant/components/nuheat/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6eab\u63a7\u5668\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_thermostat": "\u6eab\u63a7\u5668\u5e8f\u865f\u7121\u6548\u3002",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
diff --git a/homeassistant/components/numato/__init__.py b/homeassistant/components/numato/__init__.py
index 0f088cd179d..1730ff82956 100644
--- a/homeassistant/components/numato/__init__.py
+++ b/homeassistant/components/numato/__init__.py
@@ -171,7 +171,7 @@ class NumatoAPI:
 
     def __init__(self):
         """Initialize API state."""
-        self.ports_registered = dict()
+        self.ports_registered = {}
 
     def check_port_free(self, device_id, port, direction):
         """Check whether a port is still free set up.
diff --git a/homeassistant/components/nut/strings.json b/homeassistant/components/nut/strings.json
index 2203a501ff2..1b71280b6a9 100644
--- a/homeassistant/components/nut/strings.json
+++ b/homeassistant/components/nut/strings.json
@@ -25,11 +25,11 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
@@ -43,4 +43,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/nut/translations/ca.json b/homeassistant/components/nut/translations/ca.json
index 13c1bde3173..fa7b728e115 100644
--- a/homeassistant/components/nut/translations/ca.json
+++ b/homeassistant/components/nut/translations/ca.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "unknown": "Error inesperat"
         },
         "step": {
diff --git a/homeassistant/components/nut/translations/cs.json b/homeassistant/components/nut/translations/cs.json
index 5940a9c60ad..d5cf361ba03 100644
--- a/homeassistant/components/nut/translations/cs.json
+++ b/homeassistant/components/nut/translations/cs.json
@@ -1,19 +1,44 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
+            "resources": {
+                "data": {
+                    "resources": "Zdroje"
+                },
+                "title": "Vyberte zdroje, kter\u00e9 chcete sledovat"
+            },
+            "ups": {
+                "data": {
+                    "alias": "Alias",
+                    "resources": "Zdroje"
+                },
+                "title": "Vyberte UPS, kterou chcete sledovat"
+            },
             "user": {
                 "data": {
                     "host": "Hostitel",
                     "password": "Heslo",
                     "port": "Port",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k serveru NUT"
             }
         }
     },
     "options": {
         "step": {
             "init": {
+                "data": {
+                    "resources": "Zdroje",
+                    "scan_interval": "Interval sledov\u00e1n\u00ed (v sekund\u00e1ch)"
+                },
                 "description": "Zvolte zdroje senzoru."
             }
         }
diff --git a/homeassistant/components/nut/translations/en.json b/homeassistant/components/nut/translations/en.json
index f698ad9287a..2e5db79d81c 100644
--- a/homeassistant/components/nut/translations/en.json
+++ b/homeassistant/components/nut/translations/en.json
@@ -4,7 +4,7 @@
             "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "unknown": "Unexpected error"
         },
         "step": {
diff --git a/homeassistant/components/nut/translations/es.json b/homeassistant/components/nut/translations/es.json
index d05fb5587dc..c76fc0da798 100644
--- a/homeassistant/components/nut/translations/es.json
+++ b/homeassistant/components/nut/translations/es.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo",
+            "cannot_connect": "No se pudo conectar",
             "unknown": "Error inesperado"
         },
         "step": {
diff --git a/homeassistant/components/nut/translations/et.json b/homeassistant/components/nut/translations/et.json
new file mode 100644
index 00000000000..3e9ae01b36d
--- /dev/null
+++ b/homeassistant/components/nut/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "port": "",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nut/translations/it.json b/homeassistant/components/nut/translations/it.json
index 177fd72067e..440cb421504 100644
--- a/homeassistant/components/nut/translations/it.json
+++ b/homeassistant/components/nut/translations/it.json
@@ -4,7 +4,7 @@
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "unknown": "Errore imprevisto"
         },
         "step": {
diff --git a/homeassistant/components/nut/translations/no.json b/homeassistant/components/nut/translations/no.json
index 6fd749442c3..0af64ad4fa4 100644
--- a/homeassistant/components/nut/translations/no.json
+++ b/homeassistant/components/nut/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
         "step": {
@@ -25,7 +25,7 @@
                 "data": {
                     "host": "Vert",
                     "password": "Passord",
-                    "port": "",
+                    "port": "Port",
                     "username": "Brukernavn"
                 },
                 "title": "Koble til NUT-serveren"
diff --git a/homeassistant/components/nut/translations/pl.json b/homeassistant/components/nut/translations/pl.json
index d24638341d2..240b32bfe19 100644
--- a/homeassistant/components/nut/translations/pl.json
+++ b/homeassistant/components/nut/translations/pl.json
@@ -4,7 +4,7 @@
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
@@ -39,7 +39,7 @@
                     "resources": "Zasoby",
                     "scan_interval": "Cz\u0119stotliwo\u015b\u0107 aktualizacji (sekundy)"
                 },
-                "description": "Wybierz zasoby sensor\u00f3w"
+                "description": "Wybierz zasoby sensor\u00f3w."
             }
         }
     }
diff --git a/homeassistant/components/nut/translations/ru.json b/homeassistant/components/nut/translations/ru.json
index 012ac2ae568..7a3f1c9b47e 100644
--- a/homeassistant/components/nut/translations/ru.json
+++ b/homeassistant/components/nut/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
diff --git a/homeassistant/components/nut/translations/sv.json b/homeassistant/components/nut/translations/sv.json
index b8673b1b8f9..70dccdca51e 100644
--- a/homeassistant/components/nut/translations/sv.json
+++ b/homeassistant/components/nut/translations/sv.json
@@ -17,7 +17,8 @@
             "ups": {
                 "data": {
                     "alias": "Alias"
-                }
+                },
+                "title": "V\u00e4lj UPS att \u00f6vervaka"
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/nut/translations/zh-Hans.json b/homeassistant/components/nut/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/nut/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nut/translations/zh-Hant.json b/homeassistant/components/nut/translations/zh-Hant.json
index 35cd266854f..b75bd37958f 100644
--- a/homeassistant/components/nut/translations/zh-Hant.json
+++ b/homeassistant/components/nut/translations/zh-Hant.json
@@ -4,7 +4,7 @@
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
diff --git a/homeassistant/components/nws/strings.json b/homeassistant/components/nws/strings.json
index 83e8a3a694b..0f0bdcf4a1c 100644
--- a/homeassistant/components/nws/strings.json
+++ b/homeassistant/components/nws/strings.json
@@ -6,18 +6,18 @@
         "title": "Connect to the National Weather Service",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
-          "latitude": "Latitude",
-          "longitude": "Longitude",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]",
           "station": "METAR station code"
         }
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/nws/translations/ca.json b/homeassistant/components/nws/translations/ca.json
index a2239f5f97d..e012d68a10e 100644
--- a/homeassistant/components/nws/translations/ca.json
+++ b/homeassistant/components/nws/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositiu ja est\u00e0 configurat"
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "unknown": "Error inesperat"
         },
         "step": {
diff --git a/homeassistant/components/nws/translations/cs.json b/homeassistant/components/nws/translations/cs.json
index 757cf90e1e2..f2450bf6f69 100644
--- a/homeassistant/components/nws/translations/cs.json
+++ b/homeassistant/components/nws/translations/cs.json
@@ -1,10 +1,22 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Kl\u00ed\u010d API"
-                }
+                    "api_key": "Kl\u00ed\u010d API",
+                    "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
+                    "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka",
+                    "station": "K\u00f3d stanice METAR"
+                },
+                "description": "Pokud nen\u00ed zad\u00e1n k\u00f3d stanice METAR, pou\u017eije se zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka a d\u00e9lka k vyhled\u00e1n\u00ed nejbli\u017e\u0161\u00ed stanice.",
+                "title": "P\u0159ipojen\u00ed k National Weather Service"
             }
         }
     }
diff --git a/homeassistant/components/nws/translations/en.json b/homeassistant/components/nws/translations/en.json
index 19eec6a20e3..04cb13bf5e8 100644
--- a/homeassistant/components/nws/translations/en.json
+++ b/homeassistant/components/nws/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Device is already configured"
+            "already_configured": "Service is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "unknown": "Unexpected error"
         },
         "step": {
diff --git a/homeassistant/components/nws/translations/es.json b/homeassistant/components/nws/translations/es.json
index 4c1107dd05e..4e7732c062d 100644
--- a/homeassistant/components/nws/translations/es.json
+++ b/homeassistant/components/nws/translations/es.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositivo ya est\u00e1 configurado"
+            "already_configured": "El servicio ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo",
+            "cannot_connect": "No se pudo conectar",
             "unknown": "Error inesperado"
         },
         "step": {
diff --git a/homeassistant/components/nws/translations/et.json b/homeassistant/components/nws/translations/et.json
index a9607835b43..98882d81673 100644
--- a/homeassistant/components/nws/translations/et.json
+++ b/homeassistant/components/nws/translations/et.json
@@ -1,5 +1,12 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/nws/translations/it.json b/homeassistant/components/nws/translations/it.json
index 92c519513b4..827d8078b55 100644
--- a/homeassistant/components/nws/translations/it.json
+++ b/homeassistant/components/nws/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "unknown": "Errore imprevisto"
         },
         "step": {
diff --git a/homeassistant/components/nws/translations/lb.json b/homeassistant/components/nws/translations/lb.json
index 5b03ce5af1b..a527406223d 100644
--- a/homeassistant/components/nws/translations/lb.json
+++ b/homeassistant/components/nws/translations/lb.json
@@ -4,7 +4,7 @@
             "already_configured": "Apparat ass scho konfigur\u00e9iert"
         },
         "error": {
-            "cannot_connect": "Feeler beim verbannen, prob\u00e9ier w.e.g. nach emol.",
+            "cannot_connect": "Feeler beim verbannen",
             "unknown": "Onerwaarte Feeler"
         },
         "step": {
diff --git a/homeassistant/components/nws/translations/no.json b/homeassistant/components/nws/translations/no.json
index f26abdeaa2e..d9a17545c4b 100644
--- a/homeassistant/components/nws/translations/no.json
+++ b/homeassistant/components/nws/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Enheten er allerede konfigurert"
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
         "step": {
diff --git a/homeassistant/components/nws/translations/pl.json b/homeassistant/components/nws/translations/pl.json
index 2671f0408c9..2665a5c5a85 100644
--- a/homeassistant/components/nws/translations/pl.json
+++ b/homeassistant/components/nws/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
diff --git a/homeassistant/components/nws/translations/ru.json b/homeassistant/components/nws/translations/ru.json
index 96ab63cd2d4..926e936a594 100644
--- a/homeassistant/components/nws/translations/ru.json
+++ b/homeassistant/components/nws/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
diff --git a/homeassistant/components/nws/translations/sv.json b/homeassistant/components/nws/translations/sv.json
index fefa01fd40a..5ce9a828148 100644
--- a/homeassistant/components/nws/translations/sv.json
+++ b/homeassistant/components/nws/translations/sv.json
@@ -10,6 +10,7 @@
         "step": {
             "user": {
                 "data": {
+                    "api_key": "API nyckel",
                     "latitude": "Latitud",
                     "longitude": "Longitud"
                 }
diff --git a/homeassistant/components/nws/translations/zh-Hant.json b/homeassistant/components/nws/translations/zh-Hant.json
index 703dbd240b8..067234c7b54 100644
--- a/homeassistant/components/nws/translations/zh-Hant.json
+++ b/homeassistant/components/nws/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
diff --git a/homeassistant/components/nx584/alarm_control_panel.py b/homeassistant/components/nx584/alarm_control_panel.py
index 2df7cd1bb4b..6366831b598 100644
--- a/homeassistant/components/nx584/alarm_control_panel.py
+++ b/homeassistant/components/nx584/alarm_control_panel.py
@@ -58,7 +58,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     except requests.exceptions.ConnectionError as ex:
         _LOGGER.error(
             "Unable to connect to %(host)s: %(reason)s",
-            dict(host=url, reason=ex),
+            {"host": url, "reason": ex},
         )
         raise PlatformNotReady from ex
 
@@ -118,7 +118,7 @@ class NX584Alarm(alarm.AlarmControlPanelEntity):
         except requests.exceptions.ConnectionError as ex:
             _LOGGER.error(
                 "Unable to connect to %(host)s: %(reason)s",
-                dict(host=self._url, reason=ex),
+                {"host": self._url, "reason": ex},
             )
             self._state = None
             zones = []
@@ -132,7 +132,7 @@ class NX584Alarm(alarm.AlarmControlPanelEntity):
             if zone["bypassed"]:
                 _LOGGER.debug(
                     "Zone %(zone)s is bypassed, assuming HOME",
-                    dict(zone=zone["number"]),
+                    {"zone": zone["number"]},
                 )
                 bypassed = True
                 break
diff --git a/homeassistant/components/nzbget/__init__.py b/homeassistant/components/nzbget/__init__.py
index 467cd8c06db..eba5eb58baf 100644
--- a/homeassistant/components/nzbget/__init__.py
+++ b/homeassistant/components/nzbget/__init__.py
@@ -1,6 +1,5 @@
 """The NZBGet integration."""
 import asyncio
-import logging
 
 import voluptuous as vol
 
@@ -35,8 +34,6 @@ from .const import (
 )
 from .coordinator import NZBGetDataUpdateCoordinator
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORMS = ["sensor", "switch"]
 
 CONFIG_SCHEMA = vol.Schema(
diff --git a/homeassistant/components/nzbget/strings.json b/homeassistant/components/nzbget/strings.json
index 5a0c31054a9..96049ea9369 100644
--- a/homeassistant/components/nzbget/strings.json
+++ b/homeassistant/components/nzbget/strings.json
@@ -5,13 +5,13 @@
       "user": {
         "title": "Connect to NZBGet",
         "data": {
-          "name": "Name",
+          "name": "[%key:common::config_flow::data::name%]",
           "host": "[%key:common::config_flow::data::host%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
           "port": "[%key:common::config_flow::data::port%]",
-          "ssl": "NZBGet uses a SSL certificate",
-          "verify_ssl": "NZBGet uses a proper certificate"
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         }
       }
     },
diff --git a/homeassistant/components/nzbget/translations/ca.json b/homeassistant/components/nzbget/translations/ca.json
index 535b56a3768..b567d77bcb3 100644
--- a/homeassistant/components/nzbget/translations/ca.json
+++ b/homeassistant/components/nzbget/translations/ca.json
@@ -16,9 +16,9 @@
                     "name": "Nom",
                     "password": "Contrasenya",
                     "port": "Port",
-                    "ssl": "NZBGet utilitza un certificat SSL",
+                    "ssl": "Utilitza un certificat SSL",
                     "username": "Nom d'usuari",
-                    "verify_ssl": "NZBGet utilitza un certificat adequat"
+                    "verify_ssl": "Verifica el certificat SSL"
                 },
                 "title": "Connexi\u00f3 amb NZBGet"
             }
diff --git a/homeassistant/components/nzbget/translations/cs.json b/homeassistant/components/nzbget/translations/cs.json
new file mode 100644
index 00000000000..c277ce42281
--- /dev/null
+++ b/homeassistant/components/nzbget/translations/cs.json
@@ -0,0 +1,36 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace.",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "flow_title": "NZBGet: {name}",
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Hostitel",
+                    "name": "Jm\u00e9no",
+                    "password": "Heslo",
+                    "port": "Port",
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no",
+                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL"
+                },
+                "title": "P\u0159ipojen\u00ed k NZBGet"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Frekvence aktualizac\u00ed (v sekund\u00e1ch)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nzbget/translations/de.json b/homeassistant/components/nzbget/translations/de.json
index 6aa89d2e62e..2ebae1083eb 100644
--- a/homeassistant/components/nzbget/translations/de.json
+++ b/homeassistant/components/nzbget/translations/de.json
@@ -9,7 +9,8 @@
                     "password": "Passwort",
                     "port": "Port",
                     "username": "Benutzername"
-                }
+                },
+                "title": "Mit NZBGet verbinden"
             }
         }
     },
diff --git a/homeassistant/components/nzbget/translations/el.json b/homeassistant/components/nzbget/translations/el.json
new file mode 100644
index 00000000000..25febfd7c8a
--- /dev/null
+++ b/homeassistant/components/nzbget/translations/el.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "abort": {
+            "unknown": "\u039c\u03b7 \u03b1\u03bd\u03b1\u03bc\u03b5\u03bd\u03cc\u03bc\u03b5\u03bd\u03bf \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1"
+        },
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        },
+        "flow_title": "NZBGet: {\u03cc\u03bd\u03bf\u03bc\u03b1}"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nzbget/translations/en.json b/homeassistant/components/nzbget/translations/en.json
index c410d4e4874..d9a6273c27c 100644
--- a/homeassistant/components/nzbget/translations/en.json
+++ b/homeassistant/components/nzbget/translations/en.json
@@ -16,9 +16,9 @@
                     "name": "Name",
                     "password": "Password",
                     "port": "Port",
-                    "ssl": "NZBGet uses a SSL certificate",
+                    "ssl": "Uses an SSL certificate",
                     "username": "Username",
-                    "verify_ssl": "NZBGet uses a proper certificate"
+                    "verify_ssl": "Verify SSL certificate"
                 },
                 "title": "Connect to NZBGet"
             }
diff --git a/homeassistant/components/nzbget/translations/es.json b/homeassistant/components/nzbget/translations/es.json
index aeb78ca7886..153fa5736af 100644
--- a/homeassistant/components/nzbget/translations/es.json
+++ b/homeassistant/components/nzbget/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n.",
             "unknown": "Error inesperado"
         },
         "error": {
@@ -16,9 +16,9 @@
                     "name": "Nombre",
                     "password": "Contrase\u00f1a",
                     "port": "Puerto",
-                    "ssl": "NZBGet utiliza un certificado SSL",
+                    "ssl": "Utiliza un certificado SSL",
                     "username": "Usuario",
-                    "verify_ssl": "NZBGet utiliza un certificado adecuado"
+                    "verify_ssl": "Verificar certificado SSL"
                 },
                 "title": "Conectarse a NZBGet"
             }
diff --git a/homeassistant/components/nzbget/translations/et.json b/homeassistant/components/nzbget/translations/et.json
new file mode 100644
index 00000000000..93f7cab7cf8
--- /dev/null
+++ b/homeassistant/components/nzbget/translations/et.json
@@ -0,0 +1,34 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine.",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "name": "Nimi",
+                    "password": "Salas\u00f5na",
+                    "port": "",
+                    "username": "Kasutajanimi",
+                    "verify_ssl": "Kontrolli SSL sertifikaati"
+                },
+                "title": "Loo \u00fchendus NZBGet-iga"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Uuendamise sagedus (sekundites)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nzbget/translations/it.json b/homeassistant/components/nzbget/translations/it.json
index 31438f9d55b..88bea29987b 100644
--- a/homeassistant/components/nzbget/translations/it.json
+++ b/homeassistant/components/nzbget/translations/it.json
@@ -16,9 +16,9 @@
                     "name": "Nome",
                     "password": "Password",
                     "port": "Porta",
-                    "ssl": "NZBGet utilizza un certificato SSL",
+                    "ssl": "Utilizza un certificato SSL",
                     "username": "Nome utente",
-                    "verify_ssl": "NZBGet utilizza un certificato proprio"
+                    "verify_ssl": "Verificare il certificato SSL"
                 },
                 "title": "Connettiti a NZBGet"
             }
diff --git a/homeassistant/components/nzbget/translations/nl.json b/homeassistant/components/nzbget/translations/nl.json
index 472952ad8b1..b8caac157dc 100644
--- a/homeassistant/components/nzbget/translations/nl.json
+++ b/homeassistant/components/nzbget/translations/nl.json
@@ -1,9 +1,15 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
+        },
+        "flow_title": "NZBGet: {name}",
         "step": {
             "user": {
                 "data": {
                     "name": "Naam",
+                    "password": "Wachtwoord",
+                    "port": "Poort",
                     "username": "Gebruikersnaam"
                 }
             }
diff --git a/homeassistant/components/nzbget/translations/no.json b/homeassistant/components/nzbget/translations/no.json
index e8230da6f2d..bf7840c9c60 100644
--- a/homeassistant/components/nzbget/translations/no.json
+++ b/homeassistant/components/nzbget/translations/no.json
@@ -5,10 +5,10 @@
             "unknown": "Uventet feil"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning"
         },
-        "flow_title": "NZBGet: {name}",
+        "flow_title": "",
         "step": {
             "user": {
                 "data": {
@@ -16,9 +16,9 @@
                     "name": "Navn",
                     "password": "Passord",
                     "port": "Port",
-                    "ssl": "NZBGet bruker et SSL-sertifikat",
+                    "ssl": "Bruker et SSL-sertifikat",
                     "username": "Brukernavn",
-                    "verify_ssl": "NZBGet bruker et riktig sertifikat"
+                    "verify_ssl": "Verifisere SSL-sertifikat"
                 },
                 "title": "Koble til NZBGet"
             }
diff --git a/homeassistant/components/nzbget/translations/pl.json b/homeassistant/components/nzbget/translations/pl.json
index 6b39cde94a5..d1cfea50602 100644
--- a/homeassistant/components/nzbget/translations/pl.json
+++ b/homeassistant/components/nzbget/translations/pl.json
@@ -16,7 +16,19 @@
                     "name": "Nazwa",
                     "password": "Has\u0142o",
                     "port": "Port",
-                    "username": "Nazwa u\u017cytkownika"
+                    "ssl": "Certyfikat SSL",
+                    "username": "Nazwa u\u017cytkownika",
+                    "verify_ssl": "Weryfikacja certyfikatu SSL"
+                },
+                "title": "Po\u0142\u0105czenie z NZBGet"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Cz\u0119stotliwo\u015b\u0107 aktualizacji (w sekundach)"
                 }
             }
         }
diff --git a/homeassistant/components/nzbget/translations/ru.json b/homeassistant/components/nzbget/translations/ru.json
index 93e44307ab8..daab5c87ef7 100644
--- a/homeassistant/components/nzbget/translations/ru.json
+++ b/homeassistant/components/nzbget/translations/ru.json
@@ -16,9 +16,9 @@
                     "name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "NZBGet \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
                     "username": "\u041b\u043e\u0433\u0438\u043d",
-                    "verify_ssl": "NZBGet \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442"
+                    "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 },
                 "title": "NZBGet"
             }
diff --git a/homeassistant/components/nzbget/translations/zh-Hans.json b/homeassistant/components/nzbget/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/nzbget/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/nzbget/translations/zh-Hant.json b/homeassistant/components/nzbget/translations/zh-Hant.json
index d2fc50ac26a..e2c3c8ea820 100644
--- a/homeassistant/components/nzbget/translations/zh-Hant.json
+++ b/homeassistant/components/nzbget/translations/zh-Hant.json
@@ -16,9 +16,9 @@
                     "name": "\u540d\u7a31",
                     "password": "\u5bc6\u78bc",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "NZBGet \u4f7f\u7528 SSL \u8a8d\u8b49",
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
                     "username": "\u4f7f\u7528\u8005\u540d\u7a31",
-                    "verify_ssl": "NZBGet \u4f7f\u7528\u5c0d\u61c9\u8a8d\u8b49"
+                    "verify_ssl": "\u78ba\u8a8d SSL \u8a8d\u8b49"
                 },
                 "title": "\u9023\u7dda\u81f3 NZBGet"
             }
diff --git a/homeassistant/components/oem/climate.py b/homeassistant/components/oem/climate.py
index 734fe12d0f5..49badaeb7b6 100644
--- a/homeassistant/components/oem/climate.py
+++ b/homeassistant/components/oem/climate.py
@@ -1,6 +1,4 @@
 """OpenEnergyMonitor Thermostat Support."""
-import logging
-
 from oemthermostat import Thermostat
 import requests
 import voluptuous as vol
@@ -26,9 +24,6 @@ from homeassistant.const import (
 )
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_HOST): cv.string,
diff --git a/homeassistant/components/oem/manifest.json b/homeassistant/components/oem/manifest.json
index 4609cf9e2f2..7ebacb9fa4e 100644
--- a/homeassistant/components/oem/manifest.json
+++ b/homeassistant/components/oem/manifest.json
@@ -2,6 +2,6 @@
   "domain": "oem",
   "name": "OpenEnergyMonitor WiFi Thermostat",
   "documentation": "https://www.home-assistant.io/integrations/oem",
-  "requirements": ["oemthermostat==1.1"],
+  "requirements": ["oemthermostat==1.1.1"],
   "codeowners": []
 }
diff --git a/homeassistant/components/omnilogic/manifest.json b/homeassistant/components/omnilogic/manifest.json
index 468b48d620a..d999a34f076 100644
--- a/homeassistant/components/omnilogic/manifest.json
+++ b/homeassistant/components/omnilogic/manifest.json
@@ -3,6 +3,6 @@
   "name": "Hayward Omnilogic",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/omnilogic",
-  "requirements": ["omnilogic==0.4.0"],
+  "requirements": ["omnilogic==0.4.2"],
   "codeowners": ["@oliver84","@djtimca","@gentoosu"]
 }
diff --git a/homeassistant/components/omnilogic/sensor.py b/homeassistant/components/omnilogic/sensor.py
index deaee33ed82..e1b4b387a46 100644
--- a/homeassistant/components/omnilogic/sensor.py
+++ b/homeassistant/components/omnilogic/sensor.py
@@ -1,7 +1,4 @@
 """Definition and setup of the Omnilogic Sensors for Home Assistant."""
-
-import logging
-
 from homeassistant.components.sensor import DEVICE_CLASS_TEMPERATURE
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_MILLION,
@@ -15,8 +12,6 @@ from homeassistant.const import (
 from .common import OmniLogicEntity, OmniLogicUpdateCoordinator
 from .const import COORDINATOR, DOMAIN, PUMP_TYPES
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up the sensor platform."""
diff --git a/homeassistant/components/omnilogic/translations/cs.json b/homeassistant/components/omnilogic/translations/cs.json
new file mode 100644
index 00000000000..6f2b3f709ab
--- /dev/null
+++ b/homeassistant/components/omnilogic/translations/cs.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "polling_interval": "Interval dotazov\u00e1n\u00ed (v sekund\u00e1ch)"
+                }
+            }
+        }
+    },
+    "title": "Omnilogic"
+}
\ No newline at end of file
diff --git a/homeassistant/components/omnilogic/translations/el.json b/homeassistant/components/omnilogic/translations/el.json
index bf9cc6abba4..fbe77ec16c0 100644
--- a/homeassistant/components/omnilogic/translations/el.json
+++ b/homeassistant/components/omnilogic/translations/el.json
@@ -1,4 +1,22 @@
 {
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        },
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2",
+            "invalid_auth": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b1\u03c5\u03b8\u03b5\u03bd\u03c4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+            "unknown": "\u039c\u03b7 \u03b1\u03bd\u03b1\u03bc\u03b5\u03bd\u03cc\u03bc\u03b5\u03bd\u03bf \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
+                    "username": "\u038c\u03bd\u03bf\u03bc\u03b1 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7"
+                }
+            }
+        }
+    },
     "options": {
         "step": {
             "init": {
diff --git a/homeassistant/components/omnilogic/translations/es.json b/homeassistant/components/omnilogic/translations/es.json
index 849cd73b40f..aa9cafc9ddb 100644
--- a/homeassistant/components/omnilogic/translations/es.json
+++ b/homeassistant/components/omnilogic/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
             "cannot_connect": "No se pudo conectar",
diff --git a/homeassistant/components/omnilogic/translations/et.json b/homeassistant/components/omnilogic/translations/et.json
new file mode 100644
index 00000000000..2ad446f3716
--- /dev/null
+++ b/homeassistant/components/omnilogic/translations/et.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "polling_interval": "P\u00e4ringute intervall (sekundites)"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/omnilogic/translations/lb.json b/homeassistant/components/omnilogic/translations/lb.json
index 6644f439b19..22f3cb54a6e 100644
--- a/homeassistant/components/omnilogic/translations/lb.json
+++ b/homeassistant/components/omnilogic/translations/lb.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
+        },
         "error": {
             "cannot_connect": "Feeler beim verbannen",
             "invalid_auth": "\u00a7",
diff --git a/homeassistant/components/omnilogic/translations/nl.json b/homeassistant/components/omnilogic/translations/nl.json
index 2f7e9cfbd12..31587927587 100644
--- a/homeassistant/components/omnilogic/translations/nl.json
+++ b/homeassistant/components/omnilogic/translations/nl.json
@@ -1,8 +1,17 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
+        },
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken",
+            "invalid_auth": "Onjuiste gebruikersgegevens",
+            "unknown": "Onverwachte fout"
+        },
         "step": {
             "user": {
                 "data": {
+                    "password": "Wachtwoord",
                     "username": "Benutzername"
                 }
             }
diff --git a/homeassistant/components/omnilogic/translations/no.json b/homeassistant/components/omnilogic/translations/no.json
index ebadb3a40e4..e19146aa4c1 100644
--- a/homeassistant/components/omnilogic/translations/no.json
+++ b/homeassistant/components/omnilogic/translations/no.json
@@ -4,7 +4,7 @@
             "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
@@ -26,5 +26,5 @@
             }
         }
     },
-    "title": "Omnilogic"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/omnilogic/translations/pl.json b/homeassistant/components/omnilogic/translations/pl.json
index 4b9e07cb01f..10cbbdb12b7 100644
--- a/homeassistant/components/omnilogic/translations/pl.json
+++ b/homeassistant/components/omnilogic/translations/pl.json
@@ -4,6 +4,7 @@
             "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
@@ -15,5 +16,15 @@
                 }
             }
         }
-    }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "polling_interval": "Cz\u0119stotliwo\u015b\u0107 aktualizacji (w sekundach)"
+                }
+            }
+        }
+    },
+    "title": "Omnilogic"
 }
\ No newline at end of file
diff --git a/homeassistant/components/omnilogic/translations/zh-Hans.json b/homeassistant/components/omnilogic/translations/zh-Hans.json
new file mode 100644
index 00000000000..b0b26b02261
--- /dev/null
+++ b/homeassistant/components/omnilogic/translations/zh-Hans.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u5bc6\u7801",
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/onewire/const.py b/homeassistant/components/onewire/const.py
index af68135af10..83ffa12706c 100644
--- a/homeassistant/components/onewire/const.py
+++ b/homeassistant/components/onewire/const.py
@@ -1,12 +1,20 @@
 """Constants for 1-Wire component."""
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+
 CONF_MOUNT_DIR = "mount_dir"
 CONF_NAMES = "names"
 
+CONF_TYPE_OWFS = "OWFS"
+CONF_TYPE_OWSERVER = "OWServer"
+CONF_TYPE_SYSBUS = "SysBus"
+
 DEFAULT_OWSERVER_PORT = 4304
 DEFAULT_SYSBUS_MOUNT_DIR = "/sys/bus/w1/devices/"
 
 DOMAIN = "onewire"
 
+PRESSURE_CBAR = "cbar"
+
 SUPPORTED_PLATFORMS = [
-    "sensor",
+    SENSOR_DOMAIN,
 ]
diff --git a/homeassistant/components/onewire/manifest.json b/homeassistant/components/onewire/manifest.json
index f812454ae59..42ef7e54603 100644
--- a/homeassistant/components/onewire/manifest.json
+++ b/homeassistant/components/onewire/manifest.json
@@ -2,6 +2,6 @@
   "domain": "onewire",
   "name": "1-Wire",
   "documentation": "https://www.home-assistant.io/integrations/onewire",
-  "requirements": ["pyownet==0.10.0.post1"],
-  "codeowners": ["@garbled1"]
+  "requirements": ["pyownet==0.10.0.post1", "pi1wire==0.1.0"],
+  "codeowners": ["@garbled1", "@epenet"]
 }
diff --git a/homeassistant/components/onewire/sensor.py b/homeassistant/components/onewire/sensor.py
index 2ac00c814b2..bce17dbf3cb 100644
--- a/homeassistant/components/onewire/sensor.py
+++ b/homeassistant/components/onewire/sensor.py
@@ -2,8 +2,8 @@
 from glob import glob
 import logging
 import os
-import time
 
+from pi1wire import InvalidCRCException, Pi1Wire, UnsupportResponseException
 from pyownet import protocol
 import voluptuous as vol
 
@@ -14,6 +14,7 @@ from homeassistant.const import (
     ELECTRICAL_CURRENT_AMPERE,
     LIGHT_LUX,
     PERCENTAGE,
+    PRESSURE_MBAR,
     TEMP_CELSIUS,
     VOLT,
 )
@@ -23,8 +24,12 @@ from homeassistant.helpers.entity import Entity
 from .const import (
     CONF_MOUNT_DIR,
     CONF_NAMES,
+    CONF_TYPE_OWFS,
+    CONF_TYPE_OWSERVER,
+    CONF_TYPE_SYSBUS,
     DEFAULT_OWSERVER_PORT,
     DEFAULT_SYSBUS_MOUNT_DIR,
+    PRESSURE_CBAR,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -54,6 +59,8 @@ DEVICE_SENSORS = {
     "EF": {"HobbyBoard": "special"},
 }
 
+DEVICE_SUPPORT_SYSBUS = ["10", "22", "28", "3B", "42"]
+
 # EF sensors are usually hobbyboards specialized sensors.
 # These can only be read by OWFS.  Currently this driver only supports them
 # via owserver (network protocol)
@@ -81,16 +88,16 @@ SENSOR_TYPES = {
     "humidity_hih5030": ["humidity", PERCENTAGE],
     "humidity_htm1735": ["humidity", PERCENTAGE],
     "humidity_raw": ["humidity", PERCENTAGE],
-    "pressure": ["pressure", "mb"],
+    "pressure": ["pressure", PRESSURE_MBAR],
     "illuminance": ["illuminance", LIGHT_LUX],
     "wetness_0": ["wetness", PERCENTAGE],
     "wetness_1": ["wetness", PERCENTAGE],
     "wetness_2": ["wetness", PERCENTAGE],
     "wetness_3": ["wetness", PERCENTAGE],
-    "moisture_0": ["moisture", "cb"],
-    "moisture_1": ["moisture", "cb"],
-    "moisture_2": ["moisture", "cb"],
-    "moisture_3": ["moisture", "cb"],
+    "moisture_0": ["moisture", PRESSURE_CBAR],
+    "moisture_1": ["moisture", PRESSURE_CBAR],
+    "moisture_2": ["moisture", PRESSURE_CBAR],
+    "moisture_3": ["moisture", PRESSURE_CBAR],
     "counter_a": ["counter", "count"],
     "counter_b": ["counter", "count"],
     "HobbyBoard": ["none", "none"],
@@ -120,18 +127,34 @@ def hb_info_from_type(dev_type="std"):
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up 1-Wire platform."""
-    base_dir = config[CONF_MOUNT_DIR]
-    owport = config[CONF_PORT]
-    owhost = config.get(CONF_HOST)
+    entities = get_entities(config)
+    add_entities(entities, True)
 
-    devs = []
+
+def get_entities(config):
+    """Get a list of entities."""
+    base_dir = config[CONF_MOUNT_DIR]
+    owhost = config.get(CONF_HOST)
+    owport = config[CONF_PORT]
+
+    # Ensure type is configured
+    if owhost:
+        conf_type = CONF_TYPE_OWSERVER
+    elif base_dir == DEFAULT_SYSBUS_MOUNT_DIR:
+        conf_type = CONF_TYPE_SYSBUS
+    else:  # pragma: no cover
+        # This part of the implementation does not conform to policy regarding 3rd-party libraries, and will not longer be updated.
+        # https://developers.home-assistant.io/docs/creating_platform_code_review/#5-communication-with-devicesservices
+        conf_type = CONF_TYPE_OWFS
+
+    entities = []
     device_names = {}
     if CONF_NAMES in config:
         if isinstance(config[CONF_NAMES], dict):
             device_names = config[CONF_NAMES]
 
     # We have an owserver on a remote(or local) host/port
-    if owhost:
+    if conf_type == CONF_TYPE_OWSERVER:
         _LOGGER.debug("Initializing using %s:%s", owhost, owport)
         try:
             owproxy = protocol.proxy(host=owhost, port=owport)
@@ -166,7 +189,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                         sensor_key = f"wetness_{s_id}"
                 sensor_id = os.path.split(os.path.split(device)[0])[1]
                 device_file = os.path.join(os.path.split(device)[0], sensor_value)
-                devs.append(
+                entities.append(
                     OneWireProxy(
                         device_names.get(sensor_id, sensor_id),
                         device_file,
@@ -176,23 +199,47 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                 )
 
     # We have a raw GPIO ow sensor on a Pi
-    elif base_dir == DEFAULT_SYSBUS_MOUNT_DIR:
-        _LOGGER.debug("Initializing using SysBus %s", base_dir)
-        for device_family in DEVICE_SENSORS:
-            for device_folder in glob(os.path.join(base_dir, f"{device_family}[.-]*")):
-                sensor_id = os.path.split(device_folder)[1]
-                device_file = os.path.join(device_folder, "w1_slave")
-                devs.append(
-                    OneWireDirect(
-                        device_names.get(sensor_id, sensor_id),
-                        device_file,
-                        "temperature",
-                    )
+    elif conf_type == CONF_TYPE_SYSBUS:
+        _LOGGER.debug("Initializing using SysBus")
+        for p1sensor in Pi1Wire().find_all_sensors():
+            family = p1sensor.mac_address[:2]
+            sensor_id = f"{family}-{p1sensor.mac_address[2:]}"
+            if family not in DEVICE_SUPPORT_SYSBUS:
+                _LOGGER.warning(
+                    "Ignoring unknown family (%s) of sensor found for device: %s",
+                    family,
+                    sensor_id,
                 )
+                continue
+
+            device_file = f"/sys/bus/w1/devices/{sensor_id}/w1_slave"
+            entities.append(
+                OneWireDirect(
+                    device_names.get(sensor_id, sensor_id),
+                    device_file,
+                    "temperature",
+                    p1sensor,
+                )
+            )
+        if not entities:
+            _LOGGER.error(
+                "No onewire sensor found. Check if dtoverlay=w1-gpio "
+                "is in your /boot/config.txt. "
+                "Check the mount_dir parameter if it's defined"
+            )
 
     # We have an owfs mounted
-    else:
+    else:  # pragma: no cover
+        # This part of the implementation does not conform to policy regarding 3rd-party libraries, and will not longer be updated.
+        # https://developers.home-assistant.io/docs/creating_platform_code_review/#5-communication-with-devicesservices
         _LOGGER.debug("Initializing using OWFS %s", base_dir)
+        _LOGGER.warning(
+            "The OWFS implementation of 1-Wire sensors is deprecated, "
+            "and should be migrated to OWServer (on localhost:4304). "
+            "If migration to OWServer is not feasible on your installation, "
+            "please raise an issue at https://github.com/home-assistant/core/issues/new"
+            "?title=Unable%20to%20migrate%20onewire%20from%20OWFS%20to%20OWServer",
+        )
         for family_file_path in glob(os.path.join(base_dir, "*", "family")):
             with open(family_file_path) as family_file:
                 family = family_file.read()
@@ -204,7 +251,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                     device_file = os.path.join(
                         os.path.split(family_file_path)[0], sensor_value
                     )
-                    devs.append(
+                    entities.append(
                         OneWireOWFS(
                             device_names.get(sensor_id, sensor_id),
                             device_file,
@@ -212,15 +259,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                         )
                     )
 
-    if devs == []:
-        _LOGGER.error(
-            "No onewire sensor found. Check if dtoverlay=w1-gpio "
-            "is in your /boot/config.txt. "
-            "Check the mount_dir parameter if it's defined"
-        )
-        return
-
-    add_entities(devs, True)
+    return entities
 
 
 class OneWire(Entity):
@@ -234,12 +273,6 @@ class OneWire(Entity):
         self._state = None
         self._value_raw = None
 
-    def _read_value_raw(self):
-        """Read the value as it is returned by the sensor."""
-        with open(self._device_file) as ds_device_file:
-            lines = ds_device_file.readlines()
-        return lines
-
     @property
     def name(self):
         """Return the name of the sensor."""
@@ -278,9 +311,7 @@ class OneWireProxy(OneWire):
 
     def _read_value_ownet(self):
         """Read a value from the owserver."""
-        if self._owproxy:
-            return self._owproxy.read(self._device_file).decode().lstrip()
-        return None
+        return self._owproxy.read(self._device_file).decode().lstrip()
 
     def update(self):
         """Get the latest data from the device."""
@@ -300,23 +331,38 @@ class OneWireProxy(OneWire):
 class OneWireDirect(OneWire):
     """Implementation of a 1-Wire sensor directly connected to RPI GPIO."""
 
+    def __init__(self, name, device_file, sensor_type, owsensor):
+        """Initialize the sensor."""
+        super().__init__(name, device_file, sensor_type)
+        self._owsensor = owsensor
+
     def update(self):
         """Get the latest data from the device."""
         value = None
-        lines = self._read_value_raw()
-        while lines[0].strip()[-3:] != "YES":
-            time.sleep(0.2)
-            lines = self._read_value_raw()
-        equals_pos = lines[1].find("t=")
-        if equals_pos != -1:
-            value_string = lines[1][equals_pos + 2 :]
-            value = round(float(value_string) / 1000.0, 1)
-            self._value_raw = float(value_string)
+        try:
+            self._value_raw = self._owsensor.get_temperature()
+            value = round(float(self._value_raw), 1)
+        except (
+            FileNotFoundError,
+            InvalidCRCException,
+            UnsupportResponseException,
+        ) as ex:
+            _LOGGER.warning("Cannot read from sensor %s: %s", self._device_file, ex)
         self._state = value
 
 
-class OneWireOWFS(OneWire):
-    """Implementation of a 1-Wire sensor through owfs."""
+class OneWireOWFS(OneWire):  # pragma: no cover
+    """Implementation of a 1-Wire sensor through owfs.
+
+    This part of the implementation does not conform to policy regarding 3rd-party libraries, and will not longer be updated.
+    https://developers.home-assistant.io/docs/creating_platform_code_review/#5-communication-with-devicesservices
+    """
+
+    def _read_value_raw(self):
+        """Read the value as it is returned by the sensor."""
+        with open(self._device_file) as ds_device_file:
+            lines = ds_device_file.readlines()
+        return lines
 
     def update(self):
         """Get the latest data from the device."""
diff --git a/homeassistant/components/onkyo/media_player.py b/homeassistant/components/onkyo/media_player.py
index 283c1468385..54df7735f10 100644
--- a/homeassistant/components/onkyo/media_player.py
+++ b/homeassistant/components/onkyo/media_player.py
@@ -83,7 +83,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
         ),
         vol.Optional(
             CONF_RECEIVER_MAX_VOLUME, default=DEFAULT_RECEIVER_MAX_VOLUME
-        ): vol.All(vol.Coerce(int), vol.Range(min=0)),
+        ): cv.positive_int,
         vol.Optional(CONF_SOURCES, default=DEFAULT_SOURCES): {cv.string: cv.string},
     }
 )
diff --git a/homeassistant/components/onvif/__init__.py b/homeassistant/components/onvif/__init__.py
index cf92f3df3ba..0a30173c7d7 100644
--- a/homeassistant/components/onvif/__init__.py
+++ b/homeassistant/components/onvif/__init__.py
@@ -1,9 +1,7 @@
 """The ONVIF integration."""
 import asyncio
 
-import requests
-from requests.auth import HTTPDigestAuth
-from urllib3.exceptions import ReadTimeoutError
+from onvif.exceptions import ONVIFAuthError, ONVIFError, ONVIFTimeoutError
 import voluptuous as vol
 
 from homeassistant.components.ffmpeg import CONF_EXTRA_ARGUMENTS
@@ -17,7 +15,6 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
     HTTP_BASIC_AUTHENTICATION,
     HTTP_DIGEST_AUTHENTICATION,
-    HTTP_UNAUTHORIZED,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -78,6 +75,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     device = ONVIFDevice(hass, entry)
 
     if not await device.async_setup():
+        await device.device.close()
         return False
 
     if not device.available:
@@ -90,7 +88,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
 
     platforms = ["camera"]
 
-    if device.capabilities.events and await device.events.async_start():
+    if device.capabilities.events:
         platforms += ["binary_sensor", "sensor"]
 
     for component in platforms:
@@ -123,37 +121,26 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
     )
 
 
-async def _get_snapshot_auth(hass, device, entry):
-    if not (device.username and device.password):
+async def _get_snapshot_auth(device):
+    """Determine auth type for snapshots."""
+    if not device.capabilities.snapshot or not (device.username and device.password):
         return HTTP_DIGEST_AUTHENTICATION
 
-    snapshot_uri = await device.async_get_snapshot_uri(device.profiles[0])
-    if not snapshot_uri:
-        return HTTP_DIGEST_AUTHENTICATION
-    auth = HTTPDigestAuth(device.username, device.password)
-
-    def _get():
-        # so we can handle keyword arguments
-        return requests.get(snapshot_uri, timeout=1, auth=auth)
-
     try:
-        response = await hass.async_add_executor_job(_get)
+        snapshot = await device.device.get_snapshot(device.profiles[0].token)
 
-        if response.status_code == HTTP_UNAUTHORIZED:
-            return HTTP_BASIC_AUTHENTICATION
-
-        return HTTP_DIGEST_AUTHENTICATION
-    except requests.exceptions.Timeout:
+        if snapshot:
+            return HTTP_DIGEST_AUTHENTICATION
         return HTTP_BASIC_AUTHENTICATION
-    except requests.exceptions.ConnectionError as error:
-        if isinstance(error.args[0], ReadTimeoutError):
-            return HTTP_BASIC_AUTHENTICATION
+    except (ONVIFAuthError, ONVIFTimeoutError):
+        return HTTP_BASIC_AUTHENTICATION
+    except ONVIFError:
         return HTTP_DIGEST_AUTHENTICATION
 
 
 async def async_populate_snapshot_auth(hass, device, entry):
     """Check if digest auth for snapshots is possible."""
-    auth = await _get_snapshot_auth(hass, device, entry)
+    auth = await _get_snapshot_auth(device)
     new_data = {**entry.data, CONF_SNAPSHOT_AUTH: auth}
     hass.config_entries.async_update_entry(entry, data=new_data)
 
diff --git a/homeassistant/components/onvif/camera.py b/homeassistant/components/onvif/camera.py
index 5c2f89adf32..d9378588b03 100644
--- a/homeassistant/components/onvif/camera.py
+++ b/homeassistant/components/onvif/camera.py
@@ -3,8 +3,7 @@ import asyncio
 
 from haffmpeg.camera import CameraMjpeg
 from haffmpeg.tools import IMAGE_JPEG, ImageFrame
-import requests
-from requests.auth import HTTPBasicAuth, HTTPDigestAuth
+from onvif.exceptions import ONVIFError
 import voluptuous as vol
 
 from homeassistant.components.camera import SUPPORT_STREAM, Camera
@@ -86,7 +85,6 @@ class ONVIFCameraEntity(ONVIFBaseEntity, Camera):
             == HTTP_BASIC_AUTHENTICATION
         )
         self._stream_uri = None
-        self._snapshot_uri = None
 
     @property
     def supported_features(self) -> int:
@@ -119,29 +117,16 @@ class ONVIFCameraEntity(ONVIFBaseEntity, Camera):
         image = None
 
         if self.device.capabilities.snapshot:
-            auth = None
-            if self.device.username and self.device.password:
-                if self._basic_auth:
-                    auth = HTTPBasicAuth(self.device.username, self.device.password)
-                else:
-                    auth = HTTPDigestAuth(self.device.username, self.device.password)
-
-            def fetch():
-                """Read image from a URL."""
-                try:
-                    response = requests.get(self._snapshot_uri, timeout=5, auth=auth)
-                    if response.status_code < 300:
-                        return response.content
-                except requests.exceptions.RequestException as error:
-                    LOGGER.error(
-                        "Fetch snapshot image failed from %s, falling back to FFmpeg; %s",
-                        self.device.name,
-                        error,
-                    )
-
-                return None
-
-            image = await self.hass.async_add_executor_job(fetch)
+            try:
+                image = await self.device.device.get_snapshot(
+                    self.profile.token, self._basic_auth
+                )
+            except ONVIFError as err:
+                LOGGER.error(
+                    "Fetch snapshot image failed from %s, falling back to FFmpeg; %s",
+                    self.device.name,
+                    err,
+                )
 
         if image is None:
             ffmpeg = ImageFrame(self.hass.data[DATA_FFMPEG].binary, loop=self.hass.loop)
@@ -187,9 +172,6 @@ class ONVIFCameraEntity(ONVIFBaseEntity, Camera):
             "rtsp://", f"rtsp://{self.device.username}:{self.device.password}@", 1
         )
 
-        if self.device.capabilities.snapshot:
-            self._snapshot_uri = await self.device.async_get_snapshot_uri(self.profile)
-
     async def async_perform_ptz(
         self,
         distance,
diff --git a/homeassistant/components/onvif/config_flow.py b/homeassistant/components/onvif/config_flow.py
index cbe6d03fa68..273640ab6b5 100644
--- a/homeassistant/components/onvif/config_flow.py
+++ b/homeassistant/components/onvif/config_flow.py
@@ -199,9 +199,8 @@ class OnvifFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             self.onvif_config[CONF_PASSWORD],
         )
 
-        await device.update_xaddrs()
-
         try:
+            await device.update_xaddrs()
             device_mgmt = device.create_devicemgmt_service()
 
             # Get the MAC address to use as the unique ID for the config flow
@@ -250,6 +249,8 @@ class OnvifFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             if not h264:
                 return self.async_abort(reason="no_h264")
 
+            await device.close()
+
             title = f"{self.onvif_config[CONF_NAME]} - {self.device_id}"
             return self.async_create_entry(title=title, data=self.onvif_config)
 
@@ -259,11 +260,13 @@ class OnvifFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                 self.onvif_config[CONF_NAME],
                 err,
             )
+            await device.close()
             return self.async_abort(reason="onvif_error")
 
         except Fault:
-            errors["base"] = "connection_failed"
+            errors["base"] = "cannot_connect"
 
+        await device.close()
         return self.async_show_form(step_id="auth", errors=errors)
 
     async def async_step_import(self, user_input):
diff --git a/homeassistant/components/onvif/device.py b/homeassistant/components/onvif/device.py
index 1dfa670114f..8ede2ab24cd 100644
--- a/homeassistant/components/onvif/device.py
+++ b/homeassistant/components/onvif/device.py
@@ -4,7 +4,7 @@ import datetime as dt
 import os
 from typing import List
 
-from aiohttp.client_exceptions import ClientConnectionError, ServerDisconnectedError
+from httpx import RequestError
 import onvif
 from onvif import ONVIFCamera
 from onvif.exceptions import ONVIFError
@@ -93,25 +93,31 @@ class ONVIFDevice:
         try:
             await self.device.update_xaddrs()
             await self.async_check_date_and_time()
+
+            # Create event manager
+            self.events = EventManager(
+                self.hass, self.device, self.config_entry.unique_id
+            )
+
+            # Fetch basic device info and capabilities
             self.info = await self.async_get_device_info()
             self.capabilities = await self.async_get_capabilities()
             self.profiles = await self.async_get_profiles()
 
+            # No camera profiles to add
+            if not self.profiles:
+                return False
+
             if self.capabilities.ptz:
                 self.device.create_ptz_service()
 
-            if self.capabilities.events:
-                self.events = EventManager(
-                    self.hass, self.device, self.config_entry.unique_id
-                )
-
             # Determine max resolution from profiles
             self.max_resolution = max(
                 profile.video.resolution.width
                 for profile in self.profiles
                 if profile.video.encoding == "H264"
             )
-        except ClientConnectionError as err:
+        except RequestError as err:
             LOGGER.warning(
                 "Couldn't connect to camera '%s', but will retry later. Error: %s",
                 self.name,
@@ -195,7 +201,7 @@ class ONVIFDevice:
                         cam_date_utc,
                         system_date,
                     )
-        except ServerDisconnectedError as err:
+        except RequestError as err:
             LOGGER.warning(
                 "Couldn't get device '%s' date/time. Error: %s", self.name, err
             )
@@ -237,14 +243,12 @@ class ONVIFDevice:
             media_service = self.device.create_media_service()
             media_capabilities = await media_service.GetServiceCapabilities()
             snapshot = media_capabilities and media_capabilities.SnapshotUri
-        except (ONVIFError, Fault, ServerDisconnectedError):
+        except (ONVIFError, Fault, RequestError):
             pass
 
         pullpoint = False
         try:
-            event_service = self.device.create_events_service()
-            event_capabilities = await event_service.GetServiceCapabilities()
-            pullpoint = event_capabilities and event_capabilities.WSPullPointSupport
+            pullpoint = await self.events.async_start()
         except (ONVIFError, Fault):
             pass
 
@@ -262,6 +266,10 @@ class ONVIFDevice:
         media_service = self.device.create_media_service()
         result = await media_service.GetProfiles()
         profiles = []
+
+        if not isinstance(result, list):
+            return profiles
+
         for key, onvif_profile in enumerate(result):
             # Only add H264 profiles
             if (
@@ -298,7 +306,7 @@ class ONVIFDevice:
                     ptz_service = self.device.create_ptz_service()
                     presets = await ptz_service.GetPresets(profile.token)
                     profile.ptz.presets = [preset.token for preset in presets if preset]
-                except (Fault, ServerDisconnectedError):
+                except (Fault, RequestError):
                     # It's OK if Presets aren't supported
                     profile.ptz.presets = []
 
@@ -306,17 +314,6 @@ class ONVIFDevice:
 
         return profiles
 
-    async def async_get_snapshot_uri(self, profile: Profile) -> str:
-        """Get the snapshot URI for a specified profile."""
-        if not self.capabilities.snapshot:
-            return None
-
-        media_service = self.device.create_media_service()
-        req = media_service.create_type("GetSnapshotUri")
-        req.ProfileToken = profile.token
-        result = await media_service.GetSnapshotUri(req)
-        return result.Uri
-
     async def async_get_stream_uri(self, profile: Profile) -> str:
         """Get the stream URI for a specified profile."""
         media_service = self.device.create_media_service()
@@ -382,7 +379,9 @@ class ONVIFDevice:
                 await asyncio.sleep(continuous_duration)
                 req = ptz_service.create_type("Stop")
                 req.ProfileToken = profile.token
-                await ptz_service.Stop({"ProfileToken": req.ProfileToken})
+                await ptz_service.Stop(
+                    {"ProfileToken": req.ProfileToken, "PanTilt": True, "Zoom": False}
+                )
             elif move_mode == RELATIVE_MOVE:
                 # Guard against unsupported operation
                 if not profile.ptz.relative:
diff --git a/homeassistant/components/onvif/event.py b/homeassistant/components/onvif/event.py
index 514e7594370..eb61cbb4b71 100644
--- a/homeassistant/components/onvif/event.py
+++ b/homeassistant/components/onvif/event.py
@@ -3,11 +3,7 @@ import asyncio
 import datetime as dt
 from typing import Callable, Dict, List, Optional, Set
 
-from aiohttp.client_exceptions import (
-    ClientConnectorError,
-    ClientOSError,
-    ServerDisconnectedError,
-)
+from httpx import RemoteProtocolError, TransportError
 from onvif import ONVIFCamera, ONVIFService
 from zeep.exceptions import Fault
 
@@ -21,11 +17,9 @@ from .parsers import PARSERS
 
 UNHANDLED_TOPICS = set()
 SUBSCRIPTION_ERRORS = (
-    ClientConnectorError,
-    ClientOSError,
     Fault,
-    ServerDisconnectedError,
     asyncio.TimeoutError,
+    TransportError,
 )
 
 
@@ -82,11 +76,13 @@ class EventManager:
         if await self.device.create_pullpoint_subscription():
             # Initialize events
             pullpoint = self.device.create_pullpoint_service()
-            await pullpoint.SetSynchronizationPoint()
-            req = pullpoint.create_type("PullMessages")
-            req.MessageLimit = 100
-            req.Timeout = dt.timedelta(seconds=5)
-            response = await pullpoint.PullMessages(req)
+            try:
+                await pullpoint.SetSynchronizationPoint()
+            except SUBSCRIPTION_ERRORS:
+                pass
+            response = await pullpoint.PullMessages(
+                {"MessageLimit": 100, "Timeout": dt.timedelta(seconds=5)}
+            )
 
             # Parse event initialization
             await self.async_parse_messages(response.NotificationMessage)
@@ -163,20 +159,23 @@ class EventManager:
         if self.hass.state == CoreState.running:
             try:
                 pullpoint = self.device.create_pullpoint_service()
-                req = pullpoint.create_type("PullMessages")
-                req.MessageLimit = 100
-                req.Timeout = dt.timedelta(seconds=60)
-                response = await pullpoint.PullMessages(req)
+                response = await pullpoint.PullMessages(
+                    {"MessageLimit": 100, "Timeout": dt.timedelta(seconds=60)}
+                )
 
                 # Renew subscription if less than two hours is left
                 if (
                     dt_util.as_utc(response.TerminationTime) - dt_util.utcnow()
                 ).total_seconds() < 7200:
                     await self.async_renew()
-            except SUBSCRIPTION_ERRORS:
+            except RemoteProtocolError:
+                # Likley a shutdown event, nothing to see here
+                return
+            except SUBSCRIPTION_ERRORS as err:
                 LOGGER.warning(
-                    "Failed to fetch ONVIF PullPoint subscription messages for '%s'",
+                    "Failed to fetch ONVIF PullPoint subscription messages for '%s': %s",
                     self.unique_id,
+                    err,
                 )
                 # Treat errors as if the camera restarted. Assume that the pullpoint
                 # subscription is no longer valid.
diff --git a/homeassistant/components/onvif/manifest.json b/homeassistant/components/onvif/manifest.json
index 5b12d1624b9..7329f629aff 100644
--- a/homeassistant/components/onvif/manifest.json
+++ b/homeassistant/components/onvif/manifest.json
@@ -3,9 +3,9 @@
   "name": "ONVIF",
   "documentation": "https://www.home-assistant.io/integrations/onvif",
   "requirements": [
-    "onvif-zeep-async==0.6.0",
+    "onvif-zeep-async==1.0.0",
     "WSDiscovery==2.0.0",
-    "zeep[async]==3.4.0"
+    "zeep[async]==4.0.0"
   ],
   "dependencies": ["ffmpeg"],
   "codeowners": ["@hunterjm"],
diff --git a/homeassistant/components/onvif/parsers.py b/homeassistant/components/onvif/parsers.py
index 438601106b5..cad2b3c8cab 100644
--- a/homeassistant/components/onvif/parsers.py
+++ b/homeassistant/components/onvif/parsers.py
@@ -214,6 +214,37 @@ async def async_parse_cell_motion_detector(uid: str, msg) -> Event:
         return None
 
 
+@PARSERS.register("tns1:RuleEngine/MotionRegionDetector/Motion")
+# pylint: disable=protected-access
+async def async_parse_motion_region_detector(uid: str, msg) -> Event:
+    """Handle parsing event message.
+
+    Topic: tns1:RuleEngine/MotionRegionDetector/Motion
+    """
+    try:
+        video_source = ""
+        video_analytics = ""
+        rule = ""
+        for source in msg.Message._value_1.Source.SimpleItem:
+            if source.Name == "VideoSourceConfigurationToken":
+                video_source = source.Value
+            if source.Name == "VideoAnalyticsConfigurationToken":
+                video_analytics = source.Value
+            if source.Name == "Rule":
+                rule = source.Value
+
+        return Event(
+            f"{uid}_{msg.Topic._value_1}_{video_source}_{video_analytics}_{rule}",
+            f"{rule} Motion Region Detection",
+            "binary_sensor",
+            "motion",
+            None,
+            msg.Message._value_1.Data.SimpleItem[0].Value == "true",
+        )
+    except (AttributeError, KeyError):
+        return None
+
+
 @PARSERS.register("tns1:RuleEngine/TamperDetector/Tamper")
 # pylint: disable=protected-access
 async def async_parse_tamper_detector(uid: str, msg) -> Event:
diff --git a/homeassistant/components/onvif/strings.json b/homeassistant/components/onvif/strings.json
index b6ae9b98d9a..dac8ef8647d 100644
--- a/homeassistant/components/onvif/strings.json
+++ b/homeassistant/components/onvif/strings.json
@@ -1,14 +1,14 @@
 {
   "config": {
     "abort": {
-      "already_configured": "ONVIF device is already configured.",
-      "already_in_progress": "Config flow for ONVIF device is already in progress.",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "onvif_error": "Error setting up ONVIF device.  Check logs for more information.",
       "no_h264": "There were no H264 streams available.  Check the profile configuration on your device.",
       "no_mac": "Could not configure unique ID for ONVIF device."
     },
     "error": {
-      "connection_failed": "Could not connect to ONVIF service with provided credentials."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "step": {
       "user": {
@@ -23,7 +23,7 @@
       },
       "manual_input": {
         "data": {
-          "name": "Name",
+          "name": "[%key:common::config_flow::data::name%]",
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]"
         },
diff --git a/homeassistant/components/onvif/translations/ca.json b/homeassistant/components/onvif/translations/ca.json
index a0362abbb8f..99701f4020b 100644
--- a/homeassistant/components/onvif/translations/ca.json
+++ b/homeassistant/components/onvif/translations/ca.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Dispositiu ONVIF ja configurat.",
-            "already_in_progress": "El flux de dades de configuraci\u00f3 pel dispositiu ONVIF ja est\u00e0 en curs.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
             "no_h264": "No s'han torbat fluxos (streams) H264 disponibles. Comporva la configuraci\u00f3 de perfil en el dispositiu.",
             "no_mac": "No s'ha pogut configurar un ID \u00fanic pel dispositiu ONVIF.",
             "onvif_error": "Error durant la configuraci\u00f3 del dispositiu ONVIF. Consulta els registres per a m\u00e9s informaci\u00f3."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_failed": "No s'ha pogut connectar al servei ONVIF amb les credencials proporcionades."
         },
         "step": {
diff --git a/homeassistant/components/onvif/translations/cs.json b/homeassistant/components/onvif/translations/cs.json
index 66d5e1f0093..4b26acdb786 100644
--- a/homeassistant/components/onvif/translations/cs.json
+++ b/homeassistant/components/onvif/translations/cs.json
@@ -1,12 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed ONVIF je ji\u017e nakonfigurov\u00e1no",
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
             "no_h264": "Nebyly k dispozici \u017e\u00e1dn\u00e9 H264 streamy. Zkontrolujte konfiguraci profilu v za\u0159\u00edzen\u00ed.",
             "no_mac": "Nelze nakonfigurovat jedine\u010dn\u00e9 ID pro za\u0159\u00edzen\u00ed ONVIF.",
             "onvif_error": "P\u0159i nastavov\u00e1n\u00ed za\u0159\u00edzen\u00ed ONVIF do\u0161lo k chyb\u011b. Dal\u0161\u00ed informace naleznete v protokolech."
         },
         "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "connection_failed": "Nelze se p\u0159ipojit ke slu\u017eb\u011b ONVIF s poskytnut\u00fdmi p\u0159ihla\u0161ovac\u00edmi \u00fadaji."
         },
         "step": {
@@ -32,8 +34,8 @@
             },
             "manual_input": {
                 "data": {
-                    "host": "Adresa za\u0159\u00edzen\u00ed",
-                    "name": "N\u00e1zev",
+                    "host": "Hostitel",
+                    "name": "Jm\u00e9no",
                     "port": "Port"
                 },
                 "title": "Konfigurovat za\u0159\u00edzen\u00ed ONVIF"
diff --git a/homeassistant/components/onvif/translations/en.json b/homeassistant/components/onvif/translations/en.json
index a20b1fcb7e4..e414d5a6d8d 100644
--- a/homeassistant/components/onvif/translations/en.json
+++ b/homeassistant/components/onvif/translations/en.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ONVIF device is already configured.",
-            "already_in_progress": "Config flow for ONVIF device is already in progress.",
+            "already_configured": "Device is already configured",
+            "already_in_progress": "Configuration flow is already in progress",
             "no_h264": "There were no H264 streams available.  Check the profile configuration on your device.",
             "no_mac": "Could not configure unique ID for ONVIF device.",
             "onvif_error": "Error setting up ONVIF device.  Check logs for more information."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_failed": "Could not connect to ONVIF service with provided credentials."
         },
         "step": {
diff --git a/homeassistant/components/onvif/translations/es.json b/homeassistant/components/onvif/translations/es.json
index af283fe038b..9cb854b5988 100644
--- a/homeassistant/components/onvif/translations/es.json
+++ b/homeassistant/components/onvif/translations/es.json
@@ -8,6 +8,7 @@
             "onvif_error": "Error de configuraci\u00f3n del dispositivo ONVIF.  Revise los registros para m\u00e1s informaci\u00f3n."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_failed": "No se pudo conectar al servicio ONVIF con las credenciales proporcionadas."
         },
         "step": {
diff --git a/homeassistant/components/onvif/translations/et.json b/homeassistant/components/onvif/translations/et.json
new file mode 100644
index 00000000000..2a9e9b23408
--- /dev/null
+++ b/homeassistant/components/onvif/translations/et.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "auth": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            },
+            "device": {
+                "data": {
+                    "host": "Vali avastatud ONVIF seade"
+                }
+            },
+            "manual_input": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/onvif/translations/it.json b/homeassistant/components/onvif/translations/it.json
index 374c65b99a1..2183945d680 100644
--- a/homeassistant/components/onvif/translations/it.json
+++ b/homeassistant/components/onvif/translations/it.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il dispositivo ONVIF \u00e8 gi\u00e0 configurato.",
-            "already_in_progress": "Il flusso di configurazione per il dispositivo ONVIF \u00e8 gi\u00e0 in corso.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
             "no_h264": "Non c'erano flussi H264 disponibili.  Controllare la configurazione del profilo sul dispositivo.",
             "no_mac": "Impossibile configurare l'ID univoco per il dispositivo ONVIF.",
             "onvif_error": "Errore durante la configurazione del dispositivo ONVIF.  Controllare i registri per ulteriori informazioni."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_failed": "Impossibile connettersi al servizio ONVIF con le credenziali fornite."
         },
         "step": {
diff --git a/homeassistant/components/onvif/translations/lb.json b/homeassistant/components/onvif/translations/lb.json
index 024a673c442..b13e6836384 100644
--- a/homeassistant/components/onvif/translations/lb.json
+++ b/homeassistant/components/onvif/translations/lb.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ONVIF Apparat ass scho konfigur\u00e9iert.",
-            "already_in_progress": "Konfiguratioun's Oflaf fir den ONVIF Apparat ass schonn am gaangen.",
+            "already_configured": "Apparat ass scho konfigur\u00e9iert.",
+            "already_in_progress": "Konfiguratioun's Oflaf ass schonn am gaangen.",
             "no_h264": "Keng H264 Streams disponibel. Iwwerpr\u00e9if Profil Konfiguratioun op dengem Apparat.",
             "no_mac": "Konnt keng eenzegarteg ID ariichte fir den ONVIF Apparat.",
             "onvif_error": "Feeler beim ariichten vum ONVIF Apparat. Kuck d'Logs fir m\u00e9i Informatiounen."
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_failed": "Konnt sech net mam ONVIF Service mat den ugebueden Umeldungsinformatiounen verbannen."
         },
         "step": {
diff --git a/homeassistant/components/onvif/translations/nl.json b/homeassistant/components/onvif/translations/nl.json
index 71ba0d115be..deb2ba42c5f 100644
--- a/homeassistant/components/onvif/translations/nl.json
+++ b/homeassistant/components/onvif/translations/nl.json
@@ -1,5 +1,11 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        },
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken"
+        },
         "step": {
             "auth": {
                 "data": {
diff --git a/homeassistant/components/onvif/translations/no.json b/homeassistant/components/onvif/translations/no.json
index 4f605a518d7..39ea140d836 100644
--- a/homeassistant/components/onvif/translations/no.json
+++ b/homeassistant/components/onvif/translations/no.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ONVIF-enheten er allerede konfigurert.",
-            "already_in_progress": "Konfigurasjonsflyt for ONVIF-enhet p\u00e5g\u00e5r allerede.",
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
             "no_h264": "Det var ingen H264-str\u00f8mmer tilgjengelig. Sjekk profilkonfigurasjonen p\u00e5 enheten din.",
             "no_mac": "Kunne ikke konfigurere unik ID for ONVIF-enhet.",
             "onvif_error": "Feil ved konfigurering av ONVIF-enhet. Sjekk logger for mer informasjon."
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_failed": "Kan ikke koble til ONVIF-tjenesten med angitt legitimasjon."
         },
         "step": {
@@ -35,7 +36,7 @@
                 "data": {
                     "host": "Vert",
                     "name": "Navn",
-                    "port": ""
+                    "port": "Port"
                 },
                 "title": "Konfigurere ONVIF-enhet"
             },
diff --git a/homeassistant/components/onvif/translations/pl.json b/homeassistant/components/onvif/translations/pl.json
index a2d25de2194..3baf940cbd6 100644
--- a/homeassistant/components/onvif/translations/pl.json
+++ b/homeassistant/components/onvif/translations/pl.json
@@ -2,13 +2,14 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "already_in_progress": "Proces konfiguracji dla urz\u0105dzenia ONVIF jest ju\u017c w toku.",
-            "no_h264": "Nie by\u0142o dost\u0119pnych \u017cadnych strumieni H264.  Sprawd\u017a konfiguracj\u0119 profilu w swoim urz\u0105dzeniu.",
-            "no_mac": "Nie mo\u017cna utworzy\u0107 unikalnego identyfikatora urz\u0105dzenia ONVIF.",
-            "onvif_error": "Wyst\u0105pi\u0142 b\u0142\u0105d podczas konfigurowania urz\u0105dzenia ONVIF.  Sprawd\u017a logi, aby uzyska\u0107 wi\u0119cej informacji."
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "no_h264": "Nie by\u0142o dost\u0119pnych \u017cadnych strumieni H264. Sprawd\u017a konfiguracj\u0119 profilu w swoim urz\u0105dzeniu.",
+            "no_mac": "Nie mo\u017cna utworzy\u0107 unikalnego identyfikatora urz\u0105dzenia ONVIF",
+            "onvif_error": "Wyst\u0105pi\u0142 b\u0142\u0105d podczas konfigurowania urz\u0105dzenia ONVIF. Sprawd\u017a logi, aby uzyska\u0107 wi\u0119cej informacji."
         },
         "error": {
-            "connection_failed": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z us\u0142ug\u0105 ONVIF z podanymi po\u015bwiadczeniami."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_failed": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z us\u0142ug\u0105 ONVIF z podanymi po\u015bwiadczeniami"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/onvif/translations/ru.json b/homeassistant/components/onvif/translations/ru.json
index 84ff1775080..7d6cd66f8cd 100644
--- a/homeassistant/components/onvif/translations/ru.json
+++ b/homeassistant/components/onvif/translations/ru.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
             "no_h264": "\u041d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u043f\u043e\u0442\u043e\u043a\u043e\u0432 H264. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0412\u0430\u0448\u0435\u043c \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435.",
             "no_mac": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0434\u043b\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430.",
             "onvif_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_failed": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u043b\u0443\u0436\u0431\u0435 ONVIF \u0441 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u043c\u0438 \u0443\u0447\u0435\u0442\u043d\u044b\u043c\u0438 \u0434\u0430\u043d\u043d\u044b\u043c\u0438."
         },
         "step": {
diff --git a/homeassistant/components/onvif/translations/zh-Hans.json b/homeassistant/components/onvif/translations/zh-Hans.json
index c5269fccbd2..b6ad5c30a77 100644
--- a/homeassistant/components/onvif/translations/zh-Hans.json
+++ b/homeassistant/components/onvif/translations/zh-Hans.json
@@ -1,4 +1,13 @@
 {
+    "config": {
+        "step": {
+            "auth": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    },
     "options": {
         "step": {
             "onvif_devices": {
diff --git a/homeassistant/components/onvif/translations/zh-Hant.json b/homeassistant/components/onvif/translations/zh-Hant.json
index 794cae79683..a5349f2148e 100644
--- a/homeassistant/components/onvif/translations/zh-Hant.json
+++ b/homeassistant/components/onvif/translations/zh-Hant.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "ONVIF \u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
-            "already_in_progress": "ONVIF \u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
             "no_h264": "\u8a72\u8a2d\u5099\u4e0d\u652f\u63f4 H264 \u4e32\u6d41\uff0c\u8acb\u6aa2\u67e5\u8a2d\u5099\u8a2d\u5b9a\u3002",
             "no_mac": "\u7121\u6cd5\u70ba ONVIF \u8a2d\u5099\u8a2d\u5b9a\u552f\u4e00 ID\u3002",
             "onvif_error": "\u8a2d\u5b9a ONVIF \u8a2d\u5099\u932f\u8aa4\uff0c\u8acb\u53c3\u95b1\u65e5\u8a8c\u4ee5\u7372\u5f97\u66f4\u8a73\u7d30\u8cc7\u8a0a\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_failed": "\u7121\u6cd5\u4ee5\u6240\u63d0\u4f9b\u7684\u6191\u8b49\u9023\u7dda\u81f3 ONVIF \u670d\u52d9\u3002"
         },
         "step": {
diff --git a/homeassistant/components/openalpr_local/image_processing.py b/homeassistant/components/openalpr_local/image_processing.py
index c7c96b05872..ee913070a11 100644
--- a/homeassistant/components/openalpr_local/image_processing.py
+++ b/homeassistant/components/openalpr_local/image_processing.py
@@ -1,7 +1,6 @@
 """Component that will help set the OpenALPR local for ALPR processing."""
 import asyncio
 import io
-import logging
 import re
 
 import voluptuous as vol
@@ -21,8 +20,6 @@ from homeassistant.core import callback, split_entity_id
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util.async_ import run_callback_threadsafe
 
-_LOGGER = logging.getLogger(__name__)
-
 RE_ALPR_PLATE = re.compile(r"^plate\d*:")
 RE_ALPR_RESULT = re.compile(r"- (\w*)\s*confidence: (\d*.\d*)")
 
@@ -104,9 +101,7 @@ class ImageProcessingAlprEntity(ImageProcessingEntity):
     @property
     def state_attributes(self):
         """Return device specific state attributes."""
-        attr = {ATTR_PLATES: self.plates, ATTR_VEHICLES: self.vehicles}
-
-        return attr
+        return {ATTR_PLATES: self.plates, ATTR_VEHICLES: self.vehicles}
 
     def process_plates(self, plates, vehicles):
         """Send event with new plates and store data."""
diff --git a/homeassistant/components/openerz/sensor.py b/homeassistant/components/openerz/sensor.py
index 6e72058b60b..9a5bf3a9813 100644
--- a/homeassistant/components/openerz/sensor.py
+++ b/homeassistant/components/openerz/sensor.py
@@ -1,6 +1,5 @@
 """Support for OpenERZ API for Zurich city waste disposal system."""
 from datetime import timedelta
-import logging
 
 from openerz_api.main import OpenERZConnector
 import voluptuous as vol
@@ -9,7 +8,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(hours=12)
 
 CONF_ZIP = "zip"
diff --git a/homeassistant/components/openhome/media_player.py b/homeassistant/components/openhome/media_player.py
index b4258a88347..f9dbd4272ba 100644
--- a/homeassistant/components/openhome/media_player.py
+++ b/homeassistant/components/openhome/media_player.py
@@ -187,11 +187,6 @@ class OpenhomeDevice(MediaPlayerEntity):
         """Flag of features commands that are supported."""
         return self._supported_features
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def unique_id(self):
         """Return a unique ID."""
diff --git a/homeassistant/components/opensky/sensor.py b/homeassistant/components/opensky/sensor.py
index d916d9f7f29..49edf8e7d0a 100644
--- a/homeassistant/components/opensky/sensor.py
+++ b/homeassistant/components/opensky/sensor.py
@@ -1,6 +1,5 @@
 """Sensor for the Open Sky Network."""
 from datetime import timedelta
-import logging
 
 import requests
 import voluptuous as vol
@@ -21,8 +20,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import distance as util_distance, location as util_location
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_ALTITUDE = "altitude"
 
 ATTR_CALLSIGN = "callsign"
diff --git a/homeassistant/components/opentherm_gw/strings.json b/homeassistant/components/opentherm_gw/strings.json
index eb074e608ca..332b97eb5ee 100644
--- a/homeassistant/components/opentherm_gw/strings.json
+++ b/homeassistant/components/opentherm_gw/strings.json
@@ -3,7 +3,11 @@
     "step": {
       "init": {
         "title": "OpenTherm Gateway",
-        "data": { "name": "Name", "device": "Path or URL", "id": "ID" }
+        "data": {
+          "name": "[%key:common::config_flow::data::name%]",
+          "device": "Path or URL",
+          "id": "ID"
+        }
       }
     },
     "error": {
diff --git a/homeassistant/components/opentherm_gw/translations/cs.json b/homeassistant/components/opentherm_gw/translations/cs.json
new file mode 100644
index 00000000000..09d03116635
--- /dev/null
+++ b/homeassistant/components/opentherm_gw/translations/cs.json
@@ -0,0 +1,31 @@
+{
+    "config": {
+        "error": {
+            "already_configured": "Br\u00e1na je ji\u017e nastavena",
+            "id_exists": "ID br\u00e1ny ji\u017e existuje",
+            "serial_error": "Chyba p\u0159i p\u0159ipojov\u00e1n\u00ed k za\u0159\u00edzen\u00ed",
+            "timeout": "\u010casov\u00fd limit p\u0159ipojen\u00ed vypr\u0161el"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "device": "Cesta nebo URL",
+                    "id": "ID",
+                    "name": "Jm\u00e9no"
+                },
+                "title": "Br\u00e1na OpenTherm"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "floor_temperature": "Teplota podlahy",
+                    "precision": "P\u0159esnost"
+                },
+                "description": "Mo\u017enosti br\u00e1ny OpenTherm"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/opentherm_gw/translations/et.json b/homeassistant/components/opentherm_gw/translations/et.json
new file mode 100644
index 00000000000..d20d1832961
--- /dev/null
+++ b/homeassistant/components/opentherm_gw/translations/et.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "already_configured": "L\u00fc\u00fcs on juba m\u00e4\u00e4ratud"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/opentherm_gw/translations/pl.json b/homeassistant/components/opentherm_gw/translations/pl.json
index 8eea281729a..dc14f383d41 100644
--- a/homeassistant/components/opentherm_gw/translations/pl.json
+++ b/homeassistant/components/opentherm_gw/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "error": {
-            "already_configured": "Bramka jest ju\u017c skonfigurowana.",
-            "id_exists": "Identyfikator bramki ju\u017c istnieje.",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "id_exists": "Identyfikator bramki ju\u017c istnieje",
             "serial_error": "B\u0142\u0105d po\u0142\u0105czenia z urz\u0105dzeniem",
-            "timeout": "Przekroczono limit czasu pr\u00f3by po\u0142\u0105czenia."
+            "timeout": "Przekroczono limit czasu pr\u00f3by po\u0142\u0105czenia"
         },
         "step": {
             "init": {
diff --git a/homeassistant/components/openuv/strings.json b/homeassistant/components/openuv/strings.json
index 0777b139cf9..d5dec9e0eed 100644
--- a/homeassistant/components/openuv/strings.json
+++ b/homeassistant/components/openuv/strings.json
@@ -6,8 +6,8 @@
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "elevation": "Elevation",
-          "latitude": "Latitude",
-          "longitude": "Longitude"
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]"
         }
       }
     },
@@ -16,7 +16,7 @@
       "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]"
     },
     "abort": {
-      "already_configured": "These coordinates are already registered."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]"
     }
   }
 }
diff --git a/homeassistant/components/openuv/translations/ca.json b/homeassistant/components/openuv/translations/ca.json
index 2bc06623cc2..f55303e5c09 100644
--- a/homeassistant/components/openuv/translations/ca.json
+++ b/homeassistant/components/openuv/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquestes coordenades ja estan registrades."
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada"
         },
         "error": {
             "identifier_exists": "Les coordenades ja estan registrades",
diff --git a/homeassistant/components/openuv/translations/cs.json b/homeassistant/components/openuv/translations/cs.json
index 4a4776dc82c..64344c79d02 100644
--- a/homeassistant/components/openuv/translations/cs.json
+++ b/homeassistant/components/openuv/translations/cs.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno"
+        },
         "error": {
             "identifier_exists": "Sou\u0159adnice jsou ji\u017e zaregistrovan\u00e9",
             "invalid_api_key": "Neplatn\u00fd kl\u00ed\u010d API"
@@ -7,7 +10,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "OpenUV API Kl\u00ed\u010d",
+                    "api_key": "Kl\u00ed\u010d API",
                     "elevation": "Nadmo\u0159sk\u00e1 v\u00fd\u0161ka",
                     "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
                     "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka"
diff --git a/homeassistant/components/openuv/translations/en.json b/homeassistant/components/openuv/translations/en.json
index 77bdae11e05..052f5ca304e 100644
--- a/homeassistant/components/openuv/translations/en.json
+++ b/homeassistant/components/openuv/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "These coordinates are already registered."
+            "already_configured": "Location is already configured"
         },
         "error": {
             "identifier_exists": "Coordinates already registered",
diff --git a/homeassistant/components/openuv/translations/et.json b/homeassistant/components/openuv/translations/et.json
index aae3ef835bb..9ea66935864 100644
--- a/homeassistant/components/openuv/translations/et.json
+++ b/homeassistant/components/openuv/translations/et.json
@@ -1,8 +1,17 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Asukoht on juba m\u00e4\u00e4ratud"
+        },
+        "error": {
+            "identifier_exists": "Koordinaadid on juba registreeritud",
+            "invalid_api_key": "Vigane API v\u00f5ti"
+        },
         "step": {
             "user": {
                 "data": {
+                    "api_key": "API v\u00f5ti",
+                    "elevation": "K\u00f5rgus merepinnast",
                     "latitude": "Laiuskraad",
                     "longitude": "Pikkuskraad"
                 }
diff --git a/homeassistant/components/openuv/translations/it.json b/homeassistant/components/openuv/translations/it.json
index e6113500fbe..4b957b23551 100644
--- a/homeassistant/components/openuv/translations/it.json
+++ b/homeassistant/components/openuv/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Queste coordinate sono gi\u00e0 registrate."
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata"
         },
         "error": {
             "identifier_exists": "Coordinate gi\u00e0 registrate",
@@ -13,7 +13,7 @@
                     "api_key": "Chiave API",
                     "elevation": "Altitudine",
                     "latitude": "Latitudine",
-                    "longitude": "Longitudine"
+                    "longitude": "Logitudine"
                 },
                 "title": "Inserisci i tuoi dati"
             }
diff --git a/homeassistant/components/openuv/translations/lb.json b/homeassistant/components/openuv/translations/lb.json
index b8916bbed9e..483a949f143 100644
--- a/homeassistant/components/openuv/translations/lb.json
+++ b/homeassistant/components/openuv/translations/lb.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "D\u00ebs Koordinate si scho registr\u00e9iert"
+            "already_configured": "Standuert ass scho konfigur\u00e9iert"
         },
         "error": {
             "identifier_exists": "Koordinate si scho\u00a0registr\u00e9iert",
diff --git a/homeassistant/components/openuv/translations/no.json b/homeassistant/components/openuv/translations/no.json
index 4b9f875a8b9..1ba3d83be77 100644
--- a/homeassistant/components/openuv/translations/no.json
+++ b/homeassistant/components/openuv/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Disse koordinatene er allerede registrert."
+            "already_configured": "Plasseringen er allerede konfigurert"
         },
         "error": {
             "identifier_exists": "Koordinatene er allerede registrert",
diff --git a/homeassistant/components/openuv/translations/pl.json b/homeassistant/components/openuv/translations/pl.json
index 28a43bd10d9..60469ab8f8b 100644
--- a/homeassistant/components/openuv/translations/pl.json
+++ b/homeassistant/components/openuv/translations/pl.json
@@ -1,7 +1,10 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
+        },
         "error": {
-            "identifier_exists": "Wsp\u00f3\u0142rz\u0119dne s\u0105 ju\u017c zarejestrowane.",
+            "identifier_exists": "Wsp\u00f3\u0142rz\u0119dne s\u0105 ju\u017c zarejestrowane",
             "invalid_api_key": "Nieprawid\u0142owy klucz API"
         },
         "step": {
diff --git a/homeassistant/components/openuv/translations/ru.json b/homeassistant/components/openuv/translations/ru.json
index 0e748093241..52f464b7a0d 100644
--- a/homeassistant/components/openuv/translations/ru.json
+++ b/homeassistant/components/openuv/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u044b \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
             "identifier_exists": "\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u044b \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u044b.",
diff --git a/homeassistant/components/openuv/translations/zh-Hant.json b/homeassistant/components/openuv/translations/zh-Hant.json
index e589915ee89..9a5867fe0c8 100644
--- a/homeassistant/components/openuv/translations/zh-Hant.json
+++ b/homeassistant/components/openuv/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64\u4e9b\u5ea7\u6a19\u5df2\u8a3b\u518a\u3002"
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
             "identifier_exists": "\u8a72\u5ea7\u6a19\u5df2\u8a3b\u518a",
diff --git a/homeassistant/components/openweathermap/abstract_owm_sensor.py b/homeassistant/components/openweathermap/abstract_owm_sensor.py
index 7378324b0a4..809d2c2e572 100644
--- a/homeassistant/components/openweathermap/abstract_owm_sensor.py
+++ b/homeassistant/components/openweathermap/abstract_owm_sensor.py
@@ -1,14 +1,10 @@
 """Abstraction form OWM sensors."""
-import logging
-
 from homeassistant.const import ATTR_ATTRIBUTION
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import ATTRIBUTION, SENSOR_DEVICE_CLASS, SENSOR_NAME, SENSOR_UNIT
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class AbstractOpenWeatherMapSensor(Entity):
     """Abstract class for an OpenWeatherMap sensor."""
diff --git a/homeassistant/components/openweathermap/config_flow.py b/homeassistant/components/openweathermap/config_flow.py
index 5f960e52ecf..f383a5cb123 100644
--- a/homeassistant/components/openweathermap/config_flow.py
+++ b/homeassistant/components/openweathermap/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow for OpenWeatherMap."""
-import logging
-
 from pyowm import OWM
 from pyowm.exceptions.api_call_error import APICallError
 from pyowm.exceptions.api_response_error import UnauthorizedError
@@ -38,8 +36,6 @@ SCHEMA = vol.Schema(
     }
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class OpenWeatherMapConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Config flow for OpenWeatherMap."""
@@ -69,11 +65,11 @@ class OpenWeatherMapConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                     self.hass, user_input[CONF_API_KEY]
                 )
                 if not api_online:
-                    errors["base"] = "auth"
+                    errors["base"] = "invalid_api_key"
             except UnauthorizedError:
-                errors["base"] = "auth"
+                errors["base"] = "invalid_api_key"
             except APICallError:
-                errors["base"] = "connection"
+                errors["base"] = "cannot_connect"
 
             if not errors:
                 return self.async_create_entry(
diff --git a/homeassistant/components/openweathermap/sensor.py b/homeassistant/components/openweathermap/sensor.py
index c6363107d45..3879d270b52 100644
--- a/homeassistant/components/openweathermap/sensor.py
+++ b/homeassistant/components/openweathermap/sensor.py
@@ -1,6 +1,4 @@
 """Support for the OpenWeatherMap (OWM) service."""
-import logging
-
 from .abstract_owm_sensor import AbstractOpenWeatherMapSensor
 from .const import (
     ATTR_API_THIS_DAY_FORECAST,
@@ -16,8 +14,6 @@ from .const import (
 from .forecast_update_coordinator import ForecastUpdateCoordinator
 from .weather_update_coordinator import WeatherUpdateCoordinator
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up OpenWeatherMap sensor entities based on a config entry."""
diff --git a/homeassistant/components/openweathermap/strings.json b/homeassistant/components/openweathermap/strings.json
index e068bb91964..4fb415522e7 100644
--- a/homeassistant/components/openweathermap/strings.json
+++ b/homeassistant/components/openweathermap/strings.json
@@ -1,19 +1,19 @@
 {
     "config": {
         "abort": {
-            "already_configured": "OpenWeatherMap integration for these coordinates is already configured."
+            "already_configured": "[%key:common::config_flow::abort::already_configured_location%]"
         },
         "error": {
-            "auth": "API key is not correct.",
-            "connection": "Can't connect to OWM API"
+            "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
+            "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "OpenWeatherMap API key",
+                    "api_key": "[%key:common::config_flow::data::api_key%]",
                     "language": "Language",
-                    "latitude": "Latitude",
-                    "longitude": "Longitude",
+                    "latitude": "[%key:common::config_flow::data::latitude%]",
+                    "longitude": "[%key:common::config_flow::data::longitude%]",
                     "mode": "Mode",
                     "name": "Name of the integration"
                 },
diff --git a/homeassistant/components/openweathermap/translations/ca.json b/homeassistant/components/openweathermap/translations/ca.json
index 240e378c0fa..9ec2b40e5d0 100644
--- a/homeassistant/components/openweathermap/translations/ca.json
+++ b/homeassistant/components/openweathermap/translations/ca.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La integraci\u00f3 OpenWeatherMap per a aquestes coordenades ja est\u00e0 configurada."
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada"
         },
         "error": {
             "auth": "La clau API no \u00e9s correcta.",
-            "connection": "No s'ha pogut connectar amb l'API d'OWM"
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "connection": "No s'ha pogut connectar amb l'API d'OWM",
+            "invalid_api_key": "Clau API inv\u00e0lida"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Clau API d'OpenWeatherMap",
+                    "api_key": "Clau API",
                     "language": "Idioma",
                     "latitude": "Latitud",
                     "longitude": "Longitud",
diff --git a/homeassistant/components/openweathermap/translations/cs.json b/homeassistant/components/openweathermap/translations/cs.json
index 4e18283006a..7bb48cbb4e5 100644
--- a/homeassistant/components/openweathermap/translations/cs.json
+++ b/homeassistant/components/openweathermap/translations/cs.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Integrace OpenWeatherMap pro tyto sou\u0159adnice je ji\u017e nakonfigurov\u00e1na."
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno"
         },
         "error": {
             "auth": "Kl\u00ed\u010d API nen\u00ed spr\u00e1vn\u00fd.",
-            "connection": "Nelze se p\u0159ipojit k OpenWeatherMap API"
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection": "Nelze se p\u0159ipojit k OpenWeatherMap API",
+            "invalid_api_key": "Neplatn\u00fd kl\u00ed\u010d API"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "API kl\u00ed\u010d OpenWeatherMap",
+                    "api_key": "Kl\u00ed\u010d API",
                     "language": "Jazyk",
                     "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
                     "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka",
diff --git a/homeassistant/components/openweathermap/translations/de.json b/homeassistant/components/openweathermap/translations/de.json
index 6582b2046b8..964fdbb9419 100644
--- a/homeassistant/components/openweathermap/translations/de.json
+++ b/homeassistant/components/openweathermap/translations/de.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "error": {
-            "auth": "Der API-Schl\u00fcssel ist nicht korrekt."
+            "auth": "Der API-Schl\u00fcssel ist nicht korrekt.",
+            "connection": "Es kann keine Verbindung zur OWM-API hergestellt werden"
         },
         "step": {
             "user": {
@@ -9,7 +10,8 @@
                     "language": "Sprache",
                     "latitude": "Breitengrad",
                     "longitude": "L\u00e4ngengrad",
-                    "mode": "Modus"
+                    "mode": "Modus",
+                    "name": "Name der Integration"
                 },
                 "title": "OpenWeatherMap"
             }
diff --git a/homeassistant/components/openweathermap/translations/el.json b/homeassistant/components/openweathermap/translations/el.json
index dd34c67ce42..bdd4c34a586 100644
--- a/homeassistant/components/openweathermap/translations/el.json
+++ b/homeassistant/components/openweathermap/translations/el.json
@@ -1,9 +1,33 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u0397 \u03b5\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7 OpenWeatherMap \u03b3\u03b9\u03b1 \u03b1\u03c5\u03c4\u03ad\u03c2 \u03c4\u03b9\u03c2 \u03c3\u03c5\u03bd\u03c4\u03b5\u03c4\u03b1\u03b3\u03bc\u03ad\u03bd\u03b5\u03c2 \u03ad\u03c7\u03b5\u03b9 \u03ae\u03b4\u03b7 \u03c1\u03c5\u03b8\u03bc\u03b9\u03c3\u03c4\u03b5\u03af."
+        },
+        "error": {
+            "auth": "\u03a4\u03bf \u03ba\u03bb\u03b5\u03b9\u03b4\u03af API \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03c3\u03c9\u03c3\u03c4\u03cc.",
+            "connection": "\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03c3\u03c4\u03bf OWM API"
+        },
         "step": {
             "user": {
                 "data": {
-                    "language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1"
+                    "api_key": "\u039a\u03bb\u03b5\u03b9\u03b4\u03af API OpenWeatherMap",
+                    "language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1",
+                    "latitude": "\u0393\u03b5\u03c9\u03b3\u03c1\u03b1\u03c6\u03b9\u03ba\u03cc \u03c0\u03bb\u03ac\u03c4\u03bf\u03c2",
+                    "longitude": "\u0393\u03b5\u03c9\u03b3\u03c1\u03b1\u03c6\u03b9\u03ba\u03cc \u03bc\u03ae\u03ba\u03bf\u03c2",
+                    "mode": "\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1",
+                    "name": "\u038c\u03bd\u03bf\u03bc\u03b1 \u03c4\u03b7\u03c2 \u03b5\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7\u03c2"
+                },
+                "description": "\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7 \u03c4\u03b7\u03c2 \u03b5\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7\u03c2 OpenWeatherMap. \u0393\u03b9\u03b1 \u03bd\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03c3\u03b5\u03c4\u03b5 \u03ba\u03bb\u03b5\u03b9\u03b4\u03af API, \u03bc\u03b5\u03c4\u03b1\u03b2\u03b5\u03af\u03c4\u03b5 \u03c3\u03c4\u03b7 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 https://openweathermap.org/appid",
+                "title": "OpenWeatherMap"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1",
+                    "mode": "\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1"
                 }
             }
         }
diff --git a/homeassistant/components/openweathermap/translations/en.json b/homeassistant/components/openweathermap/translations/en.json
index d42c4479711..1ff286e9a9f 100644
--- a/homeassistant/components/openweathermap/translations/en.json
+++ b/homeassistant/components/openweathermap/translations/en.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "OpenWeatherMap integration for these coordinates is already configured."
+            "already_configured": "Location is already configured"
         },
         "error": {
             "auth": "API key is not correct.",
-            "connection": "Can't connect to OWM API"
+            "cannot_connect": "Failed to connect",
+            "connection": "Can't connect to OWM API",
+            "invalid_api_key": "Invalid API key"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "OpenWeatherMap API key",
+                    "api_key": "API Key",
                     "language": "Language",
                     "latitude": "Latitude",
                     "longitude": "Longitude",
diff --git a/homeassistant/components/openweathermap/translations/es.json b/homeassistant/components/openweathermap/translations/es.json
index 7dbbd400360..318061a06a7 100644
--- a/homeassistant/components/openweathermap/translations/es.json
+++ b/homeassistant/components/openweathermap/translations/es.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La integraci\u00f3n de OpenWeatherMap para estas coordenadas ya est\u00e1 configurada."
+            "already_configured": "La ubicaci\u00f3n ya est\u00e1 configurada"
         },
         "error": {
             "auth": "La clave de API no es correcta.",
-            "connection": "No se puede conectar a la API de OWM"
+            "cannot_connect": "No se pudo conectar",
+            "connection": "No se puede conectar a la API de OWM",
+            "invalid_api_key": "Clave API no v\u00e1lida"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Clave de API de OpenWeatherMap",
+                    "api_key": "Clave API",
                     "language": "Idioma",
                     "latitude": "Latitud",
                     "longitude": "Longitud",
diff --git a/homeassistant/components/openweathermap/translations/et.json b/homeassistant/components/openweathermap/translations/et.json
index 3620f1a363e..6ae485f2350 100644
--- a/homeassistant/components/openweathermap/translations/et.json
+++ b/homeassistant/components/openweathermap/translations/et.json
@@ -5,7 +5,9 @@
         },
         "error": {
             "auth": "API v\u00f5ti on vale.",
-            "connection": "OWM API-ga ei saa \u00fchendust luua"
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection": "OWM API-ga ei saa \u00fchendust luua",
+            "invalid_api_key": "Vigane API v\u00f5ti"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/openweathermap/translations/fr.json b/homeassistant/components/openweathermap/translations/fr.json
index ab53d663f48..aaa7887c120 100644
--- a/homeassistant/components/openweathermap/translations/fr.json
+++ b/homeassistant/components/openweathermap/translations/fr.json
@@ -5,7 +5,9 @@
         },
         "error": {
             "auth": "La cl\u00e9 API n'est pas correcte.",
-            "connection": "Impossible de se connecter \u00e0 l'API OWM"
+            "cannot_connect": "\u00c9chec de connexion",
+            "connection": "Impossible de se connecter \u00e0 l'API OWM",
+            "invalid_api_key": "Cl\u00e9 API invalide"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/openweathermap/translations/it.json b/homeassistant/components/openweathermap/translations/it.json
index c53e88d9558..9c4abbadb5b 100644
--- a/homeassistant/components/openweathermap/translations/it.json
+++ b/homeassistant/components/openweathermap/translations/it.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'integrazione di OpenWeatherMap per queste coordinate \u00e8 gi\u00e0 configurata."
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata"
         },
         "error": {
             "auth": "La chiave API non \u00e8 corretta.",
-            "connection": "Impossibile connettersi all'API OWM"
+            "cannot_connect": "Impossibile connettersi",
+            "connection": "Impossibile connettersi all'API OWM",
+            "invalid_api_key": "Chiave API non valida"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Chiave API OpenWeatherMap",
+                    "api_key": "Chiave API",
                     "language": "Lingua",
                     "latitude": "Latitudine",
                     "longitude": "Logitudine",
diff --git a/homeassistant/components/openweathermap/translations/lb.json b/homeassistant/components/openweathermap/translations/lb.json
index 1bf8fb29988..ebc63815e0f 100644
--- a/homeassistant/components/openweathermap/translations/lb.json
+++ b/homeassistant/components/openweathermap/translations/lb.json
@@ -1,18 +1,21 @@
 {
     "config": {
         "error": {
-            "auth": "Api Schl\u00ebssel ass net korrekt."
+            "auth": "Api Schl\u00ebssel ass net korrekt.",
+            "cannot_connect": "Feeler beim verbannen",
+            "connection": "Kann sech net mat der OWM API verbannen."
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "OpenWeatherMap API Schl\u00ebssel",
+                    "api_key": "API Schl\u00ebssel",
                     "language": "Sproch",
                     "latitude": "Breedegrad",
                     "longitude": "L\u00e4ngegrad",
                     "mode": "Modus",
                     "name": "Numm vun der Integratioun"
                 },
+                "description": "OpenWeatherMap Integratioun ariichten. Fir een API Schl\u00ebssel z'erstelle g\u00e9i op https://openweathermap.org/appid",
                 "title": "OpenWeatherMap API Schl\u00ebssel"
             }
         }
diff --git a/homeassistant/components/openweathermap/translations/nl.json b/homeassistant/components/openweathermap/translations/nl.json
index fdff089bddb..8eea3e7c649 100644
--- a/homeassistant/components/openweathermap/translations/nl.json
+++ b/homeassistant/components/openweathermap/translations/nl.json
@@ -5,6 +5,7 @@
         },
         "error": {
             "auth": "API-sleutel is niet correct.",
+            "cannot_connect": "Kan geen verbinding maken",
             "connection": "Kan geen verbinding maken met OWM API"
         },
         "step": {
diff --git a/homeassistant/components/openweathermap/translations/no.json b/homeassistant/components/openweathermap/translations/no.json
index cda3666ff18..66bae75dd4b 100644
--- a/homeassistant/components/openweathermap/translations/no.json
+++ b/homeassistant/components/openweathermap/translations/no.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "OpenWeatherMap-integrasjon for disse koordinatene er allerede konfigurert."
+            "already_configured": "Plasseringen er allerede konfigurert"
         },
         "error": {
             "auth": "API-n\u00f8kkelen er ikke korrekt.",
-            "connection": "Kan ikke koble til OWM API"
+            "cannot_connect": "Tilkobling mislyktes",
+            "connection": "Kan ikke koble til OWM API",
+            "invalid_api_key": "Ugyldig API-n\u00f8kkel"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "OpenWeatherMap API-n\u00f8kkel",
+                    "api_key": "API-n\u00f8kkel",
                     "language": "Spr\u00e5k",
                     "latitude": "Breddegrad",
                     "longitude": "Lengdegrad",
diff --git a/homeassistant/components/openweathermap/translations/pl.json b/homeassistant/components/openweathermap/translations/pl.json
index 74e74422bd2..eabd8c7d1dd 100644
--- a/homeassistant/components/openweathermap/translations/pl.json
+++ b/homeassistant/components/openweathermap/translations/pl.json
@@ -1,19 +1,25 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
+        },
         "error": {
-            "auth": "Klucz API jest nieprawid\u0142owy.",
-            "connection": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z OWM"
+            "auth": "Nieprawid\u0142owy klucz API",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z API OWM",
+            "invalid_api_key": "Nieprawid\u0142owy klucz API"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Klucz API OpenWeatherMap",
+                    "api_key": "Klucz API",
                     "language": "J\u0119zyk",
                     "latitude": "Szeroko\u015b\u0107 geograficzna",
                     "longitude": "D\u0142ugo\u015b\u0107 geograficzna",
                     "mode": "Tryb",
                     "name": "Nazwa integracji"
                 },
+                "description": "Konfiguracja integracji OpenWeatherMap. Aby wygenerowa\u0107 klucz API, przejd\u017a do https://openweathermap.org/appid",
                 "title": "OpenWeatherMap"
             }
         }
diff --git a/homeassistant/components/openweathermap/translations/ru.json b/homeassistant/components/openweathermap/translations/ru.json
index a79e51f6053..c2e2fae5a2b 100644
--- a/homeassistant/components/openweathermap/translations/ru.json
+++ b/homeassistant/components/openweathermap/translations/ru.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u0418\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f OpenWeatherMap \u0441 \u0442\u0430\u043a\u0438\u043c\u0438 \u0436\u0435 \u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0430\u043c\u0438 \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
             "auth": "\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API.",
-            "connection": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a API OpenWeatherMap."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "connection": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a API OpenWeatherMap.",
+            "invalid_api_key": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 API."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/openweathermap/translations/zh-Hant.json b/homeassistant/components/openweathermap/translations/zh-Hant.json
index e1ed3c9f89d..60bc208400f 100644
--- a/homeassistant/components/openweathermap/translations/zh-Hant.json
+++ b/homeassistant/components/openweathermap/translations/zh-Hant.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64 OpenWeatherMap \u6574\u5408\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
             "auth": "API \u5bc6\u9470\u4e0d\u6b63\u78ba\u3002",
-            "connection": "\u7121\u6cd5\u9023\u7dda\u81f3 OWM API"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "connection": "\u7121\u6cd5\u9023\u7dda\u81f3 OWM API",
+            "invalid_api_key": "API \u5bc6\u9470\u7121\u6548"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "OpenWeatherMap API \u5bc6\u9470",
+                    "api_key": "API \u5bc6\u9470",
                     "language": "\u8a9e\u8a00",
                     "latitude": "\u7def\u5ea6",
                     "longitude": "\u7d93\u5ea6",
diff --git a/homeassistant/components/openweathermap/weather.py b/homeassistant/components/openweathermap/weather.py
index cde7eb96732..e1ec96e5d07 100644
--- a/homeassistant/components/openweathermap/weather.py
+++ b/homeassistant/components/openweathermap/weather.py
@@ -1,6 +1,4 @@
 """Support for the OpenWeatherMap (OWM) service."""
-import logging
-
 from homeassistant.components.weather import WeatherEntity
 from homeassistant.const import TEMP_CELSIUS
 
@@ -21,8 +19,6 @@ from .const import (
 from .forecast_update_coordinator import ForecastUpdateCoordinator
 from .weather_update_coordinator import WeatherUpdateCoordinator
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up OpenWeatherMap weather entity based on a config entry."""
diff --git a/homeassistant/components/opnsense/device_tracker.py b/homeassistant/components/opnsense/device_tracker.py
index c64e0b0679a..936872f7a86 100644
--- a/homeassistant/components/opnsense/device_tracker.py
+++ b/homeassistant/components/opnsense/device_tracker.py
@@ -1,11 +1,7 @@
 """Device tracker support for OPNSense routers."""
-import logging
-
 from homeassistant.components.device_tracker import DeviceScanner
 from homeassistant.components.opnsense import CONF_TRACKER_INTERFACE, OPNSENSE_DATA
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_get_scanner(hass, config, discovery_info=None):
     """Configure the OPNSense device_tracker."""
@@ -61,6 +57,6 @@ class OPNSenseDeviceScanner(DeviceScanner):
         if device not in self.last_results:
             return None
         mfg = self.last_results[device].get("manufacturer")
-        if mfg:
-            return {"manufacturer": mfg}
-        return {}
+        if not mfg:
+            return {}
+        return {"manufacturer": mfg}
diff --git a/homeassistant/components/orvibo/switch.py b/homeassistant/components/orvibo/switch.py
index fec30cdade7..a03d9fc5ff0 100644
--- a/homeassistant/components/orvibo/switch.py
+++ b/homeassistant/components/orvibo/switch.py
@@ -73,11 +73,6 @@ class S20Switch(SwitchEntity):
         self._state = False
         self._exc = S20Exception
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def name(self):
         """Return the name of the switch."""
diff --git a/homeassistant/components/otp/sensor.py b/homeassistant/components/otp/sensor.py
index df5f6af1695..9f23f5ae6fa 100644
--- a/homeassistant/components/otp/sensor.py
+++ b/homeassistant/components/otp/sensor.py
@@ -1,5 +1,4 @@
 """Support for One-Time Password (OTP)."""
-import logging
 import time
 
 import pyotp
@@ -11,8 +10,6 @@ from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "OTP Sensor"
 
 TIME_STEP = 30  # Default time step assumed by Google Authenticator
diff --git a/homeassistant/components/ovo_energy/config_flow.py b/homeassistant/components/ovo_energy/config_flow.py
index ac3e8371123..dfedf780592 100644
--- a/homeassistant/components/ovo_energy/config_flow.py
+++ b/homeassistant/components/ovo_energy/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow to configure the OVO Energy integration."""
-import logging
-
 import aiohttp
 from ovoenergy.ovoenergy import OVOEnergy
 import voluptuous as vol
@@ -11,8 +9,6 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 
 from .const import CONF_ACCOUNT_ID, DOMAIN  # pylint: disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 USER_SCHEMA = vol.Schema(
     {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
 )
@@ -34,7 +30,7 @@ class OVOEnergyFlowHandler(ConfigFlow, domain=DOMAIN):
                     user_input[CONF_USERNAME], user_input[CONF_PASSWORD]
                 )
             except aiohttp.ClientError:
-                errors["base"] = "connection_error"
+                errors["base"] = "cannot_connect"
             else:
                 if authenticated:
                     await self.async_set_unique_id(user_input[CONF_USERNAME])
@@ -49,7 +45,7 @@ class OVOEnergyFlowHandler(ConfigFlow, domain=DOMAIN):
                         },
                     )
 
-                errors["base"] = "authorization_error"
+                errors["base"] = "invalid_auth"
 
         return self.async_show_form(
             step_id="user", data_schema=USER_SCHEMA, errors=errors
diff --git a/homeassistant/components/ovo_energy/sensor.py b/homeassistant/components/ovo_energy/sensor.py
index c43b7ec8514..2a64fbe2d22 100644
--- a/homeassistant/components/ovo_energy/sensor.py
+++ b/homeassistant/components/ovo_energy/sensor.py
@@ -1,6 +1,5 @@
 """Support for OVO Energy sensors."""
 from datetime import timedelta
-import logging
 
 from ovoenergy import OVODailyUsage
 from ovoenergy.ovoenergy import OVOEnergy
@@ -12,8 +11,6 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from . import OVOEnergyDeviceEntity
 from .const import DATA_CLIENT, DATA_COORDINATOR, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 SCAN_INTERVAL = timedelta(seconds=300)
 PARALLEL_UPDATES = 4
 
diff --git a/homeassistant/components/ovo_energy/strings.json b/homeassistant/components/ovo_energy/strings.json
index 0132f3582b6..fac7c97bcbe 100644
--- a/homeassistant/components/ovo_energy/strings.json
+++ b/homeassistant/components/ovo_energy/strings.json
@@ -2,8 +2,8 @@
     "config": {
         "error": {
             "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-            "authorization_error": "Authorization error. Check your credentials.",
-            "connection_error": "[%key:common::config_flow::error::cannot_connect%]"
+            "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+            "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ovo_energy/translations/ca.json b/homeassistant/components/ovo_energy/translations/ca.json
index feb03a790f2..1cb306cf2d3 100644
--- a/homeassistant/components/ovo_energy/translations/ca.json
+++ b/homeassistant/components/ovo_energy/translations/ca.json
@@ -3,7 +3,9 @@
         "error": {
             "already_configured": "El compte ja ha estat configurat",
             "authorization_error": "Error d'autoritzaci\u00f3. Comprova les teves credencials.",
-            "connection_error": "Ha fallat la connexi\u00f3"
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "connection_error": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ovo_energy/translations/cs.json b/homeassistant/components/ovo_energy/translations/cs.json
new file mode 100644
index 00000000000..094bd102714
--- /dev/null
+++ b/homeassistant/components/ovo_energy/translations/cs.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "error": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "authorization_error": "Chyba autorizace. Zkontrolujte sv\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "description": "Nastavte p\u0159\u00edstup instanci OVO Energy ke spot\u0159eb\u011b energie.",
+                "title": "P\u0159idejte \u00fa\u010det OVO Energy"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ovo_energy/translations/en.json b/homeassistant/components/ovo_energy/translations/en.json
index fd1a0225867..d716d692d6a 100644
--- a/homeassistant/components/ovo_energy/translations/en.json
+++ b/homeassistant/components/ovo_energy/translations/en.json
@@ -3,7 +3,9 @@
         "error": {
             "already_configured": "Account is already configured",
             "authorization_error": "Authorization error. Check your credentials.",
-            "connection_error": "Failed to connect"
+            "cannot_connect": "Failed to connect",
+            "connection_error": "Failed to connect",
+            "invalid_auth": "Invalid authentication"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ovo_energy/translations/es.json b/homeassistant/components/ovo_energy/translations/es.json
index 2eb715d7113..3508e5131ec 100644
--- a/homeassistant/components/ovo_energy/translations/es.json
+++ b/homeassistant/components/ovo_energy/translations/es.json
@@ -3,7 +3,9 @@
         "error": {
             "already_configured": "La cuenta ya est\u00e1 configurada",
             "authorization_error": "Error de autorizaci\u00f3n. Comprueba tus credenciales.",
-            "connection_error": "No se ha podido conectar a OVO Energy."
+            "cannot_connect": "No se pudo conectar",
+            "connection_error": "No se ha podido conectar a OVO Energy.",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ovo_energy/translations/et.json b/homeassistant/components/ovo_energy/translations/et.json
new file mode 100644
index 00000000000..8bf44aef094
--- /dev/null
+++ b/homeassistant/components/ovo_energy/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "error": {
+            "already_configured": "Konto on juba seadistatud",
+            "cannot_connect": "\u00dchendus nurjus",
+            "connection_error": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "title": "Lisa OVO Energy konto"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ovo_energy/translations/it.json b/homeassistant/components/ovo_energy/translations/it.json
index 1e2ce3cd442..968ff79da43 100644
--- a/homeassistant/components/ovo_energy/translations/it.json
+++ b/homeassistant/components/ovo_energy/translations/it.json
@@ -3,6 +3,7 @@
         "error": {
             "already_configured": "L'account \u00e8 gi\u00e0 configurato",
             "authorization_error": "Errore di autorizzazione. Controlla le tue credenziali.",
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi"
         },
         "step": {
diff --git a/homeassistant/components/ovo_energy/translations/nl.json b/homeassistant/components/ovo_energy/translations/nl.json
index 4d00f0bfc74..a66b0083373 100644
--- a/homeassistant/components/ovo_energy/translations/nl.json
+++ b/homeassistant/components/ovo_energy/translations/nl.json
@@ -1,8 +1,12 @@
 {
     "config": {
+        "error": {
+            "already_configured": "Account is al geconfigureerd"
+        },
         "step": {
             "user": {
                 "data": {
+                    "password": "Wachtwoord",
                     "username": "Gebruikersnaam"
                 }
             }
diff --git a/homeassistant/components/ovo_energy/translations/no.json b/homeassistant/components/ovo_energy/translations/no.json
index fc61e40506c..4a5bce8f467 100644
--- a/homeassistant/components/ovo_energy/translations/no.json
+++ b/homeassistant/components/ovo_energy/translations/no.json
@@ -3,7 +3,9 @@
         "error": {
             "already_configured": "Kontoen er allerede konfigurert",
             "authorization_error": "Autoriseringsfeil. Sjekk legitimasjonsbeskrivelsen.",
-            "connection_error": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes",
+            "connection_error": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ovo_energy/translations/pl.json b/homeassistant/components/ovo_energy/translations/pl.json
index 7ab3219f18c..8fe24ae98f9 100644
--- a/homeassistant/components/ovo_energy/translations/pl.json
+++ b/homeassistant/components/ovo_energy/translations/pl.json
@@ -2,14 +2,19 @@
     "config": {
         "error": {
             "already_configured": "Konto jest ju\u017c skonfigurowane",
-            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+            "authorization_error": "B\u0142\u0105d autoryzacji. Sprawd\u017a swoje po\u015bwiadczenia.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie"
         },
         "step": {
             "user": {
                 "data": {
                     "password": "Has\u0142o",
                     "username": "Nazwa u\u017cytkownika"
-                }
+                },
+                "description": "Skonfiguruj instancj\u0119 OVO Energy, aby uzyska\u0107 dost\u0119p do swojego zu\u017cycia energii.",
+                "title": "Dodaj konto OVO Energy"
             }
         }
     }
diff --git a/homeassistant/components/ovo_energy/translations/ru.json b/homeassistant/components/ovo_energy/translations/ru.json
index 24e9cf1865a..5993f408e20 100644
--- a/homeassistant/components/ovo_energy/translations/ru.json
+++ b/homeassistant/components/ovo_energy/translations/ru.json
@@ -3,7 +3,9 @@
         "error": {
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "authorization_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.",
-            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ovo_energy/translations/zh-Hans.json b/homeassistant/components/ovo_energy/translations/zh-Hans.json
new file mode 100644
index 00000000000..a7477e8c370
--- /dev/null
+++ b/homeassistant/components/ovo_energy/translations/zh-Hans.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25",
+            "invalid_auth": "\u9a8c\u8bc1\u7801\u9519\u8bef"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ovo_energy/translations/zh-Hant.json b/homeassistant/components/ovo_energy/translations/zh-Hant.json
index 4aa84207cf8..91a6f9ab90e 100644
--- a/homeassistant/components/ovo_energy/translations/zh-Hant.json
+++ b/homeassistant/components/ovo_energy/translations/zh-Hant.json
@@ -3,7 +3,9 @@
         "error": {
             "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "authorization_error": "\u8a8d\u8b49\u932f\u8aa4\u3002\u8acb\u78ba\u8a8d\u6191\u8b49\u3002",
-            "connection_error": "\u9023\u7dda\u5931\u6557"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "connection_error": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/owntracks/config_flow.py b/homeassistant/components/owntracks/config_flow.py
index 0aba24217cc..f0838b510ec 100644
--- a/homeassistant/components/owntracks/config_flow.py
+++ b/homeassistant/components/owntracks/config_flow.py
@@ -19,7 +19,7 @@ class OwnTracksFlow(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_user(self, user_input=None):
         """Handle a user initiated set up flow to create OwnTracks webhook."""
         if self._async_current_entries():
-            return self.async_abort(reason="one_instance_allowed")
+            return self.async_abort(reason="single_instance_allowed")
 
         if user_input is None:
             return self.async_show_form(step_id="user")
@@ -52,7 +52,7 @@ class OwnTracksFlow(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_import(self, user_input):
         """Import a config flow from configuration."""
         if self._async_current_entries():
-            return self.async_abort(reason="one_instance_allowed")
+            return self.async_abort(reason="single_instance_allowed")
         webhook_id, _webhook_url, cloudhook = await self._get_webhook_id()
         secret = secrets.token_hex(16)
         return self.async_create_entry(
diff --git a/homeassistant/components/owntracks/device_tracker.py b/homeassistant/components/owntracks/device_tracker.py
index d4a5399a0ff..8a8fdc52fb1 100644
--- a/homeassistant/components/owntracks/device_tracker.py
+++ b/homeassistant/components/owntracks/device_tracker.py
@@ -1,6 +1,4 @@
 """Device tracker platform that adds support for OwnTracks over MQTT."""
-import logging
-
 from homeassistant.components.device_tracker.config_entry import TrackerEntity
 from homeassistant.components.device_tracker.const import (
     ATTR_SOURCE_TYPE,
@@ -19,8 +17,6 @@ from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import DOMAIN as OT_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up OwnTracks based off an entry."""
diff --git a/homeassistant/components/owntracks/strings.json b/homeassistant/components/owntracks/strings.json
index 12aba21be72..ddb700cc642 100644
--- a/homeassistant/components/owntracks/strings.json
+++ b/homeassistant/components/owntracks/strings.json
@@ -6,7 +6,9 @@
         "description": "Are you sure you want to set up OwnTracks?"
       }
     },
-    "abort": { "one_instance_allowed": "Only a single instance is necessary." },
+    "abort": {
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
+    },
     "create_entry": {
       "default": "\n\nOn Android, open [the OwnTracks app]({android_url}), go to preferences -> connection. Change the following settings:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `'<Your name>'`\n   - Device ID: `'<Your device name>'`\n\nOn iOS, open [the OwnTracks app]({ios_url}), tap (i) icon in top left -> settings. Change the following settings:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `'<Your name>'`\n\n{secret}\n\nSee [the documentation]({docs_url}) for more information."
     }
diff --git a/homeassistant/components/owntracks/translations/ca.json b/homeassistant/components/owntracks/translations/ca.json
index 6979bcb31a8..c7cf0bb457a 100644
--- a/homeassistant/components/owntracks/translations/ca.json
+++ b/homeassistant/components/owntracks/translations/ca.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "\n\nPer Android: obre [l'app d'OwnTracks]({android_url}), ves a prefer\u00e8ncies -> connexi\u00f3. Canvia els par\u00e0metres seguents:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `'<Your name>'`\n   - Device ID: `'<Your device name>'`\n\nPer iOS: obre [l'app d'OwnTracks]({ios_url}), clica l'icona (i) a dalt a l'esquerra -> configuraci\u00f3 (settings). Canvia els par\u00e0metres seg\u00fcents:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `'<Your name>'`\n\n{secret}\n\nConsulta [la documentaci\u00f3]({docs_url}) per a m\u00e9s informaci\u00f3."
diff --git a/homeassistant/components/owntracks/translations/cs.json b/homeassistant/components/owntracks/translations/cs.json
index 451ab397ea5..dcac60be3b1 100644
--- a/homeassistant/components/owntracks/translations/cs.json
+++ b/homeassistant/components/owntracks/translations/cs.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Povolena je pouze jedna instance."
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "create_entry": {
-            "default": "\n\n V syst\u00e9mu Android otev\u0159ete aplikaci [OwnTracks]({android_url}) a p\u0159ejd\u011bte na p\u0159edvolby - > p\u0159ipojen\u00ed. Zm\u011b\u0148te n\u00e1sleduj\u00edc\u00ed nastaven\u00ed: \n - Re\u017eim: Private HTTP \n - Hostitel: {webhook_url} \n - Identifikace: \n - U\u017eivatelsk\u00e9 jm\u00e9no: ` <Your name> ' \n - ID za\u0159\u00edzen\u00ed: ` <Your device name> ' \n\n V aplikaci iOS otev\u0159ete [aplikaci OwnTracks]({ios_url}), klepn\u011bte na ikonu (i) vlevo naho\u0159e - > nastaven\u00ed. Zm\u011b\u0148te n\u00e1sleduj\u00edc\u00ed nastaven\u00ed: \n - Re\u017eim: HTTP \n - URL: {webhook_url} \n - Zapn\u011bte ov\u011b\u0159ov\u00e1n\u00ed \n - ID u\u017eivatele: ` <Your name> ' \n\n {secret} \n \n V\u00edce informac\u00ed naleznete v [dokumentaci]({docs_url})."
+            "default": "\n\nV syst\u00e9mu Android otev\u0159ete aplikaci [OwnTracks]({android_url}) a p\u0159ejd\u011bte na P\u0159edvolby -> P\u0159ipojen\u00ed. Zm\u011b\u0148te n\u00e1sleduj\u00edc\u00ed nastaven\u00ed: \n - Re\u017eim: Soukrom\u00e9 HTTP \n - Hostitel: {webhook_url} \n - Identifikace: \n   - U\u017eivatelsk\u00e9 jm\u00e9no: ` <Your name> ' \n   - ID za\u0159\u00edzen\u00ed: ` <Your device name> ' \n\nV aplikaci iOS otev\u0159ete [aplikaci OwnTracks]({ios_url}), klepn\u011bte na ikonu (i) vlevo naho\u0159e - > Nastaven\u00ed. Zm\u011b\u0148te n\u00e1sleduj\u00edc\u00ed nastaven\u00ed: \n - Re\u017eim: HTTP \n - URL: {webhook_url} \n - Zapn\u011bte ov\u011b\u0159ov\u00e1n\u00ed \n - ID u\u017eivatele: ` <Your name> ' \n\n {secret} \n \n V\u00edce informac\u00ed naleznete v [dokumentaci]({docs_url})."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/owntracks/translations/el.json b/homeassistant/components/owntracks/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/owntracks/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/owntracks/translations/en.json b/homeassistant/components/owntracks/translations/en.json
index a1cf38a91a2..9090cea70f2 100644
--- a/homeassistant/components/owntracks/translations/en.json
+++ b/homeassistant/components/owntracks/translations/en.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "\n\nOn Android, open [the OwnTracks app]({android_url}), go to preferences -> connection. Change the following settings:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `'<Your name>'`\n   - Device ID: `'<Your device name>'`\n\nOn iOS, open [the OwnTracks app]({ios_url}), tap (i) icon in top left -> settings. Change the following settings:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `'<Your name>'`\n\n{secret}\n\nSee [the documentation]({docs_url}) for more information."
diff --git a/homeassistant/components/owntracks/translations/es.json b/homeassistant/components/owntracks/translations/es.json
index ce558a70cdd..08b6fb5ec10 100644
--- a/homeassistant/components/owntracks/translations/es.json
+++ b/homeassistant/components/owntracks/translations/es.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "Solo es necesaria una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "\n\nEn Android, abre [la aplicaci\u00f3n OwnTracks]({android_url}), ve a preferencias -> conexi\u00f3n. Cambia los siguientes ajustes:\n - Modo: HTTP privado\n - Host: {webhook_url}\n - Identificaci\u00f3n:\n   - Nombre de usuario: <Your name>\n   - ID de dispositivo: <Your device name>\n\nEn iOS, abre [la aplicaci\u00f3n OwnTracks] ({ios_url}), pulsa el icono (i) en la parte superior izquierda -> configuraci\u00f3n. Cambia los siguientes ajustes:\n - Modo: HTTP\n - URL: {webhook_url}\n - Activar la autenticaci\u00f3n\n - UserID: <Your name>\n\n{secret}\n\nConsulta [la documentaci\u00f3n]({docs_url}) para obtener m\u00e1s informaci\u00f3n."
diff --git a/homeassistant/components/owntracks/translations/et.json b/homeassistant/components/owntracks/translations/et.json
new file mode 100644
index 00000000000..e59e01bef78
--- /dev/null
+++ b/homeassistant/components/owntracks/translations/et.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Lubatud on ainult \u00fcks sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "create_entry": {
+            "default": "\n\nAva Android seadmes [rakendus OwnTracks] ( {android_url} ), mine eelistustele - > \u00fchendus. Muuda j\u00e4rgmisi seadeid:\n - Re\u017eiim: privaatne HTTP\n - Host: {webhook_url}\n - Identifitseerimine:\n - kasutajanimi: \" <Your name> \"\n - seadme ID: \" <Your device name> \"\n\n IOS-is ava rakendus [OwnTracks] ( {ios_url} ), puuduta vasakus \u00fclanurgas ikooni (i) - > seaded. Muuda j\u00e4rgmisi seadeid:\n - Re\u017eiim: HTTP\n - URL: {webhook_url}\n - L\u00fclitage autentimine sisse\n - UserID: \" <Your name> \" \"\n\n {secret}\n\n Lisateavet leiad [dokumentatsioonist] ( {docs_url} )."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid OwnTracks'i seadistada?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/owntracks/translations/fr.json b/homeassistant/components/owntracks/translations/fr.json
index 69f36504051..ba894ff43e7 100644
--- a/homeassistant/components/owntracks/translations/fr.json
+++ b/homeassistant/components/owntracks/translations/fr.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "\n\n Sous Android, ouvrez [l'application OwnTracks] ( {android_url} ), acc\u00e9dez \u00e0 Pr\u00e9f\u00e9rences - > Connexion. Modifiez les param\u00e8tres suivants: \n - Mode: HTTP priv\u00e9 \n - H\u00f4te: {webhook_url} \n - Identification: \n - Nom d'utilisateur: ` <Your name> ` \n - ID de p\u00e9riph\u00e9rique: ` <Your device name> ` \n\n Sur iOS, ouvrez [l'application OwnTracks] ( {ios_url} ), appuyez sur l'ic\u00f4ne (i) en haut \u00e0 gauche - > param\u00e8tres. Modifiez les param\u00e8tres suivants: \n - Mode: HTTP \n - URL: {webhook_url} \n - Activer l'authentification \n - ID utilisateur: ` <Your name> ` \n\n {secret} \n \n Voir [la documentation] ( {docs_url} ) pour plus d'informations."
diff --git a/homeassistant/components/owntracks/translations/it.json b/homeassistant/components/owntracks/translations/it.json
index a198bc33fda..60485d590b2 100644
--- a/homeassistant/components/owntracks/translations/it.json
+++ b/homeassistant/components/owntracks/translations/it.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "\u00c8 necessaria una sola istanza."
+            "one_instance_allowed": "\u00c8 necessaria una sola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "\n\nSu Android, apri l'[app OwnTracks]({android_url}), vai su preferenze -> connessione. Modifica le seguenti impostazioni: \n - Modalit\u00e0: HTTP privato \n - Host: {webhook_url} \n - Identificazione: \n   - Nome utente: `'<Your name>'` \n   - ID dispositivo: `'<Your device name>'`\n\nSu iOS, apri l'[app OwnTracks]({ios_url}), tocca l'icona (i) in alto a sinistra -> impostazioni. Modifica le seguenti impostazioni: \n - Modalit\u00e0: HTTP \n - URL: {webhook_url} \n - Attiva autenticazione \n - UserID: `'<Your name>'` \n\n {secret} \n \n Vedi [la documentazione]({docs_url}) per maggiori informazioni."
diff --git a/homeassistant/components/owntracks/translations/lb.json b/homeassistant/components/owntracks/translations/lb.json
index 4504ca6a74a..4c9cba9e6ca 100644
--- a/homeassistant/components/owntracks/translations/lb.json
+++ b/homeassistant/components/owntracks/translations/lb.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "\n\nOp Android, an [der OwnTracks App]({android_url}), g\u00e9i an Preferences -> Connection. \u00c4nnert folgend Astellungen:\n- Mode: Private HTTP\n- Host {webhool_url}\n- Identification:\n  - Username: `<Your name>`\n  - Device ID: `<Your device name>`\n\nOp IOS, an [der OwnTracks App]({ios_url}), klick op (i) Ikon uewen l\u00e9nks -> Settings. \u00c4nnert folgend Astellungen:\n- Mode: HTTP\n- URL: {webhool_url}\n- Turn on authentication:\n- UserID: `<Your name>`\n\n{secret}\n\nKuckt w.e.g. [Dokumentatioun]({docs_url}) fir m\u00e9i Informatiounen."
diff --git a/homeassistant/components/owntracks/translations/nl.json b/homeassistant/components/owntracks/translations/nl.json
index 00d2840e2f2..f239ef1558c 100644
--- a/homeassistant/components/owntracks/translations/nl.json
+++ b/homeassistant/components/owntracks/translations/nl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "\n\nOp Android, open [the OwnTracks app]({android_url}), ga naar 'preferences' -> 'connection'. Verander de volgende instellingen:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `<Your name>`\n   - Device ID: `<Your device name>`\n\nOp iOS, open [the OwnTracks app]({ios_url}), tik op het (i) icoon links boven -> 'settings'. Verander de volgende instellingen:\n - Mode: HTTP\n - URL: {webhook_url}\n - zet 'authentication' aan\n - UserID: `<Your name>`\n\n{secret}\n\nZie [the documentation]({docs_url}) voor meer informatie."
diff --git a/homeassistant/components/owntracks/translations/no.json b/homeassistant/components/owntracks/translations/no.json
index 594f6f923cb..4be99b4d371 100644
--- a/homeassistant/components/owntracks/translations/no.json
+++ b/homeassistant/components/owntracks/translations/no.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
             "default": "\n\nP\u00e5 Android, \u00e5pne [OwnTracks appen]({android_url}), g\u00e5 til Instillinger -> tilkobling. Endre f\u00f8lgende innstillinger: \n - Modus: Privat HTTP\n - Vert: {webhook_url}\n - Identificasjon:\n   - Brukernavn: '<Your name>'\n   - Enhets ID: '<Your device name>'\n\nP\u00e5 iOS, \u00e5pne [OwnTracks appen]({ios_url}), trykk p\u00e5 (i) ikonet \u00f8verst til venstre - > innstillinger. Endre f\u00f8lgende innstillinger: \n - Modus: HTTP\n - URL: {webhook_url}\n - Sl\u00e5 p\u00e5 autensiering\n - BrukerID: '<Your name>'\n\n{secret}\n \n Se [dokumentasjonen]({docs_url}) for mer informasjon."
diff --git a/homeassistant/components/owntracks/translations/pl.json b/homeassistant/components/owntracks/translations/pl.json
index 38d5891edd8..bc9be84b702 100644
--- a/homeassistant/components/owntracks/translations/pl.json
+++ b/homeassistant/components/owntracks/translations/pl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
             "default": "\n\nNa Androidzie, otw\u00f3rz [aplikacj\u0119 OwnTracks]({android_url}), id\u017a do: ustawienia -> po\u0142\u0105czenia. Zmie\u0144 nast\u0119puj\u0105ce ustawienia:\n - Tryb: Private HTTP\n - Host: {webhook_url}\n - Identyfikacja:\n   - Nazwa u\u017cytkownika: `<Your name>`\n   - ID urz\u0105dzenia: `<Your device name>`\n\nNa iOS, otw\u00f3rz [aplikacj\u0119 OwnTracks]({ios_url}), naci\u015bnij ikon\u0119 (i) w lewym g\u00f3rnym rogu -> ustawienia. Zmie\u0144 nast\u0119puj\u0105ce ustawienia:\n - Tryb: HTTP\n - URL: {webhook_url}\n - W\u0142\u0105cz uwierzytelnianie\n - ID u\u017cytkownika: `<Your name>`\n\n{secret}\n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
diff --git a/homeassistant/components/owntracks/translations/ru.json b/homeassistant/components/owntracks/translations/ru.json
index 816f2c86087..c04394820f9 100644
--- a/homeassistant/components/owntracks/translations/ru.json
+++ b/homeassistant/components/owntracks/translations/ru.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0415\u0441\u043b\u0438 \u0412\u0430\u0448\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u043d\u0430 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u0435 Android, \u043e\u0442\u043a\u0440\u043e\u0439\u0442\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 [OwnTracks]({android_url}), \u0437\u0430\u0442\u0435\u043c preferences -> connection. \u0418\u0437\u043c\u0435\u043d\u0438\u0442\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0442\u0430\u043a, \u043a\u0430\u043a \u0443\u043a\u0430\u0437\u0430\u043d\u043e \u043d\u0438\u0436\u0435:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `<Your name>`\n   - Device ID: `<Your device name>`\n\n\u0415\u0441\u043b\u0438 \u0412\u0430\u0448\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u043d\u0430 iOS, \u043e\u0442\u043a\u0440\u043e\u0439\u0442\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 [OwnTracks]({ios_url}), \u043d\u0430\u0436\u043c\u0438\u0442\u0435 \u043d\u0430 \u0437\u043d\u0430\u0447\u043e\u043a (i) \u0432 \u043b\u0435\u0432\u043e\u043c \u0432\u0435\u0440\u0445\u043d\u0435\u043c \u0443\u0433\u043b\u0443 -> settings. \u0418\u0437\u043c\u0435\u043d\u0438\u0442\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0442\u0430\u043a, \u043a\u0430\u043a \u0443\u043a\u0430\u0437\u0430\u043d\u043e \u043d\u0438\u0436\u0435:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `<Your name>`\n\n{secret}\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
diff --git a/homeassistant/components/owntracks/translations/zh-Hant.json b/homeassistant/components/owntracks/translations/zh-Hant.json
index d86a5376d07..4d9871ffae2 100644
--- a/homeassistant/components/owntracks/translations/zh-Hant.json
+++ b/homeassistant/components/owntracks/translations/zh-Hant.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\n\n\u65bc Android \u8a2d\u5099\uff0c\u6253\u958b [OwnTracks app]({android_url})\u3001\u9ede\u9078\u8a2d\u5b9a\uff08preferences\uff09 -> \u9023\u7dda\uff08connection\uff09\u3002\u8b8a\u66f4\u4ee5\u4e0b\u8a2d\u5b9a\uff1a\n - \u6a21\u5f0f\uff08Mode\uff09\uff1aPrivate HTTP\n - \u4e3b\u6a5f\u7aef\uff08Host\uff09\uff1a{webhook_url}\n - Identification\uff1a\n   - Username\uff1a `<Your name>`\n   - Device ID\uff1a`<Your device name>`\n\n\u65bc iOS \u8a2d\u5099\uff0c\u6253\u958b [OwnTracks app]({ios_url})\u3001\u9ede\u9078\u5de6\u4e0a\u65b9\u7684 (i) \u5716\u793a -> \u8a2d\u5b9a\uff08settings\uff09\u3002\u8b8a\u66f4\u4ee5\u4e0b\u8a2d\u5b9a\uff1a\n - \u6a21\u5f0f\uff08Mode\uff09\uff1aHTTP\n - URL: {webhook_url}\n - \u958b\u555f authentication\n - UserID: `<Your name>`\n\n{secret}\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
diff --git a/homeassistant/components/ozw/binary_sensor.py b/homeassistant/components/ozw/binary_sensor.py
index 64fd66394f8..91b26218c97 100644
--- a/homeassistant/components/ozw/binary_sensor.py
+++ b/homeassistant/components/ozw/binary_sensor.py
@@ -1,7 +1,4 @@
 """Representation of Z-Wave binary_sensors."""
-
-import logging
-
 from openzwavemqtt.const import CommandClass, ValueIndex, ValueType
 
 from homeassistant.components.binary_sensor import (
@@ -25,8 +22,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from .const import DATA_UNSUBSCRIBE, DOMAIN
 from .entity import ZWaveDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 NOTIFICATION_TYPE = "index"
 NOTIFICATION_VALUES = "values"
 NOTIFICATION_DEVICE_CLASS = "device_class"
diff --git a/homeassistant/components/ozw/config_flow.py b/homeassistant/components/ozw/config_flow.py
index 8822490132c..3153324322e 100644
--- a/homeassistant/components/ozw/config_flow.py
+++ b/homeassistant/components/ozw/config_flow.py
@@ -15,7 +15,7 @@ class DomainConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_user(self, user_input=None):
         """Handle the initial step."""
         if self._async_current_entries():
-            return self.async_abort(reason="one_instance_allowed")
+            return self.async_abort(reason="single_instance_allowed")
         if "mqtt" not in self.hass.config.components:
             return self.async_abort(reason="mqtt_required")
         if user_input is not None:
diff --git a/homeassistant/components/ozw/const.py b/homeassistant/components/ozw/const.py
index 5164bbbe044..8e5007a8419 100644
--- a/homeassistant/components/ozw/const.py
+++ b/homeassistant/components/ozw/const.py
@@ -40,6 +40,7 @@ ATTR_SCENE_VALUE_LABEL = "scene_value_label"
 # Service specific
 SERVICE_ADD_NODE = "add_node"
 SERVICE_REMOVE_NODE = "remove_node"
+SERVICE_CANCEL_COMMAND = "cancel_command"
 SERVICE_SET_CONFIG_PARAMETER = "set_config_parameter"
 
 # Home Assistant Events
diff --git a/homeassistant/components/ozw/cover.py b/homeassistant/components/ozw/cover.py
index 229df25abeb..0ac2da91e44 100644
--- a/homeassistant/components/ozw/cover.py
+++ b/homeassistant/components/ozw/cover.py
@@ -1,6 +1,4 @@
 """Support for Z-Wave cover devices."""
-import logging
-
 from openzwavemqtt.const import CommandClass
 
 from homeassistant.components.cover import (
@@ -18,9 +16,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from .const import DATA_UNSUBSCRIBE, DOMAIN
 from .entity import ZWaveDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
-
 SUPPORTED_FEATURES_POSITION = SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_SET_POSITION
 SUPPORT_GARAGE = SUPPORT_OPEN | SUPPORT_CLOSE
 VALUE_SELECTED_ID = "Selected_id"
diff --git a/homeassistant/components/ozw/lock.py b/homeassistant/components/ozw/lock.py
index 3797734dfeb..68acb3f9691 100644
--- a/homeassistant/components/ozw/lock.py
+++ b/homeassistant/components/ozw/lock.py
@@ -1,7 +1,9 @@
 """Representation of Z-Wave locks."""
 import logging
 
-from openzwavemqtt.const import CommandClass, ValueIndex
+from openzwavemqtt.const import ATTR_CODE_SLOT
+from openzwavemqtt.exceptions import BaseOZWError
+from openzwavemqtt.util.lock import clear_usercode, set_usercode
 import voluptuous as vol
 
 from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN, LockEntity
@@ -12,7 +14,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from .const import DATA_UNSUBSCRIBE, DOMAIN
 from .entity import ZWaveDeviceEntity
 
-ATTR_CODE_SLOT = "code_slot"
 ATTR_USERCODE = "usercode"
 
 SERVICE_SET_USERCODE = "set_usercode"
@@ -54,6 +55,17 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     )
 
 
+def _call_util_lock_function(function, *args):
+    """Call an openzwavemqtt.util.lock function and return success of call."""
+    try:
+        function(*args)
+    except BaseOZWError as err:
+        _LOGGER.error("%s: %s", type(err), err.args[0])
+        return False
+
+    return True
+
+
 class ZWaveLock(ZWaveDeviceEntity, LockEntity):
     """Representation of a Z-Wave lock."""
 
@@ -73,25 +85,15 @@ class ZWaveLock(ZWaveDeviceEntity, LockEntity):
     @callback
     def async_set_usercode(self, code_slot, usercode):
         """Set the usercode to index X on the lock."""
-        value = self.values.primary.node.get_value(CommandClass.USER_CODE, code_slot)
-
-        if len(str(usercode)) < 4:
-            _LOGGER.error(
-                "Invalid code provided: (%s) user code must be at least 4 digits",
-                usercode,
-            )
-            return
-        value.send_value(usercode)
-        _LOGGER.debug("User code at slot %s set", code_slot)
+        if _call_util_lock_function(
+            set_usercode, self.values.primary.node, code_slot, usercode
+        ):
+            _LOGGER.debug("User code at slot %s set", code_slot)
 
     @callback
     def async_clear_usercode(self, code_slot):
         """Clear usercode in slot X on the lock."""
-        value = self.values.primary.node.get_value(
-            CommandClass.USER_CODE, ValueIndex.CLEAR_USER_CODE
-        )
-
-        value.send_value(code_slot)
-        # Sending twice because the first time it doesn't take
-        value.send_value(code_slot)
-        _LOGGER.info("Usercode at slot %s is cleared", code_slot)
+        if _call_util_lock_function(
+            clear_usercode, self.values.primary.node, code_slot
+        ):
+            _LOGGER.info("Usercode at slot %s is cleared", code_slot)
diff --git a/homeassistant/components/ozw/manifest.json b/homeassistant/components/ozw/manifest.json
index 6fa4174da4a..6402f611c74 100644
--- a/homeassistant/components/ozw/manifest.json
+++ b/homeassistant/components/ozw/manifest.json
@@ -4,7 +4,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/ozw",
   "requirements": [
-    "python-openzwave-mqtt==1.0.5"
+    "python-openzwave-mqtt==1.2.2"
   ],
   "after_dependencies": [
     "mqtt"
diff --git a/homeassistant/components/ozw/services.py b/homeassistant/components/ozw/services.py
index 500289cec21..e1f71e636b3 100644
--- a/homeassistant/components/ozw/services.py
+++ b/homeassistant/components/ozw/services.py
@@ -1,7 +1,8 @@
 """Methods and classes related to executing Z-Wave commands and publishing these to hass."""
 import logging
 
-from openzwavemqtt.const import CommandClass, ValueType
+from openzwavemqtt.const import ATTR_LABEL, ATTR_POSITION, ATTR_VALUE
+from openzwavemqtt.util.node import get_node_from_manager, set_config_parameter
 import voluptuous as vol
 
 from homeassistant.core import callback
@@ -42,6 +43,14 @@ class ZWaveServices:
                 {vol.Optional(const.ATTR_INSTANCE_ID, default=1): vol.Coerce(int)}
             ),
         )
+        self._hass.services.async_register(
+            const.DOMAIN,
+            const.SERVICE_CANCEL_COMMAND,
+            self.async_cancel_command,
+            schema=vol.Schema(
+                {vol.Optional(const.ATTR_INSTANCE_ID, default=1): vol.Coerce(int)}
+            ),
+        )
 
         self._hass.services.async_register(
             const.DOMAIN,
@@ -53,7 +62,24 @@ class ZWaveServices:
                     vol.Required(const.ATTR_NODE_ID): vol.Coerce(int),
                     vol.Required(const.ATTR_CONFIG_PARAMETER): vol.Coerce(int),
                     vol.Required(const.ATTR_CONFIG_VALUE): vol.Any(
-                        vol.Coerce(int), cv.string
+                        vol.All(
+                            cv.ensure_list,
+                            [
+                                vol.All(
+                                    {
+                                        vol.Exclusive(ATTR_LABEL, "bit"): cv.string,
+                                        vol.Exclusive(ATTR_POSITION, "bit"): vol.Coerce(
+                                            int
+                                        ),
+                                        vol.Required(ATTR_VALUE): bool,
+                                    },
+                                    cv.has_at_least_one_key(ATTR_LABEL, ATTR_POSITION),
+                                )
+                            ],
+                        ),
+                        vol.Coerce(int),
+                        bool,
+                        cv.string,
                     ),
                 }
             ),
@@ -66,57 +92,12 @@ class ZWaveServices:
         node_id = service.data[const.ATTR_NODE_ID]
         param = service.data[const.ATTR_CONFIG_PARAMETER]
         selection = service.data[const.ATTR_CONFIG_VALUE]
-        payload = None
 
-        value = (
-            self._manager.get_instance(instance_id)
-            .get_node(node_id)
-            .get_value(CommandClass.CONFIGURATION, param)
-        )
+        # These function calls may raise an exception but that's ok because
+        # the exception will show in the UI to the user
+        node = get_node_from_manager(self._manager, instance_id, node_id)
+        payload = set_config_parameter(node, param, selection)
 
-        if value.type == ValueType.BOOL:
-            payload = selection == "True"
-
-        if value.type == ValueType.LIST:
-            # accept either string from the list value OR the int value
-            for selected in value.value["List"]:
-                if selection not in (selected["Label"], selected["Value"]):
-                    continue
-                payload = int(selected["Value"])
-
-            if payload is None:
-                _LOGGER.error(
-                    "Invalid value %s for parameter %s",
-                    selection,
-                    param,
-                )
-                return
-
-        if value.type == ValueType.BUTTON:
-            # Unsupported at this time
-            _LOGGER.info("Button type not supported yet")
-            return
-
-        if value.type == ValueType.STRING:
-            payload = selection
-
-        if (
-            value.type == ValueType.INT
-            or value.type == ValueType.BYTE
-            or value.type == ValueType.SHORT
-        ):
-            if selection > value.max or selection < value.min:
-                _LOGGER.error(
-                    "Value %s out of range for parameter %s (Min: %s Max: %s)",
-                    selection,
-                    param,
-                    value.min,
-                    value.max,
-                )
-                return
-            payload = int(selection)
-
-        value.send_value(payload)  # send the payload
         _LOGGER.info(
             "Setting configuration parameter %s on Node %s with value %s",
             param,
@@ -130,6 +111,8 @@ class ZWaveServices:
         instance_id = service.data[const.ATTR_INSTANCE_ID]
         secure = service.data[const.ATTR_SECURE]
         instance = self._manager.get_instance(instance_id)
+        if instance is None:
+            raise ValueError(f"No OpenZWave Instance with ID {instance_id}")
         instance.add_node(secure)
 
     @callback
@@ -137,4 +120,15 @@ class ZWaveServices:
         """Enter exclusion mode on the controller."""
         instance_id = service.data[const.ATTR_INSTANCE_ID]
         instance = self._manager.get_instance(instance_id)
+        if instance is None:
+            raise ValueError(f"No OpenZWave Instance with ID {instance_id}")
         instance.remove_node()
+
+    @callback
+    def async_cancel_command(self, service):
+        """Tell the controller to cancel an add or remove command."""
+        instance_id = service.data[const.ATTR_INSTANCE_ID]
+        instance = self._manager.get_instance(instance_id)
+        if instance is None:
+            raise ValueError(f"No OpenZWave Instance with ID {instance_id}")
+        instance.cancel_controller_command()
diff --git a/homeassistant/components/ozw/services.yaml b/homeassistant/components/ozw/services.yaml
index d7f5c540c67..641c086f524 100644
--- a/homeassistant/components/ozw/services.yaml
+++ b/homeassistant/components/ozw/services.yaml
@@ -13,6 +13,12 @@ remove_node:
     instance_id:
       description: (Optional) The OZW Instance/Controller to use, defaults to 1.
 
+cancel_command:
+  description: Cancel a pending add or remove node command.
+  fields:
+    instance_id:
+      description: (Optional) The OZW Instance/Controller to use, defaults to 1.
+
 set_config_parameter:
   description: Set a config parameter to a node on the Z-Wave network.
   fields:
diff --git a/homeassistant/components/ozw/strings.json b/homeassistant/components/ozw/strings.json
index dd2aad7e4ce..88f8911db0d 100644
--- a/homeassistant/components/ozw/strings.json
+++ b/homeassistant/components/ozw/strings.json
@@ -6,7 +6,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "The integration only supports one Z-Wave instance",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "mqtt_required": "The MQTT integration is not set up"
     }
   }
diff --git a/homeassistant/components/ozw/translations/ca.json b/homeassistant/components/ozw/translations/ca.json
index eba9a7e8757..3a1fdb29ba1 100644
--- a/homeassistant/components/ozw/translations/ca.json
+++ b/homeassistant/components/ozw/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "La integraci\u00f3 MQTT no est\u00e0 configurada",
-            "one_instance_allowed": "La integraci\u00f3 nom\u00e9s admet una inst\u00e0ncia Z-Wave"
+            "one_instance_allowed": "La integraci\u00f3 nom\u00e9s admet una inst\u00e0ncia Z-Wave",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/cs.json b/homeassistant/components/ozw/translations/cs.json
new file mode 100644
index 00000000000..fa169785628
--- /dev/null
+++ b/homeassistant/components/ozw/translations/cs.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "mqtt_required": "Integrace MQTT nen\u00ed nastavena",
+            "one_instance_allowed": "Integrace podporuje pouze jednu instanci Z-Wave",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "user": {
+                "title": "Potvr\u010fte nastaven\u00ed"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ozw/translations/el.json b/homeassistant/components/ozw/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/ozw/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ozw/translations/en.json b/homeassistant/components/ozw/translations/en.json
index c6a45474880..4e41ee58d11 100644
--- a/homeassistant/components/ozw/translations/en.json
+++ b/homeassistant/components/ozw/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "The MQTT integration is not set up",
-            "one_instance_allowed": "The integration only supports one Z-Wave instance"
+            "one_instance_allowed": "The integration only supports one Z-Wave instance",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/es.json b/homeassistant/components/ozw/translations/es.json
index f78b62828cb..2f76c540105 100644
--- a/homeassistant/components/ozw/translations/es.json
+++ b/homeassistant/components/ozw/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "La integraci\u00f3n de MQTT no est\u00e1 configurada",
-            "one_instance_allowed": "La integraci\u00f3n solo admite una instancia de Z-Wave"
+            "one_instance_allowed": "La integraci\u00f3n solo admite una instancia de Z-Wave",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/et.json b/homeassistant/components/ozw/translations/et.json
index a167a4edd31..16196205aec 100644
--- a/homeassistant/components/ozw/translations/et.json
+++ b/homeassistant/components/ozw/translations/et.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "mqtt_required": "MQTT sidumine pole seadistatud"
+            "mqtt_required": "MQTT sidumine pole seadistatud",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/ozw/translations/fr.json b/homeassistant/components/ozw/translations/fr.json
index dbc609b93eb..0c6c1e82da5 100644
--- a/homeassistant/components/ozw/translations/fr.json
+++ b/homeassistant/components/ozw/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "L'int\u00e9gration MQTT n'est pas configur\u00e9e",
-            "one_instance_allowed": "L'int\u00e9gration ne prend en charge qu'une seule instance Z-Wave"
+            "one_instance_allowed": "L'int\u00e9gration ne prend en charge qu'une seule instance Z-Wave",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/it.json b/homeassistant/components/ozw/translations/it.json
index 0b76d09cf08..f97be82b374 100644
--- a/homeassistant/components/ozw/translations/it.json
+++ b/homeassistant/components/ozw/translations/it.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "L'integrazione MQTT non \u00e8 impostata",
-            "one_instance_allowed": "L'integrazione supporta solo un'istanza Z-Wave"
+            "one_instance_allowed": "L'integrazione supporta solo un'istanza Z-Wave",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/lb.json b/homeassistant/components/ozw/translations/lb.json
index 053fe631133..9b2a5e577c2 100644
--- a/homeassistant/components/ozw/translations/lb.json
+++ b/homeassistant/components/ozw/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "MQTT Integratioun ass net ageriicht",
-            "one_instance_allowed": "D'Integratioun \u00ebnnerst\u00ebtzt n\u00ebmmen 1 Z-Wave Instanz"
+            "one_instance_allowed": "D'Integratioun \u00ebnnerst\u00ebtzt n\u00ebmmen 1 Z-Wave Instanz",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/nl.json b/homeassistant/components/ozw/translations/nl.json
index e11b1ba1146..19119b9d9e2 100644
--- a/homeassistant/components/ozw/translations/nl.json
+++ b/homeassistant/components/ozw/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "De [%%] integratie is niet ingesteld",
-            "one_instance_allowed": "De integratie ondersteunt, maar \u00e9\u00e9n Z-Wave-exemplaar"
+            "one_instance_allowed": "De integratie ondersteunt, maar \u00e9\u00e9n Z-Wave-exemplaar",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/no.json b/homeassistant/components/ozw/translations/no.json
index 1d4049978f5..c046b4b4ed2 100644
--- a/homeassistant/components/ozw/translations/no.json
+++ b/homeassistant/components/ozw/translations/no.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "MQTT-integrasjonen er ikke satt opp",
-            "one_instance_allowed": "Integrasjonen st\u00f8tter bare \u00e9n Z-Wave-forekomst"
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/pl.json b/homeassistant/components/ozw/translations/pl.json
index 3d57c3908a0..21cdbbc0faf 100644
--- a/homeassistant/components/ozw/translations/pl.json
+++ b/homeassistant/components/ozw/translations/pl.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "mqtt_required": "Integracja MQTT nie jest skonfigurowana.",
-            "one_instance_allowed": "Integracja obs\u0142uguje tylko jedn\u0105 instancj\u0119 Z-Wave."
+            "mqtt_required": "Integracja MQTT nie jest skonfigurowana",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/ru.json b/homeassistant/components/ozw/translations/ru.json
index ac968e9fdfa..71f21f9eb17 100644
--- a/homeassistant/components/ozw/translations/ru.json
+++ b/homeassistant/components/ozw/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "\u0418\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f MQTT \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430.",
-            "one_instance_allowed": "\u0418\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440 Z-Wave."
+            "one_instance_allowed": "\u0418\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440 Z-Wave.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/zh-Hans.json b/homeassistant/components/ozw/translations/zh-Hans.json
index e4beac109fd..a3b0a71d63c 100644
--- a/homeassistant/components/ozw/translations/zh-Hans.json
+++ b/homeassistant/components/ozw/translations/zh-Hans.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "mqtt_required": "\u672a\u8bbe\u7f6e MQTT \u96c6\u6210"
+            "mqtt_required": "\u672a\u8bbe\u7f6e MQTT \u96c6\u6210",
+            "one_instance_allowed": "\u7ec4\u4ef6\u53ea\u652f\u6301\u4e00\u4e2a Z-Wave \u5b9e\u4f8b"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/translations/zh-Hant.json b/homeassistant/components/ozw/translations/zh-Hant.json
index e9ad87042d2..d9967bddae1 100644
--- a/homeassistant/components/ozw/translations/zh-Hant.json
+++ b/homeassistant/components/ozw/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "mqtt_required": "MQTT \u6574\u5408\u5c1a\u672a\u8a2d\u5b9a",
-            "one_instance_allowed": "\u6574\u5408\u50c5\u652f\u63f4\u4e00\u7d44 Z-Wave \u5be6\u4f8b"
+            "one_instance_allowed": "\u6574\u5408\u50c5\u652f\u63f4\u4e00\u7d44 Z-Wave \u5be6\u4f8b",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ozw/websocket_api.py b/homeassistant/components/ozw/websocket_api.py
index da9c2b1f598..482d78bb878 100644
--- a/homeassistant/components/ozw/websocket_api.py
+++ b/homeassistant/components/ozw/websocket_api.py
@@ -1,21 +1,34 @@
 """Web socket API for OpenZWave."""
-
-import logging
-
-from openzwavemqtt.const import EVENT_NODE_ADDED, EVENT_NODE_CHANGED
+from openzwavemqtt.const import (
+    ATTR_CODE_SLOT,
+    ATTR_LABEL,
+    ATTR_POSITION,
+    ATTR_VALUE,
+    EVENT_NODE_ADDED,
+    EVENT_NODE_CHANGED,
+)
+from openzwavemqtt.exceptions import NotFoundError, NotSupportedError
+from openzwavemqtt.util.lock import clear_usercode, get_code_slots, set_usercode
+from openzwavemqtt.util.node import (
+    get_config_parameters,
+    get_node_from_manager,
+    set_config_parameter,
+)
 import voluptuous as vol
 
 from homeassistant.components import websocket_api
 from homeassistant.core import callback
+from homeassistant.helpers import config_validation as cv
 
-from .const import DOMAIN, MANAGER, OPTIONS
-
-_LOGGER = logging.getLogger(__name__)
+from .const import ATTR_CONFIG_PARAMETER, ATTR_CONFIG_VALUE, DOMAIN, MANAGER, OPTIONS
+from .lock import ATTR_USERCODE
 
 TYPE = "type"
 ID = "id"
 OZW_INSTANCE = "ozw_instance"
 NODE_ID = "node_id"
+PARAMETER = ATTR_CONFIG_PARAMETER
+VALUE = ATTR_CONFIG_VALUE
 
 ATTR_NODE_QUERY_STAGE = "node_query_stage"
 ATTR_IS_ZWAVE_PLUS = "is_zwave_plus"
@@ -45,6 +58,52 @@ def async_register_api(hass):
     websocket_api.async_register_command(hass, websocket_node_status)
     websocket_api.async_register_command(hass, websocket_node_statistics)
     websocket_api.async_register_command(hass, websocket_refresh_node_info)
+    websocket_api.async_register_command(hass, websocket_get_config_parameters)
+    websocket_api.async_register_command(hass, websocket_set_config_parameter)
+    websocket_api.async_register_command(hass, websocket_set_usercode)
+    websocket_api.async_register_command(hass, websocket_clear_usercode)
+    websocket_api.async_register_command(hass, websocket_get_code_slots)
+
+
+def _call_util_function(hass, connection, msg, send_result, function, *args):
+    """Call an openzwavemqtt.util function."""
+    try:
+        node = get_node_from_manager(
+            hass.data[DOMAIN][MANAGER], msg[OZW_INSTANCE], msg[NODE_ID]
+        )
+    except NotFoundError as err:
+        connection.send_error(
+            msg[ID],
+            websocket_api.const.ERR_NOT_FOUND,
+            err.args[0],
+        )
+        return
+
+    try:
+        payload = function(node, *args)
+    except NotFoundError as err:
+        connection.send_error(
+            msg[ID],
+            websocket_api.const.ERR_NOT_FOUND,
+            err.args[0],
+        )
+        return
+    except NotSupportedError as err:
+        connection.send_error(
+            msg[ID],
+            websocket_api.const.ERR_NOT_SUPPORTED,
+            err.args[0],
+        )
+        return
+
+    if send_result:
+        connection.send_result(
+            msg[ID],
+            payload,
+        )
+        return
+
+    connection.send_result(msg[ID])
 
 
 @websocket_api.websocket_command({vol.Required(TYPE): "ozw/get_instances"})
@@ -102,6 +161,94 @@ def websocket_get_nodes(hass, connection, msg):
     )
 
 
+@websocket_api.websocket_command(
+    {
+        vol.Required(TYPE): "ozw/set_usercode",
+        vol.Required(NODE_ID): vol.Coerce(int),
+        vol.Optional(OZW_INSTANCE, default=1): vol.Coerce(int),
+        vol.Required(ATTR_CODE_SLOT): vol.Coerce(int),
+        vol.Required(ATTR_USERCODE): cv.string,
+    }
+)
+def websocket_set_usercode(hass, connection, msg):
+    """Set a usercode to a node code slot."""
+    _call_util_function(
+        hass, connection, msg, False, set_usercode, msg[ATTR_CODE_SLOT], ATTR_USERCODE
+    )
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required(TYPE): "ozw/clear_usercode",
+        vol.Required(NODE_ID): vol.Coerce(int),
+        vol.Optional(OZW_INSTANCE, default=1): vol.Coerce(int),
+        vol.Required(ATTR_CODE_SLOT): vol.Coerce(int),
+    }
+)
+def websocket_clear_usercode(hass, connection, msg):
+    """Clear a node code slot."""
+    _call_util_function(
+        hass, connection, msg, False, clear_usercode, msg[ATTR_CODE_SLOT]
+    )
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required(TYPE): "ozw/get_code_slots",
+        vol.Required(NODE_ID): vol.Coerce(int),
+        vol.Optional(OZW_INSTANCE, default=1): vol.Coerce(int),
+    }
+)
+def websocket_get_code_slots(hass, connection, msg):
+    """Get status of node's code slots."""
+    _call_util_function(hass, connection, msg, True, get_code_slots)
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required(TYPE): "ozw/get_config_parameters",
+        vol.Required(NODE_ID): vol.Coerce(int),
+        vol.Optional(OZW_INSTANCE, default=1): vol.Coerce(int),
+    }
+)
+def websocket_get_config_parameters(hass, connection, msg):
+    """Get a list of configuration parameters for an OZW node instance."""
+    _call_util_function(hass, connection, msg, True, get_config_parameters)
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required(TYPE): "ozw/set_config_parameter",
+        vol.Required(NODE_ID): vol.Coerce(int),
+        vol.Optional(OZW_INSTANCE, default=1): vol.Coerce(int),
+        vol.Required(PARAMETER): vol.Coerce(int),
+        vol.Required(VALUE): vol.Any(
+            vol.All(
+                cv.ensure_list,
+                [
+                    vol.All(
+                        {
+                            vol.Exclusive(ATTR_LABEL, "bit"): cv.string,
+                            vol.Exclusive(ATTR_POSITION, "bit"): vol.Coerce(int),
+                            vol.Required(ATTR_VALUE): bool,
+                        },
+                        cv.has_at_least_one_key(ATTR_LABEL, ATTR_POSITION),
+                    )
+                ],
+            ),
+            vol.Coerce(int),
+            bool,
+            cv.string,
+        ),
+    }
+)
+def websocket_set_config_parameter(hass, connection, msg):
+    """Set a config parameter to a node."""
+    _call_util_function(
+        hass, connection, msg, False, set_config_parameter, msg[PARAMETER], msg[VALUE]
+    )
+
+
 @websocket_api.websocket_command(
     {
         vol.Required(TYPE): "ozw/network_status",
@@ -148,14 +295,15 @@ def websocket_network_statistics(hass, connection, msg):
 )
 def websocket_node_status(hass, connection, msg):
     """Get the status for a Z-Wave node."""
-    manager = hass.data[DOMAIN][MANAGER]
-    node = manager.get_instance(msg[OZW_INSTANCE]).get_node(msg[NODE_ID])
-
-    if not node:
-        connection.send_message(
-            websocket_api.error_message(
-                msg[ID], websocket_api.const.ERR_NOT_FOUND, "OZW Node not found"
-            )
+    try:
+        node = get_node_from_manager(
+            hass.data[DOMAIN][MANAGER], msg[OZW_INSTANCE], msg[NODE_ID]
+        )
+    except NotFoundError as err:
+        connection.send_error(
+            msg[ID],
+            websocket_api.const.ERR_NOT_FOUND,
+            err.args[0],
         )
         return
 
@@ -192,14 +340,15 @@ def websocket_node_status(hass, connection, msg):
 )
 def websocket_node_metadata(hass, connection, msg):
     """Get the metadata for a Z-Wave node."""
-    manager = hass.data[DOMAIN][MANAGER]
-    node = manager.get_instance(msg[OZW_INSTANCE]).get_node(msg[NODE_ID])
-
-    if not node:
-        connection.send_message(
-            websocket_api.error_message(
-                msg[ID], websocket_api.const.ERR_NOT_FOUND, "OZW Node not found"
-            )
+    try:
+        node = get_node_from_manager(
+            hass.data[DOMAIN][MANAGER], msg[OZW_INSTANCE], msg[NODE_ID]
+        )
+    except NotFoundError as err:
+        connection.send_error(
+            msg[ID],
+            websocket_api.const.ERR_NOT_FOUND,
+            err.args[0],
         )
         return
 
diff --git a/homeassistant/components/panasonic_bluray/media_player.py b/homeassistant/components/panasonic_bluray/media_player.py
index ddbd9f6670b..792ee644bd9 100644
--- a/homeassistant/components/panasonic_bluray/media_player.py
+++ b/homeassistant/components/panasonic_bluray/media_player.py
@@ -1,6 +1,5 @@
 """Support for Panasonic Blu-ray players."""
 from datetime import timedelta
-import logging
 
 from panacotta import PanasonicBD
 import voluptuous as vol
@@ -23,8 +22,6 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util.dt import utcnow
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Panasonic Blu-Ray"
 
 SCAN_INTERVAL = timedelta(seconds=30)
diff --git a/homeassistant/components/panasonic_viera/__init__.py b/homeassistant/components/panasonic_viera/__init__.py
index 2095c5cc209..f51c6d9d372 100644
--- a/homeassistant/components/panasonic_viera/__init__.py
+++ b/homeassistant/components/panasonic_viera/__init__.py
@@ -14,7 +14,9 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.script import Script
 
 from .const import (
+    ATTR_DEVICE_INFO,
     ATTR_REMOTE,
+    ATTR_UDN,
     CONF_APP_ID,
     CONF_ENCRYPTION_KEY,
     CONF_ON_ACTION,
@@ -86,6 +88,22 @@ async def async_setup_entry(hass, config_entry):
 
     panasonic_viera_data[config_entry.entry_id] = {ATTR_REMOTE: remote}
 
+    # Add device_info to older config entries
+    if ATTR_DEVICE_INFO not in config or config[ATTR_DEVICE_INFO] is None:
+        device_info = await remote.async_get_device_info()
+        unique_id = config_entry.unique_id
+        if device_info is None:
+            _LOGGER.error(
+                "Couldn't gather device info. Please restart Home Assistant with your TV turned on and connected to your network."
+            )
+        else:
+            unique_id = device_info[ATTR_UDN]
+        hass.config_entries.async_update_entry(
+            config_entry,
+            unique_id=unique_id,
+            data={**config, ATTR_DEVICE_INFO: device_info},
+        )
+
     for component in PLATFORMS:
         hass.async_create_task(
             hass.config_entries.async_forward_entry_setup(config_entry, component)
@@ -223,6 +241,14 @@ class Remote:
         _LOGGER.debug("Play media: %s (%s)", media_id, media_type)
         await self._handle_errors(self._control.open_webpage, media_id)
 
+    async def async_get_device_info(self):
+        """Return device info."""
+        if self._control is None:
+            return None
+        device_info = await self._handle_errors(self._control.get_device_info)
+        _LOGGER.debug("Fetched device info: %s", str(device_info))
+        return device_info
+
     async def _handle_errors(self, func, *args):
         """Handle errors from func, set available and reconnect if needed."""
         try:
@@ -234,6 +260,7 @@ class Remote:
         except (TimeoutError, URLError, SOAPError, OSError):
             self.state = STATE_OFF
             self.available = self._on_action is not None
+            await self.async_create_remote_control()
         except Exception as err:  # pylint: disable=broad-except
             _LOGGER.exception("An unknown error occurred: %s", err)
             self.state = STATE_OFF
diff --git a/homeassistant/components/panasonic_viera/config_flow.py b/homeassistant/components/panasonic_viera/config_flow.py
index d08e293eb45..b39d3a1d3c8 100644
--- a/homeassistant/components/panasonic_viera/config_flow.py
+++ b/homeassistant/components/panasonic_viera/config_flow.py
@@ -10,6 +10,9 @@ from homeassistant import config_entries
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PIN, CONF_PORT
 
 from .const import (  # pylint: disable=unused-import
+    ATTR_DEVICE_INFO,
+    ATTR_FRIENDLY_NAME,
+    ATTR_UDN,
     CONF_APP_ID,
     CONF_ENCRYPTION_KEY,
     CONF_ON_ACTION,
@@ -17,9 +20,6 @@ from .const import (  # pylint: disable=unused-import
     DEFAULT_PORT,
     DOMAIN,
     ERROR_INVALID_PIN_CODE,
-    ERROR_NOT_CONNECTED,
-    REASON_NOT_CONNECTED,
-    REASON_UNKNOWN,
 )
 
 _LOGGER = logging.getLogger(__name__)
@@ -38,6 +38,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             CONF_NAME: None,
             CONF_PORT: None,
             CONF_ON_ACTION: None,
+            ATTR_DEVICE_INFO: None,
         }
 
         self._remote = None
@@ -52,14 +53,26 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 self._remote = await self.hass.async_add_executor_job(
                     partial(RemoteControl, self._data[CONF_HOST], self._data[CONF_PORT])
                 )
+
+                self._data[ATTR_DEVICE_INFO] = await self.hass.async_add_executor_job(
+                    self._remote.get_device_info
+                )
             except (TimeoutError, URLError, SOAPError, OSError) as err:
                 _LOGGER.error("Could not establish remote connection: %s", err)
-                errors["base"] = ERROR_NOT_CONNECTED
+                errors["base"] = "cannot_connect"
             except Exception as err:  # pylint: disable=broad-except
                 _LOGGER.exception("An unknown error occurred: %s", err)
-                return self.async_abort(reason=REASON_UNKNOWN)
+                return self.async_abort(reason="unknown")
 
             if "base" not in errors:
+                await self.async_set_unique_id(self._data[ATTR_DEVICE_INFO][ATTR_UDN])
+                self._abort_if_unique_id_configured()
+
+                if self._data[CONF_NAME] == DEFAULT_NAME:
+                    self._data[CONF_NAME] = self._data[ATTR_DEVICE_INFO][
+                        ATTR_FRIENDLY_NAME
+                    ].replace("_", " ")
+
                 if self._remote.type == TV_TYPE_ENCRYPTED:
                     return await self.async_step_pairing()
 
@@ -104,10 +117,10 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 errors["base"] = ERROR_INVALID_PIN_CODE
             except (TimeoutError, URLError, OSError) as err:
                 _LOGGER.error("The remote connection was lost: %s", err)
-                return self.async_abort(reason=REASON_NOT_CONNECTED)
+                return self.async_abort(reason="cannot_connect")
             except Exception as err:  # pylint: disable=broad-except
                 _LOGGER.exception("Unknown error: %s", err)
-                return self.async_abort(reason=REASON_UNKNOWN)
+                return self.async_abort(reason="unknown")
 
             if "base" not in errors:
                 encryption_data = {
@@ -128,10 +141,10 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             )
         except (TimeoutError, URLError, SOAPError, OSError) as err:
             _LOGGER.error("The remote connection was lost: %s", err)
-            return self.async_abort(reason=REASON_NOT_CONNECTED)
+            return self.async_abort(reason="cannot_connect")
         except Exception as err:  # pylint: disable=broad-except
             _LOGGER.exception("Unknown error: %s", err)
-            return self.async_abort(reason=REASON_UNKNOWN)
+            return self.async_abort(reason="unknown")
 
         return self.async_show_form(
             step_id="pairing",
diff --git a/homeassistant/components/panasonic_viera/const.py b/homeassistant/components/panasonic_viera/const.py
index 529de4ebe67..a2e3fc2eece 100644
--- a/homeassistant/components/panasonic_viera/const.py
+++ b/homeassistant/components/panasonic_viera/const.py
@@ -12,8 +12,13 @@ DEFAULT_PORT = 55000
 
 ATTR_REMOTE = "remote"
 
-ERROR_NOT_CONNECTED = "not_connected"
-ERROR_INVALID_PIN_CODE = "invalid_pin_code"
+ATTR_DEVICE_INFO = "device_info"
+ATTR_FRIENDLY_NAME = "friendlyName"
+ATTR_MANUFACTURER = "manufacturer"
+ATTR_MODEL_NUMBER = "modelNumber"
+ATTR_UDN = "UDN"
 
-REASON_NOT_CONNECTED = "not_connected"
-REASON_UNKNOWN = "unknown"
+DEFAULT_MANUFACTURER = "Panasonic"
+DEFAULT_MODEL_NUMBER = "Panasonic Viera"
+
+ERROR_INVALID_PIN_CODE = "invalid_pin_code"
diff --git a/homeassistant/components/panasonic_viera/manifest.json b/homeassistant/components/panasonic_viera/manifest.json
index dd61399bcd9..7b9a3d7d4e0 100644
--- a/homeassistant/components/panasonic_viera/manifest.json
+++ b/homeassistant/components/panasonic_viera/manifest.json
@@ -3,6 +3,6 @@
   "name": "Panasonic Viera",
   "documentation": "https://www.home-assistant.io/integrations/panasonic_viera",
   "requirements": ["panasonic_viera==0.3.6"],
-  "codeowners": ["@joogps"],
+  "codeowners": [],
   "config_flow": true
 }
diff --git a/homeassistant/components/panasonic_viera/media_player.py b/homeassistant/components/panasonic_viera/media_player.py
index 934067acfaf..c59c77b569c 100644
--- a/homeassistant/components/panasonic_viera/media_player.py
+++ b/homeassistant/components/panasonic_viera/media_player.py
@@ -3,7 +3,7 @@ import logging
 
 from panasonic_viera import Keys
 
-from homeassistant.components.media_player import MediaPlayerEntity
+from homeassistant.components.media_player import DEVICE_CLASS_TV, MediaPlayerEntity
 from homeassistant.components.media_player.const import (
     MEDIA_TYPE_URL,
     SUPPORT_NEXT_TRACK,
@@ -20,7 +20,16 @@ from homeassistant.components.media_player.const import (
 )
 from homeassistant.const import CONF_NAME
 
-from .const import ATTR_REMOTE, DOMAIN
+from .const import (
+    ATTR_DEVICE_INFO,
+    ATTR_MANUFACTURER,
+    ATTR_MODEL_NUMBER,
+    ATTR_REMOTE,
+    ATTR_UDN,
+    DEFAULT_MANUFACTURER,
+    DEFAULT_MODEL_NUMBER,
+    DOMAIN,
+)
 
 SUPPORT_VIERATV = (
     SUPPORT_PAUSE
@@ -46,24 +55,46 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
     remote = hass.data[DOMAIN][config_entry.entry_id][ATTR_REMOTE]
     name = config[CONF_NAME]
+    device_info = config[ATTR_DEVICE_INFO]
 
-    tv_device = PanasonicVieraTVEntity(remote, name)
+    tv_device = PanasonicVieraTVEntity(remote, name, device_info)
     async_add_entities([tv_device])
 
 
 class PanasonicVieraTVEntity(MediaPlayerEntity):
     """Representation of a Panasonic Viera TV."""
 
-    def __init__(self, remote, name, uuid=None):
+    def __init__(self, remote, name, device_info):
         """Initialize the entity."""
         self._remote = remote
         self._name = name
-        self._uuid = uuid
+        self._device_info = device_info
 
     @property
     def unique_id(self):
         """Return the unique ID of the device."""
-        return self._uuid
+        if self._device_info is None:
+            return None
+        return self._device_info[ATTR_UDN]
+
+    @property
+    def device_info(self):
+        """Return device specific attributes."""
+        if self._device_info is None:
+            return None
+        return {
+            "name": self._name,
+            "identifiers": {(DOMAIN, self._device_info[ATTR_UDN])},
+            "manufacturer": self._device_info.get(
+                ATTR_MANUFACTURER, DEFAULT_MANUFACTURER
+            ),
+            "model": self._device_info.get(ATTR_MODEL_NUMBER, DEFAULT_MODEL_NUMBER),
+        }
+
+    @property
+    def device_class(self):
+        """Return the device class of the device."""
+        return DEVICE_CLASS_TV
 
     @property
     def name(self):
diff --git a/homeassistant/components/panasonic_viera/strings.json b/homeassistant/components/panasonic_viera/strings.json
index f3943fde71d..54cfa41421d 100644
--- a/homeassistant/components/panasonic_viera/strings.json
+++ b/homeassistant/components/panasonic_viera/strings.json
@@ -4,28 +4,28 @@
     "step": {
       "user": {
         "title": "Setup your TV",
-        "description": "Enter your Panasonic Viera TV's IP address",
+        "description": "Enter your Panasonic Viera TV's [%key:common::config_flow::data::ip%]",
         "data": {
           "host": "[%key:common::config_flow::data::ip%]",
-          "name": "Name"
+          "name": "[%key:common::config_flow::data::name%]"
         }
       },
       "pairing": {
         "title": "Pairing",
-        "description": "Enter the PIN displayed on your TV",
+        "description": "Enter the [%key:common::config_flow::data::pin%] displayed on your TV",
         "data": {
-          "pin": "PIN"
+          "pin": "[%key:common::config_flow::data::pin%]"
         }
       }
     },
     "error": {
-      "not_connected": "Could not establish a remote connection with your Panasonic Viera TV",
-      "invalid_pin_code": "The PIN code you entered was invalid"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_pin_code": "The [%key:common::config_flow::data::pin%] you entered was invalid"
     },
     "abort": {
-      "already_configured": "This Panasonic Viera TV is already configured.",
-      "not_connected": "The remote connection with your Panasonic Viera TV was lost. Check the logs for more information.",
-      "unknown": "An unknown error occured. Check the logs for more information."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     }
   }
 }
diff --git a/homeassistant/components/panasonic_viera/translations/ca.json b/homeassistant/components/panasonic_viera/translations/ca.json
index 8b703ef6652..a367f62233a 100644
--- a/homeassistant/components/panasonic_viera/translations/ca.json
+++ b/homeassistant/components/panasonic_viera/translations/ca.json
@@ -1,20 +1,22 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest televisor Panasonic Viera ja est\u00e0 configurat.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "not_connected": "La connexi\u00f3 remota amb el teu televisor Panasonic Viera ha fallat. Consulta els registres per a m\u00e9s informaci\u00f3.",
-            "unknown": "S'ha produ\u00eft un error desconegut. Consulta els registres per a m\u00e9s informaci\u00f3."
+            "unknown": "Error inesperat"
         },
         "error": {
-            "invalid_pin_code": "El codi PIN introdu\u00eft no \u00e9s v\u00e0lid",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_pin_code": "El Codi PIN introdu\u00eft no \u00e9s v\u00e0lid",
             "not_connected": "No s'ha pogut establir una connexi\u00f3 remota amb el televisor Panasonic Viera"
         },
         "step": {
             "pairing": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "Codi PIN"
                 },
-                "description": "Introdueix el PIN que apareix a la pantalla del televisor",
+                "description": "Introdueix el Codi PIN que apareix al televisor",
                 "title": "Vinculaci\u00f3"
             },
             "user": {
@@ -22,7 +24,7 @@
                     "host": "Adre\u00e7a IP",
                     "name": "Nom"
                 },
-                "description": "Introdueix l'adre\u00e7a IP del televisor Panasonic Viera",
+                "description": "Introdueix l'Adre\u00e7a IP del televisor Panasonic Viera",
                 "title": "Configuraci\u00f3 del televisor"
             }
         }
diff --git a/homeassistant/components/panasonic_viera/translations/cs.json b/homeassistant/components/panasonic_viera/translations/cs.json
index 5656d8635a0..3013c1830ad 100644
--- a/homeassistant/components/panasonic_viera/translations/cs.json
+++ b/homeassistant/components/panasonic_viera/translations/cs.json
@@ -1,11 +1,33 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "not_connected": "Vzd\u00e1len\u00e9 p\u0159ipojen\u00ed k televizi Panasonic Viera bylo ztraceno. Dal\u0161\u00ed informace najdete v log\u00e1ch.",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_pin_code": "Zadan\u00fd PIN k\u00f3d je neplatn\u00fd",
+            "not_connected": "Nelze nav\u00e1zat vzd\u00e1len\u00e9 p\u0159ipojen\u00ed k televizi Panasonic Viera"
+        },
         "step": {
+            "pairing": {
+                "data": {
+                    "pin": "PIN k\u00f3d"
+                },
+                "description": "Zadejte PIN zobrazen\u00fd na va\u0161\u00ed televizi",
+                "title": "P\u00e1rov\u00e1n\u00ed"
+            },
             "user": {
                 "data": {
-                    "host": "IP adresa"
-                }
+                    "host": "IP adresa",
+                    "name": "Jm\u00e9no"
+                },
+                "description": "Zadejte IP adresu va\u0161\u00ed televize Panasonic Viera",
+                "title": "Nastaven\u00ed televize"
             }
         }
-    }
+    },
+    "title": "Panasonic Viera"
 }
\ No newline at end of file
diff --git a/homeassistant/components/panasonic_viera/translations/en.json b/homeassistant/components/panasonic_viera/translations/en.json
index 65ccf850b7f..76f4139ed17 100644
--- a/homeassistant/components/panasonic_viera/translations/en.json
+++ b/homeassistant/components/panasonic_viera/translations/en.json
@@ -1,20 +1,22 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This Panasonic Viera TV is already configured.",
+            "already_configured": "Device is already configured",
+            "cannot_connect": "Failed to connect",
             "not_connected": "The remote connection with your Panasonic Viera TV was lost. Check the logs for more information.",
-            "unknown": "An unknown error occured. Check the logs for more information."
+            "unknown": "Unexpected error"
         },
         "error": {
-            "invalid_pin_code": "The PIN code you entered was invalid",
+            "cannot_connect": "Failed to connect",
+            "invalid_pin_code": "The PIN Code you entered was invalid",
             "not_connected": "Could not establish a remote connection with your Panasonic Viera TV"
         },
         "step": {
             "pairing": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "PIN Code"
                 },
-                "description": "Enter the PIN displayed on your TV",
+                "description": "Enter the PIN Code displayed on your TV",
                 "title": "Pairing"
             },
             "user": {
@@ -22,7 +24,7 @@
                     "host": "IP Address",
                     "name": "Name"
                 },
-                "description": "Enter your Panasonic Viera TV's IP address",
+                "description": "Enter your Panasonic Viera TV's IP Address",
                 "title": "Setup your TV"
             }
         }
diff --git a/homeassistant/components/panasonic_viera/translations/es.json b/homeassistant/components/panasonic_viera/translations/es.json
index 21039a8bcaf..e806b9ce806 100644
--- a/homeassistant/components/panasonic_viera/translations/es.json
+++ b/homeassistant/components/panasonic_viera/translations/es.json
@@ -1,18 +1,20 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Este televisor Panasonic Viera ya est\u00e1 configurado.",
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
+            "cannot_connect": "No se pudo conectar",
             "not_connected": "La conexi\u00f3n remota con su televisor Panasonic Viera se perdi\u00f3. Compruebe los registros para obtener m\u00e1s informaci\u00f3n.",
-            "unknown": "Se ha producido un error desconocido. Compruebe los registros para obtener m\u00e1s informaci\u00f3n."
+            "unknown": "Error inesperado"
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "invalid_pin_code": "El c\u00f3digo PIN que ha introducido no es v\u00e1lido",
             "not_connected": "No se pudo establecer una conexi\u00f3n remota con su televisor Panasonic Viera"
         },
         "step": {
             "pairing": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "C\u00f3digo PIN"
                 },
                 "description": "Introduzca el PIN que aparece en su Televisor",
                 "title": "Emparejamiento"
diff --git a/homeassistant/components/panasonic_viera/translations/et.json b/homeassistant/components/panasonic_viera/translations/et.json
new file mode 100644
index 00000000000..133f1151198
--- /dev/null
+++ b/homeassistant/components/panasonic_viera/translations/et.json
@@ -0,0 +1,28 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "pairing": {
+                "data": {
+                    "pin": "PIN kood"
+                },
+                "description": "Sisesta teleris kuvatud PIN kood"
+            },
+            "user": {
+                "data": {
+                    "host": "IP aadress",
+                    "name": "Nimi"
+                },
+                "description": "Sisesta oma Panasonic Viera TV IP-aadress"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/panasonic_viera/translations/it.json b/homeassistant/components/panasonic_viera/translations/it.json
index 883550ba1ce..5f1e5508b60 100644
--- a/homeassistant/components/panasonic_viera/translations/it.json
+++ b/homeassistant/components/panasonic_viera/translations/it.json
@@ -1,20 +1,22 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo TV Panasonic Viera \u00e8 gi\u00e0 configurato.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "cannot_connect": "Impossibile connettersi",
             "not_connected": "La connessione remota con la TV Panasonic Viera \u00e8 andata persa. Controllare i registri per ulteriori informazioni.",
-            "unknown": "Si \u00e8 verificato un errore sconosciuto. Controllare i registri per ulteriori informazioni."
+            "unknown": "Errore imprevisto"
         },
         "error": {
-            "invalid_pin_code": "Il codice PIN inserito non \u00e8 valido",
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_pin_code": "Il Codice PIN inserito non \u00e8 valido",
             "not_connected": "Impossibile stabilire una connessione remota con la TV Panasonic Viera"
         },
         "step": {
             "pairing": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "Codice PIN"
                 },
-                "description": "Inserire il PIN visualizzato sul televisore",
+                "description": "Inserire il Codice PIN visualizzato sul televisore",
                 "title": "Abbinamento"
             },
             "user": {
@@ -22,7 +24,7 @@
                     "host": "Indirizzo IP",
                     "name": "Nome"
                 },
-                "description": "Inserisci l'indirizzo IP del tuo Panasonic Viera TV",
+                "description": "Inserisci l'Indirizzo IP del tuo Panasonic Viera TV",
                 "title": "Configura la tua TV"
             }
         }
diff --git a/homeassistant/components/panasonic_viera/translations/lb.json b/homeassistant/components/panasonic_viera/translations/lb.json
index 0fb2a8c703f..256c47b6986 100644
--- a/homeassistant/components/panasonic_viera/translations/lb.json
+++ b/homeassistant/components/panasonic_viera/translations/lb.json
@@ -1,18 +1,20 @@
 {
     "config": {
         "abort": {
-            "already_configured": "D\u00ebs Panasonic Viera TA ass scho konfigur\u00e9iert.",
+            "already_configured": "Apparat ass scho konfigur\u00e9iert",
+            "cannot_connect": "Feeler beim verbannen",
             "not_connected": "Verbindung mam Panasonic Viera TV as \u00ebnnerbrach. Kuck Log fir w\u00e9ider Informatiounen.",
-            "unknown": "Onbekannte Feeler opgetrueden. Kuck d'Logs fir m\u00e9i Informatiounen."
+            "unknown": "Onerwaarte Feeler."
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "invalid_pin_code": "PIN Code ass ong\u00eblteg",
             "not_connected": "Konnt keng Verbindung mam Panasonic Viera TV ariichten"
         },
         "step": {
             "pairing": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "PIN Code"
                 },
                 "description": "PIN uginn deem um Fernseh ugewise g\u00ebtt",
                 "title": "Kopplung"
diff --git a/homeassistant/components/panasonic_viera/translations/nl.json b/homeassistant/components/panasonic_viera/translations/nl.json
index 1f38ff9c441..792ecc75cd6 100644
--- a/homeassistant/components/panasonic_viera/translations/nl.json
+++ b/homeassistant/components/panasonic_viera/translations/nl.json
@@ -2,10 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "Deze Panasonic Viera TV is al geconfigureerd.",
+            "cannot_connect": "Kan geen verbinding maken",
             "not_connected": "De externe verbinding met uw Panasonic Viera-tv was verbroken. Controleer de logs voor meer informatie.",
             "unknown": "Er is een onbekende fout opgetreden. Controleer de logs voor meer informatie."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "invalid_pin_code": "De ingevoerde pincode is ongeldig",
             "not_connected": "Kon geen externe verbinding met uw Panasonic Viera TV tot stand brengen"
         },
diff --git a/homeassistant/components/panasonic_viera/translations/no.json b/homeassistant/components/panasonic_viera/translations/no.json
index 039adbd2ad3..365787e755c 100644
--- a/homeassistant/components/panasonic_viera/translations/no.json
+++ b/homeassistant/components/panasonic_viera/translations/no.json
@@ -1,20 +1,22 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne Panasonic Viera TV-en er allerede konfigurert.",
+            "already_configured": "Enheten er allerede konfigurert",
+            "cannot_connect": "Tilkobling mislyktes",
             "not_connected": "Fjerntilkoblingen med din Panasonic Viera TV gikk tapt. Sjekk loggene for mer informasjon.",
-            "unknown": "Det skjedde en ukjent feil. Sjekk loggene for mer informasjon."
+            "unknown": "Uventet feil"
         },
         "error": {
-            "invalid_pin_code": "PIN-koden du oppga var ugyldig",
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_pin_code": "PIN-kode du skrev inn var ugyldig",
             "not_connected": "Kunne ikke opprette en ekstern tilkobling med Panasonic Viera TV"
         },
         "step": {
             "pairing": {
                 "data": {
-                    "pin": ""
+                    "pin": "PIN-kode"
                 },
-                "description": "Angi PIN-koden som vises p\u00e5 TV-en",
+                "description": "Skriv inn PIN-kode som vises p\u00e5 TV-en",
                 "title": "Sammenkobling"
             },
             "user": {
@@ -22,7 +24,7 @@
                     "host": "IP adresse",
                     "name": "Navn"
                 },
-                "description": "Fyll inn IP-adressen til Panasonic Viera TV",
+                "description": "Skriv inn Panasonic Viera TVs IP adresse",
                 "title": "Sett opp TV-en din"
             }
         }
diff --git a/homeassistant/components/panasonic_viera/translations/pl.json b/homeassistant/components/panasonic_viera/translations/pl.json
index 4d956896e9e..7d507ac6cda 100644
--- a/homeassistant/components/panasonic_viera/translations/pl.json
+++ b/homeassistant/components/panasonic_viera/translations/pl.json
@@ -1,18 +1,20 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane.",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "not_connected": "Zdalne po\u0142\u0105czenie z telewizorem Panasonic Viera zosta\u0142o utracone. Sprawd\u017a logi, aby uzyska\u0107 wi\u0119cej informacji.",
-            "unknown": "Nieznany b\u0142\u0105d, sprawd\u017a logi, aby uzyska\u0107 wi\u0119cej szczeg\u00f3\u0142\u00f3w."
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_pin_code": "Podany kod PIN jest nieprawid\u0142owy",
-            "not_connected": "Nie uda\u0142o si\u0119 nawi\u0105za\u0107 zdalnego po\u0142\u0105czenia z telewizorem Panasonic Viera."
+            "not_connected": "Nie uda\u0142o si\u0119 nawi\u0105za\u0107 zdalnego po\u0142\u0105czenia z telewizorem Panasonic Viera"
         },
         "step": {
             "pairing": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "Kod PIN"
                 },
                 "description": "Wprowad\u017a kod PIN wy\u015bwietlony na ekranie telewizora",
                 "title": "Parowanie"
diff --git a/homeassistant/components/panasonic_viera/translations/ru.json b/homeassistant/components/panasonic_viera/translations/ru.json
index 0b840921df4..af3381cc881 100644
--- a/homeassistant/components/panasonic_viera/translations/ru.json
+++ b/homeassistant/components/panasonic_viera/translations/ru.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "not_connected": "\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0441 \u0442\u0435\u043b\u0435\u0432\u0438\u0437\u043e\u0440\u043e\u043c Panasonic Viera \u0431\u044b\u043b\u043e \u043f\u043e\u0442\u0435\u0440\u044f\u043d\u043e. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_pin_code": "\u0412\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 PIN-\u043a\u043e\u0434 \u043d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u0435\u043d.",
             "not_connected": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0441 \u0442\u0435\u043b\u0435\u0432\u0438\u0437\u043e\u0440\u043e\u043c."
         },
diff --git a/homeassistant/components/panasonic_viera/translations/zh-Hant.json b/homeassistant/components/panasonic_viera/translations/zh-Hant.json
index 28d08bdf49c..7052ba44682 100644
--- a/homeassistant/components/panasonic_viera/translations/zh-Hant.json
+++ b/homeassistant/components/panasonic_viera/translations/zh-Hant.json
@@ -1,18 +1,20 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Panasonic Viera \u96fb\u8996\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "not_connected": "\u8207 Panasonic Viera \u96fb\u8996\u9060\u7aef\u9023\u7dda\u65b7\u7dda\uff0c\u8acb\u53c3\u95b1\u65e5\u8a8c\u4ee5\u7372\u5f97\u66f4\u8a73\u7d30\u8cc7\u8a0a\u3002",
-            "unknown": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002\u8acb\u53c3\u95b1\u65e5\u8a8c\u4ee5\u7372\u5f97\u66f4\u8a73\u7d30\u8cc7\u8a0a\u3002"
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_pin_code": "\u6240\u8f38\u5165\u7684 PIN \u78bc\u7121\u6548",
             "not_connected": "\u7121\u6cd5\u8207 Panasonic Viera \u96fb\u8996\u5efa\u7acb\u9060\u7aef\u9023\u7dda"
         },
         "step": {
             "pairing": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "PIN \u78bc"
                 },
                 "description": "\u8f38\u5165\u96fb\u8996\u986f\u793a\u4e4b PIN \u78bc",
                 "title": "\u914d\u5c0d\u4e2d"
@@ -22,7 +24,7 @@
                     "host": "IP \u4f4d\u5740",
                     "name": "\u540d\u7a31"
                 },
-                "description": "\u8f38\u5165 Panasonic Viera \u96fb\u8996 IP \u4f4d\u5740",
+                "description": "\u8f38\u5165 Panasonic Viera \u96fb\u8996  IP \u4f4d\u5740",
                 "title": "\u8a2d\u5b9a\u96fb\u8996"
             }
         }
diff --git a/homeassistant/components/pandora/media_player.py b/homeassistant/components/pandora/media_player.py
index 459e583c267..33ea72f94ff 100644
--- a/homeassistant/components/pandora/media_player.py
+++ b/homeassistant/components/pandora/media_player.py
@@ -88,11 +88,6 @@ class PandoraMediaPlayer(MediaPlayerEntity):
         self._media_duration = 0
         self._pianobar = None
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def name(self):
         """Return the name of the media player."""
diff --git a/homeassistant/components/pcal9535a/binary_sensor.py b/homeassistant/components/pcal9535a/binary_sensor.py
index 8e14ea8ce69..79ad8eb8016 100644
--- a/homeassistant/components/pcal9535a/binary_sensor.py
+++ b/homeassistant/components/pcal9535a/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for binary sensor using I2C PCAL9535A chip."""
-import logging
-
 from pcal9535a import PCAL9535A
 import voluptuous as vol
 
@@ -8,8 +6,6 @@ from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensor
 from homeassistant.const import DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_I2C_ADDRESS = "i2c_address"
 CONF_I2C_BUS = "i2c_bus"
diff --git a/homeassistant/components/pcal9535a/switch.py b/homeassistant/components/pcal9535a/switch.py
index 7b4cc919dbd..897d41e9d98 100644
--- a/homeassistant/components/pcal9535a/switch.py
+++ b/homeassistant/components/pcal9535a/switch.py
@@ -1,6 +1,4 @@
 """Support for switch sensor using I2C PCAL9535A chip."""
-import logging
-
 from pcal9535a import PCAL9535A
 import voluptuous as vol
 
@@ -8,8 +6,6 @@ from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
 from homeassistant.const import DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_I2C_ADDRESS = "i2c_address"
 CONF_I2C_BUS = "i2c_bus"
diff --git a/homeassistant/components/persistent_notification/__init__.py b/homeassistant/components/persistent_notification/__init__.py
index 9a1f35c947d..49a9f4c3bea 100644
--- a/homeassistant/components/persistent_notification/__init__.py
+++ b/homeassistant/components/persistent_notification/__init__.py
@@ -119,7 +119,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
         if title is not None:
             try:
                 title.hass = hass
-                title = title.async_render()
+                title = title.async_render(parse_result=False)
             except TemplateError as ex:
                 _LOGGER.error("Error rendering title %s: %s", title, ex)
                 title = title.template
@@ -128,7 +128,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
 
         try:
             message.hass = hass
-            message = message.async_render()
+            message = message.async_render(parse_result=False)
         except TemplateError as ex:
             _LOGGER.error("Error rendering message %s: %s", message, ex)
             message = message.template
diff --git a/homeassistant/components/philips_js/media_player.py b/homeassistant/components/philips_js/media_player.py
index 7e2e126437c..451e8d6a3c2 100644
--- a/homeassistant/components/philips_js/media_player.py
+++ b/homeassistant/components/philips_js/media_player.py
@@ -96,7 +96,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class PhilipsTVMediaPlayer(MediaPlayerEntity):
     """Representation of a Philips TV exposing the JointSpace API."""
 
-    def __init__(self, tv, name, on_script):
+    def __init__(self, tv: PhilipsTV, name: str, on_script: Script):
         """Initialize the Philips TV."""
         self._tv = tv
         self._name = name
@@ -193,7 +193,7 @@ class PhilipsTVMediaPlayer(MediaPlayerEntity):
     def turn_on(self):
         """Turn on the device."""
         if self._on_script:
-            self._on_script.run()
+            self._on_script.run(context=self._context)
             self._update_soon(DELAY_ACTION_ON)
 
     def turn_off(self):
diff --git a/homeassistant/components/pi4ioe5v9xxxx/binary_sensor.py b/homeassistant/components/pi4ioe5v9xxxx/binary_sensor.py
index 4eb90101710..61cedb8f063 100644
--- a/homeassistant/components/pi4ioe5v9xxxx/binary_sensor.py
+++ b/homeassistant/components/pi4ioe5v9xxxx/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for binary sensor using RPi GPIO."""
-import logging
-
 from pi4ioe5v9xxxx import pi4ioe5v9xxxx  # pylint: disable=import-error
 import voluptuous as vol
 
@@ -8,8 +6,6 @@ from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensor
 from homeassistant.const import DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_PINS = "pins"
 CONF_I2CBUS = "i2c_bus"
diff --git a/homeassistant/components/pi4ioe5v9xxxx/switch.py b/homeassistant/components/pi4ioe5v9xxxx/switch.py
index a147c7f310d..81de76c086c 100644
--- a/homeassistant/components/pi4ioe5v9xxxx/switch.py
+++ b/homeassistant/components/pi4ioe5v9xxxx/switch.py
@@ -1,6 +1,4 @@
 """Allows to configure a switch using RPi GPIO."""
-import logging
-
 from pi4ioe5v9xxxx import pi4ioe5v9xxxx  # pylint: disable=import-error
 import voluptuous as vol
 
@@ -8,8 +6,6 @@ from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
 from homeassistant.const import DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PINS = "pins"
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_I2CBUS = "i2c_bus"
@@ -59,7 +55,7 @@ class Pi4ioe5v9Switch(SwitchEntity):
         self._name = name or DEVICE_DEFAULT_NAME
         self._pin = pin
         self._invert_logic = invert_logic
-        self._state = False
+        self._state = not invert_logic
 
     @property
     def name(self):
diff --git a/homeassistant/components/pi_hole/binary_sensor.py b/homeassistant/components/pi_hole/binary_sensor.py
index d572bb390e5..714a9f669c8 100644
--- a/homeassistant/components/pi_hole/binary_sensor.py
+++ b/homeassistant/components/pi_hole/binary_sensor.py
@@ -1,14 +1,10 @@
 """Support for getting status from a Pi-hole system."""
-import logging
-
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.const import CONF_NAME
 
 from . import PiHoleEntity
 from .const import DATA_KEY_API, DATA_KEY_COORDINATOR, DOMAIN as PIHOLE_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up the Pi-hole binary sensor."""
diff --git a/homeassistant/components/pi_hole/sensor.py b/homeassistant/components/pi_hole/sensor.py
index 179e61a21cc..2f5873b14c1 100644
--- a/homeassistant/components/pi_hole/sensor.py
+++ b/homeassistant/components/pi_hole/sensor.py
@@ -1,5 +1,4 @@
 """Support for getting statistical data from a Pi-hole system."""
-import logging
 
 from homeassistant.const import CONF_NAME
 
@@ -13,8 +12,6 @@ from .const import (
     SENSOR_LIST,
 )
 
-LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up the Pi-hole sensor."""
diff --git a/homeassistant/components/pi_hole/strings.json b/homeassistant/components/pi_hole/strings.json
index 42faf5d5a46..3bb5289777d 100644
--- a/homeassistant/components/pi_hole/strings.json
+++ b/homeassistant/components/pi_hole/strings.json
@@ -5,11 +5,11 @@
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]",
-          "name": "Name",
+          "name": "[%key:common::config_flow::data::name%]",
           "location": "Location",
           "api_key": "[%key:common::config_flow::data::api_key%]",
-          "ssl": "Use SSL",
-          "verify_ssl": "Verify SSL certificate"
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         }
       }
     },
diff --git a/homeassistant/components/pi_hole/translations/ca.json b/homeassistant/components/pi_hole/translations/ca.json
index 1a8b91fad6d..37d4e890ef4 100644
--- a/homeassistant/components/pi_hole/translations/ca.json
+++ b/homeassistant/components/pi_hole/translations/ca.json
@@ -14,7 +14,7 @@
                     "location": "Ubicaci\u00f3",
                     "name": "Nom",
                     "port": "Port",
-                    "ssl": "Utilitza SSL",
+                    "ssl": "Utilitza un certificat SSL",
                     "verify_ssl": "Verifica el certificat SSL"
                 }
             }
diff --git a/homeassistant/components/pi_hole/translations/cs.json b/homeassistant/components/pi_hole/translations/cs.json
index fbf7317b4f0..a9057ceabab 100644
--- a/homeassistant/components/pi_hole/translations/cs.json
+++ b/homeassistant/components/pi_hole/translations/cs.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Slu\u017eba je ji\u017e nakonfigurov\u00e1na"
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
@@ -9,8 +9,13 @@
         "step": {
             "user": {
                 "data": {
+                    "api_key": "Kl\u00ed\u010d API",
                     "host": "Hostitel",
-                    "port": "Port"
+                    "location": "Um\u00edst\u011bn\u00ed",
+                    "name": "Jm\u00e9no",
+                    "port": "Port",
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
+                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL"
                 }
             }
         }
diff --git a/homeassistant/components/pi_hole/translations/en.json b/homeassistant/components/pi_hole/translations/en.json
index 98ac63514b6..858e7c230ac 100644
--- a/homeassistant/components/pi_hole/translations/en.json
+++ b/homeassistant/components/pi_hole/translations/en.json
@@ -14,7 +14,7 @@
                     "location": "Location",
                     "name": "Name",
                     "port": "Port",
-                    "ssl": "Use SSL",
+                    "ssl": "Uses an SSL certificate",
                     "verify_ssl": "Verify SSL certificate"
                 }
             }
diff --git a/homeassistant/components/pi_hole/translations/et.json b/homeassistant/components/pi_hole/translations/et.json
new file mode 100644
index 00000000000..a53eca7e3ed
--- /dev/null
+++ b/homeassistant/components/pi_hole/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API v\u00f5ti",
+                    "host": "",
+                    "name": "Nimi",
+                    "port": "",
+                    "ssl": "Kasuatb SSL serti",
+                    "verify_ssl": "Kontrolli SSL sertifikaati"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/pi_hole/translations/it.json b/homeassistant/components/pi_hole/translations/it.json
index b8a155e9374..34590ee77bb 100644
--- a/homeassistant/components/pi_hole/translations/it.json
+++ b/homeassistant/components/pi_hole/translations/it.json
@@ -14,7 +14,7 @@
                     "location": "Posizione",
                     "name": "Nome",
                     "port": "Porta",
-                    "ssl": "Utilizzare SSL",
+                    "ssl": "Utilizza un certificato SSL",
                     "verify_ssl": "Verificare il certificato SSL"
                 }
             }
diff --git a/homeassistant/components/pi_hole/translations/lb.json b/homeassistant/components/pi_hole/translations/lb.json
index db41851b9fd..39dcf3e2a6f 100644
--- a/homeassistant/components/pi_hole/translations/lb.json
+++ b/homeassistant/components/pi_hole/translations/lb.json
@@ -9,7 +9,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "API Schl\u00ebssel (Optionell)",
+                    "api_key": "API Schl\u00ebssel",
                     "host": "Host",
                     "location": "Standuert",
                     "name": "Numm",
diff --git a/homeassistant/components/pi_hole/translations/nl.json b/homeassistant/components/pi_hole/translations/nl.json
index 5340086233c..6aaf75ada4a 100644
--- a/homeassistant/components/pi_hole/translations/nl.json
+++ b/homeassistant/components/pi_hole/translations/nl.json
@@ -9,7 +9,9 @@
         "step": {
             "user": {
                 "data": {
-                    "location": "Locatie"
+                    "location": "Locatie",
+                    "name": "Naam",
+                    "port": "Poort"
                 }
             }
         }
diff --git a/homeassistant/components/pi_hole/translations/no.json b/homeassistant/components/pi_hole/translations/no.json
index 387b6c0d1eb..71c815ecd36 100644
--- a/homeassistant/components/pi_hole/translations/no.json
+++ b/homeassistant/components/pi_hole/translations/no.json
@@ -4,17 +4,17 @@
             "already_configured": "Tjenesten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling feilet"
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "user": {
                 "data": {
                     "api_key": "API-n\u00f8kkel",
                     "host": "Vert",
-                    "location": "Beliggenhet",
+                    "location": "Plassering",
                     "name": "Navn",
-                    "port": "",
-                    "ssl": "Bruk SSL",
+                    "port": "Port",
+                    "ssl": "Bruker et SSL-sertifikat",
                     "verify_ssl": "Verifisere SSL-sertifikat"
                 }
             }
diff --git a/homeassistant/components/pi_hole/translations/pl.json b/homeassistant/components/pi_hole/translations/pl.json
index 394a24a5050..add788ef916 100644
--- a/homeassistant/components/pi_hole/translations/pl.json
+++ b/homeassistant/components/pi_hole/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
@@ -14,7 +14,7 @@
                     "location": "Lokalizacja",
                     "name": "Nazwa",
                     "port": "Port",
-                    "ssl": "U\u017cyj SSL",
+                    "ssl": "Certyfikat SSL",
                     "verify_ssl": "Weryfikacja certyfikatu SSL"
                 }
             }
diff --git a/homeassistant/components/pi_hole/translations/ru.json b/homeassistant/components/pi_hole/translations/ru.json
index 6f7dd24e5e2..eb3cfa62c62 100644
--- a/homeassistant/components/pi_hole/translations/ru.json
+++ b/homeassistant/components/pi_hole/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
             "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
@@ -14,7 +14,7 @@
                     "location": "\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435",
                     "name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c SSL",
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
                     "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 }
             }
diff --git a/homeassistant/components/pi_hole/translations/zh-Hant.json b/homeassistant/components/pi_hole/translations/zh-Hant.json
index 1a75757dcc6..1cea5a87f4b 100644
--- a/homeassistant/components/pi_hole/translations/zh-Hant.json
+++ b/homeassistant/components/pi_hole/translations/zh-Hant.json
@@ -14,7 +14,7 @@
                     "location": "\u5ea7\u6a19",
                     "name": "\u540d\u7a31",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "\u4f7f\u7528 SSL",
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
                     "verify_ssl": "\u78ba\u8a8d SSL \u8a8d\u8b49"
                 }
             }
diff --git a/homeassistant/components/pilight/base_class.py b/homeassistant/components/pilight/base_class.py
index 382d47f41cd..95eb987875b 100644
--- a/homeassistant/components/pilight/base_class.py
+++ b/homeassistant/components/pilight/base_class.py
@@ -1,6 +1,4 @@
 """Base class for pilight."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.pilight import DOMAIN, EVENT, SERVICE_NAME
@@ -28,8 +26,6 @@ from .const import (
     CONF_UNITCODE,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 COMMAND_SCHEMA = vol.Schema(
     {
         vol.Optional(CONF_PROTOCOL): cv.string,
diff --git a/homeassistant/components/pilight/binary_sensor.py b/homeassistant/components/pilight/binary_sensor.py
index a53e575b875..e380d39bef4 100644
--- a/homeassistant/components/pilight/binary_sensor.py
+++ b/homeassistant/components/pilight/binary_sensor.py
@@ -1,6 +1,5 @@
 """Support for Pilight binary sensors."""
 import datetime
-import logging
 
 import voluptuous as vol
 
@@ -17,8 +16,6 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import track_point_in_time
 from homeassistant.util import dt as dt_util
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_VARIABLE = "variable"
 CONF_RESET_DELAY_SEC = "reset_delay_sec"
 
diff --git a/homeassistant/components/pilight/light.py b/homeassistant/components/pilight/light.py
index 11eeb02293e..1ab7cd207c1 100644
--- a/homeassistant/components/pilight/light.py
+++ b/homeassistant/components/pilight/light.py
@@ -1,6 +1,4 @@
 """Support for switching devices via Pilight to on and off."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.light import (
@@ -15,8 +13,6 @@ import homeassistant.helpers.config_validation as cv
 from .base_class import SWITCHES_SCHEMA, PilightBaseDevice
 from .const import CONF_DIMLEVEL_MAX, CONF_DIMLEVEL_MIN
 
-_LOGGER = logging.getLogger(__name__)
-
 LIGHTS_SCHEMA = SWITCHES_SCHEMA.extend(
     {
         vol.Optional(CONF_DIMLEVEL_MIN, default=0): cv.positive_int,
diff --git a/homeassistant/components/pilight/switch.py b/homeassistant/components/pilight/switch.py
index 8fb2229f55c..e190df32732 100644
--- a/homeassistant/components/pilight/switch.py
+++ b/homeassistant/components/pilight/switch.py
@@ -1,6 +1,4 @@
 """Support for switching devices via Pilight to on and off."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
@@ -9,8 +7,6 @@ import homeassistant.helpers.config_validation as cv
 
 from .base_class import SWITCHES_SCHEMA, PilightBaseDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {vol.Required(CONF_SWITCHES): vol.Schema({cv.string: SWITCHES_SCHEMA})}
 )
diff --git a/homeassistant/components/ping/binary_sensor.py b/homeassistant/components/ping/binary_sensor.py
index afbfe80b43f..98c36c01d98 100644
--- a/homeassistant/components/ping/binary_sensor.py
+++ b/homeassistant/components/ping/binary_sensor.py
@@ -143,6 +143,7 @@ class PingDataICMPLib(PingData):
                 icmp_ping,
                 self._ip_address,
                 count=self._count,
+                timeout=1,
                 id=async_get_next_ping_id(self.hass),
             )
         )
diff --git a/homeassistant/components/ping/device_tracker.py b/homeassistant/components/ping/device_tracker.py
index ea2d7a526e3..4139438bcfe 100644
--- a/homeassistant/components/ping/device_tracker.py
+++ b/homeassistant/components/ping/device_tracker.py
@@ -92,7 +92,7 @@ class HostICMPLib:
         ).result()
 
         return icmp_ping(
-            self.ip_address, count=PING_ATTEMPTS_COUNT, id=next_id
+            self.ip_address, count=PING_ATTEMPTS_COUNT, timeout=1, id=next_id
         ).is_alive
 
     def update(self, see):
diff --git a/homeassistant/components/ping/manifest.json b/homeassistant/components/ping/manifest.json
index 675ee1a9586..33788960de3 100644
--- a/homeassistant/components/ping/manifest.json
+++ b/homeassistant/components/ping/manifest.json
@@ -3,6 +3,6 @@
   "name": "Ping (ICMP)",
   "documentation": "https://www.home-assistant.io/integrations/ping",
   "codeowners": [],
-  "requirements": ["icmplib==1.1.3"],
+  "requirements": ["icmplib==1.2.2"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/pjlink/media_player.py b/homeassistant/components/pjlink/media_player.py
index e601650d08c..74536ba8393 100644
--- a/homeassistant/components/pjlink/media_player.py
+++ b/homeassistant/components/pjlink/media_player.py
@@ -1,6 +1,4 @@
 """Support for controlling projector via the PJLink protocol."""
-import logging
-
 from pypjlink import MUTE_AUDIO, Projector
 from pypjlink.projector import ProjectorError
 import voluptuous as vol
@@ -22,8 +20,6 @@ from homeassistant.const import (
 )
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_ENCODING = "encoding"
 
 DEFAULT_PORT = 4352
diff --git a/homeassistant/components/plaato/strings.json b/homeassistant/components/plaato/strings.json
index f78943ca941..568cd3ce38e 100644
--- a/homeassistant/components/plaato/strings.json
+++ b/homeassistant/components/plaato/strings.json
@@ -3,11 +3,11 @@
     "step": {
       "user": {
         "title": "Set up the Plaato Webhook",
-        "description": "Are you sure you want to set up the Plaato Airlock?"
+        "description": "[%key:common::config_flow::description::confirm_setup%]"
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Plaato Airlock."
     },
     "create_entry": {
diff --git a/homeassistant/components/plaato/translations/ca.json b/homeassistant/components/plaato/translations/ca.json
index a0e610e4527..91a781b0748 100644
--- a/homeassistant/components/plaato/translations/ca.json
+++ b/homeassistant/components/plaato/translations/ca.json
@@ -2,14 +2,15 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Plaato Airlock.",
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar l'opci\u00f3 webhook de Plaato Airlock.\n\nCompleta la seg\u00fcent informaci\u00f3:\n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n\nConsulta la [documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
         },
         "step": {
             "user": {
-                "description": "Est\u00e0s segur que vols configurar Plaato Airlock?",
+                "description": "Vols comen\u00e7ar la configuraci\u00f3?",
                 "title": "Configuraci\u00f3 del Webhook de Plaato"
             }
         }
diff --git a/homeassistant/components/plaato/translations/cs.json b/homeassistant/components/plaato/translations/cs.json
new file mode 100644
index 00000000000..c93dcb60b8a
--- /dev/null
+++ b/homeassistant/components/plaato/translations/cs.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "V\u00e1\u0161 Home Assistant mus\u00ed b\u00fdt p\u0159\u00edstupn\u00fd z internetu, aby mohl p\u0159ij\u00edmat zpr\u00e1vy z Plaato Airlock.",
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "user": {
+                "description": "Chcete za\u010d\u00edt nastavovat?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/plaato/translations/el.json b/homeassistant/components/plaato/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/plaato/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/plaato/translations/en.json b/homeassistant/components/plaato/translations/en.json
index 42d37f042fb..c083402859b 100644
--- a/homeassistant/components/plaato/translations/en.json
+++ b/homeassistant/components/plaato/translations/en.json
@@ -2,14 +2,15 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Plaato Airlock.",
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "To send events to Home Assistant, you will need to setup the webhook feature in Plaato Airlock.\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nSee [the documentation]({docs_url}) for further details."
         },
         "step": {
             "user": {
-                "description": "Are you sure you want to set up the Plaato Airlock?",
+                "description": "Do you want to start set up?",
                 "title": "Set up the Plaato Webhook"
             }
         }
diff --git a/homeassistant/components/plaato/translations/es.json b/homeassistant/components/plaato/translations/es.json
index 90ad53085f1..f7d0716b766 100644
--- a/homeassistant/components/plaato/translations/es.json
+++ b/homeassistant/components/plaato/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Tu instancia de Home Assistant debe ser accesible desde Internet para recibir mensajes de Plaato Airlock.",
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "S\u00f3lo se necesita una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Para enviar eventos a Home Assistant, necesitar\u00e1s configurar la funci\u00f3n de webhook en Plaato Airlock.\n\nCompleta la siguiente informaci\u00f3n:\n\n- URL: `{webhook_url}`\n- M\u00e9todo: POST\n\nEcha un vistazo a [la documentaci\u00f3n]({docs_url}) para m\u00e1s detalles."
diff --git a/homeassistant/components/plaato/translations/et.json b/homeassistant/components/plaato/translations/et.json
new file mode 100644
index 00000000000..49e67883440
--- /dev/null
+++ b/homeassistant/components/plaato/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Lubatud on ainult \u00fcks sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "user": {
+                "description": "Kas alustan seadistamist?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/plaato/translations/fr.json b/homeassistant/components/plaato/translations/fr.json
index 79ea8c05b49..cd8d46fa0c4 100644
--- a/homeassistant/components/plaato/translations/fr.json
+++ b/homeassistant/components/plaato/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Votre instance de Home Assistant doit \u00eatre accessible depuis Internet pour recevoir les messages de Plaato Airlock.",
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "Pour envoyer des \u00e9v\u00e9nements \u00e0 Home Assistant, vous devez configurer la fonction Webhook dans Plaato Airlock. \n\n Remplissez les informations suivantes: \n\n - URL: ` {webhook_url} ` \n - M\u00e9thode: POST \n\n Voir [la documentation] ( {docs_url} ) pour plus de d\u00e9tails."
diff --git a/homeassistant/components/plaato/translations/it.json b/homeassistant/components/plaato/translations/it.json
index d0f04bca9d9..ab0b3179cb5 100644
--- a/homeassistant/components/plaato/translations/it.json
+++ b/homeassistant/components/plaato/translations/it.json
@@ -2,14 +2,15 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La tua istanza di Home Assistant deve essere accessibile da Internet per ricevere messaggi da Plaato Airlook.",
-            "one_instance_allowed": "\u00c8 necessaria solo una singola istanza."
+            "one_instance_allowed": "\u00c8 necessaria solo una singola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "Per inviare eventi a Home Assistant, dovrai impostare la funzione webhook in Plaato Airlock. \n\n Inserisci le seguenti informazioni: \n\n - URL: `{webhook_url}` \n - Metodo: POST \n\n Vedi [la documentazione]({docs_url}) per ulteriori dettagli."
         },
         "step": {
             "user": {
-                "description": "Sei sicuro di voler configurare Plaato Airlock?",
+                "description": "Vuoi iniziare la configurazione?",
                 "title": "Configura il webhook di Plaato"
             }
         }
diff --git a/homeassistant/components/plaato/translations/lb.json b/homeassistant/components/plaato/translations/lb.json
index 5bded3676db..61fa40ebb5a 100644
--- a/homeassistant/components/plaato/translations/lb.json
+++ b/homeassistant/components/plaato/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir Plaato Airlock Noriichten z'empf\u00e4nken.",
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Fir Evenementer un Home Assistant ze sch\u00e9cken, muss den Webhook Feature am Plaato Airlock ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nLiest [Dokumentatioun]({docs_url}) fir w\u00e9ider D\u00e9tailer."
diff --git a/homeassistant/components/plaato/translations/nl.json b/homeassistant/components/plaato/translations/nl.json
index 4d46fb9265c..ac7b62e27b2 100644
--- a/homeassistant/components/plaato/translations/nl.json
+++ b/homeassistant/components/plaato/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Uw Home Assistant-instantie moet via internet toegankelijk zijn om berichten van de Plateo Airlock te ontvangen.",
-            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Om evenementen naar de Home Assistant te sturen, moet u de webhook-functie instellen in Plaato Airlock. \n\n Vul de volgende info in: \n\n - URL: ` {webhook_url} ` \n - Methode: POST \n\n Zie [de documentatie] ( {docs_url} ) voor meer informatie."
diff --git a/homeassistant/components/plaato/translations/no.json b/homeassistant/components/plaato/translations/no.json
index 4f771b7b963..4d9cb64d357 100644
--- a/homeassistant/components/plaato/translations/no.json
+++ b/homeassistant/components/plaato/translations/no.json
@@ -2,14 +2,15 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 kunne motta meldinger fra Plaato Airlock.",
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
             "default": "For \u00e5 sende hendelser til Home Assistant, m\u00e5 du sette opp webhook-funksjonen i Plaato Airlock. \n\n Fyll ut f\u00f8lgende informasjon: \n\n - URL: `{webhook_url}` \n - Metode: POST \n\n Se [dokumentasjonen]({docs_url}) for ytterligere detaljer."
         },
         "step": {
             "user": {
-                "description": "Er du sikker p\u00e5 at du vil sette opp Plato Airlock?",
+                "description": "Vil du starte oppsettet?",
                 "title": "Sett opp Plaato Webhook"
             }
         }
diff --git a/homeassistant/components/plaato/translations/pl.json b/homeassistant/components/plaato/translations/pl.json
index 6db0a100e4a..8f61cb7bc8b 100644
--- a/homeassistant/components/plaato/translations/pl.json
+++ b/homeassistant/components/plaato/translations/pl.json
@@ -1,15 +1,16 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z Plaato Airlock.",
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z Plaato Airlock",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistanta, musisz skonfigurowa\u0107 webhook w Plaato Airlock. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
+            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistant, musisz skonfigurowa\u0107 webhook w Plaato Airlock. \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
         },
         "step": {
             "user": {
-                "description": "Na pewno chcesz skonfigurowa\u0107 Airlock Plaato?",
+                "description": "Czy chcesz rozpocz\u0105\u0107 konfiguracj\u0119?",
                 "title": "Konfiguracja Plaato Webhook"
             }
         }
diff --git a/homeassistant/components/plaato/translations/ru.json b/homeassistant/components/plaato/translations/ru.json
index 2e6e876e896..af53b848d8c 100644
--- a/homeassistant/components/plaato/translations/ru.json
+++ b/homeassistant/components/plaato/translations/ru.json
@@ -2,14 +2,15 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 Plaato Airlock.",
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0432\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Webhook \u0434\u043b\u044f Plaato Airlock.\n\n\u0414\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
         },
         "step": {
             "user": {
-                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Plaato Airlock?",
+                "description": "\u0425\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443?",
                 "title": "Plaato Airlock"
             }
         }
diff --git a/homeassistant/components/plaato/translations/zh-Hant.json b/homeassistant/components/plaato/translations/zh-Hant.json
index b374a3111e8..a93067bd3f4 100644
--- a/homeassistant/components/plaato/translations/zh-Hant.json
+++ b/homeassistant/components/plaato/translations/zh-Hant.json
@@ -2,14 +2,15 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant \u8a2d\u5099\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 Plaato Airlock \u8a0a\u606f\u3002",
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u65bc Plaato Airlock \u5167\u8a2d\u5b9a webhook \u529f\u80fd\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
         },
         "step": {
             "user": {
-                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Plaato Airlock\uff1f",
+                "description": "\u662f\u5426\u8981\u958b\u59cb\u8a2d\u5b9a\uff1f",
                 "title": "\u8a2d\u5b9a Plaato Webhook"
             }
         }
diff --git a/homeassistant/components/plant/__init__.py b/homeassistant/components/plant/__init__.py
index 1cb2416d12a..2d829187560 100644
--- a/homeassistant/components/plant/__init__.py
+++ b/homeassistant/components/plant/__init__.py
@@ -282,7 +282,8 @@ class Plant(Entity):
         """After being added to hass, load from history."""
         if ENABLE_LOAD_HISTORY and "recorder" in self.hass.config.components:
             # only use the database if it's configured
-            self.hass.async_add_job(self._load_history_from_db)
+            await self.hass.async_add_executor_job(self._load_history_from_db)
+            self.async_write_ha_state()
 
         async_track_state_change_event(
             self.hass, list(self._sensormap), self._state_changed_event
@@ -293,7 +294,7 @@ class Plant(Entity):
             if state is not None:
                 self.state_changed(entity_id, state)
 
-    async def _load_history_from_db(self):
+    def _load_history_from_db(self):
         """Load the history of the brightness values from the database.
 
         This only needs to be done once during startup.
@@ -330,7 +331,6 @@ class Plant(Entity):
                 except ValueError:
                     pass
         _LOGGER.debug("Initializing from database completed")
-        self.async_write_ha_state()
 
     @property
     def should_poll(self):
diff --git a/homeassistant/components/plant/translations/cs.json b/homeassistant/components/plant/translations/cs.json
index e0fe7b0f6cd..e458b2cef0c 100644
--- a/homeassistant/components/plant/translations/cs.json
+++ b/homeassistant/components/plant/translations/cs.json
@@ -5,5 +5,5 @@
             "problem": "Probl\u00e9m"
         }
     },
-    "title": "Rostlina"
+    "title": "Monitor rostlin"
 }
\ No newline at end of file
diff --git a/homeassistant/components/plant/translations/pl.json b/homeassistant/components/plant/translations/pl.json
index 5c4b7378018..a7159ef6cf9 100644
--- a/homeassistant/components/plant/translations/pl.json
+++ b/homeassistant/components/plant/translations/pl.json
@@ -5,5 +5,5 @@
             "problem": "problem"
         }
     },
-    "title": "Ro\u015blina"
+    "title": "Monitor ro\u015blin"
 }
\ No newline at end of file
diff --git a/homeassistant/components/plex/__init__.py b/homeassistant/components/plex/__init__.py
index 648e7b7706a..32ee5c56f64 100644
--- a/homeassistant/components/plex/__init__.py
+++ b/homeassistant/components/plex/__init__.py
@@ -1,10 +1,11 @@
 """Support to embed Plex."""
 import asyncio
 import functools
-import json
+from functools import partial
 import logging
 
 import plexapi.exceptions
+from plexapi.gdm import GDM
 from plexwebsocket import (
     SIGNAL_CONNECTION_STATE,
     SIGNAL_DATA,
@@ -33,6 +34,7 @@ from homeassistant.core import callback
 from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
@@ -43,6 +45,8 @@ from .const import (
     CONF_SERVER_IDENTIFIER,
     DISPATCHERS,
     DOMAIN as PLEX_DOMAIN,
+    GDM_DEBOUNCER,
+    GDM_SCANNER,
     PLATFORMS,
     PLATFORMS_COMPLETED,
     PLEX_SERVER_CONFIG,
@@ -53,7 +57,7 @@ from .const import (
 )
 from .errors import ShouldUpdateConfigEntry
 from .server import PlexServer
-from .services import async_setup_services
+from .services import async_setup_services, lookup_plex_media
 
 _LOGGER = logging.getLogger(__package__)
 
@@ -67,6 +71,16 @@ async def async_setup(hass, config):
 
     await async_setup_services(hass)
 
+    gdm = hass.data[PLEX_DOMAIN][GDM_SCANNER] = GDM()
+
+    hass.data[PLEX_DOMAIN][GDM_DEBOUNCER] = Debouncer(
+        hass,
+        _LOGGER,
+        cooldown=10,
+        immediate=True,
+        function=partial(gdm.scan, scan_for_clients=True),
+    ).async_call
+
     return True
 
 
@@ -115,7 +129,7 @@ async def async_setup_entry(hass, entry):
             hass.config_entries.flow.async_init(
                 PLEX_DOMAIN,
                 context={CONF_SOURCE: SOURCE_REAUTH},
-                data={**entry.data, "config_entry_id": entry.entry_id},
+                data=entry.data,
             )
         )
         _LOGGER.error(
@@ -143,10 +157,14 @@ async def async_setup_entry(hass, entry):
 
     entry.add_update_listener(async_options_updated)
 
+    async def async_update_plex():
+        await hass.data[PLEX_DOMAIN][GDM_DEBOUNCER]()
+        await plex_server.async_update_platforms()
+
     unsub = async_dispatcher_connect(
         hass,
         PLEX_UPDATE_PLATFORMS_SIGNAL.format(server_id),
-        plex_server.async_update_platforms,
+        async_update_plex,
     )
     hass.data[PLEX_DOMAIN][DISPATCHERS].setdefault(server_id, [])
     hass.data[PLEX_DOMAIN][DISPATCHERS][server_id].append(unsub)
@@ -267,7 +285,7 @@ def play_on_sonos(hass, service_call):
     """Play Plex media on a linked Sonos device."""
     entity_id = service_call.data[ATTR_ENTITY_ID]
     content_id = service_call.data[ATTR_MEDIA_CONTENT_ID]
-    content = json.loads(content_id)
+    content_type = service_call.data.get(ATTR_MEDIA_CONTENT_TYPE)
 
     sonos = hass.components.sonos
     try:
@@ -276,27 +294,9 @@ def play_on_sonos(hass, service_call):
         _LOGGER.error("Cannot get Sonos device: %s", err)
         return
 
-    if isinstance(content, int):
-        content = {"plex_key": content}
-        content_type = PLEX_DOMAIN
-    else:
-        content_type = "music"
-
-    plex_server_name = content.get("plex_server")
-    shuffle = content.pop("shuffle", 0)
-
-    plex_servers = hass.data[PLEX_DOMAIN][SERVERS].values()
-    if plex_server_name:
-        plex_server = [x for x in plex_servers if x.friendly_name == plex_server_name]
-        if not plex_server:
-            _LOGGER.error(
-                "Requested Plex server '%s' not found in %s",
-                plex_server_name,
-                [x.friendly_name for x in plex_servers],
-            )
-            return
-    else:
-        plex_server = next(iter(plex_servers))
+    media, plex_server = lookup_plex_media(hass, content_type, content_id)
+    if media is None:
+        return
 
     sonos_speaker = plex_server.account.sonos_speaker(sonos_name)
     if sonos_speaker is None:
@@ -305,11 +305,4 @@ def play_on_sonos(hass, service_call):
         )
         return
 
-    media = plex_server.lookup_media(content_type, **content)
-    if media is None:
-        _LOGGER.error("Media could not be found: %s", content)
-        return
-
-    _LOGGER.debug("Attempting to play '%s' on %s", media, sonos_speaker)
-    playqueue = plex_server.create_playqueue(media, shuffle=shuffle)
-    sonos_speaker.playMedia(playqueue)
+    sonos_speaker.playMedia(media)
diff --git a/homeassistant/components/plex/config_flow.py b/homeassistant/components/plex/config_flow.py
index b2bf856402e..bdbdc9c6cc9 100644
--- a/homeassistant/components/plex/config_flow.py
+++ b/homeassistant/components/plex/config_flow.py
@@ -96,7 +96,6 @@ class PlexFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         self.token = None
         self.client_id = None
         self._manual = False
-        self._entry_id = None
 
     async def async_step_user(
         self, user_input=None, errors=None
@@ -230,12 +229,11 @@ class PlexFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             PLEX_SERVER_CONFIG: entry_config,
         }
 
-        await self.async_set_unique_id(server_id)
+        entry = await self.async_set_unique_id(server_id)
         if (
             self.context[CONF_SOURCE]  # pylint: disable=no-member
             == config_entries.SOURCE_REAUTH
         ):
-            entry = self.hass.config_entries.async_get_entry(self._entry_id)
             self.hass.config_entries.async_update_entry(entry, data=data)
             _LOGGER.debug("Updated config entry for %s", plex_server.friendly_name)
             await self.hass.config_entries.async_reload(entry.entry_id)
@@ -329,7 +327,6 @@ class PlexFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_reauth(self, data):
         """Handle a reauthorization flow request."""
         self.current_login = dict(data)
-        self._entry_id = self.current_login.pop("config_entry_id")
         return await self.async_step_user()
 
 
diff --git a/homeassistant/components/plex/const.py b/homeassistant/components/plex/const.py
index 9823443b897..f54c376c667 100644
--- a/homeassistant/components/plex/const.py
+++ b/homeassistant/components/plex/const.py
@@ -13,6 +13,8 @@ PLEXTV_THROTTLE = 60
 
 DEBOUNCE_TIMEOUT = 1
 DISPATCHERS = "dispatchers"
+GDM_DEBOUNCER = "gdm_debouncer"
+GDM_SCANNER = "gdm_scanner"
 PLATFORMS = frozenset(["media_player", "sensor"])
 PLATFORMS_COMPLETED = "platforms_completed"
 PLAYER_SOURCE = "player_source"
@@ -47,3 +49,5 @@ MANUAL_SETUP_STRING = "Configure Plex server manually"
 SERVICE_PLAY_ON_SONOS = "play_on_sonos"
 SERVICE_REFRESH_LIBRARY = "refresh_library"
 SERVICE_SCAN_CLIENTS = "scan_for_clients"
+
+PLEX_URI_SCHEME = "plex://"
diff --git a/homeassistant/components/plex/media_browser.py b/homeassistant/components/plex/media_browser.py
index 3c91362deb9..56e6f68a968 100644
--- a/homeassistant/components/plex/media_browser.py
+++ b/homeassistant/components/plex/media_browser.py
@@ -103,7 +103,7 @@ def browse_media(
                 children_media_class = ITEM_TYPE_MEDIA_CLASS[library_or_section.TYPE]
             except KeyError as err:
                 raise BrowseError(
-                    f"Media not found: {media_content_type} / {media_content_id}"
+                    f"Unknown type received: {library_or_section.TYPE}"
                 ) from err
         else:
             raise BrowseError(
@@ -218,9 +218,9 @@ def server_payload(plex_server):
         media_content_type="server",
         can_play=False,
         can_expand=True,
+        children_media_class=MEDIA_CLASS_DIRECTORY,
     )
     server_info.children = []
-    server_info.children_media_class = MEDIA_CLASS_DIRECTORY
     server_info.children.append(special_library_payload(server_info, "On Deck"))
     server_info.children.append(special_library_payload(server_info, "Recently Added"))
     for library in plex_server.library.sections():
diff --git a/homeassistant/components/plex/media_player.py b/homeassistant/components/plex/media_player.py
index f5dc98e4eb1..94bed1db7de 100644
--- a/homeassistant/components/plex/media_player.py
+++ b/homeassistant/components/plex/media_player.py
@@ -597,7 +597,7 @@ class PlexMediaPlayer(MediaPlayerEntity):
     @property
     def device_state_attributes(self):
         """Return the scene state attributes."""
-        attr = {
+        return {
             "media_content_rating": self._media_content_rating,
             "session_username": self.username,
             "media_library_name": self._app_name,
@@ -605,8 +605,6 @@ class PlexMediaPlayer(MediaPlayerEntity):
             "player_source": self.player_source,
         }
 
-        return attr
-
     @property
     def device_info(self):
         """Return a device description for device registry."""
diff --git a/homeassistant/components/plex/server.py b/homeassistant/components/plex/server.py
index a5ac287328e..baa41cae87f 100644
--- a/homeassistant/components/plex/server.py
+++ b/homeassistant/components/plex/server.py
@@ -4,6 +4,7 @@ import ssl
 import time
 from urllib.parse import urlparse
 
+from plexapi.client import PlexClient
 from plexapi.exceptions import BadRequest, NotFound, Unauthorized
 import plexapi.myplex
 import plexapi.playqueue
@@ -32,6 +33,8 @@ from .const import (
     CONF_USE_EPISODE_ART,
     DEBOUNCE_TIMEOUT,
     DEFAULT_VERIFY_SSL,
+    DOMAIN,
+    GDM_SCANNER,
     PLAYER_SOURCE,
     PLEX_NEW_MP_SIGNAL,
     PLEX_UPDATE_MEDIA_PLAYER_SIGNAL,
@@ -84,7 +87,7 @@ class PlexServer:
         self._owner_username = None
         self._plextv_clients = None
         self._plextv_client_timestamp = 0
-        self._plextv_device_cache = {}
+        self._client_device_cache = {}
         self._use_plex_tv = self._token is not None
         self._version = None
         self.async_update_platforms = Debouncer(
@@ -321,13 +324,33 @@ class PlexServer:
         for device in devices:
             process_device("PMS", device)
 
+        def connect_to_client(source, baseurl, machine_identifier, name="Unknown"):
+            """Connect to a Plex client and return a PlexClient instance."""
+            try:
+                client = PlexClient(
+                    server=self._plex_server,
+                    baseurl=baseurl,
+                    token=self._plex_server.createToken(),
+                )
+            except requests.exceptions.ConnectionError:
+                _LOGGER.error(
+                    "Direct client connection failed, will try again: %s (%s)",
+                    name,
+                    baseurl,
+                )
+            except Unauthorized:
+                _LOGGER.error(
+                    "Direct client connection unauthorized, ignoring: %s (%s)",
+                    name,
+                    baseurl,
+                )
+                self._client_device_cache[machine_identifier] = None
+            else:
+                self._client_device_cache[client.machineIdentifier] = client
+                process_device(source, client)
+
         def connect_to_resource(resource):
             """Connect to a plex.tv resource and return a Plex client."""
-            client_id = resource.clientIdentifier
-            if client_id in self._plextv_device_cache:
-                return self._plextv_device_cache[client_id]
-
-            client = None
             try:
                 client = resource.connect(timeout=3)
                 _LOGGER.debug("plex.tv resource connection successful: %s", client)
@@ -335,17 +358,33 @@ class PlexServer:
                 _LOGGER.error("plex.tv resource connection failed: %s", resource.name)
             else:
                 client.proxyThroughServer(value=False, server=self._plex_server)
+                self._client_device_cache[client.machineIdentifier] = client
+                process_device("plex.tv", client)
 
-            self._plextv_device_cache[client_id] = client
-            return client
+        def connect_new_clients():
+            """Create connections to newly discovered clients."""
+            for gdm_entry in self.hass.data[DOMAIN][GDM_SCANNER].entries:
+                machine_identifier = gdm_entry["data"]["Resource-Identifier"]
+                if machine_identifier in self._client_device_cache:
+                    client = self._client_device_cache[machine_identifier]
+                    if client is not None:
+                        process_device("GDM", client)
+                elif machine_identifier not in available_clients:
+                    baseurl = (
+                        f"http://{gdm_entry['from'][0]}:{gdm_entry['data']['Port']}"
+                    )
+                    name = gdm_entry["data"]["Name"]
+                    connect_to_client("GDM", baseurl, machine_identifier, name)
 
-        for plextv_client in plextv_clients:
-            if plextv_client.clientIdentifier not in available_clients:
-                device = await self.hass.async_add_executor_job(
-                    connect_to_resource, plextv_client
-                )
-                if device:
-                    process_device("plex.tv", device)
+            for plextv_client in plextv_clients:
+                if plextv_client.clientIdentifier in self._client_device_cache:
+                    client = self._client_device_cache[plextv_client.clientIdentifier]
+                    if client is not None:
+                        process_device("plex.tv", client)
+                elif plextv_client.clientIdentifier not in available_clients:
+                    connect_to_resource(plextv_client)
+
+        await self.hass.async_add_executor_job(connect_new_clients)
 
         for session in sessions:
             if session.TYPE == "photo":
@@ -385,7 +424,7 @@ class PlexServer:
         for client_id in idle_clients:
             self.async_refresh_entity(client_id, None, None)
             self._known_idle.add(client_id)
-            self._plextv_device_cache.pop(client_id, None)
+            self._client_device_cache.pop(client_id, None)
 
         if new_entity_configs:
             async_dispatcher_send(
diff --git a/homeassistant/components/plex/services.py b/homeassistant/components/plex/services.py
index c16da485b57..19a04a61a9f 100644
--- a/homeassistant/components/plex/services.py
+++ b/homeassistant/components/plex/services.py
@@ -1,4 +1,5 @@
 """Services for the Plex integration."""
+import json
 import logging
 
 from plexapi.exceptions import NotFound
@@ -73,19 +74,47 @@ def get_plex_server(hass, plex_server_name=None):
     plex_servers = hass.data[DOMAIN][SERVERS].values()
 
     if plex_server_name:
-        plex_server = [x for x in plex_servers if x.friendly_name == plex_server_name]
-        if not plex_server:
-            _LOGGER.error(
-                "Requested Plex server '%s' not found in %s",
-                plex_server_name,
-                [x.friendly_name for x in plex_servers],
-            )
-            return None
-    elif len(plex_servers) == 1:
+        plex_server = next(
+            (x for x in plex_servers if x.friendly_name == plex_server_name), None
+        )
+        if plex_server is not None:
+            return plex_server
+        _LOGGER.error(
+            "Requested Plex server '%s' not found in %s",
+            plex_server_name,
+            [x.friendly_name for x in plex_servers],
+        )
+        return None
+
+    if len(plex_servers) == 1:
         return next(iter(plex_servers))
 
     _LOGGER.error(
-        "Multiple Plex servers configured and no selection made: %s",
+        "Multiple Plex servers configured, choose with 'plex_server' key: %s",
         [x.friendly_name for x in plex_servers],
     )
     return None
+
+
+def lookup_plex_media(hass, content_type, content_id):
+    """Look up Plex media using media_player.play_media service payloads."""
+    content = json.loads(content_id)
+
+    if isinstance(content, int):
+        content = {"plex_key": content}
+        content_type = DOMAIN
+
+    plex_server_name = content.pop("plex_server", None)
+    shuffle = content.pop("shuffle", 0)
+
+    plex_server = get_plex_server(hass, plex_server_name=plex_server_name)
+    if not plex_server:
+        return (None, None)
+
+    media = plex_server.lookup_media(content_type, **content)
+    if media is None:
+        _LOGGER.error("Media could not be found: %s", content)
+        return (None, None)
+
+    playqueue = plex_server.create_playqueue(media, shuffle=shuffle)
+    return (playqueue, plex_server)
diff --git a/homeassistant/components/plex/strings.json b/homeassistant/components/plex/strings.json
index 1f9226ff776..bfe6375f5ac 100644
--- a/homeassistant/components/plex/strings.json
+++ b/homeassistant/components/plex/strings.json
@@ -17,8 +17,8 @@
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]",
-          "ssl": "Use SSL",
-          "verify_ssl": "Verify SSL certificate",
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]",
           "token": "Token (Optional)"
         }
       },
@@ -40,8 +40,8 @@
     "abort": {
       "all_configured": "All linked servers already configured",
       "already_configured": "This Plex server is already configured",
-      "already_in_progress": "Plex is being configured",
-      "reauth_successful": "Successfully reauthenticated",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "token_request_timeout": "Timed out obtaining token",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
diff --git a/homeassistant/components/plex/translations/ca.json b/homeassistant/components/plex/translations/ca.json
index 01972d383b5..6cad3cb9d6e 100644
--- a/homeassistant/components/plex/translations/ca.json
+++ b/homeassistant/components/plex/translations/ca.json
@@ -3,8 +3,8 @@
         "abort": {
             "all_configured": "Tots els servidors enlla\u00e7ats ja estan configurats",
             "already_configured": "Aquest servidor Plex ja est\u00e0 configurat",
-            "already_in_progress": "S'est\u00e0 configurant Plex",
-            "reauth_successful": "Re-autenticaci\u00f3 exitosa",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
+            "reauth_successful": "Re-autenticaci\u00f3 realitzada correctament",
             "token_request_timeout": "S'ha acabat el temps d'espera durant l'obtenci\u00f3 del token.",
             "unknown": "Error inesperat"
         },
@@ -21,7 +21,7 @@
                 "data": {
                     "host": "Amfitri\u00f3",
                     "port": "Port",
-                    "ssl": "Utilitza SSL",
+                    "ssl": "Utilitza un certificat SSL",
                     "token": "Token (opcional)",
                     "verify_ssl": "Verifica el certificat SSL"
                 },
diff --git a/homeassistant/components/plex/translations/cs.json b/homeassistant/components/plex/translations/cs.json
index 4ea95b97a9b..bef1271888f 100644
--- a/homeassistant/components/plex/translations/cs.json
+++ b/homeassistant/components/plex/translations/cs.json
@@ -1,11 +1,54 @@
 {
     "config": {
+        "abort": {
+            "all_configured": "V\u0161echny propojen\u00e9 servery jsou ji\u017e nastaveny",
+            "already_configured": "Tento server Plex je ji\u017e nastaven",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "faulty_credentials": "Autorizace se nezda\u0159ila, ov\u011b\u0159te token",
+            "host_or_token": "Je t\u0159eba poskytnout alespo\u0148 jeden hostitel nebo token",
+            "no_servers": "\u017d\u00e1dn\u00e9 servery propojen\u00e9 s \u00fa\u010dtem Plex",
+            "not_found": "Server Plex nebyl nalezen",
+            "ssl_error": "Probl\u00e9m s SSL certifik\u00e1tem"
+        },
+        "flow_title": "{name} ({host})",
         "step": {
             "manual_setup": {
                 "data": {
                     "host": "Hostitel",
-                    "port": "Port"
-                }
+                    "port": "Port",
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
+                    "token": "Token (voliteln\u00fd)",
+                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL"
+                },
+                "title": "Ru\u010dn\u00ed nastaven\u00ed Plex"
+            },
+            "select_server": {
+                "data": {
+                    "server": "Server"
+                },
+                "description": "K dispozici je v\u00edce server\u016f, vyberte jeden:",
+                "title": "Vyberte server Plex"
+            },
+            "user": {
+                "title": "Plex Media Server"
+            },
+            "user_advanced": {
+                "title": "Plex Media Server"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "plex_mp_settings": {
+                "data": {
+                    "ignore_plex_web_clients": "Ignorujte webov\u00e9 klienty Plex",
+                    "monitored_users": "Sledovan\u00ed u\u017eivatel\u00e9"
+                },
+                "description": "Mo\u017enosti pro p\u0159ehr\u00e1va\u010de m\u00e9di\u00ed Plex"
             }
         }
     }
diff --git a/homeassistant/components/plex/translations/en.json b/homeassistant/components/plex/translations/en.json
index 826f71c1244..87615c9f42e 100644
--- a/homeassistant/components/plex/translations/en.json
+++ b/homeassistant/components/plex/translations/en.json
@@ -3,8 +3,8 @@
         "abort": {
             "all_configured": "All linked servers already configured",
             "already_configured": "This Plex server is already configured",
-            "already_in_progress": "Plex is being configured",
-            "reauth_successful": "Successfully reauthenticated",
+            "already_in_progress": "Configuration flow is already in progress",
+            "reauth_successful": "Re-authentication was successful",
             "token_request_timeout": "Timed out obtaining token",
             "unknown": "Unexpected error"
         },
@@ -21,7 +21,7 @@
                 "data": {
                     "host": "Host",
                     "port": "Port",
-                    "ssl": "Use SSL",
+                    "ssl": "Uses an SSL certificate",
                     "token": "Token (Optional)",
                     "verify_ssl": "Verify SSL certificate"
                 },
diff --git a/homeassistant/components/plex/translations/es.json b/homeassistant/components/plex/translations/es.json
index cc5f4569020..71365b9e2f2 100644
--- a/homeassistant/components/plex/translations/es.json
+++ b/homeassistant/components/plex/translations/es.json
@@ -4,7 +4,7 @@
             "all_configured": "Todos los servidores vinculados ya configurados",
             "already_configured": "Este servidor Plex ya est\u00e1 configurado",
             "already_in_progress": "Plex se est\u00e1 configurando",
-            "reauth_successful": "Se ha vuelto a autenticar con \u00e9xito",
+            "reauth_successful": "La reautenticaci\u00f3n se realiz\u00f3 correctamente",
             "token_request_timeout": "Tiempo de espera agotado para la obtenci\u00f3n del token",
             "unknown": "Fall\u00f3 por razones desconocidas"
         },
@@ -21,7 +21,7 @@
                 "data": {
                     "host": "Host",
                     "port": "Puerto",
-                    "ssl": "Usar SSL",
+                    "ssl": "Utiliza un certificado SSL",
                     "token": "Token (Opcional)",
                     "verify_ssl": "Verificar certificado SSL"
                 },
diff --git a/homeassistant/components/plex/translations/et.json b/homeassistant/components/plex/translations/et.json
new file mode 100644
index 00000000000..2f780bc73be
--- /dev/null
+++ b/homeassistant/components/plex/translations/et.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Plex-i server on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "reauth_successful": "Taastuvastamine oli edukas",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "host_or_token": "Pead esitama v\u00e4hemalt \u00fche hosti v\u00f5i ligip\u00e4\u00e4suloa"
+        },
+        "flow_title": "",
+        "step": {
+            "manual_setup": {
+                "data": {
+                    "host": "",
+                    "port": "",
+                    "ssl": "Kasutab SSL serti",
+                    "verify_ssl": "Kontrolli SSL sertifikaati"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/plex/translations/it.json b/homeassistant/components/plex/translations/it.json
index dbc4a272e5d..f470c1bc163 100644
--- a/homeassistant/components/plex/translations/it.json
+++ b/homeassistant/components/plex/translations/it.json
@@ -3,7 +3,8 @@
         "abort": {
             "all_configured": "Tutti i server collegati sono gi\u00e0 configurati",
             "already_configured": "Questo server Plex \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "Plex \u00e8 in fase di configurazione",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
+            "reauth_successful": "La riautenticazione ha avuto successo",
             "token_request_timeout": "Timeout per l'ottenimento del token",
             "unknown": "Errore imprevisto"
         },
@@ -20,7 +21,7 @@
                 "data": {
                     "host": "Host",
                     "port": "Porta",
-                    "ssl": "Utilizzare SSL",
+                    "ssl": "Utilizza un certificato SSL",
                     "token": "Token (opzionale)",
                     "verify_ssl": "Verificare il certificato SSL"
                 },
diff --git a/homeassistant/components/plex/translations/nl.json b/homeassistant/components/plex/translations/nl.json
index bf3018c6672..218e11ac76d 100644
--- a/homeassistant/components/plex/translations/nl.json
+++ b/homeassistant/components/plex/translations/nl.json
@@ -25,6 +25,12 @@
                 },
                 "description": "Meerdere servers beschikbaar, selecteer er een:",
                 "title": "Selecteer Plex server"
+            },
+            "user": {
+                "title": "Plex Media Server"
+            },
+            "user_advanced": {
+                "title": "Plex Media Server"
             }
         }
     },
@@ -32,6 +38,7 @@
         "step": {
             "plex_mp_settings": {
                 "data": {
+                    "ignore_new_shared_users": "Negeer nieuwe beheerde/gedeelde gebruikers",
                     "use_episode_art": "Gebruik aflevering kunst"
                 },
                 "description": "Opties voor Plex-mediaspelers"
diff --git a/homeassistant/components/plex/translations/no.json b/homeassistant/components/plex/translations/no.json
index b279eef01f7..c5368b675b3 100644
--- a/homeassistant/components/plex/translations/no.json
+++ b/homeassistant/components/plex/translations/no.json
@@ -3,8 +3,8 @@
         "abort": {
             "all_configured": "Alle knyttet servere som allerede er konfigurert",
             "already_configured": "Denne Plex-serveren er allerede konfigurert",
-            "already_in_progress": "Plex blir konfigurert",
-            "reauth_successful": "Godkjent p\u00e5 nytt",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
+            "reauth_successful": "Reautentisering var vellykket",
             "token_request_timeout": "Tidsavbrudd ved innhenting av token",
             "unknown": "Uventet feil"
         },
@@ -15,13 +15,13 @@
             "not_found": "Plex-server ikke funnet",
             "ssl_error": "Problem med SSL-sertifikat"
         },
-        "flow_title": "{name}({host})",
+        "flow_title": "",
         "step": {
             "manual_setup": {
                 "data": {
                     "host": "Vert",
-                    "port": "",
-                    "ssl": "Bruk SSL",
+                    "port": "Port",
+                    "ssl": "Bruker et SSL-sertifikat",
                     "token": "Token (valgfritt)",
                     "verify_ssl": "Verifisere SSL-sertifikat"
                 },
diff --git a/homeassistant/components/plex/translations/pl.json b/homeassistant/components/plex/translations/pl.json
index a1d4ee96a1b..10e8ef6dc53 100644
--- a/homeassistant/components/plex/translations/pl.json
+++ b/homeassistant/components/plex/translations/pl.json
@@ -1,18 +1,19 @@
 {
     "config": {
         "abort": {
-            "all_configured": "Wszystkie znalezione serwery s\u0105 ju\u017c skonfigurowane.",
-            "already_configured": "Ten serwer Plex jest ju\u017c skonfigurowany.",
-            "already_in_progress": "Plex jest konfigurowany",
-            "token_request_timeout": "Przekroczono limit czasu na uzyskanie tokena.",
-            "unknown": "Nieznany b\u0142\u0105d"
+            "all_configured": "Wszystkie znalezione serwery s\u0105 ju\u017c skonfigurowane",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119",
+            "token_request_timeout": "Przekroczono limit czasu na uzyskanie tokena",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
-            "faulty_credentials": "Autoryzacja nie powiod\u0142a si\u0119",
-            "host_or_token": "Nalezy wprowadzi\u0107 przynajmniej jeden host lub token.",
-            "no_servers": "Brak serwer\u00f3w po\u0142\u0105czonych z kontem",
+            "faulty_credentials": "Autoryzacja nie powiod\u0142a si\u0119, sprawd\u017a token",
+            "host_or_token": "Nale\u017cy wprowadzi\u0107 przynajmniej jeden host lub token",
+            "no_servers": "Brak serwer\u00f3w po\u0142\u0105czonych z kontem Plex",
             "not_found": "Nie znaleziono serwera Plex",
-            "ssl_error": "Problem z certyfikatem SSL."
+            "ssl_error": "Problem z certyfikatem SSL"
         },
         "flow_title": "{name} ({host})",
         "step": {
@@ -20,7 +21,7 @@
                 "data": {
                     "host": "Nazwa hosta lub adres IP",
                     "port": "Port",
-                    "ssl": "U\u017cyj SSL",
+                    "ssl": "Certyfikat SSL",
                     "token": "Token dost\u0119pu (opcjonalnie)",
                     "verify_ssl": "Weryfikacja certyfikatu SSL"
                 },
diff --git a/homeassistant/components/plex/translations/ru.json b/homeassistant/components/plex/translations/ru.json
index 6229eac7d24..b1530f0808b 100644
--- a/homeassistant/components/plex/translations/ru.json
+++ b/homeassistant/components/plex/translations/ru.json
@@ -3,8 +3,8 @@
         "abort": {
             "all_configured": "\u0412\u0441\u0435 \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0435 \u0441\u0435\u0440\u0432\u0435\u0440\u044b \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u044b.",
             "already_configured": "\u042d\u0442\u043e\u0442 \u0441\u0435\u0440\u0432\u0435\u0440 Plex \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d.",
-            "already_in_progress": "\u0412\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430.",
-            "reauth_successful": "\u0410\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0439\u0434\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e.",
             "token_request_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0442\u043e\u043a\u0435\u043d\u0430.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
@@ -21,7 +21,7 @@
                 "data": {
                     "host": "\u0425\u043e\u0441\u0442",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c SSL",
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
                     "token": "\u0422\u043e\u043a\u0435\u043d (\u043d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e)",
                     "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 },
diff --git a/homeassistant/components/plex/translations/sv.json b/homeassistant/components/plex/translations/sv.json
index 5577be041e6..6ca36d302af 100644
--- a/homeassistant/components/plex/translations/sv.json
+++ b/homeassistant/components/plex/translations/sv.json
@@ -13,6 +13,11 @@
             "not_found": "Plex-server hittades inte"
         },
         "step": {
+            "manual_setup": {
+                "data": {
+                    "port": "Port"
+                }
+            },
             "select_server": {
                 "data": {
                     "server": "Server"
diff --git a/homeassistant/components/plex/translations/zh-Hant.json b/homeassistant/components/plex/translations/zh-Hant.json
index 3f41f286b30..137b953a145 100644
--- a/homeassistant/components/plex/translations/zh-Hant.json
+++ b/homeassistant/components/plex/translations/zh-Hant.json
@@ -3,8 +3,8 @@
         "abort": {
             "all_configured": "\u6240\u6709\u7d81\u5b9a\u4f3a\u670d\u5668\u90fd\u5df2\u8a2d\u5b9a\u5b8c\u6210",
             "already_configured": "Plex \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "Plex \u5df2\u7d93\u8a2d\u5b9a",
-            "reauth_successful": "\u5df2\u6210\u529f\u91cd\u65b0\u8a8d\u8b49",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
+            "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f",
             "token_request_timeout": "\u53d6\u5f97\u5bc6\u9470\u903e\u6642",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
@@ -21,7 +21,7 @@
                 "data": {
                     "host": "\u4e3b\u6a5f\u7aef",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "\u4f7f\u7528 SSL",
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
                     "token": "\u5bc6\u9470\uff08\u9078\u9805\uff09",
                     "verify_ssl": "\u78ba\u8a8d SSL \u8a8d\u8b49"
                 },
diff --git a/homeassistant/components/plugwise/__init__.py b/homeassistant/components/plugwise/__init__.py
index f7986f91540..ee6c44bc558 100644
--- a/homeassistant/components/plugwise/__init__.py
+++ b/homeassistant/components/plugwise/__init__.py
@@ -1,41 +1,17 @@
 """Plugwise platform for Home Assistant Core."""
-
 import asyncio
-from datetime import timedelta
-import logging
-from typing import Dict
 
-from Plugwise_Smile.Smile import Smile
-import async_timeout
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_SCAN_INTERVAL
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import (
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-    UpdateFailed,
-)
+from homeassistant.const import CONF_HOST
+from homeassistant.core import HomeAssistant
 
-from .const import (
-    COORDINATOR,
-    DEFAULT_PORT,
-    DEFAULT_SCAN_INTERVAL,
-    DOMAIN,
-    UNDO_UPDATE_LISTENER,
-)
+from .const import ALL_PLATFORMS, DOMAIN, UNDO_UPDATE_LISTENER
+from .gateway import async_setup_entry_gw
 
 CONFIG_SCHEMA = vol.Schema({DOMAIN: vol.Schema({})}, extra=vol.ALLOW_EXTRA)
 
-_LOGGER = logging.getLogger(__name__)
-
-SENSOR_PLATFORMS = ["sensor"]
-ALL_PLATFORMS = ["binary_sensor", "climate", "sensor", "switch"]
-
 
 async def async_setup(hass: HomeAssistant, config: dict):
     """Set up the Plugwise platform."""
@@ -43,108 +19,11 @@ async def async_setup(hass: HomeAssistant, config: dict):
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up Plugwise Smiles from a config entry."""
-    websession = async_get_clientsession(hass, verify_ssl=False)
-
-    api = Smile(
-        host=entry.data[CONF_HOST],
-        password=entry.data[CONF_PASSWORD],
-        port=entry.data.get(CONF_PORT, DEFAULT_PORT),
-        timeout=30,
-        websession=websession,
-    )
-
-    try:
-        connected = await api.connect()
-
-        if not connected:
-            _LOGGER.error("Unable to connect to Smile")
-            raise ConfigEntryNotReady
-
-    except Smile.InvalidAuthentication:
-        _LOGGER.error("Invalid Smile ID")
-        return False
-
-    except Smile.PlugwiseError as err:
-        _LOGGER.error("Error while communicating to device")
-        raise ConfigEntryNotReady from err
-
-    except asyncio.TimeoutError as err:
-        _LOGGER.error("Timeout while connecting to Smile")
-        raise ConfigEntryNotReady from err
-
-    update_interval = timedelta(
-        seconds=entry.options.get(
-            CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL[api.smile_type]
-        )
-    )
-
-    async def async_update_data():
-        """Update data via API endpoint."""
-        try:
-            async with async_timeout.timeout(10):
-                await api.full_update_device()
-                return True
-        except Smile.XMLDataMissingError as err:
-            raise UpdateFailed("Smile update failed") from err
-
-    coordinator = DataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        name="Smile",
-        update_method=async_update_data,
-        update_interval=update_interval,
-    )
-
-    await coordinator.async_refresh()
-
-    if not coordinator.last_update_success:
-        raise ConfigEntryNotReady
-
-    api.get_all_devices()
-
-    if entry.unique_id is None:
-        if api.smile_version[0] != "1.8.0":
-            hass.config_entries.async_update_entry(entry, unique_id=api.smile_hostname)
-
-    undo_listener = entry.add_update_listener(_update_listener)
-
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
-        "api": api,
-        COORDINATOR: coordinator,
-        UNDO_UPDATE_LISTENER: undo_listener,
-    }
-
-    device_registry = await dr.async_get_registry(hass)
-    device_registry.async_get_or_create(
-        config_entry_id=entry.entry_id,
-        identifiers={(DOMAIN, api.gateway_id)},
-        manufacturer="Plugwise",
-        name=entry.title,
-        model=f"Smile {api.smile_name}",
-        sw_version=api.smile_version[0],
-    )
-
-    single_master_thermostat = api.single_master_thermostat()
-
-    platforms = ALL_PLATFORMS
-    if single_master_thermostat is None:
-        platforms = SENSOR_PLATFORMS
-
-    for component in platforms:
-        hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(entry, component)
-        )
-
-    return True
-
-
-async def _update_listener(hass: HomeAssistant, entry: ConfigEntry):
-    """Handle options update."""
-    coordinator = hass.data[DOMAIN][entry.entry_id][COORDINATOR]
-    coordinator.update_interval = timedelta(
-        seconds=entry.options.get(CONF_SCAN_INTERVAL)
-    )
+    """Set up Plugwise components from a config entry."""
+    if entry.data.get(CONF_HOST):
+        return await async_setup_entry_gw(hass, entry)
+    # PLACEHOLDER USB entry setup
+    return False
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
@@ -164,60 +43,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
         hass.data[DOMAIN].pop(entry.entry_id)
 
     return unload_ok
-
-
-class SmileGateway(CoordinatorEntity):
-    """Represent Smile Gateway."""
-
-    def __init__(self, api, coordinator, name, dev_id):
-        """Initialise the gateway."""
-        super().__init__(coordinator)
-
-        self._api = api
-        self._name = name
-        self._dev_id = dev_id
-
-        self._unique_id = None
-        self._model = None
-
-        self._entity_name = self._name
-
-    @property
-    def unique_id(self):
-        """Return a unique ID."""
-        return self._unique_id
-
-    @property
-    def name(self):
-        """Return the name of the entity, if any."""
-        return self._name
-
-    @property
-    def device_info(self) -> Dict[str, any]:
-        """Return the device information."""
-
-        device_information = {
-            "identifiers": {(DOMAIN, self._dev_id)},
-            "name": self._entity_name,
-            "manufacturer": "Plugwise",
-        }
-
-        if self._model is not None:
-            device_information["model"] = self._model.replace("_", " ").title()
-
-        if self._dev_id != self._api.gateway_id:
-            device_information["via_device"] = (DOMAIN, self._api.gateway_id)
-
-        return device_information
-
-    async def async_added_to_hass(self):
-        """Subscribe to updates."""
-        self._async_process_data()
-        self.async_on_remove(
-            self.coordinator.async_add_listener(self._async_process_data)
-        )
-
-    @callback
-    def _async_process_data(self):
-        """Interpret and process API data."""
-        raise NotImplementedError
diff --git a/homeassistant/components/plugwise/climate.py b/homeassistant/components/plugwise/climate.py
index c6e34ed46cb..7981283f27d 100644
--- a/homeassistant/components/plugwise/climate.py
+++ b/homeassistant/components/plugwise/climate.py
@@ -18,7 +18,6 @@ from homeassistant.components.climate.const import (
 from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS
 from homeassistant.core import callback
 
-from . import SmileGateway
 from .const import (
     COORDINATOR,
     DEFAULT_MAX_TEMP,
@@ -27,6 +26,7 @@ from .const import (
     SCHEDULE_OFF,
     SCHEDULE_ON,
 )
+from .gateway import SmileGateway
 
 HVAC_MODES_HEAT_ONLY = [HVAC_MODE_HEAT, HVAC_MODE_AUTO]
 HVAC_MODES_HEAT_COOL = [HVAC_MODE_HEAT_COOL, HVAC_MODE_AUTO]
@@ -114,10 +114,9 @@ class PwThermostat(SmileGateway, ClimateEntity):
             if self._cooling_state:
                 return CURRENT_HVAC_COOL
             return CURRENT_HVAC_IDLE
-        if self._heating_state is not None:
-            if self._setpoint > self._temperature:
-                return CURRENT_HVAC_HEAT
-            return CURRENT_HVAC_IDLE
+        if self._setpoint > self._temperature:
+            return CURRENT_HVAC_HEAT
+        return CURRENT_HVAC_IDLE
 
     @property
     def supported_features(self):
@@ -142,10 +141,9 @@ class PwThermostat(SmileGateway, ClimateEntity):
     @property
     def hvac_modes(self):
         """Return the available hvac modes list."""
-        if self._heating_state is not None:
-            if self._compressor_state is not None:
-                return HVAC_MODES_HEAT_COOL
-            return HVAC_MODES_HEAT_ONLY
+        if self._compressor_state is not None:
+            return HVAC_MODES_HEAT_COOL
+        return HVAC_MODES_HEAT_ONLY
 
     @property
     def hvac_mode(self):
@@ -263,11 +261,11 @@ class PwThermostat(SmileGateway, ClimateEntity):
         if heater_central_data.get("compressor_state") is not None:
             self._compressor_state = heater_central_data["compressor_state"]
 
+        self._hvac_mode = HVAC_MODE_HEAT
+        if self._compressor_state is not None:
+            self._hvac_mode = HVAC_MODE_HEAT_COOL
+
         if self._schema_status:
             self._hvac_mode = HVAC_MODE_AUTO
-        elif self._heating_state is not None:
-            self._hvac_mode = HVAC_MODE_HEAT
-            if self._compressor_state is not None:
-                self._hvac_mode = HVAC_MODE_HEAT_COOL
 
         self.async_write_ha_state()
diff --git a/homeassistant/components/plugwise/config_flow.py b/homeassistant/components/plugwise/config_flow.py
index 14405062231..364f58007c6 100644
--- a/homeassistant/components/plugwise/config_flow.py
+++ b/homeassistant/components/plugwise/config_flow.py
@@ -14,35 +14,30 @@ from .const import (  # pylint:disable=unused-import
     DEFAULT_PORT,
     DEFAULT_SCAN_INTERVAL,
     DOMAIN,
+    ZEROCONF_MAP,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
-ZEROCONF_MAP = {
-    "smile": "P1 DSMR",
-    "smile_thermo": "Climate (Anna)",
-    "smile_open_therm": "Climate (Adam)",
-}
 
-
-def _base_schema(discovery_info):
-    """Generate base schema."""
-    base_schema = {}
+def _base_gw_schema(discovery_info):
+    """Generate base schema for gateways."""
+    base_gw_schema = {}
 
     if not discovery_info:
-        base_schema[vol.Required(CONF_HOST)] = str
-        base_schema[vol.Optional(CONF_PORT, default=DEFAULT_PORT)] = int
+        base_gw_schema[vol.Required(CONF_HOST)] = str
+        base_gw_schema[vol.Optional(CONF_PORT, default=DEFAULT_PORT)] = int
 
-    base_schema[vol.Required(CONF_PASSWORD)] = str
+    base_gw_schema[vol.Required(CONF_PASSWORD)] = str
 
-    return vol.Schema(base_schema)
+    return vol.Schema(base_gw_schema)
 
 
-async def validate_input(hass: core.HomeAssistant, data):
+async def validate_gw_input(hass: core.HomeAssistant, data):
     """
-    Validate the user input allows us to connect.
+    Validate the user input allows us to connect to the gateray.
 
-    Data has the keys from _base_schema() with values provided by the user.
+    Data has the keys from _base_gw_schema() with values provided by the user.
     """
     websession = async_get_clientsession(hass, verify_ssl=False)
 
@@ -64,6 +59,9 @@ async def validate_input(hass: core.HomeAssistant, data):
     return api
 
 
+# PLACEHOLDER USB connection validation
+
+
 class PlugwiseConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Plugwise Smile."""
 
@@ -95,8 +93,8 @@ class PlugwiseConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         }
         return await self.async_step_user()
 
-    async def async_step_user(self, user_input=None):
-        """Handle the initial step."""
+    async def async_step_user_gateway(self, user_input=None):
+        """Handle the initial step for gateways."""
         errors = {}
 
         if user_input is not None:
@@ -110,7 +108,7 @@ class PlugwiseConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                     return self.async_abort(reason="already_configured")
 
             try:
-                api = await validate_input(self.hass, user_input)
+                api = await validate_gw_input(self.hass, user_input)
 
             except CannotConnect:
                 errors["base"] = "cannot_connect"
@@ -128,11 +126,19 @@ class PlugwiseConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 return self.async_create_entry(title=api.smile_name, data=user_input)
 
         return self.async_show_form(
-            step_id="user",
-            data_schema=_base_schema(self.discovery_info),
+            step_id="user_gateway",
+            data_schema=_base_gw_schema(self.discovery_info),
             errors=errors or {},
         )
 
+    # PLACEHOLDER USB async_step_user_usb and async_step_user_usb_manual_paht
+
+    async def async_step_user(self, user_input=None):
+        """Handle the initial step."""
+
+        # PLACEHOLDER USB vs Gateway Logic
+        return await self.async_step_user_gateway()
+
     @staticmethod
     @callback
     def async_get_options_flow(config_entry):
diff --git a/homeassistant/components/plugwise/const.py b/homeassistant/components/plugwise/const.py
index 6feceff2d3c..056606307e5 100644
--- a/homeassistant/components/plugwise/const.py
+++ b/homeassistant/components/plugwise/const.py
@@ -1,6 +1,9 @@
 """Constant for Plugwise component."""
 DOMAIN = "plugwise"
 
+SENSOR_PLATFORMS = ["sensor"]
+ALL_PLATFORMS = ["binary_sensor", "climate", "sensor", "switch"]
+
 # Sensor mapping
 SENSOR_MAP_MODEL = 0
 SENSOR_MAP_UOM = 1
@@ -42,3 +45,9 @@ FLOW_ON_ICON = "mdi:water-pump"
 
 UNDO_UPDATE_LISTENER = "undo_update_listener"
 COORDINATOR = "coordinator"
+
+ZEROCONF_MAP = {
+    "smile": "P1",
+    "smile_thermo": "Anna",
+    "smile_open_therm": "Adam",
+}
diff --git a/homeassistant/components/plugwise/gateway.py b/homeassistant/components/plugwise/gateway.py
new file mode 100644
index 00000000000..610fff18e4b
--- /dev/null
+++ b/homeassistant/components/plugwise/gateway.py
@@ -0,0 +1,217 @@
+"""Plugwise platform for Home Assistant Core."""
+
+import asyncio
+from datetime import timedelta
+import logging
+from typing import Dict
+
+from Plugwise_Smile.Smile import Smile
+import async_timeout
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_SCAN_INTERVAL
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+    UpdateFailed,
+)
+
+from .const import (
+    ALL_PLATFORMS,
+    COORDINATOR,
+    DEFAULT_PORT,
+    DEFAULT_SCAN_INTERVAL,
+    DOMAIN,
+    SENSOR_PLATFORMS,
+    UNDO_UPDATE_LISTENER,
+)
+
+CONFIG_SCHEMA = vol.Schema({DOMAIN: vol.Schema({})}, extra=vol.ALLOW_EXTRA)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry_gw(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Plugwise Smiles from a config entry."""
+    websession = async_get_clientsession(hass, verify_ssl=False)
+
+    api = Smile(
+        host=entry.data[CONF_HOST],
+        password=entry.data[CONF_PASSWORD],
+        port=entry.data.get(CONF_PORT, DEFAULT_PORT),
+        timeout=30,
+        websession=websession,
+    )
+
+    try:
+        connected = await api.connect()
+
+        if not connected:
+            _LOGGER.error("Unable to connect to Smile")
+            raise ConfigEntryNotReady
+
+    except Smile.InvalidAuthentication:
+        _LOGGER.error("Invalid Smile ID")
+        return False
+
+    except Smile.PlugwiseError as err:
+        _LOGGER.error("Error while communicating to device")
+        raise ConfigEntryNotReady from err
+
+    except asyncio.TimeoutError as err:
+        _LOGGER.error("Timeout while connecting to Smile")
+        raise ConfigEntryNotReady from err
+
+    update_interval = timedelta(
+        seconds=entry.options.get(
+            CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL[api.smile_type]
+        )
+    )
+
+    async def async_update_data():
+        """Update data via API endpoint."""
+        try:
+            async with async_timeout.timeout(10):
+                await api.full_update_device()
+                return True
+        except Smile.XMLDataMissingError as err:
+            raise UpdateFailed("Smile update failed") from err
+
+    coordinator = DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        name="Smile",
+        update_method=async_update_data,
+        update_interval=update_interval,
+    )
+
+    await coordinator.async_refresh()
+
+    if not coordinator.last_update_success:
+        raise ConfigEntryNotReady
+
+    api.get_all_devices()
+
+    if entry.unique_id is None:
+        if api.smile_version[0] != "1.8.0":
+            hass.config_entries.async_update_entry(entry, unique_id=api.smile_hostname)
+
+    undo_listener = entry.add_update_listener(_update_listener)
+
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
+        "api": api,
+        COORDINATOR: coordinator,
+        UNDO_UPDATE_LISTENER: undo_listener,
+    }
+
+    device_registry = await dr.async_get_registry(hass)
+    device_registry.async_get_or_create(
+        config_entry_id=entry.entry_id,
+        identifiers={(DOMAIN, api.gateway_id)},
+        manufacturer="Plugwise",
+        name=entry.title,
+        model=f"Smile {api.smile_name}",
+        sw_version=api.smile_version[0],
+    )
+
+    single_master_thermostat = api.single_master_thermostat()
+
+    platforms = ALL_PLATFORMS
+    if single_master_thermostat is None:
+        platforms = SENSOR_PLATFORMS
+
+    for component in platforms:
+        hass.async_create_task(
+            hass.config_entries.async_forward_entry_setup(entry, component)
+        )
+
+    return True
+
+
+async def _update_listener(hass: HomeAssistant, entry: ConfigEntry):
+    """Handle options update."""
+    coordinator = hass.data[DOMAIN][entry.entry_id][COORDINATOR]
+    coordinator.update_interval = timedelta(
+        seconds=entry.options.get(CONF_SCAN_INTERVAL)
+    )
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Unload a config entry."""
+    unload_ok = all(
+        await asyncio.gather(
+            *[
+                hass.config_entries.async_forward_entry_unload(entry, component)
+                for component in ALL_PLATFORMS
+            ]
+        )
+    )
+
+    hass.data[DOMAIN][entry.entry_id][UNDO_UPDATE_LISTENER]()
+
+    if unload_ok:
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
+
+
+class SmileGateway(CoordinatorEntity):
+    """Represent Smile Gateway."""
+
+    def __init__(self, api, coordinator, name, dev_id):
+        """Initialise the gateway."""
+        super().__init__(coordinator)
+
+        self._api = api
+        self._name = name
+        self._dev_id = dev_id
+
+        self._unique_id = None
+        self._model = None
+
+        self._entity_name = self._name
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
+    @property
+    def name(self):
+        """Return the name of the entity, if any."""
+        return self._name
+
+    @property
+    def device_info(self) -> Dict[str, any]:
+        """Return the device information."""
+
+        device_information = {
+            "identifiers": {(DOMAIN, self._dev_id)},
+            "name": self._entity_name,
+            "manufacturer": "Plugwise",
+        }
+
+        if self._model is not None:
+            device_information["model"] = self._model.replace("_", " ").title()
+
+        if self._dev_id != self._api.gateway_id:
+            device_information["via_device"] = (DOMAIN, self._api.gateway_id)
+
+        return device_information
+
+    async def async_added_to_hass(self):
+        """Subscribe to updates."""
+        self._async_process_data()
+        self.async_on_remove(
+            self.coordinator.async_add_listener(self._async_process_data)
+        )
+
+    @callback
+    def _async_process_data(self):
+        """Interpret and process API data."""
+        raise NotImplementedError
diff --git a/homeassistant/components/plugwise/manifest.json b/homeassistant/components/plugwise/manifest.json
index 222db34b344..f431ce9ee97 100644
--- a/homeassistant/components/plugwise/manifest.json
+++ b/homeassistant/components/plugwise/manifest.json
@@ -2,7 +2,7 @@
   "domain": "plugwise",
   "name": "Plugwise",
   "documentation": "https://www.home-assistant.io/integrations/plugwise",
-  "requirements": ["Plugwise_Smile==1.5.1"],
+  "requirements": ["Plugwise_Smile==1.6.0"],
   "codeowners": ["@CoMPaTech", "@bouwew"],
   "zeroconf": ["_plugwise._tcp.local."],
   "config_flow": true
diff --git a/homeassistant/components/plugwise/sensor.py b/homeassistant/components/plugwise/sensor.py
index 787f4630001..483153c6709 100644
--- a/homeassistant/components/plugwise/sensor.py
+++ b/homeassistant/components/plugwise/sensor.py
@@ -19,7 +19,6 @@ from homeassistant.const import (
 from homeassistant.core import callback
 from homeassistant.helpers.entity import Entity
 
-from . import SmileGateway
 from .const import (
     COOL_ICON,
     COORDINATOR,
@@ -32,6 +31,7 @@ from .const import (
     SENSOR_MAP_UOM,
     UNIT_LUMEN,
 )
+from .gateway import SmileGateway
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/plugwise/strings.json b/homeassistant/components/plugwise/strings.json
index 0abcd780255..4e6ea18017b 100644
--- a/homeassistant/components/plugwise/strings.json
+++ b/homeassistant/components/plugwise/strings.json
@@ -12,22 +12,29 @@
   "config": {
     "step": {
       "user": {
+        "title": "Plugwise type",
+        "description": "Product:",
+        "data": {
+          "flow_type": "Connection type"
+        }
+      },
+      "user_gateway": {
         "title": "Connect to the Smile",
         "description": "Please enter:",
         "data": {
           "password": "Smile ID",
-          "host": "Smile IP address",
-          "port": "Smile port number"
+          "host": "[%key:common::config_flow::data::ip%]",
+          "port": "[%key:common::config_flow::data::port%]"
         }
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication, check the 8 characters of your Smile ID",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "This Smile is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     },
     "flow_title": "Smile: {name}"
   }
diff --git a/homeassistant/components/plugwise/switch.py b/homeassistant/components/plugwise/switch.py
index a34eabe3d2e..d7b45f4999a 100644
--- a/homeassistant/components/plugwise/switch.py
+++ b/homeassistant/components/plugwise/switch.py
@@ -7,8 +7,8 @@ from Plugwise_Smile.Smile import Smile
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import callback
 
-from . import SmileGateway
 from .const import COORDINATOR, DOMAIN
+from .gateway import SmileGateway
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/plugwise/translations/ca.json b/homeassistant/components/plugwise/translations/ca.json
index 0477c6e1dad..d5fc2b7d398 100644
--- a/homeassistant/components/plugwise/translations/ca.json
+++ b/homeassistant/components/plugwise/translations/ca.json
@@ -1,23 +1,33 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Smile ja est\u00e0 configurat"
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
-            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida, comprova els 8 car\u00e0cters de l'ID de Smile.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
         "flow_title": "Smile: {name}",
         "step": {
             "user": {
                 "data": {
-                    "host": "Adre\u00e7a IP de Smile",
+                    "flow_type": "Tipus de connexi\u00f3",
+                    "host": "Adre\u00e7a IP",
                     "password": "ID de Smile",
-                    "port": "N\u00famero de port de Smile"
+                    "port": "Port"
+                },
+                "description": "Producte:",
+                "title": "Tipus de Plugwise"
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "Adre\u00e7a IP",
+                    "password": "ID de Smile",
+                    "port": "Port"
                 },
                 "description": "Introdueix:",
-                "title": "Connecta't amb el Smile"
+                "title": "Connexi\u00f3 amb Smile"
             }
         }
     },
diff --git a/homeassistant/components/plugwise/translations/cs.json b/homeassistant/components/plugwise/translations/cs.json
index ca6cd85a20f..03cc31e3cab 100644
--- a/homeassistant/components/plugwise/translations/cs.json
+++ b/homeassistant/components/plugwise/translations/cs.json
@@ -1,10 +1,40 @@
 {
+    "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "flow_type": "Typ p\u0159ipojen\u00ed",
+                    "host": "IP adresa",
+                    "port": "Port"
+                },
+                "description": "Produkt:",
+                "title": "Typ Plugwise"
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "IP adresa",
+                    "port": "Port"
+                },
+                "description": "Pros\u00edm zadejte:",
+                "title": "P\u0159ipojen\u00ed k Smile"
+            }
+        }
+    },
     "options": {
         "step": {
             "init": {
                 "data": {
                     "scan_interval": "Interval sledov\u00e1n\u00ed (v sekund\u00e1ch)"
-                }
+                },
+                "description": "Upravte mo\u017enosti Plugwise"
             }
         }
     }
diff --git a/homeassistant/components/plugwise/translations/de.json b/homeassistant/components/plugwise/translations/de.json
index 19d3678b5e8..43ea3c8e3b5 100644
--- a/homeassistant/components/plugwise/translations/de.json
+++ b/homeassistant/components/plugwise/translations/de.json
@@ -8,11 +8,26 @@
         "step": {
             "user": {
                 "data": {
+                    "flow_type": "Verbindungstyp",
                     "host": "Smile IP-Adresse",
                     "password": "Smile ID"
                 },
                 "description": "Details",
                 "title": "Stellen Sie eine Verbindung zu Smile her"
+            },
+            "user_gateway": {
+                "data": {
+                    "port": "Port"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Scanintervall (Sekunden)"
+                }
             }
         }
     }
diff --git a/homeassistant/components/plugwise/translations/el.json b/homeassistant/components/plugwise/translations/el.json
index cdd3c177cb7..1636ae0bef1 100644
--- a/homeassistant/components/plugwise/translations/el.json
+++ b/homeassistant/components/plugwise/translations/el.json
@@ -7,5 +7,15 @@
                 }
             }
         }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "\u0394\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1 \u03c3\u03ac\u03c1\u03c9\u03c3\u03b7\u03c2 (\u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03b1)"
+                },
+                "description": "\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ce\u03bd \u03c4\u03bf\u03c0\u03bf\u03b8\u03ad\u03c4\u03b7\u03c3\u03b7\u03c2"
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/plugwise/translations/en.json b/homeassistant/components/plugwise/translations/en.json
index 8da8694f872..20f84d94aff 100644
--- a/homeassistant/components/plugwise/translations/en.json
+++ b/homeassistant/components/plugwise/translations/en.json
@@ -1,20 +1,30 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This Smile is already configured"
+            "already_configured": "Service is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
-            "invalid_auth": "Invalid authentication, check the 8 characters of your Smile ID",
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
         "flow_title": "Smile: {name}",
         "step": {
             "user": {
                 "data": {
-                    "host": "Smile IP address",
+                    "flow_type": "Connection type",
+                    "host": "IP Address",
                     "password": "Smile ID",
-                    "port": "Smile port number"
+                    "port": "Port"
+                },
+                "description": "Product:",
+                "title": "Plugwise type"
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "IP Address",
+                    "password": "Smile ID",
+                    "port": "Port"
                 },
                 "description": "Please enter:",
                 "title": "Connect to the Smile"
diff --git a/homeassistant/components/plugwise/translations/es.json b/homeassistant/components/plugwise/translations/es.json
index 9ab00348f81..b436fbbfa09 100644
--- a/homeassistant/components/plugwise/translations/es.json
+++ b/homeassistant/components/plugwise/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Este Smile ya est\u00e1 configurado"
+            "already_configured": "El servicio ya est\u00e1 configurado"
         },
         "error": {
             "cannot_connect": "No se ha podido conectar, por favor, int\u00e9ntelo de nuevo.",
@@ -12,12 +12,22 @@
         "step": {
             "user": {
                 "data": {
+                    "flow_type": "Tipo de conexi\u00f3n",
                     "host": "Direcci\u00f3n IP de Smile",
                     "password": "ID Smile",
-                    "port": "N\u00famero de puerto de Smile"
+                    "port": "Puerto"
                 },
                 "description": "Detalles",
                 "title": "Conectarse a Smile"
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "Direcci\u00f3n IP",
+                    "password": "ID Smile",
+                    "port": "Puerto"
+                },
+                "description": "Por favor introduce:",
+                "title": "Conectarse a Smile"
             }
         }
     },
diff --git a/homeassistant/components/plugwise/translations/et.json b/homeassistant/components/plugwise/translations/et.json
index a1a5d42db59..4b8c5870511 100644
--- a/homeassistant/components/plugwise/translations/et.json
+++ b/homeassistant/components/plugwise/translations/et.json
@@ -1,4 +1,33 @@
 {
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "flow_type": "\u00dchenduse t\u00fc\u00fcp",
+                    "host": "IP aadress",
+                    "password": "Smile ID",
+                    "port": "Smile pordi number"
+                }
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "IP aadress",
+                    "password": "Smile ID",
+                    "port": "Port"
+                },
+                "description": "Palun sisesta:",
+                "title": "Loo \u00fchendus Smile-ga"
+            }
+        }
+    },
     "options": {
         "step": {
             "init": {
diff --git a/homeassistant/components/plugwise/translations/it.json b/homeassistant/components/plugwise/translations/it.json
index 0a215c39f65..4896ac69b1b 100644
--- a/homeassistant/components/plugwise/translations/it.json
+++ b/homeassistant/components/plugwise/translations/it.json
@@ -1,23 +1,33 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Smile gi\u00e0 configurato"
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
-            "invalid_auth": "Autenticazione non valida. Controllare gli 8 caratteri dell'ID Smile",
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
         "flow_title": "Smile: {name}",
         "step": {
             "user": {
                 "data": {
-                    "host": "Indirizzo IP Smile",
+                    "flow_type": "Tipo di connessione",
+                    "host": "Indirizzo IP",
                     "password": "ID Smile",
-                    "port": "Numero porta Smile"
+                    "port": "Porta"
+                },
+                "description": "Prodotto:",
+                "title": "Tipo di Plugwise"
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "Indirizzo IP",
+                    "password": "ID Smile",
+                    "port": "Porta"
                 },
                 "description": "Si prega di inserire:",
-                "title": "Connettersi al dispositivo"
+                "title": "Connettiti allo Smile"
             }
         }
     },
diff --git a/homeassistant/components/plugwise/translations/lb.json b/homeassistant/components/plugwise/translations/lb.json
index cd2100804a0..b4983f2775b 100644
--- a/homeassistant/components/plugwise/translations/lb.json
+++ b/homeassistant/components/plugwise/translations/lb.json
@@ -1,20 +1,20 @@
 {
     "config": {
         "abort": {
-            "already_configured": "D\u00ebse Smile ass scho konfigur\u00e9iert"
+            "already_configured": "Service ass scho konfigur\u00e9iert"
         },
         "error": {
-            "cannot_connect": "Feeler beim verbannen, prob\u00e9ier w.e.g. nach emol.",
-            "invalid_auth": "Ong\u00eblteg Authentifikatioun, iwwerpr\u00e9if d\u00e9i 8 Charakteren vun denger Smile ID",
+            "cannot_connect": "Feeler beim verbannen",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "unknown": "Onerwaarte Feeler"
         },
         "flow_title": "Smile: {name}",
         "step": {
             "user": {
                 "data": {
-                    "host": "Smile IP Adresse",
+                    "host": "IP Adresse",
                     "password": "Smile ID",
-                    "port": "Smile Port Nummer"
+                    "port": "Port"
                 },
                 "description": "Detailler",
                 "title": "Mat Smile verbannen"
diff --git a/homeassistant/components/plugwise/translations/nl.json b/homeassistant/components/plugwise/translations/nl.json
index 5d0bd789957..be80bb0bdd5 100644
--- a/homeassistant/components/plugwise/translations/nl.json
+++ b/homeassistant/components/plugwise/translations/nl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Deze Smile is al geconfigureerd"
+            "already_configured": "De service is al geconfigureerd"
         },
         "error": {
             "cannot_connect": "Verbinding mislukt, probeer het opnieuw",
@@ -11,11 +11,21 @@
         "step": {
             "user": {
                 "data": {
+                    "flow_type": "Verbindingstype",
                     "host": "Smile IP-adres",
-                    "password": "Smile-ID"
+                    "password": "Smile-ID",
+                    "port": "Poort"
                 },
                 "description": "Details",
                 "title": "Maak verbinding met de Smile"
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "IP-adres",
+                    "password": "Smile-ID",
+                    "port": "Poort"
+                },
+                "title": "Maak verbinding met de Smile"
             }
         }
     },
diff --git a/homeassistant/components/plugwise/translations/no.json b/homeassistant/components/plugwise/translations/no.json
index 4902ada06c2..a648ef739cc 100644
--- a/homeassistant/components/plugwise/translations/no.json
+++ b/homeassistant/components/plugwise/translations/no.json
@@ -1,20 +1,30 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne Smile-enheten er allerede konfigurert"
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
-            "invalid_auth": "Ugyldig godkjenning, sjekk din 8-tegns Smile ID",
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
         "flow_title": "",
         "step": {
             "user": {
                 "data": {
-                    "host": "Smile IP-adresse",
+                    "flow_type": "Tilkoblingstype",
+                    "host": "IP adresse",
                     "password": "",
-                    "port": "Smil portnummer"
+                    "port": "Port"
+                },
+                "description": "Produkt:",
+                "title": ""
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "IP adresse",
+                    "password": "Smile ID",
+                    "port": "Port"
                 },
                 "description": "Vennligst skriv inn:",
                 "title": "Koble til Smile"
diff --git a/homeassistant/components/plugwise/translations/pl.json b/homeassistant/components/plugwise/translations/pl.json
index 16996161f09..41559a38a67 100644
--- a/homeassistant/components/plugwise/translations/pl.json
+++ b/homeassistant/components/plugwise/translations/pl.json
@@ -1,22 +1,43 @@
 {
     "config": {
         "abort": {
-            "already_configured": "TenSmile jest ju\u017c skonfigurowany."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
-            "invalid_auth": "Nieudane uwierzytelnienie, sprawd\u017a Smile ID",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "flow_title": "Smile: {name}",
         "step": {
             "user": {
                 "data": {
-                    "host": "Adres IP Smile",
-                    "password": "Smile ID"
+                    "flow_type": "Typ po\u0142\u0105czenia",
+                    "host": "Adres IP",
+                    "password": "Identyfikator Smile",
+                    "port": "Port"
                 },
-                "description": "Szczeg\u00f3\u0142y",
-                "title": "Po\u0142\u0105cz si\u0119 ze Smile"
+                "description": "Wybierz produkt:",
+                "title": "Wybierz typ Plugwise"
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "Adres IP",
+                    "password": "Identyfikator Smile",
+                    "port": "Port"
+                },
+                "description": "Wprowad\u017a:",
+                "title": "Po\u0142\u0105czenie ze Smile"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Cz\u0119stotliwo\u015b\u0107 skanowania (w sekundach)"
+                },
+                "description": "Dostosowywanie opcji Plugwise"
             }
         }
     }
diff --git a/homeassistant/components/plugwise/translations/pt-BR.json b/homeassistant/components/plugwise/translations/pt-BR.json
new file mode 100644
index 00000000000..a375e2c1f67
--- /dev/null
+++ b/homeassistant/components/plugwise/translations/pt-BR.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "flow_type": "Tipo de conex\u00e3o"
+                }
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "Endere\u00e7o IP"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/plugwise/translations/ru.json b/homeassistant/components/plugwise/translations/ru.json
index 5d3afb061fc..7bbf48491b1 100644
--- a/homeassistant/components/plugwise/translations/ru.json
+++ b/homeassistant/components/plugwise/translations/ru.json
@@ -1,23 +1,33 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
-            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 ID \u0438 \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "flow_title": "Smile: {name}",
         "step": {
             "user": {
                 "data": {
+                    "flow_type": "\u0422\u0438\u043f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f",
                     "host": "IP-\u0430\u0434\u0440\u0435\u0441",
                     "password": "ID \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430",
-                    "port": "\u041d\u043e\u043c\u0435\u0440 \u043f\u043e\u0440\u0442\u0430 Smile"
+                    "port": "\u041f\u043e\u0440\u0442"
                 },
-                "description": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435 Home Assistant \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438 \u0441 Plugwise.",
-                "title": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443"
+                "description": "\u041f\u0440\u043e\u0434\u0443\u043a\u0442:",
+                "title": "\u0422\u0438\u043f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 Plugwise"
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "IP-\u0430\u0434\u0440\u0435\u0441",
+                    "password": "Smile ID",
+                    "port": "\u041f\u043e\u0440\u0442"
+                },
+                "description": "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u0432\u0435\u0434\u0438\u0442\u0435:",
+                "title": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a Smile"
             }
         }
     },
diff --git a/homeassistant/components/plugwise/translations/zh-Hans.json b/homeassistant/components/plugwise/translations/zh-Hans.json
new file mode 100644
index 00000000000..80c129af78d
--- /dev/null
+++ b/homeassistant/components/plugwise/translations/zh-Hans.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "step": {
+            "user_gateway": {
+                "data": {
+                    "host": "IP\u5730\u5740",
+                    "port": "\u7aef\u53e3"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/plugwise/translations/zh-Hant.json b/homeassistant/components/plugwise/translations/zh-Hant.json
index 58dd71266b3..e4f603c18da 100644
--- a/homeassistant/components/plugwise/translations/zh-Hant.json
+++ b/homeassistant/components/plugwise/translations/zh-Hant.json
@@ -1,20 +1,30 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Smile \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
-            "invalid_auth": "\u9a57\u8b49\u7121\u6548\uff0c\u8acb\u6aa2\u67e5\u6240\u8f38\u5165\u7684  Smile ID 8 \u4f4d\u5b57\u5143",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "flow_title": "Smile : {name}",
         "step": {
             "user": {
                 "data": {
-                    "host": "Smile IP \u4f4d\u5740",
+                    "flow_type": "\u9023\u7dda\u985e\u578b",
+                    "host": "IP \u4f4d\u5740",
                     "password": "Smile ID",
-                    "port": "Smile \u901a\u8a0a\u57e0"
+                    "port": "\u901a\u8a0a\u57e0"
+                },
+                "description": "\u7522\u54c1\uff1a",
+                "title": "Plugwise \u985e\u578b"
+            },
+            "user_gateway": {
+                "data": {
+                    "host": "IP \u4f4d\u5740",
+                    "password": "Smile ID",
+                    "port": "\u901a\u8a0a\u57e0"
                 },
                 "description": "\u8acb\u8f38\u5165\u8cc7\u8a0a\uff1a",
                 "title": "\u9023\u7dda\u81f3 Smile"
diff --git a/homeassistant/components/plum_lightpad/light.py b/homeassistant/components/plum_lightpad/light.py
index a94014ff1f9..feacec4492b 100644
--- a/homeassistant/components/plum_lightpad/light.py
+++ b/homeassistant/components/plum_lightpad/light.py
@@ -1,6 +1,5 @@
 """Support for Plum Lightpad lights."""
 import asyncio
-import logging
 from typing import Callable, List
 
 from plumlightpad import Plum
@@ -20,8 +19,6 @@ import homeassistant.util.color as color_util
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/plum_lightpad/translations/et.json b/homeassistant/components/plum_lightpad/translations/et.json
new file mode 100644
index 00000000000..03c20ffd00f
--- /dev/null
+++ b/homeassistant/components/plum_lightpad/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "E-post"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/plum_lightpad/translations/nl.json b/homeassistant/components/plum_lightpad/translations/nl.json
new file mode 100644
index 00000000000..42978a06b37
--- /dev/null
+++ b/homeassistant/components/plum_lightpad/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Account is al geconfigureerd"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/plum_lightpad/translations/no.json b/homeassistant/components/plum_lightpad/translations/no.json
index f4f16565659..4746a09ca9a 100644
--- a/homeassistant/components/plum_lightpad/translations/no.json
+++ b/homeassistant/components/plum_lightpad/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/plum_lightpad/translations/pl.json b/homeassistant/components/plum_lightpad/translations/pl.json
index 83d814d65dc..7fbfef8df75 100644
--- a/homeassistant/components/plum_lightpad/translations/pl.json
+++ b/homeassistant/components/plum_lightpad/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
@@ -9,8 +9,8 @@
         "step": {
             "user": {
                 "data": {
-                    "password": "[%key_id:common::config_flow::data::password%]",
-                    "username": "[%key_id:common::config_flow::data::email%]"
+                    "password": "Has\u0142o",
+                    "username": "Adres e-mail"
                 }
             }
         }
diff --git a/homeassistant/components/plum_lightpad/translations/zh-Hans.json b/homeassistant/components/plum_lightpad/translations/zh-Hans.json
new file mode 100644
index 00000000000..6a9d4aa28c5
--- /dev/null
+++ b/homeassistant/components/plum_lightpad/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u90ae\u7bb1"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/point/__init__.py b/homeassistant/components/point/__init__.py
index ba6c621dbd6..13dce13c0da 100644
--- a/homeassistant/components/point/__init__.py
+++ b/homeassistant/components/point/__init__.py
@@ -75,22 +75,22 @@ async def async_setup(hass, config):
 async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
     """Set up Point from a config entry."""
 
-    def token_saver(token):
-        _LOGGER.debug("Saving updated token")
+    async def token_saver(token, **kwargs):
+        _LOGGER.debug("Saving updated token %s", token)
         hass.config_entries.async_update_entry(
             entry, data={**entry.data, CONF_TOKEN: token}
         )
 
-    # Force token update.
-    entry.data[CONF_TOKEN]["expires_in"] = -1
     session = PointSession(
+        hass.helpers.aiohttp_client.async_get_clientsession(),
         entry.data["refresh_args"][CONF_CLIENT_ID],
+        entry.data["refresh_args"][CONF_CLIENT_SECRET],
         token=entry.data[CONF_TOKEN],
-        auto_refresh_kwargs=entry.data["refresh_args"],
         token_saver=token_saver,
     )
-
-    if not session.is_authorized:
+    try:
+        await session.ensure_active_token()
+    except Exception:  # pylint: disable=broad-except
         _LOGGER.error("Authentication Error")
         return False
 
@@ -120,8 +120,7 @@ async def async_setup_webhook(hass: HomeAssistantType, entry: ConfigEntry, sessi
                 CONF_WEBHOOK_URL: webhook_url,
             },
         )
-    await hass.async_add_executor_job(
-        session.update_webhook,
+    await session.update_webhook(
         entry.data[CONF_WEBHOOK_URL],
         entry.data[CONF_WEBHOOK_ID],
         ["*"],
@@ -136,14 +135,14 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry):
     """Unload a config entry."""
     hass.components.webhook.async_unregister(entry.data[CONF_WEBHOOK_ID])
     session = hass.data[DOMAIN].pop(entry.entry_id)
-    await hass.async_add_executor_job(session.remove_webhook)
-
-    if not hass.data[DOMAIN]:
-        hass.data.pop(DOMAIN)
+    await session.remove_webhook()
 
     for component in ("binary_sensor", "sensor"):
         await hass.config_entries.async_forward_entry_unload(entry, component)
 
+    if not hass.data[DOMAIN]:
+        hass.data.pop(DOMAIN)
+
     return True
 
 
@@ -181,12 +180,10 @@ class MinutPointClient:
 
     async def _sync(self):
         """Update local list of devices."""
-        if (
-            not await self._hass.async_add_executor_job(self._client.update)
-            and self._is_available
-        ):
+        if not await self._client.update() and self._is_available:
             self._is_available = False
             _LOGGER.warning("Device is unavailable")
+            async_dispatcher_send(self._hass, SIGNAL_UPDATE_ENTITY)
             return
 
         async def new_device(device_id, component):
@@ -221,24 +218,26 @@ class MinutPointClient:
 
     def is_available(self, device_id):
         """Return device availability."""
+        if not self._is_available:
+            return False
         return device_id in self._client.device_ids
 
-    def remove_webhook(self):
+    async def remove_webhook(self):
         """Remove the session webhook."""
-        return self._client.remove_webhook()
+        return await self._client.remove_webhook()
 
     @property
     def homes(self):
         """Return known homes."""
         return self._client.homes
 
-    def alarm_disarm(self, home_id):
+    async def async_alarm_disarm(self, home_id):
         """Send alarm disarm command."""
-        return self._client.alarm_disarm(home_id)
+        return await self._client.alarm_disarm(home_id)
 
-    def alarm_arm(self, home_id):
+    async def async_alarm_arm(self, home_id):
         """Send alarm arm command."""
-        return self._client.alarm_arm(home_id)
+        return await self._client.alarm_arm(home_id)
 
 
 class MinutPointEntity(Entity):
diff --git a/homeassistant/components/point/alarm_control_panel.py b/homeassistant/components/point/alarm_control_panel.py
index 25e135f59cb..8325c89f129 100644
--- a/homeassistant/components/point/alarm_control_panel.py
+++ b/homeassistant/components/point/alarm_control_panel.py
@@ -99,15 +99,15 @@ class MinutPointAlarmControl(AlarmControlPanelEntity):
         """Return the user the last change was triggered by."""
         return self._changed_by
 
-    def alarm_disarm(self, code=None):
+    async def async_alarm_disarm(self, code=None):
         """Send disarm command."""
-        status = self._client.alarm_disarm(self._home_id)
+        status = await self._client.async_alarm_disarm(self._home_id)
         if status:
             self._home["alarm_status"] = "off"
 
-    def alarm_arm_away(self, code=None):
+    async def async_alarm_arm_away(self, code=None):
         """Send arm away command."""
-        status = self._client.alarm_arm(self._home_id)
+        status = await self._client.async_alarm_arm(self._home_id)
         if status:
             self._home["alarm_status"] = "on"
 
diff --git a/homeassistant/components/point/config_flow.py b/homeassistant/components/point/config_flow.py
index 5a343f276a7..815b872d3e9 100644
--- a/homeassistant/components/point/config_flow.py
+++ b/homeassistant/components/point/config_flow.py
@@ -102,7 +102,6 @@ class PointFlowHandler(config_entries.ConfigFlow):
         except Exception:  # pylint: disable=broad-except
             _LOGGER.exception("Unexpected error generating auth url")
             return self.async_abort(reason="authorize_url_fail")
-
         return self.async_show_form(
             step_id="auth",
             description_placeholders={"authorization_url": url},
@@ -111,11 +110,14 @@ class PointFlowHandler(config_entries.ConfigFlow):
 
     async def _get_authorization_url(self):
         """Create Minut Point session and get authorization url."""
-
         flow = self.hass.data[DATA_FLOW_IMPL][self.flow_impl]
         client_id = flow[CONF_CLIENT_ID]
         client_secret = flow[CONF_CLIENT_SECRET]
-        point_session = PointSession(client_id, client_secret=client_secret)
+        point_session = PointSession(
+            self.hass.helpers.aiohttp_client.async_get_clientsession(),
+            client_id,
+            client_secret,
+        )
 
         self.hass.http.register_view(MinutAuthCallbackView())
 
@@ -143,17 +145,19 @@ class PointFlowHandler(config_entries.ConfigFlow):
         flow = self.hass.data[DATA_FLOW_IMPL][DOMAIN]
         client_id = flow[CONF_CLIENT_ID]
         client_secret = flow[CONF_CLIENT_SECRET]
-        point_session = PointSession(client_id, client_secret=client_secret)
-        token = await self.hass.async_add_executor_job(
-            point_session.get_access_token, code
+        point_session = PointSession(
+            self.hass.helpers.aiohttp_client.async_get_clientsession(),
+            client_id,
+            client_secret,
         )
+        token = await point_session.get_access_token(code)
         _LOGGER.debug("Got new token")
         if not point_session.is_authorized:
             _LOGGER.error("Authentication Error")
             return self.async_abort(reason="auth_error")
 
         _LOGGER.info("Successfully authenticated Point")
-        user_email = point_session.user().get("email") or ""
+        user_email = (await point_session.user()).get("email") or ""
 
         return self.async_create_entry(
             title=user_email,
diff --git a/homeassistant/components/point/manifest.json b/homeassistant/components/point/manifest.json
index d68acc4832c..6c25cdef91a 100644
--- a/homeassistant/components/point/manifest.json
+++ b/homeassistant/components/point/manifest.json
@@ -3,7 +3,7 @@
   "name": "Minut Point",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/point",
-  "requirements": ["pypoint==1.1.2"],
+  "requirements": ["pypoint==2.0.0"],
   "dependencies": ["webhook", "http"],
   "codeowners": ["@fredrike"],
   "quality_scale": "gold"
diff --git a/homeassistant/components/point/sensor.py b/homeassistant/components/point/sensor.py
index 9436877e434..87f9a8ab2fe 100644
--- a/homeassistant/components/point/sensor.py
+++ b/homeassistant/components/point/sensor.py
@@ -57,13 +57,11 @@ class MinutPointSensor(MinutPointEntity):
 
     async def _update_callback(self):
         """Update the value of the sensor."""
+        _LOGGER.debug("Update sensor value for %s", self)
         if self.is_updated:
-            _LOGGER.debug("Update sensor value for %s", self)
-            self._value = await self.hass.async_add_executor_job(
-                self.device.sensor, self.device_class
-            )
+            self._value = await self.device.sensor(self.device_class)
             self._updated = parse_datetime(self.device.last_update)
-            self.async_write_ha_state()
+        self.async_write_ha_state()
 
     @property
     def icon(self):
diff --git a/homeassistant/components/point/translations/ca.json b/homeassistant/components/point/translations/ca.json
index 184a7c9df58..b0814e56615 100644
--- a/homeassistant/components/point/translations/ca.json
+++ b/homeassistant/components/point/translations/ca.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_setup": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3.",
             "authorize_url_fail": "S'ha produ\u00eft un error desconegut al generar l'URL d'autoritzaci\u00f3.",
-            "authorize_url_timeout": "Temps d'espera durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3 esgotat.",
+            "authorize_url_timeout": "Temps d'espera esgotat durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
             "external_setup": "Point s'ha configurat correctament des d'un altre flux de dades.",
             "no_flows": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3."
         },
@@ -24,7 +24,7 @@
                     "flow_impl": "Prove\u00efdor"
                 },
                 "description": "Vols comen\u00e7ar la configuraci\u00f3?",
-                "title": "Selecci\u00f3 del m\u00e8tode d'autenticaci\u00f3"
+                "title": "Selecciona el m\u00e8tode d'autenticaci\u00f3"
             }
         }
     }
diff --git a/homeassistant/components/point/translations/cs.json b/homeassistant/components/point/translations/cs.json
index 17a333a660d..39670ea6ed5 100644
--- a/homeassistant/components/point/translations/cs.json
+++ b/homeassistant/components/point/translations/cs.json
@@ -1,30 +1,30 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Ji\u017e nakonfigurov\u00e1no. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace.",
+            "already_setup": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace.",
             "authorize_url_fail": "Nezn\u00e1m\u00e1 chyba p\u0159i generov\u00e1n\u00ed autoriza\u010dn\u00ed URL.",
             "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
-            "external_setup": "Point \u00fasp\u011b\u0161n\u011b nakonfigurov\u00e1n z jin\u00e9ho toku.",
-            "no_flows": "Mus\u00edte nakonfigurovat Point, abyste se s n\u00edm mohli ov\u011b\u0159it. [P\u0159e\u010dt\u011bte si pros\u00edm pokyny](https://www.home-assistant.io/components/point/)."
+            "external_setup": "Point \u00fasp\u011b\u0161n\u011b nastaveno jin\u00fdm zp\u016fsobem.",
+            "no_flows": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace."
         },
         "create_entry": {
-            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno pomoc\u00ed n\u00e1stroje Minut pro va\u0161e za\u0159\u00edzen\u00ed Point"
+            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno"
         },
         "error": {
             "follow_link": "P\u0159edt\u00edm, ne\u017e stisknete tla\u010d\u00edtko Odeslat, postupujte podle tohoto odkazu a autentizujte se",
-            "no_token": "Nen\u00ed ov\u011b\u0159en s Minut"
+            "no_token": "Neplatn\u00fd p\u0159\u00edstupov\u00fd token"
         },
         "step": {
             "auth": {
-                "description": "Postupujte podle n\u00ed\u017ee uveden\u00e9ho odkazu a <b> P\u0159ijm\u011bte </b> p\u0159\u00edstup k \u00fa\u010dtu Minut, pot\u00e9 se vra\u0165te zp\u011bt a stiskn\u011bte n\u00ed\u017ee <b> Odeslat </b> . \n\n [Odkaz]({authorization_url})",
+                "description": "Postupujte podle n\u00ed\u017ee uveden\u00e9ho odkazu a **P\u0159ijm\u011bte** p\u0159\u00edstup k \u00fa\u010dtu Minut, pot\u00e9 se vra\u0165te zp\u011bt a stiskn\u011bte n\u00ed\u017ee **Odeslat**. \n\n[Odkaz]({authorization_url})",
                 "title": "Ov\u011b\u0159en\u00ed Point"
             },
             "user": {
                 "data": {
                     "flow_impl": "Poskytovatel"
                 },
-                "description": "Zvolte pomoc\u00ed kter\u00e9ho poskytovatele ov\u011b\u0159ov\u00e1n\u00ed chcete ov\u011b\u0159it Point.",
-                "title": "Poskytovatel ov\u011b\u0159en\u00ed"
+                "description": "Chcete za\u010d\u00edt nastavovat?",
+                "title": "Vyberte metodu ov\u011b\u0159en\u00ed"
             }
         }
     }
diff --git a/homeassistant/components/point/translations/et.json b/homeassistant/components/point/translations/et.json
new file mode 100644
index 00000000000..d019b687733
--- /dev/null
+++ b/homeassistant/components/point/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine.",
+            "authorize_url_fail": "Tundmatu viga tuvastamise URL-i loomisel.",
+            "authorize_url_timeout": "Tuvastamise URL'i loomise ajal\u00f5pp.",
+            "no_flows": "Osis pole seadistatud. Palun vaata dokumentatsiooni."
+        },
+        "create_entry": {
+            "default": "Tuvastamine \u00f5nnestus"
+        },
+        "error": {
+            "no_token": "Vigane juurdep\u00e4\u00e4sut\u00f5end"
+        },
+        "step": {
+            "user": {
+                "description": "Kas alustan seadistamist?",
+                "title": "Vali tuvastusmeetod"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/point/translations/no.json b/homeassistant/components/point/translations/no.json
index f9fb69d7f67..2b4f431189e 100644
--- a/homeassistant/components/point/translations/no.json
+++ b/homeassistant/components/point/translations/no.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Allerede konfigurert. Bare en enkelt konfigurasjon mulig.",
+            "already_setup": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
             "authorize_url_fail": "Ukjent feil ved oppretting av godkjenningsadresse.",
-            "authorize_url_timeout": "Tidsavbrudd ved oppretting av godkjenningsadresse.",
+            "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
             "external_setup": "Punktet er konfigurert fra en annen flyt.",
-            "no_flows": "Komponenten er ikke konfigurert. F\u00f8lg dokumentasjonen."
+            "no_flows": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen."
         },
         "create_entry": {
             "default": "Vellykket godkjenning"
@@ -23,8 +23,8 @@
                 "data": {
                     "flow_impl": "Tilbyder"
                 },
-                "description": "\u00d8nsker du \u00e5 starte oppsettet?",
-                "title": "Velg godkjenningsleverand\u00f8r"
+                "description": "Vil du starte oppsettet?",
+                "title": "Velg godkjenningsmetode"
             }
         }
     }
diff --git a/homeassistant/components/point/translations/pl.json b/homeassistant/components/point/translations/pl.json
index 286c9e67fc8..e0624b5ff98 100644
--- a/homeassistant/components/point/translations/pl.json
+++ b/homeassistant/components/point/translations/pl.json
@@ -2,13 +2,13 @@
     "config": {
         "abort": {
             "already_setup": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
-            "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania url autoryzacji.",
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
-            "external_setup": "Punkt pomy\u015blnie skonfigurowany.",
+            "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania url autoryzacji",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
+            "external_setup": "Punkt pomy\u015blnie skonfigurowany",
             "no_flows": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105."
         },
         "create_entry": {
-            "default": "Pomy\u015blnie uwierzytelniono przy u\u017cyciu Minut dla urz\u0105dze\u0144 Point"
+            "default": "Pomy\u015blnie uwierzytelniono"
         },
         "error": {
             "follow_link": "Prosz\u0119 klikn\u0105\u0107 link i uwierzytelni\u0107 przed naci\u015bni\u0119ciem przycisku \"Zatwierd\u017a\"",
@@ -16,14 +16,14 @@
         },
         "step": {
             "auth": {
-                "description": "Kliknij poni\u017cszy link i <b>Zaakceptuj</b> dost\u0119p do konta Minut, a nast\u0119pnie wr\u00f3\u0107 i naci\u015bnij <b>Zatwierd\u017a</b> poni\u017cej. \n\n [Link]({authorization_url})",
+                "description": "Kliknij poni\u017cszy link i **Zaakceptuj** dost\u0119p do konta Minut, a nast\u0119pnie wr\u00f3\u0107 i naci\u015bnij **Zatwierd\u017a** poni\u017cej. \n\n [Link]({authorization_url})",
                 "title": "Uwierzytelnienie Point"
             },
             "user": {
                 "data": {
                     "flow_impl": "Dostawca"
                 },
-                "description": "Wybierz, kt\u00f3rego dostawc\u0119 uwierzytelnienia chcesz u\u017cywa\u0107 z Point.",
+                "description": "Czy chcesz rozpocz\u0105\u0107 konfiguracj\u0119?",
                 "title": "Wybierz metod\u0119 uwierzytelniania"
             }
         }
diff --git a/homeassistant/components/poolsense/binary_sensor.py b/homeassistant/components/poolsense/binary_sensor.py
index 6c3f5dc4cda..ea07f1637a6 100644
--- a/homeassistant/components/poolsense/binary_sensor.py
+++ b/homeassistant/components/poolsense/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for PoolSense binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_PROBLEM,
     BinarySensorEntity,
@@ -10,8 +8,6 @@ from homeassistant.const import CONF_EMAIL
 from . import PoolSenseEntity
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 BINARY_SENSORS = {
     "pH Status": {
         "unit": None,
diff --git a/homeassistant/components/poolsense/sensor.py b/homeassistant/components/poolsense/sensor.py
index b79f7499bcd..a64cc0aef61 100644
--- a/homeassistant/components/poolsense/sensor.py
+++ b/homeassistant/components/poolsense/sensor.py
@@ -1,6 +1,4 @@
 """Sensor platform for the PoolSense sensor."""
-import logging
-
 from homeassistant.const import (
     ATTR_ATTRIBUTION,
     CONF_EMAIL,
@@ -15,8 +13,6 @@ from homeassistant.helpers.entity import Entity
 from . import PoolSenseEntity
 from .const import ATTRIBUTION, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSORS = {
     "Chlorine": {
         "unit": "mV",
diff --git a/homeassistant/components/poolsense/translations/ca.json b/homeassistant/components/poolsense/translations/ca.json
index 58816c45a16..923aedcee66 100644
--- a/homeassistant/components/poolsense/translations/ca.json
+++ b/homeassistant/components/poolsense/translations/ca.json
@@ -12,7 +12,7 @@
                     "email": "Correu electr\u00f2nic",
                     "password": "Contrasenya"
                 },
-                "description": "[%key:common::config_flow::description%]",
+                "description": "Vols comen\u00e7ar la configuraci\u00f3?",
                 "title": "PoolSense"
             }
         }
diff --git a/homeassistant/components/poolsense/translations/cs.json b/homeassistant/components/poolsense/translations/cs.json
new file mode 100644
index 00000000000..85669bbd566
--- /dev/null
+++ b/homeassistant/components/poolsense/translations/cs.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "email": "E-mail",
+                    "password": "Heslo"
+                },
+                "description": "Chcete za\u010d\u00edt nastavovat?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/poolsense/translations/en.json b/homeassistant/components/poolsense/translations/en.json
index 524061fc023..5203d6228c4 100644
--- a/homeassistant/components/poolsense/translations/en.json
+++ b/homeassistant/components/poolsense/translations/en.json
@@ -12,7 +12,7 @@
                     "email": "Email",
                     "password": "Password"
                 },
-                "description": "[%key:common::config_flow::description%]",
+                "description": "Do you want to start set up?",
                 "title": "PoolSense"
             }
         }
diff --git a/homeassistant/components/poolsense/translations/et.json b/homeassistant/components/poolsense/translations/et.json
new file mode 100644
index 00000000000..ae00a14e035
--- /dev/null
+++ b/homeassistant/components/poolsense/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "email": "E-post",
+                    "password": "Salas\u00f5na"
+                },
+                "description": "Kas alustan seadistamist?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/poolsense/translations/it.json b/homeassistant/components/poolsense/translations/it.json
index 7198039c8b5..1dc8c700e21 100644
--- a/homeassistant/components/poolsense/translations/it.json
+++ b/homeassistant/components/poolsense/translations/it.json
@@ -12,7 +12,7 @@
                     "email": "E-mail",
                     "password": "Password"
                 },
-                "description": "[%key:common::config_flow::description%]",
+                "description": "Vuoi iniziare la configurazione?",
                 "title": "PoolSense"
             }
         }
diff --git a/homeassistant/components/poolsense/translations/no.json b/homeassistant/components/poolsense/translations/no.json
index 38adc04c1db..e2873a36080 100644
--- a/homeassistant/components/poolsense/translations/no.json
+++ b/homeassistant/components/poolsense/translations/no.json
@@ -12,7 +12,7 @@
                     "email": "E-post",
                     "password": "Passord"
                 },
-                "description": "[%key:common::config_flow::description%]",
+                "description": "Vil du starte oppsettet?",
                 "title": ""
             }
         }
diff --git a/homeassistant/components/poolsense/translations/pl.json b/homeassistant/components/poolsense/translations/pl.json
index 54f1a80b043..6f87cacce4f 100644
--- a/homeassistant/components/poolsense/translations/pl.json
+++ b/homeassistant/components/poolsense/translations/pl.json
@@ -10,8 +10,10 @@
             "user": {
                 "data": {
                     "email": "Adres e-mail",
-                    "password": "[%key_id:common::config_flow::data::password%]"
-                }
+                    "password": "Has\u0142o"
+                },
+                "description": "Czy chcesz rozpocz\u0105\u0107 konfiguracj\u0119?",
+                "title": "PoolSense"
             }
         }
     }
diff --git a/homeassistant/components/poolsense/translations/ru.json b/homeassistant/components/poolsense/translations/ru.json
index ed7adab0ccf..3687b75a6f7 100644
--- a/homeassistant/components/poolsense/translations/ru.json
+++ b/homeassistant/components/poolsense/translations/ru.json
@@ -12,7 +12,7 @@
                     "email": "\u0410\u0434\u0440\u0435\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b",
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c"
                 },
-                "description": "[%key:common::config_flow::description%]",
+                "description": "\u0425\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443?",
                 "title": "PoolSense"
             }
         }
diff --git a/homeassistant/components/poolsense/translations/sv.json b/homeassistant/components/poolsense/translations/sv.json
new file mode 100644
index 00000000000..ad96ce6310d
--- /dev/null
+++ b/homeassistant/components/poolsense/translations/sv.json
@@ -0,0 +1,9 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "description": "Vill du starta konfigurationen?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/poolsense/translations/zh-Hant.json b/homeassistant/components/poolsense/translations/zh-Hant.json
index f298fc17de1..3841a173df9 100644
--- a/homeassistant/components/poolsense/translations/zh-Hant.json
+++ b/homeassistant/components/poolsense/translations/zh-Hant.json
@@ -12,7 +12,7 @@
                     "email": "\u96fb\u5b50\u90f5\u4ef6",
                     "password": "\u5bc6\u78bc"
                 },
-                "description": "[%key:common::config_flow::description%]",
+                "description": "\u662f\u5426\u8981\u958b\u59cb\u8a2d\u5b9a\uff1f",
                 "title": "PoolSense"
             }
         }
diff --git a/homeassistant/components/powerwall/__init__.py b/homeassistant/components/powerwall/__init__.py
index 2dc19a0771d..fcf44fcf9b1 100644
--- a/homeassistant/components/powerwall/__init__.py
+++ b/homeassistant/components/powerwall/__init__.py
@@ -4,7 +4,7 @@ from datetime import timedelta
 import logging
 
 import requests
-from tesla_powerwall import APIChangedError, Powerwall, PowerwallUnreachableError
+from tesla_powerwall import MissingAttributeError, Powerwall, PowerwallUnreachableError
 import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
@@ -72,9 +72,7 @@ async def _migrate_old_unique_ids(hass, entry_id, powerwall_data):
             # The old unique_id ended with the nomianal_system_engery_kWh so we can use that
             # to find the old base unique_id and extract the device_suffix.
             normalized_energy_index = (
-                len(parts)
-                - 1
-                - parts[::-1].index(str(site_info.nominal_system_energy_kWh))
+                len(parts) - 1 - parts[::-1].index(str(site_info.nominal_system_energy))
             )
             device_suffix = parts[normalized_energy_index + 1 :]
 
@@ -90,7 +88,9 @@ async def _migrate_old_unique_ids(hass, entry_id, powerwall_data):
     await entity_registry.async_migrate_entries(hass, entry_id, _async_migrator)
 
 
-async def _async_handle_api_changed_error(hass: HomeAssistant, error: APIChangedError):
+async def _async_handle_api_changed_error(
+    hass: HomeAssistant, error: MissingAttributeError
+):
     # The error might include some important information about what exactly changed.
     _LOGGER.error(str(error))
     hass.components.persistent_notification.async_create(
@@ -116,7 +116,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     except PowerwallUnreachableError as err:
         http_session.close()
         raise ConfigEntryNotReady from err
-    except APIChangedError as err:
+    except MissingAttributeError as err:
         http_session.close()
         await _async_handle_api_changed_error(hass, err)
         return False
@@ -135,7 +135,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
                 )
             except PowerwallUnreachableError as err:
                 raise UpdateFailed("Unable to fetch data from powerwall") from err
-            except APIChangedError as err:
+            except MissingAttributeError as err:
                 await _async_handle_api_changed_error(hass, err)
                 hass.data[DOMAIN][entry.entry_id][POWERWALL_API_CHANGED] = True
                 # Returns the cached data. This data can also be None
diff --git a/homeassistant/components/powerwall/binary_sensor.py b/homeassistant/components/powerwall/binary_sensor.py
index f064616c5ab..1cacaa5fc42 100644
--- a/homeassistant/components/powerwall/binary_sensor.py
+++ b/homeassistant/components/powerwall/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for powerwall binary sensors."""
-import logging
-
 from tesla_powerwall import GridStatus
 
 from homeassistant.components.binary_sensor import (
@@ -19,13 +17,10 @@ from .const import (
     POWERWALL_API_SITE_INFO,
     POWERWALL_API_SITEMASTER,
     POWERWALL_API_STATUS,
-    POWERWALL_BATTERY_METER,
     POWERWALL_COORDINATOR,
 )
 from .entity import PowerWallEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the August sensors."""
@@ -74,7 +69,7 @@ class PowerWallRunningSensor(PowerWallEntity, BinarySensorEntity):
     @property
     def is_on(self):
         """Get the powerwall running state."""
-        return self.coordinator.data[POWERWALL_API_SITEMASTER].running
+        return self.coordinator.data[POWERWALL_API_SITEMASTER].is_running
 
 
 class PowerWallConnectedSensor(PowerWallEntity, BinarySensorEntity):
@@ -98,7 +93,7 @@ class PowerWallConnectedSensor(PowerWallEntity, BinarySensorEntity):
     @property
     def is_on(self):
         """Get the powerwall connected to tesla state."""
-        return self.coordinator.data[POWERWALL_API_SITEMASTER].connected_to_tesla
+        return self.coordinator.data[POWERWALL_API_SITEMASTER].is_connected_to_tesla
 
 
 class PowerWallGridStatusSensor(PowerWallEntity, BinarySensorEntity):
@@ -147,6 +142,4 @@ class PowerWallChargingStatusSensor(PowerWallEntity, BinarySensorEntity):
     def is_on(self):
         """Powerwall is charging."""
         # is_sending_to returns true for values greater than 100 watts
-        return self.coordinator.data[POWERWALL_API_METERS][
-            POWERWALL_BATTERY_METER
-        ].is_sending_to()
+        return self.coordinator.data[POWERWALL_API_METERS].battery.is_sending_to()
diff --git a/homeassistant/components/powerwall/config_flow.py b/homeassistant/components/powerwall/config_flow.py
index fd44949e386..eb23ce4e030 100644
--- a/homeassistant/components/powerwall/config_flow.py
+++ b/homeassistant/components/powerwall/config_flow.py
@@ -1,7 +1,7 @@
 """Config flow for Tesla Powerwall integration."""
 import logging
 
-from tesla_powerwall import APIChangedError, Powerwall, PowerwallUnreachableError
+from tesla_powerwall import MissingAttributeError, Powerwall, PowerwallUnreachableError
 import voluptuous as vol
 
 from homeassistant import config_entries, core, exceptions
@@ -27,7 +27,7 @@ async def validate_input(hass: core.HomeAssistant, data):
         site_info = await hass.async_add_executor_job(power_wall.get_site_info)
     except PowerwallUnreachableError as err:
         raise CannotConnect from err
-    except APIChangedError as err:
+    except MissingAttributeError as err:
         # Only log the exception without the traceback
         _LOGGER.error(str(err))
         raise WrongVersion from err
diff --git a/homeassistant/components/powerwall/const.py b/homeassistant/components/powerwall/const.py
index caf08679652..6dd4558a98c 100644
--- a/homeassistant/components/powerwall/const.py
+++ b/homeassistant/components/powerwall/const.py
@@ -29,8 +29,6 @@ POWERWALL_API_SERIAL_NUMBERS = "serial_numbers"
 
 POWERWALL_HTTP_SESSION = "http_session"
 
-POWERWALL_BATTERY_METER = "battery"
-
 MODEL = "PowerWall 2"
 MANUFACTURER = "Tesla"
 
diff --git a/homeassistant/components/powerwall/manifest.json b/homeassistant/components/powerwall/manifest.json
index 930da38edde..be83f6825e7 100644
--- a/homeassistant/components/powerwall/manifest.json
+++ b/homeassistant/components/powerwall/manifest.json
@@ -3,6 +3,6 @@
   "name": "Tesla Powerwall",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/powerwall",
-  "requirements": ["tesla-powerwall==0.2.12"],
+  "requirements": ["tesla-powerwall==0.3.3"],
   "codeowners": ["@bdraco", "@jrester"]
 }
diff --git a/homeassistant/components/powerwall/sensor.py b/homeassistant/components/powerwall/sensor.py
index ff8830c3970..5026d2fb357 100644
--- a/homeassistant/components/powerwall/sensor.py
+++ b/homeassistant/components/powerwall/sensor.py
@@ -1,7 +1,7 @@
 """Support for August sensors."""
 import logging
 
-from tesla_powerwall import MeterType, convert_to_kw
+from tesla_powerwall import MeterType
 
 from homeassistant.const import DEVICE_CLASS_BATTERY, DEVICE_CLASS_POWER, PERCENTAGE
 
@@ -85,7 +85,7 @@ class PowerWallChargeSensor(PowerWallEntity):
     @property
     def state(self):
         """Get the current value in percentage."""
-        return self.coordinator.data[POWERWALL_API_CHARGE]
+        return round(self.coordinator.data[POWERWALL_API_CHARGE])
 
 
 class PowerWallEnergySensor(PowerWallEntity):
@@ -131,18 +131,18 @@ class PowerWallEnergySensor(PowerWallEntity):
         """Get the current value in kW."""
         return (
             self.coordinator.data[POWERWALL_API_METERS]
-            .get(self._meter)
+            .get_meter(self._meter)
             .get_power(precision=3)
         )
 
     @property
     def device_state_attributes(self):
         """Return the device specific state attributes."""
-        meter = self.coordinator.data[POWERWALL_API_METERS].get(self._meter)
+        meter = self.coordinator.data[POWERWALL_API_METERS].get_meter(self._meter)
         return {
             ATTR_FREQUENCY: round(meter.frequency, 1),
-            ATTR_ENERGY_EXPORTED: convert_to_kw(meter.energy_exported),
-            ATTR_ENERGY_IMPORTED: convert_to_kw(meter.energy_imported),
-            ATTR_INSTANT_AVERAGE_VOLTAGE: round(meter.instant_average_voltage, 1),
+            ATTR_ENERGY_EXPORTED: meter.get_energy_exported(),
+            ATTR_ENERGY_IMPORTED: meter.get_energy_imported(),
+            ATTR_INSTANT_AVERAGE_VOLTAGE: round(meter.avarage_voltage, 1),
             ATTR_IS_ACTIVE: meter.is_active(),
         }
diff --git a/homeassistant/components/powerwall/strings.json b/homeassistant/components/powerwall/strings.json
index ce7e6a1965f..86b7db3e909 100644
--- a/homeassistant/components/powerwall/strings.json
+++ b/homeassistant/components/powerwall/strings.json
@@ -3,14 +3,18 @@
     "step": {
       "user": {
         "title": "Connect to the powerwall",
-        "data": { "ip_address": "IP Address" }
+        "data": {
+          "ip_address": "[%key:common::config_flow::data::ip%]"
+        }
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "wrong_version": "Your powerwall uses a software version that is not supported. Please consider upgrading or reporting this issue so it can be resolved.",
-      "unknown": "Unexpected error"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
-    "abort": { "already_configured": "The powerwall is already configured" }
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
   }
 }
diff --git a/homeassistant/components/powerwall/translations/ca.json b/homeassistant/components/powerwall/translations/ca.json
index b0764b78234..2c9becb1795 100644
--- a/homeassistant/components/powerwall/translations/ca.json
+++ b/homeassistant/components/powerwall/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El Powerwall ja est\u00e0 configurat"
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "unknown": "Error inesperat",
             "wrong_version": "El teu Powerwall utilitza una versi\u00f3 de programari no compatible. L'hauries d'actualitzar o informar d'aquest problema perqu\u00e8 sigui solucionat."
         },
diff --git a/homeassistant/components/powerwall/translations/cs.json b/homeassistant/components/powerwall/translations/cs.json
new file mode 100644
index 00000000000..b64eabcf33b
--- /dev/null
+++ b/homeassistant/components/powerwall/translations/cs.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba",
+            "wrong_version": "Powerwall pou\u017e\u00edv\u00e1 verzi softwaru, kter\u00e1 nen\u00ed podporov\u00e1na. Zva\u017ete upgrade nebo nahlaste probl\u00e9m, aby mohl b\u00fdt vy\u0159e\u0161en."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP adresa"
+                },
+                "title": "P\u0159ipojen\u00ed k powerwall"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/powerwall/translations/en.json b/homeassistant/components/powerwall/translations/en.json
index 8b45c665d85..773daace5c0 100644
--- a/homeassistant/components/powerwall/translations/en.json
+++ b/homeassistant/components/powerwall/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "The powerwall is already configured"
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "unknown": "Unexpected error",
             "wrong_version": "Your powerwall uses a software version that is not supported. Please consider upgrading or reporting this issue so it can be resolved."
         },
diff --git a/homeassistant/components/powerwall/translations/et.json b/homeassistant/components/powerwall/translations/et.json
new file mode 100644
index 00000000000..17b06492a40
--- /dev/null
+++ b/homeassistant/components/powerwall/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchenduse loomine nurjus. Proovi uuesti",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP aadress"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/powerwall/translations/it.json b/homeassistant/components/powerwall/translations/it.json
index 09a3d570801..422a28b6936 100644
--- a/homeassistant/components/powerwall/translations/it.json
+++ b/homeassistant/components/powerwall/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il Powerwall \u00e8 gi\u00e0 configurato"
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "unknown": "Errore imprevisto",
             "wrong_version": "Il tuo powerwall utilizza una versione del software non supportata. Si prega di considerare l'aggiornamento o la segnalazione di questo problema in modo che possa essere risolto."
         },
diff --git a/homeassistant/components/powerwall/translations/no.json b/homeassistant/components/powerwall/translations/no.json
index a688a9ad8c4..7ddab100358 100644
--- a/homeassistant/components/powerwall/translations/no.json
+++ b/homeassistant/components/powerwall/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Powerwall er allerede konfigurert"
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil",
             "wrong_version": "Powerwall bruker en programvareversjon som ikke st\u00f8ttes. Vennligst vurder \u00e5 oppgradere eller rapportere dette problemet, s\u00e5 det kan l\u00f8ses."
         },
diff --git a/homeassistant/components/powerwall/translations/pl.json b/homeassistant/components/powerwall/translations/pl.json
index cc56f1e116d..8532066608c 100644
--- a/homeassistant/components/powerwall/translations/pl.json
+++ b/homeassistant/components/powerwall/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Powerwall jest ju\u017c skonfigurowane."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d",
             "wrong_version": "Powerwall u\u017cywa wersji oprogramowania, kt\u00f3ra nie jest obs\u0142ugiwana. Rozwa\u017c uaktualnienie lub zg\u0142oszenie tego problemu, aby mo\u017cna go by\u0142o rozwi\u0105za\u0107."
         },
diff --git a/homeassistant/components/powerwall/translations/ru.json b/homeassistant/components/powerwall/translations/ru.json
index cf3b1cd4ba0..a8713bcd04a 100644
--- a/homeassistant/components/powerwall/translations/ru.json
+++ b/homeassistant/components/powerwall/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
             "wrong_version": "\u0412\u0430\u0448 powerwall \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0432\u0435\u0440\u0441\u0438\u044e \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u043e\u0433\u043e \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u044f, \u043a\u043e\u0442\u043e\u0440\u0430\u044f \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0440\u0430\u0441\u0441\u043c\u043e\u0442\u0440\u0438\u0442\u0435 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0438\u043b\u0438 \u0441\u043e\u043e\u0431\u0449\u0438\u0442\u0435 \u043e\u0431 \u044d\u0442\u043e\u0439 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0435, \u0447\u0442\u043e\u0431\u044b \u0435\u0435 \u043c\u043e\u0436\u043d\u043e \u0431\u044b\u043b\u043e \u0440\u0435\u0448\u0438\u0442\u044c."
         },
diff --git a/homeassistant/components/powerwall/translations/zh-Hant.json b/homeassistant/components/powerwall/translations/zh-Hant.json
index 8883e669a85..8cfa8bdb46b 100644
--- a/homeassistant/components/powerwall/translations/zh-Hant.json
+++ b/homeassistant/components/powerwall/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Powerwall \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4",
             "wrong_version": "\u4e0d\u652f\u63f4\u60a8\u6240\u4f7f\u7528\u7684 Powerwall \u7248\u672c\u3002\u8acb\u8003\u616e\u9032\u884c\u5347\u7d1a\u6216\u56de\u5831\u6b64\u554f\u984c\u3001\u4ee5\u671f\u554f\u984c\u53ef\u4ee5\u7372\u5f97\u89e3\u6c7a\u3002"
         },
diff --git a/homeassistant/components/profiler/__init__.py b/homeassistant/components/profiler/__init__.py
new file mode 100644
index 00000000000..518e448d4ec
--- /dev/null
+++ b/homeassistant/components/profiler/__init__.py
@@ -0,0 +1,80 @@
+"""The profiler integration."""
+import asyncio
+import cProfile
+import time
+
+from pyprof2calltree import convert
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers.service import async_register_admin_service
+from homeassistant.helpers.typing import ConfigType
+
+from .const import DOMAIN
+
+SERVICE_START = "start"
+CONF_SECONDS = "seconds"
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the profiler component."""
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Set up Profiler from a config entry."""
+
+    lock = asyncio.Lock()
+
+    async def _async_run_profile(call: ServiceCall):
+        async with lock:
+            await _async_generate_profile(hass, call)
+
+    async_register_admin_service(
+        hass,
+        DOMAIN,
+        SERVICE_START,
+        _async_run_profile,
+        schema=vol.Schema(
+            {vol.Optional(CONF_SECONDS, default=60.0): vol.Coerce(float)}
+        ),
+    )
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Unload a config entry."""
+    hass.services.async_remove(domain=DOMAIN, service=SERVICE_START)
+    return True
+
+
+async def _async_generate_profile(hass: HomeAssistant, call: ServiceCall):
+    start_time = int(time.time() * 1000000)
+    hass.components.persistent_notification.async_create(
+        "The profile started. This notification will be updated when it is complete.",
+        title="Profile Started",
+        notification_id=f"profiler_{start_time}",
+    )
+    profiler = cProfile.Profile()
+    profiler.enable()
+    await asyncio.sleep(float(call.data[CONF_SECONDS]))
+    profiler.disable()
+
+    cprofile_path = hass.config.path(f"profile.{start_time}.cprof")
+    callgrind_path = hass.config.path(f"callgrind.out.{start_time}")
+    await hass.async_add_executor_job(
+        _write_profile, profiler, cprofile_path, callgrind_path
+    )
+    hass.components.persistent_notification.async_create(
+        f"Wrote cProfile data to {cprofile_path} and callgrind data to {callgrind_path}",
+        title="Profile Complete",
+        notification_id=f"profiler_{start_time}",
+    )
+
+
+def _write_profile(profiler, cprofile_path, callgrind_path):
+    profiler.create_stats()
+    profiler.dump_stats(cprofile_path)
+    convert(profiler.getstats(), callgrind_path)
diff --git a/homeassistant/components/profiler/config_flow.py b/homeassistant/components/profiler/config_flow.py
new file mode 100644
index 00000000000..9a71b64a179
--- /dev/null
+++ b/homeassistant/components/profiler/config_flow.py
@@ -0,0 +1,24 @@
+"""Config flow for Profiler integration."""
+import voluptuous as vol
+
+from homeassistant import config_entries
+
+from .const import DEFAULT_NAME
+from .const import DOMAIN  # pylint: disable=unused-import
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Profiler."""
+
+    VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_UNKNOWN
+
+    async def async_step_user(self, user_input=None):
+        """Handle the initial step."""
+        if self._async_current_entries():
+            return self.async_abort(reason="single_instance_allowed")
+
+        if user_input is not None:
+            return self.async_create_entry(title=DEFAULT_NAME, data={})
+
+        return self.async_show_form(step_id="user", data_schema=vol.Schema({}))
diff --git a/homeassistant/components/profiler/const.py b/homeassistant/components/profiler/const.py
new file mode 100644
index 00000000000..ee80a9175f8
--- /dev/null
+++ b/homeassistant/components/profiler/const.py
@@ -0,0 +1,4 @@
+"""Consts used by profiler."""
+
+DOMAIN = "profiler"
+DEFAULT_NAME = "Profiler"
diff --git a/homeassistant/components/profiler/manifest.json b/homeassistant/components/profiler/manifest.json
new file mode 100644
index 00000000000..e740a083c77
--- /dev/null
+++ b/homeassistant/components/profiler/manifest.json
@@ -0,0 +1,13 @@
+{
+  "domain": "profiler",
+  "name": "Profiler",
+  "documentation": "https://www.home-assistant.io/integrations/profiler",
+  "requirements": [
+    "pyprof2calltree==1.4.5"
+  ],
+  "codeowners": [
+    "@bdraco"
+  ],
+  "quality_scale": "internal",
+  "config_flow": true
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/services.yaml b/homeassistant/components/profiler/services.yaml
new file mode 100644
index 00000000000..7033e988fc5
--- /dev/null
+++ b/homeassistant/components/profiler/services.yaml
@@ -0,0 +1,6 @@
+start:
+  description: Start the Profiler
+  fields:
+    seconds:
+      description: The number of seconds to run the profiler.
+      example: 60.0
diff --git a/homeassistant/components/profiler/strings.json b/homeassistant/components/profiler/strings.json
new file mode 100644
index 00000000000..394c46563cd
--- /dev/null
+++ b/homeassistant/components/profiler/strings.json
@@ -0,0 +1,12 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "description": "[%key:common::config_flow::description::confirm_setup%]"
+      }
+    },
+    "abort": {
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
+    }
+  }
+}
diff --git a/homeassistant/components/profiler/translations/ca.json b/homeassistant/components/profiler/translations/ca.json
new file mode 100644
index 00000000000..eb17f02ecdf
--- /dev/null
+++ b/homeassistant/components/profiler/translations/ca.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
+        },
+        "step": {
+            "user": {
+                "description": "Vols comen\u00e7ar la configuraci\u00f3?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/cs.json b/homeassistant/components/profiler/translations/cs.json
new file mode 100644
index 00000000000..ce19e127348
--- /dev/null
+++ b/homeassistant/components/profiler/translations/cs.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "user": {
+                "description": "Chcete za\u010d\u00edt nastavovat?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/en.json b/homeassistant/components/profiler/translations/en.json
new file mode 100644
index 00000000000..285e83585cb
--- /dev/null
+++ b/homeassistant/components/profiler/translations/en.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
+        },
+        "step": {
+            "user": {
+                "description": "Do you want to start set up?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/es.json b/homeassistant/components/profiler/translations/es.json
new file mode 100644
index 00000000000..a39a0a24d2a
--- /dev/null
+++ b/homeassistant/components/profiler/translations/es.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
+        },
+        "step": {
+            "user": {
+                "description": "\u00bfEst\u00e1s seguro de que quieres configurar el Profiler?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/et.json b/homeassistant/components/profiler/translations/et.json
new file mode 100644
index 00000000000..553790181c3
--- /dev/null
+++ b/homeassistant/components/profiler/translations/et.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid h\u00e4\u00e4lestada Profiler'i sidumist?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/it.json b/homeassistant/components/profiler/translations/it.json
new file mode 100644
index 00000000000..6e2771360db
--- /dev/null
+++ b/homeassistant/components/profiler/translations/it.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
+        },
+        "step": {
+            "user": {
+                "description": "Vuoi iniziare la configurazione?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/lb.json b/homeassistant/components/profiler/translations/lb.json
new file mode 100644
index 00000000000..b5a5bded9ff
--- /dev/null
+++ b/homeassistant/components/profiler/translations/lb.json
@@ -0,0 +1,9 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "description": "S\u00e9cher fir Profiler anzeriichten?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/nl.json b/homeassistant/components/profiler/translations/nl.json
new file mode 100644
index 00000000000..703ac8614c4
--- /dev/null
+++ b/homeassistant/components/profiler/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/no.json b/homeassistant/components/profiler/translations/no.json
new file mode 100644
index 00000000000..b764a03b67b
--- /dev/null
+++ b/homeassistant/components/profiler/translations/no.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
+        },
+        "step": {
+            "user": {
+                "description": "Vil du starte oppsettet?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/pl.json b/homeassistant/components/profiler/translations/pl.json
new file mode 100644
index 00000000000..b1cd1a8db99
--- /dev/null
+++ b/homeassistant/components/profiler/translations/pl.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
+        },
+        "step": {
+            "user": {
+                "description": "Czy chcesz rozpocz\u0105\u0107 konfiguracj\u0119?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/ru.json b/homeassistant/components/profiler/translations/ru.json
new file mode 100644
index 00000000000..ef30ee38058
--- /dev/null
+++ b/homeassistant/components/profiler/translations/ru.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
+        },
+        "step": {
+            "user": {
+                "description": "\u0425\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/profiler/translations/zh-Hant.json b/homeassistant/components/profiler/translations/zh-Hant.json
new file mode 100644
index 00000000000..85797ab2082
--- /dev/null
+++ b/homeassistant/components/profiler/translations/zh-Hant.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
+        },
+        "step": {
+            "user": {
+                "description": "\u662f\u5426\u8981\u958b\u59cb\u8a2d\u5b9a\uff1f"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/progettihwsw/config_flow.py b/homeassistant/components/progettihwsw/config_flow.py
index e65b58b370a..dca29668a84 100644
--- a/homeassistant/components/progettihwsw/config_flow.py
+++ b/homeassistant/components/progettihwsw/config_flow.py
@@ -19,7 +19,8 @@ async def validate_input(hass: core.HomeAssistant, data):
     same_entries = [
         True
         for entry in confs
-        if entry.data["host"] == data["host"] and entry.data["port"] == data["port"]
+        if entry.data.get("host") == data["host"]
+        and entry.data.get("port") == data["port"]
     ]
 
     if same_entries:
diff --git a/homeassistant/components/progettihwsw/translations/cs.json b/homeassistant/components/progettihwsw/translations/cs.json
new file mode 100644
index 00000000000..2ca858fefdd
--- /dev/null
+++ b/homeassistant/components/progettihwsw/translations/cs.json
@@ -0,0 +1,41 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "relay_modes": {
+                "data": {
+                    "relay_1": "Rel\u00e9 1",
+                    "relay_10": "Rel\u00e9 10",
+                    "relay_11": "Rel\u00e9 11",
+                    "relay_12": "Rel\u00e9 12",
+                    "relay_13": "Rel\u00e9 13",
+                    "relay_14": "Rel\u00e9 14",
+                    "relay_15": "Rel\u00e9 15",
+                    "relay_16": "Rel\u00e9 16",
+                    "relay_2": "Rel\u00e9 2",
+                    "relay_3": "Rel\u00e9 3",
+                    "relay_4": "Rel\u00e9 4",
+                    "relay_5": "Rel\u00e9 5",
+                    "relay_6": "Rel\u00e9 6",
+                    "relay_7": "Rel\u00e9 7",
+                    "relay_8": "Rel\u00e9 8",
+                    "relay_9": "Rel\u00e9 9"
+                },
+                "title": "Nastaven\u00ed rel\u00e9"
+            },
+            "user": {
+                "data": {
+                    "host": "Hostitel",
+                    "port": "Port"
+                },
+                "title": "Nastaven\u00ed desky"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/progettihwsw/translations/el.json b/homeassistant/components/progettihwsw/translations/el.json
new file mode 100644
index 00000000000..76109815009
--- /dev/null
+++ b/homeassistant/components/progettihwsw/translations/el.json
@@ -0,0 +1,33 @@
+{
+    "config": {
+        "step": {
+            "relay_modes": {
+                "data": {
+                    "relay_10": "\u03a1\u03b5\u03bb\u03ad 10",
+                    "relay_11": "\u03a1\u03b5\u03bb\u03ad 11",
+                    "relay_12": "\u03a1\u03b5\u03bb\u03ad 12",
+                    "relay_13": "\u03a1\u03b5\u03bb\u03ad 13",
+                    "relay_14": "\u03a1\u03b5\u03bb\u03ad 14",
+                    "relay_15": "\u03a1\u03b5\u03bb\u03ad 15",
+                    "relay_16": "\u03a1\u03b5\u03bb\u03ad 16",
+                    "relay_2": "\u03a1\u03b5\u03bb\u03ad 2",
+                    "relay_3": "\u03a1\u03b5\u03bb\u03ad 3",
+                    "relay_4": "\u03a1\u03b5\u03bb\u03ad 4",
+                    "relay_5": "\u03a1\u03b5\u03bb\u03ad 5",
+                    "relay_6": "\u03a1\u03b5\u03bb\u03ad 6",
+                    "relay_7": "\u03a1\u03b5\u03bb\u03ad 7",
+                    "relay_8": "\u03a1\u03b5\u03bb\u03ad 8",
+                    "relay_9": "\u03a1\u03b5\u03bb\u03ad 9"
+                },
+                "title": "\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7 \u03c1\u03b5\u03bb\u03ad"
+            },
+            "user": {
+                "data": {
+                    "port": "\u0398\u03cd\u03c1\u03b1"
+                },
+                "title": "\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7 \u03c0\u03af\u03bd\u03b1\u03ba\u03b1"
+            }
+        }
+    },
+    "title": "\u0391\u03c5\u03c4\u03bf\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2 ProgettiHWSW"
+}
\ No newline at end of file
diff --git a/homeassistant/components/progettihwsw/translations/et.json b/homeassistant/components/progettihwsw/translations/et.json
new file mode 100644
index 00000000000..d9d3c285653
--- /dev/null
+++ b/homeassistant/components/progettihwsw/translations/et.json
@@ -0,0 +1,43 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga",
+            "wrong_info_relay_modes": "Relee re\u017eiimi valik on kas mono- v\u00f5i bistabiilne."
+        },
+        "step": {
+            "relay_modes": {
+                "data": {
+                    "relay_1": "1. relee",
+                    "relay_10": "10. relee",
+                    "relay_11": "11. relee",
+                    "relay_12": "12. relee",
+                    "relay_13": "13. relee",
+                    "relay_14": "14. relee",
+                    "relay_15": "15. relee",
+                    "relay_16": "16. relee",
+                    "relay_2": "2. relee",
+                    "relay_3": "3. relee",
+                    "relay_4": "4. relee",
+                    "relay_5": "5. relee",
+                    "relay_6": "6. relee",
+                    "relay_7": "7. relee",
+                    "relay_8": "8. relee",
+                    "relay_9": "9. relee"
+                },
+                "title": "Seadista releed"
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                },
+                "title": "Seadista liides"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/progettihwsw/translations/lb.json b/homeassistant/components/progettihwsw/translations/lb.json
index e5ec74b7ab0..2e5491da644 100644
--- a/homeassistant/components/progettihwsw/translations/lb.json
+++ b/homeassistant/components/progettihwsw/translations/lb.json
@@ -1,8 +1,23 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Apparat ass scho konfigur\u00e9iert"
+        },
+        "error": {
+            "cannot_connect": "Feeler beim verbannen"
+        },
         "step": {
             "relay_modes": {
                 "data": {
+                    "relay_1": "Relais 1",
+                    "relay_10": "Relais 10",
+                    "relay_11": "Relais 11",
+                    "relay_12": "Relais 12",
+                    "relay_13": "Relais 13",
+                    "relay_14": "Relais 14",
+                    "relay_15": "Relais 15",
+                    "relay_16": "Relais 16",
+                    "relay_2": "Relais 2",
                     "relay_3": "Relais 3",
                     "relay_4": "Relais 4",
                     "relay_5": "Relais 5",
@@ -17,7 +32,8 @@
                 "data": {
                     "host": "Host",
                     "port": "Port"
-                }
+                },
+                "title": "Board ariichten"
             }
         }
     },
diff --git a/homeassistant/components/progettihwsw/translations/nl.json b/homeassistant/components/progettihwsw/translations/nl.json
index 2b30a4f1caa..511520bedbb 100644
--- a/homeassistant/components/progettihwsw/translations/nl.json
+++ b/homeassistant/components/progettihwsw/translations/nl.json
@@ -3,9 +3,18 @@
         "abort": {
             "already_configured": "Apparaat is al geconfigureerd"
         },
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken"
+        },
         "step": {
             "relay_modes": {
                 "title": "Stel relais in"
+            },
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "port": "Poort"
+                }
             }
         }
     }
diff --git a/homeassistant/components/progettihwsw/translations/no.json b/homeassistant/components/progettihwsw/translations/no.json
index 397807ef2fe..1a1bfa718b7 100644
--- a/homeassistant/components/progettihwsw/translations/no.json
+++ b/homeassistant/components/progettihwsw/translations/no.json
@@ -4,29 +4,29 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil",
             "wrong_info_relay_modes": "Valg av rel\u00e9modus m\u00e5 v\u00e6re monostable eller bistable."
         },
         "step": {
             "relay_modes": {
                 "data": {
-                    "relay_1": "Rele 1",
-                    "relay_10": "Rele 10",
-                    "relay_11": "Rele 11",
-                    "relay_12": "Rele 12",
-                    "relay_13": "Rele 13",
-                    "relay_14": "Rele 14",
-                    "relay_15": "Rele 15",
-                    "relay_16": "Rele 16",
-                    "relay_2": "Rele 2",
-                    "relay_3": "Rele 3",
-                    "relay_4": "Rele 4",
-                    "relay_5": "Rele 5",
-                    "relay_6": "Rele 6",
-                    "relay_7": "Rele 7",
-                    "relay_8": "Rele 8",
-                    "relay_9": "Rele 9 "
+                    "relay_1": "Rel\u00e9 1",
+                    "relay_10": "Rel\u00e9 10",
+                    "relay_11": "Rel\u00e9 11",
+                    "relay_12": "Rel\u00e9 12",
+                    "relay_13": "Rel\u00e9 13",
+                    "relay_14": "Rel\u00e9 14",
+                    "relay_15": "Rel\u00e9 15",
+                    "relay_16": "Rel\u00e9 16",
+                    "relay_2": "Rel\u00e9 2",
+                    "relay_3": "Rel\u00e9 3",
+                    "relay_4": "Rel\u00e9 4",
+                    "relay_5": "Rel\u00e9 5",
+                    "relay_6": "Rel\u00e9 6",
+                    "relay_7": "Rel\u00e9 7",
+                    "relay_8": "Rel\u00e9 8",
+                    "relay_9": "Rel\u00e9 9"
                 },
                 "title": "Sett opp rel\u00e9er"
             },
diff --git a/homeassistant/components/progettihwsw/translations/pl.json b/homeassistant/components/progettihwsw/translations/pl.json
index cdfea7a9221..fb70d1a8104 100644
--- a/homeassistant/components/progettihwsw/translations/pl.json
+++ b/homeassistant/components/progettihwsw/translations/pl.json
@@ -5,7 +5,8 @@
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "unknown": "Nieoczekiwany b\u0142\u0105d"
+            "unknown": "Nieoczekiwany b\u0142\u0105d",
+            "wrong_info_relay_modes": "Tryb przeka\u017anika musi by\u0107 monostabilny lub bistabilny"
         },
         "step": {
             "relay_modes": {
@@ -26,14 +27,17 @@
                     "relay_7": "Przeka\u017anik 7",
                     "relay_8": "Przeka\u017anik 8",
                     "relay_9": "Przeka\u017anik 9"
-                }
+                },
+                "title": "Konfiguracja przeka\u017anik\u00f3w"
             },
             "user": {
                 "data": {
                     "host": "Nazwa hosta lub adres IP",
                     "port": "Port"
-                }
+                },
+                "title": "Konfiguracja uk\u0142adu"
             }
         }
-    }
+    },
+    "title": "Automatyzacja ProgettiHWSW"
 }
\ No newline at end of file
diff --git a/homeassistant/components/proximity/translations/cs.json b/homeassistant/components/proximity/translations/cs.json
index a7b2b73ad2b..a85a842373d 100644
--- a/homeassistant/components/proximity/translations/cs.json
+++ b/homeassistant/components/proximity/translations/cs.json
@@ -1,3 +1,3 @@
 {
-    "title": "P\u0159ibl\u00ed\u017een\u00ed"
+    "title": "Bl\u00edzkost"
 }
\ No newline at end of file
diff --git a/homeassistant/components/ps4/config_flow.py b/homeassistant/components/ps4/config_flow.py
index 17c0eb5838c..a8bdb2b9c43 100644
--- a/homeassistant/components/ps4/config_flow.py
+++ b/homeassistant/components/ps4/config_flow.py
@@ -1,6 +1,5 @@
 """Config Flow for PlayStation 4."""
 from collections import OrderedDict
-import logging
 
 from pyps4_2ndscreen.errors import CredentialTimeout
 from pyps4_2ndscreen.helpers import Helper
@@ -20,8 +19,6 @@ from homeassistant.util import location
 
 from .const import CONFIG_ENTRY_VERSION, DEFAULT_ALIAS, DEFAULT_NAME, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_MODE = "Config Mode"
 CONF_AUTO = "Auto Discover"
 CONF_MANUAL = "Manual Entry"
@@ -139,7 +136,7 @@ class PlayStation4FlowHandler(config_entries.ConfigFlow):
 
                 # If list is empty then all devices are configured.
                 if not self.device_list:
-                    return self.async_abort(reason="devices_configured")
+                    return self.async_abort(reason="already_configured")
 
         # Login to PS4 with user data.
         if user_input is not None:
@@ -154,7 +151,7 @@ class PlayStation4FlowHandler(config_entries.ConfigFlow):
             )
 
             if is_ready is False:
-                errors["base"] = "not_ready"
+                errors["base"] = "cannot_connect"
             elif is_login is False:
                 errors["base"] = "login_failed"
             else:
diff --git a/homeassistant/components/ps4/strings.json b/homeassistant/components/ps4/strings.json
index c3a864565cf..f2a59830b59 100644
--- a/homeassistant/components/ps4/strings.json
+++ b/homeassistant/components/ps4/strings.json
@@ -7,33 +7,33 @@
       },
       "mode": {
         "title": "PlayStation 4",
-        "description": "Select mode for configuration. The IP Address field can be left blank if selecting Auto Discovery, as devices will be automatically discovered.",
+        "description": "Select mode for configuration. The [%key:common::config_flow::data::ip%] field can be left blank if selecting Auto Discovery, as devices will be automatically discovered.",
         "data": {
           "mode": "Config Mode",
-          "ip_address": "IP Address (Leave empty if using Auto Discovery)."
+          "ip_address": "[%key:common::config_flow::data::ip%] (Leave empty if using Auto Discovery)."
         }
       },
       "link": {
         "title": "PlayStation 4",
-        "description": "Enter your PlayStation 4 information. For 'PIN', navigate to 'Settings' on your PlayStation 4 console. Then navigate to 'Mobile App Connection Settings' and select 'Add Device'. Enter the PIN that is displayed. Refer to the [documentation](https://www.home-assistant.io/components/ps4/) for additional info.",
+        "description": "Enter your PlayStation 4 information. For [%key:common::config_flow::data::pin%], navigate to 'Settings' on your PlayStation 4 console. Then navigate to 'Mobile App Connection Settings' and select 'Add Device'. Enter the [%key:common::config_flow::data::pin%] that is displayed. Refer to the [documentation](https://www.home-assistant.io/components/ps4/) for additional info.",
         "data": {
           "region": "Region",
-          "name": "Name",
-          "code": "PIN",
-          "ip_address": "IP Address"
+          "name": "[%key:common::config_flow::data::name%]",
+          "code": "[%key:common::config_flow::data::pin%]",
+          "ip_address": "[%key:common::config_flow::data::ip%]"
         }
       }
     },
     "error": {
       "credential_timeout": "Credential service timed out. Press submit to restart.",
-      "not_ready": "PlayStation 4 is not on or connected to network.",
-      "login_failed": "Failed to pair to PlayStation 4. Verify PIN is correct.",
-      "no_ipaddress": "Enter the IP Address of the PlayStation 4 you would like to configure."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "login_failed": "Failed to pair to PlayStation 4. Verify [%key:common::config_flow::data::pin%] is correct.",
+      "no_ipaddress": "Enter the [%key:common::config_flow::data::ip%] of the PlayStation 4 you would like to configure."
     },
     "abort": {
       "credential_error": "Error fetching credentials.",
-      "no_devices_found": "No PlayStation 4 devices found on the network.",
-      "devices_configured": "All devices found are already configured.",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "port_987_bind_error": "Could not bind to port 987. Refer to the [documentation](https://www.home-assistant.io/components/ps4/) for additional info.",
       "port_997_bind_error": "Could not bind to port 997. Refer to the [documentation](https://www.home-assistant.io/components/ps4/) for additional info."
     }
diff --git a/homeassistant/components/ps4/translations/ca.json b/homeassistant/components/ps4/translations/ca.json
index 09b41d00587..92563f333ac 100644
--- a/homeassistant/components/ps4/translations/ca.json
+++ b/homeassistant/components/ps4/translations/ca.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
             "credential_error": "Error en l'obtenci\u00f3 de les credencials.",
             "devices_configured": "Tots els dispositius trobats ja estan configurats.",
-            "no_devices_found": "No s'han trobat dispositius PlayStation 4 a la xarxa.",
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
             "port_987_bind_error": "No s'ha pogut vincular amb el port 987. Consulta la [documentaci\u00f3](https://www.home-assistant.io/components/ps4/) per a m\u00e9s informaci\u00f3.",
             "port_997_bind_error": "No s'ha pogut vincular amb el port 997. Consulta la [documentaci\u00f3](https://www.home-assistant.io/components/ps4/) per a m\u00e9s informaci\u00f3."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "credential_timeout": "El servei de credencials ha expirat. Prem Envia per reiniciar-lo.",
-            "login_failed": "No s'ha pogut sincronitzar amb la PlayStation 4. Verifica el codi PIN.",
-            "no_ipaddress": "Introdueix l'adre\u00e7a IP de la PlayStation 4 que vulguis configurar.",
+            "login_failed": "No s'ha pogut sincronitzar amb la PlayStation 4. Verifica que el Codi PIN sigui correcte.",
+            "no_ipaddress": "Introdueix l'Adre\u00e7a IP de la PlayStation 4 que vulguis configurar.",
             "not_ready": "La PlayStation 4 no est\u00e0 engegada o no s'ha connectada a la xarxa."
         },
         "step": {
@@ -20,12 +22,12 @@
             },
             "link": {
                 "data": {
-                    "code": "PIN",
+                    "code": "Codi PIN",
                     "ip_address": "Adre\u00e7a IP",
                     "name": "Nom",
                     "region": "Regi\u00f3"
                 },
-                "description": "Introdueix la informaci\u00f3 de la teva PlayStation 4. Pel 'PIN', ves a 'Configuraci\u00f3' a la consola de la PlayStation 4. Despr\u00e9s navega fins a 'Configuraci\u00f3 de la connexi\u00f3 de l'aplicaci\u00f3 m\u00f2bil' i selecciona 'Afegir dispositiu'. Introdueix el PIN que es mostra. Consulta la [documentaci\u00f3](https://www.home-assistant.io/components/ps4/) per a m\u00e9s informaci\u00f3.",
+                "description": "Introdueix la informaci\u00f3 de la teva PlayStation 4. Per al Codi PIN, ves a 'Configuraci\u00f3' a la consola de la PlayStation 4. Despr\u00e9s navega fins a 'Configuraci\u00f3 de la connexi\u00f3 de l'aplicaci\u00f3 m\u00f2bil' i selecciona 'Afegir dispositiu'. Introdueix el Codi PIN que es mostra. Consulta la [documentaci\u00f3](https://www.home-assistant.io/components/ps4/) per a m\u00e9s informaci\u00f3.",
                 "title": "PlayStation 4"
             },
             "mode": {
@@ -33,7 +35,7 @@
                     "ip_address": "Adre\u00e7a IP (deixa-ho en blanc si fas servir la detecci\u00f3 autom\u00e0tica).",
                     "mode": "Mode de configuraci\u00f3"
                 },
-                "description": "Selecciona el mode de configuraci\u00f3. El camp de l'adre\u00e7a IP es pot deixar en blanc si selecciones descobriment autom\u00e0tic (els dispositius es descobriran autom\u00e0ticament).",
+                "description": "Selecciona el mode de configuraci\u00f3. El camp de l'Adre\u00e7a IP es pot deixar en blanc si selecciones descobriment autom\u00e0tic (els dispositius es descobriran autom\u00e0ticament).",
                 "title": "PlayStation 4"
             }
         }
diff --git a/homeassistant/components/ps4/translations/cs.json b/homeassistant/components/ps4/translations/cs.json
index d61911f012d..135cd0ce0de 100644
--- a/homeassistant/components/ps4/translations/cs.json
+++ b/homeassistant/components/ps4/translations/cs.json
@@ -1,10 +1,38 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "devices_configured": "V\u0161echna nalezen\u00e1 za\u0159\u00edzen\u00ed jsou ji\u017e nastavena.",
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "port_987_bind_error": "Nelze se p\u0159ipojit na port 987. Dal\u0161\u00ed informace naleznete v [dokumentaci](https://www.home-assistant.io/components/ps4/).",
+            "port_997_bind_error": "Nelze se p\u0159ipojit na port 997. Dal\u0161\u00ed informace naleznete v [dokumentaci](https://www.home-assistant.io/components/ps4/)."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "login_failed": "Nepoda\u0159ilo se sp\u00e1rovat s PlayStation 4. Ov\u011b\u0159te, zda je PIN k\u00f3d spr\u00e1vn\u00fd.",
+            "no_ipaddress": "Zadejte IP adresu PlayStation 4, kter\u00fd chcete konfigurovat.",
+            "not_ready": "PlayStation 4 nen\u00ed zapnut\u00e9 nebo p\u0159ipojen\u00e9 k s\u00edti."
+        },
         "step": {
+            "creds": {
+                "title": "PlayStation 4"
+            },
             "link": {
                 "data": {
+                    "code": "PIN k\u00f3d",
+                    "ip_address": "IP adresa",
+                    "name": "Jm\u00e9no",
                     "region": "Region"
                 },
+                "description": "Zadejte sv\u00e9 informace o PlayStation 4. \"PIN\" naleznete v \"Nastaven\u00ed\" sv\u00e9 konzole PlayStation 4. Pot\u00e9 p\u0159ejd\u011bte do \"Nastaven\u00ed p\u0159ipojen\u00ed mobiln\u00ed aplikace\" a vyberte \"P\u0159idat za\u0159\u00edzen\u00ed\". Zadejte PIN. Dal\u0161\u00ed informace naleznete v [dokumentaci](https://www.home-assistant.io/components/ps4/).",
+                "title": "PlayStation 4"
+            },
+            "mode": {
+                "data": {
+                    "ip_address": "IP adresa (Pokud pou\u017e\u00edv\u00e1te automatick\u00e9 zji\u0161\u0165ov\u00e1n\u00ed, ponechte pr\u00e1zdn\u00e9.)",
+                    "mode": "Re\u017eim nastaven\u00ed"
+                },
+                "description": "Vyberte re\u017eim pro konfiguraci. Pole IP adresa m\u016f\u017ee b\u00fdt ponech\u00e1no pr\u00e1zdn\u00e9, pokud vyberete \"automatick\u00e9 zji\u0161\u0165ov\u00e1n\u00ed\", proto\u017ee za\u0159\u00edzen\u00ed budou automaticky objevena.",
                 "title": "PlayStation 4"
             }
         }
diff --git a/homeassistant/components/ps4/translations/en.json b/homeassistant/components/ps4/translations/en.json
index a7c67304a76..8e326861279 100644
--- a/homeassistant/components/ps4/translations/en.json
+++ b/homeassistant/components/ps4/translations/en.json
@@ -1,15 +1,17 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Device is already configured",
             "credential_error": "Error fetching credentials.",
             "devices_configured": "All devices found are already configured.",
-            "no_devices_found": "No PlayStation 4 devices found on the network.",
+            "no_devices_found": "No devices found on the network",
             "port_987_bind_error": "Could not bind to port 987. Refer to the [documentation](https://www.home-assistant.io/components/ps4/) for additional info.",
             "port_997_bind_error": "Could not bind to port 997. Refer to the [documentation](https://www.home-assistant.io/components/ps4/) for additional info."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "credential_timeout": "Credential service timed out. Press submit to restart.",
-            "login_failed": "Failed to pair to PlayStation 4. Verify PIN is correct.",
+            "login_failed": "Failed to pair to PlayStation 4. Verify PIN Code is correct.",
             "no_ipaddress": "Enter the IP Address of the PlayStation 4 you would like to configure.",
             "not_ready": "PlayStation 4 is not on or connected to network."
         },
@@ -20,12 +22,12 @@
             },
             "link": {
                 "data": {
-                    "code": "PIN",
+                    "code": "PIN Code",
                     "ip_address": "IP Address",
                     "name": "Name",
                     "region": "Region"
                 },
-                "description": "Enter your PlayStation 4 information. For 'PIN', navigate to 'Settings' on your PlayStation 4 console. Then navigate to 'Mobile App Connection Settings' and select 'Add Device'. Enter the PIN that is displayed. Refer to the [documentation](https://www.home-assistant.io/components/ps4/) for additional info.",
+                "description": "Enter your PlayStation 4 information. For PIN Code, navigate to 'Settings' on your PlayStation 4 console. Then navigate to 'Mobile App Connection Settings' and select 'Add Device'. Enter the PIN Code that is displayed. Refer to the [documentation](https://www.home-assistant.io/components/ps4/) for additional info.",
                 "title": "PlayStation 4"
             },
             "mode": {
diff --git a/homeassistant/components/ps4/translations/es.json b/homeassistant/components/ps4/translations/es.json
index d9d410b11d8..0782e946885 100644
--- a/homeassistant/components/ps4/translations/es.json
+++ b/homeassistant/components/ps4/translations/es.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
             "credential_error": "Error al obtener las credenciales.",
             "devices_configured": "Todos los dispositivos encontrados ya est\u00e1n configurados.",
             "no_devices_found": "No se encuentran dispositivos PlayStation 4 en la red.",
@@ -8,8 +9,9 @@
             "port_997_bind_error": "No se ha podido unir al puerto 997. Consulta la [documentaci\u00f3n](https://www.home-assistant.io/components/ps4/) para m\u00e1s informaci\u00f3n."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "credential_timeout": "Se agot\u00f3 el tiempo para el servicio de credenciales. Pulsa enviar para reiniciar.",
-            "login_failed": "No se ha podido emparejar con PlayStation 4. Verifique que el PIN sea correcto.",
+            "login_failed": "No se ha podido vincular con PlayStation 4. Verifica que el PIN sea correcto.",
             "no_ipaddress": "Introduce la direcci\u00f3n IP de la PlayStation 4 que quieres configurar.",
             "not_ready": "PlayStation 4 no est\u00e1 encendido o conectado a la red."
         },
diff --git a/homeassistant/components/ps4/translations/et.json b/homeassistant/components/ps4/translations/et.json
new file mode 100644
index 00000000000..5d7f75573aa
--- /dev/null
+++ b/homeassistant/components/ps4/translations/et.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendus nurjus",
+            "login_failed": "PlayStation 4-ga sidumine nurjus. Veendu, et PIN kood on \u00f5ige.",
+            "no_ipaddress": "Sisesta Playstation, 4 mida soovid seadistada, IP-aadress."
+        },
+        "step": {
+            "link": {
+                "data": {
+                    "code": "PIN kood",
+                    "ip_address": "IP aadress",
+                    "name": "Nimi"
+                },
+                "description": "Sisesta oma PlayStation 4 teave. PIN koodi saamiseks mine PlayStation 4 konsooli  \u201eSeaded\u201d. Seej\u00e4rel liigu jaotisse \u201eMobiilirakenduse \u00fchenduse seaded\u201d ja vali \u201eLisa seade\u201d. SisestaPIN kood . Lisateavet leiad [dokumentatsioonist] (https://www.home-assistant.io/components/ps4/)."
+            },
+            "mode": {
+                "data": {
+                    "ip_address": "IP-aadress (J\u00e4tke t\u00fchjaks, kui kasutate automaatset tuvastamist)"
+                },
+                "description": "Valikonfigureerimise re\u017eiim. V\u00e4lja IP-aadress saab automaatse tuvastamise valimisel t\u00fchjaks j\u00e4tta, kuna seadmed avastatakse automaatselt.",
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ps4/translations/it.json b/homeassistant/components/ps4/translations/it.json
index d010c2e1f45..73dcd5890a1 100644
--- a/homeassistant/components/ps4/translations/it.json
+++ b/homeassistant/components/ps4/translations/it.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
             "credential_error": "Errore nel recupero delle credenziali.",
             "devices_configured": "Tutti i dispositivi trovati sono gi\u00e0 configurati.",
-            "no_devices_found": "Nessun dispositivo PlayStation 4 trovato in rete.",
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
             "port_987_bind_error": "Impossibile collegarsi alla porta 987. Fare riferimento alla [documentazione](https://www.home-assistant.io/components/ps4/) per ulteriori informazioni.",
             "port_997_bind_error": "Impossibile collegarsi alla porta 997. Consultare la [documentazione](https://www.home-assistant.io/components/ps4/) per ulteriori informazioni."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "credential_timeout": "Servizio credenziali scaduto. Premi Invia per riavviare.",
-            "login_failed": "Impossibile eseguire l'associazione a PlayStation 4. Verificare che il PIN sia corretto.",
-            "no_ipaddress": "Inserisci l'indirizzo IP della PlayStation 4 che desideri configurare.",
+            "login_failed": "Impossibile eseguire l'associazione a PlayStation 4. Verificare che il Codice PIN sia corretto.",
+            "no_ipaddress": "Inserire l'Indirizzo IP della PlayStation 4 che desideri configurare.",
             "not_ready": "La PlayStation 4 non \u00e8 accesa o non \u00e8 collegata alla rete."
         },
         "step": {
@@ -20,20 +22,20 @@
             },
             "link": {
                 "data": {
-                    "code": "PIN",
+                    "code": "Codice PIN",
                     "ip_address": "Indirizzo IP",
                     "name": "Nome",
                     "region": "Area geografica"
                 },
-                "description": "Inserisci le tue informazioni su PlayStation 4. Per \"PIN\", vai a \"Impostazioni\" sulla console PlayStation 4. Quindi vai a 'Impostazioni di connessione app mobile' e seleziona 'Aggiungi dispositivo'. Immettere il PIN visualizzato. Fare riferimento alla [documentazione](https://www.home-assistant.io/components/ps4/) per ulteriori informazioni.",
+                "description": "Inserisci le informazioni per la tua PlayStation 4. Per il Codice PIN, vai a \"Impostazioni\" sulla PlayStation 4. Quindi vai a 'Impostazioni di connessione Mobile App' e seleziona 'Aggiungi dispositivo'. Immettere il Codice PIN visualizzato. Fare riferimento alla [documentazione](https://www.home-assistant.io/components/ps4/) per ulteriori informazioni.",
                 "title": "PlayStation 4"
             },
             "mode": {
                 "data": {
-                    "ip_address": "Indirizzo IP (lasciare vuoto se si utilizza la funzione Auto Discovery).",
+                    "ip_address": "Indirizzo IP (Lasciare vuoto se si sta usando l'Auto-Rilevamento).",
                     "mode": "Modalit\u00e0 di configurazione"
                 },
-                "description": "Seleziona la modalit\u00e0 per la configurazione. L'indirizzo IP pu\u00f2 essere lasciato vuoto se si seleziona Auto Discovery, poich\u00e9 i dispositivi verranno rilevati automaticamente.",
+                "description": "Selezionare la modalit\u00e0 per la configurazione. Il campo per l'Indirizzo IP pu\u00f2 essere lasciato vuoto se si seleziona Auto-Rilevamento, poich\u00e9 i dispositivi saranno automaticamente individuati.",
                 "title": "PlayStation 4"
             }
         }
diff --git a/homeassistant/components/ps4/translations/no.json b/homeassistant/components/ps4/translations/no.json
index 814f09095a2..1aaa81621c9 100644
--- a/homeassistant/components/ps4/translations/no.json
+++ b/homeassistant/components/ps4/translations/no.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Enheten er allerede konfigurert",
             "credential_error": "Feil ved henting av legitimasjon.",
             "devices_configured": "Alle enheter som ble funnet er allerede konfigurert.",
-            "no_devices_found": "Ingen PlayStation 4 enheter funnet p\u00e5 nettverket.",
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
             "port_987_bind_error": "Kunne ikke binde til port 987. Se [dokumentasjonen](https://www.home-assistant.io/components/ps4/) for mer info.",
             "port_997_bind_error": "Kunne ikke binde til port 997. Se [dokumentasjonen](https://www.home-assistant.io/components/ps4/) for videre informasjon."
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "credential_timeout": "Legitimasjonstjenesten ble tidsavbrutt. Trykk send for \u00e5 starte p\u00e5 nytt.",
-            "login_failed": "Klarte ikke \u00e5 koble til PlayStation 4. Bekreft at PIN koden er riktig.",
-            "no_ipaddress": "Fyll inn IP adressen til din PlayStation 4 som du \u00f8nsker konfigurere.",
+            "login_failed": "Kunne ikke koble til PlayStation 4. Bekreft at PIN-kode er riktig.",
+            "no_ipaddress": "Skriv inn IP adresse til PlayStation 4 du vil konfigurere.",
             "not_ready": "PlayStation 4 er ikke p\u00e5sl\u00e5tt eller koblet til nettverk."
         },
         "step": {
@@ -20,20 +22,20 @@
             },
             "link": {
                 "data": {
-                    "code": "",
+                    "code": "PIN-kode",
                     "ip_address": "IP adresse",
                     "name": "Navn",
                     "region": ""
                 },
-                "description": "Fyll inn PlayStation 4-informasjonen. For 'PIN', naviger til 'Innstillinger' p\u00e5 PlayStation 4-konsoll. Naviger deretter til 'Mobile App Connection Settings' og velg 'Add Device'. Fyll inn PIN-koden som vises. Se [dokumentasjonen](https://www.home-assistant.io/components/ps4/) for mer informasjon.",
+                "description": "Skriv inn PlayStation 4-informasjonen din. For PIN-kode , naviger til 'Innstillinger' p\u00e5 PlayStation 4-konsollen. Naviger deretter til 'Innstillinger for tilkobling av mobilapp' og velg 'Legg til enhet'. Skriv inn PIN-kode som vises. Se [dokumentasjon] (https://www.home-assistant.io/components/ps4/) for mer informasjon.",
                 "title": ""
             },
             "mode": {
                 "data": {
-                    "ip_address": "IP-adresse (La st\u00e5 tom hvis du bruker Automatisk Oppdagelse).",
+                    "ip_address": "IP adresse (La v\u00e6re tom hvis du bruker automatisk oppdagelse)",
                     "mode": "Konfigureringsmodus"
                 },
-                "description": "Velg modus for konfigurasjon. Feltet IP-adresse kan st\u00e5 tomt dersom du velger Automatisk Oppdagelse, da enheter vil bli oppdaget automatisk.",
+                "description": "Velg modus for konfigurasjon. Feltet IP adresse kan st\u00e5 tomt hvis du velger automatisk oppdagelse, da enheter automatisk blir oppdaget.",
                 "title": ""
             }
         }
diff --git a/homeassistant/components/ps4/translations/pl.json b/homeassistant/components/ps4/translations/pl.json
index 01698f26554..0e2dba2265c 100644
--- a/homeassistant/components/ps4/translations/pl.json
+++ b/homeassistant/components/ps4/translations/pl.json
@@ -1,17 +1,19 @@
 {
     "config": {
         "abort": {
-            "credential_error": "B\u0142\u0105d podczas pobierania danych logowania.",
-            "devices_configured": "Wszystkie znalezione urz\u0105dzenia s\u0105 ju\u017c skonfigurowane.",
-            "no_devices_found": "Nie znaleziono w sieci urz\u0105dze\u0144 PlayStation 4.",
-            "port_987_bind_error": "Nie mo\u017cna powi\u0105za\u0107 z portem 987.",
-            "port_997_bind_error": "Nie mo\u017cna powi\u0105za\u0107 z portem 997."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "credential_error": "B\u0142\u0105d podczas pobierania danych logowania",
+            "devices_configured": "Wszystkie znalezione urz\u0105dzenia s\u0105 ju\u017c skonfigurowane",
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "port_987_bind_error": "Nie mo\u017cna powi\u0105za\u0107 z portem 987. Zapoznaj si\u0119 z [dokumentacj\u0105](https://www.home-assistant.io/components/ps4/), by pozna\u0107 szczeg\u00f3\u0142y.",
+            "port_997_bind_error": "Nie mo\u017cna powi\u0105za\u0107 z portem 997. Zapoznaj si\u0119 z [dokumentacj\u0105](https://www.home-assistant.io/components/ps4/), by pozna\u0107 szczeg\u00f3\u0142y."
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "credential_timeout": "Przekroczono limit czasu us\u0142ugi po\u015bwiadcze\u0144. Naci\u015bnij przycisk \"Zatwierd\u017a\", aby ponowi\u0107.",
-            "login_failed": "Nie uda\u0142o si\u0119 sparowa\u0107 z PlayStation 4. Sprawd\u017a, czy PIN jest poprawny.",
-            "no_ipaddress": "Wprowad\u017a adres IP PlayStation 4, kt\u00f3ry chcesz skonfigurowa\u0107.",
-            "not_ready": "PlayStation 4 nie jest w\u0142\u0105czona lub po\u0142\u0105czona z sieci\u0105."
+            "login_failed": "Nie uda\u0142o si\u0119 sparowa\u0107 z PlayStation 4. Sprawd\u017a, czy kod PIN jest poprawny.",
+            "no_ipaddress": "Wprowad\u017a adres IP PlayStation 4, kt\u00f3ry chcesz skonfigurowa\u0107",
+            "not_ready": "PlayStation 4 nie jest w\u0142\u0105czona lub po\u0142\u0105czona z sieci\u0105"
         },
         "step": {
             "creds": {
@@ -20,12 +22,12 @@
             },
             "link": {
                 "data": {
-                    "code": "PIN",
+                    "code": "Kod PIN",
                     "ip_address": "Adres IP",
                     "name": "Nazwa",
                     "region": "Region"
                 },
-                "description": "Wprowad\u017a informacje o PlayStation 4. Aby uzyska\u0107 'PIN', przejd\u017a do 'Ustawienia' na konsoli PlayStation 4. Nast\u0119pnie przejd\u017a do 'Ustawienia po\u0142\u0105czenia aplikacji mobilnej' i wybierz 'Dodaj urz\u0105dzenie'. Wprowad\u017a wy\u015bwietlony kod PIN.",
+                "description": "Wprowad\u017a informacje o PlayStation 4. Aby uzyska\u0107 'PIN', przejd\u017a do 'Ustawienia' na konsoli PlayStation 4. Nast\u0119pnie przejd\u017a do 'Ustawienia po\u0142\u0105czenia aplikacji mobilnej' i wybierz 'Dodaj urz\u0105dzenie'. Wprowad\u017a wy\u015bwietlony kod PIN. Zapoznaj si\u0119 z [dokumentacj\u0105](https://www.home-assistant.io/components/ps4/), by pozna\u0107 szczeg\u00f3\u0142y.",
                 "title": "PlayStation 4"
             },
             "mode": {
diff --git a/homeassistant/components/ps4/translations/ru.json b/homeassistant/components/ps4/translations/ru.json
index f2a85e2c3e7..bf9501901ec 100644
--- a/homeassistant/components/ps4/translations/ru.json
+++ b/homeassistant/components/ps4/translations/ru.json
@@ -1,15 +1,17 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "credential_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0438 \u0443\u0447\u0451\u0442\u043d\u044b\u0445 \u0434\u0430\u043d\u043d\u044b\u0445.",
             "devices_configured": "\u0412\u0441\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043d\u044b\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u044b.",
-            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 PlayStation 4 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
             "port_987_bind_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u043f\u043e\u0440\u0442\u0443 987. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438](https://www.home-assistant.io/components/ps4/).",
             "port_997_bind_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u043f\u043e\u0440\u0442\u0443 997. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438](https://www.home-assistant.io/components/ps4/)."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "credential_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 **\u041f\u041e\u0414\u0422\u0412\u0415\u0420\u0414\u0418\u0422\u042c**, \u0447\u0442\u043e\u0431\u044b \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c \u043f\u043e\u043f\u044b\u0442\u043a\u0443.",
-            "login_failed": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0441\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u0435 \u0441 PlayStation 4. \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e PIN-\u043a\u043e\u0434 \u0432\u0432\u0435\u0434\u0435\u043d \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e.",
+            "login_failed": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0441\u043e\u043f\u0440\u044f\u0436\u0435\u043d\u0438\u0435 \u0441 PlayStation 4. \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e PIN-\u043a\u043e\u0434 \u0432\u0432\u0435\u0434\u0451\u043d \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e.",
             "no_ipaddress": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 IP-\u0430\u0434\u0440\u0435\u0441 PlayStation 4.",
             "not_ready": "PlayStation 4 \u043d\u0435 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0430 \u0438\u043b\u0438 \u043d\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0430 \u043a \u0441\u0435\u0442\u0438."
         },
diff --git a/homeassistant/components/ps4/translations/zh-Hans.json b/homeassistant/components/ps4/translations/zh-Hans.json
index 821cb0ed056..770a3d8953b 100644
--- a/homeassistant/components/ps4/translations/zh-Hans.json
+++ b/homeassistant/components/ps4/translations/zh-Hans.json
@@ -8,6 +8,7 @@
             "port_997_bind_error": "\u65e0\u6cd5\u7ed1\u5b9a\u7aef\u53e3 997\u3002"
         },
         "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25",
             "login_failed": "\u65e0\u6cd5\u4e0e PlayStation 4 \u914d\u5bf9\u3002\u8bf7\u786e\u8ba4 PIN \u662f\u5426\u6b63\u786e\u3002",
             "not_ready": "PlayStation 4 \u672a\u5f00\u673a\u6216\u672a\u8fde\u63a5\u5230\u7f51\u7edc\u3002"
         },
diff --git a/homeassistant/components/ps4/translations/zh-Hant.json b/homeassistant/components/ps4/translations/zh-Hant.json
index 80efe98c4b6..273c30d1d7a 100644
--- a/homeassistant/components/ps4/translations/zh-Hant.json
+++ b/homeassistant/components/ps4/translations/zh-Hant.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "credential_error": "\u53d6\u5f97\u6191\u8b49\u932f\u8aa4\u3002",
             "devices_configured": "\u6240\u6709\u8a2d\u5099\u90fd\u5df2\u8a2d\u5b9a\u5b8c\u6210\u3002",
-            "no_devices_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230 PlayStation 4 \u8a2d\u5099\u3002",
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
             "port_987_bind_error": "\u7121\u6cd5\u7d81\u5b9a\u901a\u8a0a\u57e0 987\u3002\u8acb\u53c3\u8003 [documentation](https://www.home-assistant.io/components/ps4/) \u4ee5\u7372\u5f97\u66f4\u591a\u8cc7\u8a0a\u3002",
             "port_997_bind_error": "\u7121\u6cd5\u7d81\u5b9a\u901a\u8a0a\u57e0 997\u3002\u8acb\u53c3\u8003 [documentation](https://www.home-assistant.io/components/ps4/) \u4ee5\u7372\u5f97\u66f4\u591a\u8cc7\u8a0a\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "credential_timeout": "\u6191\u8b49\u670d\u52d9\u903e\u6642\uff0c\u9ede\u9078\u300c\u50b3\u9001\u300d\u4ee5\u91cd\u555f\u3002",
             "login_failed": "PlayStation 4 \u914d\u5c0d\u5931\u6557\uff0c\u8acb\u78ba\u8a8d PIN \u78bc\u3002",
             "no_ipaddress": "\u8f38\u5165\u6240\u8981\u8a2d\u5b9a\u7684 PlayStation 4 \u4e4b IP \u4f4d\u5740\u3002",
@@ -20,12 +22,12 @@
             },
             "link": {
                 "data": {
-                    "code": "PIN",
+                    "code": "PIN \u78bc",
                     "ip_address": "IP \u4f4d\u5740",
                     "name": "\u540d\u7a31",
                     "region": "\u5340\u57df"
                 },
-                "description": "\u8f38\u5165\u60a8\u7684 PlayStation 4 \u8cc7\u8a0a\uff0c\u300cPIN\u300d\u65bc PlayStation 4 \u4e3b\u6a5f\u7684\u300c\u8a2d\u5b9a\u300d\u5167\uff0c\u4e26\u65bc\u300c\u884c\u52d5\u7a0b\u5f0f\u9023\u7dda\u8a2d\u5b9a\uff08Mobile App Connection Settings\uff09\u300d\u4e2d\u9078\u64c7\u300c\u65b0\u589e\u8a2d\u5099\u300d\u3002\u8f38\u5165\u6240\u986f\u793a\u7684 PIN \u78bc\u3002\u8acb\u53c3\u8003 [documentation](https://www.home-assistant.io/components/ps4/) \u4ee5\u7372\u5f97\u66f4\u591a\u8cc7\u8a0a\u3002",
+                "description": "\u8f38\u5165\u60a8\u7684 PlayStation 4 \u8cc7\u8a0a\uff0c\u300cPIN \u78bc\u300d\u65bc PlayStation 4 \u4e3b\u6a5f\u7684\u300c\u8a2d\u5b9a\u300d\u5167\uff0c\u4e26\u65bc\u300c\u884c\u52d5\u7a0b\u5f0f\u9023\u7dda\u8a2d\u5b9a\uff08Mobile App Connection Settings\uff09\u300d\u4e2d\u9078\u64c7\u300c\u65b0\u589e\u8a2d\u5099\u300d\u3002\u8f38\u5165\u6240\u986f\u793a\u7684  PIN \u78bc\u3002\u8acb\u53c3\u8003 [documentation](https://www.home-assistant.io/components/ps4/) \u4ee5\u7372\u5f97\u66f4\u591a\u8cc7\u8a0a\u3002",
                 "title": "PlayStation 4"
             },
             "mode": {
diff --git a/homeassistant/components/pvoutput/sensor.py b/homeassistant/components/pvoutput/sensor.py
index 169086af3fc..0bc2a6f6ca8 100644
--- a/homeassistant/components/pvoutput/sensor.py
+++ b/homeassistant/components/pvoutput/sensor.py
@@ -5,7 +5,7 @@ import logging
 
 import voluptuous as vol
 
-from homeassistant.components.rest.sensor import RestData
+from homeassistant.components.rest.data import RestData
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import (
     ATTR_DATE,
@@ -43,7 +43,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 )
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the PVOutput sensor."""
     name = config.get(CONF_NAME)
     api_key = config.get(CONF_API_KEY)
@@ -54,13 +54,13 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     headers = {"X-Pvoutput-Apikey": api_key, "X-Pvoutput-SystemId": system_id}
 
     rest = RestData(method, _ENDPOINT, auth, headers, payload, verify_ssl)
-    rest.update()
+    await rest.async_update()
 
     if rest.data is None:
         _LOGGER.error("Unable to fetch data from PVOutput")
         return False
 
-    add_entities([PvoutputSensor(rest, name)], True)
+    async_add_entities([PvoutputSensor(rest, name)], True)
 
 
 class PvoutputSensor(Entity):
@@ -112,11 +112,15 @@ class PvoutputSensor(Entity):
                 ATTR_VOLTAGE: self.pvcoutput.voltage,
             }
 
-    def update(self):
+    async def async_update(self):
         """Get the latest data from the PVOutput API and updates the state."""
         try:
-            self.rest.update()
+            await self.rest.async_update()
             self.pvcoutput = self.status._make(self.rest.data.split(","))
         except TypeError:
             self.pvcoutput = None
             _LOGGER.error("Unable to fetch data from PVOutput. %s", self.rest.data)
+
+    async def async_will_remove_from_hass(self):
+        """Shutdown the session."""
+        await self.rest.async_remove()
diff --git a/homeassistant/components/pvpc_hourly_pricing/strings.json b/homeassistant/components/pvpc_hourly_pricing/strings.json
index fbda22c5149..a1536d2186f 100644
--- a/homeassistant/components/pvpc_hourly_pricing/strings.json
+++ b/homeassistant/components/pvpc_hourly_pricing/strings.json
@@ -11,7 +11,7 @@
       }
     },
     "abort": {
-      "already_configured": "Integration is already configured with an existing sensor with that tariff"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   }
 }
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/ca.json b/homeassistant/components/pvpc_hourly_pricing/translations/ca.json
index 8eeab499620..bc5f3a59428 100644
--- a/homeassistant/components/pvpc_hourly_pricing/translations/ca.json
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Integraci\u00f3 ja configurada amb un sensor amb aquesta tarifa"
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/cs.json b/homeassistant/components/pvpc_hourly_pricing/translations/cs.json
new file mode 100644
index 00000000000..2dc8bc03afa
--- /dev/null
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/cs.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "name": "Jm\u00e9no senzoru"
+                },
+                "title": "V\u00fdb\u011br tarifu"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/en.json b/homeassistant/components/pvpc_hourly_pricing/translations/en.json
index 7716dab8ad7..02acb46eeb6 100644
--- a/homeassistant/components/pvpc_hourly_pricing/translations/en.json
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Integration is already configured with an existing sensor with that tariff"
+            "already_configured": "Service is already configured"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/es.json b/homeassistant/components/pvpc_hourly_pricing/translations/es.json
index ee7192f6f87..abc493b0790 100644
--- a/homeassistant/components/pvpc_hourly_pricing/translations/es.json
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La integraci\u00f3n ya est\u00e1 configurada con un sensor existente con esa tarifa"
+            "already_configured": "El servicio ya est\u00e1 configurado"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/et.json b/homeassistant/components/pvpc_hourly_pricing/translations/et.json
new file mode 100644
index 00000000000..7df1adb08b5
--- /dev/null
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/et.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/it.json b/homeassistant/components/pvpc_hourly_pricing/translations/it.json
index 84f2fddcb83..e36fc746883 100644
--- a/homeassistant/components/pvpc_hourly_pricing/translations/it.json
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'integrazione \u00e8 gi\u00e0 configurata con un sensore esistente con quella tariffa"
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/no.json b/homeassistant/components/pvpc_hourly_pricing/translations/no.json
index d27b78615cf..7eec443fcaa 100644
--- a/homeassistant/components/pvpc_hourly_pricing/translations/no.json
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Integrasjon er allerede konfigurert med en eksisterende sensor med den tariffen"
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/pl.json b/homeassistant/components/pvpc_hourly_pricing/translations/pl.json
index ae5f27fb7c2..f6606c570aa 100644
--- a/homeassistant/components/pvpc_hourly_pricing/translations/pl.json
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Integracja jest ju\u017c skonfigurowana z istniej\u0105cym sensorem dla tej taryfy."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/ru.json b/homeassistant/components/pvpc_hourly_pricing/translations/ru.json
index 4a2f4440a2a..e48e5222f3c 100644
--- a/homeassistant/components/pvpc_hourly_pricing/translations/ru.json
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/pvpc_hourly_pricing/translations/zh-Hant.json b/homeassistant/components/pvpc_hourly_pricing/translations/zh-Hant.json
index 7203356ab6a..15b6539281c 100644
--- a/homeassistant/components/pvpc_hourly_pricing/translations/zh-Hant.json
+++ b/homeassistant/components/pvpc_hourly_pricing/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6574\u5408\u5df2\u7d93\u8a2d\u5b9a\u4e26\u6709\u73fe\u6709\u50b3\u611f\u5668\u4f7f\u7528\u76f8\u540c\u8cbb\u7387"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/rachio/__init__.py b/homeassistant/components/rachio/__init__.py
index 8310a12d51c..2c2918da4c9 100644
--- a/homeassistant/components/rachio/__init__.py
+++ b/homeassistant/components/rachio/__init__.py
@@ -4,6 +4,7 @@ import logging
 import secrets
 
 from rachiopy import Rachio
+from requests.exceptions import ConnectTimeout
 import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
@@ -18,7 +19,6 @@ from .const import (
     CONF_WEBHOOK_ID,
     DEFAULT_MANUAL_RUN_MINS,
     DOMAIN,
-    RACHIO_API_EXCEPTIONS,
 )
 from .device import RachioPerson
 from .webhooks import (
@@ -113,9 +113,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     # Get the API user
     try:
         await hass.async_add_executor_job(person.setup, hass)
-    # Yes we really do get all these exceptions (hopefully rachiopy switches to requests)
-    # and there is not a reasonable timeout here so it can block for a long time
-    except RACHIO_API_EXCEPTIONS as error:
+    except ConnectTimeout as error:
         _LOGGER.error("Could not reach the Rachio API: %s", error)
         raise ConfigEntryNotReady from error
 
diff --git a/homeassistant/components/rachio/config_flow.py b/homeassistant/components/rachio/config_flow.py
index f262843d4ad..96420d56ba7 100644
--- a/homeassistant/components/rachio/config_flow.py
+++ b/homeassistant/components/rachio/config_flow.py
@@ -2,6 +2,7 @@
 import logging
 
 from rachiopy import Rachio
+from requests.exceptions import ConnectTimeout
 import voluptuous as vol
 
 from homeassistant import config_entries, core, exceptions
@@ -14,7 +15,6 @@ from .const import (
     KEY_ID,
     KEY_STATUS,
     KEY_USERNAME,
-    RACHIO_API_EXCEPTIONS,
 )
 from .const import DOMAIN  # pylint:disable=unused-import
 
@@ -31,7 +31,7 @@ async def validate_input(hass: core.HomeAssistant, data):
     rachio = Rachio(data[CONF_API_KEY])
     username = None
     try:
-        data = await hass.async_add_executor_job(rachio.person.getInfo)
+        data = await hass.async_add_executor_job(rachio.person.info)
         _LOGGER.debug("rachio.person.getInfo: %s", data)
         if int(data[0][KEY_STATUS]) != HTTP_OK:
             raise InvalidAuth
@@ -43,8 +43,7 @@ async def validate_input(hass: core.HomeAssistant, data):
             raise CannotConnect
 
         username = data[1][KEY_USERNAME]
-    # Yes we really do get all these exceptions (hopefully rachiopy switches to requests)
-    except RACHIO_API_EXCEPTIONS as error:
+    except ConnectTimeout as error:
         _LOGGER.error("Could not reach the Rachio API: %s", error)
         raise CannotConnect from error
 
diff --git a/homeassistant/components/rachio/const.py b/homeassistant/components/rachio/const.py
index aad3593eed5..943e1b33199 100644
--- a/homeassistant/components/rachio/const.py
+++ b/homeassistant/components/rachio/const.py
@@ -1,8 +1,5 @@
 """Constants for rachio."""
 
-import http.client
-import ssl
-
 DEFAULT_NAME = "Rachio"
 
 DOMAIN = "rachio"
@@ -50,19 +47,12 @@ KEY_CUSTOM_SHADE = "customShade"
 KEY_CUSTOM_CROP = "customCrop"
 KEY_CUSTOM_SLOPE = "customSlope"
 
-# Yes we really do get all these exceptions (hopefully rachiopy switches to requests)
-RACHIO_API_EXCEPTIONS = (
-    http.client.HTTPException,
-    ssl.SSLError,
-    OSError,
-    AssertionError,
-)
-
 STATUS_ONLINE = "ONLINE"
 
 SCHEDULE_TYPE_FIXED = "FIXED"
 SCHEDULE_TYPE_FLEX = "FLEX"
 SERVICE_SET_ZONE_MOISTURE = "set_zone_moisture_percent"
+SERVICE_START_MULTIPLE_ZONES = "start_multiple_zone_schedule"
 
 SIGNAL_RACHIO_UPDATE = f"{DOMAIN}_update"
 SIGNAL_RACHIO_CONTROLLER_UPDATE = f"{SIGNAL_RACHIO_UPDATE}_controller"
diff --git a/homeassistant/components/rachio/device.py b/homeassistant/components/rachio/device.py
index f7357a1b2dc..9d7c3057939 100644
--- a/homeassistant/components/rachio/device.py
+++ b/homeassistant/components/rachio/device.py
@@ -39,7 +39,7 @@ class RachioPerson:
 
     def setup(self, hass):
         """Rachio device setup."""
-        response = self.rachio.person.getInfo()
+        response = self.rachio.person.info()
         assert int(response[0][KEY_STATUS]) == HTTP_OK, "API key error"
         self._id = response[1][KEY_ID]
 
@@ -49,7 +49,9 @@ class RachioPerson:
         self.username = data[1][KEY_USERNAME]
         devices = data[1][KEY_DEVICES]
         for controller in devices:
-            webhooks = self.rachio.notification.getDeviceWebhook(controller[KEY_ID])[1]
+            webhooks = self.rachio.notification.get_device_webhook(controller[KEY_ID])[
+                1
+            ]
             # The API does not provide a way to tell if a controller is shared
             # or if they are the owner. To work around this problem we fetch the webooks
             # before we setup the device so we can skip it instead of failing.
@@ -78,6 +80,10 @@ class RachioPerson:
         """Get a list of controllers managed by this account."""
         return self._controllers
 
+    def start_multiple_zones(self, zones) -> None:
+        """Start multiple zones."""
+        self.rachio.zone.start_multiple(zones)
+
 
 class RachioIro:
     """Represent a Rachio Iro."""
@@ -113,7 +119,7 @@ class RachioIro:
             if not self._webhooks:
                 # We fetched webhooks when we created the device, however if we call _init_webhooks
                 # again we need to fetch again
-                self._webhooks = self.rachio.notification.getDeviceWebhook(
+                self._webhooks = self.rachio.notification.get_device_webhook(
                     self.controller_id
                 )[1]
             for webhook in self._webhooks:
@@ -121,21 +127,21 @@ class RachioIro:
                     webhook[KEY_EXTERNAL_ID].startswith(WEBHOOK_CONST_ID)
                     or webhook[KEY_ID] == current_webhook_id
                 ):
-                    self.rachio.notification.deleteWebhook(webhook[KEY_ID])
+                    self.rachio.notification.delete(webhook[KEY_ID])
             self._webhooks = None
 
         _deinit_webhooks(None)
 
         # Choose which events to listen for and get their IDs
         event_types = []
-        for event_type in self.rachio.notification.getWebhookEventType()[1]:
+        for event_type in self.rachio.notification.get_webhook_event_type()[1]:
             if event_type[KEY_NAME] in LISTEN_EVENT_TYPES:
                 event_types.append({"id": event_type[KEY_ID]})
 
         # Register to listen to these events from the device
         url = self.rachio.webhook_url
         auth = WEBHOOK_CONST_ID + self.rachio.webhook_auth
-        new_webhook = self.rachio.notification.postWebhook(
+        new_webhook = self.rachio.notification.add(
             self.controller_id, auth, url, event_types
         )
         # Save ID for deletion at shutdown
@@ -154,7 +160,7 @@ class RachioIro:
     @property
     def current_schedule(self) -> str:
         """Return the schedule that the device is running right now."""
-        return self.rachio.device.getCurrentSchedule(self.controller_id)[1]
+        return self.rachio.device.current_schedule(self.controller_id)[1]
 
     @property
     def init_data(self) -> dict:
@@ -188,5 +194,5 @@ class RachioIro:
 
     def stop_watering(self) -> None:
         """Stop watering all zones connected to this controller."""
-        self.rachio.device.stopWater(self.controller_id)
+        self.rachio.device.stop_water(self.controller_id)
         _LOGGER.info("Stopped watering of all zones on %s", str(self))
diff --git a/homeassistant/components/rachio/manifest.json b/homeassistant/components/rachio/manifest.json
index 61148aae438..224f59ea173 100644
--- a/homeassistant/components/rachio/manifest.json
+++ b/homeassistant/components/rachio/manifest.json
@@ -2,7 +2,7 @@
   "domain": "rachio",
   "name": "Rachio",
   "documentation": "https://www.home-assistant.io/integrations/rachio",
-  "requirements": ["rachiopy==0.1.4"],
+  "requirements": ["rachiopy==1.0.3"],
   "dependencies": ["http"],
   "after_dependencies": ["cloud"],
   "codeowners": ["@bdraco"],
diff --git a/homeassistant/components/rachio/services.yaml b/homeassistant/components/rachio/services.yaml
index 0b22a0953a0..480d53aa454 100644
--- a/homeassistant/components/rachio/services.yaml
+++ b/homeassistant/components/rachio/services.yaml
@@ -7,3 +7,12 @@ set_zone_moisture_percent:
     percent:
       description: Set the desired zone moisture percentage from 0 to 100. [Required]
       example: 50
+start_multiple_zone_schedule:
+  description: Create a custom schedule of zones and runtimes.
+  fields:
+    entity_id:
+      description: Name of the zone or zones to run. Zones should all be on the same controller, attempting to start zones on multiple controllers may have undesired results. [Required]
+      example: "switch.front_yard, switch.side_yard"
+    duration:
+      description: Number of minutes to run the zone(s). If only 1 duration is given, that time will be used for all zones. If given a list of durations, the durations will apply to the respective zone listed above. [Required]
+      example: 15, 20
diff --git a/homeassistant/components/rachio/strings.json b/homeassistant/components/rachio/strings.json
index faea255693e..c6f1f4ca264 100644
--- a/homeassistant/components/rachio/strings.json
+++ b/homeassistant/components/rachio/strings.json
@@ -10,12 +10,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
diff --git a/homeassistant/components/rachio/switch.py b/homeassistant/components/rachio/switch.py
index 32ec6267941..8009d79b224 100644
--- a/homeassistant/components/rachio/switch.py
+++ b/homeassistant/components/rachio/switch.py
@@ -6,7 +6,9 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.switch import SwitchEntity
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.core import callback
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.event import async_track_point_in_utc_time
@@ -37,6 +39,7 @@ from .const import (
     SCHEDULE_TYPE_FIXED,
     SCHEDULE_TYPE_FLEX,
     SERVICE_SET_ZONE_MOISTURE,
+    SERVICE_START_MULTIPLE_ZONES,
     SIGNAL_RACHIO_CONTROLLER_UPDATE,
     SIGNAL_RACHIO_RAIN_DELAY_UPDATE,
     SIGNAL_RACHIO_SCHEDULE_UPDATE,
@@ -56,38 +59,88 @@ from .webhooks import (
     SUBTYPE_SLEEP_MODE_OFF,
     SUBTYPE_SLEEP_MODE_ON,
     SUBTYPE_ZONE_COMPLETED,
+    SUBTYPE_ZONE_PAUSED,
     SUBTYPE_ZONE_STARTED,
     SUBTYPE_ZONE_STOPPED,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
+ATTR_DURATION = "duration"
+ATTR_ID = "id"
 ATTR_PERCENT = "percent"
 ATTR_SCHEDULE_SUMMARY = "Summary"
 ATTR_SCHEDULE_ENABLED = "Enabled"
 ATTR_SCHEDULE_DURATION = "Duration"
 ATTR_SCHEDULE_TYPE = "Type"
+ATTR_SORT_ORDER = "sortOrder"
 ATTR_ZONE_NUMBER = "Zone number"
 ATTR_ZONE_SHADE = "Shade"
 ATTR_ZONE_SLOPE = "Slope"
 ATTR_ZONE_SUMMARY = "Summary"
 ATTR_ZONE_TYPE = "Type"
 
+START_MULTIPLE_ZONES_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+        vol.Required(ATTR_DURATION): cv.ensure_list_csv,
+    }
+)
+
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Rachio switches."""
+    zone_entities = []
     has_flex_sched = False
     entities = await hass.async_add_executor_job(_create_entities, hass, config_entry)
     for entity in entities:
+        if isinstance(entity, RachioZone):
+            zone_entities.append(entity)
         if isinstance(entity, RachioSchedule) and entity.type == SCHEDULE_TYPE_FLEX:
             has_flex_sched = True
-            break
 
     async_add_entities(entities)
     _LOGGER.info("%d Rachio switch(es) added", len(entities))
 
-    platform = entity_platform.current_platform.get()
+    def start_multiple(service):
+        """Service to start multiple zones in sequence."""
+        zones_list = []
+        person = hass.data[DOMAIN_RACHIO][config_entry.entry_id]
+        entity_id = service.data[ATTR_ENTITY_ID]
+        duration = iter(service.data[ATTR_DURATION])
+        default_time = service.data[ATTR_DURATION][0]
+        entity_to_zone_id = {
+            entity.entity_id: entity.zone_id for entity in zone_entities
+        }
+
+        for (count, data) in enumerate(entity_id):
+            if data in entity_to_zone_id:
+                # Time can be passed as a list per zone,
+                # or one time for all zones
+                time = int(next(duration, default_time)) * 60
+                zones_list.append(
+                    {
+                        ATTR_ID: entity_to_zone_id.get(data),
+                        ATTR_DURATION: time,
+                        ATTR_SORT_ORDER: count,
+                    }
+                )
+
+        if len(zones_list) != 0:
+            person.start_multiple_zones(zones_list)
+            _LOGGER.debug("Starting zone(s) %s", entity_id)
+        else:
+            raise HomeAssistantError("No matching zones found in given entity_ids")
+
+    hass.services.async_register(
+        DOMAIN_RACHIO,
+        SERVICE_START_MULTIPLE_ZONES,
+        start_multiple,
+        schema=START_MULTIPLE_ZONES_SCHEMA,
+    )
+
     if has_flex_sched:
+        platform = entity_platform.current_platform.get()
         platform.async_register_entity_service(
             SERVICE_SET_ZONE_MOISTURE,
             {vol.Required(ATTR_PERCENT): cv.positive_int},
@@ -178,11 +231,11 @@ class RachioStandbySwitch(RachioSwitch):
 
     def turn_on(self, **kwargs) -> None:
         """Put the controller in standby mode."""
-        self._controller.rachio.device.off(self._controller.controller_id)
+        self._controller.rachio.device.turn_off(self._controller.controller_id)
 
     def turn_off(self, **kwargs) -> None:
         """Resume controller functionality."""
-        self._controller.rachio.device.on(self._controller.controller_id)
+        self._controller.rachio.device.turn_on(self._controller.controller_id)
 
     async def async_added_to_hass(self):
         """Subscribe to updates."""
@@ -249,12 +302,12 @@ class RachioRainDelay(RachioSwitch):
 
     def turn_on(self, **kwargs) -> None:
         """Activate a 24 hour rain delay on the controller."""
-        self._controller.rachio.device.rainDelay(self._controller.controller_id, 86400)
+        self._controller.rachio.device.rain_delay(self._controller.controller_id, 86400)
         _LOGGER.debug("Starting rain delay for 24 hours")
 
     def turn_off(self, **kwargs) -> None:
         """Resume controller functionality."""
-        self._controller.rachio.device.rainDelay(self._controller.controller_id, 0)
+        self._controller.rachio.device.rain_delay(self._controller.controller_id, 0)
         _LOGGER.debug("Canceling rain delay")
 
     async def async_added_to_hass(self):
@@ -288,7 +341,7 @@ class RachioZone(RachioSwitch):
 
     def __init__(self, person, controller, data, current_schedule):
         """Initialize a new Rachio Zone."""
-        self._id = data[KEY_ID]
+        self.id = data[KEY_ID]
         self._zone_name = data[KEY_NAME]
         self._zone_number = data[KEY_ZONE_NUMBER]
         self._zone_enabled = data[KEY_ENABLED]
@@ -308,7 +361,7 @@ class RachioZone(RachioSwitch):
     @property
     def zone_id(self) -> str:
         """How the Rachio API refers to the zone."""
-        return self._id
+        return self.id
 
     @property
     def name(self) -> str:
@@ -380,7 +433,7 @@ class RachioZone(RachioSwitch):
     def set_moisture_percent(self, percent) -> None:
         """Set the zone moisture percent."""
         _LOGGER.debug("Setting %s moisture to %s percent", self._zone_name, percent)
-        self._controller.rachio.zone.setMoisturePercent(self._id, percent / 100)
+        self._controller.rachio.zone.set_moisture_percent(self.id, percent / 100)
 
     @callback
     def _async_handle_update(self, *args, **kwargs) -> None:
@@ -392,7 +445,11 @@ class RachioZone(RachioSwitch):
 
         if args[0][KEY_SUBTYPE] == SUBTYPE_ZONE_STARTED:
             self._state = True
-        elif args[0][KEY_SUBTYPE] in [SUBTYPE_ZONE_STOPPED, SUBTYPE_ZONE_COMPLETED]:
+        elif args[0][KEY_SUBTYPE] in [
+            SUBTYPE_ZONE_STOPPED,
+            SUBTYPE_ZONE_COMPLETED,
+            SUBTYPE_ZONE_PAUSED,
+        ]:
             self._state = False
 
         self.async_write_ha_state()
diff --git a/homeassistant/components/rachio/translations/ca.json b/homeassistant/components/rachio/translations/ca.json
index 8da88ec50e9..c451b4df83e 100644
--- a/homeassistant/components/rachio/translations/ca.json
+++ b/homeassistant/components/rachio/translations/ca.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/rachio/translations/cs.json b/homeassistant/components/rachio/translations/cs.json
index 757cf90e1e2..7239396d712 100644
--- a/homeassistant/components/rachio/translations/cs.json
+++ b/homeassistant/components/rachio/translations/cs.json
@@ -1,9 +1,27 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "api_key": "Kl\u00ed\u010d API"
+                },
+                "title": "P\u0159ipojen\u00ed k za\u0159\u00edzeni Rachio"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "manual_run_mins": "Na jak dlouho, v minut\u00e1ch, zapnout stanici, kdy\u017e je zapnut vyp\u00edna\u010d."
                 }
             }
         }
diff --git a/homeassistant/components/rachio/translations/en.json b/homeassistant/components/rachio/translations/en.json
index 21f7524008a..ca466938a3c 100644
--- a/homeassistant/components/rachio/translations/en.json
+++ b/homeassistant/components/rachio/translations/en.json
@@ -4,7 +4,7 @@
             "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/rachio/translations/et.json b/homeassistant/components/rachio/translations/et.json
new file mode 100644
index 00000000000..696b5dbf001
--- /dev/null
+++ b/homeassistant/components/rachio/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API v\u00f5ti"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/rachio/translations/it.json b/homeassistant/components/rachio/translations/it.json
index f8013eb3551..49d64be1523 100644
--- a/homeassistant/components/rachio/translations/it.json
+++ b/homeassistant/components/rachio/translations/it.json
@@ -4,7 +4,7 @@
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/rachio/translations/no.json b/homeassistant/components/rachio/translations/no.json
index e5f9c0abbd3..c05d2f4c8ec 100644
--- a/homeassistant/components/rachio/translations/no.json
+++ b/homeassistant/components/rachio/translations/no.json
@@ -4,14 +4,14 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "API n\u00f8kkel"
+                    "api_key": "API-n\u00f8kkel"
                 },
                 "description": "Du trenger API-n\u00f8kkelen fra https://app.rach.io/. Velg 'Kontoinnstillinger' og klikk deretter p\u00e5 'F\u00e5 API n\u00f8kkel'.",
                 "title": "Koble til Rachio-enheten din"
diff --git a/homeassistant/components/rachio/translations/pl.json b/homeassistant/components/rachio/translations/pl.json
index 55e8d18fe1c..450a4ce3eb2 100644
--- a/homeassistant/components/rachio/translations/pl.json
+++ b/homeassistant/components/rachio/translations/pl.json
@@ -4,7 +4,7 @@
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/rachio/translations/ru.json b/homeassistant/components/rachio/translations/ru.json
index f6fe53b5f8d..c85a07e58bf 100644
--- a/homeassistant/components/rachio/translations/ru.json
+++ b/homeassistant/components/rachio/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/rachio/translations/sv.json b/homeassistant/components/rachio/translations/sv.json
index 726912f62f9..c2da7a1c01d 100644
--- a/homeassistant/components/rachio/translations/sv.json
+++ b/homeassistant/components/rachio/translations/sv.json
@@ -7,6 +7,13 @@
             "cannot_connect": "Det gick inte att ansluta, f\u00f6rs\u00f6k igen",
             "invalid_auth": "Ogiltig autentisering",
             "unknown": "Ov\u00e4ntat fel"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API nyckel"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/rachio/translations/zh-Hant.json b/homeassistant/components/rachio/translations/zh-Hant.json
index 7f05aa218e7..c79264706c6 100644
--- a/homeassistant/components/rachio/translations/zh-Hant.json
+++ b/homeassistant/components/rachio/translations/zh-Hant.json
@@ -4,7 +4,7 @@
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/rachio/webhooks.py b/homeassistant/components/rachio/webhooks.py
index 5daf7852725..c175117efcb 100644
--- a/homeassistant/components/rachio/webhooks.py
+++ b/homeassistant/components/rachio/webhooks.py
@@ -58,6 +58,7 @@ SUBTYPE_ZONE_STOPPED = "ZONE_STOPPED"
 SUBTYPE_ZONE_COMPLETED = "ZONE_COMPLETED"
 SUBTYPE_ZONE_CYCLING = "ZONE_CYCLING"
 SUBTYPE_ZONE_CYCLING_COMPLETED = "ZONE_CYCLING_COMPLETED"
+SUBTYPE_ZONE_PAUSED = "ZONE_PAUSED"
 
 # Webhook callbacks
 LISTEN_EVENT_TYPES = [
diff --git a/homeassistant/components/rainbird/switch.py b/homeassistant/components/rainbird/switch.py
index 9041128be60..bccd4d2986c 100644
--- a/homeassistant/components/rainbird/switch.py
+++ b/homeassistant/components/rainbird/switch.py
@@ -1,7 +1,4 @@
 """Support for Rain Bird Irrigation system LNK WiFi Module."""
-
-import logging
-
 from pyrainbird import AvailableStations, RainbirdController
 import voluptuous as vol
 
@@ -11,8 +8,6 @@ from homeassistant.helpers import config_validation as cv
 
 from . import CONF_ZONES, DATA_RAINBIRD, DOMAIN, RAINBIRD_CONTROLLER
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_DURATION = "duration"
 
 SERVICE_START_IRRIGATION = "start_irrigation"
@@ -20,7 +15,7 @@ SERVICE_START_IRRIGATION = "start_irrigation"
 SERVICE_SCHEMA_IRRIGATION = vol.Schema(
     {
         vol.Required(ATTR_ENTITY_ID): cv.entity_id,
-        vol.Required(ATTR_DURATION): vol.All(vol.Coerce(float), vol.Range(min=0)),
+        vol.Required(ATTR_DURATION): cv.positive_float,
     }
 )
 
diff --git a/homeassistant/components/rainmachine/__init__.py b/homeassistant/components/rainmachine/__init__.py
index 544a79c42df..7d3c10636fa 100644
--- a/homeassistant/components/rainmachine/__init__.py
+++ b/homeassistant/components/rainmachine/__init__.py
@@ -7,7 +7,6 @@ from regenmaschine import Client
 from regenmaschine.errors import RainMachineError
 import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import (
     ATTR_ATTRIBUTION,
     CONF_IP_ADDRESS,
@@ -33,7 +32,6 @@ from .const import (
     DATA_RESTRICTIONS_UNIVERSAL,
     DATA_ZONES,
     DATA_ZONES_DETAILS,
-    DEFAULT_PORT,
     DEFAULT_SCAN_INTERVAL,
     DEFAULT_ZONE_RUN,
     DOMAIN,
@@ -44,7 +42,6 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_CONTROLLERS = "controllers"
 CONF_PROGRAM_ID = "program_id"
 CONF_SECONDS = "seconds"
 CONF_ZONE_ID = "zone_id"
@@ -76,50 +73,12 @@ SERVICE_STOP_PROGRAM_SCHEMA = vol.Schema(
 
 SERVICE_STOP_ZONE_SCHEMA = vol.Schema({vol.Required(CONF_ZONE_ID): cv.positive_int})
 
-CONTROLLER_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_IP_ADDRESS): cv.string,
-        vol.Required(CONF_PASSWORD): cv.string,
-        vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-        vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
-        vol.Optional(CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL): vol.All(
-            cv.time_period, lambda value: value.total_seconds()
-        ),
-        vol.Optional(CONF_ZONE_RUN_TIME, default=DEFAULT_ZONE_RUN): cv.positive_int,
-    }
-)
-
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: vol.Schema(
-            {
-                vol.Required(CONF_CONTROLLERS): vol.All(
-                    cv.ensure_list, [CONTROLLER_SCHEMA]
-                )
-            }
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
+CONFIG_SCHEMA = cv.deprecated(DOMAIN, invalidation_version="0.119")
 
 
 async def async_setup(hass, config):
     """Set up the RainMachine component."""
-    hass.data[DOMAIN] = {}
-    hass.data[DOMAIN][DATA_CLIENT] = {}
-
-    if DOMAIN not in config:
-        return True
-
-    conf = config[DOMAIN]
-
-    for controller in conf[CONF_CONTROLLERS]:
-        hass.async_create_task(
-            hass.config_entries.flow.async_init(
-                DOMAIN, context={"source": SOURCE_IMPORT}, data=controller
-            )
-        )
-
+    hass.data[DOMAIN] = {DATA_CLIENT: {}}
     return True
 
 
diff --git a/homeassistant/components/rainmachine/binary_sensor.py b/homeassistant/components/rainmachine/binary_sensor.py
index b3f7ffb7d6b..e2ef8cea64b 100644
--- a/homeassistant/components/rainmachine/binary_sensor.py
+++ b/homeassistant/components/rainmachine/binary_sensor.py
@@ -1,6 +1,4 @@
 """This platform provides binary sensors for key RainMachine data."""
-import logging
-
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -15,8 +13,6 @@ from .const import (
     SENSOR_UPDATE_TOPIC,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 TYPE_FLOW_SENSOR = "flow_sensor"
 TYPE_FREEZE = "freeze"
 TYPE_FREEZE_PROTECTION = "freeze_protection"
diff --git a/homeassistant/components/rainmachine/config_flow.py b/homeassistant/components/rainmachine/config_flow.py
index d0513ac89fb..d942ecccfab 100644
--- a/homeassistant/components/rainmachine/config_flow.py
+++ b/homeassistant/components/rainmachine/config_flow.py
@@ -46,10 +46,6 @@ class RainMachineFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             errors=errors if errors else {},
         )
 
-    async def async_step_import(self, import_config):
-        """Import a config entry from configuration.yaml."""
-        return await self.async_step_user(import_config)
-
     async def async_step_user(self, user_input=None):
         """Handle the start of the config flow."""
         if not user_input:
@@ -69,7 +65,7 @@ class RainMachineFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                 ssl=user_input.get(CONF_SSL, True),
             )
         except RainMachineError:
-            return await self._show_form({CONF_PASSWORD: "invalid_credentials"})
+            return await self._show_form({CONF_PASSWORD: "invalid_auth"})
 
         # Unfortunately, RainMachine doesn't provide a way to refresh the
         # access token without using the IP address and password, so we have to
diff --git a/homeassistant/components/rainmachine/sensor.py b/homeassistant/components/rainmachine/sensor.py
index 8534748978d..ef1b88e6489 100644
--- a/homeassistant/components/rainmachine/sensor.py
+++ b/homeassistant/components/rainmachine/sensor.py
@@ -1,6 +1,4 @@
 """This platform provides support for sensor data from RainMachine."""
-import logging
-
 from homeassistant.const import TEMP_CELSIUS, VOLUME_CUBIC_METERS
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -14,8 +12,6 @@ from .const import (
     SENSOR_UPDATE_TOPIC,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 TYPE_FLOW_SENSOR_CLICK_M3 = "flow_sensor_clicks_cubic_meter"
 TYPE_FLOW_SENSOR_CONSUMED_LITERS = "flow_sensor_consumed_liters"
 TYPE_FLOW_SENSOR_START_INDEX = "flow_sensor_start_index"
diff --git a/homeassistant/components/rainmachine/strings.json b/homeassistant/components/rainmachine/strings.json
index 555230d1f0f..d0a6adf4687 100644
--- a/homeassistant/components/rainmachine/strings.json
+++ b/homeassistant/components/rainmachine/strings.json
@@ -11,11 +11,10 @@
       }
     },
     "error": {
-      "identifier_exists": "Account already registered",
-      "invalid_credentials": "Invalid credentials"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "abort": {
-      "already_configured": "This RainMachine controller is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/rainmachine/translations/ca.json b/homeassistant/components/rainmachine/translations/ca.json
index 37d842355c0..cc77b66aef0 100644
--- a/homeassistant/components/rainmachine/translations/ca.json
+++ b/homeassistant/components/rainmachine/translations/ca.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest controlador RainMachine ja est\u00e0 configurat."
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "identifier_exists": "Aquest compte ja est\u00e0 registrat",
+            "identifier_exists": "El compte ja ha estat configurat",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Credencials inv\u00e0lides"
         },
         "step": {
diff --git a/homeassistant/components/rainmachine/translations/cs.json b/homeassistant/components/rainmachine/translations/cs.json
index 2b63decf0c3..883e731f838 100644
--- a/homeassistant/components/rainmachine/translations/cs.json
+++ b/homeassistant/components/rainmachine/translations/cs.json
@@ -1,7 +1,11 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
         "error": {
-            "identifier_exists": "\u00da\u010det je ji\u017e zaregistrov\u00e1n",
+            "identifier_exists": "\u00da\u010det je ji\u017e nastaven",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
             "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje"
         },
         "step": {
diff --git a/homeassistant/components/rainmachine/translations/en.json b/homeassistant/components/rainmachine/translations/en.json
index aabe3d35293..d734cbd5d38 100644
--- a/homeassistant/components/rainmachine/translations/en.json
+++ b/homeassistant/components/rainmachine/translations/en.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This RainMachine controller is already configured."
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "identifier_exists": "Account already registered",
+            "identifier_exists": "Account is already configured",
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid credentials"
         },
         "step": {
diff --git a/homeassistant/components/rainmachine/translations/es.json b/homeassistant/components/rainmachine/translations/es.json
index 0767c509bf9..fc27a8b3089 100644
--- a/homeassistant/components/rainmachine/translations/es.json
+++ b/homeassistant/components/rainmachine/translations/es.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Este controlador RainMachine ya est\u00e1 configurado."
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "identifier_exists": "Cuenta ya registrada",
+            "identifier_exists": "La cuenta ya ha sido configurada",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_credentials": "Credenciales no v\u00e1lidas"
         },
         "step": {
diff --git a/homeassistant/components/rainmachine/translations/et.json b/homeassistant/components/rainmachine/translations/et.json
new file mode 100644
index 00000000000..1b17200b762
--- /dev/null
+++ b/homeassistant/components/rainmachine/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "identifier_exists": "Konto on juba seadistatud",
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_credentials": "Sobimatu mandaat"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "Hostinimi v\u00f5i IP-aadress",
+                    "password": "Salas\u00f5na",
+                    "port": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/rainmachine/translations/it.json b/homeassistant/components/rainmachine/translations/it.json
index 5ec522c9c24..7850ea19c33 100644
--- a/homeassistant/components/rainmachine/translations/it.json
+++ b/homeassistant/components/rainmachine/translations/it.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo controller RainMachine \u00e8 gi\u00e0 configurato."
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "identifier_exists": "Account gi\u00e0 registrato",
+            "identifier_exists": "L'account \u00e8 gi\u00e0 configurato",
+            "invalid_auth": "Autenticazione non valida",
             "invalid_credentials": "Credenziali non valide"
         },
         "step": {
diff --git a/homeassistant/components/rainmachine/translations/lb.json b/homeassistant/components/rainmachine/translations/lb.json
index fe0b3bc0091..d0f41ddf3f9 100644
--- a/homeassistant/components/rainmachine/translations/lb.json
+++ b/homeassistant/components/rainmachine/translations/lb.json
@@ -5,6 +5,7 @@
         },
         "error": {
             "identifier_exists": "Konto ass scho registr\u00e9iert",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_credentials": "Ong\u00eblteg Login Informatioune"
         },
         "step": {
diff --git a/homeassistant/components/rainmachine/translations/no.json b/homeassistant/components/rainmachine/translations/no.json
index bc80cdedb31..164602862c5 100644
--- a/homeassistant/components/rainmachine/translations/no.json
+++ b/homeassistant/components/rainmachine/translations/no.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne RainMachine-kontrolleren er allerede konfigurert."
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "identifier_exists": "Konto er allerede registrert",
+            "identifier_exists": "Kontoen er allerede konfigurert",
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig legitimasjon"
         },
         "step": {
@@ -12,7 +13,7 @@
                 "data": {
                     "ip_address": "Vertsnavn eller IP-adresse",
                     "password": "Passord",
-                    "port": ""
+                    "port": "Port"
                 },
                 "title": "Fyll ut informasjonen din"
             }
diff --git a/homeassistant/components/rainmachine/translations/pl.json b/homeassistant/components/rainmachine/translations/pl.json
index 8ea3ab6dbc4..a1b7c01725e 100644
--- a/homeassistant/components/rainmachine/translations/pl.json
+++ b/homeassistant/components/rainmachine/translations/pl.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ten kontroler RainMachine jest ju\u017c skonfigurowany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "identifier_exists": "Konto jest ju\u017c zarejestrowane.",
+            "identifier_exists": "Konto jest ju\u017c skonfigurowane",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_credentials": "Nieprawid\u0142owe dane uwierzytelniaj\u0105ce"
         },
         "step": {
diff --git a/homeassistant/components/rainmachine/translations/ru.json b/homeassistant/components/rainmachine/translations/ru.json
index cd5e3d85d50..3bb1a95f647 100644
--- a/homeassistant/components/rainmachine/translations/ru.json
+++ b/homeassistant/components/rainmachine/translations/ru.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "identifier_exists": "\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0430.",
+            "identifier_exists": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435."
         },
         "step": {
diff --git a/homeassistant/components/rainmachine/translations/zh-Hant.json b/homeassistant/components/rainmachine/translations/zh-Hant.json
index d6c022cd5ce..bb4184b078b 100644
--- a/homeassistant/components/rainmachine/translations/zh-Hant.json
+++ b/homeassistant/components/rainmachine/translations/zh-Hant.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u6b64 RainMachine \u63a7\u5236\u5668\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "identifier_exists": "\u5e33\u865f\u5df2\u8a3b\u518a",
+            "identifier_exists": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u6191\u8b49\u7121\u6548"
         },
         "step": {
diff --git a/homeassistant/components/random/binary_sensor.py b/homeassistant/components/random/binary_sensor.py
index baec29c5937..7cd1208a3ee 100644
--- a/homeassistant/components/random/binary_sensor.py
+++ b/homeassistant/components/random/binary_sensor.py
@@ -1,5 +1,4 @@
 """Support for showing random states."""
-import logging
 from random import getrandbits
 
 import voluptuous as vol
@@ -12,8 +11,6 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Random Binary Sensor"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/random/sensor.py b/homeassistant/components/random/sensor.py
index 4ebd710f103..58d996bc6ec 100644
--- a/homeassistant/components/random/sensor.py
+++ b/homeassistant/components/random/sensor.py
@@ -1,5 +1,4 @@
 """Support for showing random numbers."""
-import logging
 from random import randrange
 
 import voluptuous as vol
@@ -14,8 +13,6 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_MAXIMUM = "maximum"
 ATTR_MINIMUM = "minimum"
 
diff --git a/homeassistant/components/raspyrfm/switch.py b/homeassistant/components/raspyrfm/switch.py
index cd4e28e1f10..56c42cf7e69 100644
--- a/homeassistant/components/raspyrfm/switch.py
+++ b/homeassistant/components/raspyrfm/switch.py
@@ -1,6 +1,4 @@
 """Support for switches that can be controlled using the RaspyRFM rc module."""
-import logging
-
 from raspyrfm_client import RaspyRFMClient
 from raspyrfm_client.device_implementations.controlunit.actions import Action
 from raspyrfm_client.device_implementations.controlunit.controlunit_constants import (
@@ -22,8 +20,6 @@ from homeassistant.const import (
 )
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_GATEWAY_MANUFACTURER = "gateway_manufacturer"
 CONF_GATEWAY_MODEL = "gateway_model"
 CONF_CONTROLUNIT_MANUFACTURER = "controlunit_manufacturer"
diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py
index 9630f94d807..18d364315b7 100644
--- a/homeassistant/components/recorder/__init__.py
+++ b/homeassistant/components/recorder/__init__.py
@@ -48,7 +48,7 @@ ATTR_REPACK = "repack"
 
 SERVICE_PURGE_SCHEMA = vol.Schema(
     {
-        vol.Optional(ATTR_KEEP_DAYS): vol.All(vol.Coerce(int), vol.Range(min=0)),
+        vol.Optional(ATTR_KEEP_DAYS): cv.positive_int,
         vol.Optional(ATTR_REPACK, default=False): cv.boolean,
     }
 )
@@ -58,8 +58,13 @@ DEFAULT_DB_FILE = "home-assistant_v2.db"
 DEFAULT_DB_INTEGRITY_CHECK = True
 DEFAULT_DB_MAX_RETRIES = 10
 DEFAULT_DB_RETRY_WAIT = 3
+DEFAULT_COMMIT_INTERVAL = 1
 KEEPALIVE_TIME = 30
 
+# Controls how often we clean up
+# States and Events objects
+EXPIRE_AFTER_COMMITS = 120
+
 CONF_AUTO_PURGE = "auto_purge"
 CONF_DB_URL = "db_url"
 CONF_DB_MAX_RETRIES = "db_max_retries"
@@ -87,13 +92,11 @@ CONFIG_SCHEMA = vol.Schema(
                     vol.Optional(CONF_PURGE_KEEP_DAYS, default=10): vol.All(
                         vol.Coerce(int), vol.Range(min=1)
                     ),
-                    vol.Optional(CONF_PURGE_INTERVAL, default=1): vol.All(
-                        vol.Coerce(int), vol.Range(min=0)
-                    ),
+                    vol.Optional(CONF_PURGE_INTERVAL, default=1): cv.positive_int,
                     vol.Optional(CONF_DB_URL): cv.string,
-                    vol.Optional(CONF_COMMIT_INTERVAL, default=1): vol.All(
-                        vol.Coerce(int), vol.Range(min=0)
-                    ),
+                    vol.Optional(
+                        CONF_COMMIT_INTERVAL, default=DEFAULT_COMMIT_INTERVAL
+                    ): cv.positive_int,
                     vol.Optional(
                         CONF_DB_MAX_RETRIES, default=DEFAULT_DB_MAX_RETRIES
                     ): cv.positive_int,
@@ -238,6 +241,7 @@ class Recorder(threading.Thread):
         self.exclude_t = exclude_t
 
         self._timechanges_seen = 0
+        self._commits_without_expire = 0
         self._keepalive_count = 0
         self._old_states = {}
         self._pending_expunge = []
@@ -345,6 +349,7 @@ class Recorder(threading.Thread):
             )
 
         self.event_session = self.get_session()
+        self.event_session.expire_on_commit = False
         # Use a session for the event read loop
         # with a commit every time the event time
         # has changed. This reduces the disk io.
@@ -382,9 +387,11 @@ class Recorder(threading.Thread):
                     continue
 
             try:
-                dbevent = Events.from_event(event)
                 if event.event_type == EVENT_STATE_CHANGED:
-                    dbevent.event_data = "{}"
+                    dbevent = Events.from_event(event, event_data="{}")
+                else:
+                    dbevent = Events.from_event(event)
+                dbevent.created = event.time_fired
                 self.event_session.add(dbevent)
             except (TypeError, ValueError):
                 _LOGGER.warning("Event is not JSON serializable: %s", event)
@@ -397,10 +404,15 @@ class Recorder(threading.Thread):
                     dbstate = States.from_event(event)
                     has_new_state = event.data.get("new_state")
                     if dbstate.entity_id in self._old_states:
-                        dbstate.old_state = self._old_states.pop(dbstate.entity_id)
+                        old_state = self._old_states.pop(dbstate.entity_id)
+                        if old_state.state_id:
+                            dbstate.old_state_id = old_state.state_id
+                        else:
+                            dbstate.old_state = old_state
                     if not has_new_state:
                         dbstate.state = None
                     dbstate.event = dbevent
+                    dbstate.created = event.time_fired
                     self.event_session.add(dbstate)
                     if has_new_state:
                         self._old_states[dbstate.entity_id] = dbstate
@@ -484,25 +496,36 @@ class Recorder(threading.Thread):
 
         try:
             self.event_session = self.get_session()
+            self.event_session.expire_on_commit = False
         except Exception as err:  # pylint: disable=broad-except
             # Must catch the exception to prevent the loop from collapsing
             _LOGGER.exception("Error while creating new event session: %s", err)
 
     def _commit_event_session(self):
+        self._commits_without_expire += 1
+
         try:
-            self.event_session.flush()
-            for dbstate in self._pending_expunge:
-                # Expunge the state so its not expired
-                # until we use it later for dbstate.old_state
-                if dbstate in self.event_session:
-                    self.event_session.expunge(dbstate)
-            self._pending_expunge = []
+            if self._pending_expunge:
+                self.event_session.flush()
+                for dbstate in self._pending_expunge:
+                    # Expunge the state so its not expired
+                    # until we use it later for dbstate.old_state
+                    if dbstate in self.event_session:
+                        self.event_session.expunge(dbstate)
+                self._pending_expunge = []
             self.event_session.commit()
         except Exception as err:
             _LOGGER.error("Error executing query: %s", err)
             self.event_session.rollback()
             raise
 
+        # Expire is an expensive operation (frequently more expensive
+        # than the flush and commit itself) so we only
+        # do it after EXPIRE_AFTER_COMMITS commits
+        if self._commits_without_expire == EXPIRE_AFTER_COMMITS:
+            self._commits_without_expire = 0
+            self.event_session.expire_all()
+
     @callback
     def event_listener(self, event):
         """Listen for new events and put them in the process queue."""
diff --git a/homeassistant/components/recorder/manifest.json b/homeassistant/components/recorder/manifest.json
index 6983dfbd690..6d2311c76e7 100644
--- a/homeassistant/components/recorder/manifest.json
+++ b/homeassistant/components/recorder/manifest.json
@@ -2,7 +2,7 @@
   "domain": "recorder",
   "name": "Recorder",
   "documentation": "https://www.home-assistant.io/integrations/recorder",
-  "requirements": ["sqlalchemy==1.3.19"],
+  "requirements": ["sqlalchemy==1.3.20"],
   "codeowners": [],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/recorder/models.py b/homeassistant/components/recorder/models.py
index 642407cf0c6..4756ac13ce3 100644
--- a/homeassistant/components/recorder/models.py
+++ b/homeassistant/components/recorder/models.py
@@ -60,12 +60,12 @@ class Events(Base):  # type: ignore
     )
 
     @staticmethod
-    def from_event(event):
+    def from_event(event, event_data=None):
         """Create an event database object from a native event."""
         return Events(
             event_type=event.event_type,
-            event_data=json.dumps(event.data, cls=JSONEncoder),
-            origin=str(event.origin),
+            event_data=event_data or json.dumps(event.data, cls=JSONEncoder),
+            origin=str(event.origin.value),
             time_fired=event.time_fired,
             context_id=event.context.id,
             context_user_id=event.context.user_id,
diff --git a/homeassistant/components/remote/__init__.py b/homeassistant/components/remote/__init__.py
index ca9de0bfb62..44a318988b2 100644
--- a/homeassistant/components/remote/__init__.py
+++ b/homeassistant/components/remote/__init__.py
@@ -30,6 +30,7 @@ _LOGGER = logging.getLogger(__name__)
 
 ATTR_ACTIVITY = "activity"
 ATTR_COMMAND = "command"
+ATTR_COMMAND_TYPE = "command_type"
 ATTR_DEVICE = "device"
 ATTR_NUM_REPEATS = "num_repeats"
 ATTR_DELAY_SECS = "delay_secs"
@@ -46,6 +47,7 @@ MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
 
 SERVICE_SEND_COMMAND = "send_command"
 SERVICE_LEARN_COMMAND = "learn_command"
+SERVICE_DELETE_COMMAND = "delete_command"
 SERVICE_SYNC = "sync"
 
 DEFAULT_NUM_REPEATS = 1
@@ -53,6 +55,7 @@ DEFAULT_DELAY_SECS = 0.4
 DEFAULT_HOLD_SECS = 0
 
 SUPPORT_LEARN_COMMAND = 1
+SUPPORT_DELETE_COMMAND = 2
 
 REMOTE_SERVICE_ACTIVITY_SCHEMA = make_entity_service_schema(
     {vol.Optional(ATTR_ACTIVITY): cv.string}
@@ -103,12 +106,22 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
         {
             vol.Optional(ATTR_DEVICE): cv.string,
             vol.Optional(ATTR_COMMAND): vol.All(cv.ensure_list, [cv.string]),
+            vol.Optional(ATTR_COMMAND_TYPE): cv.string,
             vol.Optional(ATTR_ALTERNATIVE): cv.boolean,
             vol.Optional(ATTR_TIMEOUT): cv.positive_int,
         },
         "async_learn_command",
     )
 
+    component.async_register_entity_service(
+        SERVICE_DELETE_COMMAND,
+        {
+            vol.Required(ATTR_COMMAND): vol.All(cv.ensure_list, [cv.string]),
+            vol.Optional(ATTR_DEVICE): cv.string,
+        },
+        "async_delete_command",
+    )
+
     return True
 
 
@@ -150,6 +163,17 @@ class RemoteEntity(ToggleEntity):
         assert self.hass is not None
         await self.hass.async_add_executor_job(ft.partial(self.learn_command, **kwargs))
 
+    def delete_command(self, **kwargs: Any) -> None:
+        """Delete commands from the database."""
+        raise NotImplementedError()
+
+    async def async_delete_command(self, **kwargs: Any) -> None:
+        """Delete commands from the database."""
+        assert self.hass is not None
+        await self.hass.async_add_executor_job(
+            ft.partial(self.delete_command, **kwargs)
+        )
+
 
 class RemoteDevice(RemoteEntity):
     """Representation of a remote (for backwards compatibility)."""
diff --git a/homeassistant/components/remote/services.yaml b/homeassistant/components/remote/services.yaml
index fc9d170726e..3868479efc6 100644
--- a/homeassistant/components/remote/services.yaml
+++ b/homeassistant/components/remote/services.yaml
@@ -58,9 +58,25 @@ learn_command:
     command:
       description: A single command or a list of commands to learn.
       example: "Turn on"
+    command_type:
+      description: The type of command to be learned.
+      example: "rf"
     alternative:
       description: If code must be stored as alternative (useful for discrete remotes).
       example: "True"
     timeout:
       description: Timeout, in seconds, for the command to be learned.
       example: "30"
+
+delete_command:
+  description: Deletes a command or a list of commands from the database.
+  fields:
+    entity_id:
+      description: Name(s) of the remote entities holding the database.
+      example: "remote.bedroom"
+    device:
+      description: Name of the device from which commands will be deleted.
+      example: "television"
+    command:
+      description: A single command or a list of commands to delete.
+      example: "Mute"
diff --git a/homeassistant/components/remote/translations/cs.json b/homeassistant/components/remote/translations/cs.json
index 91102dd4461..6907021e393 100644
--- a/homeassistant/components/remote/translations/cs.json
+++ b/homeassistant/components/remote/translations/cs.json
@@ -16,9 +16,9 @@
     },
     "state": {
         "_": {
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed"
+            "off": "Vypnuto",
+            "on": "Zapnuto"
         }
     },
-    "title": "D\u00e1lkov\u00e9"
+    "title": "D\u00e1lkov\u00e9 ovl\u00e1d\u00e1n\u00ed"
 }
\ No newline at end of file
diff --git a/homeassistant/components/remote/translations/el.json b/homeassistant/components/remote/translations/el.json
index 79860300b96..0ef87433fce 100644
--- a/homeassistant/components/remote/translations/el.json
+++ b/homeassistant/components/remote/translations/el.json
@@ -1,4 +1,19 @@
 {
+    "device_automation": {
+        "action_type": {
+            "toggle": "\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae {entity_name}",
+            "turn_off": "\u0391\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 {entity_name}",
+            "turn_on": "\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 {entity_name}"
+        },
+        "condition_type": {
+            "is_off": "{entity_name} \u03b5\u03af\u03bd\u03b1\u03b9 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf",
+            "is_on": "{entity_name} \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf"
+        },
+        "trigger_type": {
+            "turned_off": "{entity_name} \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03b8\u03b7\u03ba\u03b5",
+            "turned_on": "{entity_name} \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03b8\u03b7\u03ba\u03b5"
+        }
+    },
     "state": {
         "_": {
             "off": "\u039a\u03bb\u03b5\u03b9\u03c3\u03c4\u03cc",
diff --git a/homeassistant/components/remote/translations/pl.json b/homeassistant/components/remote/translations/pl.json
index e6621d8b42d..3c319ff548c 100644
--- a/homeassistant/components/remote/translations/pl.json
+++ b/homeassistant/components/remote/translations/pl.json
@@ -1,8 +1,23 @@
 {
+    "device_automation": {
+        "action_type": {
+            "toggle": "Prze\u0142\u0105cz {entity_name}",
+            "turn_off": "wy\u0142\u0105cz {entity_name}",
+            "turn_on": "w\u0142\u0105cz {entity_name}"
+        },
+        "condition_type": {
+            "is_off": "{entity_name} jest wy\u0142\u0105czony",
+            "is_on": "{entity_name} jest w\u0142\u0105czony"
+        },
+        "trigger_type": {
+            "turned_off": "{entity_name} wy\u0142\u0105czy si\u0119",
+            "turned_on": "{entity_name} w\u0142\u0105czy si\u0119"
+        }
+    },
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "Pilot"
diff --git a/homeassistant/components/remote/translations/ru.json b/homeassistant/components/remote/translations/ru.json
index 0a725bcca91..7afb30bda1f 100644
--- a/homeassistant/components/remote/translations/ru.json
+++ b/homeassistant/components/remote/translations/ru.json
@@ -1,9 +1,9 @@
 {
     "device_automation": {
         "action_type": {
-            "toggle": "\u041f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}",
-            "turn_off": "\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}",
-            "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}"
+            "toggle": "{entity_name}: \u043f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_off": "{entity_name}: \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_on": "{entity_name}: \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c"
         },
         "condition_type": {
             "is_off": "{entity_name} \u0432 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u043e\u043c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438",
diff --git a/homeassistant/components/remote/translations/zh-Hans.json b/homeassistant/components/remote/translations/zh-Hans.json
index 70ab64a957f..ba1344fbb74 100644
--- a/homeassistant/components/remote/translations/zh-Hans.json
+++ b/homeassistant/components/remote/translations/zh-Hans.json
@@ -1,4 +1,17 @@
 {
+    "device_automation": {
+        "action_type": {
+            "turn_off": "\u5173\u95ed {entity_name}"
+        },
+        "condition_type": {
+            "is_off": "{entity_name} \u5df2\u5173\u95ed",
+            "is_on": "{entity_name} \u5df2\u6253\u5f00"
+        },
+        "trigger_type": {
+            "turned_off": "{entity_name} \u88ab\u5173\u95ed",
+            "turned_on": "{entity_name} \u88ab\u6253\u5f00"
+        }
+    },
     "state": {
         "_": {
             "off": "\u5173",
diff --git a/homeassistant/components/remote_rpi_gpio/__init__.py b/homeassistant/components/remote_rpi_gpio/__init__.py
index aa0a75c3331..afa60e44bed 100644
--- a/homeassistant/components/remote_rpi_gpio/__init__.py
+++ b/homeassistant/components/remote_rpi_gpio/__init__.py
@@ -1,11 +1,7 @@
 """Support for controlling GPIO pins of a Raspberry Pi."""
-import logging
-
 from gpiozero import LED, Button
 from gpiozero.pins.pigpio import PiGPIOFactory
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_BOUNCETIME = "bouncetime"
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_PULL_MODE = "pull_mode"
diff --git a/homeassistant/components/remote_rpi_gpio/binary_sensor.py b/homeassistant/components/remote_rpi_gpio/binary_sensor.py
index d97183de86e..86966ec4d87 100644
--- a/homeassistant/components/remote_rpi_gpio/binary_sensor.py
+++ b/homeassistant/components/remote_rpi_gpio/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for binary sensor using RPi GPIO."""
-import logging
-
 import requests
 import voluptuous as vol
 
@@ -18,8 +16,6 @@ from . import (
 )
 from .. import remote_rpi_gpio
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PORTS = "ports"
 
 _SENSORS_SCHEMA = vol.Schema({cv.positive_int: cv.string})
diff --git a/homeassistant/components/remote_rpi_gpio/switch.py b/homeassistant/components/remote_rpi_gpio/switch.py
index 48e072a5d6b..6730342e260 100644
--- a/homeassistant/components/remote_rpi_gpio/switch.py
+++ b/homeassistant/components/remote_rpi_gpio/switch.py
@@ -1,6 +1,4 @@
 """Allows to configure a switch using RPi GPIO."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
@@ -10,8 +8,6 @@ import homeassistant.helpers.config_validation as cv
 from . import CONF_INVERT_LOGIC, DEFAULT_INVERT_LOGIC
 from .. import remote_rpi_gpio
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PORTS = "ports"
 
 _SENSORS_SCHEMA = vol.Schema({cv.positive_int: cv.string})
diff --git a/homeassistant/components/rest/binary_sensor.py b/homeassistant/components/rest/binary_sensor.py
index c5b8f16162a..ec8b3ba0122 100644
--- a/homeassistant/components/rest/binary_sensor.py
+++ b/homeassistant/components/rest/binary_sensor.py
@@ -1,7 +1,5 @@
 """Support for RESTful binary sensors."""
-import logging
-
-from requests.auth import HTTPBasicAuth, HTTPDigestAuth
+import httpx
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
@@ -29,18 +27,15 @@ from homeassistant.const import (
 )
 from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.reload import setup_reload_service
+from homeassistant.helpers.reload import async_setup_reload_service
 
 from . import DOMAIN, PLATFORMS
-from .sensor import RestData
-
-_LOGGER = logging.getLogger(__name__)
+from .data import DEFAULT_TIMEOUT, RestData
 
 DEFAULT_METHOD = "GET"
 DEFAULT_NAME = "REST Binary Sensor"
 DEFAULT_VERIFY_SSL = True
 DEFAULT_FORCE_UPDATE = False
-DEFAULT_TIMEOUT = 10
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
@@ -68,10 +63,10 @@ PLATFORM_SCHEMA = vol.All(
 )
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the REST binary sensor."""
 
-    setup_reload_service(hass, DOMAIN, PLATFORMS)
+    await async_setup_reload_service(hass, DOMAIN, PLATFORMS)
 
     name = config.get(CONF_NAME)
     resource = config.get(CONF_RESOURCE)
@@ -89,25 +84,25 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 
     if resource_template is not None:
         resource_template.hass = hass
-        resource = resource_template.render()
+        resource = resource_template.render(parse_result=False)
 
     if value_template is not None:
         value_template.hass = hass
 
     if username and password:
         if config.get(CONF_AUTHENTICATION) == HTTP_DIGEST_AUTHENTICATION:
-            auth = HTTPDigestAuth(username, password)
+            auth = httpx.DigestAuth(username, password)
         else:
-            auth = HTTPBasicAuth(username, password)
+            auth = (username, password)
     else:
         auth = None
 
     rest = RestData(method, resource, auth, headers, payload, verify_ssl, timeout)
-    rest.update()
+    await rest.async_update()
     if rest.data is None:
         raise PlatformNotReady
 
-    add_entities(
+    async_add_entities(
         [
             RestBinarySensor(
                 hass,
@@ -118,7 +113,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                 force_update,
                 resource_template,
             )
-        ]
+        ],
+        True,
     )
 
 
@@ -186,9 +182,13 @@ class RestBinarySensor(BinarySensorEntity):
         """Force update."""
         return self._force_update
 
-    def update(self):
+    async def async_will_remove_from_hass(self):
+        """Shutdown the session."""
+        await self.rest.async_remove()
+
+    async def async_update(self):
         """Get the latest data from REST API and updates the state."""
         if self._resource_template is not None:
-            self.rest.set_url(self._resource_template.render())
+            self.rest.set_url(self._resource_template.render(parse_result=False))
 
-        self.rest.update()
+        await self.rest.async_update()
diff --git a/homeassistant/components/rest/data.py b/homeassistant/components/rest/data.py
new file mode 100644
index 00000000000..9d9e802c2a0
--- /dev/null
+++ b/homeassistant/components/rest/data.py
@@ -0,0 +1,65 @@
+"""Support for RESTful API."""
+import logging
+
+import httpx
+
+DEFAULT_TIMEOUT = 10
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class RestData:
+    """Class for handling the data retrieval."""
+
+    def __init__(
+        self,
+        method,
+        resource,
+        auth,
+        headers,
+        data,
+        verify_ssl,
+        timeout=DEFAULT_TIMEOUT,
+    ):
+        """Initialize the data object."""
+        self._method = method
+        self._resource = resource
+        self._auth = auth
+        self._headers = headers
+        self._request_data = data
+        self._timeout = timeout
+        self._verify_ssl = verify_ssl
+        self._async_client = None
+        self.data = None
+        self.headers = None
+
+    async def async_remove(self):
+        """Destroy the http session on destroy."""
+        if self._async_client:
+            await self._async_client.aclose()
+
+    def set_url(self, url):
+        """Set url."""
+        self._resource = url
+
+    async def async_update(self):
+        """Get the latest data from REST service with provided method."""
+        if not self._async_client:
+            self._async_client = httpx.AsyncClient(verify=self._verify_ssl)
+
+        _LOGGER.debug("Updating from %s", self._resource)
+        try:
+            response = await self._async_client.request(
+                self._method,
+                self._resource,
+                headers=self._headers,
+                auth=self._auth,
+                data=self._request_data,
+                timeout=self._timeout,
+            )
+            self.data = response.text
+            self.headers = response.headers
+        except httpx.RequestError as ex:
+            _LOGGER.error("Error fetching data: %s failed with %s", self._resource, ex)
+            self.data = None
+            self.headers = None
diff --git a/homeassistant/components/rest/notify.py b/homeassistant/components/rest/notify.py
index d7ee57b4f8e..b8f81b19e92 100644
--- a/homeassistant/components/rest/notify.py
+++ b/homeassistant/components/rest/notify.py
@@ -163,7 +163,7 @@ class RestNotificationService(BaseNotificationService):
                         key: _data_template_creator(item) for key, item in value.items()
                     }
                 value.hass = self._hass
-                return value.async_render(kwargs)
+                return value.async_render(kwargs, parse_result=False)
 
             data.update(_data_template_creator(self._data_template))
 
diff --git a/homeassistant/components/rest/sensor.py b/homeassistant/components/rest/sensor.py
index 9925eb016cb..323447ba1b3 100644
--- a/homeassistant/components/rest/sensor.py
+++ b/homeassistant/components/rest/sensor.py
@@ -3,10 +3,8 @@ import json
 import logging
 from xml.parsers.expat import ExpatError
 
+import httpx
 from jsonpath import jsonpath
-import requests
-from requests import Session
-from requests.auth import HTTPBasicAuth, HTTPDigestAuth
 import voluptuous as vol
 import xmltodict
 
@@ -33,9 +31,10 @@ from homeassistant.const import (
 from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.reload import setup_reload_service
+from homeassistant.helpers.reload import async_setup_reload_service
 
 from . import DOMAIN, PLATFORMS
+from .data import DEFAULT_TIMEOUT, RestData
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -43,7 +42,6 @@ DEFAULT_METHOD = "GET"
 DEFAULT_NAME = "REST Sensor"
 DEFAULT_VERIFY_SSL = True
 DEFAULT_FORCE_UPDATE = False
-DEFAULT_TIMEOUT = 10
 
 
 CONF_JSON_ATTRS = "json_attributes"
@@ -79,9 +77,9 @@ PLATFORM_SCHEMA = vol.All(
 )
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the RESTful sensor."""
-    setup_reload_service(hass, DOMAIN, PLATFORMS)
+    await async_setup_reload_service(hass, DOMAIN, PLATFORMS)
 
     name = config.get(CONF_NAME)
     resource = config.get(CONF_RESOURCE)
@@ -105,23 +103,24 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 
     if resource_template is not None:
         resource_template.hass = hass
-        resource = resource_template.render()
+        resource = resource_template.render(parse_result=False)
 
     if username and password:
         if config.get(CONF_AUTHENTICATION) == HTTP_DIGEST_AUTHENTICATION:
-            auth = HTTPDigestAuth(username, password)
+            auth = httpx.DigestAuth(username, password)
         else:
-            auth = HTTPBasicAuth(username, password)
+            auth = (username, password)
     else:
         auth = None
     rest = RestData(method, resource, auth, headers, payload, verify_ssl, timeout)
-    rest.update()
+    await rest.async_update()
+
     if rest.data is None:
         raise PlatformNotReady
 
     # Must update the sensor now (including fetching the rest resource) to
     # ensure it's updating its state.
-    add_entities(
+    async_add_entities(
         [
             RestSensor(
                 hass,
@@ -200,12 +199,13 @@ class RestSensor(Entity):
         """Force update."""
         return self._force_update
 
-    def update(self):
+    async def async_update(self):
         """Get the latest data from REST API and update the state."""
         if self._resource_template is not None:
-            self.rest.set_url(self._resource_template.render())
+            self.rest.set_url(self._resource_template.render(parse_result=False))
+
+        await self.rest.async_update()
 
-        self.rest.update()
         value = self.rest.data
         _LOGGER.debug("Data fetched from resource: %s", value)
         if self.rest.headers is not None:
@@ -250,61 +250,22 @@ class RestSensor(Entity):
                 except ValueError:
                     _LOGGER.warning("REST result could not be parsed as JSON")
                     _LOGGER.debug("Erroneous JSON: %s", value)
+
             else:
                 _LOGGER.warning("Empty reply found when expecting JSON data")
+
         if value is not None and self._value_template is not None:
-            value = self._value_template.render_with_possible_json_value(value, None)
+            value = self._value_template.async_render_with_possible_json_value(
+                value, None
+            )
 
         self._state = value
 
+    async def async_will_remove_from_hass(self):
+        """Shutdown the session."""
+        await self.rest.async_remove()
+
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
         return self._attributes
-
-
-class RestData:
-    """Class for handling the data retrieval."""
-
-    def __init__(
-        self, method, resource, auth, headers, data, verify_ssl, timeout=DEFAULT_TIMEOUT
-    ):
-        """Initialize the data object."""
-        self._method = method
-        self._resource = resource
-        self._auth = auth
-        self._headers = headers
-        self._request_data = data
-        self._verify_ssl = verify_ssl
-        self._timeout = timeout
-        self._http_session = Session()
-        self.data = None
-        self.headers = None
-
-    def __del__(self):
-        """Destroy the http session on destroy."""
-        self._http_session.close()
-
-    def set_url(self, url):
-        """Set url."""
-        self._resource = url
-
-    def update(self):
-        """Get the latest data from REST service with provided method."""
-        _LOGGER.debug("Updating from %s", self._resource)
-        try:
-            response = self._http_session.request(
-                self._method,
-                self._resource,
-                headers=self._headers,
-                auth=self._auth,
-                data=self._request_data,
-                timeout=self._timeout,
-                verify=self._verify_ssl,
-            )
-            self.data = response.text
-            self.headers = response.headers
-        except requests.exceptions.RequestException as ex:
-            _LOGGER.error("Error fetching data: %s failed with %s", self._resource, ex)
-            self.data = None
-            self.headers = None
diff --git a/homeassistant/components/rest/switch.py b/homeassistant/components/rest/switch.py
index 865f4d01b3a..1b980e12b75 100644
--- a/homeassistant/components/rest/switch.py
+++ b/homeassistant/components/rest/switch.py
@@ -162,7 +162,7 @@ class RestSwitch(SwitchEntity):
 
     async def async_turn_on(self, **kwargs):
         """Turn the device on."""
-        body_on_t = self._body_on.async_render()
+        body_on_t = self._body_on.async_render(parse_result=False)
 
         try:
             req = await self.set_device_state(body_on_t)
@@ -178,7 +178,7 @@ class RestSwitch(SwitchEntity):
 
     async def async_turn_off(self, **kwargs):
         """Turn the device off."""
-        body_off_t = self._body_off.async_render()
+        body_off_t = self._body_off.async_render(parse_result=False)
 
         try:
             req = await self.set_device_state(body_off_t)
diff --git a/homeassistant/components/rest_command/__init__.py b/homeassistant/components/rest_command/__init__.py
index 43b5c8bd7e8..7ba46d3bf50 100644
--- a/homeassistant/components/rest_command/__init__.py
+++ b/homeassistant/components/rest_command/__init__.py
@@ -93,17 +93,22 @@ async def async_setup(hass, config):
             payload = None
             if template_payload:
                 payload = bytes(
-                    template_payload.async_render(variables=service.data), "utf-8"
+                    template_payload.async_render(
+                        variables=service.data, parse_result=False
+                    ),
+                    "utf-8",
                 )
 
-            request_url = template_url.async_render(variables=service.data)
+            request_url = template_url.async_render(
+                variables=service.data, parse_result=False
+            )
 
             headers = None
             if template_headers:
                 headers = {}
                 for header_name, template_header in template_headers.items():
                     headers[header_name] = template_header.async_render(
-                        variables=service.data
+                        variables=service.data, parse_result=False
                     )
 
             if content_type:
@@ -136,10 +141,10 @@ async def async_setup(hass, config):
                         )
 
             except asyncio.TimeoutError:
-                _LOGGER.warning("Timeout call %s", request_url, exc_info=1)
+                _LOGGER.warning("Timeout call %s", request_url)
 
             except aiohttp.ClientError:
-                _LOGGER.error("Client error %s", request_url, exc_info=1)
+                _LOGGER.error("Client error %s", request_url)
 
         # register services
         hass.services.async_register(DOMAIN, name, async_service_handler)
diff --git a/homeassistant/components/rflink/binary_sensor.py b/homeassistant/components/rflink/binary_sensor.py
index 8962af3c0d4..dd16343898d 100644
--- a/homeassistant/components/rflink/binary_sensor.py
+++ b/homeassistant/components/rflink/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Rflink binary sensors."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
@@ -17,8 +15,6 @@ from . import CONF_ALIASES, CONF_DEVICES, RflinkDevice
 CONF_OFF_DELAY = "off_delay"
 DEFAULT_FORCE_UPDATE = False
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Optional(CONF_DEVICES, default={}): {
diff --git a/homeassistant/components/rflink/light.py b/homeassistant/components/rflink/light.py
index 13e3a0f65da..6d63e12378d 100644
--- a/homeassistant/components/rflink/light.py
+++ b/homeassistant/components/rflink/light.py
@@ -197,10 +197,9 @@ class DimmableRflinkLight(SwitchableRflinkDevice, LightEntity):
     @property
     def device_state_attributes(self):
         """Return the device state attributes."""
-        attr = {}
-        if self._brightness is not None:
-            attr[ATTR_BRIGHTNESS] = self._brightness
-        return attr
+        if self._brightness is None:
+            return {}
+        return {ATTR_BRIGHTNESS: self._brightness}
 
     @property
     def supported_features(self):
@@ -260,10 +259,9 @@ class HybridRflinkLight(SwitchableRflinkDevice, LightEntity):
     @property
     def device_state_attributes(self):
         """Return the device state attributes."""
-        attr = {}
-        if self._brightness is not None:
-            attr[ATTR_BRIGHTNESS] = self._brightness
-        return attr
+        if self._brightness is None:
+            return {}
+        return {ATTR_BRIGHTNESS: self._brightness}
 
     @property
     def supported_features(self):
diff --git a/homeassistant/components/rflink/sensor.py b/homeassistant/components/rflink/sensor.py
index 9394c568a73..2c27477e6c6 100644
--- a/homeassistant/components/rflink/sensor.py
+++ b/homeassistant/components/rflink/sensor.py
@@ -1,6 +1,4 @@
 """Support for Rflink sensors."""
-import logging
-
 from rflink.parser import PACKET_FIELDS, UNITS
 import voluptuous as vol
 
@@ -28,8 +26,6 @@ from . import (
     RflinkDevice,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSOR_ICONS = {
     "humidity": "mdi:water-percent",
     "battery": "mdi:battery",
diff --git a/homeassistant/components/rflink/switch.py b/homeassistant/components/rflink/switch.py
index 266f9a4625e..77e1f821bad 100644
--- a/homeassistant/components/rflink/switch.py
+++ b/homeassistant/components/rflink/switch.py
@@ -1,6 +1,4 @@
 """Support for Rflink switches."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
@@ -20,8 +18,6 @@ from . import (
     SwitchableRflinkDevice,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 0
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/rfxtrx/__init__.py b/homeassistant/components/rfxtrx/__init__.py
index eb13800f748..9c0615fdb5e 100644
--- a/homeassistant/components/rfxtrx/__init__.py
+++ b/homeassistant/components/rfxtrx/__init__.py
@@ -2,9 +2,11 @@
 import asyncio
 import binascii
 from collections import OrderedDict
+import copy
 import logging
 
 import RFXtrx as rfxtrxmod
+import async_timeout
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -26,6 +28,7 @@ from homeassistant.const import (
     PERCENTAGE,
     POWER_WATT,
     PRESSURE_HPA,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     SPEED_METERS_PER_SECOND,
     TEMP_CELSIUS,
     TIME_HOURS,
@@ -33,11 +36,19 @@ from homeassistant.const import (
     VOLT,
 )
 from homeassistant.core import callback
+from homeassistant.exceptions import ConfigEntryNotReady
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import (
     ATTR_EVENT,
+    CONF_AUTOMATIC_ADD,
+    CONF_DATA_BITS,
+    CONF_DEBUG,
+    CONF_FIRE_EVENT,
+    CONF_OFF_DELAY,
+    CONF_REMOVE_DEVICE,
+    CONF_SIGNAL_REPETITIONS,
     DEVICE_PACKET_TYPE_LIGHTING4,
     EVENT_RFXTRX_EVENT,
     SERVICE_SEND,
@@ -47,12 +58,6 @@ DOMAIN = "rfxtrx"
 
 DEFAULT_SIGNAL_REPETITIONS = 1
 
-CONF_FIRE_EVENT = "fire_event"
-CONF_DATA_BITS = "data_bits"
-CONF_AUTOMATIC_ADD = "automatic_add"
-CONF_SIGNAL_REPETITIONS = "signal_repetitions"
-CONF_DEBUG = "debug"
-CONF_OFF_DELAY = "off_delay"
 SIGNAL_EVENT = f"{DOMAIN}_event"
 
 DATA_TYPES = OrderedDict(
@@ -83,7 +88,7 @@ DATA_TYPES = OrderedDict(
         ("Voltage", VOLT),
         ("Current", ELECTRICAL_CURRENT_AMPERE),
         ("Battery numeric", PERCENTAGE),
-        ("Rssi numeric", "dBm"),
+        ("Rssi numeric", SIGNAL_STRENGTH_DECIBELS_MILLIWATT),
     ]
 )
 
@@ -126,10 +131,10 @@ DEVICE_DATA_SCHEMA = vol.Schema(
 
 BASE_SCHEMA = vol.Schema(
     {
-        vol.Optional(CONF_DEBUG, default=False): cv.boolean,
+        vol.Optional(CONF_DEBUG): cv.boolean,
         vol.Optional(CONF_AUTOMATIC_ADD, default=False): cv.boolean,
         vol.Optional(CONF_DEVICES, default={}): {cv.string: _ensure_device},
-    }
+    },
 )
 
 DEVICE_SCHEMA = BASE_SCHEMA.extend({vol.Required(CONF_DEVICE): cv.string})
@@ -139,7 +144,8 @@ PORT_SCHEMA = BASE_SCHEMA.extend(
 )
 
 CONFIG_SCHEMA = vol.Schema(
-    {DOMAIN: vol.Any(DEVICE_SCHEMA, PORT_SCHEMA)}, extra=vol.ALLOW_EXTRA
+    {DOMAIN: vol.All(cv.deprecated(CONF_DEBUG), vol.Any(DEVICE_SCHEMA, PORT_SCHEMA))},
+    extra=vol.ALLOW_EXTRA,
 )
 
 DOMAINS = ["switch", "sensor", "light", "binary_sensor", "cover"]
@@ -154,7 +160,6 @@ async def async_setup(hass, config):
         CONF_HOST: config[DOMAIN].get(CONF_HOST),
         CONF_PORT: config[DOMAIN].get(CONF_PORT),
         CONF_DEVICE: config[DOMAIN].get(CONF_DEVICE),
-        CONF_DEBUG: config[DOMAIN].get(CONF_DEBUG),
         CONF_AUTOMATIC_ADD: config[DOMAIN].get(CONF_AUTOMATIC_ADD),
         CONF_DEVICES: config[DOMAIN][CONF_DEVICES],
     }
@@ -223,18 +228,17 @@ def _create_rfx(config):
         rfx = rfxtrxmod.Connect(
             (config[CONF_HOST], config[CONF_PORT]),
             None,
-            debug=config[CONF_DEBUG],
             transport_protocol=rfxtrxmod.PyNetworkTransport,
         )
     else:
-        rfx = rfxtrxmod.Connect(config[CONF_DEVICE], None, debug=config[CONF_DEBUG])
+        rfx = rfxtrxmod.Connect(config[CONF_DEVICE], None)
 
     return rfx
 
 
 def _get_device_lookup(devices):
     """Get a lookup structure for devices."""
-    lookup = dict()
+    lookup = {}
     for event_code, event_config in devices.items():
         event = get_rfx_object(event_code)
         if event is None:
@@ -251,7 +255,11 @@ async def async_setup_internal(hass, entry: config_entries.ConfigEntry):
     config = entry.data
 
     # Initialize library
-    rfx_object = await hass.async_add_executor_job(_create_rfx, config)
+    try:
+        async with async_timeout.timeout(5):
+            rfx_object = await hass.async_add_executor_job(_create_rfx, config)
+    except asyncio.TimeoutError as err:
+        raise ConfigEntryNotReady from err
 
     # Setup some per device config
     devices = _get_device_lookup(config[CONF_DEVICES])
@@ -297,6 +305,7 @@ async def async_setup_internal(hass, entry: config_entries.ConfigEntry):
         config[CONF_DEVICE_ID] = device_id
 
         data = entry.data.copy()
+        data[CONF_DEVICES] = copy.deepcopy(entry.data[CONF_DEVICES])
         event_code = binascii.hexlify(event.data).decode("ASCII")
         data[CONF_DEVICES][event_code] = config
         hass.config_entries.async_update_entry(entry=entry, data=data)
@@ -444,6 +453,12 @@ class RfxtrxEntity(RestoreEntity):
             )
         )
 
+        self.async_on_remove(
+            self.hass.helpers.dispatcher.async_dispatcher_connect(
+                f"{DOMAIN}_{CONF_REMOVE_DEVICE}_{self._device_id}", self.async_remove
+            )
+        )
+
     @property
     def should_poll(self):
         """No polling needed for a RFXtrx switch."""
diff --git a/homeassistant/components/rfxtrx/binary_sensor.py b/homeassistant/components/rfxtrx/binary_sensor.py
index 21f3e0b74b3..7fe89e747bc 100644
--- a/homeassistant/components/rfxtrx/binary_sensor.py
+++ b/homeassistant/components/rfxtrx/binary_sensor.py
@@ -61,6 +61,18 @@ DEVICE_TYPE_DEVICE_CLASS = {
 }
 
 
+def supported(event):
+    """Return whether an event supports binary_sensor."""
+    if isinstance(event, rfxtrxmod.ControlEvent):
+        return True
+    if isinstance(event, rfxtrxmod.SensorEvent):
+        return event.values.get("Sensor Status") in [
+            *SENSOR_STATUS_ON,
+            *SENSOR_STATUS_OFF,
+        ]
+    return False
+
+
 async def async_setup_entry(
     hass,
     config_entry,
@@ -74,16 +86,6 @@ async def async_setup_entry(
 
     discovery_info = config_entry.data
 
-    def supported(event):
-        if isinstance(event, rfxtrxmod.ControlEvent):
-            return True
-        if isinstance(event, rfxtrxmod.SensorEvent):
-            return event.values.get("Sensor Status") in [
-                *SENSOR_STATUS_ON,
-                *SENSOR_STATUS_OFF,
-            ]
-        return False
-
     for packet_id, entity_info in discovery_info[CONF_DEVICES].items():
         event = get_rfx_object(packet_id)
         if event is None:
diff --git a/homeassistant/components/rfxtrx/config_flow.py b/homeassistant/components/rfxtrx/config_flow.py
index 596f1d0b5e9..624b7ade69d 100644
--- a/homeassistant/components/rfxtrx/config_flow.py
+++ b/homeassistant/components/rfxtrx/config_flow.py
@@ -1,11 +1,412 @@
 """Config flow for RFXCOM RFXtrx integration."""
-import logging
+import copy
+import os
 
-from homeassistant import config_entries
+import RFXtrx as rfxtrxmod
+import serial
+import serial.tools.list_ports
+import voluptuous as vol
 
-from . import DOMAIN
+from homeassistant import config_entries, exceptions
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    CONF_COMMAND_OFF,
+    CONF_COMMAND_ON,
+    CONF_DEVICE,
+    CONF_DEVICE_ID,
+    CONF_DEVICES,
+    CONF_HOST,
+    CONF_PORT,
+    CONF_TYPE,
+)
+from homeassistant.core import callback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.device_registry import (
+    async_entries_for_config_entry,
+    async_get_registry as async_get_device_registry,
+)
+from homeassistant.helpers.entity_registry import (
+    async_entries_for_device,
+    async_get_registry as async_get_entity_registry,
+)
 
-_LOGGER = logging.getLogger(__name__)
+from . import DOMAIN, get_device_id, get_rfx_object
+from .binary_sensor import supported as binary_supported
+from .const import (
+    CONF_AUTOMATIC_ADD,
+    CONF_DATA_BITS,
+    CONF_FIRE_EVENT,
+    CONF_OFF_DELAY,
+    CONF_REMOVE_DEVICE,
+    CONF_REPLACE_DEVICE,
+    CONF_SIGNAL_REPETITIONS,
+    DEVICE_PACKET_TYPE_LIGHTING4,
+)
+from .cover import supported as cover_supported
+from .light import supported as light_supported
+from .switch import supported as switch_supported
+
+CONF_EVENT_CODE = "event_code"
+CONF_MANUAL_PATH = "Enter Manually"
+
+
+def none_or_int(value, base):
+    """Check if strin is one otherwise convert to int."""
+    if value is None:
+        return None
+    return int(value, base)
+
+
+class OptionsFlow(config_entries.OptionsFlow):
+    """Handle Rfxtrx options."""
+
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize rfxtrx options flow."""
+        self._config_entry = config_entry
+        self._global_options = None
+        self._selected_device = None
+        self._selected_device_entry_id = None
+        self._selected_device_event_code = None
+        self._selected_device_object = None
+        self._device_entries = None
+        self._device_registry = None
+
+    async def async_step_init(self, user_input=None):
+        """Manage the options."""
+        return await self.async_step_prompt_options()
+
+    async def async_step_prompt_options(self, user_input=None):
+        """Prompt for options."""
+        errors = {}
+
+        if user_input is not None:
+            self._global_options = {
+                CONF_AUTOMATIC_ADD: user_input[CONF_AUTOMATIC_ADD],
+            }
+            if CONF_DEVICE in user_input:
+                entry_id = user_input[CONF_DEVICE]
+                device_data = self._get_device_data(entry_id)
+                self._selected_device_entry_id = entry_id
+                event_code = device_data[CONF_EVENT_CODE]
+                self._selected_device_event_code = event_code
+                self._selected_device = self._config_entry.data[CONF_DEVICES][
+                    event_code
+                ]
+                self._selected_device_object = get_rfx_object(event_code)
+                return await self.async_step_set_device_options()
+            if CONF_REMOVE_DEVICE in user_input:
+                remove_devices = user_input[CONF_REMOVE_DEVICE]
+                devices = {}
+                for entry_id in remove_devices:
+                    device_data = self._get_device_data(entry_id)
+
+                    event_code = device_data[CONF_EVENT_CODE]
+                    device_id = device_data[CONF_DEVICE_ID]
+                    self.hass.helpers.dispatcher.async_dispatcher_send(
+                        f"{DOMAIN}_{CONF_REMOVE_DEVICE}_{device_id}"
+                    )
+                    self._device_registry.async_remove_device(entry_id)
+                    if event_code is not None:
+                        devices[event_code] = None
+
+                self.update_config_data(
+                    global_options=self._global_options, devices=devices
+                )
+
+                return self.async_create_entry(title="", data={})
+            if CONF_EVENT_CODE in user_input:
+                self._selected_device_event_code = user_input[CONF_EVENT_CODE]
+                self._selected_device = {}
+                selected_device_object = get_rfx_object(
+                    self._selected_device_event_code
+                )
+                if selected_device_object is None:
+                    errors[CONF_EVENT_CODE] = "invalid_event_code"
+                elif not self._can_add_device(selected_device_object):
+                    errors[CONF_EVENT_CODE] = "already_configured_device"
+                else:
+                    self._selected_device_object = selected_device_object
+                    return await self.async_step_set_device_options()
+
+            if not errors:
+                self.update_config_data(global_options=self._global_options)
+
+                return self.async_create_entry(title="", data={})
+
+        device_registry = await async_get_device_registry(self.hass)
+        device_entries = async_entries_for_config_entry(
+            device_registry, self._config_entry.entry_id
+        )
+        self._device_registry = device_registry
+        self._device_entries = device_entries
+
+        remove_devices = {
+            entry.id: entry.name_by_user if entry.name_by_user else entry.name
+            for entry in device_entries
+        }
+
+        configure_devices = {
+            entry.id: entry.name_by_user if entry.name_by_user else entry.name
+            for entry in device_entries
+            if self._get_device_event_code(entry.id) is not None
+        }
+
+        options = {
+            vol.Optional(
+                CONF_AUTOMATIC_ADD,
+                default=self._config_entry.data[CONF_AUTOMATIC_ADD],
+            ): bool,
+            vol.Optional(CONF_EVENT_CODE): str,
+            vol.Optional(CONF_DEVICE): vol.In(configure_devices),
+            vol.Optional(CONF_REMOVE_DEVICE): cv.multi_select(remove_devices),
+        }
+
+        return self.async_show_form(
+            step_id="prompt_options", data_schema=vol.Schema(options), errors=errors
+        )
+
+    async def async_step_set_device_options(self, user_input=None):
+        """Manage device options."""
+        errors = {}
+
+        if user_input is not None:
+            device_id = get_device_id(
+                self._selected_device_object.device,
+                data_bits=user_input.get(CONF_DATA_BITS),
+            )
+
+            if CONF_REPLACE_DEVICE in user_input:
+                await self._async_replace_device(user_input[CONF_REPLACE_DEVICE])
+
+                devices = {self._selected_device_event_code: None}
+                self.update_config_data(
+                    global_options=self._global_options, devices=devices
+                )
+
+                return self.async_create_entry(title="", data={})
+
+            try:
+                command_on = none_or_int(user_input.get(CONF_COMMAND_ON), 16)
+            except ValueError:
+                errors[CONF_COMMAND_ON] = "invalid_input_2262_on"
+
+            try:
+                command_off = none_or_int(user_input.get(CONF_COMMAND_OFF), 16)
+            except ValueError:
+                errors[CONF_COMMAND_OFF] = "invalid_input_2262_off"
+
+            try:
+                off_delay = none_or_int(user_input.get(CONF_OFF_DELAY), 10)
+            except ValueError:
+                errors[CONF_OFF_DELAY] = "invalid_input_off_delay"
+
+            if not errors:
+                devices = {}
+                device = {
+                    CONF_DEVICE_ID: device_id,
+                    CONF_FIRE_EVENT: user_input.get(CONF_FIRE_EVENT, False),
+                    CONF_SIGNAL_REPETITIONS: user_input.get(CONF_SIGNAL_REPETITIONS, 1),
+                }
+
+                devices[self._selected_device_event_code] = device
+
+                if off_delay:
+                    device[CONF_OFF_DELAY] = off_delay
+                if user_input.get(CONF_DATA_BITS):
+                    device[CONF_DATA_BITS] = user_input[CONF_DATA_BITS]
+                if command_on:
+                    device[CONF_COMMAND_ON] = command_on
+                if command_off:
+                    device[CONF_COMMAND_OFF] = command_off
+
+                self.update_config_data(
+                    global_options=self._global_options, devices=devices
+                )
+
+                return self.async_create_entry(title="", data={})
+
+        device_data = self._selected_device
+
+        data_schema = {
+            vol.Optional(
+                CONF_FIRE_EVENT, default=device_data.get(CONF_FIRE_EVENT, False)
+            ): bool,
+        }
+
+        if binary_supported(self._selected_device_object):
+            if device_data.get(CONF_OFF_DELAY):
+                off_delay_schema = {
+                    vol.Optional(
+                        CONF_OFF_DELAY,
+                        description={"suggested_value": device_data[CONF_OFF_DELAY]},
+                    ): str,
+                }
+            else:
+                off_delay_schema = {
+                    vol.Optional(CONF_OFF_DELAY): str,
+                }
+            data_schema.update(off_delay_schema)
+
+        if (
+            binary_supported(self._selected_device_object)
+            or cover_supported(self._selected_device_object)
+            or light_supported(self._selected_device_object)
+            or switch_supported(self._selected_device_object)
+        ):
+            data_schema.update(
+                {
+                    vol.Optional(
+                        CONF_SIGNAL_REPETITIONS,
+                        default=device_data.get(CONF_SIGNAL_REPETITIONS, 1),
+                    ): int,
+                }
+            )
+
+        if (
+            self._selected_device_object.device.packettype
+            == DEVICE_PACKET_TYPE_LIGHTING4
+        ):
+            data_schema.update(
+                {
+                    vol.Optional(
+                        CONF_DATA_BITS, default=device_data.get(CONF_DATA_BITS, 0)
+                    ): int,
+                    vol.Optional(
+                        CONF_COMMAND_ON,
+                        default=hex(device_data.get(CONF_COMMAND_ON, 0)),
+                    ): str,
+                    vol.Optional(
+                        CONF_COMMAND_OFF,
+                        default=hex(device_data.get(CONF_COMMAND_OFF, 0)),
+                    ): str,
+                }
+            )
+
+        devices = {
+            entry.id: entry.name_by_user if entry.name_by_user else entry.name
+            for entry in self._device_entries
+            if self._can_replace_device(entry.id)
+        }
+
+        if devices:
+            data_schema.update(
+                {
+                    vol.Optional(CONF_REPLACE_DEVICE): vol.In(devices),
+                }
+            )
+
+        return self.async_show_form(
+            step_id="set_device_options",
+            data_schema=vol.Schema(data_schema),
+            errors=errors,
+        )
+
+    async def _async_replace_device(self, replace_device):
+        """Migrate properties of a device into another."""
+        device_registry = self._device_registry
+        old_device = self._selected_device_entry_id
+        old_entry = device_registry.async_get(old_device)
+        device_registry.async_update_device(
+            replace_device,
+            area_id=old_entry.area_id,
+            name_by_user=old_entry.name_by_user,
+        )
+
+        old_device_data = self._get_device_data(old_device)
+        new_device_data = self._get_device_data(replace_device)
+
+        old_device_id = "_".join(x for x in old_device_data[CONF_DEVICE_ID])
+        new_device_id = "_".join(x for x in new_device_data[CONF_DEVICE_ID])
+
+        entity_registry = await async_get_entity_registry(self.hass)
+        entity_entries = async_entries_for_device(entity_registry, old_device)
+        entity_migration_map = {}
+        for entry in entity_entries:
+            unique_id = entry.unique_id
+            new_unique_id = unique_id.replace(old_device_id, new_device_id)
+
+            new_entity_id = entity_registry.async_get_entity_id(
+                entry.domain, entry.platform, new_unique_id
+            )
+
+            if new_entity_id is not None:
+                entity_migration_map[new_entity_id] = entry
+
+        for entry in entity_migration_map.values():
+            entity_registry.async_remove(entry.entity_id)
+
+        for entity_id, entry in entity_migration_map.items():
+            entity_registry.async_update_entity(
+                entity_id,
+                new_entity_id=entry.entity_id,
+                name=entry.name,
+                icon=entry.icon,
+            )
+
+        device_registry.async_remove_device(old_device)
+
+    def _can_add_device(self, new_rfx_obj):
+        """Check if device does not already exist."""
+        new_device_id = get_device_id(new_rfx_obj.device)
+        for packet_id, entity_info in self._config_entry.data[CONF_DEVICES].items():
+            rfx_obj = get_rfx_object(packet_id)
+            device_id = get_device_id(rfx_obj.device, entity_info.get(CONF_DATA_BITS))
+            if new_device_id == device_id:
+                return False
+
+        return True
+
+    def _can_replace_device(self, entry_id):
+        """Check if device can be replaced with selected device."""
+        device_data = self._get_device_data(entry_id)
+        event_code = device_data[CONF_EVENT_CODE]
+        rfx_obj = get_rfx_object(event_code)
+        if (
+            rfx_obj.device.packettype == self._selected_device_object.device.packettype
+            and rfx_obj.device.subtype == self._selected_device_object.device.subtype
+            and self._selected_device_event_code != event_code
+        ):
+            return True
+
+        return False
+
+    def _get_device_event_code(self, entry_id):
+        data = self._get_device_data(entry_id)
+
+        return data[CONF_EVENT_CODE]
+
+    def _get_device_data(self, entry_id):
+        """Get event code based on device identifier."""
+        event_code = None
+        device_id = None
+        entry = self._device_registry.async_get(entry_id)
+        device_id = next(iter(entry.identifiers))[1:]
+        for packet_id, entity_info in self._config_entry.data[CONF_DEVICES].items():
+            if tuple(entity_info.get(CONF_DEVICE_ID)) == device_id:
+                event_code = packet_id
+                break
+
+        data = {CONF_EVENT_CODE: event_code, CONF_DEVICE_ID: device_id}
+
+        return data
+
+    @callback
+    def update_config_data(self, global_options=None, devices=None):
+        """Update data in ConfigEntry."""
+        entry_data = self._config_entry.data.copy()
+        entry_data[CONF_DEVICES] = copy.deepcopy(self._config_entry.data[CONF_DEVICES])
+        if global_options:
+            entry_data.update(global_options)
+        if devices:
+            for event_code, options in devices.items():
+                if options is None:
+                    entry_data[CONF_DEVICES].pop(event_code)
+                else:
+                    entry_data[CONF_DEVICES][event_code] = options
+        self.hass.config_entries.async_update_entry(self._config_entry, data=entry_data)
+        self.hass.async_create_task(
+            self.hass.config_entries.async_reload(self._config_entry.entry_id)
+        )
 
 
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@@ -14,11 +415,190 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     VERSION = 1
     CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_PUSH
 
+    async def async_step_user(self, user_input=None):
+        """Step when user initializes a integration."""
+        await self.async_set_unique_id(DOMAIN)
+        self._abort_if_unique_id_configured()
+
+        errors = {}
+        if user_input is not None:
+            user_selection = user_input[CONF_TYPE]
+            if user_selection == "Serial":
+                return await self.async_step_setup_serial()
+
+            return await self.async_step_setup_network()
+
+        list_of_types = ["Serial", "Network"]
+
+        schema = vol.Schema({vol.Required(CONF_TYPE): vol.In(list_of_types)})
+        return self.async_show_form(step_id="user", data_schema=schema, errors=errors)
+
+    async def async_step_setup_network(self, user_input=None):
+        """Step when setting up network configuration."""
+        errors = {}
+
+        if user_input is not None:
+            host = user_input[CONF_HOST]
+            port = user_input[CONF_PORT]
+
+            try:
+                data = await self.async_validate_rfx(host=host, port=port)
+            except CannotConnect:
+                errors["base"] = "cannot_connect"
+
+            if not errors:
+                return self.async_create_entry(title="RFXTRX", data=data)
+
+        schema = vol.Schema(
+            {vol.Required(CONF_HOST): str, vol.Required(CONF_PORT): int}
+        )
+        return self.async_show_form(
+            step_id="setup_network",
+            data_schema=schema,
+            errors=errors,
+        )
+
+    async def async_step_setup_serial(self, user_input=None):
+        """Step when setting up serial configuration."""
+        errors = {}
+
+        if user_input is not None:
+            user_selection = user_input[CONF_DEVICE]
+            if user_selection == CONF_MANUAL_PATH:
+                return await self.async_step_setup_serial_manual_path()
+
+            dev_path = await self.hass.async_add_executor_job(
+                get_serial_by_id, user_selection
+            )
+
+            try:
+                data = await self.async_validate_rfx(device=dev_path)
+            except CannotConnect:
+                errors["base"] = "cannot_connect"
+
+            if not errors:
+                return self.async_create_entry(title="RFXTRX", data=data)
+
+        ports = await self.hass.async_add_executor_job(serial.tools.list_ports.comports)
+        list_of_ports = {}
+        for port in ports:
+            list_of_ports[
+                port.device
+            ] = f"{port}, s/n: {port.serial_number or 'n/a'}" + (
+                f" - {port.manufacturer}" if port.manufacturer else ""
+            )
+        list_of_ports[CONF_MANUAL_PATH] = CONF_MANUAL_PATH
+
+        schema = vol.Schema({vol.Required(CONF_DEVICE): vol.In(list_of_ports)})
+        return self.async_show_form(
+            step_id="setup_serial",
+            data_schema=schema,
+            errors=errors,
+        )
+
+    async def async_step_setup_serial_manual_path(self, user_input=None):
+        """Select path manually."""
+        errors = {}
+
+        if user_input is not None:
+            device = user_input[CONF_DEVICE]
+            try:
+                data = await self.async_validate_rfx(device=device)
+            except CannotConnect:
+                errors["base"] = "cannot_connect"
+
+            if not errors:
+                return self.async_create_entry(title="RFXTRX", data=data)
+
+        schema = vol.Schema({vol.Required(CONF_DEVICE): str})
+        return self.async_show_form(
+            step_id="setup_serial_manual_path",
+            data_schema=schema,
+            errors=errors,
+        )
+
     async def async_step_import(self, import_config=None):
         """Handle the initial step."""
         entry = await self.async_set_unique_id(DOMAIN)
-        if entry and import_config.items() != entry.data.items():
-            self.hass.config_entries.async_update_entry(entry, data=import_config)
-            return self.async_abort(reason="already_configured")
-        self._abort_if_unique_id_configured()
+        if entry:
+            if CONF_DEVICES not in entry.data:
+                # In version 0.113, devices key was not written to config entry. Update the entry with import data
+                self._abort_if_unique_id_configured(import_config)
+            else:
+                self._abort_if_unique_id_configured()
+
+        host = import_config[CONF_HOST]
+        port = import_config[CONF_PORT]
+        device = import_config[CONF_DEVICE]
+
+        try:
+            if host is not None:
+                await self.async_validate_rfx(host=host, port=port)
+            else:
+                await self.async_validate_rfx(device=device)
+        except CannotConnect:
+            return self.async_abort(reason="cannot_connect")
+
         return self.async_create_entry(title="RFXTRX", data=import_config)
+
+    async def async_validate_rfx(self, host=None, port=None, device=None):
+        """Create data for rfxtrx entry."""
+        success = await self.hass.async_add_executor_job(
+            _test_transport, host, port, device
+        )
+        if not success:
+            raise CannotConnect
+
+        data = {
+            CONF_HOST: host,
+            CONF_PORT: port,
+            CONF_DEVICE: device,
+            CONF_AUTOMATIC_ADD: False,
+            CONF_DEVICES: {},
+        }
+        return data
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
+        """Get the options flow for this handler."""
+        return OptionsFlow(config_entry)
+
+
+def _test_transport(host, port, device):
+    """Construct a rfx object based on config."""
+    if port is not None:
+        try:
+            conn = rfxtrxmod.PyNetworkTransport((host, port))
+        except OSError:
+            return False
+
+        conn.close()
+    else:
+        try:
+            conn = rfxtrxmod.PySerialTransport(device)
+        except serial.serialutil.SerialException:
+            return False
+
+        if conn.serial is None:
+            return False
+
+        conn.close()
+
+    return True
+
+
+def get_serial_by_id(dev_path: str) -> str:
+    """Return a /dev/serial/by-id match for given device if available."""
+    by_id = "/dev/serial/by-id"
+    if not os.path.isdir(by_id):
+        return dev_path
+
+    for path in (entry.path for entry in os.scandir(by_id) if entry.is_symlink()):
+        if os.path.realpath(path) == dev_path:
+            return path
+    return dev_path
+
+
+class CannotConnect(exceptions.HomeAssistantError):
+    """Error to indicate we cannot connect."""
diff --git a/homeassistant/components/rfxtrx/const.py b/homeassistant/components/rfxtrx/const.py
index c0436bfcf60..404d344cc71 100644
--- a/homeassistant/components/rfxtrx/const.py
+++ b/homeassistant/components/rfxtrx/const.py
@@ -1,5 +1,14 @@
 """Constants for RFXtrx integration."""
 
+CONF_FIRE_EVENT = "fire_event"
+CONF_DATA_BITS = "data_bits"
+CONF_AUTOMATIC_ADD = "automatic_add"
+CONF_SIGNAL_REPETITIONS = "signal_repetitions"
+CONF_DEBUG = "debug"
+CONF_OFF_DELAY = "off_delay"
+
+CONF_REMOVE_DEVICE = "remove_device"
+CONF_REPLACE_DEVICE = "replace_device"
 
 COMMAND_ON_LIST = [
     "On",
diff --git a/homeassistant/components/rfxtrx/cover.py b/homeassistant/components/rfxtrx/cover.py
index fc6ab6cbf15..86950308f55 100644
--- a/homeassistant/components/rfxtrx/cover.py
+++ b/homeassistant/components/rfxtrx/cover.py
@@ -20,6 +20,11 @@ from .const import COMMAND_OFF_LIST, COMMAND_ON_LIST
 _LOGGER = logging.getLogger(__name__)
 
 
+def supported(event):
+    """Return whether an event supports cover."""
+    return event.device.known_to_be_rollershutter
+
+
 async def async_setup_entry(
     hass,
     config_entry,
@@ -29,9 +34,6 @@ async def async_setup_entry(
     discovery_info = config_entry.data
     device_ids = set()
 
-    def supported(event):
-        return event.device.known_to_be_rollershutter
-
     entities = []
     for packet_id, entity_info in discovery_info[CONF_DEVICES].items():
         event = get_rfx_object(packet_id)
diff --git a/homeassistant/components/rfxtrx/light.py b/homeassistant/components/rfxtrx/light.py
index 791cc158693..33ee5ea4748 100644
--- a/homeassistant/components/rfxtrx/light.py
+++ b/homeassistant/components/rfxtrx/light.py
@@ -28,6 +28,14 @@ _LOGGER = logging.getLogger(__name__)
 SUPPORT_RFXTRX = SUPPORT_BRIGHTNESS
 
 
+def supported(event):
+    """Return whether an event supports light."""
+    return (
+        isinstance(event.device, rfxtrxmod.LightingDevice)
+        and event.device.known_to_be_dimmable
+    )
+
+
 async def async_setup_entry(
     hass,
     config_entry,
@@ -37,12 +45,6 @@ async def async_setup_entry(
     discovery_info = config_entry.data
     device_ids = set()
 
-    def supported(event):
-        return (
-            isinstance(event.device, rfxtrxmod.LightingDevice)
-            and event.device.known_to_be_dimmable
-        )
-
     # Add switch from config file
     entities = []
     for packet_id, entity_info in discovery_info[CONF_DEVICES].items():
diff --git a/homeassistant/components/rfxtrx/manifest.json b/homeassistant/components/rfxtrx/manifest.json
index 44b53ed0dac..e62fc5c3c83 100644
--- a/homeassistant/components/rfxtrx/manifest.json
+++ b/homeassistant/components/rfxtrx/manifest.json
@@ -2,7 +2,7 @@
   "domain": "rfxtrx",
   "name": "RFXCOM RFXtrx",
   "documentation": "https://www.home-assistant.io/integrations/rfxtrx",
-  "requirements": ["pyRFXtrx==0.25"],
-  "codeowners": ["@danielhiversen", "@elupus"],
-  "config_flow": false
-}
\ No newline at end of file
+  "requirements": ["pyRFXtrx==0.26"],
+  "codeowners": ["@danielhiversen", "@elupus", "@RobBie1221"],
+  "config_flow": true
+}
diff --git a/homeassistant/components/rfxtrx/strings.json b/homeassistant/components/rfxtrx/strings.json
index e19265dec32..9e976999157 100644
--- a/homeassistant/components/rfxtrx/strings.json
+++ b/homeassistant/components/rfxtrx/strings.json
@@ -1,9 +1,74 @@
 {
-    "config": {
-        "step": {},
-        "error": {},
-        "abort": {
-            "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-        }
+  "title": "Rfxtrx",
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "type": "Connection type"
+        },
+        "title": "Select connection type"
+      },
+      "setup_network": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "title": "Select connection address"
+      },
+      "setup_serial": {
+        "data": {
+          "device": "Select device"
+        },
+        "title": "Device"
+      },
+      "setup_serial_manual_path": {
+        "data": {
+          "device": "[%key:common::config_flow::data::usb_path%]"
+        },
+        "title": "Path"
+      }
     }
+  },
+  "options": {
+    "step": {
+      "prompt_options": {
+        "data": {
+          "debug": "Enable debugging",
+          "automatic_add": "Enable automatic add",
+          "event_code": "Enter event code to add",
+          "device": "Select device to configure",
+          "remove_device": "Select device to delete"
+        },
+        "title": "Rfxtrx Options"
+      },
+      "set_device_options": {
+        "data": {
+          "fire_event": "Enable device event",
+          "off_delay": "Off delay",
+          "off_delay_enabled": "Enable off delay",
+          "data_bit": "Number of data bits",
+          "command_on": "Data bits value for command on",
+          "command_off": "Data bits value for command off",
+          "signal_repetitions": "Number of signal repetitions",
+          "replace_device": "Select device to replace"
+        },
+        "title": "Configure device options"
+      }
+    },
+    "error": {
+      "already_configured_device": "[%key:common::config_flow::abort::already_configured_device%]",
+      "invalid_event_code": "Invalid event code",
+      "invalid_input_2262_on": "Invalid input for command on",
+      "invalid_input_2262_off": "Invalid input for command off",
+      "invalid_input_off_delay": "Invalid input for off delay",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    }
+  }
 }
diff --git a/homeassistant/components/rfxtrx/switch.py b/homeassistant/components/rfxtrx/switch.py
index bce5222b778..53069210794 100644
--- a/homeassistant/components/rfxtrx/switch.py
+++ b/homeassistant/components/rfxtrx/switch.py
@@ -25,6 +25,16 @@ DATA_SWITCH = f"{DOMAIN}_switch"
 _LOGGER = logging.getLogger(__name__)
 
 
+def supported(event):
+    """Return whether an event supports switch."""
+    return (
+        isinstance(event.device, rfxtrxmod.LightingDevice)
+        and not event.device.known_to_be_dimmable
+        and not event.device.known_to_be_rollershutter
+        or isinstance(event.device, rfxtrxmod.RfyDevice)
+    )
+
+
 async def async_setup_entry(
     hass,
     config_entry,
@@ -34,14 +44,6 @@ async def async_setup_entry(
     discovery_info = config_entry.data
     device_ids = set()
 
-    def supported(event):
-        return (
-            isinstance(event.device, rfxtrxmod.LightingDevice)
-            and not event.device.known_to_be_dimmable
-            and not event.device.known_to_be_rollershutter
-            or isinstance(event.device, rfxtrxmod.RfyDevice)
-        )
-
     # Add switch from config file
     entities = []
     for packet_id, entity_info in discovery_info[CONF_DEVICES].items():
diff --git a/homeassistant/components/rfxtrx/translations/ca.json b/homeassistant/components/rfxtrx/translations/ca.json
index 14e637f5f98..5861878e079 100644
--- a/homeassistant/components/rfxtrx/translations/ca.json
+++ b/homeassistant/components/rfxtrx/translations/ca.json
@@ -1,7 +1,74 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositiu ja est\u00e0 configurat"
+            "already_configured": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3.",
+            "cannot_connect": "Ha fallat la connexi\u00f3"
+        },
+        "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "host": "Amfitri\u00f3",
+                    "port": "Port"
+                },
+                "title": "Selecciona l'adre\u00e7a de connexi\u00f3"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Selecciona el dispositiu"
+                },
+                "title": "Dispositiu"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "Ruta del port USB del dispositiu"
+                },
+                "title": "Ruta"
+            },
+            "user": {
+                "data": {
+                    "type": "Tipus de connexi\u00f3"
+                },
+                "title": "Selecciona el tipus de connexi\u00f3"
+            }
         }
-    }
+    },
+    "options": {
+        "error": {
+            "already_configured_device": "El dispositiu ja est\u00e0 configurat",
+            "invalid_event_code": "Codi d'esdeveniment inv\u00e0lid",
+            "invalid_input_2262_off": "Entrada no v\u00e0lida per a l'ordre OFF",
+            "invalid_input_2262_on": "Entrada no v\u00e0lida per a l'ordre ON",
+            "invalid_input_off_delay": "Entrada no v\u00e0lida per al retard OFF",
+            "unknown": "Error inesperat"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "Activa l'addici\u00f3 autom\u00e0tica",
+                    "debug": "Activa la depuraci\u00f3",
+                    "device": "Selecciona el dispositiu a configurar",
+                    "event_code": "Introdueix el codi de l'esdeveniment a afegir",
+                    "remove_device": "Selecciona el dispositiu a eliminar"
+                },
+                "title": "Opcions de Rfxtrx"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "Valor dels bits de dades per a l'ordre OFF",
+                    "command_on": "Valor dels bits de dades per a l'ordre ON",
+                    "data_bit": "Nombre de bits de dades",
+                    "fire_event": "Activa l'esdeveniment de dispositiu",
+                    "off_delay": "Retard OFF",
+                    "off_delay_enabled": "Activa el retard OFF",
+                    "replace_device": "Selecciona el dispositiu a substituir",
+                    "signal_repetitions": "Nombre de repeticions del senyal"
+                },
+                "title": "Configuraci\u00f3 de les opcions del dispositiu"
+            }
+        }
+    },
+    "title": "Rfxtrx"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/cs.json b/homeassistant/components/rfxtrx/translations/cs.json
new file mode 100644
index 00000000000..64073787db5
--- /dev/null
+++ b/homeassistant/components/rfxtrx/translations/cs.json
@@ -0,0 +1,65 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "host": "Hostitel",
+                    "port": "Port"
+                },
+                "title": "Vyberte adresu p\u0159ipojen\u00ed"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Vyberte za\u0159\u00edzen\u00ed"
+                },
+                "title": "Za\u0159\u00edzen\u00ed"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "Cesta k USB za\u0159\u00edzen\u00ed"
+                },
+                "title": "Cesta"
+            },
+            "user": {
+                "data": {
+                    "type": "Typ p\u0159ipojen\u00ed"
+                },
+                "title": "Vyberte typ p\u0159ipojen\u00ed"
+            }
+        }
+    },
+    "options": {
+        "error": {
+            "already_configured_device": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "invalid_event_code": "Neplatn\u00fd k\u00f3d ud\u00e1losti",
+            "invalid_input_2262_off": "Neplatn\u00fd vstup pro vyp\u00ednac\u00ed p\u0159\u00edkaz",
+            "invalid_input_2262_on": "Neplatn\u00fd vstup pro zap\u00ednac\u00ed p\u0159\u00edkaz",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "Povolit automatick\u00e9 p\u0159id\u00e1n\u00ed",
+                    "debug": "Povolit lad\u011bn\u00ed",
+                    "device": "Vyberte za\u0159\u00edzen\u00ed, kter\u00e9 chcete nastavit",
+                    "remove_device": "Vyberte za\u0159\u00edzen\u00ed, kter\u00e9 chcete odstranit"
+                },
+                "title": "Mo\u017enosti Rfxtrx"
+            },
+            "set_device_options": {
+                "data": {
+                    "replace_device": "Vyberte za\u0159\u00edzen\u00ed, kter\u00e9 chcete vym\u011bnit"
+                },
+                "title": "Nastaven\u00ed mo\u017enost\u00ed za\u0159\u00edzen\u00ed"
+            }
+        }
+    },
+    "title": "Rfxtrx"
+}
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/de.json b/homeassistant/components/rfxtrx/translations/de.json
index da1d200c2a2..c4b378db213 100644
--- a/homeassistant/components/rfxtrx/translations/de.json
+++ b/homeassistant/components/rfxtrx/translations/de.json
@@ -2,6 +2,35 @@
     "config": {
         "abort": {
             "already_configured": "Ger\u00e4t ist bereits konfiguriert"
+        },
+        "step": {
+            "setup_network": {
+                "title": "Verbindungsadresse ausw\u00e4hlen"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Ger\u00e4t w\u00e4hlen"
+                },
+                "title": "Ger\u00e4t"
+            },
+            "setup_serial_manual_path": {
+                "title": "Pfad"
+            },
+            "user": {
+                "data": {
+                    "type": "Verbindungstyp"
+                },
+                "title": "Verbindungstyp ausw\u00e4hlen"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "debug": "Debugging aktivieren"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/el.json b/homeassistant/components/rfxtrx/translations/el.json
new file mode 100644
index 00000000000..fcf3a9ec83b
--- /dev/null
+++ b/homeassistant/components/rfxtrx/translations/el.json
@@ -0,0 +1,67 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        },
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "port": "\u0398\u03cd\u03c1\u03b1"
+                },
+                "title": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae"
+                },
+                "title": "\u03a3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae"
+            },
+            "setup_serial_manual_path": {
+                "title": "\u0394\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae"
+            },
+            "user": {
+                "data": {
+                    "type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+                },
+                "title": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03c4\u03cd\u03c0\u03bf\u03c5 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+            }
+        }
+    },
+    "options": {
+        "error": {
+            "invalid_event_code": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03bf\u03c2 \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c3\u03c5\u03bc\u03b2\u03ac\u03bd\u03c4\u03bf\u03c2",
+            "invalid_input_2262_off": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b5\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03b9\u03b1 \u03b5\u03bd\u03c4\u03bf\u03bb\u03ae off",
+            "invalid_input_2262_on": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b5\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03b9\u03b1 \u03b5\u03bd\u03c4\u03bf\u03bb\u03ae on",
+            "invalid_input_off_delay": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b5\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03b9\u03b1 \u03ba\u03b1\u03b8\u03c5\u03c3\u03c4\u03ad\u03c1\u03b7\u03c3\u03b7 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b7\u03c2 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7\u03c2",
+                    "debug": "\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03bd\u03c4\u03bf\u03c0\u03b9\u03c3\u03bc\u03bf\u03cd \u03c3\u03c6\u03b1\u03bb\u03bc\u03ac\u03c4\u03c9\u03bd",
+                    "device": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2 \u03b3\u03b9\u03b1 \u03c1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd",
+                    "event_code": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03cd \u03c3\u03c5\u03bc\u03b2\u03ac\u03bd\u03c4\u03bf\u03c2 \u03b3\u03b9\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7",
+                    "remove_device": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2 \u03b3\u03b9\u03b1 \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae"
+                },
+                "title": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 Rfxtrx"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "\u03a4\u03b9\u03bc\u03ae bit \u03b4\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd \u03b3\u03b9\u03b1 \u03b5\u03bd\u03c4\u03bf\u03bb\u03ae off",
+                    "command_on": "\u03a4\u03b9\u03bc\u03ae bit \u03b4\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd \u03b3\u03b9\u03b1 \u03b5\u03bd\u03c4\u03bf\u03bb\u03ae on",
+                    "data_bit": "\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 bit \u03b4\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd",
+                    "fire_event": "\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c3\u03c5\u03bc\u03b2\u03ac\u03bd\u03c4\u03bf\u03c2 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2",
+                    "off_delay": "\u039a\u03b1\u03b8\u03c5\u03c3\u03c4\u03ad\u03c1\u03b7\u03c3\u03b7 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2",
+                    "off_delay_enabled": "\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03ba\u03b1\u03b8\u03c5\u03c3\u03c4\u03ad\u03c1\u03b7\u03c3\u03b7\u03c2 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2",
+                    "replace_device": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03b3\u03b9\u03b1 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
+                    "signal_repetitions": "\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03b5\u03c0\u03b1\u03bd\u03b1\u03bb\u03ae\u03c8\u03b5\u03c9\u03bd \u03c3\u03ae\u03bc\u03b1\u03c4\u03bf\u03c2"
+                },
+                "title": "\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ce\u03bd \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2"
+            }
+        }
+    },
+    "title": "Rfxtrx"
+}
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/en.json b/homeassistant/components/rfxtrx/translations/en.json
index 1344d2f6988..5bc019699b7 100644
--- a/homeassistant/components/rfxtrx/translations/en.json
+++ b/homeassistant/components/rfxtrx/translations/en.json
@@ -1,7 +1,74 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Device is already configured"
+            "already_configured": "Already configured. Only a single configuration possible.",
+            "cannot_connect": "Failed to connect"
+        },
+        "error": {
+            "cannot_connect": "Failed to connect"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port"
+                },
+                "title": "Select connection address"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Select device"
+                },
+                "title": "Device"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "USB Device Path"
+                },
+                "title": "Path"
+            },
+            "user": {
+                "data": {
+                    "type": "Connection type"
+                },
+                "title": "Select connection type"
+            }
         }
-    }
+    },
+    "options": {
+        "error": {
+            "already_configured_device": "Device is already configured",
+            "invalid_event_code": "Invalid event code",
+            "invalid_input_2262_off": "Invalid input for command off",
+            "invalid_input_2262_on": "Invalid input for command on",
+            "invalid_input_off_delay": "Invalid input for off delay",
+            "unknown": "Unexpected error"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "Enable automatic add",
+                    "debug": "Enable debugging",
+                    "device": "Select device to configure",
+                    "event_code": "Enter event code to add",
+                    "remove_device": "Select device to delete"
+                },
+                "title": "Rfxtrx Options"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "Data bits value for command off",
+                    "command_on": "Data bits value for command on",
+                    "data_bit": "Number of data bits",
+                    "fire_event": "Enable device event",
+                    "off_delay": "Off delay",
+                    "off_delay_enabled": "Enable off delay",
+                    "replace_device": "Select device to replace",
+                    "signal_repetitions": "Number of signal repetitions"
+                },
+                "title": "Configure device options"
+            }
+        }
+    },
+    "title": "Rfxtrx"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/es.json b/homeassistant/components/rfxtrx/translations/es.json
index e8e23bf8343..f150e74802a 100644
--- a/homeassistant/components/rfxtrx/translations/es.json
+++ b/homeassistant/components/rfxtrx/translations/es.json
@@ -1,7 +1,74 @@
 {
     "config": {
         "abort": {
-            "already_configured": "El dispositivo ya est\u00e1 configurado"
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
+            "cannot_connect": "No se pudo conectar"
+        },
+        "error": {
+            "cannot_connect": "No se pudo conectar"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "host": "Host",
+                    "port": "Puerto"
+                },
+                "title": "Seleccionar la direcci\u00f3n de conexi\u00f3n"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Seleccionar dispositivo"
+                },
+                "title": "Dispositivo"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "Ruta del dispositivo USB"
+                },
+                "title": "Ruta"
+            },
+            "user": {
+                "data": {
+                    "type": "Tipo de conexi\u00f3n"
+                },
+                "title": "Seleccionar tipo de conexi\u00f3n"
+            }
         }
-    }
+    },
+    "options": {
+        "error": {
+            "already_configured_device": "El dispositivo ya est\u00e1 configurado",
+            "invalid_event_code": "C\u00f3digo de evento no v\u00e1lido",
+            "invalid_input_2262_off": "Entrada inv\u00e1lida para el comando de apagado",
+            "invalid_input_2262_on": "Entrada inv\u00e1lida para el comando de encendido",
+            "invalid_input_off_delay": "Entrada inv\u00e1lida para el retardo de apagado",
+            "unknown": "Error inesperado"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "Activar la adici\u00f3n autom\u00e1tica",
+                    "debug": "Activar la depuraci\u00f3n",
+                    "device": "Seleccionar dispositivo para configurar",
+                    "event_code": "Introducir el c\u00f3digo de evento para a\u00f1adir",
+                    "remove_device": "Selecciona el dispositivo a eliminar"
+                },
+                "title": "Opciones de Rfxtrx"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "Valor de bits de datos para comando apagado",
+                    "command_on": "Valor de bits de datos para comando activado",
+                    "data_bit": "N\u00famero de bits de datos",
+                    "fire_event": "Habilitar evento del dispositivo",
+                    "off_delay": "Retraso de apagado",
+                    "off_delay_enabled": "Activar retardo de apagado",
+                    "replace_device": "Seleccione el dispositivo que desea reemplazar",
+                    "signal_repetitions": "N\u00famero de repeticiones de la se\u00f1al"
+                },
+                "title": "Configurar las opciones del dispositivo"
+            }
+        }
+    },
+    "title": "Rfxtrx"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/et.json b/homeassistant/components/rfxtrx/translations/et.json
new file mode 100644
index 00000000000..03a066c6cdc
--- /dev/null
+++ b/homeassistant/components/rfxtrx/translations/et.json
@@ -0,0 +1,74 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine.",
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                },
+                "title": "Vali \u00fchenduse aadress"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Vali seade"
+                },
+                "title": "Seade"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "USB seadme rada"
+                },
+                "title": "Rada"
+            },
+            "user": {
+                "data": {
+                    "type": "\u00dchenduse t\u00fc\u00fcp"
+                },
+                "title": "Vali \u00fchenduse t\u00fc\u00fcp"
+            }
+        }
+    },
+    "options": {
+        "error": {
+            "already_configured_device": "Seade on juba h\u00e4\u00e4lestatud",
+            "invalid_event_code": "Vale s\u00fcndmuse kood",
+            "invalid_input_2262_off": "Vigane sisestus v\u00e4ljal\u00fclitamiseks",
+            "invalid_input_2262_on": "Vigane sisestus sissel\u00fclitamisks",
+            "invalid_input_off_delay": "Vigane sisestus v\u00e4ljal\u00fclitamise viivituseks",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "Luba automaatne lisamine",
+                    "debug": "Luba silumine",
+                    "device": "Vali seadistatav seade",
+                    "event_code": "Sisesta lisatava s\u00fcndmuse kood",
+                    "remove_device": "Vali eemaldatav seade"
+                },
+                "title": "Rfxtrx valikud"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "V\u00e4ljal\u00fclitamise k\u00e4su andmebittide v\u00e4\u00e4rtus",
+                    "command_on": "Sissel\u00fclitamise k\u00e4su andmebittide v\u00e4\u00e4rtus",
+                    "data_bit": "Andmebittide arv",
+                    "fire_event": "Luba seadme s\u00fcndmus",
+                    "off_delay": "V\u00e4ljal\u00fclitamise viivitus",
+                    "off_delay_enabled": "Luba v\u00e4ljal\u00fclitusviivitus",
+                    "replace_device": "Vali asendav seade",
+                    "signal_repetitions": "Signaali korduste arv"
+                },
+                "title": "Seadista seadme valikud"
+            }
+        }
+    },
+    "title": "Rfxtrx"
+}
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/fr.json b/homeassistant/components/rfxtrx/translations/fr.json
index c4bc0d48b1a..5155bf6dacf 100644
--- a/homeassistant/components/rfxtrx/translations/fr.json
+++ b/homeassistant/components/rfxtrx/translations/fr.json
@@ -2,6 +2,30 @@
     "config": {
         "abort": {
             "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9"
+        },
+        "step": {
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "Chemin du p\u00e9riph\u00e9rique USB"
+                }
+            }
         }
-    }
+    },
+    "options": {
+        "error": {
+            "already_configured_device": "L'appareil est d\u00e9j\u00e0 configur\u00e9",
+            "invalid_event_code": "Code d'\u00e9v\u00e9nement non valide",
+            "unknown": "Erreur inattendue"
+        },
+        "step": {
+            "set_device_options": {
+                "data": {
+                    "replace_device": "S\u00e9lectionnez l'appareil \u00e0 remplacer",
+                    "signal_repetitions": "Nombre de r\u00e9p\u00e9titions du signal"
+                },
+                "title": "Configurer les options de l'appareil"
+            }
+        }
+    },
+    "title": "Rfxtrx"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/it.json b/homeassistant/components/rfxtrx/translations/it.json
index cbea61b08cb..678047af145 100644
--- a/homeassistant/components/rfxtrx/translations/it.json
+++ b/homeassistant/components/rfxtrx/translations/it.json
@@ -1,17 +1,80 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
+            "already_configured": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione.",
+            "cannot_connect": "Impossibile connettersi"
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "one": "uno",
             "other": "altri"
         },
         "step": {
             "one": "uno",
-            "other": "altri"
+            "other": "altri",
+            "setup_network": {
+                "data": {
+                    "host": "Host",
+                    "port": "Porta"
+                },
+                "title": "Selezionare l'indirizzo di connessione"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Selezionare il dispositivo"
+                },
+                "title": "Dispositivo"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "Percorso del dispositivo USB"
+                },
+                "title": "Percorso"
+            },
+            "user": {
+                "data": {
+                    "type": "Tipo di connessione"
+                },
+                "title": "Selezionare il tipo di connessione"
+            }
         }
     },
     "one": "uno",
-    "other": "altri"
+    "options": {
+        "error": {
+            "already_configured_device": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "invalid_event_code": "Codice evento non valido",
+            "invalid_input_2262_off": "Immissione non valida per il comando disattivato",
+            "invalid_input_2262_on": "Immissione non valida per il comando attivato",
+            "invalid_input_off_delay": "Immissione non valida per il ritardo di spegnimento",
+            "unknown": "Errore imprevisto"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "Attivare l'aggiunta automatica",
+                    "debug": "Attivare il debug",
+                    "device": "Selezionare il dispositivo da configurare",
+                    "event_code": "Inserire il codice dell'evento da aggiungere",
+                    "remove_device": "Selezionare il dispositivo da cancellare"
+                },
+                "title": "Opzioni Rfxtrx"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "Valore dei bit di dati per il comando disattivato",
+                    "command_on": "Valore dei bit di dati per il comando attivato",
+                    "data_bit": "Numero di bit di dati",
+                    "fire_event": "Abilita evento dispositivo",
+                    "off_delay": "Ritardo di spegnimento",
+                    "off_delay_enabled": "Attivare il ritardo di spegnimento",
+                    "replace_device": "Selezionare il dispositivo da sostituire",
+                    "signal_repetitions": "Numero di ripetizioni del segnale"
+                },
+                "title": "Configurare le opzioni del dispositivo"
+            }
+        }
+    },
+    "other": "altri",
+    "title": "Rfxtrx"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/lb.json b/homeassistant/components/rfxtrx/translations/lb.json
index 6469543442e..6e9b0fcb9c0 100644
--- a/homeassistant/components/rfxtrx/translations/lb.json
+++ b/homeassistant/components/rfxtrx/translations/lb.json
@@ -1,7 +1,69 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Apparat ass scho konfigur\u00e9iert"
+            "already_configured": "Apparat ass scho konfigur\u00e9iert",
+            "cannot_connect": "Feeler beim verbannen"
+        },
+        "error": {
+            "cannot_connect": "Feeler beim verbannen"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port"
+                },
+                "title": "Verbindung's Adress auswielen"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Apparat auswielen"
+                },
+                "title": "Apparat"
+            },
+            "setup_serial_manual_path": {
+                "title": "Pad"
+            },
+            "user": {
+                "data": {
+                    "type": "Typ vun der Verbindung"
+                },
+                "title": "Typ vun der Verbindung auswielen"
+            }
         }
-    }
+    },
+    "options": {
+        "error": {
+            "invalid_event_code": "Ong\u00ebltegen  Evenement Code",
+            "invalid_input_2262_off": "Ong\u00eblteg Agab fir Kommando Aus",
+            "invalid_input_2262_on": "Ong\u00eblteg Agab fir Kommando Un",
+            "invalid_input_off_delay": "Ong\u00eblteg Agab fir Aus Verz\u00f6gerung"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "Aktiv\u00e9ier automatesch dob\u00e4isetzen",
+                    "debug": "Aktiv\u00e9ier Debuggen",
+                    "device": "Wiel een Apparat fir ze konfigur\u00e9ieren",
+                    "event_code": "Evenement Code aginn fir dob\u00e4izesetzen",
+                    "remove_device": "Wiel een Apparat fir ze l\u00e4schen"
+                },
+                "title": "Rfxtrx Optioune"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "Data bits W\u00e4ert fir Kommando aus",
+                    "command_on": "Data bits W\u00e4ert fir Kommando un",
+                    "data_bit": "Unzuel vun Data Bits",
+                    "fire_event": "Aktiv\u00e9ier Apparat Evenement",
+                    "off_delay": "Aus Verz\u00f6gerung",
+                    "off_delay_enabled": "Aktiv\u00e9iert Aus Verz\u00f6gerung",
+                    "replace_device": "Wiel een Apparat fir ze ersetzen",
+                    "signal_repetitions": "Zuel vu Signalwidderhuelungen"
+                },
+                "title": "Apparat Optioune konfigur\u00e9ieren"
+            }
+        }
+    },
+    "title": "Rfxtrx"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/nl.json b/homeassistant/components/rfxtrx/translations/nl.json
new file mode 100644
index 00000000000..76e26d514b5
--- /dev/null
+++ b/homeassistant/components/rfxtrx/translations/nl.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
+        },
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "port": "Poort"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/no.json b/homeassistant/components/rfxtrx/translations/no.json
index 6ba5a1f3978..369bd2381ec 100644
--- a/homeassistant/components/rfxtrx/translations/no.json
+++ b/homeassistant/components/rfxtrx/translations/no.json
@@ -1,7 +1,74 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Enheten er allerede konfigurert"
+            "already_configured": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "cannot_connect": "Tilkobling mislyktes"
+        },
+        "error": {
+            "cannot_connect": "Tilkobling mislyktes"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "host": "Vert",
+                    "port": "Port"
+                },
+                "title": "Velg tilkoblingsadresse"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Velg enhet"
+                },
+                "title": "Enhet"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "USB enhetsbane"
+                },
+                "title": "Sti"
+            },
+            "user": {
+                "data": {
+                    "type": "Tilkoblingstype"
+                },
+                "title": "Velg tilkoblingstype"
+            }
         }
-    }
+    },
+    "options": {
+        "error": {
+            "already_configured_device": "Enheten er allerede konfigurert",
+            "invalid_event_code": "Ugyldig hendelseskode",
+            "invalid_input_2262_off": "Ugyldig innputt for kommando av",
+            "invalid_input_2262_on": "Ugyldig innputt for kommando p\u00e5",
+            "invalid_input_off_delay": "Ugyldig innputt for av forsinkelse",
+            "unknown": "Uventet feil"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "Aktivere automatisk legg til",
+                    "debug": "Aktiver feils\u00f8king",
+                    "device": "Velg enhet du vil konfigurere",
+                    "event_code": "Angi hendelseskode for \u00e5 legge til",
+                    "remove_device": "Velg enhet du vil slette"
+                },
+                "title": "[VOID] alternativer"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "Databiter-verdi for kommando av",
+                    "command_on": "Databiter-verdi for kommando p\u00e5",
+                    "data_bit": "Antall databiter",
+                    "fire_event": "Aktiver enhetshendelse",
+                    "off_delay": "Av forsinkelse",
+                    "off_delay_enabled": "Aktiver av forsinkelse",
+                    "replace_device": "Velg enheten du vil erstatte",
+                    "signal_repetitions": "Antall signalrepetisjoner"
+                },
+                "title": "Konfigurer enhetsalternativer"
+            }
+        }
+    },
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/pl.json b/homeassistant/components/rfxtrx/translations/pl.json
index 637a81a3f87..56304959145 100644
--- a/homeassistant/components/rfxtrx/translations/pl.json
+++ b/homeassistant/components/rfxtrx/translations/pl.json
@@ -1,7 +1,86 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+            "already_configured": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
+        },
+        "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "few": "kilka",
+            "many": "wiele",
+            "one": "jeden",
+            "other": "inne"
+        },
+        "step": {
+            "few": "kilka",
+            "many": "wiele",
+            "one": "jeden",
+            "other": "inne",
+            "setup_network": {
+                "data": {
+                    "host": "Nazwa hosta lub adres IP",
+                    "port": "Port"
+                },
+                "title": "Wybierz adres po\u0142\u0105czenia"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "Wybierz urz\u0105dzenie"
+                },
+                "title": "Urz\u0105dzenie"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "\u015acie\u017cka urz\u0105dzenia USB"
+                },
+                "title": "\u015acie\u017cka"
+            },
+            "user": {
+                "data": {
+                    "type": "Typ po\u0142\u0105czenia"
+                },
+                "title": "Wybierz typ po\u0142\u0105czenia"
+            }
         }
-    }
+    },
+    "few": "kilka",
+    "many": "wiele",
+    "one": "jeden",
+    "options": {
+        "error": {
+            "already_configured_device": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "invalid_event_code": "Nieprawid\u0142owy kod zdarzenia",
+            "invalid_input_2262_off": "Nieprawid\u0142owy wpis dla komendy \"wy\u0142\u0105cz\" (off)",
+            "invalid_input_2262_on": "Nieprawid\u0142owy wpis dla komendy \"w\u0142\u0105cz\" (on)",
+            "invalid_input_off_delay": "Nieprawid\u0142owy wpis dla op\u00f3\u017anienia wy\u0142\u0105czania",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "W\u0142\u0105cz automatyczne dodawanie",
+                    "debug": "W\u0142\u0105cz debugowanie",
+                    "device": "Wybierz urz\u0105dzenie do skonfigurowania",
+                    "event_code": "Podaj kod zdarzenia do dodania",
+                    "remove_device": "Wybierz urz\u0105dzenie do usuni\u0119cia"
+                },
+                "title": "Opcje Rfxtrx"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "Warto\u015b\u0107 bit\u00f3w danych dla komendy \"wy\u0142\u0105cz\" (off)",
+                    "command_on": "Warto\u015b\u0107 bit\u00f3w danych dla komendy \"w\u0142\u0105cz\" (on)",
+                    "data_bit": "Liczba bit\u00f3w danych",
+                    "fire_event": "W\u0142\u0105cz zdarzenia na urz\u0105dzeniu",
+                    "off_delay": "Op\u00f3\u017anienie stanu \"off\"",
+                    "off_delay_enabled": "W\u0142\u0105cz op\u00f3\u017anienie stanu \"off\"",
+                    "replace_device": "Wybierz urz\u0105dzenie do zast\u0105pienia",
+                    "signal_repetitions": "Liczba powt\u00f3rze\u0144 sygna\u0142u"
+                },
+                "title": "Konfiguracja opcji urz\u0105dzenia"
+            }
+        }
+    },
+    "other": "inne",
+    "title": "Rfxtrx"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/ru.json b/homeassistant/components/rfxtrx/translations/ru.json
index 4ad85f691be..0926734657d 100644
--- a/homeassistant/components/rfxtrx/translations/ru.json
+++ b/homeassistant/components/rfxtrx/translations/ru.json
@@ -1,7 +1,74 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
+        },
+        "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "host": "\u0425\u043e\u0441\u0442",
+                    "port": "\u041f\u043e\u0440\u0442"
+                },
+                "title": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0430\u0434\u0440\u0435\u0441 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e"
+                },
+                "title": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "\u041f\u0443\u0442\u044c \u043a USB-\u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443"
+                },
+                "title": "\u041f\u0443\u0442\u044c"
+            },
+            "user": {
+                "data": {
+                    "type": "\u0422\u0438\u043f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f"
+                },
+                "title": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0442\u0438\u043f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f"
+            }
         }
-    }
+    },
+    "options": {
+        "error": {
+            "already_configured_device": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "invalid_event_code": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043e\u0434 \u0441\u043e\u0431\u044b\u0442\u0438\u044f.",
+            "invalid_input_2262_off": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0432\u0432\u043e\u0434 \u0434\u043b\u044f \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f.",
+            "invalid_input_2262_on": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0432\u0432\u043e\u0434 \u0434\u043b\u044f \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f.",
+            "invalid_input_off_delay": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0432\u0432\u043e\u0434 \u0434\u043b\u044f \u0437\u0430\u0434\u0435\u0440\u0436\u043a\u0438 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435",
+                    "debug": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u043e\u0442\u043b\u0430\u0434\u043a\u0438",
+                    "device": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438",
+                    "event_code": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043e\u0434 \u0441\u043e\u0431\u044b\u0442\u0438\u044f",
+                    "remove_device": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0434\u043b\u044f \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f"
+                },
+                "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0431\u0438\u0442\u043e\u0432 \u0434\u0430\u043d\u043d\u044b\u0445 \u0434\u043b\u044f \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f",
+                    "command_on": "\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 \u0431\u0438\u0442\u043e\u0432 \u0434\u0430\u043d\u043d\u044b\u0445 \u0434\u043b\u044f \u043a\u043e\u043c\u0430\u043d\u0434\u044b \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f",
+                    "data_bit": "\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0431\u0438\u0442 \u0434\u0430\u043d\u043d\u044b\u0445",
+                    "fire_event": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0441\u043e\u0431\u044b\u0442\u0438\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430",
+                    "off_delay": "\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f",
+                    "off_delay_enabled": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u0430\u0434\u0435\u0440\u0436\u043a\u0443 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f",
+                    "replace_device": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0434\u043b\u044f \u0437\u0430\u043c\u0435\u043d\u044b",
+                    "signal_repetitions": "\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u0432\u0442\u043e\u0440\u043e\u0432 \u0441\u0438\u0433\u043d\u0430\u043b\u0430"
+                },
+                "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430"
+            }
+        }
+    },
+    "title": "Rfxtrx"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/zh-Hans.json b/homeassistant/components/rfxtrx/translations/zh-Hans.json
new file mode 100644
index 00000000000..49e92607835
--- /dev/null
+++ b/homeassistant/components/rfxtrx/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "setup_network": {
+                "data": {
+                    "port": "\u7aef\u53e3"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/rfxtrx/translations/zh-Hant.json b/homeassistant/components/rfxtrx/translations/zh-Hant.json
index 1ab3e1f720f..dac2a6850b0 100644
--- a/homeassistant/components/rfxtrx/translations/zh-Hant.json
+++ b/homeassistant/components/rfxtrx/translations/zh-Hant.json
@@ -1,7 +1,74 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
+        },
+        "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
+        },
+        "step": {
+            "setup_network": {
+                "data": {
+                    "host": "\u4e3b\u6a5f\u7aef",
+                    "port": "\u901a\u8a0a\u57e0"
+                },
+                "title": "\u9078\u64c7\u9023\u7dda\u4f4d\u5740"
+            },
+            "setup_serial": {
+                "data": {
+                    "device": "\u9078\u64c7\u8a2d\u5099"
+                },
+                "title": "\u8a2d\u5099"
+            },
+            "setup_serial_manual_path": {
+                "data": {
+                    "device": "USB \u8a2d\u5099\u8def\u5f91"
+                },
+                "title": "\u8def\u5f91"
+            },
+            "user": {
+                "data": {
+                    "type": "\u9023\u7dda\u985e\u578b"
+                },
+                "title": "\u9078\u64c7\u9023\u7dda\u985e\u578b"
+            }
         }
-    }
+    },
+    "options": {
+        "error": {
+            "already_configured_device": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "invalid_event_code": "\u4e8b\u4ef6\u4ee3\u78bc\u7121\u6548",
+            "invalid_input_2262_off": "\u547d\u4ee4\u95dc\u9589\u8f38\u5165\u7121\u6548",
+            "invalid_input_2262_on": "\u547d\u4ee4\u958b\u555f\u8f38\u5165\u7121\u6548",
+            "invalid_input_off_delay": "\u5ef6\u8aa4\u8f38\u5165\u7121\u6548",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
+        },
+        "step": {
+            "prompt_options": {
+                "data": {
+                    "automatic_add": "\u958b\u555f\u81ea\u52d5\u65b0\u589e",
+                    "debug": "\u958b\u555f\u9664\u932f",
+                    "device": "\u9078\u64c7\u8a2d\u5099\u4ee5\u8a2d\u5b9a",
+                    "event_code": "\u8f38\u5165\u4e8b\u4ef6\u4ee3\u78bc\u4ee5\u65b0\u589e",
+                    "remove_device": "\u9078\u64c7\u8a2d\u5099\u4ee5\u522a\u9664"
+                },
+                "title": "Rfxtrx \u9078\u9805"
+            },
+            "set_device_options": {
+                "data": {
+                    "command_off": "\u547d\u4ee4\u95dc\u9589\u7684\u8cc7\u6599\u4f4d\u5143\u503c",
+                    "command_on": "\u547d\u4ee4\u958b\u555f\u7684\u8cc7\u6599\u4f4d\u5143\u503c",
+                    "data_bit": "\u8cc7\u6599\u4f4d\u5143\u6578",
+                    "fire_event": "\u958b\u555f\u8a2d\u5099\u4e8b\u4ef6",
+                    "off_delay": "\u5ef6\u9072",
+                    "off_delay_enabled": "\u958b\u555f\u5ef6\u9072",
+                    "replace_device": "\u9078\u64c7\u8a2d\u5099\u4ee5\u53d6\u4ee3",
+                    "signal_repetitions": "\u8a0a\u865f\u91cd\u8907\u6b21\u6578"
+                },
+                "title": "\u8a2d\u5b9a\u8a2d\u5099\u9078\u9805"
+            }
+        }
+    },
+    "title": "Rfxtrx"
 }
\ No newline at end of file
diff --git a/homeassistant/components/ring/binary_sensor.py b/homeassistant/components/ring/binary_sensor.py
index ccec9e6ad36..bbfbbf1690e 100644
--- a/homeassistant/components/ring/binary_sensor.py
+++ b/homeassistant/components/ring/binary_sensor.py
@@ -1,6 +1,5 @@
 """This component provides HA sensor support for Ring Door Bell/Chimes."""
 from datetime import datetime
-import logging
 
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_MOTION,
@@ -12,8 +11,6 @@ from homeassistant.core import callback
 from . import DOMAIN
 from .entity import RingEntityMixin
 
-_LOGGER = logging.getLogger(__name__)
-
 # Sensor types: Name, category, device_class
 SENSOR_TYPES = {
     "ding": ["Ding", ["doorbots", "authorized_doorbots"], DEVICE_CLASS_OCCUPANCY],
diff --git a/homeassistant/components/ring/sensor.py b/homeassistant/components/ring/sensor.py
index 24a5cd3b6fb..0a1cc85230f 100644
--- a/homeassistant/components/ring/sensor.py
+++ b/homeassistant/components/ring/sensor.py
@@ -1,7 +1,5 @@
 """This component provides HA sensor support for Ring Door Bell/Chimes."""
-import logging
-
-from homeassistant.const import PERCENTAGE
+from homeassistant.const import PERCENTAGE, SIGNAL_STRENGTH_DECIBELS_MILLIWATT
 from homeassistant.core import callback
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.icon import icon_for_battery_level
@@ -9,8 +7,6 @@ from homeassistant.helpers.icon import icon_for_battery_level
 from . import DOMAIN
 from .entity import RingEntityMixin
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up a sensor for a Ring device."""
@@ -256,7 +252,7 @@ SENSOR_TYPES = {
     "wifi_signal_strength": [
         "WiFi Signal Strength",
         ["chimes", "doorbots", "authorized_doorbots", "stickup_cams"],
-        "dBm",
+        SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         "wifi",
         None,
         "signal_strength",
diff --git a/homeassistant/components/ring/strings.json b/homeassistant/components/ring/strings.json
index 04b19b66614..c5b448ad68b 100644
--- a/homeassistant/components/ring/strings.json
+++ b/homeassistant/components/ring/strings.json
@@ -16,11 +16,11 @@
       }
     },
     "error": {
-      "invalid_auth": "Invalid authentication",
-      "unknown": "Unexpected error"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/ring/translations/cs.json b/homeassistant/components/ring/translations/cs.json
index 338ff5d9a44..a187e9b126c 100644
--- a/homeassistant/components/ring/translations/cs.json
+++ b/homeassistant/components/ring/translations/cs.json
@@ -1,11 +1,25 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
+            "2fa": {
+                "data": {
+                    "2fa": "K\u00f3d dvoufaktorov\u00e9ho ov\u011b\u0159ov\u00e1n\u00ed"
+                },
+                "title": "Dvoufaktorov\u00e9 ov\u011b\u0159ov\u00e1n\u00ed"
+            },
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ihl\u00e1\u0161en\u00ed k \u00fa\u010dtu Ring"
             }
         }
     }
diff --git a/homeassistant/components/ring/translations/es.json b/homeassistant/components/ring/translations/es.json
index 0b5d31869ce..d98a61474cc 100644
--- a/homeassistant/components/ring/translations/es.json
+++ b/homeassistant/components/ring/translations/es.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "invalid_auth": "Autenticaci\u00f3n inv\u00e1lida",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "unknown": "Error inesperado"
         },
         "step": {
diff --git a/homeassistant/components/ring/translations/et.json b/homeassistant/components/ring/translations/et.json
new file mode 100644
index 00000000000..faf6035290e
--- /dev/null
+++ b/homeassistant/components/ring/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ring/translations/ru.json b/homeassistant/components/ring/translations/ru.json
index aa3b383bbce..fb8c22c39af 100644
--- a/homeassistant/components/ring/translations/ru.json
+++ b/homeassistant/components/ring/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
diff --git a/homeassistant/components/ring/translations/zh-Hans.json b/homeassistant/components/ring/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/ring/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/risco/strings.json b/homeassistant/components/risco/strings.json
index dc6031e0ad3..ebce9dda514 100644
--- a/homeassistant/components/risco/strings.json
+++ b/homeassistant/components/risco/strings.json
@@ -5,7 +5,7 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "pin": "Pin code"
+          "pin": "[%key:common::config_flow::data::pin%]"
         }
       }
     },
@@ -24,8 +24,8 @@
         "title": "Configure options",
         "data": {
           "scan_interval": "How often to poll Risco (in seconds)",
-          "code_arm_required": "Require pin code to arm",
-          "code_disarm_required": "Require pin code to disarm"
+          "code_arm_required": "Require [%key:common::config_flow::data::pin%] to arm",
+          "code_disarm_required": "Require [%key:common::config_flow::data::pin%] to disarm"
         }
       },
       "risco_to_ha": {
diff --git a/homeassistant/components/risco/translations/ca.json b/homeassistant/components/risco/translations/ca.json
index 6bfce849330..2872924dbbb 100644
--- a/homeassistant/components/risco/translations/ca.json
+++ b/homeassistant/components/risco/translations/ca.json
@@ -32,8 +32,8 @@
             },
             "init": {
                 "data": {
-                    "code_arm_required": "Demana codi PIN per activar",
-                    "code_disarm_required": "Demana codi PIN per desactivar",
+                    "code_arm_required": "Demana el Codi PIN per activar",
+                    "code_disarm_required": "Demana el Codi PIN per desactivar",
                     "scan_interval": "Freq\u00fc\u00e8ncia de sondeig a Risco (en segons)"
                 },
                 "title": "Opcions de configuraci\u00f3"
diff --git a/homeassistant/components/risco/translations/cs.json b/homeassistant/components/risco/translations/cs.json
new file mode 100644
index 00000000000..a4d2971e220
--- /dev/null
+++ b/homeassistant/components/risco/translations/cs.json
@@ -0,0 +1,55 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "pin": "PIN k\u00f3d",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "ha_to_risco": {
+                "data": {
+                    "armed_away": "Nep\u0159\u00edtomnost",
+                    "armed_custom_bypass": "Zabezpe\u010deno u\u017eivatelsk\u00fdm obejit\u00edm",
+                    "armed_home": "Re\u017eim domov",
+                    "armed_night": "No\u010dn\u00ed re\u017eim"
+                },
+                "description": "Vyberte, do jak\u00e9ho stavu chcete nastavit alarm Risco p\u0159i aktivaci alarmu v Home Assistant",
+                "title": "Mapov\u00e1n\u00ed stav\u016f v Home Assistant na stavy v Risco"
+            },
+            "init": {
+                "data": {
+                    "code_arm_required": "Vy\u017eadovat PIN k\u00f3d k zabezpe\u010den\u00ed",
+                    "code_disarm_required": "Vy\u017eadovat PIN k\u00f3d k odbezpe\u010den\u00ed",
+                    "scan_interval": "Jak \u010dasto se dotazovat Risco (v sekund\u00e1ch)"
+                },
+                "title": "Nastavte mo\u017enosti"
+            },
+            "risco_to_ha": {
+                "data": {
+                    "A": "Skupina A",
+                    "B": "Skupina B",
+                    "C": "Skupina C",
+                    "D": "Skupina D",
+                    "arm": "Zabezpe\u010deno (Nep\u0159\u00edtomnost)",
+                    "partial_arm": "\u010c\u00e1ste\u010dn\u011b zabezpe\u010deno (Doma)"
+                },
+                "description": "Vyberte, v jak\u00e9m stavu bude v\u00e1\u0161 alarm v Home Assistant pro ka\u017ed\u00fd stav v Risco",
+                "title": "Mapov\u00e1n\u00ed stav\u016f v Risco na stavy v Home Assistant"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/risco/translations/el.json b/homeassistant/components/risco/translations/el.json
new file mode 100644
index 00000000000..c38cfc72cc1
--- /dev/null
+++ b/homeassistant/components/risco/translations/el.json
@@ -0,0 +1,47 @@
+{
+    "config": {
+        "error": {
+            "invalid_auth": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b1\u03c5\u03b8\u03b5\u03bd\u03c4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
+            "unknown": "\u039c\u03b7 \u03b1\u03bd\u03b1\u03bc\u03b5\u03bd\u03cc\u03bc\u03b5\u03bd\u03bf \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
+                    "pin": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 PIN"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "ha_to_risco": {
+                "data": {
+                    "armed_away": "\u039f\u03c0\u03bb\u03b9\u03c3\u03bc\u03cc\u03c2 \u0395\u03ba\u03c4\u03cc\u03c2",
+                    "armed_home": "\u039f\u03c0\u03bb\u03b9\u03c3\u03bc\u03cc\u03c2 \u0395\u03bd\u03c4\u03cc\u03c2",
+                    "armed_night": "\u039f\u03c0\u03bb\u03b9\u03c3\u03bc\u03cc\u03c2 \u03bd\u03cd\u03c7\u03c4\u03b1\u03c2"
+                },
+                "description": "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03b5 \u03c0\u03bf\u03b9\u03b1 \u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03b8\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03c3\u03c5\u03bd\u03b1\u03b3\u03b5\u03c1\u03bc\u03cc Risco \u03ba\u03b1\u03c4\u03ac \u03c4\u03bf\u03bd \u03bf\u03c0\u03bb\u03b9\u03c3\u03bc\u03cc \u03c4\u03bf\u03c5 \u03c3\u03c5\u03bd\u03b1\u03b3\u03b5\u03c1\u03bc\u03bf\u03cd Home Assistant",
+                "title": "\u0391\u03bd\u03c4\u03b9\u03c3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03ba\u03b1\u03c4\u03b1\u03c3\u03c4\u03ac\u03c3\u03b5\u03c9\u03bd Home Assistant \u03c3\u03b5 \u03ba\u03b1\u03c4\u03b1\u03c3\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2 Risco"
+            },
+            "init": {
+                "data": {
+                    "code_arm_required": "\u039d\u03b1 \u03b1\u03c0\u03b1\u03b9\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 PIN \u03b3\u03b9\u03b1 \u03bf\u03c0\u03bb\u03b9\u03c3\u03bc\u03cc",
+                    "code_disarm_required": "\u039d\u03b1 \u03b1\u03c0\u03b1\u03b9\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 PIN \u03b3\u03b9\u03b1 \u03b1\u03c6\u03bf\u03c0\u03bb\u03b9\u03c3\u03bc\u03cc",
+                    "scan_interval": "\u03a0\u03cc\u03c3\u03bf \u03c3\u03c5\u03c7\u03bd\u03ac \u03bd\u03b1 \u03ba\u03ac\u03bd\u03b5\u03c4\u03b5 \u03bb\u03ae\u03c8\u03b5\u03b9\u03c2 \u03b1\u03c0\u03cc \u03c4\u03bf Risco (\u03c3\u03b5 \u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03b1)"
+                },
+                "title": "\u0394\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ce\u03bd"
+            },
+            "risco_to_ha": {
+                "data": {
+                    "A": "\u039f\u03bc\u03ac\u03b4\u03b1 \u0391",
+                    "B": "\u039f\u03bc\u03ac\u03b4\u03b1 \u0392",
+                    "C": "\u039f\u03bc\u03ac\u03b4\u03b1 \u0393",
+                    "D": "\u039f\u03bc\u03ac\u03b4\u03b1 \u0394",
+                    "arm": "\u039f\u03c0\u03bb\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf\u03b9 (\u0395\u039a\u03a4\u039f\u03a3)",
+                    "partial_arm": "\u039c\u03b5\u03c1\u03b9\u03ba\u03ce\u03c2 \u03bf\u03c0\u03bb\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf\u03c2 (\u0395\u039d\u03a4\u039f\u03a3)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/risco/translations/en.json b/homeassistant/components/risco/translations/en.json
index 37c2343fe75..c98cd82ede8 100644
--- a/homeassistant/components/risco/translations/en.json
+++ b/homeassistant/components/risco/translations/en.json
@@ -12,7 +12,7 @@
             "user": {
                 "data": {
                     "password": "Password",
-                    "pin": "Pin code",
+                    "pin": "PIN Code",
                     "username": "Username"
                 }
             }
@@ -32,8 +32,8 @@
             },
             "init": {
                 "data": {
-                    "code_arm_required": "Require pin code to arm",
-                    "code_disarm_required": "Require pin code to disarm",
+                    "code_arm_required": "Require PIN Code to arm",
+                    "code_disarm_required": "Require PIN Code to disarm",
                     "scan_interval": "How often to poll Risco (in seconds)"
                 },
                 "title": "Configure options"
diff --git a/homeassistant/components/risco/translations/es.json b/homeassistant/components/risco/translations/es.json
index 58518e7b7c6..68e7031c102 100644
--- a/homeassistant/components/risco/translations/es.json
+++ b/homeassistant/components/risco/translations/es.json
@@ -12,7 +12,7 @@
             "user": {
                 "data": {
                     "password": "Contrase\u00f1a",
-                    "pin": "C\u00f3digo pin",
+                    "pin": "C\u00f3digo PIN",
                     "username": "Nombre de usuario"
                 }
             }
diff --git a/homeassistant/components/risco/translations/et.json b/homeassistant/components/risco/translations/et.json
new file mode 100644
index 00000000000..d94cc2d4300
--- /dev/null
+++ b/homeassistant/components/risco/translations/et.json
@@ -0,0 +1,37 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "pin": "PIN kood",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "ha_to_risco": {
+                "data": {
+                    "armed_away": "Valves eemal",
+                    "armed_home": "Valves kodus",
+                    "armed_night": "Valves \u00f6ine"
+                }
+            },
+            "init": {
+                "data": {
+                    "code_arm_required": "N\u00f5ua valvestamiseks PIN koodi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/risco/translations/it.json b/homeassistant/components/risco/translations/it.json
index 2bfccc2b9c9..790a6574433 100644
--- a/homeassistant/components/risco/translations/it.json
+++ b/homeassistant/components/risco/translations/it.json
@@ -32,8 +32,8 @@
             },
             "init": {
                 "data": {
-                    "code_arm_required": "Richiedi codice PIN per armare",
-                    "code_disarm_required": "Richiedi codice PIN per disarmare",
+                    "code_arm_required": "Richiedi il Codice PIN per armare",
+                    "code_disarm_required": "Richiedi il Codice PIN per disarmare",
                     "scan_interval": "Con che frequenza interrogare Risco (in secondi)"
                 },
                 "title": "Configura le opzioni"
diff --git a/homeassistant/components/risco/translations/lb.json b/homeassistant/components/risco/translations/lb.json
index 985112bf446..197dd78c403 100644
--- a/homeassistant/components/risco/translations/lb.json
+++ b/homeassistant/components/risco/translations/lb.json
@@ -12,7 +12,7 @@
             "user": {
                 "data": {
                     "password": "Passwuert",
-                    "pin": "Pin Code",
+                    "pin": "PIN Code",
                     "username": "Benotzernumm"
                 }
             }
diff --git a/homeassistant/components/risco/translations/nl.json b/homeassistant/components/risco/translations/nl.json
index 614a896c3f8..875adfeb756 100644
--- a/homeassistant/components/risco/translations/nl.json
+++ b/homeassistant/components/risco/translations/nl.json
@@ -1,9 +1,13 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        },
         "step": {
             "user": {
                 "data": {
-                    "pin": "Pincode",
+                    "password": "Wachtwoord",
+                    "pin": "PIN-code",
                     "username": "Gebruikersnaam"
                 }
             }
diff --git a/homeassistant/components/risco/translations/no.json b/homeassistant/components/risco/translations/no.json
index bf438991b02..5e57cd1464f 100644
--- a/homeassistant/components/risco/translations/no.json
+++ b/homeassistant/components/risco/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
@@ -12,7 +12,7 @@
             "user": {
                 "data": {
                     "password": "Passord",
-                    "pin": "PIN kode",
+                    "pin": "PIN-kode",
                     "username": "Brukernavn"
                 }
             }
@@ -32,8 +32,8 @@
             },
             "init": {
                 "data": {
-                    "code_arm_required": "Krev PIN-kode for \u00e5 koble til",
-                    "code_disarm_required": "Krev PIN-kode for \u00e5 deaktivere",
+                    "code_arm_required": "Krev PIN-kode for \u00e5 tilkoble",
+                    "code_disarm_required": "Krev PIN-kode for \u00e5 frakoble",
                     "scan_interval": "Hvor ofte skal man unders\u00f8ke Risco (i l\u00f8pet av sekunder)"
                 },
                 "title": "Konfigurer alternativer"
diff --git a/homeassistant/components/risco/translations/pl.json b/homeassistant/components/risco/translations/pl.json
index 66bc71bc397..92deb2da70a 100644
--- a/homeassistant/components/risco/translations/pl.json
+++ b/homeassistant/components/risco/translations/pl.json
@@ -12,6 +12,7 @@
             "user": {
                 "data": {
                     "password": "Has\u0142o",
+                    "pin": "Kod PIN",
                     "username": "Nazwa u\u017cytkownika"
                 }
             }
@@ -19,13 +20,35 @@
     },
     "options": {
         "step": {
+            "ha_to_risco": {
+                "data": {
+                    "armed_away": "Uzbrojony (pod nieobecno\u015b\u0107)",
+                    "armed_custom_bypass": "Uzbrojony (cz\u0119\u015bciowo)",
+                    "armed_home": "Uzbrojony (obecny)",
+                    "armed_night": "Uzbrojony (noc)"
+                },
+                "description": "Wybierz stan, w kt\u00f3rym chcesz ustawi\u0107 alarm Risco podczas uzbrajania alarmu w Home Assistant",
+                "title": "Mapuj stany Home Assistant do stan\u00f3w alarmu Risco"
+            },
+            "init": {
+                "data": {
+                    "code_arm_required": "Wymagaj kodu PIN do uzbrojenia",
+                    "code_disarm_required": "Wymagaj kodu PIN do rozbrojenia",
+                    "scan_interval": "Cz\u0119stotliwo\u015b\u0107 od\u015bwie\u017cania (w sekundach)"
+                },
+                "title": "Opcje"
+            },
             "risco_to_ha": {
                 "data": {
                     "A": "Grupa A",
                     "B": "Grupa B",
                     "C": "Grupa C",
-                    "D": "Grupa D"
-                }
+                    "D": "Grupa D",
+                    "arm": "Uzbrojony (pod nieobecno\u015b\u0107)",
+                    "partial_arm": "Uzbrojony (obecny)"
+                },
+                "description": "Wybierz stan, kt\u00f3ry b\u0119dzie raportowa\u0142 alarm Home Assistant, dla ka\u017cdego stanu zg\u0142oszonego przez Risco",
+                "title": "Mapuj stany Risco do stan\u00f3w Home Assistant"
             }
         }
     }
diff --git a/homeassistant/components/risco/translations/zh-Hans.json b/homeassistant/components/risco/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/risco/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/risco/translations/zh-Hant.json b/homeassistant/components/risco/translations/zh-Hant.json
index ae4c3f5675a..9509ace6546 100644
--- a/homeassistant/components/risco/translations/zh-Hant.json
+++ b/homeassistant/components/risco/translations/zh-Hant.json
@@ -32,8 +32,8 @@
             },
             "init": {
                 "data": {
-                    "code_arm_required": "\u9700\u8981\u8f38\u5165 PIN \u4ee5\u8b66\u6212",
-                    "code_disarm_required": "\u9700\u8981\u8f38\u5165 PIN \u4ee5\u89e3\u9664\u8b66\u6212",
+                    "code_arm_required": "\u9700\u8981\u8f38\u5165   PIN \u78bc\u4ee5\u8b66\u6212",
+                    "code_disarm_required": "\u9700\u8981\u8f38\u5165 PIN \u78bc\u4ee5\u89e3\u9664\u8b66\u6212",
                     "scan_interval": "\u66f4\u65b0 Risco \u983b\u7387\uff08\u79d2\uff09"
                 },
                 "title": "\u8a2d\u5b9a\u9078\u9805"
diff --git a/homeassistant/components/roku/translations/cs.json b/homeassistant/components/roku/translations/cs.json
index 70374eaa47f..7a83973a6f7 100644
--- a/homeassistant/components/roku/translations/cs.json
+++ b/homeassistant/components/roku/translations/cs.json
@@ -1,17 +1,23 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no",
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
             "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
         },
+        "flow_title": "Roku: {name}",
         "step": {
+            "ssdp_confirm": {
+                "description": "Chcete nastavit {name}?",
+                "title": "Roku"
+            },
             "user": {
                 "data": {
                     "host": "Hostitel"
-                }
+                },
+                "description": "Zadejte informace o Roku."
             }
         }
     }
diff --git a/homeassistant/components/roku/translations/et.json b/homeassistant/components/roku/translations/et.json
new file mode 100644
index 00000000000..7a67f4ac3c4
--- /dev/null
+++ b/homeassistant/components/roku/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "ssdp_confirm": {
+                "description": "Kas soovid seadistada {name}?",
+                "title": ""
+            },
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/roku/translations/no.json b/homeassistant/components/roku/translations/no.json
index 43e0ea1f1c8..029220b5859 100644
--- a/homeassistant/components/roku/translations/no.json
+++ b/homeassistant/components/roku/translations/no.json
@@ -7,7 +7,7 @@
         "error": {
             "cannot_connect": "Tilkobling mislyktes"
         },
-        "flow_title": "Roku: {name}",
+        "flow_title": "",
         "step": {
             "ssdp_confirm": {
                 "description": "Vil du sette opp {name} ?",
@@ -15,7 +15,7 @@
             },
             "user": {
                 "data": {
-                    "host": "Vert "
+                    "host": "Vert"
                 },
                 "description": "Fyll inn Roku-informasjonen din."
             }
diff --git a/homeassistant/components/roku/translations/pl.json b/homeassistant/components/roku/translations/pl.json
index 21c969876e7..3231d6c4bb7 100644
--- a/homeassistant/components/roku/translations/pl.json
+++ b/homeassistant/components/roku/translations/pl.json
@@ -16,7 +16,7 @@
                     "one": "jeden",
                     "other": "inne"
                 },
-                "description": "Czy chcesz skonfigurowa\u0107 {name}? R\u0119czne konfiguracje tego urz\u0105dzenia zostan\u0105 zast\u0105pione.",
+                "description": "Czy chcesz skonfigurowa\u0107 {name}?",
                 "title": "Roku"
             },
             "user": {
diff --git a/homeassistant/components/roomba/__init__.py b/homeassistant/components/roomba/__init__.py
index 192dc4de537..912b134d454 100644
--- a/homeassistant/components/roomba/__init__.py
+++ b/homeassistant/components/roomba/__init__.py
@@ -129,7 +129,7 @@ async def async_connect_or_timeout(hass, roomba):
         name = None
         with async_timeout.timeout(10):
             _LOGGER.debug("Initialize connection to vacuum")
-            await hass.async_add_job(roomba.connect)
+            await hass.async_add_executor_job(roomba.connect)
             while not roomba.roomba_connected or name is None:
                 # Waiting for connection and check datas ready
                 name = roomba_reported_state(roomba).get("name", None)
@@ -152,7 +152,7 @@ async def async_disconnect_or_timeout(hass, roomba):
     """Disconnect to vacuum."""
     _LOGGER.debug("Disconnect vacuum")
     with async_timeout.timeout(3):
-        await hass.async_add_job(roomba.disconnect)
+        await hass.async_add_executor_job(roomba.disconnect)
     return True
 
 
diff --git a/homeassistant/components/roomba/binary_sensor.py b/homeassistant/components/roomba/binary_sensor.py
index 9acea9e4dbe..ea39fba2f8e 100644
--- a/homeassistant/components/roomba/binary_sensor.py
+++ b/homeassistant/components/roomba/binary_sensor.py
@@ -1,14 +1,10 @@
 """Roomba binary sensor entities."""
-import logging
-
 from homeassistant.components.binary_sensor import BinarySensorEntity
 
 from . import roomba_reported_state
 from .const import BLID, DOMAIN, ROOMBA_SESSION
 from .irobot_base import IRobotEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the iRobot Roomba vacuum cleaner."""
diff --git a/homeassistant/components/roomba/config_flow.py b/homeassistant/components/roomba/config_flow.py
index cffbb3de4c9..b25c4ece440 100644
--- a/homeassistant/components/roomba/config_flow.py
+++ b/homeassistant/components/roomba/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow to configure roomba component."""
-import logging
-
 from roomba import Roomba
 import voluptuous as vol
 
@@ -30,8 +28,6 @@ DATA_SCHEMA = vol.Schema(
     }
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def validate_input(hass: core.HomeAssistant, data):
     """Validate the user input allows us to connect.
diff --git a/homeassistant/components/roomba/sensor.py b/homeassistant/components/roomba/sensor.py
index 54ea1eade0d..f2d08f08772 100644
--- a/homeassistant/components/roomba/sensor.py
+++ b/homeassistant/components/roomba/sensor.py
@@ -1,6 +1,4 @@
 """Sensor for checking the battery level of Roomba."""
-import logging
-
 from homeassistant.components.vacuum import STATE_DOCKED
 from homeassistant.const import DEVICE_CLASS_BATTERY, PERCENTAGE
 from homeassistant.helpers.icon import icon_for_battery_level
@@ -8,8 +6,6 @@ from homeassistant.helpers.icon import icon_for_battery_level
 from .const import BLID, DOMAIN, ROOMBA_SESSION
 from .irobot_base import IRobotEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the iRobot Roomba vacuum cleaner."""
diff --git a/homeassistant/components/roomba/strings.json b/homeassistant/components/roomba/strings.json
index d22a6e0509c..cbe7c06ae36 100644
--- a/homeassistant/components/roomba/strings.json
+++ b/homeassistant/components/roomba/strings.json
@@ -14,7 +14,7 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   },
   "options": {
@@ -27,4 +27,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/roomba/translations/ca.json b/homeassistant/components/roomba/translations/ca.json
index 3d7efbe53ae..af358678144 100644
--- a/homeassistant/components/roomba/translations/ca.json
+++ b/homeassistant/components/roomba/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar"
+            "cannot_connect": "Ha fallat la connexi\u00f3"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/roomba/translations/cs.json b/homeassistant/components/roomba/translations/cs.json
index 6d21c8f19c4..fdf4aff22c9 100644
--- a/homeassistant/components/roomba/translations/cs.json
+++ b/homeassistant/components/roomba/translations/cs.json
@@ -1,10 +1,24 @@
 {
     "config": {
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
         "step": {
             "user": {
                 "data": {
+                    "delay": "Zpo\u017ed\u011bn\u00ed",
                     "host": "Hostitel",
                     "password": "Heslo"
+                },
+                "title": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "delay": "Zpo\u017ed\u011bn\u00ed"
                 }
             }
         }
diff --git a/homeassistant/components/roomba/translations/en.json b/homeassistant/components/roomba/translations/en.json
index 677ea5f4749..b6222f2adf8 100644
--- a/homeassistant/components/roomba/translations/en.json
+++ b/homeassistant/components/roomba/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "cannot_connect": "Failed to connect, please try again"
+            "cannot_connect": "Failed to connect"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/roomba/translations/es.json b/homeassistant/components/roomba/translations/es.json
index c96508c7944..a49022c2d3d 100644
--- a/homeassistant/components/roomba/translations/es.json
+++ b/homeassistant/components/roomba/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo"
+            "cannot_connect": "No se pudo conectar"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/roomba/translations/et.json b/homeassistant/components/roomba/translations/et.json
new file mode 100644
index 00000000000..cca6ecc05ec
--- /dev/null
+++ b/homeassistant/components/roomba/translations/et.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/roomba/translations/it.json b/homeassistant/components/roomba/translations/it.json
index babd2082b3c..d109aa8bcc0 100644
--- a/homeassistant/components/roomba/translations/it.json
+++ b/homeassistant/components/roomba/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare"
+            "cannot_connect": "Impossibile connettersi"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/roomba/translations/no.json b/homeassistant/components/roomba/translations/no.json
index b780f3e718b..adf13cb57af 100644
--- a/homeassistant/components/roomba/translations/no.json
+++ b/homeassistant/components/roomba/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen"
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/roomba/translations/pl.json b/homeassistant/components/roomba/translations/pl.json
index 4600e3f5c95..b2a4ab89cbe 100644
--- a/homeassistant/components/roomba/translations/pl.json
+++ b/homeassistant/components/roomba/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/roomba/translations/ru.json b/homeassistant/components/roomba/translations/ru.json
index 12217a1bc3f..ee1192f69ec 100644
--- a/homeassistant/components/roomba/translations/ru.json
+++ b/homeassistant/components/roomba/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/roomba/translations/zh-Hant.json b/homeassistant/components/roomba/translations/zh-Hant.json
index 5e51af5efb5..794c67454fb 100644
--- a/homeassistant/components/roomba/translations/zh-Hant.json
+++ b/homeassistant/components/roomba/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/roomba/vacuum.py b/homeassistant/components/roomba/vacuum.py
index bc2e58846d1..f4e0d4f0138 100644
--- a/homeassistant/components/roomba/vacuum.py
+++ b/homeassistant/components/roomba/vacuum.py
@@ -1,13 +1,9 @@
 """Support for Wi-Fi enabled iRobot Roombas."""
-import logging
-
 from . import roomba_reported_state
 from .braava import BraavaJet
 from .const import BLID, DOMAIN, ROOMBA_SESSION
 from .roomba import RoombaVacuum, RoombaVacuumCarpetBoost
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the iRobot Roomba vacuum cleaner."""
diff --git a/homeassistant/components/roon/__init__.py b/homeassistant/components/roon/__init__.py
index ff45e2c16cf..49527a44245 100644
--- a/homeassistant/components/roon/__init__.py
+++ b/homeassistant/components/roon/__init__.py
@@ -1,14 +1,10 @@
 """Roon (www.roonlabs.com) component."""
-import logging
-
 from homeassistant.const import CONF_HOST
 from homeassistant.helpers import device_registry as dr
 
 from .const import DOMAIN
 from .server import RoonServer
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup(hass, config):
     """Set up the Roon platform."""
diff --git a/homeassistant/components/roon/translations/cs.json b/homeassistant/components/roon/translations/cs.json
new file mode 100644
index 00000000000..899bc285de4
--- /dev/null
+++ b/homeassistant/components/roon/translations/cs.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "duplicate_entry": "Tento hostitel ji\u017e byl p\u0159id\u00e1n.",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "link": {
+                "title": "Autorizujte HomeAssistant v Roon"
+            },
+            "user": {
+                "data": {
+                    "host": "Hostitel"
+                },
+                "description": "Zadejte pros\u00edm n\u00e1zev hostitele nebo IP adresu va\u0161eho Roon serveru.",
+                "title": "Nastaven\u00ed serveru Roon"
+            }
+        }
+    },
+    "title": "Roon"
+}
\ No newline at end of file
diff --git a/homeassistant/components/roon/translations/de.json b/homeassistant/components/roon/translations/de.json
index b73dc4d6444..00f85d6c1b6 100644
--- a/homeassistant/components/roon/translations/de.json
+++ b/homeassistant/components/roon/translations/de.json
@@ -1,3 +1,8 @@
 {
+    "config": {
+        "error": {
+            "duplicate_entry": "Dieser Host wurde bereits hinzugef\u00fcgt."
+        }
+    },
     "title": "Roon"
 }
\ No newline at end of file
diff --git a/homeassistant/components/roon/translations/el.json b/homeassistant/components/roon/translations/el.json
new file mode 100644
index 00000000000..4a17e5f1288
--- /dev/null
+++ b/homeassistant/components/roon/translations/el.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "error": {
+            "duplicate_entry": "\u0391\u03c5\u03c4\u03cc\u03c2 \u03bf \u03ba\u03b5\u03bd\u03c4\u03c1\u03b9\u03ba\u03cc\u03c2 \u03c5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03c4\u03ae\u03c2 \u03ad\u03c7\u03b5\u03b9 \u03ae\u03b4\u03b7 \u03c0\u03c1\u03bf\u03c3\u03c4\u03b5\u03b8\u03b5\u03af."
+        },
+        "step": {
+            "link": {
+                "description": "\u03a0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b5\u03be\u03bf\u03c5\u03c3\u03b9\u03bf\u03b4\u03bf\u03c4\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf Home Assistant \u03c3\u03c4\u03bf Roon. \u0391\u03c6\u03bf\u03cd \u03ba\u03ac\u03bd\u03b5\u03c4\u03b5 \u03ba\u03bb\u03b9\u03ba \u03c3\u03c4\u03b7\u03bd \u03c5\u03c0\u03bf\u03b2\u03bf\u03bb\u03ae, \u03bc\u03b5\u03c4\u03b1\u03b2\u03b5\u03af\u03c4\u03b5 \u03c3\u03c4\u03b7\u03bd \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae Roon Core, \u03b1\u03bd\u03bf\u03af\u03be\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03ba\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03c4\u03bf HomeAssistant \u03c3\u03c4\u03b7\u03bd \u03ba\u03b1\u03c1\u03c4\u03ad\u03bb\u03b1 \u0395\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2.",
+                "title": "\u0395\u03be\u03bf\u03c5\u03c3\u03b9\u03bf\u03b4\u03bf\u03c4\u03ae\u03c3\u03c4\u03b5 \u03c4\u03bf HomeAssistant \u03c3\u03c4\u03bf Roon"
+            },
+            "user": {
+                "description": "\u0395\u03b9\u03c3\u03b1\u03b3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03ba\u03b5\u03bd\u03c4\u03c1\u03b9\u03ba\u03bf\u03cd \u03c5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03c4\u03ae \u03ae \u03c4\u03b7\u03bd IP \u03b4\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae Roon.",
+                "title": "\u0394\u03b9\u03b1\u03bc\u03cc\u03c1\u03c6\u03c9\u03c3\u03b7 \u03b4\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae Roon"
+            }
+        }
+    },
+    "title": "Roon"
+}
\ No newline at end of file
diff --git a/homeassistant/components/roon/translations/et.json b/homeassistant/components/roon/translations/et.json
new file mode 100644
index 00000000000..7c2ca0d1bb1
--- /dev/null
+++ b/homeassistant/components/roon/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "duplicate_entry": "See host on juba lisatud.",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": ""
+                },
+                "description": "Sisesta oma Rooni serveri hostinimi v\u00f5i IP."
+            }
+        }
+    },
+    "title": "[VOID]\n"
+}
\ No newline at end of file
diff --git a/homeassistant/components/roon/translations/no.json b/homeassistant/components/roon/translations/no.json
index cdf62b8c3c2..92176c8aac0 100644
--- a/homeassistant/components/roon/translations/no.json
+++ b/homeassistant/components/roon/translations/no.json
@@ -22,5 +22,5 @@
             }
         }
     },
-    "title": "Roon"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/roon/translations/pl.json b/homeassistant/components/roon/translations/pl.json
index d6cc1c7dd8b..e0dd3345216 100644
--- a/homeassistant/components/roon/translations/pl.json
+++ b/homeassistant/components/roon/translations/pl.json
@@ -4,8 +4,23 @@
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
+            "duplicate_entry": "Ten host lub adres IP zosta\u0142 ju\u017c dodany",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
+        },
+        "step": {
+            "link": {
+                "description": "Musisz autoryzowa\u0107 Home Assistant w Roon. Po klikni\u0119ciu przycisku \"Prze\u015blij\", przejd\u017a do aplikacji Roon Core, otw\u00f3rz \"Ustawienia\" i w\u0142\u0105cz Home Assistant w karcie \"Rozszerzenia\" (Extensions).",
+                "title": "Autoryzuj Home Assistant w Roon"
+            },
+            "user": {
+                "data": {
+                    "host": "Nazwa hosta lub adres IP"
+                },
+                "description": "Wprowad\u017a nazw\u0119 hosta lub adres IP swojego serwera Roon.",
+                "title": "Konfiguracja serwera Roon"
+            }
         }
-    }
+    },
+    "title": "Roon"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rpi_camera/__init__.py b/homeassistant/components/rpi_camera/__init__.py
index 2f962872d8c..a854338ee78 100644
--- a/homeassistant/components/rpi_camera/__init__.py
+++ b/homeassistant/components/rpi_camera/__init__.py
@@ -1,6 +1,4 @@
 """The rpi_camera component."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.const import CONF_FILE_PATH, CONF_NAME
@@ -27,8 +25,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: vol.Schema(
diff --git a/homeassistant/components/rpi_gpio/__init__.py b/homeassistant/components/rpi_gpio/__init__.py
index b3a83646f0e..75aa5bccdb6 100644
--- a/homeassistant/components/rpi_gpio/__init__.py
+++ b/homeassistant/components/rpi_gpio/__init__.py
@@ -1,12 +1,8 @@
 """Support for controlling GPIO pins of a Raspberry Pi."""
-import logging
-
 from RPi import GPIO  # pylint: disable=import-error
 
 from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "rpi_gpio"
 PLATFORMS = ["binary_sensor", "cover", "switch"]
 
diff --git a/homeassistant/components/rpi_gpio/binary_sensor.py b/homeassistant/components/rpi_gpio/binary_sensor.py
index 527da2a7096..a2461f52db9 100644
--- a/homeassistant/components/rpi_gpio/binary_sensor.py
+++ b/homeassistant/components/rpi_gpio/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for binary sensor using RPi GPIO."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components import rpi_gpio
@@ -11,8 +9,6 @@ from homeassistant.helpers.reload import setup_reload_service
 
 from . import DOMAIN, PLATFORMS
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_BOUNCETIME = "bouncetime"
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_PORTS = "ports"
diff --git a/homeassistant/components/rpi_gpio/cover.py b/homeassistant/components/rpi_gpio/cover.py
index fab35da31fb..032796fe55b 100644
--- a/homeassistant/components/rpi_gpio/cover.py
+++ b/homeassistant/components/rpi_gpio/cover.py
@@ -1,5 +1,4 @@
 """Support for controlling a Raspberry Pi cover."""
-import logging
 from time import sleep
 
 import voluptuous as vol
@@ -12,8 +11,6 @@ from homeassistant.helpers.reload import setup_reload_service
 
 from . import DOMAIN, PLATFORMS
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_COVERS = "covers"
 CONF_RELAY_PIN = "relay_pin"
 CONF_RELAY_TIME = "relay_time"
diff --git a/homeassistant/components/rpi_gpio/switch.py b/homeassistant/components/rpi_gpio/switch.py
index 047bff39c95..d556d8f0354 100644
--- a/homeassistant/components/rpi_gpio/switch.py
+++ b/homeassistant/components/rpi_gpio/switch.py
@@ -1,6 +1,4 @@
 """Allows to configure a switch using RPi GPIO."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components import rpi_gpio
@@ -12,8 +10,6 @@ from homeassistant.helpers.reload import setup_reload_service
 
 from . import DOMAIN, PLATFORMS
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_PULL_MODE = "pull_mode"
 CONF_PORTS = "ports"
 CONF_INVERT_LOGIC = "invert_logic"
diff --git a/homeassistant/components/rpi_gpio_pwm/manifest.json b/homeassistant/components/rpi_gpio_pwm/manifest.json
index 9cb082dc2b6..cde9f24843f 100644
--- a/homeassistant/components/rpi_gpio_pwm/manifest.json
+++ b/homeassistant/components/rpi_gpio_pwm/manifest.json
@@ -2,6 +2,6 @@
   "domain": "rpi_gpio_pwm",
   "name": "pigpio Daemon PWM LED",
   "documentation": "https://www.home-assistant.io/integrations/rpi_gpio_pwm",
-  "requirements": ["pwmled==1.5.0"],
+  "requirements": ["pwmled==1.5.3"],
   "codeowners": []
 }
diff --git a/homeassistant/components/rpi_pfio/__init__.py b/homeassistant/components/rpi_pfio/__init__.py
index d02b2bc5610..45b3e98d977 100644
--- a/homeassistant/components/rpi_pfio/__init__.py
+++ b/homeassistant/components/rpi_pfio/__init__.py
@@ -1,12 +1,8 @@
 """Support for controlling the PiFace Digital I/O module on a RPi."""
-import logging
-
 import pifacedigitalio as PFIO
 
 from homeassistant.const import EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "rpi_pfio"
 
 DATA_PFIO_LISTENER = "pfio_listener"
diff --git a/homeassistant/components/rpi_pfio/binary_sensor.py b/homeassistant/components/rpi_pfio/binary_sensor.py
index e77ceea3eb7..5d1d46e8a39 100644
--- a/homeassistant/components/rpi_pfio/binary_sensor.py
+++ b/homeassistant/components/rpi_pfio/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for binary sensor using the PiFace Digital I/O module on a RPi."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components import rpi_pfio
@@ -8,8 +6,6 @@ from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensor
 from homeassistant.const import CONF_NAME, DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_INVERT_LOGIC = "invert_logic"
 CONF_PORTS = "ports"
 CONF_SETTLE_TIME = "settle_time"
diff --git a/homeassistant/components/rpi_pfio/switch.py b/homeassistant/components/rpi_pfio/switch.py
index bc3d99b5256..91a98cdec59 100644
--- a/homeassistant/components/rpi_pfio/switch.py
+++ b/homeassistant/components/rpi_pfio/switch.py
@@ -1,6 +1,4 @@
 """Support for switches using the PiFace Digital I/O module on a RPi."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components import rpi_pfio
@@ -9,8 +7,6 @@ from homeassistant.const import ATTR_NAME, DEVICE_DEFAULT_NAME
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import ToggleEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_INVERT_LOGIC = "invert_logic"
 
 CONF_PORTS = "ports"
diff --git a/homeassistant/components/rpi_power/translations/cs.json b/homeassistant/components/rpi_power/translations/cs.json
index b60cb60f985..86d49fd1f60 100644
--- a/homeassistant/components/rpi_power/translations/cs.json
+++ b/homeassistant/components/rpi_power/translations/cs.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "Nelze naj\u00edt t\u0159\u00eddu syst\u00e9mu pot\u0159ebnou pro tuto komponentu, ujist\u011bte se, \u017ee je va\u0161e j\u00e1dro aktu\u00e1ln\u00ed a hardware podporov\u00e1n",
-            "single_instance_allowed": "Ji\u017e je nakonfigurov\u00e1no.Je mo\u017en\u00e1 pouze jedna konfigurace."
+            "single_instance_allowed": "Ji\u017e je nastaveno. Je mo\u017en\u00e1 pouze jedna konfigurace."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/rpi_power/translations/el.json b/homeassistant/components/rpi_power/translations/el.json
index 08a3ca23e6b..89042f53e88 100644
--- a/homeassistant/components/rpi_power/translations/el.json
+++ b/homeassistant/components/rpi_power/translations/el.json
@@ -1,7 +1,13 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7 \u03c4\u03b7\u03c2 \u03ba\u03bb\u03ac\u03c3\u03b7\u03c2 \u03c3\u03c5\u03c3\u03c4\u03ae\u03bc\u03b1\u03c4\u03bf\u03c2 \u03c0\u03bf\u03c5 \u03b1\u03c0\u03b1\u03b9\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03b3\u03b9\u03b1 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03bf, \u03b2\u03b5\u03b2\u03b1\u03b9\u03c9\u03b8\u03b5\u03af\u03c4\u03b5 \u03cc\u03c4\u03b9 \u03bf \u03c0\u03c5\u03c1\u03ae\u03bd\u03b1\u03c2 \u03c3\u03b1\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03c1\u03cc\u03c3\u03c6\u03b1\u03c4\u03bf\u03c2 \u03ba\u03b1\u03b9 \u03cc\u03c4\u03b9 \u03c4\u03bf \u03c5\u03bb\u03b9\u03ba\u03cc \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03c4\u03b1\u03b9"
+            "no_devices_found": "\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7 \u03c4\u03b7\u03c2 \u03ba\u03bb\u03ac\u03c3\u03b7\u03c2 \u03c3\u03c5\u03c3\u03c4\u03ae\u03bc\u03b1\u03c4\u03bf\u03c2 \u03c0\u03bf\u03c5 \u03b1\u03c0\u03b1\u03b9\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03b3\u03b9\u03b1 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03bf, \u03b2\u03b5\u03b2\u03b1\u03b9\u03c9\u03b8\u03b5\u03af\u03c4\u03b5 \u03cc\u03c4\u03b9 \u03bf \u03c0\u03c5\u03c1\u03ae\u03bd\u03b1\u03c2 \u03c3\u03b1\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03c1\u03cc\u03c3\u03c6\u03b1\u03c4\u03bf\u03c2 \u03ba\u03b1\u03b9 \u03cc\u03c4\u03b9 \u03c4\u03bf \u03c5\u03bb\u03b9\u03ba\u03cc \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03c4\u03b1\u03b9",
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        },
+        "step": {
+            "confirm": {
+                "description": "\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03be\u03b5\u03ba\u03b9\u03bd\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03b3\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7;"
+            }
         }
     },
     "title": "\u0388\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 \u03c4\u03c1\u03bf\u03c6\u03bf\u03b4\u03bf\u03c3\u03af\u03b1\u03c2 Raspberry Pi"
diff --git a/homeassistant/components/rpi_power/translations/es.json b/homeassistant/components/rpi_power/translations/es.json
index 215b15014ab..209cb867d23 100644
--- a/homeassistant/components/rpi_power/translations/es.json
+++ b/homeassistant/components/rpi_power/translations/es.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "No se puede encontrar la clase de sistema necesaria para este componente, aseg\u00farate de que tu kernel es reciente y el hardware es compatible",
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/rpi_power/translations/et.json b/homeassistant/components/rpi_power/translations/et.json
index 350e09ca86f..d79ef1ad554 100644
--- a/homeassistant/components/rpi_power/translations/et.json
+++ b/homeassistant/components/rpi_power/translations/et.json
@@ -6,7 +6,7 @@
         },
         "step": {
             "confirm": {
-                "description": "Kas alustame paigaldusega?"
+                "description": "Kas alustada paigaldusega?"
             }
         }
     },
diff --git a/homeassistant/components/rpi_power/translations/lb.json b/homeassistant/components/rpi_power/translations/lb.json
index 0e08431d1b6..1b4c77f4fda 100644
--- a/homeassistant/components/rpi_power/translations/lb.json
+++ b/homeassistant/components/rpi_power/translations/lb.json
@@ -3,5 +3,6 @@
         "abort": {
             "no_devices_found": "Kann d\u00e9i Systemklass fir d\u00ebs noutwendeg Komponent net fannen, stell s\u00e9cher dass de Kernel rezent ass an d'Hardware \u00ebnnerst\u00ebtzt g\u00ebtt."
         }
-    }
+    },
+    "title": "Raspberry Pi Netzdeel Checker"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rpi_power/translations/nl.json b/homeassistant/components/rpi_power/translations/nl.json
index a18ff63733e..72f9ff82ba4 100644
--- a/homeassistant/components/rpi_power/translations/nl.json
+++ b/homeassistant/components/rpi_power/translations/nl.json
@@ -1,3 +1,8 @@
 {
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
+        }
+    },
     "title": "Raspberry Pi Voeding Checker"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rpi_power/translations/pl.json b/homeassistant/components/rpi_power/translations/pl.json
index 4f466e3455f..20b72f5920e 100644
--- a/homeassistant/components/rpi_power/translations/pl.json
+++ b/homeassistant/components/rpi_power/translations/pl.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "no_devices_found": "Nie mo\u017cna znale\u017a\u0107 klasy systemu potrzebnej dla tego komponentu. Upewnij si\u0119, \u017ce j\u0105dro systemu jest aktualne, a sprz\u0119t obs\u0142ugiwany.",
             "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
@@ -8,5 +9,6 @@
                 "description": "Czy chcesz rozpocz\u0105\u0107 konfiguracj\u0119?"
             }
         }
-    }
+    },
+    "title": "Kontroler zasilacza Raspberry Pi"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rpi_power/translations/ru.json b/homeassistant/components/rpi_power/translations/ru.json
index f91df15e1b3..d3cb259c150 100644
--- a/homeassistant/components/rpi_power/translations/ru.json
+++ b/homeassistant/components/rpi_power/translations/ru.json
@@ -10,5 +10,5 @@
             }
         }
     },
-    "title": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430 \u043f\u0438\u0442\u0430\u043d\u0438\u044f Raspberry Pi"
+    "title": "Raspberry Pi power supply checker"
 }
\ No newline at end of file
diff --git a/homeassistant/components/rss_feed_template/__init__.py b/homeassistant/components/rss_feed_template/__init__.py
index b979e4d5261..c9871c8f6b5 100644
--- a/homeassistant/components/rss_feed_template/__init__.py
+++ b/homeassistant/components/rss_feed_template/__init__.py
@@ -83,17 +83,19 @@ class RssView(HomeAssistantView):
 
         response += "<rss>\n"
         if self._title is not None:
-            response += "  <title>%s</title>\n" % escape(self._title.async_render())
+            response += "  <title>%s</title>\n" % escape(
+                self._title.async_render(parse_result=False)
+            )
 
         for item in self._items:
             response += "  <item>\n"
             if "title" in item:
                 response += "    <title>"
-                response += escape(item["title"].async_render())
+                response += escape(item["title"].async_render(parse_result=False))
                 response += "</title>\n"
             if "description" in item:
                 response += "    <description>"
-                response += escape(item["description"].async_render())
+                response += escape(item["description"].async_render(parse_result=False))
                 response += "</description>\n"
             response += "  </item>\n"
 
diff --git a/homeassistant/components/ruckus_unleashed/__init__.py b/homeassistant/components/ruckus_unleashed/__init__.py
new file mode 100644
index 00000000000..ed38f5a2a3a
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/__init__.py
@@ -0,0 +1,98 @@
+"""The Ruckus Unleashed integration."""
+import asyncio
+
+from pyruckus import Ruckus
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import device_registry
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+
+from .const import (
+    API_AP,
+    API_DEVICE_NAME,
+    API_ID,
+    API_MAC,
+    API_MODEL,
+    API_SYSTEM_OVERVIEW,
+    API_VERSION,
+    COORDINATOR,
+    DOMAIN,
+    MANUFACTURER,
+    PLATFORMS,
+    UNDO_UPDATE_LISTENERS,
+)
+from .coordinator import RuckusUnleashedDataUpdateCoordinator
+
+
+async def async_setup(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up the Ruckus Unleashed component."""
+    hass.data[DOMAIN] = {}
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Ruckus Unleashed from a config entry."""
+    try:
+        ruckus = await hass.async_add_executor_job(
+            Ruckus,
+            entry.data[CONF_HOST],
+            entry.data[CONF_USERNAME],
+            entry.data[CONF_PASSWORD],
+        )
+    except ConnectionError as error:
+        raise ConfigEntryNotReady from error
+
+    coordinator = RuckusUnleashedDataUpdateCoordinator(hass, ruckus=ruckus)
+
+    await coordinator.async_refresh()
+    if not coordinator.last_update_success:
+        raise ConfigEntryNotReady
+
+    system_info = await hass.async_add_executor_job(ruckus.system_info)
+
+    registry = await device_registry.async_get_registry(hass)
+    ap_info = await hass.async_add_executor_job(ruckus.ap_info)
+    for device in ap_info[API_AP][API_ID].values():
+        registry.async_get_or_create(
+            config_entry_id=entry.entry_id,
+            connections={(CONNECTION_NETWORK_MAC, device[API_MAC])},
+            identifiers={(CONNECTION_NETWORK_MAC, device[API_MAC])},
+            manufacturer=MANUFACTURER,
+            name=device[API_DEVICE_NAME],
+            model=device[API_MODEL],
+            sw_version=system_info[API_SYSTEM_OVERVIEW][API_VERSION],
+        )
+
+    hass.data[DOMAIN][entry.entry_id] = {
+        COORDINATOR: coordinator,
+        UNDO_UPDATE_LISTENERS: [],
+    }
+
+    for platform in PLATFORMS:
+        hass.async_create_task(
+            hass.config_entries.async_forward_entry_setup(entry, platform)
+        )
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    unload_ok = all(
+        await asyncio.gather(
+            *[
+                hass.config_entries.async_forward_entry_unload(entry, component)
+                for component in PLATFORMS
+            ]
+        )
+    )
+    if unload_ok:
+        for listener in hass.data[DOMAIN][entry.entry_id][UNDO_UPDATE_LISTENERS]:
+            listener()
+
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
diff --git a/homeassistant/components/ruckus_unleashed/config_flow.py b/homeassistant/components/ruckus_unleashed/config_flow.py
new file mode 100644
index 00000000000..098ffba708c
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/config_flow.py
@@ -0,0 +1,85 @@
+"""Config flow for Ruckus Unleashed integration."""
+import logging
+
+from pyruckus import Ruckus
+from pyruckus.exceptions import AuthenticationError
+import voluptuous as vol
+
+from homeassistant import config_entries, core, exceptions
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+
+from .const import (  # pylint:disable=unused-import
+    API_SERIAL,
+    API_SYSTEM_OVERVIEW,
+    DOMAIN,
+)
+
+_LOGGER = logging.getLogger(__package__)
+
+DATA_SCHEMA = vol.Schema({"host": str, "username": str, "password": str})
+
+
+def validate_input(hass: core.HomeAssistant, data):
+    """Validate the user input allows us to connect.
+
+    Data has the keys from DATA_SCHEMA with values provided by the user.
+    """
+
+    try:
+        ruckus = Ruckus(data[CONF_HOST], data[CONF_USERNAME], data[CONF_PASSWORD])
+    except AuthenticationError as error:
+        raise InvalidAuth from error
+    except ConnectionError as error:
+        raise CannotConnect from error
+
+    mesh_name = ruckus.mesh_name()
+
+    system_info = ruckus.system_info()
+    try:
+        host_serial = system_info[API_SYSTEM_OVERVIEW][API_SERIAL]
+    except KeyError as error:
+        raise CannotConnect from error
+
+    return {
+        "title": mesh_name,
+        "serial": host_serial,
+    }
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Ruckus Unleashed."""
+
+    VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_POLL
+
+    async def async_step_user(self, user_input=None):
+        """Handle the initial step."""
+        errors = {}
+        if user_input is not None:
+            try:
+                info = await self.hass.async_add_executor_job(
+                    validate_input, self.hass, user_input
+                )
+            except CannotConnect:
+                errors["base"] = "cannot_connect"
+            except InvalidAuth:
+                errors["base"] = "invalid_auth"
+            except Exception:  # pylint: disable=broad-except
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
+            else:
+                await self.async_set_unique_id(info["serial"])
+                self._abort_if_unique_id_configured()
+                return self.async_create_entry(title=info["title"], data=user_input)
+
+        return self.async_show_form(
+            step_id="user", data_schema=DATA_SCHEMA, errors=errors
+        )
+
+
+class CannotConnect(exceptions.HomeAssistantError):
+    """Error to indicate we cannot connect."""
+
+
+class InvalidAuth(exceptions.HomeAssistantError):
+    """Error to indicate there is invalid auth."""
diff --git a/homeassistant/components/ruckus_unleashed/const.py b/homeassistant/components/ruckus_unleashed/const.py
new file mode 100644
index 00000000000..77e1029143e
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/const.py
@@ -0,0 +1,23 @@
+"""Constants for the Ruckus Unleashed integration."""
+DOMAIN = "ruckus_unleashed"
+PLATFORMS = ["device_tracker"]
+SCAN_INTERVAL = 180
+
+MANUFACTURER = "Ruckus"
+
+COORDINATOR = "coordinator"
+UNDO_UPDATE_LISTENERS = "undo_update_listeners"
+
+API_CLIENTS = "clients"
+API_NAME = "host_name"
+API_MAC = "mac_address"
+API_IP = "user_ip"
+API_SYSTEM_OVERVIEW = "system_overview"
+API_SERIAL = "serial_number"
+API_DEVICE_NAME = "device_name"
+API_MODEL = "model"
+API_VERSION = "version"
+API_AP = "ap"
+API_ID = "id"
+API_CURRENT_ACTIVE_CLIENTS = "current_active_clients"
+API_ACCESS_POINT = "access_point"
diff --git a/homeassistant/components/ruckus_unleashed/coordinator.py b/homeassistant/components/ruckus_unleashed/coordinator.py
new file mode 100644
index 00000000000..1e145a19c74
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/coordinator.py
@@ -0,0 +1,50 @@
+"""Ruckus Unleashed DataUpdateCoordinator."""
+from datetime import timedelta
+import logging
+
+from pyruckus import Ruckus
+from pyruckus.exceptions import AuthenticationError
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import (
+    API_CLIENTS,
+    API_CURRENT_ACTIVE_CLIENTS,
+    API_MAC,
+    DOMAIN,
+    SCAN_INTERVAL,
+)
+
+_LOGGER = logging.getLogger(__package__)
+
+
+class RuckusUnleashedDataUpdateCoordinator(DataUpdateCoordinator):
+    """Coordinator to manage data from Ruckus Unleashed client."""
+
+    def __init__(self, hass: HomeAssistant, *, ruckus: Ruckus):
+        """Initialize global Ruckus Unleashed data updater."""
+        self.ruckus = ruckus
+
+        update_interval = timedelta(seconds=SCAN_INTERVAL)
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=update_interval,
+        )
+
+    async def _fetch_clients(self) -> dict:
+        """Fetch clients from the API and format them."""
+        clients = await self.hass.async_add_executor_job(
+            self.ruckus.current_active_clients
+        )
+        return {e[API_MAC]: e for e in clients[API_CURRENT_ACTIVE_CLIENTS][API_CLIENTS]}
+
+    async def _async_update_data(self) -> dict:
+        """Fetch Ruckus Unleashed data."""
+        try:
+            return {API_CLIENTS: await self._fetch_clients()}
+        except (AuthenticationError, ConnectionError) as error:
+            raise UpdateFailed(error) from error
diff --git a/homeassistant/components/ruckus_unleashed/device_tracker.py b/homeassistant/components/ruckus_unleashed/device_tracker.py
new file mode 100644
index 00000000000..955e0581393
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/device_tracker.py
@@ -0,0 +1,129 @@
+"""Support for Ruckus Unleashed devices."""
+from typing import Optional
+
+from homeassistant.components.device_tracker import SOURCE_TYPE_ROUTER
+from homeassistant.components.device_tracker.config_entry import ScannerEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import callback
+from homeassistant.helpers import entity_registry
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import (
+    API_ACCESS_POINT,
+    API_CLIENTS,
+    API_NAME,
+    COORDINATOR,
+    DOMAIN,
+    MANUFACTURER,
+    UNDO_UPDATE_LISTENERS,
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
+) -> None:
+    """Set up device tracker for Ruckus Unleashed component."""
+    coordinator = hass.data[DOMAIN][entry.entry_id][COORDINATOR]
+
+    tracked = set()
+
+    @callback
+    def router_update():
+        """Update the values of the router."""
+        add_new_entities(coordinator, async_add_entities, tracked)
+
+    router_update()
+
+    hass.data[DOMAIN][entry.entry_id][UNDO_UPDATE_LISTENERS].append(
+        coordinator.async_add_listener(router_update)
+    )
+
+    registry = await entity_registry.async_get_registry(hass)
+    restore_entities(registry, coordinator, entry, async_add_entities, tracked)
+
+
+@callback
+def add_new_entities(coordinator, async_add_entities, tracked):
+    """Add new tracker entities from the router."""
+    new_tracked = []
+
+    for mac in coordinator.data[API_CLIENTS]:
+        if mac in tracked:
+            continue
+
+        device = coordinator.data[API_CLIENTS][mac]
+        new_tracked.append(RuckusUnleashedDevice(coordinator, mac, device[API_NAME]))
+        tracked.add(mac)
+
+    if new_tracked:
+        async_add_entities(new_tracked)
+
+
+@callback
+def restore_entities(registry, coordinator, entry, async_add_entities, tracked):
+    """Restore clients that are not a part of active clients list."""
+    missing = []
+
+    for entity in registry.entities.values():
+        if entity.config_entry_id == entry.entry_id and entity.platform == DOMAIN:
+            if entity.unique_id not in coordinator.data[API_CLIENTS]:
+                missing.append(
+                    RuckusUnleashedDevice(
+                        coordinator, entity.unique_id, entity.original_name
+                    )
+                )
+                tracked.add(entity.unique_id)
+
+    if missing:
+        async_add_entities(missing)
+
+
+class RuckusUnleashedDevice(CoordinatorEntity, ScannerEntity):
+    """Representation of a Ruckus Unleashed client."""
+
+    def __init__(self, coordinator, mac, name) -> None:
+        """Initialize a Ruckus Unleashed client."""
+        super().__init__(coordinator)
+        self._mac = mac
+        self._name = name
+
+    @property
+    def unique_id(self) -> str:
+        """Return a unique ID."""
+        return self._mac
+
+    @property
+    def name(self) -> str:
+        """Return the name."""
+        if self.is_connected:
+            return (
+                self.coordinator.data[API_CLIENTS][self._mac][API_NAME]
+                or f"{MANUFACTURER} {self._mac}"
+            )
+        return self._name
+
+    @property
+    def is_connected(self) -> bool:
+        """Return true if the device is connected to the network."""
+        return self._mac in self.coordinator.data[API_CLIENTS]
+
+    @property
+    def source_type(self) -> str:
+        """Return the source type."""
+        return SOURCE_TYPE_ROUTER
+
+    @property
+    def device_info(self) -> Optional[dict]:
+        """Return the device information."""
+        if self.is_connected:
+            return {
+                "name": self.name,
+                "connections": {(CONNECTION_NETWORK_MAC, self._mac)},
+                "via_device": (
+                    CONNECTION_NETWORK_MAC,
+                    self.coordinator.data[API_CLIENTS][self._mac][API_ACCESS_POINT],
+                ),
+            }
+        return None
diff --git a/homeassistant/components/ruckus_unleashed/manifest.json b/homeassistant/components/ruckus_unleashed/manifest.json
new file mode 100644
index 00000000000..b8bc14a108a
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/manifest.json
@@ -0,0 +1,12 @@
+{
+  "domain": "ruckus_unleashed",
+  "name": "Ruckus Unleashed",
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/ruckus_unleashed",
+  "requirements": [
+    "pyruckus==0.12"
+  ],
+  "codeowners": [
+    "@gabe565"
+  ]
+}
diff --git a/homeassistant/components/ruckus_unleashed/strings.json b/homeassistant/components/ruckus_unleashed/strings.json
new file mode 100644
index 00000000000..d4814f84231
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/strings.json
@@ -0,0 +1,22 @@
+{
+  "title": "Ruckus Unleashed",
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/ca.json b/homeassistant/components/ruckus_unleashed/translations/ca.json
new file mode 100644
index 00000000000..773151ac1bc
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/ca.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
+        },
+        "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
+            "unknown": "Error inesperat"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Amfitri\u00f3",
+                    "password": "Contrasenya",
+                    "username": "Nom d'usuari"
+                }
+            }
+        }
+    },
+    "title": "Ruckus Unleashed"
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/cs.json b/homeassistant/components/ruckus_unleashed/translations/cs.json
new file mode 100644
index 00000000000..b9dac7e6778
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/cs.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Hostitel",
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            }
+        }
+    },
+    "title": "Ruckus Unleashed"
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/de.json b/homeassistant/components/ruckus_unleashed/translations/de.json
new file mode 100644
index 00000000000..94b8d6526d1
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/de.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "error": {
+            "unknown": "Unerwarteter Fehler"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Passwort",
+                    "username": "Benutzername"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/en.json b/homeassistant/components/ruckus_unleashed/translations/en.json
new file mode 100644
index 00000000000..b916b420aec
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/en.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Device is already configured"
+        },
+        "error": {
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
+            "unknown": "Unexpected error"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Password",
+                    "username": "Username"
+                }
+            }
+        }
+    },
+    "title": "Ruckus Unleashed"
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/es.json b/homeassistant/components/ruckus_unleashed/translations/es.json
new file mode 100644
index 00000000000..371c4ea3852
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/es.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
+        },
+        "error": {
+            "cannot_connect": "No se pudo conectar",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
+            "unknown": "Error inesperado"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Contrase\u00f1a",
+                    "username": "Usuario"
+                }
+            }
+        }
+    },
+    "title": "Ruckus Unleashed"
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/et.json b/homeassistant/components/ruckus_unleashed/translations/et.json
new file mode 100644
index 00000000000..7ebfa29e4db
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/it.json b/homeassistant/components/ruckus_unleashed/translations/it.json
new file mode 100644
index 00000000000..e33f59bd74d
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/it.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
+        },
+        "error": {
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_auth": "Autenticazione non valida",
+            "unknown": "Errore imprevisto"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "password": "Password",
+                    "username": "Nome utente"
+                }
+            }
+        }
+    },
+    "title": "Ruckus Unleashed"
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/no.json b/homeassistant/components/ruckus_unleashed/translations/no.json
new file mode 100644
index 00000000000..bf7f9170872
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/no.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Enheten er allerede konfigurert"
+        },
+        "error": {
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning",
+            "unknown": "Uventet feil"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Vert",
+                    "password": "Passord",
+                    "username": "Brukernavn"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/pl.json b/homeassistant/components/ruckus_unleashed/translations/pl.json
new file mode 100644
index 00000000000..90fe091cbe5
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/pl.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+        },
+        "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Nazwa hosta lub adres IP",
+                    "password": "Has\u0142o",
+                    "username": "Nazwa u\u017cytkownika"
+                }
+            }
+        }
+    },
+    "title": "Ruckus Unleashed"
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/ru.json b/homeassistant/components/ruckus_unleashed/translations/ru.json
new file mode 100644
index 00000000000..70331cb8936
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/ru.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
+        },
+        "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u0425\u043e\u0441\u0442",
+                    "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
+                    "username": "\u041b\u043e\u0433\u0438\u043d"
+                }
+            }
+        }
+    },
+    "title": "Ruckus Unleashed"
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/zh-Hans.json b/homeassistant/components/ruckus_unleashed/translations/zh-Hans.json
new file mode 100644
index 00000000000..b6a239d7b99
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/zh-Hans.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u5bc6\u7801",
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ruckus_unleashed/translations/zh-Hant.json b/homeassistant/components/ruckus_unleashed/translations/zh-Hant.json
new file mode 100644
index 00000000000..a6cc1c3c0b9
--- /dev/null
+++ b/homeassistant/components/ruckus_unleashed/translations/zh-Hant.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+        },
+        "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u6a5f\u7aef",
+                    "password": "\u5bc6\u78bc",
+                    "username": "\u4f7f\u7528\u8005\u540d\u7a31"
+                }
+            }
+        }
+    },
+    "title": "Ruckus Unleashed"
+}
\ No newline at end of file
diff --git a/homeassistant/components/russound_rio/media_player.py b/homeassistant/components/russound_rio/media_player.py
index d65ef1ce0e5..b2c8250afc4 100644
--- a/homeassistant/components/russound_rio/media_player.py
+++ b/homeassistant/components/russound_rio/media_player.py
@@ -1,6 +1,4 @@
 """Support for Russound multizone controllers using RIO Protocol."""
-import logging
-
 from russound_rio import Russound
 import voluptuous as vol
 
@@ -24,8 +22,6 @@ from homeassistant.const import (
 from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_RUSSOUND = (
     SUPPORT_VOLUME_MUTE
     | SUPPORT_VOLUME_SET
diff --git a/homeassistant/components/sabnzbd/__init__.py b/homeassistant/components/sabnzbd/__init__.py
index 64265f71903..8574e82aa47 100644
--- a/homeassistant/components/sabnzbd/__init__.py
+++ b/homeassistant/components/sabnzbd/__init__.py
@@ -110,7 +110,9 @@ async def async_configure_sabnzbd(
     uri_scheme = "https" if use_ssl else "http"
     base_url = BASE_URL_FORMAT.format(uri_scheme, host, port)
     if api_key is None:
-        conf = await hass.async_add_job(load_json, hass.config.path(CONFIG_FILE))
+        conf = await hass.async_add_executor_job(
+            load_json, hass.config.path(CONFIG_FILE)
+        )
         api_key = conf.get(base_url, {}).get(CONF_API_KEY, "")
 
     sab_api = SabnzbdApi(
diff --git a/homeassistant/components/sabnzbd/sensor.py b/homeassistant/components/sabnzbd/sensor.py
index b232e2e63c5..5e437c41b23 100644
--- a/homeassistant/components/sabnzbd/sensor.py
+++ b/homeassistant/components/sabnzbd/sensor.py
@@ -1,13 +1,9 @@
 """Support for monitoring an SABnzbd NZB client."""
-import logging
-
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 
 from . import DATA_SABNZBD, SENSOR_TYPES, SIGNAL_SABNZBD_UPDATED
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the SABnzbd sensors."""
diff --git a/homeassistant/components/samsungtv/bridge.py b/homeassistant/components/samsungtv/bridge.py
index ee761696cc0..dc8eb862ff7 100644
--- a/homeassistant/components/samsungtv/bridge.py
+++ b/homeassistant/components/samsungtv/bridge.py
@@ -22,7 +22,7 @@ from .const import (
     LOGGER,
     METHOD_LEGACY,
     RESULT_AUTH_MISSING,
-    RESULT_NOT_SUCCESSFUL,
+    RESULT_CANNOT_CONNECT,
     RESULT_NOT_SUPPORTED,
     RESULT_SUCCESS,
     VALUE_CONF_ID,
@@ -164,7 +164,7 @@ class SamsungTVLegacyBridge(SamsungTVBridge):
             return RESULT_NOT_SUPPORTED
         except OSError as err:
             LOGGER.debug("Failing config: %s, error: %s", config, err)
-            return RESULT_NOT_SUCCESSFUL
+            return RESULT_CANNOT_CONNECT
 
     def _get_remote(self):
         """Create or return a remote control instance."""
@@ -232,7 +232,7 @@ class SamsungTVWSBridge(SamsungTVBridge):
             if result:
                 return result
 
-        return RESULT_NOT_SUCCESSFUL
+        return RESULT_CANNOT_CONNECT
 
     def _send_key(self, key):
         """Send the key using websocket protocol."""
diff --git a/homeassistant/components/samsungtv/config_flow.py b/homeassistant/components/samsungtv/config_flow.py
index 9c18600670c..7a7fa26f922 100644
--- a/homeassistant/components/samsungtv/config_flow.py
+++ b/homeassistant/components/samsungtv/config_flow.py
@@ -31,7 +31,7 @@ from .const import (
     METHOD_LEGACY,
     METHOD_WEBSOCKET,
     RESULT_AUTH_MISSING,
-    RESULT_NOT_SUCCESSFUL,
+    RESULT_CANNOT_CONNECT,
     RESULT_SUCCESS,
 )
 
@@ -87,10 +87,10 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         for method in SUPPORTED_METHODS:
             self._bridge = SamsungTVBridge.get_bridge(method, self._host)
             result = self._bridge.try_connect()
-            if result != RESULT_NOT_SUCCESSFUL:
+            if result != RESULT_CANNOT_CONNECT:
                 return result
         LOGGER.debug("No working config found")
-        return RESULT_NOT_SUCCESSFUL
+        return RESULT_CANNOT_CONNECT
 
     async def async_step_import(self, user_input=None):
         """Handle configuration by yaml file."""
diff --git a/homeassistant/components/samsungtv/const.py b/homeassistant/components/samsungtv/const.py
index c08f07e6379..e043c74b347 100644
--- a/homeassistant/components/samsungtv/const.py
+++ b/homeassistant/components/samsungtv/const.py
@@ -16,7 +16,7 @@ CONF_ON_ACTION = "turn_on_action"
 
 RESULT_AUTH_MISSING = "auth_missing"
 RESULT_SUCCESS = "success"
-RESULT_NOT_SUCCESSFUL = "not_successful"
+RESULT_CANNOT_CONNECT = "cannot_connect"
 RESULT_NOT_SUPPORTED = "not_supported"
 
 METHOD_LEGACY = "legacy"
diff --git a/homeassistant/components/samsungtv/strings.json b/homeassistant/components/samsungtv/strings.json
index e615728776e..b326f2ab548 100644
--- a/homeassistant/components/samsungtv/strings.json
+++ b/homeassistant/components/samsungtv/strings.json
@@ -6,7 +6,7 @@
         "description": "Enter your Samsung TV information. If you never connected Home Assistant before you should see a popup on your TV asking for authorization.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
-          "name": "Name"
+          "name": "[%key:common::config_flow::data::name%]"
         }
       },
       "confirm": {
@@ -15,11 +15,11 @@
       }
     },
     "abort": {
-      "already_in_progress": "Samsung TV configuration is already in progress.",
-      "already_configured": "This Samsung TV is already configured.",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "auth_missing": "Home Assistant is not authorized to connect to this Samsung TV. Please check your TV's settings to authorize Home Assistant.",
-      "not_successful": "Unable to connect to this Samsung TV device.",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "not_supported": "This Samsung TV device is currently not supported."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/samsungtv/translations/ca.json b/homeassistant/components/samsungtv/translations/ca.json
index 5a5fe7e7986..9b0b9a37844 100644
--- a/homeassistant/components/samsungtv/translations/ca.json
+++ b/homeassistant/components/samsungtv/translations/ca.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest televisor Samsung ja configurat.",
-            "already_in_progress": "La configuraci\u00f3 del televisor Samsung ja est\u00e0 en curs.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
             "auth_missing": "Home Assistant no est\u00e0 autenticat per connectar-se amb aquest televisor Samsung. V\u00e9s a la configuraci\u00f3 del televisor per autoritzar a Home Assistant.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "not_successful": "No s'ha pogut connectar amb el dispositiu el televisor Samsung.",
             "not_supported": "Actualment aquest televisor Samsung no \u00e9s compatible."
         },
diff --git a/homeassistant/components/samsungtv/translations/cs.json b/homeassistant/components/samsungtv/translations/cs.json
index d7737722cc3..25675464169 100644
--- a/homeassistant/components/samsungtv/translations/cs.json
+++ b/homeassistant/components/samsungtv/translations/cs.json
@@ -1,10 +1,25 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1",
+            "auth_missing": "Home Assistant nem\u00e1 opr\u00e1vn\u011bn\u00ed k p\u0159ipojen\u00ed k t\u00e9to televizi Samsung. Zkontrolujte nastaven\u00ed sv\u00e9 televize a povolte Home Assistant.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "not_successful": "Nelze se p\u0159ipojit k t\u00e9to televizi Samsung.",
+            "not_supported": "Tato televize Samsung nen\u00ed aktu\u00e1ln\u011b podporov\u00e1na."
+        },
+        "flow_title": "Samsung TV: {model}",
         "step": {
+            "confirm": {
+                "description": "Chcete nastavit televizi Samsung {model} ? Pokud jste Home Assistant doposud nikdy nep\u0159ipojili, m\u011bla by se v\u00e1m na televizi zobrazit \u017e\u00e1dost o povolen\u00ed. Ru\u010dn\u00ed konfigurace pro tuto televizi budou p\u0159eps\u00e1ny.",
+                "title": "Samsung TV"
+            },
             "user": {
                 "data": {
-                    "host": "Hostitel"
-                }
+                    "host": "Hostitel",
+                    "name": "Jm\u00e9no"
+                },
+                "description": "Zadejte informace o televizi Samsung. Pokud jste Home Assistant doposud nikdy nep\u0159ipojili, m\u011bla by se v\u00e1m na televizi zobrazit \u017e\u00e1dost o povolen\u00ed."
             }
         }
     }
diff --git a/homeassistant/components/samsungtv/translations/en.json b/homeassistant/components/samsungtv/translations/en.json
index 35510858c55..ff33876b93a 100644
--- a/homeassistant/components/samsungtv/translations/en.json
+++ b/homeassistant/components/samsungtv/translations/en.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This Samsung TV is already configured.",
-            "already_in_progress": "Samsung TV configuration is already in progress.",
+            "already_configured": "Device is already configured",
+            "already_in_progress": "Configuration flow is already in progress",
             "auth_missing": "Home Assistant is not authorized to connect to this Samsung TV. Please check your TV's settings to authorize Home Assistant.",
+            "cannot_connect": "Failed to connect",
             "not_successful": "Unable to connect to this Samsung TV device.",
             "not_supported": "This Samsung TV device is currently not supported."
         },
diff --git a/homeassistant/components/samsungtv/translations/es.json b/homeassistant/components/samsungtv/translations/es.json
index 308df08de0d..97160de1a1e 100644
--- a/homeassistant/components/samsungtv/translations/es.json
+++ b/homeassistant/components/samsungtv/translations/es.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Este televisor Samsung ya est\u00e1 configurado.",
-            "already_in_progress": "La configuraci\u00f3n del televisor Samsung ya est\u00e1 en marcha.",
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
+            "already_in_progress": "El flujo de configuraci\u00f3n ya est\u00e1 en proceso",
             "auth_missing": "Home Assistant no est\u00e1 autorizado para conectarse a este televisor Samsung. Revisa la configuraci\u00f3n de tu televisor para autorizar a Home Assistant.",
+            "cannot_connect": "No se pudo conectar",
             "not_successful": "No se puede conectar a este dispositivo Samsung TV.",
             "not_supported": "Esta televisi\u00f3n Samsung actualmente no es compatible."
         },
diff --git a/homeassistant/components/samsungtv/translations/et.json b/homeassistant/components/samsungtv/translations/et.json
new file mode 100644
index 00000000000..8d3a14710ce
--- /dev/null
+++ b/homeassistant/components/samsungtv/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas",
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas soovid seadistada Samsung TV-d  {model} ? Kui seda pole kunagi enne Home Assistantiga \u00fchendatud, n\u00e4ed oma teleris h\u00fcpikakent, mis k\u00fcsib tuvastamist. Selle teleri k\u00e4sitsi seadistused kirjutatakse \u00fcle.",
+                "title": ""
+            },
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/samsungtv/translations/it.json b/homeassistant/components/samsungtv/translations/it.json
index 4236b1d8ed8..4abbcce70c0 100644
--- a/homeassistant/components/samsungtv/translations/it.json
+++ b/homeassistant/components/samsungtv/translations/it.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo Samsung TV \u00e8 gi\u00e0 configurato.",
-            "already_in_progress": "La configurazione di Samsung TV \u00e8 gi\u00e0 in corso.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
             "auth_missing": "Home Assistant non \u00e8 autorizzato a connettersi a questo Samsung TV. Controlla le impostazioni del tuo TV per autorizzare Home Assistant.",
+            "cannot_connect": "Impossibile connettersi",
             "not_successful": "Impossibile connettersi a questo dispositivo Samsung TV.",
             "not_supported": "Questo dispositivo Samsung TV non \u00e8 attualmente supportato."
         },
diff --git a/homeassistant/components/samsungtv/translations/lb.json b/homeassistant/components/samsungtv/translations/lb.json
index 2fe31838257..275aa853686 100644
--- a/homeassistant/components/samsungtv/translations/lb.json
+++ b/homeassistant/components/samsungtv/translations/lb.json
@@ -4,6 +4,7 @@
             "already_configured": "D\u00ebs Samsung TV ass scho konfigur\u00e9iert.",
             "already_in_progress": "Konfiguratioun fir d\u00ebs Samsung TV ass schonn am gaang.",
             "auth_missing": "Home Assistant ass net authentifiz\u00e9iert fir sech mat d\u00ebsem Samsung TV ze verbannen. Iwwerpr\u00e9if d'Astellunge vum Fernseh fir Home Assistant z'erlaben.",
+            "cannot_connect": "Feeler beim verbannen",
             "not_successful": "Keng Verbindung mat d\u00ebsem Samsung TV Apparat m\u00e9iglech.",
             "not_supported": "D\u00ebsen Samsung TV Modell g\u00ebtt momentan net \u00ebnnerst\u00ebtzt"
         },
diff --git a/homeassistant/components/samsungtv/translations/nl.json b/homeassistant/components/samsungtv/translations/nl.json
index 17298e3bc8a..cd3a1421969 100644
--- a/homeassistant/components/samsungtv/translations/nl.json
+++ b/homeassistant/components/samsungtv/translations/nl.json
@@ -4,6 +4,7 @@
             "already_configured": "Deze Samsung TV is al geconfigureerd.",
             "already_in_progress": "Samsung TV configuratie is al in uitvoering.",
             "auth_missing": "Home Assistant is niet geautoriseerd om verbinding te maken met deze Samsung TV.",
+            "cannot_connect": "Kan geen verbinding maken",
             "not_successful": "Niet in staat om verbinding te maken met dit Samsung TV toestel.",
             "not_supported": "Deze Samsung TV wordt momenteel niet ondersteund."
         },
diff --git a/homeassistant/components/samsungtv/translations/no.json b/homeassistant/components/samsungtv/translations/no.json
index e0420ba74af..c48dac2561d 100644
--- a/homeassistant/components/samsungtv/translations/no.json
+++ b/homeassistant/components/samsungtv/translations/no.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne Samsung TV-en er allerede konfigurert.",
-            "already_in_progress": "Samsung TV-konfigurasjon p\u00e5g\u00e5r allerede.",
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
             "auth_missing": "Home Assistant er ikke godkjent til \u00e5 koble til denne Samsung-TV. Vennligst kontroller innstillingene for TV-en for \u00e5 godkjenne Home Assistent.",
+            "cannot_connect": "Tilkobling mislyktes",
             "not_successful": "Kan ikke koble til denne Samsung TV-enheten.",
             "not_supported": "Denne Samsung TV-enhetene st\u00f8ttes forel\u00f8pig ikke."
         },
-        "flow_title": "Samsung TV: {model}",
+        "flow_title": "",
         "step": {
             "confirm": {
                 "description": "Vil du sette opp Samsung TV {model} ? Hvis du aldri har koblet til Home Assistant f\u00f8r, vil en popup p\u00e5 TVen be om godkjenning. Manuelle konfigurasjoner for denne TVen vil bli overskrevet.",
@@ -15,7 +16,7 @@
             },
             "user": {
                 "data": {
-                    "host": "Vert ",
+                    "host": "Vert",
                     "name": "Navn"
                 },
                 "description": "Fyll inn Samsung TV-informasjonen din. Hvis du aldri har koblet til Home Assistant f\u00f8r, vil en popup p\u00e5 TVen be om godkjenning."
diff --git a/homeassistant/components/samsungtv/translations/pl.json b/homeassistant/components/samsungtv/translations/pl.json
index 11de0686a33..e5ef0ec792f 100644
--- a/homeassistant/components/samsungtv/translations/pl.json
+++ b/homeassistant/components/samsungtv/translations/pl.json
@@ -1,16 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ten telewizor Samsung jest ju\u017c skonfigurowany.",
-            "already_in_progress": "Konfiguracja telewizora Samsung jest ju\u017c w toku.",
-            "auth_missing": "Home Assistant nie jest uwierzytelniony, aby po\u0142\u0105czy\u0107 si\u0119 z tym telewizorem Samsung.",
-            "not_successful": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 urz\u0105dzeniem Samsung TV.",
-            "not_supported": "Ten telewizor Samsung nie jest obecnie obs\u0142ugiwany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "auth_missing": "Home Assistant nie ma uprawnie\u0144 do po\u0142\u0105czenia si\u0119 z tym telewizorem Samsung. Sprawd\u017a ustawienia telewizora, aby autoryzowa\u0107 Home Assistant.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "not_successful": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 urz\u0105dzeniem Samsung TV",
+            "not_supported": "Ten telewizor Samsung nie jest obecnie obs\u0142ugiwany"
         },
         "flow_title": "Samsung TV: {model}",
         "step": {
             "confirm": {
-                "description": "Czy chcesz skonfigurowa\u0107 telewizor Samsung {model}? Je\u015bli nigdy wcze\u015bniej ten telewizor nie by\u0142 \u0142\u0105czony z Home Assistantem, na jego ekranie powinna pojawi\u0107 si\u0119 pro\u015bba o uwierzytelnienie. R\u0119czne konfiguracje tego telewizora zostan\u0105 zast\u0105pione.",
+                "description": "Czy chcesz skonfigurowa\u0107 telewizor Samsung {model}? Je\u015bli nigdy wcze\u015bniej ten telewizor nie by\u0142 \u0142\u0105czony z Home Assistant, na jego ekranie powinna pojawi\u0107 si\u0119 pro\u015bba o uwierzytelnienie. R\u0119czne konfiguracje tego telewizora zostan\u0105 zast\u0105pione.",
                 "title": "Samsung TV"
             },
             "user": {
@@ -18,7 +19,7 @@
                     "host": "Nazwa hosta lub adres IP",
                     "name": "Nazwa"
                 },
-                "description": "Wprowad\u017a informacje o telewizorze Samsung. Je\u015bli nigdy wcze\u015bniej ten telewizor nie by\u0142 \u0142\u0105czony z Home Assistantem."
+                "description": "Wprowad\u017a informacje o telewizorze Samsung. Je\u015bli nigdy wcze\u015bniej ten telewizor nie by\u0142 \u0142\u0105czony z Home Assistant."
             }
         }
     }
diff --git a/homeassistant/components/samsungtv/translations/ru.json b/homeassistant/components/samsungtv/translations/ru.json
index c5ee5e8348c..8af4f95404c 100644
--- a/homeassistant/components/samsungtv/translations/ru.json
+++ b/homeassistant/components/samsungtv/translations/ru.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
             "auth_missing": "Home Assistant \u043d\u0435 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d \u0434\u043b\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u043a \u044d\u0442\u043e\u043c\u0443 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0442\u0435\u043b\u0435\u0432\u0438\u0437\u043e\u0440\u0430.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "not_successful": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443.",
             "not_supported": "\u042d\u0442\u0430 \u043c\u043e\u0434\u0435\u043b\u044c \u0442\u0435\u043b\u0435\u0432\u0438\u0437\u043e\u0440\u0430 \u0432 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0432\u0440\u0435\u043c\u044f \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f."
         },
diff --git a/homeassistant/components/samsungtv/translations/zh-Hant.json b/homeassistant/components/samsungtv/translations/zh-Hant.json
index 973b84dd2ee..198a4fdb983 100644
--- a/homeassistant/components/samsungtv/translations/zh-Hant.json
+++ b/homeassistant/components/samsungtv/translations/zh-Hant.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u4e09\u661f\u96fb\u8996\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "\u4e09\u661f\u96fb\u8996\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
             "auth_missing": "Home Assistant \u672a\u7372\u5f97\u9a57\u8b49\u4ee5\u9023\u7dda\u81f3\u6b64\u4e09\u661f\u96fb\u8996\u3002\u8acb\u6aa2\u67e5\u60a8\u7684\u96fb\u8996\u8a2d\u5b9a\u4ee5\u76e1\u8208\u9a57\u8b49\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "not_successful": "\u7121\u6cd5\u9023\u7dda\u81f3\u4e09\u661f\u96fb\u8996\u8a2d\u5099\u3002",
             "not_supported": "\u4e0d\u652f\u63f4\u6b64\u6b3e\u4e09\u661f\u96fb\u8996\u3002"
         },
diff --git a/homeassistant/components/satel_integra/__init__.py b/homeassistant/components/satel_integra/__init__.py
index 0b007f63e01..34b5511c394 100644
--- a/homeassistant/components/satel_integra/__init__.py
+++ b/homeassistant/components/satel_integra/__init__.py
@@ -114,10 +114,11 @@ async def async_setup(hass, config):
     if not result:
         return False
 
-    async def _close():
+    @callback
+    def _close(*_):
         controller.close()
 
-    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _close())
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _close)
 
     _LOGGER.debug("Arm home config: %s, mode: %s ", conf, conf.get(CONF_ARM_HOME_MODE))
 
diff --git a/homeassistant/components/satel_integra/binary_sensor.py b/homeassistant/components/satel_integra/binary_sensor.py
index ea9c19376f6..5acc49d1d1b 100644
--- a/homeassistant/components/satel_integra/binary_sensor.py
+++ b/homeassistant/components/satel_integra/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Satel Integra zone states- represented as binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_SMOKE,
     BinarySensorEntity,
@@ -18,8 +16,6 @@ from . import (
     SIGNAL_ZONES_UPDATED,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Satel Integra binary sensor devices."""
diff --git a/homeassistant/components/scene/__init__.py b/homeassistant/components/scene/__init__.py
index f4eee8da836..245d21770ee 100644
--- a/homeassistant/components/scene/__init__.py
+++ b/homeassistant/components/scene/__init__.py
@@ -59,8 +59,9 @@ PLATFORM_SCHEMA = vol.Schema(
 
 async def async_setup(hass, config):
     """Set up the scenes."""
-    logger = logging.getLogger(__name__)
-    component = hass.data[DOMAIN] = EntityComponent(logger, DOMAIN, hass)
+    component = hass.data[DOMAIN] = EntityComponent(
+        logging.getLogger(__name__), DOMAIN, hass
+    )
 
     await component.async_setup(config)
     # Ensure Home Assistant platform always loaded.
diff --git a/homeassistant/components/scrape/sensor.py b/homeassistant/components/scrape/sensor.py
index 3d25e4a34ae..613151511ae 100644
--- a/homeassistant/components/scrape/sensor.py
+++ b/homeassistant/components/scrape/sensor.py
@@ -5,7 +5,7 @@ from bs4 import BeautifulSoup
 from requests.auth import HTTPBasicAuth, HTTPDigestAuth
 import voluptuous as vol
 
-from homeassistant.components.rest.sensor import RestData
+from homeassistant.components.rest.data import RestData
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import (
     CONF_AUTHENTICATION,
@@ -53,7 +53,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 )
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Web scrape sensor."""
     name = config.get(CONF_NAME)
     resource = config.get(CONF_RESOURCE)
@@ -79,12 +79,12 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     else:
         auth = None
     rest = RestData(method, resource, auth, headers, payload, verify_ssl)
-    rest.update()
+    await rest.async_update()
 
     if rest.data is None:
         raise PlatformNotReady
 
-    add_entities(
+    async_add_entities(
         [ScrapeSensor(rest, name, select, attr, index, value_template, unit)], True
     )
 
@@ -118,33 +118,42 @@ class ScrapeSensor(Entity):
         """Return the state of the device."""
         return self._state
 
-    def update(self):
+    def _extract_value(self):
+        """Parse the html extraction in the executor."""
+        raw_data = BeautifulSoup(self.rest.data, "html.parser")
+        _LOGGER.debug(raw_data)
+
+        if self._attr is not None:
+            value = raw_data.select(self._select)[self._index][self._attr]
+        else:
+            tag = raw_data.select(self._select)[self._index]
+            if tag.name in ("style", "script", "template"):
+                value = tag.string
+            else:
+                value = tag.text
+        _LOGGER.debug(value)
+        return value
+
+    async def async_update(self):
         """Get the latest data from the source and updates the state."""
-        self.rest.update()
+        await self.rest.async_update()
         if self.rest.data is None:
             _LOGGER.error("Unable to retrieve data for %s", self.name)
             return
 
-        raw_data = BeautifulSoup(self.rest.data, "html.parser")
-        _LOGGER.debug(raw_data)
-
         try:
-            if self._attr is not None:
-                value = raw_data.select(self._select)[self._index][self._attr]
-            else:
-                tag = raw_data.select(self._select)[self._index]
-                if tag.name in ("style", "script", "template"):
-                    value = tag.string
-                else:
-                    value = tag.text
-            _LOGGER.debug(value)
+            value = await self.hass.async_add_executor_job(self._extract_value)
         except IndexError:
             _LOGGER.error("Unable to extract data from HTML for %s", self.name)
             return
 
         if self._value_template is not None:
-            self._state = self._value_template.render_with_possible_json_value(
+            self._state = self._value_template.async_render_with_possible_json_value(
                 value, None
             )
         else:
             self._state = value
+
+    async def async_will_remove_from_hass(self):
+        """Shutdown the session."""
+        await self.rest.async_remove()
diff --git a/homeassistant/components/script/translations/cs.json b/homeassistant/components/script/translations/cs.json
index b75830afdce..a7224497591 100644
--- a/homeassistant/components/script/translations/cs.json
+++ b/homeassistant/components/script/translations/cs.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed"
+            "off": "Vypnuto",
+            "on": "Zapnuto"
         }
     },
     "title": "Skript"
diff --git a/homeassistant/components/script/translations/pl.json b/homeassistant/components/script/translations/pl.json
index 8982527645e..625b8cf9d92 100644
--- a/homeassistant/components/script/translations/pl.json
+++ b/homeassistant/components/script/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "Skrypt"
diff --git a/homeassistant/components/scsgate/cover.py b/homeassistant/components/scsgate/cover.py
index 0c7d057316c..e5442226d80 100644
--- a/homeassistant/components/scsgate/cover.py
+++ b/homeassistant/components/scsgate/cover.py
@@ -14,8 +14,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import CONF_SCS_ID, DOMAIN, SCSGATE_SCHEMA
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {vol.Required(CONF_DEVICES): cv.schema_with_slug_keys(SCSGATE_SCHEMA)}
 )
diff --git a/homeassistant/components/scsgate/light.py b/homeassistant/components/scsgate/light.py
index c8f5b720c70..949041534a8 100644
--- a/homeassistant/components/scsgate/light.py
+++ b/homeassistant/components/scsgate/light.py
@@ -10,8 +10,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import CONF_SCS_ID, DOMAIN, SCSGATE_SCHEMA
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {vol.Required(CONF_DEVICES): cv.schema_with_slug_keys(SCSGATE_SCHEMA)}
 )
diff --git a/homeassistant/components/season/sensor.py b/homeassistant/components/season/sensor.py
index 6e072f7377e..e116fb0e861 100644
--- a/homeassistant/components/season/sensor.py
+++ b/homeassistant/components/season/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import CONF_NAME, CONF_TYPE
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
-import homeassistant.util.dt as dt_util
+from homeassistant.util.dt import utcnow
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -72,7 +72,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         hemisphere = EQUATOR
 
     _LOGGER.debug(_type)
-    add_entities([Season(hass, hemisphere, _type, name)])
+    add_entities([Season(hass, hemisphere, _type, name)], True)
 
     return True
 
@@ -117,9 +117,9 @@ class Season(Entity):
         self.hass = hass
         self._name = name
         self.hemisphere = hemisphere
-        self.datetime = dt_util.utcnow().replace(tzinfo=None)
+        self.datetime = None
         self.type = season_tracking_type
-        self.season = get_season(self.datetime, self.hemisphere, self.type)
+        self.season = None
 
     @property
     def name(self):
@@ -143,5 +143,5 @@ class Season(Entity):
 
     def update(self):
         """Update season."""
-        self.datetime = dt_util.utcnow().replace(tzinfo=None)
+        self.datetime = utcnow().replace(tzinfo=None)
         self.season = get_season(self.datetime, self.hemisphere, self.type)
diff --git a/homeassistant/components/sense/__init__.py b/homeassistant/components/sense/__init__.py
index 17d0074c836..114c64c390b 100644
--- a/homeassistant/components/sense/__init__.py
+++ b/homeassistant/components/sense/__init__.py
@@ -110,6 +110,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     sense_devices_data = SenseDevicesData()
     try:
         sense_discovered_devices = await gateway.get_discovered_device_data()
+        await gateway.update_realtime()
     except SENSE_TIMEOUT_EXCEPTIONS as err:
         raise ConfigEntryNotReady from err
 
diff --git a/homeassistant/components/sense/manifest.json b/homeassistant/components/sense/manifest.json
index c0c568a8e3d..f0b20f27a55 100644
--- a/homeassistant/components/sense/manifest.json
+++ b/homeassistant/components/sense/manifest.json
@@ -2,7 +2,7 @@
   "domain": "sense",
   "name": "Sense",
   "documentation": "https://www.home-assistant.io/integrations/sense",
-  "requirements": ["sense_energy==0.8.0"],
+  "requirements": ["sense_energy==0.8.1"],
   "codeowners": ["@kbickar"],
   "config_flow": true
 }
diff --git a/homeassistant/components/sense/sensor.py b/homeassistant/components/sense/sensor.py
index 538267aa355..197168f9199 100644
--- a/homeassistant/components/sense/sensor.py
+++ b/homeassistant/components/sense/sensor.py
@@ -1,11 +1,10 @@
 """Support for monitoring a Sense energy sensor."""
-import logging
-
 from homeassistant.const import (
     ATTR_ATTRIBUTION,
     DEVICE_CLASS_POWER,
     ENERGY_KILO_WATT_HOUR,
     POWER_WATT,
+    VOLT,
 )
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -29,8 +28,6 @@ from .const import (
     SENSE_TRENDS_COORDINATOR,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class SensorConfig:
     """Data structure holding sensor configuration."""
@@ -96,6 +93,9 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             )
         )
 
+    for i in range(len(data.active_voltage)):
+        devices.append(SenseVoltageSensor(data, i, sense_monitor_id))
+
     for type_id in TRENDS_SENSOR_TYPES:
         typ = TRENDS_SENSOR_TYPES[type_id]
         for var in SENSOR_VARIANTS:
@@ -204,6 +204,83 @@ class SenseActiveSensor(Entity):
         self.async_write_ha_state()
 
 
+class SenseVoltageSensor(Entity):
+    """Implementation of a Sense energy voltage sensor."""
+
+    def __init__(
+        self,
+        data,
+        index,
+        sense_monitor_id,
+    ):
+        """Initialize the Sense sensor."""
+        line_num = index + 1
+        self._name = f"L{line_num} Voltage"
+        self._unique_id = f"{sense_monitor_id}-L{line_num}"
+        self._available = False
+        self._data = data
+        self._sense_monitor_id = sense_monitor_id
+        self._voltage_index = index
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def available(self):
+        """Return the availability of the sensor."""
+        return self._available
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this entity, if any."""
+        return VOLT
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return {ATTR_ATTRIBUTION: ATTRIBUTION}
+
+    @property
+    def icon(self):
+        """Icon to use in the frontend, if any."""
+        return ICON
+
+    @property
+    def unique_id(self):
+        """Return the unique id."""
+        return self._unique_id
+
+    @property
+    def should_poll(self):
+        """Return the device should not poll for updates."""
+        return False
+
+    async def async_added_to_hass(self):
+        """Register callbacks."""
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                f"{SENSE_DEVICE_UPDATE}-{self._sense_monitor_id}",
+                self._async_update_from_data,
+            )
+        )
+
+    @callback
+    def _async_update_from_data(self):
+        """Update the sensor from the data. Must not do I/O."""
+        self._state = round(self._data.active_voltage[self._voltage_index], 1)
+        self._available = True
+        self.async_write_ha_state()
+
+
 class SenseTrendsSensor(Entity):
     """Implementation of a Sense energy sensor."""
 
diff --git a/homeassistant/components/sense/strings.json b/homeassistant/components/sense/strings.json
index 1363d44d89f..44a45f07ce9 100644
--- a/homeassistant/components/sense/strings.json
+++ b/homeassistant/components/sense/strings.json
@@ -10,12 +10,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect, please try again",
-      "invalid_auth": "Invalid authentication",
-      "unknown": "Unexpected error"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/sense/translations/ca.json b/homeassistant/components/sense/translations/ca.json
index 4b1035607d6..096b4419dae 100644
--- a/homeassistant/components/sense/translations/ca.json
+++ b/homeassistant/components/sense/translations/ca.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
diff --git a/homeassistant/components/sense/translations/cs.json b/homeassistant/components/sense/translations/cs.json
index f019fb3fce6..59984b18992 100644
--- a/homeassistant/components/sense/translations/cs.json
+++ b/homeassistant/components/sense/translations/cs.json
@@ -1,11 +1,20 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "email": "E-mail",
                     "password": "Heslo"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k monitoru energie Sense"
             }
         }
     }
diff --git a/homeassistant/components/sense/translations/en.json b/homeassistant/components/sense/translations/en.json
index 181dadea06c..5582a8424a6 100644
--- a/homeassistant/components/sense/translations/en.json
+++ b/homeassistant/components/sense/translations/en.json
@@ -4,7 +4,7 @@
             "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
diff --git a/homeassistant/components/sense/translations/es.json b/homeassistant/components/sense/translations/es.json
index 1199823081c..5925049a6af 100644
--- a/homeassistant/components/sense/translations/es.json
+++ b/homeassistant/components/sense/translations/es.json
@@ -4,8 +4,8 @@
             "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se ha podido conectar, por favor, int\u00e9ntalo de nuevo.",
-            "invalid_auth": "Autentificaci\u00f3n inv\u00e1lida",
+            "cannot_connect": "No se pudo conectar",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "unknown": "Error inesperado"
         },
         "step": {
diff --git a/homeassistant/components/sense/translations/et.json b/homeassistant/components/sense/translations/et.json
new file mode 100644
index 00000000000..ce3dbf463d0
--- /dev/null
+++ b/homeassistant/components/sense/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sense/translations/it.json b/homeassistant/components/sense/translations/it.json
index 4e1ddd01b42..277e2e1539b 100644
--- a/homeassistant/components/sense/translations/it.json
+++ b/homeassistant/components/sense/translations/it.json
@@ -4,7 +4,7 @@
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare.",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "unknown": "Errore imprevisto"
         },
diff --git a/homeassistant/components/sense/translations/no.json b/homeassistant/components/sense/translations/no.json
index c3457ccb280..7fdf326e868 100644
--- a/homeassistant/components/sense/translations/no.json
+++ b/homeassistant/components/sense/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
diff --git a/homeassistant/components/sense/translations/pl.json b/homeassistant/components/sense/translations/pl.json
index 7cf2ebe4709..b4d8708c38f 100644
--- a/homeassistant/components/sense/translations/pl.json
+++ b/homeassistant/components/sense/translations/pl.json
@@ -4,7 +4,7 @@
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
diff --git a/homeassistant/components/sense/translations/ru.json b/homeassistant/components/sense/translations/ru.json
index 163af6cb512..74be3049a75 100644
--- a/homeassistant/components/sense/translations/ru.json
+++ b/homeassistant/components/sense/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/sense/translations/zh-Hant.json b/homeassistant/components/sense/translations/zh-Hant.json
index e9890263477..356e58f640b 100644
--- a/homeassistant/components/sense/translations/zh-Hant.json
+++ b/homeassistant/components/sense/translations/zh-Hant.json
@@ -4,7 +4,7 @@
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
diff --git a/homeassistant/components/sensehat/light.py b/homeassistant/components/sensehat/light.py
index 5eda783bebf..72a261aabf6 100644
--- a/homeassistant/components/sensehat/light.py
+++ b/homeassistant/components/sensehat/light.py
@@ -1,6 +1,4 @@
 """Support for Sense Hat LEDs."""
-import logging
-
 from sense_hat import SenseHat
 import voluptuous as vol
 
@@ -16,8 +14,6 @@ from homeassistant.const import CONF_NAME
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.color as color_util
 
-_LOGGER = logging.getLogger(__name__)
-
 SUPPORT_SENSEHAT = SUPPORT_BRIGHTNESS | SUPPORT_COLOR
 
 DEFAULT_NAME = "sensehat"
diff --git a/homeassistant/components/sensor/translations/cs.json b/homeassistant/components/sensor/translations/cs.json
index add81cbe07e..ccfb1548f27 100644
--- a/homeassistant/components/sensor/translations/cs.json
+++ b/homeassistant/components/sensor/translations/cs.json
@@ -2,9 +2,12 @@
     "device_automation": {
         "condition_type": {
             "is_battery_level": "Aktu\u00e1ln\u00ed \u00farove\u0148 nabit\u00ed baterie {entity_name}",
+            "is_current": "Aktu\u00e1ln\u00ed proud {entity_name}",
+            "is_energy": "Aktu\u00e1ln\u00ed energie {entity_name}",
             "is_humidity": "Aktu\u00e1ln\u00ed vlhkost {entity_name}",
             "is_illuminance": "Aktu\u00e1ln\u00ed osv\u011btlen\u00ed {entity_name}",
             "is_power": "Aktu\u00e1ln\u00ed v\u00fdkon {entity_name}",
+            "is_power_factor": "Aktu\u00e1ln\u00ed \u00fa\u010din\u00edk {entity_name}",
             "is_pressure": "Aktu\u00e1ln\u00ed tlak {entity_name}",
             "is_signal_strength": "Aktu\u00e1ln\u00ed s\u00edla sign\u00e1lu {entity_name}",
             "is_temperature": "Aktu\u00e1ln\u00ed teplota {entity_name}",
@@ -13,22 +16,25 @@
             "is_voltage": "Aktu\u00e1ln\u00ed nap\u011bt\u00ed {entity_name}"
         },
         "trigger_type": {
-            "battery_level": "\u00farove\u0148 baterie {entity_name} se zm\u011bn\u00ed",
-            "humidity": "vlhkost {entity_name} se zm\u011bn\u00ed",
-            "illuminance": "osv\u011btlen\u00ed {entity_name} se zm\u011bn\u00ed",
-            "power": "el. v\u00fdkon {entity_name} se zm\u011bn\u00ed",
-            "pressure": "tlak {entity_name} se zm\u011bn\u00ed",
-            "signal_strength": "s\u00edla sign\u00e1lu {entity_name} se zm\u011bn\u00ed",
-            "temperature": "teplota {entity_name} se zm\u011bn\u00ed",
-            "timestamp": "\u010dasov\u00e9 raz\u00edtko {entity_name} se zm\u011bn\u00ed",
-            "value": "hodnota {entity_name} se zm\u011bn\u00ed",
+            "battery_level": "P\u0159i zm\u011bn\u011b \u00farovn\u011b baterie {entity_name}",
+            "current": "P\u0159i zm\u011bn\u011b proudu {entity_name}",
+            "energy": "P\u0159i zm\u011bn\u011b energie {entity_name}",
+            "humidity": "P\u0159i zm\u011bn\u011b vlhkosti {entity_name}",
+            "illuminance": "P\u0159i zm\u011bn\u011b osv\u011btlen\u00ed {entity_name}",
+            "power": "P\u0159i zm\u011bn\u011b el. v\u00fdkonu {entity_name}",
+            "power_factor": "P\u0159i zm\u011bn\u011b \u00fa\u010din\u00edku {entity_name}",
+            "pressure": "P\u0159i zm\u011bn\u011b tlaku {entity_name}",
+            "signal_strength": "P\u0159i zm\u011bn\u011b s\u00edly sign\u00e1lu {entity_name}",
+            "temperature": "P\u0159i zm\u011bn\u011b teploty {entity_name}",
+            "timestamp": "P\u0159i zm\u011bn\u011b \u010dasov\u00e9ho raz\u00edtka {entity_name}",
+            "value": "P\u0159i zm\u011bn\u011b hodnoty {entity_name}",
             "voltage": "P\u0159i zm\u011bn\u011b nap\u011bt\u00ed {entity_name}"
         }
     },
     "state": {
         "_": {
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed"
+            "off": "Vypnuto",
+            "on": "Zapnuto"
         }
     },
     "title": "Senzor"
diff --git a/homeassistant/components/sensor/translations/pl.json b/homeassistant/components/sensor/translations/pl.json
index 84c32d8dc9a..aa2d9f4ca11 100644
--- a/homeassistant/components/sensor/translations/pl.json
+++ b/homeassistant/components/sensor/translations/pl.json
@@ -2,31 +2,39 @@
     "device_automation": {
         "condition_type": {
             "is_battery_level": "obecny poziom na\u0142adowania baterii {entity_name}",
+            "is_current": "Bie\u017c\u0105cy pr\u0105d {entity_name}",
+            "is_energy": "Bie\u017c\u0105ca energia {entity_name}",
             "is_humidity": "obecna wilgotno\u015b\u0107 {entity_name}",
             "is_illuminance": "obecne nat\u0119\u017cenie o\u015bwietlenia {entity_name}",
             "is_power": "obecna moc {entity_name}",
+            "is_power_factor": "Bie\u017c\u0105cy wsp\u00f3\u0142czynnik mocy {entity_name}",
             "is_pressure": "obecne ci\u015bnienie {entity_name}",
             "is_signal_strength": "obecna si\u0142a sygna\u0142u {entity_name}",
             "is_temperature": "obecna temperatura {entity_name}",
             "is_timestamp": "obecny znacznik czasu {entity_name}",
-            "is_value": "obecna warto\u015b\u0107 {entity_name}"
+            "is_value": "obecna warto\u015b\u0107 {entity_name}",
+            "is_voltage": "Bie\u017c\u0105ce napi\u0119cie {entity_name}"
         },
         "trigger_type": {
             "battery_level": "zmieni si\u0119 poziom baterii {entity_name}",
+            "current": "zmieni si\u0119 nat\u0119\u017cenie pr\u0105du w {entity_name}",
+            "energy": "zmieni si\u0119 moc pr\u0105du w {entity_name}",
             "humidity": "zmieni si\u0119 wilgotno\u015b\u0107 {entity_name}",
             "illuminance": "zmieni si\u0119 nat\u0119\u017cenie o\u015bwietlenia {entity_name}",
             "power": "zmieni si\u0119 moc {entity_name}",
+            "power_factor": "zmieni si\u0119 wsp\u00f3\u0142czynnik mocy w {entity_name}",
             "pressure": "zmieni si\u0119 ci\u015bnienie {entity_name}",
             "signal_strength": "zmieni si\u0119 si\u0142a sygna\u0142u {entity_name}",
             "temperature": "zmieni si\u0119 temperatura {entity_name}",
             "timestamp": "zmieni si\u0119 znacznik czasu {entity_name}",
-            "value": "zmieni si\u0119 warto\u015b\u0107 {entity_name}"
+            "value": "zmieni si\u0119 warto\u015b\u0107 {entity_name}",
+            "voltage": "zmieni si\u0119 napi\u0119cie w {entity_name}"
         }
     },
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "Sensor"
diff --git a/homeassistant/components/sentry/manifest.json b/homeassistant/components/sentry/manifest.json
index 2bcb38ed168..6a79e2bad5d 100644
--- a/homeassistant/components/sentry/manifest.json
+++ b/homeassistant/components/sentry/manifest.json
@@ -3,6 +3,6 @@
   "name": "Sentry",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/sentry",
-  "requirements": ["sentry-sdk==0.18.0"],
+  "requirements": ["sentry-sdk==0.19.1"],
   "codeowners": ["@dcramer", "@frenck"]
 }
diff --git a/homeassistant/components/sentry/strings.json b/homeassistant/components/sentry/strings.json
index 593a8c5c8d0..71196d52f8d 100644
--- a/homeassistant/components/sentry/strings.json
+++ b/homeassistant/components/sentry/strings.json
@@ -4,10 +4,15 @@
       "user": {
         "title": "Sentry",
         "description": "Enter your Sentry DSN",
-        "data": { "dsn": "DSN" }
+        "data": {
+          "dsn": "DSN"
+        }
       }
     },
-    "error": { "unknown": "Unexpected error", "bad_dsn": "Invalid DSN" },
+    "error": {
+      "unknown": "[%key:common::config_flow::error::unknown%]",
+      "bad_dsn": "Invalid DSN"
+    },
     "abort": {
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
diff --git a/homeassistant/components/sentry/translations/cs.json b/homeassistant/components/sentry/translations/cs.json
index 81105c211fd..0906281270c 100644
--- a/homeassistant/components/sentry/translations/cs.json
+++ b/homeassistant/components/sentry/translations/cs.json
@@ -1,9 +1,29 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Sentry je ji\u017e nastaveno",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "bad_dsn": "Neplatn\u00e9 DSN",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "dsn": "DSN"
+                },
+                "description": "Zadejte sv\u00e9 Sentry DSN",
+                "title": "Sentry"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "environment": "Voliteln\u00e9 jm\u00e9no prost\u0159ed\u00ed.",
+                    "tracing": "Povolit sledov\u00e1n\u00ed v\u00fdkonu"
                 }
             }
         }
diff --git a/homeassistant/components/sentry/translations/el.json b/homeassistant/components/sentry/translations/el.json
new file mode 100644
index 00000000000..a1c27233094
--- /dev/null
+++ b/homeassistant/components/sentry/translations/el.json
@@ -0,0 +1,16 @@
+{
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "event_handled": "\u03a3\u03c4\u03b5\u03af\u03bb\u03c4\u03b5 \u03c7\u03b5\u03b9\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03b1 \u03c3\u03c5\u03bc\u03b2\u03ac\u03bd\u03c4\u03b1",
+                    "event_third_party_packages": "\u03a3\u03c4\u03b5\u03af\u03bb\u03c4\u03b5 \u03b5\u03ba\u03b4\u03b7\u03bb\u03ce\u03c3\u03b5\u03b9\u03c2 \u03b1\u03c0\u03cc \u03c0\u03b1\u03ba\u03ad\u03c4\u03b1 \u03c4\u03c1\u03af\u03c4\u03c9\u03bd",
+                    "logging_event_level": "\u03a4\u03bf \u03b5\u03c0\u03af\u03c0\u03b5\u03b4\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2 Sentry \u03b8\u03b1 \u03ba\u03b1\u03c4\u03b1\u03c7\u03c9\u03c1\u03ae\u03c3\u03b5\u03b9 \u03ad\u03bd\u03b1 \u03c3\u03c5\u03bc\u03b2\u03ac\u03bd \u03b3\u03b9\u03b1",
+                    "logging_level": "\u03a4\u03bf \u03b5\u03c0\u03af\u03c0\u03b5\u03b4\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2 Sentry \u03b8\u03b1 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03ac\u03c6\u03b5\u03b9 \u03b1\u03c1\u03c7\u03b5\u03af\u03b1 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2 \u03c9\u03c2 \u03b4\u03b9\u03b1\u03ba\u03c1\u03b9\u03c4\u03b9\u03ba\u03ac \u03b3\u03b9\u03b1",
+                    "tracing": "\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b1\u03bd\u03af\u03c7\u03bd\u03b5\u03c5\u03c3\u03b7\u03c2 \u03b5\u03c0\u03b9\u03b4\u03cc\u03c3\u03b5\u03c9\u03bd",
+                    "tracing_sample_rate": "\u03a1\u03c5\u03b8\u03bc\u03cc\u03c2 \u03b1\u03bd\u03af\u03c7\u03bd\u03b5\u03c5\u03c3\u03b7\u03c2 \u03b4\u03b5\u03af\u03b3\u03bc\u03b1\u03c4\u03bf\u03c2. \u03bc\u03b5\u03c4\u03b1\u03be\u03cd 0,0 \u03ba\u03b1\u03b9 1,0 (1,0 = 100%)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sentry/translations/et.json b/homeassistant/components/sentry/translations/et.json
new file mode 100644
index 00000000000..ac75dd8fb6d
--- /dev/null
+++ b/homeassistant/components/sentry/translations/et.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Sentry on juba h\u00e4\u00e4lestatud",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "user": {
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sentry/translations/nl.json b/homeassistant/components/sentry/translations/nl.json
index a3aae138232..779c62dca22 100644
--- a/homeassistant/components/sentry/translations/nl.json
+++ b/homeassistant/components/sentry/translations/nl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Sentry is al geconfigureerd"
+            "already_configured": "Sentry is al geconfigureerd",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "error": {
             "bad_dsn": "Ongeldige DSN",
diff --git a/homeassistant/components/sentry/translations/pl.json b/homeassistant/components/sentry/translations/pl.json
index 00206d3e88b..7c82528efb6 100644
--- a/homeassistant/components/sentry/translations/pl.json
+++ b/homeassistant/components/sentry/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Sentry jest ju\u017c skonfigurowane.",
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana",
             "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
@@ -10,9 +10,28 @@
         },
         "step": {
             "user": {
+                "data": {
+                    "dsn": "DSN"
+                },
                 "description": "Wprowad\u017a DSN Sentry",
                 "title": "Sentry"
             }
         }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "environment": "Opcjonalna nazwa \u015brodowiska.",
+                    "event_custom_components": "Wysy\u0142aj zdarzenia z niestandardowych komponent\u00f3w",
+                    "event_handled": "Wysy\u0142aj obs\u0142u\u017cone zdarzenia",
+                    "event_third_party_packages": "Wysy\u0142aj zdarzenia z zewn\u0119trznych pakiet\u00f3w Pythona (spoza HA)",
+                    "logging_event_level": "Poziom wpis\u00f3w dziennika, dla kt\u00f3rego Sentry zarejestruje zdarzenie",
+                    "logging_level": "Poziom wpis\u00f3w dziennika, dla kt\u00f3rego Sentry zapisze poprzedzaj\u0105ce wpisy (breadcrumbs)",
+                    "tracing": "W\u0142\u0105cz \u015bledzenie wydajno\u015bci",
+                    "tracing_sample_rate": "Cz\u0119stotliwo\u015b\u0107 \u015bledzenia; od 0.0 do 1.0 (1.0 = 100%)"
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/sesame/lock.py b/homeassistant/components/sesame/lock.py
index a2d205de240..0ad3d87a171 100644
--- a/homeassistant/components/sesame/lock.py
+++ b/homeassistant/components/sesame/lock.py
@@ -88,8 +88,8 @@ class SesameDevice(LockEntity):
     @property
     def device_state_attributes(self) -> dict:
         """Return the state attributes."""
-        attributes = {}
-        attributes[ATTR_DEVICE_ID] = self._device_id
-        attributes[ATTR_SERIAL_NO] = self._serial
-        attributes[ATTR_BATTERY_LEVEL] = self._battery
-        return attributes
+        return {
+            ATTR_DEVICE_ID: self._device_id,
+            ATTR_SERIAL_NO: self._serial,
+            ATTR_BATTERY_LEVEL: self._battery,
+        }
diff --git a/homeassistant/components/seventeentrack/sensor.py b/homeassistant/components/seventeentrack/sensor.py
index 42b198d48d9..7abed897346 100644
--- a/homeassistant/components/seventeentrack/sensor.py
+++ b/homeassistant/components/seventeentrack/sensor.py
@@ -16,6 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.event import async_call_later
 from homeassistant.util import Throttle, slugify
 
 _LOGGER = logging.getLogger(__name__)
@@ -220,7 +221,8 @@ class SeventeenTrackPackageSensor(Entity):
         await self._data.async_update()
 
         if not self.available:
-            self.hass.async_create_task(self._remove())
+            # Entity cannot be removed while its being added
+            async_call_later(self.hass, 1, self._remove)
             return
 
         package = self._data.packages.get(self._tracking_number, None)
@@ -229,7 +231,8 @@ class SeventeenTrackPackageSensor(Entity):
         # delivered, post a notification:
         if package.status == VALUE_DELIVERED and not self._data.show_delivered:
             self._notify_delivered()
-            self.hass.async_create_task(self._remove())
+            # Entity cannot be removed while its being added
+            async_call_later(self.hass, 1, self._remove)
             return
 
         self._attrs.update(
@@ -238,7 +241,7 @@ class SeventeenTrackPackageSensor(Entity):
         self._state = package.status
         self._friendly_name = package.friendly_name
 
-    async def _remove(self):
+    async def _remove(self, *_):
         """Remove entity itself."""
         await self.async_remove()
 
diff --git a/homeassistant/components/sharkiq/__init__.py b/homeassistant/components/sharkiq/__init__.py
index 968ee91f8d6..b7684f98855 100644
--- a/homeassistant/components/sharkiq/__init__.py
+++ b/homeassistant/components/sharkiq/__init__.py
@@ -14,7 +14,7 @@ from sharkiqpy import (
 from homeassistant import exceptions
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 
-from .const import API_TIMEOUT, COMPONENTS, DOMAIN, LOGGER
+from .const import _LOGGER, API_TIMEOUT, COMPONENTS, DOMAIN
 from .update_coordinator import SharkIqUpdateCoordinator
 
 
@@ -32,13 +32,13 @@ async def async_connect_or_timeout(ayla_api: AylaApi) -> bool:
     """Connect to vacuum."""
     try:
         with async_timeout.timeout(API_TIMEOUT):
-            LOGGER.debug("Initialize connection to Ayla networks API")
+            _LOGGER.debug("Initialize connection to Ayla networks API")
             await ayla_api.async_sign_in()
     except SharkIqAuthError:
-        LOGGER.error("Authentication error connecting to Shark IQ api")
+        _LOGGER.error("Authentication error connecting to Shark IQ api")
         return False
     except asyncio.TimeoutError as exc:
-        LOGGER.error("Timeout expired")
+        _LOGGER.error("Timeout expired")
         raise CannotConnect from exc
 
     return True
@@ -60,7 +60,7 @@ async def async_setup_entry(hass, config_entry):
 
     shark_vacs = await ayla_api.async_get_devices(False)
     device_names = ", ".join([d.name for d in shark_vacs])
-    LOGGER.debug("Found %d Shark IQ device(s): %s", len(shark_vacs), device_names)
+    _LOGGER.debug("Found %d Shark IQ device(s): %s", len(shark_vacs), device_names)
     coordinator = SharkIqUpdateCoordinator(hass, config_entry, ayla_api, shark_vacs)
 
     await coordinator.async_refresh()
@@ -80,7 +80,7 @@ async def async_setup_entry(hass, config_entry):
 
 async def async_disconnect_or_timeout(coordinator: SharkIqUpdateCoordinator):
     """Disconnect to vacuum."""
-    LOGGER.debug("Disconnecting from Ayla Api")
+    _LOGGER.debug("Disconnecting from Ayla Api")
     with async_timeout.timeout(5):
         try:
             await coordinator.ayla_api.async_sign_out()
diff --git a/homeassistant/components/sharkiq/config_flow.py b/homeassistant/components/sharkiq/config_flow.py
index 4b2e54d3e38..9d2e80b8ec6 100644
--- a/homeassistant/components/sharkiq/config_flow.py
+++ b/homeassistant/components/sharkiq/config_flow.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 from homeassistant import config_entries, core, exceptions
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 
-from .const import DOMAIN, LOGGER  # pylint:disable=unused-import
+from .const import _LOGGER, DOMAIN  # pylint:disable=unused-import
 
 SHARKIQ_SCHEMA = vol.Schema(
     {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
@@ -28,7 +28,7 @@ async def validate_input(hass: core.HomeAssistant, data):
 
     try:
         with async_timeout.timeout(10):
-            LOGGER.debug("Initialize connection to Ayla networks API")
+            _LOGGER.debug("Initialize connection to Ayla networks API")
             await ayla_api.async_sign_in()
     except (asyncio.TimeoutError, aiohttp.ClientError) as errors:
         raise CannotConnect from errors
@@ -58,7 +58,7 @@ class SharkIqConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         except InvalidAuth:
             errors["base"] = "invalid_auth"
         except Exception:  # pylint: disable=broad-except
-            LOGGER.exception("Unexpected exception")
+            _LOGGER.exception("Unexpected exception")
             errors["base"] = "unknown"
         return info, errors
 
diff --git a/homeassistant/components/sharkiq/const.py b/homeassistant/components/sharkiq/const.py
index 9160fc710a2..e0feb306f77 100644
--- a/homeassistant/components/sharkiq/const.py
+++ b/homeassistant/components/sharkiq/const.py
@@ -1,11 +1,11 @@
 """Shark IQ Constants."""
-
 from datetime import timedelta
 import logging
 
+_LOGGER = logging.getLogger(__package__)
+
 API_TIMEOUT = 20
 COMPONENTS = ["vacuum"]
 DOMAIN = "sharkiq"
-LOGGER = logging.getLogger(__package__)
 SHARK = "Shark"
 UPDATE_INTERVAL = timedelta(seconds=30)
diff --git a/homeassistant/components/sharkiq/strings.json b/homeassistant/components/sharkiq/strings.json
index 114087697ad..bc920ac7c7e 100644
--- a/homeassistant/components/sharkiq/strings.json
+++ b/homeassistant/components/sharkiq/strings.json
@@ -20,9 +20,9 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured_account": "[%key:common::config_flow::abort::already_configured_account%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "reauth_successful": "[%key:common::config_flow::data::access_token%] updated successfully",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
   }
diff --git a/homeassistant/components/sharkiq/translations/ca.json b/homeassistant/components/sharkiq/translations/ca.json
index b6e98056863..d707ebded59 100644
--- a/homeassistant/components/sharkiq/translations/ca.json
+++ b/homeassistant/components/sharkiq/translations/ca.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
+            "already_configured": "El compte ja ha estat configurat",
             "already_configured_account": "El compte ja ha estat configurat",
             "cannot_connect": "Ha fallat la connexi\u00f3",
-            "reauth_successful": "Token d'acc\u00e9s actualitzat correctament",
+            "reauth_successful": "Re-autenticaci\u00f3 realitzada correctament",
             "unknown": "Error inesperat"
         },
         "error": {
diff --git a/homeassistant/components/sharkiq/translations/cs.json b/homeassistant/components/sharkiq/translations/cs.json
new file mode 100644
index 00000000000..0d01e11bc6b
--- /dev/null
+++ b/homeassistant/components/sharkiq/translations/cs.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "already_configured_account": "\u00da\u010det je ji\u017e nastaven",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "reauth": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            },
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sharkiq/translations/el.json b/homeassistant/components/sharkiq/translations/el.json
new file mode 100644
index 00000000000..4c677795525
--- /dev/null
+++ b/homeassistant/components/sharkiq/translations/el.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "unknown": "\u039c\u03b7 \u03b1\u03bd\u03b1\u03bc\u03b5\u03bd\u03cc\u03bc\u03b5\u03bd\u03bf \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1"
+        },
+        "step": {
+            "reauth": {
+                "data": {
+                    "password": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sharkiq/translations/en.json b/homeassistant/components/sharkiq/translations/en.json
index d305eaf07e8..3f663270dc4 100644
--- a/homeassistant/components/sharkiq/translations/en.json
+++ b/homeassistant/components/sharkiq/translations/en.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Account is already configured",
             "already_configured_account": "Account is already configured",
             "cannot_connect": "Failed to connect",
-            "reauth_successful": "Access Token updated successfully",
+            "reauth_successful": "Re-authentication was successful",
             "unknown": "Unexpected error"
         },
         "error": {
diff --git a/homeassistant/components/sharkiq/translations/es.json b/homeassistant/components/sharkiq/translations/es.json
index a6f70700806..2bf2e2baf5b 100644
--- a/homeassistant/components/sharkiq/translations/es.json
+++ b/homeassistant/components/sharkiq/translations/es.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_configured_account": "La cuenta ya ha sido configurada",
             "cannot_connect": "No se pudo conectar",
-            "reauth_successful": "Token de acceso actualizado correctamente",
+            "reauth_successful": "La reautenticaci\u00f3n se realiz\u00f3 correctamente",
             "unknown": "Error inesperado"
         },
         "error": {
diff --git a/homeassistant/components/sharkiq/translations/et.json b/homeassistant/components/sharkiq/translations/et.json
index ff5b447a315..5eb8926aa80 100644
--- a/homeassistant/components/sharkiq/translations/et.json
+++ b/homeassistant/components/sharkiq/translations/et.json
@@ -1,11 +1,29 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud",
+            "already_configured_account": "Konto on juba seadistatud",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "reauth_successful": "Taastuvastus oli edukas",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
         "step": {
             "reauth": {
                 "data": {
                     "password": "Salas\u00f5na",
                     "username": "Kasutajanimi"
                 }
+            },
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
             }
         }
     }
diff --git a/homeassistant/components/sharkiq/translations/it.json b/homeassistant/components/sharkiq/translations/it.json
index 8cd3a16bb1c..cb2b85e4d3e 100644
--- a/homeassistant/components/sharkiq/translations/it.json
+++ b/homeassistant/components/sharkiq/translations/it.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_configured_account": "L'account \u00e8 gi\u00e0 configurato",
             "cannot_connect": "Impossibile connettersi",
-            "reauth_successful": "Token di accesso aggiornato correttamente",
+            "reauth_successful": "La riautenticazione ha avuto successo",
             "unknown": "Errore imprevisto"
         },
         "error": {
diff --git a/homeassistant/components/sharkiq/translations/lb.json b/homeassistant/components/sharkiq/translations/lb.json
index b9984968cbf..1da09e6b8ec 100644
--- a/homeassistant/components/sharkiq/translations/lb.json
+++ b/homeassistant/components/sharkiq/translations/lb.json
@@ -17,7 +17,8 @@
             },
             "user": {
                 "data": {
-                    "password": "Passwuert"
+                    "password": "Passwuert",
+                    "username": "Benotzernumm"
                 }
             }
         }
diff --git a/homeassistant/components/sharkiq/translations/nl.json b/homeassistant/components/sharkiq/translations/nl.json
index 03605190c3c..36d65ba63fc 100644
--- a/homeassistant/components/sharkiq/translations/nl.json
+++ b/homeassistant/components/sharkiq/translations/nl.json
@@ -1,5 +1,12 @@
 {
     "config": {
+        "abort": {
+            "already_configured_account": "Account is al geconfigureerd",
+            "cannot_connect": "Kan geen verbinding maken"
+        },
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken"
+        },
         "step": {
             "reauth": {
                 "data": {
@@ -9,6 +16,7 @@
             },
             "user": {
                 "data": {
+                    "password": "Wachtwoord",
                     "username": "Gebruikersnaam"
                 }
             }
diff --git a/homeassistant/components/sharkiq/translations/no.json b/homeassistant/components/sharkiq/translations/no.json
index 80673ea381b..32facb073d5 100644
--- a/homeassistant/components/sharkiq/translations/no.json
+++ b/homeassistant/components/sharkiq/translations/no.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Kontoen er allerede konfigurert",
             "already_configured_account": "Kontoen er allerede konfigurert",
-            "cannot_connect": "Tilkobling mislyktes.",
-            "reauth_successful": "Tilgangstoken oppdatert vellykket",
+            "cannot_connect": "Tilkobling mislyktes",
+            "reauth_successful": "Reautentisering var vellykket",
             "unknown": "Uventet feil"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
diff --git a/homeassistant/components/sharkiq/translations/pl.json b/homeassistant/components/sharkiq/translations/pl.json
index 283e2c4f440..46b8a54d540 100644
--- a/homeassistant/components/sharkiq/translations/pl.json
+++ b/homeassistant/components/sharkiq/translations/pl.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Konto jest ju\u017c skonfigurowane",
             "already_configured_account": "Konto jest ju\u017c skonfigurowane",
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "reauth_successful": "Token dost\u0119pu zosta\u0142 pomy\u015blnie zaktualizowany",
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
diff --git a/homeassistant/components/sharkiq/translations/ru.json b/homeassistant/components/sharkiq/translations/ru.json
index 3bbdbc5ac58..8d0d11b7ffa 100644
--- a/homeassistant/components/sharkiq/translations/ru.json
+++ b/homeassistant/components/sharkiq/translations/ru.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "already_configured_account": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
-            "reauth_successful": "\u0422\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d.",
+            "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "error": {
diff --git a/homeassistant/components/sharkiq/translations/zh-Hans.json b/homeassistant/components/sharkiq/translations/zh-Hans.json
new file mode 100644
index 00000000000..7a170396cae
--- /dev/null
+++ b/homeassistant/components/sharkiq/translations/zh-Hans.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "step": {
+            "reauth": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            },
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sharkiq/translations/zh-Hant.json b/homeassistant/components/sharkiq/translations/zh-Hant.json
index 1cb63fe1313..09aa01b73ec 100644
--- a/homeassistant/components/sharkiq/translations/zh-Hant.json
+++ b/homeassistant/components/sharkiq/translations/zh-Hant.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "already_configured_account": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "cannot_connect": "\u9023\u7dda\u5931\u6557",
-            "reauth_successful": "\u5b58\u53d6\u5bc6\u9470\u5df2\u6210\u529f\u66f4\u65b0",
+            "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "error": {
diff --git a/homeassistant/components/sharkiq/update_coordinator.py b/homeassistant/components/sharkiq/update_coordinator.py
index 2b3f6070f3a..0651d0765cf 100644
--- a/homeassistant/components/sharkiq/update_coordinator.py
+++ b/homeassistant/components/sharkiq/update_coordinator.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import API_TIMEOUT, DOMAIN, LOGGER, UPDATE_INTERVAL
+from .const import _LOGGER, API_TIMEOUT, DOMAIN, UPDATE_INTERVAL
 
 
 class SharkIqUpdateCoordinator(DataUpdateCoordinator):
@@ -37,7 +37,7 @@ class SharkIqUpdateCoordinator(DataUpdateCoordinator):
         self._config_entry = config_entry
         self._online_dsns = set()
 
-        super().__init__(hass, LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=UPDATE_INTERVAL)
 
     @property
     def online_dsns(self) -> Set[str]:
@@ -52,7 +52,7 @@ class SharkIqUpdateCoordinator(DataUpdateCoordinator):
     async def _async_update_vacuum(sharkiq: SharkIqVacuum) -> None:
         """Asynchronously update the data for a single vacuum."""
         dsn = sharkiq.serial_number
-        LOGGER.debug("Updating sharkiq data for device DSN %s", dsn)
+        _LOGGER.debug("Updating sharkiq data for device DSN %s", dsn)
         with timeout(API_TIMEOUT):
             await sharkiq.async_update()
 
@@ -66,7 +66,7 @@ class SharkIqUpdateCoordinator(DataUpdateCoordinator):
                 if v["connection_status"] == "Online" and v["dsn"] in self.shark_vacs
             }
 
-            LOGGER.debug("Updating sharkiq data")
+            _LOGGER.debug("Updating sharkiq data")
             online_vacs = (self.shark_vacs[dsn] for dsn in self.online_dsns)
             await asyncio.gather(*[self._async_update_vacuum(v) for v in online_vacs])
         except (
@@ -74,7 +74,7 @@ class SharkIqUpdateCoordinator(DataUpdateCoordinator):
             SharkIqNotAuthedError,
             SharkIqAuthExpiringError,
         ) as err:
-            LOGGER.exception("Bad auth state")
+            _LOGGER.exception("Bad auth state")
             flow_context = {
                 "source": "reauth",
                 "unique_id": self._config_entry.unique_id,
@@ -97,7 +97,7 @@ class SharkIqUpdateCoordinator(DataUpdateCoordinator):
 
             raise UpdateFailed(err) from err
         except Exception as err:  # pylint: disable=broad-except
-            LOGGER.exception("Unexpected error updating SharkIQ")
+            _LOGGER.exception("Unexpected error updating SharkIQ")
             raise UpdateFailed(err) from err
 
         return True
diff --git a/homeassistant/components/sharkiq/vacuum.py b/homeassistant/components/sharkiq/vacuum.py
index 96e4d98f318..9684dde45e6 100644
--- a/homeassistant/components/sharkiq/vacuum.py
+++ b/homeassistant/components/sharkiq/vacuum.py
@@ -28,7 +28,7 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from .const import DOMAIN, SHARK
 from .update_coordinator import SharkIqUpdateCoordinator
 
-LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(__name__)
 
 # Supported features
 SUPPORT_SHARKIQ = (
@@ -71,7 +71,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     coordinator: SharkIqUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
     devices: Iterable["SharkIqVacuum"] = coordinator.shark_vacs.values()
     device_names = [d.name for d in devices]
-    LOGGER.debug(
+    _LOGGER.debug(
         "Found %d Shark IQ device(s): %s",
         len(device_names),
         ", ".join([d.name for d in devices]),
diff --git a/homeassistant/components/shell_command/__init__.py b/homeassistant/components/shell_command/__init__.py
index bce980035dc..0d221cb6b0b 100644
--- a/homeassistant/components/shell_command/__init__.py
+++ b/homeassistant/components/shell_command/__init__.py
@@ -45,7 +45,9 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
 
         if args_compiled:
             try:
-                rendered_args = args_compiled.async_render(service.data)
+                rendered_args = args_compiled.async_render(
+                    variables=service.data, parse_result=False
+                )
             except TemplateError as ex:
                 _LOGGER.exception("Error rendering command template: %s", ex)
                 return
diff --git a/homeassistant/components/shelly/__init__.py b/homeassistant/components/shelly/__init__.py
index c63858f0652..628ee5a53cc 100644
--- a/homeassistant/components/shelly/__init__.py
+++ b/homeassistant/components/shelly/__init__.py
@@ -3,7 +3,7 @@ import asyncio
 from datetime import timedelta
 import logging
 
-from aiocoap import error as aiocoap_error
+import aiocoap
 import aioshelly
 import async_timeout
 
@@ -18,7 +18,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client, device_registry, update_coordinator
 
-from .const import DOMAIN
+from .const import COAP_CONTEXT, DATA_CONFIG_ENTRY, DOMAIN
 
 PLATFORMS = ["binary_sensor", "cover", "light", "sensor", "switch"]
 _LOGGER = logging.getLogger(__name__)
@@ -26,7 +26,15 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup(hass: HomeAssistant, config: dict):
     """Set up the Shelly component."""
-    hass.data[DOMAIN] = {}
+    hass.data[DOMAIN] = {DATA_CONFIG_ENTRY: {}}
+    hass.data[DOMAIN][COAP_CONTEXT] = await aiocoap.Context.create_client_context()
+
+    async def shutdown_listener(*_):
+        """Home Assistant shutdown listener."""
+        await hass.data[DOMAIN][COAP_CONTEXT].shutdown()
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, shutdown_listener)
+
     return True
 
 
@@ -39,18 +47,22 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
         entry.data.get(CONF_PASSWORD),
         temperature_unit,
     )
+
+    coap_context = hass.data[DOMAIN][COAP_CONTEXT]
+
     try:
         async with async_timeout.timeout(10):
             device = await aioshelly.Device.create(
                 aiohttp_client.async_get_clientsession(hass),
+                coap_context,
                 options,
             )
     except (asyncio.TimeoutError, OSError) as err:
         raise ConfigEntryNotReady from err
 
-    wrapper = hass.data[DOMAIN][entry.entry_id] = ShellyDeviceWrapper(
-        hass, entry, device
-    )
+    wrapper = hass.data[DOMAIN][DATA_CONFIG_ENTRY][
+        entry.entry_id
+    ] = ShellyDeviceWrapper(hass, entry, device)
     await wrapper.async_setup()
 
     for component in PLATFORMS:
@@ -75,18 +87,14 @@ class ShellyDeviceWrapper(update_coordinator.DataUpdateCoordinator):
         self.hass = hass
         self.entry = entry
         self.device = device
-        self._unsub_stop = None
 
     async def _async_update_data(self):
         """Fetch data."""
-        # Race condition on shutdown. Stop all the fetches.
-        if self._unsub_stop is None:
-            return None
 
         try:
             async with async_timeout.timeout(5):
                 return await self.device.update()
-        except (aiocoap_error.Error, OSError) as err:
+        except (aiocoap.error.Error, OSError) as err:
             raise update_coordinator.UpdateFailed("Error fetching data") from err
 
     @property
@@ -101,9 +109,6 @@ class ShellyDeviceWrapper(update_coordinator.DataUpdateCoordinator):
 
     async def async_setup(self):
         """Set up the wrapper."""
-        self._unsub_stop = self.hass.bus.async_listen(
-            EVENT_HOMEASSISTANT_STOP, self._handle_ha_stop
-        )
         dev_reg = await device_registry.async_get_registry(self.hass)
         model_type = self.device.settings["device"]["type"]
         dev_reg.async_get_or_create(
@@ -117,18 +122,6 @@ class ShellyDeviceWrapper(update_coordinator.DataUpdateCoordinator):
             sw_version=self.device.settings["fw"],
         )
 
-    async def shutdown(self):
-        """Shutdown the device wrapper."""
-        if self._unsub_stop:
-            self._unsub_stop()
-            self._unsub_stop = None
-        await self.device.shutdown()
-
-    async def _handle_ha_stop(self, _):
-        """Handle Home Assistant stopping."""
-        self._unsub_stop = None
-        await self.shutdown()
-
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
     """Unload a config entry."""
@@ -141,6 +134,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
         )
     )
     if unload_ok:
-        await hass.data[DOMAIN].pop(entry.entry_id).shutdown()
+        hass.data[DOMAIN][DATA_CONFIG_ENTRY].pop(entry.entry_id)
 
     return unload_ok
diff --git a/homeassistant/components/shelly/config_flow.py b/homeassistant/components/shelly/config_flow.py
index b13c4090a10..9076d5b7338 100644
--- a/homeassistant/components/shelly/config_flow.py
+++ b/homeassistant/components/shelly/config_flow.py
@@ -2,6 +2,7 @@
 import asyncio
 import logging
 
+import aiocoap
 import aiohttp
 import aioshelly
 import async_timeout
@@ -25,6 +26,12 @@ HOST_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str})
 HTTP_CONNECT_ERRORS = (asyncio.TimeoutError, aiohttp.ClientError)
 
 
+def _remove_prefix(shelly_str):
+    if shelly_str.startswith("shellyswitch"):
+        return shelly_str[6:]
+    return shelly_str
+
+
 async def validate_input(hass: core.HomeAssistant, host, data):
     """Validate the user input allows us to connect.
 
@@ -33,16 +40,21 @@ async def validate_input(hass: core.HomeAssistant, host, data):
     options = aioshelly.ConnectionOptions(
         host, data.get(CONF_USERNAME), data.get(CONF_PASSWORD)
     )
+    coap_context = await aiocoap.Context.create_client_context()
     async with async_timeout.timeout(5):
         device = await aioshelly.Device.create(
             aiohttp_client.async_get_clientsession(hass),
+            coap_context,
             options,
         )
 
-    await device.shutdown()
+    await coap_context.shutdown()
 
     # Return info that you want to store in the config entry.
-    return {"title": device.settings["name"], "mac": device.settings["device"]["mac"]}
+    return {
+        "title": device.settings["name"],
+        "hostname": device.settings["device"]["hostname"],
+    }
 
 
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@@ -83,7 +95,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                     errors["base"] = "unknown"
                 else:
                     return self.async_create_entry(
-                        title=device_info["title"] or self.host,
+                        title=device_info["title"] or device_info["hostname"],
                         data=user_input,
                     )
 
@@ -109,7 +121,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 errors["base"] = "unknown"
             else:
                 return self.async_create_entry(
-                    title=device_info["title"] or self.host,
+                    title=device_info["title"] or device_info["hostname"],
                     data={**user_input, CONF_HOST: self.host},
                 )
         else:
@@ -142,7 +154,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         self._abort_if_unique_id_configured({CONF_HOST: zeroconf_info["host"]})
         self.host = zeroconf_info["host"]
         # pylint: disable=no-member # https://github.com/PyCQA/pylint/issues/3167
-        self.context["title_placeholders"] = {"name": zeroconf_info["host"]}
+        self.context["title_placeholders"] = {
+            "name": _remove_prefix(zeroconf_info["properties"]["id"])
+        }
         return await self.async_step_confirm_discovery()
 
     async def async_step_confirm_discovery(self, user_input=None):
@@ -161,7 +175,8 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 errors["base"] = "unknown"
             else:
                 return self.async_create_entry(
-                    title=device_info["title"] or self.host, data={"host": self.host}
+                    title=device_info["title"] or device_info["hostname"],
+                    data={"host": self.host},
                 )
 
         return self.async_show_form(
diff --git a/homeassistant/components/shelly/const.py b/homeassistant/components/shelly/const.py
index 5c9a55915fe..b40ada04b30 100644
--- a/homeassistant/components/shelly/const.py
+++ b/homeassistant/components/shelly/const.py
@@ -1,3 +1,5 @@
 """Constants for the Shelly integration."""
 
+COAP_CONTEXT = "coap_context"
+DATA_CONFIG_ENTRY = "config_entry"
 DOMAIN = "shelly"
diff --git a/homeassistant/components/shelly/cover.py b/homeassistant/components/shelly/cover.py
index ec1933ba420..a65ab5a05af 100644
--- a/homeassistant/components/shelly/cover.py
+++ b/homeassistant/components/shelly/cover.py
@@ -12,13 +12,13 @@ from homeassistant.components.cover import (
 from homeassistant.core import callback
 
 from . import ShellyDeviceWrapper
-from .const import DOMAIN
+from .const import DATA_CONFIG_ENTRY, DOMAIN
 from .entity import ShellyBlockEntity
 
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up cover for device."""
-    wrapper = hass.data[DOMAIN][config_entry.entry_id]
+    wrapper = hass.data[DOMAIN][DATA_CONFIG_ENTRY][config_entry.entry_id]
     blocks = [block for block in wrapper.device.blocks if block.type == "roller"]
 
     if not blocks:
diff --git a/homeassistant/components/shelly/entity.py b/homeassistant/components/shelly/entity.py
index 7ffd1aee052..8af95c0fb33 100644
--- a/homeassistant/components/shelly/entity.py
+++ b/homeassistant/components/shelly/entity.py
@@ -10,7 +10,7 @@ from homeassistant.core import callback
 from homeassistant.helpers import device_registry, entity
 
 from . import ShellyDeviceWrapper
-from .const import DOMAIN
+from .const import DATA_CONFIG_ENTRY, DOMAIN
 
 
 def temperature_unit(block_info: dict) -> str:
@@ -64,7 +64,9 @@ async def async_setup_entry_attribute_entities(
     hass, config_entry, async_add_entities, sensors, sensor_class
 ):
     """Set up entities for block attributes."""
-    wrapper: ShellyDeviceWrapper = hass.data[DOMAIN][config_entry.entry_id]
+    wrapper: ShellyDeviceWrapper = hass.data[DOMAIN][DATA_CONFIG_ENTRY][
+        config_entry.entry_id
+    ]
     blocks = []
 
     for block in wrapper.device.blocks:
diff --git a/homeassistant/components/shelly/light.py b/homeassistant/components/shelly/light.py
index 8025fd11205..85763a51f2a 100644
--- a/homeassistant/components/shelly/light.py
+++ b/homeassistant/components/shelly/light.py
@@ -17,13 +17,13 @@ from homeassistant.util.color import (
 )
 
 from . import ShellyDeviceWrapper
-from .const import DOMAIN
+from .const import DATA_CONFIG_ENTRY, DOMAIN
 from .entity import ShellyBlockEntity
 
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up lights for device."""
-    wrapper = hass.data[DOMAIN][config_entry.entry_id]
+    wrapper = hass.data[DOMAIN][DATA_CONFIG_ENTRY][config_entry.entry_id]
     blocks = [block for block in wrapper.device.blocks if block.type == "light"]
 
     if not blocks:
diff --git a/homeassistant/components/shelly/manifest.json b/homeassistant/components/shelly/manifest.json
index 3816d31222e..98dcbfda568 100644
--- a/homeassistant/components/shelly/manifest.json
+++ b/homeassistant/components/shelly/manifest.json
@@ -3,7 +3,7 @@
   "name": "Shelly",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/shelly",
-  "requirements": ["aioshelly==0.3.4"],
+  "requirements": ["aioshelly==0.4.0"],
   "zeroconf": [{ "type": "_http._tcp.local.", "name": "shelly*" }],
   "codeowners": ["@balloob", "@bieniu"]
 }
diff --git a/homeassistant/components/shelly/sensor.py b/homeassistant/components/shelly/sensor.py
index 14c1b645118..e82f167ca60 100644
--- a/homeassistant/components/shelly/sensor.py
+++ b/homeassistant/components/shelly/sensor.py
@@ -8,6 +8,7 @@ from homeassistant.const import (
     LIGHT_LUX,
     PERCENTAGE,
     POWER_WATT,
+    VOLT,
 )
 
 from .entity import (
@@ -53,6 +54,18 @@ SENSORS = {
         value=lambda value: round(value, 1),
         device_class=sensor.DEVICE_CLASS_POWER,
     ),
+    ("emeter", "voltage"): BlockAttributeDescription(
+        name="Voltage",
+        unit=VOLT,
+        value=lambda value: round(value, 1),
+        device_class=sensor.DEVICE_CLASS_VOLTAGE,
+    ),
+    ("emeter", "powerFactor"): BlockAttributeDescription(
+        name="Power Factor",
+        unit=PERCENTAGE,
+        value=lambda value: round(value * 100, 1),
+        device_class=sensor.DEVICE_CLASS_POWER_FACTOR,
+    ),
     ("relay", "power"): BlockAttributeDescription(
         name="Power",
         unit=POWER_WATT,
@@ -77,6 +90,12 @@ SENSORS = {
         value=lambda value: round(value / 1000, 2),
         device_class=sensor.DEVICE_CLASS_ENERGY,
     ),
+    ("emeter", "energyReturned"): BlockAttributeDescription(
+        name="Energy Returned",
+        unit=ENERGY_KILO_WATT_HOUR,
+        value=lambda value: round(value / 1000, 2),
+        device_class=sensor.DEVICE_CLASS_ENERGY,
+    ),
     ("light", "energy"): BlockAttributeDescription(
         name="Energy",
         unit=ENERGY_KILO_WATT_HOUR,
diff --git a/homeassistant/components/shelly/strings.json b/homeassistant/components/shelly/strings.json
index 69a09204227..0efceba56a5 100644
--- a/homeassistant/components/shelly/strings.json
+++ b/homeassistant/components/shelly/strings.json
@@ -1,7 +1,7 @@
 {
   "title": "Shelly",
   "config": {
-    "flow_title": "Shelly: {name}",
+    "flow_title": "{name}",
     "step": {
       "user": {
         "description": "Before set up, the battery-powered device must be woken up by pressing the button on the device.",
diff --git a/homeassistant/components/shelly/switch.py b/homeassistant/components/shelly/switch.py
index 0dcefb51cf9..7d140528858 100644
--- a/homeassistant/components/shelly/switch.py
+++ b/homeassistant/components/shelly/switch.py
@@ -5,13 +5,13 @@ from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import callback
 
 from . import ShellyDeviceWrapper
-from .const import DOMAIN
+from .const import DATA_CONFIG_ENTRY, DOMAIN
 from .entity import ShellyBlockEntity
 
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up switches for device."""
-    wrapper = hass.data[DOMAIN][config_entry.entry_id]
+    wrapper = hass.data[DOMAIN][DATA_CONFIG_ENTRY][config_entry.entry_id]
 
     # In roller mode the relay blocks exist but do not contain required info
     if (
diff --git a/homeassistant/components/shelly/translations/ca.json b/homeassistant/components/shelly/translations/ca.json
index 41ffcb34b89..6df92102699 100644
--- a/homeassistant/components/shelly/translations/ca.json
+++ b/homeassistant/components/shelly/translations/ca.json
@@ -10,7 +10,7 @@
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "unknown": "Error inesperat"
         },
-        "flow_title": "Shelly: {name}",
+        "flow_title": "{name}",
         "step": {
             "confirm_discovery": {
                 "description": "Vols configurar {model} a {host}? \n\nAbans de configurar-lo, el dispositiu amb bateria ha d'estar despert, prem el bot\u00f3 del dispositiu per despertar-lo."
diff --git a/homeassistant/components/shelly/translations/cs.json b/homeassistant/components/shelly/translations/cs.json
index 13ad3d8edbd..3f9397d5cc0 100644
--- a/homeassistant/components/shelly/translations/cs.json
+++ b/homeassistant/components/shelly/translations/cs.json
@@ -1,16 +1,31 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "unsupported_firmware": "Za\u0159\u00edzen\u00ed pou\u017e\u00edv\u00e1 nepodporovanou verzi firmwaru."
         },
         "error": {
             "auth_not_supported": "Za\u0159\u00edzen\u00ed Shelly vy\u017eaduj\u00edc\u00ed autentizaci nejsou aktu\u00e1ln\u011b podporov\u00e1na.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
             "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
-        "flow_title": "Shelly: {name}",
+        "flow_title": "{name}",
         "step": {
             "confirm_discovery": {
-                "description": "Chcete nastavit {model} na adrese {host}?"
+                "description": "Chcete nastavit {model} na {host}?\n\nP\u0159ed nastaven\u00edm mus\u00ed b\u00fdt za\u0159\u00edzen\u00ed nap\u00e1jen\u00e9 z baterie probuzeno stisknut\u00edm tla\u010d\u00edtka na dan\u00e9m za\u0159\u00edzen\u00ed."
+            },
+            "credentials": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            },
+            "user": {
+                "data": {
+                    "host": "Hostitel"
+                },
+                "description": "P\u0159ed nastaven\u00edm mus\u00ed b\u00fdt za\u0159\u00edzen\u00ed nap\u00e1jen\u00e9 z baterie probuzeno stisknut\u00edm tla\u010d\u00edtka na dan\u00e9m za\u0159\u00edzen\u00ed."
             }
         }
     },
diff --git a/homeassistant/components/shelly/translations/el.json b/homeassistant/components/shelly/translations/el.json
index c532c3054b7..753e7ee7505 100644
--- a/homeassistant/components/shelly/translations/el.json
+++ b/homeassistant/components/shelly/translations/el.json
@@ -3,10 +3,18 @@
         "abort": {
             "unsupported_firmware": "\u0397 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af \u03bc\u03b9\u03b1 \u03bc\u03b7 \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03b9\u03b6\u03cc\u03bc\u03b5\u03bd\u03b7 \u03ad\u03ba\u03b4\u03bf\u03c3\u03b7 \u03c5\u03bb\u03b9\u03ba\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03b9\u03ba\u03bf\u03cd."
         },
+        "error": {
+            "auth_not_supported": "\u039f\u03b9 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ad\u03c2 Shelly \u03c0\u03bf\u03c5 \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bd \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03b4\u03b5\u03bd \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03bf\u03bd\u03c4\u03b1\u03b9 \u03c0\u03c1\u03bf\u03c2 \u03c4\u03bf \u03c0\u03b1\u03c1\u03cc\u03bd."
+        },
+        "flow_title": "Shelly: {\u03cc\u03bd\u03bf\u03bc\u03b1}",
         "step": {
+            "confirm_discovery": {
+                "description": "\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf {model} \u03c3\u03c4\u03b7 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 {host};\n\n\u03a0\u03c1\u03b9\u03bd \u03b1\u03c0\u03cc \u03c4\u03b7 \u03c1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7, \u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03bc\u03b5 \u03bc\u03c0\u03b1\u03c4\u03b1\u03c1\u03af\u03b1 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03be\u03c5\u03c0\u03bd\u03ae\u03c3\u03b5\u03b9 \u03c0\u03b1\u03c4\u03ce\u03bd\u03c4\u03b1\u03c2 \u03c4\u03bf \u03ba\u03bf\u03c5\u03bc\u03c0\u03af \u03c3\u03c4\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae."
+            },
             "user": {
                 "description": "\u03a0\u03c1\u03b9\u03bd \u03b1\u03c0\u03cc \u03c4\u03b7 \u03c1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b7, \u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03bc\u03b5 \u03bc\u03c0\u03b1\u03c4\u03b1\u03c1\u03af\u03b1 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03be\u03c5\u03c0\u03bd\u03ae\u03c3\u03b5\u03b9 \u03c0\u03b1\u03c4\u03ce\u03bd\u03c4\u03b1\u03c2 \u03c4\u03bf \u03ba\u03bf\u03c5\u03bc\u03c0\u03af \u03c3\u03c4\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae."
             }
         }
-    }
+    },
+    "title": "Shelly"
 }
\ No newline at end of file
diff --git a/homeassistant/components/shelly/translations/en.json b/homeassistant/components/shelly/translations/en.json
index 2727cfbceeb..e109a9ac6f3 100644
--- a/homeassistant/components/shelly/translations/en.json
+++ b/homeassistant/components/shelly/translations/en.json
@@ -10,7 +10,7 @@
             "invalid_auth": "Invalid authentication",
             "unknown": "Unexpected error"
         },
-        "flow_title": "Shelly: {name}",
+        "flow_title": "{name}",
         "step": {
             "confirm_discovery": {
                 "description": "Do you want to set up the {model} at {host}?\n\nBefore set up, the battery-powered device must be woken up by pressing the button on the device."
diff --git a/homeassistant/components/shelly/translations/es.json b/homeassistant/components/shelly/translations/es.json
index 814586abdae..bd9b5913e46 100644
--- a/homeassistant/components/shelly/translations/es.json
+++ b/homeassistant/components/shelly/translations/es.json
@@ -13,7 +13,7 @@
         "flow_title": "Shelly: {name}",
         "step": {
             "confirm_discovery": {
-                "description": "\u00bfQuieres configurar el {model} en {host}?"
+                "description": "\u00bfQuieres configurar el {model} en {host}?\n\nAntes de configurarlo, el dispositivo que funciona con pilas debe ser despertado pulsando el bot\u00f3n situado en el dispositivo."
             },
             "credentials": {
                 "data": {
diff --git a/homeassistant/components/shelly/translations/et.json b/homeassistant/components/shelly/translations/et.json
new file mode 100644
index 00000000000..8c0a83e3a90
--- /dev/null
+++ b/homeassistant/components/shelly/translations/et.json
@@ -0,0 +1,31 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "unsupported_firmware": "Seade kasutab toetuseta p\u00fcsivara versiooni."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "confirm_discovery": {
+                "description": "Kas soovid seadistada {model} saidil {host} ?\n\n Enne seadistamist tuleb akutoitega seade \u00e4ratada vajutades seadmel nuppu."
+            },
+            "credentials": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            },
+            "user": {
+                "data": {
+                    "host": ""
+                },
+                "description": "Enne seadistamist tuleb akutoitega seade \u00e4ratada vajutades seadme nuppu."
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/shelly/translations/it.json b/homeassistant/components/shelly/translations/it.json
index b1584c675b3..8f878924010 100644
--- a/homeassistant/components/shelly/translations/it.json
+++ b/homeassistant/components/shelly/translations/it.json
@@ -13,7 +13,7 @@
         "flow_title": "Shelly: {name}",
         "step": {
             "confirm_discovery": {
-                "description": "Vuoi impostare {model} su {host}?"
+                "description": "Vuoi impostare il {model} presso {host}?\n\nPrima di configurare, il dispositivo alimentato a batteria deve essere svegliato premendo il pulsante sul dispositivo."
             },
             "credentials": {
                 "data": {
@@ -24,7 +24,8 @@
             "user": {
                 "data": {
                     "host": "Host"
-                }
+                },
+                "description": "Prima di configurare, il dispositivo alimentato a batteria deve essere svegliato premendo il pulsante sul dispositivo."
             }
         }
     },
diff --git a/homeassistant/components/shelly/translations/lb.json b/homeassistant/components/shelly/translations/lb.json
index 714b42e9fcc..fda3aa300c2 100644
--- a/homeassistant/components/shelly/translations/lb.json
+++ b/homeassistant/components/shelly/translations/lb.json
@@ -13,7 +13,7 @@
         "flow_title": "Shelly: {name}",
         "step": {
             "confirm_discovery": {
-                "description": "Soll de {model} um {host} konfigur\u00e9iert ginn?"
+                "description": "Soll de {model} um {host} konfigur\u00e9iert ginn?\n\nVirum ariichten muss dat Batterie bedriwwen Ger\u00e4t aktiv\u00e9iert ginn andeems de Kn\u00e4ppchen um Apparat gedr\u00e9ckt g\u00ebtt."
             },
             "credentials": {
                 "data": {
diff --git a/homeassistant/components/shelly/translations/nl.json b/homeassistant/components/shelly/translations/nl.json
index 92a172ff081..198fbe51183 100644
--- a/homeassistant/components/shelly/translations/nl.json
+++ b/homeassistant/components/shelly/translations/nl.json
@@ -11,10 +11,11 @@
         "flow_title": "Shelly: {name}",
         "step": {
             "confirm_discovery": {
-                "description": "Wilt u het {model} bij {host} opzetten?"
+                "description": "Wilt u het {model} bij {host} instellen? Voordat het apparaat op batterijen kan worden ingesteld, moet het worden gewekt door op de knop op het apparaat te drukken."
             },
             "credentials": {
                 "data": {
+                    "password": "Wachtwoord",
                     "username": "Benutzername"
                 }
             },
diff --git a/homeassistant/components/shelly/translations/no.json b/homeassistant/components/shelly/translations/no.json
index ac5067d3273..dbdb6192ba2 100644
--- a/homeassistant/components/shelly/translations/no.json
+++ b/homeassistant/components/shelly/translations/no.json
@@ -6,11 +6,11 @@
         },
         "error": {
             "auth_not_supported": "Shelly-enheter som krever godkjenning st\u00f8ttes for \u00f8yeblikket ikke.",
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
-        "flow_title": "Shelly: {name}",
+        "flow_title": "",
         "step": {
             "confirm_discovery": {
                 "description": "Vil du konfigurere {model} p\u00e5 {host} ?\n\n F\u00f8r du setter opp, m\u00e5 den batteridrevne enheten vekkes ved \u00e5 trykke p\u00e5 knappen p\u00e5 enheten."
@@ -29,5 +29,5 @@
             }
         }
     },
-    "title": "Shelly"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/shelly/translations/pl.json b/homeassistant/components/shelly/translations/pl.json
index 1e54f5a0370..c59ca677533 100644
--- a/homeassistant/components/shelly/translations/pl.json
+++ b/homeassistant/components/shelly/translations/pl.json
@@ -2,15 +2,15 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "unsupported_firmware": "Urz\u0105dzenie u\u017cywa nieobs\u0142ugiwanej wersji firmware."
+            "unsupported_firmware": "Urz\u0105dzenie u\u017cywa nieobs\u0142ugiwanej wersji firmware"
         },
         "error": {
-            "auth_not_supported": "Urz\u0105dzenia Shelly wymagaj\u0105ce uwierzytelnienia nie s\u0105 obecnie obs\u0142ugiwane.",
+            "auth_not_supported": "Urz\u0105dzenia Shelly wymagaj\u0105ce uwierzytelnienia nie s\u0105 obecnie obs\u0142ugiwane",
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
-        "flow_title": "Shelly: {name}",
+        "flow_title": "{name}",
         "step": {
             "confirm_discovery": {
                 "description": "Czy chcesz skonfigurowa\u0107 {model} ({host})?\n\nPrzed konfiguracj\u0105 urz\u0105dzenie zasilane bateryjnie nale\u017cy wybudzi\u0107, naciskaj\u0105c przycisk na urz\u0105dzeniu."
@@ -25,7 +25,7 @@
                 "data": {
                     "host": "Nazwa hosta lub adres IP"
                 },
-                "description": "Przed konfiguracj\u0105 urz\u0105dzenie zasilane bateryjnie nale\u017cy wybudzi\u0107, naciskaj\u0105c przycisk na urz\u0105dzeniu."
+                "description": "Przed konfiguracj\u0105, urz\u0105dzenie zasilane bateryjnie nale\u017cy wybudzi\u0107, naciskaj\u0105c przycisk na urz\u0105dzeniu."
             }
         }
     },
diff --git a/homeassistant/components/shelly/translations/ru.json b/homeassistant/components/shelly/translations/ru.json
index 24478afe0a4..47b4ad27c70 100644
--- a/homeassistant/components/shelly/translations/ru.json
+++ b/homeassistant/components/shelly/translations/ru.json
@@ -10,7 +10,7 @@
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
-        "flow_title": "Shelly: {name}",
+        "flow_title": "{name}",
         "step": {
             "confirm_discovery": {
                 "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c {model} ({host}) ?\n\n\u041f\u0435\u0440\u0435\u0434 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u043e\u0439 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430, \u0440\u0430\u0431\u043e\u0442\u0430\u044e\u0449\u0438\u0435 \u043e\u0442 \u0431\u0430\u0442\u0430\u0440\u0435\u0438, \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0432\u044b\u0432\u0435\u0441\u0442\u0438 \u0438\u0437 \u0441\u043f\u044f\u0449\u0435\u0433\u043e \u0440\u0435\u0436\u0438\u043c\u0430, \u043d\u0430\u0436\u0430\u0432 \u043a\u043d\u043e\u043f\u043a\u0443 \u043d\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435."
diff --git a/homeassistant/components/shelly/translations/zh-Hans.json b/homeassistant/components/shelly/translations/zh-Hans.json
new file mode 100644
index 00000000000..6fe91b6e995
--- /dev/null
+++ b/homeassistant/components/shelly/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "credentials": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/shiftr/__init__.py b/homeassistant/components/shiftr/__init__.py
index 1c3cddac256..378d83d725e 100644
--- a/homeassistant/components/shiftr/__init__.py
+++ b/homeassistant/components/shiftr/__init__.py
@@ -1,6 +1,4 @@
 """Support for Shiftr.io."""
-import logging
-
 import paho.mqtt.client as mqtt
 import voluptuous as vol
 
@@ -13,8 +11,6 @@ from homeassistant.const import (
 from homeassistant.helpers import state as state_helper
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 DOMAIN = "shiftr"
 
 SHIFTR_BROKER = "broker.shiftr.io"
diff --git a/homeassistant/components/shopping_list/__init__.py b/homeassistant/components/shopping_list/__init__.py
index 11f61d6d626..8618e9bafb7 100644
--- a/homeassistant/components/shopping_list/__init__.py
+++ b/homeassistant/components/shopping_list/__init__.py
@@ -77,7 +77,7 @@ async def async_setup_entry(hass, config_entry):
         data = hass.data[DOMAIN]
         name = call.data.get(ATTR_NAME)
         if name is not None:
-            data.async_add(name)
+            await data.async_add(name)
 
     async def complete_item_service(call):
         """Mark the item provided via `name` as completed."""
@@ -90,7 +90,7 @@ async def async_setup_entry(hass, config_entry):
         except IndexError:
             _LOGGER.error("Removing of item failed: %s cannot be found", name)
         else:
-            data.async_update(item["id"], {"name": name, "complete": True})
+            await data.async_update(item["id"], {"name": name, "complete": True})
 
     data = hass.data[DOMAIN] = ShoppingData(hass)
     await data.async_load()
@@ -139,16 +139,14 @@ class ShoppingData:
         self.hass = hass
         self.items = []
 
-    @callback
-    def async_add(self, name):
+    async def async_add(self, name):
         """Add a shopping list item."""
         item = {"name": name, "id": uuid.uuid4().hex, "complete": False}
         self.items.append(item)
-        self.hass.async_add_job(self.save)
+        await self.hass.async_add_executor_job(self.save)
         return item
 
-    @callback
-    def async_update(self, item_id, info):
+    async def async_update(self, item_id, info):
         """Update a shopping list item."""
         item = next((itm for itm in self.items if itm["id"] == item_id), None)
 
@@ -157,14 +155,13 @@ class ShoppingData:
 
         info = ITEM_UPDATE_SCHEMA(info)
         item.update(info)
-        self.hass.async_add_job(self.save)
+        await self.hass.async_add_executor_job(self.save)
         return item
 
-    @callback
-    def async_clear_completed(self):
+    async def async_clear_completed(self):
         """Clear completed items."""
         self.items = [itm for itm in self.items if not itm["complete"]]
-        self.hass.async_add_job(self.save)
+        await self.hass.async_add_executor_job(self.save)
 
     async def async_load(self):
         """Load items."""
@@ -203,7 +200,7 @@ class UpdateShoppingListItemView(http.HomeAssistantView):
         data = await request.json()
 
         try:
-            item = request.app["hass"].data[DOMAIN].async_update(item_id, data)
+            item = await request.app["hass"].data[DOMAIN].async_update(item_id, data)
             request.app["hass"].bus.async_fire(EVENT)
             return self.json(item)
         except KeyError:
@@ -221,7 +218,7 @@ class CreateShoppingListItemView(http.HomeAssistantView):
     @RequestDataValidator(vol.Schema({vol.Required("name"): str}))
     async def post(self, request, data):
         """Create a new shopping list item."""
-        item = request.app["hass"].data[DOMAIN].async_add(data["name"])
+        item = await request.app["hass"].data[DOMAIN].async_add(data["name"])
         request.app["hass"].bus.async_fire(EVENT)
         return self.json(item)
 
@@ -232,11 +229,10 @@ class ClearCompletedItemsView(http.HomeAssistantView):
     url = "/api/shopping_list/clear_completed"
     name = "api:shopping_list:clear_completed"
 
-    @callback
-    def post(self, request):
+    async def post(self, request):
         """Retrieve if API is running."""
         hass = request.app["hass"]
-        hass.data[DOMAIN].async_clear_completed()
+        await hass.data[DOMAIN].async_clear_completed()
         hass.bus.async_fire(EVENT)
         return self.json_message("Cleared completed items.")
 
@@ -249,10 +245,10 @@ def websocket_handle_items(hass, connection, msg):
     )
 
 
-@callback
-def websocket_handle_add(hass, connection, msg):
+@websocket_api.async_response
+async def websocket_handle_add(hass, connection, msg):
     """Handle add item to shopping_list."""
-    item = hass.data[DOMAIN].async_add(msg["name"])
+    item = await hass.data[DOMAIN].async_add(msg["name"])
     hass.bus.async_fire(EVENT, {"action": "add", "item": item})
     connection.send_message(websocket_api.result_message(msg["id"], item))
 
@@ -266,7 +262,7 @@ async def websocket_handle_update(hass, connection, msg):
     data = msg
 
     try:
-        item = hass.data[DOMAIN].async_update(item_id, data)
+        item = await hass.data[DOMAIN].async_update(item_id, data)
         hass.bus.async_fire(EVENT, {"action": "update", "item": item})
         connection.send_message(websocket_api.result_message(msg_id, item))
     except KeyError:
@@ -275,9 +271,9 @@ async def websocket_handle_update(hass, connection, msg):
         )
 
 
-@callback
-def websocket_handle_clear(hass, connection, msg):
+@websocket_api.async_response
+async def websocket_handle_clear(hass, connection, msg):
     """Handle clearing shopping_list items."""
-    hass.data[DOMAIN].async_clear_completed()
+    await hass.data[DOMAIN].async_clear_completed()
     hass.bus.async_fire(EVENT, {"action": "clear"})
     connection.send_message(websocket_api.result_message(msg["id"]))
diff --git a/homeassistant/components/shopping_list/intent.py b/homeassistant/components/shopping_list/intent.py
index 21ae7181e89..a6808b99328 100644
--- a/homeassistant/components/shopping_list/intent.py
+++ b/homeassistant/components/shopping_list/intent.py
@@ -24,7 +24,7 @@ class AddItemIntent(intent.IntentHandler):
         """Handle the intent."""
         slots = self.async_validate_slots(intent_obj.slots)
         item = slots["item"]["value"]
-        intent_obj.hass.data[DOMAIN].async_add(item)
+        await intent_obj.hass.data[DOMAIN].async_add(item)
 
         response = intent_obj.create_response()
         response.async_set_speech(f"I've added {item} to your shopping list")
diff --git a/homeassistant/components/shopping_list/strings.json b/homeassistant/components/shopping_list/strings.json
index 8c17d683886..5b8197177a0 100644
--- a/homeassistant/components/shopping_list/strings.json
+++ b/homeassistant/components/shopping_list/strings.json
@@ -8,7 +8,7 @@
       }
     },
     "abort": {
-      "already_configured": "The shopping list is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     }
   }
 }
diff --git a/homeassistant/components/shopping_list/translations/ca.json b/homeassistant/components/shopping_list/translations/ca.json
index d384e46641d..92a206a3e3a 100644
--- a/homeassistant/components/shopping_list/translations/ca.json
+++ b/homeassistant/components/shopping_list/translations/ca.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La llista de compres ja est\u00e0 configurada."
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/shopping_list/translations/cs.json b/homeassistant/components/shopping_list/translations/cs.json
new file mode 100644
index 00000000000..cbb7a1af2e1
--- /dev/null
+++ b/homeassistant/components/shopping_list/translations/cs.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
+        "step": {
+            "user": {
+                "description": "Chcete nastavit n\u00e1kupn\u00ed seznam?",
+                "title": "N\u00e1kupn\u00ed seznam"
+            }
+        }
+    },
+    "title": "N\u00e1kupn\u00ed seznam"
+}
\ No newline at end of file
diff --git a/homeassistant/components/shopping_list/translations/en.json b/homeassistant/components/shopping_list/translations/en.json
index e28b5076dcb..2da8b0db8d4 100644
--- a/homeassistant/components/shopping_list/translations/en.json
+++ b/homeassistant/components/shopping_list/translations/en.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "The shopping list is already configured."
+            "already_configured": "Service is already configured"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/shopping_list/translations/es.json b/homeassistant/components/shopping_list/translations/es.json
index b7baefbaa80..cdfbd5d3a9e 100644
--- a/homeassistant/components/shopping_list/translations/es.json
+++ b/homeassistant/components/shopping_list/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La lista de la compra ya est\u00e1 configurada."
+            "already_configured": "El servicio ya est\u00e1 configurado"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/shopping_list/translations/et.json b/homeassistant/components/shopping_list/translations/et.json
new file mode 100644
index 00000000000..2b3fb480ff1
--- /dev/null
+++ b/homeassistant/components/shopping_list/translations/et.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud"
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid seadistada ostunimekirja?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/shopping_list/translations/it.json b/homeassistant/components/shopping_list/translations/it.json
index c1b10bc84b6..bd267168c8f 100644
--- a/homeassistant/components/shopping_list/translations/it.json
+++ b/homeassistant/components/shopping_list/translations/it.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La lista della spesa \u00e8 gi\u00e0 configurata."
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/shopping_list/translations/no.json b/homeassistant/components/shopping_list/translations/no.json
index 56a92234c70..6bad2dd5774 100644
--- a/homeassistant/components/shopping_list/translations/no.json
+++ b/homeassistant/components/shopping_list/translations/no.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Handlelisten er allerede konfigurert."
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/shopping_list/translations/pl.json b/homeassistant/components/shopping_list/translations/pl.json
index 75f09a944ef..68d6de3c41b 100644
--- a/homeassistant/components/shopping_list/translations/pl.json
+++ b/homeassistant/components/shopping_list/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Lista zakup\u00f3w jest ju\u017c skonfigurowana."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/shopping_list/translations/ru.json b/homeassistant/components/shopping_list/translations/ru.json
index 84c6e2762f7..1dc4a274ab6 100644
--- a/homeassistant/components/shopping_list/translations/ru.json
+++ b/homeassistant/components/shopping_list/translations/ru.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0439 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/shopping_list/translations/zh-Hant.json b/homeassistant/components/shopping_list/translations/zh-Hant.json
index dbb7d941b2d..9c852054582 100644
--- a/homeassistant/components/shopping_list/translations/zh-Hant.json
+++ b/homeassistant/components/shopping_list/translations/zh-Hant.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u8cfc\u7269\u6e05\u55ae\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/sighthound/image_processing.py b/homeassistant/components/sighthound/image_processing.py
index 7e9e789423e..e15fab1aaa3 100644
--- a/homeassistant/components/sighthound/image_processing.py
+++ b/homeassistant/components/sighthound/image_processing.py
@@ -172,7 +172,6 @@ class SighthoundEntity(ImageProcessingEntity):
     @property
     def device_state_attributes(self):
         """Return the attributes."""
-        attr = {}
-        if self._last_detection:
-            attr["last_person"] = self._last_detection
-        return attr
+        if not self._last_detection:
+            return {}
+        return {"last_person": self._last_detection}
diff --git a/homeassistant/components/simplepush/notify.py b/homeassistant/components/simplepush/notify.py
index 63bcd31935e..1d101534157 100644
--- a/homeassistant/components/simplepush/notify.py
+++ b/homeassistant/components/simplepush/notify.py
@@ -1,6 +1,4 @@
 """Simplepush notification service."""
-import logging
-
 from simplepush import send, send_encrypted
 import voluptuous as vol
 
@@ -13,8 +11,6 @@ from homeassistant.components.notify import (
 from homeassistant.const import CONF_PASSWORD
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_ENCRYPTED = "encrypted"
 
 CONF_DEVICE_KEY = "device_key"
diff --git a/homeassistant/components/simplisafe/__init__.py b/homeassistant/components/simplisafe/__init__.py
index dc2474cab88..a3f56a9e1a3 100644
--- a/homeassistant/components/simplisafe/__init__.py
+++ b/homeassistant/components/simplisafe/__init__.py
@@ -16,13 +16,13 @@ from simplipy.websocket import (
 )
 import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH
+from homeassistant.config_entries import SOURCE_REAUTH
 from homeassistant.const import (
     ATTR_CODE,
     CONF_CODE,
-    CONF_PASSWORD,
     CONF_TOKEN,
     CONF_USERNAME,
+    EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import CoreState, callback
 from homeassistant.exceptions import ConfigEntryNotReady
@@ -35,12 +35,15 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_connect,
     async_dispatcher_send,
 )
-from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.service import (
     async_register_admin_service,
     verify_domain_control,
 )
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+    UpdateFailed,
+)
 
 from .const import (
     ATTR_ALARM_DURATION,
@@ -59,10 +62,7 @@ from .const import (
     VOLUMES,
 )
 
-CONF_ACCOUNTS = "accounts"
-
 DATA_LISTENER = "listener"
-TOPIC_UPDATE_REST_API = "simplisafe_update_rest_api_{0}"
 TOPIC_UPDATE_WEBSOCKET = "simplisafe_update_websocket_{0}"
 
 EVENT_SIMPLISAFE_EVENT = "SIMPLISAFE_EVENT"
@@ -70,6 +70,13 @@ EVENT_SIMPLISAFE_NOTIFICATION = "SIMPLISAFE_NOTIFICATION"
 
 DEFAULT_SOCKET_MIN_RETRY = 15
 
+SUPPORTED_PLATFORMS = (
+    "alarm_control_panel",
+    "binary_sensor",
+    "lock",
+    "sensor",
+)
+
 WEBSOCKET_EVENTS_REQUIRING_SERIAL = [EVENT_LOCK_LOCKED, EVENT_LOCK_UNLOCKED]
 WEBSOCKET_EVENTS_TO_TRIGGER_HASS_EVENT = [
     EVENT_CAMERA_MOTION_DETECTED,
@@ -130,26 +137,7 @@ SERVICE_SET_SYSTEM_PROPERTIES_SCHEMA = SERVICE_BASE_SCHEMA.extend(
     }
 )
 
-ACCOUNT_CONFIG_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_USERNAME): cv.string,
-        vol.Required(CONF_PASSWORD): cv.string,
-        vol.Optional(CONF_CODE): cv.string,
-    }
-)
-
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: vol.Schema(
-            {
-                vol.Optional(CONF_ACCOUNTS): vol.All(
-                    cv.ensure_list, [ACCOUNT_CONFIG_SCHEMA]
-                )
-            }
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
+CONFIG_SCHEMA = cv.deprecated(DOMAIN, invalidation_version="0.119")
 
 
 @callback
@@ -161,9 +149,11 @@ def _async_save_refresh_token(hass, config_entry, token):
 
 
 async def async_get_client_id(hass):
-    """Get a client ID (based on the HASS unique ID) for the SimpliSafe API."""
+    """Get a client ID (based on the HASS unique ID) for the SimpliSafe API.
+
+    Note that SimpliSafe requires full, "dashed" versions of UUIDs.
+    """
     hass_id = await hass.helpers.instance_id.async_get()
-    # SimpliSafe requires full, "dashed" versions of UUIDs:
     return str(UUID(hass_id))
 
 
@@ -181,28 +171,7 @@ async def async_register_base_station(hass, system, config_entry_id):
 
 async def async_setup(hass, config):
     """Set up the SimpliSafe component."""
-    hass.data[DOMAIN] = {}
-    hass.data[DOMAIN][DATA_CLIENT] = {}
-    hass.data[DOMAIN][DATA_LISTENER] = {}
-
-    if DOMAIN not in config:
-        return True
-
-    conf = config[DOMAIN]
-
-    for account in conf[CONF_ACCOUNTS]:
-        hass.async_create_task(
-            hass.config_entries.flow.async_init(
-                DOMAIN,
-                context={"source": SOURCE_IMPORT},
-                data={
-                    CONF_USERNAME: account[CONF_USERNAME],
-                    CONF_PASSWORD: account[CONF_PASSWORD],
-                    CONF_CODE: account.get(CONF_CODE),
-                },
-            )
-        )
-
+    hass.data[DOMAIN] = {DATA_CLIENT: {}, DATA_LISTENER: {}}
     return True
 
 
@@ -242,13 +211,14 @@ async def async_setup_entry(hass, config_entry):
 
     _async_save_refresh_token(hass, config_entry, api.refresh_token)
 
-    simplisafe = SimpliSafe(hass, api, config_entry)
+    simplisafe = hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id] = SimpliSafe(
+        hass, api, config_entry
+    )
     await simplisafe.async_init()
-    hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id] = simplisafe
 
-    for component in ("alarm_control_panel", "lock"):
+    for platform in SUPPORTED_PLATFORMS:
         hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(config_entry, component)
+            hass.config_entries.async_forward_entry_setup(config_entry, platform)
         )
 
     @callback
@@ -342,28 +312,30 @@ async def async_setup_entry(hass, config_entry):
     ]:
         async_register_admin_service(hass, DOMAIN, service, method, schema=schema)
 
-    config_entry.add_update_listener(async_update_options)
+    config_entry.add_update_listener(async_reload_entry)
 
     return True
 
 
 async def async_unload_entry(hass, entry):
     """Unload a SimpliSafe config entry."""
-    tasks = [
-        hass.config_entries.async_forward_entry_unload(entry, component)
-        for component in ("alarm_control_panel", "lock")
-    ]
+    unload_ok = all(
+        await asyncio.gather(
+            *[
+                hass.config_entries.async_forward_entry_unload(entry, component)
+                for component in SUPPORTED_PLATFORMS
+            ]
+        )
+    )
+    if unload_ok:
+        hass.data[DOMAIN][DATA_CLIENT].pop(entry.entry_id)
+        remove_listener = hass.data[DOMAIN][DATA_LISTENER].pop(entry.entry_id)
+        remove_listener()
 
-    await asyncio.gather(*tasks)
-
-    hass.data[DOMAIN][DATA_CLIENT].pop(entry.entry_id)
-    remove_listener = hass.data[DOMAIN][DATA_LISTENER].pop(entry.entry_id)
-    remove_listener()
-
-    return True
+    return unload_ok
 
 
-async def async_update_options(hass, config_entry):
+async def async_reload_entry(hass, config_entry):
     """Handle an options update."""
     await hass.config_entries.async_reload(config_entry.entry_id)
 
@@ -415,7 +387,7 @@ class SimpliSafeWebsocket:
             },
         )
 
-    async def async_websocket_connect(self):
+    async def async_connect(self):
         """Register handlers and connect to the websocket."""
         self._websocket.on_connect(self._on_connect)
         self._websocket.on_disconnect(self._on_disconnect)
@@ -423,6 +395,10 @@ class SimpliSafeWebsocket:
 
         await self._websocket.async_connect()
 
+    async def async_disconnect(self):
+        """Disconnect from the websocket."""
+        await self._websocket.async_disconnect()
+
 
 class SimpliSafe:
     """Define a SimpliSafe data object."""
@@ -430,11 +406,11 @@ class SimpliSafe:
     def __init__(self, hass, api, config_entry):
         """Initialize."""
         self._api = api
-        self._config_entry = config_entry
         self._emergency_refresh_token_used = False
         self._hass = hass
         self._system_notifications = {}
-        self.options = config_entry.options or {}
+        self.config_entry = config_entry
+        self.coordinator = None
         self.initial_event_to_use = {}
         self.systems = {}
         self.websocket = SimpliSafeWebsocket(hass, api.websocket)
@@ -478,7 +454,17 @@ class SimpliSafe:
 
     async def async_init(self):
         """Initialize the data class."""
-        asyncio.create_task(self.websocket.async_websocket_connect())
+        asyncio.create_task(self.websocket.async_connect())
+
+        async def async_websocket_disconnect(_):
+            """Define an event handler to disconnect from the websocket."""
+            await self.websocket.async_disconnect()
+
+        self._hass.data[DOMAIN][DATA_LISTENER][
+            self.config_entry.entry_id
+        ] = self._hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_STOP, async_websocket_disconnect
+        )
 
         self.systems = await self._api.get_systems()
         for system in self.systems.values():
@@ -486,7 +472,7 @@ class SimpliSafe:
 
             self._hass.async_create_task(
                 async_register_base_station(
-                    self._hass, system, self._config_entry.entry_id
+                    self._hass, system, self.config_entry.entry_id
                 )
             )
 
@@ -501,31 +487,25 @@ class SimpliSafe:
                 LOGGER.error("Error while fetching initial event: %s", err)
                 self.initial_event_to_use[system.system_id] = {}
 
-        async def refresh(event_time):
-            """Refresh data from the SimpliSafe account."""
-            await self.async_update()
-
-        self._hass.data[DOMAIN][DATA_LISTENER][
-            self._config_entry.entry_id
-        ] = async_track_time_interval(self._hass, refresh, DEFAULT_SCAN_INTERVAL)
-
-        await self.async_update()
+        self.coordinator = DataUpdateCoordinator(
+            self._hass,
+            LOGGER,
+            name=self.config_entry.data[CONF_USERNAME],
+            update_interval=DEFAULT_SCAN_INTERVAL,
+            update_method=self.async_update,
+        )
 
     async def async_update(self):
         """Get updated data from SimpliSafe."""
 
-        async def update_system(system):
+        async def async_update_system(system):
             """Update a system."""
-            await system.update()
+            await system.update(cached=system.version != 3)
             self._async_process_new_notifications(system)
-            LOGGER.debug('Updated REST API data for "%s"', system.address)
-            async_dispatcher_send(
-                self._hass, TOPIC_UPDATE_REST_API.format(system.system_id)
-            )
-
-        tasks = [update_system(system) for system in self.systems.values()]
 
+        tasks = [async_update_system(system) for system in self.systems.values()]
         results = await asyncio.gather(*tasks, return_exceptions=True)
+
         for result in results:
             if isinstance(result, InvalidCredentialsError):
                 if self._emergency_refresh_token_used:
@@ -534,7 +514,7 @@ class SimpliSafe:
                         for flow in self._hass.config_entries.flow.async_progress()
                         if flow["context"].get("source") == SOURCE_REAUTH
                         and flow["context"].get("unique_id")
-                        == self._config_entry.unique_id
+                        == self.config_entry.unique_id
                     ]
 
                     if not matching_flows:
@@ -543,44 +523,45 @@ class SimpliSafe:
                                 DOMAIN,
                                 context={
                                     "source": SOURCE_REAUTH,
-                                    "unique_id": self._config_entry.unique_id,
+                                    "unique_id": self.config_entry.unique_id,
                                 },
-                                data=self._config_entry.data,
+                                data=self.config_entry.data,
                             )
                         )
 
-                    return
+                    LOGGER.error("Update failed with stored refresh token")
+                    raise UpdateFailed from result
 
                 LOGGER.warning("SimpliSafe cloud error; trying stored refresh token")
                 self._emergency_refresh_token_used = True
 
                 try:
                     await self._api.refresh_access_token(
-                        self._config_entry.data[CONF_TOKEN]
+                        self.config_entry.data[CONF_TOKEN]
                     )
                     return
                 except SimplipyError as err:
                     LOGGER.error("Error while using stored refresh token: %s", err)
-                    return
+                    raise UpdateFailed from err
 
             if isinstance(result, EndpointUnavailable):
                 # In case the user attempt an action not allowed in their current plan,
                 # we merely log that message at INFO level (so the user is aware,
                 # but not spammed with ERROR messages that they cannot change):
                 LOGGER.info(result)
-                return
+                raise UpdateFailed from result
 
             if isinstance(result, SimplipyError):
                 LOGGER.error("SimpliSafe error while updating: %s", result)
-                return
+                raise UpdateFailed from result
 
             if isinstance(result, Exception):
                 LOGGER.error("Unknown error while updating: %s", result)
-                return
+                raise UpdateFailed from result
 
-        if self._api.refresh_token != self._config_entry.data[CONF_TOKEN]:
+        if self._api.refresh_token != self.config_entry.data[CONF_TOKEN]:
             _async_save_refresh_token(
-                self._hass, self._config_entry, self._api.refresh_token
+                self._hass, self.config_entry, self._api.refresh_token
             )
 
         # If we've reached this point using an emergency refresh token, we're in the
@@ -589,11 +570,12 @@ class SimpliSafe:
             self._emergency_refresh_token_used = False
 
 
-class SimpliSafeEntity(Entity):
+class SimpliSafeEntity(CoordinatorEntity):
     """Define a base SimpliSafe entity."""
 
     def __init__(self, simplisafe, system, name, *, serial=None):
         """Initialize."""
+        super().__init__(simplisafe.coordinator)
         self._name = name
         self._online = True
         self._simplisafe = simplisafe
@@ -624,26 +606,28 @@ class SimpliSafeEntity(Entity):
             ATTR_SYSTEM_ID: system.system_id,
         }
 
+        self._device_info = {
+            "identifiers": {(DOMAIN, system.system_id)},
+            "manufacturer": "SimpliSafe",
+            "model": system.version,
+            "name": name,
+            "via_device": (DOMAIN, system.serial),
+        }
+
     @property
     def available(self):
         """Return whether the entity is available."""
         # We can easily detect if the V3 system is offline, but no simple check exists
-        # for the V2 system. Therefore, we mark the entity as available if:
+        # for the V2 system. Therefore, assuming the coordinator hasn't failed, we mark
+        # the entity as available if:
         #   1. We can verify that the system is online (assuming True if we can't)
         #   2. We can verify that the entity is online
-        system_offline = self._system.version == 3 and self._system.offline
-        return not system_offline and self._online
+        return not (self._system.version == 3 and self._system.offline) and self._online
 
     @property
     def device_info(self):
         """Return device registry information for this entity."""
-        return {
-            "identifiers": {(DOMAIN, self._system.system_id)},
-            "manufacturer": "SimpliSafe",
-            "model": self._system.version,
-            "name": self._name,
-            "via_device": (DOMAIN, self._system.serial),
-        }
+        return self._device_info
 
     @property
     def device_state_attributes(self):
@@ -690,50 +674,43 @@ class SimpliSafeEntity(Entity):
 
         self.async_update_from_websocket_event(event)
 
+    @callback
+    def _handle_coordinator_update(self):
+        """Update the entity with new REST API data."""
+        self.async_update_from_rest_api()
+        self.async_write_ha_state()
+
+    @callback
+    def _handle_websocket_update(self, event):
+        """Update the entity with new websocket data."""
+        # Ignore this event if it belongs to a system other than this one:
+        if event.system_id != self._system.system_id:
+            return
+
+        # Ignore this event if this entity hasn't expressed interest in its type:
+        if event.event_type not in self.websocket_events_to_listen_for:
+            return
+
+        # Ignore this event if it belongs to a entity with a different serial
+        # number from this one's:
+        if (
+            event.event_type in WEBSOCKET_EVENTS_REQUIRING_SERIAL
+            and event.sensor_serial != self._serial
+        ):
+            return
+
+        self._async_internal_update_from_websocket_event(event)
+        self.async_write_ha_state()
+
     async def async_added_to_hass(self):
         """Register callbacks."""
-
-        @callback
-        def rest_api_update():
-            """Update the entity with new REST API data."""
-            self.async_update_from_rest_api()
-            self.async_write_ha_state()
-
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass,
-                TOPIC_UPDATE_REST_API.format(self._system.system_id),
-                rest_api_update,
-            )
-        )
-
-        @callback
-        def websocket_update(event):
-            """Update the entity with new websocket data."""
-            # Ignore this event if it belongs to a system other than this one:
-            if event.system_id != self._system.system_id:
-                return
-
-            # Ignore this event if this entity hasn't expressed interest in its type:
-            if event.event_type not in self.websocket_events_to_listen_for:
-                return
-
-            # Ignore this event if it belongs to a entity with a different serial
-            # number from this one's:
-            if (
-                event.event_type in WEBSOCKET_EVENTS_REQUIRING_SERIAL
-                and event.sensor_serial != self._serial
-            ):
-                return
-
-            self._async_internal_update_from_websocket_event(event)
-            self.async_write_ha_state()
+        await super().async_added_to_hass()
 
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
                 TOPIC_UPDATE_WEBSOCKET.format(self._system.system_id),
-                websocket_update,
+                self._handle_websocket_update,
             )
         )
 
@@ -747,4 +724,3 @@ class SimpliSafeEntity(Entity):
     @callback
     def async_update_from_websocket_event(self, event):
         """Update the entity with the provided websocket event."""
-        raise NotImplementedError()
diff --git a/homeassistant/components/simplisafe/alarm_control_panel.py b/homeassistant/components/simplisafe/alarm_control_panel.py
index acc7e3bb0a8..11f794eef5d 100644
--- a/homeassistant/components/simplisafe/alarm_control_panel.py
+++ b/homeassistant/components/simplisafe/alarm_control_panel.py
@@ -119,11 +119,11 @@ class SimpliSafeAlarm(SimpliSafeEntity, AlarmControlPanelEntity):
     @property
     def code_format(self):
         """Return one or more digits/characters."""
-        if not self._simplisafe.options.get(CONF_CODE):
+        if not self._simplisafe.config_entry.options.get(CONF_CODE):
             return None
-        if isinstance(self._simplisafe.options[CONF_CODE], str) and re.search(
-            "^\\d+$", self._simplisafe.options[CONF_CODE]
-        ):
+        if isinstance(
+            self._simplisafe.config_entry.options[CONF_CODE], str
+        ) and re.search("^\\d+$", self._simplisafe.config_entry.options[CONF_CODE]):
             return FORMAT_NUMBER
         return FORMAT_TEXT
 
@@ -140,10 +140,10 @@ class SimpliSafeAlarm(SimpliSafeEntity, AlarmControlPanelEntity):
     @callback
     def _is_code_valid(self, code, state):
         """Validate that a code matches the required one."""
-        if not self._simplisafe.options.get(CONF_CODE):
+        if not self._simplisafe.config_entry.options.get(CONF_CODE):
             return True
 
-        if not code or code != self._simplisafe.options[CONF_CODE]:
+        if not code or code != self._simplisafe.config_entry.options[CONF_CODE]:
             LOGGER.warning(
                 "Incorrect alarm code entered (target state: %s): %s", state, code
             )
diff --git a/homeassistant/components/simplisafe/binary_sensor.py b/homeassistant/components/simplisafe/binary_sensor.py
new file mode 100644
index 00000000000..263bbf51b13
--- /dev/null
+++ b/homeassistant/components/simplisafe/binary_sensor.py
@@ -0,0 +1,133 @@
+"""Support for SimpliSafe binary sensors."""
+from simplipy.entity import EntityTypes
+
+from homeassistant.components.binary_sensor import (
+    DEVICE_CLASS_BATTERY,
+    DEVICE_CLASS_DOOR,
+    DEVICE_CLASS_GAS,
+    DEVICE_CLASS_MOISTURE,
+    DEVICE_CLASS_SMOKE,
+    BinarySensorEntity,
+)
+from homeassistant.core import callback
+
+from . import SimpliSafeEntity
+from .const import DATA_CLIENT, DOMAIN, LOGGER
+
+SUPPORTED_BATTERY_SENSOR_TYPES = [
+    EntityTypes.carbon_monoxide,
+    EntityTypes.entry,
+    EntityTypes.leak,
+    EntityTypes.lock,
+    EntityTypes.smoke,
+    EntityTypes.temperature,
+]
+
+SUPPORTED_SENSOR_TYPES = [
+    EntityTypes.entry,
+    EntityTypes.carbon_monoxide,
+    EntityTypes.smoke,
+    EntityTypes.leak,
+]
+
+HA_SENSOR_TYPES = {
+    EntityTypes.entry: DEVICE_CLASS_DOOR,
+    EntityTypes.carbon_monoxide: DEVICE_CLASS_GAS,
+    EntityTypes.smoke: DEVICE_CLASS_SMOKE,
+    EntityTypes.leak: DEVICE_CLASS_MOISTURE,
+}
+
+SENSOR_MODELS = {
+    EntityTypes.entry: "Entry Sensor",
+    EntityTypes.carbon_monoxide: "Carbon Monoxide Detector",
+    EntityTypes.smoke: "Smoke Detector",
+    EntityTypes.leak: "Water Sensor",
+}
+
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up SimpliSafe binary sensors based on a config entry."""
+    simplisafe = hass.data[DOMAIN][DATA_CLIENT][entry.entry_id]
+    sensors = []
+
+    for system in simplisafe.systems.values():
+        if system.version == 2:
+            LOGGER.info("Skipping sensor setup for V2 system: %s", system.system_id)
+            continue
+
+        for sensor in system.sensors.values():
+            if sensor.type in SUPPORTED_SENSOR_TYPES:
+                sensors.append(SimpliSafeBinarySensor(simplisafe, system, sensor))
+            if sensor.type in SUPPORTED_BATTERY_SENSOR_TYPES:
+                sensors.append(SimpliSafeSensorBattery(simplisafe, system, sensor))
+
+    async_add_entities(sensors)
+
+
+class SimpliSafeBinarySensor(SimpliSafeEntity, BinarySensorEntity):
+    """Define a SimpliSafe binary sensor entity."""
+
+    def __init__(self, simplisafe, system, sensor):
+        """Initialize."""
+        super().__init__(simplisafe, system, sensor.name, serial=sensor.serial)
+        self._system = system
+        self._sensor = sensor
+        self._is_on = False
+
+    @property
+    def device_class(self):
+        """Return type of sensor."""
+        return HA_SENSOR_TYPES[self._sensor.type]
+
+    @property
+    def device_info(self):
+        """Return device registry information for this entity."""
+        info = super().device_info
+        info["identifiers"] = {(DOMAIN, self._sensor.serial)}
+        info["model"] = SENSOR_MODELS[self._sensor.type]
+        info["name"] = self._sensor.name
+        return info
+
+    @property
+    def is_on(self):
+        """Return true if the sensor is on."""
+        return self._is_on
+
+    @callback
+    def async_update_from_rest_api(self):
+        """Update the entity with the provided REST API data."""
+        self._is_on = self._sensor.triggered
+
+
+class SimpliSafeSensorBattery(SimpliSafeEntity, BinarySensorEntity):
+    """Define a SimpliSafe battery binary sensor entity."""
+
+    def __init__(self, simplisafe, system, sensor):
+        """Initialize."""
+        super().__init__(simplisafe, system, sensor.name, serial=sensor.serial)
+        self._sensor = sensor
+        self._is_low = False
+
+        self._device_info["identifiers"] = {(DOMAIN, sensor.serial)}
+        self._device_info["model"] = SENSOR_MODELS[sensor.type]
+        self._device_info["name"] = sensor.name
+
+    @property
+    def device_class(self):
+        """Return type of sensor."""
+        return DEVICE_CLASS_BATTERY
+
+    @property
+    def unique_id(self):
+        """Return unique ID of sensor."""
+        return f"{self._sensor.serial}-battery"
+
+    @property
+    def is_on(self):
+        """Return true if the battery is low."""
+        return self._is_low
+
+    @callback
+    def async_update_from_rest_api(self):
+        """Update the entity with the provided REST API data."""
+        self._is_low = self._sensor.low_battery
diff --git a/homeassistant/components/simplisafe/config_flow.py b/homeassistant/components/simplisafe/config_flow.py
index ef980c25421..c34255bc62a 100644
--- a/homeassistant/components/simplisafe/config_flow.py
+++ b/homeassistant/components/simplisafe/config_flow.py
@@ -65,7 +65,7 @@ class SimpliSafeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             LOGGER.info("Awaiting confirmation of MFA email click")
             return await self.async_step_mfa()
         except InvalidCredentialsError:
-            errors = {"base": "invalid_credentials"}
+            errors = {"base": "invalid_auth"}
         except SimplipyError as err:
             LOGGER.error("Unknown error while logging into SimpliSafe: %s", err)
             errors = {"base": "unknown"}
@@ -93,10 +93,6 @@ class SimpliSafeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             return self.async_abort(reason="reauth_successful")
         return self.async_create_entry(title=self._username, data=user_input)
 
-    async def async_step_import(self, import_config):
-        """Import a config entry from configuration.yaml."""
-        return await self.async_step_user(import_config)
-
     async def async_step_mfa(self, user_input=None):
         """Handle multi-factor auth confirmation."""
         if user_input is None:
diff --git a/homeassistant/components/simplisafe/lock.py b/homeassistant/components/simplisafe/lock.py
index 82177fb4387..000b1cd9abb 100644
--- a/homeassistant/components/simplisafe/lock.py
+++ b/homeassistant/components/simplisafe/lock.py
@@ -32,8 +32,8 @@ class SimpliSafeLock(SimpliSafeEntity, LockEntity):
     def __init__(self, simplisafe, system, lock):
         """Initialize."""
         super().__init__(simplisafe, system, lock.name, serial=lock.serial)
-        self._is_locked = False
         self._lock = lock
+        self._is_locked = None
 
         for event_type in (EVENT_LOCK_LOCKED, EVENT_LOCK_UNLOCKED):
             self.websocket_events_to_listen_for.append(event_type)
@@ -51,8 +51,6 @@ class SimpliSafeLock(SimpliSafeEntity, LockEntity):
             LOGGER.error('Error while locking "%s": %s', self._lock.name, err)
             return
 
-        self._is_locked = True
-
     async def async_unlock(self, **kwargs):
         """Unlock the lock."""
         try:
@@ -61,8 +59,6 @@ class SimpliSafeLock(SimpliSafeEntity, LockEntity):
             LOGGER.error('Error while unlocking "%s": %s', self._lock.name, err)
             return
 
-        self._is_locked = False
-
     @callback
     def async_update_from_rest_api(self):
         """Update the entity with the provided REST API data."""
@@ -74,6 +70,8 @@ class SimpliSafeLock(SimpliSafeEntity, LockEntity):
             }
         )
 
+        self._is_locked = self._lock.state == LockStates.locked
+
     @callback
     def async_update_from_websocket_event(self, event):
         """Update the entity with the provided websocket event data."""
diff --git a/homeassistant/components/simplisafe/manifest.json b/homeassistant/components/simplisafe/manifest.json
index 613187ef744..0f209b366e8 100644
--- a/homeassistant/components/simplisafe/manifest.json
+++ b/homeassistant/components/simplisafe/manifest.json
@@ -3,6 +3,6 @@
   "name": "SimpliSafe",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/simplisafe",
-  "requirements": ["simplisafe-python==9.4.1"],
+  "requirements": ["simplisafe-python==9.6.0"],
   "codeowners": ["@bachya"]
 }
diff --git a/homeassistant/components/simplisafe/sensor.py b/homeassistant/components/simplisafe/sensor.py
new file mode 100644
index 00000000000..5909471c455
--- /dev/null
+++ b/homeassistant/components/simplisafe/sensor.py
@@ -0,0 +1,64 @@
+"""Support for SimpliSafe freeze sensor."""
+from simplipy.entity import EntityTypes
+
+from homeassistant.const import DEVICE_CLASS_TEMPERATURE, TEMP_FAHRENHEIT
+from homeassistant.core import callback
+
+from . import SimpliSafeEntity
+from .const import DATA_CLIENT, DOMAIN, LOGGER
+
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up SimpliSafe freeze sensors based on a config entry."""
+    simplisafe = hass.data[DOMAIN][DATA_CLIENT][entry.entry_id]
+    sensors = []
+
+    for system in simplisafe.systems.values():
+        if system.version == 2:
+            LOGGER.info("Skipping sensor setup for V2 system: %s", system.system_id)
+            continue
+
+        for sensor in system.sensors.values():
+            if sensor.type == EntityTypes.temperature:
+                sensors.append(SimplisafeFreezeSensor(simplisafe, system, sensor))
+
+    async_add_entities(sensors)
+
+
+class SimplisafeFreezeSensor(SimpliSafeEntity):
+    """Define a SimpliSafe freeze sensor entity."""
+
+    def __init__(self, simplisafe, system, sensor):
+        """Initialize."""
+        super().__init__(simplisafe, system, sensor.name, serial=sensor.serial)
+        self._sensor = sensor
+        self._state = None
+
+        self._device_info["identifiers"] = {(DOMAIN, sensor.serial)}
+        self._device_info["model"] = "Freeze Sensor"
+        self._device_info["name"] = sensor.name
+
+    @property
+    def device_class(self):
+        """Return type of sensor."""
+        return DEVICE_CLASS_TEMPERATURE
+
+    @property
+    def unique_id(self):
+        """Return unique ID of sensor."""
+        return self._sensor.serial
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return TEMP_FAHRENHEIT
+
+    @property
+    def state(self):
+        """Return the sensor state."""
+        return self._state
+
+    @callback
+    def async_update_from_rest_api(self):
+        """Update the entity with the provided REST API data."""
+        self._state = self._sensor.temperature
diff --git a/homeassistant/components/simplisafe/strings.json b/homeassistant/components/simplisafe/strings.json
index 7f724de9db5..ad973261a0e 100644
--- a/homeassistant/components/simplisafe/strings.json
+++ b/homeassistant/components/simplisafe/strings.json
@@ -6,7 +6,7 @@
         "description": "Check your email for a link from SimpliSafe. After verifying the link, return here to complete the installation of the integration."
       },
       "reauth_confirm": {
-        "title": "Re-link SimpliSafe Account",
+        "title": "[%key:common::config_flow::title::reauth%]",
         "description": "Your access token has expired or been revoked. Enter your password to re-link your account.",
         "data": {
           "password": "[%key:common::config_flow::data::password%]"
@@ -23,13 +23,13 @@
     },
     "error": {
       "identifier_exists": "Account already registered",
-      "invalid_credentials": "Invalid credentials",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "still_awaiting_mfa": "Still awaiting MFA email click",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
       "already_configured": "This SimpliSafe account is already in use.",
-      "reauth_successful": "SimpliSafe successfully reauthenticated."
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     }
   },
   "options": {
diff --git a/homeassistant/components/simplisafe/translations/ca.json b/homeassistant/components/simplisafe/translations/ca.json
index 590f4bbc630..b5b88f753af 100644
--- a/homeassistant/components/simplisafe/translations/ca.json
+++ b/homeassistant/components/simplisafe/translations/ca.json
@@ -2,10 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "Aquest compte SimpliSafe ja est\u00e0 en \u00fas.",
-            "reauth_successful": "Re-autenticaci\u00f3 amb SimpliSafe exitosa."
+            "reauth_successful": "Re-autenticaci\u00f3 realitzada correctament"
         },
         "error": {
             "identifier_exists": "Aquest compte ja est\u00e0 registrat",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Credencials inv\u00e0lides",
             "still_awaiting_mfa": "Esperant clic de l'enlla\u00e7 del correu MFA",
             "unknown": "Error inesperat"
@@ -20,7 +21,7 @@
                     "password": "Contrasenya"
                 },
                 "description": "El token d'acc\u00e9s ha caducat o ha estat revocat. Introdueix la teva contrasenya per tornar a vincular el compte.",
-                "title": "Torna a vincular un compte SimpliSafe"
+                "title": "Reautenticaci\u00f3 de la integraci\u00f3"
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/simplisafe/translations/cs.json b/homeassistant/components/simplisafe/translations/cs.json
index c2bc5447d16..c422a20c14c 100644
--- a/homeassistant/components/simplisafe/translations/cs.json
+++ b/homeassistant/components/simplisafe/translations/cs.json
@@ -1,16 +1,42 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Tento \u00fa\u010det SimpliSafe je ji\u017e pou\u017e\u00edv\u00e1n.",
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9"
+        },
         "error": {
             "identifier_exists": "\u00da\u010det je ji\u017e zaregistrov\u00e1n",
-            "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje"
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "step": {
+            "mfa": {
+                "title": "V\u00edcefaktorov\u00e9 ov\u011b\u0159ov\u00e1n\u00ed SimpliSafe"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Heslo"
+                },
+                "title": "Znovu ov\u011b\u0159it integraci"
+            },
             "user": {
                 "data": {
+                    "code": "K\u00f3d (pou\u017eit\u00fd v u\u017eivatelsk\u00e9m rozhran\u00ed Home Assistant)",
                     "password": "Heslo",
-                    "username": "E-mailov\u00e1 adresa"
+                    "username": "E-mail"
                 },
-                "title": "Vypl\u0148te va\u0161e \u00fadaje"
+                "title": "Vypl\u0148te sv\u00e9 \u00fadaje."
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "code": "K\u00f3d (pou\u017e\u00edt\u00fd v u\u017eivatelsk\u00e9m rozhran\u00ed Home Assistant)"
+                },
+                "title": "Nastavte SimpliSafe"
             }
         }
     }
diff --git a/homeassistant/components/simplisafe/translations/en.json b/homeassistant/components/simplisafe/translations/en.json
index 7e2cf0bf98a..57a669444e5 100644
--- a/homeassistant/components/simplisafe/translations/en.json
+++ b/homeassistant/components/simplisafe/translations/en.json
@@ -2,10 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "This SimpliSafe account is already in use.",
-            "reauth_successful": "SimpliSafe successfully reauthenticated."
+            "reauth_successful": "Re-authentication was successful"
         },
         "error": {
             "identifier_exists": "Account already registered",
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid credentials",
             "still_awaiting_mfa": "Still awaiting MFA email click",
             "unknown": "Unexpected error"
@@ -20,7 +21,7 @@
                     "password": "Password"
                 },
                 "description": "Your access token has expired or been revoked. Enter your password to re-link your account.",
-                "title": "Re-link SimpliSafe Account"
+                "title": "Reauthenticate Integration"
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/simplisafe/translations/es.json b/homeassistant/components/simplisafe/translations/es.json
index 0c177fd02ff..4437abd9819 100644
--- a/homeassistant/components/simplisafe/translations/es.json
+++ b/homeassistant/components/simplisafe/translations/es.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Esta cuenta SimpliSafe ya est\u00e1 en uso.",
-            "reauth_successful": "SimpliSafe se volvi\u00f3 a autenticar con \u00e9xito."
+            "reauth_successful": "La reautenticaci\u00f3n se realiz\u00f3 correctamente"
         },
         "error": {
             "identifier_exists": "Cuenta ya registrada",
diff --git a/homeassistant/components/simplisafe/translations/et.json b/homeassistant/components/simplisafe/translations/et.json
new file mode 100644
index 00000000000..95a24352db9
--- /dev/null
+++ b/homeassistant/components/simplisafe/translations/et.json
@@ -0,0 +1,28 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "See SimpliSafe'i konto on juba kasutusel.",
+            "reauth_successful": "Taasautentimine \u00f5nnestus"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_credentials": "Sobimatu mandaat",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "reauth_confirm": {
+                "data": {
+                    "password": "Salas\u00f5na"
+                },
+                "description": "Juurdep\u00e4\u00e4suluba on aegunud v\u00f5i see on t\u00fchistatud. Konto uuesti linkimiseks sisesta oma parool.",
+                "title": "Taastuvasta SimpliSafe'i konto"
+            },
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "E-post"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/simplisafe/translations/it.json b/homeassistant/components/simplisafe/translations/it.json
index 2d293ab1bb3..69c720109a6 100644
--- a/homeassistant/components/simplisafe/translations/it.json
+++ b/homeassistant/components/simplisafe/translations/it.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Questo account SimpliSafe \u00e8 gi\u00e0 in uso.",
-            "reauth_successful": "SimpliSafe riautenticato correttamente."
+            "reauth_successful": "La riautenticazione ha avuto successo"
         },
         "error": {
             "identifier_exists": "Account gi\u00e0 registrato",
diff --git a/homeassistant/components/simplisafe/translations/lb.json b/homeassistant/components/simplisafe/translations/lb.json
index d81ddd63f0b..3d6865402aa 100644
--- a/homeassistant/components/simplisafe/translations/lb.json
+++ b/homeassistant/components/simplisafe/translations/lb.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "D\u00ebse SimpliSafe Kont g\u00ebtt scho benotzt.",
-            "reauth_successful": "SimpliSafe erfollegr\u00e4ich re-authentifiz\u00e9iert."
+            "reauth_successful": "Erfollegr\u00e4ich re-authentifiz\u00e9iert."
         },
         "error": {
             "identifier_exists": "Konto ass scho registr\u00e9iert",
diff --git a/homeassistant/components/simplisafe/translations/no.json b/homeassistant/components/simplisafe/translations/no.json
index 664bb912528..dd47ea5e8e2 100644
--- a/homeassistant/components/simplisafe/translations/no.json
+++ b/homeassistant/components/simplisafe/translations/no.json
@@ -2,10 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "Denne SimpliSafe-kontoen er allerede i bruk.",
-            "reauth_successful": "SimpliSafe gjenautentisering er vellykket."
+            "reauth_successful": "Reautentisering var vellykket"
         },
         "error": {
             "identifier_exists": "Konto er allerede registrert",
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig legitimasjon",
             "still_awaiting_mfa": "Forventer fortsatt MFA-e-postklikk",
             "unknown": "Uventet feil"
@@ -13,20 +14,20 @@
         "step": {
             "mfa": {
                 "description": "Sjekk e-posten din for en lenke fra SimpliSafe. Etter \u00e5 ha bekreftet lenken, g\u00e5 tilbake hit for \u00e5 fullf\u00f8re installasjonen av integrasjonen.",
-                "title": "SimpliSafe Multi-Factor Autentisering"
+                "title": "SimpliSafe flerfaktorautentisering"
             },
             "reauth_confirm": {
                 "data": {
                     "password": "Passord"
                 },
                 "description": "Adgangstokenet ditt har utl\u00f8pt eller blitt opphevet. Skriv inn passordet ditt for \u00e5 koble kontoen din p\u00e5 nytt.",
-                "title": "Koble SimpliSafe-kontoen p\u00e5 nytt"
+                "title": "Bekreft integrering p\u00e5 nytt"
             },
             "user": {
                 "data": {
                     "code": "Kode (brukt i Home Assistant brukergrensesnittet)",
                     "password": "Passord",
-                    "username": "E-postadresse"
+                    "username": "E-post"
                 },
                 "title": "Fyll ut informasjonen din."
             }
diff --git a/homeassistant/components/simplisafe/translations/pl.json b/homeassistant/components/simplisafe/translations/pl.json
index 955dc5e311e..47741d56178 100644
--- a/homeassistant/components/simplisafe/translations/pl.json
+++ b/homeassistant/components/simplisafe/translations/pl.json
@@ -1,26 +1,35 @@
 {
     "config": {
         "abort": {
-            "already_configured": "To konto SimpliSafe jest ju\u017c w u\u017cyciu."
+            "already_configured": "To konto SimpliSafe jest ju\u017c w u\u017cyciu",
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119"
         },
         "error": {
-            "identifier_exists": "Konto jest ju\u017c zarejestrowane.",
+            "identifier_exists": "Konto jest ju\u017c zarejestrowane",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_credentials": "Nieprawid\u0142owe dane uwierzytelniaj\u0105ce",
+            "still_awaiting_mfa": "Wci\u0105\u017c nie potwierdzono linka w e-mailu od SimpliSafe",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
+            "mfa": {
+                "description": "Sprawd\u017a e-mail od SimpliSafe. Po zweryfikowaniu linka, wr\u00f3\u0107 tutaj, aby doko\u0144czy\u0107 instalacj\u0119 integracji.",
+                "title": "Uwierzytelnianie wielosk\u0142adnikowe SimpliSafe"
+            },
             "reauth_confirm": {
                 "data": {
                     "password": "Has\u0142o"
-                }
+                },
+                "description": "Tw\u00f3j token dost\u0119pu wygas\u0142 lub zosta\u0142 uniewa\u017cniony. Wprowad\u017a has\u0142o, aby ponownie po\u0142\u0105czy\u0107 swoje konto.",
+                "title": "Ponownie uwierzytelnij integracj\u0119"
             },
             "user": {
                 "data": {
-                    "code": "Kod (u\u017cywany w interfejsie Home Assistanta)",
+                    "code": "Kod (u\u017cywany w interfejsie Home Assistant)",
                     "password": "Has\u0142o",
                     "username": "Adres e-mail"
                 },
-                "title": "Wprowad\u017a dane"
+                "title": "Wprowad\u017a dane."
             }
         }
     },
@@ -28,7 +37,7 @@
         "step": {
             "init": {
                 "data": {
-                    "code": "Kod (u\u017cywany w interfejsie u\u017cytkownika Home Assistanta)"
+                    "code": "Kod (u\u017cywany w interfejsie u\u017cytkownika Home Assistant)"
                 },
                 "title": "Konfiguracja SimpliSafe"
             }
diff --git a/homeassistant/components/simplisafe/translations/ru.json b/homeassistant/components/simplisafe/translations/ru.json
index 03e4cfdcf24..6f63e07a9f1 100644
--- a/homeassistant/components/simplisafe/translations/ru.json
+++ b/homeassistant/components/simplisafe/translations/ru.json
@@ -2,10 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
-            "reauth_successful": "\u0410\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0439\u0434\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
+            "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
         },
         "error": {
             "identifier_exists": "\u0423\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0430.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.",
             "still_awaiting_mfa": "\u041e\u0436\u0438\u0434\u0430\u043d\u0438\u0435 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f, \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043d\u043e\u0433\u043e \u043f\u043e \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u0435.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
@@ -20,7 +21,7 @@
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c"
                 },
                 "description": "\u0412\u0430\u0448 \u0442\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u0438\u0441\u0442\u0435\u043a \u0438\u043b\u0438 \u0431\u044b\u043b \u0430\u043d\u043d\u0443\u043b\u0438\u0440\u043e\u0432\u0430\u043d. \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043f\u0430\u0440\u043e\u043b\u044c, \u0447\u0442\u043e\u0431\u044b \u0437\u0430\u043d\u043e\u0432\u043e \u043f\u0440\u0438\u0432\u044f\u0437\u0430\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c.",
-                "title": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u043f\u0440\u0438\u0432\u044f\u0437\u043a\u0430 \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u0430 SimpliSafe"
+                "title": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0444\u0438\u043b\u044f"
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/simplisafe/translations/zh-Hans.json b/homeassistant/components/simplisafe/translations/zh-Hans.json
index 721ce3a94f4..e4bb147aea2 100644
--- a/homeassistant/components/simplisafe/translations/zh-Hans.json
+++ b/homeassistant/components/simplisafe/translations/zh-Hans.json
@@ -2,6 +2,7 @@
     "config": {
         "error": {
             "identifier_exists": "\u8d26\u6237\u5df2\u6ce8\u518c",
+            "invalid_auth": "\u65e0\u6548\u7684\u8eab\u4efd\u9a8c\u8bc1",
             "invalid_credentials": "\u65e0\u6548\u7684\u8eab\u4efd\u8ba4\u8bc1"
         },
         "step": {
diff --git a/homeassistant/components/simplisafe/translations/zh-Hant.json b/homeassistant/components/simplisafe/translations/zh-Hant.json
index 4b195cc5466..e7302d8c7a1 100644
--- a/homeassistant/components/simplisafe/translations/zh-Hant.json
+++ b/homeassistant/components/simplisafe/translations/zh-Hant.json
@@ -2,10 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "\u6b64 SimpliSafe \u5e33\u865f\u5df2\u88ab\u4f7f\u7528\u3002",
-            "reauth_successful": "SimpliSafe \u5df2\u6210\u529f\u8a8d\u8b49\u3002"
+            "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f"
         },
         "error": {
             "identifier_exists": "\u5e33\u865f\u5df2\u8a3b\u518a",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u6191\u8b49\u7121\u6548",
             "still_awaiting_mfa": "\u4ecd\u5728\u7b49\u5019\u9ede\u64ca\u591a\u6b65\u9a5f\u8a8d\u8b49\u90f5\u4ef6",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
@@ -20,7 +21,7 @@
                     "password": "\u5bc6\u78bc"
                 },
                 "description": "\u5b58\u53d6\u5bc6\u9470\u5df2\u7d93\u904e\u671f\u6216\u53d6\u6d88\uff0c\u8acb\u8f38\u5165\u5bc6\u78bc\u4ee5\u91cd\u65b0\u9023\u7d50\u5e33\u865f\u3002",
-                "title": "\u91cd\u65b0\u9023\u7d50 SimpliSafe \u5e33\u865f"
+                "title": "\u91cd\u65b0\u8a8d\u8b49\u6574\u5408"
             },
             "user": {
                 "data": {
diff --git a/homeassistant/components/simulated/sensor.py b/homeassistant/components/simulated/sensor.py
index d05448a82c7..7f484b712c1 100644
--- a/homeassistant/components/simulated/sensor.py
+++ b/homeassistant/components/simulated/sensor.py
@@ -1,6 +1,5 @@
 """Adds a simulated sensor."""
 from datetime import datetime
-import logging
 import math
 from random import Random
 
@@ -12,8 +11,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 import homeassistant.util.dt as dt_util
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_AMP = "amplitude"
 CONF_FWHM = "spread"
 CONF_MEAN = "mean"
@@ -142,7 +139,7 @@ class SimulatedSensor(Entity):
     @property
     def device_state_attributes(self):
         """Return other details about the sensor state."""
-        attr = {
+        return {
             "amplitude": self._amp,
             "mean": self._mean,
             "period": self._period,
@@ -151,4 +148,3 @@ class SimulatedSensor(Entity):
             "seed": self._seed,
             "relative_to_epoch": self._relative_to_epoch,
         }
-        return attr
diff --git a/homeassistant/components/sisyphus/media_player.py b/homeassistant/components/sisyphus/media_player.py
index 27d470ce885..8f55fce1178 100644
--- a/homeassistant/components/sisyphus/media_player.py
+++ b/homeassistant/components/sisyphus/media_player.py
@@ -1,6 +1,4 @@
 """Support for track controls on the Sisyphus Kinetic Art Table."""
-import logging
-
 import aiohttp
 from sisyphus_control import Track
 
@@ -27,8 +25,6 @@ from homeassistant.exceptions import PlatformNotReady
 
 from . import DATA_SISYPHUS
 
-_LOGGER = logging.getLogger(__name__)
-
 MEDIA_TYPE_TRACK = "sisyphus_track"
 
 SUPPORTED_FEATURES = (
diff --git a/homeassistant/components/skybell/__init__.py b/homeassistant/components/skybell/__init__.py
index 9606d9bcf12..c1c9d76314c 100644
--- a/homeassistant/components/skybell/__init__.py
+++ b/homeassistant/components/skybell/__init__.py
@@ -77,11 +77,6 @@ class SkybellDevice(Entity):
         """Initialize a sensor for Skybell device."""
         self._device = device
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     def update(self):
         """Update automation state."""
         self._device.refresh()
diff --git a/homeassistant/components/skybell/binary_sensor.py b/homeassistant/components/skybell/binary_sensor.py
index 94f64a4eb43..512731ab355 100644
--- a/homeassistant/components/skybell/binary_sensor.py
+++ b/homeassistant/components/skybell/binary_sensor.py
@@ -1,6 +1,5 @@
 """Binary sensor support for the Skybell HD Doorbell."""
 from datetime import timedelta
-import logging
 
 import voluptuous as vol
 
@@ -15,8 +14,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import DEFAULT_ENTITY_NAMESPACE, DOMAIN as SKYBELL_DOMAIN, SkybellDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 SCAN_INTERVAL = timedelta(seconds=5)
 
 # Sensor types: Name, device_class, event
diff --git a/homeassistant/components/skybell/light.py b/homeassistant/components/skybell/light.py
index 273cdfd079c..aecaea01d2a 100644
--- a/homeassistant/components/skybell/light.py
+++ b/homeassistant/components/skybell/light.py
@@ -1,6 +1,4 @@
 """Light/LED support for the Skybell HD Doorbell."""
-import logging
-
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_HS_COLOR,
@@ -12,8 +10,6 @@ import homeassistant.util.color as color_util
 
 from . import DOMAIN as SKYBELL_DOMAIN, SkybellDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform for a Skybell device."""
diff --git a/homeassistant/components/skybell/sensor.py b/homeassistant/components/skybell/sensor.py
index 24b63b6271c..09a7400a035 100644
--- a/homeassistant/components/skybell/sensor.py
+++ b/homeassistant/components/skybell/sensor.py
@@ -1,6 +1,5 @@
 """Sensor support for Skybell Doorbells."""
 from datetime import timedelta
-import logging
 
 import voluptuous as vol
 
@@ -10,8 +9,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import DEFAULT_ENTITY_NAMESPACE, DOMAIN as SKYBELL_DOMAIN, SkybellDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 SCAN_INTERVAL = timedelta(seconds=30)
 
 # Sensor types: Name, icon
diff --git a/homeassistant/components/skybell/switch.py b/homeassistant/components/skybell/switch.py
index 97a1d2a4c00..3d1d890b295 100644
--- a/homeassistant/components/skybell/switch.py
+++ b/homeassistant/components/skybell/switch.py
@@ -1,6 +1,4 @@
 """Switch support for the Skybell HD Doorbell."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
@@ -9,8 +7,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import DEFAULT_ENTITY_NAMESPACE, DOMAIN as SKYBELL_DOMAIN, SkybellDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 # Switch types: Name
 SWITCH_TYPES = {
     "do_not_disturb": ["Do Not Disturb"],
diff --git a/homeassistant/components/slack/notify.py b/homeassistant/components/slack/notify.py
index 8477b2fb501..88317b31585 100644
--- a/homeassistant/components/slack/notify.py
+++ b/homeassistant/components/slack/notify.py
@@ -32,7 +32,6 @@ ATTR_PASSWORD = "password"
 ATTR_PATH = "path"
 ATTR_URL = "url"
 ATTR_USERNAME = "username"
-ATTR_USERNAME = "username"
 
 CONF_DEFAULT_CHANNEL = "default_channel"
 
@@ -119,7 +118,7 @@ def _async_templatize_blocks(hass, value):
         }
 
     tmpl = template.Template(value, hass=hass)
-    return tmpl.async_render()
+    return tmpl.async_render(parse_result=False)
 
 
 class SlackNotificationService(BaseNotificationService):
@@ -209,8 +208,9 @@ class SlackNotificationService(BaseNotificationService):
             "username": username,
         }
 
-        if self._icon:
-            if self._icon.lower().startswith(("http://", "https://")):
+        icon = icon or self._icon
+        if icon:
+            if icon.lower().startswith(("http://", "https://")):
                 icon_type = "url"
             else:
                 icon_type = "emoji"
diff --git a/homeassistant/components/smappee/binary_sensor.py b/homeassistant/components/smappee/binary_sensor.py
index 49d21f2b2c1..4cc5cca9a23 100644
--- a/homeassistant/components/smappee/binary_sensor.py
+++ b/homeassistant/components/smappee/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for monitoring a Smappee appliance binary sensor."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_PRESENCE,
     BinarySensorEntity,
@@ -8,8 +6,6 @@ from homeassistant.components.binary_sensor import (
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 BINARY_SENSOR_PREFIX = "Appliance"
 PRESENCE_PREFIX = "Presence"
 
diff --git a/homeassistant/components/smappee/config_flow.py b/homeassistant/components/smappee/config_flow.py
index 26a47815f34..c6d208626e4 100644
--- a/homeassistant/components/smappee/config_flow.py
+++ b/homeassistant/components/smappee/config_flow.py
@@ -17,8 +17,6 @@ from .const import (
     SUPPORTED_LOCAL_DEVICES,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class SmappeeFlowHandler(
     config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
@@ -94,7 +92,7 @@ class SmappeeFlowHandler(
         smappee_api = api.api.SmappeeLocalApi(ip=ip_address)
         logon = await self.hass.async_add_executor_job(smappee_api.logon)
         if logon is None:
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
 
         return self.async_create_entry(
             title=f"{DOMAIN}{serial_number}",
@@ -149,7 +147,7 @@ class SmappeeFlowHandler(
         smappee_api = api.api.SmappeeLocalApi(ip=ip_address)
         logon = await self.hass.async_add_executor_job(smappee_api.logon)
         if logon is None:
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
 
         advanced_config = await self.hass.async_add_executor_job(
             smappee_api.load_advanced_config
diff --git a/homeassistant/components/smappee/sensor.py b/homeassistant/components/smappee/sensor.py
index dd145c4cdce..41041c1a002 100644
--- a/homeassistant/components/smappee/sensor.py
+++ b/homeassistant/components/smappee/sensor.py
@@ -1,13 +1,9 @@
 """Support for monitoring a Smappee energy sensor."""
-import logging
-
 from homeassistant.const import DEVICE_CLASS_POWER, ENERGY_WATT_HOUR, POWER_WATT, VOLT
 from homeassistant.helpers.entity import Entity
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 TREND_SENSORS = {
     "total_power": [
         "Total consumption - Active power",
diff --git a/homeassistant/components/smappee/strings.json b/homeassistant/components/smappee/strings.json
index 63cf4254e54..25fa2846117 100644
--- a/homeassistant/components/smappee/strings.json
+++ b/homeassistant/components/smappee/strings.json
@@ -25,9 +25,9 @@
     "abort": {
       "already_configured_device": "[%key:common::config_flow::abort::already_configured_device%]",
       "already_configured_local_device": "Local device(s) is already configured. Please remove those first before configuring a cloud device.",
-      "authorize_url_timeout": "Timeout generating authorize url.",
-      "connection_error": "Failed to connect to Smappee device.",
-      "missing_configuration": "The component is not configured. Please follow the documentation.",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
       "invalid_mdns": "Unsupported device for the Smappee integration.",
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]"
     }
diff --git a/homeassistant/components/smappee/switch.py b/homeassistant/components/smappee/switch.py
index bbcacc7d541..46322f413e9 100644
--- a/homeassistant/components/smappee/switch.py
+++ b/homeassistant/components/smappee/switch.py
@@ -1,12 +1,8 @@
 """Support for interacting with Smappee Comport Plugs, Switches and Output Modules."""
-import logging
-
 from homeassistant.components.switch import SwitchEntity
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 SWITCH_PREFIX = "Switch"
 ICON = "mdi:toggle-switch"
 
diff --git a/homeassistant/components/smappee/translations/ca.json b/homeassistant/components/smappee/translations/ca.json
index ee905f0ca84..d2633ace026 100644
--- a/homeassistant/components/smappee/translations/ca.json
+++ b/homeassistant/components/smappee/translations/ca.json
@@ -3,7 +3,8 @@
         "abort": {
             "already_configured_device": "El dispositiu ja est\u00e0 configurat",
             "already_configured_local_device": "Dispositiu(s) local ja configurat. Elimina'ls primer abans de configurar un dispositiu al n\u00favol.",
-            "authorize_url_timeout": "Temps d'espera esgotat generant l'URL d'autoritzaci\u00f3.",
+            "authorize_url_timeout": "Temps d'espera esgotat durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar amb el Smappee.",
             "invalid_mdns": "Dispositiu no compatible amb la integraci\u00f3 de Smappee.",
             "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
@@ -24,7 +25,7 @@
                 "description": "Introdueix l'amfitri\u00f3 per iniciar la integraci\u00f3 local de Smappee"
             },
             "pick_implementation": {
-                "title": "Selecci\u00f3 del m\u00e8tode d'autenticaci\u00f3"
+                "title": "Selecciona el m\u00e8tode d'autenticaci\u00f3"
             },
             "zeroconf_confirm": {
                 "description": "Vols afegir el dispositiu Smappee amb n\u00famero de s\u00e8rie `{serialnumber}` a Home Assistant?",
diff --git a/homeassistant/components/smappee/translations/cs.json b/homeassistant/components/smappee/translations/cs.json
new file mode 100644
index 00000000000..723df988a1f
--- /dev/null
+++ b/homeassistant/components/smappee/translations/cs.json
@@ -0,0 +1,34 @@
+{
+    "config": {
+        "abort": {
+            "already_configured_device": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed Smappee se nezda\u0159ilo.",
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "no_url_available": "Nen\u00ed k dispozici \u017e\u00e1dn\u00e1 adresa URL. Informace o t\u00e9to chyb\u011b naleznete [v sekci n\u00e1pov\u011bdy]({docs_url})"
+        },
+        "flow_title": "Smappee: {name}",
+        "step": {
+            "environment": {
+                "data": {
+                    "environment": "Prost\u0159ed\u00ed"
+                },
+                "description": "Nastavte Smappee k integraci s Home Assistant."
+            },
+            "local": {
+                "data": {
+                    "host": "Hostitel"
+                },
+                "description": "Zadejte hostitele a zahajte m\u00edstn\u00ed integraci Smappee"
+            },
+            "pick_implementation": {
+                "title": "Vyberte metodu ov\u011b\u0159en\u00ed"
+            },
+            "zeroconf_confirm": {
+                "description": "Chcete p\u0159idat za\u0159\u00edzen\u00ed Smappee se s\u00e9riov\u00fdm \u010d\u00edslem \"{serialnumber}\" do Home Assistant?",
+                "title": "Objeven\u00e9 za\u0159\u00edzen\u00ed Smappee"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smappee/translations/en.json b/homeassistant/components/smappee/translations/en.json
index a6cd10d0806..9d7c7f2c507 100644
--- a/homeassistant/components/smappee/translations/en.json
+++ b/homeassistant/components/smappee/translations/en.json
@@ -3,7 +3,8 @@
         "abort": {
             "already_configured_device": "Device is already configured",
             "already_configured_local_device": "Local device(s) is already configured. Please remove those first before configuring a cloud device.",
-            "authorize_url_timeout": "Timeout generating authorize url.",
+            "authorize_url_timeout": "Timeout generating authorize URL.",
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect to Smappee device.",
             "invalid_mdns": "Unsupported device for the Smappee integration.",
             "missing_configuration": "The component is not configured. Please follow the documentation.",
diff --git a/homeassistant/components/smappee/translations/es.json b/homeassistant/components/smappee/translations/es.json
index 5d65081f9f6..f4dc1c69a41 100644
--- a/homeassistant/components/smappee/translations/es.json
+++ b/homeassistant/components/smappee/translations/es.json
@@ -4,9 +4,10 @@
             "already_configured_device": "El dispositivo ya est\u00e1 configurado",
             "already_configured_local_device": "Los dispositivos locales ya est\u00e1n configurados. Elim\u00ednelos primero antes de configurar un dispositivo en la nube.",
             "authorize_url_timeout": "Tiempo de espera agotado generando la url de autorizaci\u00f3n.",
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se pudo conectar al dispositivo Smappee.",
             "invalid_mdns": "Dispositivo no compatible para la integraci\u00f3n de Smappee.",
-            "missing_configuration": "El componente no est\u00e1 configurado. Por favor, siga la documentaci\u00f3n.",
+            "missing_configuration": "El componente no est\u00e1 configurado. Consulta la documentaci\u00f3n.",
             "no_url_available": "No hay URL disponible. Para obtener informaci\u00f3n sobre este error, [consulta la secci\u00f3n de ayuda]({docs_url})"
         },
         "flow_title": "Smappee: {name}",
@@ -24,7 +25,7 @@
                 "description": "Ingrese el host para iniciar la integraci\u00f3n local de Smappee"
             },
             "pick_implementation": {
-                "title": "Elija el m\u00e9todo de autenticaci\u00f3n"
+                "title": "Selecciona el m\u00e9todo de autenticaci\u00f3n"
             },
             "zeroconf_confirm": {
                 "description": "\u00bfDesea agregar el dispositivo Smappee con el n\u00famero de serie `{serialnumber}` a Home Assistant?",
diff --git a/homeassistant/components/smappee/translations/et.json b/homeassistant/components/smappee/translations/et.json
new file mode 100644
index 00000000000..b57bd9b81ff
--- /dev/null
+++ b/homeassistant/components/smappee/translations/et.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "abort": {
+            "already_configured_device": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_configured_local_device": "Kohalikud seadmed on juba seadistatud. Enne pilveseadme seadistamist eemaldage need.",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "Smappee seadmega \u00fchenduse loomine nurjus.",
+            "invalid_mdns": "Seade ei toeta Smappee'ga sidumist.",
+            "missing_configuration": "Osis pole seadistatud. Palun vaata dokumentatsiooni.",
+            "no_url_available": "URL pole saadaval. Rohkem teavet [check the help section]({docs_url})"
+        },
+        "step": {
+            "local": {
+                "data": {
+                    "host": ""
+                },
+                "description": "Smappee kohaliku sidumise algatamiseks sisestage hostinimi"
+            },
+            "pick_implementation": {
+                "title": "Vali tuvastusmeetod"
+            },
+            "zeroconf_confirm": {
+                "description": "Kas soovid lisada Home Assistanti Smappee seadme seerianumbriga \" {serial_number} \"?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smappee/translations/it.json b/homeassistant/components/smappee/translations/it.json
index 3a2cc535c6d..e189cb2f3f2 100644
--- a/homeassistant/components/smappee/translations/it.json
+++ b/homeassistant/components/smappee/translations/it.json
@@ -4,6 +4,7 @@
             "already_configured_device": "Il dispositivo \u00e8 gi\u00e0 configurato",
             "already_configured_local_device": "L'apparecchio o gli apparecchi locali sono gi\u00e0 configurati. Si prega di rimuoverli prima di configurare un dispositivo cloud.",
             "authorize_url_timeout": "Tempo scaduto nel generare l'URL di autorizzazione.",
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi al dispositivo Smappee.",
             "invalid_mdns": "Dispositivo non supportato per l'integrazione Smappee.",
             "missing_configuration": "Il componente non \u00e8 configurato. Si prega di seguire la documentazione.",
diff --git a/homeassistant/components/smappee/translations/lb.json b/homeassistant/components/smappee/translations/lb.json
index 90dd0b10486..67496878870 100644
--- a/homeassistant/components/smappee/translations/lb.json
+++ b/homeassistant/components/smappee/translations/lb.json
@@ -4,6 +4,7 @@
             "already_configured_device": "Apparat ass scho konfigur\u00e9iert",
             "already_configured_local_device": "Lokalen Apparat ass scho konfigur\u00e9iert. L\u00e4sch d\u00e9i iers de ee Cloud Apparat dob\u00e4isetz.",
             "authorize_url_timeout": "Z\u00e4it Iwwerschreidung beim gener\u00e9ieren vun der Autorisatiouns URL.",
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbannen mam Smappee Apparat.",
             "invalid_mdns": "Net \u00ebnnerst\u00ebtzten Apparat fir Smappee Integratioun.",
             "missing_configuration": "Komponent ass nach net konfigur\u00e9iert. Follegt w.e.g der Dokumentatioun.",
diff --git a/homeassistant/components/smappee/translations/nl.json b/homeassistant/components/smappee/translations/nl.json
new file mode 100644
index 00000000000..7cb0141826a
--- /dev/null
+++ b/homeassistant/components/smappee/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "Kan geen verbinding maken"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smappee/translations/no.json b/homeassistant/components/smappee/translations/no.json
index 11b8b1bdd30..5cefda545ba 100644
--- a/homeassistant/components/smappee/translations/no.json
+++ b/homeassistant/components/smappee/translations/no.json
@@ -3,13 +3,14 @@
         "abort": {
             "already_configured_device": "Enheten er allerede konfigurert",
             "already_configured_local_device": "Lokale enheter er allerede konfigurert. Fjern de f\u00f8rst f\u00f8r du konfigurerer en skyenhet.",
-            "authorize_url_timeout": "Tidsavbrudd ved generering av autoriseringsadresse.",
+            "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kunne ikke koble til Smappee-enheten.",
             "invalid_mdns": "Ikke-st\u00f8ttet enhet for Smappee-integrasjonen.",
             "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
-            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk {docs_url} ] ( {docs_url} )"
+            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk hjelpseksjonen]({docs_url})"
         },
-        "flow_title": "Smappee: {navn}",
+        "flow_title": "",
         "step": {
             "environment": {
                 "data": {
diff --git a/homeassistant/components/smappee/translations/pl.json b/homeassistant/components/smappee/translations/pl.json
index 921f80323f9..e23211713d8 100644
--- a/homeassistant/components/smappee/translations/pl.json
+++ b/homeassistant/components/smappee/translations/pl.json
@@ -2,22 +2,34 @@
     "config": {
         "abort": {
             "already_configured_device": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
-            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105."
+            "already_configured_local_device": "Urz\u0105dzenie(-a) lokalne jest ju\u017c skonfigurowane. Usu\u0144 je najpierw przed skonfigurowaniem urz\u0105dzenia w chmurze.",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z urz\u0105dzeniem Smappee",
+            "invalid_mdns": "Nieobs\u0142ugiwane urz\u0105dzenie dla integracji Smappee",
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_url_available": "Brak dost\u0119pnego adresu URL. Aby uzyska\u0107 informacje na temat tego b\u0142\u0119du, [sprawd\u017a sekcj\u0119 pomocy] ({docs_url})"
         },
+        "flow_title": "Smappee: {name}",
         "step": {
             "environment": {
                 "data": {
                     "environment": "\u015arodowisko"
-                }
+                },
+                "description": "Skonfiguruj Smappee, aby zintegrowa\u0107 go z Home Assistant."
             },
             "local": {
                 "data": {
                     "host": "Nazwa hosta lub adres IP"
-                }
+                },
+                "description": "Wprowad\u017a nazw\u0119 hosta, aby zainicjowa\u0107 lokaln\u0105 integracj\u0119 Smappee"
             },
             "pick_implementation": {
                 "title": "Wybierz metod\u0119 uwierzytelniania"
+            },
+            "zeroconf_confirm": {
+                "description": "Czy chcesz doda\u0107 do Home Assistant urz\u0105dzenie Smappee o numerze seryjnym `{serialnumber}`?",
+                "title": "Wykryto urz\u0105dzenie Smappee"
             }
         }
     }
diff --git a/homeassistant/components/smappee/translations/ru.json b/homeassistant/components/smappee/translations/ru.json
index 37434488e3d..7f4c737a71b 100644
--- a/homeassistant/components/smappee/translations/ru.json
+++ b/homeassistant/components/smappee/translations/ru.json
@@ -4,6 +4,7 @@
             "already_configured_device": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "already_configured_local_device": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0434\u043b\u044f \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0445 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432. \u041d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0438\u0445 \u043f\u0435\u0440\u0435\u0434 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u043e\u0439 \u043e\u0431\u043b\u0430\u0447\u043d\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430.",
             "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443.",
             "invalid_mdns": "\u041d\u0435\u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u043e\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e.",
             "missing_configuration": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
diff --git a/homeassistant/components/smappee/translations/zh-Hant.json b/homeassistant/components/smappee/translations/zh-Hant.json
index 5374c535a12..928a45352ac 100644
--- a/homeassistant/components/smappee/translations/zh-Hant.json
+++ b/homeassistant/components/smappee/translations/zh-Hant.json
@@ -4,6 +4,7 @@
             "already_configured_device": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "already_configured_local_device": "\u672c\u5730\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\uff0c\u8acb\u5148\u9032\u884c\u79fb\u9664\u5f8c\u518d\u8a2d\u5b9a\u96f2\u7aef\u8a2d\u5099\u3002",
             "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "Smappee \u8a2d\u5099\u9023\u7dda\u5931\u6557\u3002",
             "invalid_mdns": "Smappee \u6574\u5408\u4e0d\u652f\u63f4\u7684\u8a2d\u5099\u3002",
             "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
diff --git a/homeassistant/components/smart_meter_texas/sensor.py b/homeassistant/components/smart_meter_texas/sensor.py
index c08301d7021..e65fbdcb531 100644
--- a/homeassistant/components/smart_meter_texas/sensor.py
+++ b/homeassistant/components/smart_meter_texas/sensor.py
@@ -1,6 +1,4 @@
 """Support for Smart Meter Texas sensors."""
-import logging
-
 from smart_meter_texas import Meter
 
 from homeassistant.const import CONF_ADDRESS, ENERGY_KILO_WATT_HOUR
@@ -20,8 +18,6 @@ from .const import (
     METER_NUMBER,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Smart Meter Texas sensors."""
diff --git a/homeassistant/components/smart_meter_texas/translations/cs.json b/homeassistant/components/smart_meter_texas/translations/cs.json
new file mode 100644
index 00000000000..f662c3765cf
--- /dev/null
+++ b/homeassistant/components/smart_meter_texas/translations/cs.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "description": "Zadejte sv\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no a heslo pro Smart Meter Texas."
+            }
+        }
+    },
+    "title": "Smart Meter Texas"
+}
\ No newline at end of file
diff --git a/homeassistant/components/smart_meter_texas/translations/et.json b/homeassistant/components/smart_meter_texas/translations/et.json
new file mode 100644
index 00000000000..42bf8ce1ead
--- /dev/null
+++ b/homeassistant/components/smart_meter_texas/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "description": "Sisesta oma Smart Meter Texas'e konto kasutajanimi ja salas\u00f5na."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smart_meter_texas/translations/nl.json b/homeassistant/components/smart_meter_texas/translations/nl.json
index a40ab60cd1e..4b4275a8478 100644
--- a/homeassistant/components/smart_meter_texas/translations/nl.json
+++ b/homeassistant/components/smart_meter_texas/translations/nl.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        },
         "step": {
             "user": {
                 "data": {
diff --git a/homeassistant/components/smart_meter_texas/translations/no.json b/homeassistant/components/smart_meter_texas/translations/no.json
index 693c93376d8..1a2153c493c 100644
--- a/homeassistant/components/smart_meter_texas/translations/no.json
+++ b/homeassistant/components/smart_meter_texas/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
@@ -18,5 +18,5 @@
             }
         }
     },
-    "title": "Smart Meter Texas"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/smart_meter_texas/translations/pl.json b/homeassistant/components/smart_meter_texas/translations/pl.json
index 8a08a06c699..19257e3cf5c 100644
--- a/homeassistant/components/smart_meter_texas/translations/pl.json
+++ b/homeassistant/components/smart_meter_texas/translations/pl.json
@@ -13,8 +13,10 @@
                 "data": {
                     "password": "Has\u0142o",
                     "username": "Nazwa u\u017cytkownika"
-                }
+                },
+                "description": "Podaj swoj\u0105 nazw\u0119 u\u017cytkownika i has\u0142o do Smart Meter Texas."
             }
         }
-    }
+    },
+    "title": "Smart Meter Texas"
 }
\ No newline at end of file
diff --git a/homeassistant/components/smart_meter_texas/translations/zh-Hans.json b/homeassistant/components/smart_meter_texas/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/smart_meter_texas/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smarthab/config_flow.py b/homeassistant/components/smarthab/config_flow.py
index a277388c140..68f0460a4cc 100644
--- a/homeassistant/components/smarthab/config_flow.py
+++ b/homeassistant/components/smarthab/config_flow.py
@@ -65,13 +65,13 @@ class SmartHabConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                     title=username, data={CONF_EMAIL: username, CONF_PASSWORD: password}
                 )
 
-            errors["base"] = "wrong_login"
+            errors["base"] = "invalid_auth"
         except pysmarthab.RequestFailedException:
             _LOGGER.exception("Error while trying to reach SmartHab API")
             errors["base"] = "service"
         except Exception:  # pylint: disable=broad-except
             _LOGGER.exception("Unexpected error during login")
-            errors["base"] = "unknown_error"
+            errors["base"] = "unknown"
 
         return self._show_setup_form(user_input, errors)
 
diff --git a/homeassistant/components/smarthab/strings.json b/homeassistant/components/smarthab/strings.json
index f27e359257f..e1cb6eb4411 100644
--- a/homeassistant/components/smarthab/strings.json
+++ b/homeassistant/components/smarthab/strings.json
@@ -2,8 +2,8 @@
     "config": {
         "error": {
             "service": "Error while trying to reach SmartHab. Service might be down. Check your connection.",
-            "wrong_login": "[%key:common::config_flow::error::invalid_auth%]",
-            "unknown_error": "[%key:common::config_flow::error::unknown%]"
+            "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+            "unknown": "[%key:common::config_flow::error::unknown%]"
         },
         "step": {
             "user": {
@@ -16,4 +16,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/smarthab/translations/ca.json b/homeassistant/components/smarthab/translations/ca.json
index 58a85d750ba..f6551d62078 100644
--- a/homeassistant/components/smarthab/translations/ca.json
+++ b/homeassistant/components/smarthab/translations/ca.json
@@ -1,7 +1,9 @@
 {
     "config": {
         "error": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "service": "Error en l'intent de connexi\u00f3 a SmartHab. Pot ser que el servei no estigui disponible. Comprova la connexi\u00f3.",
+            "unknown": "Error inesperat",
             "unknown_error": "Error inesperat",
             "wrong_login": "Autenticaci\u00f3 inv\u00e0lida"
         },
diff --git a/homeassistant/components/smarthab/translations/cs.json b/homeassistant/components/smarthab/translations/cs.json
new file mode 100644
index 00000000000..3e8b1abfabf
--- /dev/null
+++ b/homeassistant/components/smarthab/translations/cs.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba",
+            "unknown_error": "Neo\u010dek\u00e1van\u00e1 chyba",
+            "wrong_login": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "email": "E-mail",
+                    "password": "Heslo"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smarthab/translations/de.json b/homeassistant/components/smarthab/translations/de.json
index 6e9dfcb40b7..04298404b55 100644
--- a/homeassistant/components/smarthab/translations/de.json
+++ b/homeassistant/components/smarthab/translations/de.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "unknown": "Unerwarteter Fehler",
             "unknown_error": "Unerwarteter Fehler"
         },
         "step": {
diff --git a/homeassistant/components/smarthab/translations/en.json b/homeassistant/components/smarthab/translations/en.json
index 49904071333..33f280a763d 100644
--- a/homeassistant/components/smarthab/translations/en.json
+++ b/homeassistant/components/smarthab/translations/en.json
@@ -1,7 +1,9 @@
 {
     "config": {
         "error": {
+            "invalid_auth": "Invalid authentication",
             "service": "Error while trying to reach SmartHab. Service might be down. Check your connection.",
+            "unknown": "Unexpected error",
             "unknown_error": "Unexpected error",
             "wrong_login": "Invalid authentication"
         },
diff --git a/homeassistant/components/smarthab/translations/es.json b/homeassistant/components/smarthab/translations/es.json
index 473e1945f74..90ea53cd65a 100644
--- a/homeassistant/components/smarthab/translations/es.json
+++ b/homeassistant/components/smarthab/translations/es.json
@@ -1,7 +1,9 @@
 {
     "config": {
         "error": {
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "service": "Error al intentar contactar con SmartHab. El servicio podr\u00eda estar ca\u00eddo. Verifica tu conexi\u00f3n.",
+            "unknown": "Error inesperado",
             "unknown_error": "Error inesperado",
             "wrong_login": "Autenticaci\u00f3n no v\u00e1lida"
         },
diff --git a/homeassistant/components/smarthab/translations/et.json b/homeassistant/components/smarthab/translations/et.json
new file mode 100644
index 00000000000..b0ef8d6bb48
--- /dev/null
+++ b/homeassistant/components/smarthab/translations/et.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "error": {
+            "invalid_auth": "Tuvastamise viga",
+            "unknown": "Tundmatu viga",
+            "unknown_error": "Tundmatu viga",
+            "wrong_login": "Tuvastamine nurjus"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smarthab/translations/it.json b/homeassistant/components/smarthab/translations/it.json
index 636a0af099b..07da9a0abe1 100644
--- a/homeassistant/components/smarthab/translations/it.json
+++ b/homeassistant/components/smarthab/translations/it.json
@@ -1,7 +1,9 @@
 {
     "config": {
         "error": {
+            "invalid_auth": "Autenticazione non valida",
             "service": "Errore durante il tentativo di raggiungere SmartHab. Il servizio potrebbe non essere attivo. Controllare la connessione.",
+            "unknown": "Errore imprevisto",
             "unknown_error": "Errore imprevisto",
             "wrong_login": "Autenticazione non valida"
         },
diff --git a/homeassistant/components/smarthab/translations/nl.json b/homeassistant/components/smarthab/translations/nl.json
new file mode 100644
index 00000000000..7e198e836d7
--- /dev/null
+++ b/homeassistant/components/smarthab/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "unknown": "Onverwachte fout"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smarthab/translations/no.json b/homeassistant/components/smarthab/translations/no.json
index de1e50f5c4b..50936181c59 100644
--- a/homeassistant/components/smarthab/translations/no.json
+++ b/homeassistant/components/smarthab/translations/no.json
@@ -1,7 +1,9 @@
 {
     "config": {
         "error": {
+            "invalid_auth": "Ugyldig godkjenning",
             "service": "Feil under fors\u00f8k p\u00e5 \u00e5 n\u00e5 SmartHab. Tjenesten kan v\u00e6re nede. Sjekk tilkoblingen din.",
+            "unknown": "Uventet feil",
             "unknown_error": "Uventet feil",
             "wrong_login": "Ugyldig godkjenning"
         },
diff --git a/homeassistant/components/smarthab/translations/pl.json b/homeassistant/components/smarthab/translations/pl.json
index 3d366edbf73..563019593bb 100644
--- a/homeassistant/components/smarthab/translations/pl.json
+++ b/homeassistant/components/smarthab/translations/pl.json
@@ -1,7 +1,9 @@
 {
     "config": {
         "error": {
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "service": "B\u0142\u0105d podczas pr\u00f3by osi\u0105gni\u0119cia SmartHab. Us\u0142uga mo\u017ce by\u0107 wy\u0142\u0105czna. Sprawd\u017a po\u0142\u0105czenie.",
+            "unknown": "Nieoczekiwany b\u0142\u0105d",
             "unknown_error": "Nieoczekiwany b\u0142\u0105d",
             "wrong_login": "Niepoprawne uwierzytelnienie"
         },
@@ -9,8 +11,9 @@
             "user": {
                 "data": {
                     "email": "Adres e-mail",
-                    "password": "[%key_id:common::config_flow::data::password%]"
+                    "password": "Has\u0142o"
                 },
+                "description": "Ze wzgl\u0119d\u00f3w technicznych, nale\u017cy u\u017cy\u0107 dodatkowego konta, specjalnie na u\u017cytek dla Home Assistant. Mo\u017cesz je utworzy\u0107 z poziomu aplikacji SmartHab.",
                 "title": "Konfiguracja SmartHab"
             }
         }
diff --git a/homeassistant/components/smarthab/translations/pt-BR.json b/homeassistant/components/smarthab/translations/pt-BR.json
new file mode 100644
index 00000000000..e1f66450b01
--- /dev/null
+++ b/homeassistant/components/smarthab/translations/pt-BR.json
@@ -0,0 +1,8 @@
+{
+    "config": {
+        "error": {
+            "invalid_auth": "Autentica\u00e7\u00e3o invalida",
+            "unknown": "Erro inesperado"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/smarthab/translations/ru.json b/homeassistant/components/smarthab/translations/ru.json
index 3b1824c810f..8f7c38aecc0 100644
--- a/homeassistant/components/smarthab/translations/ru.json
+++ b/homeassistant/components/smarthab/translations/ru.json
@@ -1,7 +1,9 @@
 {
     "config": {
         "error": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "service": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u043e\u043f\u044b\u0442\u043a\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438 \u043a SmartHab. \u0421\u0435\u0440\u0432\u0438\u0441 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
             "unknown_error": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430.",
             "wrong_login": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
         },
diff --git a/homeassistant/components/smarthab/translations/zh-Hant.json b/homeassistant/components/smarthab/translations/zh-Hant.json
index 2706a473cef..629f97762b9 100644
--- a/homeassistant/components/smarthab/translations/zh-Hant.json
+++ b/homeassistant/components/smarthab/translations/zh-Hant.json
@@ -1,7 +1,9 @@
 {
     "config": {
         "error": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "service": "\u5617\u8a66\u8a2a\u554f Smarthab \u6642\u767c\u751f\u932f\u8aa4\uff0c\u670d\u52d9\u53ef\u4ee5\u5df2\u7d93\u5931\u6548\uff0c\u8acb\u6aa2\u67e5\u9023\u7dda\u3002",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4",
             "unknown_error": "\u672a\u9810\u671f\u932f\u8aa4",
             "wrong_login": "\u9a57\u8b49\u78bc\u7121\u6548"
         },
diff --git a/homeassistant/components/smartthings/translations/cs.json b/homeassistant/components/smartthings/translations/cs.json
index 70c4571c3e0..a634bcceb0e 100644
--- a/homeassistant/components/smartthings/translations/cs.json
+++ b/homeassistant/components/smartthings/translations/cs.json
@@ -1,17 +1,35 @@
 {
     "config": {
+        "abort": {
+            "invalid_webhook_url": "Home Assistant nen\u00ed spr\u00e1vn\u011b nastaven pro p\u0159\u00edjem aktualizac\u00ed ze SmartThings. URL je neplatn\u00e1:\n> {webhook_url}\n\nAktualizujte sv\u00e9 nastaven\u00ed podle [pokyn\u016f]({component_url}), restartujte Home Assistant a zkuste to znovu.",
+            "no_available_locations": "V dom\u00e1c\u00ed asistenti nejsou k dispozici \u017e\u00e1dn\u00e1 um\u00edst\u011bn\u00ed SmartThings."
+        },
         "error": {
             "app_setup_error": "Nelze nastavit SmartApp. Pros\u00edm zkuste to znovu.",
             "token_forbidden": "Token nem\u00e1 po\u017eadovan\u00e9 rozsahy OAuth.",
             "token_invalid_format": "Token mus\u00ed b\u00fdt ve form\u00e1tu UID/GUID.",
             "token_unauthorized": "Token je neplatn\u00fd nebo ji\u017e nen\u00ed autorizov\u00e1n.",
-            "webhook_error": "SmartThings nemohly ov\u011b\u0159it koncov\u00fd bod nakonfigurovan\u00fd v `base_url`. P\u0159e\u010dt\u011bte si pros\u00edm po\u017eadavky na komponenty."
+            "webhook_error": "SmartThings nemohly ov\u011b\u0159it webhook URL. Zkontrolujte, zda je URL dostupn\u00e1 z internetu, a zkuste to znovu."
         },
         "step": {
+            "authorize": {
+                "title": "Autorizovat Home Assistant"
+            },
             "pat": {
                 "data": {
                     "access_token": "P\u0159\u00edstupov\u00fd token"
-                }
+                },
+                "title": "Zadejte osobn\u00ed p\u0159\u00edstupov\u00fd token"
+            },
+            "select_location": {
+                "data": {
+                    "location_id": "Um\u00edst\u011bn\u00ed"
+                },
+                "title": "Vyberte um\u00edst\u011bn\u00ed"
+            },
+            "user": {
+                "description": "SmartThings bude nastaveno tak, aby odes\u00edlalo aktualizace do Home Assistant na: > {webhook_url}\n\nPokud to nen\u00ed spr\u00e1vn\u011b, zm\u011bnte pros\u00edm sv\u00e9 nastaven\u00ed, restartujte Home Assistant a zkuste to znovu.",
+                "title": "Potvr\u010fte URL adresu zp\u011btn\u00e9ho vol\u00e1n\u00ed"
             }
         }
     }
diff --git a/homeassistant/components/smartthings/translations/es.json b/homeassistant/components/smartthings/translations/es.json
index db1b2f88877..f354e3914e0 100644
--- a/homeassistant/components/smartthings/translations/es.json
+++ b/homeassistant/components/smartthings/translations/es.json
@@ -30,8 +30,8 @@
                 "title": "Seleccionar Ubicaci\u00f3n"
             },
             "user": {
-                "description": "Por favor, introduce el [token de acceso personal]({token_url}) de SmartThings que se haya creado seg\u00fan las [instrucciones]({component_url}).",
-                "title": "Introduce el token de acceso personal"
+                "description": "Los SmartThings se configurar\u00e1n para enviar las actualizaciones a Home Assistant en:\n> {webhook_url}\n\nSi esto no es correcto, por favor, actualiza tu configuraci\u00f3n, reinicia Home Assistant e int\u00e9ntalo de nuevo.",
+                "title": "Confirmar URL de devoluci\u00f3n de llamada"
             }
         }
     }
diff --git a/homeassistant/components/smartthings/translations/et.json b/homeassistant/components/smartthings/translations/et.json
index 91299004ed3..3cfbdb25c10 100644
--- a/homeassistant/components/smartthings/translations/et.json
+++ b/homeassistant/components/smartthings/translations/et.json
@@ -1,6 +1,11 @@
 {
     "config": {
         "step": {
+            "pat": {
+                "data": {
+                    "access_token": "Juurdep\u00e4\u00e4sut\u00f5end"
+                }
+            },
             "select_location": {
                 "data": {
                     "location_id": "Asukoht"
diff --git a/homeassistant/components/smartthings/translations/no.json b/homeassistant/components/smartthings/translations/no.json
index 75093b4a591..41bb76282b0 100644
--- a/homeassistant/components/smartthings/translations/no.json
+++ b/homeassistant/components/smartthings/translations/no.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "invalid_webhook_url": "Home Assistant er ikke konfigurert riktig for \u00e5 motta oppdateringer fra SmartThings. URLen til nettkroken er ugyldig: \n > {webhook_url} \n\nVennligst oppdater konfigurasjonen i henhold til [instruksjonene]({component_url}), start Home Assistant p\u00e5 nytt, og pr\u00f8v igjen.",
-            "no_available_locations": "Det er ingen tilgjengelige SmartThings-lokasjoner \u00e5 konfigurere i Home Assistant."
+            "no_available_locations": "Det er ingen tilgjengelige SmartThings-plasseringer \u00e5 konfigurere i Home Assistant."
         },
         "error": {
             "app_setup_error": "Kan ikke konfigurere SmartApp. Vennligst pr\u00f8v p\u00e5 nytt.",
@@ -24,10 +24,10 @@
             },
             "select_location": {
                 "data": {
-                    "location_id": "Lokasjon"
+                    "location_id": "Plassering"
                 },
                 "description": "Vennligst velg SmartThings lokasjon du vil legge til Home Assistant. Vi \u00e5pner deretter et nytt vindu og ber deg om \u00e5 logge inn og godkjenne installasjon av Home Assistant-integrasjonen p\u00e5 det valgte stedet.",
-                "title": "Velg beliggenhet"
+                "title": "Velg plassering"
             },
             "user": {
                 "description": "SmartThings konfigureres til \u00e5 sende push-oppdateringer til Home Assistant p\u00e5:\n\" {webhook_url}\n\nHvis dette ikke er riktig, m\u00e5 du oppdatere konfigurasjonen, starte Home Assistant p\u00e5 nytt og pr\u00f8ve p\u00e5 nytt.",
diff --git a/homeassistant/components/smartthings/translations/pl.json b/homeassistant/components/smartthings/translations/pl.json
index f43a6f267b3..6696235ab8f 100644
--- a/homeassistant/components/smartthings/translations/pl.json
+++ b/homeassistant/components/smartthings/translations/pl.json
@@ -1,19 +1,19 @@
 {
     "config": {
         "abort": {
-            "invalid_webhook_url": "Home Assistant nie jest poprawnie skonfigurowany do otrzymywania danych od SmartThings. Adres URL  webhook jest nieprawid\u0142owy: \n > {webhook_url} \n\n Zaktualizuj konfiguracj\u0119 zgodnie z [instrukcj\u0105]({component_url}), uruchom ponownie Home Assistant i spr\u00f3buj ponownie.",
-            "no_available_locations": "Nie ma dost\u0119pnych lokalizacji SmartThings do skonfigurowania w Home Assistant."
+            "invalid_webhook_url": "Home Assistant nie jest poprawnie skonfigurowany do otrzymywania danych od SmartThings. Adres URL webhook jest nieprawid\u0142owy: \n > {webhook_url} \n\n Zaktualizuj konfiguracj\u0119 zgodnie z [instrukcj\u0105]({component_url}), uruchom ponownie Home Assistant i spr\u00f3buj ponownie.",
+            "no_available_locations": "Nie ma dost\u0119pnych lokalizacji SmartThings do skonfigurowania w Home Assistant"
         },
         "error": {
             "app_setup_error": "Nie mo\u017cna skonfigurowa\u0107 SmartApp. Spr\u00f3buj ponownie.",
-            "token_forbidden": "Token nie ma wymaganych zakres\u00f3w OAuth.",
+            "token_forbidden": "Token nie ma wymaganych zakres\u00f3w OAuth",
             "token_invalid_format": "Token musi by\u0107 w formacie UID/GUID",
-            "token_unauthorized": "Token jest niewa\u017cny lub nie ma ju\u017c autoryzacji.",
-            "webhook_error": "SmartThings nie mo\u017ce sprawdzi\u0107 poprawno\u015bci punktu ko\u0144cowego skonfigurowanego w `base_url`. Sprawd\u017a wymagania dotycz\u0105ce komponentu."
+            "token_unauthorized": "Token jest niewa\u017cny lub nie ma ju\u017c autoryzacji",
+            "webhook_error": "SmartThings nie m\u00f3g\u0142 sprawdzi\u0107 poprawno\u015bci webhook URL. Upewnij si\u0119, \u017ce adres URL webhook jest dost\u0119pny z internetu i spr\u00f3buj ponownie."
         },
         "step": {
             "authorize": {
-                "title": "Autoryzuj Home Assistanta"
+                "title": "Autoryzuj Home Assistant"
             },
             "pat": {
                 "data": {
@@ -26,12 +26,12 @@
                 "data": {
                     "location_id": "Lokalizacja"
                 },
-                "description": "Wybierz lokalizacj\u0119 SmartThings, kt\u00f3r\u0105 chcesz doda\u0107 do Home Assistanta. Nast\u0119pnie otwarte zostanie nowe okno i zostaniesz poproszony o zalogowanie si\u0119 i autoryzacj\u0119 instalacji integracji Home Assistant w wybranej lokalizacji.",
+                "description": "Wybierz lokalizacj\u0119 SmartThings, kt\u00f3r\u0105 chcesz doda\u0107 do Home Assistant. Nast\u0119pnie otwarte zostanie nowe okno i zostaniesz poproszony o zalogowanie si\u0119 i autoryzacj\u0119 instalacji integracji Home Assistant w wybranej lokalizacji.",
                 "title": "Wybierz lokalizacj\u0119"
             },
             "user": {
-                "description": "Wprowad\u017a [token dost\u0119pu osobistego]({token_url}) SmartThings, kt\u00f3ry zosta\u0142 utworzony zgodnie z [instrukcj\u0105]({component_url}).",
-                "title": "Wprowad\u017a osobisty token dost\u0119pu"
+                "description": "SmartThings zostanie skonfigurowany, by wysy\u0142a\u0107 aktualizacje push do Home Assistant na:\n> {webhook_url}\n\nJe\u015bli adres jest nieprawid\u0142owy, popraw swoj\u0105 konfiguracj\u0119, uruchom ponownie Home Assistant i spr\u00f3buj ponownie.",
+                "title": "Potwierd\u017a Callback URL"
             }
         }
     }
diff --git a/homeassistant/components/smhi/const.py b/homeassistant/components/smhi/const.py
index a5a97503194..7e88f95f691 100644
--- a/homeassistant/components/smhi/const.py
+++ b/homeassistant/components/smhi/const.py
@@ -1,6 +1,4 @@
 """Constants in smhi component."""
-import logging
-
 from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
 
 ATTR_SMHI_CLOUDINESS = "cloudiness"
@@ -11,5 +9,3 @@ HOME_LOCATION_NAME = "Home"
 
 ENTITY_ID_SENSOR_FORMAT = WEATHER_DOMAIN + ".smhi_{}"
 ENTITY_ID_SENSOR_FORMAT_HOME = ENTITY_ID_SENSOR_FORMAT.format(HOME_LOCATION_NAME)
-
-LOGGER = logging.getLogger(__package__)
diff --git a/homeassistant/components/smhi/strings.json b/homeassistant/components/smhi/strings.json
index 245260b0fce..0bba0c2ab48 100644
--- a/homeassistant/components/smhi/strings.json
+++ b/homeassistant/components/smhi/strings.json
@@ -4,9 +4,9 @@
       "user": {
         "title": "Location in Sweden",
         "data": {
-          "name": "Name",
-          "latitude": "Latitude",
-          "longitude": "Longitude"
+          "name": "[%key:common::config_flow::data::name%]",
+          "latitude": "[%key:common::config_flow::data::latitude%]",
+          "longitude": "[%key:common::config_flow::data::longitude%]"
         }
       }
     },
diff --git a/homeassistant/components/smhi/translations/cs.json b/homeassistant/components/smhi/translations/cs.json
index 437c2105e73..5721edc084b 100644
--- a/homeassistant/components/smhi/translations/cs.json
+++ b/homeassistant/components/smhi/translations/cs.json
@@ -9,7 +9,7 @@
                 "data": {
                     "latitude": "Zem\u011bpisn\u00e1 \u0161\u00ed\u0159ka",
                     "longitude": "Zem\u011bpisn\u00e1 d\u00e9lka",
-                    "name": "N\u00e1zev"
+                    "name": "Jm\u00e9no"
                 },
                 "title": "Lokalita ve \u0160v\u00e9dsku"
             }
diff --git a/homeassistant/components/smhi/translations/it.json b/homeassistant/components/smhi/translations/it.json
index b45b60babfe..e68f697c678 100644
--- a/homeassistant/components/smhi/translations/it.json
+++ b/homeassistant/components/smhi/translations/it.json
@@ -8,7 +8,7 @@
             "user": {
                 "data": {
                     "latitude": "Latitudine",
-                    "longitude": "Longitudine",
+                    "longitude": "Logitudine",
                     "name": "Nome"
                 },
                 "title": "Localit\u00e0 in Svezia"
diff --git a/homeassistant/components/smhi/translations/pl.json b/homeassistant/components/smhi/translations/pl.json
index 612d12e7717..f1b30177d5a 100644
--- a/homeassistant/components/smhi/translations/pl.json
+++ b/homeassistant/components/smhi/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "name_exists": "Nazwa ju\u017c istnieje.",
+            "name_exists": "Nazwa ju\u017c istnieje",
             "wrong_location": "Lokalizacja w Szwecji"
         },
         "step": {
diff --git a/homeassistant/components/sms/__init__.py b/homeassistant/components/sms/__init__.py
index b1af205fc10..8752dfd90da 100644
--- a/homeassistant/components/sms/__init__.py
+++ b/homeassistant/components/sms/__init__.py
@@ -1,6 +1,5 @@
 """The sms component."""
 import asyncio
-import logging
 
 import voluptuous as vol
 
@@ -12,8 +11,6 @@ from homeassistant.helpers import config_validation as cv
 from .const import DOMAIN, SMS_GATEWAY
 from .gateway import create_sms_gateway
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORMS = ["sensor"]
 
 CONFIG_SCHEMA = vol.Schema(
diff --git a/homeassistant/components/sms/gateway.py b/homeassistant/components/sms/gateway.py
index 2d36444c03d..9bdfbad0f55 100644
--- a/homeassistant/components/sms/gateway.py
+++ b/homeassistant/components/sms/gateway.py
@@ -59,9 +59,11 @@ class Gateway:
                     if inner_entry["Buffer"] is not None:
                         text = text + inner_entry["Buffer"]
 
-            event_data = dict(
-                phone=message["Number"], date=str(message["DateTime"]), message=text
-            )
+            event_data = {
+                "phone": message["Number"],
+                "date": str(message["DateTime"]),
+                "message": text,
+            }
 
             _LOGGER.debug("Append event data:%s", event_data)
             data.append(event_data)
diff --git a/homeassistant/components/sms/sensor.py b/homeassistant/components/sms/sensor.py
index 64d2bf9bd98..eaad395eaa6 100644
--- a/homeassistant/components/sms/sensor.py
+++ b/homeassistant/components/sms/sensor.py
@@ -3,7 +3,7 @@ import logging
 
 import gammu  # pylint: disable=import-error, no-member
 
-from homeassistant.const import DEVICE_CLASS_SIGNAL_STRENGTH
+from homeassistant.const import DEVICE_CLASS_SIGNAL_STRENGTH, SIGNAL_STRENGTH_DECIBELS
 from homeassistant.helpers.entity import Entity
 
 from .const import DOMAIN, SMS_GATEWAY
@@ -50,7 +50,7 @@ class GSMSignalSensor(Entity):
     @property
     def unit_of_measurement(self):
         """Return the unit the value is expressed in."""
-        return "dB"
+        return SIGNAL_STRENGTH_DECIBELS
 
     @property
     def device_class(self):
diff --git a/homeassistant/components/sms/translations/cs.json b/homeassistant/components/sms/translations/cs.json
index 47c55692a99..1d5acf035f2 100644
--- a/homeassistant/components/sms/translations/cs.json
+++ b/homeassistant/components/sms/translations/cs.json
@@ -1,12 +1,20 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no",
-            "single_instance_allowed": "Ji\u017e nakonfigurov\u00e1no. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "device": "Za\u0159\u00edzen\u00ed"
+                },
+                "title": "P\u0159ipojen\u00ed k modemu"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/sms/translations/es.json b/homeassistant/components/sms/translations/es.json
index 9256ffecc28..f2f36d426f9 100644
--- a/homeassistant/components/sms/translations/es.json
+++ b/homeassistant/components/sms/translations/es.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "El dispositivo ya est\u00e1 configurado",
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
             "cannot_connect": "No se pudo conectar",
diff --git a/homeassistant/components/sms/translations/et.json b/homeassistant/components/sms/translations/et.json
new file mode 100644
index 00000000000..65272c56bff
--- /dev/null
+++ b/homeassistant/components/sms/translations/et.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sms/translations/nl.json b/homeassistant/components/sms/translations/nl.json
new file mode 100644
index 00000000000..3d8eda89436
--- /dev/null
+++ b/homeassistant/components/sms/translations/nl.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "device": "Apparaat"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sms/translations/no.json b/homeassistant/components/sms/translations/no.json
index 7398a7b7b0a..ab692ff8fa6 100644
--- a/homeassistant/components/sms/translations/no.json
+++ b/homeassistant/components/sms/translations/no.json
@@ -5,7 +5,7 @@
             "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
         "step": {
diff --git a/homeassistant/components/sms/translations/pl.json b/homeassistant/components/sms/translations/pl.json
index bfe331ee89e..615f08e3e06 100644
--- a/homeassistant/components/sms/translations/pl.json
+++ b/homeassistant/components/sms/translations/pl.json
@@ -13,7 +13,7 @@
                 "data": {
                     "device": "Urz\u0105dzenie"
                 },
-                "title": "Po\u0142\u0105cz z modemem"
+                "title": "Po\u0142\u0105czenie z modemem"
             }
         }
     }
diff --git a/homeassistant/components/snips/__init__.py b/homeassistant/components/snips/__init__.py
index 618190e8e70..11f732a3bd5 100644
--- a/homeassistant/components/snips/__init__.py
+++ b/homeassistant/components/snips/__init__.py
@@ -98,7 +98,7 @@ async def async_setup(hass, config):
         for site_id in site_ids:
             payload = json.dumps({"siteId": site_id})
             hass.components.mqtt.async_publish(
-                FEEDBACK_ON_TOPIC, None, qos=0, retain=False
+                FEEDBACK_ON_TOPIC, "", qos=0, retain=False
             )
             hass.components.mqtt.async_publish(
                 topic, payload, qos=int(state), retain=state
diff --git a/homeassistant/components/sochain/sensor.py b/homeassistant/components/sochain/sensor.py
index 608405dd1b4..8f704471339 100644
--- a/homeassistant/components/sochain/sensor.py
+++ b/homeassistant/components/sochain/sensor.py
@@ -1,6 +1,5 @@
 """Support for watching multiple cryptocurrencies."""
 from datetime import timedelta
-import logging
 
 from pysochain import ChainSo
 import voluptuous as vol
@@ -11,8 +10,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTRIBUTION = "Data provided by chain.so"
 
 CONF_NETWORK = "network"
diff --git a/homeassistant/components/solaredge/translations/cs.json b/homeassistant/components/solaredge/translations/cs.json
index 757cf90e1e2..501ff51a2bb 100644
--- a/homeassistant/components/solaredge/translations/cs.json
+++ b/homeassistant/components/solaredge/translations/cs.json
@@ -1,10 +1,19 @@
 {
     "config": {
+        "abort": {
+            "site_exists": "Tento identifik\u00e1tor je ji\u017e nastaven"
+        },
+        "error": {
+            "site_exists": "Tento identifik\u00e1tor je ji\u017e nastaven"
+        },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Kl\u00ed\u010d API"
-                }
+                    "api_key": "Kl\u00ed\u010d API",
+                    "name": "Jm\u00e9no t\u00e9to instalace",
+                    "site_id": "Identifik\u00e1tor SolarEdge"
+                },
+                "title": "Nastavte parametry API t\u00e9to instalace"
             }
         }
     }
diff --git a/homeassistant/components/solaredge/translations/no.json b/homeassistant/components/solaredge/translations/no.json
index 00de7a7dc28..5360bd6d810 100644
--- a/homeassistant/components/solaredge/translations/no.json
+++ b/homeassistant/components/solaredge/translations/no.json
@@ -9,7 +9,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "API n\u00f8kkel",
+                    "api_key": "API-n\u00f8kkel",
                     "name": "Navnet p\u00e5 denne installasjonen",
                     "site_id": "SolarEdge nettsted-id"
                 },
diff --git a/homeassistant/components/solaredge/translations/pl.json b/homeassistant/components/solaredge/translations/pl.json
index 2060cca6702..0c217a12510 100644
--- a/homeassistant/components/solaredge/translations/pl.json
+++ b/homeassistant/components/solaredge/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "site_exists": "To site_id jest ju\u017c skonfigurowane."
+            "site_exists": "Ten site_id jest ju\u017c skonfigurowany"
         },
         "error": {
-            "site_exists": "To site_id jest ju\u017c skonfigurowane."
+            "site_exists": "Ten site_id jest ju\u017c skonfigurowany"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/solarlog/strings.json b/homeassistant/components/solarlog/strings.json
index 1a196315a30..068132dea41 100644
--- a/homeassistant/components/solarlog/strings.json
+++ b/homeassistant/components/solarlog/strings.json
@@ -10,11 +10,11 @@
       }
     },
     "error": {
-      "already_configured": "Device is already configured",
-      "cannot_connect": "Failed to connect, please verify host address"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/solarlog/translations/ca.json b/homeassistant/components/solarlog/translations/ca.json
index c62b69fa976..6b0883b51fd 100644
--- a/homeassistant/components/solarlog/translations/ca.json
+++ b/homeassistant/components/solarlog/translations/ca.json
@@ -5,7 +5,7 @@
         },
         "error": {
             "already_configured": "El dispositiu ja est\u00e0 configurat",
-            "cannot_connect": "No s'ha pogut connectar, verifica l'adre\u00e7a de l'amfitri\u00f3"
+            "cannot_connect": "Ha fallat la connexi\u00f3"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/solarlog/translations/cs.json b/homeassistant/components/solarlog/translations/cs.json
index 1c4afe26662..320a006bd83 100644
--- a/homeassistant/components/solarlog/translations/cs.json
+++ b/homeassistant/components/solarlog/translations/cs.json
@@ -1,16 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
         },
         "error": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no",
-            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit, ov\u011b\u0159te pros\u00edm adresu hostitele"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
         },
         "step": {
             "user": {
                 "data": {
-                    "host": "N\u00e1zev hostitele nebo IP adresa va\u0161eho za\u0159\u00edzen\u00ed Solar-Log",
+                    "host": "Hostitel",
                     "name": "Prefix, kter\u00fd se m\u00e1 pou\u017e\u00edt pro va\u0161e senzory Solar-Log"
                 },
                 "title": "Definujte sv\u00e9 p\u0159ipojen\u00ed Solar-Log"
diff --git a/homeassistant/components/solarlog/translations/en.json b/homeassistant/components/solarlog/translations/en.json
index 22dd35574ad..7512da0d2dc 100644
--- a/homeassistant/components/solarlog/translations/en.json
+++ b/homeassistant/components/solarlog/translations/en.json
@@ -5,7 +5,7 @@
         },
         "error": {
             "already_configured": "Device is already configured",
-            "cannot_connect": "Failed to connect, please verify host address"
+            "cannot_connect": "Failed to connect"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/solarlog/translations/et.json b/homeassistant/components/solarlog/translations/et.json
new file mode 100644
index 00000000000..d37ef041b4d
--- /dev/null
+++ b/homeassistant/components/solarlog/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "cannot_connect": "\u00dchenduse loomine nurjus. Kontrolli host'i aadressi"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/solarlog/translations/it.json b/homeassistant/components/solarlog/translations/it.json
index c227ba7a16c..a4a27c1a0f5 100644
--- a/homeassistant/components/solarlog/translations/it.json
+++ b/homeassistant/components/solarlog/translations/it.json
@@ -5,7 +5,7 @@
         },
         "error": {
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
-            "cannot_connect": "Impossibile connettersi, verifica l'indirizzo host"
+            "cannot_connect": "Impossibile connettersi"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/solarlog/translations/no.json b/homeassistant/components/solarlog/translations/no.json
index 5c0bc0524eb..f36366db18f 100644
--- a/homeassistant/components/solarlog/translations/no.json
+++ b/homeassistant/components/solarlog/translations/no.json
@@ -5,7 +5,7 @@
         },
         "error": {
             "already_configured": "Enheten er allerede konfigurert",
-            "cannot_connect": "Kunne ikke koble til, vennligst bekreft vertsadresse"
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/solarlog/translations/pl.json b/homeassistant/components/solarlog/translations/pl.json
index 1577982d3d7..d7e925b2bb6 100644
--- a/homeassistant/components/solarlog/translations/pl.json
+++ b/homeassistant/components/solarlog/translations/pl.json
@@ -5,7 +5,7 @@
         },
         "error": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, sprawd\u017a adres hosta"
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/solarlog/translations/ru.json b/homeassistant/components/solarlog/translations/ru.json
index cf4adc2d623..ada5ebfc406 100644
--- a/homeassistant/components/solarlog/translations/ru.json
+++ b/homeassistant/components/solarlog/translations/ru.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0430\u0434\u0440\u0435\u0441 \u0445\u043e\u0441\u0442\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/solarlog/translations/zh-Hant.json b/homeassistant/components/solarlog/translations/zh-Hant.json
index 85ea05369c5..b8f53a74ff3 100644
--- a/homeassistant/components/solarlog/translations/zh-Hant.json
+++ b/homeassistant/components/solarlog/translations/zh-Hant.json
@@ -5,7 +5,7 @@
         },
         "error": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u78ba\u8a8d\u4e3b\u6a5f\u4f4d\u5740"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/solax/sensor.py b/homeassistant/components/solax/sensor.py
index 3084aefd97c..bca507c4391 100644
--- a/homeassistant/components/solax/sensor.py
+++ b/homeassistant/components/solax/sensor.py
@@ -1,7 +1,6 @@
 """Support for Solax inverter via local API."""
 import asyncio
 from datetime import timedelta
-import logging
 
 from solax import real_time_api
 from solax.inverter import InverterError
@@ -14,8 +13,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import async_track_time_interval
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_PORT = 80
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/soma/translations/cs.json b/homeassistant/components/soma/translations/cs.json
index 42a8bddf841..eeee574cf20 100644
--- a/homeassistant/components/soma/translations/cs.json
+++ b/homeassistant/components/soma/translations/cs.json
@@ -1,7 +1,13 @@
 {
     "config": {
         "abort": {
-            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el"
+            "already_setup": "M\u016f\u017eete nastavit pouze jeden \u00fa\u010det Soma.",
+            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
+            "connection_error": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed SOMA Connect se nezda\u0159ilo.",
+            "missing_configuration": "Integrace Soma nen\u00ed nastavena. Postupujte podle dokumentace."
+        },
+        "create_entry": {
+            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno pomoc\u00ed Soma."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/soma/translations/et.json b/homeassistant/components/soma/translations/et.json
new file mode 100644
index 00000000000..9da1ff9b848
--- /dev/null
+++ b/homeassistant/components/soma/translations/et.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Saad h\u00e4\u00e4lestada ainult \u00fche Soma konto.",
+            "connection_error": "SOMA Connect seadmega \u00fchenduse loomine nurjus."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                },
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/soma/translations/no.json b/homeassistant/components/soma/translations/no.json
index 5c2c01ca7a6..4b9fe3b564d 100644
--- a/homeassistant/components/soma/translations/no.json
+++ b/homeassistant/components/soma/translations/no.json
@@ -14,7 +14,7 @@
             "user": {
                 "data": {
                     "host": "Vert",
-                    "port": ""
+                    "port": "Port"
                 },
                 "description": "Vennligst fyll inn tilkoblingsinnstillingene for din SOMA Connect.",
                 "title": ""
diff --git a/homeassistant/components/soma/translations/pl.json b/homeassistant/components/soma/translations/pl.json
index 9e43072f4e9..f23411fa288 100644
--- a/homeassistant/components/soma/translations/pl.json
+++ b/homeassistant/components/soma/translations/pl.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Soma.",
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
-            "connection_error": "Nie uda\u0142o si\u0119 po\u0142\u0105czy\u0107 z SOMA Connect.",
+            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Soma",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z SOMA Connect",
             "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
-            "result_error": "SOMA Connect odpowiedzia\u0142 statusem b\u0142\u0119du."
+            "result_error": "SOMA Connect odpowiedzia\u0142 statusem b\u0142\u0119du"
         },
         "create_entry": {
             "default": "Pomy\u015blnie uwierzytelniono z Soma"
diff --git a/homeassistant/components/somfy/__init__.py b/homeassistant/components/somfy/__init__.py
index c3aa3a58837..df0739bba31 100644
--- a/homeassistant/components/somfy/__init__.py
+++ b/homeassistant/components/somfy/__init__.py
@@ -89,6 +89,7 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
     )
 
     hass.data[DOMAIN][API] = api.ConfigEntrySomfyApi(hass, entry, implementation)
+    hass.data[DOMAIN][DEVICES] = []
 
     await update_all_devices(hass)
 
diff --git a/homeassistant/components/somfy/config_flow.py b/homeassistant/components/somfy/config_flow.py
index 80fc2192d8e..5e7b5793977 100644
--- a/homeassistant/components/somfy/config_flow.py
+++ b/homeassistant/components/somfy/config_flow.py
@@ -6,8 +6,6 @@ from homeassistant.helpers import config_entry_oauth2_flow
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @config_entries.HANDLERS.register(DOMAIN)
 class SomfyFlowHandler(config_entry_oauth2_flow.AbstractOAuth2FlowHandler):
diff --git a/homeassistant/components/somfy/strings.json b/homeassistant/components/somfy/strings.json
index 384b9c3c5e5..85ef981e356 100644
--- a/homeassistant/components/somfy/strings.json
+++ b/homeassistant/components/somfy/strings.json
@@ -1,12 +1,14 @@
 {
   "config": {
     "step": {
-      "pick_implementation": { "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]" }
+      "pick_implementation": {
+        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      }
     },
     "abort": {
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
-      "authorize_url_timeout": "Timeout generating authorize url.",
-      "missing_configuration": "The Somfy component is not configured. Please follow the documentation.",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]"
     },
     "create_entry": {
diff --git a/homeassistant/components/somfy/translations/ca.json b/homeassistant/components/somfy/translations/ca.json
index 40af5096345..142be053b45 100644
--- a/homeassistant/components/somfy/translations/ca.json
+++ b/homeassistant/components/somfy/translations/ca.json
@@ -2,8 +2,8 @@
     "config": {
         "abort": {
             "already_setup": "Nom\u00e9s pots configurar un \u00fanic compte amb Somfy.",
-            "authorize_url_timeout": "S'ha acabat el temps d'espera durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
-            "missing_configuration": "El component Somfy no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
+            "authorize_url_timeout": "Temps d'espera esgotat durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
+            "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
             "no_url_available": "No hi ha cap URL disponible. Per a m\u00e9s informaci\u00f3 sobre aquest error, [consulta la secci\u00f3 d'ajuda]({docs_url})",
             "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
@@ -12,7 +12,7 @@
         },
         "step": {
             "pick_implementation": {
-                "title": "Selecci\u00f3 del m\u00e8tode d'autenticaci\u00f3"
+                "title": "Selecciona el m\u00e8tode d'autenticaci\u00f3"
             }
         }
     }
diff --git a/homeassistant/components/somfy/translations/cs.json b/homeassistant/components/somfy/translations/cs.json
index bf8a3bf916e..32cf8c8d08d 100644
--- a/homeassistant/components/somfy/translations/cs.json
+++ b/homeassistant/components/somfy/translations/cs.json
@@ -1,7 +1,14 @@
 {
     "config": {
         "abort": {
-            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el"
+            "already_setup": "M\u016f\u017eete nastavit pouze jeden \u00fa\u010det Somfy.",
+            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "no_url_available": "Nen\u00ed k dispozici \u017e\u00e1dn\u00e1 adresa URL. Informace o t\u00e9to chyb\u011b naleznete [v sekci n\u00e1pov\u011bdy]({docs_url})",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "create_entry": {
+            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno"
         },
         "step": {
             "pick_implementation": {
diff --git a/homeassistant/components/somfy/translations/el.json b/homeassistant/components/somfy/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/somfy/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/somfy/translations/en.json b/homeassistant/components/somfy/translations/en.json
index 18910be2595..9dede6ab53f 100644
--- a/homeassistant/components/somfy/translations/en.json
+++ b/homeassistant/components/somfy/translations/en.json
@@ -2,8 +2,8 @@
     "config": {
         "abort": {
             "already_setup": "You can only configure one Somfy account.",
-            "authorize_url_timeout": "Timeout generating authorize url.",
-            "missing_configuration": "The Somfy component is not configured. Please follow the documentation.",
+            "authorize_url_timeout": "Timeout generating authorize URL.",
+            "missing_configuration": "The component is not configured. Please follow the documentation.",
             "no_url_available": "No URL available. For information about this error, [check the help section]({docs_url})",
             "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
diff --git a/homeassistant/components/somfy/translations/es.json b/homeassistant/components/somfy/translations/es.json
index 6d11afcba47..259fe360dd6 100644
--- a/homeassistant/components/somfy/translations/es.json
+++ b/homeassistant/components/somfy/translations/es.json
@@ -5,10 +5,10 @@
             "authorize_url_timeout": "Tiempo de espera agotado generando la url de autorizaci\u00f3n",
             "missing_configuration": "El componente Somfy no est\u00e1 configurado. Por favor, sigue la documentaci\u00f3n.",
             "no_url_available": "No hay URL disponible. Para obtener informaci\u00f3n sobre este error, [consulta la secci\u00f3n de ayuda]({docs_url})",
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
-            "default": "Autenticado correctamente con Somfy."
+            "default": "Autenticado correctamente"
         },
         "step": {
             "pick_implementation": {
diff --git a/homeassistant/components/somfy/translations/et.json b/homeassistant/components/somfy/translations/et.json
new file mode 100644
index 00000000000..184faad8f40
--- /dev/null
+++ b/homeassistant/components/somfy/translations/et.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Saad h\u00e4\u00e4lestada ainult \u00fche Somfy konto.",
+            "no_url_available": "URL pole saadaval. Rohkem teavet [check the help section]({docs_url})",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Vali tuvastusmeetod"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/somfy/translations/it.json b/homeassistant/components/somfy/translations/it.json
index 250ca10c5ec..20b645159cc 100644
--- a/homeassistant/components/somfy/translations/it.json
+++ b/homeassistant/components/somfy/translations/it.json
@@ -2,8 +2,8 @@
     "config": {
         "abort": {
             "already_setup": "\u00c8 possibile configurare un solo account Somfy.",
-            "authorize_url_timeout": "Tempo scaduto nel generare l'url di autorizzazione",
-            "missing_configuration": "Il componente Somfy non \u00e8 configurato. Si prega di seguire la documentazione.",
+            "authorize_url_timeout": "Tempo scaduto nel generare l'URL di autorizzazione.",
+            "missing_configuration": "Il componente non \u00e8 configurato. Si prega di seguire la documentazione.",
             "no_url_available": "Nessun URL disponibile. Per informazioni su questo errore, [controlla la sezione della guida]({docs_url})",
             "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
diff --git a/homeassistant/components/somfy/translations/lb.json b/homeassistant/components/somfy/translations/lb.json
index 5a7100bbb3f..849e2fbadce 100644
--- a/homeassistant/components/somfy/translations/lb.json
+++ b/homeassistant/components/somfy/translations/lb.json
@@ -4,7 +4,8 @@
             "already_setup": "Dir k\u00ebnnt n\u00ebmmen een eenzegen Somfy Kont konfigur\u00e9ieren.",
             "authorize_url_timeout": "Z\u00e4it Iwwerschreidung beim gener\u00e9ieren vun der Autorisatiouns URL.",
             "missing_configuration": "D'Somfy Komponent ass nach net konfigur\u00e9iert. Follegt w.e.g der Dokumentatioun.",
-            "no_url_available": "Keng URL disponibel. Fir Informatiounen iwwert d\u00ebse Feeler, [kuck H\u00ebllef Sektioun]({docs_url})"
+            "no_url_available": "Keng URL disponibel. Fir Informatiounen iwwert d\u00ebse Feeler, [kuck H\u00ebllef Sektioun]({docs_url})",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Erfollegr\u00e4ich mat Somfy authentifiz\u00e9iert."
diff --git a/homeassistant/components/somfy/translations/nl.json b/homeassistant/components/somfy/translations/nl.json
index b0afb6ef168..58143628d17 100644
--- a/homeassistant/components/somfy/translations/nl.json
+++ b/homeassistant/components/somfy/translations/nl.json
@@ -3,7 +3,8 @@
         "abort": {
             "already_setup": "U kunt slechts \u00e9\u00e9n Somfy-account configureren.",
             "authorize_url_timeout": "Time-out tijdens genereren autorisatie url.",
-            "missing_configuration": "Het Somfy-component is niet geconfigureerd. Gelieve de documentatie te volgen."
+            "missing_configuration": "Het Somfy-component is niet geconfigureerd. Gelieve de documentatie te volgen.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Succesvol geverifieerd met Somfy."
diff --git a/homeassistant/components/somfy/translations/no.json b/homeassistant/components/somfy/translations/no.json
index fefd863645c..124975762c3 100644
--- a/homeassistant/components/somfy/translations/no.json
+++ b/homeassistant/components/somfy/translations/no.json
@@ -2,9 +2,9 @@
     "config": {
         "abort": {
             "already_setup": "Du kan kun konfigurere \u00e9n Somfy-konto.",
-            "authorize_url_timeout": "Tidsavbrudd ved oppretting av godkjenningsadresse.",
-            "missing_configuration": "Somfy-komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
-            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk {docs_url} ] ( {docs_url} )",
+            "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
+            "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
+            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk hjelpseksjonen]({docs_url})",
             "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
diff --git a/homeassistant/components/somfy/translations/pl.json b/homeassistant/components/somfy/translations/pl.json
index 0c3dedfb466..7bd4bc4abf6 100644
--- a/homeassistant/components/somfy/translations/pl.json
+++ b/homeassistant/components/somfy/translations/pl.json
@@ -1,12 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Somfy.",
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
-            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105."
+            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Somfy",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_url_available": "Brak dost\u0119pnego adresu URL. Aby uzyska\u0107 informacje na temat tego b\u0142\u0119du, [sprawd\u017a sekcj\u0119 pomocy] ({docs_url})",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Pomy\u015blnie uwierzytelniono z Somfy"
+            "default": "Pomy\u015blnie uwierzytelniono"
         },
         "step": {
             "pick_implementation": {
diff --git a/homeassistant/components/somfy/translations/ru.json b/homeassistant/components/somfy/translations/ru.json
index 89659e4e80b..16205dabc3f 100644
--- a/homeassistant/components/somfy/translations/ru.json
+++ b/homeassistant/components/somfy/translations/ru.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
             "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
-            "missing_configuration": "\u041a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 Somfy \u043d\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
+            "missing_configuration": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
             "no_url_available": "URL-\u0430\u0434\u0440\u0435\u0441 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d. \u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u0435\u0439]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e\u0431 \u044d\u0442\u043e\u0439 \u043e\u0448\u0438\u0431\u043a\u0435.",
             "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
diff --git a/homeassistant/components/somfy/translations/zh-Hant.json b/homeassistant/components/somfy/translations/zh-Hant.json
index 5e41fbbfe2e..4d3d5dc85fb 100644
--- a/homeassistant/components/somfy/translations/zh-Hant.json
+++ b/homeassistant/components/somfy/translations/zh-Hant.json
@@ -2,8 +2,8 @@
     "config": {
         "abort": {
             "already_setup": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44 Somfy \u5e33\u865f\u3002",
-            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642",
-            "missing_configuration": "Somfy \u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
+            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
+            "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
             "no_url_available": "\u6c92\u6709\u53ef\u7528\u7684\u7db2\u5740\u3002\u95dc\u65bc\u6b64\u932f\u8aa4\u66f4\u8a73\u7d30\u8a0a\u606f\uff0c[\u9ede\u9078\u5354\u52a9\u7ae0\u7bc0]({docs_url})",
             "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
diff --git a/homeassistant/components/somfy_mylink/__init__.py b/homeassistant/components/somfy_mylink/__init__.py
index 6c6333af5a6..8106cde0c18 100644
--- a/homeassistant/components/somfy_mylink/__init__.py
+++ b/homeassistant/components/somfy_mylink/__init__.py
@@ -1,6 +1,4 @@
 """Component for the Somfy MyLink device supporting the Synergy API."""
-import logging
-
 from somfy_mylink_synergy import SomfyMyLinkSynergy
 import voluptuous as vol
 
@@ -8,7 +6,6 @@ from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 
-_LOGGER = logging.getLogger(__name__)
 CONF_ENTITY_CONFIG = "entity_config"
 CONF_SYSTEM_ID = "system_id"
 CONF_REVERSE = "reverse"
diff --git a/homeassistant/components/sonarr/__init__.py b/homeassistant/components/sonarr/__init__.py
index 8cb64bb527a..d3330eab64b 100644
--- a/homeassistant/components/sonarr/__init__.py
+++ b/homeassistant/components/sonarr/__init__.py
@@ -6,7 +6,6 @@ from typing import Any, Dict
 
 from sonarr import Sonarr, SonarrAccessRestricted, SonarrError
 
-from homeassistant.components import persistent_notification
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntry
 from homeassistant.const import (
     ATTR_NAME,
@@ -123,13 +122,6 @@ def _async_start_reauth(hass: HomeAssistantType, entry: ConfigEntry):
     )
     _LOGGER.error("API Key is no longer valid. Please reauthenticate")
 
-    persistent_notification.async_create(
-        hass,
-        f"Sonarr integration for the Sonarr API hosted at {entry.entry_data[CONF_HOST]} needs to be re-authenticated. Please go to the integrations page to re-configure it.",
-        "Sonarr re-authentication",
-        "sonarr_reauth",
-    )
-
 
 async def _async_update_listener(hass: HomeAssistantType, entry: ConfigEntry) -> None:
     """Handle options update."""
diff --git a/homeassistant/components/sonarr/config_flow.py b/homeassistant/components/sonarr/config_flow.py
index 753fb829268..fc11790356a 100644
--- a/homeassistant/components/sonarr/config_flow.py
+++ b/homeassistant/components/sonarr/config_flow.py
@@ -5,7 +5,6 @@ from typing import Any, Dict, Optional
 from sonarr import Sonarr, SonarrAccessRestricted, SonarrError
 import voluptuous as vol
 
-from homeassistant.components import persistent_notification
 from homeassistant.config_entries import CONN_CLASS_LOCAL_POLL, ConfigFlow, OptionsFlow
 from homeassistant.const import (
     CONF_API_KEY,
@@ -74,12 +73,6 @@ class SonarrConfigFlow(ConfigFlow, domain=DOMAIN):
         """Get the options flow for this handler."""
         return SonarrOptionsFlowHandler(config_entry)
 
-    async def async_step_import(
-        self, user_input: Optional[ConfigType] = None
-    ) -> Dict[str, Any]:
-        """Handle a flow initiated by configuration file."""
-        return await self.async_step_user(user_input)
-
     async def async_step_reauth(
         self, data: Optional[ConfigType] = None
     ) -> Dict[str, Any]:
@@ -102,9 +95,6 @@ class SonarrConfigFlow(ConfigFlow, domain=DOMAIN):
                 errors={},
             )
 
-        assert self.hass
-        persistent_notification.async_dismiss(self.hass, "sonarr_reauth")
-
         return await self.async_step_user()
 
     async def async_step_user(
diff --git a/homeassistant/components/sonarr/sensor.py b/homeassistant/components/sonarr/sensor.py
index a4427223ab7..880019ecdd3 100644
--- a/homeassistant/components/sonarr/sensor.py
+++ b/homeassistant/components/sonarr/sensor.py
@@ -4,113 +4,19 @@ import logging
 from typing import Any, Callable, Dict, List, Optional
 
 from sonarr import Sonarr, SonarrConnectionError, SonarrError
-import voluptuous as vol
 
-from homeassistant.components.sensor import PLATFORM_SCHEMA
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
-from homeassistant.const import (
-    CONF_API_KEY,
-    CONF_HOST,
-    CONF_MONITORED_CONDITIONS,
-    CONF_PORT,
-    CONF_SSL,
-    CONF_VERIFY_SSL,
-    DATA_BYTES,
-    DATA_EXABYTES,
-    DATA_GIGABYTES,
-    DATA_KILOBYTES,
-    DATA_MEGABYTES,
-    DATA_PETABYTES,
-    DATA_TERABYTES,
-    DATA_YOTTABYTES,
-    DATA_ZETTABYTES,
-)
-import homeassistant.helpers.config_validation as cv
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import DATA_GIGABYTES
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.typing import ConfigType, HomeAssistantType
+from homeassistant.helpers.typing import HomeAssistantType
 import homeassistant.util.dt as dt_util
 
 from . import SonarrEntity
-from .const import (
-    CONF_BASE_PATH,
-    CONF_DAYS,
-    CONF_INCLUDED,
-    CONF_UNIT,
-    CONF_UPCOMING_DAYS,
-    CONF_URLBASE,
-    CONF_WANTED_MAX_ITEMS,
-    DATA_SONARR,
-    DEFAULT_BASE_PATH,
-    DEFAULT_HOST,
-    DEFAULT_PORT,
-    DEFAULT_SSL,
-    DOMAIN,
-)
+from .const import CONF_UPCOMING_DAYS, CONF_WANTED_MAX_ITEMS, DATA_SONARR, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-BYTE_SIZES = [
-    DATA_BYTES,
-    DATA_KILOBYTES,
-    DATA_MEGABYTES,
-    DATA_GIGABYTES,
-    DATA_TERABYTES,
-    DATA_PETABYTES,
-    DATA_EXABYTES,
-    DATA_ZETTABYTES,
-    DATA_YOTTABYTES,
-]
-
-DEFAULT_URLBASE = ""
-DEFAULT_DAYS = "1"
-DEFAULT_UNIT = DATA_GIGABYTES
-
-PLATFORM_SCHEMA = vol.All(
-    cv.deprecated(CONF_INCLUDED, invalidation_version="0.112"),
-    cv.deprecated(CONF_MONITORED_CONDITIONS, invalidation_version="0.112"),
-    cv.deprecated(CONF_UNIT, invalidation_version="0.112"),
-    PLATFORM_SCHEMA.extend(
-        {
-            vol.Required(CONF_API_KEY): cv.string,
-            vol.Optional(CONF_DAYS, default=DEFAULT_DAYS): cv.string,
-            vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-            vol.Optional(CONF_INCLUDED, default=[]): cv.ensure_list,
-            vol.Optional(CONF_MONITORED_CONDITIONS, default=[]): cv.ensure_list,
-            vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-            vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
-            vol.Optional(CONF_UNIT, default=DEFAULT_UNIT): vol.In(BYTE_SIZES),
-            vol.Optional(CONF_URLBASE, default=DEFAULT_URLBASE): cv.string,
-        }
-    ),
-)
-
-
-async def async_setup_platform(
-    hass: HomeAssistantType,
-    config: ConfigType,
-    async_add_entities: Callable[[List[Entity], bool], None],
-    discovery_info: Any = None,
-) -> None:
-    """Import the platform into a config entry."""
-    if len(hass.config_entries.async_entries(DOMAIN)) > 0:
-        return True
-
-    config[CONF_BASE_PATH] = f"{config[CONF_URLBASE]}{DEFAULT_BASE_PATH}"
-    config[CONF_UPCOMING_DAYS] = int(config[CONF_DAYS])
-    config[CONF_VERIFY_SSL] = False
-
-    del config[CONF_DAYS]
-    del config[CONF_INCLUDED]
-    del config[CONF_MONITORED_CONDITIONS]
-    del config[CONF_URLBASE]
-
-    hass.async_create_task(
-        hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
-        )
-    )
-
 
 async def async_setup_entry(
     hass: HomeAssistantType,
@@ -259,10 +165,6 @@ class SonarrDiskspaceSensor(SonarrSensor):
             enabled_default=False,
         )
 
-    def _to_unit(self, value):
-        """Return a value converted to unit of measurement."""
-        return value / 1024 ** BYTE_SIZES.index(self._unit_of_measurement)
-
     @sonarr_exception_handler
     async def async_update(self) -> None:
         """Update entity."""
@@ -276,8 +178,8 @@ class SonarrDiskspaceSensor(SonarrSensor):
         attrs = {}
 
         for disk in self._disks:
-            free = self._to_unit(disk.free)
-            total = self._to_unit(disk.total)
+            free = disk.free / 1024 ** 3
+            total = disk.total / 1024 ** 3
             usage = free / total * 100
 
             attrs[
@@ -289,7 +191,7 @@ class SonarrDiskspaceSensor(SonarrSensor):
     @property
     def state(self) -> str:
         """Return the state of the sensor."""
-        free = self._to_unit(self._total_free)
+        free = self._total_free / 1024 ** 3
         return f"{free:.2f}"
 
 
diff --git a/homeassistant/components/sonarr/strings.json b/homeassistant/components/sonarr/strings.json
index 7a50879195d..e4de5cb9193 100644
--- a/homeassistant/components/sonarr/strings.json
+++ b/homeassistant/components/sonarr/strings.json
@@ -10,12 +10,12 @@
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "base_path": "Path to API",
           "port": "[%key:common::config_flow::data::port%]",
-          "ssl": "Sonarr uses a SSL certificate",
-          "verify_ssl": "Sonarr uses a proper certificate"
+          "ssl": "[%key:common::config_flow::data::ssl%]",
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         }
       },
       "reauth_confirm": {
-        "title": "Re-authenticate with Sonarr",
+        "title": "[%key:common::config_flow::title::reauth%]",
         "description": "The Sonarr integration needs to be manually re-authenticated with the Sonarr API hosted at: {host}"
       }
     },
@@ -25,7 +25,7 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "reauth_successful": "Successfully re-authenticated",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     }
   },
diff --git a/homeassistant/components/sonarr/translations/ca.json b/homeassistant/components/sonarr/translations/ca.json
index 77ff62d6f08..00e6a487394 100644
--- a/homeassistant/components/sonarr/translations/ca.json
+++ b/homeassistant/components/sonarr/translations/ca.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "El servei ja est\u00e0 configurat",
-            "reauth_successful": "Re-autenticaci\u00f3 exitosa",
+            "reauth_successful": "Re-autenticaci\u00f3 realitzada correctament",
             "unknown": "Error inesperat"
         },
         "error": {
@@ -13,7 +13,7 @@
         "step": {
             "reauth_confirm": {
                 "description": "La integraci\u00f3 de Sonarr ha de tornar a autenticar-se manualment amb l'API de Sonarr allotjada a: {host}",
-                "title": "Re-autenticaci\u00f3 amb Sonarr"
+                "title": "Reautenticaci\u00f3 de la integraci\u00f3"
             },
             "user": {
                 "data": {
@@ -21,8 +21,8 @@
                     "base_path": "Ruta a l'API",
                     "host": "Amfitri\u00f3",
                     "port": "Port",
-                    "ssl": "Sonarr utilitza un certificat SSL",
-                    "verify_ssl": "Sonarr utilitza un certificat adequat"
+                    "ssl": "Utilitza un certificat SSL",
+                    "verify_ssl": "Verifica el certificat SSL"
                 },
                 "title": "Connexi\u00f3 amb Sonarr"
             }
diff --git a/homeassistant/components/sonarr/translations/cs.json b/homeassistant/components/sonarr/translations/cs.json
index 5552f5ae6a7..ac75f614029 100644
--- a/homeassistant/components/sonarr/translations/cs.json
+++ b/homeassistant/components/sonarr/translations/cs.json
@@ -1,21 +1,30 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Slu\u017eba je ji\u017e nakonfigurov\u00e1na",
+            "already_configured": "Slu\u017eba je ji\u017e nastavena",
+            "reauth_successful": "Op\u011btovn\u00e9 ov\u011b\u0159en\u00ed bylo \u00fasp\u011b\u0161n\u00e9",
             "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
         },
+        "flow_title": "Sonarr: {name}",
         "step": {
+            "reauth_confirm": {
+                "title": "Znovu ov\u011b\u0159it integraci"
+            },
             "user": {
                 "data": {
                     "api_key": "Kl\u00ed\u010d API",
                     "host": "Hostitel",
-                    "port": "Port"
-                }
+                    "port": "Port",
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
+                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL"
+                },
+                "title": "P\u0159ipojen\u00ed k Sonarr"
             }
         }
-    }
+    },
+    "title": "Sonarr"
 }
\ No newline at end of file
diff --git a/homeassistant/components/sonarr/translations/en.json b/homeassistant/components/sonarr/translations/en.json
index 819fe3e7105..25b3b9f9495 100644
--- a/homeassistant/components/sonarr/translations/en.json
+++ b/homeassistant/components/sonarr/translations/en.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Service is already configured",
-            "reauth_successful": "Successfully re-authenticated",
+            "reauth_successful": "Re-authentication was successful",
             "unknown": "Unexpected error"
         },
         "error": {
@@ -13,7 +13,7 @@
         "step": {
             "reauth_confirm": {
                 "description": "The Sonarr integration needs to be manually re-authenticated with the Sonarr API hosted at: {host}",
-                "title": "Re-authenticate with Sonarr"
+                "title": "Reauthenticate Integration"
             },
             "user": {
                 "data": {
@@ -21,8 +21,8 @@
                     "base_path": "Path to API",
                     "host": "Host",
                     "port": "Port",
-                    "ssl": "Sonarr uses a SSL certificate",
-                    "verify_ssl": "Sonarr uses a proper certificate"
+                    "ssl": "Uses an SSL certificate",
+                    "verify_ssl": "Verify SSL certificate"
                 },
                 "title": "Connect to Sonarr"
             }
diff --git a/homeassistant/components/sonarr/translations/es.json b/homeassistant/components/sonarr/translations/es.json
index 343af035865..8eb1d02d805 100644
--- a/homeassistant/components/sonarr/translations/es.json
+++ b/homeassistant/components/sonarr/translations/es.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "El servicio ya est\u00e1 configurado",
-            "reauth_successful": "Se ha vuelto autenticar con \u00e9xito",
+            "reauth_successful": "La reautenticaci\u00f3n se realiz\u00f3 correctamente",
             "unknown": "Error inesperado"
         },
         "error": {
@@ -21,8 +21,8 @@
                     "base_path": "Ruta a la API",
                     "host": "Host",
                     "port": "Puerto",
-                    "ssl": "Sonarr usa un certificado SSL",
-                    "verify_ssl": "Sonarr usa un certificado adecuado"
+                    "ssl": "Utiliza un certificado SSL",
+                    "verify_ssl": "Verificar certificado SSL"
                 },
                 "title": "Conectar a Sonarr"
             }
diff --git a/homeassistant/components/sonarr/translations/et.json b/homeassistant/components/sonarr/translations/et.json
new file mode 100644
index 00000000000..895936e5ce6
--- /dev/null
+++ b/homeassistant/components/sonarr/translations/et.json
@@ -0,0 +1,27 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud",
+            "reauth_successful": "Taastuvastamine oli edukas",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus"
+        },
+        "step": {
+            "reauth_confirm": {
+                "description": "Sonarr-i sidumine tuleb k\u00e4sitsi taastuvastada Sonarr API abil: {host}",
+                "title": "Autentige uuesti Sonarriga"
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": "",
+                    "verify_ssl": "Kontrolli SSL sertifikaati"
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/sonarr/translations/fr.json b/homeassistant/components/sonarr/translations/fr.json
index 0b35d915f2b..91d3b0db419 100644
--- a/homeassistant/components/sonarr/translations/fr.json
+++ b/homeassistant/components/sonarr/translations/fr.json
@@ -10,6 +10,9 @@
         },
         "flow_title": "Sonarr: {name}",
         "step": {
+            "reauth_confirm": {
+                "title": "R\u00e9-authentifier avec Sonarr"
+            },
             "user": {
                 "data": {
                     "api_key": "Cl\u00e9 API",
diff --git a/homeassistant/components/sonarr/translations/it.json b/homeassistant/components/sonarr/translations/it.json
index ae6774db11d..cc57bb2ef27 100644
--- a/homeassistant/components/sonarr/translations/it.json
+++ b/homeassistant/components/sonarr/translations/it.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Il servizio \u00e8 gi\u00e0 configurato",
+            "reauth_successful": "La riautenticazione ha avuto successo",
             "unknown": "Errore imprevisto"
         },
         "error": {
@@ -10,14 +11,18 @@
         },
         "flow_title": "Sonarr: {name}",
         "step": {
+            "reauth_confirm": {
+                "description": "L'integrazione di Sonarr deve essere nuovamente autenticata manualmente con l'API Sonarr ospitata su: {host}",
+                "title": "Eseguire nuovamente l'autenticazione con Sonarr"
+            },
             "user": {
                 "data": {
                     "api_key": "Chiave API",
                     "base_path": "Percorso dell'API",
                     "host": "Host",
                     "port": "Porta",
-                    "ssl": "Sonarr utilizza un certificato SSL",
-                    "verify_ssl": "Sonarr utilizza un certificato adeguato"
+                    "ssl": "Utilizza un certificato SSL",
+                    "verify_ssl": "Verificare il certificato SSL"
                 },
                 "title": "Connettiti a Sonarr"
             }
diff --git a/homeassistant/components/sonarr/translations/nl.json b/homeassistant/components/sonarr/translations/nl.json
new file mode 100644
index 00000000000..c1909b19508
--- /dev/null
+++ b/homeassistant/components/sonarr/translations/nl.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "port": "Poort"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sonarr/translations/no.json b/homeassistant/components/sonarr/translations/no.json
index ae0bec87cbd..2f42563b4b3 100644
--- a/homeassistant/components/sonarr/translations/no.json
+++ b/homeassistant/components/sonarr/translations/no.json
@@ -2,27 +2,27 @@
     "config": {
         "abort": {
             "already_configured": "Tjenesten er allerede konfigurert",
-            "reauth_successful": "Godkjent p\u00e5 nytt",
+            "reauth_successful": "Reautentisering var vellykket",
             "unknown": "Uventet feil"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning"
         },
         "flow_title": "",
         "step": {
             "reauth_confirm": {
                 "description": "Sonarr-integrasjonen m\u00e5 autentiseres p\u00e5 nytt med Sonarr API vert p\u00e5: {host}",
-                "title": "Autentiser p\u00e5 nytt med Sonarr"
+                "title": "Bekreft integrering p\u00e5 nytt"
             },
             "user": {
                 "data": {
-                    "api_key": "API N\u00f8kkel",
+                    "api_key": "API-n\u00f8kkel",
                     "base_path": "Bane til API",
                     "host": "Vert",
-                    "port": "",
-                    "ssl": "Sonarr bruker et SSL-sertifikat",
-                    "verify_ssl": "Sonarr bruker et riktig sertifikat"
+                    "port": "Port",
+                    "ssl": "Bruker et SSL-sertifikat",
+                    "verify_ssl": "Verifisere SSL-sertifikat"
                 },
                 "title": "Koble til Sonarr"
             }
diff --git a/homeassistant/components/sonarr/translations/pl.json b/homeassistant/components/sonarr/translations/pl.json
index f2c56d3e540..c119d5fe781 100644
--- a/homeassistant/components/sonarr/translations/pl.json
+++ b/homeassistant/components/sonarr/translations/pl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana.",
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana",
+            "reauth_successful": "Ponowne uwierzytelnienie powiod\u0142o si\u0119",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
@@ -10,16 +11,20 @@
         },
         "flow_title": "Sonarr: {name}",
         "step": {
+            "reauth_confirm": {
+                "description": "Integracja Sonarr musi by\u0107 r\u0119cznie ponownie uwierzytelniona za pomoc\u0105 API Sonarr pod adresem: {host}",
+                "title": "Ponownie uwierzytelnij integracj\u0119"
+            },
             "user": {
                 "data": {
                     "api_key": "Klucz API",
                     "base_path": "\u015acie\u017cka do API",
                     "host": "Nazwa hosta lub adres IP",
                     "port": "Port",
-                    "ssl": "Sonarr u\u017cywa certyfikatu SSL",
-                    "verify_ssl": "Sonarr u\u017cywa prawid\u0142owego certyfikatu"
+                    "ssl": "Certyfikat SSL",
+                    "verify_ssl": "Weryfikacja certyfikatu SSL"
                 },
-                "title": "Po\u0142\u0105cz z Sonarr"
+                "title": "Po\u0142\u0105czenie z Sonarr"
             }
         }
     },
diff --git a/homeassistant/components/sonarr/translations/ru.json b/homeassistant/components/sonarr/translations/ru.json
index 7eaf713101a..9bf7bc39437 100644
--- a/homeassistant/components/sonarr/translations/ru.json
+++ b/homeassistant/components/sonarr/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "reauth_successful": "\u0410\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0439\u0434\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e.",
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
+            "reauth_successful": "\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "error": {
@@ -21,8 +21,8 @@
                     "base_path": "\u041f\u0443\u0442\u044c \u043a API",
                     "host": "\u0425\u043e\u0441\u0442",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "Sonarr \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
-                    "verify_ssl": "Sonarr \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442"
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
+                    "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 },
                 "title": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a Sonarr"
             }
diff --git a/homeassistant/components/sonarr/translations/sv.json b/homeassistant/components/sonarr/translations/sv.json
index bbdafea6798..67ab4524465 100644
--- a/homeassistant/components/sonarr/translations/sv.json
+++ b/homeassistant/components/sonarr/translations/sv.json
@@ -2,6 +2,9 @@
     "config": {
         "step": {
             "user": {
+                "data": {
+                    "api_key": "API nyckel"
+                },
                 "title": "Anslut till Sonarr"
             }
         }
diff --git a/homeassistant/components/sonarr/translations/zh-Hant.json b/homeassistant/components/sonarr/translations/zh-Hant.json
index 4bac445694e..04792776046 100644
--- a/homeassistant/components/sonarr/translations/zh-Hant.json
+++ b/homeassistant/components/sonarr/translations/zh-Hant.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "reauth_successful": "\u5df2\u6210\u529f\u91cd\u65b0\u8a8d\u8b49",
+            "reauth_successful": "\u91cd\u65b0\u8a8d\u8b49\u6210\u529f",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "error": {
@@ -13,7 +13,7 @@
         "step": {
             "reauth_confirm": {
                 "description": "Sonarr \u6574\u5408\u9700\u8981\u624b\u52d5\u91cd\u65b0\u8a8d\u8b49 Sonarr API\uff1a{host}",
-                "title": "\u91cd\u65b0\u8a8d\u8b49 Sonarr"
+                "title": "\u91cd\u65b0\u8a8d\u8b49\u6574\u5408"
             },
             "user": {
                 "data": {
@@ -21,8 +21,8 @@
                     "base_path": "API \u8def\u5f91",
                     "host": "\u4e3b\u6a5f\u7aef",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "Sonarr \u4f7f\u7528 SSL \u8a8d\u8b49",
-                    "verify_ssl": "Sonarr \u4f7f\u7528\u5c0d\u61c9\u8a8d\u8b49"
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
+                    "verify_ssl": "\u78ba\u8a8d SSL \u8a8d\u8b49"
                 },
                 "title": "\u9023\u7dda\u81f3 Sonarr"
             }
diff --git a/homeassistant/components/songpal/__init__.py b/homeassistant/components/songpal/__init__.py
index 493a3ef4913..d6e31fb9a1c 100644
--- a/homeassistant/components/songpal/__init__.py
+++ b/homeassistant/components/songpal/__init__.py
@@ -1,6 +1,5 @@
 """The songpal component."""
 from collections import OrderedDict
-import logging
 
 import voluptuous as vol
 
@@ -11,8 +10,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 
 from .const import CONF_ENDPOINT, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 SONGPAL_CONFIG_SCHEMA = vol.Schema(
     {vol.Optional(CONF_NAME): cv.string, vol.Required(CONF_ENDPOINT): cv.string}
 )
diff --git a/homeassistant/components/songpal/translations/cs.json b/homeassistant/components/songpal/translations/cs.json
index 51335918cf6..687961e9101 100644
--- a/homeassistant/components/songpal/translations/cs.json
+++ b/homeassistant/components/songpal/translations/cs.json
@@ -1,10 +1,17 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "not_songpal_device": "Nejedn\u00e1 se o za\u0159\u00edzen\u00ed Songpal"
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "flow_title": "Sony Songpal {name} ({host})",
+        "step": {
+            "init": {
+                "description": "Chcete nastavit {name} ({host})?"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/songpal/translations/et.json b/homeassistant/components/songpal/translations/et.json
new file mode 100644
index 00000000000..f4f38673a28
--- /dev/null
+++ b/homeassistant/components/songpal/translations/et.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "flow_title": "Sony Songpal {name} ( {host} )",
+        "step": {
+            "init": {
+                "description": "Kas soovite seadistada {name}({host})?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/songpal/translations/no.json b/homeassistant/components/songpal/translations/no.json
index eb07eeb2daa..645816d1f13 100644
--- a/homeassistant/components/songpal/translations/no.json
+++ b/homeassistant/components/songpal/translations/no.json
@@ -5,7 +5,7 @@
             "not_songpal_device": "Ikke en Songpal-enhet"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "flow_title": "",
         "step": {
diff --git a/homeassistant/components/songpal/translations/pl.json b/homeassistant/components/songpal/translations/pl.json
index 6b5d29e06b3..911c98db651 100644
--- a/homeassistant/components/songpal/translations/pl.json
+++ b/homeassistant/components/songpal/translations/pl.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "not_songpal_device": "To nie jest urz\u0105dzenie Songpal."
+            "not_songpal_device": "To nie jest urz\u0105dzenie Songpal"
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
diff --git a/homeassistant/components/sonos/manifest.json b/homeassistant/components/sonos/manifest.json
index daded59cadf..659d9bd1b1d 100644
--- a/homeassistant/components/sonos/manifest.json
+++ b/homeassistant/components/sonos/manifest.json
@@ -3,7 +3,7 @@
   "name": "Sonos",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/sonos",
-  "requirements": ["pysonos==0.0.33"],
+  "requirements": ["pysonos==0.0.35"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:ZonePlayer:1"
diff --git a/homeassistant/components/sonos/media_player.py b/homeassistant/components/sonos/media_player.py
index 307fee923a3..cd36ee82b51 100644
--- a/homeassistant/components/sonos/media_player.py
+++ b/homeassistant/components/sonos/media_player.py
@@ -9,6 +9,7 @@ import urllib.parse
 import async_timeout
 import pysonos
 from pysonos import alarms
+from pysonos.core import PLAY_MODE_BY_MEANING, PLAY_MODES
 from pysonos.exceptions import SoCoException, SoCoUPnPException
 import pysonos.music_library
 import pysonos.snapshot
@@ -33,6 +34,9 @@ from homeassistant.components.media_player.const import (
     MEDIA_TYPE_MUSIC,
     MEDIA_TYPE_PLAYLIST,
     MEDIA_TYPE_TRACK,
+    REPEAT_MODE_ALL,
+    REPEAT_MODE_OFF,
+    REPEAT_MODE_ONE,
     SUPPORT_BROWSE_MEDIA,
     SUPPORT_CLEAR_PLAYLIST,
     SUPPORT_NEXT_TRACK,
@@ -40,6 +44,7 @@ from homeassistant.components.media_player.const import (
     SUPPORT_PLAY,
     SUPPORT_PLAY_MEDIA,
     SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_REPEAT_SET,
     SUPPORT_SEEK,
     SUPPORT_SELECT_SOURCE,
     SUPPORT_SHUFFLE_SET,
@@ -86,6 +91,7 @@ SUPPORT_SONOS = (
     | SUPPORT_PLAY
     | SUPPORT_PLAY_MEDIA
     | SUPPORT_PREVIOUS_TRACK
+    | SUPPORT_REPEAT_SET
     | SUPPORT_SEEK
     | SUPPORT_SELECT_SOURCE
     | SUPPORT_SHUFFLE_SET
@@ -192,6 +198,14 @@ PLAYABLE_MEDIA_TYPES = [
     MEDIA_TYPE_TRACK,
 ]
 
+REPEAT_TO_SONOS = {
+    REPEAT_MODE_OFF: False,
+    REPEAT_MODE_ALL: True,
+    REPEAT_MODE_ONE: "ONE",
+}
+
+SONOS_TO_REPEAT = {meaning: mode for mode, meaning in REPEAT_TO_SONOS.items()}
+
 ATTR_SONOS_GROUP = "sonos_group"
 
 UPNP_ERRORS_TO_IGNORE = ["701", "711", "712"]
@@ -501,7 +515,7 @@ class SonosEntity(MediaPlayerEntity):
         self._player = player
         self._player_volume = None
         self._player_muted = None
-        self._shuffle = None
+        self._play_mode = None
         self._coordinator = None
         self._sonos_group = [self]
         self._status = None
@@ -673,7 +687,7 @@ class SonosEntity(MediaPlayerEntity):
     def _attach_player(self):
         """Get basic information and add event subscriptions."""
         try:
-            self._shuffle = self.soco.shuffle
+            self._play_mode = self.soco.play_mode
             self.update_volume()
             self._set_favorites()
 
@@ -718,7 +732,7 @@ class SonosEntity(MediaPlayerEntity):
         if new_status == "TRANSITIONING":
             return
 
-        self._shuffle = self.soco.shuffle
+        self._play_mode = event.current_play_mode if event else self.soco.play_mode
         self._uri = None
         self._media_duration = None
         self._media_image_url = None
@@ -952,7 +966,14 @@ class SonosEntity(MediaPlayerEntity):
     @soco_coordinator
     def shuffle(self):
         """Shuffling state."""
-        return self._shuffle
+        return PLAY_MODES[self._play_mode][0]
+
+    @property
+    @soco_coordinator
+    def repeat(self):
+        """Return current repeat mode."""
+        sonos_repeat = PLAY_MODES[self._play_mode][1]
+        return SONOS_TO_REPEAT[sonos_repeat]
 
     @property
     @soco_coordinator
@@ -1053,7 +1074,17 @@ class SonosEntity(MediaPlayerEntity):
     @soco_coordinator
     def set_shuffle(self, shuffle):
         """Enable/Disable shuffle mode."""
-        self.soco.shuffle = shuffle
+        sonos_shuffle = shuffle
+        sonos_repeat = PLAY_MODES[self._play_mode][1]
+        self.soco.play_mode = PLAY_MODE_BY_MEANING[(sonos_shuffle, sonos_repeat)]
+
+    @soco_error(UPNP_ERRORS_TO_IGNORE)
+    @soco_coordinator
+    def set_repeat(self, repeat):
+        """Set repeat mode."""
+        sonos_shuffle = PLAY_MODES[self._play_mode][0]
+        sonos_repeat = REPEAT_TO_SONOS[repeat]
+        self.soco.play_mode = PLAY_MODE_BY_MEANING[(sonos_shuffle, sonos_repeat)]
 
     @soco_error()
     def mute_volume(self, mute):
@@ -1152,7 +1183,10 @@ class SonosEntity(MediaPlayerEntity):
         if media_type in (MEDIA_TYPE_MUSIC, MEDIA_TYPE_TRACK):
             if kwargs.get(ATTR_MEDIA_ENQUEUE):
                 try:
-                    self.soco.add_uri_to_queue(media_id)
+                    if self.soco.is_spotify_uri(media_id):
+                        self.soco.add_spotify_uri_to_queue(media_id)
+                    else:
+                        self.soco.add_uri_to_queue(media_id)
                 except SoCoUPnPException:
                     _LOGGER.error(
                         'Error parsing media uri "%s", '
@@ -1161,7 +1195,12 @@ class SonosEntity(MediaPlayerEntity):
                         media_id,
                     )
             else:
-                self.soco.play_uri(media_id)
+                if self.soco.is_spotify_uri(media_id):
+                    self.soco.clear_queue()
+                    self.soco.add_spotify_uri_to_queue(media_id)
+                    self.soco.play_from_queue(0)
+                else:
+                    self.soco.play_uri(media_id)
         elif media_type == MEDIA_TYPE_PLAYLIST:
             if media_id.startswith("S:"):
                 item = get_media(self._media_library, media_id, media_type)
diff --git a/homeassistant/components/sonos/services.yaml b/homeassistant/components/sonos/services.yaml
index 7a8e2195bf4..effb19c47b7 100644
--- a/homeassistant/components/sonos/services.yaml
+++ b/homeassistant/components/sonos/services.yaml
@@ -87,3 +87,22 @@ remove_from_queue:
     queue_position:
       description: Position in the queue to remove.
       example: "0"
+
+update_alarm:
+  description: Updates an alarm with new time and volume settings.
+  fields:
+    alarm_id:
+      description: ID for the alarm to be updated.
+      example: "1"
+    time:
+      description: Set time for the alarm.
+      example: "07:00"
+    volume:
+      description: Set alarm volume level.
+      example: "0.75"
+    enabled:
+      description: Enable or disable the alarm.
+      example: "true"
+    include_linked_zones:
+      description: Enable or disable including grouped rooms.
+      example: "true"
diff --git a/homeassistant/components/sonos/strings.json b/homeassistant/components/sonos/strings.json
index 22414453af9..12812d66692 100644
--- a/homeassistant/components/sonos/strings.json
+++ b/homeassistant/components/sonos/strings.json
@@ -6,8 +6,8 @@
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of Sonos is necessary.",
-      "no_devices_found": "No Sonos devices found on the network."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   }
 }
diff --git a/homeassistant/components/sonos/translations/ca.json b/homeassistant/components/sonos/translations/ca.json
index c7bbae58a41..4f9995c6c11 100644
--- a/homeassistant/components/sonos/translations/ca.json
+++ b/homeassistant/components/sonos/translations/ca.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No s'han trobat dispositius Sonos a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s cal una sola configuraci\u00f3 de Sonos."
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/sonos/translations/cs.json b/homeassistant/components/sonos/translations/cs.json
index 20aab9ac861..a07317ed3f2 100644
--- a/homeassistant/components/sonos/translations/cs.json
+++ b/homeassistant/components/sonos/translations/cs.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "V s\u00edti nebyly nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed Sonos.",
-            "single_instance_allowed": "Je t\u0159eba jen jedna konfigurace Sonos."
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/sonos/translations/en.json b/homeassistant/components/sonos/translations/en.json
index 3cd46eae627..38aecd5e965 100644
--- a/homeassistant/components/sonos/translations/en.json
+++ b/homeassistant/components/sonos/translations/en.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No Sonos devices found on the network.",
-            "single_instance_allowed": "Only a single configuration of Sonos is necessary."
+            "no_devices_found": "No devices found on the network",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/sonos/translations/es.json b/homeassistant/components/sonos/translations/es.json
index e1cc4b22ef7..41d84a932ee 100644
--- a/homeassistant/components/sonos/translations/es.json
+++ b/homeassistant/components/sonos/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No se han encontrado dispositivos Sonos en la red.",
+            "no_devices_found": "No se encontraron dispositivos en la red",
             "single_instance_allowed": "S\u00f3lo se necesita una \u00fanica configuraci\u00f3n de Sonos."
         },
         "step": {
diff --git a/homeassistant/components/sonos/translations/et.json b/homeassistant/components/sonos/translations/et.json
new file mode 100644
index 00000000000..75f24b9b171
--- /dev/null
+++ b/homeassistant/components/sonos/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid",
+            "single_instance_allowed": "Juba seadistatud, lubatud on ainult \u00fcks sidumine."
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas soovid Sonose seadistada?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/sonos/translations/it.json b/homeassistant/components/sonos/translations/it.json
index 70353a2613a..1a646649a1b 100644
--- a/homeassistant/components/sonos/translations/it.json
+++ b/homeassistant/components/sonos/translations/it.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Non sono presenti dispositivi Sonos in rete.",
-            "single_instance_allowed": "\u00c8 necessaria una sola configurazione di Sonos."
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/sonos/translations/no.json b/homeassistant/components/sonos/translations/no.json
index e5e4792eaeb..2da0b5a1b0b 100644
--- a/homeassistant/components/sonos/translations/no.json
+++ b/homeassistant/components/sonos/translations/no.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Ingen Sonos enheter funnet p\u00e5 nettverket.",
-            "single_instance_allowed": "Kun en konfigurasjon av Sonos er n\u00f8dvendig."
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/sonos/translations/pl.json b/homeassistant/components/sonos/translations/pl.json
index d37bf4c1ea9..eb016e6cd47 100644
--- a/homeassistant/components/sonos/translations/pl.json
+++ b/homeassistant/components/sonos/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nie znaleziono w sieci urz\u0105dze\u0144 Sonos.",
-            "single_instance_allowed": "Wymagana jest tylko jedna konfiguracja Sonos."
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/sonos/translations/ru.json b/homeassistant/components/sonos/translations/ru.json
index fa153fda3ce..f0b6ca6b6bf 100644
--- a/homeassistant/components/sonos/translations/ru.json
+++ b/homeassistant/components/sonos/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 Sonos \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b.",
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/sonos/translations/zh-Hant.json b/homeassistant/components/sonos/translations/zh-Hant.json
index 8ffa1577abe..b47280e3a9e 100644
--- a/homeassistant/components/sonos/translations/zh-Hant.json
+++ b/homeassistant/components/sonos/translations/zh-Hant.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230 Sonos \u8a2d\u5099\u3002",
-            "single_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u6b21 Sonos \u5373\u53ef\u3002"
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/spaceapi/__init__.py b/homeassistant/components/spaceapi/__init__.py
index ea5a64d97e7..571e0ab62f3 100644
--- a/homeassistant/components/spaceapi/__init__.py
+++ b/homeassistant/components/spaceapi/__init__.py
@@ -1,6 +1,4 @@
 """Support for the SpaceAPI."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.http import HomeAssistantView
@@ -21,8 +19,6 @@ import homeassistant.core as ha
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.dt as dt_util
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_ADDRESS = "address"
 ATTR_SPACEFED = "spacefed"
 ATTR_CAM = "cam"
diff --git a/homeassistant/components/spc/alarm_control_panel.py b/homeassistant/components/spc/alarm_control_panel.py
index 86adc588038..d2d082b08b0 100644
--- a/homeassistant/components/spc/alarm_control_panel.py
+++ b/homeassistant/components/spc/alarm_control_panel.py
@@ -1,6 +1,4 @@
 """Support for Vanderbilt (formerly Siemens) SPC alarm systems."""
-import logging
-
 from pyspcwebgw.const import AreaMode
 
 import homeassistant.components.alarm_control_panel as alarm
@@ -21,8 +19,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from . import DATA_API, SIGNAL_UPDATE_ALARM
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def _get_alarm_state(area):
     """Get the alarm state."""
diff --git a/homeassistant/components/spc/binary_sensor.py b/homeassistant/components/spc/binary_sensor.py
index 1fda59207ec..48023d09a99 100644
--- a/homeassistant/components/spc/binary_sensor.py
+++ b/homeassistant/components/spc/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Vanderbilt (formerly Siemens) SPC alarm systems."""
-import logging
-
 from pyspcwebgw.const import ZoneInput, ZoneType
 
 from homeassistant.components.binary_sensor import (
@@ -14,8 +12,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from . import DATA_API, SIGNAL_UPDATE_SENSOR
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def _get_device_class(zone_type):
     return {
diff --git a/homeassistant/components/speedtestdotnet/__init__.py b/homeassistant/components/speedtestdotnet/__init__.py
index 32562251ed4..cb3144e266e 100644
--- a/homeassistant/components/speedtestdotnet/__init__.py
+++ b/homeassistant/components/speedtestdotnet/__init__.py
@@ -60,7 +60,6 @@ def server_id_valid(server_id):
 
 async def async_setup(hass, config):
     """Import integration from config."""
-
     if DOMAIN in config:
         hass.async_create_task(
             hass.config_entries.flow.async_init(
@@ -139,6 +138,7 @@ class SpeedTestDataCoordinator(DataUpdateCoordinator):
         try:
             server_list = self.api.get_servers()
         except speedtest.ConfigRetrievalError:
+            _LOGGER.debug("Error retrieving server list")
             return
 
         self.servers[DEFAULT_SERVER] = {}
diff --git a/homeassistant/components/speedtestdotnet/config_flow.py b/homeassistant/components/speedtestdotnet/config_flow.py
index 57076c2a90b..5ff405b59a8 100644
--- a/homeassistant/components/speedtestdotnet/config_flow.py
+++ b/homeassistant/components/speedtestdotnet/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow for Speedtest.net."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -18,8 +16,6 @@ from .const import (
 )
 from .const import DOMAIN  # pylint: disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class SpeedTestFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle Speedtest.net config flow."""
@@ -36,7 +32,7 @@ class SpeedTestFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_user(self, user_input=None):
         """Handle a flow initialized by the user."""
         if self._async_current_entries():
-            return self.async_abort(reason="one_instance_allowed")
+            return self.async_abort(reason="single_instance_allowed")
 
         if user_input is None:
             return self.async_show_form(step_id="user")
diff --git a/homeassistant/components/speedtestdotnet/sensor.py b/homeassistant/components/speedtestdotnet/sensor.py
index cf0a91a240e..5607d2570c9 100644
--- a/homeassistant/components/speedtestdotnet/sensor.py
+++ b/homeassistant/components/speedtestdotnet/sensor.py
@@ -1,6 +1,4 @@
 """Support for Speedtest.net internet speed testing sensor."""
-import logging
-
 from homeassistant.const import ATTR_ATTRIBUTION
 from homeassistant.core import callback
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -19,8 +17,6 @@ from .const import (
     SENSOR_TYPES,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Speedtestdotnet sensors."""
diff --git a/homeassistant/components/speedtestdotnet/services.yaml b/homeassistant/components/speedtestdotnet/services.yaml
index 299d457350d..489261ba77a 100644
--- a/homeassistant/components/speedtestdotnet/services.yaml
+++ b/homeassistant/components/speedtestdotnet/services.yaml
@@ -1,2 +1,2 @@
 speedtest:
-  description: Immediately take a speedest with Speedtest.net
+  description: Immediately execute a speed test with Speedtest.net
diff --git a/homeassistant/components/speedtestdotnet/strings.json b/homeassistant/components/speedtestdotnet/strings.json
index f638c25a549..cf3587af6c5 100644
--- a/homeassistant/components/speedtestdotnet/strings.json
+++ b/homeassistant/components/speedtestdotnet/strings.json
@@ -2,13 +2,12 @@
   "config": {
     "step": {
       "user": {
-        "title": "Set up SpeedTest",
-        "description": "Are you sure you want to set up SpeedTest?"
+        "description": "[%key:common::config_flow::description::confirm_setup%]"
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
-      "wrong_server_id": "Server id is not valid"
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "wrong_server_id": "Server ID is not valid"
     }
   },
   "options": {
@@ -20,9 +19,6 @@
           "server_name": "Select test server"
         }
       }
-    },
-    "error": {
-      "retrive_error": "Error retriving servers list"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/homeassistant/components/speedtestdotnet/translations/ca.json b/homeassistant/components/speedtestdotnet/translations/ca.json
index 2cd81f8af2e..090a464c91a 100644
--- a/homeassistant/components/speedtestdotnet/translations/ca.json
+++ b/homeassistant/components/speedtestdotnet/translations/ca.json
@@ -2,11 +2,12 @@
     "config": {
         "abort": {
             "one_instance_allowed": "Nom\u00e9s cal una \u00fanica inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3.",
             "wrong_server_id": "L'identificador del servidor no \u00e9s v\u00e0lid"
         },
         "step": {
             "user": {
-                "description": "Est\u00e0s segur que vols configurar SpeedTest?",
+                "description": "Vols comen\u00e7ar la configuraci\u00f3?",
                 "title": "Configura SpeedTest"
             }
         }
diff --git a/homeassistant/components/speedtestdotnet/translations/cs.json b/homeassistant/components/speedtestdotnet/translations/cs.json
index 26927f4e6f3..3961433f4e8 100644
--- a/homeassistant/components/speedtestdotnet/translations/cs.json
+++ b/homeassistant/components/speedtestdotnet/translations/cs.json
@@ -2,11 +2,12 @@
     "config": {
         "abort": {
             "one_instance_allowed": "Povolena je pouze jedna instance.",
-            "wrong_server_id": "Id serveru nen\u00ed platn\u00e9."
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace.",
+            "wrong_server_id": "ID serveru nen\u00ed platn\u00e9."
         },
         "step": {
             "user": {
-                "description": "Opravdu chcete nastavit SpeedTest?",
+                "description": "Chcete za\u010d\u00edt nastavovat?",
                 "title": "Nastavit SpeedTest"
             }
         }
@@ -19,7 +20,7 @@
             "init": {
                 "data": {
                     "manual": "Zak\u00e1zat automatickou aktualizaci",
-                    "scan_interval": "Frekvence aktualizace (minuty)",
+                    "scan_interval": "Frekvence aktualizac\u00ed (v minut\u00e1ch)",
                     "server_name": "Vyberte testovac\u00ed server"
                 }
             }
diff --git a/homeassistant/components/speedtestdotnet/translations/el.json b/homeassistant/components/speedtestdotnet/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/speedtestdotnet/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/speedtestdotnet/translations/en.json b/homeassistant/components/speedtestdotnet/translations/en.json
index 203640d350b..edae80c9f19 100644
--- a/homeassistant/components/speedtestdotnet/translations/en.json
+++ b/homeassistant/components/speedtestdotnet/translations/en.json
@@ -2,11 +2,12 @@
     "config": {
         "abort": {
             "one_instance_allowed": "Only a single instance is necessary.",
-            "wrong_server_id": "Server id is not valid"
+            "single_instance_allowed": "Already configured. Only a single configuration possible.",
+            "wrong_server_id": "Server ID is not valid"
         },
         "step": {
             "user": {
-                "description": "Are you sure you want to set up SpeedTest?",
+                "description": "Do you want to start set up?",
                 "title": "Set up SpeedTest"
             }
         }
diff --git a/homeassistant/components/speedtestdotnet/translations/es.json b/homeassistant/components/speedtestdotnet/translations/es.json
index 9c21c8e29a8..88474eebd5d 100644
--- a/homeassistant/components/speedtestdotnet/translations/es.json
+++ b/homeassistant/components/speedtestdotnet/translations/es.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "one_instance_allowed": "Solo se necesita una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n.",
             "wrong_server_id": "Id del servidor no v\u00e1lido"
         },
         "step": {
diff --git a/homeassistant/components/speedtestdotnet/translations/et.json b/homeassistant/components/speedtestdotnet/translations/et.json
new file mode 100644
index 00000000000..b514abe05b6
--- /dev/null
+++ b/homeassistant/components/speedtestdotnet/translations/et.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Vajalik on ainult \u00fcks sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine.",
+            "wrong_server_id": "Serveri ID ei sobi"
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid seadistada SpeedTesti?",
+                "title": "Seadista SpeedTest"
+            }
+        }
+    },
+    "options": {
+        "error": {
+            "retrive_error": "Viga serverite loendi hankimisel"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "manual": "Keela automaatne v\u00e4rskendamine",
+                    "scan_interval": "Uuendamise sagedus (minutites)",
+                    "server_name": "Testiserveri valimine"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/speedtestdotnet/translations/fr.json b/homeassistant/components/speedtestdotnet/translations/fr.json
index 68f16cea44f..7b92a679f25 100644
--- a/homeassistant/components/speedtestdotnet/translations/fr.json
+++ b/homeassistant/components/speedtestdotnet/translations/fr.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible.",
             "wrong_server_id": "L'ID du serveur n'est pas valide"
         },
         "step": {
diff --git a/homeassistant/components/speedtestdotnet/translations/it.json b/homeassistant/components/speedtestdotnet/translations/it.json
index 3ac6b03183c..7b5459948f9 100644
--- a/homeassistant/components/speedtestdotnet/translations/it.json
+++ b/homeassistant/components/speedtestdotnet/translations/it.json
@@ -2,11 +2,12 @@
     "config": {
         "abort": {
             "one_instance_allowed": "\u00c8 necessaria solo una singola istanza.",
-            "wrong_server_id": "L'ID del server non \u00e8 valido"
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione.",
+            "wrong_server_id": "L'ID Server non \u00e8 valido"
         },
         "step": {
             "user": {
-                "description": "Sei sicuro di voler configurare SpeedTest?",
+                "description": "Vuoi iniziare la configurazione?",
                 "title": "Configurare SpeedTest"
             }
         }
diff --git a/homeassistant/components/speedtestdotnet/translations/lb.json b/homeassistant/components/speedtestdotnet/translations/lb.json
index b9587e71087..7ceedc228e3 100644
--- a/homeassistant/components/speedtestdotnet/translations/lb.json
+++ b/homeassistant/components/speedtestdotnet/translations/lb.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech.",
             "wrong_server_id": "Server ID ass ong\u00eblteg"
         },
         "step": {
diff --git a/homeassistant/components/speedtestdotnet/translations/nl.json b/homeassistant/components/speedtestdotnet/translations/nl.json
new file mode 100644
index 00000000000..703ac8614c4
--- /dev/null
+++ b/homeassistant/components/speedtestdotnet/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/speedtestdotnet/translations/no.json b/homeassistant/components/speedtestdotnet/translations/no.json
index da2945b2985..cb438f80d47 100644
--- a/homeassistant/components/speedtestdotnet/translations/no.json
+++ b/homeassistant/components/speedtestdotnet/translations/no.json
@@ -1,12 +1,13 @@
 {
     "config": {
         "abort": {
-            "one_instance_allowed": "Kun en enkelt forekomst er n\u00f8dvendig.",
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
             "wrong_server_id": "Server-ID er ikke gyldig"
         },
         "step": {
             "user": {
-                "description": "Er du sikker p\u00e5 at du vil konfigurere SpeedTest?",
+                "description": "Vil du starte oppsettet?",
                 "title": "Konfigurere SpeedTest"
             }
         }
diff --git a/homeassistant/components/speedtestdotnet/translations/pl.json b/homeassistant/components/speedtestdotnet/translations/pl.json
new file mode 100644
index 00000000000..1adbbca166f
--- /dev/null
+++ b/homeassistant/components/speedtestdotnet/translations/pl.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "wrong_server_id": "Identyfikator serwera jest nieprawid\u0142owy"
+        },
+        "step": {
+            "user": {
+                "description": "Czy chcesz rozpocz\u0105\u0107 konfiguracj\u0119?",
+                "title": "Konfiguracja SpeedTest"
+            }
+        }
+    },
+    "options": {
+        "error": {
+            "retrive_error": "B\u0142\u0105d podczas pobierania listy serwer\u00f3w"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "manual": "Wy\u0142\u0105cz automatyczne aktualizacje",
+                    "scan_interval": "Cz\u0119stotliwo\u015b\u0107 aktualizacji (w minutach)",
+                    "server_name": "Wybierz serwer"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/speedtestdotnet/translations/ru.json b/homeassistant/components/speedtestdotnet/translations/ru.json
index fe5cbc1d890..836f2422908 100644
--- a/homeassistant/components/speedtestdotnet/translations/ru.json
+++ b/homeassistant/components/speedtestdotnet/translations/ru.json
@@ -2,11 +2,12 @@
     "config": {
         "abort": {
             "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e.",
             "wrong_server_id": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u0435\u043d."
         },
         "step": {
             "user": {
-                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c SpeedTest?",
+                "description": "\u0425\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0447\u0430\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443?",
                 "title": "SpeedTest"
             }
         }
diff --git a/homeassistant/components/speedtestdotnet/translations/sv.json b/homeassistant/components/speedtestdotnet/translations/sv.json
new file mode 100644
index 00000000000..78b043f1a37
--- /dev/null
+++ b/homeassistant/components/speedtestdotnet/translations/sv.json
@@ -0,0 +1,11 @@
+{
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "server_name": "V\u00e4lj testserver"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/speedtestdotnet/translations/zh-Hant.json b/homeassistant/components/speedtestdotnet/translations/zh-Hant.json
index 1661030b2f9..ab475fa3b7b 100644
--- a/homeassistant/components/speedtestdotnet/translations/zh-Hant.json
+++ b/homeassistant/components/speedtestdotnet/translations/zh-Hant.json
@@ -2,11 +2,12 @@
     "config": {
         "abort": {
             "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002",
             "wrong_server_id": "\u4f3a\u670d\u5668 ID \u7121\u6548"
         },
         "step": {
             "user": {
-                "description": "\u662f\u5426\u8981\u8a2d\u5b9a SpeedTest\uff1f",
+                "description": "\u662f\u5426\u8981\u958b\u59cb\u8a2d\u5b9a\uff1f",
                 "title": "\u8a2d\u5b9a SpeedTest"
             }
         }
diff --git a/homeassistant/components/spider/climate.py b/homeassistant/components/spider/climate.py
index 015606286e2..d9477c2a4fb 100644
--- a/homeassistant/components/spider/climate.py
+++ b/homeassistant/components/spider/climate.py
@@ -1,7 +1,4 @@
 """Support for Spider thermostats."""
-
-import logging
-
 from homeassistant.components.climate import ClimateEntity
 from homeassistant.components.climate.const import (
     HVAC_MODE_COOL,
@@ -26,8 +23,6 @@ HA_STATE_TO_SPIDER = {
 
 SPIDER_STATE_TO_HA = {value: key for key, value in HA_STATE_TO_SPIDER.items()}
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config, async_add_entities):
     """Initialize a Spider thermostat."""
diff --git a/homeassistant/components/spider/switch.py b/homeassistant/components/spider/switch.py
index cea20d8c6be..62f220bf805 100644
--- a/homeassistant/components/spider/switch.py
+++ b/homeassistant/components/spider/switch.py
@@ -1,12 +1,8 @@
 """Support for Spider switches."""
-import logging
-
 from homeassistant.components.switch import SwitchEntity
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config, async_add_entities):
     """Initialize a Spider thermostat."""
diff --git a/homeassistant/components/spider/translations/cs.json b/homeassistant/components/spider/translations/cs.json
new file mode 100644
index 00000000000..d87964c38db
--- /dev/null
+++ b/homeassistant/components/spider/translations/cs.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                },
+                "title": "P\u0159ihlaste se pomoc\u00ed \u00fa\u010dtu mijn.ithodaalderop.nl"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/spider/translations/es.json b/homeassistant/components/spider/translations/es.json
index 230eb9f53c8..c538d4fa5b5 100644
--- a/homeassistant/components/spider/translations/es.json
+++ b/homeassistant/components/spider/translations/es.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
diff --git a/homeassistant/components/spider/translations/et.json b/homeassistant/components/spider/translations/et.json
new file mode 100644
index 00000000000..a7e16adbe4a
--- /dev/null
+++ b/homeassistant/components/spider/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/spider/translations/pl.json b/homeassistant/components/spider/translations/pl.json
index 4b9e07cb01f..f288bcbd78b 100644
--- a/homeassistant/components/spider/translations/pl.json
+++ b/homeassistant/components/spider/translations/pl.json
@@ -12,7 +12,8 @@
                 "data": {
                     "password": "Has\u0142o",
                     "username": "Nazwa u\u017cytkownika"
-                }
+                },
+                "title": "Zaloguj si\u0119 na konto mijn.ithodaalderop.nl"
             }
         }
     }
diff --git a/homeassistant/components/spider/translations/zh-Hans.json b/homeassistant/components/spider/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/spider/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/spotcrime/sensor.py b/homeassistant/components/spotcrime/sensor.py
index 2edaa3cf933..30aa80b5e7d 100644
--- a/homeassistant/components/spotcrime/sensor.py
+++ b/homeassistant/components/spotcrime/sensor.py
@@ -2,7 +2,6 @@
 
 from collections import defaultdict
 from datetime import timedelta
-import logging
 
 import spotcrime
 import voluptuous as vol
@@ -24,8 +23,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import slugify
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_DAYS = "days"
 DEFAULT_DAYS = 1
 NAME = "spotcrime"
diff --git a/homeassistant/components/spotify/__init__.py b/homeassistant/components/spotify/__init__.py
index 9459a4923c8..10fe70c611e 100644
--- a/homeassistant/components/spotify/__init__.py
+++ b/homeassistant/components/spotify/__init__.py
@@ -1,5 +1,4 @@
 """The spotify integration."""
-import logging
 
 from spotipy import Spotify, SpotifyException
 import voluptuous as vol
@@ -25,8 +24,6 @@ from .const import (
     SPOTIFY_SCOPES,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: vol.Schema(
diff --git a/homeassistant/components/spotify/config_flow.py b/homeassistant/components/spotify/config_flow.py
index 14e45d58b39..ac6e101d4fe 100644
--- a/homeassistant/components/spotify/config_flow.py
+++ b/homeassistant/components/spotify/config_flow.py
@@ -11,8 +11,6 @@ from homeassistant.helpers import config_entry_oauth2_flow
 
 from .const import DOMAIN, SPOTIFY_SCOPES
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class SpotifyFlowHandler(
     config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
diff --git a/homeassistant/components/spotify/manifest.json b/homeassistant/components/spotify/manifest.json
index db2f35ded91..c4d7378c060 100644
--- a/homeassistant/components/spotify/manifest.json
+++ b/homeassistant/components/spotify/manifest.json
@@ -2,7 +2,7 @@
   "domain": "spotify",
   "name": "Spotify",
   "documentation": "https://www.home-assistant.io/integrations/spotify",
-  "requirements": ["spotipy==2.16.0"],
+  "requirements": ["spotipy==2.16.1"],
   "zeroconf": ["_spotify-connect._tcp.local."],
   "dependencies": ["http"],
   "codeowners": ["@frenck"],
diff --git a/homeassistant/components/spotify/strings.json b/homeassistant/components/spotify/strings.json
index 5a7e56013cc..8745df8e56f 100644
--- a/homeassistant/components/spotify/strings.json
+++ b/homeassistant/components/spotify/strings.json
@@ -1,14 +1,15 @@
 {
   "config": {
     "step": {
-      "pick_implementation": { "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]" },
+      "pick_implementation": {
+        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      },
       "reauth_confirm": {
-        "title": "Re-authenticate with Spotify",
+        "title": "[%key:common::config_flow::title::reauth%]",
         "description": "The Spotify integration needs to re-authenticate with Spotify for account: {account}"
       }
     },
     "abort": {
-      "already_setup": "You can only configure one Spotify account.",
       "authorize_url_timeout": "Timeout generating authorize url.",
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
       "missing_configuration": "The Spotify integration is not configured. Please follow the documentation.",
diff --git a/homeassistant/components/spotify/translations/ca.json b/homeassistant/components/spotify/translations/ca.json
index db47a10ed24..e0e65c0ebc2 100644
--- a/homeassistant/components/spotify/translations/ca.json
+++ b/homeassistant/components/spotify/translations/ca.json
@@ -12,11 +12,11 @@
         },
         "step": {
             "pick_implementation": {
-                "title": "Selecci\u00f3 del m\u00e8tode d'autenticaci\u00f3"
+                "title": "Selecciona el m\u00e8tode d'autenticaci\u00f3"
             },
             "reauth_confirm": {
                 "description": "La integraci\u00f3 de Spotify ha de tornar a autenticar-se amb el compte de Spotify: {account}",
-                "title": "Re-autenticaci\u00f3 amb Spotify"
+                "title": "Reautenticaci\u00f3 de la integraci\u00f3"
             }
         }
     }
diff --git a/homeassistant/components/spotify/translations/cs.json b/homeassistant/components/spotify/translations/cs.json
index 10c58c119aa..b8f7c90e317 100644
--- a/homeassistant/components/spotify/translations/cs.json
+++ b/homeassistant/components/spotify/translations/cs.json
@@ -3,7 +3,8 @@
         "abort": {
             "already_setup": "M\u016f\u017eete nakonfigurovat pouze jeden \u00fa\u010det Spotify.",
             "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
-            "missing_configuration": "Integrace Spotify nen\u00ed nakonfigurov\u00e1na. Postupujte podle n\u00e1vodu."
+            "missing_configuration": "Integrace Spotify nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "no_url_available": "Nen\u00ed k dispozici \u017e\u00e1dn\u00e1 adresa URL. Informace o t\u00e9to chyb\u011b naleznete [v sekci n\u00e1pov\u011bdy]({docs_url})"
         },
         "create_entry": {
             "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno pomoc\u00ed Spotify."
@@ -11,6 +12,10 @@
         "step": {
             "pick_implementation": {
                 "title": "Vyberte metodu ov\u011b\u0159en\u00ed"
+            },
+            "reauth_confirm": {
+                "description": "Integraci Spotify je t\u0159eba znovu ov\u011b\u0159it pomoc\u00ed \u00fa\u010dtu Spotify: {account}",
+                "title": "Znovu ov\u011b\u0159it integraci"
             }
         }
     }
diff --git a/homeassistant/components/spotify/translations/el.json b/homeassistant/components/spotify/translations/el.json
new file mode 100644
index 00000000000..d2580d58c0b
--- /dev/null
+++ b/homeassistant/components/spotify/translations/el.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "reauth_account_mismatch": "\u039f \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 Spotify \u03bc\u03b5 \u03c4\u03bf\u03bd \u03bf\u03c0\u03bf\u03af\u03bf \u03ad\u03c7\u03b5\u03b9 \u03b3\u03af\u03bd\u03b5\u03b9 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2, \u03b4\u03b5\u03bd \u03c3\u03c5\u03bc\u03c6\u03c9\u03bd\u03b5\u03af \u03bc\u03b5 \u03c4\u03bf\u03bd \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03b5\u03ba \u03bd\u03ad\u03bf\u03c5 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03c4\u03bf\u03c5 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03cd."
+        },
+        "step": {
+            "reauth_confirm": {
+                "description": "\u0397 \u03b5\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7 Spotify \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b5\u03c0\u03b1\u03bb\u03b7\u03b8\u03b5\u03cd\u03c3\u03b5\u03b9 \u03be\u03b1\u03bd\u03ac \u03c4\u03bf\u03bd \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03bc\u03b5 \u03c4\u03bf Spotify \u03b3\u03b9\u03b1 \u03c4\u03bf\u03bd \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc: {account}",
+                "title": "\u0395\u03c0\u03b1\u03bb\u03b7\u03b8\u03b5\u03cd\u03c3\u03c4\u03b5 \u03c4\u03bf\u03bd \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf \u03c4\u03b1\u03c5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03bc\u03b5 \u03c4\u03bf Spotify"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/spotify/translations/en.json b/homeassistant/components/spotify/translations/en.json
index c2f1b5544ae..146c42f4411 100644
--- a/homeassistant/components/spotify/translations/en.json
+++ b/homeassistant/components/spotify/translations/en.json
@@ -16,7 +16,7 @@
             },
             "reauth_confirm": {
                 "description": "The Spotify integration needs to re-authenticate with Spotify for account: {account}",
-                "title": "Re-authenticate with Spotify"
+                "title": "Reauthenticate Integration"
             }
         }
     }
diff --git a/homeassistant/components/spotify/translations/es.json b/homeassistant/components/spotify/translations/es.json
index 025777ad3f6..56f2e3ba95b 100644
--- a/homeassistant/components/spotify/translations/es.json
+++ b/homeassistant/components/spotify/translations/es.json
@@ -12,7 +12,7 @@
         },
         "step": {
             "pick_implementation": {
-                "title": "Elija el m\u00e9todo de autenticaci\u00f3n"
+                "title": "Selecciona el m\u00e9todo de autenticaci\u00f3n"
             },
             "reauth_confirm": {
                 "description": "La integraci\u00f3n de Spotify necesita volver a autenticarse con Spotify para la cuenta: {account}",
diff --git a/homeassistant/components/spotify/translations/et.json b/homeassistant/components/spotify/translations/et.json
index 059b892f009..3403292db03 100644
--- a/homeassistant/components/spotify/translations/et.json
+++ b/homeassistant/components/spotify/translations/et.json
@@ -3,14 +3,20 @@
         "abort": {
             "already_setup": "Saate konfigureerida ainult \u00fche Spotify konto.",
             "authorize_url_timeout": "Kinnituse URLi ajal\u00f5pp",
-            "missing_configuration": "Spotify sidumine pole seadistatud. Palun j\u00e4rgige dokumentatsiooni."
+            "missing_configuration": "Spotify sidumine pole h\u00e4\u00e4lestatud. Palun j\u00e4rgige dokumentatsiooni.",
+            "no_url_available": "URL pole saadaval. Rohkem teavet [check the help section]({docs_url})",
+            "reauth_account_mismatch": "Spotify konto mida autenditi ei vasta kontole mis vajas uuesti autentimist."
         },
         "create_entry": {
             "default": "Edukalt Spotifyga autenditud."
         },
         "step": {
             "pick_implementation": {
-                "title": "Valige autentimismeetod"
+                "title": "Vali tuvastusmeetod"
+            },
+            "reauth_confirm": {
+                "description": "Spotify konto: {account} sidumine tuleb uuesti autentida",
+                "title": "Autendi Spotify uuesti"
             }
         }
     }
diff --git a/homeassistant/components/spotify/translations/no.json b/homeassistant/components/spotify/translations/no.json
index 6ab60ddbc0c..ebd6bc3816b 100644
--- a/homeassistant/components/spotify/translations/no.json
+++ b/homeassistant/components/spotify/translations/no.json
@@ -4,7 +4,7 @@
             "already_setup": "Du kan bare konfigurere en Spotify-konto.",
             "authorize_url_timeout": "Tidsavbrudd ved oppretting av godkjenningsadresse.",
             "missing_configuration": "Spotify-integrasjonen er ikke konfigurert. F\u00f8lg dokumentasjonen.",
-            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk {docs_url} ] ( {docs_url} )",
+            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk hjelpseksjonen]({docs_url})",
             "reauth_account_mismatch": "Spotify-kontoen som er autentisert med, samsvarer ikke med den kontoen som trengs re-autentisering."
         },
         "create_entry": {
@@ -16,7 +16,7 @@
             },
             "reauth_confirm": {
                 "description": "Spotify-integreringen m\u00e5 godkjennes p\u00e5 nytt med Spotify for konto: {account}",
-                "title": "Autentiser p\u00e5 nytt med Spotify"
+                "title": "Bekreft integrering p\u00e5 nytt"
             }
         }
     }
diff --git a/homeassistant/components/spotify/translations/pl.json b/homeassistant/components/spotify/translations/pl.json
index 0ed5a24ce16..8af9c3945f7 100644
--- a/homeassistant/components/spotify/translations/pl.json
+++ b/homeassistant/components/spotify/translations/pl.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Spotify.",
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
-            "missing_configuration": "Integracja ze Spotify nie jest skonfigurowana. Post\u0119puj zgodnie z dokumentacj\u0105."
+            "already_setup": "Mo\u017cesz skonfigurowa\u0107 tylko jedno konto Spotify",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_url_available": "Brak dost\u0119pnego adresu URL. Aby uzyska\u0107 informacje na temat tego b\u0142\u0119du, [sprawd\u017a sekcj\u0119 pomocy] ({docs_url})",
+            "reauth_account_mismatch": "Uwierzytelnione konto Spotify nie pasuje do konta, kt\u00f3re wymaga ponownego uwierzytelnienia"
         },
         "create_entry": {
             "default": "Pomy\u015blnie uwierzytelniono z Spotify"
@@ -13,7 +15,8 @@
                 "title": "Wybierz metod\u0119 uwierzytelniania"
             },
             "reauth_confirm": {
-                "title": "Ponownie uwierzytelnij ze Spotify"
+                "description": "Integracja Spotify wymaga ponownego uwierzytelnienia w Spotify dla konta: {account}",
+                "title": "Ponownie uwierzytelnij integracj\u0119"
             }
         }
     }
diff --git a/homeassistant/components/spotify/translations/zh-Hant.json b/homeassistant/components/spotify/translations/zh-Hant.json
index d7e52012c36..cb091ed5dd9 100644
--- a/homeassistant/components/spotify/translations/zh-Hant.json
+++ b/homeassistant/components/spotify/translations/zh-Hant.json
@@ -16,7 +16,7 @@
             },
             "reauth_confirm": {
                 "description": "Spotify \u6574\u5408\u9700\u8981\u91cd\u65b0\u8a8d\u8b49 Spotify \u5e33\u865f\uff1a{account}",
-                "title": "\u91cd\u65b0\u8a8d\u8b49 Spotify\u3002"
+                "title": "\u91cd\u65b0\u8a8d\u8b49\u6574\u5408"
             }
         }
     }
diff --git a/homeassistant/components/sql/manifest.json b/homeassistant/components/sql/manifest.json
index c79f29d6eed..459124820ff 100644
--- a/homeassistant/components/sql/manifest.json
+++ b/homeassistant/components/sql/manifest.json
@@ -2,6 +2,6 @@
   "domain": "sql",
   "name": "SQL",
   "documentation": "https://www.home-assistant.io/integrations/sql",
-  "requirements": ["sqlalchemy==1.3.19"],
+  "requirements": ["sqlalchemy==1.3.20"],
   "codeowners": ["@dgomes"]
 }
diff --git a/homeassistant/components/squeezebox/browse_media.py b/homeassistant/components/squeezebox/browse_media.py
new file mode 100644
index 00000000000..bab24e39cbc
--- /dev/null
+++ b/homeassistant/components/squeezebox/browse_media.py
@@ -0,0 +1,171 @@
+"""Support for media browsing."""
+from homeassistant.components.media_player import BrowseError, BrowseMedia
+from homeassistant.components.media_player.const import (
+    MEDIA_CLASS_ALBUM,
+    MEDIA_CLASS_ARTIST,
+    MEDIA_CLASS_DIRECTORY,
+    MEDIA_CLASS_GENRE,
+    MEDIA_CLASS_PLAYLIST,
+    MEDIA_CLASS_TRACK,
+    MEDIA_TYPE_ALBUM,
+    MEDIA_TYPE_ARTIST,
+    MEDIA_TYPE_GENRE,
+    MEDIA_TYPE_PLAYLIST,
+    MEDIA_TYPE_TRACK,
+)
+
+LIBRARY = ["Artists", "Albums", "Tracks", "Playlists", "Genres"]
+
+MEDIA_TYPE_TO_SQUEEZEBOX = {
+    "Artists": "artists",
+    "Albums": "albums",
+    "Tracks": "titles",
+    "Playlists": "playlists",
+    "Genres": "genres",
+    MEDIA_TYPE_ALBUM: "album",
+    MEDIA_TYPE_ARTIST: "artist",
+    MEDIA_TYPE_TRACK: "title",
+    MEDIA_TYPE_PLAYLIST: "playlist",
+    MEDIA_TYPE_GENRE: "genre",
+}
+
+SQUEEZEBOX_ID_BY_TYPE = {
+    MEDIA_TYPE_ALBUM: "album_id",
+    MEDIA_TYPE_ARTIST: "artist_id",
+    MEDIA_TYPE_TRACK: "track_id",
+    MEDIA_TYPE_PLAYLIST: "playlist_id",
+    MEDIA_TYPE_GENRE: "genre_id",
+}
+
+CONTENT_TYPE_MEDIA_CLASS = {
+    "Artists": {"item": MEDIA_CLASS_DIRECTORY, "children": MEDIA_CLASS_ARTIST},
+    "Albums": {"item": MEDIA_CLASS_DIRECTORY, "children": MEDIA_CLASS_ALBUM},
+    "Tracks": {"item": MEDIA_CLASS_DIRECTORY, "children": MEDIA_CLASS_TRACK},
+    "Playlists": {"item": MEDIA_CLASS_DIRECTORY, "children": MEDIA_CLASS_PLAYLIST},
+    "Genres": {"item": MEDIA_CLASS_DIRECTORY, "children": MEDIA_CLASS_GENRE},
+    MEDIA_TYPE_ALBUM: {"item": MEDIA_CLASS_ALBUM, "children": MEDIA_CLASS_TRACK},
+    MEDIA_TYPE_ARTIST: {"item": MEDIA_CLASS_ARTIST, "children": MEDIA_CLASS_ALBUM},
+    MEDIA_TYPE_TRACK: {"item": MEDIA_CLASS_TRACK, "children": None},
+    MEDIA_TYPE_GENRE: {"item": MEDIA_CLASS_GENRE, "children": MEDIA_CLASS_ARTIST},
+    MEDIA_TYPE_PLAYLIST: {
+        "item": MEDIA_CLASS_PLAYLIST,
+        "children": MEDIA_CLASS_TRACK,
+    },
+}
+
+CONTENT_TYPE_TO_CHILD_TYPE = {
+    MEDIA_TYPE_ALBUM: MEDIA_TYPE_TRACK,
+    MEDIA_TYPE_PLAYLIST: MEDIA_TYPE_PLAYLIST,
+    MEDIA_TYPE_ARTIST: MEDIA_TYPE_ALBUM,
+    MEDIA_TYPE_GENRE: MEDIA_TYPE_ARTIST,
+    "Artists": MEDIA_TYPE_ARTIST,
+    "Albums": MEDIA_TYPE_ALBUM,
+    "Tracks": MEDIA_TYPE_TRACK,
+    "Playlists": MEDIA_TYPE_PLAYLIST,
+    "Genres": MEDIA_TYPE_GENRE,
+}
+
+BROWSE_LIMIT = 1000
+
+
+async def build_item_response(player, payload):
+    """Create response payload for search described by payload."""
+    search_id = payload["search_id"]
+    search_type = payload["search_type"]
+
+    media_class = CONTENT_TYPE_MEDIA_CLASS[search_type]
+
+    if search_id and search_id != search_type:
+        browse_id = (SQUEEZEBOX_ID_BY_TYPE[search_type], search_id)
+    else:
+        browse_id = None
+
+    result = await player.async_browse(
+        MEDIA_TYPE_TO_SQUEEZEBOX[search_type],
+        limit=BROWSE_LIMIT,
+        browse_id=browse_id,
+    )
+
+    children = None
+
+    if result is not None and result.get("items"):
+        item_type = CONTENT_TYPE_TO_CHILD_TYPE[search_type]
+        child_media_class = CONTENT_TYPE_MEDIA_CLASS[item_type]
+
+        children = []
+        for item in result["items"]:
+            children.append(
+                BrowseMedia(
+                    title=item["title"],
+                    media_class=child_media_class["item"],
+                    media_content_id=str(item["id"]),
+                    media_content_type=item_type,
+                    can_play=True,
+                    can_expand=child_media_class["children"] is not None,
+                    thumbnail=item.get("image_url"),
+                )
+            )
+
+    if children is None:
+        raise BrowseError(f"Media not found: {search_type} / {search_id}")
+
+    return BrowseMedia(
+        title=result.get("title"),
+        media_class=media_class["item"],
+        children_media_class=media_class["children"],
+        media_content_id=search_id,
+        media_content_type=search_type,
+        can_play=True,
+        children=children,
+        can_expand=True,
+    )
+
+
+async def library_payload(player):
+    """Create response payload to describe contents of library."""
+
+    library_info = {
+        "title": "Music Library",
+        "media_class": MEDIA_CLASS_DIRECTORY,
+        "media_content_id": "library",
+        "media_content_type": "library",
+        "can_play": False,
+        "can_expand": True,
+        "children": [],
+    }
+
+    for item in LIBRARY:
+        media_class = CONTENT_TYPE_MEDIA_CLASS[item]
+        result = await player.async_browse(
+            MEDIA_TYPE_TO_SQUEEZEBOX[item],
+            limit=1,
+        )
+        if result is not None and result.get("items") is not None:
+            library_info["children"].append(
+                BrowseMedia(
+                    title=item,
+                    media_class=media_class["children"],
+                    media_content_id=item,
+                    media_content_type=item,
+                    can_play=True,
+                    can_expand=True,
+                )
+            )
+
+    response = BrowseMedia(**library_info)
+    return response
+
+
+async def generate_playlist(player, payload):
+    """Generate playlist from browsing payload."""
+    media_type = payload["search_type"]
+    media_id = payload["search_id"]
+
+    if media_type not in SQUEEZEBOX_ID_BY_TYPE:
+        return None
+
+    browse_id = (SQUEEZEBOX_ID_BY_TYPE[media_type], media_id)
+    result = await player.async_browse(
+        "titles", limit=BROWSE_LIMIT, browse_id=browse_id
+    )
+    return result.get("items")
diff --git a/homeassistant/components/squeezebox/manifest.json b/homeassistant/components/squeezebox/manifest.json
index 2ebde216130..a0d0d1ef50e 100644
--- a/homeassistant/components/squeezebox/manifest.json
+++ b/homeassistant/components/squeezebox/manifest.json
@@ -6,7 +6,7 @@
     "@rajlaud"
   ],
   "requirements": [
-    "pysqueezebox==0.3.1"
+    "pysqueezebox==0.5.4"
   ],
   "config_flow": true
 }
diff --git a/homeassistant/components/squeezebox/media_player.py b/homeassistant/components/squeezebox/media_player.py
index a4b62d33f39..9a7baffb3f8 100644
--- a/homeassistant/components/squeezebox/media_player.py
+++ b/homeassistant/components/squeezebox/media_player.py
@@ -12,6 +12,7 @@ from homeassistant.components.media_player.const import (
     ATTR_MEDIA_ENQUEUE,
     MEDIA_TYPE_MUSIC,
     MEDIA_TYPE_PLAYLIST,
+    SUPPORT_BROWSE_MEDIA,
     SUPPORT_CLEAR_PLAYLIST,
     SUPPORT_NEXT_TRACK,
     SUPPORT_PAUSE,
@@ -48,6 +49,7 @@ from homeassistant.helpers.dispatcher import (
 )
 from homeassistant.util.dt import utcnow
 
+from .browse_media import build_item_response, generate_playlist, library_payload
 from .const import (
     DEFAULT_PORT,
     DISCOVERY_TASK,
@@ -71,7 +73,8 @@ _LOGGER = logging.getLogger(__name__)
 DISCOVERY_INTERVAL = 60
 
 SUPPORT_SQUEEZEBOX = (
-    SUPPORT_PAUSE
+    SUPPORT_BROWSE_MEDIA
+    | SUPPORT_PAUSE
     | SUPPORT_VOLUME_SET
     | SUPPORT_VOLUME_MUTE
     | SUPPORT_PREVIOUS_TRACK
@@ -476,15 +479,40 @@ class SqueezeBoxEntity(MediaPlayerEntity):
         If ATTR_MEDIA_ENQUEUE is True, add `media_id` to the current playlist.
         """
         cmd = "play"
+        index = None
+
         if kwargs.get(ATTR_MEDIA_ENQUEUE):
             cmd = "add"
 
-        if media_type == MEDIA_TYPE_PLAYLIST:
-            content = json.loads(media_id)
-            await self._player.async_load_playlist(content["urls"], cmd)
-            await self._player.async_index(content["index"])
-        else:
+        if media_type == MEDIA_TYPE_MUSIC:
             await self._player.async_load_url(media_id, cmd)
+            return
+
+        if media_type == MEDIA_TYPE_PLAYLIST:
+            try:
+                # a saved playlist by number
+                payload = {
+                    "search_id": int(media_id),
+                    "search_type": MEDIA_TYPE_PLAYLIST,
+                }
+                playlist = await generate_playlist(self._player, payload)
+            except ValueError:
+                # a list of urls
+                content = json.loads(media_id)
+                playlist = content["urls"]
+                index = content["index"]
+        else:
+            payload = {
+                "search_id": media_id,
+                "search_type": media_type,
+            }
+            playlist = await generate_playlist(self._player, payload)
+
+            _LOGGER.debug("Generated playlist: %s", playlist)
+
+        await self._player.async_load_playlist(playlist, cmd)
+        if index is not None:
+            await self._player.async_index(index)
 
     async def async_set_shuffle(self, shuffle):
         """Enable/disable shuffle mode."""
@@ -541,3 +569,22 @@ class SqueezeBoxEntity(MediaPlayerEntity):
     async def async_unsync(self):
         """Unsync this Squeezebox player."""
         await self._player.async_unsync()
+
+    async def async_browse_media(self, media_content_type=None, media_content_id=None):
+        """Implement the websocket media browsing helper."""
+
+        _LOGGER.debug(
+            "Reached async_browse_media with content_type %s and content_id %s",
+            media_content_type,
+            media_content_id,
+        )
+
+        if media_content_type in [None, "library"]:
+            return await library_payload(self._player)
+
+        payload = {
+            "search_type": media_content_type,
+            "search_id": media_content_id,
+        }
+
+        return await build_item_response(self._player, payload)
diff --git a/homeassistant/components/squeezebox/translations/cs.json b/homeassistant/components/squeezebox/translations/cs.json
index 0bf738d91ff..d90b902cc61 100644
--- a/homeassistant/components/squeezebox/translations/cs.json
+++ b/homeassistant/components/squeezebox/translations/cs.json
@@ -1,13 +1,15 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "no_server_found": "Server se nepoda\u0159ilo automaticky objevit.",
             "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
         },
+        "flow_title": "Logitech Squeezebox: {host}",
         "step": {
             "edit": {
                 "data": {
diff --git a/homeassistant/components/squeezebox/translations/et.json b/homeassistant/components/squeezebox/translations/et.json
new file mode 100644
index 00000000000..34155663543
--- /dev/null
+++ b/homeassistant/components/squeezebox/translations/et.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "flow_title": "Logitech Squeezebox: {host}",
+        "step": {
+            "edit": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "port": "",
+                    "username": "Kasutajanimi"
+                }
+            },
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/squeezebox/translations/nl.json b/homeassistant/components/squeezebox/translations/nl.json
index bb140f4ca89..67fe1197e21 100644
--- a/homeassistant/components/squeezebox/translations/nl.json
+++ b/homeassistant/components/squeezebox/translations/nl.json
@@ -1,11 +1,18 @@
 {
     "config": {
+        "flow_title": "Logitech Squeezebox: {host}",
         "step": {
             "edit": {
                 "data": {
+                    "password": "Wachtwoord",
+                    "port": "Poort",
                     "username": "Gebruikersnaam"
                 }
+            },
+            "user": {
+                "title": "Configureer Logitech Media Server"
             }
         }
-    }
+    },
+    "title": "Logitech Squeezebox"
 }
\ No newline at end of file
diff --git a/homeassistant/components/squeezebox/translations/no.json b/homeassistant/components/squeezebox/translations/no.json
index ddda0b61be2..777c782691d 100644
--- a/homeassistant/components/squeezebox/translations/no.json
+++ b/homeassistant/components/squeezebox/translations/no.json
@@ -5,7 +5,7 @@
             "no_server_found": "Ingen LMS-server funnet."
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "no_server_found": "Kan ikke automatisk oppdage serveren.",
             "unknown": "Uventet feil"
@@ -16,7 +16,7 @@
                 "data": {
                     "host": "Vert",
                     "password": "Passord",
-                    "port": "",
+                    "port": "Port",
                     "username": "Brukernavn"
                 },
                 "title": "Redigere tilkoblingsinformasjon"
diff --git a/homeassistant/components/squeezebox/translations/pl.json b/homeassistant/components/squeezebox/translations/pl.json
index 4bf27bbb3ec..1f9aa5d24af 100644
--- a/homeassistant/components/squeezebox/translations/pl.json
+++ b/homeassistant/components/squeezebox/translations/pl.json
@@ -1,27 +1,33 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "no_server_found": "Nie znaleziono serwera LMS"
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "no_server_found": "Nie uda\u0142o si\u0119 automatycznie wykry\u0107 serwera",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
+        "flow_title": "Logitech Squeezebox: {host}",
         "step": {
             "edit": {
                 "data": {
                     "host": "Nazwa hosta lub adres IP",
-                    "password": "[%key_id:common::config_flow::data::password%]",
+                    "password": "Has\u0142o",
                     "port": "Port",
-                    "username": "[%key_id:common::config_flow::data::username%]"
-                }
+                    "username": "Nazwa u\u017cytkownika"
+                },
+                "title": "Edycja informacji o po\u0142\u0105czeniu"
             },
             "user": {
                 "data": {
                     "host": "Nazwa hosta lub adres IP"
-                }
+                },
+                "title": "Konfiguracja Serwera medi\u00f3w Logitech (LMS)"
             }
         }
-    }
+    },
+    "title": "Logitech Squeezebox"
 }
\ No newline at end of file
diff --git a/homeassistant/components/squeezebox/translations/zh-Hans.json b/homeassistant/components/squeezebox/translations/zh-Hans.json
new file mode 100644
index 00000000000..56359f49302
--- /dev/null
+++ b/homeassistant/components/squeezebox/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "edit": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/ssdp/__init__.py b/homeassistant/components/ssdp/__init__.py
index af2ae21dac3..7108034cfb8 100644
--- a/homeassistant/components/ssdp/__init__.py
+++ b/homeassistant/components/ssdp/__init__.py
@@ -1,6 +1,7 @@
 """The SSDP integration."""
 import asyncio
 from datetime import timedelta
+import itertools
 import logging
 
 import aiohttp
@@ -50,6 +51,12 @@ async def async_setup(hass, config):
     return True
 
 
+def _run_ssdp_scans():
+    _LOGGER.debug("Scanning")
+    # Run 3 times as packets can get lost
+    return itertools.chain.from_iterable([ssdp.scan() for _ in range(3)])
+
+
 class Scanner:
     """Class to manage SSDP scanning."""
 
@@ -62,11 +69,9 @@ class Scanner:
 
     async def async_scan(self, _):
         """Scan for new entries."""
-        _LOGGER.debug("Scanning")
-        # Run 3 times as packets can get lost
-        for _ in range(3):
-            entries = await self.hass.async_add_executor_job(ssdp.scan)
-            await self._process_entries(entries)
+        entries = await self.hass.async_add_executor_job(_run_ssdp_scans)
+
+        await self._process_entries(entries)
 
         # We clear the cache after each run. We track discovered entries
         # so will never need a description twice.
diff --git a/homeassistant/components/starline/account.py b/homeassistant/components/starline/account.py
index 3ee716ec856..1cedcef8e84 100644
--- a/homeassistant/components/starline/account.py
+++ b/homeassistant/components/starline/account.py
@@ -9,13 +9,13 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.event import async_track_time_interval
 
 from .const import (
+    _LOGGER,
     DATA_EXPIRES,
     DATA_SLID_TOKEN,
     DATA_SLNET_TOKEN,
     DATA_USER_ID,
     DEFAULT_SCAN_INTERVAL,
     DOMAIN,
-    LOGGER,
 )
 
 
@@ -60,7 +60,7 @@ class StarlineAccount:
                 },
             )
         except Exception as err:  # pylint: disable=broad-except
-            LOGGER.error("Error updating SLNet token: %s", err)
+            _LOGGER.error("Error updating SLNet token: %s", err)
 
     def _update_data(self):
         """Update StarLine data."""
@@ -78,7 +78,7 @@ class StarlineAccount:
 
     def set_update_interval(self, interval: int) -> None:
         """Set StarLine API update interval."""
-        LOGGER.debug("Setting update interval: %ds", interval)
+        _LOGGER.debug("Setting update interval: %ds", interval)
         self._update_interval = interval
         if self._unsubscribe_auto_updater is not None:
             self._unsubscribe_auto_updater()
@@ -90,7 +90,7 @@ class StarlineAccount:
 
     def unload(self):
         """Unload StarLine API."""
-        LOGGER.debug("Unloading StarLine API.")
+        _LOGGER.debug("Unloading StarLine API.")
         if self._unsubscribe_auto_updater is not None:
             self._unsubscribe_auto_updater()
             self._unsubscribe_auto_updater = None
diff --git a/homeassistant/components/starline/config_flow.py b/homeassistant/components/starline/config_flow.py
index 8650f158cfc..d6e8d6f98ea 100644
--- a/homeassistant/components/starline/config_flow.py
+++ b/homeassistant/components/starline/config_flow.py
@@ -8,6 +8,7 @@ from homeassistant import config_entries, core
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 
 from .const import (  # pylint: disable=unused-import
+    _LOGGER,
     CONF_APP_ID,
     CONF_APP_SECRET,
     CONF_CAPTCHA_CODE,
@@ -20,7 +21,6 @@ from .const import (  # pylint: disable=unused-import
     ERROR_AUTH_APP,
     ERROR_AUTH_MFA,
     ERROR_AUTH_USER,
-    LOGGER,
 )
 
 
@@ -182,7 +182,7 @@ class StarlineFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             )
             return self._async_form_auth_user(error)
         except Exception as err:  # pylint: disable=broad-except
-            LOGGER.error("Error auth StarLine: %s", err)
+            _LOGGER.error("Error auth StarLine: %s", err)
             return self._async_form_auth_app(ERROR_AUTH_APP)
 
     async def _async_authenticate_user(self, error=None):
@@ -215,7 +215,7 @@ class StarlineFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
             raise Exception(data)
         except Exception as err:  # pylint: disable=broad-except
-            LOGGER.error("Error auth user: %s", err)
+            _LOGGER.error("Error auth user: %s", err)
             return self._async_form_auth_user(ERROR_AUTH_USER)
 
     async def _async_get_entry(self):
diff --git a/homeassistant/components/starline/const.py b/homeassistant/components/starline/const.py
index d76cd47b100..64ba8fc3d2d 100644
--- a/homeassistant/components/starline/const.py
+++ b/homeassistant/components/starline/const.py
@@ -1,7 +1,7 @@
 """StarLine constants."""
 import logging
 
-LOGGER = logging.getLogger(__package__)
+_LOGGER = logging.getLogger(__package__)
 
 DOMAIN = "starline"
 PLATFORMS = ["device_tracker", "binary_sensor", "sensor", "lock", "switch"]
diff --git a/homeassistant/components/starline/translations/cs.json b/homeassistant/components/starline/translations/cs.json
index 94c158b64d4..c7446a1cc80 100644
--- a/homeassistant/components/starline/translations/cs.json
+++ b/homeassistant/components/starline/translations/cs.json
@@ -1,11 +1,38 @@
 {
     "config": {
+        "error": {
+            "error_auth_mfa": "Neplatn\u00fd k\u00f3d",
+            "error_auth_user": "Nespr\u00e1vn\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no nebo heslo"
+        },
         "step": {
+            "auth_app": {
+                "data": {
+                    "app_id": "ID aplikace"
+                },
+                "description": "ID aplikace a tajn\u00fd k\u00f3d z [\u00fa\u010dtu v\u00fdvoj\u00e1\u0159e StarLine] (https://my.starline.ru/developer)",
+                "title": "P\u0159ihla\u0161ovac\u00ed \u00fadaje aplikace"
+            },
+            "auth_captcha": {
+                "data": {
+                    "captcha_code": "K\u00f3d z obr\u00e1zku"
+                },
+                "description": "{captcha_img}",
+                "title": "Captcha"
+            },
+            "auth_mfa": {
+                "data": {
+                    "mfa_code": "SMS k\u00f3d"
+                },
+                "description": "Zadejte k\u00f3d odeslan\u00fd na tel. \u010d\u00edslo {phone_number}",
+                "title": "Dvoufaktorov\u00e9 ov\u011b\u0159en\u00ed"
+            },
             "auth_user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "description": "E-mail a heslo k \u00fa\u010dtu StarLine",
+                "title": "P\u0159ihla\u0161ovac\u00ed \u00fadaje u\u017eivatele"
             }
         }
     }
diff --git a/homeassistant/components/starline/translations/et.json b/homeassistant/components/starline/translations/et.json
index 7e3c4103ccf..0b4d2f9f6d5 100644
--- a/homeassistant/components/starline/translations/et.json
+++ b/homeassistant/components/starline/translations/et.json
@@ -1,6 +1,12 @@
 {
     "config": {
+        "error": {
+            "error_auth_user": "Vale kasutajanimi v\u00f5i salas\u00f5na"
+        },
         "step": {
+            "auth_captcha": {
+                "title": ""
+            },
             "auth_mfa": {
                 "title": "Kaheastmeline autoriseerimine"
             },
diff --git a/homeassistant/components/starline/translations/pl.json b/homeassistant/components/starline/translations/pl.json
index 5e5a293fc82..038f2d308b3 100644
--- a/homeassistant/components/starline/translations/pl.json
+++ b/homeassistant/components/starline/translations/pl.json
@@ -11,7 +11,7 @@
                     "app_id": "Identyfikator aplikacji",
                     "app_secret": "Tajny kod"
                 },
-                "description": "Identyfikator aplikacji i tajny kod z <a href=\"https://my.starline.ru/developer\" target=\"_blank\">konta programisty StarLine</a>",
+                "description": "Identyfikator aplikacji i tajny kod z [konta programisty StarLine](https://my.starline.ru/developer)",
                 "title": "Po\u015bwiadczenia aplikacji"
             },
             "auth_captcha": {
diff --git a/homeassistant/components/starline/translations/zh-Hans.json b/homeassistant/components/starline/translations/zh-Hans.json
new file mode 100644
index 00000000000..980744e116e
--- /dev/null
+++ b/homeassistant/components/starline/translations/zh-Hans.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "error": {
+            "error_auth_user": "\u7528\u6237\u540d\u6216\u5bc6\u7801\u9519\u8bef"
+        },
+        "step": {
+            "auth_user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/steam_online/sensor.py b/homeassistant/components/steam_online/sensor.py
index 97109decae2..dbe83177537 100644
--- a/homeassistant/components/steam_online/sensor.py
+++ b/homeassistant/components/steam_online/sensor.py
@@ -31,6 +31,9 @@ STATE_LOOKING_TO_PLAY = "looking_to_play"
 STEAM_API_URL = "https://steamcdn-a.akamaihd.net/steam/apps/"
 STEAM_HEADER_IMAGE_FILE = "header.jpg"
 STEAM_MAIN_IMAGE_FILE = "capsule_616x353.jpg"
+STEAM_ICON_URL = (
+    "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/apps/%d/%s.jpg"
+)
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
@@ -78,11 +81,13 @@ class SteamSensor(Entity):
         self._profile = None
         self._game = None
         self._game_id = None
+        self._extra_game_info = None
         self._state = None
         self._name = None
         self._avatar = None
         self._last_online = None
         self._level = None
+        self._owned_games = None
 
     @property
     def name(self):
@@ -108,8 +113,15 @@ class SteamSensor(Entity):
         """Update device state."""
         try:
             self._profile = self._steamod.user.profile(self._account)
+            # Only if need be, get the owned games
+            if not self._owned_games:
+                self._owned_games = self._steamod.api.interface(
+                    "IPlayerService"
+                ).GetOwnedGames(steamid=self._account, include_appinfo=1)
+
             self._game = self._get_current_game()
             self._game_id = self._profile.current_game[0]
+            self._extra_game_info = self._get_game_info()
             self._state = {
                 1: STATE_ONLINE,
                 2: STATE_BUSY,
@@ -162,6 +174,16 @@ class SteamSensor(Entity):
         _LOGGER.error("Unable to find name of app with ID=%s", game_id)
         return repr(game_id)
 
+    def _get_game_info(self):
+        game_id = self._profile.current_game[0]
+        if game_id is not None:
+
+            for game in self._owned_games["response"]["games"]:
+                if game["appid"] == game_id:
+                    return game
+
+        return None
+
     def _get_last_online(self):
         """Convert last_online from the steam module into timestamp UTC."""
         last_online = utc_from_timestamp(mktime(self._profile.last_online))
@@ -182,6 +204,11 @@ class SteamSensor(Entity):
             game_url = f"{STEAM_API_URL}{self._game_id}/"
             attr["game_image_header"] = f"{game_url}{STEAM_HEADER_IMAGE_FILE}"
             attr["game_image_main"] = f"{game_url}{STEAM_MAIN_IMAGE_FILE}"
+        if self._extra_game_info is not None and self._game_id is not None:
+            attr["game_icon"] = STEAM_ICON_URL % (
+                self._game_id,
+                self._extra_game_info["img_icon_url"],
+            )
         if self._last_online is not None:
             attr["last_online"] = self._last_online
         if self._level is not None:
diff --git a/homeassistant/components/stookalert/binary_sensor.py b/homeassistant/components/stookalert/binary_sensor.py
index aa792d10653..a1c36e9a10e 100644
--- a/homeassistant/components/stookalert/binary_sensor.py
+++ b/homeassistant/components/stookalert/binary_sensor.py
@@ -1,6 +1,5 @@
 """This component provides support for Stookalert Binary Sensor."""
 from datetime import timedelta
-import logging
 
 import stookalert
 import voluptuous as vol
@@ -13,8 +12,6 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.const import ATTR_ATTRIBUTION, CONF_NAME
 from homeassistant.helpers import config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 SCAN_INTERVAL = timedelta(minutes=60)
 CONF_PROVINCE = "province"
 DEFAULT_DEVICE_CLASS = DEVICE_CLASS_SAFETY
diff --git a/homeassistant/components/stream/__init__.py b/homeassistant/components/stream/__init__.py
index d754f0beb01..2b242389ef0 100644
--- a/homeassistant/components/stream/__init__.py
+++ b/homeassistant/components/stream/__init__.py
@@ -171,7 +171,7 @@ class Stream:
         # pylint: disable=import-outside-toplevel
         from .worker import stream_worker
 
-        if self._thread is None or not self._thread.isAlive():
+        if self._thread is None or not self._thread.is_alive():
             if self._thread is not None:
                 # The thread must have crashed/exited. Join to clean up the
                 # previous thread.
diff --git a/homeassistant/components/stream/const.py b/homeassistant/components/stream/const.py
index b986cddaf68..9406c24eaf6 100644
--- a/homeassistant/components/stream/const.py
+++ b/homeassistant/components/stream/const.py
@@ -20,3 +20,6 @@ MIN_SEGMENT_DURATION = 1.5  # Each segment is at least this many seconds
 
 PACKETS_TO_WAIT_FOR_AUDIO = 20  # Some streams have an audio stream with no audio
 MAX_TIMESTAMP_GAP = 10000  # seconds - anything from 10 to 50000 is probably reasonable
+
+MAX_MISSING_DTS = 6  # Number of packets missing DTS to allow
+STREAM_TIMEOUT = 30  # Timeout for reading stream
diff --git a/homeassistant/components/stream/worker.py b/homeassistant/components/stream/worker.py
index 22f67432a1b..4f972774fcc 100644
--- a/homeassistant/components/stream/worker.py
+++ b/homeassistant/components/stream/worker.py
@@ -6,7 +6,13 @@ import time
 
 import av
 
-from .const import MAX_TIMESTAMP_GAP, MIN_SEGMENT_DURATION, PACKETS_TO_WAIT_FOR_AUDIO
+from .const import (
+    MAX_MISSING_DTS,
+    MAX_TIMESTAMP_GAP,
+    MIN_SEGMENT_DURATION,
+    PACKETS_TO_WAIT_FOR_AUDIO,
+    STREAM_TIMEOUT,
+)
 from .core import Segment, StreamBuffer
 
 _LOGGER = logging.getLogger(__name__)
@@ -62,7 +68,7 @@ def stream_worker(hass, stream, quit_event):
 def _stream_worker_internal(hass, stream, quit_event):
     """Handle consuming streams."""
 
-    container = av.open(stream.source, options=stream.options)
+    container = av.open(stream.source, options=stream.options, timeout=STREAM_TIMEOUT)
     try:
         video_stream = container.streams.video[0]
     except (KeyError, IndexError):
@@ -81,13 +87,15 @@ def _stream_worker_internal(hass, stream, quit_event):
     if audio_stream and audio_stream.profile is None:
         audio_stream = None
 
+    # Iterator for demuxing
+    container_packets = None
     # The presentation timestamps of the first packet in each stream we receive
     # Use to adjust before muxing or outputting, but we don't adjust internally
     first_pts = {}
     # The decoder timestamps of the latest packet in each stream we processed
     last_dts = None
     # Keep track of consecutive packets without a dts to detect end of stream.
-    last_packet_was_without_dts = False
+    missing_dts = 0
     # Holds the buffers for each stream provider
     outputs = None
     # Keep track of the number of segments we've processed
@@ -102,7 +110,8 @@ def _stream_worker_internal(hass, stream, quit_event):
     # 2 - seeking can be problematic https://trac.ffmpeg.org/ticket/7815
 
     def peek_first_pts():
-        nonlocal first_pts, audio_stream
+        nonlocal first_pts, audio_stream, container_packets
+        missing_dts = 0
 
         def empty_stream_dict():
             return {
@@ -111,25 +120,38 @@ def _stream_worker_internal(hass, stream, quit_event):
             }
 
         try:
+            container_packets = container.demux((video_stream, audio_stream))
             first_packet = empty_stream_dict()
             first_pts = empty_stream_dict()
             # Get to first video keyframe
             while first_packet[video_stream] is None:
-                packet = next(container.demux())
+                packet = next(container_packets)
                 if (
-                    packet.stream == video_stream
-                    and packet.is_keyframe
-                    and packet.dts is not None
-                ):
+                    packet.dts is None
+                ):  # Allow MAX_MISSING_DTS packets with no dts, raise error on the next one
+                    if missing_dts >= MAX_MISSING_DTS:
+                        raise StopIteration(
+                            f"Invalid data - got {MAX_MISSING_DTS+1} packets with missing DTS while initializing"
+                        )
+                    missing_dts += 1
+                    continue
+                if packet.stream == video_stream and packet.is_keyframe:
                     first_packet[video_stream] = packet
                     initial_packets.append(packet)
             # Get first_pts from subsequent frame to first keyframe
             while any(
                 [pts is None for pts in {**first_packet, **first_pts}.values()]
             ) and (len(initial_packets) < PACKETS_TO_WAIT_FOR_AUDIO):
-                packet = next(container.demux((video_stream, audio_stream)))
-                if packet.dts is None:
-                    continue  # Discard packets with no dts
+                packet = next(container_packets)
+                if (
+                    packet.dts is None
+                ):  # Allow MAX_MISSING_DTS packet with no dts, raise error on the next one
+                    if missing_dts >= MAX_MISSING_DTS:
+                        raise StopIteration(
+                            f"Invalid data - got {MAX_MISSING_DTS+1} packets with missing DTS while initializing"
+                        )
+                    missing_dts += 1
+                    continue
                 if (
                     first_packet[packet.stream] is None
                 ):  # actually video already found above so only for audio
@@ -151,13 +173,10 @@ def _stream_worker_internal(hass, stream, quit_event):
                 audio_stream = None
 
         except (av.AVError, StopIteration) as ex:
-            if not stream.keepalive:
-                # End of stream, clear listeners and stop thread
-                for fmt, _ in outputs.items():
-                    hass.loop.call_soon_threadsafe(stream.outputs[fmt].put, None)
             _LOGGER.error(
                 "Error demuxing stream while finding first packet: %s", str(ex)
             )
+            finalize_stream()
             return False
         return True
 
@@ -203,7 +222,7 @@ def _stream_worker_internal(hass, stream, quit_event):
     def finalize_stream():
         if not stream.keepalive:
             # End of stream, clear listeners and stop thread
-            for fmt, _ in outputs.items():
+            for fmt in stream.outputs.keys():
                 hass.loop.call_soon_threadsafe(stream.outputs[fmt].put, None)
 
     if not peek_first_pts():
@@ -217,16 +236,16 @@ def _stream_worker_internal(hass, stream, quit_event):
             if len(initial_packets) > 0:
                 packet = initial_packets.popleft()
             else:
-                packet = next(container.demux((video_stream, audio_stream)))
+                packet = next(container_packets)
             if packet.dts is None:
-                _LOGGER.error("Stream packet without dts detected, skipping...")
-                # Allow a single packet without dts before terminating the stream.
-                if last_packet_was_without_dts:
-                    # If we get a "flushing" packet, the stream is done
-                    raise StopIteration("No dts in consecutive packets")
-                last_packet_was_without_dts = True
+                # Allow MAX_MISSING_DTS consecutive packets without dts. Terminate the stream on the next one.
+                if missing_dts >= MAX_MISSING_DTS:
+                    raise StopIteration(
+                        f"No dts in {MAX_MISSING_DTS+1} consecutive packets"
+                    )
+                missing_dts += 1
                 continue
-            last_packet_was_without_dts = False
+            missing_dts = 0
         except (av.AVError, StopIteration) as ex:
             _LOGGER.error("Error demuxing stream: %s", str(ex))
             finalize_stream()
@@ -234,20 +253,17 @@ def _stream_worker_internal(hass, stream, quit_event):
 
         # Discard packet if dts is not monotonic
         if packet.dts <= last_dts[packet.stream]:
-            if (last_dts[packet.stream] - packet.dts) > (
-                packet.time_base * MAX_TIMESTAMP_GAP
+            if (
+                packet.time_base * (last_dts[packet.stream] - packet.dts)
+                > MAX_TIMESTAMP_GAP
             ):
                 _LOGGER.warning(
-                    "Timestamp overflow detected: dts = %s, resetting stream",
+                    "Timestamp overflow detected: last dts %s, dts = %s, resetting stream",
+                    last_dts[packet.stream],
                     packet.dts,
                 )
                 finalize_stream()
                 break
-            _LOGGER.warning(
-                "Dropping out of order packet: %s <= %s",
-                packet.dts,
-                last_dts[packet.stream],
-            )
             continue
 
         # Check for end of segment
diff --git a/homeassistant/components/sun/__init__.py b/homeassistant/components/sun/__init__.py
index 5fb777bd325..2d921da4a46 100644
--- a/homeassistant/components/sun/__init__.py
+++ b/homeassistant/components/sun/__init__.py
@@ -41,7 +41,7 @@ STATE_ATTR_NEXT_SETTING = "next_setting"
 # The algorithm used here is somewhat complicated. It aims to cut down
 # the number of sensor updates over the day. It's documented best in
 # the PR for the change, see the Discussion section of:
-# https://github.com/home-assistant/home-assistant/pull/23832
+# https://github.com/home-assistant/core/pull/23832
 
 
 # As documented in wikipedia: https://en.wikipedia.org/wiki/Twilight
diff --git a/homeassistant/components/sun/translations/cs.json b/homeassistant/components/sun/translations/cs.json
index 3a8426bf51d..fe13d3e4fb0 100644
--- a/homeassistant/components/sun/translations/cs.json
+++ b/homeassistant/components/sun/translations/cs.json
@@ -1,8 +1,8 @@
 {
     "state": {
         "_": {
-            "above_horizon": "Nad horizontem",
-            "below_horizon": "Za horizontem"
+            "above_horizon": "Nad obzorem",
+            "below_horizon": "Pod obzorem"
         }
     },
     "title": "Slunce"
diff --git a/homeassistant/components/sun/trigger.py b/homeassistant/components/sun/trigger.py
index c21726cf0ae..779d3078f13 100644
--- a/homeassistant/components/sun/trigger.py
+++ b/homeassistant/components/sun/trigger.py
@@ -1,6 +1,5 @@
 """Offer sun based automation rules."""
 from datetime import timedelta
-import logging
 
 import voluptuous as vol
 
@@ -10,14 +9,12 @@ from homeassistant.const import (
     CONF_PLATFORM,
     SUN_EVENT_SUNRISE,
 )
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_sunrise, async_track_sunset
 
 # mypy: allow-untyped-defs, no-check-untyped-defs
 
-_LOGGER = logging.getLogger(__name__)
-
 TRIGGER_SCHEMA = vol.Schema(
     {
         vol.Required(CONF_PLATFORM): "sun",
@@ -34,12 +31,13 @@ async def async_attach_trigger(hass, config, action, automation_info):
     description = event
     if offset:
         description = f"{description} with offset"
+    job = HassJob(action)
 
     @callback
     def call_action():
         """Call action with right context."""
-        hass.async_run_job(
-            action,
+        hass.async_run_hass_job(
+            job,
             {
                 "trigger": {
                     "platform": "sun",
diff --git a/homeassistant/components/surepetcare/manifest.json b/homeassistant/components/surepetcare/manifest.json
index 659a6091299..2fbe4fe245f 100644
--- a/homeassistant/components/surepetcare/manifest.json
+++ b/homeassistant/components/surepetcare/manifest.json
@@ -3,5 +3,5 @@
   "name": "Sure Petcare",
   "documentation": "https://www.home-assistant.io/integrations/surepetcare",
   "codeowners": ["@benleb"],
-  "requirements": ["surepy==0.2.5"]
+  "requirements": ["surepy==0.2.6"]
 }
diff --git a/homeassistant/components/swiss_public_transport/sensor.py b/homeassistant/components/swiss_public_transport/sensor.py
index 1562a498080..2c7fb483eff 100644
--- a/homeassistant/components/swiss_public_transport/sensor.py
+++ b/homeassistant/components/swiss_public_transport/sensor.py
@@ -103,7 +103,7 @@ class SwissPublicTransportSensor(Entity):
             self._opendata.connections[0]["departure"]
         ) - dt_util.as_local(dt_util.utcnow())
 
-        attr = {
+        return {
             ATTR_TRAIN_NUMBER: self._opendata.connections[0]["number"],
             ATTR_PLATFORM: self._opendata.connections[0]["platform"],
             ATTR_TRANSFERS: self._opendata.connections[0]["transfers"],
@@ -116,7 +116,6 @@ class SwissPublicTransportSensor(Entity):
             ATTR_ATTRIBUTION: ATTRIBUTION,
             ATTR_DELAY: self._opendata.connections[0]["delay"],
         }
-        return attr
 
     @property
     def icon(self):
diff --git a/homeassistant/components/switch/light.py b/homeassistant/components/switch/light.py
index c9dd3553928..5128a49d8b7 100644
--- a/homeassistant/components/switch/light.py
+++ b/homeassistant/components/switch/light.py
@@ -1,5 +1,4 @@
 """Light support for switch entities."""
-import logging
 from typing import Any, Callable, Optional, Sequence, cast
 
 import voluptuous as vol
@@ -25,8 +24,6 @@ from homeassistant.helpers.typing import (
 
 # mypy: allow-untyped-calls, allow-untyped-defs, no-check-untyped-defs
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Light Switch"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/switch/translations/cs.json b/homeassistant/components/switch/translations/cs.json
index a4729db91dc..b82eaab9e4f 100644
--- a/homeassistant/components/switch/translations/cs.json
+++ b/homeassistant/components/switch/translations/cs.json
@@ -1,9 +1,24 @@
 {
-    "state": {
-        "_": {
-            "off": "Neaktivn\u00ed",
-            "on": "Aktivn\u00ed"
+    "device_automation": {
+        "action_type": {
+            "toggle": "P\u0159epnout {entity_name}",
+            "turn_off": "Vypnout {entity_name}",
+            "turn_on": "Zapnout {entity_name}"
+        },
+        "condition_type": {
+            "is_off": "{entity_name} je vypnuto",
+            "is_on": "{entity_name} je zapnuto"
+        },
+        "trigger_type": {
+            "turned_off": "{entity_name} bylo vypnuto",
+            "turned_on": "{entity_name} bylo zapnuto"
         }
     },
-    "title": "Sp\u00edna\u010d"
+    "state": {
+        "_": {
+            "off": "Vypnuto",
+            "on": "Zapnuto"
+        }
+    },
+    "title": "Vyp\u00edna\u010d"
 }
\ No newline at end of file
diff --git a/homeassistant/components/switch/translations/pl.json b/homeassistant/components/switch/translations/pl.json
index 4b3aebf30b4..0d0d7263bf2 100644
--- a/homeassistant/components/switch/translations/pl.json
+++ b/homeassistant/components/switch/translations/pl.json
@@ -16,8 +16,8 @@
     },
     "state": {
         "_": {
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony"
+            "off": "wy\u0142.",
+            "on": "w\u0142."
         }
     },
     "title": "Prze\u0142\u0105cznik"
diff --git a/homeassistant/components/switch/translations/ru.json b/homeassistant/components/switch/translations/ru.json
index 4ff5c7c208e..bd11c80ac6b 100644
--- a/homeassistant/components/switch/translations/ru.json
+++ b/homeassistant/components/switch/translations/ru.json
@@ -1,9 +1,9 @@
 {
     "device_automation": {
         "action_type": {
-            "toggle": "\u041f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}",
-            "turn_off": "\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}",
-            "turn_on": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c {entity_name}"
+            "toggle": "{entity_name}: \u043f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_off": "{entity_name}: \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_on": "{entity_name}: \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c"
         },
         "condition_type": {
             "is_off": "{entity_name} \u0432 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u043e\u043c \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0438",
diff --git a/homeassistant/components/switch/translations/zh-Hans.json b/homeassistant/components/switch/translations/zh-Hans.json
index eed1df46204..8820cb9e435 100644
--- a/homeassistant/components/switch/translations/zh-Hans.json
+++ b/homeassistant/components/switch/translations/zh-Hans.json
@@ -1,4 +1,16 @@
 {
+    "device_automation": {
+        "action_type": {
+            "turn_off": "\u5173\u95ed {entity_name}"
+        },
+        "condition_type": {
+            "is_off": "{entity_name} \u5df2\u5173\u95ed"
+        },
+        "trigger_type": {
+            "turned_off": "{entity_name} \u88ab\u5173\u95ed",
+            "turned_on": "{entity_name} \u88ab\u6253\u5f00"
+        }
+    },
     "state": {
         "_": {
             "off": "\u5173",
diff --git a/homeassistant/components/switchbot/switch.py b/homeassistant/components/switchbot/switch.py
index 6d32f8cfd10..3dd931abe49 100644
--- a/homeassistant/components/switchbot/switch.py
+++ b/homeassistant/components/switchbot/switch.py
@@ -1,5 +1,4 @@
 """Support for Switchbot."""
-import logging
 from typing import Any, Dict
 
 # pylint: disable=import-error, no-member
@@ -11,8 +10,6 @@ from homeassistant.const import CONF_MAC, CONF_NAME, CONF_PASSWORD
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.restore_state import RestoreEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Switchbot"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
diff --git a/homeassistant/components/switcher_kis/__init__.py b/homeassistant/components/switcher_kis/__init__.py
index 4a9a564ec3b..23b69eefb74 100644
--- a/homeassistant/components/switcher_kis/__init__.py
+++ b/homeassistant/components/switcher_kis/__init__.py
@@ -1,8 +1,7 @@
 """Home Assistant Switcher Component."""
-
 from asyncio import QueueEmpty, TimeoutError as Asyncio_TimeoutError, wait_for
 from datetime import datetime, timedelta
-from logging import getLogger
+import logging
 from typing import Dict, Optional
 
 from aioswitcher.api import SwitcherV2Api
@@ -28,7 +27,7 @@ from homeassistant.helpers.typing import (
 )
 from homeassistant.loader import bind_hass
 
-_LOGGER = getLogger(__name__)
+_LOGGER = logging.getLogger(__name__)
 
 DOMAIN = "switcher_kis"
 
diff --git a/homeassistant/components/switcher_kis/switch.py b/homeassistant/components/switcher_kis/switch.py
index badab64391e..af922c3ab8b 100644
--- a/homeassistant/components/switcher_kis/switch.py
+++ b/homeassistant/components/switcher_kis/switch.py
@@ -1,6 +1,4 @@
 """Home Assistant Switcher Component Switch platform."""
-
-from logging import getLogger
 from typing import TYPE_CHECKING, Callable, Dict
 
 from aioswitcher.api import SwitcherV2Api
@@ -31,8 +29,6 @@ if TYPE_CHECKING:
     from aioswitcher.devices import SwitcherV2Device
 
 
-_LOGGER = getLogger(__name__)
-
 DEVICE_PROPERTIES_TO_HA_ATTRIBUTES = {
     "power_consumption": ATTR_CURRENT_POWER_W,
     "electric_current": ATTR_ELECTRIC_CURRENT,
diff --git a/homeassistant/components/switchmate/switch.py b/homeassistant/components/switchmate/switch.py
index e09e42fe75b..a052b9051a1 100644
--- a/homeassistant/components/switchmate/switch.py
+++ b/homeassistant/components/switchmate/switch.py
@@ -1,6 +1,5 @@
 """Support for Switchmate."""
 from datetime import timedelta
-import logging
 
 # pylint: disable=import-error, no-member
 import switchmate
@@ -10,8 +9,6 @@ from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
 from homeassistant.const import CONF_MAC, CONF_NAME
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_FLIP_ON_OFF = "flip_on_off"
 DEFAULT_NAME = "Switchmate"
 
diff --git a/homeassistant/components/syncthru/strings.json b/homeassistant/components/syncthru/strings.json
index 1824763c8f8..0164fdf6ddc 100644
--- a/homeassistant/components/syncthru/strings.json
+++ b/homeassistant/components/syncthru/strings.json
@@ -18,7 +18,7 @@
       },
       "user": {
         "data": {
-          "name": "Name",
+          "name": "[%key:common::config_flow::data::name%]",
           "url": "Web interface URL"
         }
       }
diff --git a/homeassistant/components/syncthru/translations/cs.json b/homeassistant/components/syncthru/translations/cs.json
new file mode 100644
index 00000000000..7527e6d81c8
--- /dev/null
+++ b/homeassistant/components/syncthru/translations/cs.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "flow_title": "Tisk\u00e1rna Samsung SyncThru: {name}",
+        "step": {
+            "confirm": {
+                "data": {
+                    "name": "Jm\u00e9no",
+                    "url": "URL webov\u00e9ho rozhran\u00ed"
+                }
+            },
+            "user": {
+                "data": {
+                    "name": "Jm\u00e9no",
+                    "url": "URL webov\u00e9ho rozhran\u00ed"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/syncthru/translations/et.json b/homeassistant/components/syncthru/translations/et.json
new file mode 100644
index 00000000000..71fe5cfb03c
--- /dev/null
+++ b/homeassistant/components/syncthru/translations/et.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "invalid_url": "Sobimatu URL",
+            "unknown_state": "Printeri olek teadmata, kontrolli URL-i ja v\u00f5rgu\u00fchendust"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/syncthru/translations/nl.json b/homeassistant/components/syncthru/translations/nl.json
new file mode 100644
index 00000000000..900bac61bc5
--- /dev/null
+++ b/homeassistant/components/syncthru/translations/nl.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "name": "Naam"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/syncthru/translations/pl.json b/homeassistant/components/syncthru/translations/pl.json
index 2c092f86003..6b554ef9e74 100644
--- a/homeassistant/components/syncthru/translations/pl.json
+++ b/homeassistant/components/syncthru/translations/pl.json
@@ -5,8 +5,23 @@
         },
         "error": {
             "invalid_url": "Nieprawid\u0142owy URL",
+            "syncthru_not_supported": "Urz\u0105dzenie nie obs\u0142uguje SyncThru",
             "unknown_state": "Nieznany stan drukarki, sprawd\u017a adres URL i \u0142\u0105czno\u015b\u0107 sieciow\u0105"
         },
-        "flow_title": "Drukarka Samsung SyncThru: {name}"
+        "flow_title": "Drukarka Samsung SyncThru: {name}",
+        "step": {
+            "confirm": {
+                "data": {
+                    "name": "Nazwa",
+                    "url": "Adres URL interfejsu internetowego"
+                }
+            },
+            "user": {
+                "data": {
+                    "name": "Nazwa",
+                    "url": "Adres URL interfejsu internetowego"
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/syncthru/translations/sv.json b/homeassistant/components/syncthru/translations/sv.json
new file mode 100644
index 00000000000..76687105e49
--- /dev/null
+++ b/homeassistant/components/syncthru/translations/sv.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "invalid_url": "Ogiltig URL"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/synology_dsm/__init__.py b/homeassistant/components/synology_dsm/__init__.py
index 7f6cef46cbc..44a68b4c18c 100644
--- a/homeassistant/components/synology_dsm/__init__.py
+++ b/homeassistant/components/synology_dsm/__init__.py
@@ -11,6 +11,7 @@ from synology_dsm.api.dsm.information import SynoDSMInformation
 from synology_dsm.api.dsm.network import SynoDSMNetwork
 from synology_dsm.api.storage.storage import SynoStorage
 from synology_dsm.api.surveillance_station import SynoSurveillanceStation
+from synology_dsm.exceptions import SynologyDSMRequestException
 import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
@@ -27,6 +28,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import callback
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import entity_registry
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import (
@@ -101,7 +103,6 @@ async def async_setup(hass, config):
 
 async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
     """Set up Synology DSM sensors."""
-    api = SynoApi(hass, entry)
 
     # Migrate old unique_id
     @callback
@@ -162,7 +163,11 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
     await entity_registry.async_migrate_entries(hass, entry.entry_id, _async_migrator)
 
     # Continue setup
-    await api.async_setup()
+    api = SynoApi(hass, entry)
+    try:
+        await api.async_setup()
+    except SynologyDSMRequestException as err:
+        raise ConfigEntryNotReady from err
 
     undo_listener = entry.add_update_listener(_async_update_listener)
 
@@ -253,10 +258,11 @@ class SynoApi:
             self._entry.data[CONF_PASSWORD],
             self._entry.data[CONF_SSL],
             timeout=self._entry.options.get(CONF_TIMEOUT),
-            device_token=self._entry.data.get("device_token"),
+        )
+        await self._hass.async_add_executor_job(
+            self.dsm.login, self._entry.data.get("device_token")
         )
 
-        await self._hass.async_add_executor_job(self.dsm.discover_apis)
         self._with_surveillance_station = bool(
             self.dsm.apis.get(SynoSurveillanceStation.CAMERA_API_KEY)
         )
@@ -310,6 +316,8 @@ class SynoApi:
         )
         self._with_surveillance_station = bool(
             self._fetching_entities.get(SynoSurveillanceStation.CAMERA_API_KEY)
+        ) or bool(
+            self._fetching_entities.get(SynoSurveillanceStation.HOME_MODE_API_KEY)
         )
 
         # Reset not used API, information is not reset since it's used in device_info
@@ -332,7 +340,6 @@ class SynoApi:
     def _fetch_device_configuration(self):
         """Fetch initial device config."""
         self.information = self.dsm.information
-        self.information.update()
         self.network = self.dsm.network
         self.network.update()
 
diff --git a/homeassistant/components/synology_dsm/binary_sensor.py b/homeassistant/components/synology_dsm/binary_sensor.py
index a75f57db678..6c11d31b7f7 100644
--- a/homeassistant/components/synology_dsm/binary_sensor.py
+++ b/homeassistant/components/synology_dsm/binary_sensor.py
@@ -67,7 +67,4 @@ class SynoDSMStorageBinarySensor(SynologyDSMDeviceEntity, BinarySensorEntity):
     @property
     def is_on(self) -> bool:
         """Return the state."""
-        attr = getattr(self._api.storage, self.entity_type)(self._device_id)
-        if attr is None:
-            return None
-        return attr
+        return getattr(self._api.storage, self.entity_type)(self._device_id)
diff --git a/homeassistant/components/synology_dsm/config_flow.py b/homeassistant/components/synology_dsm/config_flow.py
index dd4b7cf7e10..2267d0b099c 100644
--- a/homeassistant/components/synology_dsm/config_flow.py
+++ b/homeassistant/components/synology_dsm/config_flow.py
@@ -140,10 +140,10 @@ class SynologyDSMFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             return await self.async_step_2sa(user_input, errors)
         except SynologyDSMLoginInvalidException as ex:
             _LOGGER.error(ex)
-            errors[CONF_USERNAME] = "login"
+            errors[CONF_USERNAME] = "invalid_auth"
         except SynologyDSMRequestException as ex:
             _LOGGER.error(ex)
-            errors[CONF_HOST] = "connection"
+            errors[CONF_HOST] = "cannot_connect"
         except SynologyDSMException as ex:
             _LOGGER.error(ex)
             errors["base"] = "unknown"
diff --git a/homeassistant/components/synology_dsm/manifest.json b/homeassistant/components/synology_dsm/manifest.json
index aee8c464464..6aefaf7742b 100644
--- a/homeassistant/components/synology_dsm/manifest.json
+++ b/homeassistant/components/synology_dsm/manifest.json
@@ -2,7 +2,7 @@
   "domain": "synology_dsm",
   "name": "Synology DSM",
   "documentation": "https://www.home-assistant.io/integrations/synology_dsm",
-  "requirements": ["python-synology==0.9.0"],
+  "requirements": ["python-synology==1.0.0"],
   "codeowners": ["@hacf-fr", "@Quentame"],
   "config_flow": true,
   "ssdp": [
diff --git a/homeassistant/components/synology_dsm/strings.json b/homeassistant/components/synology_dsm/strings.json
index 2bb81f6711d..9ff0b16f8fb 100644
--- a/homeassistant/components/synology_dsm/strings.json
+++ b/homeassistant/components/synology_dsm/strings.json
@@ -7,7 +7,7 @@
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]",
-          "ssl": "Use SSL/TLS to connect to your NAS",
+          "ssl": "[%key:common::config_flow::data::ssl%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]"
         }
@@ -22,7 +22,7 @@
         "title": "Synology DSM",
         "description": "Do you want to setup {name} ({host})?",
         "data": {
-          "ssl": "Use SSL/TLS to connect to your NAS",
+          "ssl": "[%key:common::config_flow::data::ssl%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
           "port": "[%key:common::config_flow::data::port%]"
@@ -30,14 +30,14 @@
       }
     },
     "error": {
-      "connection": "Connection error: please check your host, port & ssl",
-      "login": "Login error: please check your username & password",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "missing_data": "Missing data: please retry later or an other configuration",
       "otp_failed": "Two-step authentication failed, retry with a new pass code",
-      "unknown": "Unknown error: please check logs to get more details"
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "Host already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
diff --git a/homeassistant/components/synology_dsm/translations/ca.json b/homeassistant/components/synology_dsm/translations/ca.json
index e265bc31da7..71372908ff4 100644
--- a/homeassistant/components/synology_dsm/translations/ca.json
+++ b/homeassistant/components/synology_dsm/translations/ca.json
@@ -1,14 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'amfitri\u00f3 ja est\u00e0 configurat"
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection": "Error de connexi\u00f3: comprova l'amfitri\u00f3, la contrasenya i l'SSL",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "login": "Error d'inici de sessi\u00f3: comprova el nom d'usuari i la contrasenya",
             "missing_data": "Falten dades: torna-ho a provar m\u00e9s tard o prova una altra configuraci\u00f3 diferent",
             "otp_failed": "L'autenticaci\u00f3 en dos passos ha fallat, torna-ho a provar amb un nou codi",
-            "unknown": "Error desconegut: consulta els registres per a m\u00e9s detalls."
+            "unknown": "Error inesperat"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
@@ -22,7 +24,7 @@
                 "data": {
                     "password": "Contrasenya",
                     "port": "Port",
-                    "ssl": "Utilitza SSL/TLS per connectar-te al servidor NAS",
+                    "ssl": "Utilitza un certificat SSL",
                     "username": "Nom d'usuari"
                 },
                 "description": "Vols configurar {name} ({host})?",
@@ -33,7 +35,7 @@
                     "host": "Amfitri\u00f3",
                     "password": "Contrasenya",
                     "port": "Port",
-                    "ssl": "Utilitza SSL/TLS per connectar-te al servidor NAS",
+                    "ssl": "Utilitza un certificat SSL",
                     "username": "Nom d'usuari"
                 },
                 "title": "Synology DSM"
diff --git a/homeassistant/components/synology_dsm/translations/cs.json b/homeassistant/components/synology_dsm/translations/cs.json
index d1f593c7938..ce48a3c23b6 100644
--- a/homeassistant/components/synology_dsm/translations/cs.json
+++ b/homeassistant/components/synology_dsm/translations/cs.json
@@ -1,20 +1,43 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection": "Chyba p\u0159ipojen\u00ed: zkontrolujte pros\u00edm sv\u00e9ho hostitele, port a SSL",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "login": "Chyba p\u0159ihl\u00e1\u0161en\u00ed: zkontrolujte sv\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no a heslo",
+            "missing_data": "Chyb\u011bj\u00edc\u00ed data: zkuste to pros\u00edm pozd\u011bji nebo s jin\u00fdm nastaven\u00edm",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "flow_title": "Synology DSM {name} ({host})",
         "step": {
+            "2sa": {
+                "data": {
+                    "otp_code": "K\u00f3d"
+                },
+                "title": "Synology DSM: dvoufaktorov\u00e9 ov\u011b\u0159ov\u00e1n\u00ed"
+            },
             "link": {
                 "data": {
                     "password": "Heslo",
                     "port": "Port",
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "description": "Chcete nastavit {name} ({host})?",
+                "title": "Synology DSM"
             },
             "user": {
                 "data": {
                     "host": "Hostitel",
                     "password": "Heslo",
                     "port": "Port",
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "Synology DSM"
             }
         }
     },
diff --git a/homeassistant/components/synology_dsm/translations/de.json b/homeassistant/components/synology_dsm/translations/de.json
index f54a7e2a378..205bf5197b0 100644
--- a/homeassistant/components/synology_dsm/translations/de.json
+++ b/homeassistant/components/synology_dsm/translations/de.json
@@ -44,7 +44,8 @@
         "step": {
             "init": {
                 "data": {
-                    "scan_interval": "Minuten zwischen den Scans"
+                    "scan_interval": "Minuten zwischen den Scans",
+                    "timeout": "Timeout (Sekunden)"
                 }
             }
         }
diff --git a/homeassistant/components/synology_dsm/translations/en.json b/homeassistant/components/synology_dsm/translations/en.json
index fc78d3cfa66..54266f9e8fa 100644
--- a/homeassistant/components/synology_dsm/translations/en.json
+++ b/homeassistant/components/synology_dsm/translations/en.json
@@ -1,14 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Host already configured"
+            "already_configured": "Device is already configured"
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection": "Connection error: please check your host, port & ssl",
+            "invalid_auth": "Invalid authentication",
             "login": "Login error: please check your username & password",
             "missing_data": "Missing data: please retry later or an other configuration",
             "otp_failed": "Two-step authentication failed, retry with a new pass code",
-            "unknown": "Unknown error: please check logs to get more details"
+            "unknown": "Unexpected error"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
@@ -22,7 +24,7 @@
                 "data": {
                     "password": "Password",
                     "port": "Port",
-                    "ssl": "Use SSL/TLS to connect to your NAS",
+                    "ssl": "Uses an SSL certificate",
                     "username": "Username"
                 },
                 "description": "Do you want to setup {name} ({host})?",
@@ -33,7 +35,7 @@
                     "host": "Host",
                     "password": "Password",
                     "port": "Port",
-                    "ssl": "Use SSL/TLS to connect to your NAS",
+                    "ssl": "Uses an SSL certificate",
                     "username": "Username"
                 },
                 "title": "Synology DSM"
diff --git a/homeassistant/components/synology_dsm/translations/es.json b/homeassistant/components/synology_dsm/translations/es.json
index ca02cf41e23..c428054f2de 100644
--- a/homeassistant/components/synology_dsm/translations/es.json
+++ b/homeassistant/components/synology_dsm/translations/es.json
@@ -4,7 +4,9 @@
             "already_configured": "El host ya est\u00e1 configurado."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection": "Error de conexi\u00f3n: comprueba tu host, puerto y ssl",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "login": "Error de inicio de sesi\u00f3n: comprueba tu nombre de usuario y contrase\u00f1a",
             "missing_data": "Faltan datos: por favor, vuelva a intentarlo m\u00e1s tarde o pruebe con otra configuraci\u00f3n",
             "otp_failed": "La autenticaci\u00f3n de dos pasos fall\u00f3, vuelva a intentar con un nuevo c\u00f3digo de acceso",
diff --git a/homeassistant/components/synology_dsm/translations/et.json b/homeassistant/components/synology_dsm/translations/et.json
new file mode 100644
index 00000000000..354fa0058d2
--- /dev/null
+++ b/homeassistant/components/synology_dsm/translations/et.json
@@ -0,0 +1,38 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga",
+            "login": "Viga sisselogimisel: kontrolli palun oma kasutajanime ja salas\u00f5na",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "link": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                },
+                "description": "Kas soovid seadistada {name}({host})?",
+                "title": ""
+            },
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na"
+                },
+                "title": ""
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "timeout": "Ajal\u00f5pp (sekundites)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/synology_dsm/translations/it.json b/homeassistant/components/synology_dsm/translations/it.json
index 933f9760b5b..986e35119c7 100644
--- a/homeassistant/components/synology_dsm/translations/it.json
+++ b/homeassistant/components/synology_dsm/translations/it.json
@@ -1,14 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Host gi\u00e0 configurato"
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection": "Errore di connessione: controlla host, porta e SSL",
+            "invalid_auth": "Autenticazione non valida",
             "login": "Errore di accesso: si prega di controllare il nome utente e la password",
             "missing_data": "Dati mancanti: si prega di riprovare pi\u00f9 tardi o un'altra configurazione",
             "otp_failed": "Autenticazione in due fasi fallita, riprovare con un nuovo codice di accesso",
-            "unknown": "Errore sconosciuto: si prega di controllare i registri per ottenere maggiori dettagli"
+            "unknown": "Errore imprevisto"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
@@ -22,7 +24,7 @@
                 "data": {
                     "password": "Password",
                     "port": "Porta",
-                    "ssl": "Utilizzare SSL/TLS per connettersi al NAS",
+                    "ssl": "Utilizza un certificato SSL",
                     "username": "Nome utente"
                 },
                 "description": "Vuoi impostare {name} ({host})?",
@@ -33,7 +35,7 @@
                     "host": "Host",
                     "password": "Password",
                     "port": "Porta",
-                    "ssl": "Utilizzare SSL/TLS per connettersi al NAS",
+                    "ssl": "Utilizza un certificato SSL",
                     "username": "Nome utente"
                 },
                 "title": "Synology DSM"
diff --git a/homeassistant/components/synology_dsm/translations/lb.json b/homeassistant/components/synology_dsm/translations/lb.json
index 63e1be3fa2d..78f3f434064 100644
--- a/homeassistant/components/synology_dsm/translations/lb.json
+++ b/homeassistant/components/synology_dsm/translations/lb.json
@@ -4,11 +4,13 @@
             "already_configured": "Apparat ass scho konfigur\u00e9iert"
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection": "Feeler beim verbannen Iwwerpr\u00e9if w.e.g. den Numm, Passwuert & SSL",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "login": "Feeler beim Login: iwwerpr\u00e9if de Benotzernumm & Passwuert",
             "missing_data": "Donn\u00e9\u00ebe feelen, prob\u00e9ier sp\u00e9ider oder mat enger aner Konfiguratioun",
             "otp_failed": "Feeler mam 2-Faktor-Authentifikatiouns, prob\u00e9ier mat engem neie Code",
-            "unknown": "Onbekannte Feeler opgetrueden. Kuck d'Logs fir m\u00e9i Informatiounen."
+            "unknown": "Onerwaarte Feeler"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
diff --git a/homeassistant/components/synology_dsm/translations/nl.json b/homeassistant/components/synology_dsm/translations/nl.json
index ee7c89f7192..d03c70d3711 100644
--- a/homeassistant/components/synology_dsm/translations/nl.json
+++ b/homeassistant/components/synology_dsm/translations/nl.json
@@ -4,6 +4,7 @@
             "already_configured": "Host is al geconfigureerd."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection": "Verbindingsfout: controleer uw host, poort & ssl",
             "login": "Aanmeldingsfout: controleer uw gebruikersnaam en wachtwoord",
             "missing_data": "Ontbrekende gegevens: probeer het later opnieuw of een andere configuratie",
diff --git a/homeassistant/components/synology_dsm/translations/no.json b/homeassistant/components/synology_dsm/translations/no.json
index c9d16a9a6e8..9dffa382c38 100644
--- a/homeassistant/components/synology_dsm/translations/no.json
+++ b/homeassistant/components/synology_dsm/translations/no.json
@@ -1,16 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Verten er allerede konfigurert"
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection": "Tilkoblingsfeil: Vennligst sjekk verten, porten og SSL",
+            "invalid_auth": "Ugyldig godkjenning",
             "login": "P\u00e5loggingsfeil: Vennligst sjekk brukernavnet ditt og passordet ditt",
             "missing_data": "Manglende data: Vennligst pr\u00f8v p\u00e5 nytt senere eller en annen konfigurasjon",
             "otp_failed": "Totrinnsgodkjenning mislyktes, pr\u00f8v p\u00e5 nytt med en ny passord",
-            "unknown": "Ukjent feil: Vennligst sjekk loggene for \u00e5 f\u00e5 flere detaljer"
+            "unknown": "Uventet feil"
         },
-        "flow_title": "Synology DSM {name} ({host})",
+        "flow_title": "",
         "step": {
             "2sa": {
                 "data": {
@@ -21,8 +23,8 @@
             "link": {
                 "data": {
                     "password": "Passord",
-                    "port": "",
-                    "ssl": "Bruk SSL/TLS til \u00e5 koble til NAS-en",
+                    "port": "Port",
+                    "ssl": "Bruker et SSL-sertifikat",
                     "username": "Brukernavn"
                 },
                 "description": "Vil du konfigurere {name} ({host})?",
@@ -32,8 +34,8 @@
                 "data": {
                     "host": "Vert",
                     "password": "Passord",
-                    "port": "",
-                    "ssl": "Bruk SSL/TLS til \u00e5 koble til NAS-en",
+                    "port": "Port",
+                    "ssl": "Bruker et SSL-sertifikat",
                     "username": "Brukernavn"
                 },
                 "title": ""
diff --git a/homeassistant/components/synology_dsm/translations/pl.json b/homeassistant/components/synology_dsm/translations/pl.json
index 60c7ee849f1..c827c09c369 100644
--- a/homeassistant/components/synology_dsm/translations/pl.json
+++ b/homeassistant/components/synology_dsm/translations/pl.json
@@ -1,14 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Host jest ju\u017c skonfigurowany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection": "B\u0142\u0105d po\u0142\u0105czenia: sprawd\u017a host, port i SSL",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "login": "B\u0142\u0105d logowania: sprawd\u017a nazw\u0119 u\u017cytkownika i has\u0142o",
             "missing_data": "Brakuj\u0105ce dane: spr\u00f3buj ponownie p\u00f3\u017aniej lub skorzystaj z innej konfiguracji",
             "otp_failed": "Uwierzytelnianie dwuetapowe nie powiod\u0142o si\u0119, spr\u00f3buj ponownie z nowym kodem dost\u0119pu",
-            "unknown": "Nieznany b\u0142\u0105d, sprawd\u017a logi, aby uzyska\u0107 wi\u0119cej szczeg\u00f3\u0142\u00f3w"
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
@@ -22,7 +24,7 @@
                 "data": {
                     "password": "Has\u0142o",
                     "port": "Port",
-                    "ssl": "U\u017cyj SSL/TLS, aby po\u0142\u0105czy\u0107 si\u0119 z serwerem NAS",
+                    "ssl": "Certyfikat SSL",
                     "username": "Nazwa u\u017cytkownika"
                 },
                 "description": "Czy chcesz skonfigurowa\u0107 {name} ({host})?",
@@ -33,7 +35,7 @@
                     "host": "Nazwa hosta lub adres IP",
                     "password": "Has\u0142o",
                     "port": "Port",
-                    "ssl": "U\u017cyj SSL/TLS, aby po\u0142\u0105czy\u0107 si\u0119 z serwerem NAS",
+                    "ssl": "Certyfikat SSL",
                     "username": "Nazwa u\u017cytkownika"
                 },
                 "title": "Synology DSM"
@@ -44,7 +46,8 @@
         "step": {
             "init": {
                 "data": {
-                    "scan_interval": "Cz\u0119stotliwo\u015b\u0107 aktualizacji [min]"
+                    "scan_interval": "Cz\u0119stotliwo\u015b\u0107 aktualizacji [min]",
+                    "timeout": "Limit czasu (sekundy)"
                 }
             }
         }
diff --git a/homeassistant/components/synology_dsm/translations/ru.json b/homeassistant/components/synology_dsm/translations/ru.json
index b332afd131f..61079c31af3 100644
--- a/homeassistant/components/synology_dsm/translations/ru.json
+++ b/homeassistant/components/synology_dsm/translations/ru.json
@@ -1,14 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0445\u043e\u0441\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0435 \u0445\u043e\u0441\u0442, \u043f\u043e\u0440\u0442 \u0438 SSL.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "login": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0445\u043e\u0434\u0430: \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438\u043d \u0438 \u043f\u0430\u0440\u043e\u043b\u044c.",
             "missing_data": "\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0434\u0430\u043d\u043d\u044b\u0435: \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u043f\u043e\u0437\u0436\u0435 \u0438\u043b\u0438 \u0434\u0440\u0443\u0433\u0443\u044e \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e.",
             "otp_failed": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0434\u0432\u0443\u0445\u0444\u0430\u043a\u0442\u043e\u0440\u043d\u043e\u0439 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438, \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u0441 \u043d\u043e\u0432\u044b\u043c \u043f\u0430\u0440\u043e\u043b\u0435\u043c.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430: \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438 \u0434\u043b\u044f \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0435\u0439"
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "flow_title": "Synology DSM {name} ({host})",
         "step": {
@@ -22,7 +24,7 @@
                 "data": {
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c SSL / TLS \u0434\u043b\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f",
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
                     "username": "\u041b\u043e\u0433\u0438\u043d"
                 },
                 "description": "\u0425\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c {name} ({host})?",
@@ -33,7 +35,7 @@
                     "host": "\u0425\u043e\u0441\u0442",
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "port": "\u041f\u043e\u0440\u0442",
-                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c SSL / TLS \u0434\u043b\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f",
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
                     "username": "\u041b\u043e\u0433\u0438\u043d"
                 },
                 "title": "Synology DSM"
diff --git a/homeassistant/components/synology_dsm/translations/zh-Hans.json b/homeassistant/components/synology_dsm/translations/zh-Hans.json
new file mode 100644
index 00000000000..94a619f570d
--- /dev/null
+++ b/homeassistant/components/synology_dsm/translations/zh-Hans.json
@@ -0,0 +1,55 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u8bbe\u5907\u5df2\u7ecf\u914d\u7f6e\u8fc7\u4e86"
+        },
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25",
+            "connection": "\u8fde\u63a5\u9519\u8bef\uff1a\u8bf7\u68c0\u67e5\u4e3b\u673a\u3001\u7aef\u53e3\u548c SSL",
+            "invalid_auth": "\u8eab\u4efd\u8ba4\u8bc1\u65e0\u6548",
+            "login": "\u767b\u5f55\u9519\u8bef\uff1a\u8bf7\u68c0\u67e5\u7528\u6237\u540d\u548c\u5bc6\u7801",
+            "missing_data": "\u7f3a\u5c11\u6570\u636e\uff1a\u8bf7\u7a0d\u540e\u91cd\u8bd5\u6216\u5c1d\u8bd5\u5176\u4ed6\u914d\u7f6e",
+            "otp_failed": "\u4e24\u6b65\u9a8c\u8bc1\u5931\u8d25\uff0c\u8bf7\u4f7f\u7528\u65b0\u7684\u9a8c\u8bc1\u7801\u91cd\u8bd5",
+            "unknown": "\u975e\u9884\u671f\u7684\u9519\u8bef"
+        },
+        "flow_title": "Synology DSM {name} ({host})",
+        "step": {
+            "2sa": {
+                "data": {
+                    "otp_code": "\u9a8c\u8bc1\u7801"
+                },
+                "title": "Synology DSM\uff1a\u4e24\u6b65\u9a8c\u8bc1"
+            },
+            "link": {
+                "data": {
+                    "password": "\u5bc6\u7801",
+                    "port": "\u7aef\u53e3",
+                    "ssl": "\u4f7f\u7528 SSL \u8bc1\u4e66",
+                    "username": "\u7528\u6237\u540d"
+                },
+                "description": "\u60a8\u60f3\u8981\u914d\u7f6e {name} ({host}) \u5417\uff1f",
+                "title": "Synology DSM"
+            },
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u673a",
+                    "password": "\u5bc6\u7801",
+                    "port": "\u7aef\u53e3",
+                    "ssl": "\u4f7f\u7528 SSL \u8bc1\u4e66",
+                    "username": "\u7528\u6237\u540d"
+                },
+                "title": "Synology DSM"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "\u4e24\u6b21\u626b\u63cf\u4e4b\u95f4\u7684\u5206\u949f\u6570",
+                    "timeout": "\u8d85\u65f6\uff08\u79d2\uff09"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/synology_dsm/translations/zh-Hant.json b/homeassistant/components/synology_dsm/translations/zh-Hant.json
index 96f8d5283fd..c0460d74cf6 100644
--- a/homeassistant/components/synology_dsm/translations/zh-Hant.json
+++ b/homeassistant/components/synology_dsm/translations/zh-Hant.json
@@ -1,14 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u4e3b\u6a5f\u7aef\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection": "\u9023\u7dda\u932f\u8aa4\uff1a\u8acb\u6aa2\u67e5\u4e3b\u6a5f\u7aef\u3001\u901a\u8a0a\u57e0\u8207 SSL",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "login": "\u767b\u5165\u932f\u8aa4\uff1a\u8acb\u78ba\u8a8d\u96fb\u5b50\u90f5\u4ef6\u8207\u5bc6\u78bc",
             "missing_data": "\u7f3a\u5c11\u8cc7\u6599\uff1a\u8acb\u7a0d\u5f8c\u91cd\u8a66\u6216\u4f7f\u7528\u5176\u4ed6\u8a2d\u5b9a",
             "otp_failed": "\u5169\u6b65\u9a5f\u9a57\u8b49\u5931\u6557\uff0c\u8acb\u91cd\u65b0\u53d6\u5f97\u4ee3\u78bc\u5f8c\u91cd\u8a66",
-            "unknown": "\u672a\u77e5\u932f\u8aa4\uff1a\u8acb\u53c3\u95b1\u65e5\u8a8c\u4ee5\u7372\u5f97\u66f4\u8a73\u7d30\u8cc7\u8a0a"
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "flow_title": "\u7fa4\u6689 DSM {name} ({host})",
         "step": {
@@ -22,7 +24,7 @@
                 "data": {
                     "password": "\u5bc6\u78bc",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "\u4f7f\u7528 SSL/TLS \u9023\u7dda\u81f3 NAS",
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
                     "username": "\u4f7f\u7528\u8005\u540d\u7a31"
                 },
                 "description": "\u662f\u5426\u8981\u8a2d\u5b9a {name} ({host})\uff1f",
@@ -33,7 +35,7 @@
                     "host": "\u4e3b\u6a5f\u7aef",
                     "password": "\u5bc6\u78bc",
                     "port": "\u901a\u8a0a\u57e0",
-                    "ssl": "\u4f7f\u7528 SSL/TLS \u9023\u7dda\u81f3 NAS",
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
                     "username": "\u4f7f\u7528\u8005\u540d\u7a31"
                 },
                 "title": "\u7fa4\u6689 DSM"
diff --git a/homeassistant/components/syslog/notify.py b/homeassistant/components/syslog/notify.py
index 67d4882e5c3..8ace605a0f5 100644
--- a/homeassistant/components/syslog/notify.py
+++ b/homeassistant/components/syslog/notify.py
@@ -1,5 +1,4 @@
 """Syslog notification service."""
-import logging
 import syslog
 
 import voluptuous as vol
@@ -11,8 +10,6 @@ from homeassistant.components.notify import (
     BaseNotificationService,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_FACILITY = "facility"
 CONF_OPTION = "option"
 CONF_PRIORITY = "priority"
diff --git a/homeassistant/components/system_health/translations/cs.json b/homeassistant/components/system_health/translations/cs.json
index 4bc9bb8858e..726f9d917a5 100644
--- a/homeassistant/components/system_health/translations/cs.json
+++ b/homeassistant/components/system_health/translations/cs.json
@@ -1,3 +1,3 @@
 {
-    "title": "Kondice syst\u00e9mu"
+    "title": "Stav syst\u00e9mu"
 }
\ No newline at end of file
diff --git a/homeassistant/components/systemmonitor/sensor.py b/homeassistant/components/systemmonitor/sensor.py
index e29081257e0..1aa6bcdea75 100644
--- a/homeassistant/components/systemmonitor/sensor.py
+++ b/homeassistant/components/systemmonitor/sensor.py
@@ -79,7 +79,7 @@ SENSOR_TYPES = {
         True,
     ],
     "process": ["Process", " ", CPU_ICON, None, True],
-    "processor_use": ["Processor use", PERCENTAGE, CPU_ICON, None, False],
+    "processor_use": ["Processor use (percent)", PERCENTAGE, CPU_ICON, None, False],
     "processor_temperature": [
         "Processor temperature",
         TEMP_CELSIUS,
diff --git a/homeassistant/components/tado/entity.py b/homeassistant/components/tado/entity.py
index 97a3e3bdc39..d91896a4e12 100644
--- a/homeassistant/components/tado/entity.py
+++ b/homeassistant/components/tado/entity.py
@@ -1,13 +1,8 @@
 """Base class for August entity."""
-
-import logging
-
 from homeassistant.helpers.entity import Entity
 
 from .const import DEFAULT_NAME, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class TadoZoneEntity(Entity):
     """Base implementation for tado device."""
diff --git a/homeassistant/components/tado/strings.json b/homeassistant/components/tado/strings.json
index f0f2ce4ab99..e0eb90f7ddc 100644
--- a/homeassistant/components/tado/strings.json
+++ b/homeassistant/components/tado/strings.json
@@ -1,7 +1,7 @@
 {
   "config": {
     "abort": {
-      "already_configured": "Device is already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
     "step": {
       "user": {
@@ -13,10 +13,10 @@
       }
     },
     "error": {
-      "unknown": "Unexpected error",
+      "unknown": "[%key:common::config_flow::error::unknown%]",
       "no_homes": "There are no homes linked to this tado account.",
-      "invalid_auth": "Invalid authentication",
-      "cannot_connect": "Failed to connect, please try again"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   },
   "options": {
@@ -30,4 +30,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/tado/translations/ca.json b/homeassistant/components/tado/translations/ca.json
index df340784f7f..935b58483d7 100644
--- a/homeassistant/components/tado/translations/ca.json
+++ b/homeassistant/components/tado/translations/ca.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar, torna-ho a provar",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "no_homes": "No hi ha cases enlla\u00e7ades a aquest compte Tado.",
             "unknown": "Error inesperat"
diff --git a/homeassistant/components/tado/translations/cs.json b/homeassistant/components/tado/translations/cs.json
index 338ff5d9a44..8ddc5522b55 100644
--- a/homeassistant/components/tado/translations/cs.json
+++ b/homeassistant/components/tado/translations/cs.json
@@ -1,11 +1,30 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k \u00fa\u010dtu Tado"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "fallback": "Povolit z\u00e1lo\u017en\u00ed re\u017eim."
+                },
+                "title": "Upravte mo\u017enosti Tado."
             }
         }
     }
diff --git a/homeassistant/components/tado/translations/en.json b/homeassistant/components/tado/translations/en.json
index d6f28c43cb2..4e0df459437 100644
--- a/homeassistant/components/tado/translations/en.json
+++ b/homeassistant/components/tado/translations/en.json
@@ -4,7 +4,7 @@
             "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect, please try again",
+            "cannot_connect": "Failed to connect",
             "invalid_auth": "Invalid authentication",
             "no_homes": "There are no homes linked to this tado account.",
             "unknown": "Unexpected error"
diff --git a/homeassistant/components/tado/translations/es.json b/homeassistant/components/tado/translations/es.json
index fec4e448182..c9a26a1a9ab 100644
--- a/homeassistant/components/tado/translations/es.json
+++ b/homeassistant/components/tado/translations/es.json
@@ -4,7 +4,7 @@
             "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar, por favor, int\u00e9ntalo de nuevo",
+            "cannot_connect": "No se pudo conectar",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "no_homes": "No hay casas asociadas a esta cuenta de Tado",
             "unknown": "Error inesperado"
diff --git a/homeassistant/components/tado/translations/et.json b/homeassistant/components/tado/translations/et.json
new file mode 100644
index 00000000000..a317cab785f
--- /dev/null
+++ b/homeassistant/components/tado/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Ootamatu t\u00f5rge"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tado/translations/it.json b/homeassistant/components/tado/translations/it.json
index 775ef702b84..2c09ca74312 100644
--- a/homeassistant/components/tado/translations/it.json
+++ b/homeassistant/components/tado/translations/it.json
@@ -4,7 +4,7 @@
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi, si prega di riprovare",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_auth": "Autenticazione non valida",
             "no_homes": "Non ci sono case collegate a questo account tado.",
             "unknown": "Errore imprevisto"
diff --git a/homeassistant/components/tado/translations/no.json b/homeassistant/components/tado/translations/no.json
index 594084c6571..4b6db19e0af 100644
--- a/homeassistant/components/tado/translations/no.json
+++ b/homeassistant/components/tado/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Klarte ikke \u00e5 koble til, vennligst pr\u00f8v igjen",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "no_homes": "Det er ingen hjem knyttet til denne tado-kontoen.",
             "unknown": "Uventet feil"
diff --git a/homeassistant/components/tado/translations/pl.json b/homeassistant/components/tado/translations/pl.json
index 46c78ce438e..4f109fc9e98 100644
--- a/homeassistant/components/tado/translations/pl.json
+++ b/homeassistant/components/tado/translations/pl.json
@@ -4,9 +4,9 @@
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
-            "no_homes": "Brak dom\u00f3w powi\u0105zanych z tym kontem Tado.",
+            "no_homes": "Brak dom\u00f3w powi\u0105zanych z tym kontem Tado",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
diff --git a/homeassistant/components/tado/translations/ru.json b/homeassistant/components/tado/translations/ru.json
index 04d1a0d9545..8ffb14edc0e 100644
--- a/homeassistant/components/tado/translations/ru.json
+++ b/homeassistant/components/tado/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "no_homes": "\u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e \u0434\u043e\u043c\u043e\u0432, \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0441 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u044c\u044e.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
diff --git a/homeassistant/components/tado/translations/sv.json b/homeassistant/components/tado/translations/sv.json
index 90be3d809c9..f6813633b80 100644
--- a/homeassistant/components/tado/translations/sv.json
+++ b/homeassistant/components/tado/translations/sv.json
@@ -24,7 +24,8 @@
             "init": {
                 "data": {
                     "fallback": "Aktivera reservl\u00e4ge."
-                }
+                },
+                "title": "Justera Tado inst\u00e4llningarna."
             }
         }
     }
diff --git a/homeassistant/components/tado/translations/zh-Hans.json b/homeassistant/components/tado/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/tado/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tado/translations/zh-Hant.json b/homeassistant/components/tado/translations/zh-Hant.json
index 911520065fc..59e2d80c561 100644
--- a/homeassistant/components/tado/translations/zh-Hant.json
+++ b/homeassistant/components/tado/translations/zh-Hant.json
@@ -4,7 +4,7 @@
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "no_homes": "\u6b64 Tado \u5e33\u865f\u672a\u7d81\u5b9a\u4efb\u4f55\u5bb6\u5ead\u3002",
             "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
diff --git a/homeassistant/components/tag/translations/et.json b/homeassistant/components/tag/translations/et.json
new file mode 100644
index 00000000000..e20cb213a6c
--- /dev/null
+++ b/homeassistant/components/tag/translations/et.json
@@ -0,0 +1,3 @@
+{
+    "title": "M\u00e4rgis"
+}
\ No newline at end of file
diff --git a/homeassistant/components/tag/translations/no.json b/homeassistant/components/tag/translations/no.json
index fdac700612d..d8a4c453015 100644
--- a/homeassistant/components/tag/translations/no.json
+++ b/homeassistant/components/tag/translations/no.json
@@ -1,3 +1,3 @@
 {
-    "title": "Tag"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/tahoma/scene.py b/homeassistant/components/tahoma/scene.py
index 55b89dfcd47..1d53b65d5d5 100644
--- a/homeassistant/components/tahoma/scene.py
+++ b/homeassistant/components/tahoma/scene.py
@@ -1,13 +1,10 @@
 """Support for Tahoma scenes."""
-import logging
 from typing import Any
 
 from homeassistant.components.scene import Scene
 
 from . import DOMAIN as TAHOMA_DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tahoma scenes."""
diff --git a/homeassistant/components/tasmota/__init__.py b/homeassistant/components/tasmota/__init__.py
new file mode 100644
index 00000000000..a82d95474cc
--- /dev/null
+++ b/homeassistant/components/tasmota/__init__.py
@@ -0,0 +1,138 @@
+"""The Tasmota integration."""
+import asyncio
+import logging
+
+from hatasmota.const import (
+    CONF_MAC,
+    CONF_MANUFACTURER,
+    CONF_MODEL,
+    CONF_NAME,
+    CONF_SW_VERSION,
+)
+from hatasmota.discovery import clear_discovery_topic
+from hatasmota.mqtt import TasmotaMQTTClient
+
+from homeassistant.components import mqtt
+from homeassistant.components.mqtt.subscription import (
+    async_subscribe_topics,
+    async_unsubscribe_topics,
+)
+from homeassistant.core import callback
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.helpers.typing import HomeAssistantType
+
+from . import device_automation, discovery
+from .const import CONF_DISCOVERY_PREFIX, DATA_REMOVE_DISCOVER_COMPONENT, PLATFORMS
+
+_LOGGER = logging.getLogger(__name__)
+
+DEVICE_MACS = "tasmota_devices"
+
+
+async def async_setup(hass: HomeAssistantType, config: dict):
+    """Set up the Tasmota component."""
+    return True
+
+
+async def async_setup_entry(hass, entry):
+    """Set up Tasmota from a config entry."""
+    hass.data[DEVICE_MACS] = {}
+
+    def _publish(*args, **kwds):
+        mqtt.async_publish(hass, *args, **kwds)
+
+    async def _subscribe_topics(sub_state, topics):
+        # Optionally mark message handlers as callback
+        for topic in topics.values():
+            if "msg_callback" in topic and "event_loop_safe" in topic:
+                topic["msg_callback"] = callback(topic["msg_callback"])
+        return await async_subscribe_topics(hass, sub_state, topics)
+
+    async def _unsubscribe_topics(sub_state):
+        return await async_unsubscribe_topics(hass, sub_state)
+
+    tasmota_mqtt = TasmotaMQTTClient(_publish, _subscribe_topics, _unsubscribe_topics)
+
+    device_registry = await hass.helpers.device_registry.async_get_registry()
+
+    def async_discover_device(config, mac):
+        """Discover and add a Tasmota device."""
+        async_setup_device(hass, mac, config, entry, tasmota_mqtt, device_registry)
+
+    async def start_platforms():
+        await device_automation.async_setup_entry(hass, entry)
+        await asyncio.gather(
+            *[
+                hass.config_entries.async_forward_entry_setup(entry, component)
+                for component in PLATFORMS
+            ]
+        )
+
+        discovery_prefix = entry.data[CONF_DISCOVERY_PREFIX]
+        await discovery.async_start(
+            hass, discovery_prefix, entry, tasmota_mqtt, async_discover_device
+        )
+
+    hass.async_create_task(start_platforms())
+    return True
+
+
+async def async_unload_entry(hass, entry):
+    """Unload a config entry."""
+
+    # cleanup platforms
+    unload_ok = all(
+        await asyncio.gather(
+            *[
+                hass.config_entries.async_forward_entry_unload(entry, component)
+                for component in PLATFORMS
+            ]
+        )
+    )
+    if not unload_ok:
+        return False
+
+    # disable discovery
+    await discovery.async_stop(hass)
+    hass.data.pop(DEVICE_MACS)
+    hass.data.pop(DATA_REMOVE_DISCOVER_COMPONENT.format("device_automation"))()
+    for component in PLATFORMS:
+        hass.data.pop(DATA_REMOVE_DISCOVER_COMPONENT.format(component))()
+
+    return True
+
+
+def _remove_device(hass, config_entry, mac, tasmota_mqtt, device_registry):
+    """Remove device from device registry."""
+    device = device_registry.async_get_device(set(), {(CONNECTION_NETWORK_MAC, mac)})
+
+    if device is None:
+        return
+
+    _LOGGER.debug("Removing tasmota device %s", mac)
+    device_registry.async_remove_device(device.id)
+    clear_discovery_topic(mac, config_entry.data[CONF_DISCOVERY_PREFIX], tasmota_mqtt)
+
+
+def _update_device(hass, config_entry, config, device_registry):
+    """Add or update device registry."""
+    config_entry_id = config_entry.entry_id
+    device_info = {
+        "connections": {(CONNECTION_NETWORK_MAC, config[CONF_MAC])},
+        "manufacturer": config[CONF_MANUFACTURER],
+        "model": config[CONF_MODEL],
+        "name": config[CONF_NAME],
+        "sw_version": config[CONF_SW_VERSION],
+        "config_entry_id": config_entry_id,
+    }
+    _LOGGER.debug("Adding or updating tasmota device %s", config[CONF_MAC])
+    device = device_registry.async_get_or_create(**device_info)
+    hass.data[DEVICE_MACS][device.id] = config[CONF_MAC]
+
+
+def async_setup_device(hass, mac, config, config_entry, tasmota_mqtt, device_registry):
+    """Set up the Tasmota device."""
+    if not config:
+        _remove_device(hass, config_entry, mac, tasmota_mqtt, device_registry)
+    else:
+        _update_device(hass, config_entry, config, device_registry)
diff --git a/homeassistant/components/tasmota/binary_sensor.py b/homeassistant/components/tasmota/binary_sensor.py
new file mode 100644
index 00000000000..ade309840ca
--- /dev/null
+++ b/homeassistant/components/tasmota/binary_sensor.py
@@ -0,0 +1,86 @@
+"""Support for Tasmota binary sensors."""
+
+from homeassistant.components import binary_sensor
+from homeassistant.components.binary_sensor import BinarySensorEntity
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+import homeassistant.helpers.event as evt
+
+from .const import DATA_REMOVE_DISCOVER_COMPONENT, DOMAIN as TASMOTA_DOMAIN
+from .discovery import TASMOTA_DISCOVERY_ENTITY_NEW
+from .mixins import TasmotaAvailability, TasmotaDiscoveryUpdate
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up Tasmota binary sensor dynamically through discovery."""
+
+    @callback
+    def async_discover(tasmota_entity, discovery_hash):
+        """Discover and add a Tasmota binary sensor."""
+        async_add_entities(
+            [
+                TasmotaBinarySensor(
+                    tasmota_entity=tasmota_entity, discovery_hash=discovery_hash
+                )
+            ]
+        )
+
+    hass.data[
+        DATA_REMOVE_DISCOVER_COMPONENT.format(binary_sensor.DOMAIN)
+    ] = async_dispatcher_connect(
+        hass,
+        TASMOTA_DISCOVERY_ENTITY_NEW.format(binary_sensor.DOMAIN, TASMOTA_DOMAIN),
+        async_discover,
+    )
+
+
+class TasmotaBinarySensor(
+    TasmotaAvailability,
+    TasmotaDiscoveryUpdate,
+    BinarySensorEntity,
+):
+    """Representation a Tasmota binary sensor."""
+
+    def __init__(self, **kwds):
+        """Initialize the Tasmota binary sensor."""
+        self._delay_listener = None
+        self._state = None
+
+        super().__init__(
+            discovery_update=self.discovery_update,
+            **kwds,
+        )
+
+    @callback
+    def off_delay_listener(self, now):
+        """Switch device off after a delay."""
+        self._delay_listener = None
+        self._state = False
+        self.async_write_ha_state()
+
+    @callback
+    def state_updated(self, state, **kwargs):
+        """Handle state updates."""
+        self._state = state
+
+        if self._delay_listener is not None:
+            self._delay_listener()
+            self._delay_listener = None
+
+        off_delay = self._tasmota_entity.off_delay
+        if self._state and off_delay is not None:
+            self._delay_listener = evt.async_call_later(
+                self.hass, off_delay, self.off_delay_listener
+            )
+
+        self.async_write_ha_state()
+
+    @property
+    def force_update(self):
+        """Force update."""
+        return True
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        return self._state
diff --git a/homeassistant/components/tasmota/config_flow.py b/homeassistant/components/tasmota/config_flow.py
new file mode 100644
index 00000000000..5d39fa02438
--- /dev/null
+++ b/homeassistant/components/tasmota/config_flow.py
@@ -0,0 +1,88 @@
+"""Config flow for Tasmota."""
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.components.mqtt import valid_subscribe_topic
+
+from .const import (  # pylint:disable=unused-import
+    CONF_DISCOVERY_PREFIX,
+    DEFAULT_PREFIX,
+    DOMAIN,
+)
+
+
+class FlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow."""
+
+    VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_PUSH
+
+    def __init__(self):
+        """Initialize flow."""
+        self._prefix = DEFAULT_PREFIX
+
+    async def async_step_mqtt(self, discovery_info=None):
+        """Handle a flow initialized by MQTT discovery."""
+        if self._async_in_progress() or self._async_current_entries():
+            return self.async_abort(reason="single_instance_allowed")
+
+        await self.async_set_unique_id(DOMAIN)
+
+        # Validate the topic, will throw if it fails
+        prefix = discovery_info.subscribed_topic
+        if prefix.endswith("/#"):
+            prefix = prefix[:-2]
+        try:
+            valid_subscribe_topic(f"{prefix}/#")
+        except vol.Invalid:
+            return self.async_abort(reason="invalid_discovery_info")
+
+        self._prefix = prefix
+
+        return await self.async_step_confirm()
+
+    async def async_step_user(self, user_input=None):
+        """Handle a flow initialized by the user."""
+        if self._async_current_entries():
+            return self.async_abort(reason="single_instance_allowed")
+
+        if self.show_advanced_options:
+            return await self.async_step_config()
+        return await self.async_step_confirm()
+
+    async def async_step_config(self, user_input=None):
+        """Confirm the setup."""
+        errors = {}
+        data = {CONF_DISCOVERY_PREFIX: self._prefix}
+
+        if user_input is not None:
+            bad_prefix = False
+            prefix = user_input[CONF_DISCOVERY_PREFIX]
+            if prefix.endswith("/#"):
+                prefix = prefix[:-2]
+            try:
+                valid_subscribe_topic(f"{prefix}/#")
+            except vol.Invalid:
+                errors["base"] = "invalid_discovery_topic"
+                bad_prefix = True
+            else:
+                data[CONF_DISCOVERY_PREFIX] = prefix
+            if not bad_prefix:
+                return self.async_create_entry(title="Tasmota", data=data)
+
+        fields = {}
+        fields[vol.Optional(CONF_DISCOVERY_PREFIX, default=self._prefix)] = str
+
+        return self.async_show_form(
+            step_id="config", data_schema=vol.Schema(fields), errors=errors
+        )
+
+    async def async_step_confirm(self, user_input=None):
+        """Confirm the setup."""
+
+        data = {CONF_DISCOVERY_PREFIX: self._prefix}
+
+        if user_input is not None:
+            return self.async_create_entry(title="Tasmota", data=data)
+
+        return self.async_show_form(step_id="confirm")
diff --git a/homeassistant/components/tasmota/const.py b/homeassistant/components/tasmota/const.py
new file mode 100644
index 00000000000..7cddeb7a603
--- /dev/null
+++ b/homeassistant/components/tasmota/const.py
@@ -0,0 +1,17 @@
+"""Constants used by multiple Tasmota modules."""
+CONF_DISCOVERY_PREFIX = "discovery_prefix"
+
+DATA_REMOVE_DISCOVER_COMPONENT = "tasmota_discover_{}"
+
+DEFAULT_PREFIX = "tasmota/discovery"
+
+DOMAIN = "tasmota"
+
+PLATFORMS = [
+    "binary_sensor",
+    "light",
+    "sensor",
+    "switch",
+]
+
+TASMOTA_EVENT = "tasmota_event"
diff --git a/homeassistant/components/tasmota/device_automation.py b/homeassistant/components/tasmota/device_automation.py
new file mode 100644
index 00000000000..e921a186fea
--- /dev/null
+++ b/homeassistant/components/tasmota/device_automation.py
@@ -0,0 +1,36 @@
+"""Provides device automations for Tasmota."""
+
+from hatasmota.const import AUTOMATION_TYPE_TRIGGER
+
+from homeassistant.helpers.device_registry import EVENT_DEVICE_REGISTRY_UPDATED
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+
+from . import device_trigger
+from .const import DATA_REMOVE_DISCOVER_COMPONENT
+from .discovery import TASMOTA_DISCOVERY_ENTITY_NEW
+
+
+async def async_setup_entry(hass, config_entry):
+    """Set up Tasmota device automation dynamically through discovery."""
+
+    async def async_device_removed(event):
+        """Handle the removal of a device."""
+        if event.data["action"] != "remove":
+            return
+        await device_trigger.async_device_removed(hass, event.data["device_id"])
+
+    async def async_discover(tasmota_automation, discovery_hash):
+        """Discover and add a Tasmota device automation."""
+        if tasmota_automation.automation_type == AUTOMATION_TYPE_TRIGGER:
+            await device_trigger.async_setup_trigger(
+                hass, tasmota_automation, config_entry, discovery_hash
+            )
+
+    hass.data[
+        DATA_REMOVE_DISCOVER_COMPONENT.format("device_automation")
+    ] = async_dispatcher_connect(
+        hass,
+        TASMOTA_DISCOVERY_ENTITY_NEW.format("device_automation", "tasmota"),
+        async_discover,
+    )
+    hass.bus.async_listen(EVENT_DEVICE_REGISTRY_UPDATED, async_device_removed)
diff --git a/homeassistant/components/tasmota/device_trigger.py b/homeassistant/components/tasmota/device_trigger.py
new file mode 100644
index 00000000000..9db7ca492af
--- /dev/null
+++ b/homeassistant/components/tasmota/device_trigger.py
@@ -0,0 +1,291 @@
+"""Provides device automations for Tasmota."""
+import logging
+from typing import Callable, List, Optional
+
+import attr
+from hatasmota.trigger import TasmotaTrigger
+import voluptuous as vol
+
+from homeassistant.components.automation import AutomationActionType
+from homeassistant.components.device_automation import TRIGGER_BASE_SCHEMA
+from homeassistant.components.homeassistant.triggers import event as event_trigger
+from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN, CONF_PLATFORM, CONF_TYPE
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.typing import ConfigType, HomeAssistantType
+
+from .const import DOMAIN, TASMOTA_EVENT
+from .discovery import TASMOTA_DISCOVERY_ENTITY_UPDATED, clear_discovery_hash
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_DISCOVERY_ID = "discovery_id"
+CONF_SUBTYPE = "subtype"
+DEVICE = "device"
+
+TRIGGER_SCHEMA = TRIGGER_BASE_SCHEMA.extend(
+    {
+        vol.Required(CONF_PLATFORM): DEVICE,
+        vol.Required(CONF_DOMAIN): DOMAIN,
+        vol.Required(CONF_DEVICE_ID): str,
+        vol.Required(CONF_DISCOVERY_ID): str,
+        vol.Required(CONF_TYPE): cv.string,
+        vol.Required(CONF_SUBTYPE): cv.string,
+    }
+)
+
+DEVICE_TRIGGERS = "tasmota_device_triggers"
+
+
+@attr.s(slots=True)
+class TriggerInstance:
+    """Attached trigger settings."""
+
+    action: AutomationActionType = attr.ib()
+    automation_info: dict = attr.ib()
+    trigger: "Trigger" = attr.ib()
+    remove: Optional[CALLBACK_TYPE] = attr.ib(default=None)
+
+    async def async_attach_trigger(self):
+        """Attach event trigger."""
+        event_config = {
+            event_trigger.CONF_PLATFORM: "event",
+            event_trigger.CONF_EVENT_TYPE: TASMOTA_EVENT,
+            event_trigger.CONF_EVENT_DATA: {
+                "mac": self.trigger.tasmota_trigger.cfg.mac,
+                "source": self.trigger.tasmota_trigger.cfg.source,
+                "event": self.trigger.tasmota_trigger.cfg.event,
+            },
+        }
+
+        event_config = event_trigger.TRIGGER_SCHEMA(event_config)
+        if self.remove:
+            self.remove()
+        # Note: No lock needed, event_trigger.async_attach_trigger is an synchronous function
+        self.remove = await event_trigger.async_attach_trigger(
+            self.trigger.hass,
+            event_config,
+            self.action,
+            self.automation_info,
+            platform_type="device",
+        )
+
+
+@attr.s(slots=True)
+class Trigger:
+    """Device trigger settings."""
+
+    device_id: str = attr.ib()
+    discovery_hash: dict = attr.ib()
+    hass: HomeAssistantType = attr.ib()
+    remove_update_signal: Callable[[], None] = attr.ib()
+    subtype: str = attr.ib()
+    tasmota_trigger: TasmotaTrigger = attr.ib()
+    type: str = attr.ib()
+    trigger_instances: List[TriggerInstance] = attr.ib(factory=list)
+
+    async def add_trigger(self, action, automation_info):
+        """Add Tasmota trigger."""
+        instance = TriggerInstance(action, automation_info, self)
+        self.trigger_instances.append(instance)
+
+        if self.tasmota_trigger is not None:
+            # If we know about the trigger, set it up
+            await instance.async_attach_trigger()
+
+        @callback
+        def async_remove() -> None:
+            """Remove trigger."""
+            if instance not in self.trigger_instances:
+                raise HomeAssistantError("Can't remove trigger twice")
+
+            if instance.remove:
+                instance.remove()
+            self.trigger_instances.remove(instance)
+
+        return async_remove
+
+    def detach_trigger(self):
+        """Remove Tasmota device trigger."""
+        # Mark trigger as unknown
+        self.tasmota_trigger = None
+
+        # Unsubscribe if this trigger is in use
+        for trig in self.trigger_instances:
+            if trig.remove:
+                trig.remove()
+                trig.remove = None
+
+    async def arm_tasmota_trigger(self):
+        """Arm Tasmota trigger: subscribe to MQTT topics and fire events."""
+
+        @callback
+        def _on_trigger():
+            data = {
+                "mac": self.tasmota_trigger.cfg.mac,
+                "source": self.tasmota_trigger.cfg.source,
+                "event": self.tasmota_trigger.cfg.event,
+            }
+            self.hass.bus.async_fire(
+                TASMOTA_EVENT,
+                data,
+            )
+
+        self.tasmota_trigger.set_on_trigger_callback(_on_trigger)
+        await self.tasmota_trigger.subscribe_topics()
+
+    async def set_tasmota_trigger(self, tasmota_trigger, remove_update_signal):
+        """Set Tasmota trigger."""
+        await self.update_tasmota_trigger(tasmota_trigger.cfg, remove_update_signal)
+        self.tasmota_trigger = tasmota_trigger
+
+        for trig in self.trigger_instances:
+            await trig.async_attach_trigger()
+
+    async def update_tasmota_trigger(self, tasmota_trigger_cfg, remove_update_signal):
+        """Update Tasmota trigger."""
+        self.remove_update_signal = remove_update_signal
+        self.type = tasmota_trigger_cfg.type
+        self.subtype = tasmota_trigger_cfg.subtype
+
+
+async def async_setup_trigger(hass, tasmota_trigger, config_entry, discovery_hash):
+    """Set up a discovered Tasmota device trigger."""
+    discovery_id = tasmota_trigger.cfg.trigger_id
+    remove_update_signal = None
+    _LOGGER.debug(
+        "Discovered trigger with id: %s '%s'", discovery_id, tasmota_trigger.cfg
+    )
+
+    async def discovery_update(trigger_config):
+        """Handle discovery update."""
+        _LOGGER.debug(
+            "Got update for trigger with hash: %s '%s'", discovery_hash, trigger_config
+        )
+        if not trigger_config.is_active:
+            # Empty trigger_config: Remove trigger
+            _LOGGER.debug("Removing trigger: %s", discovery_hash)
+            if discovery_id in hass.data[DEVICE_TRIGGERS]:
+                device_trigger = hass.data[DEVICE_TRIGGERS][discovery_id]
+                await device_trigger.tasmota_trigger.unsubscribe_topics()
+                device_trigger.detach_trigger()
+                clear_discovery_hash(hass, discovery_hash)
+                remove_update_signal()
+            return
+
+        device_trigger = hass.data[DEVICE_TRIGGERS][discovery_id]
+        if device_trigger.tasmota_trigger.config_same(trigger_config):
+            # Unchanged payload: Ignore to avoid unnecessary unsubscribe / subscribe
+            _LOGGER.debug("Ignoring unchanged update for: %s", discovery_hash)
+            return
+
+        # Non-empty, changed trigger_config: Update trigger
+        _LOGGER.debug("Updating trigger: %s", discovery_hash)
+        device_trigger.tasmota_trigger.config_update(trigger_config)
+        await device_trigger.update_tasmota_trigger(
+            trigger_config, remove_update_signal
+        )
+        await device_trigger.arm_tasmota_trigger()
+        return
+
+    remove_update_signal = async_dispatcher_connect(
+        hass, TASMOTA_DISCOVERY_ENTITY_UPDATED.format(*discovery_hash), discovery_update
+    )
+
+    device_registry = await hass.helpers.device_registry.async_get_registry()
+    device = device_registry.async_get_device(
+        set(),
+        {(CONNECTION_NETWORK_MAC, tasmota_trigger.cfg.mac)},
+    )
+
+    if device is None:
+        return
+
+    if DEVICE_TRIGGERS not in hass.data:
+        hass.data[DEVICE_TRIGGERS] = {}
+    if discovery_id not in hass.data[DEVICE_TRIGGERS]:
+        device_trigger = Trigger(
+            hass=hass,
+            device_id=device.id,
+            discovery_hash=discovery_hash,
+            subtype=tasmota_trigger.cfg.subtype,
+            tasmota_trigger=tasmota_trigger,
+            type=tasmota_trigger.cfg.type,
+            remove_update_signal=remove_update_signal,
+        )
+        hass.data[DEVICE_TRIGGERS][discovery_id] = device_trigger
+    else:
+        # This Tasmota trigger is wanted by device trigger(s), set them up
+        device_trigger = hass.data[DEVICE_TRIGGERS][discovery_id]
+        await device_trigger.set_tasmota_trigger(tasmota_trigger, remove_update_signal)
+    await device_trigger.arm_tasmota_trigger()
+
+
+async def async_device_removed(hass: HomeAssistant, device_id: str):
+    """Handle the removal of a Tasmota device - cleanup any device triggers."""
+    triggers = await async_get_triggers(hass, device_id)
+    for trig in triggers:
+        device_trigger = hass.data[DEVICE_TRIGGERS].pop(trig[CONF_DISCOVERY_ID])
+        if device_trigger:
+            discovery_hash = device_trigger.discovery_hash
+
+            await device_trigger.tasmota_trigger.unsubscribe_topics()
+            device_trigger.detach_trigger()
+            clear_discovery_hash(hass, discovery_hash)
+            device_trigger.remove_update_signal()
+
+
+async def async_get_triggers(hass: HomeAssistant, device_id: str) -> List[dict]:
+    """List device triggers for Tasmota devices."""
+    triggers = []
+
+    if DEVICE_TRIGGERS not in hass.data:
+        return triggers
+
+    for discovery_id, trig in hass.data[DEVICE_TRIGGERS].items():
+        if trig.device_id != device_id or trig.tasmota_trigger is None:
+            continue
+
+        trigger = {
+            "platform": "device",
+            "domain": "tasmota",
+            "device_id": device_id,
+            "type": trig.type,
+            "subtype": trig.subtype,
+            "discovery_id": discovery_id,
+        }
+        triggers.append(trigger)
+
+    return triggers
+
+
+async def async_attach_trigger(
+    hass: HomeAssistant,
+    config: ConfigType,
+    action: Callable,
+    automation_info: dict,
+) -> CALLBACK_TYPE:
+    """Attach a device trigger."""
+    if DEVICE_TRIGGERS not in hass.data:
+        hass.data[DEVICE_TRIGGERS] = {}
+    config = TRIGGER_SCHEMA(config)
+    device_id = config[CONF_DEVICE_ID]
+    discovery_id = config[CONF_DISCOVERY_ID]
+
+    if discovery_id not in hass.data[DEVICE_TRIGGERS]:
+        # The trigger has not (yet) been discovered, prepare it for later
+        hass.data[DEVICE_TRIGGERS][discovery_id] = Trigger(
+            hass=hass,
+            device_id=device_id,
+            discovery_hash=None,
+            remove_update_signal=None,
+            type=config[CONF_TYPE],
+            subtype=config[CONF_SUBTYPE],
+            tasmota_trigger=None,
+        )
+    return await hass.data[DEVICE_TRIGGERS][discovery_id].add_trigger(
+        action, automation_info
+    )
diff --git a/homeassistant/components/tasmota/discovery.py b/homeassistant/components/tasmota/discovery.py
new file mode 100644
index 00000000000..2313a8327c5
--- /dev/null
+++ b/homeassistant/components/tasmota/discovery.py
@@ -0,0 +1,173 @@
+"""Support for Tasmota device discovery."""
+import logging
+
+from hatasmota.discovery import (
+    TasmotaDiscovery,
+    get_device_config as tasmota_get_device_config,
+    get_entities_for_platform as tasmota_get_entities_for_platform,
+    get_entity as tasmota_get_entity,
+    get_trigger as tasmota_get_trigger,
+    get_triggers as tasmota_get_triggers,
+    unique_id_from_hash,
+)
+
+import homeassistant.components.sensor as sensor
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.entity_registry import async_entries_for_device
+from homeassistant.helpers.typing import HomeAssistantType
+
+from .const import DOMAIN, PLATFORMS
+
+_LOGGER = logging.getLogger(__name__)
+
+ALREADY_DISCOVERED = "tasmota_discovered_components"
+TASMOTA_DISCOVERY_ENTITY_NEW = "tasmota_discovery_entity_new_{}"
+TASMOTA_DISCOVERY_ENTITY_UPDATED = "tasmota_discovery_entity_updated_{}_{}_{}_{}"
+TASMOTA_DISCOVERY_INSTANCE = "tasmota_discovery_instance"
+
+
+def clear_discovery_hash(hass, discovery_hash):
+    """Clear entry in ALREADY_DISCOVERED list."""
+    if ALREADY_DISCOVERED not in hass.data:
+        # Discovery is shutting down
+        return
+    del hass.data[ALREADY_DISCOVERED][discovery_hash]
+
+
+def set_discovery_hash(hass, discovery_hash):
+    """Set entry in ALREADY_DISCOVERED list."""
+    hass.data[ALREADY_DISCOVERED][discovery_hash] = {}
+
+
+async def async_start(
+    hass: HomeAssistantType, discovery_topic, config_entry, tasmota_mqtt, setup_device
+) -> bool:
+    """Start Tasmota device discovery."""
+
+    async def _discover_entity(tasmota_entity_config, discovery_hash, platform):
+        """Handle adding or updating a discovered entity."""
+        if not tasmota_entity_config:
+            # Entity disabled, clean up entity registry
+            entity_registry = await hass.helpers.entity_registry.async_get_registry()
+            unique_id = unique_id_from_hash(discovery_hash)
+            entity_id = entity_registry.async_get_entity_id(platform, DOMAIN, unique_id)
+            if entity_id:
+                _LOGGER.debug("Removing entity: %s %s", platform, discovery_hash)
+                entity_registry.async_remove(entity_id)
+            return
+
+        if discovery_hash in hass.data[ALREADY_DISCOVERED]:
+            _LOGGER.debug(
+                "Entity already added, sending update: %s %s",
+                platform,
+                discovery_hash,
+            )
+            async_dispatcher_send(
+                hass,
+                TASMOTA_DISCOVERY_ENTITY_UPDATED.format(*discovery_hash),
+                tasmota_entity_config,
+            )
+        else:
+            tasmota_entity = tasmota_get_entity(tasmota_entity_config, tasmota_mqtt)
+            _LOGGER.debug(
+                "Adding new entity: %s %s %s",
+                platform,
+                discovery_hash,
+                tasmota_entity.unique_id,
+            )
+
+            hass.data[ALREADY_DISCOVERED][discovery_hash] = None
+
+            async_dispatcher_send(
+                hass,
+                TASMOTA_DISCOVERY_ENTITY_NEW.format(platform),
+                tasmota_entity,
+                discovery_hash,
+            )
+
+    async def async_device_discovered(payload, mac):
+        """Process the received message."""
+
+        if ALREADY_DISCOVERED not in hass.data:
+            # Discovery is shutting down
+            return
+
+        _LOGGER.debug("Received discovery data for tasmota device: %s", mac)
+        tasmota_device_config = tasmota_get_device_config(payload)
+        setup_device(tasmota_device_config, mac)
+
+        if not payload:
+            return
+
+        tasmota_triggers = tasmota_get_triggers(payload)
+        for trigger_config in tasmota_triggers:
+            discovery_hash = (mac, "automation", "trigger", trigger_config.trigger_id)
+            if discovery_hash in hass.data[ALREADY_DISCOVERED]:
+                _LOGGER.debug(
+                    "Trigger already added, sending update: %s",
+                    discovery_hash,
+                )
+                async_dispatcher_send(
+                    hass,
+                    TASMOTA_DISCOVERY_ENTITY_UPDATED.format(*discovery_hash),
+                    trigger_config,
+                )
+            elif trigger_config.is_active:
+                _LOGGER.debug("Adding new trigger: %s", discovery_hash)
+                hass.data[ALREADY_DISCOVERED][discovery_hash] = None
+
+                tasmota_trigger = tasmota_get_trigger(trigger_config, tasmota_mqtt)
+
+                async_dispatcher_send(
+                    hass,
+                    TASMOTA_DISCOVERY_ENTITY_NEW.format("device_automation"),
+                    tasmota_trigger,
+                    discovery_hash,
+                )
+
+        for platform in PLATFORMS:
+            tasmota_entities = tasmota_get_entities_for_platform(payload, platform)
+            for (tasmota_entity_config, discovery_hash) in tasmota_entities:
+                await _discover_entity(tasmota_entity_config, discovery_hash, platform)
+
+    async def async_sensors_discovered(sensors, mac):
+        """Handle discovery of (additional) sensors."""
+        platform = sensor.DOMAIN
+
+        device_registry = await hass.helpers.device_registry.async_get_registry()
+        entity_registry = await hass.helpers.entity_registry.async_get_registry()
+        device = device_registry.async_get_device(set(), {("mac", mac)})
+
+        if device is None:
+            _LOGGER.warning("Got sensors for unknown device mac: %s", mac)
+            return
+
+        orphaned_entities = {
+            entry.unique_id
+            for entry in async_entries_for_device(entity_registry, device.id)
+            if entry.domain == sensor.DOMAIN and entry.platform == DOMAIN
+        }
+        for (tasmota_sensor_config, discovery_hash) in sensors:
+            if tasmota_sensor_config:
+                orphaned_entities.discard(tasmota_sensor_config.unique_id)
+            await _discover_entity(tasmota_sensor_config, discovery_hash, platform)
+        for unique_id in orphaned_entities:
+            entity_id = entity_registry.async_get_entity_id(platform, DOMAIN, unique_id)
+            if entity_id:
+                _LOGGER.debug("Removing entity: %s %s", platform, entity_id)
+                entity_registry.async_remove(entity_id)
+
+    hass.data[ALREADY_DISCOVERED] = {}
+
+    tasmota_discovery = TasmotaDiscovery(discovery_topic, tasmota_mqtt)
+    await tasmota_discovery.start_discovery(
+        async_device_discovered, async_sensors_discovered
+    )
+    hass.data[TASMOTA_DISCOVERY_INSTANCE] = tasmota_discovery
+
+
+async def async_stop(hass: HomeAssistantType) -> bool:
+    """Stop Tasmota device discovery."""
+    hass.data.pop(ALREADY_DISCOVERED)
+    tasmota_discovery = hass.data.pop(TASMOTA_DISCOVERY_INSTANCE)
+    await tasmota_discovery.stop_discovery()
diff --git a/homeassistant/components/tasmota/light.py b/homeassistant/components/tasmota/light.py
new file mode 100644
index 00000000000..1a41e7373fd
--- /dev/null
+++ b/homeassistant/components/tasmota/light.py
@@ -0,0 +1,232 @@
+"""Support for Tasmota lights."""
+from hatasmota.light import (
+    LIGHT_TYPE_COLDWARM,
+    LIGHT_TYPE_NONE,
+    LIGHT_TYPE_RGB,
+    LIGHT_TYPE_RGBCW,
+    LIGHT_TYPE_RGBW,
+)
+
+from homeassistant.components import light
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS,
+    ATTR_COLOR_TEMP,
+    ATTR_EFFECT,
+    ATTR_HS_COLOR,
+    ATTR_TRANSITION,
+    ATTR_WHITE_VALUE,
+    SUPPORT_BRIGHTNESS,
+    SUPPORT_COLOR,
+    SUPPORT_COLOR_TEMP,
+    SUPPORT_EFFECT,
+    SUPPORT_TRANSITION,
+    SUPPORT_WHITE_VALUE,
+    LightEntity,
+)
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+import homeassistant.util.color as color_util
+
+from .const import DATA_REMOVE_DISCOVER_COMPONENT, DOMAIN as TASMOTA_DOMAIN
+from .discovery import TASMOTA_DISCOVERY_ENTITY_NEW
+from .mixins import TasmotaAvailability, TasmotaDiscoveryUpdate
+
+DEFAULT_BRIGHTNESS_MAX = 255
+TASMOTA_BRIGHTNESS_MAX = 100
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up Tasmota light dynamically through discovery."""
+
+    @callback
+    def async_discover(tasmota_entity, discovery_hash):
+        """Discover and add a Tasmota light."""
+        async_add_entities(
+            [TasmotaLight(tasmota_entity=tasmota_entity, discovery_hash=discovery_hash)]
+        )
+
+    hass.data[
+        DATA_REMOVE_DISCOVER_COMPONENT.format(light.DOMAIN)
+    ] = async_dispatcher_connect(
+        hass,
+        TASMOTA_DISCOVERY_ENTITY_NEW.format(light.DOMAIN, TASMOTA_DOMAIN),
+        async_discover,
+    )
+
+
+class TasmotaLight(
+    TasmotaAvailability,
+    TasmotaDiscoveryUpdate,
+    LightEntity,
+):
+    """Representation of a Tasmota light."""
+
+    def __init__(self, **kwds):
+        """Initialize Tasmota light."""
+        self._state = False
+        self._supported_features = 0
+
+        self._brightness = None
+        self._color_temp = None
+        self._effect = None
+        self._hs = None
+        self._white_value = None
+        self._flash_times = None
+
+        super().__init__(
+            discovery_update=self.discovery_update,
+            **kwds,
+        )
+
+        self._setup_from_entity()
+
+    async def discovery_update(self, update, write_state=True):
+        """Handle updated discovery message."""
+        await super().discovery_update(update, write_state=False)
+        self._setup_from_entity()
+        self.async_write_ha_state()
+
+    def _setup_from_entity(self):
+        """(Re)Setup the entity."""
+        supported_features = 0
+        light_type = self._tasmota_entity.light_type
+
+        if light_type != LIGHT_TYPE_NONE:
+            supported_features |= SUPPORT_BRIGHTNESS
+            supported_features |= SUPPORT_TRANSITION
+
+        if light_type in [LIGHT_TYPE_COLDWARM, LIGHT_TYPE_RGBCW]:
+            supported_features |= SUPPORT_COLOR_TEMP
+
+        if light_type in [LIGHT_TYPE_RGB, LIGHT_TYPE_RGBW, LIGHT_TYPE_RGBCW]:
+            supported_features |= SUPPORT_COLOR
+            supported_features |= SUPPORT_EFFECT
+
+        if light_type in [LIGHT_TYPE_RGBW, LIGHT_TYPE_RGBCW]:
+            supported_features |= SUPPORT_WHITE_VALUE
+
+        self._supported_features = supported_features
+
+    @callback
+    def state_updated(self, state, **kwargs):
+        """Handle state updates."""
+        self._state = state
+        attributes = kwargs.get("attributes")
+        if attributes:
+            if "brightness" in attributes:
+                brightness = float(attributes["brightness"])
+                percent_bright = brightness / TASMOTA_BRIGHTNESS_MAX
+                self._brightness = percent_bright * 255
+            if "color" in attributes:
+                color = attributes["color"]
+                self._hs = color_util.color_RGB_to_hs(*color)
+            if "color_temp" in attributes:
+                self._color_temp = attributes["color_temp"]
+            if "effect" in attributes:
+                self._effect = attributes["effect"]
+            if "white_value" in attributes:
+                white_value = float(attributes["white_value"])
+                percent_white = white_value / TASMOTA_BRIGHTNESS_MAX
+                self._white_value = percent_white * 255
+        self.async_write_ha_state()
+
+    @property
+    def brightness(self):
+        """Return the brightness of this light between 0..255."""
+        return self._brightness
+
+    @property
+    def color_temp(self):
+        """Return the color temperature in mired."""
+        return self._color_temp
+
+    @property
+    def min_mireds(self):
+        """Return the coldest color_temp that this light supports."""
+        return self._tasmota_entity.min_mireds
+
+    @property
+    def max_mireds(self):
+        """Return the warmest color_temp that this light supports."""
+        return self._tasmota_entity.max_mireds
+
+    @property
+    def effect(self):
+        """Return the current effect."""
+        return self._effect
+
+    @property
+    def effect_list(self):
+        """Return the list of supported effects."""
+        return self._tasmota_entity.effect_list
+
+    @property
+    def hs_color(self):
+        """Return the hs color value."""
+        return self._hs
+
+    @property
+    def white_value(self):
+        """Return the white property."""
+        return self._white_value
+
+    @property
+    def is_on(self):
+        """Return true if device is on."""
+        return self._state
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        return self._supported_features
+
+    async def async_turn_on(self, **kwargs):
+        """Turn the entity on."""
+        supported_features = self._supported_features
+
+        attributes = {}
+
+        if ATTR_HS_COLOR in kwargs and supported_features & SUPPORT_COLOR:
+            hs_color = kwargs[ATTR_HS_COLOR]
+            attributes["color"] = {}
+
+            rgb = color_util.color_hsv_to_RGB(hs_color[0], hs_color[1], 100)
+            attributes["color"] = [rgb[0], rgb[1], rgb[2]]
+
+        if ATTR_TRANSITION in kwargs:
+            attributes["transition"] = kwargs[ATTR_TRANSITION]
+
+        if ATTR_BRIGHTNESS in kwargs and supported_features & SUPPORT_BRIGHTNESS:
+            brightness_normalized = kwargs[ATTR_BRIGHTNESS] / DEFAULT_BRIGHTNESS_MAX
+            device_brightness = min(
+                round(brightness_normalized * TASMOTA_BRIGHTNESS_MAX),
+                TASMOTA_BRIGHTNESS_MAX,
+            )
+            # Make sure the brightness is not rounded down to 0
+            device_brightness = max(device_brightness, 1)
+            attributes["brightness"] = device_brightness
+
+        if ATTR_COLOR_TEMP in kwargs and supported_features & SUPPORT_COLOR_TEMP:
+            attributes["color_temp"] = int(kwargs[ATTR_COLOR_TEMP])
+
+        if ATTR_EFFECT in kwargs:
+            attributes["effect"] = kwargs[ATTR_EFFECT]
+
+        if ATTR_WHITE_VALUE in kwargs:
+            white_value_normalized = kwargs[ATTR_WHITE_VALUE] / DEFAULT_BRIGHTNESS_MAX
+            device_white_value = min(
+                round(white_value_normalized * TASMOTA_BRIGHTNESS_MAX),
+                TASMOTA_BRIGHTNESS_MAX,
+            )
+            attributes["white_value"] = device_white_value
+
+        self._tasmota_entity.set_state(True, attributes)
+
+    async def async_turn_off(self, **kwargs):
+        """Turn the entity off."""
+        attributes = {"state": "OFF"}
+
+        if ATTR_TRANSITION in kwargs:
+            attributes["transition"] = kwargs[ATTR_TRANSITION]
+
+        self._tasmota_entity.set_state(False, attributes)
diff --git a/homeassistant/components/tasmota/manifest.json b/homeassistant/components/tasmota/manifest.json
new file mode 100644
index 00000000000..991e38e6a95
--- /dev/null
+++ b/homeassistant/components/tasmota/manifest.json
@@ -0,0 +1,10 @@
+{
+  "domain": "tasmota",
+  "name": "Tasmota (beta)",
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/tasmota",
+  "requirements": ["hatasmota==0.0.24"],
+  "dependencies": ["mqtt"],
+  "mqtt": ["tasmota/discovery/#"],
+  "codeowners": ["@emontnemery"]
+}
diff --git a/homeassistant/components/tasmota/mixins.py b/homeassistant/components/tasmota/mixins.py
new file mode 100644
index 00000000000..5a1c7a9f3de
--- /dev/null
+++ b/homeassistant/components/tasmota/mixins.py
@@ -0,0 +1,168 @@
+"""Tasmota entity mixins."""
+import logging
+
+from homeassistant.components.mqtt import (
+    async_subscribe_connection_status,
+    is_connected as mqtt_connected,
+)
+from homeassistant.core import callback
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity import Entity
+
+from .discovery import (
+    TASMOTA_DISCOVERY_ENTITY_UPDATED,
+    clear_discovery_hash,
+    set_discovery_hash,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class TasmotaEntity(Entity):
+    """Base class for Tasmota entities."""
+
+    def __init__(self, tasmota_entity) -> None:
+        """Initialize."""
+        self._state = None
+        self._tasmota_entity = tasmota_entity
+        self._unique_id = tasmota_entity.unique_id
+
+    async def async_added_to_hass(self):
+        """Subscribe to MQTT events."""
+        self._tasmota_entity.set_on_state_callback(self.state_updated)
+        await self._subscribe_topics()
+
+    async def async_will_remove_from_hass(self):
+        """Unsubscribe when removed."""
+        await self._tasmota_entity.unsubscribe_topics()
+        await super().async_will_remove_from_hass()
+
+    async def discovery_update(self, update, write_state=True):
+        """Handle updated discovery message."""
+        self._tasmota_entity.config_update(update)
+        await self._subscribe_topics()
+        if write_state:
+            self.async_write_ha_state()
+
+    async def _subscribe_topics(self):
+        """(Re)Subscribe to topics."""
+        await self._tasmota_entity.subscribe_topics()
+
+    @callback
+    def state_updated(self, state, **kwargs):
+        """Handle state updates."""
+        self._state = state
+        self.async_write_ha_state()
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        return {"connections": {(CONNECTION_NETWORK_MAC, self._tasmota_entity.mac)}}
+
+    @property
+    def name(self):
+        """Return the name of the binary sensor."""
+        return self._tasmota_entity.name
+
+    @property
+    def should_poll(self):
+        """Return the polling state."""
+        return False
+
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
+
+class TasmotaAvailability(TasmotaEntity):
+    """Mixin used for platforms that report availability."""
+
+    def __init__(self, **kwds) -> None:
+        """Initialize the availability mixin."""
+        self._available = False
+        super().__init__(**kwds)
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to MQTT events."""
+        self._tasmota_entity.set_on_availability_callback(self.availability_updated)
+        self.async_on_remove(
+            async_subscribe_connection_status(self.hass, self.async_mqtt_connected)
+        )
+        await super().async_added_to_hass()
+
+    @callback
+    def availability_updated(self, available: bool) -> None:
+        """Handle updated availability."""
+        if available and not self._available:
+            self._tasmota_entity.poll_status()
+        self._available = available
+        self.async_write_ha_state()
+
+    @callback
+    def async_mqtt_connected(self, _):
+        """Update state on connection/disconnection to MQTT broker."""
+        if not self.hass.is_stopping:
+            if not mqtt_connected(self.hass):
+                self._available = False
+            self.async_write_ha_state()
+
+    @property
+    def available(self) -> bool:
+        """Return if the device is available."""
+        return self._available
+
+
+class TasmotaDiscoveryUpdate(TasmotaEntity):
+    """Mixin used to handle updated discovery message."""
+
+    def __init__(self, discovery_hash, discovery_update, **kwds) -> None:
+        """Initialize the discovery update mixin."""
+        self._discovery_hash = discovery_hash
+        self._discovery_update = discovery_update
+        self._removed_from_hass = False
+        super().__init__(**kwds)
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to discovery updates."""
+        self._removed_from_hass = False
+        await super().async_added_to_hass()
+
+        async def discovery_callback(config):
+            """Handle discovery update."""
+            _LOGGER.debug(
+                "Got update for entity with hash: %s '%s'",
+                self._discovery_hash,
+                config,
+            )
+            if not self._tasmota_entity.config_same(config):
+                # Changed payload: Notify component
+                _LOGGER.debug("Updating component: %s", self.entity_id)
+                await self._discovery_update(config)
+            else:
+                # Unchanged payload: Ignore to avoid changing states
+                _LOGGER.debug("Ignoring unchanged update for: %s", self.entity_id)
+
+        # Set in case the entity has been removed and is re-added, for example when changing entity_id
+        set_discovery_hash(self.hass, self._discovery_hash)
+        self.async_on_remove(
+            async_dispatcher_connect(
+                self.hass,
+                TASMOTA_DISCOVERY_ENTITY_UPDATED.format(*self._discovery_hash),
+                discovery_callback,
+            )
+        )
+
+    @callback
+    def add_to_platform_abort(self) -> None:
+        """Abort adding an entity to a platform."""
+        clear_discovery_hash(self.hass, self._discovery_hash)
+        super().add_to_platform_abort()
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Stop listening to signal and cleanup discovery data.."""
+        if not self._removed_from_hass:
+            clear_discovery_hash(self.hass, self._discovery_hash)
+            self._removed_from_hass = True
+        await super().async_will_remove_from_hass()
diff --git a/homeassistant/components/tasmota/sensor.py b/homeassistant/components/tasmota/sensor.py
new file mode 100644
index 00000000000..076ca457a23
--- /dev/null
+++ b/homeassistant/components/tasmota/sensor.py
@@ -0,0 +1,185 @@
+"""Support for Tasmota sensors."""
+from typing import Optional
+
+from hatasmota.const import (
+    SENSOR_AMBIENT,
+    SENSOR_APPARENT_POWERUSAGE,
+    SENSOR_BATTERY,
+    SENSOR_CCT,
+    SENSOR_CO2,
+    SENSOR_COLOR_BLUE,
+    SENSOR_COLOR_GREEN,
+    SENSOR_COLOR_RED,
+    SENSOR_CURRENT,
+    SENSOR_DEWPOINT,
+    SENSOR_DISTANCE,
+    SENSOR_ECO2,
+    SENSOR_FREQUENCY,
+    SENSOR_HUMIDITY,
+    SENSOR_ILLUMINANCE,
+    SENSOR_MOISTURE,
+    SENSOR_PB0_3,
+    SENSOR_PB0_5,
+    SENSOR_PB1,
+    SENSOR_PB2_5,
+    SENSOR_PB5,
+    SENSOR_PB10,
+    SENSOR_PM1,
+    SENSOR_PM2_5,
+    SENSOR_PM10,
+    SENSOR_POWERFACTOR,
+    SENSOR_POWERUSAGE,
+    SENSOR_PRESSURE,
+    SENSOR_PRESSUREATSEALEVEL,
+    SENSOR_PROXIMITY,
+    SENSOR_REACTIVE_POWERUSAGE,
+    SENSOR_STATUS_SIGNAL,
+    SENSOR_TEMPERATURE,
+    SENSOR_TODAY,
+    SENSOR_TOTAL,
+    SENSOR_TOTAL_START_TIME,
+    SENSOR_TVOC,
+    SENSOR_VOLTAGE,
+    SENSOR_WEIGHT,
+    SENSOR_YESTERDAY,
+)
+
+from homeassistant.components import sensor
+from homeassistant.const import (
+    DEVICE_CLASS_BATTERY,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_POWER,
+    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_SIGNAL_STRENGTH,
+    DEVICE_CLASS_TEMPERATURE,
+)
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity import Entity
+
+from .const import DATA_REMOVE_DISCOVER_COMPONENT, DOMAIN as TASMOTA_DOMAIN
+from .discovery import TASMOTA_DISCOVERY_ENTITY_NEW
+from .mixins import TasmotaAvailability, TasmotaDiscoveryUpdate
+
+DEVICE_CLASS = "device_class"
+ICON = "icon"
+
+# A Tasmota sensor type may be mapped to either a device class or an icon, not both
+SENSOR_DEVICE_CLASS_ICON_MAP = {
+    SENSOR_AMBIENT: {DEVICE_CLASS: DEVICE_CLASS_ILLUMINANCE},
+    SENSOR_APPARENT_POWERUSAGE: {DEVICE_CLASS: DEVICE_CLASS_POWER},
+    SENSOR_BATTERY: {DEVICE_CLASS: DEVICE_CLASS_BATTERY},
+    SENSOR_CCT: {ICON: "mdi:temperature-kelvin"},
+    SENSOR_CO2: {ICON: "mdi:molecule-co2"},
+    SENSOR_COLOR_BLUE: {ICON: "mdi:palette"},
+    SENSOR_COLOR_GREEN: {ICON: "mdi:palette"},
+    SENSOR_COLOR_RED: {ICON: "mdi:palette"},
+    SENSOR_CURRENT: {ICON: "mdi:alpha-a-circle-outline"},
+    SENSOR_DEWPOINT: {ICON: "mdi:weather-rainy"},
+    SENSOR_DISTANCE: {ICON: "mdi:leak"},
+    SENSOR_ECO2: {ICON: "mdi:molecule-co2"},
+    SENSOR_FREQUENCY: {ICON: "mdi:current-ac"},
+    SENSOR_HUMIDITY: {DEVICE_CLASS: DEVICE_CLASS_HUMIDITY},
+    SENSOR_ILLUMINANCE: {DEVICE_CLASS: DEVICE_CLASS_ILLUMINANCE},
+    SENSOR_MOISTURE: {ICON: "mdi:cup-water"},
+    SENSOR_PB0_3: {ICON: "mdi:flask"},
+    SENSOR_PB0_5: {ICON: "mdi:flask"},
+    SENSOR_PB10: {ICON: "mdi:flask"},
+    SENSOR_PB1: {ICON: "mdi:flask"},
+    SENSOR_PB2_5: {ICON: "mdi:flask"},
+    SENSOR_PB5: {ICON: "mdi:flask"},
+    SENSOR_PM10: {ICON: "mdi:air-filter"},
+    SENSOR_PM1: {ICON: "mdi:air-filter"},
+    SENSOR_PM2_5: {ICON: "mdi:air-filter"},
+    SENSOR_POWERFACTOR: {ICON: "mdi:alpha-f-circle-outline"},
+    SENSOR_POWERUSAGE: {DEVICE_CLASS: DEVICE_CLASS_POWER},
+    SENSOR_PRESSURE: {DEVICE_CLASS: DEVICE_CLASS_PRESSURE},
+    SENSOR_PRESSUREATSEALEVEL: {DEVICE_CLASS: DEVICE_CLASS_PRESSURE},
+    SENSOR_PROXIMITY: {ICON: "mdi:ruler"},
+    SENSOR_REACTIVE_POWERUSAGE: {DEVICE_CLASS: DEVICE_CLASS_POWER},
+    SENSOR_STATUS_SIGNAL: {DEVICE_CLASS: DEVICE_CLASS_SIGNAL_STRENGTH},
+    SENSOR_TEMPERATURE: {DEVICE_CLASS: DEVICE_CLASS_TEMPERATURE},
+    SENSOR_TODAY: {DEVICE_CLASS: DEVICE_CLASS_POWER},
+    SENSOR_TOTAL: {DEVICE_CLASS: DEVICE_CLASS_POWER},
+    SENSOR_TOTAL_START_TIME: {ICON: "mdi:progress-clock"},
+    SENSOR_TVOC: {ICON: "mdi:air-filter"},
+    SENSOR_VOLTAGE: {ICON: "mdi:alpha-v-circle-outline"},
+    SENSOR_WEIGHT: {ICON: "mdi:scale"},
+    SENSOR_YESTERDAY: {DEVICE_CLASS: DEVICE_CLASS_POWER},
+}
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up Tasmota sensor dynamically through discovery."""
+
+    async def async_discover_sensor(tasmota_entity, discovery_hash):
+        """Discover and add a Tasmota sensor."""
+        async_add_entities(
+            [
+                TasmotaSensor(
+                    tasmota_entity=tasmota_entity, discovery_hash=discovery_hash
+                )
+            ]
+        )
+
+    hass.data[
+        DATA_REMOVE_DISCOVER_COMPONENT.format(sensor.DOMAIN)
+    ] = async_dispatcher_connect(
+        hass,
+        TASMOTA_DISCOVERY_ENTITY_NEW.format(sensor.DOMAIN, TASMOTA_DOMAIN),
+        async_discover_sensor,
+    )
+
+
+class TasmotaSensor(TasmotaAvailability, TasmotaDiscoveryUpdate, Entity):
+    """Representation of a Tasmota sensor."""
+
+    def __init__(self, **kwds):
+        """Initialize the Tasmota sensor."""
+        self._state = None
+
+        super().__init__(
+            discovery_update=self.discovery_update,
+            **kwds,
+        )
+
+    @callback
+    def state_updated(self, state, **kwargs):
+        """Handle state updates."""
+        self._state = state
+        self.async_write_ha_state()
+
+    @property
+    def device_class(self) -> Optional[str]:
+        """Return the device class of the sensor."""
+        class_or_icon = SENSOR_DEVICE_CLASS_ICON_MAP.get(
+            self._tasmota_entity.quantity, {}
+        )
+        return class_or_icon.get(DEVICE_CLASS)
+
+    @property
+    def entity_registry_enabled_default(self) -> bool:
+        """Return if the entity should be enabled when first added to the entity registry."""
+        # Hide status sensors to not overwhelm users
+        if self._tasmota_entity.quantity == SENSOR_STATUS_SIGNAL:
+            return False
+        return True
+
+    @property
+    def icon(self):
+        """Return the icon."""
+        class_or_icon = SENSOR_DEVICE_CLASS_ICON_MAP.get(
+            self._tasmota_entity.quantity, {}
+        )
+        return class_or_icon.get(ICON)
+
+    @property
+    def state(self):
+        """Return the state of the entity."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit this state is expressed in."""
+        return self._tasmota_entity.unit
diff --git a/homeassistant/components/tasmota/strings.json b/homeassistant/components/tasmota/strings.json
new file mode 100644
index 00000000000..3d32b54b95d
--- /dev/null
+++ b/homeassistant/components/tasmota/strings.json
@@ -0,0 +1,22 @@
+{
+  "config": {
+    "step": {
+      "confirm": {
+        "description": "Do you want to set up Tasmota?"
+      },
+      "config": {
+        "title": "Tasmota",
+        "description": "Please enter the Tasmota configuration.",
+        "data": {
+          "discovery_prefix": "Discovery topic prefix"
+        }
+      }
+    },
+    "abort": {
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
+    },
+    "error": {
+      "invalid_discovery_topic": "Invalid discovery topic prefix."
+    }
+  }
+}
diff --git a/homeassistant/components/tasmota/switch.py b/homeassistant/components/tasmota/switch.py
new file mode 100644
index 00000000000..0a97a5e2528
--- /dev/null
+++ b/homeassistant/components/tasmota/switch.py
@@ -0,0 +1,63 @@
+"""Support for Tasmota switches."""
+
+from homeassistant.components import switch
+from homeassistant.components.switch import SwitchEntity
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+
+from .const import DATA_REMOVE_DISCOVER_COMPONENT, DOMAIN as TASMOTA_DOMAIN
+from .discovery import TASMOTA_DISCOVERY_ENTITY_NEW
+from .mixins import TasmotaAvailability, TasmotaDiscoveryUpdate
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up Tasmota switch dynamically through discovery."""
+
+    @callback
+    def async_discover(tasmota_entity, discovery_hash):
+        """Discover and add a Tasmota switch."""
+        async_add_entities(
+            [
+                TasmotaSwitch(
+                    tasmota_entity=tasmota_entity, discovery_hash=discovery_hash
+                )
+            ]
+        )
+
+    hass.data[
+        DATA_REMOVE_DISCOVER_COMPONENT.format(switch.DOMAIN)
+    ] = async_dispatcher_connect(
+        hass,
+        TASMOTA_DISCOVERY_ENTITY_NEW.format(switch.DOMAIN, TASMOTA_DOMAIN),
+        async_discover,
+    )
+
+
+class TasmotaSwitch(
+    TasmotaAvailability,
+    TasmotaDiscoveryUpdate,
+    SwitchEntity,
+):
+    """Representation of a Tasmota switch."""
+
+    def __init__(self, **kwds):
+        """Initialize the Tasmota switch."""
+        self._state = False
+
+        super().__init__(
+            discovery_update=self.discovery_update,
+            **kwds,
+        )
+
+    @property
+    def is_on(self):
+        """Return true if device is on."""
+        return self._state
+
+    async def async_turn_on(self, **kwargs):
+        """Turn the device on."""
+        self._tasmota_entity.set_state(True)
+
+    async def async_turn_off(self, **kwargs):
+        """Turn the device off."""
+        self._tasmota_entity.set_state(False)
diff --git a/homeassistant/components/tasmota/translations/ca.json b/homeassistant/components/tasmota/translations/ca.json
new file mode 100644
index 00000000000..0a414bc5cfe
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/ca.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
+        },
+        "error": {
+            "invalid_discovery_topic": "Prefix del topic de descoberta inv\u00e0lid."
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "Prefix del topic de descoberta (discovery)"
+                },
+                "description": "Introdureix la configuraci\u00f3 de Tasmota.",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "Vols configurar Tasmota?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/cs.json b/homeassistant/components/tasmota/translations/cs.json
new file mode 100644
index 00000000000..4fb0d555c63
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/cs.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "config": {
+                "description": "Pros\u00edm zajdete nastaven\u00ed pro Tasmota.",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "Chcete nastavit Tasmota?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/en.json b/homeassistant/components/tasmota/translations/en.json
new file mode 100644
index 00000000000..ddd7e726079
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/en.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
+        },
+        "error": {
+            "invalid_discovery_topic": "Invalid discovery topic prefix."
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "Discovery topic prefix"
+                },
+                "description": "Please enter the Tasmota configuration.",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "Do you want to set up Tasmota?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/es.json b/homeassistant/components/tasmota/translations/es.json
new file mode 100644
index 00000000000..f5a5532f180
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/es.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
+        },
+        "error": {
+            "invalid_discovery_topic": "Prefijo del tema para descubrimiento no v\u00e1lido."
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "Prefijo del tema para descubrimiento"
+                },
+                "description": "Introduce la configuraci\u00f3n de Tasmota.",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "\u00bfQuieres configurar Tasmota?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/et.json b/homeassistant/components/tasmota/translations/et.json
new file mode 100644
index 00000000000..e689dcf7e43
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "invalid_discovery_topic": "Sobimatu tuvastusteema eesliide."
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "Tuvastusteema eesliide"
+                },
+                "description": "Sisesta Tasmota konfiguratsioon.",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "Kas soovid seadistada Tasmota sidumist?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/it.json b/homeassistant/components/tasmota/translations/it.json
new file mode 100644
index 00000000000..9d1f143ebad
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/it.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
+        },
+        "error": {
+            "invalid_discovery_topic": "Prefisso dell'argomento di individuazione non valido."
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "Prefisso dell'argomento di individuazione"
+                },
+                "description": "Inserire la configurazione Tasmota.",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "Vuoi configurare Tasmota?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/lb.json b/homeassistant/components/tasmota/translations/lb.json
new file mode 100644
index 00000000000..ee93b28f922
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/lb.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "error": {
+            "invalid_discovery_topic": "Ong\u00ebltege discovery topic prefix."
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "Discovery topic prefix"
+                },
+                "description": "F\u00ebll Tasmota Konfiguratioun aus.",
+                "title": "Tasmota"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/nl.json b/homeassistant/components/tasmota/translations/nl.json
new file mode 100644
index 00000000000..3b0cc5c1ca8
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/nl.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Is al geconfigureerd. Er is maar een configuratie mogelijk"
+        },
+        "step": {
+            "config": {
+                "description": "Vul de Tasmota gegevens in",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "Wil je Tasmota instellen?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/no.json b/homeassistant/components/tasmota/translations/no.json
new file mode 100644
index 00000000000..3c68c280086
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/no.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
+        },
+        "error": {
+            "invalid_discovery_topic": "Ugyldig prefiks for oppdagelsesemne"
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "Prefiks for oppdagelsesemne"
+                },
+                "description": "Vennligst skriv inn Tasmota-konfigurasjonen.",
+                "title": ""
+            },
+            "confirm": {
+                "description": "Vil du sette opp Tasmota?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/pl.json b/homeassistant/components/tasmota/translations/pl.json
new file mode 100644
index 00000000000..398b3c50fd4
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/pl.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
+        },
+        "error": {
+            "invalid_discovery_topic": "Nieprawid\u0142owy prefiks tematu wykrywania"
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "Prefiks tematu wykrywania"
+                },
+                "description": "Wprowad\u017a konfiguracj\u0119 dla Tasmota.",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "Czy chcesz skonfigurowa\u0107 Tasmota?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/ru.json b/homeassistant/components/tasmota/translations/ru.json
new file mode 100644
index 00000000000..3f4b8996f2f
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/ru.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
+        },
+        "error": {
+            "invalid_discovery_topic": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u0442\u043e\u043f\u0438\u043a\u0430 \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0438\u044f."
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "\u041f\u0440\u0435\u0444\u0438\u043a\u0441 \u0442\u043e\u043f\u0438\u043a\u0430 \u0430\u0432\u0442\u043e\u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0438\u044f"
+                },
+                "description": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435 Home Assistant \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438 \u0441 Tasmota.",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Tasmota?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tasmota/translations/zh-Hant.json b/homeassistant/components/tasmota/translations/zh-Hant.json
new file mode 100644
index 00000000000..1431fc8e1b7
--- /dev/null
+++ b/homeassistant/components/tasmota/translations/zh-Hant.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
+        },
+        "error": {
+            "invalid_discovery_topic": "\u63a2\u7d22\u4e3b\u984c prefix \u7121\u6548\u3002"
+        },
+        "step": {
+            "config": {
+                "data": {
+                    "discovery_prefix": "\u63a2\u7d22\u4e3b\u984c prefix"
+                },
+                "description": "\u8acb\u8f38\u5165 Tasmota \u8a2d\u5b9a\u3002",
+                "title": "Tasmota"
+            },
+            "confirm": {
+                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Tasmota\uff1f"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tautulli/sensor.py b/homeassistant/components/tautulli/sensor.py
index 3c61559bcfa..ed96bb62ace 100644
--- a/homeassistant/components/tautulli/sensor.py
+++ b/homeassistant/components/tautulli/sensor.py
@@ -1,6 +1,5 @@
 """A platform which allows you to get information from Tautulli."""
 from datetime import timedelta
-import logging
 
 from pytautulli import Tautulli
 import voluptuous as vol
@@ -22,8 +21,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_MONITORED_USERS = "monitored_users"
 
 DEFAULT_NAME = "Tautulli"
diff --git a/homeassistant/components/tcp/binary_sensor.py b/homeassistant/components/tcp/binary_sensor.py
index 1648ab5e247..5437cef02de 100644
--- a/homeassistant/components/tcp/binary_sensor.py
+++ b/homeassistant/components/tcp/binary_sensor.py
@@ -1,12 +1,8 @@
 """Provides a binary sensor which gets its values from a TCP socket."""
-import logging
-
 from homeassistant.components.binary_sensor import BinarySensorEntity
 
 from .sensor import CONF_VALUE_ON, PLATFORM_SCHEMA, TcpSensor
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({})
 
 
diff --git a/homeassistant/components/tcp/sensor.py b/homeassistant/components/tcp/sensor.py
index 9eee857fd83..868cd9b8557 100644
--- a/homeassistant/components/tcp/sensor.py
+++ b/homeassistant/components/tcp/sensor.py
@@ -136,7 +136,9 @@ class TcpSensor(Entity):
 
         if self._config[CONF_VALUE_TEMPLATE] is not None:
             try:
-                self._state = self._config[CONF_VALUE_TEMPLATE].render(value=value)
+                self._state = self._config[CONF_VALUE_TEMPLATE].render(
+                    parse_result=False, value=value
+                )
                 return
             except TemplateError:
                 _LOGGER.error(
diff --git a/homeassistant/components/telegram_bot/__init__.py b/homeassistant/components/telegram_bot/__init__.py
index cb22487ba63..60e33414b1e 100644
--- a/homeassistant/components/telegram_bot/__init__.py
+++ b/homeassistant/components/telegram_bot/__init__.py
@@ -329,7 +329,9 @@ async def async_setup(hass, config):
                 else:
                     attribute_templ.hass = hass
                     try:
-                        data[attribute] = attribute_templ.async_render()
+                        data[attribute] = attribute_templ.async_render(
+                            parse_result=False
+                        )
                     except TemplateError as exc:
                         _LOGGER.error(
                             "TemplateError in %s: %s -> %s",
@@ -354,26 +356,32 @@ async def async_setup(hass, config):
         _LOGGER.debug("New telegram message %s: %s", msgtype, kwargs)
 
         if msgtype == SERVICE_SEND_MESSAGE:
-            await hass.async_add_job(partial(notify_service.send_message, **kwargs))
+            await hass.async_add_executor_job(
+                partial(notify_service.send_message, **kwargs)
+            )
         elif msgtype in [
             SERVICE_SEND_PHOTO,
             SERVICE_SEND_STICKER,
             SERVICE_SEND_VIDEO,
             SERVICE_SEND_DOCUMENT,
         ]:
-            await hass.async_add_job(
+            await hass.async_add_executor_job(
                 partial(notify_service.send_file, msgtype, **kwargs)
             )
         elif msgtype == SERVICE_SEND_LOCATION:
-            await hass.async_add_job(partial(notify_service.send_location, **kwargs))
+            await hass.async_add_executor_job(
+                partial(notify_service.send_location, **kwargs)
+            )
         elif msgtype == SERVICE_ANSWER_CALLBACK_QUERY:
-            await hass.async_add_job(
+            await hass.async_add_executor_job(
                 partial(notify_service.answer_callback_query, **kwargs)
             )
         elif msgtype == SERVICE_DELETE_MESSAGE:
-            await hass.async_add_job(partial(notify_service.delete_message, **kwargs))
+            await hass.async_add_executor_job(
+                partial(notify_service.delete_message, **kwargs)
+            )
         else:
-            await hass.async_add_job(
+            await hass.async_add_executor_job(
                 partial(notify_service.edit_message, msgtype, **kwargs)
             )
 
diff --git a/homeassistant/components/telegram_bot/broadcast.py b/homeassistant/components/telegram_bot/broadcast.py
index 2330c9b4097..dd0d4cd1f31 100644
--- a/homeassistant/components/telegram_bot/broadcast.py
+++ b/homeassistant/components/telegram_bot/broadcast.py
@@ -10,7 +10,7 @@ async def async_setup_platform(hass, config):
     """Set up the Telegram broadcast platform."""
     bot = initialize_bot(config)
 
-    bot_config = await hass.async_add_job(bot.getMe)
+    bot_config = await hass.async_add_executor_job(bot.getMe)
     _LOGGER.debug(
         "Telegram broadcast platform setup with bot %s", bot_config["username"]
     )
diff --git a/homeassistant/components/telegram_bot/services.yaml b/homeassistant/components/telegram_bot/services.yaml
index 8e42b25c0ca..a87bfdf3af6 100644
--- a/homeassistant/components/telegram_bot/services.yaml
+++ b/homeassistant/components/telegram_bot/services.yaml
@@ -202,7 +202,7 @@ send_location:
       example: '["/button1, /button2", "/button3"] or [[["Text button1", "/button1"], ["Text button2", "/button2"]], [["Text button3", "/button3"]]]'
 
 edit_message:
-  description: Edit a previusly sent message.
+  description: Edit a previously sent message.
   fields:
     message_id:
       description: id of the message to edit.
@@ -227,7 +227,7 @@ edit_message:
       example: '["/button1, /button2", "/button3"] or [[["Text button1", "/button1"], ["Text button2", "/button2"]], [["Text button3", "/button3"]]]'
 
 edit_caption:
-  description: Edit the caption of a previusly sent message.
+  description: Edit the caption of a previously sent message.
   fields:
     message_id:
       description: id of the message to edit.
@@ -243,7 +243,7 @@ edit_caption:
       example: '["/button1, /button2", "/button3"] or [[["Text button1", "/button1"], ["Text button2", "/button2"]], [["Text button3", "/button3"]]]'
 
 edit_replymarkup:
-  description: Edit the inline keyboard of a previusly sent message.
+  description: Edit the inline keyboard of a previously sent message.
   fields:
     message_id:
       description: id of the message to edit.
diff --git a/homeassistant/components/telegram_bot/webhooks.py b/homeassistant/components/telegram_bot/webhooks.py
index 4d5f41066e2..f772e2411e5 100644
--- a/homeassistant/components/telegram_bot/webhooks.py
+++ b/homeassistant/components/telegram_bot/webhooks.py
@@ -32,7 +32,7 @@ async def async_setup_platform(hass, config):
 
     bot = initialize_bot(config)
 
-    current_status = await hass.async_add_job(bot.getWebhookInfo)
+    current_status = await hass.async_add_executor_job(bot.getWebhookInfo)
     base_url = config.get(
         CONF_URL, get_url(hass, require_ssl=True, allow_internal=False)
     )
@@ -64,7 +64,7 @@ async def async_setup_platform(hass, config):
                 _LOGGER.warning("Timeout trying to set webhook (retry #%d)", retry_num)
 
     if current_status and current_status["url"] != handler_url:
-        result = await hass.async_add_job(_try_to_set_webhook)
+        result = await hass.async_add_executor_job(_try_to_set_webhook)
         if result:
             _LOGGER.info("Set new telegram webhook %s", handler_url)
         else:
diff --git a/homeassistant/components/tellduslive/binary_sensor.py b/homeassistant/components/tellduslive/binary_sensor.py
index 3f829365689..45a49e2c1fb 100644
--- a/homeassistant/components/tellduslive/binary_sensor.py
+++ b/homeassistant/components/tellduslive/binary_sensor.py
@@ -1,14 +1,10 @@
 """Support for binary sensors using Tellstick Net."""
-import logging
-
 from homeassistant.components import binary_sensor, tellduslive
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .entry import TelldusLiveEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up tellduslive sensors dynamically."""
diff --git a/homeassistant/components/tellduslive/config_flow.py b/homeassistant/components/tellduslive/config_flow.py
index 36bc89d115a..ae8a9d1a690 100644
--- a/homeassistant/components/tellduslive/config_flow.py
+++ b/homeassistant/components/tellduslive/config_flow.py
@@ -91,7 +91,7 @@ class FlowHandler(config_entries.ConfigFlow):
                         KEY_SESSION: session,
                     },
                 )
-            errors["base"] = "auth_error"
+            errors["base"] = "invalid_auth"
 
         try:
             with async_timeout.timeout(10):
diff --git a/homeassistant/components/tellduslive/cover.py b/homeassistant/components/tellduslive/cover.py
index 246b22dc157..735219d7a8c 100644
--- a/homeassistant/components/tellduslive/cover.py
+++ b/homeassistant/components/tellduslive/cover.py
@@ -1,14 +1,10 @@
 """Support for Tellstick covers using Tellstick Net."""
-import logging
-
 from homeassistant.components import cover, tellduslive
 from homeassistant.components.cover import CoverEntity
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .entry import TelldusLiveEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up tellduslive sensors dynamically."""
diff --git a/homeassistant/components/tellduslive/sensor.py b/homeassistant/components/tellduslive/sensor.py
index e322481813a..3ced0217ea9 100644
--- a/homeassistant/components/tellduslive/sensor.py
+++ b/homeassistant/components/tellduslive/sensor.py
@@ -1,6 +1,4 @@
 """Support for Tellstick Net/Telstick Live sensors."""
-import logging
-
 from homeassistant.components import sensor, tellduslive
 from homeassistant.const import (
     DEVICE_CLASS_HUMIDITY,
@@ -19,8 +17,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .entry import TelldusLiveEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSOR_TYPE_TEMPERATURE = "temp"
 SENSOR_TYPE_HUMIDITY = "humidity"
 SENSOR_TYPE_RAINRATE = "rrate"
diff --git a/homeassistant/components/tellduslive/strings.json b/homeassistant/components/tellduslive/strings.json
index aabf00bc1b2..8d1c2c1acaf 100644
--- a/homeassistant/components/tellduslive/strings.json
+++ b/homeassistant/components/tellduslive/strings.json
@@ -1,13 +1,13 @@
 {
   "config": {
     "abort": {
-      "already_configured": "TelldusLive is already configured",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
       "authorize_url_fail": "Unknown error generating an authorize url.",
-      "authorize_url_timeout": "Timeout generating authorize url.",
-      "unknown": "Unknown error occurred"
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "error": {
-      "auth_error": "Authentication error, please try again"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "step": {
       "auth": {
diff --git a/homeassistant/components/tellduslive/switch.py b/homeassistant/components/tellduslive/switch.py
index 05a3c166213..9dd8ca93927 100644
--- a/homeassistant/components/tellduslive/switch.py
+++ b/homeassistant/components/tellduslive/switch.py
@@ -1,14 +1,10 @@
 """Support for Tellstick switches using Tellstick Net."""
-import logging
-
 from homeassistant.components import switch, tellduslive
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import ToggleEntity
 
 from .entry import TelldusLiveEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up tellduslive sensors dynamically."""
diff --git a/homeassistant/components/tellduslive/translations/ca.json b/homeassistant/components/tellduslive/translations/ca.json
index 4326269131e..ab5707f1e71 100644
--- a/homeassistant/components/tellduslive/translations/ca.json
+++ b/homeassistant/components/tellduslive/translations/ca.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "TelldusLive ja est\u00e0 configurat",
+            "already_configured": "El servei ja est\u00e0 configurat",
             "authorize_url_fail": "S'ha produ\u00eft un error desconegut al generar l'URL d'autoritzaci\u00f3.",
-            "authorize_url_timeout": "S'ha acabat el temps d'espera durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
-            "unknown": "S'ha produ\u00eft un error desconegut"
+            "authorize_url_timeout": "Temps d'espera esgotat durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
+            "unknown": "Error inesperat"
         },
         "error": {
-            "auth_error": "Error d'autenticaci\u00f3, torna-ho a provar"
+            "auth_error": "Error d'autenticaci\u00f3, torna-ho a provar",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/tellduslive/translations/cs.json b/homeassistant/components/tellduslive/translations/cs.json
index 63813e9c856..efe9a588b3f 100644
--- a/homeassistant/components/tellduslive/translations/cs.json
+++ b/homeassistant/components/tellduslive/translations/cs.json
@@ -1,13 +1,24 @@
 {
     "config": {
         "abort": {
-            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el"
+            "already_configured": "Slu\u017eba je ji\u017e nastavena",
+            "authorize_url_fail": "Nezn\u00e1m\u00e1 chyba p\u0159i generov\u00e1n\u00ed autoriza\u010dn\u00ed URL adresy.",
+            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "error": {
+            "auth_error": "Chyba ov\u011b\u0159en\u00ed, zkuste to pros\u00edm znovu",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
         },
         "step": {
+            "auth": {
+                "title": "Ov\u011b\u0159it pomoc\u00ed TelldusLive"
+            },
             "user": {
                 "data": {
                     "host": "Hostitel"
-                }
+                },
+                "title": "Vyberte koncov\u00fd bod."
             }
         }
     }
diff --git a/homeassistant/components/tellduslive/translations/en.json b/homeassistant/components/tellduslive/translations/en.json
index ef509f0ac43..4eab9dc1e42 100644
--- a/homeassistant/components/tellduslive/translations/en.json
+++ b/homeassistant/components/tellduslive/translations/en.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "TelldusLive is already configured",
+            "already_configured": "Service is already configured",
             "authorize_url_fail": "Unknown error generating an authorize url.",
-            "authorize_url_timeout": "Timeout generating authorize url.",
-            "unknown": "Unknown error occurred"
+            "authorize_url_timeout": "Timeout generating authorize URL.",
+            "unknown": "Unexpected error"
         },
         "error": {
-            "auth_error": "Authentication error, please try again"
+            "auth_error": "Authentication error, please try again",
+            "invalid_auth": "Invalid authentication"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/tellduslive/translations/es.json b/homeassistant/components/tellduslive/translations/es.json
index 3fcc57050fe..0cb63f197fd 100644
--- a/homeassistant/components/tellduslive/translations/es.json
+++ b/homeassistant/components/tellduslive/translations/es.json
@@ -7,7 +7,8 @@
             "unknown": "Se produjo un error desconocido"
         },
         "error": {
-            "auth_error": "Error de autenticaci\u00f3n, por favor int\u00e9ntalo de nuevo"
+            "auth_error": "Error de autenticaci\u00f3n, por favor int\u00e9ntalo de nuevo",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/tellduslive/translations/et.json b/homeassistant/components/tellduslive/translations/et.json
new file mode 100644
index 00000000000..37afc808337
--- /dev/null
+++ b/homeassistant/components/tellduslive/translations/et.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba seadistatud",
+            "authorize_url_fail": "Tundmatu viga tuvastamise URL-i loomisel.",
+            "unknown": "Tundmatu viga"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/translations/it.json b/homeassistant/components/tellduslive/translations/it.json
index c4afb96170e..7b7a5ab3ce4 100644
--- a/homeassistant/components/tellduslive/translations/it.json
+++ b/homeassistant/components/tellduslive/translations/it.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "TelldusLive \u00e8 gi\u00e0 configurato",
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato",
             "authorize_url_fail": "Errore sconosciuto nel generare l'url di autorizzazione",
-            "authorize_url_timeout": "Tempo scaduto nel generare l'url di autorizzazione",
-            "unknown": "Si \u00e8 verificato un errore sconosciuto."
+            "authorize_url_timeout": "Tempo scaduto nel generare l'URL di autorizzazione.",
+            "unknown": "Errore imprevisto"
         },
         "error": {
-            "auth_error": "Errore di autenticazione, riprovare"
+            "auth_error": "Errore di autenticazione, riprovare",
+            "invalid_auth": "Autenticazione non valida"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/tellduslive/translations/no.json b/homeassistant/components/tellduslive/translations/no.json
index 232db7a0fad..29593f5ccc2 100644
--- a/homeassistant/components/tellduslive/translations/no.json
+++ b/homeassistant/components/tellduslive/translations/no.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "TelldusLive er allerede konfigurert",
+            "already_configured": "Tjenesten er allerede konfigurert",
             "authorize_url_fail": "Ukjent feil ved oppretting av godkjenningsadresse.",
-            "authorize_url_timeout": "Tidsavbrudd ved oppretting av godkjenningsadresse.",
-            "unknown": "Ukjent feil oppstod"
+            "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
+            "unknown": "Uventet feil"
         },
         "error": {
-            "auth_error": "Godkjenningsfeil, vennligst pr\u00f8v igjen"
+            "auth_error": "Godkjenningsfeil, vennligst pr\u00f8v igjen",
+            "invalid_auth": "Ugyldig godkjenning"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/tellduslive/translations/pl.json b/homeassistant/components/tellduslive/translations/pl.json
index 13054967365..1fec2ac3350 100644
--- a/homeassistant/components/tellduslive/translations/pl.json
+++ b/homeassistant/components/tellduslive/translations/pl.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "TelldusLive jest ju\u017c skonfigurowany",
-            "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania url autoryzacji.",
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana",
+            "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania url autoryzacji",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "error": {
-            "auth_error": "B\u0142\u0105d uwierzytelniania, spr\u00f3buj ponownie"
+            "auth_error": "B\u0142\u0105d uwierzytelniania, spr\u00f3buj ponownie",
+            "invalid_auth": "Niepoprawne uwierzytelnienie"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/tellduslive/translations/ru.json b/homeassistant/components/tellduslive/translations/ru.json
index c1d052930a1..1113ca73887 100644
--- a/homeassistant/components/tellduslive/translations/ru.json
+++ b/homeassistant/components/tellduslive/translations/ru.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "authorize_url_fail": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
             "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
-            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "error": {
-            "auth_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443."
+            "auth_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/tellduslive/translations/zh-Hant.json b/homeassistant/components/tellduslive/translations/zh-Hant.json
index de64974b2de..f392958748b 100644
--- a/homeassistant/components/tellduslive/translations/zh-Hant.json
+++ b/homeassistant/components/tellduslive/translations/zh-Hant.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "already_configured": "TelldusLive \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "authorize_url_fail": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u767c\u751f\u672a\u77e5\u932f\u8aa4",
-            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642",
-            "unknown": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002"
+            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "error": {
-            "auth_error": "\u8a8d\u8b49\u932f\u8aa4\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002"
+            "auth_error": "\u8a8d\u8b49\u932f\u8aa4\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/template/__init__.py b/homeassistant/components/template/__init__.py
index a0f3a6a4a65..079569a9324 100644
--- a/homeassistant/components/template/__init__.py
+++ b/homeassistant/components/template/__init__.py
@@ -1,14 +1,9 @@
 """The template component."""
-
-import logging
-
 from homeassistant.const import SERVICE_RELOAD
 from homeassistant.helpers.reload import async_reload_integration_platforms
 
 from .const import DOMAIN, EVENT_TEMPLATE_RELOADED, PLATFORMS
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_reload_service(hass):
     """Create the reload service for the template domain."""
diff --git a/homeassistant/components/template/alarm_control_panel.py b/homeassistant/components/template/alarm_control_panel.py
index e37c7e2982e..ccefab767be 100644
--- a/homeassistant/components/template/alarm_control_panel.py
+++ b/homeassistant/components/template/alarm_control_panel.py
@@ -22,6 +22,7 @@ from homeassistant.const import (
     STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_ARMED_HOME,
     STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
     STATE_ALARM_DISARMED,
     STATE_ALARM_PENDING,
     STATE_ALARM_TRIGGERED,
@@ -42,6 +43,7 @@ _VALID_STATES = [
     STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_ARMED_HOME,
     STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
     STATE_ALARM_DISARMED,
     STATE_ALARM_PENDING,
     STATE_ALARM_TRIGGERED,
diff --git a/homeassistant/components/template/binary_sensor.py b/homeassistant/components/template/binary_sensor.py
index 2e50448c037..0fd3205f20c 100644
--- a/homeassistant/components/template/binary_sensor.py
+++ b/homeassistant/components/template/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for exposing a templated binary sensor."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
@@ -30,8 +28,6 @@ from homeassistant.helpers.template import result_as_boolean
 from .const import CONF_AVAILABILITY_TEMPLATE, DOMAIN, PLATFORMS
 from .template_entity import TemplateEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_DELAY_ON = "delay_on"
 CONF_DELAY_OFF = "delay_off"
 CONF_ATTRIBUTE_TEMPLATES = "attribute_templates"
diff --git a/homeassistant/components/template/cover.py b/homeassistant/components/template/cover.py
index fe8b6568c1e..93ffd2fd988 100644
--- a/homeassistant/components/template/cover.py
+++ b/homeassistant/components/template/cover.py
@@ -258,7 +258,8 @@ class CoverTemplate(TemplateEntity, CoverEntity):
             self._position = None
             return
 
-        state = result.lower()
+        state = str(result).lower()
+
         if state in _VALID_STATES:
             if state in ("true", STATE_OPEN):
                 self._position = 100
diff --git a/homeassistant/components/template/fan.py b/homeassistant/components/template/fan.py
index 4f75faa36ff..fa67f60dac0 100644
--- a/homeassistant/components/template/fan.py
+++ b/homeassistant/components/template/fan.py
@@ -367,6 +367,8 @@ class TemplateFan(TemplateEntity, FanEntity):
     @callback
     def _update_speed(self, speed):
         # Validate speed
+        speed = str(speed)
+
         if speed in self._speed_list:
             self._speed = speed
         elif speed in [STATE_UNAVAILABLE, STATE_UNKNOWN]:
diff --git a/homeassistant/components/template/light.py b/homeassistant/components/template/light.py
index 2b79846986c..42493136b48 100644
--- a/homeassistant/components/template/light.py
+++ b/homeassistant/components/template/light.py
@@ -412,16 +412,21 @@ class LightTemplate(TemplateEntity, LightEntity):
                 self._available = True
             return
 
-        state = result.lower()
+        if isinstance(result, bool):
+            self._state = result
+            return
+
+        state = str(result).lower()
         if state in _VALID_STATES:
             self._state = state in ("true", STATE_ON)
-        else:
-            _LOGGER.error(
-                "Received invalid light is_on state: %s. Expected: %s",
-                state,
-                ", ".join(_VALID_STATES),
-            )
-            self._state = None
+            return
+
+        _LOGGER.error(
+            "Received invalid light is_on state: %s. Expected: %s",
+            state,
+            ", ".join(_VALID_STATES),
+        )
+        self._state = None
 
     @callback
     def _update_temperature(self, render):
@@ -451,12 +456,17 @@ class LightTemplate(TemplateEntity, LightEntity):
     @callback
     def _update_color(self, render):
         """Update the hs_color from the template."""
-        if render in ("None", ""):
-            self._color = None
-            return
-        h_str, s_str = map(
-            float, render.replace("(", "").replace(")", "").split(",", 1)
-        )
+        h_str = s_str = None
+        if isinstance(render, str):
+            if render in ("None", ""):
+                self._color = None
+                return
+            h_str, s_str = map(
+                float, render.replace("(", "").replace(")", "").split(",", 1)
+            )
+        elif isinstance(render, (list, tuple)) and len(render) == 2:
+            h_str, s_str = render
+
         if (
             h_str is not None
             and s_str is not None
diff --git a/homeassistant/components/template/lock.py b/homeassistant/components/template/lock.py
index b917430a6ff..2cd8bc00266 100644
--- a/homeassistant/components/template/lock.py
+++ b/homeassistant/components/template/lock.py
@@ -1,6 +1,4 @@
 """Support for locks which integrates with other components."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.lock import PLATFORM_SCHEMA, LockEntity
@@ -21,8 +19,6 @@ from homeassistant.helpers.script import Script
 from .const import CONF_AVAILABILITY_TEMPLATE, DOMAIN, PLATFORMS
 from .template_entity import TemplateEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_LOCK = "lock"
 CONF_UNLOCK = "unlock"
 
@@ -120,7 +116,16 @@ class TemplateLock(TemplateEntity, LockEntity):
         if isinstance(result, TemplateError):
             self._state = None
             return
-        self._state = result.lower() in ("true", STATE_ON, STATE_LOCKED)
+
+        if isinstance(result, bool):
+            self._state = result
+            return
+
+        if isinstance(result, str):
+            self._state = result.lower() in ("true", STATE_ON, STATE_LOCKED)
+            return
+
+        self._state = False
 
     async def async_added_to_hass(self):
         """Register callbacks."""
diff --git a/homeassistant/components/template/sensor.py b/homeassistant/components/template/sensor.py
index 754b3da27ac..aea14884812 100644
--- a/homeassistant/components/template/sensor.py
+++ b/homeassistant/components/template/sensor.py
@@ -1,5 +1,4 @@
 """Allows the creation of a sensor that breaks out state_attributes."""
-import logging
 from typing import Optional
 
 import voluptuous as vol
@@ -32,8 +31,6 @@ from .template_entity import TemplateEntity
 
 CONF_ATTRIBUTE_TEMPLATES = "attribute_templates"
 
-_LOGGER = logging.getLogger(__name__)
-
 SENSOR_SCHEMA = vol.All(
     cv.deprecated(ATTR_ENTITY_ID),
     vol.Schema(
diff --git a/homeassistant/components/template/switch.py b/homeassistant/components/template/switch.py
index fc7b2408f21..511338b5aa1 100644
--- a/homeassistant/components/template/switch.py
+++ b/homeassistant/components/template/switch.py
@@ -1,5 +1,4 @@
 """Support for switches which integrates with other components."""
-import logging
 
 import voluptuous as vol
 
@@ -30,7 +29,6 @@ from homeassistant.helpers.script import Script
 from .const import CONF_AVAILABILITY_TEMPLATE, DOMAIN, PLATFORMS
 from .template_entity import TemplateEntity
 
-_LOGGER = logging.getLogger(__name__)
 _VALID_STATES = [STATE_ON, STATE_OFF, "true", "false"]
 
 ON_ACTION = "turn_on"
@@ -136,7 +134,16 @@ class SwitchTemplate(TemplateEntity, SwitchEntity, RestoreEntity):
         if isinstance(result, TemplateError):
             self._state = None
             return
-        self._state = result.lower() in ("true", STATE_ON)
+
+        if isinstance(result, bool):
+            self._state = result
+            return
+
+        if isinstance(result, str):
+            self._state = result.lower() in ("true", STATE_ON)
+            return
+
+        self._state = False
 
     async def async_added_to_hass(self):
         """Register callbacks."""
diff --git a/homeassistant/components/template/trigger.py b/homeassistant/components/template/trigger.py
index 5dcee0a7347..5d748edb841 100644
--- a/homeassistant/components/template/trigger.py
+++ b/homeassistant/components/template/trigger.py
@@ -5,7 +5,7 @@ import voluptuous as vol
 
 from homeassistant import exceptions
 from homeassistant.const import CONF_FOR, CONF_PLATFORM, CONF_VALUE_TEMPLATE
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 from homeassistant.helpers import config_validation as cv, template
 from homeassistant.helpers.event import (
     TrackTemplate,
@@ -36,6 +36,7 @@ async def async_attach_trigger(
     time_delta = config.get(CONF_FOR)
     template.attach(hass, time_delta)
     delay_cancel = None
+    job = HassJob(action)
 
     @callback
     def template_listener(event, updates):
@@ -58,8 +59,8 @@ async def async_attach_trigger(
         @callback
         def call_action(*_):
             """Call action with right context."""
-            hass.async_run_job(
-                action,
+            hass.async_run_hass_job(
+                job,
                 {
                     "trigger": {
                         "platform": "template",
diff --git a/homeassistant/components/tesla/__init__.py b/homeassistant/components/tesla/__init__.py
index a04c5975881..51090d34271 100644
--- a/homeassistant/components/tesla/__init__.py
+++ b/homeassistant/components/tesla/__init__.py
@@ -282,7 +282,7 @@ class TeslaDevice(CoordinatorEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the device."""
-        attr = self._attributes.copy()
+        attr = self._attributes
         if self.tesla_device.has_battery():
             attr[ATTR_BATTERY_LEVEL] = self.tesla_device.battery_level()
             attr[ATTR_BATTERY_CHARGING] = self.tesla_device.battery_charging()
@@ -310,4 +310,5 @@ class TeslaDevice(CoordinatorEntity):
         This assumes the coordinator has updated the controller.
         """
         self.tesla_device.refresh()
+        self._attributes = self.tesla_device.attrs.copy()
         self.async_write_ha_state()
diff --git a/homeassistant/components/tesla/binary_sensor.py b/homeassistant/components/tesla/binary_sensor.py
index 3c3777afc1f..77315ef1e3c 100644
--- a/homeassistant/components/tesla/binary_sensor.py
+++ b/homeassistant/components/tesla/binary_sensor.py
@@ -1,12 +1,9 @@
 """Support for Tesla binary sensor."""
-import logging
 
 from homeassistant.components.binary_sensor import DEVICE_CLASSES, BinarySensorEntity
 
 from . import DOMAIN as TESLA_DOMAIN, TeslaDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Tesla binary_sensors by config_entry."""
diff --git a/homeassistant/components/tesla/config_flow.py b/homeassistant/components/tesla/config_flow.py
index f21c8c76e23..debe896c9cf 100644
--- a/homeassistant/components/tesla/config_flow.py
+++ b/homeassistant/components/tesla/config_flow.py
@@ -62,7 +62,7 @@ class TeslaConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             return self.async_show_form(
                 step_id="user",
                 data_schema=DATA_SCHEMA,
-                errors={CONF_USERNAME: "identifier_exists"},
+                errors={CONF_USERNAME: "already_configured"},
                 description_placeholders={},
             )
 
@@ -72,14 +72,14 @@ class TeslaConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             return self.async_show_form(
                 step_id="user",
                 data_schema=DATA_SCHEMA,
-                errors={"base": "connection_error"},
+                errors={"base": "cannot_connect"},
                 description_placeholders={},
             )
         except InvalidAuth:
             return self.async_show_form(
                 step_id="user",
                 data_schema=DATA_SCHEMA,
-                errors={"base": "invalid_credentials"},
+                errors={"base": "invalid_auth"},
                 description_placeholders={},
             )
         return self.async_create_entry(title=user_input[CONF_USERNAME], data=info)
diff --git a/homeassistant/components/tesla/device_tracker.py b/homeassistant/components/tesla/device_tracker.py
index 46265a96ae4..cac89d58d3a 100644
--- a/homeassistant/components/tesla/device_tracker.py
+++ b/homeassistant/components/tesla/device_tracker.py
@@ -1,5 +1,4 @@
 """Support for tracking Tesla cars."""
-import logging
 from typing import Optional
 
 from homeassistant.components.device_tracker import SOURCE_TYPE_GPS
@@ -7,8 +6,6 @@ from homeassistant.components.device_tracker.config_entry import TrackerEntity
 
 from . import DOMAIN as TESLA_DOMAIN, TeslaDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Tesla binary_sensors by config_entry."""
diff --git a/homeassistant/components/tesla/sensor.py b/homeassistant/components/tesla/sensor.py
index 50be1edc87d..3b66845c786 100644
--- a/homeassistant/components/tesla/sensor.py
+++ b/homeassistant/components/tesla/sensor.py
@@ -1,5 +1,4 @@
 """Support for the Tesla sensors."""
-import logging
 from typing import Optional
 
 from homeassistant.components.sensor import DEVICE_CLASSES
@@ -14,8 +13,6 @@ from homeassistant.util.distance import convert
 
 from . import DOMAIN as TESLA_DOMAIN, TeslaDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Tesla binary_sensors by config_entry."""
diff --git a/homeassistant/components/tesla/strings.json b/homeassistant/components/tesla/strings.json
index fb3c11a276f..503124eedd4 100644
--- a/homeassistant/components/tesla/strings.json
+++ b/homeassistant/components/tesla/strings.json
@@ -1,10 +1,9 @@
 {
   "config": {
     "error": {
-      "connection_error": "Error connecting; check network and retry",
-      "identifier_exists": "Email already registered",
-      "invalid_credentials": "Invalid credentials",
-      "unknown_error": "Unknown error, please report log info"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "step": {
       "user": {
@@ -27,4 +26,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/tesla/switch.py b/homeassistant/components/tesla/switch.py
index cb57c1e3d5c..9fcdbae0c1c 100644
--- a/homeassistant/components/tesla/switch.py
+++ b/homeassistant/components/tesla/switch.py
@@ -2,7 +2,6 @@
 import logging
 
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.const import STATE_ON
 
 from . import DOMAIN as TESLA_DOMAIN, TeslaDevice
 
@@ -42,7 +41,7 @@ class ChargerSwitch(TeslaDevice, SwitchEntity):
         """Get whether the switch is in on state."""
         if self.tesla_device.is_charging() is None:
             return None
-        return self.tesla_device.is_charging() == STATE_ON
+        return self.tesla_device.is_charging()
 
 
 class RangeSwitch(TeslaDevice, SwitchEntity):
diff --git a/homeassistant/components/tesla/translations/ca.json b/homeassistant/components/tesla/translations/ca.json
index 35169f70245..0d39ebc2639 100644
--- a/homeassistant/components/tesla/translations/ca.json
+++ b/homeassistant/components/tesla/translations/ca.json
@@ -1,8 +1,12 @@
 {
     "config": {
         "error": {
+            "already_configured": "El compte ja ha estat configurat",
+            "already_configured_account": "El compte ja ha estat configurat",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "Error de connexi\u00f3; comprova la xarxa i torna-ho a intentar",
             "identifier_exists": "Correu electr\u00f2nic ja registrat",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Credencials inv\u00e0lides",
             "unknown_error": "Error desconegut, si us plau, envia la informaci\u00f3 del registre"
         },
diff --git a/homeassistant/components/tesla/translations/cs.json b/homeassistant/components/tesla/translations/cs.json
index e20e44aec6e..7c7e34c201b 100644
--- a/homeassistant/components/tesla/translations/cs.json
+++ b/homeassistant/components/tesla/translations/cs.json
@@ -1,10 +1,31 @@
 {
     "config": {
+        "error": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "already_configured_account": "\u00da\u010det je ji\u017e nastaven",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "Chyba p\u0159ipojen\u00ed; zkontrolujte s\u00ed\u0165 a zkuste to znovu",
+            "identifier_exists": "E-mail je ji\u017e zaregistrov\u00e1n",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_credentials": "Neplatn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje",
+            "unknown_error": "Nezn\u00e1m\u00e1 chyba, nahlaste pros\u00edm informace z logu"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "E-mail"
+                },
+                "description": "Zadejte sv\u00e9 \u00fadaje.",
+                "title": "Tesla - Nastaven\u00ed"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Po\u010det sekund mezi sledov\u00e1n\u00edm"
                 }
             }
         }
diff --git a/homeassistant/components/tesla/translations/en.json b/homeassistant/components/tesla/translations/en.json
index 762a7f01d0e..80d5591b0a1 100644
--- a/homeassistant/components/tesla/translations/en.json
+++ b/homeassistant/components/tesla/translations/en.json
@@ -1,8 +1,12 @@
 {
     "config": {
         "error": {
+            "already_configured": "Account is already configured",
+            "already_configured_account": "Account is already configured",
+            "cannot_connect": "Failed to connect",
             "connection_error": "Error connecting; check network and retry",
             "identifier_exists": "Email already registered",
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid credentials",
             "unknown_error": "Unknown error, please report log info"
         },
diff --git a/homeassistant/components/tesla/translations/es.json b/homeassistant/components/tesla/translations/es.json
index 8bb659d377f..074f570ea00 100644
--- a/homeassistant/components/tesla/translations/es.json
+++ b/homeassistant/components/tesla/translations/es.json
@@ -1,8 +1,12 @@
 {
     "config": {
         "error": {
+            "already_configured": "La cuenta ya ha sido configurada",
+            "already_configured_account": "La cuenta ya ha sido configurada",
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "Error de conexi\u00f3n; comprueba la red y vuelve a intentarlo",
             "identifier_exists": "Correo electr\u00f3nico ya registrado",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_credentials": "Credenciales no v\u00e1lidas",
             "unknown_error": "Error desconocido, por favor reporte la informaci\u00f3n de registro"
         },
diff --git a/homeassistant/components/tesla/translations/et.json b/homeassistant/components/tesla/translations/et.json
new file mode 100644
index 00000000000..31cc796f310
--- /dev/null
+++ b/homeassistant/components/tesla/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "error": {
+            "already_configured": "Konto on juba h\u00e4\u00e4lestatud",
+            "already_configured_account": "Kasutaja on juba lisatud",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga",
+            "unknown_error": "Tundmatu viga, palun lisa logid"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tesla/translations/it.json b/homeassistant/components/tesla/translations/it.json
index 0c4ae68fe0f..5a14b01cc88 100644
--- a/homeassistant/components/tesla/translations/it.json
+++ b/homeassistant/components/tesla/translations/it.json
@@ -1,8 +1,12 @@
 {
     "config": {
         "error": {
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato",
+            "already_configured_account": "L'account \u00e8 gi\u00e0 configurato",
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Errore durante la connessione; controllare la rete e riprovare",
             "identifier_exists": "E-mail gi\u00e0 registrata",
+            "invalid_auth": "Autenticazione non valida",
             "invalid_credentials": "Credenziali non valide",
             "unknown_error": "Errore sconosciuto, si prega di segnalare le informazioni del registro"
         },
diff --git a/homeassistant/components/tesla/translations/lb.json b/homeassistant/components/tesla/translations/lb.json
index b23a02bbcf4..09943e7a14e 100644
--- a/homeassistant/components/tesla/translations/lb.json
+++ b/homeassistant/components/tesla/translations/lb.json
@@ -1,8 +1,10 @@
 {
     "config": {
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbannen, Iwwerpr\u00e9ift Netzwierk a prob\u00e9iert nach emol",
             "identifier_exists": "E-Mail ass scho registr\u00e9iert",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_credentials": "Ong\u00eblteg Login Informatioune",
             "unknown_error": "Onbekannte Feeler, mellt w.e.g. Logbuch Info"
         },
diff --git a/homeassistant/components/tesla/translations/nl.json b/homeassistant/components/tesla/translations/nl.json
index 27df1acae2a..86f9318f18b 100644
--- a/homeassistant/components/tesla/translations/nl.json
+++ b/homeassistant/components/tesla/translations/nl.json
@@ -1,6 +1,9 @@
 {
     "config": {
         "error": {
+            "already_configured": "Account is al geconfigureerd",
+            "already_configured_account": "Account is al geconfigureerd",
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Fout bij verbinden; controleer het netwerk en probeer het opnieuw",
             "identifier_exists": "E-mail al geregistreerd",
             "invalid_credentials": "Ongeldige inloggegevens",
diff --git a/homeassistant/components/tesla/translations/no.json b/homeassistant/components/tesla/translations/no.json
index a2ca81bf693..761aa6d6a10 100644
--- a/homeassistant/components/tesla/translations/no.json
+++ b/homeassistant/components/tesla/translations/no.json
@@ -1,8 +1,12 @@
 {
     "config": {
         "error": {
+            "already_configured": "Kontoen er allerede konfigurert",
+            "already_configured_account": "Kontoen er allerede konfigurert",
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Feil ved tilkobling; sjekk nettverket og pr\u00f8v p\u00e5 nytt",
             "identifier_exists": "E-post er allerede registrert",
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldig legitimasjon",
             "unknown_error": "Ukjent feil, Vennligst rapporter informasjon fra Loggen"
         },
@@ -10,7 +14,7 @@
             "user": {
                 "data": {
                     "password": "Passord",
-                    "username": "E-postadresse"
+                    "username": "E-post"
                 },
                 "description": "Vennligst fyll inn din informasjonen.",
                 "title": "Tesla - Konfigurasjon"
diff --git a/homeassistant/components/tesla/translations/pl.json b/homeassistant/components/tesla/translations/pl.json
index e2a6b6a09c8..795b2917ef8 100644
--- a/homeassistant/components/tesla/translations/pl.json
+++ b/homeassistant/components/tesla/translations/pl.json
@@ -1,8 +1,12 @@
 {
     "config": {
         "error": {
+            "already_configured": "Konto jest ju\u017c skonfigurowane",
+            "already_configured_account": "Konto jest ju\u017c skonfigurowane",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_error": "B\u0142\u0105d po\u0142\u0105czenia; sprawd\u017a sie\u0107 i spr\u00f3buj ponownie",
-            "identifier_exists": "Adres e-mail jest ju\u017c zarejestrowany.",
+            "identifier_exists": "Adres e-mail jest ju\u017c zarejestrowany",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_credentials": "Nieprawid\u0142owe po\u015bwiadczenia",
             "unknown_error": "Nieznany b\u0142\u0105d, prosz\u0119 zg\u0142osi\u0107 dane z loga"
         },
@@ -13,7 +17,7 @@
                     "username": "Adres e-mail"
                 },
                 "description": "Wprowad\u017a dane",
-                "title": "Tesla - konfiguracja"
+                "title": "Tesla \u2014 konfiguracja"
             }
         }
     },
diff --git a/homeassistant/components/tesla/translations/ru.json b/homeassistant/components/tesla/translations/ru.json
index dae30a669b3..10a1239279c 100644
--- a/homeassistant/components/tesla/translations/ru.json
+++ b/homeassistant/components/tesla/translations/ru.json
@@ -1,8 +1,12 @@
 {
     "config": {
         "error": {
+            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
+            "already_configured_account": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0441\u0435\u0442\u044c \u0438 \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443.",
             "identifier_exists": "\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0430.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.",
             "unknown_error": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/tesla/translations/zh-Hant.json b/homeassistant/components/tesla/translations/zh-Hant.json
index 2668c29084c..83f73f85274 100644
--- a/homeassistant/components/tesla/translations/zh-Hant.json
+++ b/homeassistant/components/tesla/translations/zh-Hant.json
@@ -1,8 +1,12 @@
 {
     "config": {
         "error": {
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured_account": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "\u9023\u7dda\u932f\u8aa4\uff1b\u8acb\u6aa2\u5bdf\u7db2\u8def\u5f8c\u518d\u8a66\u4e00\u6b21",
             "identifier_exists": "\u90f5\u4ef6\u5df2\u8a3b\u518a",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u6191\u8b49\u7121\u6548",
             "unknown_error": "\u672a\u77e5\u932f\u8aa4\uff0c\u8acb\u56de\u5831\u7d00\u9304"
         },
diff --git a/homeassistant/components/thethingsnetwork/__init__.py b/homeassistant/components/thethingsnetwork/__init__.py
index 65626a381ec..c31b4dc7bcd 100644
--- a/homeassistant/components/thethingsnetwork/__init__.py
+++ b/homeassistant/components/thethingsnetwork/__init__.py
@@ -1,12 +1,9 @@
 """Support for The Things network."""
-import logging
 
 import voluptuous as vol
 
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_ACCESS_KEY = "access_key"
 CONF_APP_ID = "app_id"
 
diff --git a/homeassistant/components/thinkingcleaner/sensor.py b/homeassistant/components/thinkingcleaner/sensor.py
index ec8d6a5ef2b..966930f1eb1 100644
--- a/homeassistant/components/thinkingcleaner/sensor.py
+++ b/homeassistant/components/thinkingcleaner/sensor.py
@@ -1,6 +1,5 @@
 """Support for ThinkingCleaner sensors."""
 from datetime import timedelta
-import logging
 
 from pythinkingcleaner import Discovery, ThinkingCleaner
 import voluptuous as vol
@@ -11,8 +10,6 @@ from homeassistant.const import CONF_HOST, PERCENTAGE
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
 MIN_TIME_BETWEEN_FORCED_SCANS = timedelta(milliseconds=100)
 
diff --git a/homeassistant/components/thinkingcleaner/switch.py b/homeassistant/components/thinkingcleaner/switch.py
index 6ef1a6f9556..6a1d20f9509 100644
--- a/homeassistant/components/thinkingcleaner/switch.py
+++ b/homeassistant/components/thinkingcleaner/switch.py
@@ -1,6 +1,5 @@
 """Support for ThinkingCleaner switches."""
 from datetime import timedelta
-import logging
 import time
 
 from pythinkingcleaner import Discovery, ThinkingCleaner
@@ -12,8 +11,6 @@ from homeassistant.const import CONF_HOST, STATE_OFF, STATE_ON
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import ToggleEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
 MIN_TIME_BETWEEN_FORCED_SCANS = timedelta(milliseconds=100)
 
diff --git a/homeassistant/components/tibber/config_flow.py b/homeassistant/components/tibber/config_flow.py
index 2e09ea22777..8dce1e66a5a 100644
--- a/homeassistant/components/tibber/config_flow.py
+++ b/homeassistant/components/tibber/config_flow.py
@@ -1,6 +1,5 @@
 """Adds config flow for Tibber integration."""
 import asyncio
-import logging
 
 import aiohttp
 import tibber
@@ -12,8 +11,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN  # pylint:disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 DATA_SCHEMA = vol.Schema({vol.Required(CONF_ACCESS_TOKEN): str})
 
 
@@ -48,7 +45,7 @@ class TibberConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             except asyncio.TimeoutError:
                 errors[CONF_ACCESS_TOKEN] = "timeout"
             except aiohttp.ClientError:
-                errors[CONF_ACCESS_TOKEN] = "connection_error"
+                errors[CONF_ACCESS_TOKEN] = "cannot_connect"
             except tibber.InvalidLogin:
                 errors[CONF_ACCESS_TOKEN] = "invalid_access_token"
 
diff --git a/homeassistant/components/tibber/manifest.json b/homeassistant/components/tibber/manifest.json
index 74f61f17d29..3ea64be07bd 100644
--- a/homeassistant/components/tibber/manifest.json
+++ b/homeassistant/components/tibber/manifest.json
@@ -2,7 +2,7 @@
   "domain": "tibber",
   "name": "Tibber",
   "documentation": "https://www.home-assistant.io/integrations/tibber",
-  "requirements": ["pyTibber==0.15.3"],
+  "requirements": ["pyTibber==0.15.7"],
   "codeowners": ["@danielhiversen"],
   "quality_scale": "silver",
   "config_flow": true
diff --git a/homeassistant/components/tibber/sensor.py b/homeassistant/components/tibber/sensor.py
index d2ddd645907..1fb291bad5e 100644
--- a/homeassistant/components/tibber/sensor.py
+++ b/homeassistant/components/tibber/sensor.py
@@ -2,9 +2,11 @@
 import asyncio
 from datetime import timedelta
 import logging
+from random import randrange
 
 import aiohttp
 
+from homeassistant.components.sensor import DEVICE_CLASS_POWER
 from homeassistant.const import POWER_WATT
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.entity import Entity
@@ -15,7 +17,6 @@ from .const import DOMAIN as TIBBER_DOMAIN, MANUFACTURER
 _LOGGER = logging.getLogger(__name__)
 
 ICON = "mdi:currency-usd"
-ICON_RT = "mdi:power-plug"
 SCAN_INTERVAL = timedelta(minutes=1)
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=5)
 PARALLEL_UPDATES = 0
@@ -59,6 +60,7 @@ class TibberSensor(Entity):
             self._name = tibber_home.info["viewer"]["home"]["address"].get(
                 "address1", ""
             )
+        self._spread_load_constant = randrange(3600)
 
     @property
     def device_state_attributes(self):
@@ -110,7 +112,8 @@ class TibberSensorElPrice(TibberSensor):
 
         if (
             not self._tibber_home.last_data_timestamp
-            or (self._tibber_home.last_data_timestamp - now).total_seconds() / 3600 < 12
+            or (self._tibber_home.last_data_timestamp - now).total_seconds()
+            < 5 * 3600 + self._spread_load_constant
             or not self._is_available
         ):
             _LOGGER.debug("Asking for new data")
@@ -156,6 +159,7 @@ class TibberSensorElPrice(TibberSensor):
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     async def _fetch_data(self):
+        _LOGGER.debug("Fetching data")
         try:
             await self._tibber_home.update_info_and_price_info()
         except (asyncio.TimeoutError, aiohttp.ClientError):
@@ -217,11 +221,6 @@ class TibberSensorRT(TibberSensor):
         """Return the polling state."""
         return False
 
-    @property
-    def icon(self):
-        """Return the icon to use in the frontend."""
-        return ICON_RT
-
     @property
     def unit_of_measurement(self):
         """Return the unit of measurement of this entity."""
@@ -231,3 +230,8 @@ class TibberSensorRT(TibberSensor):
     def unique_id(self):
         """Return a unique ID."""
         return f"{self.device_id}_rt_consumption"
+
+    @property
+    def device_class(self):
+        """Return the device class of the sensor."""
+        return DEVICE_CLASS_POWER
diff --git a/homeassistant/components/tibber/strings.json b/homeassistant/components/tibber/strings.json
index cb5cc08552a..bf679705b9f 100644
--- a/homeassistant/components/tibber/strings.json
+++ b/homeassistant/components/tibber/strings.json
@@ -2,11 +2,11 @@
   "title": "Tibber",
   "config": {
     "abort": {
-      "already_configured": "A Tibber account is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
     },
     "error": {
       "timeout": "Timeout connecting to Tibber",
-      "connection_error": "Error connecting to Tibber",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_access_token": "[%key:common::config_flow::error::invalid_access_token%]"
     },
     "step": {
@@ -19,4 +19,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/tibber/translations/ca.json b/homeassistant/components/tibber/translations/ca.json
index 0b17cbb3524..22f156ab7a1 100644
--- a/homeassistant/components/tibber/translations/ca.json
+++ b/homeassistant/components/tibber/translations/ca.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ja hi ha un compte Tibber configurat."
+            "already_configured": "El servei ja est\u00e0 configurat"
         },
         "error": {
-            "connection_error": "S'ha produ\u00eft un error en connectar-se a Tibber",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "connection_error": "Ha fallat la connexi\u00f3",
             "invalid_access_token": "[%key::common::config_flow::error::invalid_access_token%]",
             "timeout": "S'ha acabat el temps d'espera durant la connexi\u00f3 a Tibber"
         },
diff --git a/homeassistant/components/tibber/translations/cs.json b/homeassistant/components/tibber/translations/cs.json
index d21dc20e8a1..5b2cc898c88 100644
--- a/homeassistant/components/tibber/translations/cs.json
+++ b/homeassistant/components/tibber/translations/cs.json
@@ -1,14 +1,22 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena"
+        },
         "error": {
-            "invalid_access_token": "Neplatn\u00fd p\u0159\u00edstupov\u00fd token"
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_access_token": "Neplatn\u00fd p\u0159\u00edstupov\u00fd token",
+            "timeout": "\u010casov\u00fd limit p\u0159i p\u0159ipojen\u00ed k Tibber"
         },
         "step": {
             "user": {
                 "data": {
                     "access_token": "P\u0159\u00edstupov\u00fd token"
-                }
+                },
+                "title": "Tibber"
             }
         }
-    }
+    },
+    "title": "Tibber"
 }
\ No newline at end of file
diff --git a/homeassistant/components/tibber/translations/en.json b/homeassistant/components/tibber/translations/en.json
index 658ce004943..3a851ca1283 100644
--- a/homeassistant/components/tibber/translations/en.json
+++ b/homeassistant/components/tibber/translations/en.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "A Tibber account is already configured."
+            "already_configured": "Service is already configured"
         },
         "error": {
-            "connection_error": "Error connecting to Tibber",
+            "cannot_connect": "Failed to connect",
+            "connection_error": "Failed to connect",
             "invalid_access_token": "Invalid access token",
             "timeout": "Timeout connecting to Tibber"
         },
diff --git a/homeassistant/components/tibber/translations/es.json b/homeassistant/components/tibber/translations/es.json
index 31d8bc1a0ae..bc5e416102b 100644
--- a/homeassistant/components/tibber/translations/es.json
+++ b/homeassistant/components/tibber/translations/es.json
@@ -4,6 +4,7 @@
             "already_configured": "Una cuenta de Tibber ya est\u00e1 configurada."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "Error de conexi\u00f3n con Tibber",
             "invalid_access_token": "Token de acceso inv\u00e1lido",
             "timeout": "Tiempo de espera para conectarse a Tibber"
diff --git a/homeassistant/components/tibber/translations/et.json b/homeassistant/components/tibber/translations/et.json
new file mode 100644
index 00000000000..94dd4c36e73
--- /dev/null
+++ b/homeassistant/components/tibber/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Teenus on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendus nurjus",
+            "connection_error": "\u00dchendamine nurjus",
+            "invalid_access_token": "Vigane juurdep\u00e4\u00e4sut\u00f5end"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "access_token": "Juurdep\u00e4\u00e4sut\u00f5end"
+                },
+                "title": ""
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/tibber/translations/it.json b/homeassistant/components/tibber/translations/it.json
index 3a5548360cf..1281dd2c5a8 100644
--- a/homeassistant/components/tibber/translations/it.json
+++ b/homeassistant/components/tibber/translations/it.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Un account Tibber \u00e8 gi\u00e0 configurato."
+            "already_configured": "Il servizio \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "connection_error": "Errore durante la connessione a Tibber",
+            "cannot_connect": "Impossibile connettersi",
+            "connection_error": "Impossibile connettersi",
             "invalid_access_token": "Token di accesso non valido",
             "timeout": "Tempo scaduto per la connessione a Tibber"
         },
diff --git a/homeassistant/components/tibber/translations/no.json b/homeassistant/components/tibber/translations/no.json
index 34e078f5467..9eca1edc74c 100644
--- a/homeassistant/components/tibber/translations/no.json
+++ b/homeassistant/components/tibber/translations/no.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "En Tibber-konto er allerede konfigurert."
+            "already_configured": "Tjenesten er allerede konfigurert"
         },
         "error": {
-            "connection_error": "Feil ved tilkobling til Tibber",
+            "cannot_connect": "Tilkobling mislyktes",
+            "connection_error": "Tilkobling mislyktes",
             "invalid_access_token": "Ugyldig tilgangstoken",
             "timeout": "Tidsavbrudd for tilkobling til Tibber"
         },
diff --git a/homeassistant/components/tibber/translations/pl.json b/homeassistant/components/tibber/translations/pl.json
index d69572b4a42..53e498c8e97 100644
--- a/homeassistant/components/tibber/translations/pl.json
+++ b/homeassistant/components/tibber/translations/pl.json
@@ -1,12 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Konto jest ju\u017c skonfigurowane"
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
-            "connection_error": "B\u0142\u0105d po\u0142\u0105czenia z Tibber.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_access_token": "Niepoprawny token dost\u0119pu",
-            "timeout": "Przekroczono limit czasu \u0142\u0105czenia z Tibber."
+            "timeout": "Przekroczono limit czasu \u0142\u0105czenia z Tibber"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/tibber/translations/ru.json b/homeassistant/components/tibber/translations/ru.json
index 715fcf1179a..a301312e11f 100644
--- a/homeassistant/components/tibber/translations/ru.json
+++ b/homeassistant/components/tibber/translations/ru.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
+            "already_configured": "\u042d\u0442\u0430 \u0441\u043b\u0443\u0436\u0431\u0430 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
-            "connection_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_access_token": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0442\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430.",
             "timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f."
         },
diff --git a/homeassistant/components/tibber/translations/zh-Hans.json b/homeassistant/components/tibber/translations/zh-Hans.json
new file mode 100644
index 00000000000..2941dfd9383
--- /dev/null
+++ b/homeassistant/components/tibber/translations/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tibber/translations/zh-Hant.json b/homeassistant/components/tibber/translations/zh-Hant.json
index 0521ff79266..3ca7557215e 100644
--- a/homeassistant/components/tibber/translations/zh-Hant.json
+++ b/homeassistant/components/tibber/translations/zh-Hant.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Tibber \u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u670d\u52d9\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "connection_error": "\u9023\u7dda\u81f3 Tibber \u932f\u8aa4",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "connection_error": "\u9023\u7dda\u5931\u6557",
             "invalid_access_token": "\u5b58\u53d6\u5bc6\u9470\u7121\u6548",
             "timeout": "\u9023\u7dda\u81f3 Tibber \u903e\u6642"
         },
diff --git a/homeassistant/components/tile/config_flow.py b/homeassistant/components/tile/config_flow.py
index 15ac70eeb2c..87f58193e9d 100644
--- a/homeassistant/components/tile/config_flow.py
+++ b/homeassistant/components/tile/config_flow.py
@@ -47,6 +47,6 @@ class TileFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                 user_input[CONF_USERNAME], user_input[CONF_PASSWORD], session=session
             )
         except TileError:
-            return await self._show_form({"base": "invalid_credentials"})
+            return await self._show_form({"base": "invalid_auth"})
 
         return self.async_create_entry(title=user_input[CONF_USERNAME], data=user_input)
diff --git a/homeassistant/components/tile/strings.json b/homeassistant/components/tile/strings.json
index 8a1ee9660d9..cdddbe54f96 100644
--- a/homeassistant/components/tile/strings.json
+++ b/homeassistant/components/tile/strings.json
@@ -10,10 +10,10 @@
       }
     },
     "error": {
-      "invalid_credentials": "Invalid Tile credentials provided."
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "abort": {
-      "already_configured": "This Tile account is already registered."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
   },
   "options": {
diff --git a/homeassistant/components/tile/translations/ca.json b/homeassistant/components/tile/translations/ca.json
index 5b9c954e249..70428873940 100644
--- a/homeassistant/components/tile/translations/ca.json
+++ b/homeassistant/components/tile/translations/ca.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest compte de Tile ja est\u00e0 registrat."
+            "already_configured": "El compte ja ha estat configurat"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_credentials": "Credencials de Tile inv\u00e0lides."
         },
         "step": {
diff --git a/homeassistant/components/tile/translations/cs.json b/homeassistant/components/tile/translations/cs.json
index e20e44aec6e..ee1ea2ada66 100644
--- a/homeassistant/components/tile/translations/cs.json
+++ b/homeassistant/components/tile/translations/cs.json
@@ -1,11 +1,25 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "E-mail"
-                }
+                },
+                "title": "Nastavit Tile"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "title": "Nastavte Tile"
             }
         }
     }
diff --git a/homeassistant/components/tile/translations/en.json b/homeassistant/components/tile/translations/en.json
index 67985383979..ebbd12fc66a 100644
--- a/homeassistant/components/tile/translations/en.json
+++ b/homeassistant/components/tile/translations/en.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This Tile account is already registered."
+            "already_configured": "Account is already configured"
         },
         "error": {
+            "invalid_auth": "Invalid authentication",
             "invalid_credentials": "Invalid Tile credentials provided."
         },
         "step": {
diff --git a/homeassistant/components/tile/translations/es.json b/homeassistant/components/tile/translations/es.json
index d9433d87ad1..b3de73afaf1 100644
--- a/homeassistant/components/tile/translations/es.json
+++ b/homeassistant/components/tile/translations/es.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Esta cuenta de Tile ya est\u00e1 registrada."
+            "already_configured": "La cuenta ya ha sido configurada"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_credentials": "Credenciales de Tile no v\u00e1lidas"
         },
         "step": {
diff --git a/homeassistant/components/tile/translations/et.json b/homeassistant/components/tile/translations/et.json
new file mode 100644
index 00000000000..6fda8553827
--- /dev/null
+++ b/homeassistant/components/tile/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "E-post"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tile/translations/it.json b/homeassistant/components/tile/translations/it.json
index 10017a9baee..660985d9688 100644
--- a/homeassistant/components/tile/translations/it.json
+++ b/homeassistant/components/tile/translations/it.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo account Tile \u00e8 gi\u00e0 registrato."
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato"
         },
         "error": {
+            "invalid_auth": "Autenticazione non valida",
             "invalid_credentials": "Fornite credenziali di Tile non valide."
         },
         "step": {
diff --git a/homeassistant/components/tile/translations/lb.json b/homeassistant/components/tile/translations/lb.json
index 464b437b000..ab2159256a4 100644
--- a/homeassistant/components/tile/translations/lb.json
+++ b/homeassistant/components/tile/translations/lb.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "D\u00ebse Tile Kont ass scho registr\u00e9iert."
+            "already_configured": "Kont ass scho registr\u00e9iert."
         },
         "error": {
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_credentials": "Ong\u00eblteg Tile Login Informatioune uginn."
         },
         "step": {
diff --git a/homeassistant/components/tile/translations/no.json b/homeassistant/components/tile/translations/no.json
index ccd8c0fc176..c8cb1f9c4f2 100644
--- a/homeassistant/components/tile/translations/no.json
+++ b/homeassistant/components/tile/translations/no.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne Tile kontoen er allerede registrert."
+            "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_credentials": "Ugyldige Tile registreringsinformasjon gitt."
         },
         "step": {
diff --git a/homeassistant/components/tile/translations/pl.json b/homeassistant/components/tile/translations/pl.json
index 09fbdc93241..3c50630ec25 100644
--- a/homeassistant/components/tile/translations/pl.json
+++ b/homeassistant/components/tile/translations/pl.json
@@ -1,11 +1,29 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Konto jest ju\u017c skonfigurowane"
+        },
+        "error": {
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "invalid_credentials": "Nieprawid\u0142owe dane logowania Tile"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Has\u0142o",
                     "username": "Adres e-mail"
-                }
+                },
+                "title": "Konfiguracja Tile"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "show_inactive": "Poka\u017c nieaktywne urz\u0105dzenia Tile"
+                },
+                "title": "Konfiguracja urz\u0105dzenia Tile"
             }
         }
     }
diff --git a/homeassistant/components/tile/translations/ru.json b/homeassistant/components/tile/translations/ru.json
index f7019567bc9..c02a17b1646 100644
--- a/homeassistant/components/tile/translations/ru.json
+++ b/homeassistant/components/tile/translations/ru.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0430."
+            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435."
         },
         "step": {
diff --git a/homeassistant/components/tile/translations/zh-Hans.json b/homeassistant/components/tile/translations/zh-Hans.json
new file mode 100644
index 00000000000..6a9d4aa28c5
--- /dev/null
+++ b/homeassistant/components/tile/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u90ae\u7bb1"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tile/translations/zh-Hant.json b/homeassistant/components/tile/translations/zh-Hant.json
index 41a9553e5f8..8e1e51c5682 100644
--- a/homeassistant/components/tile/translations/zh-Hant.json
+++ b/homeassistant/components/tile/translations/zh-Hant.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Tile \u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_credentials": "\u6240\u63d0\u4f9b\u7684 Tile \u6191\u8b49\u7121\u6548\u3002"
         },
         "step": {
diff --git a/homeassistant/components/timer/translations/cs.json b/homeassistant/components/timer/translations/cs.json
index bd6f2fd5374..a70730598f1 100644
--- a/homeassistant/components/timer/translations/cs.json
+++ b/homeassistant/components/timer/translations/cs.json
@@ -1,9 +1,9 @@
 {
     "state": {
         "_": {
-            "active": "aktivn\u00ed",
-            "idle": "ne\u010dinn\u00e9",
-            "paused": "pozastaveno"
+            "active": "Aktivn\u00ed",
+            "idle": "Ne\u010dinn\u00fd",
+            "paused": "Pozastaveno"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/todoist/calendar.py b/homeassistant/components/todoist/calendar.py
index 548cac6da92..f81a4a7249a 100644
--- a/homeassistant/components/todoist/calendar.py
+++ b/homeassistant/components/todoist/calendar.py
@@ -262,14 +262,13 @@ class TodoistProjectDevice(CalendarEventDevice):
             # No tasks, we don't REALLY need to show anything.
             return None
 
-        attributes = {}
-        attributes[DUE_TODAY] = self.data.event[DUE_TODAY]
-        attributes[OVERDUE] = self.data.event[OVERDUE]
-        attributes[ALL_TASKS] = self._cal_data[ALL_TASKS]
-        attributes[PRIORITY] = self.data.event[PRIORITY]
-        attributes[LABELS] = self.data.event[LABELS]
-
-        return attributes
+        return {
+            DUE_TODAY: self.data.event[DUE_TODAY],
+            OVERDUE: self.data.event[OVERDUE],
+            ALL_TASKS: self._cal_data[ALL_TASKS],
+            PRIORITY: self.data.event[PRIORITY],
+            LABELS: self.data.event[LABELS],
+        }
 
 
 class TodoistProjectData:
diff --git a/homeassistant/components/tof/sensor.py b/homeassistant/components/tof/sensor.py
index d9ad178cab2..17b2d1010bf 100644
--- a/homeassistant/components/tof/sensor.py
+++ b/homeassistant/components/tof/sensor.py
@@ -2,7 +2,6 @@
 
 import asyncio
 from functools import partial
-import logging
 
 from VL53L1X2 import VL53L1X  # pylint: disable=import-error
 import voluptuous as vol
@@ -13,8 +12,6 @@ from homeassistant.const import CONF_NAME, LENGTH_MILLIMETERS
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_I2C_ADDRESS = "i2c_address"
 CONF_I2C_BUS = "i2c_bus"
 CONF_XSHUT = "xshut"
diff --git a/homeassistant/components/toon/__init__.py b/homeassistant/components/toon/__init__.py
index e2171f02290..d1753ad4d02 100644
--- a/homeassistant/components/toon/__init__.py
+++ b/homeassistant/components/toon/__init__.py
@@ -1,6 +1,5 @@
 """Support for Toon van Eneco devices."""
 import asyncio
-import logging
 
 import voluptuous as vol
 
@@ -35,8 +34,6 @@ ENTITY_COMPONENTS = {
     SWITCH_DOMAIN,
 }
 
-_LOGGER = logging.getLogger(__name__)
-
 # Validation of the user's configuration
 CONFIG_SCHEMA = vol.Schema(
     {
diff --git a/homeassistant/components/toon/binary_sensor.py b/homeassistant/components/toon/binary_sensor.py
index 135b25dddff..fe14435f2ab 100644
--- a/homeassistant/components/toon/binary_sensor.py
+++ b/homeassistant/components/toon/binary_sensor.py
@@ -1,5 +1,4 @@
 """Support for Toon binary sensors."""
-import logging
 from typing import Optional
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
@@ -25,8 +24,6 @@ from .models import (
     ToonEntity,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/toon/climate.py b/homeassistant/components/toon/climate.py
index 06f64262d2b..ba3ef8ee807 100644
--- a/homeassistant/components/toon/climate.py
+++ b/homeassistant/components/toon/climate.py
@@ -1,5 +1,4 @@
 """Support for Toon thermostat."""
-import logging
 from typing import Any, Dict, List, Optional
 
 from toonapi import (
@@ -29,8 +28,6 @@ from .const import DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP, DOMAIN
 from .helpers import toon_exception_handler
 from .models import ToonDisplayDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/toon/models.py b/homeassistant/components/toon/models.py
index 4047ac0d744..edcbed369a3 100644
--- a/homeassistant/components/toon/models.py
+++ b/homeassistant/components/toon/models.py
@@ -1,5 +1,4 @@
 """DataUpdate Coordinator, and base Entity and Device models for Toon."""
-import logging
 from typing import Any, Dict, Optional
 
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -7,8 +6,6 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from .const import DOMAIN
 from .coordinator import ToonDataUpdateCoordinator
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class ToonEntity(CoordinatorEntity):
     """Defines a base Toon entity."""
diff --git a/homeassistant/components/toon/oauth2.py b/homeassistant/components/toon/oauth2.py
index feeb44b656a..2622e0a9027 100644
--- a/homeassistant/components/toon/oauth2.py
+++ b/homeassistant/components/toon/oauth2.py
@@ -1,5 +1,4 @@
 """OAuth2 implementations for Toon."""
-import logging
 from typing import Any, Optional, cast
 
 from homeassistant.core import HomeAssistant
@@ -8,8 +7,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from . import config_flow
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def register_oauth2_implementations(
     hass: HomeAssistant, client_id: str, client_secret: str
diff --git a/homeassistant/components/toon/sensor.py b/homeassistant/components/toon/sensor.py
index e686ff28211..52d3a68f2c1 100644
--- a/homeassistant/components/toon/sensor.py
+++ b/homeassistant/components/toon/sensor.py
@@ -1,5 +1,4 @@
 """Support for Toon sensors."""
-import logging
 from typing import Optional
 
 from homeassistant.config_entries import ConfigEntry
@@ -27,8 +26,6 @@ from .models import (
     ToonWaterMeterDeviceEntity,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/toon/switch.py b/homeassistant/components/toon/switch.py
index 22bdd6b100e..d529dd07075 100644
--- a/homeassistant/components/toon/switch.py
+++ b/homeassistant/components/toon/switch.py
@@ -1,5 +1,4 @@
 """Support for Toon switches."""
-import logging
 from typing import Any
 
 from toonapi import (
@@ -27,8 +26,6 @@ from .coordinator import ToonDataUpdateCoordinator
 from .helpers import toon_exception_handler
 from .models import ToonDisplayDeviceEntity, ToonEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
diff --git a/homeassistant/components/toon/translations/ca.json b/homeassistant/components/toon/translations/ca.json
index 89c8c242516..7fc0aef9ec6 100644
--- a/homeassistant/components/toon/translations/ca.json
+++ b/homeassistant/components/toon/translations/ca.json
@@ -3,7 +3,7 @@
         "abort": {
             "already_configured": "L'acord seleccionat ja est\u00e0 configurat.",
             "authorize_url_fail": "S'ha produ\u00eft un error desconegut al generar l'URL d'autoritzaci\u00f3.",
-            "authorize_url_timeout": "Temps d'espera durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3 esgotat.",
+            "authorize_url_timeout": "Temps d'espera esgotat durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
             "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
             "no_agreements": "Aquest compte no t\u00e9 pantalles Toon.",
             "no_url_available": "No hi ha cap URL disponible. Per a m\u00e9s informaci\u00f3 sobre aquest error, [consulta la secci\u00f3 d'ajuda]({docs_url})"
diff --git a/homeassistant/components/toon/translations/cs.json b/homeassistant/components/toon/translations/cs.json
index e514edf63aa..3039fa9f061 100644
--- a/homeassistant/components/toon/translations/cs.json
+++ b/homeassistant/components/toon/translations/cs.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
-            "missing_configuration": "Komponenta nen\u00ed nakonfigurov\u00e1na. Postupujte podle dokumentace."
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "no_url_available": "Nen\u00ed k dispozici \u017e\u00e1dn\u00e1 adresa URL. Informace o t\u00e9to chyb\u011b naleznete [v sekci n\u00e1pov\u011bdy]({docs_url})"
         },
         "step": {
             "agreement": {
diff --git a/homeassistant/components/toon/translations/et.json b/homeassistant/components/toon/translations/et.json
new file mode 100644
index 00000000000..7a4577d91da
--- /dev/null
+++ b/homeassistant/components/toon/translations/et.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Valitud n\u00f5usolek on juba seadistatud.",
+            "authorize_url_fail": "Tundmatu viga tuvastamise URL-i loomisel.",
+            "missing_configuration": "Osis pole seadistatud. Palun vaata dokumentatsiooni.",
+            "no_url_available": "URL pole saadaval. Rohkem teavet [check the help section]({docs_url})"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/toon/translations/no.json b/homeassistant/components/toon/translations/no.json
index 49103a77b37..241f04c5b71 100644
--- a/homeassistant/components/toon/translations/no.json
+++ b/homeassistant/components/toon/translations/no.json
@@ -6,7 +6,7 @@
             "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
             "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
             "no_agreements": "Denne kontoen har ingen Toon skjermer.",
-            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk {docs_url} ] ( {docs_url} )"
+            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk hjelpseksjonen]({docs_url})"
         },
         "step": {
             "agreement": {
diff --git a/homeassistant/components/toon/translations/pl.json b/homeassistant/components/toon/translations/pl.json
index dba8c957a3b..a74a58339be 100644
--- a/homeassistant/components/toon/translations/pl.json
+++ b/homeassistant/components/toon/translations/pl.json
@@ -1,15 +1,23 @@
 {
     "config": {
         "abort": {
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana",
+            "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania autoryzowanego adresu URL",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
             "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
-            "no_agreements": "To konto nie posiada wy\u015bwietlaczy Toon."
+            "no_agreements": "To konto nie posiada wy\u015bwietlaczy Toon",
+            "no_url_available": "Brak dost\u0119pnego adresu URL. Aby uzyska\u0107 informacje na temat tego b\u0142\u0119du, [sprawd\u017a sekcj\u0119 pomocy] ({docs_url})"
         },
         "step": {
             "agreement": {
                 "data": {
                     "agreement": "Umowa"
-                }
+                },
+                "description": "Wybierz adres umowy, kt\u00f3ry chcesz doda\u0107.",
+                "title": "Wybierz swoj\u0105 umow\u0119"
+            },
+            "pick_implementation": {
+                "title": "Wybierz dzier\u017cawc\u0119 do uwierzytelnienia"
             }
         }
     }
diff --git a/homeassistant/components/torque/sensor.py b/homeassistant/components/torque/sensor.py
index b4b44bdfb4f..4b52a565d87 100644
--- a/homeassistant/components/torque/sensor.py
+++ b/homeassistant/components/torque/sensor.py
@@ -1,5 +1,4 @@
 """Support for the Torque OBD application."""
-import logging
 import re
 
 import voluptuous as vol
@@ -11,8 +10,6 @@ from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 API_PATH = "/api/torque"
 
 DEFAULT_NAME = "vehicle"
diff --git a/homeassistant/components/totalconnect/config_flow.py b/homeassistant/components/totalconnect/config_flow.py
index 03ddd0a432a..2608a3c812c 100644
--- a/homeassistant/components/totalconnect/config_flow.py
+++ b/homeassistant/components/totalconnect/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow for the Total Connect component."""
-import logging
-
 from total_connect_client import TotalConnectClient
 import voluptuous as vol
 
@@ -9,8 +7,6 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 
 from .const import DOMAIN  # pylint: disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class TotalConnectConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Total Connect config flow."""
@@ -38,7 +34,7 @@ class TotalConnectConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                     data={CONF_USERNAME: username, CONF_PASSWORD: password},
                 )
             # authentication failed / invalid
-            errors["base"] = "login"
+            errors["base"] = "invalid_auth"
 
         data_schema = vol.Schema(
             {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
diff --git a/homeassistant/components/totalconnect/strings.json b/homeassistant/components/totalconnect/strings.json
index eb7a91ef438..7b306554b7b 100644
--- a/homeassistant/components/totalconnect/strings.json
+++ b/homeassistant/components/totalconnect/strings.json
@@ -10,10 +10,10 @@
       }
     },
     "error": {
-      "login": "Login error: please check your username & password"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "abort": {
-      "already_configured": "Account already configured"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/totalconnect/translations/ca.json b/homeassistant/components/totalconnect/translations/ca.json
index ca9e6d66e2e..f217eb4f6bc 100644
--- a/homeassistant/components/totalconnect/translations/ca.json
+++ b/homeassistant/components/totalconnect/translations/ca.json
@@ -4,6 +4,7 @@
             "already_configured": "El compte ja ha estat configurat"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "login": "Error d'inici de sessi\u00f3: comprova el nom d'usuari i la contrasenya"
         },
         "step": {
diff --git a/homeassistant/components/totalconnect/translations/cs.json b/homeassistant/components/totalconnect/translations/cs.json
index 338ff5d9a44..f589e592330 100644
--- a/homeassistant/components/totalconnect/translations/cs.json
+++ b/homeassistant/components/totalconnect/translations/cs.json
@@ -1,11 +1,19 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "login": "Chyba p\u0159ihl\u00e1\u0161en\u00ed: zkontrolujte sv\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no a heslo"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
-                }
+                },
+                "title": "Total Connect"
             }
         }
     }
diff --git a/homeassistant/components/totalconnect/translations/el.json b/homeassistant/components/totalconnect/translations/el.json
new file mode 100644
index 00000000000..161d646f430
--- /dev/null
+++ b/homeassistant/components/totalconnect/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "invalid_auth": "\u039c\u03b7 \u03ad\u03b3\u03ba\u03c5\u03c1\u03b7 \u03b1\u03c5\u03b8\u03b5\u03bd\u03c4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/totalconnect/translations/en.json b/homeassistant/components/totalconnect/translations/en.json
index 3486d42ae3d..1174d3e6687 100644
--- a/homeassistant/components/totalconnect/translations/en.json
+++ b/homeassistant/components/totalconnect/translations/en.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Account already configured"
+            "already_configured": "Account is already configured"
         },
         "error": {
+            "invalid_auth": "Invalid authentication",
             "login": "Login error: please check your username & password"
         },
         "step": {
diff --git a/homeassistant/components/totalconnect/translations/es.json b/homeassistant/components/totalconnect/translations/es.json
index 18b45f390b2..32d43bb165a 100644
--- a/homeassistant/components/totalconnect/translations/es.json
+++ b/homeassistant/components/totalconnect/translations/es.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "La cuenta ya est\u00e1 configurada"
+            "already_configured": "La cuenta ya ha sido configurada"
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "login": "Error de inicio de sesi\u00f3n: comprueba tu nombre de usuario y contrase\u00f1a"
         },
         "step": {
diff --git a/homeassistant/components/totalconnect/translations/et.json b/homeassistant/components/totalconnect/translations/et.json
new file mode 100644
index 00000000000..83763a467ac
--- /dev/null
+++ b/homeassistant/components/totalconnect/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Konto on juba seadistatud"
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/totalconnect/translations/fr.json b/homeassistant/components/totalconnect/translations/fr.json
index ef7cf7f38fa..cf841328d9c 100644
--- a/homeassistant/components/totalconnect/translations/fr.json
+++ b/homeassistant/components/totalconnect/translations/fr.json
@@ -4,6 +4,7 @@
             "already_configured": "Compte d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
+            "invalid_auth": "Authentification invalide",
             "login": "Erreur de connexion: veuillez v\u00e9rifier votre nom d'utilisateur et votre mot de passe"
         },
         "step": {
diff --git a/homeassistant/components/totalconnect/translations/it.json b/homeassistant/components/totalconnect/translations/it.json
index 455b8a7967f..369b739e841 100644
--- a/homeassistant/components/totalconnect/translations/it.json
+++ b/homeassistant/components/totalconnect/translations/it.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Account gi\u00e0 configurato"
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato"
         },
         "error": {
+            "invalid_auth": "Autenticazione non valida",
             "login": "Errore di accesso: si prega di controllare il nome utente e la password"
         },
         "step": {
diff --git a/homeassistant/components/totalconnect/translations/lb.json b/homeassistant/components/totalconnect/translations/lb.json
index a75e63e9b58..53074251944 100644
--- a/homeassistant/components/totalconnect/translations/lb.json
+++ b/homeassistant/components/totalconnect/translations/lb.json
@@ -4,6 +4,7 @@
             "already_configured": "Kont ass scho konfigur\u00e9iert"
         },
         "error": {
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "login": "Feeler beim Login: iwwerpr\u00e9if de Benotzernumm & Passwuert"
         },
         "step": {
diff --git a/homeassistant/components/totalconnect/translations/no.json b/homeassistant/components/totalconnect/translations/no.json
index c312f98f3d2..62e4fffb1fd 100644
--- a/homeassistant/components/totalconnect/translations/no.json
+++ b/homeassistant/components/totalconnect/translations/no.json
@@ -4,6 +4,7 @@
             "already_configured": "Kontoen er allerede konfigurert"
         },
         "error": {
+            "invalid_auth": "Ugyldig godkjenning",
             "login": "P\u00e5loggingsfeil: Vennligst sjekk brukernavnet ditt og passordet ditt"
         },
         "step": {
diff --git a/homeassistant/components/totalconnect/translations/pl.json b/homeassistant/components/totalconnect/translations/pl.json
index 58a0f7018da..fd47103360c 100644
--- a/homeassistant/components/totalconnect/translations/pl.json
+++ b/homeassistant/components/totalconnect/translations/pl.json
@@ -1,9 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Konto jest ju\u017c skonfigurowane."
+            "already_configured": "Konto jest ju\u017c skonfigurowane"
         },
         "error": {
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "login": "B\u0142\u0105d logowania: sprawd\u017a swoj\u0105 nazw\u0119 u\u017cytkownika i has\u0142o"
         },
         "step": {
diff --git a/homeassistant/components/totalconnect/translations/ru.json b/homeassistant/components/totalconnect/translations/ru.json
index a3de1ee4555..29a070d841e 100644
--- a/homeassistant/components/totalconnect/translations/ru.json
+++ b/homeassistant/components/totalconnect/translations/ru.json
@@ -4,6 +4,7 @@
             "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant."
         },
         "error": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "login": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0445\u043e\u0434\u0430: \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043b\u043e\u0433\u0438\u043d \u0438 \u043f\u0430\u0440\u043e\u043b\u044c."
         },
         "step": {
diff --git a/homeassistant/components/totalconnect/translations/zh-Hans.json b/homeassistant/components/totalconnect/translations/zh-Hans.json
new file mode 100644
index 00000000000..1d0c0eb1071
--- /dev/null
+++ b/homeassistant/components/totalconnect/translations/zh-Hans.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "error": {
+            "login": "\u767b\u5f55\u9519\u8bef\uff1a\u8bf7\u68c0\u67e5\u7528\u6237\u540d\u548c\u5bc6\u7801"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/totalconnect/translations/zh-Hant.json b/homeassistant/components/totalconnect/translations/zh-Hant.json
index 0424db3cdc3..b9416b0fbf3 100644
--- a/homeassistant/components/totalconnect/translations/zh-Hant.json
+++ b/homeassistant/components/totalconnect/translations/zh-Hant.json
@@ -4,6 +4,7 @@
             "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "login": "\u767b\u5165\u932f\u8aa4\uff1a\u8acb\u78ba\u8a8d\u96fb\u5b50\u90f5\u4ef6\u8207\u5bc6\u78bc"
         },
         "step": {
diff --git a/homeassistant/components/touchline/climate.py b/homeassistant/components/touchline/climate.py
index 16709793ec1..3193b6f847c 100644
--- a/homeassistant/components/touchline/climate.py
+++ b/homeassistant/components/touchline/climate.py
@@ -1,6 +1,4 @@
 """Platform for Roth Touchline floor heating controller."""
-import logging
-
 from pytouchline import PyTouchline
 import voluptuous as vol
 
@@ -13,8 +11,6 @@ from homeassistant.components.climate.const import (
 from homeassistant.const import ATTR_TEMPERATURE, CONF_HOST, TEMP_CELSIUS
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 PRESET_MODES = {
     "Normal": {"mode": 0, "program": 0},
     "Night": {"mode": 1, "program": 0},
diff --git a/homeassistant/components/tplink/common.py b/homeassistant/components/tplink/common.py
index 6c9d1f8b2e8..1aca4bf7edc 100644
--- a/homeassistant/components/tplink/common.py
+++ b/homeassistant/components/tplink/common.py
@@ -1,8 +1,6 @@
 """Common code for tplink."""
-import asyncio
-from datetime import timedelta
 import logging
-from typing import Any, Callable, List
+from typing import List
 
 from pyHS100 import (
     Discover,
@@ -15,6 +13,8 @@ from pyHS100 import (
 
 from homeassistant.helpers.typing import HomeAssistantType
 
+from .const import DOMAIN as TPLINK_DOMAIN
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -113,89 +113,45 @@ def get_static_devices(config_data) -> SmartDevices:
     for type_ in [CONF_LIGHT, CONF_SWITCH, CONF_STRIP, CONF_DIMMER]:
         for entry in config_data[type_]:
             host = entry["host"]
-
-            if type_ == CONF_LIGHT:
-                lights.append(SmartBulb(host))
-            elif type_ == CONF_SWITCH:
-                switches.append(SmartPlug(host))
-            elif type_ == CONF_STRIP:
-                try:
-                    ss_host = SmartStrip(host)
-                except SmartDeviceException as sde:
-                    _LOGGER.error(
-                        "Failed to setup SmartStrip at %s: %s; not retrying", host, sde
-                    )
-                    continue
-                for plug in ss_host.plugs.values():
-                    switches.append(plug)
-            # Dimmers need to be defined as smart plugs to work correctly.
-            elif type_ == CONF_DIMMER:
-                lights.append(SmartPlug(host))
-
+            try:
+                if type_ == CONF_LIGHT:
+                    lights.append(SmartBulb(host))
+                elif type_ == CONF_SWITCH:
+                    switches.append(SmartPlug(host))
+                elif type_ == CONF_STRIP:
+                    for plug in SmartStrip(host).plugs.values():
+                        switches.append(plug)
+                # Dimmers need to be defined as smart plugs to work correctly.
+                elif type_ == CONF_DIMMER:
+                    lights.append(SmartPlug(host))
+            except SmartDeviceException as sde:
+                _LOGGER.error(
+                    "Failed to setup device %s due to %s; not retrying", host, sde
+                )
     return SmartDevices(lights, switches)
 
 
-async def async_add_entities_retry(
-    hass: HomeAssistantType,
-    async_add_entities: Callable[[List[Any], bool], None],
-    objects: List[Any],
-    callback: Callable[[Any, Callable], None],
-    interval: timedelta = timedelta(seconds=60),
-):
-    """
-    Add entities now and retry later if issues are encountered.
+def add_available_devices(hass, device_type, device_class):
+    """Get sysinfo for all devices."""
 
-    If the callback throws an exception or returns false, that
-    object will try again a while later.
-    This is useful for devices that are not online when hass starts.
-    :param hass:
-    :param async_add_entities: The callback provided to a
-    platform's async_setup.
-    :param objects: The objects to create as entities.
-    :param callback: The callback that will perform the add.
-    :param interval: THe time between attempts to add.
-    :return: A callback to cancel the retries.
-    """
-    add_objects = objects.copy()
+    devices = hass.data[TPLINK_DOMAIN][device_type]
 
-    is_cancelled = False
+    if f"{device_type}_remaining" in hass.data[TPLINK_DOMAIN]:
+        devices = hass.data[TPLINK_DOMAIN][f"{device_type}_remaining"]
 
-    def cancel_interval_callback():
-        nonlocal is_cancelled
-        is_cancelled = True
+    entities_ready = []
+    devices_unavailable = []
+    for device in devices:
+        try:
+            device.get_sysinfo()
+            entities_ready.append(device_class(device))
+        except SmartDeviceException as ex:
+            devices_unavailable.append(device)
+            _LOGGER.warning(
+                "Unable to communicate with device %s: %s",
+                device.host,
+                ex,
+            )
 
-    async def process_objects_loop(delay: int):
-        if is_cancelled:
-            return
-
-        await process_objects()
-
-        if not add_objects:
-            return
-
-        await asyncio.sleep(delay)
-
-        hass.async_create_task(process_objects_loop(delay))
-
-    async def process_objects(*args):
-        # Process each object.
-        for add_object in list(add_objects):
-            # Call the individual item callback.
-            try:
-                _LOGGER.debug("Attempting to add object of type %s", type(add_object))
-                result = await hass.async_add_job(
-                    callback, add_object, async_add_entities
-                )
-            except SmartDeviceException as ex:
-                _LOGGER.debug(str(ex))
-                result = False
-
-            if result is True or result is None:
-                _LOGGER.debug("Added object")
-                add_objects.remove(add_object)
-            else:
-                _LOGGER.debug("Failed to add object, will try again later")
-
-    await process_objects_loop(interval.seconds)
-
-    return cancel_interval_callback
+    hass.data[TPLINK_DOMAIN][f"{device_type}_remaining"] = devices_unavailable
+    return entities_ready
diff --git a/homeassistant/components/tplink/light.py b/homeassistant/components/tplink/light.py
index a5135704dad..ceb0944efe6 100644
--- a/homeassistant/components/tplink/light.py
+++ b/homeassistant/components/tplink/light.py
@@ -1,4 +1,5 @@
 """Support for TPLink lights."""
+import asyncio
 from datetime import timedelta
 import logging
 import time
@@ -15,7 +16,7 @@ from homeassistant.components.light import (
     SUPPORT_COLOR_TEMP,
     LightEntity,
 )
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.exceptions import HomeAssistantError, PlatformNotReady
 import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.util.color import (
@@ -25,7 +26,7 @@ from homeassistant.util.color import (
 import homeassistant.util.dt as dt_util
 
 from . import CONF_LIGHT, DOMAIN as TPLINK_DOMAIN
-from .common import async_add_entities_retry
+from .common import add_available_devices
 
 PARALLEL_UPDATES = 0
 SCAN_INTERVAL = timedelta(seconds=5)
@@ -54,23 +55,21 @@ LIGHT_SYSINFO_IS_DIMMABLE = "is_dimmable"
 LIGHT_SYSINFO_IS_VARIABLE_COLOR_TEMP = "is_variable_color_temp"
 LIGHT_SYSINFO_IS_COLOR = "is_color"
 
+MAX_ATTEMPTS = 300
+SLEEP_TIME = 2
+
 
 async def async_setup_entry(hass: HomeAssistantType, config_entry, async_add_entities):
-    """Set up switches."""
-    await async_add_entities_retry(
-        hass, async_add_entities, hass.data[TPLINK_DOMAIN][CONF_LIGHT], add_entity
+    """Set up lights."""
+    entities = await hass.async_add_executor_job(
+        add_available_devices, hass, CONF_LIGHT, TPLinkSmartBulb
     )
-    return True
 
+    if entities:
+        async_add_entities(entities, update_before_add=True)
 
-def add_entity(device: SmartBulb, async_add_entities):
-    """Check if device is online and add the entity."""
-    # Attempt to get the sysinfo. If it fails, it will raise an
-    # exception that is caught by async_add_entities_retry which
-    # will try again later.
-    device.get_sysinfo()
-
-    async_add_entities([TPLinkSmartBulb(device)], update_before_add=True)
+    if hass.data[TPLINK_DOMAIN][f"{CONF_LIGHT}_remaining"]:
+        raise PlatformNotReady
 
 
 def brightness_to_percentage(byt):
@@ -134,6 +133,9 @@ class TPLinkSmartBulb(LightEntity):
         self._last_historical_power_update = None
         self._emeter_params = {}
 
+        self._host = None
+        self._alias = None
+
     @property
     def unique_id(self):
         """Return a unique ID."""
@@ -235,40 +237,36 @@ class TPLinkSmartBulb(LightEntity):
         """Return True if device is on."""
         return self._light_state.state
 
-    def update(self):
-        """Update the TP-Link Bulb's state."""
+    def attempt_update(self, update_attempt):
+        """Attempt to get details the TP-Link bulb."""
         # State is currently being set, ignore.
         if self._is_setting_light_state:
-            return
+            return False
 
         try:
-            # Update light features only once.
             if not self._light_features:
-                self._light_features = self._get_light_features_retry()
-            self._light_state = self._get_light_state_retry()
-            self._is_available = True
+                self._light_features = self._get_light_features()
+                self._alias = self._light_features.alias
+                self._host = self.smartbulb.host
+            self._light_state = self._get_light_state()
+            return True
+
         except (SmartDeviceException, OSError) as ex:
-            if self._is_available:
-                _LOGGER.warning(
-                    "Could not read data for %s: %s", self.smartbulb.host, ex
+            if update_attempt == 0:
+                _LOGGER.debug(
+                    "Retrying in %s seconds for %s|%s due to: %s",
+                    SLEEP_TIME,
+                    self._host,
+                    self._alias,
+                    ex,
                 )
-            self._is_available = False
+            return False
 
     @property
     def supported_features(self):
         """Flag supported features."""
         return self._light_features.supported_features
 
-    def _get_light_features_retry(self) -> LightFeatures:
-        """Retry the retrieval of the supported features."""
-        try:
-            return self._get_light_features()
-        except (SmartDeviceException, OSError):
-            pass
-
-        _LOGGER.debug("Retrying getting light features")
-        return self._get_light_features()
-
     def _get_light_features(self):
         """Determine all supported features in one go."""
         sysinfo = self.smartbulb.sys_info
@@ -304,16 +302,6 @@ class TPLinkSmartBulb(LightEntity):
             has_emeter=has_emeter,
         )
 
-    def _get_light_state_retry(self) -> LightState:
-        """Retry the retrieval of getting light states."""
-        try:
-            return self._get_light_state()
-        except (SmartDeviceException, OSError):
-            pass
-
-        _LOGGER.debug("Retrying getting light state")
-        return self._get_light_state()
-
     def _light_state_from_params(self, light_state_params) -> LightState:
         brightness = None
         color_temp = None
@@ -474,6 +462,33 @@ class TPLinkSmartBulb(LightEntity):
 
         return self._get_device_state()
 
+    async def async_update(self):
+        """Update the TP-Link bulb's state."""
+        for update_attempt in range(MAX_ATTEMPTS):
+            is_ready = await self.hass.async_add_executor_job(
+                self.attempt_update, update_attempt
+            )
+
+            if is_ready:
+                self._is_available = True
+                if update_attempt > 0:
+                    _LOGGER.debug(
+                        "Device %s|%s responded after %s attempts",
+                        self._host,
+                        self._alias,
+                        update_attempt,
+                    )
+                break
+            await asyncio.sleep(SLEEP_TIME)
+        else:
+            if self._is_available:
+                _LOGGER.warning(
+                    "Could not read state for %s|%s",
+                    self._host,
+                    self._alias,
+                )
+            self._is_available = False
+
 
 def _light_state_diff(old_light_state: LightState, new_light_state: LightState):
     old_state_param = old_light_state.to_param()
diff --git a/homeassistant/components/tplink/manifest.json b/homeassistant/components/tplink/manifest.json
index 44673bf6c8c..14de87b7b69 100644
--- a/homeassistant/components/tplink/manifest.json
+++ b/homeassistant/components/tplink/manifest.json
@@ -3,6 +3,11 @@
   "name": "TP-Link Kasa Smart",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/tplink",
-  "requirements": ["pyHS100==0.3.5.1"],
-  "codeowners": ["@rytilahti"]
-}
+  "requirements": [
+    "pyHS100==0.3.5.1"
+  ],
+  "codeowners": [
+    "@rytilahti",
+    "@thegardenmonkey"
+  ]
+}
\ No newline at end of file
diff --git a/homeassistant/components/tplink/strings.json b/homeassistant/components/tplink/strings.json
index cbb89653607..a10c44b9252 100644
--- a/homeassistant/components/tplink/strings.json
+++ b/homeassistant/components/tplink/strings.json
@@ -6,8 +6,8 @@
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration is necessary.",
-      "no_devices_found": "No TP-Link devices found on the network."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   }
 }
diff --git a/homeassistant/components/tplink/switch.py b/homeassistant/components/tplink/switch.py
index 344f9cd96b0..23000fe7b59 100644
--- a/homeassistant/components/tplink/switch.py
+++ b/homeassistant/components/tplink/switch.py
@@ -1,4 +1,5 @@
 """Support for TPLink HS100/HS110/HS200 smart switch."""
+import asyncio
 import logging
 import time
 
@@ -10,11 +11,12 @@ from homeassistant.components.switch import (
     SwitchEntity,
 )
 from homeassistant.const import ATTR_VOLTAGE
+from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.typing import HomeAssistantType
 
 from . import CONF_SWITCH, DOMAIN as TPLINK_DOMAIN
-from .common import async_add_entities_retry
+from .common import add_available_devices
 
 PARALLEL_UPDATES = 0
 
@@ -23,24 +25,21 @@ _LOGGER = logging.getLogger(__name__)
 ATTR_TOTAL_ENERGY_KWH = "total_energy_kwh"
 ATTR_CURRENT_A = "current_a"
 
-
-def add_entity(device: SmartPlug, async_add_entities):
-    """Check if device is online and add the entity."""
-    # Attempt to get the sysinfo. If it fails, it will raise an
-    # exception that is caught by async_add_entities_retry which
-    # will try again later.
-    device.get_sysinfo()
-
-    async_add_entities([SmartPlugSwitch(device)], update_before_add=True)
+MAX_ATTEMPTS = 300
+SLEEP_TIME = 2
 
 
 async def async_setup_entry(hass: HomeAssistantType, config_entry, async_add_entities):
     """Set up switches."""
-    await async_add_entities_retry(
-        hass, async_add_entities, hass.data[TPLINK_DOMAIN][CONF_SWITCH], add_entity
+    entities = await hass.async_add_executor_job(
+        add_available_devices, hass, CONF_SWITCH, SmartPlugSwitch
     )
 
-    return True
+    if entities:
+        async_add_entities(entities, update_before_add=True)
+
+    if hass.data[TPLINK_DOMAIN][f"{CONF_SWITCH}_remaining"]:
+        raise PlatformNotReady
 
 
 class SmartPlugSwitch(SwitchEntity):
@@ -51,7 +50,7 @@ class SmartPlugSwitch(SwitchEntity):
         self.smartplug = smartplug
         self._sysinfo = None
         self._state = None
-        self._available = False
+        self._is_available = False
         # Set up emeter cache
         self._emeter_params = {}
 
@@ -59,6 +58,7 @@ class SmartPlugSwitch(SwitchEntity):
         self._alias = None
         self._model = None
         self._device_id = None
+        self._host = None
 
     @property
     def unique_id(self):
@@ -84,7 +84,7 @@ class SmartPlugSwitch(SwitchEntity):
     @property
     def available(self) -> bool:
         """Return if switch is available."""
-        return self._available
+        return self._is_available
 
     @property
     def is_on(self):
@@ -110,24 +110,29 @@ class SmartPlugSwitch(SwitchEntity):
         children = self.smartplug.sys_info["children"]
         return next(c for c in children if c["id"] == self.smartplug.context)
 
-    def update(self):
+    def update_state(self):
         """Update the TP-Link switch's state."""
+        if self.smartplug.context is None:
+            self._state = self.smartplug.state == self.smartplug.SWITCH_STATE_ON
+        else:
+            self._state = self._plug_from_context["state"] == 1
+
+    def attempt_update(self, update_attempt):
+        """Attempt to get details from the TP-Link switch."""
         try:
             if not self._sysinfo:
                 self._sysinfo = self.smartplug.sys_info
-                self._mac = self.smartplug.mac
-                self._model = self.smartplug.model
+                self._mac = self._sysinfo["mac"]
+                self._model = self._sysinfo["model"]
+                self._host = self.smartplug.host
                 if self.smartplug.context is None:
-                    self._alias = self.smartplug.alias
+                    self._alias = self._sysinfo["alias"]
                     self._device_id = self._mac
                 else:
                     self._alias = self._plug_from_context["alias"]
                     self._device_id = self.smartplug.context
 
-            if self.smartplug.context is None:
-                self._state = self.smartplug.state == self.smartplug.SWITCH_STATE_ON
-            else:
-                self._state = self._plug_from_context["state"] == 1
+            self.update_state()
 
             if self.smartplug.has_emeter:
                 emeter_readings = self.smartplug.get_emeter_realtime()
@@ -153,12 +158,40 @@ class SmartPlugSwitch(SwitchEntity):
                 except KeyError:
                     # Device returned no daily history
                     pass
-
-            self._available = True
-
+            return True
         except (SmartDeviceException, OSError) as ex:
-            if self._available:
-                _LOGGER.warning(
-                    "Could not read state for %s: %s", self.smartplug.host, ex
+            if update_attempt == 0:
+                _LOGGER.debug(
+                    "Retrying in %s seconds for %s|%s due to: %s",
+                    SLEEP_TIME,
+                    self._host,
+                    self._alias,
+                    ex,
                 )
-            self._available = False
+            return False
+
+    async def async_update(self):
+        """Update the TP-Link switch's state."""
+        for update_attempt in range(MAX_ATTEMPTS):
+            is_ready = await self.hass.async_add_executor_job(
+                self.attempt_update, update_attempt
+            )
+
+            if is_ready:
+                self._is_available = True
+                if update_attempt > 0:
+                    _LOGGER.debug(
+                        "Device %s|%s responded after %s attempts",
+                        self._host,
+                        self._alias,
+                        update_attempt,
+                    )
+                break
+            await asyncio.sleep(SLEEP_TIME)
+
+        else:
+            if self._is_available:
+                _LOGGER.warning(
+                    "Could not read state for %s|%s", self.smartplug.host, self._alias
+                )
+            self._is_available = False
diff --git a/homeassistant/components/tplink/translations/ca.json b/homeassistant/components/tplink/translations/ca.json
index 62baf289fd4..69dfc1b4b9d 100644
--- a/homeassistant/components/tplink/translations/ca.json
+++ b/homeassistant/components/tplink/translations/ca.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No s'han trobat dispositius TP-Link a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s cal una \u00fanica configuraci\u00f3."
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/tplink/translations/cs.json b/homeassistant/components/tplink/translations/cs.json
new file mode 100644
index 00000000000..36d303b0f01
--- /dev/null
+++ b/homeassistant/components/tplink/translations/cs.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "confirm": {
+                "description": "Chcete nastavit inteligentn\u00ed za\u0159\u00edzen\u00ed TP-Link?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tplink/translations/en.json b/homeassistant/components/tplink/translations/en.json
index 3c1f7da52e0..1105f6a383b 100644
--- a/homeassistant/components/tplink/translations/en.json
+++ b/homeassistant/components/tplink/translations/en.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No TP-Link devices found on the network.",
-            "single_instance_allowed": "Only a single configuration is necessary."
+            "no_devices_found": "No devices found on the network",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/tplink/translations/es.json b/homeassistant/components/tplink/translations/es.json
index 408be2c1360..5f4cb5a6e7c 100644
--- a/homeassistant/components/tplink/translations/es.json
+++ b/homeassistant/components/tplink/translations/es.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No se han encontrado dispositivos TP-Link en la red.",
-            "single_instance_allowed": "S\u00f3lo es necesaria una configuraci\u00f3n."
+            "no_devices_found": "No se encontraron dispositivos en la red",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/tplink/translations/et.json b/homeassistant/components/tplink/translations/et.json
new file mode 100644
index 00000000000..972e581fc61
--- /dev/null
+++ b/homeassistant/components/tplink/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas soovid seadistada TP-Linki nutiseadmeid?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tplink/translations/it.json b/homeassistant/components/tplink/translations/it.json
index d5fc0a46a00..8940b1c8ee6 100644
--- a/homeassistant/components/tplink/translations/it.json
+++ b/homeassistant/components/tplink/translations/it.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nessun dispositivo TP-Link trovato in rete.",
-            "single_instance_allowed": "\u00c8 necessaria una sola configurazione."
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/tplink/translations/no.json b/homeassistant/components/tplink/translations/no.json
index d480a5d996d..1d1d624ab40 100644
--- a/homeassistant/components/tplink/translations/no.json
+++ b/homeassistant/components/tplink/translations/no.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Ingen TP-Link enheter funnet p\u00e5 nettverket.",
-            "single_instance_allowed": "Kun en konfigurasjon av TP-Link er n\u00f8dvendig."
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/tplink/translations/pl.json b/homeassistant/components/tplink/translations/pl.json
index 924f596ca4f..ea531a845ed 100644
--- a/homeassistant/components/tplink/translations/pl.json
+++ b/homeassistant/components/tplink/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 TP-Link w sieci.",
-            "single_instance_allowed": "Wymagana jest tylko jedna konfiguracja."
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/tplink/translations/ru.json b/homeassistant/components/tplink/translations/ru.json
index 7f84067d9a2..4df755bee4f 100644
--- a/homeassistant/components/tplink/translations/ru.json
+++ b/homeassistant/components/tplink/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 TP-Link \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/tplink/translations/zh-Hant.json b/homeassistant/components/tplink/translations/zh-Hant.json
index 9fafcbbce7d..e88d982b8a1 100644
--- a/homeassistant/components/tplink/translations/zh-Hant.json
+++ b/homeassistant/components/tplink/translations/zh-Hant.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230 TP-Link \u8a2d\u5099\u3002",
-            "single_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u6b21\u5373\u53ef\u3002"
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/traccar/__init__.py b/homeassistant/components/traccar/__init__.py
index 5203ea5ec90..c19a9cdd27e 100644
--- a/homeassistant/components/traccar/__init__.py
+++ b/homeassistant/components/traccar/__init__.py
@@ -1,6 +1,4 @@
 """Support for Traccar."""
-import logging
-
 from aiohttp import web
 import voluptuous as vol
 
@@ -23,8 +21,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 TRACKER_UPDATE = f"{DOMAIN}_tracker_update"
 
 
diff --git a/homeassistant/components/traccar/device_tracker.py b/homeassistant/components/traccar/device_tracker.py
index dc2b60dec1a..cdb20339510 100644
--- a/homeassistant/components/traccar/device_tracker.py
+++ b/homeassistant/components/traccar/device_tracker.py
@@ -79,9 +79,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
         vol.Optional(CONF_PORT, default=8082): cv.port,
         vol.Optional(CONF_SSL, default=False): cv.boolean,
         vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
-        vol.Required(CONF_MAX_ACCURACY, default=0): vol.All(
-            vol.Coerce(int), vol.Range(min=0)
-        ),
+        vol.Required(CONF_MAX_ACCURACY, default=0): cv.positive_int,
         vol.Optional(CONF_SKIP_ACCURACY_ON, default=[]): vol.All(
             cv.ensure_list, [cv.string]
         ),
diff --git a/homeassistant/components/traccar/strings.json b/homeassistant/components/traccar/strings.json
index 8574f4f34f1..aef269defcb 100644
--- a/homeassistant/components/traccar/strings.json
+++ b/homeassistant/components/traccar/strings.json
@@ -7,7 +7,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Traccar."
     },
     "create_entry": {
diff --git a/homeassistant/components/traccar/translations/ca.json b/homeassistant/components/traccar/translations/ca.json
index 2fa93690553..8dd1cecf90a 100644
--- a/homeassistant/components/traccar/translations/ca.json
+++ b/homeassistant/components/traccar/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Traccar.",
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar l'opci\u00f3 webhook de Traccar.\n\nUtilitza el seg\u00fcent enlla\u00e7: `{webhook_url}`\n\nConsulta la [documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
diff --git a/homeassistant/components/traccar/translations/cs.json b/homeassistant/components/traccar/translations/cs.json
new file mode 100644
index 00000000000..4c41801fb42
--- /dev/null
+++ b/homeassistant/components/traccar/translations/cs.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "user": {
+                "title": "Nastavit Traccar"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/traccar/translations/el.json b/homeassistant/components/traccar/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/traccar/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/traccar/translations/en.json b/homeassistant/components/traccar/translations/en.json
index 1e6b286def2..2a9c92cc1d0 100644
--- a/homeassistant/components/traccar/translations/en.json
+++ b/homeassistant/components/traccar/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive messages from Traccar.",
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "To send events to Home Assistant, you will need to setup the webhook feature in Traccar.\n\nUse the following url: `{webhook_url}`\n\nSee [the documentation]({docs_url}) for further details."
diff --git a/homeassistant/components/traccar/translations/es.json b/homeassistant/components/traccar/translations/es.json
index b9cd4b9def9..9ce5699526d 100644
--- a/homeassistant/components/traccar/translations/es.json
+++ b/homeassistant/components/traccar/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Su instancia de Home Assistant debe ser accesible desde Internet para recibir mensajes de Traccar.",
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "S\u00f3lo se necesita una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Para enviar eventos a Home Assistant, necesitar\u00e1 configurar la funci\u00f3n de webhook en Traccar.\n\nUtilice la siguiente url: ``{webhook_url}``\n\nConsulte la [documentaci\u00f3n]({docs_url}) para m\u00e1s detalles."
diff --git a/homeassistant/components/traccar/translations/et.json b/homeassistant/components/traccar/translations/et.json
new file mode 100644
index 00000000000..2283058c25f
--- /dev/null
+++ b/homeassistant/components/traccar/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Lubatud on ainult \u00fcks sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid seadistada Traccar'i?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/traccar/translations/fr.json b/homeassistant/components/traccar/translations/fr.json
index faf64359f0d..e000bbaaac8 100644
--- a/homeassistant/components/traccar/translations/fr.json
+++ b/homeassistant/components/traccar/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Votre instance de Home Assistant doit \u00eatre accessible depuis Internet pour recevoir les messages de Traccar.",
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "Pour envoyer des \u00e9v\u00e9nements \u00e0 Home Assistant, vous devez configurer la fonction Webhook dans Traccar. \n\n Utilisez l'URL suivante: ` {webhook_url} ` \n\n Voir [la documentation] ( {docs_url} ) pour plus de d\u00e9tails."
diff --git a/homeassistant/components/traccar/translations/it.json b/homeassistant/components/traccar/translations/it.json
index 54e46e8d31d..86e65ace3db 100644
--- a/homeassistant/components/traccar/translations/it.json
+++ b/homeassistant/components/traccar/translations/it.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La tua istanza di Home Assistant deve essere accessibile da Internet per ricevere messaggi da Traccar.",
-            "one_instance_allowed": "\u00c8 necessaria solo una singola istanza."
+            "one_instance_allowed": "\u00c8 necessaria solo una singola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "Per inviare eventi a Home Assistant, \u00e8 necessario configurare la funzionalit\u00e0 webhook in Traccar.\n\nUtilizzare l'URL seguente: `{webhook_url}`\n\nPer ulteriori dettagli, vedere [la documentazione]({docs_url}) ."
diff --git a/homeassistant/components/traccar/translations/lb.json b/homeassistant/components/traccar/translations/lb.json
index a4d1da866e0..3ccacf127e9 100644
--- a/homeassistant/components/traccar/translations/lb.json
+++ b/homeassistant/components/traccar/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir Traccar Noriichten z'empf\u00e4nken.",
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Fir Evenementer un Home Assistant ze sch\u00e9cken, muss den Webhook Feature am Traccar ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n\nLiest [Dokumentatioun]({docs_url}) fir w\u00e9ider Informatiounen."
diff --git a/homeassistant/components/traccar/translations/nl.json b/homeassistant/components/traccar/translations/nl.json
index fd238b09bd9..7e9d93bc0c8 100644
--- a/homeassistant/components/traccar/translations/nl.json
+++ b/homeassistant/components/traccar/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Uw Home Assistant-exemplaar moet toegankelijk zijn vanaf internet om berichten van Traccar te ontvangen.",
-            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n instantie is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Voor het verzenden van gebeurtenissen naar Home Assistant, moet u de webhook-functie in Traccar instellen.\n\nGebruik de volgende URL: ' {webhook_url} '\n\nZie [de documentatie] ({docs_url}) voor meer informatie."
diff --git a/homeassistant/components/traccar/translations/no.json b/homeassistant/components/traccar/translations/no.json
index 53e6500e70e..1b0728f26d4 100644
--- a/homeassistant/components/traccar/translations/no.json
+++ b/homeassistant/components/traccar/translations/no.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Din Home Assistant-forekomst m\u00e5 v\u00e6re tilgjengelig fra Internett for \u00e5 motta meldinger fra Traccar.",
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
             "default": "Hvis du vil sende hendelser til Home Assistant, m\u00e5 du konfigurere webhook-funksjonen i Traccar.\n\nBruk f\u00f8lgende URL-adresse: `{webhook_url}`\n\nSe [dokumentasjonen]({docs_url}) for mer informasjon."
diff --git a/homeassistant/components/traccar/translations/pl.json b/homeassistant/components/traccar/translations/pl.json
index fecfc94c36c..04d06274ae5 100644
--- a/homeassistant/components/traccar/translations/pl.json
+++ b/homeassistant/components/traccar/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z Traccar.",
-            "one_instance_allowed": "Niezb\u0119dna jest tylko jedna instancja."
+            "not_internet_accessible": "Twoja instancja Home Assistant musi by\u0107 dost\u0119pna z Internetu, aby otrzymywa\u0107 wiadomo\u015bci z Traccar",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistanta, musisz skonfigurowa\u0107 webhook w Traccar. \n\n U\u017cyj nast\u0119puj\u0105cego URL: `{webhook_url}` \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
+            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistant, musisz skonfigurowa\u0107 webhook w Traccar. \n\n U\u017cyj nast\u0119puj\u0105cego URL: `{webhook_url}` \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}), by pozna\u0107 szczeg\u00f3\u0142y."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/traccar/translations/ru.json b/homeassistant/components/traccar/translations/ru.json
index a2979379e18..f9a23647422 100644
--- a/homeassistant/components/traccar/translations/ru.json
+++ b/homeassistant/components/traccar/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 Traccar.",
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Webhook \u0434\u043b\u044f Traccar.\n\n\u0414\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0431\u043e\u043b\u0435\u0435 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438."
diff --git a/homeassistant/components/traccar/translations/zh-Hant.json b/homeassistant/components/traccar/translations/zh-Hant.json
index 5135320f631..b14b5f12b9f 100644
--- a/homeassistant/components/traccar/translations/zh-Hant.json
+++ b/homeassistant/components/traccar/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant \u8a2d\u5099\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 Traccar \u8a0a\u606f\u3002",
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u65bc Traccar \u5167\u8a2d\u5b9a webhook \u529f\u80fd\u3002\n\n\u8acb\u4f7f\u7528 url: `{webhook_url}`\n\n\u8acb\u53c3\u95b1 [\u6587\u4ef6]({docs_url})\u4ee5\u4e86\u89e3\u66f4\u8a73\u7d30\u8cc7\u6599\u3002"
diff --git a/homeassistant/components/tradfri/__init__.py b/homeassistant/components/tradfri/__init__.py
index 002231e4e20..8d82df07bbb 100644
--- a/homeassistant/components/tradfri/__init__.py
+++ b/homeassistant/components/tradfri/__init__.py
@@ -1,14 +1,19 @@
 """Support for IKEA Tradfri."""
 import asyncio
+from datetime import timedelta
+import logging
 
 from pytradfri import Gateway, RequestError
 from pytradfri.api.aiocoap_api import APIFactory
 import voluptuous as vol
 
 from homeassistant import config_entries
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.exceptions import ConfigEntryNotReady
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.typing import ConfigType, HomeAssistantType
 from homeassistant.util.json import load_json
 
 from . import config_flow  # noqa: F401
@@ -31,6 +36,8 @@ from .const import (
     PLATFORMS,
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 FACTORY = "tradfri_factory"
 LISTENERS = "tradfri_listeners"
 
@@ -49,7 +56,7 @@ CONFIG_SCHEMA = vol.Schema(
 )
 
 
-async def async_setup(hass, config):
+async def async_setup(hass: HomeAssistantType, config: ConfigType):
     """Set up the Tradfri component."""
     conf = config.get(DOMAIN)
 
@@ -57,7 +64,7 @@ async def async_setup(hass, config):
         return True
 
     configured_hosts = [
-        entry.data["host"] for entry in hass.config_entries.async_entries(DOMAIN)
+        entry.data.get("host") for entry in hass.config_entries.async_entries(DOMAIN)
     ]
 
     legacy_hosts = await hass.async_add_executor_job(
@@ -94,7 +101,7 @@ async def async_setup(hass, config):
     return True
 
 
-async def async_setup_entry(hass, entry):
+async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
     """Create a gateway."""
     # host, identity, key, allow_tradfri_groups
     tradfri_data = hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {}
@@ -147,10 +154,23 @@ async def async_setup_entry(hass, entry):
             hass.config_entries.async_forward_entry_setup(entry, component)
         )
 
+    async def async_keep_alive(now):
+        if hass.is_stopping:
+            return
+
+        try:
+            await api(gateway.get_gateway_info())
+        except RequestError:
+            _LOGGER.error("Keep-alive failed")
+
+    listeners.append(
+        async_track_time_interval(hass, async_keep_alive, timedelta(seconds=60))
+    )
+
     return True
 
 
-async def async_unload_entry(hass, entry):
+async def async_unload_entry(hass: HomeAssistantType, entry: ConfigEntry):
     """Unload a config entry."""
     unload_ok = all(
         await asyncio.gather(
diff --git a/homeassistant/components/tradfri/cover.py b/homeassistant/components/tradfri/cover.py
index 2d99de7756a..72597637bd3 100644
--- a/homeassistant/components/tradfri/cover.py
+++ b/homeassistant/components/tradfri/cover.py
@@ -31,8 +31,7 @@ class TradfriCover(TradfriBaseDevice, CoverEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attr = {ATTR_MODEL: self._device.device_info.model_number}
-        return attr
+        return {ATTR_MODEL: self._device.device_info.model_number}
 
     @property
     def current_cover_position(self):
diff --git a/homeassistant/components/tradfri/light.py b/homeassistant/components/tradfri/light.py
index 939968852d9..bad4ce282b9 100644
--- a/homeassistant/components/tradfri/light.py
+++ b/homeassistant/components/tradfri/light.py
@@ -1,6 +1,4 @@
 """Support for IKEA Tradfri lights."""
-import logging
-
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_COLOR_TEMP,
@@ -29,8 +27,6 @@ from .const import (
     SUPPORTED_LIGHT_FEATURES,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Load Tradfri lights based on a config entry."""
diff --git a/homeassistant/components/tradfri/strings.json b/homeassistant/components/tradfri/strings.json
index 33a3f059098..45850fd639a 100644
--- a/homeassistant/components/tradfri/strings.json
+++ b/homeassistant/components/tradfri/strings.json
@@ -12,12 +12,12 @@
     },
     "error": {
       "invalid_key": "Failed to register with provided key. If this keeps happening, try restarting the gateway.",
-      "cannot_connect": "Unable to connect to the gateway.",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "timeout": "Timeout validating the code."
     },
     "abort": {
-      "already_configured": "Bridge is already configured.",
-      "already_in_progress": "Bridge configuration is already in progress."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/tradfri/translations/ca.json b/homeassistant/components/tradfri/translations/ca.json
index cee54ccca79..a1ab94a0920 100644
--- a/homeassistant/components/tradfri/translations/ca.json
+++ b/homeassistant/components/tradfri/translations/ca.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'enlla\u00e7 ja est\u00e0 configurat",
-            "already_in_progress": "La configuraci\u00f3 de l'enlla\u00e7 ja est\u00e0 en curs."
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar a la passarel\u00b7la d'enlla\u00e7",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_key": "Ha fallat el registre amb la clau proporcionada. Si aix\u00f2 continua passant, intenta reiniciar la passarel\u00b7la d'enlla\u00e7.",
             "timeout": "S'ha acabat el temps d'espera durant la validaci\u00f3 del codi."
         },
diff --git a/homeassistant/components/tradfri/translations/cs.json b/homeassistant/components/tradfri/translations/cs.json
index e4c328c3020..2426d2959b8 100644
--- a/homeassistant/components/tradfri/translations/cs.json
+++ b/homeassistant/components/tradfri/translations/cs.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Bridge je ji\u017e nakonfigurov\u00e1n"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1"
         },
         "error": {
-            "cannot_connect": "Nelze se p\u0159ipojit k br\u00e1n\u011b.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "invalid_key": "Nepoda\u0159ilo se zaregistrovat pomoc\u00ed zadan\u00e9ho kl\u00ed\u010de. Pokud se situace opakuje, zkuste restartovat gateway.",
             "timeout": "\u010casov\u00fd limit ov\u011b\u0159ov\u00e1n\u00ed k\u00f3du vypr\u0161el"
         },
diff --git a/homeassistant/components/tradfri/translations/de.json b/homeassistant/components/tradfri/translations/de.json
index 181631047ea..3e55cb701d5 100644
--- a/homeassistant/components/tradfri/translations/de.json
+++ b/homeassistant/components/tradfri/translations/de.json
@@ -6,7 +6,7 @@
         },
         "error": {
             "cannot_connect": "Verbindung zum Gateway nicht m\u00f6glich.",
-            "invalid_key": "Fehler beim Registrieren mit dem angegebenen Schl\u00fcssel. Wenn dies weiterhin geschieht, versuche, das Gateway neu zu starten.",
+            "invalid_key": "Registrierung mit angegebenem Schl\u00fcssel fehlgeschlagen. Wenn dies weiterhin geschieht, starte den Gateway neu.",
             "timeout": "Timeout bei der \u00dcberpr\u00fcfung des Codes."
         },
         "step": {
diff --git a/homeassistant/components/tradfri/translations/en.json b/homeassistant/components/tradfri/translations/en.json
index f1ee9b9238a..9035496a0cc 100644
--- a/homeassistant/components/tradfri/translations/en.json
+++ b/homeassistant/components/tradfri/translations/en.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Bridge is already configured.",
-            "already_in_progress": "Bridge configuration is already in progress."
+            "already_configured": "Device is already configured",
+            "already_in_progress": "Configuration flow is already in progress"
         },
         "error": {
-            "cannot_connect": "Unable to connect to the gateway.",
+            "cannot_connect": "Failed to connect",
             "invalid_key": "Failed to register with provided key. If this keeps happening, try restarting the gateway.",
             "timeout": "Timeout validating the code."
         },
diff --git a/homeassistant/components/tradfri/translations/et.json b/homeassistant/components/tradfri/translations/et.json
index 5d0a728407a..c5d97b1c496 100644
--- a/homeassistant/components/tradfri/translations/et.json
+++ b/homeassistant/components/tradfri/translations/et.json
@@ -1,5 +1,12 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
         "step": {
             "auth": {
                 "data": {
diff --git a/homeassistant/components/tradfri/translations/it.json b/homeassistant/components/tradfri/translations/it.json
index 4fe9b2a7c9c..c05098d97d2 100644
--- a/homeassistant/components/tradfri/translations/it.json
+++ b/homeassistant/components/tradfri/translations/it.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Bridge gi\u00e0 configurato.",
-            "already_in_progress": "La configurazione del Bridge \u00e8 gi\u00e0 in corso."
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi al gateway.",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_key": "Impossibile registrarsi con la chiave fornita. Se questo continua a succedere, prova a riavviare il gateway.",
             "timeout": "Tempo scaduto per la validazione del codice."
         },
diff --git a/homeassistant/components/tradfri/translations/no.json b/homeassistant/components/tradfri/translations/no.json
index 39e66e48a78..917a6587b84 100644
--- a/homeassistant/components/tradfri/translations/no.json
+++ b/homeassistant/components/tradfri/translations/no.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Bridge er allerede konfigurert.",
-            "already_in_progress": "Brokonfigurasjon er allerede i gang."
+            "already_configured": "Enheten er allerede konfigurert",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede"
         },
         "error": {
-            "cannot_connect": "Kan ikke koble til gatewayen.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_key": "Kunne ikke registrere med gitt n\u00f8kkel. Hvis dette fortsetter, pr\u00f8v \u00e5 starte gatewayen p\u00e5 nytt.",
             "timeout": "Tidsavbrudd ved validering av kode."
         },
diff --git a/homeassistant/components/tradfri/translations/pl.json b/homeassistant/components/tradfri/translations/pl.json
index 028956ec6b3..e2fcb45f51c 100644
--- a/homeassistant/components/tradfri/translations/pl.json
+++ b/homeassistant/components/tradfri/translations/pl.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Mostek jest ju\u017c skonfigurowany.",
-            "already_in_progress": "Konfiguracja mostka jest ju\u017c w toku."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z bram\u0105.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_key": "Rejestracja si\u0119 nie powiod\u0142a z podanym kluczem. Je\u015bli tak si\u0119 stanie, spr\u00f3buj ponownie uruchomi\u0107 bramk\u0119.",
-            "timeout": "Przekroczono limit czasu sprawdzania poprawno\u015bci kodu."
+            "timeout": "Przekroczono limit czasu sprawdzania poprawno\u015bci kodu"
         },
         "step": {
             "auth": {
diff --git a/homeassistant/components/tradfri/translations/ru.json b/homeassistant/components/tradfri/translations/ru.json
index 03077907aab..adb2b3aa18f 100644
--- a/homeassistant/components/tradfri/translations/ru.json
+++ b/homeassistant/components/tradfri/translations/ru.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0448\u043b\u044e\u0437\u0443.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_key": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0441 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u043c \u043a\u043b\u044e\u0447\u043e\u043c. \u0415\u0441\u043b\u0438 \u044d\u0442\u043e \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0448\u043b\u044e\u0437.",
             "timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 \u043a\u043e\u0434\u0430."
         },
diff --git a/homeassistant/components/tradfri/translations/zh-Hant.json b/homeassistant/components/tradfri/translations/zh-Hant.json
index adbb0e148f4..21b232b757f 100644
--- a/homeassistant/components/tradfri/translations/zh-Hant.json
+++ b/homeassistant/components/tradfri/translations/zh-Hant.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Bridge \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
-            "already_in_progress": "Bridge \u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d"
         },
         "error": {
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3\u9598\u9053\u5668\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_key": "\u63d0\u4f9b\u4e4b\u5b89\u5168\u78bc\u8a3b\u518a\u5931\u6557\u3002\u5047\u5982\u6b64\u60c5\u6cc1\u6301\u7e8c\u767c\u751f\uff0c\u8acb\u5617\u8a66\u91cd\u555f\u9598\u9053\u5668\u3002",
             "timeout": "\u8a8d\u8b49\u78bc\u903e\u6642\u3002"
         },
diff --git a/homeassistant/components/transmission/config_flow.py b/homeassistant/components/transmission/config_flow.py
index 56ed3081b63..890a0f3dfa9 100644
--- a/homeassistant/components/transmission/config_flow.py
+++ b/homeassistant/components/transmission/config_flow.py
@@ -64,13 +64,12 @@ class TransmissionFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                 if entry.data[CONF_NAME] == user_input[CONF_NAME]:
                     errors[CONF_NAME] = "name_exists"
                     break
-
             try:
                 await get_api(self.hass, user_input)
 
             except AuthenticationError:
-                errors[CONF_USERNAME] = "wrong_credentials"
-                errors[CONF_PASSWORD] = "wrong_credentials"
+                errors[CONF_USERNAME] = "invalid_auth"
+                errors[CONF_PASSWORD] = "invalid_auth"
             except (CannotConnect, UnknownError):
                 errors["base"] = "cannot_connect"
 
diff --git a/homeassistant/components/transmission/sensor.py b/homeassistant/components/transmission/sensor.py
index 69388de1145..ef1e68e2d0a 100644
--- a/homeassistant/components/transmission/sensor.py
+++ b/homeassistant/components/transmission/sensor.py
@@ -1,6 +1,4 @@
 """Support for monitoring the Transmission BitTorrent client API."""
-import logging
-
 from homeassistant.const import CONF_NAME, DATA_RATE_MEGABYTES_PER_SECOND, STATE_IDLE
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -14,8 +12,6 @@ from .const import (
     SUPPORTED_ORDER_MODES,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Transmission sensors."""
diff --git a/homeassistant/components/transmission/strings.json b/homeassistant/components/transmission/strings.json
index 66a5b757818..81725ad7d16 100644
--- a/homeassistant/components/transmission/strings.json
+++ b/homeassistant/components/transmission/strings.json
@@ -4,7 +4,7 @@
       "user": {
         "title": "Setup Transmission Client",
         "data": {
-          "name": "Name",
+          "name": "[%key:common::config_flow::data::name%]",
           "host": "[%key:common::config_flow::data::host%]",
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
@@ -13,12 +13,12 @@
       }
     },
     "error": {
-      "name_exists": "Name already exists",
-      "wrong_credentials": "Wrong username or password",
-      "cannot_connect": "Unable to Connect to host"
+      "name_exists": "[%key:common::config_flow::data::name%] already exists",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "Host is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "options": {
@@ -33,4 +33,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/transmission/translations/ca.json b/homeassistant/components/transmission/translations/ca.json
index 96f3397af85..b2ab15a2ace 100644
--- a/homeassistant/components/transmission/translations/ca.json
+++ b/homeassistant/components/transmission/translations/ca.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'amfitri\u00f3 ja est\u00e0 configurat."
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar amb l'amfitri\u00f3",
-            "name_exists": "El nom ja existeix",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
+            "name_exists": "Nom ja existeix",
             "wrong_credentials": "Nom d'usuari o contrasenya incorrectes"
         },
         "step": {
diff --git a/homeassistant/components/transmission/translations/cs.json b/homeassistant/components/transmission/translations/cs.json
index 9c3d253e8e0..864630a2896 100644
--- a/homeassistant/components/transmission/translations/cs.json
+++ b/homeassistant/components/transmission/translations/cs.json
@@ -1,15 +1,19 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Hostitel je ji\u017e nakonfigurov\u00e1n."
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
         },
         "error": {
-            "name_exists": "Jm\u00e9no ji\u017e existuje"
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "name_exists": "Jm\u00e9no already exists",
+            "wrong_credentials": "Neplatn\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no nebo heslo"
         },
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel",
+                    "name": "Jm\u00e9no",
                     "password": "Heslo",
                     "port": "Port",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
@@ -20,6 +24,9 @@
     "options": {
         "step": {
             "init": {
+                "data": {
+                    "scan_interval": "Frekvence aktualizac\u00ed"
+                },
                 "title": "Nakonfigurujte mo\u017enosti pro Transmission"
             }
         }
diff --git a/homeassistant/components/transmission/translations/en.json b/homeassistant/components/transmission/translations/en.json
index fe3758b774a..9f1c5cc90cc 100644
--- a/homeassistant/components/transmission/translations/en.json
+++ b/homeassistant/components/transmission/translations/en.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Host is already configured."
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Unable to Connect to host",
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
             "name_exists": "Name already exists",
             "wrong_credentials": "Wrong username or password"
         },
diff --git a/homeassistant/components/transmission/translations/es.json b/homeassistant/components/transmission/translations/es.json
index a1c2de1af7e..62adeaa6ac7 100644
--- a/homeassistant/components/transmission/translations/es.json
+++ b/homeassistant/components/transmission/translations/es.json
@@ -4,7 +4,8 @@
             "already_configured": "El host ya est\u00e1 configurado."
         },
         "error": {
-            "cannot_connect": "No se puede conectar al host",
+            "cannot_connect": "No se pudo conectar",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "name_exists": "El nombre ya existe",
             "wrong_credentials": "Nombre de usuario o contrase\u00f1a incorrectos"
         },
diff --git a/homeassistant/components/transmission/translations/et.json b/homeassistant/components/transmission/translations/et.json
index d7f39519aad..6107ac808e6 100644
--- a/homeassistant/components/transmission/translations/et.json
+++ b/homeassistant/components/transmission/translations/et.json
@@ -1,10 +1,21 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga",
+            "name_exists": "Nimi on juba olemas",
+            "wrong_credentials": "Vale kasutajanimi v\u00f5i salas\u00f5na"
+        },
         "step": {
             "user": {
                 "data": {
+                    "host": "",
                     "name": "Nimi",
                     "password": "Salas\u00f5na",
+                    "port": "",
                     "username": "Kasutajanimi"
                 }
             }
diff --git a/homeassistant/components/transmission/translations/it.json b/homeassistant/components/transmission/translations/it.json
index 0a9fa5a874e..daf7088ee8d 100644
--- a/homeassistant/components/transmission/translations/it.json
+++ b/homeassistant/components/transmission/translations/it.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'host \u00e8 gi\u00e0 configurato."
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi all'host",
-            "name_exists": "Il nome \u00e8 gi\u00e0 esistente",
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_auth": "Autenticazione non valida",
+            "name_exists": "Nome gi\u00e0 esistente",
             "wrong_credentials": "Nome utente o password non validi"
         },
         "step": {
diff --git a/homeassistant/components/transmission/translations/lb.json b/homeassistant/components/transmission/translations/lb.json
index 1da78c9ce0c..e9afd3d58c3 100644
--- a/homeassistant/components/transmission/translations/lb.json
+++ b/homeassistant/components/transmission/translations/lb.json
@@ -5,6 +5,7 @@
         },
         "error": {
             "cannot_connect": "Kann sech net mam Server verbannen.",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "name_exists": "Numm g\u00ebtt et schonn",
             "wrong_credentials": "Falsche Benotzernumm oder Passwuert"
         },
diff --git a/homeassistant/components/transmission/translations/no.json b/homeassistant/components/transmission/translations/no.json
index 48b86516917..2abf1b2a9d7 100644
--- a/homeassistant/components/transmission/translations/no.json
+++ b/homeassistant/components/transmission/translations/no.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Verten er allerede konfigurert."
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Kan ikke koble til vert",
-            "name_exists": "Navnet eksisterer allerede",
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning",
+            "name_exists": "Navn eksisterer allerede",
             "wrong_credentials": "Feil brukernavn eller passord"
         },
         "step": {
@@ -14,7 +15,7 @@
                     "host": "Vert",
                     "name": "Navn",
                     "password": "Passord",
-                    "port": "",
+                    "port": "Port",
                     "username": "Brukernavn"
                 },
                 "title": "Oppsett av Transmission-klient"
diff --git a/homeassistant/components/transmission/translations/pl.json b/homeassistant/components/transmission/translations/pl.json
index 4f62dcfb882..882a0762e4f 100644
--- a/homeassistant/components/transmission/translations/pl.json
+++ b/homeassistant/components/transmission/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Host jest ju\u017c skonfigurowany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z hostem",
-            "name_exists": "Nazwa ju\u017c istnieje.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
+            "name_exists": "Nazwa ju\u017c istnieje",
             "wrong_credentials": "Nieprawid\u0142owa nazwa u\u017cytkownika lub has\u0142o"
         },
         "step": {
diff --git a/homeassistant/components/transmission/translations/ru.json b/homeassistant/components/transmission/translations/ru.json
index b6bbe58ea1a..42b4da357fa 100644
--- a/homeassistant/components/transmission/translations/ru.json
+++ b/homeassistant/components/transmission/translations/ru.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0445\u043e\u0441\u0442\u0443.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "name_exists": "\u042d\u0442\u043e \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f.",
             "wrong_credentials": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c."
         },
diff --git a/homeassistant/components/transmission/translations/sv.json b/homeassistant/components/transmission/translations/sv.json
index 84023ea7c9c..1e485ebbbe7 100644
--- a/homeassistant/components/transmission/translations/sv.json
+++ b/homeassistant/components/transmission/translations/sv.json
@@ -25,6 +25,8 @@
         "step": {
             "init": {
                 "data": {
+                    "limit": "Gr\u00e4ns",
+                    "order": "Ordning",
                     "scan_interval": "Uppdateringsfrekvens"
                 },
                 "title": "Konfigurera alternativ f\u00f6r Transmission"
diff --git a/homeassistant/components/transmission/translations/zh-Hans.json b/homeassistant/components/transmission/translations/zh-Hans.json
new file mode 100644
index 00000000000..feebc8ea8a2
--- /dev/null
+++ b/homeassistant/components/transmission/translations/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "wrong_credentials": "\u7528\u6237\u540d\u6216\u5bc6\u7801\u9519\u8bef"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/transmission/translations/zh-Hant.json b/homeassistant/components/transmission/translations/zh-Hant.json
index 0dcbd97d183..f4485f347a1 100644
--- a/homeassistant/components/transmission/translations/zh-Hant.json
+++ b/homeassistant/components/transmission/translations/zh-Hant.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u4e3b\u6a5f\u7aef\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3\u4e3b\u6a5f\u7aef",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "name_exists": "\u8a72\u540d\u7a31\u5df2\u5b58\u5728",
             "wrong_credentials": "\u4f7f\u7528\u8005\u540d\u7a31\u6216\u5bc6\u78bc\u932f\u8aa4"
         },
diff --git a/homeassistant/components/transport_nsw/sensor.py b/homeassistant/components/transport_nsw/sensor.py
index e877e2d2e43..2aa27f8c4b3 100644
--- a/homeassistant/components/transport_nsw/sensor.py
+++ b/homeassistant/components/transport_nsw/sensor.py
@@ -1,6 +1,5 @@
 """Support for Transport NSW (AU) to query next leave event."""
 from datetime import timedelta
-import logging
 
 from TransportNSW import TransportNSW
 import voluptuous as vol
@@ -16,8 +15,6 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_STOP_ID = "stop_id"
 ATTR_ROUTE = "route"
 ATTR_DUE_IN = "due"
diff --git a/homeassistant/components/trend/binary_sensor.py b/homeassistant/components/trend/binary_sensor.py
index 1c6c75d6ce5..4b4bd48bfe3 100644
--- a/homeassistant/components/trend/binary_sensor.py
+++ b/homeassistant/components/trend/binary_sensor.py
@@ -203,7 +203,7 @@ class SensorTrend(BinarySensorEntity):
             return
 
         # Calculate gradient of linear trend
-        await self.hass.async_add_job(self._calculate_gradient)
+        await self.hass.async_add_executor_job(self._calculate_gradient)
 
         # Update state
         self._state = (
diff --git a/homeassistant/components/tts/__init__.py b/homeassistant/components/tts/__init__.py
index 7ee4922677c..719f8c52e7a 100644
--- a/homeassistant/components/tts/__init__.py
+++ b/homeassistant/components/tts/__init__.py
@@ -11,7 +11,7 @@ from typing import Dict, Optional
 
 from aiohttp import web
 import mutagen
-from mutagen.id3 import ID3FileType, TextFrame as ID3Text
+from mutagen.id3 import ID3, TextFrame as ID3Text
 import voluptuous as vol
 
 from homeassistant.components.http import HomeAssistantView
@@ -468,7 +468,9 @@ class SpeechManager:
         try:
             tts_file = mutagen.File(data_bytes)
             if tts_file is not None:
-                if isinstance(tts_file, ID3FileType):
+                if not tts_file.tags:
+                    tts_file.add_tags()
+                if isinstance(tts_file.tags, ID3):
                     tts_file["artist"] = ID3Text(encoding=3, text=artist)
                     tts_file["album"] = ID3Text(encoding=3, text=album)
                     tts_file["title"] = ID3Text(encoding=3, text=message)
diff --git a/homeassistant/components/tts/notify.py b/homeassistant/components/tts/notify.py
new file mode 100644
index 00000000000..ce978c9b967
--- /dev/null
+++ b/homeassistant/components/tts/notify.py
@@ -0,0 +1,60 @@
+"""Support notifications through TTS service."""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.notify import PLATFORM_SCHEMA, BaseNotificationService
+from homeassistant.const import CONF_NAME
+from homeassistant.core import split_entity_id
+import homeassistant.helpers.config_validation as cv
+
+from . import ATTR_ENTITY_ID, ATTR_LANGUAGE, ATTR_MESSAGE, DOMAIN
+
+CONF_MEDIA_PLAYER = "media_player"
+CONF_TTS_SERVICE = "tts_service"
+
+# mypy: allow-untyped-calls, allow-untyped-defs, no-check-untyped-defs
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+    {
+        vol.Required(CONF_NAME): cv.string,
+        vol.Required(CONF_TTS_SERVICE): cv.entity_id,
+        vol.Required(CONF_MEDIA_PLAYER): cv.entity_id,
+        vol.Optional(ATTR_LANGUAGE): cv.string,
+    }
+)
+
+
+async def async_get_service(hass, config, discovery_info=None):
+    """Return the notify service."""
+
+    return TTSNotificationService(config)
+
+
+class TTSNotificationService(BaseNotificationService):
+    """The TTS Notification Service."""
+
+    def __init__(self, config):
+        """Initialize the service."""
+        _, self._tts_service = split_entity_id(config[CONF_TTS_SERVICE])
+        self._media_player = config[CONF_MEDIA_PLAYER]
+        self._language = config.get(ATTR_LANGUAGE)
+
+    async def async_send_message(self, message="", **kwargs):
+        """Call TTS service to speak the notification."""
+        _LOGGER.debug("%s '%s' on %s", self._tts_service, message, self._media_player)
+
+        data = {
+            ATTR_MESSAGE: message,
+            ATTR_ENTITY_ID: self._media_player,
+        }
+        if self._language:
+            data[ATTR_LANGUAGE] = self._language
+
+        await self.hass.services.async_call(
+            DOMAIN,
+            self._tts_service,
+            data,
+        )
diff --git a/homeassistant/components/tuya/config_flow.py b/homeassistant/components/tuya/config_flow.py
index c905334aac7..f00396d4405 100644
--- a/homeassistant/components/tuya/config_flow.py
+++ b/homeassistant/components/tuya/config_flow.py
@@ -22,8 +22,8 @@ DATA_SCHEMA_USER = vol.Schema(
     }
 )
 
-RESULT_AUTH_FAILED = "auth_failed"
-RESULT_CONN_ERROR = "conn_error"
+RESULT_AUTH_FAILED = "invalid_auth"
+RESULT_CONN_ERROR = "cannot_connect"
 RESULT_SUCCESS = "success"
 
 RESULT_LOG_MESSAGE = {
diff --git a/homeassistant/components/tuya/manifest.json b/homeassistant/components/tuya/manifest.json
index b63d9d40ce5..642a4dbe5d1 100644
--- a/homeassistant/components/tuya/manifest.json
+++ b/homeassistant/components/tuya/manifest.json
@@ -2,7 +2,7 @@
   "domain": "tuya",
   "name": "Tuya",
   "documentation": "https://www.home-assistant.io/integrations/tuya",
-  "requirements": ["tuyaha==0.0.7"],
+  "requirements": ["tuyaha==0.0.8"],
   "codeowners": ["@ollo69"],
   "config_flow": true
 }
diff --git a/homeassistant/components/tuya/strings.json b/homeassistant/components/tuya/strings.json
index 891eeb47643..08123db3a36 100644
--- a/homeassistant/components/tuya/strings.json
+++ b/homeassistant/components/tuya/strings.json
@@ -14,12 +14,12 @@
       }
     },
     "abort": {
-      "auth_failed": "[%key:common::config_flow::error::invalid_auth%]",
-      "conn_error": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     },
     "error": {
-      "auth_failed": "[%key:common::config_flow::error::invalid_auth%]"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     }
   }
 }
diff --git a/homeassistant/components/tuya/translations/ca.json b/homeassistant/components/tuya/translations/ca.json
index 20709b61a98..ca88e8b54a4 100644
--- a/homeassistant/components/tuya/translations/ca.json
+++ b/homeassistant/components/tuya/translations/ca.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "Autenticaci\u00f3 inv\u00e0lida",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "conn_error": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
-            "auth_failed": "Autenticaci\u00f3 inv\u00e0lida"
+            "auth_failed": "Autenticaci\u00f3 inv\u00e0lida",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
         },
         "flow_title": "Configuraci\u00f3 de Tuya",
         "step": {
diff --git a/homeassistant/components/tuya/translations/cs.json b/homeassistant/components/tuya/translations/cs.json
index 0dadb787d3a..88bfb2e7322 100644
--- a/homeassistant/components/tuya/translations/cs.json
+++ b/homeassistant/components/tuya/translations/cs.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
             "conn_error": "Nepoda\u0159ilo se p\u0159ipojit",
-            "single_instance_allowed": "Ji\u017e nakonfigurov\u00e1no. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "error": {
-            "auth_failed": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+            "auth_failed": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
         },
         "flow_title": "Konfigurace Tuya",
         "step": {
diff --git a/homeassistant/components/tuya/translations/en.json b/homeassistant/components/tuya/translations/en.json
index c66eb2d274f..8b013c6c062 100644
--- a/homeassistant/components/tuya/translations/en.json
+++ b/homeassistant/components/tuya/translations/en.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "Invalid authentication",
+            "cannot_connect": "Failed to connect",
             "conn_error": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
             "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
-            "auth_failed": "Invalid authentication"
+            "auth_failed": "Invalid authentication",
+            "invalid_auth": "Invalid authentication"
         },
         "flow_title": "Tuya configuration",
         "step": {
diff --git a/homeassistant/components/tuya/translations/es.json b/homeassistant/components/tuya/translations/es.json
index f0a607331f3..41ab447ec8e 100644
--- a/homeassistant/components/tuya/translations/es.json
+++ b/homeassistant/components/tuya/translations/es.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "Autenticaci\u00f3n no v\u00e1lida",
+            "cannot_connect": "No se pudo conectar",
             "conn_error": "No se pudo conectar",
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
-            "auth_failed": "Autenticaci\u00f3n no v\u00e1lida"
+            "auth_failed": "Autenticaci\u00f3n no v\u00e1lida",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
         },
         "flow_title": "Configuraci\u00f3n Tuya",
         "step": {
diff --git a/homeassistant/components/tuya/translations/et.json b/homeassistant/components/tuya/translations/et.json
index 0086fd641f8..c7323e3c189 100644
--- a/homeassistant/components/tuya/translations/et.json
+++ b/homeassistant/components/tuya/translations/et.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "Viga tuvastamisel",
-            "conn_error": "\u00dchendamine eba\u00f5nnestus",
+            "cannot_connect": "\u00dchendamine nurjus",
+            "conn_error": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamise viga",
             "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks sidumine."
         },
         "error": {
-            "auth_failed": "Vigane tuvastamine"
+            "auth_failed": "Vigane tuvastamine",
+            "invalid_auth": "Tuvastamise viga"
         },
         "flow_title": "Tuya seaded",
         "step": {
@@ -17,7 +20,8 @@
                     "platform": "\u00c4pp kus teie konto registreeriti",
                     "username": "Kasutajanimi"
                 },
-                "description": "Sisestage oma Tuya konto andmed."
+                "description": "Sisestage oma Tuya konto andmed.",
+                "title": ""
             }
         }
     }
diff --git a/homeassistant/components/tuya/translations/it.json b/homeassistant/components/tuya/translations/it.json
index fc2c8fc49b3..027764d614f 100644
--- a/homeassistant/components/tuya/translations/it.json
+++ b/homeassistant/components/tuya/translations/it.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "Autenticazione non valida",
+            "cannot_connect": "Impossibile connettersi",
             "conn_error": "Impossibile connettersi",
+            "invalid_auth": "Autenticazione non valida",
             "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
-            "auth_failed": "Autenticazione non valida"
+            "auth_failed": "Autenticazione non valida",
+            "invalid_auth": "Autenticazione non valida"
         },
         "flow_title": "Configurazione di Tuya",
         "step": {
diff --git a/homeassistant/components/tuya/translations/lb.json b/homeassistant/components/tuya/translations/lb.json
index 32595b961a1..db47c64ce11 100644
--- a/homeassistant/components/tuya/translations/lb.json
+++ b/homeassistant/components/tuya/translations/lb.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "Ong\u00eblteg Authentifikatioun",
+            "cannot_connect": "Feeler beim verbannen",
             "conn_error": "Feeler beim verbannen",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "error": {
-            "auth_failed": "Ong\u00eblteg Authentifikatioun"
+            "auth_failed": "Ong\u00eblteg Authentifikatioun",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun"
         },
         "flow_title": "Tuya Konfiguratioun",
         "step": {
diff --git a/homeassistant/components/tuya/translations/nl.json b/homeassistant/components/tuya/translations/nl.json
index 0c1a78eb2a5..f513168a9e1 100644
--- a/homeassistant/components/tuya/translations/nl.json
+++ b/homeassistant/components/tuya/translations/nl.json
@@ -2,6 +2,7 @@
     "config": {
         "abort": {
             "auth_failed": "Verkeerde gegevens",
+            "cannot_connect": "Kan geen verbinding maken",
             "conn_error": "Niet gelukt om te verbinden.",
             "single_instance_allowed": "Al geconfigureerd. Er is maar een configuratie mogelijk."
         },
diff --git a/homeassistant/components/tuya/translations/no.json b/homeassistant/components/tuya/translations/no.json
index 5681f95d984..b2245361e9c 100644
--- a/homeassistant/components/tuya/translations/no.json
+++ b/homeassistant/components/tuya/translations/no.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "Ugyldig godkjenning",
-            "conn_error": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
+            "conn_error": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning",
             "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
-            "auth_failed": "Ugyldig godkjenning"
+            "auth_failed": "Ugyldig godkjenning",
+            "invalid_auth": "Ugyldig godkjenning"
         },
         "flow_title": "Tuya konfigurasjon",
         "step": {
diff --git a/homeassistant/components/tuya/translations/pl.json b/homeassistant/components/tuya/translations/pl.json
index d306172fab0..3e7b62d21ea 100644
--- a/homeassistant/components/tuya/translations/pl.json
+++ b/homeassistant/components/tuya/translations/pl.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "Niepoprawne uwierzytelnienie",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "conn_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
-            "auth_failed": "Niepoprawne uwierzytelnienie"
+            "auth_failed": "Niepoprawne uwierzytelnienie",
+            "invalid_auth": "Niepoprawne uwierzytelnienie"
         },
         "flow_title": "Konfiguracja integracji Tuya",
         "step": {
diff --git a/homeassistant/components/tuya/translations/ru.json b/homeassistant/components/tuya/translations/ru.json
index 4eedc62396e..bdb3ad91c35 100644
--- a/homeassistant/components/tuya/translations/ru.json
+++ b/homeassistant/components/tuya/translations/ru.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "conn_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
-            "auth_failed": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
+            "auth_failed": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
         },
         "flow_title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 Tuya",
         "step": {
diff --git a/homeassistant/components/tuya/translations/zh-Hans.json b/homeassistant/components/tuya/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/tuya/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tuya/translations/zh-Hant.json b/homeassistant/components/tuya/translations/zh-Hant.json
index 2d7d2fe1004..a667ac76b15 100644
--- a/homeassistant/components/tuya/translations/zh-Hant.json
+++ b/homeassistant/components/tuya/translations/zh-Hant.json
@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "auth_failed": "\u9a57\u8b49\u78bc\u7121\u6548",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "conn_error": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
-            "auth_failed": "\u9a57\u8b49\u78bc\u7121\u6548"
+            "auth_failed": "\u9a57\u8b49\u78bc\u7121\u6548",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548"
         },
         "flow_title": "Tuya \u8a2d\u5b9a",
         "step": {
diff --git a/homeassistant/components/twentemilieu/__init__.py b/homeassistant/components/twentemilieu/__init__.py
index 15583b75499..06c2cb27f35 100644
--- a/homeassistant/components/twentemilieu/__init__.py
+++ b/homeassistant/components/twentemilieu/__init__.py
@@ -1,7 +1,6 @@
 """Support for Twente Milieu."""
 import asyncio
 from datetime import timedelta
-import logging
 from typing import Optional
 
 from twentemilieu import TwenteMilieu
@@ -24,8 +23,6 @@ from homeassistant.helpers.typing import ConfigType, HomeAssistantType
 
 SCAN_INTERVAL = timedelta(seconds=3600)
 
-_LOGGER = logging.getLogger(__name__)
-
 SERVICE_UPDATE = "update"
 SERVICE_SCHEMA = vol.Schema({vol.Optional(CONF_ID): cv.string})
 
diff --git a/homeassistant/components/twentemilieu/config_flow.py b/homeassistant/components/twentemilieu/config_flow.py
index 8c2180ca0dd..76c9f33b3e9 100644
--- a/homeassistant/components/twentemilieu/config_flow.py
+++ b/homeassistant/components/twentemilieu/config_flow.py
@@ -1,6 +1,4 @@
 """Config flow to configure the Twente Milieu integration."""
-import logging
-
 from twentemilieu import (
     TwenteMilieu,
     TwenteMilieuAddressError,
@@ -19,8 +17,6 @@ from homeassistant.config_entries import ConfigFlow
 from homeassistant.const import CONF_ID
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @config_entries.HANDLERS.register(DOMAIN)
 class TwenteMilieuFlowHandler(ConfigFlow):
@@ -62,7 +58,7 @@ class TwenteMilieuFlowHandler(ConfigFlow):
         try:
             unique_id = await twentemilieu.unique_id()
         except TwenteMilieuConnectionError:
-            errors["base"] = "connection_error"
+            errors["base"] = "cannot_connect"
             return await self._show_setup_form(errors)
         except TwenteMilieuAddressError:
             errors["base"] = "invalid_address"
@@ -71,7 +67,7 @@ class TwenteMilieuFlowHandler(ConfigFlow):
         entries = self._async_current_entries()
         for entry in entries:
             if entry.data[CONF_ID] == unique_id:
-                return self.async_abort(reason="address_already_set_up")
+                return self.async_abort(reason="already_configured")
 
         return self.async_create_entry(
             title=unique_id,
diff --git a/homeassistant/components/twentemilieu/sensor.py b/homeassistant/components/twentemilieu/sensor.py
index b1be9a071e4..92194e12172 100644
--- a/homeassistant/components/twentemilieu/sensor.py
+++ b/homeassistant/components/twentemilieu/sensor.py
@@ -1,5 +1,4 @@
 """Support for Twente Milieu sensors."""
-import logging
 from typing import Any, Dict
 
 from twentemilieu import (
@@ -20,8 +19,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import HomeAssistantType
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 1
 
 
diff --git a/homeassistant/components/twentemilieu/strings.json b/homeassistant/components/twentemilieu/strings.json
index 75005e7cb37..369484a6392 100644
--- a/homeassistant/components/twentemilieu/strings.json
+++ b/homeassistant/components/twentemilieu/strings.json
@@ -12,9 +12,9 @@
       }
     },
     "error": {
-      "connection_error": "Failed to connect.",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_address": "Address not found in Twente Milieu service area."
     },
-    "abort": { "address_exists": "Address already set up." }
+    "abort": { "already_configured": "[%key:common::config_flow::abort::already_configured_location%]" }
   }
 }
diff --git a/homeassistant/components/twentemilieu/translations/ca.json b/homeassistant/components/twentemilieu/translations/ca.json
index 4c5e1ffeee7..6c97b4bd83d 100644
--- a/homeassistant/components/twentemilieu/translations/ca.json
+++ b/homeassistant/components/twentemilieu/translations/ca.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_exists": "Adre\u00e7a ja configurada."
+            "address_exists": "Adre\u00e7a ja configurada.",
+            "already_configured": "La ubicaci\u00f3 ja est\u00e0 configurada"
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar.",
             "invalid_address": "No s'ha trobat l'adre\u00e7a a l'\u00e0rea de servei de Twente Milieu."
         },
diff --git a/homeassistant/components/twentemilieu/translations/cs.json b/homeassistant/components/twentemilieu/translations/cs.json
new file mode 100644
index 00000000000..58c5185f6aa
--- /dev/null
+++ b/homeassistant/components/twentemilieu/translations/cs.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "address_exists": "Adresa je ji\u017e nastavena.",
+            "already_configured": "Um\u00edst\u011bn\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "Nepoda\u0159ilo se p\u0159ipojit."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "house_number": "\u010c\u00edslo domu",
+                    "post_code": "PS\u010c"
+                },
+                "title": "Twente Milieu"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/twentemilieu/translations/en.json b/homeassistant/components/twentemilieu/translations/en.json
index bc48832db9d..1f96f5f2fad 100644
--- a/homeassistant/components/twentemilieu/translations/en.json
+++ b/homeassistant/components/twentemilieu/translations/en.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_exists": "Address already set up."
+            "address_exists": "Address already set up.",
+            "already_configured": "Location is already configured"
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect.",
             "invalid_address": "Address not found in Twente Milieu service area."
         },
diff --git a/homeassistant/components/twentemilieu/translations/es.json b/homeassistant/components/twentemilieu/translations/es.json
index d336c5ec105..f557ddc77cf 100644
--- a/homeassistant/components/twentemilieu/translations/es.json
+++ b/homeassistant/components/twentemilieu/translations/es.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_exists": "Direcci\u00f3n ya configurada."
+            "address_exists": "Direcci\u00f3n ya configurada.",
+            "already_configured": "La ubicaci\u00f3n ya est\u00e1 configurada"
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se conect\u00f3.",
             "invalid_address": "Direcci\u00f3n no encontrada en el \u00e1rea de servicio de Twente Milieu."
         },
diff --git a/homeassistant/components/twentemilieu/translations/et.json b/homeassistant/components/twentemilieu/translations/et.json
new file mode 100644
index 00000000000..43b7989a125
--- /dev/null
+++ b/homeassistant/components/twentemilieu/translations/et.json
@@ -0,0 +1,16 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Asukoht on juba m\u00e4\u00e4ratud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "\u00dchenduse loomine nurjus"
+        },
+        "step": {
+            "user": {
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/twentemilieu/translations/it.json b/homeassistant/components/twentemilieu/translations/it.json
index a429a565beb..939a0495992 100644
--- a/homeassistant/components/twentemilieu/translations/it.json
+++ b/homeassistant/components/twentemilieu/translations/it.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_exists": "Indirizzo gi\u00e0 impostato."
+            "address_exists": "Indirizzo gi\u00e0 impostato.",
+            "already_configured": "La posizione \u00e8 gi\u00e0 configurata"
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi.",
             "invalid_address": "Indirizzo non trovato nell'area di servizio di Twente Milieu."
         },
diff --git a/homeassistant/components/twentemilieu/translations/no.json b/homeassistant/components/twentemilieu/translations/no.json
index a9d3c184495..05cdee7504a 100644
--- a/homeassistant/components/twentemilieu/translations/no.json
+++ b/homeassistant/components/twentemilieu/translations/no.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_exists": "Adressen er allerede satt opp."
+            "address_exists": "Adressen er allerede satt opp.",
+            "already_configured": "Plasseringen er allerede konfigurert"
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Tilkobling mislyktes.",
             "invalid_address": "Adresse ble ikke funnet i Twente Milieu tjenesteomr\u00e5de."
         },
diff --git a/homeassistant/components/twentemilieu/translations/pl.json b/homeassistant/components/twentemilieu/translations/pl.json
index e654bbac6a4..33d03480310 100644
--- a/homeassistant/components/twentemilieu/translations/pl.json
+++ b/homeassistant/components/twentemilieu/translations/pl.json
@@ -1,11 +1,13 @@
 {
     "config": {
         "abort": {
-            "address_exists": "Adres jest ju\u017c skonfigurowany."
+            "address_exists": "Adres jest ju\u017c skonfigurowany",
+            "already_configured": "Lokalizacja jest ju\u017c skonfigurowana"
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "invalid_address": "Nie znaleziono adresu w obszarze us\u0142ugi Twente Milieu."
+            "invalid_address": "Nie znaleziono adresu w obszarze us\u0142ugi Twente Milieu"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/twentemilieu/translations/ru.json b/homeassistant/components/twentemilieu/translations/ru.json
index 4f470da8385..8a222657c6c 100644
--- a/homeassistant/components/twentemilieu/translations/ru.json
+++ b/homeassistant/components/twentemilieu/translations/ru.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_exists": "\u0410\u0434\u0440\u0435\u0441 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d."
+            "address_exists": "\u0410\u0434\u0440\u0435\u0441 \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d.",
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f.",
             "invalid_address": "\u0410\u0434\u0440\u0435\u0441 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d \u0432 \u0437\u043e\u043d\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f Twente Milieu."
         },
diff --git a/homeassistant/components/twentemilieu/translations/zh-Hans.json b/homeassistant/components/twentemilieu/translations/zh-Hans.json
index 80301cfd57b..507422c7355 100644
--- a/homeassistant/components/twentemilieu/translations/zh-Hans.json
+++ b/homeassistant/components/twentemilieu/translations/zh-Hans.json
@@ -2,6 +2,10 @@
     "config": {
         "abort": {
             "address_exists": "\u5730\u5740\u5df2\u7ecf\u8bbe\u7f6e\u597d\u4e86\u3002"
+        },
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25",
+            "connection_error": "\u8fde\u63a5\u5931\u8d25\u3002"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/twentemilieu/translations/zh-Hant.json b/homeassistant/components/twentemilieu/translations/zh-Hant.json
index 7ee372b14d2..1a20f1ba1ac 100644
--- a/homeassistant/components/twentemilieu/translations/zh-Hant.json
+++ b/homeassistant/components/twentemilieu/translations/zh-Hant.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_exists": "\u5730\u5740\u5df2\u8a2d\u5b9a\u3002"
+            "address_exists": "\u5730\u5740\u5df2\u8a2d\u5b9a\u3002",
+            "already_configured": "\u5ea7\u6a19\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "\u9023\u7dda\u5931\u6557\u3002",
             "invalid_address": "Twente Milieu \u670d\u52d9\u5340\u57df\u5167\u627e\u4e0d\u5230\u6b64\u5730\u5740\u3002"
         },
diff --git a/homeassistant/components/twilio/strings.json b/homeassistant/components/twilio/strings.json
index 96e0249df9a..0480fdae7c8 100644
--- a/homeassistant/components/twilio/strings.json
+++ b/homeassistant/components/twilio/strings.json
@@ -7,7 +7,7 @@
       }
     },
     "abort": {
-      "one_instance_allowed": "Only a single instance is necessary.",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
       "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive Twilio messages."
     },
     "create_entry": {
diff --git a/homeassistant/components/twilio/translations/ca.json b/homeassistant/components/twilio/translations/ca.json
index 591124fda28..b4adcdb1cb4 100644
--- a/homeassistant/components/twilio/translations/ca.json
+++ b/homeassistant/components/twilio/translations/ca.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Twilio.",
-            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
+            "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "create_entry": {
             "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar [Webhooks amb Twilio]({twilio_url}).\n\nCompleta la seg\u00fcent informaci\u00f3 : \n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n- Tipus de contingut: application/x-www-form-urlencoded\n\nConsulta la [documentaci\u00f3]({docs_url}) sobre com configurar les automatitzacions per gestionar dades entrants."
diff --git a/homeassistant/components/twilio/translations/cs.json b/homeassistant/components/twilio/translations/cs.json
index 073aab126c1..1b5acf21077 100644
--- a/homeassistant/components/twilio/translations/cs.json
+++ b/homeassistant/components/twilio/translations/cs.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Va\u0161e Home Assistant instance mus\u00ed b\u00fdt p\u0159\u00edstupn\u00e1 z internetu aby mohla p\u0159ij\u00edmat zpr\u00e1vy Twilio.",
-            "one_instance_allowed": "Povolena je pouze jedna instance."
+            "not_internet_accessible": "V\u00e1\u0161 Home Asistent mus\u00ed b\u00fdt p\u0159\u00edstupn\u00fd z internetu, aby mohl p\u0159ij\u00edmat zpr\u00e1vy od Twilio.",
+            "one_instance_allowed": "Povolena je pouze jedna instance.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "create_entry": {
             "default": "Chcete-li odeslat ud\u00e1losti do aplikace Home Assistant, mus\u00edte nastavit [Webhooks s Twilio]({twilio_url}). \n\n Vypl\u0148te n\u00e1sleduj\u00edc\u00ed informace: \n\n - URL: `{webhook_url}' \n - Metoda: POST \n - Typ obsahu: application/x-www-form-urlencoded \n\n Viz [dokumentace]({docs_url}), jak konfigurovat automatizace pro zpracov\u00e1n\u00ed p\u0159\u00edchoz\u00edch dat."
diff --git a/homeassistant/components/twilio/translations/el.json b/homeassistant/components/twilio/translations/el.json
new file mode 100644
index 00000000000..aecb2ee553f
--- /dev/null
+++ b/homeassistant/components/twilio/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 \u03ae\u03b4\u03b7. \u039c\u03cc\u03bd\u03bf \u03bc\u03af\u03b1 \u03c0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/twilio/translations/en.json b/homeassistant/components/twilio/translations/en.json
index 32df9de104d..de5d921dec2 100644
--- a/homeassistant/components/twilio/translations/en.json
+++ b/homeassistant/components/twilio/translations/en.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Your Home Assistant instance needs to be accessible from the internet to receive Twilio messages.",
-            "one_instance_allowed": "Only a single instance is necessary."
+            "one_instance_allowed": "Only a single instance is necessary.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "create_entry": {
             "default": "To send events to Home Assistant, you will need to setup [Webhooks with Twilio]({twilio_url}).\n\nFill in the following info:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/x-www-form-urlencoded\n\nSee [the documentation]({docs_url}) on how to configure automations to handle incoming data."
diff --git a/homeassistant/components/twilio/translations/es.json b/homeassistant/components/twilio/translations/es.json
index a470b3619a4..b7ba037eef6 100644
--- a/homeassistant/components/twilio/translations/es.json
+++ b/homeassistant/components/twilio/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Tu instancia de Home Assistant debe ser accesible desde Internet para recibir mensajes de Twilio.",
-            "one_instance_allowed": "S\u00f3lo se necesita una instancia."
+            "one_instance_allowed": "Solo es necesaria una instancia.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
             "default": "Para enviar eventos a Home Assistant debes configurar los [Webhooks en Twilio]({twilio_url}). \n\n Completa la siguiente informaci\u00f3n: \n\n - URL: `{webhook_url}` \n - M\u00e9todo: POST \n - Tipo de contenido: application/x-www-form-urlencoded \n\nConsulta [la documentaci\u00f3n]({docs_url}) sobre c\u00f3mo configurar las automatizaciones para manejar los datos entrantes."
diff --git a/homeassistant/components/twilio/translations/et.json b/homeassistant/components/twilio/translations/et.json
new file mode 100644
index 00000000000..faa0ab7769e
--- /dev/null
+++ b/homeassistant/components/twilio/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Lubatud on ainult \u00fcks sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "user": {
+                "description": "Kas soovid Twilio-t seadistada?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/twilio/translations/fr.json b/homeassistant/components/twilio/translations/fr.json
index 2144fdd1d48..3136fb53974 100644
--- a/homeassistant/components/twilio/translations/fr.json
+++ b/homeassistant/components/twilio/translations/fr.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Votre instance de Home Assistant doit \u00eatre accessible depuis Internet pour recevoir les messages Twilio.",
-            "one_instance_allowed": "Une seule instance est n\u00e9cessaire."
+            "one_instance_allowed": "Une seule instance est n\u00e9cessaire.",
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "create_entry": {
             "default": "Pour envoyer des \u00e9v\u00e9nements \u00e0 Home Assistant, vous devez configurer [Webhooks avec Twilio] ( {twilio_url} ). \n\n Remplissez les informations suivantes: \n\n - URL: ` {webhook_url} ` \n - M\u00e9thode: POST \n - Type de contenu: application / x-www-form-urlencoded \n\n Voir [la documentation] ( {docs_url} ) pour savoir comment configurer les automatisations pour g\u00e9rer les donn\u00e9es entrantes."
diff --git a/homeassistant/components/twilio/translations/it.json b/homeassistant/components/twilio/translations/it.json
index 8bf92bf60a2..ee7ed374cea 100644
--- a/homeassistant/components/twilio/translations/it.json
+++ b/homeassistant/components/twilio/translations/it.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "La tua istanza di Home Assistant deve essere accessibile da Internet per ricevere messaggi da Twilio.",
-            "one_instance_allowed": "\u00c8 necessaria una sola istanza."
+            "one_instance_allowed": "\u00c8 necessaria una sola istanza.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "create_entry": {
             "default": "Per inviare eventi a Home Assistant, dovrai configurare [Webhooks con Twilio]({twilio_url})\n\n Compila le seguenti informazioni: \n\n - URL: `{webhook_url}` \n - Method: POST \n - Content Type: application/x-www-form-urlencoded\n\n Vedi [la documentazione]({docs_url}) su come configurare le automazioni per gestire i dati in arrivo."
diff --git a/homeassistant/components/twilio/translations/lb.json b/homeassistant/components/twilio/translations/lb.json
index 8f741409059..5183c9f12fd 100644
--- a/homeassistant/components/twilio/translations/lb.json
+++ b/homeassistant/components/twilio/translations/lb.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u00c4r Home Assistant Instanz muss iwwert Internet accessibel si fir Twilio Noriichten z'empf\u00e4nken.",
-            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg."
+            "one_instance_allowed": "N\u00ebmmen eng eenzeg Instanz ass n\u00e9ideg.",
+            "single_instance_allowed": "Scho konfigur\u00e9iert. N\u00ebmmen eng eenzeg Konfiguratioun ass m\u00e9iglech."
         },
         "create_entry": {
             "default": "Fir Evenementer un Home Assistant ze sch\u00e9cken, mussen [Webhooks mat Twilio]({twilio_url}) ageriicht ginn.\n\nF\u00ebllt folgend Informatiounen aus:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/x-www-form-urlencoded\n\nLiest [Dokumentatioun]({docs_url}) w\u00e9i een Automatiounen ariicht welch eingehend Donn\u00e9\u00eb trait\u00e9ieren."
diff --git a/homeassistant/components/twilio/translations/nl.json b/homeassistant/components/twilio/translations/nl.json
index 0af84ebb172..f65a06061c0 100644
--- a/homeassistant/components/twilio/translations/nl.json
+++ b/homeassistant/components/twilio/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Uw Home Assistant instantie moet toegankelijk zijn vanaf het internet om Twillo-berichten te ontvangen.",
-            "one_instance_allowed": "Slechts \u00e9\u00e9n exemplaar is nodig."
+            "one_instance_allowed": "Slechts \u00e9\u00e9n exemplaar is nodig.",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "create_entry": {
             "default": "Om evenementen naar de Home Assistant te verzenden, moet u [Webhooks with Twilio] ( {twilio_url} ) instellen. \n\n Vul de volgende info in: \n\n - URL: ` {webhook_url} ` \n - Methode: POST \n - Inhoudstype: application / x-www-form-urlencoded \n\n Zie [de documentatie] ( {docs_url} ) voor informatie over het configureren van automatiseringen om binnenkomende gegevens te verwerken."
diff --git a/homeassistant/components/twilio/translations/no.json b/homeassistant/components/twilio/translations/no.json
index 98b2575d691..3f73ce0d3e0 100644
--- a/homeassistant/components/twilio/translations/no.json
+++ b/homeassistant/components/twilio/translations/no.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Din Home Assistant forekomst m\u00e5 v\u00e6re tilgjengelig fra internett for \u00e5 motta Twilio-meldinger.",
-            "one_instance_allowed": "Kun en forekomst er n\u00f8dvendig."
+            "one_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "create_entry": {
             "default": "For \u00e5 sende hendelser til Home Assistant, m\u00e5 du sette opp [Webhooks with Twilio]({twilio_url}). \n\nFyll ut f\u00f8lgende informasjon: \n\n- URL: `{webhook_url}` \n- Metode: POST\n- Innholdstype: application/x-www-form-urlencoded \n\n Se [dokumentasjonen]({docs_url}) om hvordan du konfigurerer automatiseringer for \u00e5 h\u00e5ndtere innkommende data."
diff --git a/homeassistant/components/twilio/translations/pl.json b/homeassistant/components/twilio/translations/pl.json
index 8c7a4da4cdd..2a4b6766b98 100644
--- a/homeassistant/components/twilio/translations/pl.json
+++ b/homeassistant/components/twilio/translations/pl.json
@@ -1,11 +1,12 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty Twilio.",
-            "one_instance_allowed": "Wymagana jest tylko jedna instancja."
+            "not_internet_accessible": "Tw\u00f3j Home Assistant musi by\u0107 dost\u0119pny z Internetu, aby odbiera\u0107 komunikaty Twilio",
+            "one_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "create_entry": {
-            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistanta, musisz skonfigurowa\u0107 [Twilio Webhook]({twilio_url}). \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n - Typ zawarto\u015bci: application/x-www-form-urlencoded \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) na temat konfiguracji automatyzacji, by obs\u0142u\u017cy\u0107 przychodz\u0105ce dane."
+            "default": "Aby wysy\u0142a\u0107 zdarzenia do Home Assistant, musisz skonfigurowa\u0107 [Twilio Webhook]({twilio_url}). \n\n Wprowad\u017a nast\u0119puj\u0105ce dane:\n\n - URL: `{webhook_url}` \n - Metoda: POST \n - Typ zawarto\u015bci: application/x-www-form-urlencoded \n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) na temat konfiguracji automatyzacji, by obs\u0142u\u017cy\u0107 przychodz\u0105ce dane."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/twilio/translations/ru.json b/homeassistant/components/twilio/translations/ru.json
index cdb9377cd99..74972ab9b08 100644
--- a/homeassistant/components/twilio/translations/ru.json
+++ b/homeassistant/components/twilio/translations/ru.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "\u0412\u0430\u0448 Home Assistant \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0438\u0437 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0430 \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 Twilio.",
-            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "one_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "create_entry": {
             "default": "\u0414\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u0439 \u0432 Home Assistant \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Webhook \u0434\u043b\u044f [Twilio]({twilio_url}).\n\n\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e:\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/x-www-form-urlencoded\n\n\u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438]({docs_url}) \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0437\u0430\u0446\u0438\u0439 \u043f\u043e \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0435 \u043f\u043e\u0441\u0442\u0443\u043f\u0430\u044e\u0449\u0438\u0445 \u0434\u0430\u043d\u043d\u044b\u0445."
diff --git a/homeassistant/components/twilio/translations/zh-Hant.json b/homeassistant/components/twilio/translations/zh-Hant.json
index cc198a4f43d..1f07a1f44e1 100644
--- a/homeassistant/components/twilio/translations/zh-Hant.json
+++ b/homeassistant/components/twilio/translations/zh-Hant.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "not_internet_accessible": "Home Assistant \u8a2d\u5099\u5fc5\u9808\u80fd\u5920\u7531\u7db2\u969b\u7db2\u8def\u5b58\u53d6\uff0c\u65b9\u80fd\u63a5\u53d7 Twilio \u8a0a\u606f\u3002",
-            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002"
+            "one_instance_allowed": "\u50c5\u9700\u8a2d\u5b9a\u4e00\u7d44\u7269\u4ef6\u5373\u53ef\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "create_entry": {
             "default": "\u6b32\u50b3\u9001\u4e8b\u4ef6\u81f3 Home Assistant\uff0c\u5c07\u9700\u8a2d\u5b9a [Webhooks with Twilio]({twilio_url})\u3002\n\n\u8acb\u586b\u5beb\u4e0b\u5217\u8cc7\u8a0a\uff1a\n\n- URL: `{webhook_url}`\n- Method: POST\n- Content Type: application/x-www-form-urlencoded\n\n\u95dc\u65bc\u5982\u4f55\u50b3\u5165\u8cc7\u6599\u81ea\u52d5\u5316\u8a2d\u5b9a\uff0c\u8acb\u53c3\u95b1[\u6587\u4ef6]({docs_url})\u4ee5\u9032\u884c\u4e86\u89e3\u3002"
diff --git a/homeassistant/components/twitch/sensor.py b/homeassistant/components/twitch/sensor.py
index 52212fca060..4b019628158 100644
--- a/homeassistant/components/twitch/sensor.py
+++ b/homeassistant/components/twitch/sensor.py
@@ -72,11 +72,6 @@ class TwitchSensor(Entity):
         self._follow = None
         self._statistics = None
 
-    @property
-    def should_poll(self):
-        """Device should be polled."""
-        return True
-
     @property
     def name(self):
         """Return the name of the sensor."""
diff --git a/homeassistant/components/unifi/__init__.py b/homeassistant/components/unifi/__init__.py
index 610d39b0fb9..439073497a2 100644
--- a/homeassistant/components/unifi/__init__.py
+++ b/homeassistant/components/unifi/__init__.py
@@ -1,9 +1,6 @@
 """Support for devices connected to UniFi POE."""
-import voluptuous as vol
-
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 
 from .config_flow import get_controller_id_from_config_entry
@@ -19,11 +16,6 @@ SAVE_DELAY = 10
 STORAGE_KEY = "unifi_data"
 STORAGE_VERSION = 1
 
-CONFIG_SCHEMA = vol.Schema(
-    cv.deprecated(UNIFI_DOMAIN, invalidation_version="0.109"),
-    {UNIFI_DOMAIN: cv.match_all},
-)
-
 
 async def async_setup(hass, config):
     """Component doesn't support configuration through configuration.yaml."""
@@ -54,10 +46,9 @@ async def async_setup_entry(hass, config_entry):
     device_registry.async_get_or_create(
         config_entry_id=config_entry.entry_id,
         connections={(CONNECTION_NETWORK_MAC, controller.mac)},
-        manufacturer=ATTR_MANUFACTURER,
-        model="UniFi Controller",
-        name="UniFi Controller",
-        # sw_version=config.raw['swversion'],
+        default_manufacturer=ATTR_MANUFACTURER,
+        default_model="UniFi Controller",
+        default_name="UniFi Controller",
     )
 
     return True
diff --git a/homeassistant/components/unifi/device_tracker.py b/homeassistant/components/unifi/device_tracker.py
index 831a8335528..a3352631885 100644
--- a/homeassistant/components/unifi/device_tracker.py
+++ b/homeassistant/components/unifi/device_tracker.py
@@ -1,6 +1,5 @@
 """Track devices using UniFi controllers."""
 from datetime import timedelta
-import logging
 
 from aiounifi.api import SOURCE_DATA, SOURCE_EVENT
 from aiounifi.events import (
@@ -29,8 +28,6 @@ from .const import ATTR_MANUFACTURER, DOMAIN as UNIFI_DOMAIN
 from .unifi_client import UniFiClient
 from .unifi_entity_base import UniFiBase
 
-LOGGER = logging.getLogger(__name__)
-
 CLIENT_TRACKER = "client"
 DEVICE_TRACKER = "device"
 
@@ -233,9 +230,7 @@ class UniFiClientTracker(UniFiClient, ScannerEntity):
     @property
     def device_state_attributes(self):
         """Return the client state attributes."""
-        attributes = {}
-
-        attributes["is_wired"] = self.is_wired
+        attributes = {"is_wired": self.is_wired}
 
         if self.is_connected:
             for variable in CLIENT_CONNECTED_ATTRIBUTES:
diff --git a/homeassistant/components/unifi/sensor.py b/homeassistant/components/unifi/sensor.py
index 59aff09811f..c0b8cea09c2 100644
--- a/homeassistant/components/unifi/sensor.py
+++ b/homeassistant/components/unifi/sensor.py
@@ -1,6 +1,4 @@
 """Support for bandwidth sensors with UniFi clients."""
-import logging
-
 from homeassistant.components.sensor import DEVICE_CLASS_TIMESTAMP, DOMAIN
 from homeassistant.const import DATA_MEGABYTES
 from homeassistant.core import callback
@@ -10,17 +8,11 @@ import homeassistant.util.dt as dt_util
 from .const import DOMAIN as UNIFI_DOMAIN
 from .unifi_client import UniFiClient
 
-LOGGER = logging.getLogger(__name__)
-
 RX_SENSOR = "rx"
 TX_SENSOR = "tx"
 UPTIME_SENSOR = "uptime"
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Sensor platform doesn't support configuration through configuration.yaml."""
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up sensors for UniFi integration."""
     controller = hass.data[UNIFI_DOMAIN][config_entry.entry_id]
diff --git a/homeassistant/components/unifi/strings.json b/homeassistant/components/unifi/strings.json
index ba0b3952dd0..9deb68f4e3b 100644
--- a/homeassistant/components/unifi/strings.json
+++ b/homeassistant/components/unifi/strings.json
@@ -9,7 +9,7 @@
           "password": "[%key:common::config_flow::data::password%]",
           "port": "[%key:common::config_flow::data::port%]",
           "site": "Site ID",
-          "verify_ssl": "Controller using proper certificate"
+          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
         }
       }
     },
diff --git a/homeassistant/components/unifi/switch.py b/homeassistant/components/unifi/switch.py
index 1b9f7147a9a..9bdb35baf4d 100644
--- a/homeassistant/components/unifi/switch.py
+++ b/homeassistant/components/unifi/switch.py
@@ -17,7 +17,7 @@ from homeassistant.helpers.restore_state import RestoreEntity
 from .const import DOMAIN as UNIFI_DOMAIN
 from .unifi_client import UniFiClient
 
-LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(__name__)
 
 BLOCK_SWITCH = "block"
 POE_SWITCH = "poe"
@@ -26,10 +26,6 @@ CLIENT_BLOCKED = (WIRED_CLIENT_BLOCKED, WIRELESS_CLIENT_BLOCKED)
 CLIENT_UNBLOCKED = (WIRED_CLIENT_UNBLOCKED, WIRELESS_CLIENT_UNBLOCKED)
 
 
-async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
-    """Component doesn't support configuration through configuration.yaml."""
-
-
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up switches for UniFi component.
 
@@ -229,7 +225,7 @@ class UniFiPOEClientSwitch(UniFiClient, SwitchEntity, RestoreEntity):
         try:
             return self.device.ports[self.client.sw_port]
         except (AttributeError, KeyError, TypeError):
-            LOGGER.warning(
+            _LOGGER.warning(
                 "Entity %s reports faulty device %s or port %s",
                 self.entity_id,
                 self.client.sw_mac,
diff --git a/homeassistant/components/unifi/translations/ca.json b/homeassistant/components/unifi/translations/ca.json
index 8fe38c706ba..fb52e583d36 100644
--- a/homeassistant/components/unifi/translations/ca.json
+++ b/homeassistant/components/unifi/translations/ca.json
@@ -16,7 +16,7 @@
                     "port": "[%key::common::config_flow::data::port%]",
                     "site": "ID del lloc",
                     "username": "[%key::common::config_flow::data::username%]",
-                    "verify_ssl": "El controlador est\u00e0 utilitzant un certificat adequat"
+                    "verify_ssl": "Verifica el certificat SSL"
                 },
                 "title": "Configuraci\u00f3 del controlador UniFi"
             }
diff --git a/homeassistant/components/unifi/translations/cs.json b/homeassistant/components/unifi/translations/cs.json
index c7e1ddc7136..b599756677e 100644
--- a/homeassistant/components/unifi/translations/cs.json
+++ b/homeassistant/components/unifi/translations/cs.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ovlada\u010d je ji\u017e nakonfigurov\u00e1n"
+            "already_configured": "Ovlada\u010d je ji\u017e nastaven"
         },
         "error": {
-            "faulty_credentials": "Chybn\u00e9 p\u0159ihla\u0161ovac\u00ed \u00fadaje",
+            "faulty_credentials": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
             "service_unavailable": "Nepoda\u0159ilo se p\u0159ipojit",
             "unknown_client_mac": "Na t\u00e9to MAC adrese nen\u00ed dostupn\u00fd \u017e\u00e1dn\u00fd klient"
         },
@@ -16,7 +16,7 @@
                     "port": "Port",
                     "site": "ID s\u00edt\u011b",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no",
-                    "verify_ssl": "Ovlada\u010d pou\u017e\u00edv\u00e1 spr\u00e1vn\u00fd certifik\u00e1t"
+                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL"
                 },
                 "title": "Nastaven\u00ed UniFi ovlada\u010de"
             }
@@ -26,12 +26,15 @@
         "step": {
             "client_control": {
                 "data": {
+                    "block_client": "Klienti s p\u0159\u00edstupem k s\u00edti",
                     "poe_clients": "Povolit u klient\u016f ovl\u00e1d\u00e1n\u00ed POE"
                 },
+                "description": "Nakonfigurujte ovl\u00e1dac\u00ed prvky klienta\n\nVytvo\u0159te vyp\u00edna\u010de pro s\u00e9riov\u00e1 \u010d\u00edsla, pro kter\u00e1 chcete \u0159\u00eddit p\u0159\u00edstup k s\u00edti.",
                 "title": "Mo\u017enosti UniFi 2/3"
             },
             "device_tracker": {
                 "data": {
+                    "detection_time": "Po\u010det sekund od posledn\u00edho vid\u011bn\u00ed, aby bylo za\u0159\u00edzen\u00ed ozna\u010deno, \u017ee je pry\u010d",
                     "ssid_filter": "Vyberte SSID, ve kter\u00e9m budou sledov\u00e1ni bezdr\u00e1tov\u011b p\u0159ipojen\u00ed klienti",
                     "track_clients": "Sledovat p\u0159ipojen\u00e9 klienty",
                     "track_devices": "Sledovat p\u0159ipojen\u00e1 za\u0159\u00edzen\u00ed (Ubiquiti za\u0159\u00edzen\u00ed)",
@@ -42,6 +45,7 @@
             },
             "simple_options": {
                 "data": {
+                    "block_client": "Klienti s p\u0159\u00edstupem k s\u00edti",
                     "track_clients": "Sledov\u00e1n\u00ed p\u0159ipojen\u00fdch za\u0159\u00edzen\u00ed",
                     "track_devices": "Sledov\u00e1n\u00ed s\u00ed\u0165ov\u00fdch za\u0159\u00edzen\u00ed (za\u0159\u00edzen\u00ed Ubiquiti)"
                 },
diff --git a/homeassistant/components/unifi/translations/en.json b/homeassistant/components/unifi/translations/en.json
index 72dec2e7709..ed3a26b335a 100644
--- a/homeassistant/components/unifi/translations/en.json
+++ b/homeassistant/components/unifi/translations/en.json
@@ -16,7 +16,7 @@
                     "port": "Port",
                     "site": "Site ID",
                     "username": "Username",
-                    "verify_ssl": "Controller using proper certificate"
+                    "verify_ssl": "Verify SSL certificate"
                 },
                 "title": "Set up UniFi Controller"
             }
diff --git a/homeassistant/components/unifi/translations/et.json b/homeassistant/components/unifi/translations/et.json
new file mode 100644
index 00000000000..99a7ed01077
--- /dev/null
+++ b/homeassistant/components/unifi/translations/et.json
@@ -0,0 +1,32 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Kontroller on juba seadistatud"
+        },
+        "error": {
+            "faulty_credentials": "Tuvastamine nurjus",
+            "service_unavailable": "\u00dchendamine nurjus",
+            "unknown_client_mac": "Sellel MAC-aadressil pole \u00fchtegi klienti saadaval"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "",
+                    "password": "Salas\u00f5na",
+                    "port": "",
+                    "username": "Kasutajanimi",
+                    "verify_ssl": "Kontrolli SSL sertifikaati"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "statistics_sensors": {
+                "data": {
+                    "allow_uptime_sensors": "V\u00f5rguklientide t\u00f6\u00f6soleku andurid"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/unifi/translations/it.json b/homeassistant/components/unifi/translations/it.json
index 43fd5b31c23..91326796740 100644
--- a/homeassistant/components/unifi/translations/it.json
+++ b/homeassistant/components/unifi/translations/it.json
@@ -16,7 +16,7 @@
                     "port": "Porta",
                     "site": "ID del sito",
                     "username": "Nome utente",
-                    "verify_ssl": "Il Controller sta utilizzando il certificato corretto"
+                    "verify_ssl": "Verificare il certificato SSL"
                 },
                 "title": "Configura l'UniFi Controller"
             }
diff --git a/homeassistant/components/unifi/translations/nl.json b/homeassistant/components/unifi/translations/nl.json
index f945e5c4d6d..9c4804c09a2 100644
--- a/homeassistant/components/unifi/translations/nl.json
+++ b/homeassistant/components/unifi/translations/nl.json
@@ -54,7 +54,8 @@
                 "data": {
                     "block_client": "Cli\u00ebnten met netwerktoegang",
                     "track_clients": "Volg netwerkclients"
-                }
+                },
+                "description": "Configureer UniFi-integratie"
             },
             "statistics_sensors": {
                 "data": {
diff --git a/homeassistant/components/unifi/translations/no.json b/homeassistant/components/unifi/translations/no.json
index fa0d29c5a88..4b2c6d3d4f7 100644
--- a/homeassistant/components/unifi/translations/no.json
+++ b/homeassistant/components/unifi/translations/no.json
@@ -13,10 +13,10 @@
                 "data": {
                     "host": "Vert",
                     "password": "Passord",
-                    "port": "",
+                    "port": "Port",
                     "site": "Nettsted-ID",
                     "username": "Brukernavn",
-                    "verify_ssl": "Kontroller bruker riktig sertifikat"
+                    "verify_ssl": "Verifisere SSL-sertifikat"
                 },
                 "title": "Sett opp UniFi kontroller"
             }
@@ -54,7 +54,7 @@
                 "data": {
                     "block_client": "Nettverkskontrollerte klienter",
                     "track_clients": "Spor nettverksklienter",
-                    "track_devices": "Spor nettverksenheter (Ubiquiti enheter)"
+                    "track_devices": "Spore nettverksenheter (Ubiquiti-enheter)"
                 },
                 "description": "Konfigurer UniFi-integrasjon"
             },
diff --git a/homeassistant/components/unifi/translations/pl.json b/homeassistant/components/unifi/translations/pl.json
index 4aecd4502fa..b24105478f4 100644
--- a/homeassistant/components/unifi/translations/pl.json
+++ b/homeassistant/components/unifi/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Witryna kontrolera jest ju\u017c skonfigurowana."
+            "already_configured": "Us\u0142uga jest ju\u017c skonfigurowana"
         },
         "error": {
             "faulty_credentials": "Niepoprawne uwierzytelnienie",
@@ -16,7 +16,7 @@
                     "port": "Port",
                     "site": "Identyfikator witryny",
                     "username": "Nazwa u\u017cytkownika",
-                    "verify_ssl": "Kontroler u\u017cywa prawid\u0142owego certyfikatu"
+                    "verify_ssl": "Weryfikacja certyfikatu SSL"
                 },
                 "title": "Konfiguracja kontrolera UniFi"
             }
@@ -62,7 +62,8 @@
             },
             "statistics_sensors": {
                 "data": {
-                    "allow_bandwidth_sensors": "Stw\u00f3rz sensory wykorzystania przepustowo\u015bci przez klient\u00f3w sieciowych"
+                    "allow_bandwidth_sensors": "Sensory wykorzystania przepustowo\u015bci przez klient\u00f3w sieciowych",
+                    "allow_uptime_sensors": "Sensory czasu pracy dla klient\u00f3w sieciowych"
                 },
                 "description": "Konfiguracja sensora statystyk",
                 "title": "Opcje UniFi"
diff --git a/homeassistant/components/unifi/translations/ru.json b/homeassistant/components/unifi/translations/ru.json
index 8276b41e33b..9096408474a 100644
--- a/homeassistant/components/unifi/translations/ru.json
+++ b/homeassistant/components/unifi/translations/ru.json
@@ -16,7 +16,7 @@
                     "port": "\u041f\u043e\u0440\u0442",
                     "site": "ID \u0441\u0430\u0439\u0442\u0430",
                     "username": "\u041b\u043e\u0433\u0438\u043d",
-                    "verify_ssl": "\u041a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442"
+                    "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 },
                 "title": "UniFi Controller"
             }
diff --git a/homeassistant/components/unifi/translations/sv.json b/homeassistant/components/unifi/translations/sv.json
index a0388cb7611..eb4e0d8ee3d 100644
--- a/homeassistant/components/unifi/translations/sv.json
+++ b/homeassistant/components/unifi/translations/sv.json
@@ -38,6 +38,9 @@
                     "other": "Tomma"
                 }
             },
+            "simple_options": {
+                "description": "Konfigurera UniFi-integrationen"
+            },
             "statistics_sensors": {
                 "data": {
                     "allow_bandwidth_sensors": "Skapa bandbreddsanv\u00e4ndningssensorer f\u00f6r n\u00e4tverksklienter"
diff --git a/homeassistant/components/unifi/translations/zh-Hant.json b/homeassistant/components/unifi/translations/zh-Hant.json
index bd43b062786..1ed8d8d8856 100644
--- a/homeassistant/components/unifi/translations/zh-Hant.json
+++ b/homeassistant/components/unifi/translations/zh-Hant.json
@@ -16,7 +16,7 @@
                     "port": "\u901a\u8a0a\u57e0",
                     "site": "\u4f4d\u5740 ID",
                     "username": "\u4f7f\u7528\u8005\u540d\u7a31",
-                    "verify_ssl": "\u63a7\u5236\u5668\u4f7f\u7528\u9a57\u8b49"
+                    "verify_ssl": "\u78ba\u8a8d SSL \u8a8d\u8b49"
                 },
                 "title": "\u8a2d\u5b9a UniFi \u63a7\u5236\u5668"
             }
diff --git a/homeassistant/components/unifi/unifi_client.py b/homeassistant/components/unifi/unifi_client.py
index 9842cdc0777..17f5a473211 100644
--- a/homeassistant/components/unifi/unifi_client.py
+++ b/homeassistant/components/unifi/unifi_client.py
@@ -1,13 +1,8 @@
 """Base class for UniFi clients."""
-
-import logging
-
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 
 from .unifi_entity_base import UniFiBase
 
-LOGGER = logging.getLogger(__name__)
-
 
 class UniFiClient(UniFiBase):
     """Base class for UniFi clients."""
@@ -54,4 +49,8 @@ class UniFiClient(UniFiBase):
     @property
     def device_info(self) -> dict:
         """Return a client description for device registry."""
-        return {"connections": {(CONNECTION_NETWORK_MAC, self.client.mac)}}
+        return {
+            "connections": {(CONNECTION_NETWORK_MAC, self.client.mac)},
+            "default_name": self.name,
+            "default_manufacturer": self.client.oui,
+        }
diff --git a/homeassistant/components/unifi/unifi_entity_base.py b/homeassistant/components/unifi/unifi_entity_base.py
index 46a7123e4c9..42820cf69b0 100644
--- a/homeassistant/components/unifi/unifi_entity_base.py
+++ b/homeassistant/components/unifi/unifi_entity_base.py
@@ -6,7 +6,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_registry import async_entries_for_device
 
-LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(__name__)
 
 
 class UniFiBase(Entity):
@@ -26,7 +26,9 @@ class UniFiBase(Entity):
 
     async def async_added_to_hass(self) -> None:
         """Entity created."""
-        LOGGER.debug("New %s entity %s (%s)", self.TYPE, self.entity_id, self._item.mac)
+        _LOGGER.debug(
+            "New %s entity %s (%s)", self.TYPE, self.entity_id, self._item.mac
+        )
         for signal, method in (
             (self.controller.signal_reachable, self.async_update_callback),
             (self.controller.signal_options_update, self.options_updated),
@@ -37,7 +39,7 @@ class UniFiBase(Entity):
 
     async def async_will_remove_from_hass(self) -> None:
         """Disconnect object when removed."""
-        LOGGER.debug(
+        _LOGGER.debug(
             "Removing %s entity %s (%s)", self.TYPE, self.entity_id, self._item.mac
         )
         self._item.remove_callback(self.async_update_callback)
@@ -46,7 +48,7 @@ class UniFiBase(Entity):
     @callback
     def async_update_callback(self) -> None:
         """Update the entity's state."""
-        LOGGER.debug(
+        _LOGGER.debug(
             "Updating %s entity %s (%s)", self.TYPE, self.entity_id, self._item.mac
         )
         self.async_write_ha_state()
diff --git a/homeassistant/components/universal/media_player.py b/homeassistant/components/universal/media_player.py
index aedc27c2a29..8fff0e80dfb 100644
--- a/homeassistant/components/universal/media_player.py
+++ b/homeassistant/components/universal/media_player.py
@@ -1,6 +1,5 @@
 """Combination of multiple media players for a universal controller."""
 from copy import copy
-import logging
 
 import voluptuous as vol
 
@@ -75,8 +74,6 @@ from homeassistant.helpers.event import TrackTemplate, async_track_template_resu
 from homeassistant.helpers.reload import async_setup_reload_service
 from homeassistant.helpers.service import async_call_from_config
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_ACTIVE_CHILD = "active_child"
 ATTR_DATA = "data"
 
diff --git a/homeassistant/components/upb/config_flow.py b/homeassistant/components/upb/config_flow.py
index a84b71c71e4..3af9999bd9f 100644
--- a/homeassistant/components/upb/config_flow.py
+++ b/homeassistant/components/upb/config_flow.py
@@ -89,7 +89,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         if user_input is not None:
             try:
                 if self._url_already_configured(_make_url_from_data(user_input)):
-                    return self.async_abort(reason="address_already_configured")
+                    return self.async_abort(reason="already_configured")
                 network_id, info = await _validate_input(user_input)
             except CannotConnect:
                 errors["base"] = "cannot_connect"
diff --git a/homeassistant/components/upb/strings.json b/homeassistant/components/upb/strings.json
index fb4f82d555e..9b2cc0a1b12 100644
--- a/homeassistant/components/upb/strings.json
+++ b/homeassistant/components/upb/strings.json
@@ -12,12 +12,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect to UPB PIM, please try again.",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_upb_file": "Missing or invalid UPB UPStart export file, check the name and path of the file.",
-      "unknown": "Unexpected error."
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "address_already_configured": "An UPB PIM with this address is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
 }
diff --git a/homeassistant/components/upb/translations/ca.json b/homeassistant/components/upb/translations/ca.json
index 92785937145..5b9cd3c4e02 100644
--- a/homeassistant/components/upb/translations/ca.json
+++ b/homeassistant/components/upb/translations/ca.json
@@ -1,12 +1,13 @@
 {
     "config": {
         "abort": {
-            "address_already_configured": "Ja hi ha un UPB PIM configurat amb aquesta adre\u00e7a."
+            "address_already_configured": "Ja hi ha un UPB PIM configurat amb aquesta adre\u00e7a.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar a UPB PIM, torna-ho a provar.",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "invalid_upb_file": "El fitxer d'exportaci\u00f3 UPB UPStart no hi \u00e9s o \u00e9s erroni, comprova el nom i la ruta del fitxer.",
-            "unknown": "Error inesperat."
+            "unknown": "Error inesperat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/upb/translations/cs.json b/homeassistant/components/upb/translations/cs.json
new file mode 100644
index 00000000000..75698bbe959
--- /dev/null
+++ b/homeassistant/components/upb/translations/cs.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "address": "Adresa (viz popis v\u00fd\u0161e)",
+                    "protocol": "Protokol"
+                },
+                "title": "P\u0159ipojen\u00ed k UPB PIM"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upb/translations/en.json b/homeassistant/components/upb/translations/en.json
index 61aa19e64f0..79853a8727e 100644
--- a/homeassistant/components/upb/translations/en.json
+++ b/homeassistant/components/upb/translations/en.json
@@ -1,12 +1,13 @@
 {
     "config": {
         "abort": {
-            "address_already_configured": "An UPB PIM with this address is already configured."
+            "address_already_configured": "An UPB PIM with this address is already configured.",
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect to UPB PIM, please try again.",
+            "cannot_connect": "Failed to connect",
             "invalid_upb_file": "Missing or invalid UPB UPStart export file, check the name and path of the file.",
-            "unknown": "Unexpected error."
+            "unknown": "Unexpected error"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/upb/translations/es.json b/homeassistant/components/upb/translations/es.json
index 15e251ac48a..46d957c1750 100644
--- a/homeassistant/components/upb/translations/es.json
+++ b/homeassistant/components/upb/translations/es.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_already_configured": "Un PIM UPB con esta direcci\u00f3n ya est\u00e1 configurado."
+            "address_already_configured": "Un PIM UPB con esta direcci\u00f3n ya est\u00e1 configurado.",
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se conect\u00f3 con UPB PIM, por favor, int\u00e9ntelo de nuevo.",
+            "cannot_connect": "No se pudo conectar",
             "invalid_upb_file": "Archivo de exportaci\u00f3n UPB UPStart faltante o no v\u00e1lido, verifique el nombre y la ruta del archivo.",
             "unknown": "Error inesperado"
         },
diff --git a/homeassistant/components/upb/translations/et.json b/homeassistant/components/upb/translations/et.json
new file mode 100644
index 00000000000..78594b0ef00
--- /dev/null
+++ b/homeassistant/components/upb/translations/et.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "address_already_configured": "UPB PIM selle aadressiga on juba m\u00e4\u00e4ratud",
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Ootamatu t\u00f5rge."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upb/translations/it.json b/homeassistant/components/upb/translations/it.json
index cd858b86989..b80f934d721 100644
--- a/homeassistant/components/upb/translations/it.json
+++ b/homeassistant/components/upb/translations/it.json
@@ -1,12 +1,13 @@
 {
     "config": {
         "abort": {
-            "address_already_configured": "Un UPB PIM con questo indirizzo \u00e8 gi\u00e0 configurato."
+            "address_already_configured": "Un UPB PIM con questo indirizzo \u00e8 gi\u00e0 configurato.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi a UPB PIM, riprovare.",
+            "cannot_connect": "Impossibile connettersi",
             "invalid_upb_file": "File di esportazione UPStart UPB mancante o non valido, controllare il nome e il percorso del file.",
-            "unknown": "Errore imprevisto."
+            "unknown": "Errore imprevisto"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/upb/translations/nl.json b/homeassistant/components/upb/translations/nl.json
new file mode 100644
index 00000000000..8b2702b6708
--- /dev/null
+++ b/homeassistant/components/upb/translations/nl.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upb/translations/no.json b/homeassistant/components/upb/translations/no.json
index 2dfe583fda0..6768b277838 100644
--- a/homeassistant/components/upb/translations/no.json
+++ b/homeassistant/components/upb/translations/no.json
@@ -1,19 +1,20 @@
 {
     "config": {
         "abort": {
-            "address_already_configured": "En UPB PIM med denne adressen er allerede konfigurert."
+            "address_already_configured": "En UPB PIM med denne adressen er allerede konfigurert.",
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Kunne ikke koble til UPB PIM, pr\u00f8v igjen.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_upb_file": "Manglende eller ugyldig UPB UPStart eksportfil, sjekk navnet og banen til filen.",
-            "unknown": "Uventet feil."
+            "unknown": "Uventet feil"
         },
         "step": {
             "user": {
                 "data": {
                     "address": "Adresse (se beskrivelse over)",
                     "file_path": "Sti og navn p\u00e5 UPStart UPB-eksportfilen.",
-                    "protocol": "protokoll"
+                    "protocol": "Protokoll"
                 },
                 "description": "Koble til en universal Powerline Bus Powerline Interface Module (UPB PIM). Adressestrengen m\u00e5 v\u00e6re i skjemaet 'adresse[:port]' for 'tcp'. Porten er valgfri og bruker som standard til 2101. Eksempel: '192.168.1.42'. For serieprotokollen m\u00e5 adressen v\u00e6re i skjemaet 'tty[:baud]'. Baud er valgfritt og standard til 4800. Eksempel: '/dev/ttyS1'.",
                 "title": "Koble til UPB PIM"
diff --git a/homeassistant/components/upb/translations/pl.json b/homeassistant/components/upb/translations/pl.json
index 18b1b3a8c78..b54942d3e7e 100644
--- a/homeassistant/components/upb/translations/pl.json
+++ b/homeassistant/components/upb/translations/pl.json
@@ -1,14 +1,23 @@
 {
     "config": {
+        "abort": {
+            "address_already_configured": "UPB PIM z takim adresem jest ju\u017c skonfigurowany",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+        },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z UPB PIM, spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_upb_file": "Brak lub nieprawid\u0142owy plik eksportu UPB UPStart, sprawd\u017a nazw\u0119 i \u015bcie\u017ck\u0119 do pliku",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "user": {
                 "data": {
+                    "address": "Adres (opis powy\u017cej)",
+                    "file_path": "\u015acie\u017cka i nazwa pliku eksportu UPStart UPB.",
                     "protocol": "Protok\u00f3\u0142"
-                }
+                },
+                "description": "Po\u0142\u0105czenie Universal Powerline Bus Powerline Interface Module (UPB PIM). Adres musi mie\u0107 posta\u0107 \"adres[:port]\" dla protoko\u0142u \"tcp\". Numer portu jest opcjonalny i domy\u015blnie ustawiony na 2101. Przyk\u0142ad: \"192.168.1.42\". Dla protoko\u0142u szeregowego adres musi mie\u0107 posta\u0107 \"tty[:baud]\". Szybko\u015b\u0107 transmisji (baud) jest opcjonalna i domy\u015blnie ustawiona na 4800. Przyk\u0142ad: \"/dev/ttyS1\".",
+                "title": "Po\u0142\u0105czenie z UPB PIM"
             }
         }
     }
diff --git a/homeassistant/components/upb/translations/pt-BR.json b/homeassistant/components/upb/translations/pt-BR.json
index 7ce0f1c613a..093611b2331 100644
--- a/homeassistant/components/upb/translations/pt-BR.json
+++ b/homeassistant/components/upb/translations/pt-BR.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Dispositivo j\u00e1 configurado"
+        },
         "error": {
             "unknown": "Erro inesperado."
         },
diff --git a/homeassistant/components/upb/translations/ru.json b/homeassistant/components/upb/translations/ru.json
index 563e190d397..5d78c994279 100644
--- a/homeassistant/components/upb/translations/ru.json
+++ b/homeassistant/components/upb/translations/ru.json
@@ -1,10 +1,11 @@
 {
     "config": {
         "abort": {
-            "address_already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0441 \u044d\u0442\u0438\u043c \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "address_already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0441 \u044d\u0442\u0438\u043c \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "invalid_upb_file": "\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0438\u043b\u0438 \u043d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u0435\u043d \u0444\u0430\u0439\u043b \u044d\u043a\u0441\u043f\u043e\u0440\u0442\u0430 UPB UPStart, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0438\u043c\u044f \u0438 \u043f\u0443\u0442\u044c \u043a \u0444\u0430\u0439\u043b\u0443.",
             "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
diff --git a/homeassistant/components/upb/translations/zh-Hant.json b/homeassistant/components/upb/translations/zh-Hant.json
index 527262121e1..fb41d81efc4 100644
--- a/homeassistant/components/upb/translations/zh-Hant.json
+++ b/homeassistant/components/upb/translations/zh-Hant.json
@@ -1,12 +1,13 @@
 {
     "config": {
         "abort": {
-            "address_already_configured": "\u4f7f\u7528\u6b64\u4f4d\u5740\u7684\u4e00\u7d44 UPB PIM \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "address_already_configured": "\u4f7f\u7528\u6b64\u4f4d\u5740\u7684\u4e00\u7d44 UPB PIM \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "UPB PIM \u9023\u7dda\u5931\u6557\uff0c\u8acb\u518d\u8a66\u4e00\u6b21\u3002",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "invalid_upb_file": "UPB UPStart \u532f\u51fa\u6a94\u6848\u7121\u6548\u6216\u907a\u5931\uff0c\u8acb\u78ba\u8a8d\u6a94\u6848\u7684\u8def\u5f91\u8207\u540d\u7a31\u3002",
-            "unknown": "\u672a\u9810\u671f\u932f\u8aa4\u3002"
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/upcloud/__init__.py b/homeassistant/components/upcloud/__init__.py
index 2daa50a22b0..5acf9e364bc 100644
--- a/homeassistant/components/upcloud/__init__.py
+++ b/homeassistant/components/upcloud/__init__.py
@@ -1,10 +1,17 @@
 """Support for UpCloud."""
+
+import dataclasses
 from datetime import timedelta
 import logging
+from typing import Dict, List
 
+import requests.exceptions
 import upcloud_api
 import voluptuous as vol
 
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import (
     CONF_PASSWORD,
     CONF_SCAN_INTERVAL,
@@ -13,12 +20,20 @@ from homeassistant.const import (
     STATE_ON,
     STATE_PROBLEM,
 )
-from homeassistant.core import callback
+from homeassistant.core import CALLBACK_TYPE
+from homeassistant.exceptions import ConfigEntryNotReady
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.dispatcher import async_dispatcher_connect, dispatcher_send
-from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.event import track_time_interval
-from homeassistant.util import dt
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect,
+    async_dispatcher_send,
+)
+from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
+
+from .const import CONFIG_ENTRY_UPDATE_SIGNAL_TEMPLATE, DEFAULT_SCAN_INTERVAL, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,14 +48,11 @@ ATTR_ZONE = "zone"
 CONF_SERVERS = "servers"
 
 DATA_UPCLOUD = "data_upcloud"
-DOMAIN = "upcloud"
 
 DEFAULT_COMPONENT_NAME = "UpCloud {}"
 DEFAULT_COMPONENT_DEVICE_CLASS = "power"
 
-UPCLOUD_PLATFORMS = ["binary_sensor", "switch"]
-
-SCAN_INTERVAL = timedelta(seconds=60)
+CONFIG_ENTRY_DOMAINS = {BINARY_SENSOR_DOMAIN, SWITCH_DOMAIN}
 
 SIGNAL_UPDATE_UPCLOUD = "upcloud_update"
 
@@ -52,7 +64,9 @@ CONFIG_SCHEMA = vol.Schema(
             {
                 vol.Required(CONF_USERNAME): cv.string,
                 vol.Required(CONF_PASSWORD): cv.string,
-                vol.Optional(CONF_SCAN_INTERVAL, default=SCAN_INTERVAL): cv.time_period,
+                vol.Optional(
+                    CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL
+                ): cv.time_period,
             }
         )
     },
@@ -60,57 +74,191 @@ CONFIG_SCHEMA = vol.Schema(
 )
 
 
-def setup(hass, config):
-    """Set up the UpCloud component."""
-    conf = config[DOMAIN]
-    username = conf.get(CONF_USERNAME)
-    password = conf.get(CONF_PASSWORD)
-    scan_interval = conf.get(CONF_SCAN_INTERVAL)
+class UpCloudDataUpdateCoordinator(
+    DataUpdateCoordinator[Dict[str, upcloud_api.Server]]
+):
+    """UpCloud data update coordinator."""
 
-    manager = upcloud_api.CloudManager(username, password)
+    def __init__(
+        self,
+        hass: HomeAssistantType,
+        *,
+        cloud_manager: upcloud_api.CloudManager,
+        update_interval: timedelta,
+        username: str,
+    ) -> None:
+        """Initialize coordinator."""
+        super().__init__(
+            hass, _LOGGER, name=f"{username}@UpCloud", update_interval=update_interval
+        )
+        self.cloud_manager = cloud_manager
+        self.unsub_handlers: List[CALLBACK_TYPE] = []
 
-    try:
-        manager.authenticate()
-        hass.data[DATA_UPCLOUD] = UpCloud(manager)
-    except upcloud_api.UpCloudAPIError:
-        _LOGGER.error("Authentication failed")
-        return False
+    async def async_update_config(self, config_entry: ConfigEntry) -> None:
+        """Handle config update."""
+        self.update_interval = timedelta(
+            seconds=config_entry.options[CONF_SCAN_INTERVAL]
+        )
 
-    def upcloud_update(event_time):
-        """Call UpCloud to update information."""
-        _LOGGER.debug("Updating UpCloud component")
-        hass.data[DATA_UPCLOUD].update()
-        dispatcher_send(hass, SIGNAL_UPDATE_UPCLOUD)
+    async def _async_update_data(self) -> Dict[str, upcloud_api.Server]:
+        return {
+            x.uuid: x
+            for x in await self.hass.async_add_executor_job(
+                self.cloud_manager.get_servers
+            )
+        }
 
-    # Call the UpCloud API to refresh data
-    upcloud_update(dt.utcnow())
-    track_time_interval(hass, upcloud_update, scan_interval)
+
+@dataclasses.dataclass
+class UpCloudHassData:
+    """Home Assistant UpCloud runtime data."""
+
+    coordinators: Dict[str, UpCloudDataUpdateCoordinator] = dataclasses.field(
+        default_factory=dict
+    )
+    scan_interval_migrations: Dict[str, int] = dataclasses.field(default_factory=dict)
+
+
+async def async_setup(hass: HomeAssistantType, config) -> bool:
+    """Set up UpCloud component."""
+    domain_config = config.get(DOMAIN)
+    if not domain_config:
+        return True
+
+    _LOGGER.warning(
+        "Loading upcloud via top level config is deprecated and no longer "
+        "necessary as of 0.117. Please remove it from your YAML configuration."
+    )
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_IMPORT},
+            data={
+                CONF_USERNAME: domain_config[CONF_USERNAME],
+                CONF_PASSWORD: domain_config[CONF_PASSWORD],
+            },
+        )
+    )
+
+    if domain_config[CONF_SCAN_INTERVAL]:
+        hass.data[DATA_UPCLOUD] = UpCloudHassData()
+        hass.data[DATA_UPCLOUD].scan_interval_migrations[
+            domain_config[CONF_USERNAME]
+        ] = domain_config[CONF_SCAN_INTERVAL]
 
     return True
 
 
-class UpCloud:
-    """Handle all communication with the UpCloud API."""
-
-    def __init__(self, manager):
-        """Initialize the UpCloud connection."""
-        self.data = {}
-        self.manager = manager
-
-    def update(self):
-        """Update data from UpCloud API."""
-        self.data = {server.uuid: server for server in self.manager.get_servers()}
+def _config_entry_update_signal_name(config_entry: ConfigEntry) -> str:
+    """Get signal name for updates to a config entry."""
+    return CONFIG_ENTRY_UPDATE_SIGNAL_TEMPLATE.format(config_entry.unique_id)
 
 
-class UpCloudServerEntity(Entity):
+async def _async_signal_options_update(
+    hass: HomeAssistantType, config_entry: ConfigEntry
+) -> None:
+    """Signal config entry options update."""
+    async_dispatcher_send(
+        hass, _config_entry_update_signal_name(config_entry), config_entry
+    )
+
+
+async def async_setup_entry(hass: HomeAssistantType, config_entry: ConfigEntry) -> bool:
+    """Set up the UpCloud config entry."""
+
+    manager = upcloud_api.CloudManager(
+        config_entry.data[CONF_USERNAME], config_entry.data[CONF_PASSWORD]
+    )
+
+    try:
+        await hass.async_add_executor_job(manager.authenticate)
+    except upcloud_api.UpCloudAPIError:
+        _LOGGER.error("Authentication failed", exc_info=True)
+        return False
+    except requests.exceptions.RequestException as err:
+        _LOGGER.error("Failed to connect", exc_info=True)
+        raise ConfigEntryNotReady from err
+
+    upcloud_data = hass.data.setdefault(DATA_UPCLOUD, UpCloudHassData())
+
+    # Handle pre config entry (0.117) scan interval migration to options
+    migrated_scan_interval = upcloud_data.scan_interval_migrations.pop(
+        config_entry.data[CONF_USERNAME], None
+    )
+    if migrated_scan_interval and (
+        not config_entry.options.get(CONF_SCAN_INTERVAL)
+        or config_entry.options[CONF_SCAN_INTERVAL] == DEFAULT_SCAN_INTERVAL.seconds
+    ):
+        update_interval = migrated_scan_interval
+        hass.config_entries.async_update_entry(
+            config_entry,
+            options={CONF_SCAN_INTERVAL: update_interval.seconds},
+        )
+    elif config_entry.options.get(CONF_SCAN_INTERVAL):
+        update_interval = timedelta(seconds=config_entry.options[CONF_SCAN_INTERVAL])
+    else:
+        update_interval = DEFAULT_SCAN_INTERVAL
+
+    coordinator = UpCloudDataUpdateCoordinator(
+        hass,
+        update_interval=update_interval,
+        cloud_manager=manager,
+        username=config_entry.data[CONF_USERNAME],
+    )
+
+    # Call the UpCloud API to refresh data
+    await coordinator.async_request_refresh()
+    if not coordinator.last_update_success:
+        raise ConfigEntryNotReady
+
+    # Listen to config entry updates
+    coordinator.unsub_handlers.append(
+        config_entry.add_update_listener(_async_signal_options_update)
+    )
+    coordinator.unsub_handlers.append(
+        async_dispatcher_connect(
+            hass,
+            _config_entry_update_signal_name(config_entry),
+            coordinator.async_update_config,
+        )
+    )
+
+    upcloud_data.coordinators[config_entry.data[CONF_USERNAME]] = coordinator
+
+    # Forward entry setup
+    for domain in CONFIG_ENTRY_DOMAINS:
+        hass.async_create_task(
+            hass.config_entries.async_forward_entry_setup(config_entry, domain)
+        )
+
+    return True
+
+
+async def async_unload_entry(hass, config_entry):
+    """Unload the config entry."""
+    for domain in CONFIG_ENTRY_DOMAINS:
+        await hass.config_entries.async_forward_entry_unload(config_entry, domain)
+
+    coordinator: UpCloudDataUpdateCoordinator = hass.data[
+        DATA_UPCLOUD
+    ].coordinators.pop(config_entry.data[CONF_USERNAME])
+    while coordinator.unsub_handlers:
+        coordinator.unsub_handlers.pop()()
+
+    return True
+
+
+class UpCloudServerEntity(CoordinatorEntity):
     """Entity class for UpCloud servers."""
 
-    def __init__(self, upcloud, uuid):
+    def __init__(self, coordinator, uuid):
         """Initialize the UpCloud server entity."""
-        self._upcloud = upcloud
+        super().__init__(coordinator)
         self.uuid = uuid
-        self.data = None
-        self._unsub_handlers = []
+
+    @property
+    def _server(self) -> upcloud_api.Server:
+        return self.coordinator.data[self.uuid]
 
     @property
     def unique_id(self) -> str:
@@ -121,29 +269,10 @@ class UpCloudServerEntity(Entity):
     def name(self):
         """Return the name of the component."""
         try:
-            return DEFAULT_COMPONENT_NAME.format(self.data.title)
+            return DEFAULT_COMPONENT_NAME.format(self._server.title)
         except (AttributeError, KeyError, TypeError):
             return DEFAULT_COMPONENT_NAME.format(self.uuid)
 
-    async def async_added_to_hass(self):
-        """Register callbacks."""
-        self._unsub_handlers.append(
-            async_dispatcher_connect(
-                self.hass, SIGNAL_UPDATE_UPCLOUD, self._update_callback
-            )
-        )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Invoke unsubscription handlers."""
-        for unsub in self._unsub_handlers:
-            unsub()
-        self._unsub_handlers.clear()
-
-    @callback
-    def _update_callback(self):
-        """Call update method."""
-        self.async_schedule_update_ha_state(True)
-
     @property
     def icon(self):
         """Return the icon of this server."""
@@ -153,7 +282,7 @@ class UpCloudServerEntity(Entity):
     def state(self):
         """Return state of the server."""
         try:
-            return STATE_MAP.get(self.data.state)
+            return STATE_MAP.get(self._server.state, self._server.state)
         except AttributeError:
             return None
 
@@ -171,18 +300,13 @@ class UpCloudServerEntity(Entity):
     def device_state_attributes(self):
         """Return the state attributes of the UpCloud server."""
         return {
-            x: getattr(self.data, x, None)
+            x: getattr(self._server, x, None)
             for x in (
                 ATTR_UUID,
                 ATTR_TITLE,
                 ATTR_HOSTNAME,
                 ATTR_ZONE,
-                ATTR_STATE,
                 ATTR_CORE_NUMBER,
                 ATTR_MEMORY_AMOUNT,
             )
         }
-
-    def update(self):
-        """Update data of the UpCloud server."""
-        self.data = self._upcloud.data.get(self.uuid)
diff --git a/homeassistant/components/upcloud/binary_sensor.py b/homeassistant/components/upcloud/binary_sensor.py
index 2b29aa0e24f..d64dc0f7ea9 100644
--- a/homeassistant/components/upcloud/binary_sensor.py
+++ b/homeassistant/components/upcloud/binary_sensor.py
@@ -1,29 +1,23 @@
 """Support for monitoring the state of UpCloud servers."""
-import logging
 
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensorEntity
+from homeassistant.const import CONF_USERNAME
 import homeassistant.helpers.config_validation as cv
 
 from . import CONF_SERVERS, DATA_UPCLOUD, UpCloudServerEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {vol.Required(CONF_SERVERS): vol.All(cv.ensure_list, [cv.string])}
 )
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the UpCloud server binary sensor."""
-    upcloud = hass.data[DATA_UPCLOUD]
-
-    servers = config.get(CONF_SERVERS)
-
-    devices = [UpCloudBinarySensor(upcloud, uuid) for uuid in servers]
-
-    add_entities(devices, True)
+    coordinator = hass.data[DATA_UPCLOUD].coordinators[config_entry.data[CONF_USERNAME]]
+    entities = [UpCloudBinarySensor(coordinator, uuid) for uuid in coordinator.data]
+    async_add_entities(entities, True)
 
 
 class UpCloudBinarySensor(UpCloudServerEntity, BinarySensorEntity):
diff --git a/homeassistant/components/upcloud/config_flow.py b/homeassistant/components/upcloud/config_flow.py
new file mode 100644
index 00000000000..d7f1680c80f
--- /dev/null
+++ b/homeassistant/components/upcloud/config_flow.py
@@ -0,0 +1,112 @@
+"""Config flow for UpCloud."""
+
+import logging
+
+import requests.exceptions
+import upcloud_api
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_PASSWORD, CONF_SCAN_INTERVAL, CONF_USERNAME
+from homeassistant.core import callback
+
+# pylint: disable=unused-import # for DOMAIN https://github.com/PyCQA/pylint/issues/3202
+from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class UpCloudConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """UpCloud config flow."""
+
+    VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_CLOUD_POLL
+
+    username: str
+    password: str
+
+    async def async_step_user(self, user_input=None):
+        """Handle user initiated flow."""
+        if user_input is None:
+            return self._async_show_form(step_id="user")
+
+        await self.async_set_unique_id(user_input[CONF_USERNAME])
+
+        manager = upcloud_api.CloudManager(
+            user_input[CONF_USERNAME], user_input[CONF_PASSWORD]
+        )
+
+        errors = {}
+        try:
+            await self.hass.async_add_executor_job(manager.authenticate)
+        except upcloud_api.UpCloudAPIError:
+            errors["base"] = "invalid_auth"
+            _LOGGER.debug("invalid_auth", exc_info=True)
+        except requests.exceptions.RequestException:
+            errors["base"] = "cannot_connect"
+            _LOGGER.debug("cannot_connect", exc_info=True)
+
+        if errors:
+            return self._async_show_form(
+                step_id="user", user_input=user_input, errors=errors
+            )
+
+        return self.async_create_entry(title=user_input[CONF_USERNAME], data=user_input)
+
+    async def async_step_import(self, user_input=None):
+        """Handle import initiated flow."""
+        await self.async_set_unique_id(user_input[CONF_USERNAME])
+        self._abort_if_unique_id_configured()
+
+        return await self.async_step_user(user_input=user_input)
+
+    @callback
+    def _async_show_form(self, step_id, user_input=None, errors=None):
+        """Show our form."""
+        if user_input is None:
+            user_input = {}
+        return self.async_show_form(
+            step_id=step_id,
+            data_schema=vol.Schema(
+                {
+                    vol.Required(
+                        CONF_USERNAME, default=user_input.get(CONF_USERNAME, "")
+                    ): str,
+                    vol.Required(
+                        CONF_PASSWORD, default=user_input.get(CONF_PASSWORD, "")
+                    ): str,
+                }
+            ),
+            errors=errors or {},
+        )
+
+    @staticmethod
+    @callback
+    def async_get_options_flow(config_entry):
+        """Get options flow."""
+        return UpCloudOptionsFlow(config_entry)
+
+
+class UpCloudOptionsFlow(config_entries.OptionsFlow):
+    """UpCloud options flow."""
+
+    def __init__(self, config_entry: config_entries.ConfigEntry):
+        """Initialize options flow."""
+        self.config_entry = config_entry
+
+    async def async_step_init(self, user_input=None):
+        """Handle options flow."""
+
+        if user_input is not None:
+            return self.async_create_entry(title="", data=user_input)
+
+        data_schema = vol.Schema(
+            {
+                vol.Optional(
+                    CONF_SCAN_INTERVAL,
+                    default=self.config_entry.options.get(CONF_SCAN_INTERVAL)
+                    or DEFAULT_SCAN_INTERVAL.seconds,
+                ): vol.All(vol.Coerce(int), vol.Range(min=30)),
+            }
+        )
+        return self.async_show_form(step_id="init", data_schema=data_schema)
diff --git a/homeassistant/components/upcloud/const.py b/homeassistant/components/upcloud/const.py
new file mode 100644
index 00000000000..62aeb75d3dd
--- /dev/null
+++ b/homeassistant/components/upcloud/const.py
@@ -0,0 +1,7 @@
+"""UpCloud constants."""
+
+from datetime import timedelta
+
+DOMAIN = "upcloud"
+DEFAULT_SCAN_INTERVAL = timedelta(seconds=60)
+CONFIG_ENTRY_UPDATE_SIGNAL_TEMPLATE = f"{DOMAIN}_config_entry_update:" "{}"
diff --git a/homeassistant/components/upcloud/manifest.json b/homeassistant/components/upcloud/manifest.json
index f5ff1b2dd1e..3a85f847c9d 100644
--- a/homeassistant/components/upcloud/manifest.json
+++ b/homeassistant/components/upcloud/manifest.json
@@ -1,6 +1,7 @@
 {
   "domain": "upcloud",
   "name": "UpCloud",
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/upcloud",
   "requirements": ["upcloud-api==0.4.5"],
   "codeowners": ["@scop"]
diff --git a/homeassistant/components/upcloud/strings.json b/homeassistant/components/upcloud/strings.json
new file mode 100644
index 00000000000..3daf70be598
--- /dev/null
+++ b/homeassistant/components/upcloud/strings.json
@@ -0,0 +1,25 @@
+{
+  "config": {
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      }
+    }
+  },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "scan_interval": "Update interval in seconds, minimum 30"
+        }
+      }
+    }
+  }
+}
diff --git a/homeassistant/components/upcloud/switch.py b/homeassistant/components/upcloud/switch.py
index 1d0984cdddb..a9e4ab56dd1 100644
--- a/homeassistant/components/upcloud/switch.py
+++ b/homeassistant/components/upcloud/switch.py
@@ -1,31 +1,24 @@
 """Support for interacting with UpCloud servers."""
-import logging
 
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
-from homeassistant.const import STATE_OFF
+from homeassistant.const import CONF_USERNAME, STATE_OFF
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_send
 
 from . import CONF_SERVERS, DATA_UPCLOUD, SIGNAL_UPDATE_UPCLOUD, UpCloudServerEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {vol.Required(CONF_SERVERS): vol.All(cv.ensure_list, [cv.string])}
 )
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the UpCloud server switch."""
-    upcloud = hass.data[DATA_UPCLOUD]
-
-    servers = config.get(CONF_SERVERS)
-
-    devices = [UpCloudSwitch(upcloud, uuid) for uuid in servers]
-
-    add_entities(devices, True)
+    coordinator = hass.data[DATA_UPCLOUD].coordinators[config_entry.data[CONF_USERNAME]]
+    entities = [UpCloudSwitch(coordinator, uuid) for uuid in coordinator.data]
+    async_add_entities(entities, True)
 
 
 class UpCloudSwitch(UpCloudServerEntity, SwitchEntity):
@@ -34,10 +27,10 @@ class UpCloudSwitch(UpCloudServerEntity, SwitchEntity):
     def turn_on(self, **kwargs):
         """Start the server."""
         if self.state == STATE_OFF:
-            self.data.start()
+            self._server.start()
             dispatcher_send(self.hass, SIGNAL_UPDATE_UPCLOUD)
 
     def turn_off(self, **kwargs):
         """Stop the server."""
         if self.is_on:
-            self.data.stop()
+            self._server.stop()
diff --git a/homeassistant/components/upcloud/translations/ca.json b/homeassistant/components/upcloud/translations/ca.json
new file mode 100644
index 00000000000..57b35430605
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/ca.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Contrasenya",
+                    "username": "Nom d'usuari"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Interval d'actualitzaci\u00f3 en segons, m\u00ednim 30"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/cs.json b/homeassistant/components/upcloud/translations/cs.json
new file mode 100644
index 00000000000..4b170822c95
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/cs.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Interval aktualizace v sekund\u00e1ch, minim\u00e1ln\u011b 30"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/de.json b/homeassistant/components/upcloud/translations/de.json
new file mode 100644
index 00000000000..ffdd1e0dd58
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/de.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Passwort",
+                    "username": "Benutzername"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Aktualisierungsintervall in Sekunden, mindestens 30"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/en.json b/homeassistant/components/upcloud/translations/en.json
new file mode 100644
index 00000000000..a252ebf7a2e
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/en.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Password",
+                    "username": "Username"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Update interval in seconds, minimum 30"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/es.json b/homeassistant/components/upcloud/translations/es.json
new file mode 100644
index 00000000000..96c659ccad4
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/es.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "No se pudo conectar",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Contrase\u00f1a",
+                    "username": "Usuario"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Intervalo de actualizaci\u00f3n en segundos, m\u00ednimo 30"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/et.json b/homeassistant/components/upcloud/translations/et.json
new file mode 100644
index 00000000000..e957bb56318
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/et.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u00dchendus nurjus",
+            "invalid_auth": "Tuvastamise viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Uuendamise intervall (sekundites, v\u00e4hemalt 30)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/no.json b/homeassistant/components/upcloud/translations/no.json
new file mode 100644
index 00000000000..fddeb42a143
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/no.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Passord",
+                    "username": "Brukernavn"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Oppdateringsintervall i sekunder, minimum 30"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/pl.json b/homeassistant/components/upcloud/translations/pl.json
new file mode 100644
index 00000000000..bb3946f228e
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/pl.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Has\u0142o",
+                    "username": "Nazwa u\u017cytkownika"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "Cz\u0119stotliwo\u015b\u0107 aktualizacji w sekundach (minimum 30)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/ru.json b/homeassistant/components/upcloud/translations/ru.json
new file mode 100644
index 00000000000..ced4097a7e2
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/ru.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
+                    "username": "\u041b\u043e\u0433\u0438\u043d"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f (\u0432 \u0441\u0435\u043a\u0443\u043d\u0434\u0430\u0445, \u043c\u0438\u043d\u0438\u043c\u0443\u043c 30)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/zh-Hans.json b/homeassistant/components/upcloud/translations/zh-Hans.json
new file mode 100644
index 00000000000..83be90bc292
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/zh-Hans.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "error": {
+            "invalid_auth": "\u65e0\u6548\u7684\u8eab\u4efd\u9a8c\u8bc1"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u5bc6\u7801",
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/upcloud/translations/zh-Hant.json b/homeassistant/components/upcloud/translations/zh-Hant.json
new file mode 100644
index 00000000000..c908b3169a4
--- /dev/null
+++ b/homeassistant/components/upcloud/translations/zh-Hant.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u5bc6\u78bc",
+                    "username": "\u4f7f\u7528\u8005\u540d\u7a31"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "scan_interval": "\u66f4\u65b0\u9593\u9694\uff08\u6700\u5c11 30 \u79d2\uff09"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/updater/translations/no.json b/homeassistant/components/updater/translations/no.json
index 94c84fb618e..c8fafabfe77 100644
--- a/homeassistant/components/updater/translations/no.json
+++ b/homeassistant/components/updater/translations/no.json
@@ -1,3 +1,3 @@
 {
-    "title": "Oppdateringer"
+    "title": "Oppdaterer"
 }
\ No newline at end of file
diff --git a/homeassistant/components/upnp/config_flow.py b/homeassistant/components/upnp/config_flow.py
index e7c16ef0df9..72efc4ffd55 100644
--- a/homeassistant/components/upnp/config_flow.py
+++ b/homeassistant/components/upnp/config_flow.py
@@ -54,7 +54,7 @@ class UpnpFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                 if discovery[DISCOVERY_USN] == user_input["usn"]
             ]
             if not matching_discoveries:
-                return self.async_abort(reason="no_devices_discovered")
+                return self.async_abort(reason="no_devices_found")
 
             discovery = matching_discoveries[0]
             await self.async_set_unique_id(
diff --git a/homeassistant/components/upnp/strings.json b/homeassistant/components/upnp/strings.json
index 99e58698f2e..97e91c490e3 100644
--- a/homeassistant/components/upnp/strings.json
+++ b/homeassistant/components/upnp/strings.json
@@ -15,9 +15,8 @@
       }
     },
     "abort": {
-      "already_configured": "UPnP/IGD is already configured",
-      "no_devices_discovered": "No UPnP/IGDs discovered",
-      "no_devices_found": "No UPnP/IGD devices found on the network.",
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
       "incomplete_discovery": "Incomplete discovery"
     }
   }
diff --git a/homeassistant/components/upnp/translations/ca.json b/homeassistant/components/upnp/translations/ca.json
index e2bf1e92d99..76e1933d44d 100644
--- a/homeassistant/components/upnp/translations/ca.json
+++ b/homeassistant/components/upnp/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "UPnP/IGD ja est\u00e0 configurat",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
             "incomplete_discovery": "Descoberta incompleta",
             "no_devices_discovered": "No s'ha trobat cap UPnP/IGD",
-            "no_devices_found": "No s'han trobat dispositius UPnP/IGD a la xarxa."
+            "no_devices_found": "No s'han trobat dispositius a la xarxa"
         },
         "error": {
             "one": "un",
diff --git a/homeassistant/components/upnp/translations/cs.json b/homeassistant/components/upnp/translations/cs.json
index 0c38ba9ab80..597be2a5492 100644
--- a/homeassistant/components/upnp/translations/cs.json
+++ b/homeassistant/components/upnp/translations/cs.json
@@ -1,9 +1,22 @@
 {
     "config": {
         "abort": {
-            "already_configured": "UPnP/IGD je ji\u017e nakonfigurov\u00e1no",
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "incomplete_discovery": "Ne\u00fapln\u00e9 objevov\u00e1n\u00ed",
             "no_devices_discovered": "Nebyly zji\u0161t\u011bny \u017e\u00e1dn\u00e9 UPnP/IGD",
-            "no_devices_found": "V s\u00edti nejsou nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed UPnP/IGD."
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed"
+        },
+        "flow_title": "UPnP/IGD: {name}",
+        "step": {
+            "ssdp_confirm": {
+                "description": "Chcete nastavit toto za\u0159\u00edzen\u00ed UPnP/IGD?"
+            },
+            "user": {
+                "data": {
+                    "scan_interval": "Interval aktualizace (v sekund\u00e1ch, minim\u00e1ln\u011b 30)",
+                    "usn": "Za\u0159\u00edzen\u00ed"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/upnp/translations/en.json b/homeassistant/components/upnp/translations/en.json
index 737954c2133..1dd0550c991 100644
--- a/homeassistant/components/upnp/translations/en.json
+++ b/homeassistant/components/upnp/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "UPnP/IGD is already configured",
+            "already_configured": "Device is already configured",
             "incomplete_discovery": "Incomplete discovery",
             "no_devices_discovered": "No UPnP/IGDs discovered",
-            "no_devices_found": "No UPnP/IGD devices found on the network."
+            "no_devices_found": "No devices found on the network"
         },
         "flow_title": "UPnP/IGD: {name}",
         "step": {
diff --git a/homeassistant/components/upnp/translations/es.json b/homeassistant/components/upnp/translations/es.json
index 308b10cb6db..91a169fd839 100644
--- a/homeassistant/components/upnp/translations/es.json
+++ b/homeassistant/components/upnp/translations/es.json
@@ -4,7 +4,7 @@
             "already_configured": "UPnP / IGD ya est\u00e1 configurado",
             "incomplete_discovery": "Descubrimiento incompleto",
             "no_devices_discovered": "No se descubrieron UPnP / IGDs",
-            "no_devices_found": "No se encuentran dispositivos UPnP/IGD en la red."
+            "no_devices_found": "No se encontraron dispositivos en la red"
         },
         "error": {
             "one": "UNO",
diff --git a/homeassistant/components/upnp/translations/it.json b/homeassistant/components/upnp/translations/it.json
index ea25f22d301..fab94b35e73 100644
--- a/homeassistant/components/upnp/translations/it.json
+++ b/homeassistant/components/upnp/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "UPnP/IGD \u00e8 gi\u00e0 configurato",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
             "incomplete_discovery": "Individuazione incompleta",
             "no_devices_discovered": "Nessun UPnP/IGD trovato",
-            "no_devices_found": "Nessun dispositivo UPnP/IGD trovato in rete."
+            "no_devices_found": "Nessun dispositivo trovato sulla rete"
         },
         "error": {
             "one": "Vuoto",
diff --git a/homeassistant/components/upnp/translations/no.json b/homeassistant/components/upnp/translations/no.json
index 28c2e099192..e154db981b7 100644
--- a/homeassistant/components/upnp/translations/no.json
+++ b/homeassistant/components/upnp/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "UPnP / IGD er allerede konfigurert",
+            "already_configured": "Enheten er allerede konfigurert",
             "incomplete_discovery": "Ufullstendig oppdagelse",
             "no_devices_discovered": "Ingen UPnP / IGDs oppdaget",
-            "no_devices_found": "Ingen UPnP / IGD-enheter funnet p\u00e5 nettverket."
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket"
         },
         "error": {
             "few": "f\u00e5",
@@ -14,7 +14,7 @@
             "two": "to",
             "zero": "ingen"
         },
-        "flow_title": "UPnP/IGD: {name}",
+        "flow_title": "",
         "step": {
             "ssdp_confirm": {
                 "description": "\u00d8nsker du \u00e5 sette opp denne UPnP/IGD-enheten?"
diff --git a/homeassistant/components/upnp/translations/pl.json b/homeassistant/components/upnp/translations/pl.json
index 55d0abbba48..dafbbb0ddd1 100644
--- a/homeassistant/components/upnp/translations/pl.json
+++ b/homeassistant/components/upnp/translations/pl.json
@@ -1,13 +1,25 @@
 {
     "config": {
         "abort": {
-            "already_configured": "UPnP/IGD jest ju\u017c skonfigurowane.",
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
             "incomplete_discovery": "Wykrywanie niekompletne",
-            "no_devices_discovered": "Nie wykryto urz\u0105dze\u0144 UPnP/IGD.",
-            "no_devices_found": "Nie znaleziono w sieci urz\u0105dze\u0144 UPnP/IGD."
+            "no_devices_discovered": "Nie wykryto urz\u0105dze\u0144 UPnP/IGD",
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci"
+        },
+        "error": {
+            "few": "kilka",
+            "many": "wiele",
+            "one": "jeden",
+            "other": "inne"
         },
         "flow_title": "UPnP/IGD: {name}",
         "step": {
+            "init": {
+                "few": "kilka",
+                "many": "wiele",
+                "one": "jeden",
+                "other": "inne"
+            },
             "ssdp_confirm": {
                 "description": "Czy chcesz skonfigurowa\u0107 to urz\u0105dzenie UPnP/IGD?"
             },
diff --git a/homeassistant/components/upnp/translations/ru.json b/homeassistant/components/upnp/translations/ru.json
index cea6b66db2b..799ce24c208 100644
--- a/homeassistant/components/upnp/translations/ru.json
+++ b/homeassistant/components/upnp/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "incomplete_discovery": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043f\u0440\u043e\u0446\u0435\u0441\u0441.",
             "no_devices_discovered": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 UPnP / IGD \u043d\u0435 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u044b.",
-            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 UPnP / IGD \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438."
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438."
         },
         "error": {
             "few": "\u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e",
diff --git a/homeassistant/components/upnp/translations/zh-Hant.json b/homeassistant/components/upnp/translations/zh-Hant.json
index c89ff8af971..15b3ea3a19f 100644
--- a/homeassistant/components/upnp/translations/zh-Hant.json
+++ b/homeassistant/components/upnp/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_configured": "UPnP/IGD \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "incomplete_discovery": "\u672a\u5b8c\u6210\u63a2\u7d22",
             "no_devices_discovered": "\u672a\u641c\u5c0b\u5230 UPnP/IGD",
-            "no_devices_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230 UPnP/IGD \u8a2d\u5099\u3002"
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099"
         },
         "flow_title": "UPnP/IGD\uff1a{name}",
         "step": {
diff --git a/homeassistant/components/usgs_earthquakes_feed/geo_location.py b/homeassistant/components/usgs_earthquakes_feed/geo_location.py
index af9e82adf49..40a544a2e21 100644
--- a/homeassistant/components/usgs_earthquakes_feed/geo_location.py
+++ b/homeassistant/components/usgs_earthquakes_feed/geo_location.py
@@ -79,7 +79,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
         vol.Optional(CONF_RADIUS, default=DEFAULT_RADIUS_IN_KM): vol.Coerce(float),
         vol.Optional(
             CONF_MINIMUM_MAGNITUDE, default=DEFAULT_MINIMUM_MAGNITUDE
-        ): vol.All(vol.Coerce(float), vol.Range(min=0)),
+        ): cv.positive_float,
     }
 )
 
diff --git a/homeassistant/components/uvc/camera.py b/homeassistant/components/uvc/camera.py
index e07fac28d1f..da748c20c1c 100644
--- a/homeassistant/components/uvc/camera.py
+++ b/homeassistant/components/uvc/camera.py
@@ -152,7 +152,7 @@ class UnifiVideoCamera(Camera):
                 camera.login()
                 _LOGGER.debug(
                     "Logged into UVC camera %(name)s via %(addr)s",
-                    dict(name=self._name, addr=addr),
+                    {"name": self._name, "addr": addr},
                 )
                 self._connect_addr = addr
                 break
diff --git a/homeassistant/components/vacuum/translations/cs.json b/homeassistant/components/vacuum/translations/cs.json
index 75a3254ec36..505bb5e7a5e 100644
--- a/homeassistant/components/vacuum/translations/cs.json
+++ b/homeassistant/components/vacuum/translations/cs.json
@@ -1,12 +1,26 @@
 {
+    "device_automation": {
+        "action_type": {
+            "clean": "Nechat {entity_name} ukl\u00edzet",
+            "dock": "Nechat {entity_name} vr\u00e1tit se do stanice"
+        },
+        "condition_type": {
+            "is_cleaning": "{entity_name} ukl\u00edz\u00ed",
+            "is_docked": "{entity_name} je ve stanici"
+        },
+        "trigger_type": {
+            "cleaning": "{entity_name} zah\u00e1jil \u00faklid",
+            "docked": "{entity_name} p\u0159ijel do stanice"
+        }
+    },
     "state": {
         "_": {
-            "cleaning": "\u010cist\u00ed",
-            "docked": "V stanici",
+            "cleaning": "Ukl\u00edz\u00ed",
+            "docked": "Ve stanici",
             "error": "Chyba",
             "idle": "Ne\u010dinn\u00fd",
-            "off": "Off",
-            "on": "On",
+            "off": "Vypnuto",
+            "on": "Zapnuto",
             "paused": "Pozastaveno",
             "returning": "N\u00e1vrat do stanice"
         }
diff --git a/homeassistant/components/vacuum/translations/no.json b/homeassistant/components/vacuum/translations/no.json
index 8e62bc64e81..f39e62058d7 100644
--- a/homeassistant/components/vacuum/translations/no.json
+++ b/homeassistant/components/vacuum/translations/no.json
@@ -22,7 +22,7 @@
             "off": "Av",
             "on": "P\u00e5",
             "paused": "Pauset",
-            "returning": "Returner til dokken"
+            "returning": "Returner til dokkingstasjon"
         }
     },
     "title": "St\u00f8vsuger"
diff --git a/homeassistant/components/vacuum/translations/pl.json b/homeassistant/components/vacuum/translations/pl.json
index 6eef0f893f7..27a1dfb1505 100644
--- a/homeassistant/components/vacuum/translations/pl.json
+++ b/homeassistant/components/vacuum/translations/pl.json
@@ -19,8 +19,8 @@
             "docked": "w stacji dokuj\u0105cej",
             "error": "b\u0142\u0105d",
             "idle": "nieaktywny",
-            "off": "wy\u0142\u0105czony",
-            "on": "w\u0142\u0105czony",
+            "off": "wy\u0142.",
+            "on": "w\u0142.",
             "paused": "wstrzymany",
             "returning": "powr\u00f3t do stacji dokuj\u0105cej"
         }
diff --git a/homeassistant/components/vacuum/translations/ru.json b/homeassistant/components/vacuum/translations/ru.json
index bb7aca9719f..2833dd2596b 100644
--- a/homeassistant/components/vacuum/translations/ru.json
+++ b/homeassistant/components/vacuum/translations/ru.json
@@ -2,7 +2,7 @@
     "device_automation": {
         "action_type": {
             "clean": "\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c {entity_name} \u0434\u0435\u043b\u0430\u0442\u044c \u0443\u0431\u043e\u0440\u043a\u0443",
-            "dock": "\u0412\u0435\u0440\u043d\u0443\u0442\u044c {entity_name} \u043d\u0430 \u0434\u043e\u043a-\u0441\u0442\u0430\u043d\u0446\u0438\u044e"
+            "dock": "{entity_name}: \u0432\u0435\u0440\u043d\u0443\u0442\u044c \u043a \u0434\u043e\u043a-\u0441\u0442\u0430\u043d\u0446\u0438\u0438"
         },
         "condition_type": {
             "is_cleaning": "{entity_name} \u0434\u0435\u043b\u0430\u0435\u0442 \u0443\u0431\u043e\u0440\u043a\u0443",
diff --git a/homeassistant/components/velbus/binary_sensor.py b/homeassistant/components/velbus/binary_sensor.py
index 8c4cc5a4043..74263d87234 100644
--- a/homeassistant/components/velbus/binary_sensor.py
+++ b/homeassistant/components/velbus/binary_sensor.py
@@ -1,13 +1,9 @@
 """Support for Velbus Binary Sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import BinarySensorEntity
 
 from . import VelbusEntity
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up Velbus binary sensor based on config_entry."""
diff --git a/homeassistant/components/velbus/sensor.py b/homeassistant/components/velbus/sensor.py
index d8644b4569a..095108b4401 100644
--- a/homeassistant/components/velbus/sensor.py
+++ b/homeassistant/components/velbus/sensor.py
@@ -1,13 +1,9 @@
 """Support for Velbus sensors."""
-import logging
-
 from homeassistant.const import DEVICE_CLASS_POWER, ENERGY_KILO_WATT_HOUR
 
 from . import VelbusEntity
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, entry, async_add_entities):
     """Set up Velbus sensor based on config_entry."""
diff --git a/homeassistant/components/velbus/translations/ca.json b/homeassistant/components/velbus/translations/ca.json
index 783bb6d7f3b..b6680ace1d6 100644
--- a/homeassistant/components/velbus/translations/ca.json
+++ b/homeassistant/components/velbus/translations/ca.json
@@ -1,9 +1,12 @@
 {
     "config": {
         "abort": {
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
             "port_exists": "El port ja est\u00e0 configurat"
         },
         "error": {
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_failed": "Ha fallat la connexi\u00f3 Velbus",
             "port_exists": "El port ja est\u00e0 configurat"
         },
diff --git a/homeassistant/components/velbus/translations/cs.json b/homeassistant/components/velbus/translations/cs.json
new file mode 100644
index 00000000000..0e564545238
--- /dev/null
+++ b/homeassistant/components/velbus/translations/cs.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "port_exists": "Tento port je ji\u017e nastaven"
+        },
+        "error": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_failed": "P\u0159ipojen\u00ed velbus selhalo",
+            "port_exists": "Tento port je ji\u017e nastaven"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "name": "Jm\u00e9no tohoto p\u0159ipojen\u00ed velbus"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/velbus/translations/el.json b/homeassistant/components/velbus/translations/el.json
new file mode 100644
index 00000000000..04b238a916d
--- /dev/null
+++ b/homeassistant/components/velbus/translations/el.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/velbus/translations/en.json b/homeassistant/components/velbus/translations/en.json
index ab455442891..f0b6d16c7be 100644
--- a/homeassistant/components/velbus/translations/en.json
+++ b/homeassistant/components/velbus/translations/en.json
@@ -1,9 +1,12 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Device is already configured",
             "port_exists": "This port is already configured"
         },
         "error": {
+            "already_configured": "Device is already configured",
+            "cannot_connect": "Failed to connect",
             "connection_failed": "The velbus connection failed",
             "port_exists": "This port is already configured"
         },
diff --git a/homeassistant/components/velbus/translations/es.json b/homeassistant/components/velbus/translations/es.json
index 1bde7176eaf..0c29e2d8505 100644
--- a/homeassistant/components/velbus/translations/es.json
+++ b/homeassistant/components/velbus/translations/es.json
@@ -1,9 +1,12 @@
 {
     "config": {
         "abort": {
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
             "port_exists": "Este puerto ya est\u00e1 configurado"
         },
         "error": {
+            "already_configured": "El dispositivo ya est\u00e1 configurado",
+            "cannot_connect": "No se pudo conectar",
             "connection_failed": "La conexi\u00f3n velbus fall\u00f3",
             "port_exists": "Este puerto ya est\u00e1 configurado"
         },
diff --git a/homeassistant/components/velbus/translations/et.json b/homeassistant/components/velbus/translations/et.json
new file mode 100644
index 00000000000..9bcd15028ba
--- /dev/null
+++ b/homeassistant/components/velbus/translations/et.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "port_exists": "See port on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "cannot_connect": "\u00dchendamine nurjus"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/velbus/translations/fr.json b/homeassistant/components/velbus/translations/fr.json
index ab2e8d756e6..1c771b9d7a2 100644
--- a/homeassistant/components/velbus/translations/fr.json
+++ b/homeassistant/components/velbus/translations/fr.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
+            "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9",
             "port_exists": "Ce port est d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
+            "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9",
             "connection_failed": "La connexion velbus a \u00e9chou\u00e9",
             "port_exists": "Ce port est d\u00e9j\u00e0 configur\u00e9"
         },
diff --git a/homeassistant/components/velbus/translations/it.json b/homeassistant/components/velbus/translations/it.json
index bf24ff11336..3ee9a0c02de 100644
--- a/homeassistant/components/velbus/translations/it.json
+++ b/homeassistant/components/velbus/translations/it.json
@@ -1,9 +1,12 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
             "port_exists": "Questa porta \u00e8 gi\u00e0 configurata"
         },
         "error": {
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "cannot_connect": "Impossibile connettersi",
             "connection_failed": "La connessione Velbus non \u00e8 riuscita",
             "port_exists": "Questa porta \u00e8 gi\u00e0 configurata"
         },
diff --git a/homeassistant/components/velbus/translations/lb.json b/homeassistant/components/velbus/translations/lb.json
index 5bb18bc5fa4..a791e4ce046 100644
--- a/homeassistant/components/velbus/translations/lb.json
+++ b/homeassistant/components/velbus/translations/lb.json
@@ -1,9 +1,12 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Apparat ass scho konfigur\u00e9iert",
             "port_exists": "D\u00ebse Port ass scho konfigur\u00e9iert"
         },
         "error": {
+            "already_configured": "Apparat ass scho konfigur\u00e9iert",
+            "cannot_connect": "Feeler beim verbannen",
             "connection_failed": "Feeler bei der velbus Verbindung",
             "port_exists": "D\u00ebse Port ass scho konfigur\u00e9iert"
         },
diff --git a/homeassistant/components/velbus/translations/nl.json b/homeassistant/components/velbus/translations/nl.json
index 81991bfff0e..03bbe8c2e58 100644
--- a/homeassistant/components/velbus/translations/nl.json
+++ b/homeassistant/components/velbus/translations/nl.json
@@ -4,6 +4,7 @@
             "port_exists": "Deze poort is al geconfigureerd"
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_failed": "De velbus verbinding is mislukt.",
             "port_exists": "Deze poort is al geconfigureerd"
         },
diff --git a/homeassistant/components/velbus/translations/no.json b/homeassistant/components/velbus/translations/no.json
index 0cc2f475820..24f30b0c37c 100644
--- a/homeassistant/components/velbus/translations/no.json
+++ b/homeassistant/components/velbus/translations/no.json
@@ -1,9 +1,12 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Enheten er allerede konfigurert",
             "port_exists": "Denne porten er allerede konfigurert"
         },
         "error": {
+            "already_configured": "Enheten er allerede konfigurert",
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_failed": "Velbus-tilkoblingen mislyktes",
             "port_exists": "Denne porten er allerede konfigurert"
         },
diff --git a/homeassistant/components/velbus/translations/pl.json b/homeassistant/components/velbus/translations/pl.json
index c3f06b312f4..adbd368280f 100644
--- a/homeassistant/components/velbus/translations/pl.json
+++ b/homeassistant/components/velbus/translations/pl.json
@@ -1,11 +1,14 @@
 {
     "config": {
         "abort": {
-            "port_exists": "Ten port jest ju\u017c skonfigurowany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "port_exists": "Ten port jest ju\u017c skonfigurowany"
         },
         "error": {
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_failed": "Po\u0142\u0105czenie Velbus nie powiod\u0142o si\u0119",
-            "port_exists": "Ten port jest ju\u017c skonfigurowany."
+            "port_exists": "Ten port jest ju\u017c skonfigurowany"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/velbus/translations/ru.json b/homeassistant/components/velbus/translations/ru.json
index e88f6209eee..7a80b18f03e 100644
--- a/homeassistant/components/velbus/translations/ru.json
+++ b/homeassistant/components/velbus/translations/ru.json
@@ -1,9 +1,12 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
             "port_exists": "\u042d\u0442\u043e\u0442 \u043f\u043e\u0440\u0442 \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d."
         },
         "error": {
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_failed": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0441 Velbus.",
             "port_exists": "\u042d\u0442\u043e\u0442 \u043f\u043e\u0440\u0442 \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d."
         },
diff --git a/homeassistant/components/velbus/translations/zh-Hant.json b/homeassistant/components/velbus/translations/zh-Hant.json
index 48f9ef5919b..6a9aeec0bd0 100644
--- a/homeassistant/components/velbus/translations/zh-Hant.json
+++ b/homeassistant/components/velbus/translations/zh-Hant.json
@@ -1,9 +1,12 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "port_exists": "\u6b64\u901a\u8a0a\u57e0\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_failed": "Velbus \u9023\u7dda\u5931\u6557",
             "port_exists": "\u6b64\u901a\u8a0a\u57e0\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
diff --git a/homeassistant/components/vera/binary_sensor.py b/homeassistant/components/vera/binary_sensor.py
index 2e66d38e249..a84764209b2 100644
--- a/homeassistant/components/vera/binary_sensor.py
+++ b/homeassistant/components/vera/binary_sensor.py
@@ -1,5 +1,4 @@
 """Support for Vera binary sensors."""
-import logging
 from typing import Callable, List, Optional
 
 import pyvera as veraApi
@@ -16,8 +15,6 @@ from homeassistant.helpers.entity import Entity
 from . import VeraDevice
 from .common import ControllerData, get_controller_data
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/vera/climate.py b/homeassistant/components/vera/climate.py
index 0946de4a379..70694af012f 100644
--- a/homeassistant/components/vera/climate.py
+++ b/homeassistant/components/vera/climate.py
@@ -1,5 +1,4 @@
 """Support for Vera thermostats."""
-import logging
 from typing import Any, Callable, List, Optional
 
 import pyvera as veraApi
@@ -28,8 +27,6 @@ from homeassistant.util import convert
 from . import VeraDevice
 from .common import ControllerData, get_controller_data
 
-_LOGGER = logging.getLogger(__name__)
-
 FAN_OPERATION_LIST = [FAN_ON, FAN_AUTO]
 
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_FAN_MODE
diff --git a/homeassistant/components/vera/common.py b/homeassistant/components/vera/common.py
index 66a2d6879dd..fce6475f930 100644
--- a/homeassistant/components/vera/common.py
+++ b/homeassistant/components/vera/common.py
@@ -1,5 +1,4 @@
 """Common vera code."""
-import logging
 from typing import DefaultDict, List, NamedTuple, Set
 
 import pyvera as pv
@@ -11,8 +10,6 @@ from homeassistant.helpers.event import call_later
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class ControllerData(NamedTuple):
     """Controller data."""
diff --git a/homeassistant/components/vera/cover.py b/homeassistant/components/vera/cover.py
index 49b15e91eb2..69e412bdade 100644
--- a/homeassistant/components/vera/cover.py
+++ b/homeassistant/components/vera/cover.py
@@ -1,5 +1,4 @@
 """Support for Vera cover - curtains, rollershutters etc."""
-import logging
 from typing import Any, Callable, List
 
 import pyvera as veraApi
@@ -17,8 +16,6 @@ from homeassistant.helpers.entity import Entity
 from . import VeraDevice
 from .common import ControllerData, get_controller_data
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/vera/light.py b/homeassistant/components/vera/light.py
index 47d2d039d2a..7daaf095a5c 100644
--- a/homeassistant/components/vera/light.py
+++ b/homeassistant/components/vera/light.py
@@ -1,5 +1,4 @@
 """Support for Vera lights."""
-import logging
 from typing import Any, Callable, List, Optional, Tuple
 
 import pyvera as veraApi
@@ -21,8 +20,6 @@ import homeassistant.util.color as color_util
 from . import VeraDevice
 from .common import ControllerData, get_controller_data
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/vera/lock.py b/homeassistant/components/vera/lock.py
index 46f8c6f189e..36a5f4cf2f3 100644
--- a/homeassistant/components/vera/lock.py
+++ b/homeassistant/components/vera/lock.py
@@ -1,5 +1,4 @@
 """Support for Vera locks."""
-import logging
 from typing import Any, Callable, Dict, List, Optional
 
 import pyvera as veraApi
@@ -17,8 +16,6 @@ from homeassistant.helpers.entity import Entity
 from . import VeraDevice
 from .common import ControllerData, get_controller_data
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_LAST_USER_NAME = "changed_by_name"
 ATTR_LOW_BATTERY = "low_battery"
 
diff --git a/homeassistant/components/vera/scene.py b/homeassistant/components/vera/scene.py
index 8bd4473e1c8..a031aadb66c 100644
--- a/homeassistant/components/vera/scene.py
+++ b/homeassistant/components/vera/scene.py
@@ -1,5 +1,4 @@
 """Support for Vera scenes."""
-import logging
 from typing import Any, Callable, Dict, List, Optional
 
 import pyvera as veraApi
@@ -13,8 +12,6 @@ from homeassistant.util import slugify
 from .common import ControllerData, get_controller_data
 from .const import VERA_ID_FORMAT
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/vera/sensor.py b/homeassistant/components/vera/sensor.py
index 9c3dd097a78..e39b752bbf3 100644
--- a/homeassistant/components/vera/sensor.py
+++ b/homeassistant/components/vera/sensor.py
@@ -1,6 +1,5 @@
 """Support for Vera sensors."""
 from datetime import timedelta
-import logging
 from typing import Callable, List, Optional, cast
 
 import pyvera as veraApi
@@ -15,8 +14,6 @@ from homeassistant.util import convert
 from . import VeraDevice
 from .common import ControllerData, get_controller_data
 
-_LOGGER = logging.getLogger(__name__)
-
 SCAN_INTERVAL = timedelta(seconds=5)
 
 
diff --git a/homeassistant/components/vera/switch.py b/homeassistant/components/vera/switch.py
index 9e8360bf673..d0cbeba669c 100644
--- a/homeassistant/components/vera/switch.py
+++ b/homeassistant/components/vera/switch.py
@@ -1,5 +1,4 @@
 """Support for Vera switches."""
-import logging
 from typing import Any, Callable, List, Optional
 
 import pyvera as veraApi
@@ -17,8 +16,6 @@ from homeassistant.util import convert
 from . import VeraDevice
 from .common import ControllerData, get_controller_data
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
diff --git a/homeassistant/components/vera/translations/cs.json b/homeassistant/components/vera/translations/cs.json
new file mode 100644
index 00000000000..221fb6be442
--- /dev/null
+++ b/homeassistant/components/vera/translations/cs.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Ovlada\u010d je ji\u017e nastaven.",
+            "cannot_connect": "Nelze se p\u0159ipojit k ovlada\u010di pomoc\u00ed URL adresy {base_url}"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "exclude": "ID za\u0159\u00edzen\u00ed Vera, kter\u00e1 chcete vylou\u010dit z Home Assistant.",
+                    "lights": "ID za\u0159\u00edzen\u00ed Vera, se kter\u00fdmi m\u00e1 Home Assistant zach\u00e1zet jako se sv\u011btly.",
+                    "vera_controller_url": "URL adresa ovlada\u010de"
+                },
+                "description": "N\u00ed\u017ee zadejte adresu URL odvlada\u010de Vera. M\u011blo by to vypadat takto: http://192.168.1.161:3480.",
+                "title": "Nastaven\u00ed ovlada\u010de Vera"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "exclude": "ID za\u0159\u00edzen\u00ed Vera, kter\u00e1 chcete vylou\u010dit z Home Assistant.",
+                    "lights": "ID za\u0159\u00edzen\u00ed Vera, se kter\u00fdmi m\u00e1 Home Assistant zach\u00e1zet jako se sv\u011btly."
+                },
+                "title": "Mo\u017enosti ovlada\u010de Vera"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/vera/translations/et.json b/homeassistant/components/vera/translations/et.json
new file mode 100644
index 00000000000..5c79a04737b
--- /dev/null
+++ b/homeassistant/components/vera/translations/et.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Kontroller on juba seadistatud"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "vera_controller_url": "Kontrolleri URL"
+                },
+                "title": "Seadista Vera kontroller"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/vera/translations/pl.json b/homeassistant/components/vera/translations/pl.json
index baafc324bea..1d993b01c0b 100644
--- a/homeassistant/components/vera/translations/pl.json
+++ b/homeassistant/components/vera/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Kontroler jest ju\u017c skonfigurowany.",
+            "already_configured": "Kontroler jest ju\u017c skonfigurowany",
             "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 z kontrolerem za pomoc\u0105 adresu {base_url}"
         },
         "step": {
diff --git a/homeassistant/components/verisure/binary_sensor.py b/homeassistant/components/verisure/binary_sensor.py
index 206a4072ace..5a7f4386ece 100644
--- a/homeassistant/components/verisure/binary_sensor.py
+++ b/homeassistant/components/verisure/binary_sensor.py
@@ -1,6 +1,4 @@
 """Support for Verisure binary sensors."""
-import logging
-
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_CONNECTIVITY,
     BinarySensorEntity,
@@ -8,8 +6,6 @@ from homeassistant.components.binary_sensor import (
 
 from . import CONF_DOOR_WINDOW, HUB as hub
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Verisure binary sensors."""
diff --git a/homeassistant/components/verisure/sensor.py b/homeassistant/components/verisure/sensor.py
index ff1c31f7302..437e45ba72a 100644
--- a/homeassistant/components/verisure/sensor.py
+++ b/homeassistant/components/verisure/sensor.py
@@ -1,13 +1,9 @@
 """Support for Verisure sensors."""
-import logging
-
 from homeassistant.const import PERCENTAGE, TEMP_CELSIUS
 from homeassistant.helpers.entity import Entity
 
 from . import CONF_HYDROMETERS, CONF_MOUSE, CONF_THERMOMETERS, HUB as hub
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Verisure platform."""
diff --git a/homeassistant/components/verisure/switch.py b/homeassistant/components/verisure/switch.py
index 8025b22f402..4615e0a2a49 100644
--- a/homeassistant/components/verisure/switch.py
+++ b/homeassistant/components/verisure/switch.py
@@ -1,13 +1,10 @@
 """Support for Verisure Smartplugs."""
-import logging
 from time import monotonic
 
 from homeassistant.components.switch import SwitchEntity
 
 from . import CONF_SMARTPLUGS, HUB as hub
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Verisure switch platform."""
diff --git a/homeassistant/components/version/sensor.py b/homeassistant/components/version/sensor.py
index dcfdc115376..c030383a4a6 100644
--- a/homeassistant/components/version/sensor.py
+++ b/homeassistant/components/version/sensor.py
@@ -1,6 +1,5 @@
 """Sensor that can display the current Home Assistant versions."""
 from datetime import timedelta
-import logging
 
 from pyhaversion import (
     DockerVersion,
@@ -18,8 +17,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 
-_LOGGER = logging.getLogger(__name__)
-
 ALL_IMAGES = [
     "default",
     "intel-nuc",
diff --git a/homeassistant/components/vesync/config_flow.py b/homeassistant/components/vesync/config_flow.py
index 8b0e8ae6781..f930619d00b 100644
--- a/homeassistant/components/vesync/config_flow.py
+++ b/homeassistant/components/vesync/config_flow.py
@@ -1,6 +1,5 @@
 """Config flow utilities."""
 from collections import OrderedDict
-import logging
 
 from pyvesync import VeSync
 import voluptuous as vol
@@ -11,8 +10,6 @@ from homeassistant.core import callback
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @callback
 def configured_instances(hass):
@@ -51,7 +48,7 @@ class VeSyncFlowHandler(config_entries.ConfigFlow):
     async def async_step_user(self, user_input=None):
         """Handle a flow start."""
         if configured_instances(self.hass):
-            return self.async_abort(reason="already_setup")
+            return self.async_abort(reason="single_instance_allowed")
 
         if not user_input:
             return self._show_form()
@@ -62,7 +59,7 @@ class VeSyncFlowHandler(config_entries.ConfigFlow):
         manager = VeSync(self._username, self._password)
         login = await self.hass.async_add_executor_job(manager.login)
         if not login:
-            return self._show_form(errors={"base": "invalid_login"})
+            return self._show_form(errors={"base": "invalid_auth"})
 
         return self.async_create_entry(
             title=self._username,
diff --git a/homeassistant/components/vesync/manifest.json b/homeassistant/components/vesync/manifest.json
index a4e786c2a12..667cb16d128 100644
--- a/homeassistant/components/vesync/manifest.json
+++ b/homeassistant/components/vesync/manifest.json
@@ -8,7 +8,7 @@
     "@thegardenmonkey"
   ],
   "requirements": [
-    "pyvesync==1.1.0"
+    "pyvesync==1.2.0"
   ],
   "config_flow": true
 }
\ No newline at end of file
diff --git a/homeassistant/components/vesync/strings.json b/homeassistant/components/vesync/strings.json
index 1bdf32e1037..8359691effe 100644
--- a/homeassistant/components/vesync/strings.json
+++ b/homeassistant/components/vesync/strings.json
@@ -10,10 +10,10 @@
       }
     },
     "error": {
-      "invalid_login": "Invalid username or password"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
     },
     "abort": {
-      "already_setup": "Only one Vesync instance is allowed"
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/vesync/switch.py b/homeassistant/components/vesync/switch.py
index 939240349d1..0ce4b931def 100644
--- a/homeassistant/components/vesync/switch.py
+++ b/homeassistant/components/vesync/switch.py
@@ -74,13 +74,14 @@ class VeSyncSwitchHA(VeSyncBaseSwitch, SwitchEntity):
     @property
     def device_state_attributes(self):
         """Return the state attributes of the device."""
-        attr = {}
-        if hasattr(self.smartplug, "weekly_energy_total"):
-            attr["voltage"] = self.smartplug.voltage
-            attr["weekly_energy_total"] = self.smartplug.weekly_energy_total
-            attr["monthly_energy_total"] = self.smartplug.monthly_energy_total
-            attr["yearly_energy_total"] = self.smartplug.yearly_energy_total
-        return attr
+        if not hasattr(self.smartplug, "weekly_energy_total"):
+            return {}
+        return {
+            "voltage": self.smartplug.voltage,
+            "weekly_energy_total": self.smartplug.weekly_energy_total,
+            "monthly_energy_total": self.smartplug.monthly_energy_total,
+            "yearly_energy_total": self.smartplug.yearly_energy_total,
+        }
 
     @property
     def current_power_w(self):
diff --git a/homeassistant/components/vesync/translations/ca.json b/homeassistant/components/vesync/translations/ca.json
index cdeeaa3ed57..63c39de62ba 100644
--- a/homeassistant/components/vesync/translations/ca.json
+++ b/homeassistant/components/vesync/translations/ca.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Nom\u00e9s es permet una \u00fanica inst\u00e0ncia de VeSync"
+            "already_setup": "Nom\u00e9s es permet una \u00fanica inst\u00e0ncia de VeSync",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
             "invalid_login": "Nom d'usuari o contrasenya incorrectes"
         },
         "step": {
diff --git a/homeassistant/components/vesync/translations/cs.json b/homeassistant/components/vesync/translations/cs.json
index e20e44aec6e..c6922b0b96a 100644
--- a/homeassistant/components/vesync/translations/cs.json
+++ b/homeassistant/components/vesync/translations/cs.json
@@ -1,11 +1,20 @@
 {
     "config": {
+        "abort": {
+            "already_setup": "Je povolena pouze jedna instance Vesync",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_login": "Neplatn\u00e9 u\u017eivatelsk\u00e9 jm\u00e9no nebo heslo"
+        },
         "step": {
             "user": {
                 "data": {
                     "password": "Heslo",
                     "username": "E-mail"
-                }
+                },
+                "title": "Zadejte u\u017eivatelsk\u00e9 jm\u00e9no a heslo"
             }
         }
     }
diff --git a/homeassistant/components/vesync/translations/en.json b/homeassistant/components/vesync/translations/en.json
index a7a12160187..211f4fa64e0 100644
--- a/homeassistant/components/vesync/translations/en.json
+++ b/homeassistant/components/vesync/translations/en.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Only one Vesync instance is allowed"
+            "already_setup": "Only one Vesync instance is allowed",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
+            "invalid_auth": "Invalid authentication",
             "invalid_login": "Invalid username or password"
         },
         "step": {
diff --git a/homeassistant/components/vesync/translations/es.json b/homeassistant/components/vesync/translations/es.json
index f4d94672f48..5af7e2551bf 100644
--- a/homeassistant/components/vesync/translations/es.json
+++ b/homeassistant/components/vesync/translations/es.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Solo se permite una instancia de Vesync"
+            "already_setup": "Solo se permite una instancia de Vesync",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
             "invalid_login": "Nombre de usuario o contrase\u00f1a no v\u00e1lidos"
         },
         "step": {
diff --git a/homeassistant/components/vesync/translations/et.json b/homeassistant/components/vesync/translations/et.json
new file mode 100644
index 00000000000..b160ddacd77
--- /dev/null
+++ b/homeassistant/components/vesync/translations/et.json
@@ -0,0 +1,21 @@
+{
+    "config": {
+        "abort": {
+            "already_setup": "Lubatud on ainult \u00fcks Vesync sidumine.",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "invalid_auth": "Tuvastamise viga",
+            "invalid_login": "Vale kasutajanimi v\u00f5i salas\u00f5na"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "E-post"
+                },
+                "title": "Sisesta kasutajanimi ja salas\u00f5na"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/vesync/translations/it.json b/homeassistant/components/vesync/translations/it.json
index f18dd28c996..b3c15c4c4d3 100644
--- a/homeassistant/components/vesync/translations/it.json
+++ b/homeassistant/components/vesync/translations/it.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "\u00c8 consentita una sola istanza di Vesync"
+            "already_setup": "\u00c8 consentita una sola istanza di Vesync",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
+            "invalid_auth": "Autenticazione non valida",
             "invalid_login": "Nome utente o password non validi"
         },
         "step": {
diff --git a/homeassistant/components/vesync/translations/lb.json b/homeassistant/components/vesync/translations/lb.json
index 73453c73d5a..6757bc82146 100644
--- a/homeassistant/components/vesync/translations/lb.json
+++ b/homeassistant/components/vesync/translations/lb.json
@@ -4,6 +4,7 @@
             "already_setup": "N\u00ebmmen eng eenzeg Instanz vu Vesync ass erlaabt."
         },
         "error": {
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun",
             "invalid_login": "Ong\u00ebltege Benotzernumm oder Passwuert"
         },
         "step": {
diff --git a/homeassistant/components/vesync/translations/nl.json b/homeassistant/components/vesync/translations/nl.json
index 3624fd2b3f4..cbc6ad38695 100644
--- a/homeassistant/components/vesync/translations/nl.json
+++ b/homeassistant/components/vesync/translations/nl.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Er is slechts \u00e9\u00e9n Vesync instantie toegestaan."
+            "already_setup": "Er is slechts \u00e9\u00e9n Vesync instantie toegestaan.",
+            "single_instance_allowed": "Al geconfigureerd. Slecht \u00e9\u00e9n configuratie mogelijk."
         },
         "error": {
             "invalid_login": "Ongeldige gebruikersnaam of wachtwoord"
diff --git a/homeassistant/components/vesync/translations/no.json b/homeassistant/components/vesync/translations/no.json
index 3cd5f75eb81..060b93fb7b4 100644
--- a/homeassistant/components/vesync/translations/no.json
+++ b/homeassistant/components/vesync/translations/no.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Bare en Vesync-forekomst er tillatt"
+            "already_setup": "Bare en Vesync-forekomst er tillatt",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
+            "invalid_auth": "Ugyldig godkjenning",
             "invalid_login": "Ugyldig brukernavn eller passord"
         },
         "step": {
diff --git a/homeassistant/components/vesync/translations/pl.json b/homeassistant/components/vesync/translations/pl.json
index aa5d4dc587f..8f7837db8ff 100644
--- a/homeassistant/components/vesync/translations/pl.json
+++ b/homeassistant/components/vesync/translations/pl.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Dozwolona jest tylko jedna instancja Vesync"
+            "already_setup": "Dozwolona jest tylko jedna instancja Vesync",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "invalid_login": "Nieprawid\u0142owa nazwa u\u017cytkownika lub has\u0142o"
         },
         "step": {
diff --git a/homeassistant/components/vesync/translations/pt-BR.json b/homeassistant/components/vesync/translations/pt-BR.json
index fada7da0ac7..e4beb645736 100644
--- a/homeassistant/components/vesync/translations/pt-BR.json
+++ b/homeassistant/components/vesync/translations/pt-BR.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "invalid_auth": "Autentica\u00e7\u00e3o invalida",
             "invalid_login": "Usu\u00e1rio ou senha inv\u00e1lidos"
         },
         "step": {
diff --git a/homeassistant/components/vesync/translations/ru.json b/homeassistant/components/vesync/translations/ru.json
index 4b18d353aa9..c1af7ed08ad 100644
--- a/homeassistant/components/vesync/translations/ru.json
+++ b/homeassistant/components/vesync/translations/ru.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
             "invalid_login": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c."
         },
         "step": {
diff --git a/homeassistant/components/vesync/translations/zh-Hans.json b/homeassistant/components/vesync/translations/zh-Hans.json
index caa00f36c89..e256110ffa7 100644
--- a/homeassistant/components/vesync/translations/zh-Hans.json
+++ b/homeassistant/components/vesync/translations/zh-Hans.json
@@ -2,6 +2,14 @@
     "config": {
         "abort": {
             "already_setup": "\u53ea\u5141\u8bb8\u4e00\u4e2aVesync\u5b9e\u4f8b"
+        },
+        "error": {
+            "invalid_login": "\u7528\u6237\u540d\u6216\u5bc6\u7801\u65e0\u6548"
+        },
+        "step": {
+            "user": {
+                "title": "\u8f93\u5165\u7528\u6237\u540d\u548c\u5bc6\u7801"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/vesync/translations/zh-Hant.json b/homeassistant/components/vesync/translations/zh-Hant.json
index 6d099a9d125..5265fa3fb9c 100644
--- a/homeassistant/components/vesync/translations/zh-Hant.json
+++ b/homeassistant/components/vesync/translations/zh-Hant.json
@@ -1,9 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_setup": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44 Vesync \u8a2d\u5099"
+            "already_setup": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44 Vesync \u8a2d\u5099",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
             "invalid_login": "\u4f7f\u7528\u8005\u540d\u7a31\u6216\u5bc6\u78bc\u7121\u6548"
         },
         "step": {
diff --git a/homeassistant/components/vilfo/strings.json b/homeassistant/components/vilfo/strings.json
index 6de59a51f96..c9b8882c264 100644
--- a/homeassistant/components/vilfo/strings.json
+++ b/homeassistant/components/vilfo/strings.json
@@ -11,12 +11,12 @@
       }
     },
     "error": {
-      "cannot_connect": "Failed to connect. Please check the information you provided and try again.",
-      "invalid_auth": "Invalid authentication. Please check the access token and try again.",
-      "unknown": "An unexpected error occurred while setting up the integration."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "This Vilfo Router is already configured."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/vilfo/translations/ca.json b/homeassistant/components/vilfo/translations/ca.json
index 639167e4cec..827545f5b54 100644
--- a/homeassistant/components/vilfo/translations/ca.json
+++ b/homeassistant/components/vilfo/translations/ca.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'encaminador Vilfo ja est\u00e0 configurat."
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar. Verifica la informaci\u00f3 proporcionada i torna-ho a provar.",
-            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida. Comprova el token d'acc\u00e9s i torna-ho a provar.",
-            "unknown": "S'ha produ\u00eft un error inesperat durant la configuraci\u00f3 de la integraci\u00f3."
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida",
+            "unknown": "Error inesperat"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/vilfo/translations/cs.json b/homeassistant/components/vilfo/translations/cs.json
index f1b0c890a22..8b423a73518 100644
--- a/homeassistant/components/vilfo/translations/cs.json
+++ b/homeassistant/components/vilfo/translations/cs.json
@@ -1,11 +1,20 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "user": {
                 "data": {
                     "access_token": "P\u0159\u00edstupov\u00fd token",
                     "host": "Hostitel"
-                }
+                },
+                "title": "P\u0159ipojen\u00ed k routeru Vilfo"
             }
         }
     }
diff --git a/homeassistant/components/vilfo/translations/en.json b/homeassistant/components/vilfo/translations/en.json
index 57815aa0393..03f9a9bd23a 100644
--- a/homeassistant/components/vilfo/translations/en.json
+++ b/homeassistant/components/vilfo/translations/en.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This Vilfo Router is already configured."
+            "already_configured": "Device is already configured"
         },
         "error": {
-            "cannot_connect": "Failed to connect. Please check the information you provided and try again.",
-            "invalid_auth": "Invalid authentication. Please check the access token and try again.",
-            "unknown": "An unexpected error occurred while setting up the integration."
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
+            "unknown": "Unexpected error"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/vilfo/translations/es.json b/homeassistant/components/vilfo/translations/es.json
index 0fbfed923cf..863e0cfb6ce 100644
--- a/homeassistant/components/vilfo/translations/es.json
+++ b/homeassistant/components/vilfo/translations/es.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Este router Vilfo ya est\u00e1 configurado."
+            "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "cannot_connect": "No se pudo conectar. Comprueba la informaci\u00f3n que proporcionaste e int\u00e9ntalo de nuevo.",
-            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida. Comprueba el token de acceso e int\u00e9ntalo de nuevo.",
-            "unknown": "Se ha producido un error inesperado al configurar la integraci\u00f3n."
+            "cannot_connect": "No se pudo conectar",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
+            "unknown": "Error inesperado"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/vilfo/translations/et.json b/homeassistant/components/vilfo/translations/et.json
new file mode 100644
index 00000000000..2274221a6bb
--- /dev/null
+++ b/homeassistant/components/vilfo/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "access_token": "Juurdep\u00e4\u00e4sut\u00f5end",
+                    "host": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/vilfo/translations/it.json b/homeassistant/components/vilfo/translations/it.json
index 8d41d74c79d..ad15381b1db 100644
--- a/homeassistant/components/vilfo/translations/it.json
+++ b/homeassistant/components/vilfo/translations/it.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo Vilfo Router \u00e8 gi\u00e0 configurato."
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi. Controllare le informazioni fornite e riprovare.",
-            "invalid_auth": "Autenticazione non valida. Controllare il token di accesso e riprovare.",
-            "unknown": "Si \u00e8 verificato un errore imprevisto durante l'impostazione dell'integrazione."
+            "cannot_connect": "Impossibile connettersi",
+            "invalid_auth": "Autenticazione non valida",
+            "unknown": "Errore imprevisto"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/vilfo/translations/no.json b/homeassistant/components/vilfo/translations/no.json
index 18b51391d85..b1f1cd8950f 100644
--- a/homeassistant/components/vilfo/translations/no.json
+++ b/homeassistant/components/vilfo/translations/no.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne Vilfo Ruteren er allerede konfigurert."
+            "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes. Vennligst sjekk informasjonen du oppga, og pr\u00f8v igjen.",
-            "invalid_auth": "Ugyldig godkjenning. Vennligst sjekk access token, og pr\u00f8v p\u00e5 nytt.",
-            "unknown": "Det oppstod en uventet feil under installasjonen av integrasjonen."
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning",
+            "unknown": "Uventet feil"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/vilfo/translations/pl.json b/homeassistant/components/vilfo/translations/pl.json
index fb439da9bfe..43b94ffd103 100644
--- a/homeassistant/components/vilfo/translations/pl.json
+++ b/homeassistant/components/vilfo/translations/pl.json
@@ -1,11 +1,11 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Ten router Vilfo jest ju\u017c skonfigurowany."
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia. Sprawd\u017a wprowadzone dane i spr\u00f3buj ponownie.",
-            "invalid_auth": "Nieudane uwierzytelnienie. Sprawd\u017a token dost\u0119pu i spr\u00f3buj ponownie.",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "invalid_auth": "Niepoprawne uwierzytelnienie",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
diff --git a/homeassistant/components/vilfo/translations/ru.json b/homeassistant/components/vilfo/translations/ru.json
index 329a5e400e5..8e61be90400 100644
--- a/homeassistant/components/vilfo/translations/ru.json
+++ b/homeassistant/components/vilfo/translations/ru.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f, \u043f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0438 \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0435\u0449\u0435 \u0440\u0430\u0437.",
-            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0442\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u0438 \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0441\u043d\u043e\u0432\u0430.",
-            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0435 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
+            "unknown": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/vilfo/translations/zh-Hant.json b/homeassistant/components/vilfo/translations/zh-Hant.json
index c1fe87f65e8..abbc12e6d8f 100644
--- a/homeassistant/components/vilfo/translations/zh-Hant.json
+++ b/homeassistant/components/vilfo/translations/zh-Hant.json
@@ -1,12 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Vilfo \u8def\u7531\u5668\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210\u3002"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
         },
         "error": {
-            "cannot_connect": "\u9023\u7dda\u5931\u6557\u3002\u8acb\u6aa2\u67e5\u8f38\u5165\u8cc7\u6599\u5f8c\uff0c\u518d\u8a66\u4e00\u6b21\u3002",
-            "invalid_auth": "\u9a57\u8b49\u7121\u6548\uff0c\u8acb\u6aa2\u67e5\u5b58\u53d6\u5bc6\u9470\u5f8c\u518d\u8a66\u4e00\u6b21\u3002",
-            "unknown": "\u8a2d\u5b9a\u6574\u5408\u6642\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548",
+            "unknown": "\u672a\u9810\u671f\u932f\u8aa4"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/vivotek/camera.py b/homeassistant/components/vivotek/camera.py
index 6bf9fdace5a..953d64f0ff6 100644
--- a/homeassistant/components/vivotek/camera.py
+++ b/homeassistant/components/vivotek/camera.py
@@ -1,7 +1,4 @@
 """Support for Vivotek IP Cameras."""
-
-import logging
-
 from libpyvivotek import VivotekCamera
 import voluptuous as vol
 
@@ -19,8 +16,6 @@ from homeassistant.const import (
 )
 from homeassistant.helpers import config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_FRAMERATE = "framerate"
 CONF_SECURITY_LEVEL = "security_level"
 CONF_STREAM_PATH = "stream_path"
@@ -52,9 +47,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up a Vivotek IP Camera."""
     creds = f"{config[CONF_USERNAME]}:{config[CONF_PASSWORD]}"
-    args = dict(
-        config=config,
-        cam=VivotekCamera(
+    args = {
+        "config": config,
+        "cam": VivotekCamera(
             host=config[CONF_IP_ADDRESS],
             port=(443 if config[CONF_SSL] else 80),
             verify_ssl=config[CONF_VERIFY_SSL],
@@ -63,8 +58,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
             digest_auth=config[CONF_AUTHENTICATION] == HTTP_DIGEST_AUTHENTICATION,
             sec_lvl=config[CONF_SECURITY_LEVEL],
         ),
-        stream_source=f"rtsp://{creds}@{config[CONF_IP_ADDRESS]}:554/{config[CONF_STREAM_PATH]}",
-    )
+        "stream_source": f"rtsp://{creds}@{config[CONF_IP_ADDRESS]}:554/{config[CONF_STREAM_PATH]}",
+    }
     add_entities([VivotekCam(**args)], True)
 
 
diff --git a/homeassistant/components/vizio/config_flow.py b/homeassistant/components/vizio/config_flow.py
index 74fc0d746e3..f3b7720a33e 100644
--- a/homeassistant/components/vizio/config_flow.py
+++ b/homeassistant/components/vizio/config_flow.py
@@ -206,29 +206,29 @@ class VizioConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         self, user_input: Dict[str, Any] = None
     ) -> Dict[str, Any]:
         """Handle a flow initialized by the user."""
+        assert self.hass
         errors = {}
 
         if user_input is not None:
             # Store current values in case setup fails and user needs to edit
             self._user_schema = _get_config_schema(user_input)
-            unique_id = await VizioAsync.get_unique_id(
-                user_input[CONF_HOST],
-                user_input[CONF_DEVICE_CLASS],
-                session=async_get_clientsession(self.hass, False),
-            )
-
-            if not unique_id:
-                errors[CONF_HOST] = "cannot_connect"
-            else:
-                # Set unique ID and abort if a flow with the same unique ID is already in progress
-                existing_entry = await self.async_set_unique_id(
-                    unique_id=unique_id, raise_on_progress=True
+            if self.unique_id is None:
+                unique_id = await VizioAsync.get_unique_id(
+                    user_input[CONF_HOST],
+                    user_input[CONF_DEVICE_CLASS],
+                    session=async_get_clientsession(self.hass, False),
                 )
-                # If device was discovered, abort if existing entry found, otherwise display an error
-                # pylint: disable=no-member # https://github.com/PyCQA/pylint/issues/3167
-                if self.context["source"] == SOURCE_ZEROCONF:
-                    self._abort_if_unique_id_configured()
-                elif existing_entry:
+
+                # Check if unique ID was found, set unique ID, and abort if a flow with
+                # the same unique ID is already in progress
+                if not unique_id:
+                    errors[CONF_HOST] = "cannot_connect"
+                elif (
+                    await self.async_set_unique_id(
+                        unique_id=unique_id, raise_on_progress=True
+                    )
+                    is not None
+                ):
                     errors[CONF_HOST] = "existing_config_entry_found"
 
             if not errors:
@@ -346,6 +346,7 @@ class VizioConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         self, discovery_info: Optional[DiscoveryInfoType] = None
     ) -> Dict[str, Any]:
         """Handle zeroconf discovery."""
+        assert self.hass
 
         discovery_info[
             CONF_HOST
@@ -360,6 +361,15 @@ class VizioConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             discovery_info[CONF_HOST]
         )
 
+        # Set unique ID early for discovery flow so we can abort if needed
+        unique_id = await VizioAsync.get_unique_id(
+            discovery_info[CONF_HOST],
+            discovery_info[CONF_DEVICE_CLASS],
+            session=async_get_clientsession(self.hass, False),
+        )
+        await self.async_set_unique_id(unique_id=unique_id, raise_on_progress=True)
+        self._abort_if_unique_id_configured()
+
         # Form must be shown after discovery so user can confirm/update configuration
         # before ConfigEntry creation.
         self._must_show_form = True
diff --git a/homeassistant/components/vizio/media_player.py b/homeassistant/components/vizio/media_player.py
index ac688241682..61c9ca54854 100644
--- a/homeassistant/components/vizio/media_player.py
+++ b/homeassistant/components/vizio/media_player.py
@@ -289,7 +289,7 @@ class VizioDevice(MediaPlayerEntity):
     ) -> None:
         """Send update event when Vizio config entry is updated."""
         # Move this method to component level if another entity ever gets added for a single config entry.
-        # See here: https://github.com/home-assistant/home-assistant/pull/30653#discussion_r366426121
+        # See here: https://github.com/home-assistant/core/pull/30653#discussion_r366426121
         async_dispatcher_send(hass, config_entry.entry_id, config_entry)
 
     async def _async_update_options(self, config_entry: ConfigEntry) -> None:
diff --git a/homeassistant/components/vizio/strings.json b/homeassistant/components/vizio/strings.json
index 8979f6fd82e..da039b6a89e 100644
--- a/homeassistant/components/vizio/strings.json
+++ b/homeassistant/components/vizio/strings.json
@@ -5,7 +5,7 @@
         "title": "VIZIO SmartCast Device",
         "description": "An [%key:common::config_flow::data::access_token%] is only needed for TVs. If you are configuring a TV and do not have an [%key:common::config_flow::data::access_token%] yet, leave it blank to go through a pairing process.",
         "data": {
-          "name": "Name",
+          "name": "[%key:common::config_flow::data::name%]",
           "host": "[%key:common::config_flow::data::host%]",
           "device_class": "Device Type",
           "access_token": "[%key:common::config_flow::data::access_token%]"
@@ -15,7 +15,7 @@
         "title": "Complete Pairing Process",
         "description": "Your TV should be displaying a code. Enter that code into the form and then continue to the next step to complete the pairing.",
         "data": {
-          "pin": "PIN"
+          "pin": "[%key:common::config_flow::data::pin%]"
         }
       },
       "pairing_complete": {
@@ -50,4 +50,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/vizio/translations/ca.json b/homeassistant/components/vizio/translations/ca.json
index 34ce551a0fe..9182264dddf 100644
--- a/homeassistant/components/vizio/translations/ca.json
+++ b/homeassistant/components/vizio/translations/ca.json
@@ -14,7 +14,7 @@
         "step": {
             "pair_tv": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "Codi PIN"
                 },
                 "description": "El televisor hauria d'estar mostrant un codi. Introdueix aquest codi al formulari i segueix amb els seg\u00fcents passos per completar la vinculaci\u00f3.",
                 "title": "Proc\u00e9s de vinculaci\u00f3 complet"
diff --git a/homeassistant/components/vizio/translations/cs.json b/homeassistant/components/vizio/translations/cs.json
index 5918b2833bd..e0df8526604 100644
--- a/homeassistant/components/vizio/translations/cs.json
+++ b/homeassistant/components/vizio/translations/cs.json
@@ -1,21 +1,52 @@
 {
     "config": {
         "abort": {
-            "already_configured_device": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured_device": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "updated_entry": "Tato polo\u017eka ji\u017e byla nastavena, ale jm\u00e9no, aplikace nebo mo\u017enosti definovan\u00e9 v konfiguraci neodpov\u00eddaj\u00ed d\u0159\u00edve importovan\u00e9 konfiguraci, tak\u017ee polo\u017eka konfigurace byla odpov\u00eddaj\u00edc\u00edm zp\u016fsobem aktualizov\u00e1na."
         },
         "error": {
-            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "host_exists": "Za\u0159\u00edzen\u00ed VIZIO SmartCast se zadan\u00fdm hostitelem je ji\u017e nastaveno.",
+            "name_exists": "Za\u0159\u00edzen\u00ed VIZIO SmartCast se zadan\u00fdm hostitelem je ji\u017e nastaveno."
         },
         "step": {
+            "pair_tv": {
+                "data": {
+                    "pin": "PIN k\u00f3d"
+                },
+                "description": "Va\u0161e televize by m\u011bla zobrazovat k\u00f3d. Zadejte tento k\u00f3d do formul\u00e1\u0159e a pokra\u010dujte dal\u0161\u00edm krokem, kter\u00fdm dokon\u010d\u00edte p\u00e1rov\u00e1n\u00ed.",
+                "title": "Dokon\u010dete proces p\u00e1rov\u00e1n\u00ed"
+            },
+            "pairing_complete": {
+                "description": "V\u00e1\u0161 Za\u0159\u00edzen\u00ed VIZIO SmartCast je nyn\u00ed p\u0159ipojeno k Home Assistant.",
+                "title": "P\u00e1rov\u00e1n\u00ed dokon\u010deno"
+            },
             "pairing_complete_import": {
-                "description": "V\u00e1\u0161  je nyn\u00ed p\u0159ipojen k Home Assistant. \n\n V\u00e1\u0161 P\u0159\u00edstupov\u00fd token je '** {access_token} **'."
+                "description": "V\u00e1\u0161 Za\u0159\u00edzen\u00ed VIZIO SmartCast je nyn\u00ed p\u0159ipojen k Home Assistant. \n\n V\u00e1\u0161 P\u0159\u00edstupov\u00fd token je '** {access_token} **'.",
+                "title": "P\u00e1rov\u00e1n\u00ed dokon\u010deno"
             },
             "user": {
                 "data": {
                     "access_token": "P\u0159\u00edstupov\u00fd token",
-                    "host": "Hostitel"
+                    "device_class": "Typ za\u0159\u00edzen\u00ed",
+                    "host": "Hostitel",
+                    "name": "Jm\u00e9no"
                 },
-                "description": "P\u0159\u00edstupov\u00fd token je pot\u0159eba pouze pro televizory. Pokud konfigurujete televizor a nem\u00e1te [%key:common:common::config_flow::data::access_token%], ponechte jej pr\u00e1zdn\u00e9, abyste mohli proj\u00edt procesem p\u00e1rov\u00e1n\u00ed."
+                "description": "P\u0159\u00edstupov\u00fd token je pot\u0159eba pouze pro televizory. Pokud konfigurujete televizor a nem\u00e1te [%key:common:common::config_flow::data::access_token%], ponechte jej pr\u00e1zdn\u00e9, abyste mohli proj\u00edt procesem p\u00e1rov\u00e1n\u00ed.",
+                "title": "Za\u0159\u00edzen\u00ed VIZIO SmartCast"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "apps_to_include_or_exclude": "Aplikace, kter\u00e9 chcete zahrnout nebo vylou\u010dit",
+                    "include_or_exclude": "Zahrnout nebo vylou\u010dit aplikace?",
+                    "volume_step": "V\u00fd\u0161e kroku hlasitosti"
+                },
+                "description": "Pokud m\u00e1te Smart TV, m\u016f\u017eete vyfiltrovat seznam zdroj\u016f v\u00fdb\u011brem aplikac\u00ed, kter\u00e9 chcete do seznamu zdroj\u016f zahrnout nebo vylou\u010dit.",
+                "title": "Aktualizujte mo\u017enosti Za\u0159\u00edzen\u00ed VIZIO SmartCast"
             }
         }
     }
diff --git a/homeassistant/components/vizio/translations/en.json b/homeassistant/components/vizio/translations/en.json
index 0c18c2d581e..2bda9864bed 100644
--- a/homeassistant/components/vizio/translations/en.json
+++ b/homeassistant/components/vizio/translations/en.json
@@ -14,7 +14,7 @@
         "step": {
             "pair_tv": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "PIN Code"
                 },
                 "description": "Your TV should be displaying a code. Enter that code into the form and then continue to the next step to complete the pairing.",
                 "title": "Complete Pairing Process"
diff --git a/homeassistant/components/vizio/translations/es.json b/homeassistant/components/vizio/translations/es.json
index ec20977b459..cc7f61c371f 100644
--- a/homeassistant/components/vizio/translations/es.json
+++ b/homeassistant/components/vizio/translations/es.json
@@ -14,7 +14,7 @@
         "step": {
             "pair_tv": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "C\u00f3digo PIN"
                 },
                 "description": "Tu TV debe estar mostrando un c\u00f3digo. Escribe ese c\u00f3digo en el formulario y contin\u00faa con el paso siguiente para completar el emparejamiento.",
                 "title": "Completar Proceso de Emparejamiento"
diff --git a/homeassistant/components/vizio/translations/et.json b/homeassistant/components/vizio/translations/et.json
new file mode 100644
index 00000000000..4c33f9cb6bb
--- /dev/null
+++ b/homeassistant/components/vizio/translations/et.json
@@ -0,0 +1,38 @@
+{
+    "config": {
+        "abort": {
+            "already_configured_device": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "pair_tv": {
+                "data": {
+                    "pin": "PIN kood"
+                }
+            },
+            "pairing_complete_import": {
+                "description": "[VOID] on n\u00fc\u00fcd \u00fchendatud Home Assistantiga.\n\nJuurdep\u00e4\u00e4sut\u00f5end on '** {access_token} **'."
+            },
+            "user": {
+                "data": {
+                    "access_token": "Juurdep\u00e4\u00e4sut\u00f5end",
+                    "host": "",
+                    "name": "Nimi"
+                },
+                "description": "Juurdep\u00e4\u00e4sut\u00f5end on vaja ainult telerite jaoks. Kui seadistad telerit ja pole veel Juurdep\u00e4\u00e4sut\u00f5end , j\u00e4ta v\u00e4li paaristamisprotsessi l\u00e4bimiseks t\u00fchjaks.",
+                "title": ""
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "include_or_exclude": "Kas kaasata v\u00f5i v\u00e4listada rakendused?"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/vizio/translations/it.json b/homeassistant/components/vizio/translations/it.json
index d42562b82b2..0a8e1b10f61 100644
--- a/homeassistant/components/vizio/translations/it.json
+++ b/homeassistant/components/vizio/translations/it.json
@@ -14,7 +14,7 @@
         "step": {
             "pair_tv": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "Codice PIN"
                 },
                 "description": "La TV dovrebbe visualizzare un codice. Immettere quel codice nel modulo e quindi continuare con il passaggio successivo per completare l'associazione.",
                 "title": "Processo di associazione completo"
diff --git a/homeassistant/components/vizio/translations/nl.json b/homeassistant/components/vizio/translations/nl.json
index 476f8265102..f8f5f2a42c2 100644
--- a/homeassistant/components/vizio/translations/nl.json
+++ b/homeassistant/components/vizio/translations/nl.json
@@ -14,6 +14,7 @@
                 "data": {
                     "pin": "PIN"
                 },
+                "description": "Uw TV zou een code moeten weergeven. Voer die code in het formulier in en ga dan door naar de volgende stap om de koppeling te voltooien.",
                 "title": "Voltooi het koppelingsproces"
             },
             "pairing_complete": {
diff --git a/homeassistant/components/vizio/translations/no.json b/homeassistant/components/vizio/translations/no.json
index ede021f1a3a..e10275fd95f 100644
--- a/homeassistant/components/vizio/translations/no.json
+++ b/homeassistant/components/vizio/translations/no.json
@@ -5,16 +5,16 @@
             "updated_entry": "Dette innlegget har allerede v\u00e6rt oppsett, men navnet, apps, og/eller alternativer som er definert i konfigurasjon som ikke stemmer med det som tidligere er importert konfigurasjon, s\u00e5 konfigurasjonen innlegget har blitt oppdatert i henhold til dette."
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "complete_pairing_failed": "Kan ikke fullf\u00f8re sammenkoblingen. Forsikre deg om at PIN-koden du oppga er riktig, og at TV-en fortsatt er p\u00e5 og tilkoblet nettverket f\u00f8r du sender inn p\u00e5 nytt.",
             "existing_config_entry_found": "En eksisterende VIZIO SmartCast-enhet konfigurasjonsinngang med samme serienummer er allerede konfigurert. Du m\u00e5 slette den eksisterende oppf\u00f8ringen for \u00e5 konfigurere denne.",
-            "host_exists": "VIZIO SmartCast-enhet with specified host already configured.",
-            "name_exists": "VIZIO SmartCast-enhet with specified name already configured."
+            "host_exists": "VIZIO SmartCast-enhet med spesifisert vert allerede konfigurert.",
+            "name_exists": "VIZIO SmartCast-enhet med spesifisert navn allerede konfigurert."
         },
         "step": {
             "pair_tv": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "PIN-kode"
                 },
                 "description": "TVen skal vise en kode. Fyll inn denne koden i skjemaet, og fortsett deretter til neste trinn for \u00e5 fullf\u00f8re paringen.",
                 "title": "Fullf\u00f8r sammenkoblingsprosess"
@@ -24,7 +24,7 @@
                 "title": "Sammenkoblingen fullf\u00f8rt"
             },
             "pairing_complete_import": {
-                "description": "Din VIZIO SmartCast-enhet er n\u00e5 koblet til VIZIO SmartCast-enhet . \n\n Tilgangstoken er '** {access_token} **'.",
+                "description": "Din VIZIO SmartCast-enhet er n\u00e5 koblet til Home Assistant . \n\n Tilgangstoken er '** {access_token} **'.",
                 "title": "Sammenkoblingen fullf\u00f8rt"
             },
             "user": {
diff --git a/homeassistant/components/vizio/translations/pl.json b/homeassistant/components/vizio/translations/pl.json
index e5bcf0875a3..8784c30c9a0 100644
--- a/homeassistant/components/vizio/translations/pl.json
+++ b/homeassistant/components/vizio/translations/pl.json
@@ -2,28 +2,29 @@
     "config": {
         "abort": {
             "already_configured_device": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "updated_entry": "Ten wpis zosta\u0142 ju\u017c skonfigurowany, ale nazwa i/lub opcje zdefiniowane w konfiguracji nie pasuj\u0105 do wcze\u015bniej zaimportowanych warto\u015bci, wi\u0119c wpis konfiguracji zosta\u0142 odpowiednio zaktualizowany."
+            "updated_entry": "Ten wpis zosta\u0142 ju\u017c skonfigurowany, ale nazwa, aplikacje i/lub opcje zdefiniowane w konfiguracji nie pasuj\u0105 do wcze\u015bniej zaimportowanych warto\u015bci, wi\u0119c wpis konfiguracji zosta\u0142 odpowiednio zaktualizowany."
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "complete_pairing_failed": "Nie mo\u017cna uko\u0144czy\u0107 parowania. Upewnij si\u0119, \u017ce podany kod PIN jest prawid\u0142owy, a telewizor jest zasilany i pod\u0142\u0105czony do sieci przed ponownym przes\u0142aniem.",
-            "host_exists": "Urz\u0105dzenie Vizio z okre\u015blonym hostem jest ju\u017c skonfigurowane.",
-            "name_exists": "Urz\u0105dzenie Vizio o okre\u015blonej nazwie jest ju\u017c skonfigurowane."
+            "existing_config_entry_found": "Istnieje ju\u017c wpis konfiguracyjny VIZIO SmartCast z tym samym numerem seryjnym. W celu skonfigurowania tego wpisu nale\u017cy usun\u0105\u0107 istniej\u0105cy.",
+            "host_exists": "Urz\u0105dzenie VIZIO SmartCast z okre\u015blonym hostem jest ju\u017c skonfigurowane",
+            "name_exists": "Urz\u0105dzenie VIZIO SmartCast o okre\u015blonej nazwie jest ju\u017c skonfigurowane"
         },
         "step": {
             "pair_tv": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "Kod PIN"
                 },
                 "description": "Tw\u00f3j telewizor powinien wy\u015bwietla\u0107 kod. Wprowad\u017a ten kod do formularza, a nast\u0119pnie przejd\u017a do nast\u0119pnego kroku, aby zako\u0144czy\u0107 parowanie.",
                 "title": "Ko\u0144czenie procesu parowania"
             },
             "pairing_complete": {
-                "description": "Twoje urz\u0105dzenie VIZIO SmartCast jest teraz po\u0142\u0105czone z Home Assistantem.",
+                "description": "Twoje urz\u0105dzenie VIZIO SmartCast jest teraz po\u0142\u0105czone z Home Assistant.",
                 "title": "Parowanie zako\u0144czone"
             },
             "pairing_complete_import": {
-                "description": "Twoje urz\u0105dzenie VIZIO SmartCast jest teraz po\u0142\u0105czone z Home Assistantem.\n\nToken dost\u0119pu to '**{access_token}**'.",
+                "description": "Twoje urz\u0105dzenie VIZIO SmartCast jest teraz po\u0142\u0105czone z Home Assistant.\n\nToken dost\u0119pu to '**{access_token}**'.",
                 "title": "Parowanie zako\u0144czone"
             },
             "user": {
@@ -34,7 +35,7 @@
                     "name": "Nazwa"
                 },
                 "description": "Token dost\u0119pu potrzebny jest tylko dla telewizor\u00f3w. Je\u015bli konfigurujesz telewizor i nie masz jeszcze tokenu dost\u0119pu, pozostaw go pusty, aby przej\u015b\u0107 przez proces parowania.",
-                "title": "Konfiguracja klienta Vizio SmartCast"
+                "title": "VIZIO SmartCast"
             }
         }
     },
@@ -47,7 +48,7 @@
                     "volume_step": "Skok g\u0142o\u015bno\u015bci"
                 },
                 "description": "Je\u015bli telewizor obs\u0142uguje aplikacje, mo\u017cesz opcjonalnie filtrowa\u0107 aplikacje, kt\u00f3re maj\u0105 zosta\u0107 uwzgl\u0119dnione lub wykluczone z listy \u017ar\u00f3de\u0142. Mo\u017cesz pomin\u0105\u0107 ten krok dla telewizor\u00f3w, kt\u00f3re nie obs\u0142uguj\u0105 aplikacji.",
-                "title": "Aktualizacja opcji Vizo SmartCast"
+                "title": "Aktualizacja opcji VIZIO SmartCast"
             }
         }
     }
diff --git a/homeassistant/components/vizio/translations/sv.json b/homeassistant/components/vizio/translations/sv.json
index 0762066c8b4..1ade90683e1 100644
--- a/homeassistant/components/vizio/translations/sv.json
+++ b/homeassistant/components/vizio/translations/sv.json
@@ -23,6 +23,8 @@
         "step": {
             "init": {
                 "data": {
+                    "apps_to_include_or_exclude": "Appar som ska inkluderas eller exkluderas",
+                    "include_or_exclude": "Inkludera eller exkludera appar?",
                     "volume_step": "Storlek p\u00e5 volymsteg"
                 },
                 "title": "Uppdatera Vizo SmartCast-alternativ"
diff --git a/homeassistant/components/vizio/translations/zh-Hant.json b/homeassistant/components/vizio/translations/zh-Hant.json
index 133c2d24381..bc12095371f 100644
--- a/homeassistant/components/vizio/translations/zh-Hant.json
+++ b/homeassistant/components/vizio/translations/zh-Hant.json
@@ -14,7 +14,7 @@
         "step": {
             "pair_tv": {
                 "data": {
-                    "pin": "PIN"
+                    "pin": "PIN \u78bc"
                 },
                 "description": "\u96fb\u8996\u4e0a\u61c9\u8a72\u6703\u986f\u793a\u4e00\u7d44\u4ee3\u78bc\u3002\u65bc\u8868\u683c\u4e2d\u8f38\u5165\u4ee3\u78bc\uff0c\u7136\u5f8c\u7e7c\u7e8c\u4e0b\u4e00\u6b65\u4ee5\u5b8c\u6210\u914d\u5c0d\u3002",
                 "title": "\u5b8c\u6210\u914d\u5c0d\u904e\u7a0b"
diff --git a/homeassistant/components/volumio/browse_media.py b/homeassistant/components/volumio/browse_media.py
new file mode 100644
index 00000000000..dfceb491372
--- /dev/null
+++ b/homeassistant/components/volumio/browse_media.py
@@ -0,0 +1,167 @@
+"""Support for media browsing."""
+import json
+
+from homeassistant.components.media_player import BrowseError, BrowseMedia
+from homeassistant.components.media_player.const import (
+    MEDIA_CLASS_ALBUM,
+    MEDIA_CLASS_ARTIST,
+    MEDIA_CLASS_CHANNEL,
+    MEDIA_CLASS_DIRECTORY,
+    MEDIA_CLASS_GENRE,
+    MEDIA_CLASS_PLAYLIST,
+    MEDIA_CLASS_TRACK,
+    MEDIA_TYPE_MUSIC,
+)
+
+PLAYABLE_ITEM_TYPES = [
+    "folder",
+    "song",
+    "mywebradio",
+    "webradio",
+    "playlist",
+    "cuesong",
+    "remdisk",
+    "cuefile",
+    "folder-with-favourites",
+    "internal-folder",
+]
+
+NON_EXPANDABLE_ITEM_TYPES = [
+    "song",
+    "webradio",
+    "mywebradio",
+    "cuesong",
+    "album",
+    "artist",
+    "cd",
+    "play-playlist",
+]
+
+PLAYLISTS_URI_PREFIX = "playlists"
+ARTISTS_URI_PREFIX = "artists://"
+ALBUMS_URI_PREFIX = "albums://"
+GENRES_URI_PREFIX = "genres://"
+RADIO_URI_PREFIX = "radio"
+LAST_100_URI_PREFIX = "Last_100"
+FAVOURITES_URI = "favourites"
+
+
+def _item_to_children_media_class(item, info=None):
+    if info and "album" in info and "artist" in info:
+        return MEDIA_CLASS_TRACK
+    if item["uri"].startswith(PLAYLISTS_URI_PREFIX):
+        return MEDIA_CLASS_PLAYLIST
+    if item["uri"].startswith(ARTISTS_URI_PREFIX):
+        if len(item["uri"]) > len(ARTISTS_URI_PREFIX):
+            return MEDIA_CLASS_ALBUM
+        return MEDIA_CLASS_ARTIST
+    if item["uri"].startswith(ALBUMS_URI_PREFIX):
+        if len(item["uri"]) > len(ALBUMS_URI_PREFIX):
+            return MEDIA_CLASS_TRACK
+        return MEDIA_CLASS_ALBUM
+    if item["uri"].startswith(GENRES_URI_PREFIX):
+        if len(item["uri"]) > len(GENRES_URI_PREFIX):
+            return MEDIA_CLASS_ALBUM
+        return MEDIA_CLASS_GENRE
+    if item["uri"].startswith(LAST_100_URI_PREFIX) or item["uri"] == FAVOURITES_URI:
+        return MEDIA_CLASS_TRACK
+    if item["uri"].startswith(RADIO_URI_PREFIX):
+        return MEDIA_CLASS_CHANNEL
+    return MEDIA_CLASS_DIRECTORY
+
+
+def _item_to_media_class(item, parent_item=None):
+    if "type" not in item:
+        return MEDIA_CLASS_DIRECTORY
+    if item["type"] in ["webradio", "mywebradio"]:
+        return MEDIA_CLASS_CHANNEL
+    if item["type"] in ["song", "cuesong"]:
+        return MEDIA_CLASS_TRACK
+    if item.get("artist"):
+        return MEDIA_CLASS_ALBUM
+    if item["uri"].startswith(ARTISTS_URI_PREFIX) and len(item["uri"]) > len(
+        ARTISTS_URI_PREFIX
+    ):
+        return MEDIA_CLASS_ARTIST
+    if parent_item:
+        return _item_to_children_media_class(parent_item)
+    return MEDIA_CLASS_DIRECTORY
+
+
+def _list_payload(media_library, item, children=None):
+    return BrowseMedia(
+        title=item["name"],
+        media_class=MEDIA_CLASS_DIRECTORY,
+        children_media_class=_item_to_children_media_class(item),
+        media_content_type=MEDIA_TYPE_MUSIC,
+        media_content_id=json.dumps(item),
+        can_play=False,
+        can_expand=True,
+    )
+
+
+def _raw_item_payload(media_library, item, parent_item=None, title=None, info=None):
+    if "type" in item:
+        thumbnail = item.get("albumart")
+        if thumbnail:
+            thumbnail = media_library.canonic_url(thumbnail)
+    else:
+        # don't use the built-in volumio white-on-white icons
+        thumbnail = None
+
+    return {
+        "title": title or item.get("title"),
+        "media_class": _item_to_media_class(item, parent_item),
+        "children_media_class": _item_to_children_media_class(item, info),
+        "media_content_type": MEDIA_TYPE_MUSIC,
+        "media_content_id": json.dumps(item),
+        "can_play": item.get("type") in PLAYABLE_ITEM_TYPES,
+        "can_expand": item.get("type") not in NON_EXPANDABLE_ITEM_TYPES,
+        "thumbnail": thumbnail,
+    }
+
+
+def _item_payload(media_library, item, parent_item):
+    return BrowseMedia(
+        **_raw_item_payload(media_library, item, parent_item=parent_item)
+    )
+
+
+async def browse_top_level(media_library):
+    """Browse the top-level of a Volumio media hierarchy."""
+    navigation = await media_library.browse()
+    children = [_list_payload(media_library, item) for item in navigation["lists"]]
+    return BrowseMedia(
+        media_class=MEDIA_CLASS_DIRECTORY,
+        media_content_id="library",
+        media_content_type="library",
+        title="Media Library",
+        can_play=False,
+        can_expand=True,
+        children=children,
+    )
+
+
+async def browse_node(media_library, media_content_type, media_content_id):
+    """Browse a node of a Volumio media hierarchy."""
+    json_item = json.loads(media_content_id)
+    navigation = await media_library.browse(json_item["uri"])
+    if "lists" not in navigation:
+        raise BrowseError(f"Media not found: {media_content_type} / {media_content_id}")
+
+    # we only use the first list since the second one could include all tracks
+    first_list = navigation["lists"][0]
+    children = [
+        _item_payload(media_library, item, parent_item=json_item)
+        for item in first_list["items"]
+    ]
+    info = navigation.get("info")
+    title = first_list.get("title")
+    if not title:
+        if info:
+            title = f"{info.get('album')} ({info.get('artist')})"
+        else:
+            title = "Media Library"
+
+    payload = _raw_item_payload(media_library, json_item, title=title, info=info)
+    return BrowseMedia(**payload, children=children)
diff --git a/homeassistant/components/volumio/manifest.json b/homeassistant/components/volumio/manifest.json
index 08c0167df0a..a12b96e7bca 100644
--- a/homeassistant/components/volumio/manifest.json
+++ b/homeassistant/components/volumio/manifest.json
@@ -5,5 +5,5 @@
   "codeowners": ["@OnFreund"],
   "config_flow": true,
   "zeroconf": ["_Volumio._tcp.local."],
-  "requirements": ["pyvolumio==0.1.2"]
+  "requirements": ["pyvolumio==0.1.3"]
 }
\ No newline at end of file
diff --git a/homeassistant/components/volumio/media_player.py b/homeassistant/components/volumio/media_player.py
index d471f283ef1..89fb17affc8 100644
--- a/homeassistant/components/volumio/media_player.py
+++ b/homeassistant/components/volumio/media_player.py
@@ -4,15 +4,17 @@ Volumio Platform.
 Volumio rest API: https://volumio.github.io/docs/API/REST_API.html
 """
 from datetime import timedelta
-import logging
+import json
 
 from homeassistant.components.media_player import MediaPlayerEntity
 from homeassistant.components.media_player.const import (
     MEDIA_TYPE_MUSIC,
+    SUPPORT_BROWSE_MEDIA,
     SUPPORT_CLEAR_PLAYLIST,
     SUPPORT_NEXT_TRACK,
     SUPPORT_PAUSE,
     SUPPORT_PLAY,
+    SUPPORT_PLAY_MEDIA,
     SUPPORT_PREVIOUS_TRACK,
     SUPPORT_SEEK,
     SUPPORT_SELECT_SOURCE,
@@ -31,10 +33,10 @@ from homeassistant.const import (
 )
 from homeassistant.util import Throttle
 
+from .browse_media import browse_node, browse_top_level
 from .const import DATA_INFO, DATA_VOLUMIO, DOMAIN
 
 _CONFIGURING = {}
-_LOGGER = logging.getLogger(__name__)
 
 SUPPORT_VOLUMIO = (
     SUPPORT_PAUSE
@@ -45,10 +47,12 @@ SUPPORT_VOLUMIO = (
     | SUPPORT_SEEK
     | SUPPORT_STOP
     | SUPPORT_PLAY
+    | SUPPORT_PLAY_MEDIA
     | SUPPORT_VOLUME_STEP
     | SUPPORT_SELECT_SOURCE
     | SUPPORT_SHUFFLE_SET
     | SUPPORT_CLEAR_PLAYLIST
+    | SUPPORT_BROWSE_MEDIA
 )
 
 PLAYLIST_UPDATE_INTERVAL = timedelta(seconds=15)
@@ -246,3 +250,14 @@ class Volumio(MediaPlayerEntity):
     async def _async_update_playlists(self, **kwargs):
         """Update available Volumio playlists."""
         self._playlists = await self._volumio.get_playlists()
+
+    async def async_play_media(self, media_type, media_id, **kwargs):
+        """Send the play_media command to the media player."""
+        await self._volumio.replace_and_play(json.loads(media_id))
+
+    async def async_browse_media(self, media_content_type=None, media_content_id=None):
+        """Implement the websocket media browsing helper."""
+        if media_content_type in [None, "library"]:
+            return await browse_top_level(self._volumio)
+
+        return await browse_node(self._volumio, media_content_type, media_content_id)
diff --git a/homeassistant/components/volumio/translations/cs.json b/homeassistant/components/volumio/translations/cs.json
index c3862ff2f79..70af5c82425 100644
--- a/homeassistant/components/volumio/translations/cs.json
+++ b/homeassistant/components/volumio/translations/cs.json
@@ -1,5 +1,13 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nelze se p\u0159ipojit k objeven\u00e9mu za\u0159\u00edzen\u00ed Volumio"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
         "step": {
             "discovery_confirm": {
                 "description": "Chcete p\u0159idat Volumio (`{name}`) do Home Assistant?",
@@ -7,6 +15,7 @@
             },
             "user": {
                 "data": {
+                    "host": "Hostitel",
                     "port": "Port"
                 }
             }
diff --git a/homeassistant/components/volumio/translations/et.json b/homeassistant/components/volumio/translations/et.json
new file mode 100644
index 00000000000..a8a93cef5c0
--- /dev/null
+++ b/homeassistant/components/volumio/translations/et.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "discovery_confirm": {
+                "description": "Kas soovid lisada Volumio ('{name}') Home Assistanti?"
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "port": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/volumio/translations/nl.json b/homeassistant/components/volumio/translations/nl.json
new file mode 100644
index 00000000000..c1909b19508
--- /dev/null
+++ b/homeassistant/components/volumio/translations/nl.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "port": "Poort"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/volumio/translations/no.json b/homeassistant/components/volumio/translations/no.json
index 60b5fc38e68..d8e297a6223 100644
--- a/homeassistant/components/volumio/translations/no.json
+++ b/homeassistant/components/volumio/translations/no.json
@@ -5,12 +5,12 @@
             "cannot_connect": "Kan ikke koble til oppdaget Volumio"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "unknown": "Uventet feil"
         },
         "step": {
             "discovery_confirm": {
-                "description": "Vil du legge Volumio (` {name} `) til Home Assistant?",
+                "description": "Vil du legge Volumio (`{name}`) til Home Assistant?",
                 "title": "Oppdaget Volumio"
             },
             "user": {
diff --git a/homeassistant/components/volumio/translations/pl.json b/homeassistant/components/volumio/translations/pl.json
index 1708694e123..431788c2c52 100644
--- a/homeassistant/components/volumio/translations/pl.json
+++ b/homeassistant/components/volumio/translations/pl.json
@@ -1,13 +1,18 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z odnalezionym Volumio"
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
+            "discovery_confirm": {
+                "description": "Czy chcesz doda\u0107 Volumio (\"{name}\") do Home Assistant?",
+                "title": "Wykryte Volumio"
+            },
             "user": {
                 "data": {
                     "host": "Nazwa hosta lub adres IP",
diff --git a/homeassistant/components/volvooncall/binary_sensor.py b/homeassistant/components/volvooncall/binary_sensor.py
index 0dba6186ef9..f08b4509bd1 100644
--- a/homeassistant/components/volvooncall/binary_sensor.py
+++ b/homeassistant/components/volvooncall/binary_sensor.py
@@ -1,12 +1,8 @@
 """Support for VOC."""
-import logging
-
 from homeassistant.components.binary_sensor import DEVICE_CLASSES, BinarySensorEntity
 
 from . import DATA_KEY, VolvoEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Volvo sensors."""
diff --git a/homeassistant/components/volvooncall/device_tracker.py b/homeassistant/components/volvooncall/device_tracker.py
index 5e3909c9bed..eab42156c9a 100644
--- a/homeassistant/components/volvooncall/device_tracker.py
+++ b/homeassistant/components/volvooncall/device_tracker.py
@@ -1,14 +1,10 @@
 """Support for tracking a Volvo."""
-import logging
-
 from homeassistant.components.device_tracker import SOURCE_TYPE_GPS
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.util import slugify
 
 from . import DATA_KEY, SIGNAL_STATE_UPDATED
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_scanner(hass, config, async_see, discovery_info=None):
     """Set up the Volvo tracker."""
diff --git a/homeassistant/components/volvooncall/lock.py b/homeassistant/components/volvooncall/lock.py
index efb8423777b..6d9adcf1e1b 100644
--- a/homeassistant/components/volvooncall/lock.py
+++ b/homeassistant/components/volvooncall/lock.py
@@ -1,12 +1,8 @@
 """Support for Volvo On Call locks."""
-import logging
-
 from homeassistant.components.lock import LockEntity
 
 from . import DATA_KEY, VolvoEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Volvo On Call lock."""
diff --git a/homeassistant/components/volvooncall/sensor.py b/homeassistant/components/volvooncall/sensor.py
index 5132a7b8949..0915408860d 100644
--- a/homeassistant/components/volvooncall/sensor.py
+++ b/homeassistant/components/volvooncall/sensor.py
@@ -1,10 +1,6 @@
 """Support for Volvo On Call sensors."""
-import logging
-
 from . import DATA_KEY, VolvoEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up the Volvo sensors."""
diff --git a/homeassistant/components/volvooncall/switch.py b/homeassistant/components/volvooncall/switch.py
index da0f61c1d8f..535cfe75e50 100644
--- a/homeassistant/components/volvooncall/switch.py
+++ b/homeassistant/components/volvooncall/switch.py
@@ -1,12 +1,8 @@
 """Support for Volvo heater."""
-import logging
-
 from homeassistant.helpers.entity import ToggleEntity
 
 from . import DATA_KEY, VolvoEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
     """Set up a Volvo switch."""
diff --git a/homeassistant/components/wake_on_lan/__init__.py b/homeassistant/components/wake_on_lan/__init__.py
index 8262c461ec5..d6a254ebf52 100644
--- a/homeassistant/components/wake_on_lan/__init__.py
+++ b/homeassistant/components/wake_on_lan/__init__.py
@@ -45,7 +45,7 @@ async def async_setup(hass, config):
             broadcast_port,
         )
 
-        await hass.async_add_job(
+        await hass.async_add_executor_job(
             partial(wakeonlan.send_magic_packet, mac_address, **service_kwargs)
         )
 
diff --git a/homeassistant/components/wake_on_lan/switch.py b/homeassistant/components/wake_on_lan/switch.py
index 94bc83b7dd4..491bae782c5 100644
--- a/homeassistant/components/wake_on_lan/switch.py
+++ b/homeassistant/components/wake_on_lan/switch.py
@@ -117,7 +117,7 @@ class WolSwitch(SwitchEntity):
     def turn_off(self, **kwargs):
         """Turn the device off if an off action is present."""
         if self._off_script is not None:
-            self._off_script.run()
+            self._off_script.run(context=self._context)
 
     def update(self):
         """Check if device is on and update the state."""
diff --git a/homeassistant/components/water_heater/device_action.py b/homeassistant/components/water_heater/device_action.py
new file mode 100644
index 00000000000..991929580d1
--- /dev/null
+++ b/homeassistant/components/water_heater/device_action.py
@@ -0,0 +1,75 @@
+"""Provides device automations for Water Heater."""
+from typing import List, Optional
+
+import voluptuous as vol
+
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    CONF_DEVICE_ID,
+    CONF_DOMAIN,
+    CONF_ENTITY_ID,
+    CONF_TYPE,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.core import Context, HomeAssistant
+from homeassistant.helpers import entity_registry
+import homeassistant.helpers.config_validation as cv
+
+from . import DOMAIN
+
+ACTION_TYPES = {"turn_on", "turn_off"}
+
+ACTION_SCHEMA = cv.DEVICE_ACTION_BASE_SCHEMA.extend(
+    {
+        vol.Required(CONF_TYPE): vol.In(ACTION_TYPES),
+        vol.Required(CONF_ENTITY_ID): cv.entity_domain(DOMAIN),
+    }
+)
+
+
+async def async_get_actions(hass: HomeAssistant, device_id: str) -> List[dict]:
+    """List device actions for Water Heater devices."""
+    registry = await entity_registry.async_get_registry(hass)
+    actions = []
+
+    for entry in entity_registry.async_entries_for_device(registry, device_id):
+        if entry.domain != DOMAIN:
+            continue
+
+        actions.append(
+            {
+                CONF_DEVICE_ID: device_id,
+                CONF_DOMAIN: DOMAIN,
+                CONF_ENTITY_ID: entry.entity_id,
+                CONF_TYPE: "turn_on",
+            }
+        )
+        actions.append(
+            {
+                CONF_DEVICE_ID: device_id,
+                CONF_DOMAIN: DOMAIN,
+                CONF_ENTITY_ID: entry.entity_id,
+                CONF_TYPE: "turn_off",
+            }
+        )
+
+    return actions
+
+
+async def async_call_action_from_config(
+    hass: HomeAssistant, config: dict, variables: dict, context: Optional[Context]
+) -> None:
+    """Execute a device action."""
+    config = ACTION_SCHEMA(config)
+
+    service_data = {ATTR_ENTITY_ID: config[CONF_ENTITY_ID]}
+
+    if config[CONF_TYPE] == "turn_on":
+        service = SERVICE_TURN_ON
+    elif config[CONF_TYPE] == "turn_off":
+        service = SERVICE_TURN_OFF
+
+    await hass.services.async_call(
+        DOMAIN, service, service_data, blocking=True, context=context
+    )
diff --git a/homeassistant/components/water_heater/strings.json b/homeassistant/components/water_heater/strings.json
new file mode 100644
index 00000000000..8f5709ac155
--- /dev/null
+++ b/homeassistant/components/water_heater/strings.json
@@ -0,0 +1,8 @@
+{
+  "device_automation": {
+    "action_type": {
+      "turn_on": "Turn on {entity_name}",
+      "turn_off": "Turn off {entity_name}"
+    }
+  }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/ca.json b/homeassistant/components/water_heater/translations/ca.json
new file mode 100644
index 00000000000..8c1de7124f5
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/ca.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "Apaga {entity_name}",
+            "turn_on": "Engega {entity_name}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/cs.json b/homeassistant/components/water_heater/translations/cs.json
new file mode 100644
index 00000000000..c7152528be9
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/cs.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "Vypnout {entity_name}",
+            "turn_on": "Zapnout {entity_name}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/de.json b/homeassistant/components/water_heater/translations/de.json
new file mode 100644
index 00000000000..9169018a5d4
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/de.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "{entity_name} ausschalten",
+            "turn_on": "{entity_name} einschalten"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/en.json b/homeassistant/components/water_heater/translations/en.json
new file mode 100644
index 00000000000..d6abfbb995d
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/en.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "Turn off {entity_name}",
+            "turn_on": "Turn on {entity_name}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/es.json b/homeassistant/components/water_heater/translations/es.json
new file mode 100644
index 00000000000..46be0201ba5
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/es.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "Apagar {entity_name}",
+            "turn_on": "Encender {entity_name}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/et.json b/homeassistant/components/water_heater/translations/et.json
new file mode 100644
index 00000000000..fbb3d11424f
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/et.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "L\u00fclita {entity_name} v\u00e4lja",
+            "turn_on": "L\u00fclita {entity_name} sisse"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/no.json b/homeassistant/components/water_heater/translations/no.json
new file mode 100644
index 00000000000..6455919518f
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/no.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "Sl\u00e5 av {entity_name}",
+            "turn_on": "Sl\u00e5 p\u00e5 {entity_name}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/pl.json b/homeassistant/components/water_heater/translations/pl.json
new file mode 100644
index 00000000000..d6deb99da02
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/pl.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "wy\u0142\u0105cz {entity_name}",
+            "turn_on": "w\u0142\u0105cz {entity_name}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/ru.json b/homeassistant/components/water_heater/translations/ru.json
new file mode 100644
index 00000000000..7c703da39d5
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/ru.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "{entity_name}: \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c",
+            "turn_on": "{entity_name}: \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/zh-Hans.json b/homeassistant/components/water_heater/translations/zh-Hans.json
new file mode 100644
index 00000000000..21a77facc93
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/zh-Hans.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "\u5173\u95ed {entity_name}",
+            "turn_on": "\u6253\u5f00 {entity_name}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/water_heater/translations/zh-Hant.json b/homeassistant/components/water_heater/translations/zh-Hant.json
new file mode 100644
index 00000000000..11e88cb1fae
--- /dev/null
+++ b/homeassistant/components/water_heater/translations/zh-Hant.json
@@ -0,0 +1,8 @@
+{
+    "device_automation": {
+        "action_type": {
+            "turn_off": "\u95dc\u9589{entity_name}",
+            "turn_on": "\u958b\u555f{entity_name}"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/watson_iot/__init__.py b/homeassistant/components/watson_iot/__init__.py
index ecb546f4a8c..99f6b63ec90 100644
--- a/homeassistant/components/watson_iot/__init__.py
+++ b/homeassistant/components/watson_iot/__init__.py
@@ -21,6 +21,7 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
+from homeassistant.core import callback
 from homeassistant.helpers import state as state_helper
 import homeassistant.helpers.config_validation as cv
 
@@ -165,6 +166,7 @@ class WatsonIOTThread(threading.Thread):
         self.shutdown = False
         hass.bus.listen(EVENT_STATE_CHANGED, self._event_listener)
 
+    @callback
     def _event_listener(self, event):
         """Listen for new messages on the bus and queue them for Watson IoT."""
         item = (time.monotonic(), event)
diff --git a/homeassistant/components/watson_tts/tts.py b/homeassistant/components/watson_tts/tts.py
index 67dfa32e673..27bfff9550b 100644
--- a/homeassistant/components/watson_tts/tts.py
+++ b/homeassistant/components/watson_tts/tts.py
@@ -1,6 +1,4 @@
 """Support for IBM Watson TTS integration."""
-import logging
-
 from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
 from ibm_watson import TextToSpeechV1
 import voluptuous as vol
@@ -8,8 +6,6 @@ import voluptuous as vol
 from homeassistant.components.tts import PLATFORM_SCHEMA, Provider
 import homeassistant.helpers.config_validation as cv
 
-_LOGGER = logging.getLogger(__name__)
-
 CONF_URL = "watson_url"
 CONF_APIKEY = "watson_apikey"
 ATTR_CREDENTIALS = "credentials"
diff --git a/homeassistant/components/weather/translations/pl.json b/homeassistant/components/weather/translations/pl.json
index dcd70a3d0e3..43cc15533eb 100644
--- a/homeassistant/components/weather/translations/pl.json
+++ b/homeassistant/components/weather/translations/pl.json
@@ -1,21 +1,21 @@
 {
     "state": {
         "_": {
-            "clear-night": "Pogodna noc",
-            "cloudy": "Pochmurno",
-            "exceptional": "wyj\u0105tkowy",
-            "fog": "Mg\u0142a",
-            "hail": "Grad",
-            "lightning": "B\u0142yskawice",
-            "lightning-rainy": "Burza",
-            "partlycloudy": "Cz\u0119\u015bciowe zachmurzenie",
-            "pouring": "Ulewa",
-            "rainy": "Deszczowo",
-            "snowy": "\u015anie\u017cnie",
-            "snowy-rainy": "\u015anie\u017cnie, deszczowo",
-            "sunny": "S\u0142onecznie",
-            "windy": "Wietrznie",
-            "windy-variant": "Wietrznie"
+            "clear-night": "pogodna noc",
+            "cloudy": "pochmurno",
+            "exceptional": "warunki nadzwyczajne",
+            "fog": "mg\u0142a",
+            "hail": "grad",
+            "lightning": "b\u0142yskawice",
+            "lightning-rainy": "burza",
+            "partlycloudy": "cz\u0119\u015bciowe zachmurzenie",
+            "pouring": "ulewa",
+            "rainy": "deszczowo",
+            "snowy": "opady \u015bniegu",
+            "snowy-rainy": "\u015bnieg z deszczem",
+            "sunny": "s\u0142onecznie",
+            "windy": "wietrznie",
+            "windy-variant": "wietrznie"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/webhook/trigger.py b/homeassistant/components/webhook/trigger.py
index cc03f74922f..81c4c2813cd 100644
--- a/homeassistant/components/webhook/trigger.py
+++ b/homeassistant/components/webhook/trigger.py
@@ -1,26 +1,23 @@
 """Offer webhook triggered automation rules."""
 from functools import partial
-import logging
 
 from aiohttp import hdrs
 import voluptuous as vol
 
 from homeassistant.const import CONF_PLATFORM, CONF_WEBHOOK_ID
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 import homeassistant.helpers.config_validation as cv
 
 # mypy: allow-untyped-defs
 
 DEPENDENCIES = ("webhook",)
 
-_LOGGER = logging.getLogger(__name__)
-
 TRIGGER_SCHEMA = vol.Schema(
     {vol.Required(CONF_PLATFORM): "webhook", vol.Required(CONF_WEBHOOK_ID): cv.string}
 )
 
 
-async def _handle_webhook(action, hass, webhook_id, request):
+async def _handle_webhook(job, hass, webhook_id, request):
     """Handle incoming webhook."""
     result = {"platform": "webhook", "webhook_id": webhook_id}
 
@@ -31,17 +28,18 @@ async def _handle_webhook(action, hass, webhook_id, request):
 
     result["query"] = request.query
     result["description"] = "webhook"
-    hass.async_run_job(action, {"trigger": result})
+    hass.async_run_hass_job(job, {"trigger": result})
 
 
 async def async_attach_trigger(hass, config, action, automation_info):
     """Trigger based on incoming webhooks."""
     webhook_id = config.get(CONF_WEBHOOK_ID)
+    job = HassJob(action)
     hass.components.webhook.async_register(
         automation_info["domain"],
         automation_info["name"],
         webhook_id,
-        partial(_handle_webhook, action),
+        partial(_handle_webhook, job),
     )
 
     @callback
diff --git a/homeassistant/components/webostv/media_player.py b/homeassistant/components/webostv/media_player.py
index 66645ee1fb9..82950e4f7f8 100644
--- a/homeassistant/components/webostv/media_player.py
+++ b/homeassistant/components/webostv/media_player.py
@@ -320,10 +320,9 @@ class LgWebOSMediaPlayerEntity(MediaPlayerEntity):
     @property
     def device_state_attributes(self):
         """Return device specific state attributes."""
-        attributes = {}
-        if self._client.sound_output is not None and self.state != STATE_OFF:
-            attributes[ATTR_SOUND_OUTPUT] = self._client.sound_output
-        return attributes
+        if self._client.sound_output is None and self.state == STATE_OFF:
+            return {}
+        return {ATTR_SOUND_OUTPUT: self._client.sound_output}
 
     @cmd
     async def async_turn_off(self):
diff --git a/homeassistant/components/websocket_api/commands.py b/homeassistant/components/websocket_api/commands.py
index 2106e745351..80ea945834b 100644
--- a/homeassistant/components/websocket_api/commands.py
+++ b/homeassistant/components/websocket_api/commands.py
@@ -1,6 +1,5 @@
 """Commands part of Websocket API."""
 import asyncio
-import logging
 
 import voluptuous as vol
 
@@ -22,8 +21,6 @@ from homeassistant.loader import IntegrationNotFound, async_get_integration
 
 from . import const, decorators, messages
 
-_LOGGER = logging.getLogger(__name__)
-
 # mypy: allow-untyped-calls, allow-untyped-defs
 
 
diff --git a/homeassistant/components/websocket_api/decorators.py b/homeassistant/components/websocket_api/decorators.py
index d4a4cff1a8f..283734f7578 100644
--- a/homeassistant/components/websocket_api/decorators.py
+++ b/homeassistant/components/websocket_api/decorators.py
@@ -1,7 +1,6 @@
 """Decorators for the Websocket API."""
 import asyncio
 from functools import wraps
-import logging
 from typing import Awaitable, Callable
 
 from homeassistant.core import HomeAssistant, callback
@@ -12,8 +11,6 @@ from .connection import ActiveConnection
 
 # mypy: allow-untyped-calls, allow-untyped-defs
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def _handle_async_response(func, hass, connection, msg):
     """Create a response and handle exception."""
diff --git a/homeassistant/components/websocket_api/messages.py b/homeassistant/components/websocket_api/messages.py
index 52e97b60ccf..f68beff5924 100644
--- a/homeassistant/components/websocket_api/messages.py
+++ b/homeassistant/components/websocket_api/messages.py
@@ -12,6 +12,7 @@ from homeassistant.util.json import (
     find_paths_unserializable_data,
     format_unserializable_data,
 )
+from homeassistant.util.yaml.loader import JSON_TYPE
 
 from . import const
 
@@ -27,6 +28,9 @@ MINIMAL_MESSAGE_SCHEMA = vol.Schema(
 # Base schema to extend by message handlers
 BASE_COMMAND_MESSAGE_SCHEMA = vol.Schema({vol.Required("id"): cv.positive_int})
 
+IDEN_TEMPLATE = "__IDEN__"
+IDEN_JSON_TEMPLATE = '"__IDEN__"'
+
 
 def result_message(iden: int, result: Any = None) -> Dict:
     """Return a success result message."""
@@ -43,12 +47,11 @@ def error_message(iden: int, code: str, message: str) -> Dict:
     }
 
 
-def event_message(iden: int, event: Any) -> Dict:
+def event_message(iden: JSON_TYPE, event: Any) -> Dict:
     """Return an event message."""
     return {"id": iden, "type": "event", "event": event}
 
 
-@lru_cache(maxsize=128)
 def cached_event_message(iden: int, event: Event) -> str:
     """Return an event message.
 
@@ -58,7 +61,17 @@ def cached_event_message(iden: int, event: Event) -> str:
     all getting many of the same events (mostly state changed)
     we can avoid serializing the same data for each connection.
     """
-    return message_to_json(event_message(iden, event))
+    return _cached_event_message(event).replace(IDEN_JSON_TEMPLATE, str(iden), 1)
+
+
+@lru_cache(maxsize=128)
+def _cached_event_message(event: Event) -> str:
+    """Cache and serialize the event to json.
+
+    The IDEN_TEMPLATE is used which will be replaced
+    with the actual iden in cached_event_message
+    """
+    return message_to_json(event_message(IDEN_TEMPLATE, event))
 
 
 def message_to_json(message: Any) -> str:
diff --git a/homeassistant/components/wemo/strings.json b/homeassistant/components/wemo/strings.json
index fe8cc10a74c..f7c6329b1af 100644
--- a/homeassistant/components/wemo/strings.json
+++ b/homeassistant/components/wemo/strings.json
@@ -6,8 +6,8 @@
       }
     },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of Wemo is possible.",
-      "no_devices_found": "No Wemo devices found on the network."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]"
     }
   }
 }
diff --git a/homeassistant/components/wemo/switch.py b/homeassistant/components/wemo/switch.py
index 7cc88f552bf..fc00d4ea8b5 100644
--- a/homeassistant/components/wemo/switch.py
+++ b/homeassistant/components/wemo/switch.py
@@ -217,7 +217,7 @@ class WemoSwitch(SwitchEntity):
         self._update_lock = asyncio.Lock()
 
         registry = self.hass.data[WEMO_DOMAIN]["registry"]
-        await self.hass.async_add_job(registry.register, self.wemo)
+        await self.hass.async_add_executor_job(registry.register, self.wemo)
         registry.on(self.wemo, None, self._subscription_callback)
 
     async def async_update(self):
@@ -242,7 +242,7 @@ class WemoSwitch(SwitchEntity):
     async def _async_locked_update(self, force_update):
         """Try updating within an async lock."""
         async with self._update_lock:
-            await self.hass.async_add_job(self._update, force_update)
+            await self.hass.async_add_executor_job(self._update, force_update)
 
     def _update(self, force_update):
         """Update the device state."""
diff --git a/homeassistant/components/wemo/translations/ca.json b/homeassistant/components/wemo/translations/ca.json
index 007252042cc..1216504eb85 100644
--- a/homeassistant/components/wemo/translations/ca.json
+++ b/homeassistant/components/wemo/translations/ca.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No s'han trobat dispositius Wemo a la xarxa.",
-            "single_instance_allowed": "Nom\u00e9s \u00e9s possible una \u00fanica configuraci\u00f3 de Wemo."
+            "no_devices_found": "No s'han trobat dispositius a la xarxa",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/wemo/translations/cs.json b/homeassistant/components/wemo/translations/cs.json
new file mode 100644
index 00000000000..2ed434575b4
--- /dev/null
+++ b/homeassistant/components/wemo/translations/cs.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "step": {
+            "confirm": {
+                "description": "Chcete nastavit Wemo?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wemo/translations/en.json b/homeassistant/components/wemo/translations/en.json
index 32ef4cc4cf5..20a9af468ff 100644
--- a/homeassistant/components/wemo/translations/en.json
+++ b/homeassistant/components/wemo/translations/en.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "No Wemo devices found on the network.",
-            "single_instance_allowed": "Only a single configuration of Wemo is possible."
+            "no_devices_found": "No devices found on the network",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/wemo/translations/et.json b/homeassistant/components/wemo/translations/et.json
new file mode 100644
index 00000000000..e9959620510
--- /dev/null
+++ b/homeassistant/components/wemo/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas soovid Wemo-t seadistada?"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wemo/translations/it.json b/homeassistant/components/wemo/translations/it.json
index 46204dc6057..691c7ca46b3 100644
--- a/homeassistant/components/wemo/translations/it.json
+++ b/homeassistant/components/wemo/translations/it.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nessun dispositivo Wemo trovato in rete.",
-            "single_instance_allowed": "\u00c8 consentita solo una singola configurazione di Wemo."
+            "no_devices_found": "Nessun dispositivo trovato sulla rete",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/wemo/translations/no.json b/homeassistant/components/wemo/translations/no.json
index 59ff68d5790..59958ac048d 100644
--- a/homeassistant/components/wemo/translations/no.json
+++ b/homeassistant/components/wemo/translations/no.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Ingen Sonos enheter funnet p\u00e5 nettverket.",
-            "single_instance_allowed": "Kun en konfigurasjon av Wemo er mulig."
+            "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/wemo/translations/pl.json b/homeassistant/components/wemo/translations/pl.json
index 456dca40d4f..406856aac8e 100644
--- a/homeassistant/components/wemo/translations/pl.json
+++ b/homeassistant/components/wemo/translations/pl.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nie znaleziono w sieci urz\u0105dze\u0144 Wemo.",
-            "single_instance_allowed": "Dozwolona jest tylko jedna konfiguracja Wemo."
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/wemo/translations/ru.json b/homeassistant/components/wemo/translations/ru.json
index 7123ac1b601..60b1efb3dea 100644
--- a/homeassistant/components/wemo/translations/ru.json
+++ b/homeassistant/components/wemo/translations/ru.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 Wemo \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b.",
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/wemo/translations/zh-Hant.json b/homeassistant/components/wemo/translations/zh-Hant.json
index 29167a13480..0b9966135b1 100644
--- a/homeassistant/components/wemo/translations/zh-Hant.json
+++ b/homeassistant/components/wemo/translations/zh-Hant.json
@@ -1,8 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "\u5728\u7db2\u8def\u4e0a\u627e\u4e0d\u5230 Wemo \u8a2d\u5099\u3002",
-            "single_instance_allowed": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44 Wemo\u3002"
+            "no_devices_found": "\u7db2\u8def\u4e0a\u627e\u4e0d\u5230\u8a2d\u5099",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/wiffi/strings.json b/homeassistant/components/wiffi/strings.json
index e219b2ecae7..d4dc66972c7 100644
--- a/homeassistant/components/wiffi/strings.json
+++ b/homeassistant/components/wiffi/strings.json
@@ -4,7 +4,7 @@
       "user": {
         "title": "Setup TCP server for WIFFI devices",
         "data": {
-          "port": "Server Port"
+          "port": "[%key:common::config_flow::data::port%]"
         }
       }
     },
diff --git a/homeassistant/components/wiffi/translations/ca.json b/homeassistant/components/wiffi/translations/ca.json
index 33fc5015ecd..6fe2792888c 100644
--- a/homeassistant/components/wiffi/translations/ca.json
+++ b/homeassistant/components/wiffi/translations/ca.json
@@ -7,7 +7,7 @@
         "step": {
             "user": {
                 "data": {
-                    "port": "Port del servidor"
+                    "port": "Port"
                 },
                 "title": "Configuraci\u00f3 del servidor TCP per a dispositius WIFFI"
             }
diff --git a/homeassistant/components/wiffi/translations/cs.json b/homeassistant/components/wiffi/translations/cs.json
new file mode 100644
index 00000000000..dbfc7b8a2ea
--- /dev/null
+++ b/homeassistant/components/wiffi/translations/cs.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "addr_in_use": "Port serveru je ji\u017e pou\u017e\u00edv\u00e1n.",
+            "start_server_failed": "Spu\u0161t\u011bn\u00ed serveru se nezda\u0159ilo."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "port": "Port"
+                }
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "timeout": "\u010casov\u00fd limit (v minut\u00e1ch)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wiffi/translations/en.json b/homeassistant/components/wiffi/translations/en.json
index 0ac1868714d..046f37de2c7 100644
--- a/homeassistant/components/wiffi/translations/en.json
+++ b/homeassistant/components/wiffi/translations/en.json
@@ -7,7 +7,7 @@
         "step": {
             "user": {
                 "data": {
-                    "port": "Server Port"
+                    "port": "Port"
                 },
                 "title": "Setup TCP server for WIFFI devices"
             }
diff --git a/homeassistant/components/wiffi/translations/et.json b/homeassistant/components/wiffi/translations/et.json
new file mode 100644
index 00000000000..ea0b813d0ee
--- /dev/null
+++ b/homeassistant/components/wiffi/translations/et.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "port": ""
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wiffi/translations/it.json b/homeassistant/components/wiffi/translations/it.json
index 0884f31cbd7..054bcbc9862 100644
--- a/homeassistant/components/wiffi/translations/it.json
+++ b/homeassistant/components/wiffi/translations/it.json
@@ -7,7 +7,7 @@
         "step": {
             "user": {
                 "data": {
-                    "port": "Porta del server"
+                    "port": "Porta"
                 },
                 "title": "Configurare il server TCP per i dispositivi WIFFI"
             }
diff --git a/homeassistant/components/wiffi/translations/lb.json b/homeassistant/components/wiffi/translations/lb.json
index f9080d52584..b5b9ec57e33 100644
--- a/homeassistant/components/wiffi/translations/lb.json
+++ b/homeassistant/components/wiffi/translations/lb.json
@@ -7,7 +7,7 @@
         "step": {
             "user": {
                 "data": {
-                    "port": "Server Port"
+                    "port": "Port"
                 },
                 "title": "TCP Server fir WIFFI Apparater ariichten"
             }
diff --git a/homeassistant/components/wiffi/translations/no.json b/homeassistant/components/wiffi/translations/no.json
index 9f745e0e4a8..06e8f3449e1 100644
--- a/homeassistant/components/wiffi/translations/no.json
+++ b/homeassistant/components/wiffi/translations/no.json
@@ -7,7 +7,7 @@
         "step": {
             "user": {
                 "data": {
-                    "port": "Serverport"
+                    "port": "Port"
                 },
                 "title": "Sett opp TCP-server for WIFFI-enheter"
             }
diff --git a/homeassistant/components/wiffi/translations/pl.json b/homeassistant/components/wiffi/translations/pl.json
index 810bc4fb1ec..f9c2e2c3979 100644
--- a/homeassistant/components/wiffi/translations/pl.json
+++ b/homeassistant/components/wiffi/translations/pl.json
@@ -1,13 +1,13 @@
 {
     "config": {
         "abort": {
-            "addr_in_use": "Port serwera jest ju\u017c w u\u017cyciu.",
-            "start_server_failed": "Uruchomienie serwera nie powiod\u0142o si\u0119."
+            "addr_in_use": "Port serwera jest ju\u017c w u\u017cyciu",
+            "start_server_failed": "Uruchomienie serwera nie powiod\u0142o si\u0119"
         },
         "step": {
             "user": {
                 "data": {
-                    "port": "Port serwera"
+                    "port": "Port"
                 },
                 "title": "Konfiguracja serwera TCP dla urz\u0105dze\u0144 WIFFI"
             }
diff --git a/homeassistant/components/wiffi/translations/ru.json b/homeassistant/components/wiffi/translations/ru.json
index 50d0ec06718..f703edbf23b 100644
--- a/homeassistant/components/wiffi/translations/ru.json
+++ b/homeassistant/components/wiffi/translations/ru.json
@@ -7,7 +7,7 @@
         "step": {
             "user": {
                 "data": {
-                    "port": "\u041f\u043e\u0440\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430"
+                    "port": "\u041f\u043e\u0440\u0442"
                 },
                 "title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 TCP-\u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0434\u043b\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432 WIFFI"
             }
diff --git a/homeassistant/components/wiffi/translations/sv.json b/homeassistant/components/wiffi/translations/sv.json
new file mode 100644
index 00000000000..86a5180fbfd
--- /dev/null
+++ b/homeassistant/components/wiffi/translations/sv.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "addr_in_use": "Serverporten \u00e4r upptagen."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wiffi/translations/zh-Hant.json b/homeassistant/components/wiffi/translations/zh-Hant.json
index 77b1488025c..ae2956cc5e9 100644
--- a/homeassistant/components/wiffi/translations/zh-Hant.json
+++ b/homeassistant/components/wiffi/translations/zh-Hant.json
@@ -7,7 +7,7 @@
         "step": {
             "user": {
                 "data": {
-                    "port": "\u4f3a\u670d\u5668\u901a\u8a0a\u57e0"
+                    "port": "\u901a\u8a0a\u57e0"
                 },
                 "title": "\u8a2d\u5b9a WIFFI \u8a2d\u5099 TCP \u4f3a\u670d\u5668"
             }
diff --git a/homeassistant/components/wilight/config_flow.py b/homeassistant/components/wilight/config_flow.py
index 724bbb6547d..6bc81e363aa 100644
--- a/homeassistant/components/wilight/config_flow.py
+++ b/homeassistant/components/wilight/config_flow.py
@@ -1,5 +1,4 @@
 """Config flow to configure WiLight."""
-import logging
 from urllib.parse import urlparse
 
 import pywilight
@@ -18,8 +17,6 @@ WILIGHT_MANUFACTURER = "All Automacao Ltda"
 # List the components supported by this integration.
 ALLOWED_WILIGHT_COMPONENTS = ["light"]
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class WiLightFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a WiLight config flow."""
diff --git a/homeassistant/components/wilight/translations/cs.json b/homeassistant/components/wilight/translations/cs.json
index 0dcaaf15e5d..0903e0e3a65 100644
--- a/homeassistant/components/wilight/translations/cs.json
+++ b/homeassistant/components/wilight/translations/cs.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
             "not_supported_device": "Toto za\u0159\u00edzen\u00ed WiLight nen\u00ed moment\u00e1ln\u011b podporov\u00e1no.",
             "not_wilight_device": "Toto za\u0159\u00edzen\u00ed nen\u00ed WiLight"
         },
diff --git a/homeassistant/components/wilight/translations/el.json b/homeassistant/components/wilight/translations/el.json
new file mode 100644
index 00000000000..3f5afd4d729
--- /dev/null
+++ b/homeassistant/components/wilight/translations/el.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "not_supported_device": "\u0391\u03c5\u03c4\u03cc \u03c4\u03bf WiLight \u03b4\u03b5\u03bd \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03c4\u03b1\u03b9 \u03c0\u03c1\u03bf\u03c2 \u03c4\u03bf \u03c0\u03b1\u03c1\u03cc\u03bd",
+            "not_wilight_device": "\u0391\u03c5\u03c4\u03ae \u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 WiLight"
+        },
+        "flow_title": "WiLight: {\u03cc\u03bd\u03bf\u03bc\u03b1}",
+        "step": {
+            "confirm": {
+                "description": "\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf WiLight {name} ;\n\n \u03a5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03b9: {components}",
+                "title": "WiLight"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wilight/translations/et.json b/homeassistant/components/wilight/translations/et.json
new file mode 100644
index 00000000000..87557468d2f
--- /dev/null
+++ b/homeassistant/components/wilight/translations/et.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas soovid seadistada WiLight'i {name} ?\n\n See toetab: {components}",
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wilight/translations/no.json b/homeassistant/components/wilight/translations/no.json
index d57458d49ea..89cf91cbe63 100644
--- a/homeassistant/components/wilight/translations/no.json
+++ b/homeassistant/components/wilight/translations/no.json
@@ -5,11 +5,11 @@
             "not_supported_device": "Dette WiLight st\u00f8ttes forel\u00f8pig ikke",
             "not_wilight_device": "Denne enheten er ikke WiLight"
         },
-        "flow_title": "WiLight: {name}",
+        "flow_title": "",
         "step": {
             "confirm": {
                 "description": "Vil du konfigurere WiLight {name} ? \n\n Den st\u00f8tter: {components}",
-                "title": "WiLight"
+                "title": ""
             }
         }
     }
diff --git a/homeassistant/components/wilight/translations/pl.json b/homeassistant/components/wilight/translations/pl.json
index 637a81a3f87..45c3d1f8990 100644
--- a/homeassistant/components/wilight/translations/pl.json
+++ b/homeassistant/components/wilight/translations/pl.json
@@ -1,7 +1,16 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "not_supported_device": "Ten WiLight nie jest obecnie obs\u0142ugiwany",
+            "not_wilight_device": "To urz\u0105dzenie nie jest urz\u0105dzeniem WiLight"
+        },
+        "flow_title": "WiLight: {name}",
+        "step": {
+            "confirm": {
+                "description": "Czy chcesz skonfigurowa\u0107 WiLight {name}?\n\nObs\u0142uguje: {components}",
+                "title": "WiLight"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/wink/alarm_control_panel.py b/homeassistant/components/wink/alarm_control_panel.py
index 89dc6a46815..5c45cc7b03d 100644
--- a/homeassistant/components/wink/alarm_control_panel.py
+++ b/homeassistant/components/wink/alarm_control_panel.py
@@ -1,6 +1,4 @@
 """Support Wink alarm control panels."""
-import logging
-
 import pywink
 
 import homeassistant.components.alarm_control_panel as alarm
@@ -16,8 +14,6 @@ from homeassistant.const import (
 
 from . import DOMAIN, WinkDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 STATE_ALARM_PRIVACY = "Private"
 
 
diff --git a/homeassistant/components/wink/fan.py b/homeassistant/components/wink/fan.py
index d1d4e30ada3..535e7094fcd 100644
--- a/homeassistant/components/wink/fan.py
+++ b/homeassistant/components/wink/fan.py
@@ -1,6 +1,4 @@
 """Support for Wink fans."""
-import logging
-
 import pywink
 
 from homeassistant.components.fan import (
@@ -14,8 +12,6 @@ from homeassistant.components.fan import (
 
 from . import DOMAIN, WinkDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 SPEED_AUTO = "auto"
 SPEED_LOWEST = "lowest"
 SUPPORTED_FEATURES = SUPPORT_DIRECTION + SUPPORT_SET_SPEED
diff --git a/homeassistant/components/wink/lock.py b/homeassistant/components/wink/lock.py
index 221d6d8165e..f82b74e7712 100644
--- a/homeassistant/components/wink/lock.py
+++ b/homeassistant/components/wink/lock.py
@@ -1,6 +1,4 @@
 """Support for Wink locks."""
-import logging
-
 import pywink
 import voluptuous as vol
 
@@ -16,8 +14,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import DOMAIN, WinkDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 SERVICE_SET_VACATION_MODE = "set_lock_vacation_mode"
 SERVICE_SET_ALARM_MODE = "set_lock_alarm_mode"
 SERVICE_SET_ALARM_SENSITIVITY = "set_lock_alarm_sensitivity"
diff --git a/homeassistant/components/wink/scene.py b/homeassistant/components/wink/scene.py
index 753e2c24278..3f4724957f8 100644
--- a/homeassistant/components/wink/scene.py
+++ b/homeassistant/components/wink/scene.py
@@ -1,5 +1,4 @@
 """Support for Wink scenes."""
-import logging
 from typing import Any
 
 import pywink
@@ -8,8 +7,6 @@ from homeassistant.components.scene import Scene
 
 from . import DOMAIN, WinkDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink platform."""
diff --git a/homeassistant/components/wink/switch.py b/homeassistant/components/wink/switch.py
index cf2264e7eeb..2632036095a 100644
--- a/homeassistant/components/wink/switch.py
+++ b/homeassistant/components/wink/switch.py
@@ -1,14 +1,10 @@
 """Support for Wink switches."""
-import logging
-
 import pywink
 
 from homeassistant.helpers.entity import ToggleEntity
 
 from . import DOMAIN, WinkDevice
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Wink platform."""
diff --git a/homeassistant/components/wirelesstag/__init__.py b/homeassistant/components/wirelesstag/__init__.py
index 702479c4112..83e92c2250b 100644
--- a/homeassistant/components/wirelesstag/__init__.py
+++ b/homeassistant/components/wirelesstag/__init__.py
@@ -12,6 +12,7 @@ from homeassistant.const import (
     CONF_PASSWORD,
     CONF_USERNAME,
     PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     VOLT,
 )
 import homeassistant.helpers.config_validation as cv
@@ -226,11 +227,6 @@ class WirelessTagBaseSensor(Entity):
         self._name = self._tag.name
         self._state = None
 
-    @property
-    def should_poll(self):
-        """Return the polling state."""
-        return True
-
     @property
     def name(self):
         """Return the name of the sensor."""
@@ -281,7 +277,7 @@ class WirelessTagBaseSensor(Entity):
         return {
             ATTR_BATTERY_LEVEL: int(self._tag.battery_remaining * 100),
             ATTR_VOLTAGE: f"{self._tag.battery_volts:.2f}{VOLT}",
-            ATTR_TAG_SIGNAL_STRENGTH: f"{self._tag.signal_strength}dBm",
+            ATTR_TAG_SIGNAL_STRENGTH: f"{self._tag.signal_strength}{SIGNAL_STRENGTH_DECIBELS_MILLIWATT}",
             ATTR_TAG_OUT_OF_RANGE: not self._tag.is_in_range,
             ATTR_TAG_POWER_CONSUMPTION: f"{self._tag.power_consumption:.2f}{PERCENTAGE}",
         }
diff --git a/homeassistant/components/wirelesstag/binary_sensor.py b/homeassistant/components/wirelesstag/binary_sensor.py
index b92cdeb0bca..ef97867e829 100644
--- a/homeassistant/components/wirelesstag/binary_sensor.py
+++ b/homeassistant/components/wirelesstag/binary_sensor.py
@@ -1,6 +1,4 @@
 """Binary sensor support for Wireless Sensor Tags."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensorEntity
@@ -15,8 +13,6 @@ from . import (
     WirelessTagBaseSensor,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 # On means in range, Off means out of range
 SENSOR_PRESENCE = "presence"
 
diff --git a/homeassistant/components/wirelesstag/switch.py b/homeassistant/components/wirelesstag/switch.py
index 9027f92aec0..11a5308d8d9 100644
--- a/homeassistant/components/wirelesstag/switch.py
+++ b/homeassistant/components/wirelesstag/switch.py
@@ -1,6 +1,4 @@
 """Switch implementation for Wireless Sensor Tags (wirelesstag.net)."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
@@ -9,8 +7,6 @@ import homeassistant.helpers.config_validation as cv
 
 from . import DOMAIN as WIRELESSTAG_DOMAIN, WirelessTagBaseSensor
 
-_LOGGER = logging.getLogger(__name__)
-
 ARM_TEMPERATURE = "temperature"
 ARM_HUMIDITY = "humidity"
 ARM_MOTION = "motion"
diff --git a/homeassistant/components/withings/common.py b/homeassistant/components/withings/common.py
index 067133f331f..52e22f9501a 100644
--- a/homeassistant/components/withings/common.py
+++ b/homeassistant/components/withings/common.py
@@ -811,7 +811,28 @@ class DataManager:
         )
 
         def get_sleep_summary() -> SleepGetSummaryResponse:
-            return self._api.sleep_get_summary(lastupdate=yesterday_noon)
+            return self._api.sleep_get_summary(
+                lastupdate=yesterday_noon,
+                data_fields=[
+                    GetSleepSummaryField.BREATHING_DISTURBANCES_INTENSITY,
+                    GetSleepSummaryField.DEEP_SLEEP_DURATION,
+                    GetSleepSummaryField.DURATION_TO_SLEEP,
+                    GetSleepSummaryField.DURATION_TO_WAKEUP,
+                    GetSleepSummaryField.HR_AVERAGE,
+                    GetSleepSummaryField.HR_MAX,
+                    GetSleepSummaryField.HR_MIN,
+                    GetSleepSummaryField.LIGHT_SLEEP_DURATION,
+                    GetSleepSummaryField.REM_SLEEP_DURATION,
+                    GetSleepSummaryField.RR_AVERAGE,
+                    GetSleepSummaryField.RR_MAX,
+                    GetSleepSummaryField.RR_MIN,
+                    GetSleepSummaryField.SLEEP_SCORE,
+                    GetSleepSummaryField.SNORING,
+                    GetSleepSummaryField.SNORING_EPISODE_COUNT,
+                    GetSleepSummaryField.WAKEUP_COUNT,
+                    GetSleepSummaryField.WAKEUP_DURATION,
+                ],
+            )
 
         response = await self._hass.async_add_executor_job(get_sleep_summary)
 
diff --git a/homeassistant/components/withings/config_flow.py b/homeassistant/components/withings/config_flow.py
index e1a1dee3191..d04327808de 100644
--- a/homeassistant/components/withings/config_flow.py
+++ b/homeassistant/components/withings/config_flow.py
@@ -10,8 +10,6 @@ from homeassistant.components.withings import const
 from homeassistant.helpers import config_entry_oauth2_flow
 from homeassistant.util import slugify
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class WithingsFlowHandler(
     config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=const.DOMAIN
@@ -70,7 +68,7 @@ class WithingsFlowHandler(
                 self._current_data = {}
                 return await self.async_step_finish(new_data)
 
-            errors["base"] = "profile_exists"
+            errors["base"] = "already_configured"
 
         return self.async_show_form(
             step_id="profile",
diff --git a/homeassistant/components/withings/strings.json b/homeassistant/components/withings/strings.json
index 05f6d15ca11..db18bb0f334 100644
--- a/homeassistant/components/withings/strings.json
+++ b/homeassistant/components/withings/strings.json
@@ -9,19 +9,21 @@
       },
       "pick_implementation": { "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]" },
       "reauth": {
-        "title": "Re-authenticate Profile",
+        "title": "[%key:common::config_flow::title::reauth%]",
         "description": "The \"{profile}\" profile needs to be re-authenticated in order to continue receiving Withings data."
       }
     },
     "error": {
-      "profile_exists": "User profile is already configured. Please provide a unique profile name."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
     },
     "abort": {
-      "authorize_url_timeout": "Timeout generating authorize url.",
-      "missing_configuration": "The Withings integration is not configured. Please follow the documentation.",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
       "already_configured": "Configuration updated for profile.",
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]"
     },
-    "create_entry": { "default": "Successfully authenticated with Withings." }
+    "create_entry": {
+      "default": "Successfully authenticated with Withings."
+    }
   }
 }
diff --git a/homeassistant/components/withings/translations/ca.json b/homeassistant/components/withings/translations/ca.json
index 1731a7bdaaf..18814d45d47 100644
--- a/homeassistant/components/withings/translations/ca.json
+++ b/homeassistant/components/withings/translations/ca.json
@@ -2,20 +2,22 @@
     "config": {
         "abort": {
             "already_configured": "Configuraci\u00f3 de perfil actualitzada.",
-            "authorize_url_timeout": "S'ha acabat el temps d'espera durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
-            "missing_configuration": "La integraci\u00f3 Withings no est\u00e0 configurada. Mira'n la documentaci\u00f3.",
+            "authorize_url_timeout": "Temps d'espera esgotat durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
+            "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
             "no_url_available": "No hi ha cap URL disponible. Per a m\u00e9s informaci\u00f3 sobre aquest error, [consulta la secci\u00f3 d'ajuda]({docs_url})"
         },
         "create_entry": {
             "default": "Autenticaci\u00f3 exitosa amb Withings."
         },
         "error": {
+            "already_configured": "El compte ja ha estat configurat",
+            "already_configured_account": "El compte ja ha estat configurat",
             "profile_exists": "El perfil ja est\u00e0 configurat. Proporciona un nom de perfil \u00fanic."
         },
         "flow_title": "Withings: {profile}",
         "step": {
             "pick_implementation": {
-                "title": "Selecci\u00f3 del m\u00e8tode d'autenticaci\u00f3"
+                "title": "Selecciona el m\u00e8tode d'autenticaci\u00f3"
             },
             "profile": {
                 "data": {
@@ -26,7 +28,7 @@
             },
             "reauth": {
                 "description": "El perfil \"{profile}\" s'ha de tornar a autenticar per poder continuar rebent dades de Withings.",
-                "title": "Torna a autenticar perfil"
+                "title": "Reautenticaci\u00f3 de la integraci\u00f3"
             }
         }
     }
diff --git a/homeassistant/components/withings/translations/cs.json b/homeassistant/components/withings/translations/cs.json
index 379ad7fde30..cc4d14c210b 100644
--- a/homeassistant/components/withings/translations/cs.json
+++ b/homeassistant/components/withings/translations/cs.json
@@ -2,8 +2,17 @@
     "config": {
         "abort": {
             "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
-            "missing_configuration": "Integrace Withings nen\u00ed nakonfigurov\u00e1na. Postupujte podle n\u00e1vodu."
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "no_url_available": "Nen\u00ed k dispozici \u017e\u00e1dn\u00e1 adresa URL. Informace o t\u00e9to chyb\u011b naleznete [v sekci n\u00e1pov\u011bdy]({docs_url})"
         },
+        "create_entry": {
+            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno pomoc\u00ed Withings."
+        },
+        "error": {
+            "already_configured": "\u00da\u010det je ji\u017e nastaven",
+            "already_configured_account": "\u00da\u010det je ji\u017e nastaven"
+        },
+        "flow_title": "Withings: {profile}",
         "step": {
             "pick_implementation": {
                 "title": "Vyberte metodu ov\u011b\u0159en\u00ed"
@@ -12,8 +21,11 @@
                 "data": {
                     "profile": "Profil"
                 },
-                "description": "Kter\u00fd profil jste vybrali na webu Withings? Je d\u016fle\u017eit\u00e9, aby se profily shodovaly, jinak budou data nespr\u00e1vn\u011b ozna\u010dena.",
+                "description": "Zadejte jedine\u010dn\u00e9 jm\u00e9no profilu pro tato data. Obvykle se jedn\u00e1 o jm\u00e9no profilu, kter\u00e9 jste vybrali v p\u0159edchoz\u00edm kroku.",
                 "title": "U\u017eivatelsk\u00fd profil."
+            },
+            "reauth": {
+                "title": "Znovu ov\u011b\u0159it integraci"
             }
         }
     }
diff --git a/homeassistant/components/withings/translations/en.json b/homeassistant/components/withings/translations/en.json
index 53f8a78f3a9..616851bb503 100644
--- a/homeassistant/components/withings/translations/en.json
+++ b/homeassistant/components/withings/translations/en.json
@@ -2,14 +2,16 @@
     "config": {
         "abort": {
             "already_configured": "Configuration updated for profile.",
-            "authorize_url_timeout": "Timeout generating authorize url.",
-            "missing_configuration": "The Withings integration is not configured. Please follow the documentation.",
+            "authorize_url_timeout": "Timeout generating authorize URL.",
+            "missing_configuration": "The component is not configured. Please follow the documentation.",
             "no_url_available": "No URL available. For information about this error, [check the help section]({docs_url})"
         },
         "create_entry": {
             "default": "Successfully authenticated with Withings."
         },
         "error": {
+            "already_configured": "Account is already configured",
+            "already_configured_account": "Account is already configured",
             "profile_exists": "User profile is already configured. Please provide a unique profile name."
         },
         "flow_title": "Withings: {profile}",
@@ -26,7 +28,7 @@
             },
             "reauth": {
                 "description": "The \"{profile}\" profile needs to be re-authenticated in order to continue receiving Withings data.",
-                "title": "Re-authenticate Profile"
+                "title": "Reauthenticate Integration"
             }
         }
     }
diff --git a/homeassistant/components/withings/translations/es.json b/homeassistant/components/withings/translations/es.json
index d8b69013bbd..b554b0a78da 100644
--- a/homeassistant/components/withings/translations/es.json
+++ b/homeassistant/components/withings/translations/es.json
@@ -3,19 +3,21 @@
         "abort": {
             "already_configured": "Configuraci\u00f3n actualizada para el perfil.",
             "authorize_url_timeout": "Tiempo de espera agotado generando la url de autorizaci\u00f3n.",
-            "missing_configuration": "La integraci\u00f3n de Withings no est\u00e1 configurada. Por favor, siga la documentaci\u00f3n.",
+            "missing_configuration": "El componente no est\u00e1 configurado. Consulta la documentaci\u00f3n.",
             "no_url_available": "No hay URL disponible. Para obtener informaci\u00f3n sobre este error, [consulta la secci\u00f3n de ayuda]({docs_url})"
         },
         "create_entry": {
             "default": "Autenticado correctamente con Withings."
         },
         "error": {
+            "already_configured": "La cuenta ya ha sido configurada",
+            "already_configured_account": "La cuenta ya ha sido configurada",
             "profile_exists": "El perfil de usuario ya est\u00e1 configurado. Por favor, proporciona un nombre de perfil \u00fanico."
         },
         "flow_title": "Withings: {profile}",
         "step": {
             "pick_implementation": {
-                "title": "Elija el m\u00e9todo de autenticaci\u00f3n"
+                "title": "Selecciona el m\u00e9todo de autenticaci\u00f3n"
             },
             "profile": {
                 "data": {
diff --git a/homeassistant/components/withings/translations/et.json b/homeassistant/components/withings/translations/et.json
new file mode 100644
index 00000000000..79212f168e7
--- /dev/null
+++ b/homeassistant/components/withings/translations/et.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Profiili seaded on v\u00e4rskendatud.",
+            "authorize_url_timeout": "Tuvastamise URL'i loomise ajal\u00f5pp.",
+            "missing_configuration": "Osis pole seadistatud. Palun vaata dokumentatsiooni.",
+            "no_url_available": "URL pole saadaval. Rohkem teavet [check the help section]({docs_url})"
+        },
+        "error": {
+            "already_configured": "Konto on juba seadistatud",
+            "already_configured_account": "Konto on juba h\u00e4\u00e4lestatud"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Vali tuvastusmeetod"
+            },
+            "reauth": {
+                "description": "Withingi andmete jsaamiseks tuleb kasutaja {profile} taastuvastada.",
+                "title": "Taastuvasta profiil"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/withings/translations/it.json b/homeassistant/components/withings/translations/it.json
index 90824fd0445..bceeffc70d2 100644
--- a/homeassistant/components/withings/translations/it.json
+++ b/homeassistant/components/withings/translations/it.json
@@ -2,14 +2,16 @@
     "config": {
         "abort": {
             "already_configured": "Configurazione aggiornata per il profilo.",
-            "authorize_url_timeout": "Timeout durante la generazione dell'URL di autorizzazione.",
-            "missing_configuration": "Il componente Withings non \u00e8 configurato. Si prega di seguire la documentazione.",
+            "authorize_url_timeout": "Tempo scaduto nel generare l'URL di autorizzazione.",
+            "missing_configuration": "Il componente non \u00e8 configurato. Si prega di seguire la documentazione.",
             "no_url_available": "Nessun URL disponibile. Per informazioni su questo errore, [controlla la sezione della guida]({docs_url})"
         },
         "create_entry": {
             "default": "Autenticazione riuscita con Withings."
         },
         "error": {
+            "already_configured": "L'account \u00e8 gi\u00e0 configurato",
+            "already_configured_account": "L'account \u00e8 gi\u00e0 configurato",
             "profile_exists": "Il profilo utente \u00e8 gi\u00e0 configurato. Si prega di fornire un nome di profilo univoco."
         },
         "flow_title": "Withings: {profile}",
diff --git a/homeassistant/components/withings/translations/lb.json b/homeassistant/components/withings/translations/lb.json
index e3ff23e392a..4f3efddc094 100644
--- a/homeassistant/components/withings/translations/lb.json
+++ b/homeassistant/components/withings/translations/lb.json
@@ -26,7 +26,7 @@
             },
             "reauth": {
                 "description": "De Profil \"{profile}\" muss fr\u00ebsch authentifi\u00e9iert ginn fir weiderhinn Donn\u00e9e\u00eb vun Withing z'empf\u00e4nken.",
-                "title": "{profile} fr\u00ebsch authentifiz\u00e9ieren"
+                "title": "Profil fr\u00ebsch authentifiz\u00e9ieren"
             }
         }
     }
diff --git a/homeassistant/components/withings/translations/nl.json b/homeassistant/components/withings/translations/nl.json
index a54333ab8f2..94d62dbb5dd 100644
--- a/homeassistant/components/withings/translations/nl.json
+++ b/homeassistant/components/withings/translations/nl.json
@@ -8,6 +8,9 @@
         "create_entry": {
             "default": "Succesvol geverifieerd met Withings voor het geselecteerde profiel."
         },
+        "error": {
+            "already_configured_account": "Account is al geconfigureerd"
+        },
         "step": {
             "pick_implementation": {
                 "title": "Kies Authenticatiemethode"
diff --git a/homeassistant/components/withings/translations/no.json b/homeassistant/components/withings/translations/no.json
index bdec62a7160..3d40dde3bbf 100644
--- a/homeassistant/components/withings/translations/no.json
+++ b/homeassistant/components/withings/translations/no.json
@@ -2,17 +2,19 @@
     "config": {
         "abort": {
             "already_configured": "Konfigurasjon oppdatert for profil.",
-            "authorize_url_timeout": "Tidsavbrudd ved oppretting av godkjenningsadresse.",
-            "missing_configuration": "Withings-integrasjonen er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
-            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, sjekk {docs_url} ] ( {docs_url} )"
+            "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
+            "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
+            "no_url_available": "Ingen URL tilgjengelig. For informasjon om denne feilen, [sjekk hjelpseksjonen]({docs_url})"
         },
         "create_entry": {
             "default": "Vellykket godkjenning med Withings."
         },
         "error": {
+            "already_configured": "Kontoen er allerede konfigurert",
+            "already_configured_account": "Kontoen er allerede konfigurert",
             "profile_exists": "Brukerprofilen er allerede konfigurert. Oppgi et unikt profilnavn."
         },
-        "flow_title": "Withings: {profil}",
+        "flow_title": "",
         "step": {
             "pick_implementation": {
                 "title": "Velg godkjenningsmetode"
@@ -26,7 +28,7 @@
             },
             "reauth": {
                 "description": "Profilen {profile} m\u00e5 godkjennes p\u00e5 nytt for \u00e5 kunne fortsette \u00e5 motta Withings-data.",
-                "title": "Autentiser profil p\u00e5 nytt"
+                "title": "Bekreft integrering p\u00e5 nytt"
             }
         }
     }
diff --git a/homeassistant/components/withings/translations/pl.json b/homeassistant/components/withings/translations/pl.json
index e6b31e4d481..08442d5c35f 100644
--- a/homeassistant/components/withings/translations/pl.json
+++ b/homeassistant/components/withings/translations/pl.json
@@ -1,12 +1,19 @@
 {
     "config": {
         "abort": {
-            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji.",
-            "missing_configuration": "Integracja z Withings nie jest skonfigurowana. Post\u0119puj zgodnie z dokumentacj\u0105."
+            "already_configured": "Konfiguracja profilu zosta\u0142a zaktualizowana",
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "no_url_available": "Brak dost\u0119pnego adresu URL. Aby uzyska\u0107 informacje na temat tego b\u0142\u0119du, [sprawd\u017a sekcj\u0119 pomocy] ({docs_url})"
         },
         "create_entry": {
             "default": "Pomy\u015blnie uwierzytelniono z Withings dla wybranego profilu"
         },
+        "error": {
+            "already_configured": "Konto jest ju\u017c skonfigurowane",
+            "already_configured_account": "Konto jest ju\u017c skonfigurowane",
+            "profile_exists": "Profil u\u017cytkownika jest ju\u017c skonfigurowany. Podaj unikaln\u0105 nazw\u0119 profilu."
+        },
         "flow_title": "Withings: {profile}",
         "step": {
             "pick_implementation": {
@@ -14,14 +21,14 @@
             },
             "profile": {
                 "data": {
-                    "profile": "Profil"
+                    "profile": "Nazwa profilu"
                 },
-                "description": "Kt\u00f3ry profil wybra\u0142e\u015b na stronie Withings? Wa\u017cne jest, aby profile si\u0119 zgadza\u0142y, w przeciwnym razie dane zostan\u0105 b\u0142\u0119dnie oznaczone.",
+                "description": "Podaj unikaln\u0105 nazw\u0119 profilu. Zwykle jest to nazwa profilu wybranego w poprzednim kroku.",
                 "title": "Profil u\u017cytkownika"
             },
             "reauth": {
                 "description": "Profil \"{profile}\" musi zosta\u0107 ponownie uwierzytelniony, aby nadal otrzymywa\u0107 dane Withings.",
-                "title": "Ponownie uwierzytelnij {rofile}"
+                "title": "Ponownie uwierzytelnij integracj\u0119"
             }
         }
     }
diff --git a/homeassistant/components/withings/translations/pt-BR.json b/homeassistant/components/withings/translations/pt-BR.json
index f87b8b64576..01556b760ad 100644
--- a/homeassistant/components/withings/translations/pt-BR.json
+++ b/homeassistant/components/withings/translations/pt-BR.json
@@ -2,6 +2,9 @@
     "config": {
         "create_entry": {
             "default": "Autenticado com sucesso no Withings."
+        },
+        "error": {
+            "already_configured_account": "Conta j\u00e1 configurada"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/withings/translations/ru.json b/homeassistant/components/withings/translations/ru.json
index 93fcce53d45..ff7b6c83bb9 100644
--- a/homeassistant/components/withings/translations/ru.json
+++ b/homeassistant/components/withings/translations/ru.json
@@ -3,13 +3,15 @@
         "abort": {
             "already_configured": "\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0434\u043b\u044f \u043f\u0440\u043e\u0444\u0438\u043b\u044f.",
             "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
-            "missing_configuration": "\u0418\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u044f Withings \u043d\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
+            "missing_configuration": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
             "no_url_available": "URL-\u0430\u0434\u0440\u0435\u0441 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d. \u041e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 [\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u0435\u0439]({docs_url}) \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e\u0431 \u044d\u0442\u043e\u0439 \u043e\u0448\u0438\u0431\u043a\u0435."
         },
         "create_entry": {
             "default": "\u0410\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0439\u0434\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
         },
         "error": {
+            "already_configured": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
+            "already_configured_account": "\u042d\u0442\u0430 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 Home Assistant.",
             "profile_exists": "\u041f\u0440\u043e\u0444\u0438\u043b\u044c \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0443\u0436\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d. \u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0435 \u0438\u043c\u044f \u043f\u0440\u043e\u0444\u0438\u043b\u044f."
         },
         "flow_title": "Withings: {profile}",
diff --git a/homeassistant/components/withings/translations/zh-Hant.json b/homeassistant/components/withings/translations/zh-Hant.json
index 02e6d6f669c..a7214b0f250 100644
--- a/homeassistant/components/withings/translations/zh-Hant.json
+++ b/homeassistant/components/withings/translations/zh-Hant.json
@@ -3,13 +3,15 @@
         "abort": {
             "already_configured": "\u6b64\u500b\u4eba\u8a2d\u7f6e\u8a2d\u5b9a\u5df2\u66f4\u65b0\u3002",
             "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
-            "missing_configuration": "Withings \u6574\u5408\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
+            "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
             "no_url_available": "\u6c92\u6709\u53ef\u7528\u7684\u7db2\u5740\u3002\u95dc\u65bc\u6b64\u932f\u8aa4\u66f4\u8a73\u7d30\u8a0a\u606f\uff0c[\u9ede\u9078\u5354\u52a9\u7ae0\u7bc0]({docs_url})"
         },
         "create_entry": {
             "default": "\u5df2\u6210\u529f\u8a8d\u8b49 Withings \u8a2d\u5099\u3002"
         },
         "error": {
+            "already_configured": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured_account": "\u5e33\u865f\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
             "profile_exists": "\u4f7f\u7528\u8005\u500b\u4eba\u8a2d\u7f6e\u5df2\u7d93\u8a2d\u5b9a\uff0c\u8acb\u63d0\u4f9b\u7368\u4e00\u7684\u540d\u7a31\u3002"
         },
         "flow_title": "Withings\uff1a{profile}",
@@ -26,7 +28,7 @@
             },
             "reauth": {
                 "description": "\"{profile}\" \u8a2d\u5b9a\u6a94\u9700\u8981\u91cd\u65b0\u8a8d\u8b49\u4ee5\u4fdd\u6301\u63a5\u6536 Withings \u8cc7\u6599\u3002",
-                "title": "\u91cd\u65b0\u8a8d\u8b49\u500b\u4eba\u8a2d\u7f6e"
+                "title": "\u91cd\u65b0\u8a8d\u8b49\u6574\u5408"
             }
         }
     }
diff --git a/homeassistant/components/wled/config_flow.py b/homeassistant/components/wled/config_flow.py
index ecf8ca6e1e0..4d0f6bf1606 100644
--- a/homeassistant/components/wled/config_flow.py
+++ b/homeassistant/components/wled/config_flow.py
@@ -1,5 +1,4 @@
 """Config flow to configure the WLED integration."""
-import logging
 from typing import Any, Dict, Optional
 
 import voluptuous as vol
@@ -16,8 +15,6 @@ from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN  # pylint: disable=unused-import
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class WLEDFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a WLED config flow."""
@@ -36,7 +33,7 @@ class WLEDFlowHandler(ConfigFlow, domain=DOMAIN):
     ) -> Dict[str, Any]:
         """Handle zeroconf discovery."""
         if user_input is None:
-            return self.async_abort(reason="connection_error")
+            return self.async_abort(reason="cannot_connect")
 
         # Hostname is format: wled-livingroom.local.
         host = user_input["hostname"].rstrip(".")
@@ -86,8 +83,8 @@ class WLEDFlowHandler(ConfigFlow, domain=DOMAIN):
                 device = await wled.update()
             except WLEDConnectionError:
                 if source == SOURCE_ZEROCONF:
-                    return self.async_abort(reason="connection_error")
-                return self._show_setup_form({"base": "connection_error"})
+                    return self.async_abort(reason="cannot_connect")
+                return self._show_setup_form({"base": "cannot_connect"})
             user_input[CONF_MAC] = device.info.mac_address
 
         # Check if already configured
diff --git a/homeassistant/components/wled/const.py b/homeassistant/components/wled/const.py
index 6006952a580..f50e17c01cc 100644
--- a/homeassistant/components/wled/const.py
+++ b/homeassistant/components/wled/const.py
@@ -26,7 +26,6 @@ ATTR_UDP_PORT = "udp_port"
 
 # Units of measurement
 CURRENT_MA = "mA"
-SIGNAL_DBM = "dBm"
 
 # Services
 SERVICE_EFFECT = "effect"
diff --git a/homeassistant/components/wled/light.py b/homeassistant/components/wled/light.py
index 6a22bf6852f..9c6d027b058 100644
--- a/homeassistant/components/wled/light.py
+++ b/homeassistant/components/wled/light.py
@@ -1,6 +1,5 @@
 """Support for LED lights."""
 from functools import partial
-import logging
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 import voluptuous as vol
@@ -45,8 +44,6 @@ from .const import (
     SERVICE_EFFECT,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 1
 
 
@@ -67,6 +64,7 @@ async def async_setup_entry(
             vol.Optional(ATTR_INTENSITY): vol.All(
                 vol.Coerce(int), vol.Range(min=0, max=255)
             ),
+            vol.Optional(ATTR_PALETTE): vol.Any(cv.positive_int, cv.string),
             vol.Optional(ATTR_REVERSE): cv.boolean,
             vol.Optional(ATTR_SPEED): vol.All(
                 vol.Coerce(int), vol.Range(min=0, max=255)
@@ -350,6 +348,7 @@ class WLEDSegmentLight(LightEntity, WLEDDeviceEntity):
         self,
         effect: Optional[Union[int, str]] = None,
         intensity: Optional[int] = None,
+        palette: Optional[Union[int, str]] = None,
         reverse: Optional[bool] = None,
         speed: Optional[int] = None,
     ) -> None:
@@ -362,6 +361,9 @@ class WLEDSegmentLight(LightEntity, WLEDDeviceEntity):
         if intensity is not None:
             data[ATTR_INTENSITY] = intensity
 
+        if palette is not None:
+            data[ATTR_PALETTE] = palette
+
         if reverse is not None:
             data[ATTR_REVERSE] = reverse
 
diff --git a/homeassistant/components/wled/sensor.py b/homeassistant/components/wled/sensor.py
index 63a253e6efc..89d76776a82 100644
--- a/homeassistant/components/wled/sensor.py
+++ b/homeassistant/components/wled/sensor.py
@@ -1,6 +1,5 @@
 """Support for WLED sensors."""
 from datetime import timedelta
-import logging
 from typing import Any, Callable, Dict, List, Optional
 
 from homeassistant.components.sensor import DEVICE_CLASS_CURRENT
@@ -10,15 +9,14 @@ from homeassistant.const import (
     DEVICE_CLASS_SIGNAL_STRENGTH,
     DEVICE_CLASS_TIMESTAMP,
     PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
 )
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.util.dt import utcnow
 
 from . import WLEDDataUpdateCoordinator, WLEDDeviceEntity
-from .const import ATTR_LED_COUNT, ATTR_MAX_POWER, CURRENT_MA, DOMAIN, SIGNAL_DBM
-
-_LOGGER = logging.getLogger(__name__)
+from .const import ATTR_LED_COUNT, ATTR_MAX_POWER, CURRENT_MA, DOMAIN
 
 
 async def async_setup_entry(
@@ -192,7 +190,7 @@ class WLEDWifiRSSISensor(WLEDSensor):
             icon="mdi:wifi",
             key="wifi_rssi",
             name=f"{coordinator.data.info.name} Wi-Fi RSSI",
-            unit_of_measurement=SIGNAL_DBM,
+            unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
         )
 
     @property
diff --git a/homeassistant/components/wled/services.yaml b/homeassistant/components/wled/services.yaml
index 90b14125ad8..7b9a8d01ba1 100644
--- a/homeassistant/components/wled/services.yaml
+++ b/homeassistant/components/wled/services.yaml
@@ -10,6 +10,9 @@ effect:
     intensity:
       description: Intensity of the effect
       example: 100
+    palette:
+      description: Name or ID of the WLED light palette.
+      example: "Tiamat"
     speed:
       description: Speed of the effect. Number between 0 (slow) and 255 (fast).
       example: 150
diff --git a/homeassistant/components/wled/strings.json b/homeassistant/components/wled/strings.json
index 1197517917c..f60a4bf3563 100644
--- a/homeassistant/components/wled/strings.json
+++ b/homeassistant/components/wled/strings.json
@@ -14,11 +14,11 @@
       }
     },
     "error": {
-      "connection_error": "Failed to connect to WLED device."
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     },
     "abort": {
-      "already_configured": "This WLED device is already configured.",
-      "connection_error": "Failed to connect to WLED device."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/wled/switch.py b/homeassistant/components/wled/switch.py
index 440819927b1..38ebd0e9b29 100644
--- a/homeassistant/components/wled/switch.py
+++ b/homeassistant/components/wled/switch.py
@@ -1,5 +1,4 @@
 """Support for WLED switches."""
-import logging
 from typing import Any, Callable, Dict, List, Optional
 
 from homeassistant.components.switch import SwitchEntity
@@ -16,8 +15,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 1
 
 
diff --git a/homeassistant/components/wled/translations/ca.json b/homeassistant/components/wled/translations/ca.json
index 72a8fc519b4..6eee56045b6 100644
--- a/homeassistant/components/wled/translations/ca.json
+++ b/homeassistant/components/wled/translations/ca.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Aquest dispositiu WLED ja est\u00e0 configurat.",
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar amb el dispositiu WLED."
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connection_error": "No s'ha pogut connectar amb el dispositiu WLED."
         },
         "flow_title": "WLED: {name}",
diff --git a/homeassistant/components/wled/translations/cs.json b/homeassistant/components/wled/translations/cs.json
index d7737722cc3..ef5bca151fe 100644
--- a/homeassistant/components/wled/translations/cs.json
+++ b/homeassistant/components/wled/translations/cs.json
@@ -1,10 +1,25 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed WLED se nezda\u0159ilo."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "P\u0159ipojen\u00ed k za\u0159\u00edzen\u00ed WLED se nezda\u0159ilo."
+        },
+        "flow_title": "WLED: {name}",
         "step": {
             "user": {
                 "data": {
                     "host": "Hostitel"
-                }
+                },
+                "description": "Nastavte WLED k integraci s Home Assistant."
+            },
+            "zeroconf_confirm": {
+                "description": "Chcete p\u0159idat WLED se jm\u00e9nem {name} do Home Assistant?",
+                "title": "Nalezen\u00e9 za\u0159\u00edzen\u00ed WLED"
             }
         }
     }
diff --git a/homeassistant/components/wled/translations/el.json b/homeassistant/components/wled/translations/el.json
new file mode 100644
index 00000000000..58012c1e4e3
--- /dev/null
+++ b/homeassistant/components/wled/translations/el.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        },
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wled/translations/en.json b/homeassistant/components/wled/translations/en.json
index 2576270808d..aa448672bf2 100644
--- a/homeassistant/components/wled/translations/en.json
+++ b/homeassistant/components/wled/translations/en.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "This WLED device is already configured.",
+            "already_configured": "Device is already configured",
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect to WLED device."
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connection_error": "Failed to connect to WLED device."
         },
         "flow_title": "WLED: {name}",
diff --git a/homeassistant/components/wled/translations/es.json b/homeassistant/components/wled/translations/es.json
index aab9752d8b6..ba57fbab904 100644
--- a/homeassistant/components/wled/translations/es.json
+++ b/homeassistant/components/wled/translations/es.json
@@ -2,16 +2,18 @@
     "config": {
         "abort": {
             "already_configured": "Este dispositivo WLED ya est\u00e1 configurado.",
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se ha podido conectar al dispositivo WLED."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connection_error": "No se ha podido conectar al dispositivo WLED."
         },
         "flow_title": "WLED: {name}",
         "step": {
             "user": {
                 "data": {
-                    "host": "Host o direcci\u00f3n IP"
+                    "host": "Host"
                 },
                 "description": "Configura el WLED para integrarlo con Home Assistant."
             },
diff --git a/homeassistant/components/wled/translations/et.json b/homeassistant/components/wled/translations/et.json
index 794bd87e42f..4c5b7f22a98 100644
--- a/homeassistant/components/wled/translations/et.json
+++ b/homeassistant/components/wled/translations/et.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "See WLED seade on juba konfigureeritud.",
+            "already_configured": "See WLED seade on juba h\u00e4\u00e4lestatud.",
+            "cannot_connect": "\u00dchendamine nurjus",
             "connection_error": "WLED-seadmega \u00fchenduse loomine nurjus."
         },
         "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
             "connection_error": "WLED-seadmega \u00fchenduse loomine nurjus."
         },
         "flow_title": "WLED: {name}",
@@ -16,7 +18,7 @@
                 "description": "Seadista WLED-i sidumine Home Assistantiga."
             },
             "zeroconf_confirm": {
-                "description": "Kas soovite lisada WLED {nimi} Home Assistanti?",
+                "description": "Kas soovid lisada WLED {nimi} Home Assistanti?",
                 "title": "Leitud WLED seade"
             }
         }
diff --git a/homeassistant/components/wled/translations/fr.json b/homeassistant/components/wled/translations/fr.json
index 694627b8baf..79ab5ab876b 100644
--- a/homeassistant/components/wled/translations/fr.json
+++ b/homeassistant/components/wled/translations/fr.json
@@ -2,9 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "Cet appareil WLED est d\u00e9j\u00e0 configur\u00e9.",
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "Impossible de se connecter au p\u00e9riph\u00e9rique WLED."
         },
         "error": {
+            "cannot_connect": "\u00c9chec de connexion",
             "connection_error": "Impossible de se connecter au p\u00e9riph\u00e9rique WLED."
         },
         "flow_title": "WLED: {name}",
diff --git a/homeassistant/components/wled/translations/it.json b/homeassistant/components/wled/translations/it.json
index 897c04539f0..d6760328db5 100644
--- a/homeassistant/components/wled/translations/it.json
+++ b/homeassistant/components/wled/translations/it.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Questo dispositivo WLED \u00e8 gi\u00e0 configurato.",
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi al dispositivo WLED."
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connection_error": "Impossibile connettersi al dispositivo WLED."
         },
         "flow_title": "WLED: {name}",
diff --git a/homeassistant/components/wled/translations/lb.json b/homeassistant/components/wled/translations/lb.json
index 1490e62e068..6843b74174f 100644
--- a/homeassistant/components/wled/translations/lb.json
+++ b/homeassistant/components/wled/translations/lb.json
@@ -2,9 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "D\u00ebsen WLED Apparat ass scho konfigur\u00e9iert.",
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbannen mam WLED Apparat."
         },
         "error": {
+            "cannot_connect": "Feeler beim verbannen",
             "connection_error": "Feeler beim verbannen mam WLED Apparat."
         },
         "flow_title": "WLED: {name}",
diff --git a/homeassistant/components/wled/translations/nl.json b/homeassistant/components/wled/translations/nl.json
index ebbc0e52cde..08f420d5042 100644
--- a/homeassistant/components/wled/translations/nl.json
+++ b/homeassistant/components/wled/translations/nl.json
@@ -2,9 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "Dit WLED-apparaat is al geconfigureerd.",
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kan geen verbinding maken met WLED-apparaat."
         },
         "error": {
+            "cannot_connect": "Kan geen verbinding maken",
             "connection_error": "Kan geen verbinding maken met WLED-apparaat."
         },
         "flow_title": "WLED: {name}",
diff --git a/homeassistant/components/wled/translations/no.json b/homeassistant/components/wled/translations/no.json
index da372daad11..b3a98e3ab4a 100644
--- a/homeassistant/components/wled/translations/no.json
+++ b/homeassistant/components/wled/translations/no.json
@@ -1,17 +1,19 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Denne WLED-enheten er allerede konfigurert.",
+            "already_configured": "Enheten er allerede konfigurert",
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kunne ikke koble til WLED-enheten."
         },
         "error": {
+            "cannot_connect": "Tilkobling mislyktes",
             "connection_error": "Kunne ikke koble til WLED-enheten."
         },
-        "flow_title": "WLED: {name}",
+        "flow_title": "",
         "step": {
             "user": {
                 "data": {
-                    "host": "Vert "
+                    "host": "Vert"
                 },
                 "description": "Sett opp WLED til \u00e5 integreres med Home Assistant."
             },
diff --git a/homeassistant/components/wled/translations/pl.json b/homeassistant/components/wled/translations/pl.json
index 608fbe65ef2..800c190c64c 100644
--- a/homeassistant/components/wled/translations/pl.json
+++ b/homeassistant/components/wled/translations/pl.json
@@ -2,9 +2,11 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "flow_title": "WLED: {name}",
@@ -13,10 +15,10 @@
                 "data": {
                     "host": "Nazwa hosta lub adres IP"
                 },
-                "description": "Konfiguracja WLED w celu integracji z Home Assistantem."
+                "description": "Konfiguracja WLED w celu integracji z Home Assistant."
             },
             "zeroconf_confirm": {
-                "description": "Czy chcesz doda\u0107 WLED o nazwie `{name}` do Home Assistanta?",
+                "description": "Czy chcesz doda\u0107 WLED o nazwie `{name}` do Home Assistant?",
                 "title": "Wykryto urz\u0105dzenie WLED"
             }
         }
diff --git a/homeassistant/components/wled/translations/ru.json b/homeassistant/components/wled/translations/ru.json
index 5d50b75b94f..3700aa6cc30 100644
--- a/homeassistant/components/wled/translations/ru.json
+++ b/homeassistant/components/wled/translations/ru.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
         },
         "flow_title": "WLED: {name}",
diff --git a/homeassistant/components/wled/translations/zh-Hans.json b/homeassistant/components/wled/translations/zh-Hans.json
new file mode 100644
index 00000000000..254f6df9327
--- /dev/null
+++ b/homeassistant/components/wled/translations/zh-Hans.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "abort": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        },
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wled/translations/zh-Hant.json b/homeassistant/components/wled/translations/zh-Hant.json
index 87490dc4595..26d49a34688 100644
--- a/homeassistant/components/wled/translations/zh-Hant.json
+++ b/homeassistant/components/wled/translations/zh-Hant.json
@@ -1,10 +1,12 @@
 {
     "config": {
         "abort": {
-            "already_configured": "WLED \u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "WLED \u8a2d\u5099\u9023\u7dda\u5931\u6557\u3002"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connection_error": "WLED \u8a2d\u5099\u9023\u7dda\u5931\u6557\u3002"
         },
         "flow_title": "WLED\uff1a{name}",
diff --git a/homeassistant/components/wolflink/sensor.py b/homeassistant/components/wolflink/sensor.py
index 1cae006824b..201979d4dc3 100644
--- a/homeassistant/components/wolflink/sensor.py
+++ b/homeassistant/components/wolflink/sensor.py
@@ -1,6 +1,4 @@
 """The Wolf SmartSet sensors."""
-import logging
-
 from wolf_smartset.models import (
     HoursParameter,
     ListItemParameter,
@@ -22,8 +20,6 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import COORDINATOR, DEVICE_ID, DOMAIN, PARAMETERS, STATES
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up all entries for Wolf Platform."""
diff --git a/homeassistant/components/wolflink/translations/cs.json b/homeassistant/components/wolflink/translations/cs.json
new file mode 100644
index 00000000000..b66ca57cd44
--- /dev/null
+++ b/homeassistant/components/wolflink/translations/cs.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "unknown": "Neo\u010dek\u00e1van\u00e1 chyba"
+        },
+        "step": {
+            "device": {
+                "data": {
+                    "device_name": "Za\u0159\u00edzen\u00ed"
+                }
+            },
+            "user": {
+                "data": {
+                    "password": "Heslo",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wolflink/translations/et.json b/homeassistant/components/wolflink/translations/et.json
new file mode 100644
index 00000000000..04c0ea2a1cf
--- /dev/null
+++ b/homeassistant/components/wolflink/translations/et.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "invalid_auth": "Tuvastamine nurjus",
+            "unknown": "Tundmatu viga"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "Salas\u00f5na",
+                    "username": "Kasutajanimi"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wolflink/translations/no.json b/homeassistant/components/wolflink/translations/no.json
index a158cba44a2..82cf873bd78 100644
--- a/homeassistant/components/wolflink/translations/no.json
+++ b/homeassistant/components/wolflink/translations/no.json
@@ -4,7 +4,7 @@
             "already_configured": "Enheten er allerede konfigurert"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
             "invalid_auth": "Ugyldig godkjenning",
             "unknown": "Uventet feil"
         },
diff --git a/homeassistant/components/wolflink/translations/pl.json b/homeassistant/components/wolflink/translations/pl.json
index d6d42eafb8a..1b84e8b9e3a 100644
--- a/homeassistant/components/wolflink/translations/pl.json
+++ b/homeassistant/components/wolflink/translations/pl.json
@@ -6,7 +6,7 @@
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "invalid_auth": "Niepoprawne uwierzytelnienie",
-            "unknown": "[%key::common::config_flow::error::unknown%]"
+            "unknown": "Nieoczekiwany b\u0142\u0105d"
         },
         "step": {
             "device": {
@@ -17,8 +17,8 @@
             },
             "user": {
                 "data": {
-                    "password": "[%key_id:common::config_flow::data::password%]",
-                    "username": "[%key_id:common::config_flow::data::username%]"
+                    "password": "Has\u0142o",
+                    "username": "Nazwa u\u017cytkownika"
                 },
                 "title": "Po\u0142\u0105czenie WOLF SmartSet"
             }
diff --git a/homeassistant/components/wolflink/translations/sensor.cs.json b/homeassistant/components/wolflink/translations/sensor.cs.json
new file mode 100644
index 00000000000..fded9a5b839
--- /dev/null
+++ b/homeassistant/components/wolflink/translations/sensor.cs.json
@@ -0,0 +1,15 @@
+{
+    "state": {
+        "wolflink__state": {
+            "auto": "Automatika",
+            "cooling": "Chlazen\u00ed",
+            "heizbetrieb": "Re\u017eim topen\u00ed",
+            "heizung": "Topen\u00ed",
+            "permanent": "Trval\u00fd",
+            "standby": "Pohotovostn\u00ed re\u017eim",
+            "start": "Start",
+            "storung": "Chyba",
+            "urlaubsmodus": "Pr\u00e1zdninov\u00fd re\u017eim"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wolflink/translations/sensor.de.json b/homeassistant/components/wolflink/translations/sensor.de.json
index ef60c1c1ae1..373e1989578 100644
--- a/homeassistant/components/wolflink/translations/sensor.de.json
+++ b/homeassistant/components/wolflink/translations/sensor.de.json
@@ -1,6 +1,13 @@
 {
     "state": {
         "wolflink__state": {
+            "solarbetrieb": "Solarmodus",
+            "sparbetrieb": "Sparmodus",
+            "sparen": "Sparen",
+            "stabilisierung": "Stabilisierung",
+            "standby": "Standby",
+            "start": "Start",
+            "storung": "Fehler",
             "test": "Test",
             "tpw": "TPW"
         }
diff --git a/homeassistant/components/wolflink/translations/sensor.et.json b/homeassistant/components/wolflink/translations/sensor.et.json
new file mode 100644
index 00000000000..cbbe3647f03
--- /dev/null
+++ b/homeassistant/components/wolflink/translations/sensor.et.json
@@ -0,0 +1,16 @@
+{
+    "state": {
+        "wolflink__state": {
+            "permanent": "Alaline",
+            "permanentbetrieb": "P\u00fcsire\u017eiim",
+            "solarbetrieb": "P\u00e4ikesek\u00fctte re\u017eiim",
+            "sparbetrieb": "S\u00e4\u00e4sture\u017eiim",
+            "stabilisierung": "Rahunemine",
+            "standby": "Ootel",
+            "start": "K\u00e4ivitus",
+            "storung": "Viga",
+            "test": "Kontroll",
+            "zunden": "S\u00fc\u00fcde"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wolflink/translations/sensor.pl.json b/homeassistant/components/wolflink/translations/sensor.pl.json
index ba65f3ab992..176f0c49b57 100644
--- a/homeassistant/components/wolflink/translations/sensor.pl.json
+++ b/homeassistant/components/wolflink/translations/sensor.pl.json
@@ -2,86 +2,86 @@
     "state": {
         "wolflink__state": {
             "1_x_warmwasser": "1 x CWU",
-            "abgasklappe": "Przepustnica spalin",
-            "absenkbetrieb": "Wych\u0142adzanie",
-            "absenkstop": "Zatrzymanie wych\u0142adzania",
-            "aktiviert": "W\u0142\u0105czone",
-            "antilegionellenfunktion": "Funkcja antylegionella",
-            "at_abschaltung": "Granica wy\u0142\u0105czenia temperatura zewn\u0119trzna",
-            "at_frostschutz": "AT Ochrona antyzamro\u017ceniowa",
-            "aus": "Wy\u0142\u0105czone",
-            "auto": "Automatyczny",
+            "abgasklappe": "przepustnica spalin",
+            "absenkbetrieb": "wych\u0142adzanie",
+            "absenkstop": "zatrzymanie wych\u0142adzania",
+            "aktiviert": "w\u0142\u0105czone",
+            "antilegionellenfunktion": "funkcja antylegionella",
+            "at_abschaltung": "granica wy\u0142\u0105czenia temperatura zewn\u0119trzna",
+            "at_frostschutz": "ochrona antyzamro\u017ceniowa AT",
+            "aus": "wy\u0142\u0105czony",
+            "auto": "automatyczny",
             "auto_off_cool": "AutoOffCool",
             "auto_on_cool": "AutoOnCool",
-            "automatik_aus": "Automatyczne wy\u0142\u0105czanie",
-            "automatik_ein": "Automatyczne w\u0142\u0105czenie",
-            "bereit_keine_ladung": "Gotowe, nie \u0142aduj\u0119",
-            "betrieb_ohne_brenner": "Praca bez palnika",
-            "cooling": "Ch\u0142odzenie",
-            "deaktiviert": "Nieaktywne",
-            "dhw_prior": "Priorytet CWU",
-            "eco": "Eco",
-            "ein": "W\u0142\u0105czony",
-            "estrichtrocknung": "Suszenie jastrychu",
-            "externe_deaktivierung": "Zewn\u0119trzna dezaktywacja",
-            "fernschalter_ein": "Zdalne sterowanie w\u0142\u0105czone",
-            "frost_heizkreis": "Mr\u00f3z w obwodzie grzewczym",
-            "frost_warmwasser": "Mr\u00f3z na CWU",
-            "frostschutz": "Zabezpieczenie przed zamarzaniem",
-            "gasdruck": "Ci\u015bnienie gazu",
-            "glt_betrieb": "Tryb BMS",
-            "gradienten_uberwachung": "Monitorowanie gradientu",
-            "heizbetrieb": "Tryb ogrzewania",
-            "heizgerat_mit_speicher": "Urz\u0105dzenie grzewcze z zasobnikiem",
-            "heizung": "Ogrzewanie",
-            "initialisierung": "Inicjalizacja",
-            "kalibration": "Kalibracja",
-            "kalibration_heizbetrieb": "Kalibracja trybu ogrzewania",
-            "kalibration_kombibetrieb": "Kalibracja trybu kombi",
-            "kalibration_warmwasserbetrieb": "Kalibracja CWU",
-            "kaskadenbetrieb": "Tryb kaskadowy",
-            "kombibetrieb": "Tryb kombi",
-            "kombigerat": "Urz\u0105dzenie kombi",
-            "kombigerat_mit_solareinbindung": "Urz\u0105dzenie kombi zintegrowane z solarem",
-            "mindest_kombizeit": "Minimalny czas kombi",
-            "nachlauf_heizkreispumpe": "Wybieg pompy obiegu grzewczego",
-            "nachspulen": "Przedmuchiwanie",
-            "nur_heizgerat": "Tylko urz\u0105dzenie grzewcze",
-            "parallelbetrieb": "Tryb r\u00f3wnoleg\u0142y",
-            "partymodus": "Tryb imprezowy",
+            "automatik_aus": "automatyczne wy\u0142\u0105czanie",
+            "automatik_ein": "automatyczne w\u0142\u0105czenie",
+            "bereit_keine_ladung": "gotowe, nie \u0142aduj\u0119",
+            "betrieb_ohne_brenner": "praca bez palnika",
+            "cooling": "ch\u0142odzenie",
+            "deaktiviert": "nieaktywne",
+            "dhw_prior": "priorytet CWU",
+            "eco": "tryb eco",
+            "ein": "w\u0142\u0105czony",
+            "estrichtrocknung": "suszenie jastrychu",
+            "externe_deaktivierung": "zewn\u0119trzna dezaktywacja",
+            "fernschalter_ein": "zdalne sterowanie w\u0142\u0105czone",
+            "frost_heizkreis": "mr\u00f3z w obwodzie grzewczym",
+            "frost_warmwasser": "mr\u00f3z na CWU",
+            "frostschutz": "zabezpieczenie przed zamarzaniem",
+            "gasdruck": "ci\u015bnienie gazu",
+            "glt_betrieb": "tryb BMS",
+            "gradienten_uberwachung": "monitorowanie gradientu",
+            "heizbetrieb": "tryb ogrzewania",
+            "heizgerat_mit_speicher": "urz\u0105dzenie grzewcze z zasobnikiem",
+            "heizung": "grzanie",
+            "initialisierung": "inicjalizacja",
+            "kalibration": "kalibracja",
+            "kalibration_heizbetrieb": "kalibracja trybu ogrzewania",
+            "kalibration_kombibetrieb": "kalibracja trybu kombi",
+            "kalibration_warmwasserbetrieb": "kalibracja CWU",
+            "kaskadenbetrieb": "tryb kaskadowy",
+            "kombibetrieb": "tryb kombi",
+            "kombigerat": "urz\u0105dzenie kombi",
+            "kombigerat_mit_solareinbindung": "urz\u0105dzenie kombi zintegrowane z solarem",
+            "mindest_kombizeit": "minimalny czas kombi",
+            "nachlauf_heizkreispumpe": "wybieg pompy obiegu grzewczego",
+            "nachspulen": "przedmuchiwanie",
+            "nur_heizgerat": "tylko urz\u0105dzenie grzewcze",
+            "parallelbetrieb": "tryb r\u00f3wnoleg\u0142y",
+            "partymodus": "tryb imprezowy",
             "perm_cooling": "PermCooling",
-            "permanent": "Sta\u0142y",
-            "permanentbetrieb": "Tryb pracy ci\u0105g\u0142ej",
-            "reduzierter_betrieb": "Tryb ograniczony",
-            "rt_abschaltung": "Wy\u0142\u0105czenie RT",
-            "rt_frostschutz": "RT Ochrona antyzamro\u017ceniowa",
-            "ruhekontakt": "Zestyk spoczynkowy",
-            "schornsteinfeger": "Kominiarz",
+            "permanent": "sta\u0142y",
+            "permanentbetrieb": "tryb pracy ci\u0105g\u0142ej",
+            "reduzierter_betrieb": "tryb ograniczony",
+            "rt_abschaltung": "wy\u0142\u0105czenie RT",
+            "rt_frostschutz": "ochrona antyzamro\u017ceniowa RT",
+            "ruhekontakt": "zestyk spoczynkowy",
+            "schornsteinfeger": "badanie emisji",
             "smart_grid": "SmartGrid",
             "smart_home": "SmartHome",
-            "softstart": "\u0141agodny rozruch",
-            "solarbetrieb": "Tryb solarny",
-            "sparbetrieb": "Tryb oszcz\u0119dzania",
-            "sparen": "Oszcz\u0119dzanie",
-            "spreizung_hoch": "Zbyt du\u017cy zakres",
-            "spreizung_kf": "Zakres KF",
-            "stabilisierung": "Stabilizacja",
-            "standby": "Tryb czuwania",
-            "start": "Start",
-            "storung": "Usterka",
-            "taktsperre": "Blokada taktu",
-            "telefonfernschalter": "Zdalne sterowanie za pomoc\u0105 telefonu",
-            "test": "Test",
+            "softstart": "\u0142agodny rozruch",
+            "solarbetrieb": "tryb solarny",
+            "sparbetrieb": "tryb oszcz\u0119dzania",
+            "sparen": "oszcz\u0119dzanie",
+            "spreizung_hoch": "zbyt du\u017cy zakres",
+            "spreizung_kf": "zakres KF",
+            "stabilisierung": "stabilizacja",
+            "standby": "tryb czuwania",
+            "start": "start",
+            "storung": "usterka",
+            "taktsperre": "blokada taktu",
+            "telefonfernschalter": "zdalny prze\u0142\u0105cznik w telefonie",
+            "test": "test",
             "tpw": "TPW",
-            "urlaubsmodus": "Tryb wakacyjny",
+            "urlaubsmodus": "tryb wakacyjny",
             "ventilprufung": "Kontrola zawor\u00f3w",
-            "vorspulen": "P\u0142ukanie wst\u0119pne",
+            "vorspulen": "p\u0142ukanie wst\u0119pne",
             "warmwasser": "CWU",
-            "warmwasser_schnellstart": "Szybki start CWU",
-            "warmwasserbetrieb": "Tryb CWU",
-            "warmwassernachlauf": "Wybieg CWU",
-            "warmwasservorrang": "Priorytet CWU",
-            "zunden": "Zap\u0142on"
+            "warmwasser_schnellstart": "szybki start CWU",
+            "warmwasserbetrieb": "tryb CWU",
+            "warmwassernachlauf": "wybieg CWU",
+            "warmwasservorrang": "priorytet CWU",
+            "zunden": "zap\u0142on"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/wolflink/translations/sensor.sv.json b/homeassistant/components/wolflink/translations/sensor.sv.json
new file mode 100644
index 00000000000..7b55b80227e
--- /dev/null
+++ b/homeassistant/components/wolflink/translations/sensor.sv.json
@@ -0,0 +1,9 @@
+{
+    "state": {
+        "wolflink__state": {
+            "aktiviert": "Aktiverad",
+            "aus": "Inaktiverad",
+            "test": "Test"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/wolflink/translations/zh-Hans.json b/homeassistant/components/wolflink/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/wolflink/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/worldclock/sensor.py b/homeassistant/components/worldclock/sensor.py
index 3a3853d9f68..e02dc3a0d5c 100644
--- a/homeassistant/components/worldclock/sensor.py
+++ b/homeassistant/components/worldclock/sensor.py
@@ -1,6 +1,4 @@
 """Support for showing the time in a different time zone."""
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA
@@ -11,8 +9,6 @@ import homeassistant.util.dt as dt_util
 
 CONF_TIME_FORMAT = "time_format"
 
-_LOGGER = logging.getLogger(__name__)
-
 DEFAULT_NAME = "Worldclock Sensor"
 ICON = "mdi:clock"
 DEFAULT_TIME_STR_FORMAT = "%H:%M"
diff --git a/homeassistant/components/xbox/__init__.py b/homeassistant/components/xbox/__init__.py
new file mode 100644
index 00000000000..3e8d537799a
--- /dev/null
+++ b/homeassistant/components/xbox/__init__.py
@@ -0,0 +1,269 @@
+"""The xbox integration."""
+import asyncio
+from dataclasses import dataclass
+from datetime import timedelta
+import logging
+from typing import Dict, Optional
+
+import voluptuous as vol
+from xbox.webapi.api.client import XboxLiveClient
+from xbox.webapi.api.provider.catalog.const import SYSTEM_PFN_ID_MAP
+from xbox.webapi.api.provider.catalog.models import AlternateIdType, Product
+from xbox.webapi.api.provider.people.models import (
+    PeopleResponse,
+    Person,
+    PresenceDetail,
+)
+from xbox.webapi.api.provider.smartglass.models import (
+    SmartglassConsoleList,
+    SmartglassConsoleStatus,
+)
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import (
+    aiohttp_client,
+    config_entry_oauth2_flow,
+    config_validation as cv,
+)
+from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from . import api, config_flow
+from .const import DOMAIN, OAUTH2_AUTHORIZE, OAUTH2_TOKEN
+
+_LOGGER = logging.getLogger(__name__)
+
+CONFIG_SCHEMA = vol.Schema(
+    {
+        DOMAIN: vol.Schema(
+            {
+                vol.Required(CONF_CLIENT_ID): cv.string,
+                vol.Required(CONF_CLIENT_SECRET): cv.string,
+            }
+        )
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
+PLATFORMS = ["media_player", "remote", "binary_sensor", "sensor"]
+
+
+async def async_setup(hass: HomeAssistant, config: dict):
+    """Set up the xbox component."""
+    hass.data[DOMAIN] = {}
+
+    if DOMAIN not in config:
+        return True
+
+    config_flow.OAuth2FlowHandler.async_register_implementation(
+        hass,
+        config_entry_oauth2_flow.LocalOAuth2Implementation(
+            hass,
+            DOMAIN,
+            config[DOMAIN][CONF_CLIENT_ID],
+            config[DOMAIN][CONF_CLIENT_SECRET],
+            OAUTH2_AUTHORIZE,
+            OAUTH2_TOKEN,
+        ),
+    )
+
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Set up xbox from a config entry."""
+    implementation = (
+        await config_entry_oauth2_flow.async_get_config_entry_implementation(
+            hass, entry
+        )
+    )
+    session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
+    auth = api.AsyncConfigEntryAuth(
+        aiohttp_client.async_get_clientsession(hass), session
+    )
+
+    client = XboxLiveClient(auth)
+    consoles: SmartglassConsoleList = await client.smartglass.get_console_list()
+    _LOGGER.debug(
+        "Found %d consoles: %s",
+        len(consoles.result),
+        consoles.dict(),
+    )
+
+    coordinator = XboxUpdateCoordinator(hass, client, consoles)
+    await coordinator.async_refresh()
+
+    hass.data[DOMAIN][entry.entry_id] = {
+        "client": XboxLiveClient(auth),
+        "consoles": consoles,
+        "coordinator": coordinator,
+    }
+
+    for component in PLATFORMS:
+        hass.async_create_task(
+            hass.config_entries.async_forward_entry_setup(entry, component)
+        )
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
+    """Unload a config entry."""
+    unload_ok = all(
+        await asyncio.gather(
+            *[
+                hass.config_entries.async_forward_entry_unload(entry, component)
+                for component in PLATFORMS
+            ]
+        )
+    )
+    if unload_ok:
+        # Unsub from coordinator updates
+        hass.data[DOMAIN][entry.entry_id]["sensor_unsub"]()
+        hass.data[DOMAIN][entry.entry_id]["binary_sensor_unsub"]()
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok
+
+
+@dataclass
+class ConsoleData:
+    """Xbox console status data."""
+
+    status: SmartglassConsoleStatus
+    app_details: Optional[Product]
+
+
+@dataclass
+class PresenceData:
+    """Xbox user presence data."""
+
+    xuid: str
+    gamertag: str
+    display_pic: str
+    online: bool
+    status: str
+    in_party: bool
+    in_game: bool
+    in_multiplayer: bool
+    gamer_score: str
+    gold_tenure: Optional[str]
+    account_tier: str
+
+
+@dataclass
+class XboxData:
+    """Xbox dataclass for update coordinator."""
+
+    consoles: Dict[str, ConsoleData]
+    presence: Dict[str, PresenceData]
+
+
+class XboxUpdateCoordinator(DataUpdateCoordinator):
+    """Store Xbox Console Status."""
+
+    def __init__(
+        self,
+        hass: HomeAssistantType,
+        client: XboxLiveClient,
+        consoles: SmartglassConsoleList,
+    ) -> None:
+        """Initialize."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=10),
+        )
+        self.data: XboxData = XboxData({}, [])
+        self.client: XboxLiveClient = client
+        self.consoles: SmartglassConsoleList = consoles
+
+    async def _async_update_data(self) -> XboxData:
+        """Fetch the latest console status."""
+        # Update Console Status
+        new_console_data: Dict[str, ConsoleData] = {}
+        for console in self.consoles.result:
+            current_state: Optional[ConsoleData] = self.data.consoles.get(console.id)
+            status: SmartglassConsoleStatus = (
+                await self.client.smartglass.get_console_status(console.id)
+            )
+
+            _LOGGER.debug(
+                "%s status: %s",
+                console.name,
+                status.dict(),
+            )
+
+            # Setup focus app
+            app_details: Optional[Product] = None
+            if current_state is not None:
+                app_details = current_state.app_details
+
+            if status.focus_app_aumid:
+                if (
+                    not current_state
+                    or status.focus_app_aumid != current_state.status.focus_app_aumid
+                ):
+                    app_id = status.focus_app_aumid.split("!")[0]
+                    id_type = AlternateIdType.PACKAGE_FAMILY_NAME
+                    if app_id in SYSTEM_PFN_ID_MAP:
+                        id_type = AlternateIdType.LEGACY_XBOX_PRODUCT_ID
+                        app_id = SYSTEM_PFN_ID_MAP[app_id][id_type]
+                    catalog_result = (
+                        await self.client.catalog.get_product_from_alternate_id(
+                            app_id, id_type
+                        )
+                    )
+                    if catalog_result and catalog_result.products:
+                        app_details = catalog_result.products[0]
+            else:
+                app_details = None
+
+            new_console_data[console.id] = ConsoleData(
+                status=status, app_details=app_details
+            )
+
+        # Update user presence
+        presence_data = {}
+        batch: PeopleResponse = await self.client.people.get_friends_own_batch(
+            [self.client.xuid]
+        )
+        own_presence: Person = batch.people[0]
+        presence_data[own_presence.xuid] = _build_presence_data(own_presence)
+
+        friends: PeopleResponse = await self.client.people.get_friends_own()
+        for friend in friends.people:
+            if not friend.is_favorite:
+                continue
+
+            presence_data[friend.xuid] = _build_presence_data(friend)
+
+        return XboxData(new_console_data, presence_data)
+
+
+def _build_presence_data(person: Person) -> PresenceData:
+    """Build presence data from a person."""
+    active_app: Optional[PresenceDetail] = None
+    try:
+        active_app = next(
+            presence for presence in person.presence_details if presence.is_primary
+        )
+    except StopIteration:
+        pass
+
+    return PresenceData(
+        xuid=person.xuid,
+        gamertag=person.gamertag,
+        display_pic=person.display_pic_raw,
+        online=person.presence_state == "Online",
+        status=person.presence_text,
+        in_party=person.multiplayer_summary.in_party > 0,
+        in_game=active_app and active_app.is_game,
+        in_multiplayer=person.multiplayer_summary.in_multiplayer_session,
+        gamer_score=person.gamer_score,
+        gold_tenure=person.detail.tenure,
+        account_tier=person.detail.account_tier,
+    )
diff --git a/homeassistant/components/xbox/api.py b/homeassistant/components/xbox/api.py
new file mode 100644
index 00000000000..bb38b235c0c
--- /dev/null
+++ b/homeassistant/components/xbox/api.py
@@ -0,0 +1,39 @@
+"""API for xbox bound to Home Assistant OAuth."""
+from aiohttp import ClientSession
+from xbox.webapi.authentication.manager import AuthenticationManager
+from xbox.webapi.authentication.models import OAuth2TokenResponse
+
+from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.util.dt import utc_from_timestamp
+
+
+class AsyncConfigEntryAuth(AuthenticationManager):
+    """Provide xbox authentication tied to an OAuth2 based config entry."""
+
+    def __init__(
+        self,
+        websession: ClientSession,
+        oauth_session: config_entry_oauth2_flow.OAuth2Session,
+    ):
+        """Initialize xbox auth."""
+        # Leaving out client credentials as they are handled by Home Assistant
+        super().__init__(websession, "", "", "")
+        self._oauth_session = oauth_session
+        self.oauth = self._get_oauth_token()
+
+    async def refresh_tokens(self) -> None:
+        """Return a valid access token."""
+        if not self._oauth_session.valid_token:
+            await self._oauth_session.async_ensure_token_valid()
+            self.oauth = self._get_oauth_token()
+
+        # This will skip the OAuth refresh and only refresh User and XSTS tokens
+        await super().refresh_tokens()
+
+    def _get_oauth_token(self) -> OAuth2TokenResponse:
+        tokens = {**self._oauth_session.token}
+        issued = tokens["expires_at"] - tokens["expires_in"]
+        del tokens["expires_at"]
+        token_response = OAuth2TokenResponse.parse_obj(tokens)
+        token_response.issued = utc_from_timestamp(issued)
+        return token_response
diff --git a/homeassistant/components/xbox/base_sensor.py b/homeassistant/components/xbox/base_sensor.py
new file mode 100644
index 00000000000..028f1d4c9ec
--- /dev/null
+++ b/homeassistant/components/xbox/base_sensor.py
@@ -0,0 +1,63 @@
+"""Base Sensor for the Xbox Integration."""
+from typing import Optional
+
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from . import PresenceData, XboxUpdateCoordinator
+from .const import DOMAIN
+
+
+class XboxBaseSensorEntity(CoordinatorEntity):
+    """Base Sensor for the Xbox Integration."""
+
+    def __init__(self, coordinator: XboxUpdateCoordinator, xuid: str, attribute: str):
+        """Initialize Xbox binary sensor."""
+        super().__init__(coordinator)
+        self.xuid = xuid
+        self.attribute = attribute
+
+    @property
+    def unique_id(self) -> str:
+        """Return a unique, Home Assistant friendly identifier for this entity."""
+        return f"{self.xuid}_{self.attribute}"
+
+    @property
+    def data(self) -> Optional[PresenceData]:
+        """Return coordinator data for this console."""
+        return self.coordinator.data.presence.get(self.xuid)
+
+    @property
+    def name(self) -> str:
+        """Return the name of the sensor."""
+        if not self.data:
+            return None
+
+        if self.attribute == "online":
+            return self.data.gamertag
+
+        attr_name = " ".join([part.title() for part in self.attribute.split("_")])
+        return f"{self.data.gamertag} {attr_name}"
+
+    @property
+    def entity_picture(self) -> str:
+        """Return the gamer pic."""
+        if not self.data:
+            return None
+
+        return self.data.display_pic.replace("&mode=Padding", "")
+
+    @property
+    def entity_registry_enabled_default(self) -> bool:
+        """Return if the entity should be enabled when first added to the entity registry."""
+        return self.attribute == "online"
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        return {
+            "identifiers": {(DOMAIN, "xbox_live")},
+            "name": "Xbox Live",
+            "manufacturer": "Microsoft",
+            "model": "Xbox Live",
+            "entry_type": "service",
+        }
diff --git a/homeassistant/components/xbox/binary_sensor.py b/homeassistant/components/xbox/binary_sensor.py
new file mode 100644
index 00000000000..109b2839b68
--- /dev/null
+++ b/homeassistant/components/xbox/binary_sensor.py
@@ -0,0 +1,84 @@
+"""Xbox friends binary sensors."""
+from functools import partial
+from typing import Dict, List
+
+from homeassistant.components.binary_sensor import BinarySensorEntity
+from homeassistant.core import callback
+from homeassistant.helpers.entity_registry import (
+    async_get_registry as async_get_entity_registry,
+)
+from homeassistant.helpers.typing import HomeAssistantType
+
+from . import XboxUpdateCoordinator
+from .base_sensor import XboxBaseSensorEntity
+from .const import DOMAIN
+
+PRESENCE_ATTRIBUTES = ["online", "in_party", "in_game", "in_multiplayer"]
+
+
+async def async_setup_entry(hass: HomeAssistantType, config_entry, async_add_entities):
+    """Set up Xbox Live friends."""
+    coordinator: XboxUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id][
+        "coordinator"
+    ]
+
+    update_friends = partial(async_update_friends, coordinator, {}, async_add_entities)
+
+    unsub = coordinator.async_add_listener(update_friends)
+    hass.data[DOMAIN][config_entry.entry_id]["binary_sensor_unsub"] = unsub
+    update_friends()
+
+
+class XboxBinarySensorEntity(XboxBaseSensorEntity, BinarySensorEntity):
+    """Representation of a Xbox presence state."""
+
+    @property
+    def is_on(self) -> bool:
+        """Return the status of the requested attribute."""
+        if not self.coordinator.last_update_success:
+            return False
+
+        return getattr(self.data, self.attribute, False)
+
+
+@callback
+def async_update_friends(
+    coordinator: XboxUpdateCoordinator,
+    current: Dict[str, List[XboxBinarySensorEntity]],
+    async_add_entities,
+) -> None:
+    """Update friends."""
+    new_ids = set(coordinator.data.presence)
+    current_ids = set(current)
+
+    # Process new favorites, add them to Home Assistant
+    new_entities = []
+    for xuid in new_ids - current_ids:
+        current[xuid] = [
+            XboxBinarySensorEntity(coordinator, xuid, attribute)
+            for attribute in PRESENCE_ATTRIBUTES
+        ]
+        new_entities = new_entities + current[xuid]
+
+    if new_entities:
+        async_add_entities(new_entities)
+
+    # Process deleted favorites, remove them from Home Assistant
+    for xuid in current_ids - new_ids:
+        coordinator.hass.async_create_task(
+            async_remove_entities(xuid, coordinator, current)
+        )
+
+
+async def async_remove_entities(
+    xuid: str,
+    coordinator: XboxUpdateCoordinator,
+    current: Dict[str, XboxBinarySensorEntity],
+) -> None:
+    """Remove friend sensors from Home Assistant."""
+    registry = await async_get_entity_registry(coordinator.hass)
+    entities = current[xuid]
+    for entity in entities:
+        if entity.entity_id in registry.entities:
+            registry.async_remove(entity.entity_id)
+    del current[xuid]
diff --git a/homeassistant/components/xbox/browse_media.py b/homeassistant/components/xbox/browse_media.py
new file mode 100644
index 00000000000..a91713931c2
--- /dev/null
+++ b/homeassistant/components/xbox/browse_media.py
@@ -0,0 +1,178 @@
+"""Support for media browsing."""
+from typing import Dict, List, Optional
+
+from xbox.webapi.api.client import XboxLiveClient
+from xbox.webapi.api.provider.catalog.const import HOME_APP_IDS, SYSTEM_PFN_ID_MAP
+from xbox.webapi.api.provider.catalog.models import (
+    AlternateIdType,
+    CatalogResponse,
+    FieldsTemplate,
+    Image,
+)
+from xbox.webapi.api.provider.smartglass.models import (
+    InstalledPackage,
+    InstalledPackagesList,
+)
+
+from homeassistant.components.media_player import BrowseMedia
+from homeassistant.components.media_player.const import (
+    MEDIA_CLASS_APP,
+    MEDIA_CLASS_DIRECTORY,
+    MEDIA_CLASS_GAME,
+    MEDIA_TYPE_APP,
+    MEDIA_TYPE_GAME,
+)
+
+TYPE_MAP = {
+    "App": {
+        "type": MEDIA_TYPE_APP,
+        "class": MEDIA_CLASS_APP,
+    },
+    "Game": {
+        "type": MEDIA_TYPE_GAME,
+        "class": MEDIA_CLASS_GAME,
+    },
+}
+
+
+async def build_item_response(
+    client: XboxLiveClient,
+    device_id: str,
+    tv_configured: bool,
+    media_content_type: str,
+    media_content_id: str,
+) -> Optional[BrowseMedia]:
+    """Create response payload for the provided media query."""
+    apps: InstalledPackagesList = await client.smartglass.get_installed_apps(device_id)
+
+    if media_content_type in [None, "library"]:
+        library_info = BrowseMedia(
+            media_class=MEDIA_CLASS_DIRECTORY,
+            media_content_id="library",
+            media_content_type="library",
+            title="Installed Applications",
+            can_play=False,
+            can_expand=True,
+            children=[],
+        )
+
+        # Add Home
+        id_type = AlternateIdType.LEGACY_XBOX_PRODUCT_ID
+        home_catalog: CatalogResponse = (
+            await client.catalog.get_product_from_alternate_id(
+                HOME_APP_IDS[id_type], id_type
+            )
+        )
+        home_thumb = _find_media_image(
+            home_catalog.products[0].localized_properties[0].images
+        )
+        library_info.children.append(
+            BrowseMedia(
+                media_class=MEDIA_CLASS_APP,
+                media_content_id="Home",
+                media_content_type=MEDIA_TYPE_APP,
+                title="Home",
+                can_play=True,
+                can_expand=False,
+                thumbnail=home_thumb.uri,
+            )
+        )
+
+        # Add TV if configured
+        if tv_configured:
+            tv_catalog: CatalogResponse = (
+                await client.catalog.get_product_from_alternate_id(
+                    SYSTEM_PFN_ID_MAP["Microsoft.Xbox.LiveTV_8wekyb3d8bbwe"][id_type],
+                    id_type,
+                )
+            )
+            tv_thumb = _find_media_image(
+                tv_catalog.products[0].localized_properties[0].images
+            )
+            library_info.children.append(
+                BrowseMedia(
+                    media_class=MEDIA_CLASS_APP,
+                    media_content_id="TV",
+                    media_content_type=MEDIA_TYPE_APP,
+                    title="Live TV",
+                    can_play=True,
+                    can_expand=False,
+                    thumbnail=tv_thumb.uri,
+                )
+            )
+
+        content_types = sorted(
+            {app.content_type for app in apps.result if app.content_type in TYPE_MAP}
+        )
+        for c_type in content_types:
+            library_info.children.append(
+                BrowseMedia(
+                    media_class=MEDIA_CLASS_DIRECTORY,
+                    media_content_id=c_type,
+                    media_content_type=TYPE_MAP[c_type]["type"],
+                    title=f"{c_type}s",
+                    can_play=False,
+                    can_expand=True,
+                    children_media_class=TYPE_MAP[c_type]["class"],
+                )
+            )
+
+        return library_info
+
+    app_details = await client.catalog.get_products(
+        [
+            app.one_store_product_id
+            for app in apps.result
+            if app.content_type == media_content_id and app.one_store_product_id
+        ],
+        FieldsTemplate.BROWSE,
+    )
+
+    images = {
+        prod.product_id: prod.localized_properties[0].images
+        for prod in app_details.products
+    }
+
+    return BrowseMedia(
+        media_class=MEDIA_CLASS_DIRECTORY,
+        media_content_id=media_content_id,
+        media_content_type=media_content_type,
+        title=f"{media_content_id}s",
+        can_play=False,
+        can_expand=True,
+        children=[
+            item_payload(app, images)
+            for app in apps.result
+            if app.content_type == media_content_id and app.one_store_product_id
+        ],
+        children_media_class=TYPE_MAP[media_content_id]["class"],
+    )
+
+
+def item_payload(item: InstalledPackage, images: Dict[str, List[Image]]):
+    """Create response payload for a single media item."""
+    thumbnail = None
+    image = _find_media_image(images.get(item.one_store_product_id, []))
+    if image is not None:
+        thumbnail = image.uri
+        if thumbnail[0] == "/":
+            thumbnail = f"https:{thumbnail}"
+
+    return BrowseMedia(
+        media_class=TYPE_MAP[item.content_type]["class"],
+        media_content_id=item.one_store_product_id,
+        media_content_type=TYPE_MAP[item.content_type]["type"],
+        title=item.name,
+        can_play=True,
+        can_expand=False,
+        thumbnail=thumbnail,
+    )
+
+
+def _find_media_image(images=List[Image]) -> Optional[Image]:
+    purpose_order = ["Poster", "Tile", "Logo", "BoxArt"]
+    for purpose in purpose_order:
+        for image in images:
+            if image.image_purpose == purpose and image.width >= 300:
+                return image
+    return None
diff --git a/homeassistant/components/xbox/config_flow.py b/homeassistant/components/xbox/config_flow.py
new file mode 100644
index 00000000000..1d1f0cd8465
--- /dev/null
+++ b/homeassistant/components/xbox/config_flow.py
@@ -0,0 +1,36 @@
+"""Config flow for xbox."""
+import logging
+
+from homeassistant import config_entries
+from homeassistant.helpers import config_entry_oauth2_flow
+
+from .const import DOMAIN
+
+
+class OAuth2FlowHandler(
+    config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
+):
+    """Config flow to handle xbox OAuth2 authentication."""
+
+    DOMAIN = DOMAIN
+    CONNECTION_CLASS = config_entries.CONN_CLASS_CLOUD_POLL
+
+    @property
+    def logger(self) -> logging.Logger:
+        """Return logger."""
+        return logging.getLogger(__name__)
+
+    @property
+    def extra_authorize_data(self) -> dict:
+        """Extra data that needs to be appended to the authorize url."""
+        scopes = ["Xboxlive.signin", "Xboxlive.offline_access"]
+        return {"scope": " ".join(scopes)}
+
+    async def async_step_user(self, user_input=None):
+        """Handle a flow start."""
+        await self.async_set_unique_id(DOMAIN)
+
+        if self._async_current_entries():
+            return self.async_abort(reason="single_instance_allowed")
+
+        return await super().async_step_user(user_input)
diff --git a/homeassistant/components/xbox/const.py b/homeassistant/components/xbox/const.py
new file mode 100644
index 00000000000..1a38e0b3cdd
--- /dev/null
+++ b/homeassistant/components/xbox/const.py
@@ -0,0 +1,8 @@
+"""Constants for the xbox integration."""
+
+DOMAIN = "xbox"
+
+OAUTH2_AUTHORIZE = "https://login.live.com/oauth20_authorize.srf"
+OAUTH2_TOKEN = "https://login.live.com/oauth20_token.srf"
+
+EVENT_NEW_FAVORITE = "xbox/new_favorite"
diff --git a/homeassistant/components/xbox/manifest.json b/homeassistant/components/xbox/manifest.json
new file mode 100644
index 00000000000..b410c32465c
--- /dev/null
+++ b/homeassistant/components/xbox/manifest.json
@@ -0,0 +1,9 @@
+{
+  "domain": "xbox",
+  "name": "Xbox",
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/xbox",
+  "requirements": ["xbox-webapi==2.0.8"],
+  "dependencies": ["http"],
+  "codeowners": ["@hunterjm"]
+}
diff --git a/homeassistant/components/xbox/media_player.py b/homeassistant/components/xbox/media_player.py
new file mode 100644
index 00000000000..41aaa7eeb9c
--- /dev/null
+++ b/homeassistant/components/xbox/media_player.py
@@ -0,0 +1,245 @@
+"""Xbox Media Player Support."""
+import re
+from typing import List, Optional
+
+from xbox.webapi.api.client import XboxLiveClient
+from xbox.webapi.api.provider.catalog.models import Image
+from xbox.webapi.api.provider.smartglass.models import (
+    PlaybackState,
+    PowerState,
+    SmartglassConsole,
+    SmartglassConsoleList,
+    VolumeDirection,
+)
+
+from homeassistant.components.media_player import MediaPlayerEntity
+from homeassistant.components.media_player.const import (
+    MEDIA_TYPE_APP,
+    MEDIA_TYPE_GAME,
+    SUPPORT_BROWSE_MEDIA,
+    SUPPORT_NEXT_TRACK,
+    SUPPORT_PAUSE,
+    SUPPORT_PLAY,
+    SUPPORT_PLAY_MEDIA,
+    SUPPORT_PREVIOUS_TRACK,
+    SUPPORT_TURN_OFF,
+    SUPPORT_TURN_ON,
+    SUPPORT_VOLUME_MUTE,
+    SUPPORT_VOLUME_STEP,
+)
+from homeassistant.const import STATE_OFF, STATE_ON, STATE_PAUSED, STATE_PLAYING
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from . import ConsoleData, XboxUpdateCoordinator
+from .browse_media import build_item_response
+from .const import DOMAIN
+
+SUPPORT_XBOX = (
+    SUPPORT_TURN_ON
+    | SUPPORT_TURN_OFF
+    | SUPPORT_PREVIOUS_TRACK
+    | SUPPORT_NEXT_TRACK
+    | SUPPORT_PLAY
+    | SUPPORT_PAUSE
+    | SUPPORT_VOLUME_STEP
+    | SUPPORT_VOLUME_MUTE
+    | SUPPORT_BROWSE_MEDIA
+    | SUPPORT_PLAY_MEDIA
+)
+
+XBOX_STATE_MAP = {
+    PlaybackState.Playing: STATE_PLAYING,
+    PlaybackState.Paused: STATE_PAUSED,
+    PowerState.On: STATE_ON,
+    PowerState.SystemUpdate: STATE_OFF,
+    PowerState.ConnectedStandby: STATE_OFF,
+    PowerState.Off: STATE_OFF,
+    PowerState.Unknown: None,
+}
+
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up Xbox media_player from a config entry."""
+    client: XboxLiveClient = hass.data[DOMAIN][entry.entry_id]["client"]
+    consoles: SmartglassConsoleList = hass.data[DOMAIN][entry.entry_id]["consoles"]
+    coordinator: XboxUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
+        "coordinator"
+    ]
+
+    async_add_entities(
+        [XboxMediaPlayer(client, console, coordinator) for console in consoles.result]
+    )
+
+
+class XboxMediaPlayer(CoordinatorEntity, MediaPlayerEntity):
+    """Representation of an Xbox Media Player."""
+
+    def __init__(
+        self,
+        client: XboxLiveClient,
+        console: SmartglassConsole,
+        coordinator: XboxUpdateCoordinator,
+    ) -> None:
+        """Initialize the Xbox Media Player."""
+        super().__init__(coordinator)
+        self.client: XboxLiveClient = client
+        self._console: SmartglassConsole = console
+
+    @property
+    def name(self):
+        """Return the device name."""
+        return self._console.name
+
+    @property
+    def unique_id(self):
+        """Console device ID."""
+        return self._console.id
+
+    @property
+    def data(self) -> ConsoleData:
+        """Return coordinator data for this console."""
+        return self.coordinator.data.consoles[self._console.id]
+
+    @property
+    def state(self):
+        """State of the player."""
+        status = self.data.status
+        if status.playback_state in XBOX_STATE_MAP:
+            return XBOX_STATE_MAP[status.playback_state]
+        return XBOX_STATE_MAP[status.power_state]
+
+    @property
+    def supported_features(self):
+        """Flag media player features that are supported."""
+        active_support = SUPPORT_XBOX
+        if self.state not in [STATE_PLAYING, STATE_PAUSED]:
+            active_support &= ~SUPPORT_NEXT_TRACK & ~SUPPORT_PREVIOUS_TRACK
+        return active_support
+
+    @property
+    def media_content_type(self):
+        """Media content type."""
+        app_details = self.data.app_details
+        if app_details and app_details.product_family == "Games":
+            return MEDIA_TYPE_GAME
+        return MEDIA_TYPE_APP
+
+    @property
+    def media_title(self):
+        """Title of current playing media."""
+        app_details = self.data.app_details
+        if not app_details:
+            return None
+        return (
+            app_details.localized_properties[0].product_title
+            or app_details.localized_properties[0].short_title
+        )
+
+    @property
+    def media_image_url(self):
+        """Image url of current playing media."""
+        app_details = self.data.app_details
+        if not app_details:
+            return None
+        image = _find_media_image(app_details.localized_properties[0].images)
+
+        if not image:
+            return None
+
+        url = image.uri
+        if url[0] == "/":
+            url = f"http:{url}"
+        return url
+
+    @property
+    def media_image_remotely_accessible(self) -> bool:
+        """If the image url is remotely accessible."""
+        return True
+
+    async def async_turn_on(self):
+        """Turn the media player on."""
+        await self.client.smartglass.wake_up(self._console.id)
+
+    async def async_turn_off(self):
+        """Turn the media player off."""
+        await self.client.smartglass.turn_off(self._console.id)
+
+    async def async_mute_volume(self, mute):
+        """Mute the volume."""
+        if mute:
+            await self.client.smartglass.mute(self._console.id)
+        else:
+            await self.client.smartglass.unmute(self._console.id)
+
+    async def async_volume_up(self):
+        """Turn volume up for media player."""
+        await self.client.smartglass.volume(self._console.id, VolumeDirection.Up)
+
+    async def async_volume_down(self):
+        """Turn volume down for media player."""
+        await self.client.smartglass.volume(self._console.id, VolumeDirection.Down)
+
+    async def async_media_play(self):
+        """Send play command."""
+        await self.client.smartglass.play(self._console.id)
+
+    async def async_media_pause(self):
+        """Send pause command."""
+        await self.client.smartglass.pause(self._console.id)
+
+    async def async_media_previous_track(self):
+        """Send previous track command."""
+        await self.client.smartglass.previous(self._console.id)
+
+    async def async_media_next_track(self):
+        """Send next track command."""
+        await self.client.smartglass.next(self._console.id)
+
+    async def async_browse_media(self, media_content_type=None, media_content_id=None):
+        """Implement the websocket media browsing helper."""
+        return await build_item_response(
+            self.client,
+            self._console.id,
+            self.data.status.is_tv_configured,
+            media_content_type,
+            media_content_id,
+        )
+
+    async def async_play_media(self, media_type, media_id, **kwargs):
+        """Launch an app on the Xbox."""
+        if media_id == "Home":
+            await self.client.smartglass.go_home(self._console.id)
+        elif media_id == "TV":
+            await self.client.smartglass.show_tv_guide(self._console.id)
+        else:
+            await self.client.smartglass.launch_app(self._console.id, media_id)
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        # Turns "XboxOneX" into "Xbox One X" for display
+        matches = re.finditer(
+            ".+?(?:(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])|$)",
+            self._console.console_type,
+        )
+        model = " ".join([m.group(0) for m in matches])
+
+        return {
+            "identifiers": {(DOMAIN, self._console.id)},
+            "name": self._console.name,
+            "manufacturer": "Microsoft",
+            "model": model,
+        }
+
+
+def _find_media_image(images=List[Image]) -> Optional[Image]:
+    purpose_order = ["FeaturePromotionalSquareArt", "Tile", "Logo", "BoxArt"]
+    for purpose in purpose_order:
+        for image in images:
+            if (
+                image.image_purpose == purpose
+                and image.width == image.height
+                and image.width >= 300
+            ):
+                return image
+    return None
diff --git a/homeassistant/components/xbox/media_source.py b/homeassistant/components/xbox/media_source.py
new file mode 100644
index 00000000000..5615e11ea7f
--- /dev/null
+++ b/homeassistant/components/xbox/media_source.py
@@ -0,0 +1,280 @@
+"""Xbox Media Source Implementation."""
+from dataclasses import dataclass
+from typing import List, Tuple
+
+# pylint: disable=no-name-in-module
+from pydantic.error_wrappers import ValidationError
+from xbox.webapi.api.client import XboxLiveClient
+from xbox.webapi.api.provider.catalog.models import FieldsTemplate, Image
+from xbox.webapi.api.provider.gameclips.models import GameclipsResponse
+from xbox.webapi.api.provider.screenshots.models import ScreenshotResponse
+from xbox.webapi.api.provider.smartglass.models import InstalledPackage
+
+from homeassistant.components.media_player.const import (
+    MEDIA_CLASS_DIRECTORY,
+    MEDIA_CLASS_GAME,
+    MEDIA_CLASS_IMAGE,
+    MEDIA_CLASS_VIDEO,
+)
+from homeassistant.components.media_source.const import MEDIA_MIME_TYPES
+from homeassistant.components.media_source.models import (
+    BrowseMediaSource,
+    MediaSource,
+    MediaSourceItem,
+    PlayMedia,
+)
+from homeassistant.core import callback
+from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.util import dt as dt_util
+
+from .browse_media import _find_media_image
+from .const import DOMAIN
+
+MIME_TYPE_MAP = {
+    "gameclips": "video/mp4",
+    "screenshots": "image/png",
+}
+
+MEDIA_CLASS_MAP = {
+    "gameclips": MEDIA_CLASS_VIDEO,
+    "screenshots": MEDIA_CLASS_IMAGE,
+}
+
+
+async def async_get_media_source(hass: HomeAssistantType):
+    """Set up Xbox media source."""
+    entry = hass.config_entries.async_entries(DOMAIN)[0]
+    client = hass.data[DOMAIN][entry.entry_id]["client"]
+    return XboxSource(hass, client)
+
+
+@callback
+def async_parse_identifier(
+    item: MediaSourceItem,
+) -> Tuple[str, str, str]:
+    """Parse identifier."""
+    identifier = item.identifier or ""
+    start = ["", "", ""]
+    items = identifier.lstrip("/").split("~~", 2)
+    return tuple(items + start[len(items) :])
+
+
+@dataclass
+class XboxMediaItem:
+    """Represents gameclip/screenshot media."""
+
+    caption: str
+    thumbnail: str
+    uri: str
+    media_class: str
+
+
+class XboxSource(MediaSource):
+    """Provide Xbox screenshots and gameclips as media sources."""
+
+    name: str = "Xbox Game Media"
+
+    def __init__(self, hass: HomeAssistantType, client: XboxLiveClient):
+        """Initialize Xbox source."""
+        super().__init__(DOMAIN)
+
+        self.hass: HomeAssistantType = hass
+        self.client: XboxLiveClient = client
+
+    async def async_resolve_media(self, item: MediaSourceItem) -> PlayMedia:
+        """Resolve media to a url."""
+        _, category, url = async_parse_identifier(item)
+        _, kind = category.split("#", 1)
+        return PlayMedia(url, MIME_TYPE_MAP[kind])
+
+    async def async_browse_media(
+        self, item: MediaSourceItem, media_types: Tuple[str] = MEDIA_MIME_TYPES
+    ) -> BrowseMediaSource:
+        """Return media."""
+        title, category, _ = async_parse_identifier(item)
+
+        if not title:
+            return await self._build_game_library()
+
+        if not category:
+            return _build_categories(title)
+
+        return await self._build_media_items(title, category)
+
+    async def _build_game_library(self):
+        """Display installed games across all consoles."""
+        apps = await self.client.smartglass.get_installed_apps()
+        games = {
+            game.one_store_product_id: game
+            for game in apps.result
+            if game.is_game and game.title_id
+        }
+
+        app_details = await self.client.catalog.get_products(
+            games.keys(),
+            FieldsTemplate.BROWSE,
+        )
+
+        images = {
+            prod.product_id: prod.localized_properties[0].images
+            for prod in app_details.products
+        }
+
+        return BrowseMediaSource(
+            domain=DOMAIN,
+            identifier="",
+            media_class=MEDIA_CLASS_DIRECTORY,
+            media_content_type="",
+            title="Xbox Game Media",
+            can_play=False,
+            can_expand=True,
+            children=[_build_game_item(game, images) for game in games.values()],
+            children_media_class=MEDIA_CLASS_GAME,
+        )
+
+    async def _build_media_items(self, title, category):
+        """Fetch requested gameclip/screenshot media."""
+        title_id, _, thumbnail = title.split("#", 2)
+        owner, kind = category.split("#", 1)
+
+        items: List[XboxMediaItem] = []
+        try:
+            if kind == "gameclips":
+                if owner == "my":
+                    response: GameclipsResponse = (
+                        await self.client.gameclips.get_recent_clips_by_xuid(
+                            self.client.xuid, title_id
+                        )
+                    )
+                elif owner == "community":
+                    response: GameclipsResponse = await self.client.gameclips.get_recent_community_clips_by_title_id(
+                        title_id
+                    )
+                else:
+                    return None
+                items = [
+                    XboxMediaItem(
+                        item.user_caption
+                        or dt_util.as_local(
+                            dt_util.parse_datetime(item.date_recorded)
+                        ).strftime("%b. %d, %Y %I:%M %p"),
+                        item.thumbnails[0].uri,
+                        item.game_clip_uris[0].uri,
+                        MEDIA_CLASS_VIDEO,
+                    )
+                    for item in response.game_clips
+                ]
+            elif kind == "screenshots":
+                if owner == "my":
+                    response: ScreenshotResponse = (
+                        await self.client.screenshots.get_recent_screenshots_by_xuid(
+                            self.client.xuid, title_id
+                        )
+                    )
+                elif owner == "community":
+                    response: ScreenshotResponse = await self.client.screenshots.get_recent_community_screenshots_by_title_id(
+                        title_id
+                    )
+                else:
+                    return None
+                items = [
+                    XboxMediaItem(
+                        item.user_caption
+                        or dt_util.as_local(item.date_taken).strftime(
+                            "%b. %d, %Y %I:%M%p"
+                        ),
+                        item.thumbnails[0].uri,
+                        item.screenshot_uris[0].uri,
+                        MEDIA_CLASS_IMAGE,
+                    )
+                    for item in response.screenshots
+                ]
+        except ValidationError:
+            # Unexpected API response
+            pass
+
+        return BrowseMediaSource(
+            domain=DOMAIN,
+            identifier=f"{title}~~{category}",
+            media_class=MEDIA_CLASS_DIRECTORY,
+            media_content_type="",
+            title=f"{owner.title()} {kind.title()}",
+            can_play=False,
+            can_expand=True,
+            children=[_build_media_item(title, category, item) for item in items],
+            children_media_class=MEDIA_CLASS_MAP[kind],
+            thumbnail=thumbnail,
+        )
+
+
+def _build_game_item(item: InstalledPackage, images: List[Image]):
+    """Build individual game."""
+    thumbnail = ""
+    image = _find_media_image(images.get(item.one_store_product_id, []))
+    if image is not None:
+        thumbnail = image.uri
+        if thumbnail[0] == "/":
+            thumbnail = f"https:{thumbnail}"
+
+    return BrowseMediaSource(
+        domain=DOMAIN,
+        identifier=f"{item.title_id}#{item.name}#{thumbnail}",
+        media_class=MEDIA_CLASS_GAME,
+        media_content_type="",
+        title=item.name,
+        can_play=False,
+        can_expand=True,
+        children_media_class=MEDIA_CLASS_DIRECTORY,
+        thumbnail=thumbnail,
+    )
+
+
+def _build_categories(title):
+    """Build base categories for Xbox media."""
+    _, name, thumbnail = title.split("#", 2)
+    base = BrowseMediaSource(
+        domain=DOMAIN,
+        identifier=f"{title}",
+        media_class=MEDIA_CLASS_GAME,
+        media_content_type="",
+        title=name,
+        can_play=False,
+        can_expand=True,
+        children=[],
+        children_media_class=MEDIA_CLASS_DIRECTORY,
+        thumbnail=thumbnail,
+    )
+
+    owners = ["my", "community"]
+    kinds = ["gameclips", "screenshots"]
+    for owner in owners:
+        for kind in kinds:
+            base.children.append(
+                BrowseMediaSource(
+                    domain=DOMAIN,
+                    identifier=f"{title}~~{owner}#{kind}",
+                    media_class=MEDIA_CLASS_DIRECTORY,
+                    media_content_type="",
+                    title=f"{owner.title()} {kind.title()}",
+                    can_play=False,
+                    can_expand=True,
+                    children_media_class=MEDIA_CLASS_MAP[kind],
+                )
+            )
+
+    return base
+
+
+def _build_media_item(title: str, category: str, item: XboxMediaItem):
+    """Build individual media item."""
+    _, kind = category.split("#", 1)
+    return BrowseMediaSource(
+        domain=DOMAIN,
+        identifier=f"{title}~~{category}~~{item.uri}",
+        media_class=item.media_class,
+        media_content_type=MIME_TYPE_MAP[kind],
+        title=item.caption,
+        can_play=True,
+        can_expand=False,
+        thumbnail=item.thumbnail,
+    )
diff --git a/homeassistant/components/xbox/remote.py b/homeassistant/components/xbox/remote.py
new file mode 100644
index 00000000000..12d9a6336c8
--- /dev/null
+++ b/homeassistant/components/xbox/remote.py
@@ -0,0 +1,112 @@
+"""Xbox Remote support."""
+import asyncio
+import re
+from typing import Any, Iterable
+
+from xbox.webapi.api.client import XboxLiveClient
+from xbox.webapi.api.provider.smartglass.models import (
+    InputKeyType,
+    PowerState,
+    SmartglassConsole,
+    SmartglassConsoleList,
+)
+
+from homeassistant.components.remote import (
+    ATTR_DELAY_SECS,
+    ATTR_NUM_REPEATS,
+    DEFAULT_DELAY_SECS,
+    RemoteEntity,
+)
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from . import ConsoleData, XboxUpdateCoordinator
+from .const import DOMAIN
+
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up Xbox media_player from a config entry."""
+    client: XboxLiveClient = hass.data[DOMAIN][entry.entry_id]["client"]
+    consoles: SmartglassConsoleList = hass.data[DOMAIN][entry.entry_id]["consoles"]
+    coordinator: XboxUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][
+        "coordinator"
+    ]
+
+    async_add_entities(
+        [XboxRemote(client, console, coordinator) for console in consoles.result]
+    )
+
+
+class XboxRemote(CoordinatorEntity, RemoteEntity):
+    """Representation of an Xbox remote."""
+
+    def __init__(
+        self,
+        client: XboxLiveClient,
+        console: SmartglassConsole,
+        coordinator: XboxUpdateCoordinator,
+    ) -> None:
+        """Initialize the Xbox Media Player."""
+        super().__init__(coordinator)
+        self.client: XboxLiveClient = client
+        self._console: SmartglassConsole = console
+
+    @property
+    def name(self):
+        """Return the device name."""
+        return f"{self._console.name} Remote"
+
+    @property
+    def unique_id(self):
+        """Console device ID."""
+        return self._console.id
+
+    @property
+    def data(self) -> ConsoleData:
+        """Return coordinator data for this console."""
+        return self.coordinator.data.consoles[self._console.id]
+
+    @property
+    def is_on(self):
+        """Return True if device is on."""
+        return self.data.status.power_state == PowerState.On
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the Xbox on."""
+        await self.client.smartglass.wake_up(self._console.id)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the Xbox off."""
+        await self.client.smartglass.turn_off(self._console.id)
+
+    async def async_send_command(self, command: Iterable[str], **kwargs: Any) -> None:
+        """Send controller or text input to the Xbox."""
+        num_repeats = kwargs[ATTR_NUM_REPEATS]
+        delay = kwargs.get(ATTR_DELAY_SECS, DEFAULT_DELAY_SECS)
+
+        for _ in range(num_repeats):
+            for single_command in command:
+                try:
+                    button = InputKeyType(single_command)
+                    await self.client.smartglass.press_button(self._console.id, button)
+                except ValueError:
+                    await self.client.smartglass.insert_text(
+                        self._console.id, single_command
+                    )
+                await asyncio.sleep(delay)
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        # Turns "XboxOneX" into "Xbox One X" for display
+        matches = re.finditer(
+            ".+?(?:(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])|$)",
+            self._console.console_type,
+        )
+        model = " ".join([m.group(0) for m in matches])
+
+        return {
+            "identifiers": {(DOMAIN, self._console.id)},
+            "name": self._console.name,
+            "manufacturer": "Microsoft",
+            "model": model,
+        }
diff --git a/homeassistant/components/xbox/sensor.py b/homeassistant/components/xbox/sensor.py
new file mode 100644
index 00000000000..e0ab661b2d9
--- /dev/null
+++ b/homeassistant/components/xbox/sensor.py
@@ -0,0 +1,83 @@
+"""Xbox friends binary sensors."""
+from functools import partial
+from typing import Dict, List
+
+from homeassistant.core import callback
+from homeassistant.helpers.entity_registry import (
+    async_get_registry as async_get_entity_registry,
+)
+from homeassistant.helpers.typing import HomeAssistantType
+
+from . import XboxUpdateCoordinator
+from .base_sensor import XboxBaseSensorEntity
+from .const import DOMAIN
+
+SENSOR_ATTRIBUTES = ["status", "gamer_score", "account_tier", "gold_tenure"]
+
+
+async def async_setup_entry(hass: HomeAssistantType, config_entry, async_add_entities):
+    """Set up Xbox Live friends."""
+    coordinator: XboxUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id][
+        "coordinator"
+    ]
+
+    update_friends = partial(async_update_friends, coordinator, {}, async_add_entities)
+
+    unsub = coordinator.async_add_listener(update_friends)
+    hass.data[DOMAIN][config_entry.entry_id]["sensor_unsub"] = unsub
+    update_friends()
+
+
+class XboxSensorEntity(XboxBaseSensorEntity):
+    """Representation of a Xbox presence state."""
+
+    @property
+    def state(self):
+        """Return the state of the requested attribute."""
+        if not self.coordinator.last_update_success:
+            return None
+
+        return getattr(self.data, self.attribute, None)
+
+
+@callback
+def async_update_friends(
+    coordinator: XboxUpdateCoordinator,
+    current: Dict[str, List[XboxSensorEntity]],
+    async_add_entities,
+) -> None:
+    """Update friends."""
+    new_ids = set(coordinator.data.presence)
+    current_ids = set(current)
+
+    # Process new favorites, add them to Home Assistant
+    new_entities = []
+    for xuid in new_ids - current_ids:
+        current[xuid] = [
+            XboxSensorEntity(coordinator, xuid, attribute)
+            for attribute in SENSOR_ATTRIBUTES
+        ]
+        new_entities = new_entities + current[xuid]
+
+    if new_entities:
+        async_add_entities(new_entities)
+
+    # Process deleted favorites, remove them from Home Assistant
+    for xuid in current_ids - new_ids:
+        coordinator.hass.async_create_task(
+            async_remove_entities(xuid, coordinator, current)
+        )
+
+
+async def async_remove_entities(
+    xuid: str,
+    coordinator: XboxUpdateCoordinator,
+    current: Dict[str, XboxSensorEntity],
+) -> None:
+    """Remove friend sensors from Home Assistant."""
+    registry = await async_get_entity_registry(coordinator.hass)
+    entities = current[xuid]
+    for entity in entities:
+        if entity.entity_id in registry.entities:
+            registry.async_remove(entity.entity_id)
+    del current[xuid]
diff --git a/homeassistant/components/xbox/strings.json b/homeassistant/components/xbox/strings.json
new file mode 100644
index 00000000000..accd6775941
--- /dev/null
+++ b/homeassistant/components/xbox/strings.json
@@ -0,0 +1,17 @@
+{
+  "config": {
+    "step": {
+      "pick_implementation": {
+        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      }
+    },
+    "abort": {
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]",
+      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
+      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]"
+    },
+    "create_entry": {
+      "default": "[%key:common::config_flow::create_entry::authenticated%]"
+    }
+  }
+}
diff --git a/homeassistant/components/xbox/translations/ca.json b/homeassistant/components/xbox/translations/ca.json
new file mode 100644
index 00000000000..8b85898dfd6
--- /dev/null
+++ b/homeassistant/components/xbox/translations/ca.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "Temps d'espera esgotat durant la generaci\u00f3 de l'URL d'autoritzaci\u00f3.",
+            "missing_configuration": "El component no est\u00e0 configurat. Mira'n la documentaci\u00f3.",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
+        },
+        "create_entry": {
+            "default": "Autenticaci\u00f3 exitosa"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Selecciona el m\u00e8tode d'autenticaci\u00f3"
+            }
+        }
+    },
+    "title": "xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/cs.json b/homeassistant/components/xbox/translations/cs.json
new file mode 100644
index 00000000000..0bc97c8e002
--- /dev/null
+++ b/homeassistant/components/xbox/translations/cs.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "\u010casov\u00fd limit autoriza\u010dn\u00edho URL vypr\u0161el",
+            "missing_configuration": "Komponenta nen\u00ed nastavena. Postupujte podle dokumentace.",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "create_entry": {
+            "default": "\u00dasp\u011b\u0161n\u011b ov\u011b\u0159eno"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Vyberte metodu ov\u011b\u0159en\u00ed"
+            }
+        }
+    },
+    "title": "Xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/de.json b/homeassistant/components/xbox/translations/de.json
new file mode 100644
index 00000000000..dac1d5644e9
--- /dev/null
+++ b/homeassistant/components/xbox/translations/de.json
@@ -0,0 +1,13 @@
+{
+    "config": {
+        "create_entry": {
+            "default": "Erfolgreich authentifiziert"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Authentifizierungsmethode w\u00e4hlen"
+            }
+        }
+    },
+    "title": "xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/en.json b/homeassistant/components/xbox/translations/en.json
new file mode 100644
index 00000000000..0bb1266bded
--- /dev/null
+++ b/homeassistant/components/xbox/translations/en.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "Timeout generating authorize URL.",
+            "missing_configuration": "The component is not configured. Please follow the documentation.",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
+        },
+        "create_entry": {
+            "default": "Successfully authenticated"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Pick Authentication Method"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/es.json b/homeassistant/components/xbox/translations/es.json
new file mode 100644
index 00000000000..3b06bdff853
--- /dev/null
+++ b/homeassistant/components/xbox/translations/es.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "Tiempo de espera agotado generando la url de autorizaci\u00f3n.",
+            "missing_configuration": "El componente no est\u00e1 configurado. Consulta la documentaci\u00f3n.",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
+        },
+        "create_entry": {
+            "default": "Autenticado correctamente"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Selecciona el m\u00e9todo de autenticaci\u00f3n"
+            }
+        }
+    },
+    "title": "xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/et.json b/homeassistant/components/xbox/translations/et.json
new file mode 100644
index 00000000000..2504817b6d6
--- /dev/null
+++ b/homeassistant/components/xbox/translations/et.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "Tuvastamise URL'i loomise ajal\u00f5pp.",
+            "missing_configuration": "Osis pole seadistatud. Palun vaata dokumentatsiooni.",
+            "single_instance_allowed": "Seade on juba lisatud. Lubatud on ainult \u00fcks seadistamine."
+        },
+        "create_entry": {
+            "default": "Edukalt tuvastatud"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Vali tuvastusmeetod"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/it.json b/homeassistant/components/xbox/translations/it.json
new file mode 100644
index 00000000000..2b6077b9c70
--- /dev/null
+++ b/homeassistant/components/xbox/translations/it.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "Tempo scaduto nel generare l'URL di autorizzazione.",
+            "missing_configuration": "Il componente non \u00e8 configurato. Si prega di seguire la documentazione.",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
+        },
+        "create_entry": {
+            "default": "Autenticazione riuscita"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Scegli il metodo di autenticazione"
+            }
+        }
+    },
+    "title": "Xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/nl.json b/homeassistant/components/xbox/translations/nl.json
new file mode 100644
index 00000000000..5a4bc8da0f6
--- /dev/null
+++ b/homeassistant/components/xbox/translations/nl.json
@@ -0,0 +1,3 @@
+{
+    "title": "xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/no.json b/homeassistant/components/xbox/translations/no.json
new file mode 100644
index 00000000000..ca7f7ac3d4f
--- /dev/null
+++ b/homeassistant/components/xbox/translations/no.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "Tidsavbrudd som genererer autorer URL-adresse.",
+            "missing_configuration": "Komponenten er ikke konfigurert. Vennligst f\u00f8lg dokumentasjonen.",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
+        },
+        "create_entry": {
+            "default": "Vellykket godkjenning"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Velg godkjenningsmetode"
+            }
+        }
+    },
+    "title": "Xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/pl.json b/homeassistant/components/xbox/translations/pl.json
new file mode 100644
index 00000000000..7532e8cd529
--- /dev/null
+++ b/homeassistant/components/xbox/translations/pl.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "Przekroczono limit czasu generowania URL autoryzacji",
+            "missing_configuration": "Komponent nie jest skonfigurowany. Post\u0119puj zgodnie z dokumentacj\u0105.",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
+        },
+        "create_entry": {
+            "default": "Pomy\u015blnie uwierzytelniono"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "Wybierz metod\u0119 uwierzytelniania"
+            }
+        }
+    },
+    "title": "Xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/ru.json b/homeassistant/components/xbox/translations/ru.json
new file mode 100644
index 00000000000..3e6afd408c9
--- /dev/null
+++ b/homeassistant/components/xbox/translations/ru.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
+            "missing_configuration": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
+        },
+        "create_entry": {
+            "default": "\u0410\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f \u043f\u0440\u043e\u0439\u0434\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e."
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u043f\u043e\u0441\u043e\u0431 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438"
+            }
+        }
+    },
+    "title": "Xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox/translations/zh-Hant.json b/homeassistant/components/xbox/translations/zh-Hant.json
new file mode 100644
index 00000000000..c5514515664
--- /dev/null
+++ b/homeassistant/components/xbox/translations/zh-Hant.json
@@ -0,0 +1,18 @@
+{
+    "config": {
+        "abort": {
+            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642\u3002",
+            "missing_configuration": "\u5143\u4ef6\u5c1a\u672a\u8a2d\u7f6e\uff0c\u8acb\u53c3\u95b1\u6587\u4ef6\u8aaa\u660e\u3002",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
+        },
+        "create_entry": {
+            "default": "\u5df2\u6210\u529f\u8a8d\u8b49"
+        },
+        "step": {
+            "pick_implementation": {
+                "title": "\u9078\u64c7\u9a57\u8b49\u6a21\u5f0f"
+            }
+        }
+    },
+    "title": "xbox"
+}
\ No newline at end of file
diff --git a/homeassistant/components/xbox_live/sensor.py b/homeassistant/components/xbox_live/sensor.py
index 1f46267967a..300fcbfb095 100644
--- a/homeassistant/components/xbox_live/sensor.py
+++ b/homeassistant/components/xbox_live/sensor.py
@@ -106,9 +106,7 @@ class XboxSensor(Entity):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        attributes = {}
-        attributes["gamerscore"] = self._gamerscore
-        attributes["tier"] = self._tier
+        attributes = {"gamerscore": self._gamerscore, "tier": self._tier}
 
         for device in self._presence:
             for title in device["titles"]:
diff --git a/homeassistant/components/xiaomi/camera.py b/homeassistant/components/xiaomi/camera.py
index 45466be2cc4..97a0aca20f7 100644
--- a/homeassistant/components/xiaomi/camera.py
+++ b/homeassistant/components/xiaomi/camera.py
@@ -142,7 +142,7 @@ class XiaomiCamera(Camera):
         """Return a still image response from the camera."""
 
         try:
-            host = self.host.async_render()
+            host = self.host.async_render(parse_result=False)
         except TemplateError as exc:
             _LOGGER.error("Error parsing template %s: %s", self.host, exc)
             return self._last_image
diff --git a/homeassistant/components/xiaomi_aqara/binary_sensor.py b/homeassistant/components/xiaomi_aqara/binary_sensor.py
index d63be7824ed..8fbecee46e9 100644
--- a/homeassistant/components/xiaomi_aqara/binary_sensor.py
+++ b/homeassistant/components/xiaomi_aqara/binary_sensor.py
@@ -254,7 +254,7 @@ class XiaomiMotionSensor(XiaomiBinarySensor):
             _LOGGER.debug(
                 "Skipping heartbeat of the motion sensor. "
                 "It can introduce an incorrect state because of a firmware "
-                "bug (https://github.com/home-assistant/home-assistant/pull/"
+                "bug (https://github.com/home-assistant/core/pull/"
                 "11631#issuecomment-357507744)"
             )
             return
diff --git a/homeassistant/components/xiaomi_aqara/cover.py b/homeassistant/components/xiaomi_aqara/cover.py
index fbe7ae334e6..0ef74da83ff 100644
--- a/homeassistant/components/xiaomi_aqara/cover.py
+++ b/homeassistant/components/xiaomi_aqara/cover.py
@@ -1,13 +1,9 @@
 """Support for Xiaomi curtain."""
-import logging
-
 from homeassistant.components.cover import ATTR_POSITION, CoverEntity
 
 from . import XiaomiDevice
 from .const import DOMAIN, GATEWAYS_KEY
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_CURTAIN_LEVEL = "curtain_level"
 
 DATA_KEY_PROTO_V1 = "status"
diff --git a/homeassistant/components/xiaomi_aqara/lock.py b/homeassistant/components/xiaomi_aqara/lock.py
index db858729995..7c5334e0f5c 100644
--- a/homeassistant/components/xiaomi_aqara/lock.py
+++ b/homeassistant/components/xiaomi_aqara/lock.py
@@ -1,6 +1,4 @@
 """Support for Xiaomi Aqara locks."""
-import logging
-
 from homeassistant.components.lock import LockEntity
 from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED
 from homeassistant.core import callback
@@ -9,8 +7,6 @@ from homeassistant.helpers.event import async_call_later
 from . import XiaomiDevice
 from .const import DOMAIN, GATEWAYS_KEY
 
-_LOGGER = logging.getLogger(__name__)
-
 FINGER_KEY = "fing_verified"
 PASSWORD_KEY = "psw_verified"
 CARD_KEY = "card_verified"
diff --git a/homeassistant/components/xiaomi_aqara/strings.json b/homeassistant/components/xiaomi_aqara/strings.json
index bc50c491866..d5fb25d2c3f 100644
--- a/homeassistant/components/xiaomi_aqara/strings.json
+++ b/homeassistant/components/xiaomi_aqara/strings.json
@@ -23,7 +23,7 @@
         "title": "Select the Xiaomi Aqara Gateway that you wish to connect",
         "description": "Run the setup again if you want to connect aditional gateways",
         "data": {
-          "select_ip": "Gateway IP"
+          "select_ip": "[%key:common::config_flow::data::ip%]"
         }
       }
     },
@@ -31,12 +31,12 @@
       "discovery_error": "Failed to discover a Xiaomi Aqara Gateway, try using the IP of the device running HomeAssistant as interface",
       "invalid_interface": "Invalid network interface",
       "invalid_key": "Invalid gateway key",
-      "invalid_host": "Invalid [%key:common::config_flow::data::ip%], see https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
+      "invalid_host": "[%key:common::config_flow::error::invalid_host%], see https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
       "invalid_mac": "Invalid Mac Address"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "Config flow for this gateway is already in progress",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "not_xiaomi_aqara": "Not a Xiaomi Aqara Gateway, discovered device did not match known gateways"
     }
   }
diff --git a/homeassistant/components/xiaomi_aqara/translations/ca.json b/homeassistant/components/xiaomi_aqara/translations/ca.json
index 22d3bbaccd3..ad8259ceddc 100644
--- a/homeassistant/components/xiaomi_aqara/translations/ca.json
+++ b/homeassistant/components/xiaomi_aqara/translations/ca.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "El dispositiu ja est\u00e0 configurat",
-            "already_in_progress": "El flux de configuraci\u00f3 de la passarel\u00b7la ja est\u00e0 en curs.",
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs",
             "not_xiaomi_aqara": "No \u00e9s una passarel\u00b7la Xiaomi Aqara, el dispositiu descobert no coincideix amb cap passarel\u00b7la coneguda"
         },
         "error": {
             "discovery_error": "No s'ha pogut descobrir cap passarel\u00b7la Xiaomi Aqara, prova d'utilitzar la IP del dispositiu que executa Home Assistant com a interf\u00edcie",
-            "invalid_host": "Adre\u00e7a IP no v\u00e0lida, consulta https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
+            "invalid_host": "Nom de l'amfitri\u00f3 o l'adre\u00e7a IP inv\u00e0lids, consulta https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
             "invalid_interface": "Interf\u00edcie de xarxa no v\u00e0lida",
             "invalid_key": "Clau de la passarel\u00b7la no v\u00e0lida",
             "invalid_mac": "Adre\u00e7a MAC no v\u00e0lida",
@@ -17,7 +17,7 @@
         "step": {
             "select": {
                 "data": {
-                    "select_ip": "IP de la passarel\u00b7la"
+                    "select_ip": "Adre\u00e7a IP"
                 },
                 "description": "Torna a executar la configuraci\u00f3 si vols connectar passarel\u00b7les addicionals",
                 "title": "Selecciona la passarel\u00b7la Xiaomi Aqara a la qual connectar-te"
diff --git a/homeassistant/components/xiaomi_aqara/translations/cs.json b/homeassistant/components/xiaomi_aqara/translations/cs.json
index 1eee6cfc151..36412d13798 100644
--- a/homeassistant/components/xiaomi_aqara/translations/cs.json
+++ b/homeassistant/components/xiaomi_aqara/translations/cs.json
@@ -1,7 +1,37 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1"
+        },
+        "error": {
+            "invalid_host": "Neplatn\u00fd hostitel nebo IP adresa , viz https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
+            "invalid_interface": "Neplatn\u00e9 s\u00ed\u0165ov\u00e9 rozhran\u00ed",
+            "invalid_key": "Neplatn\u00fd kl\u00ed\u010d br\u00e1ny",
+            "invalid_mac": "Neplatn\u00e1 MAC adresa"
+        },
+        "flow_title": "Br\u00e1na Xiaomi Aqara: {name}",
+        "step": {
+            "select": {
+                "data": {
+                    "select_ip": "IP adresa"
+                },
+                "title": "Vyberte br\u00e1nu Xiaomi Aqara, kterou chcete p\u0159ipojit"
+            },
+            "settings": {
+                "data": {
+                    "key": "Kl\u00ed\u010d va\u0161\u00ed br\u00e1ny",
+                    "name": "Jm\u00e9no br\u00e1ny"
+                }
+            },
+            "user": {
+                "data": {
+                    "host": "IP adresa (voliteln\u011b)",
+                    "mac": "MAC adresa (voliteln\u00e1)"
+                },
+                "description": "P\u0159ipojte se k va\u0161\u00ed br\u00e1n\u011b Xiaomi Aqara - pokud z\u016fstanou pr\u00e1zdn\u00e9 adresy IP a MAC, pou\u017eije se automatick\u00e9 zji\u0161\u0165ov\u00e1n\u00ed",
+                "title": "Br\u00e1na Xiaomi Aqara"
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/xiaomi_aqara/translations/en.json b/homeassistant/components/xiaomi_aqara/translations/en.json
index 4cdc7ee497a..e2dfdccf438 100644
--- a/homeassistant/components/xiaomi_aqara/translations/en.json
+++ b/homeassistant/components/xiaomi_aqara/translations/en.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "Device is already configured",
-            "already_in_progress": "Config flow for this gateway is already in progress",
+            "already_in_progress": "Configuration flow is already in progress",
             "not_xiaomi_aqara": "Not a Xiaomi Aqara Gateway, discovered device did not match known gateways"
         },
         "error": {
             "discovery_error": "Failed to discover a Xiaomi Aqara Gateway, try using the IP of the device running HomeAssistant as interface",
-            "invalid_host": "Invalid IP Address, see https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
+            "invalid_host": "Invalid hostname or IP address, see https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
             "invalid_interface": "Invalid network interface",
             "invalid_key": "Invalid gateway key",
             "invalid_mac": "Invalid Mac Address",
@@ -17,7 +17,7 @@
         "step": {
             "select": {
                 "data": {
-                    "select_ip": "Gateway IP"
+                    "select_ip": "IP Address"
                 },
                 "description": "Run the setup again if you want to connect aditional gateways",
                 "title": "Select the Xiaomi Aqara Gateway that you wish to connect"
diff --git a/homeassistant/components/xiaomi_aqara/translations/es.json b/homeassistant/components/xiaomi_aqara/translations/es.json
index caf99aed710..21742e1099f 100644
--- a/homeassistant/components/xiaomi_aqara/translations/es.json
+++ b/homeassistant/components/xiaomi_aqara/translations/es.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "El dispositivo ya est\u00e1 configurado",
-            "already_in_progress": "El flujo de configuraci\u00f3n para este gateway ya est\u00e1 en marcha.",
+            "already_in_progress": "El flujo de configuraci\u00f3n ya est\u00e1 en proceso",
             "not_xiaomi_aqara": "No es un Xiaomi Aqara Gateway, el dispositivo descubierto no coincide con los gateways conocidos"
         },
         "error": {
@@ -36,7 +36,7 @@
                     "interface": "La interfaz de la red a usar",
                     "mac": "Direcci\u00f3n Mac (opcional)"
                 },
-                "description": "Conectar con tu Xiaomi Aqara Gateway",
+                "description": "Con\u00e9ctate a tu Xiaomi Aqara Gateway, si las direcciones IP y mac se dejan vac\u00edas, se utiliza el auto-descubrimiento.",
                 "title": "Xiaomi Aqara Gateway"
             }
         }
diff --git a/homeassistant/components/xiaomi_aqara/translations/et.json b/homeassistant/components/xiaomi_aqara/translations/et.json
new file mode 100644
index 00000000000..73aec8cf45a
--- /dev/null
+++ b/homeassistant/components/xiaomi_aqara/translations/et.json
@@ -0,0 +1,42 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas"
+        },
+        "error": {
+            "discovery_error": "Xiaomi Aqara l\u00fc\u00fcsi avastamine nurjus, proovi kasutada HomeAssistanti IP-d liidesena",
+            "invalid_host": "Vigane hostinimi v\u00f5i IP aadress, lisaks vaata: https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
+            "invalid_interface": "Sobimatu v\u00f5rguliides",
+            "invalid_key": "Vigane l\u00fc\u00fcsi v\u00f5ti",
+            "invalid_mac": "Vigane MAC aadress"
+        },
+        "flow_title": "Xiaomi Aqara l\u00fc\u00fcs: {name}",
+        "step": {
+            "select": {
+                "data": {
+                    "select_ip": "L\u00fc\u00fcsi IP"
+                },
+                "description": "K\u00e4ivita seadistamine uuesti kui soovid \u00fchendada t\u00e4iendavaid l\u00fc\u00fcse",
+                "title": "Vali Xiaomi Aqara l\u00fc\u00fcs mida soovid \u00fchendada"
+            },
+            "settings": {
+                "data": {
+                    "key": "L\u00fc\u00fcsi v\u00f5ti",
+                    "name": "L\u00fc\u00fcsi nimi"
+                },
+                "description": "V\u00f5tme (parooli) saab hankida selle \u00f5petuse abil: https://www.domoticz.com/wiki/Xiaomi_Gateway_(Aqara)#Adding_the_Xiaomi_Gateway_to_Domoticz. Kui v\u00f5ti puudub on ligip\u00e4\u00e4s ainult anduritele",
+                "title": "Xiaomi Aqara Gateway, valikulised s\u00e4tted"
+            },
+            "user": {
+                "data": {
+                    "host": "IP-aadress (valikuline)",
+                    "interface": "Kasutatav v\u00f5rguliides",
+                    "mac": "MAC aadress (valikuline)"
+                },
+                "description": "\u00dchendu oma Xiaomi Aqara Gatewayga. Kui IP- ja MAC-aadressid j\u00e4etakse t\u00fchjaks, kasutatakse automaatset avastamist",
+                "title": ""
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/xiaomi_aqara/translations/it.json b/homeassistant/components/xiaomi_aqara/translations/it.json
index dfffec72272..1f00bc38d81 100644
--- a/homeassistant/components/xiaomi_aqara/translations/it.json
+++ b/homeassistant/components/xiaomi_aqara/translations/it.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "Il flusso di configurazione per questo gateway \u00e8 gi\u00e0 in corso",
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso",
             "not_xiaomi_aqara": "Non \u00e8 un Gateway Xiaomi Aqara, il dispositivo scoperto non corrisponde ai gateway noti"
         },
         "error": {
             "discovery_error": "Impossibile individuare un gateway Xiaomi Aqara, provare a utilizzare l'IP del dispositivo che esegue HomeAssistant come interfaccia",
-            "invalid_host": "Indirizzo IP non valido, vedere https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
+            "invalid_host": "Nome host o indirizzo IP non valido, vedere https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
             "invalid_interface": "Interfaccia di rete non valida",
             "invalid_key": "Chiave gateway non valida",
             "invalid_mac": "Indirizzo Mac non valido",
diff --git a/homeassistant/components/xiaomi_aqara/translations/lb.json b/homeassistant/components/xiaomi_aqara/translations/lb.json
index 919fdeb21ea..513c2e050bf 100644
--- a/homeassistant/components/xiaomi_aqara/translations/lb.json
+++ b/homeassistant/components/xiaomi_aqara/translations/lb.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "Apparat ass scho konfigur\u00e9iert",
-            "already_in_progress": "Konfiguratioun's Oflaf fir d\u00ebs Gateway ass schonn am gaangen.",
+            "already_in_progress": "Konfiguratioun's Oflaf ass schonn am gaangen.",
             "not_xiaomi_aqara": "Keng Xiaomi Aqara Gateway, entdeckten Apparat passt net zu bekannte Gateways"
         },
         "error": {
             "discovery_error": "Feeler beim entdecken vun enger Xiaomi Aqara Gateway, prob\u00e9ier d'IP vum Apparat op deem Home Assistant leeft als Interface ze benotzen",
-            "invalid_host": "Ong\u00eblteg IP Adress",
+            "invalid_host": "Ong\u00ebltege Numm oder IP Adress, kuck https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
             "invalid_interface": "Ong\u00ebltege Netzwierk Interface",
             "invalid_key": "Ong\u00ebltegen Gateway Schl\u00ebssel",
             "invalid_mac": "Ong\u00eblteg Mac Adresse",
@@ -36,7 +36,7 @@
                     "interface": "Netzwierk Interface dee soll benotzt ginn",
                     "mac": "Mac Adress (Optionell)"
                 },
-                "description": "Mat denger Xiaomi Aqara Gateway verbannen",
+                "description": "Mat denger Xiaomi Aqara Gateway verbannen,  falls keng IP oder MAC Adress  uginn ass g\u00ebtt auto-discovery benotzt",
                 "title": "Xiaomi Aqara Gateway"
             }
         }
diff --git a/homeassistant/components/xiaomi_aqara/translations/nl.json b/homeassistant/components/xiaomi_aqara/translations/nl.json
index 24eeccf11a0..a2f3f58abda 100644
--- a/homeassistant/components/xiaomi_aqara/translations/nl.json
+++ b/homeassistant/components/xiaomi_aqara/translations/nl.json
@@ -1,10 +1,16 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        },
+        "flow_title": "Xiaomi Aqara Gateway: {name}",
         "step": {
             "user": {
                 "data": {
+                    "host": "IP-adres (optioneel)",
                     "mac": "MAC-adres (optioneel)"
-                }
+                },
+                "title": "Xiaomi Aqara Gateway"
             }
         }
     }
diff --git a/homeassistant/components/xiaomi_aqara/translations/no.json b/homeassistant/components/xiaomi_aqara/translations/no.json
index 39f472299d7..c42958275b3 100644
--- a/homeassistant/components/xiaomi_aqara/translations/no.json
+++ b/homeassistant/components/xiaomi_aqara/translations/no.json
@@ -2,22 +2,22 @@
     "config": {
         "abort": {
             "already_configured": "Enheten er allerede konfigurert",
-            "already_in_progress": "Konfigurasjonsflyt for denne porten p\u00e5g\u00e5r allerede",
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede",
             "not_xiaomi_aqara": "Ikke en Xiaomi Aqara Gateway, oppdaget enhet ikke samsvarer med kjente gatewayer"
         },
         "error": {
             "discovery_error": "Kunne ikke oppdage en Xiaomi Aqara Gateway, pr\u00f8v \u00e5 bruke IP-adressen til enheten som kj\u00f8rer HomeAssistant som grensesnitt",
-            "invalid_host": "Ugyldig IP adresse , se https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
+            "invalid_host": "Ugyldig vertsnavn eller IP-adresse , se https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
             "invalid_interface": "Ugyldig nettverksgrensesnitt",
             "invalid_key": "Ugyldig gateway-n\u00f8kkel",
-            "invalid_mac": "Ugyldig Mac-adresse",
+            "invalid_mac": "Ugyldig MAC-adresse",
             "not_found_error": "Zeroconf oppdaget Gateway kunne ikke v\u00e6re plassert for \u00e5 f\u00e5 den n\u00f8dvendige informasjonen, kan du pr\u00f8ve \u00e5 bruke IP-adressen til enheten som kj\u00f8rer HomeAssistant som grensesnitt"
         },
         "flow_title": "",
         "step": {
             "select": {
                 "data": {
-                    "select_ip": ""
+                    "select_ip": "IP adresse"
                 },
                 "description": "Kj\u00f8r oppsettet igjen hvis du vil koble til tilleggsportaler",
                 "title": "Velg Xiaomi Aqara Gateway som du \u00f8nsker \u00e5 koble til"
@@ -34,9 +34,9 @@
                 "data": {
                     "host": "IP adresse (valgfritt)",
                     "interface": "Nettverksgrensesnittet som skal brukes",
-                    "mac": "Mac-adresse (valgfritt)"
+                    "mac": "MAC-adresse (valgfritt)"
                 },
-                "description": "Koble til Xiaomi Aqara Gateway, hvis IP- og mac-adressene er tomme, brukes automatisk oppdagelse",
+                "description": "Koble til Xiaomi Aqara Gateway, hvis IP- og MAC-adressene er tomme, brukes automatisk oppdagelse",
                 "title": ""
             }
         }
diff --git a/homeassistant/components/xiaomi_aqara/translations/pl.json b/homeassistant/components/xiaomi_aqara/translations/pl.json
index fba37ad0249..8c4e44de762 100644
--- a/homeassistant/components/xiaomi_aqara/translations/pl.json
+++ b/homeassistant/components/xiaomi_aqara/translations/pl.json
@@ -2,14 +2,14 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "already_in_progress": "Konfiguracja dla tej bramki jest ju\u017c w toku",
-            "not_xiaomi_aqara": "To nie jest bramka Xiaomi Aqara, wykryte urz\u0105dzenie nie pasuje do znanych bramek."
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku",
+            "not_xiaomi_aqara": "To nie jest bramka Xiaomi Aqara, wykryte urz\u0105dzenie nie pasuje do znanych bramek"
         },
         "error": {
-            "discovery_error": "Nie uda\u0142o si\u0119 wykry\u0107 bramki Xiaomi Aqara, spr\u00f3buj u\u017cy\u0107 adresu IP urz\u0105dzenia, na kt\u00f3rym pracuje Home Assistant jako interfejsu.",
-            "invalid_host": "Adres IP jest nieprawid\u0142owy, po pomoc w rozwi\u0105zaniu problemu wejd\u017a tutaj: https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
-            "invalid_interface": "Nieprawid\u0142owy interfejs sieciowy.",
-            "invalid_key": "Nieprawid\u0142owy klucz bramki.",
+            "discovery_error": "Nie uda\u0142o si\u0119 wykry\u0107 bramki Xiaomi Aqara, spr\u00f3buj u\u017cy\u0107 adresu IP urz\u0105dzenia, na kt\u00f3rym pracuje Home Assistant jako interfejsu",
+            "invalid_host": "Nieprawid\u0142owa nazwa hosta lub adres IP, po pomoc w rozwi\u0105zaniu problemu kliknij [tutaj]({https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem)}",
+            "invalid_interface": "Nieprawid\u0142owy interfejs sieciowy",
+            "invalid_key": "Nieprawid\u0142owy klucz bramki",
             "invalid_mac": "Nieprawid\u0142owy adres MAC",
             "not_found_error": "Nie mo\u017cna odnale\u017a\u0107 wykrytej bramki, aby uzyska\u0107 niezb\u0119dne informacje, spr\u00f3buj u\u017cy\u0107 adresu IP urz\u0105dzenia, na kt\u00f3rym pracuje Home Assistant jako interfejsu."
         },
@@ -17,7 +17,7 @@
         "step": {
             "select": {
                 "data": {
-                    "select_ip": "IP bramki"
+                    "select_ip": "Adres IP"
                 },
                 "description": "Uruchom konfiguracj\u0119 ponownie, je\u015bli chcesz pod\u0142\u0105czy\u0107 dodatkowe bramki",
                 "title": "Wybierz bramk\u0119 Xiaomi Aqara, z kt\u00f3r\u0105 chcesz si\u0119 po\u0142\u0105czy\u0107"
diff --git a/homeassistant/components/xiaomi_aqara/translations/ru.json b/homeassistant/components/xiaomi_aqara/translations/ru.json
index ddce68aa2bf..751da25d26d 100644
--- a/homeassistant/components/xiaomi_aqara/translations/ru.json
+++ b/homeassistant/components/xiaomi_aqara/translations/ru.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f.",
             "not_xiaomi_aqara": "\u042d\u0442\u043e \u043d\u0435 \u0448\u043b\u044e\u0437 Xiaomi Aqara. \u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u043d\u0435 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u043c \u0448\u043b\u044e\u0437\u0430\u043c."
         },
         "error": {
             "discovery_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0438\u0442\u044c \u0448\u043b\u044e\u0437 Xiaomi Aqara, \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c IP-\u0430\u0434\u0440\u0435\u0441 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0441 HomeAssistant \u0432 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430.",
-            "invalid_host": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 IP-\u0430\u0434\u0440\u0435\u0441. \u0421\u043f\u043e\u0441\u043e\u0431\u044b \u0440\u0435\u0448\u0435\u043d\u0438\u044f \u044d\u0442\u043e\u0439 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u043e\u043f\u0438\u0441\u0430\u043d\u044b \u0437\u0434\u0435\u0441\u044c: https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem.",
+            "invalid_host": "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0434\u043e\u043c\u0435\u043d\u043d\u043e\u0435 \u0438\u043c\u044f \u0438\u043b\u0438 IP-\u0430\u0434\u0440\u0435\u0441.. \u0421\u043f\u043e\u0441\u043e\u0431\u044b \u0440\u0435\u0448\u0435\u043d\u0438\u044f \u044d\u0442\u043e\u0439 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u044b \u043e\u043f\u0438\u0441\u0430\u043d\u044b \u0437\u0434\u0435\u0441\u044c: https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem.",
             "invalid_interface": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441.",
             "invalid_key": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 \u0448\u043b\u044e\u0437\u0430.",
             "invalid_mac": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 MAC-\u0430\u0434\u0440\u0435\u0441.",
@@ -17,7 +17,7 @@
         "step": {
             "select": {
                 "data": {
-                    "select_ip": "IP-\u0430\u0434\u0440\u0435\u0441 \u0448\u043b\u044e\u0437\u0430"
+                    "select_ip": "IP-\u0430\u0434\u0440\u0435\u0441"
                 },
                 "description": "\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0443 \u0435\u0449\u0451 \u0440\u0430\u0437, \u0435\u0441\u043b\u0438 \u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0435\u0449\u0451 \u043e\u0434\u0438\u043d \u0448\u043b\u044e\u0437",
                 "title": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0448\u043b\u044e\u0437 Xiaomi Aqara"
diff --git a/homeassistant/components/xiaomi_aqara/translations/zh-Hans.json b/homeassistant/components/xiaomi_aqara/translations/zh-Hans.json
new file mode 100644
index 00000000000..02e2a01961b
--- /dev/null
+++ b/homeassistant/components/xiaomi_aqara/translations/zh-Hans.json
@@ -0,0 +1,44 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u8bbe\u5907\u5df2\u7ecf\u914d\u7f6e\u8fc7\u4e86",
+            "already_in_progress": "\u914d\u7f6e\u6d41\u7a0b\u5df2\u5728\u8fdb\u884c\u4e2d",
+            "not_xiaomi_aqara": "\u8fd9\u4e0d\u662f\u5c0f\u7c73 Aqara \u7f51\u5173\u3002\u53d1\u73b0\u7684\u8bbe\u5907\u4e0e\u5df2\u77e5\u7f51\u5173\u4e0d\u5339\u914d"
+        },
+        "error": {
+            "discovery_error": "\u672a\u53d1\u73b0\u5c0f\u7c73 Aqara \u7f51\u5173\u3002\u8bf7\u5c1d\u8bd5\u4f7f\u7528\u8fd0\u884c Home Assistant \u7684\u8bbe\u5907 IP \u4f5c\u4e3a\u63a5\u53e3",
+            "invalid_host": "IP \u5730\u5740\u65e0\u6548\u3002\u8bf7\u53c2\u9605 https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
+            "invalid_interface": "\u7f51\u7edc\u63a5\u53e3\u65e0\u6548",
+            "invalid_key": "\u7f51\u5173 key \u65e0\u6548",
+            "invalid_mac": "MAC \u5730\u5740\u65e0\u6548",
+            "not_found_error": "Zeroconf \u53d1\u73b0\u7684\u7f51\u5173\u65e0\u6cd5\u5b9a\u4f4d\uff0c\u56e0\u6b64\u65e0\u6cd5\u83b7\u5f97\u5fc5\u8981\u4fe1\u606f\u3002\u8bf7\u5c1d\u8bd5\u4f7f\u7528\u8fd0\u884c HomeAssistant \u7684\u8bbe\u5907 IP \u4f5c\u4e3a\u63a5\u53e3"
+        },
+        "flow_title": "\u5c0f\u7c73 Aqara \u7f51\u5173\uff1a{name}",
+        "step": {
+            "select": {
+                "data": {
+                    "select_ip": "\u7f51\u5173 IP"
+                },
+                "description": "\u5982\u679c\u8981\u8fde\u63a5\u5176\u4ed6\u7f51\u5173\uff0c\u8bf7\u518d\u6b21\u8fd0\u884c\u914d\u7f6e\u7a0b\u5e8f",
+                "title": "\u9009\u62e9\u8981\u8fde\u63a5\u7684\u5c0f\u7c73 Aqara \u7f51\u5173"
+            },
+            "settings": {
+                "data": {
+                    "key": "\u7f51\u5173 key",
+                    "name": "\u7f51\u5173\u540d\u79f0"
+                },
+                "description": "\u6240\u9700\u7684 key \u53ef\u4ee5\u53c2\u8003\u4ee5\u4e0b\u6559\u7a0b\u83b7\u53d6: https://www.domoticz.com/wiki/Xiaomi_Gateway_(Aqara)#Adding_the_Xiaomi_Gateway_to_Domoticz \u3002\u5982\u679c\u672a\u63d0\u4f9b key\uff0c\u5219\u53ea\u80fd\u8bbf\u95ee\u4f20\u611f\u5668",
+                "title": "\u5c0f\u7c73 Aqara \u7f51\u5173\u7684\u53ef\u9009\u8bbe\u7f6e"
+            },
+            "user": {
+                "data": {
+                    "host": "IP \u5730\u5740 (\u53ef\u9009)",
+                    "interface": "\u8981\u4f7f\u7528\u7684\u7f51\u7edc\u63a5\u53e3",
+                    "mac": "MAC \u5730\u5740 (\u53ef\u9009)"
+                },
+                "description": "\u8fde\u63a5\u5230\u60a8\u7684\u5c0f\u7c73 Aqara \u7f51\u5173\uff0c\u5982\u679c IP \u548c MAC \u5730\u5740\u7559\u7a7a\uff0c\u5219\u4f7f\u7528\u81ea\u52a8\u53d1\u73b0",
+                "title": "\u5c0f\u7c73 Aqara \u7f51\u5173"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/xiaomi_aqara/translations/zh-Hant.json b/homeassistant/components/xiaomi_aqara/translations/zh-Hant.json
index 87ea0c6028a..c71d5e1a89b 100644
--- a/homeassistant/components/xiaomi_aqara/translations/zh-Hant.json
+++ b/homeassistant/components/xiaomi_aqara/translations/zh-Hant.json
@@ -2,12 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "\u7db2\u95dc\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d",
             "not_xiaomi_aqara": "\u4e26\u975e\u5c0f\u7c73 Aqara \u7db2\u95dc\uff0c\u6240\u63a2\u7d22\u4e4b\u8a2d\u5099\u8207\u5df2\u77e5\u7db2\u95dc\u4e0d\u7b26\u5408"
         },
         "error": {
             "discovery_error": "\u63a2\u7d22\u5c0f\u7c73 Aqara \u7db2\u95dc\u5931\u6557\uff0c\u8acb\u5617\u8a66\u4f7f\u7528\u57f7\u884c Home Assistant \u8a2d\u5099\u7684 IP \u4f5c\u70ba\u4ecb\u9762",
-            "invalid_host": "\u7121\u6548\u7684 IP \u4f4d\u5740\uff0c\u8acb\u53c3\u95b1 https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
+            "invalid_host": "\u7121\u6548\u4e3b\u6a5f\u540d\u7a31\u6216 IP \u4f4d\u5740\uff0c\u8acb\u53c3\u95b1 https://www.home-assistant.io/integrations/xiaomi_aqara/#connection-problem",
             "invalid_interface": "\u7db2\u8def\u4ecb\u9762\u7121\u6548",
             "invalid_key": "\u7db2\u95dc\u5bc6\u9470\u7121\u6548",
             "invalid_mac": "\u7121\u6548\u7684 Mac \u4f4d\u5740",
@@ -17,7 +17,7 @@
         "step": {
             "select": {
                 "data": {
-                    "select_ip": "\u7db2\u95dc IP"
+                    "select_ip": "IP \u4f4d\u5740"
                 },
                 "description": "\u5982\u679c\u9084\u6709\u5176\u4ed6\u7db2\u95dc\u9700\u8981\u9023\u7dda\uff0c\u8acb\u518d\u57f7\u884c\u4e00\u6b21\u8a2d\u5b9a",
                 "title": "\u9078\u64c7\u6240\u8981\u9023\u7dda\u7684\u5c0f\u7c73 Aqara \u7db2\u95dc"
diff --git a/homeassistant/components/xiaomi_miio/__init__.py b/homeassistant/components/xiaomi_miio/__init__.py
index 6957862ab7a..7ff1ed999c4 100644
--- a/homeassistant/components/xiaomi_miio/__init__.py
+++ b/homeassistant/components/xiaomi_miio/__init__.py
@@ -1,6 +1,4 @@
 """Support for Xiaomi Miio."""
-import logging
-
 from homeassistant import config_entries, core
 from homeassistant.const import CONF_HOST, CONF_TOKEN
 from homeassistant.helpers import device_registry as dr
@@ -9,8 +7,6 @@ from .config_flow import CONF_FLOW_TYPE, CONF_GATEWAY
 from .const import DOMAIN
 from .gateway import ConnectXiaomiGateway
 
-_LOGGER = logging.getLogger(__name__)
-
 GATEWAY_PLATFORMS = ["alarm_control_panel", "sensor", "light"]
 
 
diff --git a/homeassistant/components/xiaomi_miio/air_quality.py b/homeassistant/components/xiaomi_miio/air_quality.py
index baeb0bf39e5..1e1e1b58632 100644
--- a/homeassistant/components/xiaomi_miio/air_quality.py
+++ b/homeassistant/components/xiaomi_miio/air_quality.py
@@ -195,8 +195,9 @@ class AirMonitorS1(AirMonitorB1):
             self._humidity = state.humidity
             self._available = True
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
 
 
 class AirMonitorV1(AirMonitorB1):
@@ -210,8 +211,9 @@ class AirMonitorV1(AirMonitorB1):
             self._air_quality_index = state.aqi
             self._available = True
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
 
     @property
     def unit_of_measurement(self):
diff --git a/homeassistant/components/xiaomi_miio/alarm_control_panel.py b/homeassistant/components/xiaomi_miio/alarm_control_panel.py
index 89fcb45b864..6880202cbd6 100644
--- a/homeassistant/components/xiaomi_miio/alarm_control_panel.py
+++ b/homeassistant/components/xiaomi_miio/alarm_control_panel.py
@@ -3,7 +3,7 @@
 from functools import partial
 import logging
 
-from miio.gateway import GatewayException
+from miio import DeviceException
 
 from homeassistant.components.alarm_control_panel import (
     SUPPORT_ALARM_ARM_AWAY,
@@ -103,7 +103,7 @@ class XiaomiGatewayAlarm(AlarmControlPanelEntity):
                 partial(func, *args, **kwargs)
             )
             _LOGGER.debug("Response received from miio device: %s", result)
-        except GatewayException as exc:
+        except DeviceException as exc:
             _LOGGER.error(mask_error, exc)
 
     async def async_alarm_arm_away(self, code=None):
@@ -122,9 +122,11 @@ class XiaomiGatewayAlarm(AlarmControlPanelEntity):
         """Fetch state from the device."""
         try:
             state = await self.hass.async_add_executor_job(self._gateway.alarm.status)
-        except GatewayException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+        except DeviceException as ex:
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
+
             return
 
         _LOGGER.debug("Got new state: %s", state)
diff --git a/homeassistant/components/xiaomi_miio/config_flow.py b/homeassistant/components/xiaomi_miio/config_flow.py
index 6a62fbead13..6ebb50cd7ce 100644
--- a/homeassistant/components/xiaomi_miio/config_flow.py
+++ b/homeassistant/components/xiaomi_miio/config_flow.py
@@ -111,7 +111,7 @@ class XiaomiMiioFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
                     },
                 )
 
-            errors["base"] = "connect_error"
+            errors["base"] = "cannot_connect"
 
         if self.host:
             schema = vol.Schema(GATEWAY_SETTINGS)
diff --git a/homeassistant/components/xiaomi_miio/fan.py b/homeassistant/components/xiaomi_miio/fan.py
index 3382ca910c3..8d971446a53 100644
--- a/homeassistant/components/xiaomi_miio/fan.py
+++ b/homeassistant/components/xiaomi_miio/fan.py
@@ -449,7 +449,7 @@ SERVICE_SCHEMA_VOLUME = AIRPURIFIER_SERVICE_SCHEMA.extend(
 )
 
 SERVICE_SCHEMA_EXTRA_FEATURES = AIRPURIFIER_SERVICE_SCHEMA.extend(
-    {vol.Required(ATTR_FEATURES): vol.All(vol.Coerce(int), vol.Range(min=0))}
+    {vol.Required(ATTR_FEATURES): cv.positive_int}
 )
 
 SERVICE_SCHEMA_TARGET_HUMIDITY = AIRPURIFIER_SERVICE_SCHEMA.extend(
@@ -655,8 +655,10 @@ class XiaomiGenericDevice(FanEntity):
 
             return result == SUCCESS
         except DeviceException as exc:
-            _LOGGER.error(mask_error, exc)
-            self._available = False
+            if self._available:
+                _LOGGER.error(mask_error, exc)
+                self._available = False
+
             return False
 
     async def async_turn_on(self, speed: str = None, **kwargs) -> None:
@@ -785,8 +787,9 @@ class XiaomiAirPurifier(XiaomiGenericDevice):
             )
 
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
 
     @property
     def speed_list(self) -> list:
@@ -1029,8 +1032,9 @@ class XiaomiAirHumidifier(XiaomiGenericDevice):
             )
 
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
 
     @property
     def speed_list(self) -> list:
@@ -1138,8 +1142,9 @@ class XiaomiAirFresh(XiaomiGenericDevice):
             )
 
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
 
     @property
     def speed_list(self) -> list:
diff --git a/homeassistant/components/xiaomi_miio/gateway.py b/homeassistant/components/xiaomi_miio/gateway.py
index 8c928cb36e4..eb2f4cdf2eb 100644
--- a/homeassistant/components/xiaomi_miio/gateway.py
+++ b/homeassistant/components/xiaomi_miio/gateway.py
@@ -65,7 +65,7 @@ class XiaomiGatewayDevice(Entity):
         self._entry = entry
         self._unique_id = sub_device.sid
         self._name = f"{sub_device.name} ({sub_device.sid})"
-        self._available = None
+        self._available = False
 
     @property
     def unique_id(self):
@@ -100,5 +100,6 @@ class XiaomiGatewayDevice(Entity):
             await self.hass.async_add_executor_job(self._sub_device.update)
             self._available = True
         except gateway.GatewayException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
diff --git a/homeassistant/components/xiaomi_miio/light.py b/homeassistant/components/xiaomi_miio/light.py
index 29c80faa892..d1746fcd889 100644
--- a/homeassistant/components/xiaomi_miio/light.py
+++ b/homeassistant/components/xiaomi_miio/light.py
@@ -278,11 +278,6 @@ class XiaomiPhilipsAbstractLight(LightEntity):
         self._state = None
         self._state_attrs = {ATTR_MODEL: self._model}
 
-    @property
-    def should_poll(self):
-        """Poll the light."""
-        return True
-
     @property
     def unique_id(self):
         """Return an unique ID."""
@@ -329,8 +324,10 @@ class XiaomiPhilipsAbstractLight(LightEntity):
 
             return result == SUCCESS
         except DeviceException as exc:
-            _LOGGER.error(mask_error, exc)
-            self._available = False
+            if self._available:
+                _LOGGER.error(mask_error, exc)
+                self._available = False
+
             return False
 
     async def async_turn_on(self, **kwargs):
@@ -361,8 +358,10 @@ class XiaomiPhilipsAbstractLight(LightEntity):
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
+
             return
 
         _LOGGER.debug("Got new state: %s", state)
@@ -385,8 +384,10 @@ class XiaomiPhilipsGenericLight(XiaomiPhilipsAbstractLight):
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
+
             return
 
         _LOGGER.debug("Got new state: %s", state)
@@ -541,8 +542,10 @@ class XiaomiPhilipsBulb(XiaomiPhilipsGenericLight):
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
+
             return
 
         _LOGGER.debug("Got new state: %s", state)
@@ -598,8 +601,10 @@ class XiaomiPhilipsCeilingLamp(XiaomiPhilipsBulb):
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
+
             return
 
         _LOGGER.debug("Got new state: %s", state)
@@ -642,8 +647,10 @@ class XiaomiPhilipsEyecareLamp(XiaomiPhilipsGenericLight):
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
+
             return
 
         _LOGGER.debug("Got new state: %s", state)
@@ -783,8 +790,10 @@ class XiaomiPhilipsEyecareLampAmbientLight(XiaomiPhilipsAbstractLight):
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
+
             return
 
         _LOGGER.debug("Got new state: %s", state)
@@ -937,8 +946,10 @@ class XiaomiPhilipsMoonlightLamp(XiaomiPhilipsBulb):
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
+
             return
 
         _LOGGER.debug("Got new state: %s", state)
diff --git a/homeassistant/components/xiaomi_miio/remote.py b/homeassistant/components/xiaomi_miio/remote.py
index c88b2d3663c..c946533ab54 100644
--- a/homeassistant/components/xiaomi_miio/remote.py
+++ b/homeassistant/components/xiaomi_miio/remote.py
@@ -45,9 +45,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Optional(CONF_NAME): cv.string,
         vol.Required(CONF_HOST): cv.string,
-        vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): vol.All(
-            int, vol.Range(min=0)
-        ),
+        vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
         vol.Optional(CONF_SLOT, default=DEFAULT_SLOT): vol.All(
             int, vol.Range(min=1, max=1000000)
         ),
@@ -150,7 +148,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     platform.async_register_entity_service(
         SERVICE_LEARN,
         {
-            vol.Optional(CONF_TIMEOUT, default=10): vol.All(int, vol.Range(min=0)),
+            vol.Optional(CONF_TIMEOUT, default=10): cv.positive_int,
             vol.Optional(CONF_SLOT, default=1): vol.All(
                 int, vol.Range(min=1, max=1000000)
             ),
diff --git a/homeassistant/components/xiaomi_miio/sensor.py b/homeassistant/components/xiaomi_miio/sensor.py
index 6e25750ea50..d20c2dfac1e 100644
--- a/homeassistant/components/xiaomi_miio/sensor.py
+++ b/homeassistant/components/xiaomi_miio/sensor.py
@@ -7,6 +7,7 @@ from miio.gateway import (
     GATEWAY_MODEL_AC_V1,
     GATEWAY_MODEL_AC_V2,
     GATEWAY_MODEL_AC_V3,
+    GATEWAY_MODEL_EU,
     DeviceType,
     GatewayException,
 )
@@ -93,6 +94,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             GATEWAY_MODEL_AC_V1,
             GATEWAY_MODEL_AC_V2,
             GATEWAY_MODEL_AC_V3,
+            GATEWAY_MODEL_EU,
         ]:
             entities.append(
                 XiaomiGatewayIlluminanceSensor(
@@ -174,11 +176,6 @@ class XiaomiAirQualityMonitor(Entity):
             ATTR_MODEL: self._model,
         }
 
-    @property
-    def should_poll(self):
-        """Poll the miio device."""
-        return True
-
     @property
     def unique_id(self):
         """Return an unique ID."""
@@ -236,8 +233,9 @@ class XiaomiAirQualityMonitor(Entity):
             )
 
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
 
 
 class XiaomiGatewaySensor(XiaomiGatewayDevice):
diff --git a/homeassistant/components/xiaomi_miio/strings.json b/homeassistant/components/xiaomi_miio/strings.json
index 171e358c90e..68536de76e5 100644
--- a/homeassistant/components/xiaomi_miio/strings.json
+++ b/homeassistant/components/xiaomi_miio/strings.json
@@ -11,21 +11,21 @@
       },
       "gateway": {
         "title": "Connect to a Xiaomi Gateway",
-        "description": "You will need the 32 character API Token, see https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token for instructions. Please note, that this token is different from the key used by the Xiaomi Aqara integration.",
+        "description": "You will need the 32 character [%key:common::config_flow::data::api_token%], see https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token for instructions. Please note, that this [%key:common::config_flow::data::api_token%] is different from the key used by the Xiaomi Aqara integration.",
         "data": {
           "host": "[%key:common::config_flow::data::ip%]",
-          "token": "API Token",
+          "token": "[%key:common::config_flow::data::api_token%]",
           "name": "Name of the Gateway"
         }
       }
     },
     "error": {
-      "connect_error": "[%key:common::config_flow::error::cannot_connect%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "no_device_selected": "No device selected, please select one device."
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "Config flow for this Xiaomi Miio device is already in progress."
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
     }
   }
 }
diff --git a/homeassistant/components/xiaomi_miio/switch.py b/homeassistant/components/xiaomi_miio/switch.py
index 6dfcc539a44..b9e90cc5c23 100644
--- a/homeassistant/components/xiaomi_miio/switch.py
+++ b/homeassistant/components/xiaomi_miio/switch.py
@@ -96,7 +96,7 @@ SERVICE_SCHEMA_POWER_MODE = SERVICE_SCHEMA.extend(
 )
 
 SERVICE_SCHEMA_POWER_PRICE = SERVICE_SCHEMA.extend(
-    {vol.Required(ATTR_PRICE): vol.All(vol.Coerce(float), vol.Range(min=0))}
+    {vol.Required(ATTR_PRICE): cv.positive_float}
 )
 
 SERVICE_TO_METHOD = {
@@ -235,11 +235,6 @@ class XiaomiPlugGenericSwitch(SwitchEntity):
         self._device_features = FEATURE_FLAGS_GENERIC
         self._skip_update = False
 
-    @property
-    def should_poll(self):
-        """Poll the plug."""
-        return True
-
     @property
     def unique_id(self):
         """Return an unique ID."""
@@ -285,8 +280,10 @@ class XiaomiPlugGenericSwitch(SwitchEntity):
 
             return result == SUCCESS
         except DeviceException as exc:
-            _LOGGER.error(mask_error, exc)
-            self._available = False
+            if self._available:
+                _LOGGER.error(mask_error, exc)
+                self._available = False
+
             return False
 
     async def async_turn_on(self, **kwargs):
@@ -321,8 +318,9 @@ class XiaomiPlugGenericSwitch(SwitchEntity):
             self._state_attrs[ATTR_TEMPERATURE] = state.temperature
 
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
 
     async def async_set_wifi_led_on(self):
         """Turn the wifi led on."""
@@ -407,8 +405,9 @@ class XiaomiPowerStripSwitch(XiaomiPlugGenericSwitch):
                 self._state_attrs[ATTR_POWER_PRICE] = state.power_price
 
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
 
     async def async_set_power_mode(self, mode: str):
         """Set the power mode."""
@@ -497,8 +496,9 @@ class ChuangMiPlugSwitch(XiaomiPlugGenericSwitch):
                 self._state_attrs[ATTR_LOAD_POWER] = state.load_power
 
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
 
 
 class XiaomiAirConditioningCompanionSwitch(XiaomiPlugGenericSwitch):
@@ -546,5 +546,6 @@ class XiaomiAirConditioningCompanionSwitch(XiaomiPlugGenericSwitch):
             self._state_attrs[ATTR_LOAD_POWER] = state.load_power
 
         except DeviceException as ex:
-            self._available = False
-            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            if self._available:
+                self._available = False
+                _LOGGER.error("Got exception while fetching the state: %s", ex)
diff --git a/homeassistant/components/xiaomi_miio/translations/ca.json b/homeassistant/components/xiaomi_miio/translations/ca.json
index 9bd8f91c947..93e0a4859b6 100644
--- a/homeassistant/components/xiaomi_miio/translations/ca.json
+++ b/homeassistant/components/xiaomi_miio/translations/ca.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_configured": "[%key::common::config_flow::abort::already_configured_device%]",
-            "already_in_progress": "El flux de dades de configuraci\u00f3 pel dispositiu Xiaomi Miio ja est\u00e0 en curs."
+            "already_in_progress": "El flux de configuraci\u00f3 ja est\u00e0 en curs"
         },
         "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
             "connect_error": "[%key::common::config_flow::error::cannot_connect%]",
             "no_device_selected": "No hi ha cap dispositiu seleccionat, selecciona'n un."
         },
@@ -14,9 +15,9 @@
                 "data": {
                     "host": "Adre\u00e7a IP",
                     "name": "Nom de la passarel\u00b7la",
-                    "token": "Token de l'API"
+                    "token": "Token d'API"
                 },
-                "description": "Necessitar\u00e0s el token de l'API de 32 car\u00e0cters, consulta les instruccions a https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token. Tingues en compte que aquest token \u00e9s diferent a la clau utilitzada per la integraci\u00f3 Xiaomi Aqara.",
+                "description": "Necessitar\u00e0s el Token d'API de 32 car\u00e0cters, consulta les instruccions a https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token. Tingues en compte que aquest Token d'API \u00e9s diferent a la clau utilitzada per la integraci\u00f3 Xiaomi Aqara.",
                 "title": "Connexi\u00f3 amb la passarel\u00b7la de Xiaomi"
             },
             "user": {
diff --git a/homeassistant/components/xiaomi_miio/translations/cs.json b/homeassistant/components/xiaomi_miio/translations/cs.json
index d784fda2c0d..65e64e4b168 100644
--- a/homeassistant/components/xiaomi_miio/translations/cs.json
+++ b/homeassistant/components/xiaomi_miio/translations/cs.json
@@ -1,20 +1,23 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nakonfigurov\u00e1no"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "already_in_progress": "Konfigurace ji\u017e prob\u00edh\u00e1"
         },
         "error": {
-            "connect_error": "Nepoda\u0159ilo se p\u0159ipojit, zkuste to znovu",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connect_error": "Nepoda\u0159ilo se p\u0159ipojit",
             "no_device_selected": "Nebylo vybr\u00e1no \u017e\u00e1dn\u00e9 za\u0159\u00edzen\u00ed, vyberte jedno za\u0159\u00edzen\u00ed."
         },
+        "flow_title": "Xiaomi Miio: {name}",
         "step": {
             "gateway": {
                 "data": {
                     "host": "IP adresa",
                     "name": "N\u00e1zev br\u00e1ny",
-                    "token": "API Token"
+                    "token": "API token"
                 },
-                "description": "Je vy\u017eadov\u00e1n token API, pokyny naleznete na str\u00e1nce https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token.",
+                "description": "Budete pot\u0159ebovat 32 znakov\u00fd API token, pokyny naleznete na https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token. Upozor\u0148ujeme, \u017ee tento token se li\u0161\u00ed od kl\u00ed\u010de pou\u017e\u00edvan\u00e9ho v integraci Xiaomi Aqara.",
                 "title": "P\u0159ipojen\u00ed k br\u00e1n\u011b Xiaomi"
             },
             "user": {
diff --git a/homeassistant/components/xiaomi_miio/translations/en.json b/homeassistant/components/xiaomi_miio/translations/en.json
index e4b8cb70be6..661125b4586 100644
--- a/homeassistant/components/xiaomi_miio/translations/en.json
+++ b/homeassistant/components/xiaomi_miio/translations/en.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_configured": "Device is already configured",
-            "already_in_progress": "Config flow for this Xiaomi Miio device is already in progress."
+            "already_in_progress": "Configuration flow is already in progress"
         },
         "error": {
+            "cannot_connect": "Failed to connect",
             "connect_error": "Failed to connect",
             "no_device_selected": "No device selected, please select one device."
         },
@@ -16,7 +17,7 @@
                     "name": "Name of the Gateway",
                     "token": "API Token"
                 },
-                "description": "You will need the 32 character API Token, see https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token for instructions. Please note, that this token is different from the key used by the Xiaomi Aqara integration.",
+                "description": "You will need the 32 character API Token, see https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token for instructions. Please note, that this API Token is different from the key used by the Xiaomi Aqara integration.",
                 "title": "Connect to a Xiaomi Gateway"
             },
             "user": {
diff --git a/homeassistant/components/xiaomi_miio/translations/es.json b/homeassistant/components/xiaomi_miio/translations/es.json
index 748b3da5b31..cd529a8ff77 100644
--- a/homeassistant/components/xiaomi_miio/translations/es.json
+++ b/homeassistant/components/xiaomi_miio/translations/es.json
@@ -5,6 +5,7 @@
             "already_in_progress": "El flujo de configuraci\u00f3n para este dispositivo Xiaomi Miio ya est\u00e1 en marcha."
         },
         "error": {
+            "cannot_connect": "No se pudo conectar",
             "connect_error": "No se ha podido conectar",
             "no_device_selected": "No se ha seleccionado ning\u00fan dispositivo, por favor, seleccione un dispositivo."
         },
diff --git a/homeassistant/components/xiaomi_miio/translations/et.json b/homeassistant/components/xiaomi_miio/translations/et.json
new file mode 100644
index 00000000000..57451eb7244
--- /dev/null
+++ b/homeassistant/components/xiaomi_miio/translations/et.json
@@ -0,0 +1,32 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "already_in_progress": "Seadistamine on juba k\u00e4imas"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendus nurjus",
+            "connect_error": "\u00dchendamine nurjus",
+            "no_device_selected": "Seadmeid pole valitud, vali \u00fcks seade."
+        },
+        "flow_title": "Xiaomi Miio: {name}",
+        "step": {
+            "gateway": {
+                "data": {
+                    "host": "IP aadress",
+                    "name": "L\u00fc\u00fcsi nimi",
+                    "token": "API string"
+                },
+                "description": "On vaja 32-kohalist API-tokenti, juhiste saamiseks vaata lehte https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token. Pane t\u00e4hele, et see token erineb Xiaomi Aqara sidumisel kasutatavast v\u00f5tmest.",
+                "title": "Loo \u00fchendus Xiaomi l\u00fc\u00fcsiga"
+            },
+            "user": {
+                "data": {
+                    "gateway": "Loo \u00fchendus Xiaomi l\u00fc\u00fcsiga"
+                },
+                "description": "Vali seade millega soovid \u00fchenduse luua.",
+                "title": "Xiaomi Miio"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/xiaomi_miio/translations/it.json b/homeassistant/components/xiaomi_miio/translations/it.json
index 3514d759926..fc2105fdc50 100644
--- a/homeassistant/components/xiaomi_miio/translations/it.json
+++ b/homeassistant/components/xiaomi_miio/translations/it.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
-            "already_in_progress": "Il flusso di configurazione per questo dispositivo Xiaomi Miio \u00e8 gi\u00e0 in corso."
+            "already_in_progress": "Il flusso di configurazione \u00e8 gi\u00e0 in corso"
         },
         "error": {
+            "cannot_connect": "Impossibile connettersi",
             "connect_error": "Impossibile connettersi",
             "no_device_selected": "Nessun dispositivo selezionato, selezionare un dispositivo."
         },
@@ -16,7 +17,7 @@
                     "name": "Nome del Gateway",
                     "token": "Token API"
                 },
-                "description": "\u00c8 necessario il Token API a 32 caratteri, vedere https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token per le istruzioni. Si prega di notare che questo token \u00e8 diverso dalla chiave utilizzata dall'integrazione di Xiaomi Aqara.",
+                "description": "E' necessaria la Token API di 32 caratteri, vedere https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token per le istruzioni. Notare che questa Token API \u00e8 differente dalla chiave usata dall'integrazione di Xiaomi Aqara.",
                 "title": "Connessione a un Xiaomi Gateway "
             },
             "user": {
diff --git a/homeassistant/components/xiaomi_miio/translations/lb.json b/homeassistant/components/xiaomi_miio/translations/lb.json
index 4eba640db1b..151e70ea914 100644
--- a/homeassistant/components/xiaomi_miio/translations/lb.json
+++ b/homeassistant/components/xiaomi_miio/translations/lb.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Apparat ass scho konfigur\u00e9iert",
-            "already_in_progress": "Konfiguratioun's Oflaf fir d\u00ebse Xiaomi Miio Apparat ass schonn am gaangen."
+            "already_in_progress": "Konfiguratioun's Oflaf ass schonn am gaangen."
         },
         "error": {
             "connect_error": "Feeler beim verbannen",
@@ -16,7 +16,7 @@
                     "name": "Numm vum Gateway",
                     "token": "API Jeton"
                 },
-                "description": "Du brauchs den API Jeton, kuck https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token fir Instruktiounen.",
+                "description": "Du brauchs den 32 stellegen API Jeton, kuck https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token fir Instruktiounen. Remarque, d\u00ebst ass een aaneren jeton w\u00e9i en vun der Xiaomi Aqara Integratioun benotzt g\u00ebtt.",
                 "title": "Mat enger Xiaomi Gateway verbannen"
             },
             "user": {
diff --git a/homeassistant/components/xiaomi_miio/translations/no.json b/homeassistant/components/xiaomi_miio/translations/no.json
index cf978d4a015..725b9742851 100644
--- a/homeassistant/components/xiaomi_miio/translations/no.json
+++ b/homeassistant/components/xiaomi_miio/translations/no.json
@@ -2,13 +2,14 @@
     "config": {
         "abort": {
             "already_configured": "Enheten er allerede konfigurert",
-            "already_in_progress": "Konfigurasjonsflyt for denne Xiaomi Miio-enheten p\u00e5g\u00e5r allerede."
+            "already_in_progress": "Konfigurasjonsflyten p\u00e5g\u00e5r allerede"
         },
         "error": {
-            "connect_error": "Tilkobling mislyktes.",
+            "cannot_connect": "Tilkobling mislyktes",
+            "connect_error": "Tilkobling mislyktes",
             "no_device_selected": "Ingen enhet valgt, vennligst velg en enhet."
         },
-        "flow_title": "Xiaomi Miio: {navn}",
+        "flow_title": "",
         "step": {
             "gateway": {
                 "data": {
@@ -16,7 +17,7 @@
                     "name": "Navnet p\u00e5 gatewayen",
                     "token": "API-token"
                 },
-                "description": "Du trenger API-tokenet p\u00e5 32 tegn, se https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token for instruksjoner. V\u00e6r oppmerksom p\u00e5 at dette tokenet er forskjellig fra n\u00f8kkelen som brukes av Xiaomi Aqara-integreringen.",
+                "description": "Du trenger 32 tegn API-token , se https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token for instruksjoner. V\u00e6r oppmerksom p\u00e5 at denne API-token er forskjellig fra n\u00f8kkelen som brukes av Xiaomi Aqara-integrasjonen.",
                 "title": "Koble til en Xiaomi Gateway"
             },
             "user": {
diff --git a/homeassistant/components/xiaomi_miio/translations/pl.json b/homeassistant/components/xiaomi_miio/translations/pl.json
index 0c32eaf77ca..ba26dc62bdd 100644
--- a/homeassistant/components/xiaomi_miio/translations/pl.json
+++ b/homeassistant/components/xiaomi_miio/translations/pl.json
@@ -2,11 +2,12 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "already_in_progress": "Konfiguracja tego urz\u0105dzenia Xiaomi Miio jest ju\u017c w toku."
+            "already_in_progress": "Konfiguracja jest ju\u017c w toku"
         },
         "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
             "connect_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
-            "no_device_selected": "Nie wybrano \u017cadnego urz\u0105dzenia, wybierz jedno urz\u0105dzenie."
+            "no_device_selected": "Nie wybrano \u017cadnego urz\u0105dzenia, wybierz jedno urz\u0105dzenie"
         },
         "flow_title": "Xiaomi Miio: {name}",
         "step": {
@@ -17,11 +18,11 @@
                     "token": "Token API"
                 },
                 "description": "B\u0119dziesz potrzebowa\u0107 tokenu API (32 znaki), odwied\u017a https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token, aby uzyska\u0107 instrukcje. Zauwa\u017c i\u017c jest to inny token ni\u017c w integracji Xiaomi Aqara .",
-                "title": "Po\u0142\u0105cz si\u0119 z bramk\u0105 Xiaomi"
+                "title": "Po\u0142\u0105czenie z bramk\u0105 Xiaomi"
             },
             "user": {
                 "data": {
-                    "gateway": "Po\u0142\u0105cz si\u0119 z bramk\u0105 Xiaomi"
+                    "gateway": "Po\u0142\u0105czenie z bramk\u0105 Xiaomi"
                 },
                 "description": "Wybierz urz\u0105dzenie, z kt\u00f3rym chcesz si\u0119 po\u0142\u0105czy\u0107.",
                 "title": "Xiaomi Miio"
diff --git a/homeassistant/components/xiaomi_miio/translations/ru.json b/homeassistant/components/xiaomi_miio/translations/ru.json
index 1c934e2784c..598c5a585aa 100644
--- a/homeassistant/components/xiaomi_miio/translations/ru.json
+++ b/homeassistant/components/xiaomi_miio/translations/ru.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
-            "already_in_progress": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u044d\u0442\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f."
+            "already_in_progress": "\u041f\u0440\u043e\u0446\u0435\u0441\u0441 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f."
         },
         "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "connect_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
             "no_device_selected": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0434\u043d\u043e \u0438\u0437 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432."
         },
@@ -16,7 +17,7 @@
                     "name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
                     "token": "\u0422\u043e\u043a\u0435\u043d API"
                 },
-                "description": "\u0414\u043b\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f 32-\u0445 \u0437\u043d\u0430\u0447\u043d\u044b\u0439 \u0442\u043e\u043a\u0435\u043d API. \u041e \u0442\u043e\u043c, \u043a\u0430\u043a \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0442\u043e\u043a\u0435\u043d, \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0443\u0437\u043d\u0430\u0442\u044c \u0437\u0434\u0435\u0441\u044c: \nhttps://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token.\n\u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435 \u0432\u043d\u0438\u043c\u0430\u043d\u0438\u0435, \u0447\u0442\u043e \u044d\u0442\u043e\u0442 \u0442\u043e\u043a\u0435\u043d \u043e\u0442\u043b\u0438\u0447\u0430\u0435\u0442\u0441\u044f \u043e\u0442 \u043a\u043b\u044e\u0447\u0430, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u043e\u0433\u043e \u043f\u0440\u0438 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438 Xiaomi Aqara.",
+                "description": "\u0414\u043b\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f 32-\u0445 \u0437\u043d\u0430\u0447\u043d\u044b\u0439 \u0422\u043e\u043a\u0435\u043d API. \u041e \u0442\u043e\u043c, \u043a\u0430\u043a \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0442\u043e\u043a\u0435\u043d, \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0443\u0437\u043d\u0430\u0442\u044c \u0437\u0434\u0435\u0441\u044c: \nhttps://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token.\n\u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435 \u0432\u043d\u0438\u043c\u0430\u043d\u0438\u0435, \u0447\u0442\u043e \u044d\u0442\u043e\u0442 \u0442\u043e\u043a\u0435\u043d \u043e\u0442\u043b\u0438\u0447\u0430\u0435\u0442\u0441\u044f \u043e\u0442 \u043a\u043b\u044e\u0447\u0430, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u043e\u0433\u043e \u043f\u0440\u0438 \u0438\u043d\u0442\u0435\u0433\u0440\u0430\u0446\u0438\u0438 Xiaomi Aqara.",
                 "title": "\u041f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a \u0448\u043b\u044e\u0437\u0443 Xiaomi"
             },
             "user": {
diff --git a/homeassistant/components/xiaomi_miio/translations/zh-Hans.json b/homeassistant/components/xiaomi_miio/translations/zh-Hans.json
index 086f449e0ca..9a54104116a 100644
--- a/homeassistant/components/xiaomi_miio/translations/zh-Hans.json
+++ b/homeassistant/components/xiaomi_miio/translations/zh-Hans.json
@@ -8,7 +8,7 @@
             "connect_error": "\u8fde\u63a5\u5931\u8d25\uff0c\u8bf7\u91cd\u8bd5",
             "no_device_selected": "\u672a\u9009\u62e9\u8bbe\u5907\uff0c\u8bf7\u9009\u62e9\u4e00\u4e2a\u8bbe\u5907\u3002"
         },
-        "flow_title": "\u5c0f\u7c73 Miio: {name}",
+        "flow_title": "Xiaomi Miio: {name}",
         "step": {
             "gateway": {
                 "data": {
@@ -24,7 +24,7 @@
                     "gateway": "\u8fde\u63a5\u5230\u5c0f\u7c73\u7f51\u5173"
                 },
                 "description": "\u8bf7\u9009\u62e9\u8981\u8fde\u63a5\u7684\u8bbe\u5907\u3002",
-                "title": "\u5c0f\u7c73 Miio"
+                "title": "Xiaomi Miio"
             }
         }
     }
diff --git a/homeassistant/components/xiaomi_miio/translations/zh-Hant.json b/homeassistant/components/xiaomi_miio/translations/zh-Hant.json
index 7b459c30803..f622d1184f1 100644
--- a/homeassistant/components/xiaomi_miio/translations/zh-Hant.json
+++ b/homeassistant/components/xiaomi_miio/translations/zh-Hant.json
@@ -2,9 +2,10 @@
     "config": {
         "abort": {
             "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "already_in_progress": "\u5c0f\u7c73 Miio \u8a2d\u5099\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d\u3002"
+            "already_in_progress": "\u8a2d\u5b9a\u5df2\u7d93\u9032\u884c\u4e2d"
         },
         "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
             "connect_error": "\u9023\u7dda\u5931\u6557",
             "no_device_selected": "\u672a\u9078\u64c7\u8a2d\u5099\uff0c\u8acb\u9078\u64c7\u4e00\u9805\u8a2d\u5099\u3002"
         },
@@ -16,7 +17,7 @@
                     "name": "\u7db2\u95dc\u540d\u7a31",
                     "token": "API \u5bc6\u9470"
                 },
-                "description": "\u5c07\u9700\u8981\u8f38\u5165 32 \u4f4d\u5b57\u5143 API \u5bc6\u9470\uff0c\u8acb\u53c3\u95b1 https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token \u4ee5\u7372\u5f97\u7372\u53d6\u5bc6\u9470\u7684\u6559\u5b78\u3002\u8acb\u6ce8\u610f\uff1a\u6b64\u5bc6\u9470\u8207 Xiaomi Aqara \u6574\u5408\u6240\u4f7f\u7528\u4e4b\u5bc6\u9470\u4e0d\u540c\u3002",
+                "description": "\u5c07\u9700\u8981\u8f38\u5165 32 \u4f4d\u5b57\u5143 API \u5bc6\u9470\uff0c\u8acb\u53c3\u95b1 https://www.home-assistant.io/integrations/vacuum.xiaomi_miio/#retrieving-the-access-token \u4ee5\u7372\u5f97\u7372\u53d6\u5bc6\u9470\u7684\u6559\u5b78\u3002\u8acb\u6ce8\u610f\uff1a\u6b64API \u5bc6\u9470\u8207 Xiaomi Aqara \u6574\u5408\u6240\u4f7f\u7528\u4e4b\u5bc6\u9470\u4e0d\u540c\u3002",
                 "title": "\u9023\u7dda\u81f3\u5c0f\u7c73\u7db2\u95dc"
             },
             "user": {
diff --git a/homeassistant/components/xiaomi_miio/vacuum.py b/homeassistant/components/xiaomi_miio/vacuum.py
index 3e414016fc5..2a9ae1187b2 100644
--- a/homeassistant/components/xiaomi_miio/vacuum.py
+++ b/homeassistant/components/xiaomi_miio/vacuum.py
@@ -484,13 +484,20 @@ class MiroboVacuum(StateVacuumEntity):
             self.last_clean = self._vacuum.last_clean_details()
             self.dnd_state = self._vacuum.dnd_status()
 
-            self._timers = self._vacuum.timer()
-
             self._available = True
-        except OSError as exc:
-            _LOGGER.error("Got OSError while fetching the state: %s", exc)
+        except (OSError, DeviceException) as exc:
+            if self._available:
+                self._available = False
+                _LOGGER.warning("Got exception while fetching the state: %s", exc)
+
+        # Fetch timers separately, see #38285
+        try:
+            self._timers = self._vacuum.timer()
         except DeviceException as exc:
-            _LOGGER.warning("Got exception while fetching the state: %s", exc)
+            _LOGGER.debug(
+                "Unable to fetch timers, this may happen on some devices: %s", exc
+            )
+            self._timers = []
 
     async def async_clean_zone(self, zone, repeats=1):
         """Clean selected area for the number of repeats indicated."""
diff --git a/homeassistant/components/xs1/climate.py b/homeassistant/components/xs1/climate.py
index 60b6ca3c7c9..238fe2b8342 100644
--- a/homeassistant/components/xs1/climate.py
+++ b/homeassistant/components/xs1/climate.py
@@ -1,6 +1,4 @@
 """Support for XS1 climate devices."""
-import logging
-
 from xs1_api_client.api_constants import ActuatorType
 
 from homeassistant.components.climate import ClimateEntity
@@ -12,8 +10,6 @@ from homeassistant.const import ATTR_TEMPERATURE
 
 from . import ACTUATORS, DOMAIN as COMPONENT_DOMAIN, SENSORS, XS1DeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 MIN_TEMP = 8
 MAX_TEMP = 25
 
diff --git a/homeassistant/components/xs1/sensor.py b/homeassistant/components/xs1/sensor.py
index 5c963ecafa3..9e6afa40fa4 100644
--- a/homeassistant/components/xs1/sensor.py
+++ b/homeassistant/components/xs1/sensor.py
@@ -1,14 +1,10 @@
 """Support for XS1 sensors."""
-import logging
-
 from xs1_api_client.api_constants import ActuatorType
 
 from homeassistant.helpers.entity import Entity
 
 from . import ACTUATORS, DOMAIN as COMPONENT_DOMAIN, SENSORS, XS1DeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the XS1 sensor platform."""
diff --git a/homeassistant/components/xs1/switch.py b/homeassistant/components/xs1/switch.py
index cbb05b9aa62..a69c8e965eb 100644
--- a/homeassistant/components/xs1/switch.py
+++ b/homeassistant/components/xs1/switch.py
@@ -1,5 +1,4 @@
 """Support for XS1 switches."""
-import logging
 
 from xs1_api_client.api_constants import ActuatorType
 
@@ -7,8 +6,6 @@ from homeassistant.helpers.entity import ToggleEntity
 
 from . import ACTUATORS, DOMAIN as COMPONENT_DOMAIN, XS1DeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the XS1 switch platform."""
diff --git a/homeassistant/components/yamaha_musiccast/media_player.py b/homeassistant/components/yamaha_musiccast/media_player.py
index bfec5b932a8..b21f6d3a3f4 100644
--- a/homeassistant/components/yamaha_musiccast/media_player.py
+++ b/homeassistant/components/yamaha_musiccast/media_player.py
@@ -137,11 +137,6 @@ class YamahaDevice(MediaPlayerEntity):
             return self.status
         return self.power
 
-    @property
-    def should_poll(self):
-        """Push an update after each command."""
-        return True
-
     @property
     def is_volume_muted(self):
         """Boolean if volume is currently muted."""
diff --git a/homeassistant/components/yeelight/translations/cs.json b/homeassistant/components/yeelight/translations/cs.json
new file mode 100644
index 00000000000..b1eb849f582
--- /dev/null
+++ b/homeassistant/components/yeelight/translations/cs.json
@@ -0,0 +1,37 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "step": {
+            "pick_device": {
+                "data": {
+                    "device": "Za\u0159\u00edzen\u00ed"
+                }
+            },
+            "user": {
+                "data": {
+                    "host": "Hostitel",
+                    "ip_address": "IP adresa"
+                },
+                "description": "Pokud z\u016fstane hostitel pr\u00e1zdn\u00fd, k vyhled\u00e1n\u00ed za\u0159\u00edzen\u00ed se pou\u017eije zji\u0161\u0165ov\u00e1n\u00ed."
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "model": "Model (voliteln\u00fd)",
+                    "save_on_change": "Ulo\u017eit stav p\u0159i zm\u011bn\u011b",
+                    "transition": "\u010cas p\u0159echodu (v ms)"
+                }
+            }
+        }
+    },
+    "title": "Yeelight"
+}
\ No newline at end of file
diff --git a/homeassistant/components/yeelight/translations/de.json b/homeassistant/components/yeelight/translations/de.json
index 6930fca0a5b..b282a4d8b84 100644
--- a/homeassistant/components/yeelight/translations/de.json
+++ b/homeassistant/components/yeelight/translations/de.json
@@ -18,6 +18,8 @@
         "step": {
             "init": {
                 "data": {
+                    "save_on_change": "Status bei \u00c4nderung speichern",
+                    "transition": "\u00dcbergangszeit (ms)",
                     "use_music_mode": "Musik-Modus aktivieren"
                 }
             }
diff --git a/homeassistant/components/yeelight/translations/el.json b/homeassistant/components/yeelight/translations/el.json
new file mode 100644
index 00000000000..6495e7a489f
--- /dev/null
+++ b/homeassistant/components/yeelight/translations/el.json
@@ -0,0 +1,35 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2"
+        },
+        "step": {
+            "pick_device": {
+                "data": {
+                    "device": "\u03a3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ae"
+                }
+            },
+            "user": {
+                "data": {
+                    "ip_address": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 IP"
+                },
+                "description": "\u0395\u03ac\u03bd \u03b1\u03c6\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03ba\u03b5\u03bd\u03c4\u03c1\u03b9\u03ba\u03cc \u03c5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03c4\u03ae \u03ba\u03b5\u03bd\u03cc, \u03bf \u03b5\u03bd\u03c4\u03bf\u03c0\u03b9\u03c3\u03bc\u03cc\u03c2 \u03b8\u03b1 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ce\u03bd."
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "model": "\u039c\u03bf\u03bd\u03c4\u03ad\u03bb\u03bf (\u03a0\u03c1\u03bf\u03b1\u03b9\u03c1\u03b5\u03c4\u03b9\u03ba\u03cc)",
+                    "nightlight_switch": "\u03a7\u03c1\u03ae\u03c3\u03b7 \u03b4\u03b9\u03b1\u03ba\u03cc\u03c0\u03c4\u03b7 \u03bd\u03c5\u03c7\u03c4\u03b5\u03c1\u03b9\u03bd\u03bf\u03cd \u03c6\u03c9\u03c4\u03b9\u03c3\u03bc\u03bf\u03cd",
+                    "save_on_change": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7\u03c2 \u03ba\u03b1\u03c4\u03ac \u03c4\u03b7\u03bd \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae",
+                    "transition": "\u03a7\u03c1\u03cc\u03bd\u03bf\u03c2 \u03bc\u03b5\u03c4\u03ac\u03b2\u03b1\u03c3\u03b7\u03c2 (ms)",
+                    "use_music_mode": "\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1\u03c2 \u03bc\u03bf\u03c5\u03c3\u03b9\u03ba\u03ae\u03c2"
+                },
+                "description": "\u0395\u03ac\u03bd \u03b1\u03c6\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03bc\u03bf\u03bd\u03c4\u03ad\u03bb\u03bf \u03ba\u03b5\u03bd\u03cc, \u03b8\u03b1 \u03b5\u03bd\u03c4\u03bf\u03c0\u03b9\u03c3\u03c4\u03b5\u03af \u03b1\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b1."
+            }
+        }
+    },
+    "title": "Yeelight"
+}
\ No newline at end of file
diff --git a/homeassistant/components/yeelight/translations/et.json b/homeassistant/components/yeelight/translations/et.json
new file mode 100644
index 00000000000..97ff2d793d4
--- /dev/null
+++ b/homeassistant/components/yeelight/translations/et.json
@@ -0,0 +1,40 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
+        "step": {
+            "pick_device": {
+                "data": {
+                    "device": "Seade"
+                }
+            },
+            "user": {
+                "data": {
+                    "host": "",
+                    "ip_address": "IP aadress"
+                },
+                "description": "Kui j\u00e4tad hosti t\u00fchjaks kasutatakse seadmete leidmiseks avastamist."
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "model": "Mudel (valikuline)",
+                    "nightlight_switch": "Kasuta Nightlight Switchi",
+                    "save_on_change": "Salvesta olek peale muutmist",
+                    "transition": "\u00dclemineku aeg (ms)",
+                    "use_music_mode": "Luba muusikare\u017eiim"
+                },
+                "description": "Kui j\u00e4tad mudeli m\u00e4\u00e4ramata tuvastatakse see automaatselt."
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/yeelight/translations/lb.json b/homeassistant/components/yeelight/translations/lb.json
index 255df06effe..6237ef6c5ef 100644
--- a/homeassistant/components/yeelight/translations/lb.json
+++ b/homeassistant/components/yeelight/translations/lb.json
@@ -1,10 +1,16 @@
 {
     "config": {
+        "error": {
+            "cannot_connect": "Feeler beim verbannen"
+        },
         "step": {
             "pick_device": {
                 "data": {
                     "device": "Apparat"
                 }
+            },
+            "user": {
+                "description": "Falls Host eidel gelass g\u00ebtt, g\u00ebtt eng automatesch Sich gestart"
             }
         }
     },
@@ -13,8 +19,11 @@
             "init": {
                 "data": {
                     "model": "Modell (Optionell)",
+                    "nightlight_switch": "Nuechtliicht Schalter benotzen",
+                    "save_on_change": "Status sp\u00e4icheren bei \u00c4nnerung",
                     "use_music_mode": "Musek Modus aktiv\u00e9ieren"
-                }
+                },
+                "description": "Falls Modell eidel gelass g\u00ebtt, g\u00ebtt et automatesch erkannt."
             }
         }
     },
diff --git a/homeassistant/components/yeelight/translations/no.json b/homeassistant/components/yeelight/translations/no.json
index 365bdb7ba0f..c6b428c618f 100644
--- a/homeassistant/components/yeelight/translations/no.json
+++ b/homeassistant/components/yeelight/translations/no.json
@@ -5,7 +5,7 @@
             "no_devices_found": "Ingen enheter funnet p\u00e5 nettverket"
         },
         "error": {
-            "cannot_connect": "Tilkobling mislyktes."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "pick_device": {
@@ -18,7 +18,7 @@
                     "host": "Vert",
                     "ip_address": "IP adresse"
                 },
-                "description": "Hvis du lar verten st\u00e5 tom, brukes oppdagelsen til \u00e5 finne enheter."
+                "description": "Hvis du lar verten st\u00e5 tom, brukes automatisk oppdagelse til \u00e5 finne enheter"
             }
         }
     },
@@ -36,5 +36,5 @@
             }
         }
     },
-    "title": "Yeelight"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/yeelight/translations/pl.json b/homeassistant/components/yeelight/translations/pl.json
index 325e3cbc7ae..9a477ba52d8 100644
--- a/homeassistant/components/yeelight/translations/pl.json
+++ b/homeassistant/components/yeelight/translations/pl.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
-            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci."
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci"
         },
         "error": {
             "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
diff --git a/homeassistant/components/zabbix/__init__.py b/homeassistant/components/zabbix/__init__.py
index a1b4327470f..b9d02731570 100644
--- a/homeassistant/components/zabbix/__init__.py
+++ b/homeassistant/components/zabbix/__init__.py
@@ -1,8 +1,14 @@
 """Support for Zabbix."""
+import json
 import logging
+import math
+import queue
+import threading
+import time
+from urllib.error import HTTPError
 from urllib.parse import urljoin
 
-from pyzabbix import ZabbixAPI, ZabbixAPIException
+from pyzabbix import ZabbixAPI, ZabbixAPIException, ZabbixMetric, ZabbixSender
 import voluptuous as vol
 
 from homeassistant.const import (
@@ -11,24 +17,46 @@ from homeassistant.const import (
     CONF_PATH,
     CONF_SSL,
     CONF_USERNAME,
+    EVENT_HOMEASSISTANT_STOP,
+    EVENT_STATE_CHANGED,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
 )
+from homeassistant.core import callback
+from homeassistant.helpers import event as event_helper, state as state_helper
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entityfilter import (
+    INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA,
+    convert_include_exclude_filter,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
+CONF_PUBLISH_STATES_HOST = "publish_states_host"
+
 DEFAULT_SSL = False
 DEFAULT_PATH = "zabbix"
 DOMAIN = "zabbix"
 
+TIMEOUT = 5
+RETRY_DELAY = 20
+QUEUE_BACKLOG_SECONDS = 30
+RETRY_INTERVAL = 60  # seconds
+RETRY_MESSAGE = f"%s Retrying in {RETRY_INTERVAL} seconds."
+
+BATCH_TIMEOUT = 1
+BATCH_BUFFER_SIZE = 100
+
 CONFIG_SCHEMA = vol.Schema(
     {
-        DOMAIN: vol.Schema(
+        DOMAIN: INCLUDE_EXCLUDE_BASE_FILTER_SCHEMA.extend(
             {
                 vol.Required(CONF_HOST): cv.string,
                 vol.Optional(CONF_PASSWORD): cv.string,
                 vol.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string,
                 vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
                 vol.Optional(CONF_USERNAME): cv.string,
+                vol.Optional(CONF_PUBLISH_STATES_HOST): cv.string,
             }
         )
     },
@@ -46,13 +74,189 @@ def setup(hass, config):
     username = conf.get(CONF_USERNAME)
     password = conf.get(CONF_PASSWORD)
 
-    zapi = ZabbixAPI(url)
+    publish_states_host = conf.get(CONF_PUBLISH_STATES_HOST)
+
+    entities_filter = convert_include_exclude_filter(conf)
+
     try:
-        zapi.login(username, password)
+        zapi = ZabbixAPI(url=url, user=username, password=password)
         _LOGGER.info("Connected to Zabbix API Version %s", zapi.api_version())
     except ZabbixAPIException as login_exception:
         _LOGGER.error("Unable to login to the Zabbix API: %s", login_exception)
         return False
+    except HTTPError as http_error:
+        _LOGGER.error("HTTPError when connecting to Zabbix API: %s", http_error)
+        zapi = None
+        _LOGGER.error(RETRY_MESSAGE, http_error)
+        event_helper.call_later(hass, RETRY_INTERVAL, lambda _: setup(hass, config))
+        return True
 
     hass.data[DOMAIN] = zapi
+
+    def event_to_metrics(event, float_keys, string_keys):
+        """Add an event to the outgoing Zabbix list."""
+        state = event.data.get("new_state")
+        if state is None or state.state in (STATE_UNKNOWN, "", STATE_UNAVAILABLE):
+            return
+
+        entity_id = state.entity_id
+        if not entities_filter(entity_id):
+            return
+
+        floats = {}
+        strings = {}
+        try:
+            _state_as_value = float(state.state)
+            floats[entity_id] = _state_as_value
+        except ValueError:
+            try:
+                _state_as_value = float(state_helper.state_as_number(state))
+                floats[entity_id] = _state_as_value
+            except ValueError:
+                strings[entity_id] = state.state
+
+        for key, value in state.attributes.items():
+            # For each value we try to cast it as float
+            # But if we can not do it we store the value
+            # as string
+            attribute_id = f"{entity_id}/{key}"
+            try:
+                float_value = float(value)
+            except (ValueError, TypeError):
+                float_value = None
+            if float_value is None or not math.isfinite(float_value):
+                strings[attribute_id] = str(value)
+            else:
+                floats[attribute_id] = float_value
+
+        metrics = []
+        float_keys_count = len(float_keys)
+        float_keys.update(floats)
+        if len(float_keys) != float_keys_count:
+            floats_discovery = []
+            for float_key in float_keys:
+                floats_discovery.append({"{#KEY}": float_key})
+            metric = ZabbixMetric(
+                publish_states_host,
+                "homeassistant.floats_discovery",
+                json.dumps(floats_discovery),
+            )
+            metrics.append(metric)
+        for key, value in floats.items():
+            metric = ZabbixMetric(
+                publish_states_host, f"homeassistant.float[{key}]", value
+            )
+            metrics.append(metric)
+
+        string_keys.update(strings)
+        return metrics
+
+    if publish_states_host:
+        zabbix_sender = ZabbixSender(zabbix_server=conf[CONF_HOST])
+        instance = ZabbixThread(hass, zabbix_sender, event_to_metrics)
+        instance.setup(hass)
+
     return True
+
+
+class ZabbixThread(threading.Thread):
+    """A threaded event handler class."""
+
+    MAX_TRIES = 3
+
+    def __init__(self, hass, zabbix_sender, event_to_metrics):
+        """Initialize the listener."""
+        threading.Thread.__init__(self, name="Zabbix")
+        self.queue = queue.Queue()
+        self.zabbix_sender = zabbix_sender
+        self.event_to_metrics = event_to_metrics
+        self.write_errors = 0
+        self.shutdown = False
+        self.float_keys = set()
+        self.string_keys = set()
+
+    def setup(self, hass):
+        """Set up the thread and start it."""
+        hass.bus.listen(EVENT_STATE_CHANGED, self._event_listener)
+        hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, self._shutdown)
+        self.start()
+        _LOGGER.debug("Started publishing state changes to Zabbix")
+
+    def _shutdown(self, event):
+        """Shut down the thread."""
+        self.queue.put(None)
+        self.join()
+
+    @callback
+    def _event_listener(self, event):
+        """Listen for new messages on the bus and queue them for Zabbix."""
+        item = (time.monotonic(), event)
+        self.queue.put(item)
+
+    def get_metrics(self):
+        """Return a batch of events formatted for writing."""
+        queue_seconds = QUEUE_BACKLOG_SECONDS + self.MAX_TRIES * RETRY_DELAY
+
+        count = 0
+        metrics = []
+
+        dropped = 0
+
+        try:
+            while len(metrics) < BATCH_BUFFER_SIZE and not self.shutdown:
+                timeout = None if count == 0 else BATCH_TIMEOUT
+                item = self.queue.get(timeout=timeout)
+                count += 1
+
+                if item is None:
+                    self.shutdown = True
+                else:
+                    timestamp, event = item
+                    age = time.monotonic() - timestamp
+
+                    if age < queue_seconds:
+                        event_metrics = self.event_to_metrics(
+                            event, self.float_keys, self.string_keys
+                        )
+                        if event_metrics:
+                            metrics += event_metrics
+                    else:
+                        dropped += 1
+
+        except queue.Empty:
+            pass
+
+        if dropped:
+            _LOGGER.warning("Catching up, dropped %d old events", dropped)
+
+        return count, metrics
+
+    def write_to_zabbix(self, metrics):
+        """Write preprocessed events to zabbix, with retry."""
+
+        for retry in range(self.MAX_TRIES + 1):
+            try:
+                self.zabbix_sender.send(metrics)
+
+                if self.write_errors:
+                    _LOGGER.error("Resumed, lost %d events", self.write_errors)
+                    self.write_errors = 0
+
+                _LOGGER.debug("Wrote %d metrics", len(metrics))
+                break
+            except OSError as err:
+                if retry < self.MAX_TRIES:
+                    time.sleep(RETRY_DELAY)
+                else:
+                    if not self.write_errors:
+                        _LOGGER.error("Write error: %s", err)
+                    self.write_errors += len(metrics)
+
+    def run(self):
+        """Process incoming events."""
+        while not self.shutdown:
+            count, metrics = self.get_metrics()
+            if metrics:
+                self.write_to_zabbix(metrics)
+            for _ in range(count):
+                self.queue.task_done()
diff --git a/homeassistant/components/zabbix/manifest.json b/homeassistant/components/zabbix/manifest.json
index 08dfb98d5fa..5ed2e7c163d 100644
--- a/homeassistant/components/zabbix/manifest.json
+++ b/homeassistant/components/zabbix/manifest.json
@@ -2,6 +2,6 @@
   "domain": "zabbix",
   "name": "Zabbix",
   "documentation": "https://www.home-assistant.io/integrations/zabbix",
-  "requirements": ["pyzabbix==0.7.4"],
+  "requirements": ["py-zabbix==1.1.7"],
   "codeowners": []
 }
diff --git a/homeassistant/components/zengge/light.py b/homeassistant/components/zengge/light.py
index fa2c7d50add..30776eabbb3 100644
--- a/homeassistant/components/zengge/light.py
+++ b/homeassistant/components/zengge/light.py
@@ -97,11 +97,6 @@ class ZenggeLight(LightEntity):
         """Flag supported features."""
         return SUPPORT_ZENGGE_LED
 
-    @property
-    def should_poll(self):
-        """Feel free to poll."""
-        return True
-
     @property
     def assumed_state(self):
         """We can report the actual state."""
diff --git a/homeassistant/components/zeroconf/manifest.json b/homeassistant/components/zeroconf/manifest.json
index 7ac2cf9c5f1..1848c890573 100644
--- a/homeassistant/components/zeroconf/manifest.json
+++ b/homeassistant/components/zeroconf/manifest.json
@@ -2,8 +2,8 @@
   "domain": "zeroconf",
   "name": "Zero-configuration networking (zeroconf)",
   "documentation": "https://www.home-assistant.io/integrations/zeroconf",
-  "requirements": ["zeroconf==0.28.5"],
+  "requirements": ["zeroconf==0.28.6"],
   "dependencies": ["api"],
-  "codeowners": ["@Kane610"],
+  "codeowners": ["@bdraco"],
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/zerproc/translations/cs.json b/homeassistant/components/zerproc/translations/cs.json
index 64fd9e8590c..62305d54d01 100644
--- a/homeassistant/components/zerproc/translations/cs.json
+++ b/homeassistant/components/zerproc/translations/cs.json
@@ -1,13 +1,14 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed.",
-            "single_instance_allowed": "Ji\u017e nakonfigurov\u00e1no. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+            "no_devices_found": "V s\u00edti nebyla nalezena \u017e\u00e1dn\u00e1 za\u0159\u00edzen\u00ed",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "step": {
             "confirm": {
-                "description": "Chcete spustit nastaven\u00ed?"
+                "description": "Chcete za\u010d\u00edt nastavovat?"
             }
         }
-    }
+    },
+    "title": "Zerproc"
 }
\ No newline at end of file
diff --git a/homeassistant/components/zerproc/translations/es.json b/homeassistant/components/zerproc/translations/es.json
index a0bb855fc5d..56a0be99057 100644
--- a/homeassistant/components/zerproc/translations/es.json
+++ b/homeassistant/components/zerproc/translations/es.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "No se encontraron dispositivos en la red",
-            "single_instance_allowed": "Ya est\u00e1 configurado. S\u00f3lo es posible una \u00fanica configuraci\u00f3n."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/zerproc/translations/et.json b/homeassistant/components/zerproc/translations/et.json
new file mode 100644
index 00000000000..bbe8d0cd2f3
--- /dev/null
+++ b/homeassistant/components/zerproc/translations/et.json
@@ -0,0 +1,14 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "V\u00f5rgust ei leitud seadmeid",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "step": {
+            "confirm": {
+                "description": "Kas alustan seadistamist?"
+            }
+        }
+    },
+    "title": ""
+}
\ No newline at end of file
diff --git a/homeassistant/components/zerproc/translations/no.json b/homeassistant/components/zerproc/translations/no.json
index 5324c4b87b1..602a81af2f5 100644
--- a/homeassistant/components/zerproc/translations/no.json
+++ b/homeassistant/components/zerproc/translations/no.json
@@ -10,5 +10,5 @@
             }
         }
     },
-    "title": "Zerproc"
+    "title": ""
 }
\ No newline at end of file
diff --git a/homeassistant/components/zerproc/translations/pl.json b/homeassistant/components/zerproc/translations/pl.json
index 429b6f37e65..c5c191f22d6 100644
--- a/homeassistant/components/zerproc/translations/pl.json
+++ b/homeassistant/components/zerproc/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci.",
+            "no_devices_found": "Nie znaleziono urz\u0105dze\u0144 w sieci",
             "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "step": {
diff --git a/homeassistant/components/zha/api.py b/homeassistant/components/zha/api.py
index a5b409c7116..82c57abd82b 100644
--- a/homeassistant/components/zha/api.py
+++ b/homeassistant/components/zha/api.py
@@ -119,8 +119,8 @@ SERVICE_SCHEMAS = {
             vol.Required(ATTR_ENDPOINT_ID): cv.positive_int,
             vol.Required(ATTR_CLUSTER_ID): cv.positive_int,
             vol.Optional(ATTR_CLUSTER_TYPE, default=CLUSTER_TYPE_IN): cv.string,
-            vol.Required(ATTR_ATTRIBUTE): vol.Any(int, cv.boolean, cv.string),
-            vol.Required(ATTR_VALUE): cv.string,
+            vol.Required(ATTR_ATTRIBUTE): vol.Any(cv.positive_int, str),
+            vol.Required(ATTR_VALUE): vol.Any(int, cv.boolean, cv.string),
             vol.Optional(ATTR_MANUFACTURER): cv.positive_int,
         }
     ),
diff --git a/homeassistant/components/zha/binary_sensor.py b/homeassistant/components/zha/binary_sensor.py
index 2548060c0fd..ba95a0e4bc6 100644
--- a/homeassistant/components/zha/binary_sensor.py
+++ b/homeassistant/components/zha/binary_sensor.py
@@ -143,6 +143,25 @@ class Opening(BinarySensor):
     DEVICE_CLASS = DEVICE_CLASS_OPENING
 
 
+@STRICT_MATCH(
+    channel_names=CHANNEL_ON_OFF,
+    manufacturers="IKEA of Sweden",
+    models=lambda model: isinstance(model, str)
+    and model is not None
+    and model.find("motion") != -1,
+)
+@STRICT_MATCH(
+    channel_names=CHANNEL_ON_OFF,
+    manufacturers="Philips",
+    models={"SML001", "SML002"},
+)
+class Motion(BinarySensor):
+    """ZHA BinarySensor."""
+
+    SENSOR_ATTR = "on_off"
+    DEVICE_CLASS = DEVICE_CLASS_MOTION
+
+
 @STRICT_MATCH(channel_names=CHANNEL_ZONE)
 class IASZone(BinarySensor):
     """ZHA IAS BinarySensor."""
diff --git a/homeassistant/components/zha/climate.py b/homeassistant/components/zha/climate.py
index 7ffb727bacc..728d0f48217 100644
--- a/homeassistant/components/zha/climate.py
+++ b/homeassistant/components/zha/climate.py
@@ -7,7 +7,6 @@ at https://home-assistant.io/components/zha.climate/
 from datetime import datetime, timedelta
 import enum
 import functools
-import logging
 from random import randint
 from typing import List, Optional, Tuple
 
@@ -145,8 +144,6 @@ SYSTEM_MODE_2_HVAC = {
 
 ZCL_TEMP = 100
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Zigbee Home Automation sensor from config entry."""
diff --git a/homeassistant/components/zha/core/channels/__init__.py b/homeassistant/components/zha/core/channels/__init__.py
index f0ef6f382c4..dca80e9fcb3 100644
--- a/homeassistant/components/zha/core/channels/__init__.py
+++ b/homeassistant/components/zha/core/channels/__init__.py
@@ -1,6 +1,5 @@
 """Channels module for Zigbee Home Automation."""
 import asyncio
-import logging
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import zigpy.zcl.clusters.closures
@@ -30,7 +29,6 @@ from .. import (
     typing as zha_typing,
 )
 
-_LOGGER = logging.getLogger(__name__)
 ChannelsDict = Dict[str, zha_typing.ChannelType]
 
 
diff --git a/homeassistant/components/zha/core/channels/base.py b/homeassistant/components/zha/core/channels/base.py
index 0570070785f..9f2fe4f21bd 100644
--- a/homeassistant/components/zha/core/channels/base.py
+++ b/homeassistant/components/zha/core/channels/base.py
@@ -200,6 +200,10 @@ class ZigbeeChannel(LogMixin):
 
     async def async_initialize(self, from_cache):
         """Initialize channel."""
+        if not from_cache and self._ch_pool.skip_configuration:
+            self._status = ChannelStatus.INITIALIZED
+            return
+
         self.debug("initializing channel: from_cache: %s", from_cache)
         attributes = []
         for report_config in self._report_config:
diff --git a/homeassistant/components/zha/core/channels/closures.py b/homeassistant/components/zha/core/channels/closures.py
index 5641deffb60..0760427d46b 100644
--- a/homeassistant/components/zha/core/channels/closures.py
+++ b/homeassistant/components/zha/core/channels/closures.py
@@ -1,6 +1,4 @@
 """Closures channels module for Zigbee Home Automation."""
-import logging
-
 import zigpy.zcl.clusters.closures as closures
 
 from homeassistant.core import callback
@@ -9,8 +7,6 @@ from .. import registries
 from ..const import REPORT_CONFIG_IMMEDIATE, SIGNAL_ATTR_UPDATED
 from .base import ClientChannel, ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(closures.DoorLock.cluster_id)
 class DoorLockChannel(ZigbeeChannel):
diff --git a/homeassistant/components/zha/core/channels/general.py b/homeassistant/components/zha/core/channels/general.py
index 05406b6939e..2cb744ec063 100644
--- a/homeassistant/components/zha/core/channels/general.py
+++ b/homeassistant/components/zha/core/channels/general.py
@@ -1,6 +1,5 @@
 """General channels module for Zigbee Home Automation."""
 import asyncio
-import logging
 from typing import Any, List, Optional
 
 import zigpy.exceptions
@@ -23,8 +22,6 @@ from ..const import (
 )
 from .base import ClientChannel, ZigbeeChannel, parse_and_log_command
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(general.Alarms.cluster_id)
 class Alarms(ZigbeeChannel):
@@ -89,11 +86,12 @@ class BasicChannel(ZigbeeChannel):
 
     async def async_initialize(self, from_cache):
         """Initialize channel."""
-        power_source = await self.get_attribute_value(
-            "power_source", from_cache=from_cache
-        )
-        if power_source is not None:
-            self._power_source = power_source
+        if not self._ch_pool.skip_configuration or from_cache:
+            power_source = await self.get_attribute_value(
+                "power_source", from_cache=from_cache
+            )
+            if power_source is not None:
+                self._power_source = power_source
         await super().async_initialize(from_cache)
 
     def get_power_source(self):
@@ -294,10 +292,10 @@ class OnOffChannel(ZigbeeChannel):
 
     async def async_initialize(self, from_cache):
         """Initialize channel."""
-        state = await self.get_attribute_value(self.ON_OFF, from_cache=from_cache)
+        await super().async_initialize(from_cache)
+        state = await self.get_attribute_value(self.ON_OFF, from_cache=True)
         if state is not None:
             self._state = bool(state)
-        await super().async_initialize(from_cache)
 
     async def async_update(self):
         """Initialize channel."""
diff --git a/homeassistant/components/zha/core/channels/homeautomation.py b/homeassistant/components/zha/core/channels/homeautomation.py
index e18f4ae9c17..03812be0548 100644
--- a/homeassistant/components/zha/core/channels/homeautomation.py
+++ b/homeassistant/components/zha/core/channels/homeautomation.py
@@ -1,5 +1,4 @@
 """Home automation channels module for Zigbee Home Automation."""
-import logging
 from typing import Optional
 
 import zigpy.zcl.clusters.homeautomation as homeautomation
@@ -12,8 +11,6 @@ from ..const import (
 )
 from .base import ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(
     homeautomation.ApplianceEventAlerts.cluster_id
diff --git a/homeassistant/components/zha/core/channels/hvac.py b/homeassistant/components/zha/core/channels/hvac.py
index 17fbb86fc63..1eedf51cd00 100644
--- a/homeassistant/components/zha/core/channels/hvac.py
+++ b/homeassistant/components/zha/core/channels/hvac.py
@@ -6,7 +6,6 @@ https://home-assistant.io/integrations/zha/
 """
 import asyncio
 from collections import namedtuple
-import logging
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 from zigpy.exceptions import ZigbeeException
@@ -25,8 +24,6 @@ from ..const import (
 from ..helpers import retryable_req
 from .base import ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 AttributeUpdateRecord = namedtuple("AttributeUpdateRecord", "attr_id, attr_name, value")
 REPORT_CONFIG_CLIMATE = (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 25)
 REPORT_CONFIG_CLIMATE_DEMAND = (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 5)
diff --git a/homeassistant/components/zha/core/channels/lighting.py b/homeassistant/components/zha/core/channels/lighting.py
index 2b80a1092bb..ac88ba1c2c0 100644
--- a/homeassistant/components/zha/core/channels/lighting.py
+++ b/homeassistant/components/zha/core/channels/lighting.py
@@ -1,14 +1,10 @@
 """Lighting channels module for Zigbee Home Automation."""
-import logging
-
 import zigpy.zcl.clusters.lighting as lighting
 
 from .. import registries, typing as zha_typing
 from ..const import REPORT_CONFIG_DEFAULT
 from .base import ClientChannel, ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(lighting.Ballast.cluster_id)
 class Ballast(ZigbeeChannel):
diff --git a/homeassistant/components/zha/core/channels/lightlink.py b/homeassistant/components/zha/core/channels/lightlink.py
index 25f3ebf9686..9a357d76eb7 100644
--- a/homeassistant/components/zha/core/channels/lightlink.py
+++ b/homeassistant/components/zha/core/channels/lightlink.py
@@ -1,13 +1,9 @@
 """Lightlink channels module for Zigbee Home Automation."""
-import logging
-
 import zigpy.zcl.clusters.lightlink as lightlink
 
 from .. import registries
 from .base import ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.CHANNEL_ONLY_CLUSTERS.register(lightlink.LightLink.cluster_id)
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(lightlink.LightLink.cluster_id)
diff --git a/homeassistant/components/zha/core/channels/manufacturerspecific.py b/homeassistant/components/zha/core/channels/manufacturerspecific.py
index cc56c10d06a..8b840e76317 100644
--- a/homeassistant/components/zha/core/channels/manufacturerspecific.py
+++ b/homeassistant/components/zha/core/channels/manufacturerspecific.py
@@ -1,6 +1,4 @@
 """Manufacturer specific channels module for Zigbee Home Automation."""
-import logging
-
 from homeassistant.core import callback
 
 from .. import registries
@@ -16,8 +14,6 @@ from ..const import (
 )
 from .base import ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(registries.SMARTTHINGS_HUMIDITY_CLUSTER)
 class SmartThingsHumidity(ZigbeeChannel):
diff --git a/homeassistant/components/zha/core/channels/measurement.py b/homeassistant/components/zha/core/channels/measurement.py
index f05177de600..949b7cbc138 100644
--- a/homeassistant/components/zha/core/channels/measurement.py
+++ b/homeassistant/components/zha/core/channels/measurement.py
@@ -1,6 +1,4 @@
 """Measurement channels module for Zigbee Home Automation."""
-import logging
-
 import zigpy.zcl.clusters.measurement as measurement
 
 from .. import registries
@@ -12,8 +10,6 @@ from ..const import (
 )
 from .base import ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(measurement.FlowMeasurement.cluster_id)
 class FlowMeasurement(ZigbeeChannel):
diff --git a/homeassistant/components/zha/core/channels/protocol.py b/homeassistant/components/zha/core/channels/protocol.py
index 083e0f55841..4162809da7a 100644
--- a/homeassistant/components/zha/core/channels/protocol.py
+++ b/homeassistant/components/zha/core/channels/protocol.py
@@ -1,13 +1,9 @@
 """Protocol channels module for Zigbee Home Automation."""
-import logging
-
 import zigpy.zcl.clusters.protocol as protocol
 
 from .. import registries
 from .base import ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(protocol.AnalogInputExtended.cluster_id)
 class AnalogInputExtended(ZigbeeChannel):
diff --git a/homeassistant/components/zha/core/channels/security.py b/homeassistant/components/zha/core/channels/security.py
index b2b6f74c0de..126dc761572 100644
--- a/homeassistant/components/zha/core/channels/security.py
+++ b/homeassistant/components/zha/core/channels/security.py
@@ -5,7 +5,6 @@ For more details about this component, please refer to the documentation at
 https://home-assistant.io/integrations/zha/
 """
 import asyncio
-import logging
 
 from zigpy.exceptions import ZigbeeException
 import zigpy.zcl.clusters.security as security
@@ -23,8 +22,6 @@ from ..const import (
 )
 from .base import ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(security.IasAce.cluster_id)
 class IasAce(ZigbeeChannel):
diff --git a/homeassistant/components/zha/core/channels/smartenergy.py b/homeassistant/components/zha/core/channels/smartenergy.py
index a4bd2bf2d40..d30f891dee1 100644
--- a/homeassistant/components/zha/core/channels/smartenergy.py
+++ b/homeassistant/components/zha/core/channels/smartenergy.py
@@ -1,6 +1,4 @@
 """Smart energy channels module for Zigbee Home Automation."""
-import logging
-
 import zigpy.zcl.clusters.smartenergy as smartenergy
 
 from homeassistant.const import (
@@ -16,8 +14,6 @@ from .. import registries, typing as zha_typing
 from ..const import REPORT_CONFIG_DEFAULT
 from .base import ZigbeeChannel
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @registries.ZIGBEE_CHANNEL_REGISTRY.register(smartenergy.Calendar.cluster_id)
 class Calendar(ZigbeeChannel):
diff --git a/homeassistant/components/zha/core/device.py b/homeassistant/components/zha/core/device.py
index 68fb7393cd5..2b4f8359e90 100644
--- a/homeassistant/components/zha/core/device.py
+++ b/homeassistant/components/zha/core/device.py
@@ -401,7 +401,7 @@ class ZHADevice(LogMixin):
         entry = self.gateway.zha_storage.async_create_or_update_device(self)
         self.debug("stored in registry: %s", entry)
 
-        if self._channels.identify_ch is not None:
+        if self._channels.identify_ch is not None and not self.skip_configuration:
             await self._channels.identify_ch.trigger_effect(
                 EFFECT_OKAY, EFFECT_DEFAULT_VARIANT
             )
diff --git a/homeassistant/components/zha/core/helpers.py b/homeassistant/components/zha/core/helpers.py
index 0e967a7a123..9b62cef4ace 100644
--- a/homeassistant/components/zha/core/helpers.py
+++ b/homeassistant/components/zha/core/helpers.py
@@ -25,8 +25,6 @@ from homeassistant.core import State, callback
 from .const import CLUSTER_TYPE_IN, CLUSTER_TYPE_OUT, DATA_ZHA, DATA_ZHA_GATEWAY
 from .registries import BINDABLE_CLUSTERS
 
-_LOGGER = logging.getLogger(__name__)
-
 ClusterPair = collections.namedtuple("ClusterPair", "source_cluster target_cluster")
 
 
diff --git a/homeassistant/components/zha/core/registries.py b/homeassistant/components/zha/core/registries.py
index 0cc350ba4b8..81521748da0 100644
--- a/homeassistant/components/zha/core/registries.py
+++ b/homeassistant/components/zha/core/registries.py
@@ -180,10 +180,12 @@ class MatchRule:
         """
         weight = 0
         if self.models:
-            weight += 401 - len(self.models)
+            weight += 401 - (1 if callable(self.models) else len(self.models))
 
         if self.manufacturers:
-            weight += 301 - len(self.manufacturers)
+            weight += 301 - (
+                1 if callable(self.manufacturers) else len(self.manufacturers)
+            )
 
         weight += 10 * len(self.channel_names)
         weight += 5 * len(self.generic_ids)
diff --git a/homeassistant/components/zha/core/store.py b/homeassistant/components/zha/core/store.py
index ab560820f19..051fcaa2925 100644
--- a/homeassistant/components/zha/core/store.py
+++ b/homeassistant/components/zha/core/store.py
@@ -2,7 +2,6 @@
 # pylint: disable=unused-import
 from collections import OrderedDict
 import datetime
-import logging
 import time
 from typing import MutableMapping, Optional, cast
 
@@ -14,8 +13,6 @@ from homeassistant.loader import bind_hass
 
 from .typing import ZhaDeviceType
 
-_LOGGER = logging.getLogger(__name__)
-
 DATA_REGISTRY = "zha_storage"
 
 STORAGE_KEY = "zha.storage"
diff --git a/homeassistant/components/zha/device_tracker.py b/homeassistant/components/zha/device_tracker.py
index 824435e6337..53191789eba 100644
--- a/homeassistant/components/zha/device_tracker.py
+++ b/homeassistant/components/zha/device_tracker.py
@@ -1,6 +1,5 @@
 """Support for the ZHA platform."""
 import functools
-import logging
 import time
 
 from homeassistant.components.device_tracker import DOMAIN, SOURCE_TYPE_ROUTER
@@ -21,7 +20,6 @@ from .entity import ZhaEntity
 from .sensor import Battery
 
 STRICT_MATCH = functools.partial(ZHA_ENTITIES.strict_match, DOMAIN)
-_LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
diff --git a/homeassistant/components/zha/fan.py b/homeassistant/components/zha/fan.py
index ac8edd10be5..9983967f764 100644
--- a/homeassistant/components/zha/fan.py
+++ b/homeassistant/components/zha/fan.py
@@ -1,6 +1,5 @@
 """Fans on Zigbee Home Automation networks."""
 import functools
-import logging
 from typing import List
 
 from zigpy.exceptions import ZigbeeException
@@ -30,8 +29,6 @@ from .core.const import (
 from .core.registries import ZHA_ENTITIES
 from .entity import ZhaEntity, ZhaGroupEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 # Additional speeds in zigbee's ZCL
 # Spec is unclear as to what this value means. On King Of Fans HBUniversal
 # receiver, this means Very High.
diff --git a/homeassistant/components/zha/light.py b/homeassistant/components/zha/light.py
index ba05d63df12..34c27f0af45 100644
--- a/homeassistant/components/zha/light.py
+++ b/homeassistant/components/zha/light.py
@@ -457,8 +457,8 @@ class Light(BaseLight, ZhaEntity):
             ):
                 self._color_temp = results["color_temperature"]
 
-            color_x = results.get("color_x")
-            color_y = results.get("color_y")
+            color_x = results.get("current_x")
+            color_y = results.get("current_y")
             if color_x is not None and color_y is not None:
                 self._hs_color = color_util.color_xy_to_hs(
                     float(color_x / 65535), float(color_y / 65535)
diff --git a/homeassistant/components/zha/lock.py b/homeassistant/components/zha/lock.py
index d951e7ada19..5cc7d7c56f6 100644
--- a/homeassistant/components/zha/lock.py
+++ b/homeassistant/components/zha/lock.py
@@ -1,6 +1,5 @@
 """Locks on Zigbee Home Automation networks."""
 import functools
-import logging
 
 from zigpy.zcl.foundation import Status
 
@@ -24,10 +23,7 @@ from .core.const import (
 from .core.registries import ZHA_ENTITIES
 from .entity import ZhaEntity
 
-_LOGGER = logging.getLogger(__name__)
-
-""" The first state is Zigbee 'Not fully locked' """
-
+# The first state is Zigbee 'Not fully locked'
 STATE_LIST = [STATE_UNLOCKED, STATE_LOCKED, STATE_UNLOCKED]
 STRICT_MATCH = functools.partial(ZHA_ENTITIES.strict_match, DOMAIN)
 
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index 414a8721275..01c24bdc6f6 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -8,11 +8,11 @@
     "pyserial==3.4",
     "zha-quirks==0.0.45",
     "zigpy-cc==0.5.2",
-    "zigpy-deconz==0.10.0",
+    "zigpy-deconz==0.11.0",
     "zigpy==0.26.0",
     "zigpy-xbee==0.13.0",
     "zigpy-zigate==0.6.2",
-    "zigpy-znp==0.2.1"
+    "zigpy-znp==0.2.2"
   ],
   "codeowners": ["@dmulcahey", "@adminiuga"]
 }
diff --git a/homeassistant/components/zha/sensor.py b/homeassistant/components/zha/sensor.py
index a18d6bfa9dd..302637cc068 100644
--- a/homeassistant/components/zha/sensor.py
+++ b/homeassistant/components/zha/sensor.py
@@ -1,6 +1,5 @@
 """Sensors on Zigbee Home Automation networks."""
 import functools
-import logging
 import numbers
 
 from homeassistant.components.sensor import (
@@ -27,6 +26,7 @@ from homeassistant.util.temperature import fahrenheit_to_celsius
 
 from .core import discovery
 from .core.const import (
+    CHANNEL_ANALOG_INPUT,
     CHANNEL_ELECTRICAL_MEASUREMENT,
     CHANNEL_HUMIDITY,
     CHANNEL_ILLUMINANCE,
@@ -44,7 +44,6 @@ from .core.registries import SMARTTHINGS_HUMIDITY_CLUSTER, ZHA_ENTITIES
 from .entity import ZhaEntity
 
 PARALLEL_UPDATES = 5
-_LOGGER = logging.getLogger(__name__)
 
 BATTERY_SIZES = {
     0: "No battery",
@@ -139,7 +138,6 @@ class Sensor(ZhaEntity):
         """Restore previous state."""
         self._state = last_state.state
 
-    @callback
     async def async_state_attr_provider(self):
         """Initialize device state attributes."""
         return {}
@@ -153,6 +151,13 @@ class Sensor(ZhaEntity):
         return round(float(value * self._multiplier) / self._divisor)
 
 
+@STRICT_MATCH(channel_names=CHANNEL_ANALOG_INPUT, manufacturers="Digi")
+class AnalogInput(Sensor):
+    """Sensor that displays analog input values."""
+
+    SENSOR_ATTR = "present_value"
+
+
 @STRICT_MATCH(channel_names=CHANNEL_POWER_CONFIGURATION)
 class Battery(Sensor):
     """Battery sensor of power configuration cluster."""
diff --git a/homeassistant/components/zha/strings.json b/homeassistant/components/zha/strings.json
index 915501b2437..93b5cd7ccf5 100644
--- a/homeassistant/components/zha/strings.json
+++ b/homeassistant/components/zha/strings.json
@@ -21,9 +21,9 @@
         }
       }
     },
-    "error": { "cannot_connect": "Unable to connect to ZHA device." },
+    "error": { "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]" },
     "abort": {
-      "single_instance_allowed": "Only a single configuration of ZHA is allowed."
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   },
   "device_automation": {
diff --git a/homeassistant/components/zha/switch.py b/homeassistant/components/zha/switch.py
index 07c40c7175e..60db9ec0a08 100644
--- a/homeassistant/components/zha/switch.py
+++ b/homeassistant/components/zha/switch.py
@@ -1,6 +1,5 @@
 """Switches on Zigbee Home Automation networks."""
 import functools
-import logging
 from typing import Any, List
 
 from zigpy.zcl.clusters.general import OnOff
@@ -22,7 +21,6 @@ from .core.const import (
 from .core.registries import ZHA_ENTITIES
 from .entity import ZhaEntity, ZhaGroupEntity
 
-_LOGGER = logging.getLogger(__name__)
 STRICT_MATCH = functools.partial(ZHA_ENTITIES.strict_match, DOMAIN)
 GROUP_MATCH = functools.partial(ZHA_ENTITIES.group_match, DOMAIN)
 
diff --git a/homeassistant/components/zha/translations/ca.json b/homeassistant/components/zha/translations/ca.json
index c1092875b01..7fb36f11532 100644
--- a/homeassistant/components/zha/translations/ca.json
+++ b/homeassistant/components/zha/translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Nom\u00e9s es permet una \u00fanica configuraci\u00f3 de ZHA."
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
-            "cannot_connect": "No s'ha pogut connectar amb el dispositiu ZHA."
+            "cannot_connect": "Ha fallat la connexi\u00f3"
         },
         "step": {
             "pick_radio": {
diff --git a/homeassistant/components/zha/translations/cs.json b/homeassistant/components/zha/translations/cs.json
index 0951ca3377e..b36a1651e0a 100644
--- a/homeassistant/components/zha/translations/cs.json
+++ b/homeassistant/components/zha/translations/cs.json
@@ -1,6 +1,27 @@
 {
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "step": {
+            "port_config": {
+                "data": {
+                    "baudrate": "rychlost portu"
+                },
+                "title": "Nastaven\u00ed"
+            },
+            "user": {
+                "title": "ZHA"
+            }
+        }
+    },
     "device_automation": {
         "trigger_subtype": {
+            "both_buttons": "Ob\u011b tla\u010d\u00edtka",
+            "button_1": "Prvn\u00ed tla\u010d\u00edtko",
             "button_2": "Druh\u00e9 tla\u010d\u00edtko",
             "button_3": "T\u0159et\u00ed tla\u010d\u00edtko",
             "button_4": "\u010ctvrt\u00e9 tla\u010d\u00edtko",
@@ -8,7 +29,38 @@
             "button_6": "\u0160est\u00e9 tla\u010d\u00edtko",
             "close": "Zav\u0159\u00edt",
             "dim_down": "ztmavit",
-            "dim_up": "ro\u017ehnout"
+            "dim_up": "ro\u017ehnout",
+            "face_1": "aktivov\u00e1no tv\u00e1\u0159\u00ed 1",
+            "face_2": "aktivov\u00e1no tv\u00e1\u0159\u00ed 2",
+            "face_3": "aktivov\u00e1no tv\u00e1\u0159\u00ed 3",
+            "face_4": "aktivov\u00e1no tv\u00e1\u0159\u00ed 4",
+            "face_5": "aktivov\u00e1no tv\u00e1\u0159\u00ed 5",
+            "face_6": "aktivov\u00e1no tv\u00e1\u0159\u00ed 6",
+            "left": "Vlevo",
+            "open": "Otev\u0159eno",
+            "right": "Vpravo",
+            "turn_off": "Vypnout",
+            "turn_on": "Zapnout"
+        },
+        "trigger_type": {
+            "device_offline": "Za\u0159\u00edzen\u00ed je offline",
+            "device_rotated": "Za\u0159\u00edzen\u00ed oto\u010deno \"{subtype}\"",
+            "device_shaken": "Za\u0159\u00edzen\u00ed se zat\u0159\u00e1slo",
+            "device_tilted": "Za\u0159\u00edzen\u00ed naklon\u011bno",
+            "remote_button_alt_double_press": "Dvakr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\" (alternativn\u00ed re\u017eim)",
+            "remote_button_alt_long_release": "Uvoln\u011bno tla\u010d\u00edtko \"{subtype}\" po dlouh\u00e9m stisku (alternativn\u00ed re\u017eim)",
+            "remote_button_alt_quadruple_press": "\u010cty\u0159ikr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\" (alternativn\u00ed re\u017eim)",
+            "remote_button_alt_quintuple_press": "P\u011btkr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\" (alternativn\u00ed re\u017eim)",
+            "remote_button_alt_short_press": "Stiknuto tla\u010d\u00edtko \"{subtype}\" (alternativn\u00ed re\u017eim)",
+            "remote_button_alt_short_release": "Uvoln\u011bno tla\u010d\u00edtko \"{subtype}\" (alternativn\u00ed re\u017eim)",
+            "remote_button_alt_triple_press": "T\u0159ikr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\" (alternativn\u00ed re\u017eim)",
+            "remote_button_double_press": "Dvakr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_long_release": "Uvoln\u011bno tla\u010d\u00edtko \"{subtype}\" po dlouh\u00e9m stisku",
+            "remote_button_quadruple_press": "\u010cty\u0159ikr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_quintuple_press": "P\u011btkr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_short_press": "Stiknuto tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_short_release": "Uvoln\u011bno tla\u010d\u00edtko \"{subtype}\"",
+            "remote_button_triple_press": "T\u0159ikr\u00e1t stisknuto tla\u010d\u00edtko \"{subtype}\""
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/zha/translations/en.json b/homeassistant/components/zha/translations/en.json
index d54eec90b5f..d9c78171d94 100644
--- a/homeassistant/components/zha/translations/en.json
+++ b/homeassistant/components/zha/translations/en.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Only a single configuration of ZHA is allowed."
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
-            "cannot_connect": "Unable to connect to ZHA device."
+            "cannot_connect": "Failed to connect"
         },
         "step": {
             "pick_radio": {
diff --git a/homeassistant/components/zha/translations/es.json b/homeassistant/components/zha/translations/es.json
index fb2445f0f8c..677d60d0d65 100644
--- a/homeassistant/components/zha/translations/es.json
+++ b/homeassistant/components/zha/translations/es.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "S\u00f3lo se permite una \u00fanica configuraci\u00f3n de ZHA."
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
-            "cannot_connect": "No se puede conectar al dispositivo ZHA."
+            "cannot_connect": "No se pudo conectar"
         },
         "step": {
             "pick_radio": {
diff --git a/homeassistant/components/zha/translations/et.json b/homeassistant/components/zha/translations/et.json
index 27a7113e3d2..9d43ded0eb2 100644
--- a/homeassistant/components/zha/translations/et.json
+++ b/homeassistant/components/zha/translations/et.json
@@ -1,13 +1,40 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus"
+        },
         "step": {
+            "pick_radio": {
+                "data": {
+                    "radio_type": "Seadme raadio t\u00fc\u00fcp"
+                },
+                "description": "Vali oma Zigbee raadio t\u00fc\u00fcp",
+                "title": "Seadme raadio t\u00fc\u00fcp"
+            },
             "port_config": {
+                "data": {
+                    "baudrate": "pordi kiirus",
+                    "flow_control": "andmevoo juhtimine",
+                    "path": "Jadaseadme tee"
+                },
+                "description": "Sisesta pordispetsiifilised seaded",
                 "title": "Seaded"
+            },
+            "user": {
+                "data": {
+                    "path": "Jadaseadme tee"
+                },
+                "description": "Vali Zigbee raadio jadaport",
+                "title": ""
             }
         }
     },
     "device_automation": {
         "action_type": {
+            "squawk": "Pr\u00e4\u00e4ksata",
             "warn": "Hoiata"
         },
         "trigger_subtype": {
diff --git a/homeassistant/components/zha/translations/it.json b/homeassistant/components/zha/translations/it.json
index 8330583cf74..066a45feab1 100644
--- a/homeassistant/components/zha/translations/it.json
+++ b/homeassistant/components/zha/translations/it.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u00c8 consentita solo una singola configurazione di ZHA."
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
-            "cannot_connect": "Impossibile connettersi al dispositivo ZHA."
+            "cannot_connect": "Impossibile connettersi"
         },
         "step": {
             "pick_radio": {
diff --git a/homeassistant/components/zha/translations/nl.json b/homeassistant/components/zha/translations/nl.json
index ca8d18dae12..569358d9fc7 100644
--- a/homeassistant/components/zha/translations/nl.json
+++ b/homeassistant/components/zha/translations/nl.json
@@ -73,7 +73,7 @@
             "remote_button_alt_long_release": "\"{subtype}\" knop losgelaten (alternate mode)",
             "remote_button_alt_quadruple_press": "\" {subtype} \" knop viervoudig aangeklikt (alternate mode)",
             "remote_button_alt_quintuple_press": "\" {subtype} \" knop vijfmaal geklikt (alternate mode)",
-            "remote_button_alt_short_press": "\" {subtype} \" knop ingedrukt (alternate mode)",
+            "remote_button_alt_short_press": "\"{subtype}\" knop ingedrukt (alternate mode)",
             "remote_button_alt_short_release": "\"{subtype}\" knop losgelaten (alternate mode)",
             "remote_button_alt_triple_press": "\" {subtype} \" knop driemaal geklikt (alternate mode)",
             "remote_button_double_press": "\"{subtype}\" knop dubbel geklikt",
@@ -81,7 +81,7 @@
             "remote_button_long_release": "\"{subtype}\" knop losgelaten na lang indrukken van de knop",
             "remote_button_quadruple_press": "\" {subtype} \" knop viervoudig aangeklikt",
             "remote_button_quintuple_press": "\" {subtype} \" knop vijf keer aangeklikt",
-            "remote_button_short_press": "\" {subtype} \" knop ingedrukt",
+            "remote_button_short_press": "\"{subtype}\" knop ingedrukt",
             "remote_button_short_release": "\"{subtype}\" knop losgelaten",
             "remote_button_triple_press": "\" {subtype} \" knop driemaal geklikt"
         }
diff --git a/homeassistant/components/zha/translations/no.json b/homeassistant/components/zha/translations/no.json
index e97a4e27ccd..a99e74fc6c7 100644
--- a/homeassistant/components/zha/translations/no.json
+++ b/homeassistant/components/zha/translations/no.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Kun en konfigurasjon av ZHA er tillatt."
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
-            "cannot_connect": "Kan ikke koble til ZHA-enhet."
+            "cannot_connect": "Tilkobling mislyktes"
         },
         "step": {
             "pick_radio": {
@@ -35,7 +35,7 @@
     "device_automation": {
         "action_type": {
             "squawk": "Squawk",
-            "warn": "Advar"
+            "warn": "Advare"
         },
         "trigger_subtype": {
             "both_buttons": "Begge knapper",
@@ -58,7 +58,7 @@
             "left": "Venstre",
             "open": "\u00c5pen",
             "right": "H\u00f8yre",
-            "turn_off": "Skru av",
+            "turn_off": "Sl\u00e5 av",
             "turn_on": "Sl\u00e5 p\u00e5"
         },
         "trigger_type": {
@@ -67,7 +67,7 @@
             "device_knocked": "Enheten sl\u00e5tt \"{subtype}\"",
             "device_offline": "Enheten er frakoblet",
             "device_rotated": "Enheten roterte \"{subtype}\"",
-            "device_shaken": "Enhet er ristet",
+            "device_shaken": "Enhet ristet",
             "device_slid": "Enheten skled \"{subtype}\"",
             "device_tilted": "Enheten skr\u00e5stilt",
             "remote_button_alt_double_press": "\"{subtype}\"-knapp trykket p\u00e5 to ganger (vekslende modus)",
diff --git a/homeassistant/components/zha/translations/pl.json b/homeassistant/components/zha/translations/pl.json
index b2089e0dad8..3e047b558ef 100644
--- a/homeassistant/components/zha/translations/pl.json
+++ b/homeassistant/components/zha/translations/pl.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "Dozwolona jest tylko jedna konfiguracja ZHA."
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
-            "cannot_connect": "Nie mo\u017cna po\u0142\u0105czy\u0107 si\u0119 z urz\u0105dzeniem ZHA."
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia"
         },
         "step": {
             "pick_radio": {
@@ -65,6 +65,7 @@
             "device_dropped": "nast\u0105pi upadek urz\u0105dzenia",
             "device_flipped": "nast\u0105pi odwr\u00f3cenie urz\u0105dzenia \"{subtype}\"",
             "device_knocked": "nast\u0105pi pukni\u0119cie w urz\u0105dzenie \"{subtype}\"",
+            "device_offline": "Urz\u0105dzenie offline",
             "device_rotated": "nast\u0105pi obr\u00f3cenie urz\u0105dzenia \"{subtype}\"",
             "device_shaken": "nast\u0105pi potrz\u0105\u015bni\u0119cie urz\u0105dzeniem",
             "device_slid": "nast\u0105pi przesuni\u0119cie urz\u0105dzenia \"{subtype}\"",
diff --git a/homeassistant/components/zha/translations/ru.json b/homeassistant/components/zha/translations/ru.json
index eea55972c62..4070d759a90 100644
--- a/homeassistant/components/zha/translations/ru.json
+++ b/homeassistant/components/zha/translations/ru.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
-            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f."
         },
         "step": {
             "pick_radio": {
diff --git a/homeassistant/components/zha/translations/zh-Hans.json b/homeassistant/components/zha/translations/zh-Hans.json
index 7a841edbb3b..4df88473d0d 100644
--- a/homeassistant/components/zha/translations/zh-Hans.json
+++ b/homeassistant/components/zha/translations/zh-Hans.json
@@ -11,5 +11,13 @@
                 "title": "ZHA"
             }
         }
+    },
+    "device_automation": {
+        "trigger_subtype": {
+            "turn_off": "\u5173\u95ed"
+        },
+        "trigger_type": {
+            "device_offline": "\u8bbe\u5907\u79bb\u7ebf"
+        }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/zha/translations/zh-Hant.json b/homeassistant/components/zha/translations/zh-Hant.json
index 5965911d459..e62d61ac8ea 100644
--- a/homeassistant/components/zha/translations/zh-Hant.json
+++ b/homeassistant/components/zha/translations/zh-Hant.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u50c5\u5141\u8a31\u8a2d\u5b9a\u4e00\u7d44 ZHA\u3002"
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
-            "cannot_connect": "\u7121\u6cd5\u9023\u7dda\u81f3 ZHA \u8a2d\u5099\u3002"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557"
         },
         "step": {
             "pick_radio": {
diff --git a/homeassistant/components/zhong_hong/climate.py b/homeassistant/components/zhong_hong/climate.py
index fc5a5688027..68247537847 100644
--- a/homeassistant/components/zhong_hong/climate.py
+++ b/homeassistant/components/zhong_hong/climate.py
@@ -87,6 +87,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 
     hub_is_initialized = False
 
+    def _start_hub():
+        """Start the hub socket and query status of all devices."""
+        hub.start_listen()
+        hub.query_all_status()
+
     async def startup():
         """Start hub socket after all climate entity is set up."""
         nonlocal hub_is_initialized
@@ -97,8 +102,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
             return
 
         _LOGGER.debug("zhong_hong hub start listen event")
-        await hass.async_add_job(hub.start_listen)
-        await hass.async_add_job(hub.query_all_status)
+        await hass.async_add_executor_job(_start_hub)
         hub_is_initialized = True
 
     async_dispatcher_connect(hass, SIGNAL_DEVICE_ADDED, startup)
diff --git a/homeassistant/components/zodiac/sensor.py b/homeassistant/components/zodiac/sensor.py
index 06bd52f6bf5..5113c5c6e18 100644
--- a/homeassistant/components/zodiac/sensor.py
+++ b/homeassistant/components/zodiac/sensor.py
@@ -1,6 +1,4 @@
 """Support for tracking the zodiac sign."""
-import logging
-
 from homeassistant.helpers.entity import Entity
 from homeassistant.util.dt import as_local, utcnow
 
@@ -29,8 +27,6 @@ from .const import (
     SIGN_VIRGO,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 ZODIAC_BY_DATE = (
     (
         (21, 3),
diff --git a/homeassistant/components/zodiac/translations/sensor.cs.json b/homeassistant/components/zodiac/translations/sensor.cs.json
new file mode 100644
index 00000000000..95e3e8dcbce
--- /dev/null
+++ b/homeassistant/components/zodiac/translations/sensor.cs.json
@@ -0,0 +1,18 @@
+{
+    "state": {
+        "zodiac__sign": {
+            "aquarius": "Vodn\u00e1\u0159",
+            "aries": "Beran",
+            "cancer": "Rak",
+            "capricorn": "Kozoroh",
+            "gemini": "Bl\u00ed\u017eenci",
+            "leo": "Lev",
+            "libra": "V\u00e1hy",
+            "pisces": "Ryby",
+            "sagittarius": "St\u0159elec",
+            "scorpio": "\u0160t\u00edr",
+            "taurus": "B\u00fdk",
+            "virgo": "Panna"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/zone/translations/et.json b/homeassistant/components/zone/translations/et.json
index 8a319fb7c1d..5452dc40826 100644
--- a/homeassistant/components/zone/translations/et.json
+++ b/homeassistant/components/zone/translations/et.json
@@ -1,5 +1,8 @@
 {
     "config": {
+        "error": {
+            "name_exists": "Nimi on juba kasutusel"
+        },
         "step": {
             "init": {
                 "data": {
@@ -7,6 +10,7 @@
                     "latitude": "Laiuskraad",
                     "longitude": "Pikkuskraad",
                     "name": "Nimi",
+                    "passive": "Passiivne",
                     "radius": "Raadius"
                 },
                 "title": "M\u00e4\u00e4ra ala parameetrid"
diff --git a/homeassistant/components/zone/translations/pl.json b/homeassistant/components/zone/translations/pl.json
index 5c013d5da8f..e649de4c75e 100644
--- a/homeassistant/components/zone/translations/pl.json
+++ b/homeassistant/components/zone/translations/pl.json
@@ -1,7 +1,7 @@
 {
     "config": {
         "error": {
-            "name_exists": "Nazwa ju\u017c istnieje."
+            "name_exists": "Nazwa ju\u017c istnieje"
         },
         "step": {
             "init": {
diff --git a/homeassistant/components/zone/trigger.py b/homeassistant/components/zone/trigger.py
index 1f0856513dd..9958d201810 100644
--- a/homeassistant/components/zone/trigger.py
+++ b/homeassistant/components/zone/trigger.py
@@ -8,7 +8,7 @@ from homeassistant.const import (
     CONF_PLATFORM,
     CONF_ZONE,
 )
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 from homeassistant.helpers import condition, config_validation as cv, location
 from homeassistant.helpers.event import async_track_state_change_event
 
@@ -37,6 +37,7 @@ async def async_attach_trigger(hass, config, action, automation_info):
     entity_id = config.get(CONF_ENTITY_ID)
     zone_entity_id = config.get(CONF_ZONE)
     event = config.get(CONF_EVENT)
+    job = HassJob(action)
 
     @callback
     def zone_automation_listener(zone_event):
@@ -65,8 +66,8 @@ async def async_attach_trigger(hass, config, action, automation_info):
             and not to_match
         ):
             description = f"{entity} {_EVENT_DESCRIPTION[event]} {zone_state.attributes[ATTR_FRIENDLY_NAME]}"
-            hass.async_run_job(
-                action,
+            hass.async_run_hass_job(
+                job,
                 {
                     "trigger": {
                         "platform": "zone",
diff --git a/homeassistant/components/zoneminder/translations/ca.json b/homeassistant/components/zoneminder/translations/ca.json
index cdbe838c1f1..5be4bbfc8b4 100644
--- a/homeassistant/components/zoneminder/translations/ca.json
+++ b/homeassistant/components/zoneminder/translations/ca.json
@@ -2,14 +2,18 @@
     "config": {
         "abort": {
             "auth_fail": "Nom d'usuari i/o contrasenya incorrectes.",
-            "connection_error": "No s'ha pogut connectar al servidor ZoneMinder."
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "connection_error": "No s'ha pogut connectar al servidor ZoneMinder.",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
         },
         "create_entry": {
             "default": "S'ha afegit el servidor ZoneMinder."
         },
         "error": {
             "auth_fail": "Nom d'usuari i/o contrasenya incorrectes.",
-            "connection_error": "No s'ha pogut connectar al servidor ZoneMinder."
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "connection_error": "No s'ha pogut connectar al servidor ZoneMinder.",
+            "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
         },
         "flow_title": "ZoneMinder",
         "step": {
@@ -19,7 +23,7 @@
                     "password": "Contrasenya",
                     "path": "Ruta de ZM",
                     "path_zms": "Ruta de ZMS",
-                    "ssl": "Utilitza SSL per a les connexions a ZoneMinder",
+                    "ssl": "Utilitza un certificat SSL",
                     "username": "Nom d'usuari",
                     "verify_ssl": "Verifica el certificat SSL"
                 },
diff --git a/homeassistant/components/zoneminder/translations/cs.json b/homeassistant/components/zoneminder/translations/cs.json
new file mode 100644
index 00000000000..92c92c69ecf
--- /dev/null
+++ b/homeassistant/components/zoneminder/translations/cs.json
@@ -0,0 +1,32 @@
+{
+    "config": {
+        "abort": {
+            "auth_fail": "U\u017eivatelsk\u00e9 jm\u00e9no nebo heslo je nespr\u00e1vn\u00e9.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "P\u0159ipojen\u00ed k serveru ZoneMinder se nezda\u0159ilo.",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "create_entry": {
+            "default": "P\u0159id\u00e1n server ZoneMinder."
+        },
+        "error": {
+            "auth_fail": "U\u017eivatelsk\u00e9 jm\u00e9no nebo heslo je nespr\u00e1vn\u00e9.",
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
+            "connection_error": "P\u0159ipojen\u00ed k serveru ZoneMinder se nezda\u0159ilo.",
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+        },
+        "flow_title": "ZoneMinder",
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Hostitel a port (nap\u0159. 10.10.0.4:8010)",
+                    "password": "Heslo",
+                    "ssl": "Pou\u017e\u00edv\u00e1 SSL certifik\u00e1t",
+                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no",
+                    "verify_ssl": "Ov\u011b\u0159it certifik\u00e1t SSL"
+                },
+                "title": "P\u0159idejte server ZoneMinder."
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/zoneminder/translations/el.json b/homeassistant/components/zoneminder/translations/el.json
index 8a63dab388f..81511935386 100644
--- a/homeassistant/components/zoneminder/translations/el.json
+++ b/homeassistant/components/zoneminder/translations/el.json
@@ -7,13 +7,23 @@
         "create_entry": {
             "default": "\u03a0\u03c1\u03bf\u03c3\u03c4\u03ad\u03b8\u03b7\u03ba\u03b5 \u03b4\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae\u03c2 ZoneMinder."
         },
+        "error": {
+            "auth_fail": "\u03a4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7 \u03ae \u03bf \u03ba\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03c3\u03c6\u03b1\u03bb\u03bc\u03ad\u03bd\u03b1.",
+            "connection_error": "\u0391\u03c0\u03bf\u03c4\u03c5\u03c7\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2 \u03c3\u03b5 \u03b4\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae ZoneMinder."
+        },
         "flow_title": "ZoneMinder",
         "step": {
             "user": {
                 "data": {
+                    "host": "\u039a\u03b5\u03bd\u03c4\u03c1\u03b9\u03ba\u03cc\u03c2 \u03c5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03c4\u03ae\u03c2 \u03ba\u03b1\u03b9 \u03b8\u03cd\u03c1\u03b1 (\u03c0\u03c1\u03ce\u03b7\u03bd 10.10.0.4:8010)",
+                    "password": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7\u03c2",
+                    "path": "\u0394\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae ZMS",
+                    "path_zms": "\u0394\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae ZMS",
+                    "ssl": "\u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 SSL \u03b3\u03b9\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03b5\u03b9\u03c2 \u03c3\u03c4\u03bf ZoneMinder",
                     "username": "\u038c\u03bd\u03bf\u03bc\u03b1 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7",
                     "verify_ssl": "\u0395\u03c0\u03b1\u03bb\u03ae\u03b8\u03b5\u03c5\u03c3\u03b7 \u03c0\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03b9\u03ba\u03bf\u03cd SSL"
-                }
+                },
+                "title": "\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03b4\u03b9\u03b1\u03ba\u03bf\u03bc\u03b9\u03c3\u03c4\u03ae ZoneMinder."
             }
         }
     }
diff --git a/homeassistant/components/zoneminder/translations/en.json b/homeassistant/components/zoneminder/translations/en.json
index 3bf249c0786..eab5f5f1e72 100644
--- a/homeassistant/components/zoneminder/translations/en.json
+++ b/homeassistant/components/zoneminder/translations/en.json
@@ -2,14 +2,18 @@
     "config": {
         "abort": {
             "auth_fail": "Username or password is incorrect.",
-            "connection_error": "Failed to connect to a ZoneMinder server."
+            "cannot_connect": "Failed to connect",
+            "connection_error": "Failed to connect to a ZoneMinder server.",
+            "invalid_auth": "Invalid authentication"
         },
         "create_entry": {
             "default": "ZoneMinder server added."
         },
         "error": {
             "auth_fail": "Username or password is incorrect.",
-            "connection_error": "Failed to connect to a ZoneMinder server."
+            "cannot_connect": "Failed to connect",
+            "connection_error": "Failed to connect to a ZoneMinder server.",
+            "invalid_auth": "Invalid authentication"
         },
         "flow_title": "ZoneMinder",
         "step": {
@@ -19,9 +23,9 @@
                     "password": "Password",
                     "path": "ZM Path",
                     "path_zms": "ZMS Path",
-                    "ssl": "Use SSL for connections to ZoneMinder",
+                    "ssl": "Uses an SSL certificate",
                     "username": "Username",
-                    "verify_ssl": "Verify SSL Certificate"
+                    "verify_ssl": "Verify SSL certificate"
                 },
                 "title": "Add ZoneMinder Server."
             }
diff --git a/homeassistant/components/zoneminder/translations/es.json b/homeassistant/components/zoneminder/translations/es.json
index b7fa166864a..6e12f9fd8fe 100644
--- a/homeassistant/components/zoneminder/translations/es.json
+++ b/homeassistant/components/zoneminder/translations/es.json
@@ -2,14 +2,18 @@
     "config": {
         "abort": {
             "auth_fail": "Nombre de usuario o contrase\u00f1a incorrectos.",
-            "connection_error": "No se pudo conectar con un servidor ZoneMinder."
+            "cannot_connect": "No se pudo conectar",
+            "connection_error": "No se pudo conectar con un servidor ZoneMinder.",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
         },
         "create_entry": {
             "default": "Servidor ZoneMinder a\u00f1adido."
         },
         "error": {
             "auth_fail": "Nombre de usuario o contrase\u00f1a incorrectos.",
-            "connection_error": "No se pudo conectar con un servidor ZoneMinder."
+            "cannot_connect": "No se pudo conectar",
+            "connection_error": "No se pudo conectar con un servidor ZoneMinder.",
+            "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
         },
         "flow_title": "ZoneMinder",
         "step": {
@@ -19,7 +23,7 @@
                     "password": "Contrase\u00f1a",
                     "path": "Ruta ZM",
                     "path_zms": "Ruta ZMS",
-                    "ssl": "Usar SSL para conexiones a ZoneMinder",
+                    "ssl": "Utiliza un certificado SSL",
                     "username": "Usuario",
                     "verify_ssl": "Verificar certificado SSL"
                 },
diff --git a/homeassistant/components/zoneminder/translations/et.json b/homeassistant/components/zoneminder/translations/et.json
index 1446846940a..087158a450d 100644
--- a/homeassistant/components/zoneminder/translations/et.json
+++ b/homeassistant/components/zoneminder/translations/et.json
@@ -2,14 +2,18 @@
     "config": {
         "abort": {
             "auth_fail": "Kasutajanimi v\u00f5i salas\u00f5na on vale.",
-            "connection_error": "ZoneMinderi serveriga \u00fchenduse loomine nurjus."
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "ZoneMinderi serveriga \u00fchenduse loomine nurjus.",
+            "invalid_auth": "Tuvastamise viga"
         },
         "create_entry": {
             "default": "ZoneMinderi server on lisatud."
         },
         "error": {
             "auth_fail": "Vale kasutajanimi v\u00f5i salas\u00f5na",
-            "connection_error": "ZoneMinderi serveriga \u00fchenduse loomine nurjus."
+            "cannot_connect": "\u00dchendamine nurjus",
+            "connection_error": "ZoneMinderi serveriga \u00fchenduse loomine nurjus.",
+            "invalid_auth": "Tuvastamise viga"
         },
         "flow_title": "ZoneMinder",
         "step": {
@@ -21,7 +25,7 @@
                     "path_zms": "ZMS-i aadress",
                     "ssl": "Kasutage ZoneMinderiga \u00fchenduse loomiseks SSL-i",
                     "username": "Kasutajanimi",
-                    "verify_ssl": "Kontrollige SSL-sertifikaati"
+                    "verify_ssl": "Kontrolli SSL sertifikaati"
                 },
                 "title": "Lisa ZoneMinderi server."
             }
diff --git a/homeassistant/components/zoneminder/translations/fr.json b/homeassistant/components/zoneminder/translations/fr.json
index 0919811fa2b..3f3729ce02f 100644
--- a/homeassistant/components/zoneminder/translations/fr.json
+++ b/homeassistant/components/zoneminder/translations/fr.json
@@ -2,14 +2,18 @@
     "config": {
         "abort": {
             "auth_fail": "L'identifiant ou le mot de passe est incorrect.",
-            "connection_error": "\u00c9chec de la connexion \u00e0 un serveur ZoneMinder."
+            "cannot_connect": "\u00c9chec de connexion",
+            "connection_error": "\u00c9chec de la connexion \u00e0 un serveur ZoneMinder.",
+            "invalid_auth": "Authentification invalide"
         },
         "create_entry": {
             "default": "Serveur Zoneminder ajout\u00e9."
         },
         "error": {
             "auth_fail": "L'identifiant ou le mot de passe est incorrect.",
-            "connection_error": "\u00c9chec de la connexion \u00e0 un serveur ZoneMinder."
+            "cannot_connect": "\u00c9chec de connexion",
+            "connection_error": "\u00c9chec de la connexion \u00e0 un serveur ZoneMinder.",
+            "invalid_auth": "Authentification invalide"
         },
         "flow_title": "ZoneMinder",
         "step": {
diff --git a/homeassistant/components/zoneminder/translations/it.json b/homeassistant/components/zoneminder/translations/it.json
index b4f6b8da9ee..cf2a3a63553 100644
--- a/homeassistant/components/zoneminder/translations/it.json
+++ b/homeassistant/components/zoneminder/translations/it.json
@@ -2,14 +2,18 @@
     "config": {
         "abort": {
             "auth_fail": "Nome utente o password non corretti.",
-            "connection_error": "Impossibile connettersi a un server ZoneMinder."
+            "cannot_connect": "Impossibile connettersi",
+            "connection_error": "Impossibile connettersi a un server ZoneMinder.",
+            "invalid_auth": "Autenticazione non valida"
         },
         "create_entry": {
             "default": "Server ZoneMinder aggiunto."
         },
         "error": {
             "auth_fail": "Nome utente o password non corretti.",
-            "connection_error": "Impossibile connettersi a un server ZoneMinder."
+            "cannot_connect": "Impossibile connettersi",
+            "connection_error": "Impossibile connettersi a un server ZoneMinder.",
+            "invalid_auth": "Autenticazione non valida"
         },
         "flow_title": "ZoneMinder",
         "step": {
@@ -19,9 +23,9 @@
                     "password": "Password",
                     "path": "Percorso ZM",
                     "path_zms": "Percorso ZMS",
-                    "ssl": "Usa SSL per le connessioni a ZoneMinder",
+                    "ssl": "Utilizza un certificato SSL",
                     "username": "Nome utente",
-                    "verify_ssl": "Verifica del certificato SSL"
+                    "verify_ssl": "Verificare il certificato SSL"
                 },
                 "title": "Aggiungi Server ZoneMinder."
             }
diff --git a/homeassistant/components/zoneminder/translations/lb.json b/homeassistant/components/zoneminder/translations/lb.json
index ad0669b1040..dea6b9f0d34 100644
--- a/homeassistant/components/zoneminder/translations/lb.json
+++ b/homeassistant/components/zoneminder/translations/lb.json
@@ -2,14 +2,18 @@
     "config": {
         "abort": {
             "auth_fail": "Benotzernumm oder Passwuert inkorrekt",
-            "connection_error": "Feeler beim verbannen mam ZoneMinder Server."
+            "cannot_connect": "Feeler beim verbannen",
+            "connection_error": "Feeler beim verbannen mam ZoneMinder Server.",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun"
         },
         "create_entry": {
             "default": "Zoneminder Server dob\u00e4igesat."
         },
         "error": {
             "auth_fail": "Benotzernumm oder Passwuert inkorrekt",
-            "connection_error": "Feeler beim verbannen mam ZoneMinder Server."
+            "cannot_connect": "Feeler beim verbannen",
+            "connection_error": "Feeler beim verbannen mam ZoneMinder Server.",
+            "invalid_auth": "Ong\u00eblteg Authentifikatioun"
         },
         "flow_title": "ZoneMinder",
         "step": {
@@ -19,7 +23,7 @@
                     "password": "Passwuert",
                     "path": "ZM Pad",
                     "path_zms": "ZMS Pad",
-                    "ssl": "Benotz SSL fir d'Verbindung mat ZoneMinder",
+                    "ssl": "Benotz een SSL Zertifikat",
                     "username": "Benotzernumm",
                     "verify_ssl": "SSL Zertifikat iwwerpr\u00e9iwen"
                 },
diff --git a/homeassistant/components/zoneminder/translations/nl.json b/homeassistant/components/zoneminder/translations/nl.json
index a9ad121c32e..126abbe2d28 100644
--- a/homeassistant/components/zoneminder/translations/nl.json
+++ b/homeassistant/components/zoneminder/translations/nl.json
@@ -1,6 +1,14 @@
 {
     "config": {
         "abort": {
+            "auth_fail": "Gebruikersnaam of wachtwoord is onjuist.",
+            "cannot_connect": "Kan geen verbinding maken",
+            "connection_error": "Kan geen verbinding maken met een ZoneMinder-server."
+        },
+        "create_entry": {
+            "default": "ZoneMinder-server toegevoegd."
+        },
+        "error": {
             "auth_fail": "Gebruikersnaam of wachtwoord is onjuist.",
             "connection_error": "Kan geen verbinding maken met een ZoneMinder-server."
         },
@@ -14,7 +22,7 @@
                     "path_zms": "ZMS-pad",
                     "ssl": "Gebruik SSL voor verbindingen met ZoneMinder",
                     "username": "Gebruikersnaam",
-                    "verify_ssl": "Verifieer SSLcertificaat"
+                    "verify_ssl": "Verifieer SSL-certificaat"
                 },
                 "title": "Voeg ZoneMinder server toe."
             }
diff --git a/homeassistant/components/zoneminder/translations/no.json b/homeassistant/components/zoneminder/translations/no.json
index 3e5dc0867c0..50a9b5fedbf 100644
--- a/homeassistant/components/zoneminder/translations/no.json
+++ b/homeassistant/components/zoneminder/translations/no.json
@@ -2,16 +2,20 @@
     "config": {
         "abort": {
             "auth_fail": "Brukernavn eller passord er feil.",
-            "connection_error": "Kunne ikke koble til en ZoneMinder-server."
+            "cannot_connect": "Tilkobling mislyktes",
+            "connection_error": "Kunne ikke koble til en ZoneMinder-server.",
+            "invalid_auth": "Ugyldig godkjenning"
         },
         "create_entry": {
             "default": "ZoneMinder-serveren er lagt til."
         },
         "error": {
             "auth_fail": "Brukernavn eller passord er feil.",
-            "connection_error": "Kunne ikke koble til en ZoneMinder-server."
+            "cannot_connect": "Tilkobling mislyktes",
+            "connection_error": "Kunne ikke koble til en ZoneMinder-server.",
+            "invalid_auth": "Ugyldig godkjenning"
         },
-        "flow_title": "ZoneMinder",
+        "flow_title": "",
         "step": {
             "user": {
                 "data": {
@@ -19,9 +23,9 @@
                     "password": "Passord",
                     "path": "ZM-bane",
                     "path_zms": "ZMS-bane",
-                    "ssl": "Bruk SSL for tilkoblinger til ZoneMinder",
+                    "ssl": "Bruker et SSL-sertifikat",
                     "username": "Brukernavn",
-                    "verify_ssl": "Bekreft SSL-sertifikat"
+                    "verify_ssl": "Verifisere SSL-sertifikat"
                 },
                 "title": "Legg til ZoneMinder Server."
             }
diff --git a/homeassistant/components/zoneminder/translations/pl.json b/homeassistant/components/zoneminder/translations/pl.json
index b8b737c37a3..055b60de794 100644
--- a/homeassistant/components/zoneminder/translations/pl.json
+++ b/homeassistant/components/zoneminder/translations/pl.json
@@ -1,11 +1,33 @@
 {
     "config": {
+        "abort": {
+            "auth_fail": "Nazwa u\u017cytkownika lub has\u0142o jest niepoprawne",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z serwerem ZoneMinder",
+            "invalid_auth": "Niepoprawne uwierzytelnienie"
+        },
+        "create_entry": {
+            "default": "Dodano serwer ZoneMinder."
+        },
+        "error": {
+            "auth_fail": "Nazwa u\u017cytkownika lub has\u0142o jest niepoprawne",
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "connection_error": "Nie uda\u0142o si\u0119 po\u0142\u0105czy\u0107 z serwerem ZoneMinder",
+            "invalid_auth": "Niepoprawne uwierzytelnienie"
+        },
+        "flow_title": "ZoneMinder",
         "step": {
             "user": {
                 "data": {
+                    "host": "Nazwa hosta/adres IP i port (np. 10.10.0.4:8010)",
                     "password": "Has\u0142o",
-                    "username": "Nazwa u\u017cytkownika"
-                }
+                    "path": "\u015acie\u017cka do ZM",
+                    "path_zms": "\u015acie\u017cka do ZMS",
+                    "ssl": "Certyfikat SSL",
+                    "username": "Nazwa u\u017cytkownika",
+                    "verify_ssl": "Weryfikacja certyfikatu SSL"
+                },
+                "title": "Dodawanie serwera ZoneMinder."
             }
         }
     }
diff --git a/homeassistant/components/zoneminder/translations/ru.json b/homeassistant/components/zoneminder/translations/ru.json
index e7ac29e58ab..d599e767f64 100644
--- a/homeassistant/components/zoneminder/translations/ru.json
+++ b/homeassistant/components/zoneminder/translations/ru.json
@@ -2,14 +2,18 @@
     "config": {
         "abort": {
             "auth_fail": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.",
-            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 ZoneMinder."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 ZoneMinder.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
         },
         "create_entry": {
             "default": "\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0441\u0435\u0440\u0432\u0435\u0440 ZoneMinder."
         },
         "error": {
             "auth_fail": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c.",
-            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 ZoneMinder."
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 ZoneMinder.",
+            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f."
         },
         "flow_title": "ZoneMinder",
         "step": {
@@ -19,7 +23,7 @@
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "path": "\u041f\u0443\u0442\u044c \u043a ZM",
                     "path_zms": "\u041f\u0443\u0442\u044c \u043a ZMS",
-                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c SSL \u0434\u043b\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f",
+                    "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
                     "username": "\u041b\u043e\u0433\u0438\u043d",
                     "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 },
diff --git a/homeassistant/components/zoneminder/translations/zh-Hans.json b/homeassistant/components/zoneminder/translations/zh-Hans.json
new file mode 100644
index 00000000000..a5f4ff11f09
--- /dev/null
+++ b/homeassistant/components/zoneminder/translations/zh-Hans.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u7528\u6237\u540d"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/zoneminder/translations/zh-Hant.json b/homeassistant/components/zoneminder/translations/zh-Hant.json
index 5d7c96c2ad2..310a15014f6 100644
--- a/homeassistant/components/zoneminder/translations/zh-Hant.json
+++ b/homeassistant/components/zoneminder/translations/zh-Hant.json
@@ -2,14 +2,18 @@
     "config": {
         "abort": {
             "auth_fail": "\u4f7f\u7528\u8005\u540d\u7a31\u6216\u5bc6\u78bc\u932f\u8aa4\u3002",
-            "connection_error": "ZoneMinder \u4f3a\u670d\u5668\u9023\u7dda\u5931\u6557\u3002"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "connection_error": "ZoneMinder \u4f3a\u670d\u5668\u9023\u7dda\u5931\u6557\u3002",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548"
         },
         "create_entry": {
             "default": "ZoneMinder \u4f3a\u670d\u5668\u5df2\u65b0\u589e\u3002"
         },
         "error": {
             "auth_fail": "\u4f7f\u7528\u8005\u540d\u7a31\u6216\u5bc6\u78bc\u932f\u8aa4\u3002",
-            "connection_error": "ZoneMinder \u4f3a\u670d\u5668\u9023\u7dda\u5931\u6557\u3002"
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "connection_error": "ZoneMinder \u4f3a\u670d\u5668\u9023\u7dda\u5931\u6557\u3002",
+            "invalid_auth": "\u9a57\u8b49\u78bc\u7121\u6548"
         },
         "flow_title": "ZoneMinder",
         "step": {
@@ -19,7 +23,7 @@
                     "password": "\u5bc6\u78bc",
                     "path": "ZM \u8def\u5f91",
                     "path_zms": "ZMS \u8def\u5f91",
-                    "ssl": "\u4f7f\u7528 SSL/TLS \u9023\u7dda\u81f3 ZoneMinder",
+                    "ssl": "\u4f7f\u7528 SSL \u8a8d\u8b49",
                     "username": "\u4f7f\u7528\u8005\u540d\u7a31",
                     "verify_ssl": "\u78ba\u8a8d SSL \u8a8d\u8b49"
                 },
diff --git a/homeassistant/components/zwave/config_flow.py b/homeassistant/components/zwave/config_flow.py
index d6c64e914f6..18c5d2f6f4e 100644
--- a/homeassistant/components/zwave/config_flow.py
+++ b/homeassistant/components/zwave/config_flow.py
@@ -1,7 +1,6 @@
 """Config flow to configure Z-Wave."""
 # pylint: disable=import-outside-toplevel
 from collections import OrderedDict
-import logging
 
 import voluptuous as vol
 
@@ -14,8 +13,6 @@ from .const import (
     DOMAIN,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @config_entries.HANDLERS.register(DOMAIN)
 class ZwaveFlowHandler(config_entries.ConfigFlow):
@@ -31,7 +28,7 @@ class ZwaveFlowHandler(config_entries.ConfigFlow):
     async def async_step_user(self, user_input=None):
         """Handle a flow start."""
         if self._async_current_entries():
-            return self.async_abort(reason="one_instance_only")
+            return self.async_abort(reason="single_instance_allowed")
 
         errors = {}
 
diff --git a/homeassistant/components/zwave/fan.py b/homeassistant/components/zwave/fan.py
index a2dbc3a4eab..df6f5d8b8f5 100644
--- a/homeassistant/components/zwave/fan.py
+++ b/homeassistant/components/zwave/fan.py
@@ -1,5 +1,4 @@
 """Support for Z-Wave fans."""
-import logging
 import math
 
 from homeassistant.components.fan import (
@@ -16,8 +15,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from . import ZWaveDeviceEntity
 
-_LOGGER = logging.getLogger(__name__)
-
 SPEED_LIST = [SPEED_OFF, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]
 
 SUPPORTED_FEATURES = SUPPORT_SET_SPEED
diff --git a/homeassistant/components/zwave/node_entity.py b/homeassistant/components/zwave/node_entity.py
index a9a4bf22b8b..064f21c69b4 100644
--- a/homeassistant/components/zwave/node_entity.py
+++ b/homeassistant/components/zwave/node_entity.py
@@ -1,7 +1,6 @@
 """Entity class that represents Z-Wave node."""
 # pylint: disable=import-outside-toplevel
 from itertools import count
-import logging
 
 from homeassistant.const import ATTR_BATTERY_LEVEL, ATTR_ENTITY_ID, ATTR_WAKEUP
 from homeassistant.core import callback
@@ -23,8 +22,6 @@ from .const import (
 )
 from .util import is_node_parsed, node_device_id_and_name, node_name
 
-_LOGGER = logging.getLogger(__name__)
-
 ATTR_QUERY_STAGE = "query_stage"
 ATTR_AWAKE = "is_awake"
 ATTR_READY = "is_ready"
diff --git a/homeassistant/components/zwave/sensor.py b/homeassistant/components/zwave/sensor.py
index b551e436352..aae38382f2e 100644
--- a/homeassistant/components/zwave/sensor.py
+++ b/homeassistant/components/zwave/sensor.py
@@ -1,6 +1,4 @@
 """Support for Z-Wave sensors."""
-import logging
-
 from homeassistant.components.sensor import DEVICE_CLASS_BATTERY, DOMAIN
 from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
 from homeassistant.core import callback
@@ -8,8 +6,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from . import ZWaveDeviceEntity, const
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up Z-Wave Sensor from Config Entry."""
diff --git a/homeassistant/components/zwave/strings.json b/homeassistant/components/zwave/strings.json
index cab8e7461cb..852b8ca22fa 100644
--- a/homeassistant/components/zwave/strings.json
+++ b/homeassistant/components/zwave/strings.json
@@ -14,8 +14,8 @@
       "option_error": "Z-Wave validation failed. Is the path to the USB stick correct?"
     },
     "abort": {
-      "already_configured": "Z-Wave is already configured",
-      "one_instance_only": "Component only supports one Z-Wave instance"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   },
   "state": {
@@ -30,4 +30,4 @@
       "ready": "Ready"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/zwave/switch.py b/homeassistant/components/zwave/switch.py
index c5770bf7702..06606dac938 100644
--- a/homeassistant/components/zwave/switch.py
+++ b/homeassistant/components/zwave/switch.py
@@ -1,5 +1,4 @@
 """Support for Z-Wave switches."""
-import logging
 import time
 
 from homeassistant.components.switch import DOMAIN, SwitchEntity
@@ -8,8 +7,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from . import ZWaveDeviceEntity, workaround
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up Z-Wave Switch from Config Entry."""
diff --git a/homeassistant/components/zwave/translations/ca.json b/homeassistant/components/zwave/translations/ca.json
index dedf7f60e4a..ce4e7f5301b 100644
--- a/homeassistant/components/zwave/translations/ca.json
+++ b/homeassistant/components/zwave/translations/ca.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Z-Wave ja est\u00e0 configurat",
-            "one_instance_only": "El component nom\u00e9s admet una inst\u00e0ncia de Z-Wave"
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "one_instance_only": "El component nom\u00e9s admet una inst\u00e0ncia de Z-Wave",
+            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
         },
         "error": {
             "option_error": "Ha fallat la validaci\u00f3 de Z-Wave. \u00c9s correcta la ruta al port USB on hi ha connectat el dispositiu?"
diff --git a/homeassistant/components/zwave/translations/cs.json b/homeassistant/components/zwave/translations/cs.json
index 858edb1b0dc..0e107422a47 100644
--- a/homeassistant/components/zwave/translations/cs.json
+++ b/homeassistant/components/zwave/translations/cs.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Z-Wave je ji\u017e nakonfigurov\u00e1no",
-            "one_instance_only": "Komponenta podporuje pouze jednu instanci Z-Wave"
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno",
+            "one_instance_only": "Komponenta podporuje pouze jednu instanci Z-Wave",
+            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
         },
         "error": {
             "option_error": "Z-Wave ov\u011b\u0159en\u00ed se nezda\u0159ilo. Je cesta k USB za\u0159\u00edzen\u00ed spr\u00e1vn\u011b?"
@@ -11,7 +12,7 @@
             "user": {
                 "data": {
                     "network_key": "S\u00ed\u0165ov\u00fd kl\u00ed\u010d (ponechte pr\u00e1zdn\u00e9 pro automatick\u00e9 generov\u00e1n\u00ed)",
-                    "usb_path": "Cesta k USB"
+                    "usb_path": "Cesta k USB za\u0159\u00edzen\u00ed"
                 },
                 "description": "Viz https://www.home-assistant.io/docs/z-wave/installation/ pro informace o konfigura\u010dn\u00edch prom\u011bnn\u00fdch",
                 "title": "Nastavit Z-Wave"
@@ -26,8 +27,8 @@
             "sleeping": "\u00dasporn\u00fd re\u017eim"
         },
         "query_stage": {
-            "dead": "Nereaguje ({query_stage})",
-            "initializing": "Inicializace ( {query_stage} )"
+            "dead": "Nereaguje",
+            "initializing": "Inicializace"
         }
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/zwave/translations/en.json b/homeassistant/components/zwave/translations/en.json
index bd27966b6a5..19732f99e6f 100644
--- a/homeassistant/components/zwave/translations/en.json
+++ b/homeassistant/components/zwave/translations/en.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Z-Wave is already configured",
-            "one_instance_only": "Component only supports one Z-Wave instance"
+            "already_configured": "Device is already configured",
+            "one_instance_only": "Component only supports one Z-Wave instance",
+            "single_instance_allowed": "Already configured. Only a single configuration possible."
         },
         "error": {
             "option_error": "Z-Wave validation failed. Is the path to the USB stick correct?"
diff --git a/homeassistant/components/zwave/translations/es.json b/homeassistant/components/zwave/translations/es.json
index 02b95f0e028..f4d8141d7d7 100644
--- a/homeassistant/components/zwave/translations/es.json
+++ b/homeassistant/components/zwave/translations/es.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "already_configured": "Z-Wave ya est\u00e1 configurado",
-            "one_instance_only": "El componente solo admite una instancia de Z-Wave"
+            "one_instance_only": "El componente solo admite una instancia de Z-Wave",
+            "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "error": {
             "option_error": "Z-Wave error de validaci\u00f3n. \u00bfLa ruta de acceso a la memoria USB escorrecta?"
diff --git a/homeassistant/components/zwave/translations/et.json b/homeassistant/components/zwave/translations/et.json
index 07d5d386548..93705f4c805 100644
--- a/homeassistant/components/zwave/translations/et.json
+++ b/homeassistant/components/zwave/translations/et.json
@@ -1,4 +1,24 @@
 {
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud",
+            "one_instance_only": "Komponent toetab ainult \u00fchte Z-Wave sidumist",
+            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
+        },
+        "error": {
+            "option_error": "Z-Wave valideerimine nurjus. Kas USB-m\u00e4lupulga tee on \u00f5ige?"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "network_key": "V\u00f5rguv\u00f5ti (j\u00e4ta automaatse genereerimise jaoks t\u00fchjaks)",
+                    "usb_path": "USB seadme rada"
+                },
+                "description": "Konfiguratsioonimuutujate kohta leiad teavet https://www.home-assistant.io/docs/z-wave/installation/",
+                "title": "Seadista Z-Wave"
+            }
+        }
+    },
     "state": {
         "_": {
             "dead": "Surnud",
diff --git a/homeassistant/components/zwave/translations/it.json b/homeassistant/components/zwave/translations/it.json
index 2b1b248e92c..d8647733fad 100644
--- a/homeassistant/components/zwave/translations/it.json
+++ b/homeassistant/components/zwave/translations/it.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Z-Wave \u00e8 gi\u00e0 configurato",
-            "one_instance_only": "Il componente supporta solo un'istanza di Z-Wave"
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato",
+            "one_instance_only": "Il componente supporta solo un'istanza di Z-Wave",
+            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
         },
         "error": {
             "option_error": "Convalida Z-Wave fallita. Il percorso della chiavetta USB \u00e8 corretto?"
diff --git a/homeassistant/components/zwave/translations/nl.json b/homeassistant/components/zwave/translations/nl.json
index 96e697c021a..35f912576e5 100644
--- a/homeassistant/components/zwave/translations/nl.json
+++ b/homeassistant/components/zwave/translations/nl.json
@@ -2,7 +2,8 @@
     "config": {
         "abort": {
             "already_configured": "Z-Wave is al geconfigureerd",
-            "one_instance_only": "Component ondersteunt slechts \u00e9\u00e9n Z-Wave-instantie"
+            "one_instance_only": "Component ondersteunt slechts \u00e9\u00e9n Z-Wave-instantie",
+            "single_instance_allowed": "Al geconfigureerd. Slechts \u00e9\u00e9n configuratie mogelijk."
         },
         "error": {
             "option_error": "Z-Wave-validatie mislukt. Is het pad naar de USB-stick correct?"
diff --git a/homeassistant/components/zwave/translations/no.json b/homeassistant/components/zwave/translations/no.json
index d2614bbb2c7..f20cf46aeb4 100644
--- a/homeassistant/components/zwave/translations/no.json
+++ b/homeassistant/components/zwave/translations/no.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Z-Wave er allerede konfigurert",
-            "one_instance_only": "Komponenten st\u00f8tter kun en Z-Wave-forekomst"
+            "already_configured": "Enheten er allerede konfigurert",
+            "one_instance_only": "Komponenten st\u00f8tter kun en Z-Wave-forekomst",
+            "single_instance_allowed": "Allerede konfigurert. Bare \u00e9n enkelt konfigurasjon er mulig."
         },
         "error": {
             "option_error": "Z-Wave-validering mislyktes. Er banen til USB dongel riktig?"
@@ -11,7 +12,7 @@
             "user": {
                 "data": {
                     "network_key": "Nettverksn\u00f8kkel (la v\u00e6re tom for automatisk oppretting)",
-                    "usb_path": "USB bane"
+                    "usb_path": "USB enhetsbane"
                 },
                 "description": "Se [www.home-assistant.io/docs/z-wave/installation/](https://www.home-assistant.io/docs/z-wave/installation/) for informasjon om konfigurasjon variablene",
                 "title": "Sett opp Z-Wave"
diff --git a/homeassistant/components/zwave/translations/pl.json b/homeassistant/components/zwave/translations/pl.json
index ecff84ceb97..6d7675391ff 100644
--- a/homeassistant/components/zwave/translations/pl.json
+++ b/homeassistant/components/zwave/translations/pl.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Z-Wave jest ju\u017c skonfigurowany.",
-            "one_instance_only": "Komponent obs\u0142uguje tylko jedn\u0105 instancj\u0119 Z-Wave"
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane",
+            "one_instance_only": "Komponent obs\u0142uguje tylko jedn\u0105 instancj\u0119 Z-Wave",
+            "single_instance_allowed": "Ju\u017c skonfigurowano. Mo\u017cliwa jest tylko jedna konfiguracja."
         },
         "error": {
             "option_error": "Walidacja Z-Wave si\u0119 nie powiod\u0142a. Czy \u015bcie\u017cka do kontrolera Z-Wave USB jest prawid\u0142owa?"
@@ -21,9 +22,9 @@
     "state": {
         "_": {
             "dead": "martwy",
-            "initializing": "Inicjowanie",
-            "ready": "Gotowe",
-            "sleeping": "U\u015bpiony"
+            "initializing": "inicjalizacja",
+            "ready": "gotowy",
+            "sleeping": "u\u015bpiony"
         },
         "query_stage": {
             "dead": "martwy",
diff --git a/homeassistant/components/zwave/translations/ru.json b/homeassistant/components/zwave/translations/ru.json
index 72255110b6a..c74405767a2 100644
--- a/homeassistant/components/zwave/translations/ru.json
+++ b/homeassistant/components/zwave/translations/ru.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
-            "one_instance_only": "\u041a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0441 \u043e\u0434\u043d\u0438\u043c \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440\u043e\u043c Z-Wave."
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant.",
+            "one_instance_only": "\u041a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0441 \u043e\u0434\u043d\u0438\u043c \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440\u043e\u043c Z-Wave.",
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430. \u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e."
         },
         "error": {
             "option_error": "\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438 Z-Wave. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043f\u0443\u0442\u044c \u043a USB-\u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
diff --git a/homeassistant/components/zwave/translations/zh-Hant.json b/homeassistant/components/zwave/translations/zh-Hant.json
index 6742964e87a..dd309a245c7 100644
--- a/homeassistant/components/zwave/translations/zh-Hant.json
+++ b/homeassistant/components/zwave/translations/zh-Hant.json
@@ -1,8 +1,9 @@
 {
     "config": {
         "abort": {
-            "already_configured": "Z-Wave \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
-            "one_instance_only": "\u7d44\u4ef6\u50c5\u652f\u63f4\u4e00\u7d44 Z-Wave \u7269\u4ef6"
+            "already_configured": "\u8a2d\u5099\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "one_instance_only": "\u7d44\u4ef6\u50c5\u652f\u63f4\u4e00\u7d44 Z-Wave \u7269\u4ef6",
+            "single_instance_allowed": "\u50c5\u80fd\u8a2d\u5b9a\u4e00\u7d44\u8a2d\u5099\u3002"
         },
         "error": {
             "option_error": "Z-Wave \u9a57\u8b49\u5931\u6557\uff0c\u8acb\u78ba\u5b9a USB \u96a8\u8eab\u789f\u8def\u5f91\u6b63\u78ba\uff1f"
diff --git a/homeassistant/components/zwave/websocket_api.py b/homeassistant/components/zwave/websocket_api.py
index 24bf8d80a75..5e3a49df63c 100644
--- a/homeassistant/components/zwave/websocket_api.py
+++ b/homeassistant/components/zwave/websocket_api.py
@@ -1,7 +1,4 @@
 """Web socket API for Z-Wave."""
-
-import logging
-
 import voluptuous as vol
 
 from homeassistant.components import websocket_api
@@ -17,8 +14,6 @@ from .const import (
     DATA_ZWAVE_CONFIG,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 TYPE = "type"
 ID = "id"
 
diff --git a/homeassistant/components/zwave/workaround.py b/homeassistant/components/zwave/workaround.py
index a23f69c4af0..9ef7cde446d 100644
--- a/homeassistant/components/zwave/workaround.py
+++ b/homeassistant/components/zwave/workaround.py
@@ -7,7 +7,7 @@ GE = 0x0063
 PHILIO = 0x013C
 SOMFY = 0x0047
 WENZHOU = 0x0118
-VIZIA = 0x001D
+LEVITON = 0x001D
 
 # Product IDs
 GE_FAN_CONTROLLER_12730 = 0x3034
@@ -17,6 +17,7 @@ PHILIO_SLIM_SENSOR = 0x0002
 PHILIO_3_IN_1_SENSOR_GEN_4 = 0x000D
 PHILIO_PAN07 = 0x0005
 VIZIA_FAN_CONTROLLER_VRF01 = 0x0334
+LEVITON_DECORA_FAN_CONTROLLER_ZW4SF = 0x0002
 
 # Product Types
 FGFS101_FLOOD_SENSOR_TYPE = 0x0B00
@@ -27,6 +28,7 @@ PHILIO_SWITCH = 0x0001
 PHILIO_SENSOR = 0x0002
 SOMFY_ZRTSI = 0x5A52
 VIZIA_DIMMER = 0x1001
+LEVITON_DECORA_FAN_CONTROLLER = 0x0038
 
 # Mapping devices
 PHILIO_SLIM_SENSOR_MOTION_MTII = (PHILIO, PHILIO_SENSOR, PHILIO_SLIM_SENSOR, 0)
@@ -89,11 +91,17 @@ JASCO_FAN_CONTROLLER_14314_MULTILEVEL = (
     const.COMMAND_CLASS_SWITCH_MULTILEVEL,
 )
 VIZIA_FAN_CONTROLLER_VRF01_MULTILEVEL = (
-    VIZIA,
+    LEVITON,
     VIZIA_DIMMER,
     VIZIA_FAN_CONTROLLER_VRF01,
     const.COMMAND_CLASS_SWITCH_MULTILEVEL,
 )
+LEVITON_FAN_CONTROLLER_ZW4SF_MULTILEVEL = (
+    LEVITON,
+    LEVITON_DECORA_FAN_CONTROLLER,
+    LEVITON_DECORA_FAN_CONTROLLER_ZW4SF,
+    const.COMMAND_CLASS_SWITCH_MULTILEVEL,
+)
 
 # List of component workarounds by
 # (manufacturer_id, product_type, command_class)
@@ -110,6 +118,7 @@ DEVICE_COMPONENT_MAPPING_MTI = {
     GE_FAN_CONTROLLER_14287_MULTILEVEL: "fan",
     JASCO_FAN_CONTROLLER_14314_MULTILEVEL: "fan",
     VIZIA_FAN_CONTROLLER_VRF01_MULTILEVEL: "fan",
+    LEVITON_FAN_CONTROLLER_ZW4SF_MULTILEVEL: "fan",
 }
 
 
diff --git a/homeassistant/config.py b/homeassistant/config.py
index 3e9dd27458d..c3fe18d69df 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -32,6 +32,7 @@ from homeassistant.const import (
     CONF_ID,
     CONF_INTERNAL_URL,
     CONF_LATITUDE,
+    CONF_LEGACY_TEMPLATES,
     CONF_LONGITUDE,
     CONF_MEDIA_DIRS,
     CONF_NAME,
@@ -224,6 +225,7 @@ CORE_CONFIG_SCHEMA = CUSTOMIZE_CONFIG_SCHEMA.extend(
         ),
         # pylint: disable=no-value-for-parameter
         vol.Optional(CONF_MEDIA_DIRS): cv.schema_with_slug_keys(vol.IsDir()),
+        vol.Optional(CONF_LEGACY_TEMPLATES): cv.boolean,
     }
 )
 
@@ -500,6 +502,7 @@ async def async_process_ha_core_config(hass: HomeAssistant, config: Dict) -> Non
         (CONF_INTERNAL_URL, "internal_url"),
         (CONF_EXTERNAL_URL, "external_url"),
         (CONF_MEDIA_DIRS, "media_dirs"),
+        (CONF_LEGACY_TEMPLATES, "legacy_templates"),
     ):
         if key in config:
             setattr(hac, attr, config[key])
@@ -747,8 +750,14 @@ async def async_process_component_config(
     config_validator = None
     try:
         config_validator = integration.get_platform("config")
-    except ImportError:
-        pass
+    except ImportError as err:
+        # Filter out import error of the config platform.
+        # If the config platform contains bad imports, make sure
+        # that still fails.
+        if err.name != f"{integration.pkg_path}.config":
+            _LOGGER.error("Error importing config platform %s: %s", domain, err)
+            return None
+
     if config_validator is not None and hasattr(
         config_validator, "async_validate_config"
     ):
@@ -893,7 +902,7 @@ def async_notify_setup_error(
         part = f"[{name}]({link})" if link else name
         message += f" - {part}\n"
 
-    message += "\nPlease check your config."
+    message += "\nPlease check your config and [logs](/config/logs)."
 
     persistent_notification.async_create(
         hass, message, "Invalid config", "invalid_config"
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 139e2066d17..a7de2107ecd 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -25,6 +25,7 @@ SOURCE_HASSIO = "hassio"
 SOURCE_HOMEKIT = "homekit"
 SOURCE_IMPORT = "import"
 SOURCE_INTEGRATION_DISCOVERY = "integration_discovery"
+SOURCE_MQTT = "mqtt"
 SOURCE_SSDP = "ssdp"
 SOURCE_USER = "user"
 SOURCE_ZEROCONF = "zeroconf"
@@ -77,6 +78,8 @@ DISCOVERY_SOURCES = (
     SOURCE_UNIGNORE,
 )
 
+RECONFIGURE_NOTIFICATION_ID = "config_entry_reconfigure"
+
 EVENT_FLOW_DISCOVERED = "config_entry_discovered"
 
 CONN_CLASS_CLOUD_PUSH = "cloud_push"
@@ -139,7 +142,7 @@ class ConfigEntry:
     ) -> None:
         """Initialize a config entry."""
         # Unique id of the config entry
-        self.entry_id = entry_id or uuid_util.uuid_v1mc_hex()
+        self.entry_id = entry_id or uuid_util.random_uuid_hex()
 
         # Version of the configuration.
         self.version = version
@@ -561,10 +564,19 @@ class ConfigEntriesFlowManager(data_entry_flow.FlowManager):
                 title="New devices discovered",
                 message=(
                     "We have discovered new devices on your network. "
-                    "[Check it out](/config/integrations)"
+                    "[Check it out](/config/integrations)."
                 ),
                 notification_id=DISCOVERY_NOTIFICATION_ID,
             )
+        elif source == SOURCE_REAUTH:
+            self.hass.components.persistent_notification.async_create(
+                title="Integration requires reconfiguration",
+                message=(
+                    "At least one of your integrations requires reconfiguration to "
+                    "continue functioning. [Check it out](/config/integrations)."
+                ),
+                notification_id=RECONFIGURE_NOTIFICATION_ID,
+            )
 
 
 class ConfigEntries:
@@ -1003,8 +1015,30 @@ class ConfigFlow(data_entry_flow.FlowHandler):
         await self._async_handle_discovery_without_unique_id()
         return await self.async_step_user()
 
+    @callback
+    def async_abort(
+        self, *, reason: str, description_placeholders: Optional[Dict] = None
+    ) -> Dict[str, Any]:
+        """Abort the config flow."""
+        assert self.hass
+
+        # Remove reauth notification if no reauth flows are in progress
+        if self.source == SOURCE_REAUTH and not any(
+            ent["context"]["source"] == SOURCE_REAUTH
+            for ent in self.hass.config_entries.flow.async_progress()
+            if ent["flow_id"] != self.flow_id
+        ):
+            self.hass.components.persistent_notification.async_dismiss(
+                RECONFIGURE_NOTIFICATION_ID
+            )
+
+        return super().async_abort(
+            reason=reason, description_placeholders=description_placeholders
+        )
+
     async_step_hassio = async_step_discovery
     async_step_homekit = async_step_discovery
+    async_step_mqtt = async_step_discovery
     async_step_ssdp = async_step_discovery
     async_step_zeroconf = async_step_discovery
 
diff --git a/homeassistant/const.py b/homeassistant/const.py
index ec54d017962..fdf4b26567c 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -1,7 +1,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
-MINOR_VERSION = 116
-PATCH_VERSION = "4"
+MINOR_VERSION = 117
+PATCH_VERSION = "0"
 __short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__ = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER = (3, 7, 1)
@@ -34,6 +34,7 @@ CONF_AFTER = "after"
 CONF_ALIAS = "alias"
 CONF_ALLOWLIST_EXTERNAL_URLS = "allowlist_external_urls"
 CONF_API_KEY = "api_key"
+CONF_API_TOKEN = "api_token"
 CONF_API_VERSION = "api_version"
 CONF_ARMING_TIME = "arming_time"
 CONF_AT = "at"
@@ -112,6 +113,7 @@ CONF_INCLUDE = "include"
 CONF_INTERNAL_URL = "internal_url"
 CONF_IP_ADDRESS = "ip_address"
 CONF_LATITUDE = "latitude"
+CONF_LEGACY_TEMPLATES = "legacy_templates"
 CONF_LIGHTS = "lights"
 CONF_LONGITUDE = "longitude"
 CONF_MAC = "mac"
@@ -353,6 +355,9 @@ ATTR_STATE = "state"
 ATTR_EDITABLE = "editable"
 ATTR_OPTION = "option"
 
+# The entity has been restored with restore state
+ATTR_RESTORED = "restored"
+
 # Bitfield of supported component features for the entity
 ATTR_SUPPORTED_FEATURES = "supported_features"
 
@@ -472,6 +477,10 @@ SPEED_METERS_PER_SECOND = f"{LENGTH_METERS}/{TIME_SECONDS}"
 SPEED_KILOMETERS_PER_HOUR = f"{LENGTH_KILOMETERS}/{TIME_HOURS}"
 SPEED_MILES_PER_HOUR = "mph"
 
+# Signal_strength units
+SIGNAL_STRENGTH_DECIBELS = "dB"
+SIGNAL_STRENGTH_DECIBELS_MILLIWATT = "dBm"
+
 # Data units
 DATA_BITS = "bit"
 DATA_KILOBITS = "kbit"
@@ -526,6 +535,7 @@ SERVICE_MEDIA_STOP = "media_stop"
 SERVICE_MEDIA_NEXT_TRACK = "media_next_track"
 SERVICE_MEDIA_PREVIOUS_TRACK = "media_previous_track"
 SERVICE_MEDIA_SEEK = "media_seek"
+SERVICE_REPEAT_SET = "repeat_set"
 SERVICE_SHUFFLE_SET = "shuffle_set"
 
 SERVICE_ALARM_DISARM = "alarm_disarm"
diff --git a/homeassistant/core.py b/homeassistant/core.py
index 82fbe1be2b6..ca4a27eef3d 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -21,6 +21,7 @@ from typing import (
     Any,
     Awaitable,
     Callable,
+    Collection,
     Coroutine,
     Dict,
     Iterable,
@@ -148,6 +149,52 @@ def is_callback(func: Callable[..., Any]) -> bool:
     return getattr(func, "_hass_callback", False) is True
 
 
+@enum.unique
+class HassJobType(enum.Enum):
+    """Represent a job type."""
+
+    Coroutinefunction = 1
+    Callback = 2
+    Executor = 3
+
+
+class HassJob:
+    """Represent a job to be run later.
+
+    We check the callable type in advance
+    so we can avoid checking it every time
+    we run the job.
+    """
+
+    __slots__ = ("job_type", "target")
+
+    def __init__(self, target: Callable):
+        """Create a job object."""
+        if asyncio.iscoroutine(target):
+            raise ValueError("Coroutine not allowed to be passed to HassJob")
+
+        self.target = target
+        self.job_type = _get_callable_job_type(target)
+
+    def __repr__(self) -> str:
+        """Return the job."""
+        return f"<Job {self.job_type} {self.target}>"
+
+
+def _get_callable_job_type(target: Callable) -> HassJobType:
+    """Determine the job type from the callable."""
+    # Check for partials to properly determine if coroutine function
+    check_target = target
+    while isinstance(check_target, functools.partial):
+        check_target = check_target.func
+
+    if asyncio.iscoroutinefunction(check_target):
+        return HassJobType.Coroutinefunction
+    if is_callback(check_target):
+        return HassJobType.Callback
+    return HassJobType.Executor
+
+
 class CoreState(enum.Enum):
     """Represent the current state of Home Assistant."""
 
@@ -305,24 +352,33 @@ class HomeAssistant:
         if target is None:
             raise ValueError("Don't call async_add_job with None")
 
-        task = None
+        if asyncio.iscoroutine(target):
+            return self.async_create_task(cast(Coroutine, target))
 
-        # Check for partials to properly determine if coroutine function
-        check_target = target
-        while isinstance(check_target, functools.partial):
-            check_target = check_target.func
+        return self.async_add_hass_job(HassJob(target), *args)
 
-        if asyncio.iscoroutine(check_target):
-            task = self.loop.create_task(target)  # type: ignore
-        elif asyncio.iscoroutinefunction(check_target):
-            task = self.loop.create_task(target(*args))
-        elif is_callback(check_target):
-            self.loop.call_soon(target, *args)
+    @callback
+    def async_add_hass_job(
+        self, hassjob: HassJob, *args: Any
+    ) -> Optional[asyncio.Future]:
+        """Add a HassJob from within the event loop.
+
+        This method must be run in the event loop.
+        hassjob: HassJob to call.
+        args: parameters for method to call.
+        """
+        if hassjob.job_type == HassJobType.Coroutinefunction:
+            task = self.loop.create_task(hassjob.target(*args))
+        elif hassjob.job_type == HassJobType.Callback:
+            self.loop.call_soon(hassjob.target, *args)
+            return None
         else:
-            task = self.loop.run_in_executor(None, target, *args)  # type: ignore
+            task = self.loop.run_in_executor(  # type: ignore
+                None, hassjob.target, *args
+            )
 
         # If a task is scheduled
-        if self._track_task and task is not None:
+        if self._track_task:
             self._pending_tasks.append(task)
 
         return task
@@ -365,6 +421,20 @@ class HomeAssistant:
         """Stop track tasks so you can't wait for all tasks to be done."""
         self._track_task = False
 
+    @callback
+    def async_run_hass_job(self, hassjob: HassJob, *args: Any) -> None:
+        """Run a HassJob from within the event loop.
+
+        This method must be run in the event loop.
+
+        hassjob: HassJob
+        args: parameters for method to call.
+        """
+        if hassjob.job_type == HassJobType.Callback:
+            hassjob.target(*args)
+        else:
+            self.async_add_hass_job(hassjob, *args)
+
     @callback
     def async_run_job(
         self, target: Callable[..., Union[None, Awaitable]], *args: Any
@@ -376,14 +446,11 @@ class HomeAssistant:
         target: target to call.
         args: parameters for method to call.
         """
-        if (
-            not asyncio.iscoroutine(target)
-            and not asyncio.iscoroutinefunction(target)
-            and is_callback(target)
-        ):
-            target(*args)
-        else:
-            self.async_add_job(target, *args)
+        if asyncio.iscoroutine(target):
+            self.async_create_task(cast(Coroutine, target))
+            return
+
+        self.async_run_hass_job(HassJob(target), *args)
 
     def block_till_done(self) -> None:
         """Block until all pending work is done."""
@@ -510,7 +577,7 @@ class Context:
 
     user_id: str = attr.ib(default=None)
     parent_id: Optional[str] = attr.ib(default=None)
-    id: str = attr.ib(factory=uuid_util.uuid_v1mc_hex)
+    id: str = attr.ib(factory=uuid_util.random_uuid_hex)
 
     def as_dict(self) -> dict:
         """Return a dictionary representation of the context."""
@@ -561,8 +628,8 @@ class Event:
         return {
             "event_type": self.event_type,
             "data": dict(self.data),
-            "origin": str(self.origin),
-            "time_fired": self.time_fired,
+            "origin": str(self.origin.value),
+            "time_fired": self.time_fired.isoformat(),
             "context": self.context.as_dict(),
         }
 
@@ -591,7 +658,7 @@ class EventBus:
 
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize a new event bus."""
-        self._listeners: Dict[str, List[Callable]] = {}
+        self._listeners: Dict[str, List[HassJob]] = {}
         self._hass = hass
 
     @callback
@@ -626,6 +693,7 @@ class EventBus:
         event_data: Optional[Dict] = None,
         origin: EventOrigin = EventOrigin.local,
         context: Optional[Context] = None,
+        time_fired: Optional[datetime.datetime] = None,
     ) -> None:
         """Fire an event.
 
@@ -638,7 +706,7 @@ class EventBus:
         if match_all_listeners is not None and event_type != EVENT_HOMEASSISTANT_CLOSE:
             listeners = match_all_listeners + listeners
 
-        event = Event(event_type, event_data, origin, None, context)
+        event = Event(event_type, event_data, origin, time_fired, context)
 
         if event_type != EVENT_TIME_CHANGED:
             _LOGGER.debug("Bus:Handling %s", event)
@@ -646,8 +714,8 @@ class EventBus:
         if not listeners:
             return
 
-        for func in listeners:
-            self._hass.async_add_job(func, event)
+        for job in listeners:
+            self._hass.async_add_hass_job(job, event)
 
     def listen(self, event_type: str, listener: Callable) -> CALLBACK_TYPE:
         """Listen for all events or events of a specific type.
@@ -674,14 +742,15 @@ class EventBus:
 
         This method must be run in the event loop.
         """
-        if event_type in self._listeners:
-            self._listeners[event_type].append(listener)
-        else:
-            self._listeners[event_type] = [listener]
+        return self._async_listen_job(event_type, HassJob(listener))
+
+    @callback
+    def _async_listen_job(self, event_type: str, hassjob: HassJob) -> CALLBACK_TYPE:
+        self._listeners.setdefault(event_type, []).append(hassjob)
 
         def remove_listener() -> None:
             """Remove the listener."""
-            self._async_remove_listener(event_type, listener)
+            self._async_remove_listener(event_type, hassjob)
 
         return remove_listener
 
@@ -714,31 +783,36 @@ class EventBus:
 
         This method must be run in the event loop.
         """
+        job: Optional[HassJob] = None
 
         @callback
-        def onetime_listener(event: Event) -> None:
+        def _onetime_listener(event: Event) -> None:
             """Remove listener from event bus and then fire listener."""
-            if hasattr(onetime_listener, "run"):
+            nonlocal job
+            if hasattr(_onetime_listener, "run"):
                 return
             # Set variable so that we will never run twice.
             # Because the event bus loop might have async_fire queued multiple
             # times, its possible this listener may already be lined up
             # multiple times as well.
             # This will make sure the second time it does nothing.
-            setattr(onetime_listener, "run", True)
-            self._async_remove_listener(event_type, onetime_listener)
+            setattr(_onetime_listener, "run", True)
+            assert job is not None
+            self._async_remove_listener(event_type, job)
             self._hass.async_run_job(listener, event)
 
-        return self.async_listen(event_type, onetime_listener)
+        job = HassJob(_onetime_listener)
+
+        return self._async_listen_job(event_type, job)
 
     @callback
-    def _async_remove_listener(self, event_type: str, listener: Callable) -> None:
+    def _async_remove_listener(self, event_type: str, hassjob: HassJob) -> None:
         """Remove a listener of a specific event_type.
 
         This method must be run in the event loop.
         """
         try:
-            self._listeners[event_type].remove(listener)
+            self._listeners[event_type].remove(hassjob)
 
             # delete event_type list if empty
             if not self._listeners[event_type]:
@@ -746,7 +820,7 @@ class EventBus:
         except (KeyError, ValueError):
             # KeyError is key event_type listener did not exist
             # ValueError if listener did not exist within event_type
-            _LOGGER.warning("Unable to remove unknown listener %s", listener)
+            _LOGGER.warning("Unable to remove unknown job listener %s", hassjob)
 
 
 class State:
@@ -771,6 +845,7 @@ class State:
         "context",
         "domain",
         "object_id",
+        "_as_dict",
     ]
 
     def __init__(
@@ -805,6 +880,7 @@ class State:
         self.last_changed = last_changed or self.last_updated
         self.context = context or Context()
         self.domain, self.object_id = split_entity_id(self.entity_id)
+        self._as_dict: Optional[Dict[str, Collection[Any]]] = None
 
     @property
     def name(self) -> str:
@@ -821,14 +897,21 @@ class State:
         To be used for JSON serialization.
         Ensures: state == State.from_dict(state.as_dict())
         """
-        return {
-            "entity_id": self.entity_id,
-            "state": self.state,
-            "attributes": dict(self.attributes),
-            "last_changed": self.last_changed,
-            "last_updated": self.last_updated,
-            "context": self.context.as_dict(),
-        }
+        if not self._as_dict:
+            last_changed_isoformat = self.last_changed.isoformat()
+            if self.last_changed == self.last_updated:
+                last_updated_isoformat = last_changed_isoformat
+            else:
+                last_updated_isoformat = self.last_updated.isoformat()
+            self._as_dict = {
+                "entity_id": self.entity_id,
+                "state": self.state,
+                "attributes": dict(self.attributes),
+                "last_changed": last_changed_isoformat,
+                "last_updated": last_updated_isoformat,
+                "context": self.context.as_dict(),
+            }
+        return self._as_dict
 
     @classmethod
     def from_dict(cls, json_dict: Dict) -> Any:
@@ -890,6 +973,7 @@ class StateMachine:
     def __init__(self, bus: EventBus, loop: asyncio.events.AbstractEventLoop) -> None:
         """Initialize state machine."""
         self._states: Dict[str, State] = {}
+        self._reservations: Set[str] = set()
         self._bus = bus
         self._loop = loop
 
@@ -997,6 +1081,9 @@ class StateMachine:
         entity_id = entity_id.lower()
         old_state = self._states.pop(entity_id, None)
 
+        if entity_id in self._reservations:
+            self._reservations.remove(entity_id)
+
         if old_state is None:
             return False
 
@@ -1033,6 +1120,29 @@ class StateMachine:
             context,
         ).result()
 
+    @callback
+    def async_reserve(self, entity_id: str) -> None:
+        """Reserve a state in the state machine for an entity being added.
+
+        This must not fire an event when the state is reserved.
+
+        This avoids a race condition where multiple entities with the same
+        entity_id are added.
+        """
+        entity_id = entity_id.lower()
+        if entity_id in self._states or entity_id in self._reservations:
+            raise HomeAssistantError(
+                "async_reserve must not be called once the state is in the state machine."
+            )
+
+        self._reservations.add(entity_id)
+
+    @callback
+    def async_available(self, entity_id: str) -> bool:
+        """Check to see if an entity_id is available to be used."""
+        entity_id = entity_id.lower()
+        return entity_id not in self._states and entity_id not in self._reservations
+
     @callback
     def async_set(
         self,
@@ -1070,7 +1180,15 @@ class StateMachine:
         if context is None:
             context = Context()
 
-        state = State(entity_id, new_state, attributes, last_changed, None, context)
+        state = State(
+            entity_id,
+            new_state,
+            attributes,
+            last_changed,
+            None,
+            context,
+            old_state is None,
+        )
         self._states[entity_id] = state
         self._bus.async_fire(
             EVENT_STATE_CHANGED,
@@ -1083,7 +1201,7 @@ class StateMachine:
 class Service:
     """Representation of a callable service."""
 
-    __slots__ = ["func", "schema", "is_callback", "is_coroutinefunction"]
+    __slots__ = ["job", "schema"]
 
     def __init__(
         self,
@@ -1092,13 +1210,8 @@ class Service:
         context: Optional[Context] = None,
     ) -> None:
         """Initialize a service."""
-        self.func = func
+        self.job = HassJob(func)
         self.schema = schema
-        # Properly detect wrapped functions
-        while isinstance(func, functools.partial):
-            func = func.func
-        self.is_callback = is_callback(func)
-        self.is_coroutinefunction = asyncio.iscoroutinefunction(func)
 
 
 class ServiceCall:
@@ -1366,12 +1479,12 @@ class ServiceRegistry:
         self, handler: Service, service_call: ServiceCall
     ) -> None:
         """Execute a service."""
-        if handler.is_coroutinefunction:
-            await handler.func(service_call)
-        elif handler.is_callback:
-            handler.func(service_call)
+        if handler.job.job_type == HassJobType.Coroutinefunction:
+            await handler.job.target(service_call)
+        elif handler.job.job_type == HassJobType.Callback:
+            handler.job.target(service_call)
         else:
-            await self._hass.async_add_executor_job(handler.func, service_call)
+            await self._hass.async_add_executor_job(handler.job.target, service_call)
 
 
 class Config:
@@ -1416,6 +1529,9 @@ class Config:
         # If Home Assistant is running in safe mode
         self.safe_mode: bool = False
 
+        # Use legacy template behavior
+        self.legacy_templates: bool = True
+
     def distance(self, lat: float, lon: float) -> Optional[float]:
         """Calculate distance from Home Assistant.
 
@@ -1643,13 +1759,18 @@ def _async_create_timer(hass: HomeAssistant) -> None:
         """Fire next time event."""
         now = dt_util.utcnow()
 
-        hass.bus.async_fire(EVENT_TIME_CHANGED, {ATTR_NOW: now}, context=timer_context)
+        hass.bus.async_fire(
+            EVENT_TIME_CHANGED, {ATTR_NOW: now}, time_fired=now, context=timer_context
+        )
 
         # If we are more than a second late, a tick was missed
         late = monotonic() - target
         if late > 1:
             hass.bus.async_fire(
-                EVENT_TIMER_OUT_OF_SYNC, {ATTR_SECONDS: late}, context=timer_context
+                EVENT_TIMER_OUT_OF_SYNC,
+                {ATTR_SECONDS: late},
+                time_fired=now,
+                context=timer_context,
             )
 
         schedule_tick(now)
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index b553c190f55..b707ec62d3d 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -1,7 +1,6 @@
 """Classes to help gather user submissions."""
 import abc
 import asyncio
-import logging
 from typing import Any, Dict, List, Optional, cast
 import uuid
 
@@ -10,8 +9,6 @@ import voluptuous as vol
 from .core import HomeAssistant, callback
 from .exceptions import HomeAssistantError
 
-_LOGGER = logging.getLogger(__name__)
-
 RESULT_TYPE_FORM = "form"
 RESULT_TYPE_CREATE_ENTRY = "create_entry"
 RESULT_TYPE_ABORT = "abort"
@@ -264,11 +261,17 @@ class FlowHandler:
     @property
     def source(self) -> Optional[str]:
         """Source that initialized the flow."""
+        if not hasattr(self, "context"):
+            return None
+
         return self.context.get("source", None)
 
     @property
     def show_advanced_options(self) -> bool:
         """If we should show advanced options."""
+        if not hasattr(self, "context"):
+            return False
+
         return self.context.get("show_advanced_options", False)
 
     @callback
diff --git a/homeassistant/generated/config_flows.py b/homeassistant/generated/config_flows.py
index 095c8c9afec..bd1a1ed4e53 100644
--- a/homeassistant/generated/config_flows.py
+++ b/homeassistant/generated/config_flows.py
@@ -10,6 +10,7 @@ FLOWS = [
     "accuweather",
     "acmeda",
     "adguard",
+    "advantage_air",
     "agent_dvr",
     "airly",
     "airvisual",
@@ -34,6 +35,7 @@ FLOWS = [
     "canary",
     "cast",
     "cert_expiry",
+    "cloudflare",
     "control4",
     "coolmaster",
     "coronavirus",
@@ -71,6 +73,7 @@ FLOWS = [
     "goalzero",
     "gogogate2",
     "gpslogger",
+    "gree",
     "griddy",
     "guardian",
     "hangouts",
@@ -145,17 +148,20 @@ FLOWS = [
     "point",
     "poolsense",
     "powerwall",
+    "profiler",
     "progettihwsw",
     "ps4",
     "pvpc_hourly_pricing",
     "rachio",
     "rainmachine",
+    "rfxtrx",
     "ring",
     "risco",
     "roku",
     "roomba",
     "roon",
     "rpi_power",
+    "ruckus_unleashed",
     "samsungtv",
     "sense",
     "sentry",
@@ -184,6 +190,7 @@ FLOWS = [
     "syncthru",
     "synology_dsm",
     "tado",
+    "tasmota",
     "tellduslive",
     "tesla",
     "tibber",
@@ -199,6 +206,7 @@ FLOWS = [
     "twilio",
     "unifi",
     "upb",
+    "upcloud",
     "upnp",
     "velbus",
     "vera",
@@ -212,6 +220,7 @@ FLOWS = [
     "withings",
     "wled",
     "wolflink",
+    "xbox",
     "xiaomi_aqara",
     "xiaomi_miio",
     "yeelight",
diff --git a/homeassistant/generated/mqtt.py b/homeassistant/generated/mqtt.py
new file mode 100644
index 00000000000..41aac3e3a08
--- /dev/null
+++ b/homeassistant/generated/mqtt.py
@@ -0,0 +1,12 @@
+"""Automatically generated by hassfest.
+
+To update, run python3 -m script.hassfest
+"""
+
+# fmt: off
+
+MQTT = {
+    "tasmota": [
+        "tasmota/discovery/#"
+    ]
+}
diff --git a/homeassistant/generated/zeroconf.py b/homeassistant/generated/zeroconf.py
index 1dfd797306f..60dcf04d9ed 100644
--- a/homeassistant/generated/zeroconf.py
+++ b/homeassistant/generated/zeroconf.py
@@ -111,7 +111,7 @@ ZEROCONF = {
     "_printer._tcp.local.": [
         {
             "domain": "brother",
-            "name": "brother*"
+            "name": "Brother*"
         }
     ],
     "_spotify-connect._tcp.local.": [
diff --git a/homeassistant/helpers/aiohttp_client.py b/homeassistant/helpers/aiohttp_client.py
index d20e34cca36..e33492c21a8 100644
--- a/homeassistant/helpers/aiohttp_client.py
+++ b/homeassistant/helpers/aiohttp_client.py
@@ -1,6 +1,5 @@
 """Helper for aiohttp webclient stuff."""
 import asyncio
-import logging
 from ssl import SSLContext
 import sys
 from typing import Any, Awaitable, Optional, Union, cast
@@ -18,8 +17,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.loader import bind_hass
 from homeassistant.util import ssl as ssl_util
 
-_LOGGER = logging.getLogger(__name__)
-
 DATA_CONNECTOR = "aiohttp_connector"
 DATA_CONNECTOR_NOTVERIFY = "aiohttp_connector_notverify"
 DATA_CLIENTSESSION = "aiohttp_clientsession"
diff --git a/homeassistant/helpers/area_registry.py b/homeassistant/helpers/area_registry.py
index 3e3a3e03f6a..347e552a012 100644
--- a/homeassistant/helpers/area_registry.py
+++ b/homeassistant/helpers/area_registry.py
@@ -1,7 +1,6 @@
 """Provide a way to connect devices to one physical location."""
 from asyncio import Event
 from collections import OrderedDict
-import logging
 from typing import Dict, Iterable, List, MutableMapping, Optional, cast
 
 import attr
@@ -12,8 +11,6 @@ import homeassistant.util.uuid as uuid_util
 
 from .typing import HomeAssistantType
 
-_LOGGER = logging.getLogger(__name__)
-
 DATA_REGISTRY = "area_registry"
 EVENT_AREA_REGISTRY_UPDATED = "area_registry_updated"
 STORAGE_KEY = "core.area_registry"
@@ -26,7 +23,7 @@ class AreaEntry:
     """Area Registry Entry."""
 
     name: Optional[str] = attr.ib(default=None)
-    id: str = attr.ib(factory=uuid_util.uuid_v1mc_hex)
+    id: str = attr.ib(factory=uuid_util.random_uuid_hex)
 
 
 class AreaRegistry:
diff --git a/homeassistant/helpers/condition.py b/homeassistant/helpers/condition.py
index c982b58d8d9..9cfa6c00996 100644
--- a/homeassistant/helpers/condition.py
+++ b/homeassistant/helpers/condition.py
@@ -458,7 +458,13 @@ def async_template(
         _LOGGER.error("Error during template condition: %s", ex)
         return False
 
-    return value.lower() == "true"
+    if isinstance(value, bool):
+        return value
+
+    if isinstance(value, str):
+        return value.lower() == "true"
+
+    return False
 
 
 def async_template_from_config(
diff --git a/homeassistant/helpers/config_entry_flow.py b/homeassistant/helpers/config_entry_flow.py
index 2b967286b95..6b9df47c4d8 100644
--- a/homeassistant/helpers/config_entry_flow.py
+++ b/homeassistant/helpers/config_entry_flow.py
@@ -80,6 +80,7 @@ class DiscoveryFlowHandler(config_entries.ConfigFlow):
 
     async_step_zeroconf = async_step_discovery
     async_step_ssdp = async_step_discovery
+    async_step_mqtt = async_step_discovery
     async_step_homekit = async_step_discovery
 
     async def async_step_import(self, _: Optional[Dict[str, Any]]) -> Dict[str, Any]:
@@ -136,7 +137,7 @@ class WebhookFlowHandler(config_entries.ConfigFlow):
     ) -> Dict[str, Any]:
         """Handle a user initiated set up flow to create a webhook."""
         if not self._allow_multiple and self._async_current_entries():
-            return self.async_abort(reason="one_instance_allowed")
+            return self.async_abort(reason="single_instance_allowed")
 
         if user_input is None:
             return self.async_show_form(step_id="user")
diff --git a/homeassistant/helpers/config_entry_oauth2_flow.py b/homeassistant/helpers/config_entry_oauth2_flow.py
index 55ec3984b82..ace1365df1b 100644
--- a/homeassistant/helpers/config_entry_oauth2_flow.py
+++ b/homeassistant/helpers/config_entry_oauth2_flow.py
@@ -302,6 +302,7 @@ class AbstractOAuth2FlowHandler(config_entries.ConfigFlow, metaclass=ABCMeta):
         return await self.async_step_pick_implementation()
 
     async_step_user = async_step_pick_implementation
+    async_step_mqtt = async_step_discovery
     async_step_ssdp = async_step_discovery
     async_step_zeroconf = async_step_discovery
     async_step_homekit = async_step_discovery
diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 08d23a98da6..190cee5e050 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -98,6 +98,7 @@ TIME_PERIOD_ERROR = "offset {} should be format 'HH:MM', 'HH:MM:SS' or 'HH:MM:SS
 byte = vol.All(vol.Coerce(int), vol.Range(min=0, max=255))
 small_float = vol.All(vol.Coerce(float), vol.Range(min=0, max=1))
 positive_int = vol.All(vol.Coerce(int), vol.Range(min=0))
+positive_float = vol.All(vol.Coerce(float), vol.Range(min=0))
 latitude = vol.All(
     vol.Coerce(float), vol.Range(min=-90, max=90), msg="invalid latitude"
 )
@@ -485,7 +486,11 @@ def string(value: Any) -> str:
     """Coerce value to string, except for None."""
     if value is None:
         raise vol.Invalid("string value is None")
-    if isinstance(value, (list, dict)):
+
+    if isinstance(value, template_helper.ResultWrapper):
+        value = value.render_result
+
+    elif isinstance(value, (list, dict)):
         raise vol.Invalid("value should be a string")
 
     return str(value)
@@ -526,8 +531,8 @@ def template(value: Optional[Any]) -> template_helper.Template:
     template_value = template_helper.Template(str(value))  # type: ignore
 
     try:
-        template_value.ensure_valid()
-        return cast(template_helper.Template, template_value)
+        template_value.ensure_valid()  # type: ignore[no-untyped-call]
+        return template_value
     except TemplateError as ex:
         raise vol.Invalid(f"invalid template ({ex})") from ex
 
@@ -544,8 +549,8 @@ def dynamic_template(value: Optional[Any]) -> template_helper.Template:
 
     template_value = template_helper.Template(str(value))  # type: ignore
     try:
-        template_value.ensure_valid()
-        return cast(template_helper.Template, template_value)
+        template_value.ensure_valid()  # type: ignore[no-untyped-call]
+        return template_value
     except TemplateError as ex:
         raise vol.Invalid(f"invalid template ({ex})") from ex
 
@@ -702,7 +707,7 @@ def deprecated(
     else:
         # If Python is unable to access the sources files, the call stack frame
         # will be missing information, so let's guard.
-        # https://github.com/home-assistant/home-assistant/issues/24982
+        # https://github.com/home-assistant/core/issues/24982
         module_name = __name__
 
     if replacement_key and invalidation_version:
@@ -828,6 +833,12 @@ def custom_serializer(schema: Any) -> Any:
     if schema is positive_time_period_dict:
         return {"type": "positive_time_period_dict"}
 
+    if schema is string:
+        return {"type": "string"}
+
+    if schema is boolean:
+        return {"type": "boolean"}
+
     if isinstance(schema, multi_select):
         return {"type": "multi_select", "options": schema.options}
 
diff --git a/homeassistant/helpers/debounce.py b/homeassistant/helpers/debounce.py
index 3f297dcbbe8..988ea9f0051 100644
--- a/homeassistant/helpers/debounce.py
+++ b/homeassistant/helpers/debounce.py
@@ -3,7 +3,7 @@ import asyncio
 from logging import Logger
 from typing import Any, Awaitable, Callable, Optional
 
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HassJob, HomeAssistant, callback
 
 
 class Debouncer:
@@ -26,12 +26,25 @@ class Debouncer:
         """
         self.hass = hass
         self.logger = logger
-        self.function = function
+        self._function = function
         self.cooldown = cooldown
         self.immediate = immediate
         self._timer_task: Optional[asyncio.TimerHandle] = None
         self._execute_at_end_of_timer: bool = False
         self._execute_lock = asyncio.Lock()
+        self._job: Optional[HassJob] = None if function is None else HassJob(function)
+
+    @property
+    def function(self) -> Optional[Callable[..., Awaitable[Any]]]:
+        """Return the function being wrapped by the Debouncer."""
+        return self._function
+
+    @function.setter
+    def function(self, function: Callable[..., Awaitable[Any]]) -> None:
+        """Update the function being wrapped by the Debouncer."""
+        self._function = function
+        if self._job is None or function != self._job.target:
+            self._job = HassJob(function)
 
     async def async_call(self) -> None:
         """Call the function."""
@@ -57,7 +70,7 @@ class Debouncer:
             if self._timer_task:
                 return
 
-            await self.hass.async_add_job(self.function)  # type: ignore
+            await self.hass.async_add_hass_job(self._job)  # type: ignore
 
             self._schedule_timer()
 
@@ -82,7 +95,7 @@ class Debouncer:
                 return  # type: ignore
 
             try:
-                await self.hass.async_add_job(self.function)  # type: ignore
+                await self.hass.async_add_hass_job(self._job)  # type: ignore
             except Exception:  # pylint: disable=broad-except
                 self.logger.exception("Unexpected exception from %s", self.function)
 
diff --git a/homeassistant/helpers/deprecation.py b/homeassistant/helpers/deprecation.py
index 2a4fafde75b..a62a2e63804 100644
--- a/homeassistant/helpers/deprecation.py
+++ b/homeassistant/helpers/deprecation.py
@@ -60,7 +60,7 @@ def get_deprecated(
         else:
             # If Python is unable to access the sources files, the call stack frame
             # will be missing information, so let's guard.
-            # https://github.com/home-assistant/home-assistant/issues/24982
+            # https://github.com/home-assistant/core/issues/24982
             module_name = __name__
 
         logger = logging.getLogger(module_name)
diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index 1dff2ef9483..fcb9b4ddcb8 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -73,7 +73,7 @@ class DeviceEntry:
     area_id: str = attr.ib(default=None)
     name_by_user: str = attr.ib(default=None)
     entry_type: str = attr.ib(default=None)
-    id: str = attr.ib(factory=uuid_util.uuid_v1mc_hex)
+    id: str = attr.ib(factory=uuid_util.random_uuid_hex)
     # This value is not stored, just used to keep track of events to fire.
     is_new: bool = attr.ib(default=False)
 
diff --git a/homeassistant/helpers/discovery.py b/homeassistant/helpers/discovery.py
index e86638ac02a..d41e8174bc9 100644
--- a/homeassistant/helpers/discovery.py
+++ b/homeassistant/helpers/discovery.py
@@ -42,12 +42,14 @@ def async_listen(
     else:
         service = tuple(service)
 
+    job = core.HassJob(callback)
+
     @core.callback
     def discovery_event_listener(event: core.Event) -> None:
         """Listen for discovery events."""
         if ATTR_SERVICE in event.data and event.data[ATTR_SERVICE] in service:
-            hass.async_add_job(
-                callback, event.data[ATTR_SERVICE], event.data.get(ATTR_DISCOVERED)
+            hass.async_add_hass_job(
+                job, event.data[ATTR_SERVICE], event.data.get(ATTR_DISCOVERED)
             )
 
     hass.bus.async_listen(EVENT_PLATFORM_DISCOVERED, discovery_event_listener)
@@ -110,6 +112,7 @@ def async_listen_platform(
     This method must be run in the event loop.
     """
     service = EVENT_LOAD_PLATFORM.format(component)
+    job = core.HassJob(callback)
 
     @core.callback
     def discovery_platform_listener(event: core.Event) -> None:
@@ -122,7 +125,7 @@ def async_listen_platform(
         if not platform:
             return
 
-        hass.async_run_job(callback, platform, event.data.get(ATTR_DISCOVERED))
+        hass.async_run_hass_job(job, platform, event.data.get(ATTR_DISCOVERED))
 
     hass.bus.async_listen(EVENT_PLATFORM_DISCOVERED, discovery_platform_listener)
 
diff --git a/homeassistant/helpers/dispatcher.py b/homeassistant/helpers/dispatcher.py
index bb6fa3a735d..cdf24ec23e9 100644
--- a/homeassistant/helpers/dispatcher.py
+++ b/homeassistant/helpers/dispatcher.py
@@ -2,7 +2,7 @@
 import logging
 from typing import Any, Callable
 
-from homeassistant.core import callback
+from homeassistant.core import HassJob, callback
 from homeassistant.loader import bind_hass
 from homeassistant.util.async_ import run_callback_threadsafe
 from homeassistant.util.logging import catch_log_exception
@@ -41,26 +41,25 @@ def async_dispatcher_connect(
     if DATA_DISPATCHER not in hass.data:
         hass.data[DATA_DISPATCHER] = {}
 
-    if signal not in hass.data[DATA_DISPATCHER]:
-        hass.data[DATA_DISPATCHER][signal] = []
-
-    wrapped_target = catch_log_exception(
-        target,
-        lambda *args: "Exception in {} when dispatching '{}': {}".format(
-            # Functions wrapped in partial do not have a __name__
-            getattr(target, "__name__", None) or str(target),
-            signal,
-            args,
-        ),
+    job = HassJob(
+        catch_log_exception(
+            target,
+            lambda *args: "Exception in {} when dispatching '{}': {}".format(
+                # Functions wrapped in partial do not have a __name__
+                getattr(target, "__name__", None) or str(target),
+                signal,
+                args,
+            ),
+        )
     )
 
-    hass.data[DATA_DISPATCHER][signal].append(wrapped_target)
+    hass.data[DATA_DISPATCHER].setdefault(signal, []).append(job)
 
     @callback
     def async_remove_dispatcher() -> None:
         """Remove signal listener."""
         try:
-            hass.data[DATA_DISPATCHER][signal].remove(wrapped_target)
+            hass.data[DATA_DISPATCHER][signal].remove(job)
         except (KeyError, ValueError):
             # KeyError is key target listener did not exist
             # ValueError if listener did not exist within signal
@@ -84,5 +83,5 @@ def async_dispatcher_send(hass: HomeAssistantType, signal: str, *args: Any) -> N
     """
     target_list = hass.data.get(DATA_DISPATCHER, {}).get(signal, [])
 
-    for target in target_list:
-        hass.async_add_job(target, *args)
+    for job in target_list:
+        hass.async_add_hass_job(job, *args)
diff --git a/homeassistant/helpers/entity.py b/homeassistant/helpers/entity.py
index 5b3366d7554..03342a9f235 100644
--- a/homeassistant/helpers/entity.py
+++ b/homeassistant/helpers/entity.py
@@ -77,7 +77,7 @@ def async_generate_entity_id(
 
     test_string = preferred_string
     tries = 1
-    while hass.states.get(test_string):
+    while not hass.states.async_available(test_string):
         tries += 1
         test_string = f"{preferred_string}_{tries}"
 
@@ -362,7 +362,7 @@ class Entity(ABC):
             else:
                 extra = (
                     "Please create a bug report at "
-                    "https://github.com/home-assistant/home-assistant/issues?q=is%3Aopen+is%3Aissue"
+                    "https://github.com/home-assistant/core/issues?q=is%3Aopen+is%3Aissue"
                 )
                 if self.platform:
                     extra += (
@@ -453,26 +453,35 @@ class Entity(ABC):
         if self.parallel_updates:
             await self.parallel_updates.acquire()
 
-        assert self.hass is not None
-        if warning:
-            update_warn = self.hass.loop.call_later(
-                SLOW_UPDATE_WARNING,
-                _LOGGER.warning,
+        try:
+            # pylint: disable=no-member
+            if hasattr(self, "async_update"):
+                task = self.hass.async_create_task(self.async_update())  # type: ignore
+            elif hasattr(self, "update"):
+                task = self.hass.async_add_executor_job(self.update)  # type: ignore
+            else:
+                return
+
+            if not warning:
+                await task
+                return
+
+            finished, _ = await asyncio.wait([task], timeout=SLOW_UPDATE_WARNING)
+
+            for done in finished:
+                exc = done.exception()
+                if exc:
+                    raise exc
+                return
+
+            _LOGGER.warning(
                 "Update of %s is taking over %s seconds",
                 self.entity_id,
                 SLOW_UPDATE_WARNING,
             )
-
-        try:
-            # pylint: disable=no-member
-            if hasattr(self, "async_update"):
-                await self.async_update()  # type: ignore
-            elif hasattr(self, "update"):
-                await self.hass.async_add_executor_job(self.update)  # type: ignore
+            await task
         finally:
             self._update_staged = False
-            if warning:
-                update_warn.cancel()
             if self.parallel_updates:
                 self.parallel_updates.release()
 
diff --git a/homeassistant/helpers/entity_platform.py b/homeassistant/helpers/entity_platform.py
index 39b09cef193..693c01b982f 100644
--- a/homeassistant/helpers/entity_platform.py
+++ b/homeassistant/helpers/entity_platform.py
@@ -7,7 +7,7 @@ from types import ModuleType
 from typing import TYPE_CHECKING, Callable, Coroutine, Dict, Iterable, List, Optional
 
 from homeassistant import config_entries
-from homeassistant.const import DEVICE_DEFAULT_NAME
+from homeassistant.const import ATTR_RESTORED, DEVICE_DEFAULT_NAME
 from homeassistant.core import (
     CALLBACK_TYPE,
     ServiceCall,
@@ -79,6 +79,10 @@ class EntityPlatform:
             self.platform_name, []
         ).append(self)
 
+    def __repr__(self):
+        """Represent an EntityPlatform."""
+        return f"<EntityPlatform domain={self.domain} platform_name={self.platform_name} config_entry={self.config_entry}>"
+
     @callback
     def _get_parallel_updates_semaphore(
         self, entity_has_async_update: bool
@@ -138,7 +142,7 @@ class EntityPlatform:
 
             # This should not be replaced with hass.async_add_job because
             # we don't want to track this task in case it blocks startup.
-            return hass.loop.run_in_executor(
+            return hass.loop.run_in_executor(  # type: ignore[return-value]
                 None,
                 platform.setup_platform,  # type: ignore
                 hass,
@@ -315,6 +319,13 @@ class EntityPlatform:
                 self.platform_name,
                 timeout,
             )
+        except Exception:
+            self.logger.exception(
+                "Error adding entities for domain %s with platform %s",
+                self.domain,
+                self.platform_name,
+            )
+            raise
 
         if self._async_unsub_polling is not None or not any(
             entity.should_poll for entity in self.entities.values()
@@ -454,11 +465,15 @@ class EntityPlatform:
             raise HomeAssistantError(f"Invalid entity id: {entity.entity_id}")
 
         already_exists = entity.entity_id in self.entities
+        restored = False
 
-        if not already_exists:
+        if not already_exists and not self.hass.states.async_available(
+            entity.entity_id
+        ):
             existing = self.hass.states.get(entity.entity_id)
-
-            if existing and not existing.attributes.get("restored"):
+            if existing is not None and ATTR_RESTORED in existing.attributes:
+                restored = True
+            else:
                 already_exists = True
 
         if already_exists:
@@ -476,6 +491,15 @@ class EntityPlatform:
 
         entity_id = entity.entity_id
         self.entities[entity_id] = entity
+
+        if not restored:
+            # Reserve the state in the state machine
+            # because as soon as we return control to the event
+            # loop below, another entity could be added
+            # with the same id before `entity.add_to_platform_finish()`
+            # has a chance to finish.
+            self.hass.states.async_reserve(entity.entity_id)
+
         entity.async_on_remove(lambda: self.entities.pop(entity_id))
 
         await entity.add_to_platform_finish()
diff --git a/homeassistant/helpers/entity_registry.py b/homeassistant/helpers/entity_registry.py
index c4c445b2be9..14dce1d6d2c 100644
--- a/homeassistant/helpers/entity_registry.py
+++ b/homeassistant/helpers/entity_registry.py
@@ -27,6 +27,7 @@ from homeassistant.const import (
     ATTR_DEVICE_CLASS,
     ATTR_FRIENDLY_NAME,
     ATTR_ICON,
+    ATTR_RESTORED,
     ATTR_SUPPORTED_FEATURES,
     ATTR_UNIT_OF_MEASUREMENT,
     EVENT_HOMEASSISTANT_START,
@@ -56,8 +57,6 @@ DISABLED_HASS = "hass"
 DISABLED_USER = "user"
 DISABLED_INTEGRATION = "integration"
 
-ATTR_RESTORED = "restored"
-
 STORAGE_VERSION = 1
 STORAGE_KEY = "core.entity_registry"
 
@@ -183,7 +182,7 @@ class EntityRegistry:
         while (
             test_string in self.entities
             or test_string in known_object_ids
-            or self.hass.states.get(test_string)
+            or not self.hass.states.async_available(test_string)
         ):
             tries += 1
             test_string = f"{preferred_string}_{tries}"
diff --git a/homeassistant/helpers/event.py b/homeassistant/helpers/event.py
index 33d2082c99e..2044dbd7856 100644
--- a/homeassistant/helpers/event.py
+++ b/homeassistant/helpers/event.py
@@ -1,5 +1,6 @@
 """Helpers for listening to events."""
 import asyncio
+import copy
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 import functools as ft
@@ -34,6 +35,7 @@ from homeassistant.const import (
 from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
+    HassJob,
     HomeAssistant,
     State,
     callback,
@@ -111,8 +113,8 @@ class TrackTemplateResult:
     """
 
     template: Template
-    last_result: Union[str, None, TemplateError]
-    result: Union[str, TemplateError]
+    last_result: Any
+    result: Any
 
 
 def threaded_listener_factory(async_factory: Callable[..., Any]) -> CALLBACK_TYPE:
@@ -174,6 +176,8 @@ def async_track_state_change(
     else:
         entity_ids = tuple(entity_id.lower() for entity_id in entity_ids)
 
+    job = HassJob(action)
+
     @callback
     def state_change_listener(event: Event) -> None:
         """Handle specific state changes."""
@@ -192,8 +196,8 @@ def async_track_state_change(
             if not match_to_state(new_state):
                 return
 
-        hass.async_run_job(
-            action,
+        hass.async_run_hass_job(
+            job,
             event.data.get("entity_id"),
             event.data.get("old_state"),
             event.data.get("new_state"),
@@ -249,9 +253,9 @@ def async_track_state_change_event(
             if entity_id not in entity_callbacks:
                 return
 
-            for action in entity_callbacks[entity_id][:]:
+            for job in entity_callbacks[entity_id][:]:
                 try:
-                    hass.async_run_job(action, event)
+                    hass.async_run_hass_job(job, event)
                 except Exception:  # pylint: disable=broad-except
                     _LOGGER.exception(
                         "Error while processing state changed for %s", entity_id
@@ -261,10 +265,10 @@ def async_track_state_change_event(
             EVENT_STATE_CHANGED, _async_state_change_dispatcher
         )
 
-    entity_ids = _async_string_to_lower_list(entity_ids)
+    job = HassJob(action)
 
     for entity_id in entity_ids:
-        entity_callbacks.setdefault(entity_id, []).append(action)
+        entity_callbacks.setdefault(entity_id, []).append(job)
 
     @callback
     def remove_listener() -> None:
@@ -274,7 +278,7 @@ def async_track_state_change_event(
             TRACK_STATE_CHANGE_CALLBACKS,
             TRACK_STATE_CHANGE_LISTENER,
             entity_ids,
-            action,
+            job,
         )
 
     return remove_listener
@@ -291,14 +295,14 @@ def _async_remove_indexed_listeners(
     data_key: str,
     listener_key: str,
     storage_keys: Iterable[str],
-    action: Callable[[Event], Any],
+    job: HassJob,
 ) -> None:
     """Remove a listener."""
 
     callbacks = hass.data[data_key]
 
     for storage_key in storage_keys:
-        callbacks[storage_key].remove(action)
+        callbacks[storage_key].remove(job)
         if len(callbacks[storage_key]) == 0:
             del callbacks[storage_key]
 
@@ -333,9 +337,9 @@ def async_track_entity_registry_updated_event(
             if entity_id not in entity_callbacks:
                 return
 
-            for action in entity_callbacks[entity_id][:]:
+            for job in entity_callbacks[entity_id][:]:
                 try:
-                    hass.async_run_job(action, event)
+                    hass.async_run_hass_job(job, event)
                 except Exception:  # pylint: disable=broad-except
                     _LOGGER.exception(
                         "Error while processing entity registry update for %s",
@@ -346,10 +350,10 @@ def async_track_entity_registry_updated_event(
             EVENT_ENTITY_REGISTRY_UPDATED, _async_entity_registry_updated_dispatcher
         )
 
-    entity_ids = _async_string_to_lower_list(entity_ids)
+    job = HassJob(action)
 
     for entity_id in entity_ids:
-        entity_callbacks.setdefault(entity_id, []).append(action)
+        entity_callbacks.setdefault(entity_id, []).append(job)
 
     @callback
     def remove_listener() -> None:
@@ -359,7 +363,7 @@ def async_track_entity_registry_updated_event(
             TRACK_ENTITY_REGISTRY_UPDATED_CALLBACKS,
             TRACK_ENTITY_REGISTRY_UPDATED_LISTENER,
             entity_ids,
-            action,
+            job,
         )
 
     return remove_listener
@@ -376,9 +380,9 @@ def _async_dispatch_domain_event(
 
     listeners = callbacks.get(domain, []) + callbacks.get(MATCH_ALL, [])
 
-    for action in listeners:
+    for job in listeners:
         try:
-            hass.async_run_job(action, event)
+            hass.async_run_hass_job(job, event)
         except Exception:  # pylint: disable=broad-except
             _LOGGER.exception(
                 "Error while processing event %s for domain %s", event, domain
@@ -412,10 +416,10 @@ def async_track_state_added_domain(
             EVENT_STATE_CHANGED, _async_state_change_dispatcher
         )
 
-    domains = _async_string_to_lower_list(domains)
+    job = HassJob(action)
 
     for domain in domains:
-        domain_callbacks.setdefault(domain, []).append(action)
+        domain_callbacks.setdefault(domain, []).append(job)
 
     @callback
     def remove_listener() -> None:
@@ -425,7 +429,7 @@ def async_track_state_added_domain(
             TRACK_STATE_ADDED_DOMAIN_CALLBACKS,
             TRACK_STATE_ADDED_DOMAIN_LISTENER,
             domains,
-            action,
+            job,
         )
 
     return remove_listener
@@ -458,10 +462,10 @@ def async_track_state_removed_domain(
             EVENT_STATE_CHANGED, _async_state_change_dispatcher
         )
 
-    domains = _async_string_to_lower_list(domains)
+    job = HassJob(action)
 
     for domain in domains:
-        domain_callbacks.setdefault(domain, []).append(action)
+        domain_callbacks.setdefault(domain, []).append(job)
 
     @callback
     def remove_listener() -> None:
@@ -471,7 +475,7 @@ def async_track_state_removed_domain(
             TRACK_STATE_REMOVED_DOMAIN_CALLBACKS,
             TRACK_STATE_REMOVED_DOMAIN_LISTENER,
             domains,
-            action,
+            job,
         )
 
     return remove_listener
@@ -682,6 +686,8 @@ def async_track_template(
 
     """
 
+    job = HassJob(action)
+
     @callback
     def _template_changed_listener(
         event: Event, updates: List[TrackTemplateResult]
@@ -708,8 +714,8 @@ def async_track_template(
         ):
             return
 
-        hass.async_run_job(
-            action,
+        hass.async_run_hass_job(
+            job,
             event.data.get("entity_id"),
             event.data.get("old_state"),
             event.data.get("new_state"),
@@ -736,7 +742,7 @@ class _TrackTemplateResultInfo:
     ):
         """Handle removal / refresh of tracker init."""
         self.hass = hass
-        self._action = action
+        self._job = HassJob(action)
 
         for track_template_ in track_templates:
             track_template_.template.hass = hass
@@ -747,26 +753,28 @@ class _TrackTemplateResultInfo:
         self._rate_limit = KeyedRateLimit(hass)
         self._info: Dict[Template, RenderInfo] = {}
         self._track_state_changes: Optional[_TrackStateChangeFiltered] = None
+        self._time_listeners: Dict[Template, Callable] = {}
 
     def async_setup(self, raise_on_template_error: bool) -> None:
         """Activation of template tracking."""
         for track_template_ in self._track_templates:
             template = track_template_.template
             variables = track_template_.variables
+            self._info[template] = info = template.async_render_to_info(variables)
 
-            self._info[template] = template.async_render_to_info(variables)
-            if self._info[template].exception:
+            if info.exception:
                 if raise_on_template_error:
-                    raise self._info[template].exception
+                    raise info.exception
                 _LOGGER.error(
                     "Error while processing template: %s",
                     track_template_.template,
-                    exc_info=self._info[template].exception,
+                    exc_info=info.exception,
                 )
 
         self._track_state_changes = async_track_state_change_filtered(
             self.hass, _render_infos_to_track_states(self._info.values()), self._refresh
         )
+        self._update_time_listeners()
         _LOGGER.debug(
             "Template group %s listens for %s",
             self._track_templates,
@@ -777,7 +785,40 @@ class _TrackTemplateResultInfo:
     def listeners(self) -> Dict:
         """State changes that will cause a re-render."""
         assert self._track_state_changes
-        return self._track_state_changes.listeners
+        return {
+            **self._track_state_changes.listeners,
+            "time": bool(self._time_listeners),
+        }
+
+    @callback
+    def _setup_time_listener(self, template: Template, has_time: bool) -> None:
+        if not has_time:
+            if template in self._time_listeners:
+                # now() or utcnow() has left the scope of the template
+                self._time_listeners.pop(template)()
+            return
+
+        if template in self._time_listeners:
+            return
+
+        track_templates = [
+            track_template_
+            for track_template_ in self._track_templates
+            if track_template_.template == template
+        ]
+
+        @callback
+        def _refresh_from_time(now: datetime) -> None:
+            self._refresh(None, track_templates=track_templates)
+
+        self._time_listeners[template] = async_track_utc_time_change(
+            self.hass, _refresh_from_time, second=0
+        )
+
+    @callback
+    def _update_time_listeners(self) -> None:
+        for template, info in self._info.items():
+            self._setup_time_listener(template, info.has_time)
 
     @callback
     def async_remove(self) -> None:
@@ -785,6 +826,8 @@ class _TrackTemplateResultInfo:
         assert self._track_state_changes
         self._track_state_changes.async_remove()
         self._rate_limit.async_remove()
+        for template in list(self._time_listeners):
+            self._time_listeners.pop(template)()
 
     @callback
     def async_refresh(self) -> None:
@@ -812,19 +855,21 @@ class _TrackTemplateResultInfo:
         if event:
             info = self._info[template]
 
-            if not self._rate_limit.async_has_timer(
-                template
-            ) and not _event_triggers_rerender(event, info):
+            if not _event_triggers_rerender(event, info):
                 return False
 
+            had_timer = self._rate_limit.async_has_timer(template)
+
             if self._rate_limit.async_schedule_action(
                 template,
                 _rate_limit_for_event(event, info, track_template_),
                 now,
                 self._refresh,
                 event,
+                (track_template_,),
+                True,
             ):
-                return False
+                return not had_timer
 
             _LOGGER.debug(
                 "Template update %s triggered by event: %s",
@@ -833,10 +878,12 @@ class _TrackTemplateResultInfo:
             )
 
         self._rate_limit.async_triggered(template, now)
-        self._info[template] = template.async_render_to_info(track_template_.variables)
+        self._info[template] = info = template.async_render_to_info(
+            track_template_.variables
+        )
 
         try:
-            result: Union[str, TemplateError] = self._info[template].result()
+            result: Union[str, TemplateError] = info.result()
         except TemplateError as ex:
             result = ex
 
@@ -852,24 +899,52 @@ class _TrackTemplateResultInfo:
         return TrackTemplateResult(template, last_result, result)
 
     @callback
-    def _refresh(self, event: Optional[Event]) -> None:
+    def _refresh(
+        self,
+        event: Optional[Event],
+        track_templates: Optional[Iterable[TrackTemplate]] = None,
+        replayed: Optional[bool] = False,
+    ) -> None:
+        """Refresh the template.
+
+        The event is the state_changed event that caused the refresh
+        to be considered.
+
+        track_templates is an optional list of TrackTemplate objects
+        to refresh.  If not provided, all tracked templates will be
+        considered.
+
+        replayed is True if the event is being replayed because the
+        rate limit was hit.
+        """
         updates = []
         info_changed = False
-        now = dt_util.utcnow()
+        now = event.time_fired if not replayed and event else dt_util.utcnow()
 
-        for track_template_ in self._track_templates:
+        for track_template_ in track_templates or self._track_templates:
             update = self._render_template_if_ready(track_template_, now, event)
             if not update:
                 continue
 
+            template = track_template_.template
+            self._setup_time_listener(template, self._info[template].has_time)
+
             info_changed = True
+
             if isinstance(update, TrackTemplateResult):
                 updates.append(update)
 
         if info_changed:
             assert self._track_state_changes
             self._track_state_changes.async_update_listeners(
-                _render_infos_to_track_states(self._info.values()),
+                _render_infos_to_track_states(
+                    [
+                        _suppress_domain_all_in_render_info(self._info[template])
+                        if self._rate_limit.async_has_timer(template)
+                        else self._info[template]
+                        for template in self._info
+                    ]
+                )
             )
             _LOGGER.debug(
                 "Template group %s listens for %s",
@@ -883,7 +958,7 @@ class _TrackTemplateResultInfo:
         for track_result in updates:
             self._last_result[track_result.template] = track_result.result
 
-        self.hass.async_run_job(self._action, event, updates)
+        self.hass.async_run_hass_job(self._job, event, updates)
 
 
 TrackTemplateResultListener = Callable[
@@ -913,7 +988,7 @@ def async_track_template_result(
     action: TrackTemplateResultListener,
     raise_on_template_error: bool = False,
 ) -> _TrackTemplateResultInfo:
-    """Add a listener that fires when a the result of a template changes.
+    """Add a listener that fires when the result of a template changes.
 
     The action will fire with the initial result from the template, and
     then whenever the output from the template changes. The template will
@@ -968,6 +1043,8 @@ def async_track_same_state(
     async_remove_state_for_cancel: Optional[CALLBACK_TYPE] = None
     async_remove_state_for_listener: Optional[CALLBACK_TYPE] = None
 
+    job = HassJob(action)
+
     @callback
     def clear_listener() -> None:
         """Clear all unsub listener."""
@@ -986,7 +1063,7 @@ def async_track_same_state(
         nonlocal async_remove_state_for_listener
         async_remove_state_for_listener = None
         clear_listener()
-        hass.async_run_job(action)
+        hass.async_run_hass_job(job)
 
     @callback
     def state_for_cancel_listener(event: Event) -> None:
@@ -1022,14 +1099,18 @@ track_same_state = threaded_listener_factory(async_track_same_state)
 @callback
 @bind_hass
 def async_track_point_in_time(
-    hass: HomeAssistant, action: Callable[..., None], point_in_time: datetime
+    hass: HomeAssistant,
+    action: Union[HassJob, Callable[..., None]],
+    point_in_time: datetime,
 ) -> CALLBACK_TYPE:
     """Add a listener that fires once after a specific point in time."""
 
+    job = action if isinstance(action, HassJob) else HassJob(action)
+
     @callback
     def utc_converter(utc_now: datetime) -> None:
         """Convert passed in UTC now to local now."""
-        hass.async_run_job(action, dt_util.as_local(utc_now))
+        hass.async_run_hass_job(job, dt_util.as_local(utc_now))
 
     return async_track_point_in_utc_time(hass, utc_converter, point_in_time)
 
@@ -1040,16 +1121,22 @@ track_point_in_time = threaded_listener_factory(async_track_point_in_time)
 @callback
 @bind_hass
 def async_track_point_in_utc_time(
-    hass: HomeAssistant, action: Callable[..., Any], point_in_time: datetime
+    hass: HomeAssistant,
+    action: Union[HassJob, Callable[..., None]],
+    point_in_time: datetime,
 ) -> CALLBACK_TYPE:
     """Add a listener that fires once after a specific point in UTC time."""
     # Ensure point_in_time is UTC
     utc_point_in_time = dt_util.as_utc(point_in_time)
 
+    # Since this is called once, we accept a HassJob so we can avoid
+    # having to figure out how to call the action every time its called.
+    job = action if isinstance(action, HassJob) else HassJob(action)
+
     cancel_callback = hass.loop.call_at(
         hass.loop.time() + point_in_time.timestamp() - time.time(),
-        hass.async_run_job,
-        action,
+        hass.async_run_hass_job,
+        job,
         utc_point_in_time,
     )
 
@@ -1067,7 +1154,7 @@ track_point_in_utc_time = threaded_listener_factory(async_track_point_in_utc_tim
 @callback
 @bind_hass
 def async_call_later(
-    hass: HomeAssistant, delay: float, action: Callable[..., None]
+    hass: HomeAssistant, delay: float, action: Union[HassJob, Callable[..., None]]
 ) -> CALLBACK_TYPE:
     """Add a listener that is called in <delay>."""
     return async_track_point_in_utc_time(
@@ -1087,6 +1174,9 @@ def async_track_time_interval(
 ) -> CALLBACK_TYPE:
     """Add a listener that fires repetitively at every timedelta interval."""
     remove = None
+    interval_listener_job = None
+
+    job = HassJob(action)
 
     def next_interval() -> datetime:
         """Return the next interval."""
@@ -1096,14 +1186,19 @@ def async_track_time_interval(
     def interval_listener(now: datetime) -> None:
         """Handle elapsed intervals."""
         nonlocal remove
-        remove = async_track_point_in_utc_time(hass, interval_listener, next_interval())
-        hass.async_run_job(action, now)
+        nonlocal interval_listener_job
 
-    remove = async_track_point_in_utc_time(hass, interval_listener, next_interval())
+        remove = async_track_point_in_utc_time(
+            hass, interval_listener_job, next_interval()  # type: ignore
+        )
+        hass.async_run_hass_job(job, now)
+
+    interval_listener_job = HassJob(interval_listener)
+    remove = async_track_point_in_utc_time(hass, interval_listener_job, next_interval())
 
     def remove_listener() -> None:
         """Remove interval listener."""
-        remove()
+        remove()  # type: ignore
 
     return remove_listener
 
@@ -1116,7 +1211,7 @@ class SunListener:
     """Helper class to help listen to sun events."""
 
     hass: HomeAssistant = attr.ib()
-    action: Callable[..., None] = attr.ib()
+    job: HassJob = attr.ib()
     event: str = attr.ib()
     offset: Optional[timedelta] = attr.ib()
     _unsub_sun: Optional[CALLBACK_TYPE] = attr.ib(default=None)
@@ -1160,7 +1255,7 @@ class SunListener:
         """Handle solar event."""
         self._unsub_sun = None
         self._listen_next_sun_event()
-        self.hass.async_run_job(self.action)
+        self.hass.async_run_hass_job(self.job)
 
     @callback
     def _handle_config_event(self, _event: Any) -> None:
@@ -1177,7 +1272,7 @@ def async_track_sunrise(
     hass: HomeAssistant, action: Callable[..., None], offset: Optional[timedelta] = None
 ) -> CALLBACK_TYPE:
     """Add a listener that will fire a specified offset from sunrise daily."""
-    listener = SunListener(hass, action, SUN_EVENT_SUNRISE, offset)
+    listener = SunListener(hass, HassJob(action), SUN_EVENT_SUNRISE, offset)
     listener.async_attach()
     return listener.async_detach
 
@@ -1191,7 +1286,7 @@ def async_track_sunset(
     hass: HomeAssistant, action: Callable[..., None], offset: Optional[timedelta] = None
 ) -> CALLBACK_TYPE:
     """Add a listener that will fire a specified offset from sunset daily."""
-    listener = SunListener(hass, action, SUN_EVENT_SUNSET, offset)
+    listener = SunListener(hass, HassJob(action), SUN_EVENT_SUNSET, offset)
     listener.async_attach()
     return listener.async_detach
 
@@ -1213,6 +1308,8 @@ def async_track_utc_time_change(
     local: bool = False,
 ) -> CALLBACK_TYPE:
     """Add a listener that will fire if time matches a pattern."""
+
+    job = HassJob(action)
     # We do not have to wrap the function with time pattern matching logic
     # if no pattern given
     if all(val is None for val in (hour, minute, second)):
@@ -1220,7 +1317,7 @@ def async_track_utc_time_change(
         @callback
         def time_change_listener(event: Event) -> None:
             """Fire every time event that comes in."""
-            hass.async_run_job(action, event.data[ATTR_NOW])
+            hass.async_run_hass_job(job, event.data[ATTR_NOW])
 
         return hass.bus.async_listen(EVENT_TIME_CHANGED, time_change_listener)
 
@@ -1250,7 +1347,7 @@ def async_track_utc_time_change(
         nonlocal next_time, cancel_callback
 
         now = pattern_utc_now()
-        hass.async_run_job(action, dt_util.as_local(now) if local else now)
+        hass.async_run_hass_job(job, dt_util.as_local(now) if local else now)
 
         calculate_next(now + timedelta(seconds=1))
 
@@ -1412,3 +1509,13 @@ def _rate_limit_for_event(
 
     rate_limit: Optional[timedelta] = info.rate_limit
     return rate_limit
+
+
+def _suppress_domain_all_in_render_info(render_info: RenderInfo) -> RenderInfo:
+    """Remove the domains and all_states from render info during a ratelimit."""
+    rate_limited_render_info = copy.copy(render_info)
+    rate_limited_render_info.all_states = False
+    rate_limited_render_info.all_states_lifecycle = False
+    rate_limited_render_info.domains = set()
+    rate_limited_render_info.domains_lifecycle = set()
+    return rate_limited_render_info
diff --git a/homeassistant/helpers/json.py b/homeassistant/helpers/json.py
index 4acb9fd500a..3168310dc59 100644
--- a/homeassistant/helpers/json.py
+++ b/homeassistant/helpers/json.py
@@ -1,11 +1,8 @@
 """Helpers to help with encoding Home Assistant objects in JSON."""
 from datetime import datetime
 import json
-import logging
 from typing import Any
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class JSONEncoder(json.JSONEncoder):
     """JSONEncoder that supports Home Assistant objects."""
diff --git a/homeassistant/helpers/location.py b/homeassistant/helpers/location.py
index 92af08bbd00..856c5c4d8e3 100644
--- a/homeassistant/helpers/location.py
+++ b/homeassistant/helpers/location.py
@@ -46,7 +46,8 @@ def closest(
             state.attributes.get(ATTR_LONGITUDE),
             latitude,
             longitude,
-        ),
+        )
+        or 0,
     )
 
 
diff --git a/homeassistant/helpers/ratelimit.py b/homeassistant/helpers/ratelimit.py
index 422ebdf2eee..d7099e9fe3d 100644
--- a/homeassistant/helpers/ratelimit.py
+++ b/homeassistant/helpers/ratelimit.py
@@ -26,6 +26,8 @@ class KeyedRateLimit:
     @callback
     def async_has_timer(self, key: Hashable) -> bool:
         """Check if a rate limit timer is running."""
+        if not self._rate_limit_timers:
+            return False
         return key in self._rate_limit_timers
 
     @callback
@@ -37,7 +39,7 @@ class KeyedRateLimit:
     @callback
     def async_cancel_timer(self, key: Hashable) -> None:
         """Cancel a rate limit time that will call the action."""
-        if not self.async_has_timer(key):
+        if not self._rate_limit_timers or not self.async_has_timer(key):
             return
 
         self._rate_limit_timers.pop(key).cancel()
@@ -71,10 +73,14 @@ class KeyedRateLimit:
 
             Return None
         """
-        if rate_limit is None or key not in self._last_triggered:
+        if rate_limit is None:
             return None
 
-        next_call_time = self._last_triggered[key] + rate_limit
+        last_triggered = self._last_triggered.get(key)
+        if not last_triggered:
+            return None
+
+        next_call_time = last_triggered + rate_limit
 
         if next_call_time <= now:
             self.async_cancel_timer(key)
diff --git a/homeassistant/helpers/reload.py b/homeassistant/helpers/reload.py
index 1c11afdb46b..e596027b7e1 100644
--- a/homeassistant/helpers/reload.py
+++ b/homeassistant/helpers/reload.py
@@ -80,7 +80,9 @@ async def _resetup_platform(
 
     # If its an entity platform, we use the entity_platform
     # async_reset method
-    platform = async_get_platform(hass, integration_name, integration_platform)
+    platform = async_get_platform_without_config_entry(
+        hass, integration_name, integration_platform
+    )
     if platform:
         await _async_reconfig_platform(platform, root_config[integration_platform])
         return
@@ -137,11 +139,13 @@ async def async_integration_yaml_config(
 
 
 @callback
-def async_get_platform(
+def async_get_platform_without_config_entry(
     hass: HomeAssistantType, integration_name: str, integration_platform_name: str
 ) -> Optional[EntityPlatform]:
-    """Find an existing platform."""
+    """Find an existing platform that is not a config entry."""
     for integration_platform in async_get_platforms(hass, integration_name):
+        if integration_platform.config_entry is not None:
+            continue
         if integration_platform.domain == integration_platform_name:
             platform: EntityPlatform = integration_platform
             return platform
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 4d958fe431f..645131b60b5 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -53,7 +53,13 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
     SERVICE_TURN_ON,
 )
-from homeassistant.core import SERVICE_CALL_LIMIT, Context, HomeAssistant, callback
+from homeassistant.core import (
+    SERVICE_CALL_LIMIT,
+    Context,
+    HassJob,
+    HomeAssistant,
+    callback,
+)
 from homeassistant.helpers import condition, config_validation as cv, template
 from homeassistant.helpers.event import async_call_later, async_track_template
 from homeassistant.helpers.script_variables import ScriptVariables
@@ -789,7 +795,11 @@ class Script:
         self.name = name
         self.domain = domain
         self.running_description = running_description or f"{domain} script"
-        self.change_listener = change_listener
+        self._change_listener = change_listener
+        self._change_listener_job = (
+            None if change_listener is None else HassJob(change_listener)
+        )
+
         self.script_mode = script_mode
         self._set_logger(logger)
         self._log_exceptions = log_exceptions
@@ -812,6 +822,21 @@ class Script:
         if self._variables_dynamic:
             template.attach(hass, variables)
 
+    @property
+    def change_listener(self) -> Optional[Callable[..., Any]]:
+        """Return the change_listener."""
+        return self._change_listener
+
+    @change_listener.setter
+    def change_listener(self, change_listener: Callable[..., Any]) -> None:
+        """Update the change_listener."""
+        self._change_listener = change_listener
+        if (
+            self._change_listener_job is None
+            or change_listener != self._change_listener_job.target
+        ):
+            self._change_listener_job = HassJob(change_listener)
+
     def _set_logger(self, logger: Optional[logging.Logger] = None) -> None:
         if logger:
             self._logger = logger
@@ -830,8 +855,8 @@ class Script:
                 choose_data["default"].update_logger(self._logger)
 
     def _changed(self):
-        if self.change_listener:
-            self._hass.async_run_job(self.change_listener)
+        if self._change_listener_job:
+            self._hass.async_run_hass_job(self._change_listener_job)
 
     def _chain_change_listener(self, sub_script):
         if sub_script.is_running:
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index 20f7aa2d2d7..d03fb8c91c6 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -38,7 +38,7 @@ from homeassistant.helpers import template
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, HomeAssistantType, TemplateVarsType
-from homeassistant.loader import async_get_integration, bind_hass
+from homeassistant.loader import Integration, async_get_integration, bind_hass
 from homeassistant.util.yaml import load_yaml
 from homeassistant.util.yaml.loader import JSON_TYPE
 
@@ -252,21 +252,29 @@ async def async_extract_entity_ids(
     return extracted
 
 
-async def _load_services_file(hass: HomeAssistantType, domain: str) -> JSON_TYPE:
+def _load_services_file(hass: HomeAssistantType, integration: Integration) -> JSON_TYPE:
     """Load services file for an integration."""
-    integration = await async_get_integration(hass, domain)
     try:
-        return await hass.async_add_executor_job(
-            load_yaml, str(integration.file_path / "services.yaml")
-        )
+        return load_yaml(str(integration.file_path / "services.yaml"))
     except FileNotFoundError:
-        _LOGGER.warning("Unable to find services.yaml for the %s integration", domain)
+        _LOGGER.warning(
+            "Unable to find services.yaml for the %s integration", integration.domain
+        )
         return {}
     except HomeAssistantError:
-        _LOGGER.warning("Unable to parse services.yaml for the %s integration", domain)
+        _LOGGER.warning(
+            "Unable to parse services.yaml for the %s integration", integration.domain
+        )
         return {}
 
 
+def _load_services_files(
+    hass: HomeAssistantType, integrations: Iterable[Integration]
+) -> List[JSON_TYPE]:
+    """Load service files for multiple intergrations."""
+    return [_load_services_file(hass, integration) for integration in integrations]
+
+
 @bind_hass
 async def async_get_all_descriptions(
     hass: HomeAssistantType,
@@ -289,8 +297,12 @@ async def async_get_all_descriptions(
     loaded = {}
 
     if missing:
-        contents = await asyncio.gather(
-            *(_load_services_file(hass, domain) for domain in missing)
+        integrations = await asyncio.gather(
+            *(async_get_integration(hass, domain) for domain in missing)
+        )
+
+        contents = await hass.async_add_executor_job(
+            _load_services_files, hass, integrations
         )
 
         for domain, content in zip(missing, contents):
@@ -308,7 +320,7 @@ async def async_get_all_descriptions(
             # Cache missing descriptions
             if description is None:
                 domain_yaml = loaded[domain]
-                yaml_description = domain_yaml.get(service, {})
+                yaml_description = domain_yaml.get(service, {})  # type: ignore
 
                 # Don't warn for missing services, because it triggers false
                 # positives for things like scripts, that register as a service
diff --git a/homeassistant/helpers/singleton.py b/homeassistant/helpers/singleton.py
index 82b666be40a..ab4d12dc1cc 100644
--- a/homeassistant/helpers/singleton.py
+++ b/homeassistant/helpers/singleton.py
@@ -1,14 +1,14 @@
 """Helper to help coordinating calls."""
 import asyncio
 import functools
-from typing import Awaitable, Callable, TypeVar, cast
+from typing import Callable, Optional, TypeVar, cast
 
 from homeassistant.core import HomeAssistant
 from homeassistant.loader import bind_hass
 
 T = TypeVar("T")
 
-FUNC = Callable[[HomeAssistant], Awaitable[T]]
+FUNC = Callable[[HomeAssistant], T]
 
 
 def singleton(data_key: str) -> Callable[[FUNC], FUNC]:
@@ -19,10 +19,21 @@ def singleton(data_key: str) -> Callable[[FUNC], FUNC]:
 
     def wrapper(func: FUNC) -> FUNC:
         """Wrap a function with caching logic."""
+        if not asyncio.iscoroutinefunction(func):
+
+            @bind_hass
+            @functools.wraps(func)
+            def wrapped(hass: HomeAssistant) -> T:
+                obj: Optional[T] = hass.data.get(data_key)
+                if obj is None:
+                    obj = hass.data[data_key] = func(hass)
+                return obj
+
+            return wrapped
 
         @bind_hass
         @functools.wraps(func)
-        async def wrapped(hass: HomeAssistant) -> T:
+        async def async_wrapped(hass: HomeAssistant) -> T:
             obj_or_evt = hass.data.get(data_key)
 
             if not obj_or_evt:
@@ -41,6 +52,6 @@ def singleton(data_key: str) -> Callable[[FUNC], FUNC]:
 
             return cast(T, obj_or_evt)
 
-        return wrapped
+        return async_wrapped
 
     return wrapper
diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py
index 85458cf564b..d6c89f28e6e 100644
--- a/homeassistant/helpers/template.py
+++ b/homeassistant/helpers/template.py
@@ -1,16 +1,17 @@
 """Template helper methods for rendering strings with Home Assistant data."""
+from ast import literal_eval
 import asyncio
 import base64
 import collections.abc
 from datetime import datetime, timedelta
-from functools import wraps
+from functools import partial, wraps
 import json
 import logging
 import math
 from operator import attrgetter
 import random
 import re
-from typing import Any, Generator, Iterable, List, Optional, Union
+from typing import Any, Dict, Generator, Iterable, List, Optional, Type, Union
 from urllib.parse import urlencode as urllib_urlencode
 import weakref
 
@@ -72,7 +73,8 @@ _COLLECTABLE_STATE_ATTRIBUTES = {
     "name",
 }
 
-DEFAULT_RATE_LIMIT = timedelta(minutes=1)
+ALL_STATES_RATE_LIMIT = timedelta(minutes=1)
+DOMAIN_STATES_RATE_LIMIT = timedelta(seconds=1)
 
 
 @bind_hass
@@ -122,6 +124,66 @@ def is_template_string(maybe_template: str) -> bool:
     return _RE_JINJA_DELIMITERS.search(maybe_template) is not None
 
 
+class ResultWrapper:
+    """Result wrapper class to store render result."""
+
+    render_result: Optional[str]
+
+
+def gen_result_wrapper(kls):
+    """Generate a result wrapper."""
+
+    class Wrapper(kls, ResultWrapper):
+        """Wrapper of a kls that can store render_result."""
+
+        def __init__(self, *args: tuple, render_result: Optional[str] = None) -> None:
+            super().__init__(*args)
+            self.render_result = render_result
+
+        def __str__(self) -> str:
+            if self.render_result is None:
+                # Can't get set repr to work
+                if kls is set:
+                    return str(set(self))
+
+                return kls.__str__(self)
+
+            return self.render_result
+
+    return Wrapper
+
+
+class TupleWrapper(tuple, ResultWrapper):
+    """Wrap a tuple."""
+
+    # This is all magic to be allowed to subclass a tuple.
+
+    def __new__(
+        cls, value: tuple, *, render_result: Optional[str] = None
+    ) -> "TupleWrapper":
+        """Create a new tuple class."""
+        return super().__new__(cls, tuple(value))
+
+    # pylint: disable=super-init-not-called
+
+    def __init__(self, value: tuple, *, render_result: Optional[str] = None):
+        """Initialize a new tuple class."""
+        self.render_result = render_result
+
+    def __str__(self) -> str:
+        """Return string representation."""
+        if self.render_result is None:
+            return super().__str__()
+
+        return self.render_result
+
+
+RESULT_WRAPPERS: Dict[Type, Type] = {
+    kls: gen_result_wrapper(kls) for kls in (list, dict, set)
+}
+RESULT_WRAPPERS[tuple] = TupleWrapper
+
+
 def extract_entities(
     hass: HomeAssistantType,
     template: Optional[str],
@@ -201,10 +263,11 @@ class RenderInfo:
         self.domains_lifecycle = set()
         self.entities = set()
         self.rate_limit = None
+        self.has_time = False
 
     def __repr__(self) -> str:
         """Representation of RenderInfo."""
-        return f"<RenderInfo {self.template} all_states={self.all_states} all_states_lifecycle={self.all_states_lifecycle} domains={self.domains} domains_lifecycle={self.domains_lifecycle} entities={self.entities} rate_limit={self.rate_limit}>"
+        return f"<RenderInfo {self.template} all_states={self.all_states} all_states_lifecycle={self.all_states_lifecycle} domains={self.domains} domains_lifecycle={self.domains_lifecycle} entities={self.entities} rate_limit={self.rate_limit}> has_time={self.has_time}"
 
     def _filter_domains_and_entities(self, entity_id: str) -> bool:
         """Template should re-render if the entity state changes when we match specific domains or entities."""
@@ -212,6 +275,10 @@ class RenderInfo:
             split_entity_id(entity_id)[0] in self.domains or entity_id in self.entities
         )
 
+    def _filter_entities(self, entity_id: str) -> bool:
+        """Template should re-render if the entity state changes when we match specific entities."""
+        return entity_id in self.entities
+
     def _filter_lifecycle_domains(self, entity_id: str) -> bool:
         """Template should re-render if the entity is added or removed with domains watched."""
         return split_entity_id(entity_id)[0] in self.domains_lifecycle
@@ -235,12 +302,11 @@ class RenderInfo:
     def _freeze(self) -> None:
         self._freeze_sets()
 
-        if self.rate_limit is None and (
-            self.domains or self.domains_lifecycle or self.all_states or self.exception
-        ):
-            # If the template accesses all states or an entire
-            # domain, and no rate limit is set, we use the default.
-            self.rate_limit = DEFAULT_RATE_LIMIT
+        if self.rate_limit is None:
+            if self.all_states or self.exception:
+                self.rate_limit = ALL_STATES_RATE_LIMIT
+            elif self.domains or self.domains_lifecycle:
+                self.rate_limit = DOMAIN_STATES_RATE_LIMIT
 
         if self.exception:
             return
@@ -254,8 +320,10 @@ class RenderInfo:
         if self.all_states:
             return
 
-        if self.entities or self.domains:
+        if self.domains:
             self.filter = self._filter_domains_and_entities
+        elif self.entities:
+            self.filter = self._filter_entities
         else:
             self.filter = _false
 
@@ -263,12 +331,21 @@ class RenderInfo:
 class Template:
     """Class to hold a template and manage caching and rendering."""
 
+    __slots__ = (
+        "__weakref__",
+        "template",
+        "hass",
+        "is_static",
+        "_compiled_code",
+        "_compiled",
+    )
+
     def __init__(self, template, hass=None):
         """Instantiate a template."""
         if not isinstance(template, str):
             raise TypeError("Expected template to be a string")
 
-        self.template: str = template
+        self.template: str = template.strip()
         self._compiled_code = None
         self._compiled = None
         self.hass = hass
@@ -302,26 +379,38 @@ class Template:
 
         return extract_entities(self.hass, self.template, variables)
 
-    def render(self, variables: TemplateVarsType = None, **kwargs: Any) -> str:
+    def render(
+        self,
+        variables: TemplateVarsType = None,
+        parse_result: bool = True,
+        **kwargs: Any,
+    ) -> Any:
         """Render given template."""
         if self.is_static:
-            return self.template.strip()
-
-        if variables is not None:
-            kwargs.update(variables)
+            if self.hass.config.legacy_templates or not parse_result:
+                return self.template
+            return self._parse_result(self.template)
 
         return run_callback_threadsafe(
-            self.hass.loop, self.async_render, kwargs
+            self.hass.loop,
+            partial(self.async_render, variables, parse_result, **kwargs),
         ).result()
 
     @callback
-    def async_render(self, variables: TemplateVarsType = None, **kwargs: Any) -> str:
+    def async_render(
+        self,
+        variables: TemplateVarsType = None,
+        parse_result: bool = True,
+        **kwargs: Any,
+    ) -> Any:
         """Render given template.
 
         This method must be run in the event loop.
         """
         if self.is_static:
-            return self.template.strip()
+            if self.hass.config.legacy_templates or not parse_result:
+                return self.template
+            return self._parse_result(self.template)
 
         compiled = self._compiled or self._ensure_compiled()
 
@@ -329,10 +418,38 @@ class Template:
             kwargs.update(variables)
 
         try:
-            return compiled.render(kwargs).strip()
+            render_result = compiled.render(kwargs)
         except Exception as err:  # pylint: disable=broad-except
             raise TemplateError(err) from err
 
+        render_result = render_result.strip()
+
+        if self.hass.config.legacy_templates or not parse_result:
+            return render_result
+
+        return self._parse_result(render_result)
+
+    def _parse_result(self, render_result: str) -> Any:  # pylint: disable=no-self-use
+        """Parse the result."""
+        try:
+            result = literal_eval(render_result)
+
+            if type(result) in RESULT_WRAPPERS:
+                result = RESULT_WRAPPERS[type(result)](
+                    result, render_result=render_result
+                )
+
+            # If the literal_eval result is a string, use the original
+            # render, by not returning right here. The evaluation of strings
+            # resulting in strings impacts quotes, to avoid unexpected
+            # output; use the original render instead of the evaluated one.
+            if not isinstance(result, str):
+                return result
+        except (ValueError, TypeError, SyntaxError, MemoryError):
+            pass
+
+        return render_result
+
     async def async_render_will_timeout(
         self, timeout: float, variables: TemplateVarsType = None, **kwargs: Any
     ) -> bool:
@@ -928,6 +1045,24 @@ def state_attr(hass, entity_id, name):
     return None
 
 
+def now(hass):
+    """Record fetching now."""
+    render_info = hass.data.get(_RENDER_INFO)
+    if render_info is not None:
+        render_info.has_time = True
+
+    return dt_util.now()
+
+
+def utcnow(hass):
+    """Record fetching utcnow."""
+    render_info = hass.data.get(_RENDER_INFO)
+    if render_info is not None:
+        render_info.has_time = True
+
+    return dt_util.utcnow()
+
+
 def forgiving_round(value, precision=0, method="common"):
     """Round accepted strings."""
     try:
@@ -1258,9 +1393,7 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
         self.globals["atan"] = arc_tangent
         self.globals["atan2"] = arc_tangent2
         self.globals["float"] = forgiving_float
-        self.globals["now"] = dt_util.now
         self.globals["as_local"] = dt_util.as_local
-        self.globals["utcnow"] = dt_util.utcnow
         self.globals["as_timestamp"] = forgiving_as_timestamp
         self.globals["relative_time"] = relative_time
         self.globals["timedelta"] = timedelta
@@ -1291,6 +1424,8 @@ class TemplateEnvironment(ImmutableSandboxedEnvironment):
         self.globals["is_state_attr"] = hassfunction(is_state_attr)
         self.globals["state_attr"] = hassfunction(state_attr)
         self.globals["states"] = AllStates(hass)
+        self.globals["utcnow"] = hassfunction(utcnow)
+        self.globals["now"] = hassfunction(now)
 
     def is_safe_callable(self, obj):
         """Test if callback is safe."""
diff --git a/homeassistant/helpers/update_coordinator.py b/homeassistant/helpers/update_coordinator.py
index 44e10243598..2abe7b8c6b7 100644
--- a/homeassistant/helpers/update_coordinator.py
+++ b/homeassistant/helpers/update_coordinator.py
@@ -9,7 +9,7 @@ import urllib.error
 import aiohttp
 import requests
 
-from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
+from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
 from homeassistant.helpers import entity, event
 from homeassistant.util.dt import utcnow
 
@@ -48,6 +48,7 @@ class DataUpdateCoordinator(Generic[T]):
         self.data: Optional[T] = None
 
         self._listeners: List[CALLBACK_TYPE] = []
+        self._job = HassJob(self._handle_refresh_interval)
         self._unsub_refresh: Optional[CALLBACK_TYPE] = None
         self._request_refresh_task: Optional[asyncio.TimerHandle] = None
         self.last_update_success = True
@@ -108,7 +109,7 @@ class DataUpdateCoordinator(Generic[T]):
         # as long as the update process takes less than a second
         self._unsub_refresh = event.async_track_point_in_utc_time(
             self.hass,
-            self._handle_refresh_interval,
+            self._job,
             utcnow().replace(microsecond=0) + self.update_interval,
         )
 
@@ -213,9 +214,14 @@ class CoordinatorEntity(entity.Entity):
         """When entity is added to hass."""
         await super().async_added_to_hass()
         self.async_on_remove(
-            self.coordinator.async_add_listener(self.async_write_ha_state)
+            self.coordinator.async_add_listener(self._handle_coordinator_update)
         )
 
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        self.async_write_ha_state()
+
     async def async_update(self) -> None:
         """Update the entity.
 
diff --git a/homeassistant/loader.py b/homeassistant/loader.py
index 53f793678c0..cb701213fe7 100644
--- a/homeassistant/loader.py
+++ b/homeassistant/loader.py
@@ -25,6 +25,7 @@ from typing import (
     cast,
 )
 
+from homeassistant.generated.mqtt import MQTT
 from homeassistant.generated.ssdp import SSDP
 from homeassistant.generated.zeroconf import HOMEKIT, ZEROCONF
 
@@ -202,6 +203,21 @@ async def async_get_ssdp(hass: "HomeAssistant") -> Dict[str, List]:
     return ssdp
 
 
+async def async_get_mqtt(hass: "HomeAssistant") -> Dict[str, List]:
+    """Return cached list of MQTT mappings."""
+
+    mqtt: Dict[str, List] = MQTT.copy()
+
+    integrations = await async_get_custom_components(hass)
+    for integration in integrations.values():
+        if not integration.mqtt:
+            continue
+
+        mqtt[integration.domain] = integration.mqtt
+
+    return mqtt
+
+
 class Integration:
     """An integration in Home Assistant."""
 
@@ -323,6 +339,11 @@ class Integration:
         """Return Integration Quality Scale."""
         return cast(str, self.manifest.get("quality_scale"))
 
+    @property
+    def mqtt(self) -> Optional[list]:
+        """Return Integration MQTT entries."""
+        return cast(List[dict], self.manifest.get("mqtt"))
+
     @property
     def ssdp(self) -> Optional[list]:
         """Return Integration SSDP entries."""
@@ -398,11 +419,13 @@ class Integration:
         cache = self.hass.data.setdefault(DATA_COMPONENTS, {})
         full_name = f"{self.domain}.{platform_name}"
         if full_name not in cache:
-            cache[full_name] = importlib.import_module(
-                f"{self.pkg_path}.{platform_name}"
-            )
+            cache[full_name] = self._import_platform(platform_name)
         return cache[full_name]  # type: ignore
 
+    def _import_platform(self, platform_name: str) -> ModuleType:
+        """Import the platform."""
+        return importlib.import_module(f"{self.pkg_path}.{platform_name}")
+
     def __repr__(self) -> str:
         """Text representation of class."""
         return f"<Integration {self.domain}: {self.pkg_path}>"
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index c510ded1e5f..10cb7858aba 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -8,12 +8,13 @@ attrs==19.3.0
 bcrypt==3.1.7
 certifi>=2020.6.20
 ciso8601==2.1.3
-cryptography==2.9.2
+cryptography==3.2.0
 defusedxml==0.6.0
 distro==1.5.0
 emoji==0.5.4
-hass-nabucasa==0.37.0
-home-assistant-frontend==20201001.2
+hass-nabucasa==0.37.1
+home-assistant-frontend==20201021.3
+httpx==0.16.1
 importlib-metadata==1.6.0;python_version<'3.8'
 jinja2>=2.11.2
 netdisco==2.8.2
@@ -25,11 +26,11 @@ pytz>=2020.1
 pyyaml==5.3.1
 requests==2.24.0
 ruamel.yaml==0.15.100
-sqlalchemy==1.3.19
+sqlalchemy==1.3.20
 voluptuous-serialize==2.4.0
 voluptuous==0.12.0
 yarl==1.4.2
-zeroconf==0.28.5
+zeroconf==0.28.6
 
 pycryptodome>=3.6.6
 
diff --git a/homeassistant/requirements.py b/homeassistant/requirements.py
index 303f6219cae..b3af06ad070 100644
--- a/homeassistant/requirements.py
+++ b/homeassistant/requirements.py
@@ -1,6 +1,5 @@
 """Module to handle installing requirements."""
 import asyncio
-import logging
 import os
 from typing import Any, Dict, Iterable, List, Optional, Set, Union, cast
 
@@ -13,8 +12,8 @@ DATA_PIP_LOCK = "pip_lock"
 DATA_PKG_CACHE = "pkg_cache"
 DATA_INTEGRATIONS_WITH_REQS = "integrations_with_reqs"
 CONSTRAINT_FILE = "package_constraints.txt"
-_LOGGER = logging.getLogger(__name__)
 DISCOVERY_INTEGRATIONS: Dict[str, Iterable[str]] = {
+    "mqtt": ("mqtt",),
     "ssdp": ("ssdp",),
     "zeroconf": ("zeroconf", "homekit"),
 }
diff --git a/homeassistant/scripts/macos/__init__.py b/homeassistant/scripts/macos/__init__.py
index b1c91001351..e6d128fa846 100644
--- a/homeassistant/scripts/macos/__init__.py
+++ b/homeassistant/scripts/macos/__init__.py
@@ -15,8 +15,8 @@ def install_osx():
 
     template_path = os.path.join(os.path.dirname(__file__), "launchd.plist")
 
-    with open(template_path, encoding="utf-8") as inp:
-        plist = inp.read()
+    with open(template_path, encoding="utf-8") as tinp:
+        plist = tinp.read()
 
     plist = plist.replace("$HASS_PATH$", hass_path)
     plist = plist.replace("$USER$", user)
diff --git a/homeassistant/setup.py b/homeassistant/setup.py
index 818e28479fb..4060b0410d6 100644
--- a/homeassistant/setup.py
+++ b/homeassistant/setup.py
@@ -77,7 +77,7 @@ async def _async_process_dependencies(
         if dep not in hass.config.components
     }
 
-    after_dependencies_tasks = dict()
+    after_dependencies_tasks = {}
     to_be_loaded = hass.data.get(DATA_SETUP_DONE, {})
     for dep in integration.after_dependencies:
         if (
diff --git a/homeassistant/strings.json b/homeassistant/strings.json
index 05bc2e3c247..56577c04c2a 100644
--- a/homeassistant/strings.json
+++ b/homeassistant/strings.json
@@ -19,12 +19,14 @@
     "config_flow": {
       "title": {
         "oauth2_pick_implementation": "Pick Authentication Method",
+        "reauth": "Reauthenticate Integration",
         "via_hassio_addon": "{name} via Home Assistant add-on"
       },
       "description": {
         "confirm_setup": "Do you want to start set up?"
       },
       "data": {
+        "name": "Name",
         "email": "Email",
         "username": "Username",
         "password": "Password",
@@ -34,27 +36,37 @@
         "url": "URL",
         "usb_path": "USB Device Path",
         "access_token": "Access Token",
-        "api_key": "API Key"
+        "api_key": "API Key",
+        "api_token": "API Token",
+        "ssl": "Uses an SSL certificate",
+        "verify_ssl": "Verify SSL certificate",
+        "longitude": "Longitude",
+        "latitude": "Latitude",
+        "pin": "PIN Code"
       },
       "create_entry": {
         "authenticated": "Successfully authenticated"
       },
       "error": {
-        "invalid_api_key": "Invalid API key",
-        "invalid_access_token": "Invalid access token",
         "cannot_connect": "Failed to connect",
+        "invalid_access_token": "Invalid access token",
+        "invalid_api_key": "Invalid API key",
         "invalid_auth": "Invalid authentication",
+        "invalid_host": "Invalid hostname or IP address",
         "unknown": "Unexpected error"
       },
       "abort": {
         "single_instance_allowed": "Already configured. Only a single configuration possible.",
         "already_configured_account": "Account is already configured",
-        "already_configured_service": "Service is already configured",
         "already_configured_device": "Device is already configured",
+        "already_configured_location": "Location is already configured",
+        "already_configured_service": "Service is already configured",
+        "already_in_progress": "Configuration flow is already in progress",
         "no_devices_found": "No devices found on the network",
         "oauth2_missing_configuration": "The component is not configured. Please follow the documentation.",
         "oauth2_authorize_url_timeout": "Timeout generating authorize URL.",
-        "oauth2_no_url_available": "No URL available. For information about this error, [check the help section]({docs_url})"
+        "oauth2_no_url_available": "No URL available. For information about this error, [check the help section]({docs_url})",
+        "reauth_successful": "Re-authentication was successful"
       }
     }
   }
diff --git a/homeassistant/util/__init__.py b/homeassistant/util/__init__.py
index 135de94a513..db1bbaa9993 100644
--- a/homeassistant/util/__init__.py
+++ b/homeassistant/util/__init__.py
@@ -44,7 +44,7 @@ def sanitize_path(path: str) -> str:
 
 def slugify(text: str, *, separator: str = "_") -> str:
     """Slugify a given text."""
-    return unicode_slug.slugify(text, separator=separator)  # type: ignore
+    return unicode_slug.slugify(text, separator=separator)
 
 
 def repr_helper(inp: Any) -> str:
diff --git a/homeassistant/util/distance.py b/homeassistant/util/distance.py
index 70fc9ad4eaa..3ae809b2a9f 100644
--- a/homeassistant/util/distance.py
+++ b/homeassistant/util/distance.py
@@ -1,6 +1,4 @@
 """Distance util functions."""
-
-import logging
 from numbers import Number
 
 from homeassistant.const import (
@@ -12,8 +10,6 @@ from homeassistant.const import (
     UNIT_NOT_RECOGNIZED_TEMPLATE,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 VALID_UNITS = [LENGTH_KILOMETERS, LENGTH_MILES, LENGTH_FEET, LENGTH_METERS]
 
 
diff --git a/homeassistant/util/dt.py b/homeassistant/util/dt.py
index d16e02913b5..8b52170f0e4 100644
--- a/homeassistant/util/dt.py
+++ b/homeassistant/util/dt.py
@@ -11,6 +11,7 @@ import pytz.tzinfo as pytzinfo
 from homeassistant.const import MATCH_ALL
 
 DATE_STR_FORMAT = "%Y-%m-%d"
+NATIVE_UTC = dt.timezone.utc
 UTC = pytz.utc
 DEFAULT_TIME_ZONE: dt.tzinfo = pytz.utc
 
@@ -52,7 +53,7 @@ def get_time_zone(time_zone_str: str) -> Optional[dt.tzinfo]:
 
 def utcnow() -> dt.datetime:
     """Get now in UTC time."""
-    return dt.datetime.utcnow().replace(tzinfo=UTC)
+    return dt.datetime.now(NATIVE_UTC)
 
 
 def now(time_zone: Optional[dt.tzinfo] = None) -> dt.datetime:
@@ -213,9 +214,13 @@ def parse_time_expression(parameter: Any, min_value: int, max_value: int) -> Lis
     """Parse the time expression part and return a list of times to match."""
     if parameter is None or parameter == MATCH_ALL:
         res = list(range(min_value, max_value + 1))
-    elif isinstance(parameter, str) and parameter.startswith("/"):
-        parameter = int(parameter[1:])
-        res = [x for x in range(min_value, max_value + 1) if x % parameter == 0]
+    elif isinstance(parameter, str):
+        if parameter.startswith("/"):
+            parameter = int(parameter[1:])
+            res = [x for x in range(min_value, max_value + 1) if x % parameter == 0]
+        else:
+            res = [int(parameter)]
+
     elif not hasattr(parameter, "__iter__"):
         res = [int(parameter)]
     else:
@@ -310,7 +315,7 @@ def find_next_time_expression_time(
     # Now we need to handle timezones. We will make this datetime object
     # "naive" first and then re-convert it to the target timezone.
     # This is so that we can call pytz's localize and handle DST changes.
-    tzinfo: pytzinfo.DstTzInfo = result.tzinfo
+    tzinfo: pytzinfo.DstTzInfo = UTC if result.tzinfo == NATIVE_UTC else result.tzinfo
     result = result.replace(tzinfo=None)
 
     try:
@@ -333,7 +338,7 @@ def find_next_time_expression_time(
         return find_next_time_expression_time(result, seconds, minutes, hours)
 
     result_dst = cast(dt.timedelta, result.dst())
-    now_dst = cast(dt.timedelta, now.dst())
+    now_dst = cast(dt.timedelta, now.dst()) or dt.timedelta(0)
     if result_dst >= now_dst:
         return result
 
diff --git a/homeassistant/util/logging.py b/homeassistant/util/logging.py
index 629928f43d7..2f202165550 100644
--- a/homeassistant/util/logging.py
+++ b/homeassistant/util/logging.py
@@ -98,7 +98,7 @@ def log_exception(format_err: Callable[..., Any], *args: Any) -> None:
     else:
         # If Python is unable to access the sources files, the call stack frame
         # will be missing information, so let's guard.
-        # https://github.com/home-assistant/home-assistant/issues/24982
+        # https://github.com/home-assistant/core/issues/24982
         module_name = __name__
 
     # Do not print the wrapper in the traceback
@@ -172,7 +172,7 @@ def async_create_catching_coro(target: Coroutine) -> Coroutine:
     wrapped_target = catch_log_coro_exception(
         target,
         lambda *args: "Exception in {} called from\n {}".format(
-            target.__name__,  # type: ignore
+            target.__name__,
             "".join(traceback.format_list(trace[:-1])),
         ),
     )
diff --git a/homeassistant/util/pressure.py b/homeassistant/util/pressure.py
index 046b65122a9..22ad86a6896 100644
--- a/homeassistant/util/pressure.py
+++ b/homeassistant/util/pressure.py
@@ -1,6 +1,4 @@
 """Pressure util functions."""
-
-import logging
 from numbers import Number
 
 from homeassistant.const import (
@@ -13,8 +11,6 @@ from homeassistant.const import (
     UNIT_NOT_RECOGNIZED_TEMPLATE,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 VALID_UNITS = [PRESSURE_PA, PRESSURE_HPA, PRESSURE_MBAR, PRESSURE_INHG, PRESSURE_PSI]
 
 UNIT_CONVERSION = {
diff --git a/homeassistant/util/timeout.py b/homeassistant/util/timeout.py
index 1193c701712..8c3d38a3700 100644
--- a/homeassistant/util/timeout.py
+++ b/homeassistant/util/timeout.py
@@ -7,7 +7,6 @@ from __future__ import annotations
 
 import asyncio
 import enum
-import logging
 from types import TracebackType
 from typing import Any, Dict, List, Optional, Type, Union
 
@@ -15,8 +14,6 @@ from .async_ import run_callback_threadsafe
 
 ZONE_GLOBAL = "global"
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class _State(str, enum.Enum):
     """States of a task."""
diff --git a/homeassistant/util/unit_system.py b/homeassistant/util/unit_system.py
index bac66cd28bc..9e0d0c2c979 100644
--- a/homeassistant/util/unit_system.py
+++ b/homeassistant/util/unit_system.py
@@ -1,6 +1,4 @@
 """Unit system helper class and methods."""
-
-import logging
 from numbers import Number
 from typing import Optional
 
@@ -33,8 +31,6 @@ from homeassistant.util import (
     volume as volume_util,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 LENGTH_UNITS = distance_util.VALID_UNITS
 
 MASS_UNITS = [MASS_POUNDS, MASS_OUNCES, MASS_KILOGRAMS, MASS_GRAMS]
diff --git a/homeassistant/util/uuid.py b/homeassistant/util/uuid.py
index c91cfe0dd12..d924eab934d 100644
--- a/homeassistant/util/uuid.py
+++ b/homeassistant/util/uuid.py
@@ -1,15 +1,12 @@
 """Helpers to generate uuids."""
 
-import random
-import uuid
+from random import getrandbits
 
 
-def uuid_v1mc_hex() -> str:
-    """Generate a uuid1 with a random multicast MAC address.
+def random_uuid_hex() -> str:
+    """Generate a random UUID hex.
 
-    The uuid1 uses a random multicast MAC address instead of the real MAC address
-    of the machine without the overhead of calling the getrandom() system call.
-
-    This is effectively equivalent to PostgreSQL's uuid_generate_v1mc() function
+    This uuid should not be used for cryptographically secure
+    operations.
     """
-    return uuid.uuid1(node=random.getrandbits(48) | (1 << 40)).hex
+    return "%032x" % getrandbits(32 * 4)
diff --git a/homeassistant/util/volume.py b/homeassistant/util/volume.py
index 30185e4346c..5d94f848cd8 100644
--- a/homeassistant/util/volume.py
+++ b/homeassistant/util/volume.py
@@ -1,6 +1,4 @@
 """Volume conversion util functions."""
-
-import logging
 from numbers import Number
 
 from homeassistant.const import (
@@ -12,8 +10,6 @@ from homeassistant.const import (
     VOLUME_MILLILITERS,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 VALID_UNITS = [VOLUME_LITERS, VOLUME_MILLILITERS, VOLUME_GALLONS, VOLUME_FLUID_OUNCE]
 
 
diff --git a/pylintrc b/pylintrc
deleted file mode 100644
index 86f3d4caea0..00000000000
--- a/pylintrc
+++ /dev/null
@@ -1,65 +0,0 @@
-[MASTER]
-ignore=tests
-# Use a conservative default here; 2 should speed up most setups and not hurt
-# any too bad. Override on command line as appropriate.
-# Disabled for now: https://github.com/PyCQA/pylint/issues/3584
-#jobs=2
-load-plugins=pylint_strict_informational
-persistent=no
-extension-pkg-whitelist=ciso8601,cv2
-
-[BASIC]
-good-names=id,i,j,k,ex,Run,_,fp,T,ev
-
-[MESSAGES CONTROL]
-# Reasons disabled:
-# format - handled by black
-# locally-disabled - it spams too much
-# duplicate-code - unavoidable
-# cyclic-import - doesn't test if both import on load
-# abstract-class-little-used - prevents from setting right foundation
-# unused-argument - generic callbacks and setup methods create a lot of warnings
-# too-many-* - are not enforced for the sake of readability
-# too-few-* - same as too-many-*
-# abstract-method - with intro of async there are always methods missing
-# inconsistent-return-statements - doesn't handle raise
-# too-many-ancestors - it's too strict.
-# wrong-import-order - isort guards this
-disable=
-  format,
-  abstract-class-little-used,
-  abstract-method,
-  cyclic-import,
-  duplicate-code,
-  inconsistent-return-statements,
-  locally-disabled,
-  not-context-manager,
-  too-few-public-methods,
-  too-many-ancestors,
-  too-many-arguments,
-  too-many-branches,
-  too-many-instance-attributes,
-  too-many-lines,
-  too-many-locals,
-  too-many-public-methods,
-  too-many-return-statements,
-  too-many-statements,
-  too-many-boolean-expressions,
-  unused-argument,
-  wrong-import-order
-# enable useless-suppression temporarily every now and then to clean them up
-enable=
-  use-symbolic-message-instead
-
-[REPORTS]
-score=no
-
-[TYPECHECK]
-# For attrs
-ignored-classes=_CountingAttr
-
-[FORMAT]
-expected-line-ending-format=LF
-
-[EXCEPTIONS]
-overgeneral-exceptions=BaseException,Exception,HomeAssistantError
diff --git a/pyproject.toml b/pyproject.toml
index 7c0c5eeb433..0f416d9e014 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,117 @@
 [tool.black]
 target-version = ["py37", "py38"]
 exclude = 'generated'
+
+[tool.isort]
+# https://github.com/PyCQA/isort/wiki/isort-Settings
+profile = "black"
+# will group `import x` and `from x import` of the same module.
+force_sort_within_sections = true
+known_first_party = [
+    "homeassistant",
+    "tests",
+]
+forced_separate = [
+    "tests",
+]
+combine_as_imports = true
+
+[tool.pylint.MASTER]
+ignore = [
+    "tests",
+]
+# Use a conservative default here; 2 should speed up most setups and not hurt
+# any too bad. Override on command line as appropriate.
+# Disabled for now: https://github.com/PyCQA/pylint/issues/3584
+#jobs = 2
+load-plugins = [
+    "pylint_strict_informational",
+]
+persistent = false
+extension-pkg-whitelist = [
+    "ciso8601",
+    "cv2",
+]
+
+[tool.pylint.BASIC]
+good-names = [
+    "_",
+    "ev",
+    "ex",
+    "fp",
+    "i",
+    "id",
+    "j",
+    "k",
+    "Run",
+    "T",
+]
+
+[tool.pylint."MESSAGES CONTROL"]
+# Reasons disabled:
+# format - handled by black
+# locally-disabled - it spams too much
+# duplicate-code - unavoidable
+# cyclic-import - doesn't test if both import on load
+# abstract-class-little-used - prevents from setting right foundation
+# unused-argument - generic callbacks and setup methods create a lot of warnings
+# too-many-* - are not enforced for the sake of readability
+# too-few-* - same as too-many-*
+# abstract-method - with intro of async there are always methods missing
+# inconsistent-return-statements - doesn't handle raise
+# too-many-ancestors - it's too strict.
+# wrong-import-order - isort guards this
+disable = [
+    "format",
+    "abstract-class-little-used",
+    "abstract-method",
+    "cyclic-import",
+    "duplicate-code",
+    "inconsistent-return-statements",
+    "locally-disabled",
+    "not-context-manager",
+    "too-few-public-methods",
+    "too-many-ancestors",
+    "too-many-arguments",
+    "too-many-branches",
+    "too-many-instance-attributes",
+    "too-many-lines",
+    "too-many-locals",
+    "too-many-public-methods",
+    "too-many-return-statements",
+    "too-many-statements",
+    "too-many-boolean-expressions",
+    "unused-argument",
+    "wrong-import-order",
+]
+enable = [
+    #"useless-suppression",  # temporarily every now and then to clean them up
+    "use-symbolic-message-instead",
+]
+
+[tool.pylint.REPORTS]
+score = false
+
+[tool.pylint.TYPECHECK]
+ignored-classes = [
+    "_CountingAttr",  # for attrs
+]
+
+[tool.pylint.FORMAT]
+expected-line-ending-format = "LF"
+
+[tool.pylint.EXCEPTIONS]
+overgeneral-exceptions = [
+    "BaseException",
+    "Exception",
+    "HomeAssistantError",
+]
+
+[tool.pytest.ini_options]
+testpaths = [
+    "tests",
+]
+norecursedirs = [
+    ".git",
+    "testing_config",
+]
diff --git a/requirements.txt b/requirements.txt
index 91f09a54390..1586fdddee4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,10 +8,11 @@ attrs==19.3.0
 bcrypt==3.1.7
 certifi>=2020.6.20
 ciso8601==2.1.3
+httpx==0.16.1
 importlib-metadata==1.6.0;python_version<'3.8'
 jinja2>=2.11.2
 PyJWT==1.7.1
-cryptography==2.9.2
+cryptography==3.2.0
 pip>=8.0.3
 python-slugify==4.0.1
 pytz>=2020.1
diff --git a/requirements_all.txt b/requirements_all.txt
index d5c1cdff86d..cab26593191 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -26,7 +26,7 @@ Mastodon.py==1.5.1
 OPi.GPIO==0.4.0
 
 # homeassistant.components.plugwise
-Plugwise_Smile==1.5.1
+Plugwise_Smile==1.6.0
 
 # homeassistant.components.essent
 PyEssent==0.13
@@ -104,9 +104,6 @@ abodepy==1.1.0
 # homeassistant.components.accuweather
 accuweather==0.0.11
 
-# homeassistant.components.mcp23017
-adafruit-blinka==3.9.0
-
 # homeassistant.components.bmp280
 adafruit-circuitpython-bmp280==3.1.1
 
@@ -122,6 +119,9 @@ adext==0.3
 # homeassistant.components.adguard
 adguardhome==0.4.2
 
+# homeassistant.components.advantage_air
+advantage_air==0.2.1
+
 # homeassistant.components.frontier_silicon
 afsapi==0.0.4
 
@@ -221,7 +221,7 @@ aiopvpc==2.0.2
 aiopylgtv==0.3.3
 
 # homeassistant.components.shelly
-aioshelly==0.3.4
+aioshelly==0.4.0
 
 # homeassistant.components.switcher_kis
 aioswitcher==1.2.1
@@ -248,7 +248,7 @@ ambiclimate==0.2.1
 amcrest==1.7.0
 
 # homeassistant.components.androidtv
-androidtv[async]==0.0.50
+androidtv[async]==0.0.52
 
 # homeassistant.components.anel_pwrctrl
 anel_pwrctrl-homeassistant==0.0.1.dev2
@@ -309,13 +309,13 @@ av==8.0.2
 avri-api==0.1.7
 
 # homeassistant.components.axis
-axis==37
+axis==41
 
 # homeassistant.components.azure_event_hub
 azure-eventhub==5.1.0
 
 # homeassistant.components.azure_service_bus
-azure-servicebus==0.50.1
+azure-servicebus==0.50.3
 
 # homeassistant.components.baidu
 baidu-aip==1.6.6
@@ -342,7 +342,7 @@ beautifulsoup4==4.9.1
 bellows==0.20.3
 
 # homeassistant.components.bmw_connected_drive
-bimmer_connected==0.7.7
+bimmer_connected==0.7.8
 
 # homeassistant.components.bizkaibus
 bizkaibus==0.1.1
@@ -369,9 +369,6 @@ blockchain==1.4.4
 # homeassistant.components.bme680
 # bme680==1.0.5
 
-# homeassistant.components.bom
-bomradarloop==0.1.5
-
 # homeassistant.components.bond
 bond-api==0.1.8
 
@@ -386,7 +383,7 @@ bravia-tv==1.0.6
 broadlink==0.15.0
 
 # homeassistant.components.brother
-brother==0.1.17
+brother==0.1.18
 
 # homeassistant.components.brottsplatskartan
 brottsplatskartan==0.0.1
@@ -481,10 +478,10 @@ defusedxml==0.6.0
 deluge-client==1.7.1
 
 # homeassistant.components.denonavr
-denonavr==0.9.4
+denonavr==0.9.5
 
 # homeassistant.components.devolo_home_control
-devolo-home-control-api==0.15.0
+devolo-home-control-api==0.15.1
 
 # homeassistant.components.directv
 directv==0.3.0
@@ -538,7 +535,7 @@ elgato==0.2.0
 eliqonline==1.2.2
 
 # homeassistant.components.elkm1
-elkm1-lib==0.8.0
+elkm1-lib==0.8.4
 
 # homeassistant.components.mobile_app
 emoji==0.5.4
@@ -683,6 +680,9 @@ google-cloud-pubsub==0.39.1
 # homeassistant.components.google_cloud
 google-cloud-texttospeech==0.4.0
 
+# homeassistant.components.nest
+google-nest-sdm==0.1.6
+
 # homeassistant.components.google_travel_time
 googlemaps==2.5.1
 
@@ -695,8 +695,11 @@ gpiozero==1.5.1
 # homeassistant.components.gpsd
 gps3==0.33.3
 
+# homeassistant.components.gree
+greeclimate==0.9.0
+
 # homeassistant.components.greeneye_monitor
-greeneye_monitor==2.0
+greeneye_monitor==2.1
 
 # homeassistant.components.greenwave
 greenwavereality==0.5.1
@@ -723,13 +726,16 @@ habitipy==0.2.0
 hangups==0.4.11
 
 # homeassistant.components.cloud
-hass-nabucasa==0.37.0
+hass-nabucasa==0.37.1
 
 # homeassistant.components.splunk
 hass_splunk==0.1.1
 
+# homeassistant.components.tasmota
+hatasmota==0.0.24
+
 # homeassistant.components.jewish_calendar
-hdate==0.9.5
+hdate==0.9.12
 
 # homeassistant.components.heatmiser
 heatmiserV3==1.1.18
@@ -753,13 +759,13 @@ hole==0.5.1
 holidays==0.10.3
 
 # homeassistant.components.frontend
-home-assistant-frontend==20201001.2
+home-assistant-frontend==20201021.3
 
 # homeassistant.components.zwave
 homeassistant-pyozw==0.1.10
 
 # homeassistant.components.home_connect
-homeconnect==0.5
+homeconnect==0.6.3
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.11.0
@@ -798,7 +804,7 @@ ibm-watson==4.0.1
 ibmiotf==0.3.4
 
 # homeassistant.components.ping
-icmplib==1.1.3
+icmplib==1.2.2
 
 # homeassistant.components.iglo
 iglo==1.2.7
@@ -868,7 +874,7 @@ liffylights==0.9.4
 lightify==1.0.7.2
 
 # homeassistant.components.lightwave
-lightwave==0.18
+lightwave==0.19
 
 # homeassistant.components.limitlessled
 limitlessled==1.1.3
@@ -1013,16 +1019,16 @@ oasatelematics==0.3
 oauth2client==4.0.0
 
 # homeassistant.components.oem
-oemthermostat==1.1
+oemthermostat==1.1.1
 
 # homeassistant.components.omnilogic
-omnilogic==0.4.0
+omnilogic==0.4.2
 
 # homeassistant.components.onkyo
 onkyo-eiscp==1.2.7
 
 # homeassistant.components.onvif
-onvif-zeep-async==0.6.0
+onvif-zeep-async==1.0.0
 
 # homeassistant.components.opengarage
 open-garage==0.1.4
@@ -1084,6 +1090,9 @@ pencompy==0.0.3
 # homeassistant.components.unifi_direct
 pexpect==4.6.0
 
+# homeassistant.components.onewire
+pi1wire==0.1.0
+
 # homeassistant.components.pi4ioe5v9xxxx
 pi4ioe5v9xxxx==0.0.2
 
@@ -1173,7 +1182,7 @@ pushbullet.py==0.11.0
 pushover_complete==1.1.1
 
 # homeassistant.components.rpi_gpio_pwm
-pwmled==1.5.0
+pwmled==1.5.3
 
 # homeassistant.components.august
 py-august==0.25.0
@@ -1196,6 +1205,9 @@ py-schluter==0.1.7
 # homeassistant.components.synology
 py-synology==0.2.0
 
+# homeassistant.components.zabbix
+py-zabbix==1.1.7
+
 # homeassistant.components.seventeentrack
 py17track==2.2.2
 
@@ -1213,13 +1225,13 @@ pyHS100==0.3.5.1
 pyMetno==0.8.1
 
 # homeassistant.components.rfxtrx
-pyRFXtrx==0.25
+pyRFXtrx==0.26
 
 # homeassistant.components.switchmate
 # pySwitchmate==0.4.6
 
 # homeassistant.components.tibber
-pyTibber==0.15.3
+pyTibber==0.15.7
 
 # homeassistant.components.dlink
 pyW215==0.7.0
@@ -1240,7 +1252,7 @@ pyaehw4a1==0.3.9
 pyaftership==0.1.2
 
 # homeassistant.components.airvisual
-pyairvisual==5.0.2
+pyairvisual==5.0.3
 
 # homeassistant.components.almond
 pyalmond==0.0.2
@@ -1276,13 +1288,13 @@ pybotvac==0.0.17
 pycarwings2==2.9
 
 # homeassistant.components.cloudflare
-pycfdns==0.0.1
+pycfdns==1.1.1
 
 # homeassistant.components.channels
 pychannels==1.0.0
 
 # homeassistant.components.cast
-pychromecast==7.5.0
+pychromecast==7.5.1
 
 # homeassistant.components.cmus
 pycmus==0.1.1
@@ -1342,7 +1354,7 @@ pyedimax==0.2.1
 pyeight==0.1.4
 
 # homeassistant.components.emby
-pyemby==1.6
+pyemby==1.7
 
 # homeassistant.components.envisalink
 pyenvisalink==4.0
@@ -1391,7 +1403,7 @@ pygatt[GATTTOOL]==4.0.5
 pygtfs==0.1.5
 
 # homeassistant.components.hvv_departures
-pygti==0.6.0
+pygti==0.9.2
 
 # homeassistant.components.version
 pyhaversion==3.4.2
@@ -1400,13 +1412,13 @@ pyhaversion==3.4.2
 pyheos==0.6.0
 
 # homeassistant.components.hikvision
-pyhik==0.2.7
+pyhik==0.2.8
 
 # homeassistant.components.hive
 pyhiveapi==0.2.20.2
 
 # homeassistant.components.homematic
-pyhomematic==0.1.68
+pyhomematic==0.1.70
 
 # homeassistant.components.homeworks
 pyhomeworks==0.0.6
@@ -1439,7 +1451,7 @@ pyirishrail==0.0.2
 pyiss==1.0.1
 
 # homeassistant.components.isy994
-pyisy==2.0.2
+pyisy==2.1.0
 
 # homeassistant.components.itach
 pyitachip2ir==0.0.7
@@ -1448,7 +1460,7 @@ pyitachip2ir==0.0.7
 pykira==0.1.1
 
 # homeassistant.components.kodi
-pykodi==0.2.0
+pykodi==0.2.1
 
 # homeassistant.components.kwb
 pykwb==0.0.8
@@ -1475,7 +1487,7 @@ pylitejet==0.1
 pyloopenergy==0.2.1
 
 # homeassistant.components.lutron_caseta
-pylutron-caseta==0.6.1
+pylutron-caseta==0.7.0
 
 # homeassistant.components.lutron
 pylutron==0.2.5
@@ -1514,7 +1526,7 @@ pymsteams==0.1.12
 pymusiccast==0.1.6
 
 # homeassistant.components.myq
-pymyq==2.0.5
+pymyq==2.0.8
 
 # homeassistant.components.mysensors
 pymysensors==0.18.0
@@ -1523,7 +1535,7 @@ pymysensors==0.18.0
 pynanoleaf==0.0.5
 
 # homeassistant.components.nello
-pynello==2.0.2
+pynello==2.0.3
 
 # homeassistant.components.netgear
 pynetgear==0.6.1
@@ -1588,7 +1600,10 @@ pypck==0.7.2
 pypjlink2==1.2.1
 
 # homeassistant.components.point
-pypoint==1.1.2
+pypoint==2.0.0
+
+# homeassistant.components.profiler
+pyprof2calltree==1.4.5
 
 # homeassistant.components.ps4
 pyps4-2ndscreen==1.1.1
@@ -1614,6 +1629,9 @@ pyrepetier==3.0.5
 # homeassistant.components.risco
 pyrisco==0.3.1
 
+# homeassistant.components.ruckus_unleashed
+pyruckus==0.12
+
 # homeassistant.components.sabnzbd
 pysabnzbd==1.1.0
 
@@ -1670,13 +1688,13 @@ pysnmp==4.4.12
 pysoma==0.0.10
 
 # homeassistant.components.sonos
-pysonos==0.0.33
+pysonos==0.0.35
 
 # homeassistant.components.spc
 pyspcwebgw==0.4.0
 
 # homeassistant.components.squeezebox
-pysqueezebox==0.3.1
+pysqueezebox==0.5.4
 
 # homeassistant.components.stiebel_eltron
 pystiebeleltron==0.0.1.dev2
@@ -1763,7 +1781,7 @@ python-nest==4.1.0
 python-nmap==0.6.1
 
 # homeassistant.components.ozw
-python-openzwave-mqtt==1.0.5
+python-openzwave-mqtt==1.2.2
 
 # homeassistant.components.qbittorrent
 python-qbittorrent==0.4.1
@@ -1778,7 +1796,7 @@ python-sochain-api==0.0.2
 python-songpal==0.12
 
 # homeassistant.components.synology_dsm
-python-synology==0.9.0
+python-synology==1.0.0
 
 # homeassistant.components.tado
 python-tado==0.8.1
@@ -1848,7 +1866,7 @@ pyvera==0.3.10
 pyversasense==0.0.6
 
 # homeassistant.components.vesync
-pyvesync==1.1.0
+pyvesync==1.2.0
 
 # homeassistant.components.vizio
 pyvizio==0.1.56
@@ -1857,7 +1875,7 @@ pyvizio==0.1.56
 pyvlx==0.2.17
 
 # homeassistant.components.volumio
-pyvolumio==0.1.2
+pyvolumio==0.1.3
 
 # homeassistant.components.html5
 pywebpush==1.9.2
@@ -1871,9 +1889,6 @@ pywilight==0.0.65
 # homeassistant.components.xeoma
 pyxeoma==1.4.1
 
-# homeassistant.components.zabbix
-pyzabbix==0.7.4
-
 # homeassistant.components.qrcode
 pyzbar==0.1.7
 
@@ -1887,7 +1902,7 @@ qnapstats==0.3.0
 quantum-gateway==0.0.5
 
 # homeassistant.components.rachio
-rachiopy==0.1.4
+rachiopy==1.0.3
 
 # homeassistant.components.radiotherm
 radiotherm==2.0.0
@@ -1981,10 +1996,10 @@ sense-hat==2.2.0
 
 # homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense_energy==0.8.0
+sense_energy==0.8.1
 
 # homeassistant.components.sentry
-sentry-sdk==0.18.0
+sentry-sdk==0.19.1
 
 # homeassistant.components.sharkiq
 sharkiqpy==0.1.8
@@ -2002,7 +2017,7 @@ simplehound==0.3
 simplepush==1.1.4
 
 # homeassistant.components.simplisafe
-simplisafe-python==9.4.1
+simplisafe-python==9.6.0
 
 # homeassistant.components.sisyphus
 sisyphus-control==2.2.1
@@ -2073,11 +2088,11 @@ spiderpy==1.3.1
 spotcrime==1.0.4
 
 # homeassistant.components.spotify
-spotipy==2.16.0
+spotipy==2.16.1
 
 # homeassistant.components.recorder
 # homeassistant.components.sql
-sqlalchemy==1.3.19
+sqlalchemy==1.3.20
 
 # homeassistant.components.starline
 starline==0.1.3
@@ -2110,7 +2125,7 @@ sucks==0.9.4
 sunwatcher==0.2.1
 
 # homeassistant.components.surepetcare
-surepy==0.2.5
+surepy==0.2.6
 
 # homeassistant.components.swiss_hydrological_data
 swisshydrodata==0.0.3
@@ -2146,7 +2161,7 @@ temperusb==1.5.3
 # tensorflow==2.3.0
 
 # homeassistant.components.powerwall
-tesla-powerwall==0.2.12
+tesla-powerwall==0.3.3
 
 # homeassistant.components.tesla
 teslajsonpy==0.10.4
@@ -2182,7 +2197,7 @@ tp-connected==0.0.4
 transmissionrpc==0.11
 
 # homeassistant.components.tuya
-tuyaha==0.0.7
+tuyaha==0.0.8
 
 # homeassistant.components.twentemilieu
 twentemilieu==0.3.0
@@ -2272,6 +2287,9 @@ wolf_smartset==0.1.6
 # homeassistant.components.xbee
 xbee-helper==0.0.7
 
+# homeassistant.components.xbox
+xbox-webapi==2.0.8
+
 # homeassistant.components.xbox_live
 xboxapi==2.0.1
 
@@ -2304,13 +2322,13 @@ yeelightsunflower==0.0.10
 youtube_dl==2020.09.20
 
 # homeassistant.components.onvif
-zeep[async]==3.4.0
+zeep[async]==4.0.0
 
 # homeassistant.components.zengge
 zengge==0.2
 
 # homeassistant.components.zeroconf
-zeroconf==0.28.5
+zeroconf==0.28.6
 
 # homeassistant.components.zha
 zha-quirks==0.0.45
@@ -2325,7 +2343,7 @@ ziggo-mediabox-xl==1.1.0
 zigpy-cc==0.5.2
 
 # homeassistant.components.zha
-zigpy-deconz==0.10.0
+zigpy-deconz==0.11.0
 
 # homeassistant.components.zha
 zigpy-xbee==0.13.0
@@ -2334,7 +2352,7 @@ zigpy-xbee==0.13.0
 zigpy-zigate==0.6.2
 
 # homeassistant.components.zha
-zigpy-znp==0.2.1
+zigpy-znp==0.2.2
 
 # homeassistant.components.zha
 zigpy==0.26.0
diff --git a/requirements_test.txt b/requirements_test.txt
index 0fd681b62b2..744765bec77 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,11 +5,11 @@
 -c homeassistant/package_constraints.txt
 -r requirements_test_pre_commit.txt
 asynctest==0.13.0
-codecov==2.1.9
+codecov==2.1.10
 coverage==5.3
 jsonpickle==1.4.1
 mock-open==1.4.0
-mypy==0.782
+mypy==0.790
 pre-commit==2.7.1
 pylint==2.6.0
 astroid==2.4.2
@@ -24,5 +24,6 @@ pytest-xdist==2.1.0
 pytest==6.0.2
 requests_mock==1.8.0
 responses==0.12.0
+respx==0.14.0
 stdlib-list==0.7.0
 tqdm==4.49.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index ba81a6c0a49..5d3df986871 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -7,7 +7,7 @@
 HAP-python==3.0.0
 
 # homeassistant.components.plugwise
-Plugwise_Smile==1.5.1
+Plugwise_Smile==1.6.0
 
 # homeassistant.components.flick_electric
 PyFlick==0.0.2
@@ -56,6 +56,9 @@ adext==0.3
 # homeassistant.components.adguard
 adguardhome==0.4.2
 
+# homeassistant.components.advantage_air
+advantage_air==0.2.1
+
 # homeassistant.components.agent_dvr
 agent-py==0.0.23
 
@@ -134,7 +137,7 @@ aiopvpc==2.0.2
 aiopylgtv==0.3.3
 
 # homeassistant.components.shelly
-aioshelly==0.3.4
+aioshelly==0.4.0
 
 # homeassistant.components.switcher_kis
 aioswitcher==1.2.1
@@ -152,7 +155,7 @@ airly==1.0.0
 ambiclimate==0.2.1
 
 # homeassistant.components.androidtv
-androidtv[async]==0.0.50
+androidtv[async]==0.0.52
 
 # homeassistant.components.apns
 apns2==0.3.0
@@ -177,7 +180,7 @@ av==8.0.2
 avri-api==0.1.7
 
 # homeassistant.components.axis
-axis==37
+axis==41
 
 # homeassistant.components.azure_event_hub
 azure-eventhub==5.1.0
@@ -194,9 +197,6 @@ blebox_uniapi==1.3.2
 # homeassistant.components.blink
 blinkpy==0.16.3
 
-# homeassistant.components.bom
-bomradarloop==0.1.5
-
 # homeassistant.components.bond
 bond-api==0.1.8
 
@@ -207,7 +207,7 @@ bravia-tv==1.0.6
 broadlink==0.15.0
 
 # homeassistant.components.brother
-brother==0.1.17
+brother==0.1.18
 
 # homeassistant.components.bsblan
 bsblan==0.3.7
@@ -251,10 +251,10 @@ debugpy==1.0.0rc2
 defusedxml==0.6.0
 
 # homeassistant.components.denonavr
-denonavr==0.9.4
+denonavr==0.9.5
 
 # homeassistant.components.devolo_home_control
-devolo-home-control-api==0.15.0
+devolo-home-control-api==0.15.1
 
 # homeassistant.components.directv
 directv==0.3.0
@@ -278,7 +278,7 @@ eebrightbox==0.0.4
 elgato==0.2.0
 
 # homeassistant.components.elkm1
-elkm1-lib==0.8.0
+elkm1-lib==0.8.4
 
 # homeassistant.components.mobile_app
 emoji==0.5.4
@@ -348,6 +348,12 @@ google-api-python-client==1.6.4
 # homeassistant.components.google_pubsub
 google-cloud-pubsub==0.39.1
 
+# homeassistant.components.nest
+google-nest-sdm==0.1.6
+
+# homeassistant.components.gree
+greeclimate==0.9.0
+
 # homeassistant.components.griddy
 griddypower==0.1.0
 
@@ -358,10 +364,13 @@ ha-ffmpeg==2.0
 hangups==0.4.11
 
 # homeassistant.components.cloud
-hass-nabucasa==0.37.0
+hass-nabucasa==0.37.1
+
+# homeassistant.components.tasmota
+hatasmota==0.0.24
 
 # homeassistant.components.jewish_calendar
-hdate==0.9.5
+hdate==0.9.12
 
 # homeassistant.components.here_travel_time
 herepy==2.0.0
@@ -376,13 +385,13 @@ hole==0.5.1
 holidays==0.10.3
 
 # homeassistant.components.frontend
-home-assistant-frontend==20201001.2
+home-assistant-frontend==20201021.3
 
 # homeassistant.components.zwave
 homeassistant-pyozw==0.1.10
 
 # homeassistant.components.home_connect
-homeconnect==0.5
+homeconnect==0.6.3
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.11.0
@@ -401,7 +410,7 @@ hyperion-py==0.3.0
 iaqualink==0.3.4
 
 # homeassistant.components.ping
-icmplib==1.1.3
+icmplib==1.2.2
 
 # homeassistant.components.influxdb
 influxdb-client==1.8.0
@@ -487,10 +496,10 @@ numpy==1.19.2
 oauth2client==4.0.0
 
 # homeassistant.components.omnilogic
-omnilogic==0.4.0
+omnilogic==0.4.2
 
 # homeassistant.components.onvif
-onvif-zeep-async==0.6.0
+onvif-zeep-async==1.0.0
 
 # homeassistant.components.openerz
 openerz-api==0.1.0
@@ -513,6 +522,9 @@ pdunehd==1.3.2
 # homeassistant.components.unifi_direct
 pexpect==4.6.0
 
+# homeassistant.components.onewire
+pi1wire==0.1.0
+
 # homeassistant.components.pilight
 pilight==0.1.1
 
@@ -591,10 +603,10 @@ pyHS100==0.3.5.1
 pyMetno==0.8.1
 
 # homeassistant.components.rfxtrx
-pyRFXtrx==0.25
+pyRFXtrx==0.26
 
 # homeassistant.components.tibber
-pyTibber==0.15.3
+pyTibber==0.15.7
 
 # homeassistant.components.nextbus
 py_nextbusnext==0.1.4
@@ -603,7 +615,7 @@ py_nextbusnext==0.1.4
 pyaehw4a1==0.3.9
 
 # homeassistant.components.airvisual
-pyairvisual==5.0.2
+pyairvisual==5.0.3
 
 # homeassistant.components.almond
 pyalmond==0.0.2
@@ -623,8 +635,11 @@ pyblackbird==0.5
 # homeassistant.components.neato
 pybotvac==0.0.17
 
+# homeassistant.components.cloudflare
+pycfdns==1.1.1
+
 # homeassistant.components.cast
-pychromecast==7.5.0
+pychromecast==7.5.1
 
 # homeassistant.components.coolmaster
 pycoolmasternet-async==0.1.2
@@ -670,7 +685,7 @@ pyfttt==0.3
 pygatt[GATTTOOL]==4.0.5
 
 # homeassistant.components.hvv_departures
-pygti==0.6.0
+pygti==0.9.2
 
 # homeassistant.components.version
 pyhaversion==3.4.2
@@ -679,7 +694,7 @@ pyhaversion==3.4.2
 pyheos==0.6.0
 
 # homeassistant.components.homematic
-pyhomematic==0.1.68
+pyhomematic==0.1.70
 
 # homeassistant.components.icloud
 pyicloud==0.9.7
@@ -697,13 +712,13 @@ pyipp==0.11.0
 pyiqvia==0.2.1
 
 # homeassistant.components.isy994
-pyisy==2.0.2
+pyisy==2.1.0
 
 # homeassistant.components.kira
 pykira==0.1.1
 
 # homeassistant.components.kodi
-pykodi==0.2.0
+pykodi==0.2.1
 
 # homeassistant.components.lastfm
 pylast==3.3.0
@@ -715,7 +730,7 @@ pylibrespot-java==0.1.0
 pylitejet==0.1
 
 # homeassistant.components.lutron_caseta
-pylutron-caseta==0.6.1
+pylutron-caseta==0.7.0
 
 # homeassistant.components.mailgun
 pymailgunner==1.4
@@ -739,7 +754,7 @@ pymodbus==2.3.0
 pymonoprice==0.3
 
 # homeassistant.components.myq
-pymyq==2.0.5
+pymyq==2.0.8
 
 # homeassistant.components.nut
 pynut2==2.1.2
@@ -770,8 +785,14 @@ pyotp==2.3.0
 # homeassistant.components.openweathermap
 pyowm==2.10.0
 
+# homeassistant.components.onewire
+pyownet==0.10.0.post1
+
 # homeassistant.components.point
-pypoint==1.1.2
+pypoint==2.0.0
+
+# homeassistant.components.profiler
+pyprof2calltree==1.4.5
 
 # homeassistant.components.ps4
 pyps4-2ndscreen==1.1.1
@@ -782,6 +803,9 @@ pyqwikswitch==0.93
 # homeassistant.components.risco
 pyrisco==0.3.1
 
+# homeassistant.components.ruckus_unleashed
+pyruckus==0.12
+
 # homeassistant.components.acer_projector
 # homeassistant.components.zha
 pyserial==3.4
@@ -805,13 +829,13 @@ pysmartthings==0.7.4
 pysoma==0.0.10
 
 # homeassistant.components.sonos
-pysonos==0.0.33
+pysonos==0.0.35
 
 # homeassistant.components.spc
 pyspcwebgw==0.4.0
 
 # homeassistant.components.squeezebox
-pysqueezebox==0.3.1
+pysqueezebox==0.5.4
 
 # homeassistant.components.syncthru
 pysyncthru==0.7.0
@@ -835,13 +859,13 @@ python-miio==0.5.3
 python-nest==4.1.0
 
 # homeassistant.components.ozw
-python-openzwave-mqtt==1.0.5
+python-openzwave-mqtt==1.2.2
 
 # homeassistant.components.songpal
 python-songpal==0.12
 
 # homeassistant.components.synology_dsm
-python-synology==0.9.0
+python-synology==1.0.0
 
 # homeassistant.components.tado
 python-tado==0.8.1
@@ -868,13 +892,13 @@ pytradfri[async]==7.0.2
 pyvera==0.3.10
 
 # homeassistant.components.vesync
-pyvesync==1.1.0
+pyvesync==1.2.0
 
 # homeassistant.components.vizio
 pyvizio==0.1.56
 
 # homeassistant.components.volumio
-pyvolumio==0.1.2
+pyvolumio==0.1.3
 
 # homeassistant.components.html5
 pywebpush==1.9.2
@@ -886,7 +910,7 @@ pywilight==0.0.65
 pyzerproc==0.2.5
 
 # homeassistant.components.rachio
-rachiopy==0.1.4
+rachiopy==1.0.3
 
 # homeassistant.components.rainmachine
 regenmaschine==2.1.0
@@ -923,10 +947,10 @@ samsungtvws==1.4.0
 
 # homeassistant.components.emulated_kasa
 # homeassistant.components.sense
-sense_energy==0.8.0
+sense_energy==0.8.1
 
 # homeassistant.components.sentry
-sentry-sdk==0.18.0
+sentry-sdk==0.19.1
 
 # homeassistant.components.sharkiq
 sharkiqpy==0.1.8
@@ -935,7 +959,10 @@ sharkiqpy==0.1.8
 simplehound==0.3
 
 # homeassistant.components.simplisafe
-simplisafe-python==9.4.1
+simplisafe-python==9.6.0
+
+# homeassistant.components.slack
+slackclient==2.5.0
 
 # homeassistant.components.sleepiq
 sleepyq==0.7
@@ -968,11 +995,11 @@ speedtest-cli==2.1.2
 spiderpy==1.3.1
 
 # homeassistant.components.spotify
-spotipy==2.16.0
+spotipy==2.16.1
 
 # homeassistant.components.recorder
 # homeassistant.components.sql
-sqlalchemy==1.3.19
+sqlalchemy==1.3.20
 
 # homeassistant.components.starline
 starline==0.1.3
@@ -990,13 +1017,13 @@ stringcase==1.2.0
 sunwatcher==0.2.1
 
 # homeassistant.components.surepetcare
-surepy==0.2.5
+surepy==0.2.6
 
 # homeassistant.components.tellduslive
 tellduslive==0.10.11
 
 # homeassistant.components.powerwall
-tesla-powerwall==0.2.12
+tesla-powerwall==0.3.3
 
 # homeassistant.components.tesla
 teslajsonpy==0.10.4
@@ -1011,7 +1038,7 @@ total_connect_client==0.55
 transmissionrpc==0.11
 
 # homeassistant.components.tuya
-tuyaha==0.0.7
+tuyaha==0.0.8
 
 # homeassistant.components.twentemilieu
 twentemilieu==0.3.0
@@ -1022,6 +1049,9 @@ twilio==6.32.0
 # homeassistant.components.upb
 upb_lib==0.4.11
 
+# homeassistant.components.upcloud
+upcloud-api==0.4.5
+
 # homeassistant.components.huawei_lte
 # homeassistant.components.syncthru
 url-normalize==1.4.1
@@ -1056,6 +1086,9 @@ wled==0.4.4
 # homeassistant.components.wolflink
 wolf_smartset==0.1.6
 
+# homeassistant.components.xbox
+xbox-webapi==2.0.8
+
 # homeassistant.components.bluesound
 # homeassistant.components.rest
 # homeassistant.components.startca
@@ -1067,10 +1100,10 @@ xmltodict==0.12.0
 yeelight==0.5.4
 
 # homeassistant.components.onvif
-zeep[async]==3.4.0
+zeep[async]==4.0.0
 
 # homeassistant.components.zeroconf
-zeroconf==0.28.5
+zeroconf==0.28.6
 
 # homeassistant.components.zha
 zha-quirks==0.0.45
@@ -1079,7 +1112,7 @@ zha-quirks==0.0.45
 zigpy-cc==0.5.2
 
 # homeassistant.components.zha
-zigpy-deconz==0.10.0
+zigpy-deconz==0.11.0
 
 # homeassistant.components.zha
 zigpy-xbee==0.13.0
@@ -1088,7 +1121,7 @@ zigpy-xbee==0.13.0
 zigpy-zigate==0.6.2
 
 # homeassistant.components.zha
-zigpy-znp==0.2.1
+zigpy-znp==0.2.2
 
 # homeassistant.components.zha
 zigpy==0.26.0
diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
index d464c648e75..a8b10eb4501 100644
--- a/requirements_test_pre_commit.txt
+++ b/requirements_test_pre_commit.txt
@@ -4,7 +4,7 @@ bandit==1.6.2
 black==20.8b1
 codespell==1.17.1
 flake8-docstrings==1.5.0
-flake8==3.8.3
+flake8==3.8.4
 isort==5.5.3
 pydocstyle==5.1.1
 pyupgrade==2.7.2
diff --git a/script/hassfest/__main__.py b/script/hassfest/__main__.py
index e3e4fbf38c6..4b2e91524e2 100644
--- a/script/hassfest/__main__.py
+++ b/script/hassfest/__main__.py
@@ -11,6 +11,7 @@ from . import (
     dependencies,
     json,
     manifest,
+    mqtt,
     requirements,
     services,
     ssdp,
@@ -25,6 +26,7 @@ INTEGRATION_PLUGINS = [
     config_flow,
     dependencies,
     manifest,
+    mqtt,
     services,
     ssdp,
     translations,
diff --git a/script/hassfest/config_flow.py b/script/hassfest/config_flow.py
index b51e3c43afb..d3402c3dc9a 100644
--- a/script/hassfest/config_flow.py
+++ b/script/hassfest/config_flow.py
@@ -33,6 +33,11 @@ def validate_integration(config: Config, integration: Integration):
                 "config_flow",
                 "HomeKit information in a manifest requires a config flow to exist",
             )
+        if integration.manifest.get("mqtt"):
+            integration.add_error(
+                "config_flow",
+                "MQTT information in a manifest requires a config flow to exist",
+            )
         if integration.manifest.get("ssdp"):
             integration.add_error(
                 "config_flow",
@@ -51,6 +56,7 @@ def validate_integration(config: Config, integration: Integration):
         "async_step_discovery" in config_flow
         or "async_step_hassio" in config_flow
         or "async_step_homekit" in config_flow
+        or "async_step_mqtt" in config_flow
         or "async_step_ssdp" in config_flow
         or "async_step_zeroconf" in config_flow
     )
@@ -91,6 +97,7 @@ def generate_and_validate(integrations: Dict[str, Integration], config: Config):
         if not (
             integration.manifest.get("config_flow")
             or integration.manifest.get("homekit")
+            or integration.manifest.get("mqtt")
             or integration.manifest.get("ssdp")
             or integration.manifest.get("zeroconf")
         ):
diff --git a/script/hassfest/coverage.py b/script/hassfest/coverage.py
index dc94b36e6d8..c561c5d9f16 100644
--- a/script/hassfest/coverage.py
+++ b/script/hassfest/coverage.py
@@ -4,6 +4,70 @@ from typing import Dict
 
 from .model import Config, Integration
 
+DONT_IGNORE = (
+    "config_flow.py",
+    "device_action.py",
+    "device_condition.py",
+    "device_trigger.py",
+    "group.py",
+    "intent.py",
+    "logbook.py",
+    "media_source.py",
+    "scene.py",
+)
+
+# They were violating when we introduced this check
+# Need to be fixed in a future PR.
+ALLOWED_IGNORE_VIOLATIONS = {
+    ("ambient_station", "config_flow.py"),
+    ("cast", "config_flow.py"),
+    ("daikin", "config_flow.py"),
+    ("doorbird", "config_flow.py"),
+    ("doorbird", "logbook.py"),
+    ("elkm1", "config_flow.py"),
+    ("elkm1", "scene.py"),
+    ("fibaro", "scene.py"),
+    ("flume", "config_flow.py"),
+    ("hangouts", "config_flow.py"),
+    ("harmony", "config_flow.py"),
+    ("hisense_aehw4a1", "config_flow.py"),
+    ("home_connect", "config_flow.py"),
+    ("huawei_lte", "config_flow.py"),
+    ("ifttt", "config_flow.py"),
+    ("ios", "config_flow.py"),
+    ("iqvia", "config_flow.py"),
+    ("knx", "scene.py"),
+    ("konnected", "config_flow.py"),
+    ("lcn", "scene.py"),
+    ("life360", "config_flow.py"),
+    ("lifx", "config_flow.py"),
+    ("lutron", "scene.py"),
+    ("mobile_app", "config_flow.py"),
+    ("nest", "config_flow.py"),
+    ("plaato", "config_flow.py"),
+    ("point", "config_flow.py"),
+    ("rachio", "config_flow.py"),
+    ("sense", "config_flow.py"),
+    ("sms", "config_flow.py"),
+    ("solarlog", "config_flow.py"),
+    ("somfy", "config_flow.py"),
+    ("sonos", "config_flow.py"),
+    ("speedtestdotnet", "config_flow.py"),
+    ("spider", "config_flow.py"),
+    ("starline", "config_flow.py"),
+    ("tado", "config_flow.py"),
+    ("tahoma", "scene.py"),
+    ("totalconnect", "config_flow.py"),
+    ("tradfri", "config_flow.py"),
+    ("tuya", "config_flow.py"),
+    ("tuya", "scene.py"),
+    ("upnp", "config_flow.py"),
+    ("velux", "scene.py"),
+    ("wemo", "config_flow.py"),
+    ("wiffi", "config_flow.py"),
+    ("wink", "scene.py"),
+}
+
 
 def validate(integrations: Dict[str, Integration], config: Config):
     """Validate coverage."""
@@ -31,11 +95,34 @@ def validate(integrations: Dict[str, Integration], config: Config):
             path = Path(line)
 
             # Discard wildcard
-            while "*" in path.name:
-                path = path.parent
+            path_exists = path
+            while "*" in path_exists.name:
+                path_exists = path_exists.parent
 
-            if not path.exists():
+            if not path_exists.exists():
                 not_found.append(line)
+                continue
+
+            if (
+                not line.startswith("homeassistant/components/")
+                or not len(path.parts) == 4
+                or not path.parts[-1] == "*"
+            ):
+                continue
+
+            integration_path = path.parent
+
+            integration = integrations[integration_path.name]
+
+            for check in DONT_IGNORE:
+                if (integration_path.name, check) in ALLOWED_IGNORE_VIOLATIONS:
+                    continue
+
+                if (integration_path / check).exists():
+                    integration.add_error(
+                        "coverage",
+                        f"{check} must not be ignored by the .coveragerc file",
+                    )
 
     if not not_found:
         return
diff --git a/script/hassfest/manifest.py b/script/hassfest/manifest.py
index b0148b0911a..389e380af85 100644
--- a/script/hassfest/manifest.py
+++ b/script/hassfest/manifest.py
@@ -38,6 +38,7 @@ MANIFEST_SCHEMA = vol.Schema(
         vol.Required("domain"): str,
         vol.Required("name"): str,
         vol.Optional("config_flow"): bool,
+        vol.Optional("mqtt"): [str],
         vol.Optional("zeroconf"): [
             vol.Any(
                 str,
diff --git a/script/hassfest/mqtt.py b/script/hassfest/mqtt.py
new file mode 100644
index 00000000000..fdc16895d8c
--- /dev/null
+++ b/script/hassfest/mqtt.py
@@ -0,0 +1,64 @@
+"""Generate MQTT file."""
+from collections import defaultdict
+import json
+from typing import Dict
+
+from .model import Config, Integration
+
+BASE = """
+\"\"\"Automatically generated by hassfest.
+
+To update, run python3 -m script.hassfest
+\"\"\"
+
+# fmt: off
+
+MQTT = {}
+""".strip()
+
+
+def generate_and_validate(integrations: Dict[str, Integration]):
+    """Validate and generate MQTT data."""
+
+    data = defaultdict(list)
+
+    for domain in sorted(integrations):
+        integration = integrations[domain]
+
+        if not integration.manifest:
+            continue
+
+        mqtt = integration.manifest.get("mqtt")
+
+        if not mqtt:
+            continue
+
+        for topic in mqtt:
+            data[domain].append(topic)
+
+    return BASE.format(json.dumps(data, indent=4))
+
+
+def validate(integrations: Dict[str, Integration], config: Config):
+    """Validate MQTT file."""
+    mqtt_path = config.root / "homeassistant/generated/mqtt.py"
+    config.cache["mqtt"] = content = generate_and_validate(integrations)
+
+    if config.specific_integrations:
+        return
+
+    with open(str(mqtt_path)) as fp:
+        if fp.read().strip() != content:
+            config.add_error(
+                "mqtt",
+                "File mqtt.py is not up to date. Run python3 -m script.hassfest",
+                fixable=True,
+            )
+        return
+
+
+def generate(integrations: Dict[str, Integration], config: Config):
+    """Generate MQTT file."""
+    mqtt_path = config.root / "homeassistant/generated/mqtt.py"
+    with open(str(mqtt_path), "w") as fp:
+        fp.write(f"{config.cache['mqtt']}\n")
diff --git a/script/hassfest/translations.py b/script/hassfest/translations.py
index 7a9208da7d1..6f94b88816c 100644
--- a/script/hassfest/translations.py
+++ b/script/hassfest/translations.py
@@ -2,7 +2,6 @@
 from functools import partial
 from itertools import chain
 import json
-import logging
 import re
 from typing import Dict
 
@@ -15,8 +14,6 @@ from script.translations import upload
 
 from .model import Config, Integration
 
-_LOGGER = logging.getLogger(__name__)
-
 UNDEFINED = 0
 REQUIRED = 1
 REMOVED = 2
diff --git a/script/scaffold/generate.py b/script/scaffold/generate.py
index 292ae86e3a9..4c50b8971fb 100644
--- a/script/scaffold/generate.py
+++ b/script/scaffold/generate.py
@@ -153,7 +153,7 @@ def _custom_tasks(template, info) -> None:
         )
 
     elif template == "config_flow_oauth2":
-        info.update_manifest(config_flow=True)
+        info.update_manifest(config_flow=True, dependencies=["http"])
         info.update_strings(
             title=info.name,
             config={
diff --git a/script/scaffold/templates/config_flow_oauth2/integration/api.py b/script/scaffold/templates/config_flow_oauth2/integration/api.py
index 14f7d60096c..710c76600fb 100644
--- a/script/scaffold/templates/config_flow_oauth2/integration/api.py
+++ b/script/scaffold/templates/config_flow_oauth2/integration/api.py
@@ -29,13 +29,13 @@ class ConfigEntryAuth(my_pypi_package.AbstractAuth):
         )
         super().__init__(self.session.token)
 
-    def refresh_tokens(self) -> dict:
+    def refresh_tokens(self) -> str:
         """Refresh and return new NEW_NAME tokens using Home Assistant OAuth2 session."""
         run_coroutine_threadsafe(
             self.session.async_ensure_token_valid(), self.hass.loop
         ).result()
 
-        return self.session.token
+        return self.session.token["access_token"]
 
 
 class AsyncConfigEntryAuth(my_pypi_package.AbstractAuth):
@@ -50,9 +50,9 @@ class AsyncConfigEntryAuth(my_pypi_package.AbstractAuth):
         super().__init__(websession)
         self._oauth_session = oauth_session
 
-    async def async_get_access_token(self):
+    async def async_get_access_token(self) -> str:
         """Return a valid access token."""
         if not self._oauth_session.valid_token:
             await self._oauth_session.async_ensure_token_valid()
 
-        return self._oauth_session.token
+        return self._oauth_session.token["access_token"]
diff --git a/script/scaffold/templates/config_flow_oauth2/integration/config_flow.py b/script/scaffold/templates/config_flow_oauth2/integration/config_flow.py
index 2343e1d79f8..8670c8a7b43 100644
--- a/script/scaffold/templates/config_flow_oauth2/integration/config_flow.py
+++ b/script/scaffold/templates/config_flow_oauth2/integration/config_flow.py
@@ -6,8 +6,6 @@ from homeassistant.helpers import config_entry_oauth2_flow
 
 from .const import DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class OAuth2FlowHandler(
     config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
diff --git a/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py b/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py
index 7dda6564507..36a42431cf3 100644
--- a/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py
+++ b/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py
@@ -13,7 +13,7 @@ CLIENT_ID = "1234"
 CLIENT_SECRET = "5678"
 
 
-async def test_full_flow(hass, aiohttp_client, aioclient_mock):
+async def test_full_flow(hass, aiohttp_client, aioclient_mock, current_request):
     """Check full flow."""
     assert await setup.async_setup_component(
         hass,
diff --git a/script/scaffold/templates/device_trigger/integration/device_trigger.py b/script/scaffold/templates/device_trigger/integration/device_trigger.py
index a4f918684dc..e1312148cbe 100644
--- a/script/scaffold/templates/device_trigger/integration/device_trigger.py
+++ b/script/scaffold/templates/device_trigger/integration/device_trigger.py
@@ -3,8 +3,9 @@ from typing import List
 
 import voluptuous as vol
 
-from homeassistant.components.automation import AutomationActionType, state
+from homeassistant.components.automation import AutomationActionType
 from homeassistant.components.device_automation import TRIGGER_BASE_SCHEMA
+from homeassistant.components.homeassistant.triggers import state
 from homeassistant.const import (
     CONF_DEVICE_ID,
     CONF_DOMAIN,
diff --git a/script/translations/develop.py b/script/translations/develop.py
index 8886debd555..f59b9b9c7cb 100644
--- a/script/translations/develop.py
+++ b/script/translations/develop.py
@@ -2,6 +2,7 @@
 import argparse
 import json
 from pathlib import Path
+import re
 from shutil import rmtree
 import sys
 
@@ -29,6 +30,59 @@ def get_arguments() -> argparse.Namespace:
     return parser.parse_args()
 
 
+def flatten_translations(translations):
+    """Flatten all translations."""
+    stack = [iter(translations.items())]
+    key_stack = []
+    flattened_translations = {}
+    while stack:
+        for k, v in stack[-1]:
+            key_stack.append(k)
+            if isinstance(v, dict):
+                stack.append(iter(v.items()))
+                break
+            elif isinstance(v, str):
+                common_key = "::".join(key_stack)
+                flattened_translations[common_key] = v
+                key_stack.pop()
+        else:
+            stack.pop()
+            if len(key_stack) > 0:
+                key_stack.pop()
+
+    return flattened_translations
+
+
+def substitute_translation_references(integration_strings, flattened_translations):
+    """Recursively processes all translation strings for the integration."""
+    result = {}
+    for key, value in integration_strings.items():
+        if isinstance(value, dict):
+            sub_dict = substitute_translation_references(value, flattened_translations)
+            result[key] = sub_dict
+        elif isinstance(value, str):
+            result[key] = substitute_reference(value, flattened_translations)
+
+    return result
+
+
+def substitute_reference(value, flattened_translations):
+    """Substitute localization key references in a translation string."""
+    matches = re.findall(r"\[\%key:((?:[\w]+|[:]{2})*)\%\]", value)
+    if not matches:
+        return value
+
+    new = value
+    for key in matches:
+        if key in flattened_translations:
+            new = new.replace(f"[%key:{key}%]", flattened_translations[key])
+        else:
+            print(f"Invalid substitution key '{key}' found in string '{value}'")
+            sys.exit(1)
+
+    return new
+
+
 def run():
     """Run the script."""
     args = get_arguments()
@@ -51,6 +105,13 @@ def run():
         print("Integration has no strings.json")
         sys.exit(1)
 
+    flattened_translations = flatten_translations(translations)
+    integration_strings = translations["component"][integration]
+
+    translations["component"][integration] = substitute_translation_references(
+        integration_strings, flattened_translations
+    )
+
     if download.DOWNLOAD_DIR.is_dir():
         rmtree(str(download.DOWNLOAD_DIR))
 
diff --git a/setup.cfg b/setup.cfg
index 8dd3e083a8b..8286e58c7cf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,15 +14,10 @@ classifier =
     Programming Language :: Python :: 3.7
     Topic :: Home Automation
 
-[tool:pytest]
-testpaths = tests
-norecursedirs = .git testing_config
-
 [flake8]
 exclude = .venv,.git,.tox,docs,venv,bin,lib,deps,build
 doctests = True
 # To work with Black
-max-line-length = 88
 # E501: line too long
 # W503: Line break occurred before a binary operator
 # E203: Whitespace before ':'
@@ -35,18 +30,9 @@ ignore =
     D202,
     W504
 
-[isort]
-# https://github.com/timothycrosley/isort
-# https://github.com/timothycrosley/isort/wiki/isort-Settings
-profile = black
-# will group `import x` and `from x import` of the same module.
-force_sort_within_sections = true
-known_first_party = homeassistant,tests
-forced_separate = tests
-combine_as_imports = true
-
 [mypy]
 python_version = 3.7
+show_error_codes = true
 ignore_errors = true
 follow_imports = silent
 ignore_missing_imports = true
@@ -54,7 +40,7 @@ warn_incomplete_stub = true
 warn_redundant_casts = true
 warn_unused_configs = true
 
-[mypy-homeassistant.block_async_io,homeassistant.bootstrap,homeassistant.components,homeassistant.config_entries,homeassistant.config,homeassistant.const,homeassistant.core,homeassistant.data_entry_flow,homeassistant.exceptions,homeassistant.__init__,homeassistant.loader,homeassistant.__main__,homeassistant.requirements,homeassistant.runner,homeassistant.setup,homeassistant.util,homeassistant.auth.*,homeassistant.components.automation.*,homeassistant.components.binary_sensor.*,homeassistant.components.calendar.*,homeassistant.components.cover.*,homeassistant.components.device_automation.*,homeassistant.components.frontend.*,homeassistant.components.geo_location.*,homeassistant.components.group.*,homeassistant.components.history.*,homeassistant.components.http.*,homeassistant.components.image_processing.*,homeassistant.components.integration.*,homeassistant.components.light.*,homeassistant.components.lock.*,homeassistant.components.mailbox.*,homeassistant.components.media_player.*,homeassistant.components.notify.*,homeassistant.components.persistent_notification.*,homeassistant.components.proximity.*,homeassistant.components.remote.*,homeassistant.components.scene.*,homeassistant.components.sensor.*,homeassistant.components.sun.*,homeassistant.components.switch.*,homeassistant.components.systemmonitor.*,homeassistant.components.tts.*,homeassistant.components.vacuum.*,homeassistant.components.water_heater.*,homeassistant.components.weather.*,homeassistant.components.websocket_api.*,homeassistant.components.zone.*,homeassistant.helpers.*,homeassistant.scripts.*,homeassistant.util.*]
+[mypy-homeassistant.block_async_io,homeassistant.bootstrap,homeassistant.components,homeassistant.config_entries,homeassistant.config,homeassistant.const,homeassistant.core,homeassistant.data_entry_flow,homeassistant.exceptions,homeassistant.__init__,homeassistant.loader,homeassistant.__main__,homeassistant.requirements,homeassistant.runner,homeassistant.setup,homeassistant.util,homeassistant.auth.*,homeassistant.components.automation.*,homeassistant.components.binary_sensor.*,homeassistant.components.calendar.*,homeassistant.components.cover.*,homeassistant.components.device_automation.*,homeassistant.components.frontend.*,homeassistant.components.geo_location.*,homeassistant.components.group.*,homeassistant.components.history.*,homeassistant.components.http.*,homeassistant.components.huawei_lte.*,homeassistant.components.image_processing.*,homeassistant.components.integration.*,homeassistant.components.light.*,homeassistant.components.lock.*,homeassistant.components.mailbox.*,homeassistant.components.media_player.*,homeassistant.components.notify.*,homeassistant.components.persistent_notification.*,homeassistant.components.proximity.*,homeassistant.components.remote.*,homeassistant.components.scene.*,homeassistant.components.sensor.*,homeassistant.components.sun.*,homeassistant.components.switch.*,homeassistant.components.systemmonitor.*,homeassistant.components.tts.*,homeassistant.components.vacuum.*,homeassistant.components.water_heater.*,homeassistant.components.weather.*,homeassistant.components.websocket_api.*,homeassistant.components.zone.*,homeassistant.helpers.*,homeassistant.scripts.*,homeassistant.util.*]
 strict = true
 ignore_errors = false
 warn_unreachable = true
diff --git a/setup.py b/setup.py
index 022f5547655..e501ac6cf12 100755
--- a/setup.py
+++ b/setup.py
@@ -39,11 +39,12 @@ REQUIRES = [
     "bcrypt==3.1.7",
     "certifi>=2020.6.20",
     "ciso8601==2.1.3",
+    "httpx==0.16.1",
     "importlib-metadata==1.6.0;python_version<'3.8'",
     "jinja2>=2.11.2",
     "PyJWT==1.7.1",
     # PyJWT has loose dependency. We want the latest one.
-    "cryptography==2.9.2",
+    "cryptography==3.2.0",
     "pip>=8.0.3",
     "python-slugify==4.0.1",
     "pytz>=2020.1",
diff --git a/tests/auth/providers/test_homeassistant.py b/tests/auth/providers/test_homeassistant.py
index f9ac8fbb92a..c804b237e8b 100644
--- a/tests/auth/providers/test_homeassistant.py
+++ b/tests/auth/providers/test_homeassistant.py
@@ -277,7 +277,7 @@ async def test_legacy_get_or_create_credentials(hass, legacy_data):
 async def test_race_condition_in_data_loading(hass):
     """Test race condition in the hass_auth.Data loading.
 
-    Ref issue: https://github.com/home-assistant/home-assistant/issues/21569
+    Ref issue: https://github.com/home-assistant/core/issues/21569
     """
     counter = 0
 
diff --git a/tests/common.py b/tests/common.py
index d516873786b..0b56d10188e 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -207,6 +207,7 @@ async def async_test_home_assistant(loop):
     hass.config.units = METRIC_SYSTEM
     hass.config.media_dirs = {"local": get_test_config_dir("media")}
     hass.config.skip_pip = True
+    hass.config.legacy_templates = False
 
     hass.config_entries = config_entries.ConfigEntries(hass, {})
     hass.config_entries._entries = []
@@ -973,6 +974,14 @@ def mock_integration(hass, module):
         hass, f"homeassistant.components.{module.DOMAIN}", None, module.mock_manifest()
     )
 
+    def mock_import_platform(platform_name):
+        raise ImportError(
+            f"Mocked unable to import platform '{platform_name}'",
+            name=f"{integration.pkg_path}.{platform_name}",
+        )
+
+    integration._import_platform = mock_import_platform
+
     _LOGGER.info("Adding mock integration: %s", module.DOMAIN)
     hass.data.setdefault(loader.DATA_INTEGRATIONS, {})[module.DOMAIN] = integration
     hass.data.setdefault(loader.DATA_COMPONENTS, {})[module.DOMAIN] = module
diff --git a/tests/components/abode/test_config_flow.py b/tests/components/abode/test_config_flow.py
index 01508d412a2..509a68eda4b 100644
--- a/tests/components/abode/test_config_flow.py
+++ b/tests/components/abode/test_config_flow.py
@@ -61,7 +61,7 @@ async def test_invalid_credentials(hass):
         side_effect=AbodeAuthenticationException((400, "auth error")),
     ):
         result = await flow.async_step_user(user_input=conf)
-        assert result["errors"] == {"base": "invalid_credentials"}
+        assert result["errors"] == {"base": "invalid_auth"}
 
 
 async def test_connection_error(hass):
@@ -78,7 +78,7 @@ async def test_connection_error(hass):
         ),
     ):
         result = await flow.async_step_user(user_input=conf)
-        assert result["errors"] == {"base": "connection_error"}
+        assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_step_import(hass):
diff --git a/tests/components/acmeda/test_config_flow.py b/tests/components/acmeda/test_config_flow.py
index 98a23a0dd41..2aacedc3680 100644
--- a/tests/components/acmeda/test_config_flow.py
+++ b/tests/components/acmeda/test_config_flow.py
@@ -47,7 +47,7 @@ async def test_show_form_no_hubs(hass, mock_hub_discover):
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "all_configured"
+    assert result["reason"] == "no_devices_found"
 
     # Check we performed the discovery
     assert len(mock_hub_discover.mock_calls) == 1
@@ -140,4 +140,4 @@ async def test_already_configured(hass, mock_hub_discover):
     )
 
     assert result["type"] == "abort"
-    assert result["reason"] == "all_configured"
+    assert result["reason"] == "no_devices_found"
diff --git a/tests/components/adguard/test_config_flow.py b/tests/components/adguard/test_config_flow.py
index e773768ebe6..36263335dac 100644
--- a/tests/components/adguard/test_config_flow.py
+++ b/tests/components/adguard/test_config_flow.py
@@ -53,7 +53,7 @@ async def test_connection_error(hass, aioclient_mock):
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "user"
-    assert result["errors"] == {"base": "connection_error"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_full_flow_implementation(hass, aioclient_mock):
@@ -235,4 +235,4 @@ async def test_hassio_connection_error(hass, aioclient_mock):
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "hassio_confirm"
-    assert result["errors"] == {"base": "connection_error"}
+    assert result["errors"] == {"base": "cannot_connect"}
diff --git a/tests/components/advantage_air/__init__.py b/tests/components/advantage_air/__init__.py
new file mode 100644
index 00000000000..92faaff6359
--- /dev/null
+++ b/tests/components/advantage_air/__init__.py
@@ -0,0 +1,33 @@
+"""Tests for the Advantage Air component."""
+
+from homeassistant.components.advantage_air.const import DOMAIN
+from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT
+
+from tests.common import MockConfigEntry, load_fixture
+
+TEST_SYSTEM_DATA = load_fixture("advantage_air/getSystemData.json")
+TEST_SET_RESPONSE = load_fixture("advantage_air/setAircon.json")
+
+USER_INPUT = {
+    CONF_IP_ADDRESS: "1.2.3.4",
+    CONF_PORT: 2025,
+}
+
+TEST_SYSTEM_URL = (
+    f"http://{USER_INPUT[CONF_IP_ADDRESS]}:{USER_INPUT[CONF_PORT]}/getSystemData"
+)
+TEST_SET_URL = f"http://{USER_INPUT[CONF_IP_ADDRESS]}:{USER_INPUT[CONF_PORT]}/setAircon"
+
+
+async def add_mock_config(hass):
+    """Create a fake Advantage Air Config Entry."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="test entry",
+        unique_id="0123456",
+        data=USER_INPUT,
+    )
+    entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+    return entry
diff --git a/tests/components/advantage_air/test_binary_sensor.py b/tests/components/advantage_air/test_binary_sensor.py
new file mode 100644
index 00000000000..d0b1a90aaad
--- /dev/null
+++ b/tests/components/advantage_air/test_binary_sensor.py
@@ -0,0 +1,69 @@
+"""Test the Advantage Air Binary Sensor Platform."""
+
+from homeassistant.const import STATE_OFF, STATE_ON
+
+from tests.components.advantage_air import (
+    TEST_SET_RESPONSE,
+    TEST_SET_URL,
+    TEST_SYSTEM_DATA,
+    TEST_SYSTEM_URL,
+    add_mock_config,
+)
+
+
+async def test_binary_sensor_async_setup_entry(hass, aioclient_mock):
+    """Test binary sensor setup."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+    aioclient_mock.get(
+        TEST_SET_URL,
+        text=TEST_SET_RESPONSE,
+    )
+    await add_mock_config(hass)
+
+    registry = await hass.helpers.entity_registry.async_get_registry()
+
+    assert len(aioclient_mock.mock_calls) == 1
+
+    # Test First Air Filter
+    entity_id = "binary_sensor.ac_one_filter"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OFF
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-filter"
+
+    # Test Second Air Filter
+    entity_id = "binary_sensor.ac_two_filter"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_ON
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac2-filter"
+
+    # Test First Motion Sensor
+    entity_id = "binary_sensor.zone_open_with_sensor_motion"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_ON
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-z01-motion"
+
+    # Test Second Motion Sensor
+    entity_id = "binary_sensor.zone_closed_with_sensor_motion"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OFF
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-z02-motion"
diff --git a/tests/components/advantage_air/test_climate.py b/tests/components/advantage_air/test_climate.py
new file mode 100644
index 00000000000..7eb1729a5db
--- /dev/null
+++ b/tests/components/advantage_air/test_climate.py
@@ -0,0 +1,196 @@
+"""Test the Advantage Air Climate Platform."""
+
+from json import loads
+
+from homeassistant.components.advantage_air.climate import (
+    HASS_FAN_MODES,
+    HASS_HVAC_MODES,
+)
+from homeassistant.components.advantage_air.const import (
+    ADVANTAGE_AIR_STATE_OFF,
+    ADVANTAGE_AIR_STATE_ON,
+)
+from homeassistant.components.climate.const import (
+    ATTR_FAN_MODE,
+    ATTR_HVAC_MODE,
+    DOMAIN as CLIMATE_DOMAIN,
+    FAN_LOW,
+    HVAC_MODE_FAN_ONLY,
+    HVAC_MODE_OFF,
+    SERVICE_SET_FAN_MODE,
+    SERVICE_SET_HVAC_MODE,
+    SERVICE_SET_TEMPERATURE,
+)
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE
+
+from tests.components.advantage_air import (
+    TEST_SET_RESPONSE,
+    TEST_SET_URL,
+    TEST_SYSTEM_DATA,
+    TEST_SYSTEM_URL,
+    add_mock_config,
+)
+
+
+async def test_climate_async_setup_entry(hass, aioclient_mock):
+    """Test climate setup."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+    aioclient_mock.get(
+        TEST_SET_URL,
+        text=TEST_SET_RESPONSE,
+    )
+    await add_mock_config(hass)
+
+    registry = await hass.helpers.entity_registry.async_get_registry()
+
+    assert len(aioclient_mock.mock_calls) == 1
+
+    # Test Main Climate Entity
+    entity_id = "climate.ac_one"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == HVAC_MODE_FAN_ONLY
+    assert state.attributes.get("min_temp") == 16
+    assert state.attributes.get("max_temp") == 32
+    assert state.attributes.get("temperature") == 24
+    assert state.attributes.get("current_temperature") is None
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1"
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: [entity_id], ATTR_HVAC_MODE: HVAC_MODE_FAN_ONLY},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 3
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac1"]["info"]["state"] == ADVANTAGE_AIR_STATE_ON
+    assert data["ac1"]["info"]["mode"] == HASS_HVAC_MODES[HVAC_MODE_FAN_ONLY]
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: [entity_id], ATTR_HVAC_MODE: HVAC_MODE_OFF},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 5
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac1"]["info"]["state"] == ADVANTAGE_AIR_STATE_OFF
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_FAN_MODE,
+        {ATTR_ENTITY_ID: [entity_id], ATTR_FAN_MODE: FAN_LOW},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 7
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac1"]["info"]["fan"] == HASS_FAN_MODES[FAN_LOW]
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: [entity_id], ATTR_TEMPERATURE: 25},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 9
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac1"]["info"]["setTemp"] == 25
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    # Test Climate Zone Entity
+    entity_id = "climate.zone_open_with_sensor"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.attributes.get("min_temp") == 16
+    assert state.attributes.get("max_temp") == 32
+    assert state.attributes.get("temperature") == 24
+    assert state.attributes.get("current_temperature") == 25
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-z01"
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: [entity_id], ATTR_HVAC_MODE: HVAC_MODE_FAN_ONLY},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 11
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: [entity_id], ATTR_HVAC_MODE: HVAC_MODE_OFF},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 13
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: [entity_id], ATTR_TEMPERATURE: 25},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 15
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+
+async def test_climate_async_failed_update(hass, aioclient_mock):
+    """Test climate change failure."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+    aioclient_mock.get(
+        TEST_SET_URL,
+        exc=SyntaxError,
+    )
+    await add_mock_config(hass)
+
+    assert len(aioclient_mock.mock_calls) == 1
+
+    await hass.services.async_call(
+        CLIMATE_DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: ["climate.ac_one"], ATTR_TEMPERATURE: 25},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 2
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/setAircon"
diff --git a/tests/components/advantage_air/test_config_flow.py b/tests/components/advantage_air/test_config_flow.py
new file mode 100644
index 00000000000..248ee25858b
--- /dev/null
+++ b/tests/components/advantage_air/test_config_flow.py
@@ -0,0 +1,71 @@
+"""Test the Advantage Air config flow."""
+
+from homeassistant import config_entries, data_entry_flow
+from homeassistant.components.advantage_air.const import DOMAIN
+
+from tests.async_mock import patch
+from tests.components.advantage_air import TEST_SYSTEM_DATA, TEST_SYSTEM_URL, USER_INPUT
+
+
+async def test_form(hass, aioclient_mock):
+    """Test that form shows up."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+
+    result1 = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result1["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result1["step_id"] == "user"
+    assert result1["errors"] == {}
+
+    with patch(
+        "homeassistant.components.advantage_air.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result1["flow_id"],
+            USER_INPUT,
+        )
+
+    assert len(aioclient_mock.mock_calls) == 1
+    assert result2["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result2["title"] == "testname"
+    assert result2["data"] == USER_INPUT
+    await hass.async_block_till_done()
+    assert len(mock_setup_entry.mock_calls) == 1
+
+    # Test Duplicate Config Flow
+    result3 = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    result4 = await hass.config_entries.flow.async_configure(
+        result3["flow_id"],
+        USER_INPUT,
+    )
+    assert result4["type"] == data_entry_flow.RESULT_TYPE_ABORT
+
+
+async def test_form_cannot_connect(hass, aioclient_mock):
+    """Test we handle cannot connect error."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        exc=SyntaxError,
+    )
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT,
+    )
+
+    assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result2["step_id"] == "user"
+    assert result2["errors"] == {"base": "cannot_connect"}
+    assert len(aioclient_mock.mock_calls) == 1
diff --git a/tests/components/advantage_air/test_cover.py b/tests/components/advantage_air/test_cover.py
new file mode 100644
index 00000000000..18fd4f05b5a
--- /dev/null
+++ b/tests/components/advantage_air/test_cover.py
@@ -0,0 +1,113 @@
+"""Test the Advantage Air Cover Platform."""
+
+from json import loads
+
+from homeassistant.components.advantage_air.const import (
+    ADVANTAGE_AIR_STATE_CLOSE,
+    ADVANTAGE_AIR_STATE_OPEN,
+)
+from homeassistant.components.cover import (
+    ATTR_POSITION,
+    DEVICE_CLASS_DAMPER,
+    DOMAIN as COVER_DOMAIN,
+    SERVICE_CLOSE_COVER,
+    SERVICE_OPEN_COVER,
+    SERVICE_SET_COVER_POSITION,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OPEN
+
+from tests.components.advantage_air import (
+    TEST_SET_RESPONSE,
+    TEST_SET_URL,
+    TEST_SYSTEM_DATA,
+    TEST_SYSTEM_URL,
+    add_mock_config,
+)
+
+
+async def test_cover_async_setup_entry(hass, aioclient_mock):
+    """Test climate setup without sensors."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+    aioclient_mock.get(
+        TEST_SET_URL,
+        text=TEST_SET_RESPONSE,
+    )
+
+    await add_mock_config(hass)
+
+    registry = await hass.helpers.entity_registry.async_get_registry()
+
+    assert len(aioclient_mock.mock_calls) == 1
+
+    # Test Cover Zone Entity
+    entity_id = "cover.zone_open_without_sensor"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OPEN
+    assert state.attributes.get("device_class") == DEVICE_CLASS_DAMPER
+    assert state.attributes.get("current_position") == 100
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac2-z01"
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_CLOSE_COVER,
+        {ATTR_ENTITY_ID: [entity_id]},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 3
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac2"]["zones"]["z01"]["state"] == ADVANTAGE_AIR_STATE_CLOSE
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: [entity_id]},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 5
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac2"]["zones"]["z01"]["state"] == ADVANTAGE_AIR_STATE_OPEN
+    assert data["ac2"]["zones"]["z01"]["value"] == 100
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: [entity_id], ATTR_POSITION: 50},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 7
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac2"]["zones"]["z01"]["value"] == 50
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_SET_COVER_POSITION,
+        {ATTR_ENTITY_ID: [entity_id], ATTR_POSITION: 0},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 9
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac2"]["zones"]["z01"]["state"] == ADVANTAGE_AIR_STATE_CLOSE
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
diff --git a/tests/components/advantage_air/test_init.py b/tests/components/advantage_air/test_init.py
new file mode 100644
index 00000000000..1567b9ee8ad
--- /dev/null
+++ b/tests/components/advantage_air/test_init.py
@@ -0,0 +1,41 @@
+"""Test the Advantage Air Initialization."""
+
+from homeassistant.config_entries import (
+    ENTRY_STATE_LOADED,
+    ENTRY_STATE_NOT_LOADED,
+    ENTRY_STATE_SETUP_RETRY,
+)
+
+from tests.components.advantage_air import (
+    TEST_SYSTEM_DATA,
+    TEST_SYSTEM_URL,
+    add_mock_config,
+)
+
+
+async def test_async_setup_entry(hass, aioclient_mock):
+    """Test a successful setup entry and unload."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+
+    entry = await add_mock_config(hass)
+    assert entry.state == ENTRY_STATE_LOADED
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+    assert entry.state == ENTRY_STATE_NOT_LOADED
+
+
+async def test_async_setup_entry_failure(hass, aioclient_mock):
+    """Test a unsuccessful setup entry."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        exc=SyntaxError,
+    )
+
+    entry = await add_mock_config(hass)
+    assert entry.state == ENTRY_STATE_SETUP_RETRY
diff --git a/tests/components/advantage_air/test_sensor.py b/tests/components/advantage_air/test_sensor.py
new file mode 100644
index 00000000000..e420ab978fd
--- /dev/null
+++ b/tests/components/advantage_air/test_sensor.py
@@ -0,0 +1,126 @@
+"""Test the Advantage Air Sensor Platform."""
+
+from json import loads
+
+from homeassistant.components.advantage_air.const import DOMAIN as ADVANTAGE_AIR_DOMAIN
+from homeassistant.components.advantage_air.sensor import (
+    ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
+    ADVANTAGE_AIR_SET_COUNTDOWN_VALUE,
+)
+from homeassistant.const import ATTR_ENTITY_ID
+
+from tests.components.advantage_air import (
+    TEST_SET_RESPONSE,
+    TEST_SET_URL,
+    TEST_SYSTEM_DATA,
+    TEST_SYSTEM_URL,
+    add_mock_config,
+)
+
+
+async def test_sensor_platform(hass, aioclient_mock):
+    """Test sensor platform."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+    aioclient_mock.get(
+        TEST_SET_URL,
+        text=TEST_SET_RESPONSE,
+    )
+    await add_mock_config(hass)
+
+    registry = await hass.helpers.entity_registry.async_get_registry()
+
+    assert len(aioclient_mock.mock_calls) == 1
+
+    # Test First TimeToOn Sensor
+    entity_id = "sensor.ac_one_time_to_on"
+    state = hass.states.get(entity_id)
+    assert state
+    assert int(state.state) == 0
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-timetoOn"
+
+    value = 20
+    await hass.services.async_call(
+        ADVANTAGE_AIR_DOMAIN,
+        ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
+        {ATTR_ENTITY_ID: [entity_id], ADVANTAGE_AIR_SET_COUNTDOWN_VALUE: value},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 3
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac1"]["info"]["countDownToOn"] == value
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    # Test First TimeToOff Sensor
+    entity_id = "sensor.ac_one_time_to_off"
+    state = hass.states.get(entity_id)
+    assert state
+    assert int(state.state) == 10
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-timetoOff"
+
+    value = 0
+    await hass.services.async_call(
+        ADVANTAGE_AIR_DOMAIN,
+        ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
+        {ATTR_ENTITY_ID: [entity_id], ADVANTAGE_AIR_SET_COUNTDOWN_VALUE: value},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 5
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac1"]["info"]["countDownToOff"] == value
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    # Test First Zone Vent Sensor
+    entity_id = "sensor.zone_open_with_sensor_vent"
+    state = hass.states.get(entity_id)
+    assert state
+    assert int(state.state) == 100
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-z01-vent"
+
+    # Test Second Zone Vent Sensor
+    entity_id = "sensor.zone_closed_with_sensor_vent"
+    state = hass.states.get(entity_id)
+    assert state
+    assert int(state.state) == 0
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-z02-vent"
+
+    # Test First Zone Signal Sensor
+    entity_id = "sensor.zone_open_with_sensor_signal"
+    state = hass.states.get(entity_id)
+    assert state
+    assert int(state.state) == 40
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-z01-signal"
+
+    # Test Second Zone Signal Sensor
+    entity_id = "sensor.zone_closed_with_sensor_signal"
+    state = hass.states.get(entity_id)
+    assert state
+    assert int(state.state) == 10
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-z02-signal"
diff --git a/tests/components/advantage_air/test_switch.py b/tests/components/advantage_air/test_switch.py
new file mode 100644
index 00000000000..f45477adc70
--- /dev/null
+++ b/tests/components/advantage_air/test_switch.py
@@ -0,0 +1,79 @@
+"""Test the Advantage Air Switch Platform."""
+
+from json import loads
+
+from homeassistant.components.advantage_air.const import (
+    ADVANTAGE_AIR_STATE_OFF,
+    ADVANTAGE_AIR_STATE_ON,
+)
+from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF
+
+from tests.components.advantage_air import (
+    TEST_SET_RESPONSE,
+    TEST_SET_URL,
+    TEST_SYSTEM_DATA,
+    TEST_SYSTEM_URL,
+    add_mock_config,
+)
+
+
+async def test_cover_async_setup_entry(hass, aioclient_mock):
+    """Test climate setup without sensors."""
+
+    aioclient_mock.get(
+        TEST_SYSTEM_URL,
+        text=TEST_SYSTEM_DATA,
+    )
+    aioclient_mock.get(
+        TEST_SET_URL,
+        text=TEST_SET_RESPONSE,
+    )
+
+    await add_mock_config(hass)
+
+    registry = await hass.helpers.entity_registry.async_get_registry()
+
+    assert len(aioclient_mock.mock_calls) == 1
+
+    # Test Switch Entity
+    entity_id = "switch.ac_one_fresh_air"
+    state = hass.states.get(entity_id)
+    assert state
+    assert state.state == STATE_OFF
+
+    entry = registry.async_get(entity_id)
+    assert entry
+    assert entry.unique_id == "uniqueid-ac1-freshair"
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: [entity_id]},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 3
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac1"]["info"]["freshAirStatus"] == ADVANTAGE_AIR_STATE_ON
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: [entity_id]},
+        blocking=True,
+    )
+    assert len(aioclient_mock.mock_calls) == 5
+    assert aioclient_mock.mock_calls[-2][0] == "GET"
+    assert aioclient_mock.mock_calls[-2][1].path == "/setAircon"
+    data = loads(aioclient_mock.mock_calls[-2][1].query["json"])
+    assert data["ac1"]["info"]["freshAirStatus"] == ADVANTAGE_AIR_STATE_OFF
+    assert aioclient_mock.mock_calls[-1][0] == "GET"
+    assert aioclient_mock.mock_calls[-1][1].path == "/getSystemData"
diff --git a/tests/components/agent_dvr/test_config_flow.py b/tests/components/agent_dvr/test_config_flow.py
index 064034a4a69..3e11aae054a 100644
--- a/tests/components/agent_dvr/test_config_flow.py
+++ b/tests/components/agent_dvr/test_config_flow.py
@@ -49,7 +49,7 @@ async def test_connection_error(hass: HomeAssistant, aioclient_mock) -> None:
         data={CONF_HOST: "example.local", CONF_PORT: 8090},
     )
 
-    assert result["errors"] == {"base": "device_unavailable"}
+    assert result["errors"] == {"base": "cannot_connect"}
     assert result["step_id"] == "user"
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
 
diff --git a/tests/components/airly/test_config_flow.py b/tests/components/airly/test_config_flow.py
index 243a92258eb..d7d45bbd7e3 100644
--- a/tests/components/airly/test_config_flow.py
+++ b/tests/components/airly/test_config_flow.py
@@ -48,7 +48,7 @@ async def test_invalid_api_key(hass):
             DOMAIN, context={"source": SOURCE_USER}, data=CONFIG
         )
 
-        assert result["errors"] == {"base": "auth"}
+        assert result["errors"] == {"base": "invalid_api_key"}
 
 
 async def test_invalid_location(hass):
diff --git a/tests/components/airvisual/test_config_flow.py b/tests/components/airvisual/test_config_flow.py
index 2d0acf8fe7b..19390231550 100644
--- a/tests/components/airvisual/test_config_flow.py
+++ b/tests/components/airvisual/test_config_flow.py
@@ -140,7 +140,7 @@ async def test_node_pro_error(hass):
             result["flow_id"], user_input=node_pro_conf
         )
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-        assert result["errors"] == {CONF_IP_ADDRESS: "unable_to_connect"}
+        assert result["errors"] == {CONF_IP_ADDRESS: "cannot_connect"}
 
 
 async def test_options_flow(hass):
@@ -273,7 +273,7 @@ async def test_step_reauth(hass):
 
     with patch(
         "homeassistant.components.airvisual.async_setup_entry", return_value=True
-    ), patch("pyairvisual.air_quality.AirQuality"):
+    ), patch("pyairvisual.air_quality.AirQuality.nearest_city", return_value=True):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"], user_input={CONF_API_KEY: "defgh67890"}
         )
diff --git a/tests/components/alarmdecoder/test_config_flow.py b/tests/components/alarmdecoder/test_config_flow.py
index 64f4a604ff3..4af8b783b07 100644
--- a/tests/components/alarmdecoder/test_config_flow.py
+++ b/tests/components/alarmdecoder/test_config_flow.py
@@ -126,7 +126,7 @@ async def test_setup_connection_error(hass: HomeAssistant):
             result["flow_id"], connection_settings
         )
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-        assert result["errors"] == {"base": "service_unavailable"}
+        assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_options_arm_flow(hass: HomeAssistant):
diff --git a/tests/components/alert/test_init.py b/tests/components/alert/test_init.py
index 60c2bd6b809..3796322a5b5 100644
--- a/tests/components/alert/test_init.py
+++ b/tests/components/alert/test_init.py
@@ -1,7 +1,8 @@
 """The tests for the Alert component."""
 # pylint: disable=protected-access
 from copy import deepcopy
-import unittest
+
+import pytest
 
 import homeassistant.components.alert as alert
 from homeassistant.components.alert import DOMAIN
@@ -19,9 +20,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import callback
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 NAME = "alert_test"
 DONE_MESSAGE = "alert_gone"
@@ -63,14 +62,6 @@ TEST_NOACK = [
 ENTITY_ID = f"{alert.DOMAIN}.{NAME}"
 
 
-def turn_on(hass, entity_id):
-    """Reset the alert.
-
-    This is a legacy helper method. Do not use it for new tests.
-    """
-    hass.add_job(async_turn_on, hass, entity_id)
-
-
 @callback
 def async_turn_on(hass, entity_id):
     """Async reset the alert.
@@ -81,14 +72,6 @@ def async_turn_on(hass, entity_id):
     hass.async_create_task(hass.services.async_call(DOMAIN, SERVICE_TURN_ON, data))
 
 
-def turn_off(hass, entity_id):
-    """Acknowledge alert.
-
-    This is a legacy helper method. Do not use it for new tests.
-    """
-    hass.add_job(async_turn_off, hass, entity_id)
-
-
 @callback
 def async_turn_off(hass, entity_id):
     """Async acknowledge the alert.
@@ -99,14 +82,6 @@ def async_turn_off(hass, entity_id):
     hass.async_create_task(hass.services.async_call(DOMAIN, SERVICE_TURN_OFF, data))
 
 
-def toggle(hass, entity_id):
-    """Toggle acknowledgment of alert.
-
-    This is a legacy helper method. Do not use it for new tests.
-    """
-    hass.add_job(async_toggle, hass, entity_id)
-
-
 @callback
 def async_toggle(hass, entity_id):
     """Async toggle acknowledgment of alert.
@@ -117,239 +92,237 @@ def async_toggle(hass, entity_id):
     hass.async_create_task(hass.services.async_call(DOMAIN, SERVICE_TOGGLE, data))
 
 
-# pylint: disable=invalid-name
-class TestAlert(unittest.TestCase):
-    """Test the alert module."""
+@pytest.fixture
+def mock_notifier(hass):
+    """Mock for notifier."""
+    events = []
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self._setup_notify()
-        self.addCleanup(self.hass.stop)
+    @callback
+    def record_event(event):
+        """Add recorded event to set."""
+        events.append(event)
 
-    def _setup_notify(self):
-        events = []
+    hass.services.async_register(notify.DOMAIN, NOTIFIER, record_event)
 
-        @callback
-        def record_event(event):
-            """Add recorded event to set."""
-            events.append(event)
+    return events
 
-        self.hass.services.register(notify.DOMAIN, NOTIFIER, record_event)
 
-        return events
+async def test_is_on(hass):
+    """Test is_on method."""
+    hass.states.async_set(ENTITY_ID, STATE_ON)
+    await hass.async_block_till_done()
+    assert alert.is_on(hass, ENTITY_ID)
+    hass.states.async_set(ENTITY_ID, STATE_OFF)
+    await hass.async_block_till_done()
+    assert not alert.is_on(hass, ENTITY_ID)
 
-    def test_is_on(self):
-        """Test is_on method."""
-        self.hass.states.set(ENTITY_ID, STATE_ON)
-        self.hass.block_till_done()
-        assert alert.is_on(self.hass, ENTITY_ID)
-        self.hass.states.set(ENTITY_ID, STATE_OFF)
-        self.hass.block_till_done()
-        assert not alert.is_on(self.hass, ENTITY_ID)
 
-    def test_setup(self):
-        """Test setup method."""
-        assert setup_component(self.hass, alert.DOMAIN, TEST_CONFIG)
-        assert STATE_IDLE == self.hass.states.get(ENTITY_ID).state
+async def test_setup(hass):
+    """Test setup method."""
+    assert await async_setup_component(hass, alert.DOMAIN, TEST_CONFIG)
+    assert STATE_IDLE == hass.states.get(ENTITY_ID).state
 
-    def test_fire(self):
-        """Test the alert firing."""
-        assert setup_component(self.hass, alert.DOMAIN, TEST_CONFIG)
-        self.hass.states.set("sensor.test", STATE_ON)
-        self.hass.block_till_done()
-        assert STATE_ON == self.hass.states.get(ENTITY_ID).state
 
-    def test_silence(self):
-        """Test silencing the alert."""
-        assert setup_component(self.hass, alert.DOMAIN, TEST_CONFIG)
-        self.hass.states.set("sensor.test", STATE_ON)
-        self.hass.block_till_done()
-        turn_off(self.hass, ENTITY_ID)
-        self.hass.block_till_done()
-        assert STATE_OFF == self.hass.states.get(ENTITY_ID).state
+async def test_fire(hass, mock_notifier):
+    """Test the alert firing."""
+    assert await async_setup_component(hass, alert.DOMAIN, TEST_CONFIG)
+    hass.states.async_set("sensor.test", STATE_ON)
+    await hass.async_block_till_done()
+    assert STATE_ON == hass.states.get(ENTITY_ID).state
 
-        # alert should not be silenced on next fire
-        self.hass.states.set("sensor.test", STATE_OFF)
-        self.hass.block_till_done()
-        assert STATE_IDLE == self.hass.states.get(ENTITY_ID).state
-        self.hass.states.set("sensor.test", STATE_ON)
-        self.hass.block_till_done()
-        assert STATE_ON == self.hass.states.get(ENTITY_ID).state
 
-    def test_reset(self):
-        """Test resetting the alert."""
-        assert setup_component(self.hass, alert.DOMAIN, TEST_CONFIG)
-        self.hass.states.set("sensor.test", STATE_ON)
-        self.hass.block_till_done()
-        turn_off(self.hass, ENTITY_ID)
-        self.hass.block_till_done()
-        assert STATE_OFF == self.hass.states.get(ENTITY_ID).state
-        turn_on(self.hass, ENTITY_ID)
-        self.hass.block_till_done()
-        assert STATE_ON == self.hass.states.get(ENTITY_ID).state
+async def test_silence(hass, mock_notifier):
+    """Test silencing the alert."""
+    assert await async_setup_component(hass, alert.DOMAIN, TEST_CONFIG)
+    hass.states.async_set("sensor.test", STATE_ON)
+    await hass.async_block_till_done()
+    async_turn_off(hass, ENTITY_ID)
+    await hass.async_block_till_done()
+    assert STATE_OFF == hass.states.get(ENTITY_ID).state
 
-    def test_toggle(self):
-        """Test toggling alert."""
-        assert setup_component(self.hass, alert.DOMAIN, TEST_CONFIG)
-        self.hass.states.set("sensor.test", STATE_ON)
-        self.hass.block_till_done()
-        assert STATE_ON == self.hass.states.get(ENTITY_ID).state
-        toggle(self.hass, ENTITY_ID)
-        self.hass.block_till_done()
-        assert STATE_OFF == self.hass.states.get(ENTITY_ID).state
-        toggle(self.hass, ENTITY_ID)
-        self.hass.block_till_done()
-        assert STATE_ON == self.hass.states.get(ENTITY_ID).state
+    # alert should not be silenced on next fire
+    hass.states.async_set("sensor.test", STATE_OFF)
+    await hass.async_block_till_done()
+    assert STATE_IDLE == hass.states.get(ENTITY_ID).state
+    hass.states.async_set("sensor.test", STATE_ON)
+    await hass.async_block_till_done()
+    assert STATE_ON == hass.states.get(ENTITY_ID).state
 
-    def test_notification_no_done_message(self):
-        """Test notifications."""
-        events = []
-        config = deepcopy(TEST_CONFIG)
-        del config[alert.DOMAIN][NAME][alert.CONF_DONE_MESSAGE]
 
-        @callback
-        def record_event(event):
-            """Add recorded event to set."""
-            events.append(event)
+async def test_reset(hass, mock_notifier):
+    """Test resetting the alert."""
+    assert await async_setup_component(hass, alert.DOMAIN, TEST_CONFIG)
+    hass.states.async_set("sensor.test", STATE_ON)
+    await hass.async_block_till_done()
+    async_turn_off(hass, ENTITY_ID)
+    await hass.async_block_till_done()
+    assert STATE_OFF == hass.states.get(ENTITY_ID).state
+    async_turn_on(hass, ENTITY_ID)
+    await hass.async_block_till_done()
+    assert STATE_ON == hass.states.get(ENTITY_ID).state
 
-        self.hass.services.register(notify.DOMAIN, NOTIFIER, record_event)
 
-        assert setup_component(self.hass, alert.DOMAIN, config)
-        assert len(events) == 0
+async def test_toggle(hass, mock_notifier):
+    """Test toggling alert."""
+    assert await async_setup_component(hass, alert.DOMAIN, TEST_CONFIG)
+    hass.states.async_set("sensor.test", STATE_ON)
+    await hass.async_block_till_done()
+    assert STATE_ON == hass.states.get(ENTITY_ID).state
+    async_toggle(hass, ENTITY_ID)
+    await hass.async_block_till_done()
+    assert STATE_OFF == hass.states.get(ENTITY_ID).state
+    async_toggle(hass, ENTITY_ID)
+    await hass.async_block_till_done()
+    assert STATE_ON == hass.states.get(ENTITY_ID).state
 
-        self.hass.states.set("sensor.test", STATE_ON)
-        self.hass.block_till_done()
-        assert len(events) == 1
 
-        self.hass.states.set("sensor.test", STATE_OFF)
-        self.hass.block_till_done()
-        assert len(events) == 1
+async def test_notification_no_done_message(hass):
+    """Test notifications."""
+    events = []
+    config = deepcopy(TEST_CONFIG)
+    del config[alert.DOMAIN][NAME][alert.CONF_DONE_MESSAGE]
 
-    def test_notification(self):
-        """Test notifications."""
-        events = []
+    @callback
+    def record_event(event):
+        """Add recorded event to set."""
+        events.append(event)
 
-        @callback
-        def record_event(event):
-            """Add recorded event to set."""
-            events.append(event)
+    hass.services.async_register(notify.DOMAIN, NOTIFIER, record_event)
 
-        self.hass.services.register(notify.DOMAIN, NOTIFIER, record_event)
+    assert await async_setup_component(hass, alert.DOMAIN, config)
+    assert len(events) == 0
 
-        assert setup_component(self.hass, alert.DOMAIN, TEST_CONFIG)
-        assert len(events) == 0
+    hass.states.async_set("sensor.test", STATE_ON)
+    await hass.async_block_till_done()
+    assert len(events) == 1
 
-        self.hass.states.set("sensor.test", STATE_ON)
-        self.hass.block_till_done()
-        assert len(events) == 1
+    hass.states.async_set("sensor.test", STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(events) == 1
 
-        self.hass.states.set("sensor.test", STATE_OFF)
-        self.hass.block_till_done()
-        assert len(events) == 2
 
-    def test_sending_non_templated_notification(self):
-        """Test notifications."""
-        events = self._setup_notify()
+async def test_notification(hass):
+    """Test notifications."""
+    events = []
 
-        assert setup_component(self.hass, alert.DOMAIN, TEST_CONFIG)
+    @callback
+    def record_event(event):
+        """Add recorded event to set."""
+        events.append(event)
 
-        self.hass.states.set(TEST_ENTITY, STATE_ON)
-        self.hass.block_till_done()
-        self.assertEqual(1, len(events))
-        last_event = events[-1]
-        self.assertEqual(last_event.data[notify.ATTR_MESSAGE], NAME)
+    hass.services.async_register(notify.DOMAIN, NOTIFIER, record_event)
 
-    def test_sending_templated_notification(self):
-        """Test templated notification."""
-        events = self._setup_notify()
+    assert await async_setup_component(hass, alert.DOMAIN, TEST_CONFIG)
+    assert len(events) == 0
 
-        config = deepcopy(TEST_CONFIG)
-        config[alert.DOMAIN][NAME][alert.CONF_ALERT_MESSAGE] = TEMPLATE
-        assert setup_component(self.hass, alert.DOMAIN, config)
+    hass.states.async_set("sensor.test", STATE_ON)
+    await hass.async_block_till_done()
+    assert len(events) == 1
 
-        self.hass.states.set(TEST_ENTITY, STATE_ON)
-        self.hass.block_till_done()
-        self.assertEqual(1, len(events))
-        last_event = events[-1]
-        self.assertEqual(last_event.data[notify.ATTR_MESSAGE], TEST_ENTITY)
+    hass.states.async_set("sensor.test", STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(events) == 2
 
-    def test_sending_templated_done_notification(self):
-        """Test templated notification."""
-        events = self._setup_notify()
 
-        config = deepcopy(TEST_CONFIG)
-        config[alert.DOMAIN][NAME][alert.CONF_DONE_MESSAGE] = TEMPLATE
-        assert setup_component(self.hass, alert.DOMAIN, config)
+async def test_sending_non_templated_notification(hass, mock_notifier):
+    """Test notifications."""
+    assert await async_setup_component(hass, alert.DOMAIN, TEST_CONFIG)
 
-        self.hass.states.set(TEST_ENTITY, STATE_ON)
-        self.hass.block_till_done()
-        self.hass.states.set(TEST_ENTITY, STATE_OFF)
-        self.hass.block_till_done()
-        self.assertEqual(2, len(events))
-        last_event = events[-1]
-        self.assertEqual(last_event.data[notify.ATTR_MESSAGE], TEST_ENTITY)
+    hass.states.async_set(TEST_ENTITY, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(mock_notifier) == 1
+    last_event = mock_notifier[-1]
+    assert last_event.data[notify.ATTR_MESSAGE] == NAME
 
-    def test_sending_titled_notification(self):
-        """Test notifications."""
-        events = self._setup_notify()
 
-        config = deepcopy(TEST_CONFIG)
-        config[alert.DOMAIN][NAME][alert.CONF_TITLE] = TITLE
-        assert setup_component(self.hass, alert.DOMAIN, config)
+async def test_sending_templated_notification(hass, mock_notifier):
+    """Test templated notification."""
+    config = deepcopy(TEST_CONFIG)
+    config[alert.DOMAIN][NAME][alert.CONF_ALERT_MESSAGE] = TEMPLATE
+    assert await async_setup_component(hass, alert.DOMAIN, config)
 
-        self.hass.states.set(TEST_ENTITY, STATE_ON)
-        self.hass.block_till_done()
-        self.assertEqual(1, len(events))
-        last_event = events[-1]
-        self.assertEqual(last_event.data[notify.ATTR_TITLE], TEST_TITLE)
+    hass.states.async_set(TEST_ENTITY, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(mock_notifier) == 1
+    last_event = mock_notifier[-1]
+    assert last_event.data[notify.ATTR_MESSAGE] == TEST_ENTITY
 
-    def test_sending_data_notification(self):
-        """Test notifications."""
-        events = self._setup_notify()
 
-        config = deepcopy(TEST_CONFIG)
-        config[alert.DOMAIN][NAME][alert.CONF_DATA] = TEST_DATA
-        assert setup_component(self.hass, alert.DOMAIN, config)
+async def test_sending_templated_done_notification(hass, mock_notifier):
+    """Test templated notification."""
+    config = deepcopy(TEST_CONFIG)
+    config[alert.DOMAIN][NAME][alert.CONF_DONE_MESSAGE] = TEMPLATE
+    assert await async_setup_component(hass, alert.DOMAIN, config)
 
-        self.hass.states.set(TEST_ENTITY, STATE_ON)
-        self.hass.block_till_done()
-        self.assertEqual(1, len(events))
-        last_event = events[-1]
-        self.assertEqual(last_event.data[notify.ATTR_DATA], TEST_DATA)
+    hass.states.async_set(TEST_ENTITY, STATE_ON)
+    await hass.async_block_till_done()
+    hass.states.async_set(TEST_ENTITY, STATE_OFF)
+    await hass.async_block_till_done()
+    assert len(mock_notifier) == 2
+    last_event = mock_notifier[-1]
+    assert last_event.data[notify.ATTR_MESSAGE] == TEST_ENTITY
 
-    def test_skipfirst(self):
-        """Test skipping first notification."""
-        config = deepcopy(TEST_CONFIG)
-        config[alert.DOMAIN][NAME][alert.CONF_SKIP_FIRST] = True
-        events = []
 
-        @callback
-        def record_event(event):
-            """Add recorded event to set."""
-            events.append(event)
+async def test_sending_titled_notification(hass, mock_notifier):
+    """Test notifications."""
+    config = deepcopy(TEST_CONFIG)
+    config[alert.DOMAIN][NAME][alert.CONF_TITLE] = TITLE
+    assert await async_setup_component(hass, alert.DOMAIN, config)
 
-        self.hass.services.register(notify.DOMAIN, NOTIFIER, record_event)
+    hass.states.async_set(TEST_ENTITY, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(mock_notifier) == 1
+    last_event = mock_notifier[-1]
+    assert last_event.data[notify.ATTR_TITLE] == TEST_TITLE
 
-        assert setup_component(self.hass, alert.DOMAIN, config)
-        assert len(events) == 0
 
-        self.hass.states.set("sensor.test", STATE_ON)
-        self.hass.block_till_done()
-        assert len(events) == 0
+async def test_sending_data_notification(hass, mock_notifier):
+    """Test notifications."""
+    config = deepcopy(TEST_CONFIG)
+    config[alert.DOMAIN][NAME][alert.CONF_DATA] = TEST_DATA
+    assert await async_setup_component(hass, alert.DOMAIN, config)
 
-    def test_noack(self):
-        """Test no ack feature."""
-        entity = alert.Alert(self.hass, *TEST_NOACK)
-        self.hass.add_job(entity.begin_alerting)
-        self.hass.block_till_done()
+    hass.states.async_set(TEST_ENTITY, STATE_ON)
+    await hass.async_block_till_done()
+    assert len(mock_notifier) == 1
+    last_event = mock_notifier[-1]
+    assert last_event.data[notify.ATTR_DATA] == TEST_DATA
 
-    def test_done_message_state_tracker_reset_on_cancel(self):
-        """Test that the done message is reset when canceled."""
-        entity = alert.Alert(self.hass, *TEST_NOACK)
-        entity._cancel = lambda *args: None
-        assert entity._send_done_message is False
-        entity._send_done_message = True
-        self.hass.add_job(entity.end_alerting)
-        self.hass.block_till_done()
-        assert entity._send_done_message is False
+
+async def test_skipfirst(hass):
+    """Test skipping first notification."""
+    config = deepcopy(TEST_CONFIG)
+    config[alert.DOMAIN][NAME][alert.CONF_SKIP_FIRST] = True
+    events = []
+
+    @callback
+    def record_event(event):
+        """Add recorded event to set."""
+        events.append(event)
+
+    hass.services.async_register(notify.DOMAIN, NOTIFIER, record_event)
+
+    assert await async_setup_component(hass, alert.DOMAIN, config)
+    assert len(events) == 0
+
+    hass.states.async_set("sensor.test", STATE_ON)
+    await hass.async_block_till_done()
+    assert len(events) == 0
+
+
+async def test_noack(hass):
+    """Test no ack feature."""
+    entity = alert.Alert(hass, *TEST_NOACK)
+    hass.async_add_job(entity.begin_alerting)
+    await hass.async_block_till_done()
+
+
+async def test_done_message_state_tracker_reset_on_cancel(hass):
+    """Test that the done message is reset when canceled."""
+    entity = alert.Alert(hass, *TEST_NOACK)
+    entity._cancel = lambda *args: None
+    assert entity._send_done_message is False
+    entity._send_done_message = True
+    hass.async_add_job(entity.end_alerting)
+    await hass.async_block_till_done()
+    assert entity._send_done_message is False
diff --git a/tests/components/alexa/test_smart_home.py b/tests/components/alexa/test_smart_home.py
index c3bbcbb7a31..9a7f5760270 100644
--- a/tests/components/alexa/test_smart_home.py
+++ b/tests/components/alexa/test_smart_home.py
@@ -1490,7 +1490,7 @@ async def test_automation(hass):
     appliance = await discovery_test(device, hass)
 
     assert appliance["endpointId"] == "automation#test"
-    assert appliance["displayCategories"][0] == "OTHER"
+    assert appliance["displayCategories"][0] == "ACTIVITY_TRIGGER"
     assert appliance["friendlyName"] == "Test automation"
     assert_endpoint_capabilities(
         appliance, "Alexa.PowerController", "Alexa.EndpointHealth", "Alexa"
@@ -3296,10 +3296,7 @@ async def test_media_player_sound_mode_list_unsupported(hass):
 
     # Test equalizer controller is not there
     assert_endpoint_capabilities(
-        appliance,
-        "Alexa",
-        "Alexa.PowerController",
-        "Alexa.EndpointHealth",
+        appliance, "Alexa", "Alexa.PowerController", "Alexa.EndpointHealth"
     )
 
 
@@ -3459,7 +3456,7 @@ async def test_vacuum_discovery(hass):
     appliance = await discovery_test(device, hass)
 
     assert appliance["endpointId"] == "vacuum#test_1"
-    assert appliance["displayCategories"][0] == "OTHER"
+    assert appliance["displayCategories"][0] == "VACUUM_CLEANER"
     assert appliance["friendlyName"] == "Test vacuum 1"
 
     assert_endpoint_capabilities(
@@ -3502,7 +3499,7 @@ async def test_vacuum_fan_speed(hass):
     appliance = await discovery_test(device, hass)
 
     assert appliance["endpointId"] == "vacuum#test_2"
-    assert appliance["displayCategories"][0] == "OTHER"
+    assert appliance["displayCategories"][0] == "VACUUM_CLEANER"
     assert appliance["friendlyName"] == "Test vacuum 2"
 
     capabilities = assert_endpoint_capabilities(
@@ -3834,10 +3831,7 @@ async def test_camera_hass_urls(hass, mock_stream, url, result):
         "idle",
         {"friendly_name": "Test camera", "supported_features": 3},
     )
-    await async_process_ha_core_config(
-        hass,
-        {"external_url": url},
-    )
+    await async_process_ha_core_config(hass, {"external_url": url})
 
     appliance = await discovery_test(device, hass)
     assert len(appliance["capabilities"]) == result
@@ -3850,8 +3844,7 @@ async def test_initialize_camera_stream(hass, mock_camera, mock_stream):
     )
 
     await async_process_ha_core_config(
-        hass,
-        {"external_url": "https://mycamerastream.test"},
+        hass, {"external_url": "https://mycamerastream.test"}
     )
 
     with patch(
diff --git a/tests/components/almond/test_config_flow.py b/tests/components/almond/test_config_flow.py
index 49694d84410..b2144205895 100644
--- a/tests/components/almond/test_config_flow.py
+++ b/tests/components/almond/test_config_flow.py
@@ -80,15 +80,15 @@ async def test_abort_if_existing_entry(hass):
 
     result = await flow.async_step_user()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "single_instance_allowed"
 
     result = await flow.async_step_import()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "single_instance_allowed"
 
     result = await flow.async_step_hassio({})
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "single_instance_allowed"
 
 
 async def test_full_flow(hass, aiohttp_client, aioclient_mock, current_request):
diff --git a/tests/components/ambiclimate/test_config_flow.py b/tests/components/ambiclimate/test_config_flow.py
index 35c2ef69bb3..04c714ebb5f 100644
--- a/tests/components/ambiclimate/test_config_flow.py
+++ b/tests/components/ambiclimate/test_config_flow.py
@@ -30,7 +30,7 @@ async def test_abort_if_no_implementation_registered(hass):
 
     result = await flow.async_step_user()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "no_config"
+    assert result["reason"] == "missing_configuration"
 
 
 async def test_abort_if_already_setup(hass):
@@ -40,12 +40,12 @@ async def test_abort_if_already_setup(hass):
     with patch.object(hass.config_entries, "async_entries", return_value=[{}]):
         result = await flow.async_step_user()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "already_configured"
 
     with patch.object(hass.config_entries, "async_entries", return_value=[{}]):
         result = await flow.async_step_code()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "already_configured"
 
 
 async def test_full_flow_implementation(hass):
@@ -107,7 +107,7 @@ async def test_already_setup(hass):
         result = await flow.async_step_user()
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "already_configured"
 
 
 async def test_view(hass):
diff --git a/tests/components/apns/test_notify.py b/tests/components/apns/test_notify.py
index 6c27299de5c..6aa327a3943 100644
--- a/tests/components/apns/test_notify.py
+++ b/tests/components/apns/test_notify.py
@@ -1,17 +1,17 @@
 """The tests for the APNS component."""
 import io
-import unittest
 
 from apns2.errors import Unregistered
+import pytest
 import yaml
 
 import homeassistant.components.apns.notify as apns
 import homeassistant.components.notify as notify
 from homeassistant.core import State
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import Mock, mock_open, patch
-from tests.common import assert_setup_component, get_test_home_assistant
+from tests.common import assert_setup_component
 
 CONFIG = {
     notify.DOMAIN: {
@@ -23,356 +23,367 @@ CONFIG = {
 }
 
 
-@patch("homeassistant.components.apns.notify.open", mock_open(), create=True)
-class TestApns(unittest.TestCase):
-    """Test the APNS component."""
+@pytest.fixture(scope="module", autouse=True)
+def mock_apns_notify_open():
+    """Mock builtins.open for apns.notfiy."""
+    with patch("homeassistant.components.apns.notify.open", mock_open(), create=True):
+        yield
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.tear_down_cleanup)
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+@patch("os.path.isfile", Mock(return_value=True))
+@patch("os.access", Mock(return_value=True))
+async def _setup_notify(hass_):
+    assert isinstance(apns.load_yaml_config_file, Mock), "Found unmocked load_yaml"
 
-    @patch("os.path.isfile", Mock(return_value=True))
-    @patch("os.access", Mock(return_value=True))
-    def _setup_notify(self):
-        assert isinstance(apns.load_yaml_config_file, Mock), "Found unmocked load_yaml"
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(hass_, notify.DOMAIN, CONFIG)
+    assert handle_config[notify.DOMAIN]
 
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, CONFIG)
-        assert handle_config[notify.DOMAIN]
 
-    @patch("os.path.isfile", return_value=True)
-    @patch("os.access", return_value=True)
-    def test_apns_setup_full(self, mock_access, mock_isfile):
-        """Test setup with all data."""
-        config = {
-            "notify": {
-                "platform": "apns",
-                "name": "test_app",
-                "sandbox": "True",
-                "topic": "testapp.appname",
-                "cert_file": "test_app.pem",
-            }
+@patch("os.path.isfile", return_value=True)
+@patch("os.access", return_value=True)
+async def test_apns_setup_full(mock_access, mock_isfile, hass):
+    """Test setup with all data."""
+    config = {
+        "notify": {
+            "platform": "apns",
+            "name": "test_app",
+            "sandbox": "True",
+            "topic": "testapp.appname",
+            "cert_file": "test_app.pem",
         }
+    }
 
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert handle_config[notify.DOMAIN]
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+    assert handle_config[notify.DOMAIN]
 
-    def test_apns_setup_missing_name(self):
-        """Test setup with missing name."""
-        config = {
-            "notify": {
-                "platform": "apns",
-                "topic": "testapp.appname",
-                "cert_file": "test_app.pem",
-            }
+
+async def test_apns_setup_missing_name(hass):
+    """Test setup with missing name."""
+    config = {
+        "notify": {
+            "platform": "apns",
+            "topic": "testapp.appname",
+            "cert_file": "test_app.pem",
         }
-        with assert_setup_component(0) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert not handle_config[notify.DOMAIN]
+    }
+    with assert_setup_component(0) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+    assert not handle_config[notify.DOMAIN]
 
-    def test_apns_setup_missing_certificate(self):
-        """Test setup with missing certificate."""
-        config = {
-            "notify": {
-                "platform": "apns",
-                "name": "test_app",
-                "topic": "testapp.appname",
-            }
+
+async def test_apns_setup_missing_certificate(hass):
+    """Test setup with missing certificate."""
+    config = {
+        "notify": {
+            "platform": "apns",
+            "name": "test_app",
+            "topic": "testapp.appname",
         }
-        with assert_setup_component(0) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert not handle_config[notify.DOMAIN]
+    }
+    with assert_setup_component(0) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+    assert not handle_config[notify.DOMAIN]
 
-    def test_apns_setup_missing_topic(self):
-        """Test setup with missing topic."""
-        config = {
-            "notify": {
-                "platform": "apns",
-                "name": "test_app",
-                "cert_file": "test_app.pem",
-            }
+
+async def test_apns_setup_missing_topic(hass):
+    """Test setup with missing topic."""
+    config = {
+        "notify": {
+            "platform": "apns",
+            "name": "test_app",
+            "cert_file": "test_app.pem",
         }
-        with assert_setup_component(0) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert not handle_config[notify.DOMAIN]
+    }
+    with assert_setup_component(0) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+    assert not handle_config[notify.DOMAIN]
 
-    @patch("homeassistant.components.apns.notify._write_device")
-    def test_register_new_device(self, mock_write):
-        """Test registering a new device with a name."""
-        yaml_file = {5678: {"name": "test device 2"}}
 
-        written_devices = []
+@patch("homeassistant.components.apns.notify._write_device")
+async def test_register_new_device(mock_write, hass):
+    """Test registering a new device with a name."""
+    yaml_file = {5678: {"name": "test device 2"}}
 
-        def fake_write(_out, device):
-            """Fake write_device."""
-            written_devices.append(device)
+    written_devices = []
 
-        mock_write.side_effect = fake_write
+    def fake_write(_out, device):
+        """Fake write_device."""
+        written_devices.append(device)
 
-        with patch(
-            "homeassistant.components.apns.notify.load_yaml_config_file",
-            Mock(return_value=yaml_file),
-        ):
-            self._setup_notify()
+    mock_write.side_effect = fake_write
 
-        assert self.hass.services.call(
-            apns.DOMAIN,
-            "apns_test_app",
-            {"push_id": "1234", "name": "test device"},
-            blocking=True,
-        )
+    with patch(
+        "homeassistant.components.apns.notify.load_yaml_config_file",
+        Mock(return_value=yaml_file),
+    ):
+        await _setup_notify(hass)
 
-        assert len(written_devices) == 1
-        assert written_devices[0].name == "test device"
+    assert await hass.services.async_call(
+        apns.DOMAIN,
+        "apns_test_app",
+        {"push_id": "1234", "name": "test device"},
+        blocking=True,
+    )
 
-    @patch("homeassistant.components.apns.notify._write_device")
-    def test_register_device_without_name(self, mock_write):
-        """Test registering a without a name."""
-        yaml_file = {
-            1234: {"name": "test device 1", "tracking_device_id": "tracking123"},
-            5678: {"name": "test device 2", "tracking_device_id": "tracking456"},
-        }
+    assert len(written_devices) == 1
+    assert written_devices[0].name == "test device"
 
-        written_devices = []
 
-        def fake_write(_out, device):
-            """Fake write_device."""
-            written_devices.append(device)
+@patch("homeassistant.components.apns.notify._write_device")
+async def test_register_device_without_name(mock_write, hass):
+    """Test registering a without a name."""
+    yaml_file = {
+        1234: {"name": "test device 1", "tracking_device_id": "tracking123"},
+        5678: {"name": "test device 2", "tracking_device_id": "tracking456"},
+    }
 
-        mock_write.side_effect = fake_write
+    written_devices = []
 
-        with patch(
-            "homeassistant.components.apns.notify.load_yaml_config_file",
-            Mock(return_value=yaml_file),
-        ):
-            self._setup_notify()
+    def fake_write(_out, device):
+        """Fake write_device."""
+        written_devices.append(device)
 
-        assert self.hass.services.call(
-            apns.DOMAIN, "apns_test_app", {"push_id": "1234"}, blocking=True
-        )
+    mock_write.side_effect = fake_write
 
-        devices = {dev.push_id: dev for dev in written_devices}
+    with patch(
+        "homeassistant.components.apns.notify.load_yaml_config_file",
+        Mock(return_value=yaml_file),
+    ):
+        await _setup_notify(hass)
 
-        test_device = devices.get("1234")
+    assert await hass.services.async_call(
+        apns.DOMAIN, "apns_test_app", {"push_id": "1234"}, blocking=True
+    )
 
-        assert test_device is not None
-        assert test_device.name is None
+    devices = {dev.push_id: dev for dev in written_devices}
 
-    @patch("homeassistant.components.apns.notify._write_device")
-    def test_update_existing_device(self, mock_write):
-        """Test updating an existing device."""
-        yaml_file = {1234: {"name": "test device 1"}, 5678: {"name": "test device 2"}}
+    test_device = devices.get("1234")
 
-        written_devices = []
+    assert test_device is not None
+    assert test_device.name is None
 
-        def fake_write(_out, device):
-            """Fake write_device."""
-            written_devices.append(device)
 
-        mock_write.side_effect = fake_write
+@patch("homeassistant.components.apns.notify._write_device")
+async def test_update_existing_device(mock_write, hass):
+    """Test updating an existing device."""
+    yaml_file = {1234: {"name": "test device 1"}, 5678: {"name": "test device 2"}}
 
-        with patch(
-            "homeassistant.components.apns.notify.load_yaml_config_file",
-            Mock(return_value=yaml_file),
-        ):
-            self._setup_notify()
+    written_devices = []
 
-        assert self.hass.services.call(
-            apns.DOMAIN,
-            "apns_test_app",
-            {"push_id": "1234", "name": "updated device 1"},
-            blocking=True,
-        )
+    def fake_write(_out, device):
+        """Fake write_device."""
+        written_devices.append(device)
 
-        devices = {dev.push_id: dev for dev in written_devices}
+    mock_write.side_effect = fake_write
 
-        test_device_1 = devices.get("1234")
-        test_device_2 = devices.get("5678")
+    with patch(
+        "homeassistant.components.apns.notify.load_yaml_config_file",
+        Mock(return_value=yaml_file),
+    ):
+        await _setup_notify(hass)
 
-        assert test_device_1 is not None
-        assert test_device_2 is not None
+    assert await hass.services.async_call(
+        apns.DOMAIN,
+        "apns_test_app",
+        {"push_id": "1234", "name": "updated device 1"},
+        blocking=True,
+    )
 
-        assert "updated device 1" == test_device_1.name
+    devices = {dev.push_id: dev for dev in written_devices}
 
-    @patch("homeassistant.components.apns.notify._write_device")
-    def test_update_existing_device_with_tracking_id(self, mock_write):
-        """Test updating an existing device that has a tracking id."""
-        yaml_file = {
-            1234: {"name": "test device 1", "tracking_device_id": "tracking123"},
-            5678: {"name": "test device 2", "tracking_device_id": "tracking456"},
-        }
+    test_device_1 = devices.get("1234")
+    test_device_2 = devices.get("5678")
 
-        written_devices = []
+    assert test_device_1 is not None
+    assert test_device_2 is not None
 
-        def fake_write(_out, device):
-            """Fake write_device."""
-            written_devices.append(device)
+    assert "updated device 1" == test_device_1.name
 
-        mock_write.side_effect = fake_write
 
-        with patch(
-            "homeassistant.components.apns.notify.load_yaml_config_file",
-            Mock(return_value=yaml_file),
-        ):
-            self._setup_notify()
+@patch("homeassistant.components.apns.notify._write_device")
+async def test_update_existing_device_with_tracking_id(mock_write, hass):
+    """Test updating an existing device that has a tracking id."""
+    yaml_file = {
+        1234: {"name": "test device 1", "tracking_device_id": "tracking123"},
+        5678: {"name": "test device 2", "tracking_device_id": "tracking456"},
+    }
 
-        assert self.hass.services.call(
-            apns.DOMAIN,
-            "apns_test_app",
-            {"push_id": "1234", "name": "updated device 1"},
-            blocking=True,
-        )
+    written_devices = []
 
-        devices = {dev.push_id: dev for dev in written_devices}
+    def fake_write(_out, device):
+        """Fake write_device."""
+        written_devices.append(device)
 
-        test_device_1 = devices.get("1234")
-        test_device_2 = devices.get("5678")
+    mock_write.side_effect = fake_write
 
-        assert test_device_1 is not None
-        assert test_device_2 is not None
+    with patch(
+        "homeassistant.components.apns.notify.load_yaml_config_file",
+        Mock(return_value=yaml_file),
+    ):
+        await _setup_notify(hass)
 
-        assert "tracking123" == test_device_1.tracking_device_id
-        assert "tracking456" == test_device_2.tracking_device_id
+    assert await hass.services.async_call(
+        apns.DOMAIN,
+        "apns_test_app",
+        {"push_id": "1234", "name": "updated device 1"},
+        blocking=True,
+    )
 
-    @patch("homeassistant.components.apns.notify.APNsClient")
-    def test_send(self, mock_client):
-        """Test updating an existing device."""
-        send = mock_client.return_value.send_notification
+    devices = {dev.push_id: dev for dev in written_devices}
 
-        yaml_file = {1234: {"name": "test device 1"}}
+    test_device_1 = devices.get("1234")
+    test_device_2 = devices.get("5678")
 
-        with patch(
-            "homeassistant.components.apns.notify.load_yaml_config_file",
-            Mock(return_value=yaml_file),
-        ):
-            self._setup_notify()
+    assert test_device_1 is not None
+    assert test_device_2 is not None
 
-        assert self.hass.services.call(
-            "notify",
+    assert "tracking123" == test_device_1.tracking_device_id
+    assert "tracking456" == test_device_2.tracking_device_id
+
+
+@patch("homeassistant.components.apns.notify.APNsClient")
+async def test_send(mock_client, hass):
+    """Test updating an existing device."""
+    send = mock_client.return_value.send_notification
+
+    yaml_file = {1234: {"name": "test device 1"}}
+
+    with patch(
+        "homeassistant.components.apns.notify.load_yaml_config_file",
+        Mock(return_value=yaml_file),
+    ):
+        await _setup_notify(hass)
+
+    assert await hass.services.async_call(
+        "notify",
+        "test_app",
+        {
+            "message": "Hello",
+            "data": {"badge": 1, "sound": "test.mp3", "category": "testing"},
+        },
+        blocking=True,
+    )
+
+    assert send.called
+    assert 1 == len(send.mock_calls)
+
+    target = send.mock_calls[0][1][0]
+    payload = send.mock_calls[0][1][1]
+
+    assert "1234" == target
+    assert "Hello" == payload.alert
+    assert 1 == payload.badge
+    assert "test.mp3" == payload.sound
+    assert "testing" == payload.category
+
+
+@patch("homeassistant.components.apns.notify.APNsClient")
+async def test_send_when_disabled(mock_client, hass):
+    """Test updating an existing device."""
+    send = mock_client.return_value.send_notification
+
+    yaml_file = {1234: {"name": "test device 1", "disabled": True}}
+
+    with patch(
+        "homeassistant.components.apns.notify.load_yaml_config_file",
+        Mock(return_value=yaml_file),
+    ):
+        await _setup_notify(hass)
+
+    assert await hass.services.async_call(
+        "notify",
+        "test_app",
+        {
+            "message": "Hello",
+            "data": {"badge": 1, "sound": "test.mp3", "category": "testing"},
+        },
+        blocking=True,
+    )
+
+    assert not send.called
+
+
+@patch("homeassistant.components.apns.notify.APNsClient")
+async def test_send_with_state(mock_client, hass):
+    """Test updating an existing device."""
+    send = mock_client.return_value.send_notification
+
+    yaml_file = {
+        1234: {"name": "test device 1", "tracking_device_id": "tracking123"},
+        5678: {"name": "test device 2", "tracking_device_id": "tracking456"},
+    }
+
+    with patch(
+        "homeassistant.components.apns.notify.load_yaml_config_file",
+        Mock(return_value=yaml_file),
+    ), patch("os.path.isfile", Mock(return_value=True)):
+        notify_service = await hass.async_add_executor_job(
+            apns.ApnsNotificationService,
+            hass,
             "test_app",
-            {
-                "message": "Hello",
-                "data": {"badge": 1, "sound": "test.mp3", "category": "testing"},
-            },
-            blocking=True,
+            "testapp.appname",
+            False,
+            "test_app.pem",
         )
 
-        assert send.called
-        assert 1 == len(send.mock_calls)
+    notify_service.device_state_changed_listener(
+        "device_tracker.tracking456",
+        State("device_tracker.tracking456", None),
+        State("device_tracker.tracking456", "home"),
+    )
 
-        target = send.mock_calls[0][1][0]
-        payload = send.mock_calls[0][1][1]
+    notify_service.send_message(message="Hello", target="home")
 
-        assert "1234" == target
-        assert "Hello" == payload.alert
-        assert 1 == payload.badge
-        assert "test.mp3" == payload.sound
-        assert "testing" == payload.category
+    assert send.called
+    assert 1 == len(send.mock_calls)
 
-    @patch("homeassistant.components.apns.notify.APNsClient")
-    def test_send_when_disabled(self, mock_client):
-        """Test updating an existing device."""
-        send = mock_client.return_value.send_notification
+    target = send.mock_calls[0][1][0]
+    payload = send.mock_calls[0][1][1]
 
-        yaml_file = {1234: {"name": "test device 1", "disabled": True}}
-
-        with patch(
-            "homeassistant.components.apns.notify.load_yaml_config_file",
-            Mock(return_value=yaml_file),
-        ):
-            self._setup_notify()
-
-        assert self.hass.services.call(
-            "notify",
-            "test_app",
-            {
-                "message": "Hello",
-                "data": {"badge": 1, "sound": "test.mp3", "category": "testing"},
-            },
-            blocking=True,
-        )
-
-        assert not send.called
-
-    @patch("homeassistant.components.apns.notify.APNsClient")
-    def test_send_with_state(self, mock_client):
-        """Test updating an existing device."""
-        send = mock_client.return_value.send_notification
-
-        yaml_file = {
-            1234: {"name": "test device 1", "tracking_device_id": "tracking123"},
-            5678: {"name": "test device 2", "tracking_device_id": "tracking456"},
-        }
-
-        with patch(
-            "homeassistant.components.apns.notify.load_yaml_config_file",
-            Mock(return_value=yaml_file),
-        ), patch("os.path.isfile", Mock(return_value=True)):
-            notify_service = apns.ApnsNotificationService(
-                self.hass, "test_app", "testapp.appname", False, "test_app.pem"
-            )
-
-        notify_service.device_state_changed_listener(
-            "device_tracker.tracking456",
-            State("device_tracker.tracking456", None),
-            State("device_tracker.tracking456", "home"),
-        )
-
-        notify_service.send_message(message="Hello", target="home")
-
-        assert send.called
-        assert 1 == len(send.mock_calls)
-
-        target = send.mock_calls[0][1][0]
-        payload = send.mock_calls[0][1][1]
-
-        assert "5678" == target
-        assert "Hello" == payload.alert
-
-    @patch("homeassistant.components.apns.notify.APNsClient")
-    @patch("homeassistant.components.apns.notify._write_device")
-    def test_disable_when_unregistered(self, mock_write, mock_client):
-        """Test disabling a device when it is unregistered."""
-        send = mock_client.return_value.send_notification
-        send.side_effect = Unregistered()
-
-        yaml_file = {
-            1234: {"name": "test device 1", "tracking_device_id": "tracking123"},
-            5678: {"name": "test device 2", "tracking_device_id": "tracking456"},
-        }
-
-        written_devices = []
-
-        def fake_write(_out, device):
-            """Fake write_device."""
-            written_devices.append(device)
-
-        mock_write.side_effect = fake_write
-
-        with patch(
-            "homeassistant.components.apns.notify.load_yaml_config_file",
-            Mock(return_value=yaml_file),
-        ):
-            self._setup_notify()
-
-        assert self.hass.services.call(
-            "notify", "test_app", {"message": "Hello"}, blocking=True
-        )
-
-        devices = {dev.push_id: dev for dev in written_devices}
-
-        test_device_1 = devices.get("1234")
-        assert test_device_1 is not None
-        assert test_device_1.disabled is True
+    assert "5678" == target
+    assert "Hello" == payload.alert
 
 
-def test_write_device():
+@patch("homeassistant.components.apns.notify.APNsClient")
+@patch("homeassistant.components.apns.notify._write_device")
+async def test_disable_when_unregistered(mock_write, mock_client, hass):
+    """Test disabling a device when it is unregistered."""
+    send = mock_client.return_value.send_notification
+    send.side_effect = Unregistered()
+
+    yaml_file = {
+        1234: {"name": "test device 1", "tracking_device_id": "tracking123"},
+        5678: {"name": "test device 2", "tracking_device_id": "tracking456"},
+    }
+
+    written_devices = []
+
+    def fake_write(_out, device):
+        """Fake write_device."""
+        written_devices.append(device)
+
+    mock_write.side_effect = fake_write
+
+    with patch(
+        "homeassistant.components.apns.notify.load_yaml_config_file",
+        Mock(return_value=yaml_file),
+    ):
+        await _setup_notify(hass)
+
+    assert await hass.services.async_call(
+        "notify", "test_app", {"message": "Hello"}, blocking=True
+    )
+
+    devices = {dev.push_id: dev for dev in written_devices}
+
+    test_device_1 = devices.get("1234")
+    assert test_device_1 is not None
+    assert test_device_1.disabled is True
+
+
+async def test_write_device():
     """Test writing device."""
     out = io.StringIO()
     device = apns.ApnsDevice("123", "name", "track_id", True)
diff --git a/tests/components/arcam_fmj/test_config_flow.py b/tests/components/arcam_fmj/test_config_flow.py
index 032f57c3113..7de4b83723e 100644
--- a/tests/components/arcam_fmj/test_config_flow.py
+++ b/tests/components/arcam_fmj/test_config_flow.py
@@ -99,7 +99,7 @@ async def test_ssdp_unable_to_connect(hass, dummy_client):
 
     result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "unable_to_connect"
+    assert result["reason"] == "cannot_connect"
 
 
 async def test_ssdp_update(hass):
diff --git a/tests/components/atag/test_config_flow.py b/tests/components/atag/test_config_flow.py
index 7609d6c3e54..59d8d99670c 100644
--- a/tests/components/atag/test_config_flow.py
+++ b/tests/components/atag/test_config_flow.py
@@ -58,7 +58,7 @@ async def test_connection_error(hass):
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "user"
-    assert result["errors"] == {"base": "connection_error"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_unauthorized(hass):
diff --git a/tests/components/aurora/test_binary_sensor.py b/tests/components/aurora/test_binary_sensor.py
index ea385d5697f..d4eea423244 100644
--- a/tests/components/aurora/test_binary_sensor.py
+++ b/tests/components/aurora/test_binary_sensor.py
@@ -1,85 +1,60 @@
 """The tests for the Aurora sensor platform."""
 import re
-import unittest
-
-import requests_mock
 
 from homeassistant.components.aurora import binary_sensor as aurora
 
-from tests.common import get_test_home_assistant, load_fixture
+from tests.common import load_fixture
 
 
-class TestAuroraSensorSetUp(unittest.TestCase):
-    """Test the aurora platform."""
+def test_setup_and_initial_state(hass, requests_mock):
+    """Test that the component is created and initialized as expected."""
+    uri = re.compile(r"http://services\.swpc\.noaa\.gov/text/aurora-nowcast-map\.txt")
+    requests_mock.get(uri, text=load_fixture("aurora.txt"))
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.lat = 37.8267
-        self.lon = -122.423
-        self.hass.config.latitude = self.lat
-        self.hass.config.longitude = self.lon
-        self.entities = []
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    @requests_mock.Mocker()
-    def test_setup_and_initial_state(self, mock_req):
-        """Test that the component is created and initialized as expected."""
-        uri = re.compile(
-            r"http://services\.swpc\.noaa\.gov/text/aurora-nowcast-map\.txt"
-        )
-        mock_req.get(uri, text=load_fixture("aurora.txt"))
-
-        entities = []
-
-        def mock_add_entities(new_entities, update_before_add=False):
-            """Mock add entities."""
-            if update_before_add:
-                for entity in new_entities:
-                    entity.update()
+    entities = []
 
+    def mock_add_entities(new_entities, update_before_add=False):
+        """Mock add entities."""
+        if update_before_add:
             for entity in new_entities:
-                entities.append(entity)
+                entity.update()
 
-        config = {"name": "Test", "forecast_threshold": 75}
-        aurora.setup_platform(self.hass, config, mock_add_entities)
+        for entity in new_entities:
+            entities.append(entity)
 
-        aurora_component = entities[0]
-        assert len(entities) == 1
-        assert aurora_component.name == "Test"
-        assert aurora_component.device_state_attributes["visibility_level"] == "0"
-        assert aurora_component.device_state_attributes["message"] == "nothing's out"
-        assert not aurora_component.is_on
+    config = {"name": "Test", "forecast_threshold": 75}
+    aurora.setup_platform(hass, config, mock_add_entities)
 
-    @requests_mock.Mocker()
-    def test_custom_threshold_works(self, mock_req):
-        """Test that the config can take a custom forecast threshold."""
-        uri = re.compile(
-            r"http://services\.swpc\.noaa\.gov/text/aurora-nowcast-map\.txt"
-        )
-        mock_req.get(uri, text=load_fixture("aurora.txt"))
+    aurora_component = entities[0]
+    assert len(entities) == 1
+    assert aurora_component.name == "Test"
+    assert aurora_component.device_state_attributes["visibility_level"] == "0"
+    assert aurora_component.device_state_attributes["message"] == "nothing's out"
+    assert not aurora_component.is_on
 
-        entities = []
 
-        def mock_add_entities(new_entities, update_before_add=False):
-            """Mock add entities."""
-            if update_before_add:
-                for entity in new_entities:
-                    entity.update()
+def test_custom_threshold_works(hass, requests_mock):
+    """Test that the config can take a custom forecast threshold."""
+    uri = re.compile(r"http://services\.swpc\.noaa\.gov/text/aurora-nowcast-map\.txt")
+    requests_mock.get(uri, text=load_fixture("aurora.txt"))
 
+    entities = []
+
+    def mock_add_entities(new_entities, update_before_add=False):
+        """Mock add entities."""
+        if update_before_add:
             for entity in new_entities:
-                entities.append(entity)
+                entity.update()
 
-        config = {"name": "Test", "forecast_threshold": 1}
-        self.hass.config.longitude = 18.987
-        self.hass.config.latitude = 69.648
+        for entity in new_entities:
+            entities.append(entity)
 
-        aurora.setup_platform(self.hass, config, mock_add_entities)
+    config = {"name": "Test", "forecast_threshold": 1}
+    hass.config.longitude = 18.987
+    hass.config.latitude = 69.648
 
-        aurora_component = entities[0]
-        assert aurora_component.aurora_data.visibility_level == "16"
-        assert aurora_component.is_on
+    aurora.setup_platform(hass, config, mock_add_entities)
+
+    aurora_component = entities[0]
+    assert aurora_component.aurora_data.visibility_level == "16"
+    assert aurora_component.is_on
diff --git a/tests/components/awair/test_config_flow.py b/tests/components/awair/test_config_flow.py
index 63253993117..6dcbc7eac9e 100644
--- a/tests/components/awair/test_config_flow.py
+++ b/tests/components/awair/test_config_flow.py
@@ -31,7 +31,7 @@ async def test_invalid_access_token(hass):
             DOMAIN, context={"source": SOURCE_USER}, data=CONFIG
         )
 
-        assert result["errors"] == {CONF_ACCESS_TOKEN: "auth"}
+        assert result["errors"] == {CONF_ACCESS_TOKEN: "invalid_access_token"}
 
 
 async def test_unexpected_api_error(hass):
@@ -78,7 +78,7 @@ async def test_no_devices_error(hass):
         )
 
         assert result["type"] == "abort"
-        assert result["reason"] == "no_devices"
+        assert result["reason"] == "no_devices_found"
 
 
 async def test_import(hass):
@@ -169,7 +169,7 @@ async def test_reauth(hass):
             data=CONFIG,
         )
 
-        assert result["errors"] == {CONF_ACCESS_TOKEN: "auth"}
+        assert result["errors"] == {CONF_ACCESS_TOKEN: "invalid_access_token"}
 
     with patch("python_awair.AwairClient.query", side_effect=AwairError()):
         result = await hass.config_entries.flow.async_init(
diff --git a/tests/components/axis/test_config_flow.py b/tests/components/axis/test_config_flow.py
index e5a32c4489a..0def1d84251 100644
--- a/tests/components/axis/test_config_flow.py
+++ b/tests/components/axis/test_config_flow.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 
-from .test_device import MAC, MODEL, NAME, setup_axis_integration, vapix_session_request
+from .test_device import MAC, MODEL, NAME, setup_axis_integration, vapix_request
 
 from tests.async_mock import patch
 from tests.common import MockConfigEntry
@@ -32,7 +32,7 @@ async def test_flow_manual_configuration(hass):
     assert result["type"] == "form"
     assert result["step_id"] == "user"
 
-    with patch("axis.vapix.session_request", new=vapix_session_request):
+    with patch("axis.vapix.Vapix.request", new=vapix_request):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -70,9 +70,7 @@ async def test_manual_configuration_update_configuration(hass):
     with patch(
         "homeassistant.components.axis.async_setup_entry",
         return_value=True,
-    ) as mock_setup_entry, patch(
-        "axis.vapix.session_request", new=vapix_session_request
-    ):
+    ) as mock_setup_entry, patch("axis.vapix.Vapix.request", new=vapix_request):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -101,7 +99,7 @@ async def test_flow_fails_already_configured(hass):
     assert result["type"] == "form"
     assert result["step_id"] == "user"
 
-    with patch("axis.vapix.session_request", new=vapix_session_request):
+    with patch("axis.vapix.Vapix.request", new=vapix_request):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -139,11 +137,11 @@ async def test_flow_fails_faulty_credentials(hass):
             },
         )
 
-    assert result["errors"] == {"base": "faulty_credentials"}
+    assert result["errors"] == {"base": "invalid_auth"}
 
 
-async def test_flow_fails_device_unavailable(hass):
-    """Test that config flow fails on device unavailable."""
+async def test_flow_fails_cannot_connect(hass):
+    """Test that config flow fails on cannot connect."""
     result = await hass.config_entries.flow.async_init(
         AXIS_DOMAIN, context={"source": "user"}
     )
@@ -165,7 +163,7 @@ async def test_flow_fails_device_unavailable(hass):
             },
         )
 
-    assert result["errors"] == {"base": "device_unavailable"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_flow_create_entry_multiple_existing_entries_of_same_model(hass):
@@ -188,7 +186,7 @@ async def test_flow_create_entry_multiple_existing_entries_of_same_model(hass):
     assert result["type"] == "form"
     assert result["step_id"] == "user"
 
-    with patch("axis.vapix.session_request", new=vapix_session_request):
+    with patch("axis.vapix.Vapix.request", new=vapix_request):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -230,7 +228,7 @@ async def test_zeroconf_flow(hass):
     assert result["type"] == "form"
     assert result["step_id"] == "user"
 
-    with patch("axis.vapix.session_request", new=vapix_session_request):
+    with patch("axis.vapix.Vapix.request", new=vapix_request):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input={
@@ -294,9 +292,7 @@ async def test_zeroconf_flow_updated_configuration(hass):
     with patch(
         "homeassistant.components.axis.async_setup_entry",
         return_value=True,
-    ) as mock_setup_entry, patch(
-        "axis.vapix.session_request", new=vapix_session_request
-    ):
+    ) as mock_setup_entry, patch("axis.vapix.Vapix.request", new=vapix_request):
         result = await hass.config_entries.flow.async_init(
             AXIS_DOMAIN,
             data={
diff --git a/tests/components/axis/test_device.py b/tests/components/axis/test_device.py
index dc4cb607934..627a17ecf60 100644
--- a/tests/components/axis/test_device.py
+++ b/tests/components/axis/test_device.py
@@ -1,6 +1,5 @@
 """Test Axis device."""
 from copy import deepcopy
-import json
 from unittest import mock
 
 import axis as axislib
@@ -39,7 +38,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 
-from tests.async_mock import Mock, patch
+from tests.async_mock import AsyncMock, Mock, patch
 from tests.common import MockConfigEntry, async_fire_mqtt_message
 
 MAC = "00408C12345"
@@ -197,22 +196,22 @@ root.StreamProfile.S1.Parameters=videocodec=h265
 """
 
 
-def vapix_session_request(session, url, **kwargs):
+async def vapix_request(self, session, url, **kwargs):
     """Return data based on url."""
     if API_DISCOVERY_URL in url:
-        return json.dumps(API_DISCOVERY_RESPONSE)
+        return API_DISCOVERY_RESPONSE
     if APPLICATIONS_URL in url:
         return APPLICATIONS_LIST_RESPONSE
     if BASIC_DEVICE_INFO_URL in url:
-        return json.dumps(BASIC_DEVICE_INFO_RESPONSE)
+        return BASIC_DEVICE_INFO_RESPONSE
     if LIGHT_CONTROL_URL in url:
-        return json.dumps(LIGHT_CONTROL_RESPONSE)
+        return LIGHT_CONTROL_RESPONSE
     if MQTT_CLIENT_URL in url:
-        return json.dumps(MQTT_CLIENT_RESPONSE)
+        return MQTT_CLIENT_RESPONSE
     if PORT_MANAGEMENT_URL in url:
-        return json.dumps(PORT_MANAGEMENT_RESPONSE)
+        return PORT_MANAGEMENT_RESPONSE
     if VMD4_URL in url:
-        return json.dumps(VMD4_RESPONSE)
+        return VMD4_RESPONSE
     if BRAND_URL in url:
         return BRAND_RESPONSE
     if IOPORT_URL in url or INPUT_URL in url or OUTPUT_URL in url:
@@ -235,7 +234,7 @@ async def setup_axis_integration(hass, config=ENTRY_CONFIG, options=ENTRY_OPTION
     )
     config_entry.add_to_hass(hass)
 
-    with patch("axis.vapix.session_request", new=vapix_session_request), patch(
+    with patch("axis.vapix.Vapix.request", new=vapix_request), patch(
         "axis.rtsp.RTSPClient.start",
         return_value=True,
     ):
@@ -314,7 +313,7 @@ async def test_update_address(hass):
     device = await setup_axis_integration(hass)
     assert device.api.config.host == "1.2.3.4"
 
-    with patch("axis.vapix.session_request", new=vapix_session_request), patch(
+    with patch("axis.vapix.Vapix.request", new=vapix_request), patch(
         "homeassistant.components.axis.async_setup_entry",
         return_value=True,
     ) as mock_setup_entry:
@@ -385,16 +384,18 @@ async def test_shutdown():
 
     axis_device = axis.device.AxisNetworkDevice(hass, entry)
     axis_device.api = Mock()
+    axis_device.api.vapix.close = AsyncMock()
 
-    axis_device.shutdown(None)
+    await axis_device.shutdown(None)
 
     assert len(axis_device.api.stream.stop.mock_calls) == 1
+    assert len(axis_device.api.vapix.close.mock_calls) == 1
 
 
 async def test_get_device_fails(hass):
     """Device unauthorized yields authentication required error."""
     with patch(
-        "axis.vapix.session_request", side_effect=axislib.Unauthorized
+        "axis.vapix.Vapix.request", side_effect=axislib.Unauthorized
     ), pytest.raises(axis.errors.AuthenticationRequired):
         await axis.device.get_device(hass, host="", port="", username="", password="")
 
@@ -402,7 +403,7 @@ async def test_get_device_fails(hass):
 async def test_get_device_device_unavailable(hass):
     """Device unavailable yields cannot connect error."""
     with patch(
-        "axis.vapix.session_request", side_effect=axislib.RequestError
+        "axis.vapix.Vapix.request", side_effect=axislib.RequestError
     ), pytest.raises(axis.errors.CannotConnect):
         await axis.device.get_device(hass, host="", port="", username="", password="")
 
@@ -410,6 +411,6 @@ async def test_get_device_device_unavailable(hass):
 async def test_get_device_unknown_error(hass):
     """Device yield unknown error."""
     with patch(
-        "axis.vapix.session_request", side_effect=axislib.AxisException
+        "axis.vapix.Vapix.request", side_effect=axislib.AxisException
     ), pytest.raises(axis.errors.AuthenticationRequired):
         await axis.device.get_device(hass, host="", port="", username="", password="")
diff --git a/tests/components/axis/test_light.py b/tests/components/axis/test_light.py
index 98613451b0d..987ef1cd48b 100644
--- a/tests/components/axis/test_light.py
+++ b/tests/components/axis/test_light.py
@@ -91,7 +91,7 @@ async def test_lights(hass):
             {"entity_id": f"light.{NAME}_ir_light_0", ATTR_BRIGHTNESS: 50},
             blocking=True,
         )
-        mock_activate.not_called()
+        mock_activate.assert_not_awaited()
         mock_set_intensity.assert_called_once_with("led0", 29)
 
     # Turn off
diff --git a/tests/components/axis/test_switch.py b/tests/components/axis/test_switch.py
index f00c17784d2..37d50e33e3e 100644
--- a/tests/components/axis/test_switch.py
+++ b/tests/components/axis/test_switch.py
@@ -13,7 +13,7 @@ from .test_device import (
     setup_axis_integration,
 )
 
-from tests.async_mock import Mock, patch
+from tests.async_mock import AsyncMock, patch
 
 EVENTS = [
     {
@@ -55,8 +55,10 @@ async def test_switches_with_port_cgi(hass):
     """Test that switches are loaded properly using port.cgi."""
     device = await setup_axis_integration(hass)
 
-    device.api.vapix.ports = {"0": Mock(), "1": Mock()}
+    device.api.vapix.ports = {"0": AsyncMock(), "1": AsyncMock()}
     device.api.vapix.ports["0"].name = "Doorbell"
+    device.api.vapix.ports["0"].open = AsyncMock()
+    device.api.vapix.ports["0"].close = AsyncMock()
     device.api.vapix.ports["1"].name = ""
 
     for event in EVENTS:
@@ -98,8 +100,10 @@ async def test_switches_with_port_management(hass):
     with patch.dict(API_DISCOVERY_RESPONSE, api_discovery):
         device = await setup_axis_integration(hass)
 
-    device.api.vapix.ports = {"0": Mock(), "1": Mock()}
+    device.api.vapix.ports = {"0": AsyncMock(), "1": AsyncMock()}
     device.api.vapix.ports["0"].name = "Doorbell"
+    device.api.vapix.ports["0"].open = AsyncMock()
+    device.api.vapix.ports["0"].close = AsyncMock()
     device.api.vapix.ports["1"].name = ""
 
     for event in EVENTS:
diff --git a/tests/components/azure_devops/test_config_flow.py b/tests/components/azure_devops/test_config_flow.py
index fce4c6f5df3..daad5992350 100644
--- a/tests/components/azure_devops/test_config_flow.py
+++ b/tests/components/azure_devops/test_config_flow.py
@@ -51,7 +51,7 @@ async def test_authorization_error(hass: HomeAssistant) -> None:
 
         assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
         assert result2["step_id"] == "user"
-        assert result2["errors"] == {"base": "authorization_error"}
+        assert result2["errors"] == {"base": "invalid_auth"}
 
 
 async def test_reauth_authorization_error(hass: HomeAssistant) -> None:
@@ -75,7 +75,7 @@ async def test_reauth_authorization_error(hass: HomeAssistant) -> None:
 
         assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
         assert result2["step_id"] == "reauth"
-        assert result2["errors"] == {"base": "authorization_error"}
+        assert result2["errors"] == {"base": "invalid_auth"}
 
 
 async def test_connection_error(hass: HomeAssistant) -> None:
@@ -99,7 +99,7 @@ async def test_connection_error(hass: HomeAssistant) -> None:
 
         assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
         assert result2["step_id"] == "user"
-        assert result2["errors"] == {"base": "connection_error"}
+        assert result2["errors"] == {"base": "cannot_connect"}
 
 
 async def test_reauth_connection_error(hass: HomeAssistant) -> None:
@@ -123,7 +123,7 @@ async def test_reauth_connection_error(hass: HomeAssistant) -> None:
 
         assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
         assert result2["step_id"] == "reauth"
-        assert result2["errors"] == {"base": "connection_error"}
+        assert result2["errors"] == {"base": "cannot_connect"}
 
 
 async def test_project_error(hass: HomeAssistant) -> None:
@@ -201,7 +201,7 @@ async def test_reauth_flow(hass: HomeAssistant) -> None:
 
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
         assert result["step_id"] == "reauth"
-        assert result["errors"] == {"base": "authorization_error"}
+        assert result["errors"] == {"base": "invalid_auth"}
 
     with patch(
         "homeassistant.components.azure_devops.config_flow.DevOpsClient.authorize",
diff --git a/tests/components/bayesian/test_binary_sensor.py b/tests/components/bayesian/test_binary_sensor.py
index 5755a7e24e9..2be01679777 100644
--- a/tests/components/bayesian/test_binary_sensor.py
+++ b/tests/components/bayesian/test_binary_sensor.py
@@ -1,7 +1,6 @@
 """The test for the bayesian sensor platform."""
 import json
 from os import path
-import unittest
 
 from homeassistant import config as hass_config
 from homeassistant.components.bayesian import DOMAIN, binary_sensor as bayesian
@@ -17,491 +16,488 @@ from homeassistant.const import (
     STATE_UNKNOWN,
 )
 from homeassistant.core import Context, callback
-from homeassistant.setup import async_setup_component, setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
 
 
-class TestBayesianBinarySensor(unittest.TestCase):
-    """Test the threshold sensor."""
+async def test_load_values_when_added_to_hass(hass):
+    """Test that sensor initializes with observations of relevant entities."""
 
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_load_values_when_added_to_hass(self):
-        """Test that sensor initializes with observations of relevant entities."""
-
-        config = {
-            "binary_sensor": {
-                "name": "Test_Binary",
-                "platform": "bayesian",
-                "observations": [
-                    {
-                        "platform": "state",
-                        "entity_id": "sensor.test_monitored",
-                        "to_state": "off",
-                        "prob_given_true": 0.8,
-                        "prob_given_false": 0.4,
-                    }
-                ],
-                "prior": 0.2,
-                "probability_threshold": 0.32,
-            }
+    config = {
+        "binary_sensor": {
+            "name": "Test_Binary",
+            "platform": "bayesian",
+            "observations": [
+                {
+                    "platform": "state",
+                    "entity_id": "sensor.test_monitored",
+                    "to_state": "off",
+                    "prob_given_true": 0.8,
+                    "prob_given_false": 0.4,
+                }
+            ],
+            "prior": 0.2,
+            "probability_threshold": 0.32,
         }
+    }
 
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert state.attributes.get("observations")[0]["prob_given_true"] == 0.8
-        assert state.attributes.get("observations")[0]["prob_given_false"] == 0.4
+    state = hass.states.get("binary_sensor.test_binary")
+    assert state.attributes.get("observations")[0]["prob_given_true"] == 0.8
+    assert state.attributes.get("observations")[0]["prob_given_false"] == 0.4
 
-    def test_unknown_state_does_not_influence_probability(self):
-        """Test that an unknown state does not change the output probability."""
 
-        config = {
-            "binary_sensor": {
-                "name": "Test_Binary",
-                "platform": "bayesian",
-                "observations": [
-                    {
-                        "platform": "state",
-                        "entity_id": "sensor.test_monitored",
-                        "to_state": "off",
-                        "prob_given_true": 0.8,
-                        "prob_given_false": 0.4,
-                    }
-                ],
-                "prior": 0.2,
-                "probability_threshold": 0.32,
-            }
+async def test_unknown_state_does_not_influence_probability(hass):
+    """Test that an unknown state does not change the output probability."""
+
+    config = {
+        "binary_sensor": {
+            "name": "Test_Binary",
+            "platform": "bayesian",
+            "observations": [
+                {
+                    "platform": "state",
+                    "entity_id": "sensor.test_monitored",
+                    "to_state": "off",
+                    "prob_given_true": 0.8,
+                    "prob_given_false": 0.4,
+                }
+            ],
+            "prior": 0.2,
+            "probability_threshold": 0.32,
         }
+    }
 
-        self.hass.states.set("sensor.test_monitored", STATE_UNKNOWN)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", STATE_UNKNOWN)
+    await hass.async_block_till_done()
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert state.attributes.get("observations") == []
+    state = hass.states.get("binary_sensor.test_binary")
+    assert state.attributes.get("observations") == []
 
-    def test_sensor_numeric_state(self):
-        """Test sensor on numeric state platform observations."""
-        config = {
-            "binary_sensor": {
-                "platform": "bayesian",
-                "name": "Test_Binary",
-                "observations": [
-                    {
-                        "platform": "numeric_state",
-                        "entity_id": "sensor.test_monitored",
-                        "below": 10,
-                        "above": 5,
-                        "prob_given_true": 0.6,
-                    },
-                    {
-                        "platform": "numeric_state",
-                        "entity_id": "sensor.test_monitored1",
-                        "below": 7,
-                        "above": 5,
-                        "prob_given_true": 0.9,
-                        "prob_given_false": 0.1,
-                    },
-                ],
-                "prior": 0.2,
-            }
+
+async def test_sensor_numeric_state(hass):
+    """Test sensor on numeric state platform observations."""
+    config = {
+        "binary_sensor": {
+            "platform": "bayesian",
+            "name": "Test_Binary",
+            "observations": [
+                {
+                    "platform": "numeric_state",
+                    "entity_id": "sensor.test_monitored",
+                    "below": 10,
+                    "above": 5,
+                    "prob_given_true": 0.6,
+                },
+                {
+                    "platform": "numeric_state",
+                    "entity_id": "sensor.test_monitored1",
+                    "below": 7,
+                    "above": 5,
+                    "prob_given_true": 0.9,
+                    "prob_given_false": 0.1,
+                },
+            ],
+            "prior": 0.2,
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", 4)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 4)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
+    state = hass.states.get("binary_sensor.test_binary")
 
-        assert [] == state.attributes.get("observations")
-        assert 0.2 == state.attributes.get("probability")
+    assert [] == state.attributes.get("observations")
+    assert 0.2 == state.attributes.get("probability")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 6)
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", 4)
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", 6)
-        self.hass.states.set("sensor.test_monitored1", 6)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 6)
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", 4)
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", 6)
+    hass.states.async_set("sensor.test_monitored1", 6)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert state.attributes.get("observations")[0]["prob_given_true"] == 0.6
-        assert state.attributes.get("observations")[1]["prob_given_true"] == 0.9
-        assert state.attributes.get("observations")[1]["prob_given_false"] == 0.1
-        assert round(abs(0.77 - state.attributes.get("probability")), 7) == 0
+    state = hass.states.get("binary_sensor.test_binary")
+    assert state.attributes.get("observations")[0]["prob_given_true"] == 0.6
+    assert state.attributes.get("observations")[1]["prob_given_true"] == 0.9
+    assert state.attributes.get("observations")[1]["prob_given_false"] == 0.1
+    assert round(abs(0.77 - state.attributes.get("probability")), 7) == 0
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", 6)
-        self.hass.states.set("sensor.test_monitored1", 0)
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", 4)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 6)
+    hass.states.async_set("sensor.test_monitored1", 0)
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", 4)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert 0.2 == state.attributes.get("probability")
+    state = hass.states.get("binary_sensor.test_binary")
+    assert 0.2 == state.attributes.get("probability")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 15)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 15)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
+    state = hass.states.get("binary_sensor.test_binary")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-    def test_sensor_state(self):
-        """Test sensor on state platform observations."""
-        config = {
-            "binary_sensor": {
-                "name": "Test_Binary",
-                "platform": "bayesian",
-                "observations": [
-                    {
-                        "platform": "state",
-                        "entity_id": "sensor.test_monitored",
-                        "to_state": "off",
-                        "prob_given_true": 0.8,
-                        "prob_given_false": 0.4,
-                    }
-                ],
-                "prior": 0.2,
-                "probability_threshold": 0.32,
-            }
+
+async def test_sensor_state(hass):
+    """Test sensor on state platform observations."""
+    config = {
+        "binary_sensor": {
+            "name": "Test_Binary",
+            "platform": "bayesian",
+            "observations": [
+                {
+                    "platform": "state",
+                    "entity_id": "sensor.test_monitored",
+                    "to_state": "off",
+                    "prob_given_true": 0.8,
+                    "prob_given_false": 0.4,
+                }
+            ],
+            "prior": 0.2,
+            "probability_threshold": 0.32,
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", "on")
+    hass.states.async_set("sensor.test_monitored", "on")
 
-        state = self.hass.states.get("binary_sensor.test_binary")
+    state = hass.states.get("binary_sensor.test_binary")
 
-        assert [] == state.attributes.get("observations")
-        assert 0.2 == state.attributes.get("probability")
+    assert [] == state.attributes.get("observations")
+    assert 0.2 == state.attributes.get("probability")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", "on")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", "on")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert state.attributes.get("observations")[0]["prob_given_true"] == 0.8
-        assert state.attributes.get("observations")[0]["prob_given_false"] == 0.4
-        assert round(abs(0.33 - state.attributes.get("probability")), 7) == 0
+    state = hass.states.get("binary_sensor.test_binary")
+    assert state.attributes.get("observations")[0]["prob_given_true"] == 0.8
+    assert state.attributes.get("observations")[0]["prob_given_false"] == 0.4
+    assert round(abs(0.33 - state.attributes.get("probability")), 7) == 0
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", "on")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", "on")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert round(abs(0.2 - state.attributes.get("probability")), 7) == 0
+    state = hass.states.get("binary_sensor.test_binary")
+    assert round(abs(0.2 - state.attributes.get("probability")), 7) == 0
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-    def test_sensor_value_template(self):
-        """Test sensor on template platform observations."""
-        config = {
-            "binary_sensor": {
-                "name": "Test_Binary",
-                "platform": "bayesian",
-                "observations": [
-                    {
-                        "platform": "template",
-                        "value_template": "{{states('sensor.test_monitored') == 'off'}}",
-                        "prob_given_true": 0.8,
-                        "prob_given_false": 0.4,
-                    }
-                ],
-                "prior": 0.2,
-                "probability_threshold": 0.32,
-            }
+
+async def test_sensor_value_template(hass):
+    """Test sensor on template platform observations."""
+    config = {
+        "binary_sensor": {
+            "name": "Test_Binary",
+            "platform": "bayesian",
+            "observations": [
+                {
+                    "platform": "template",
+                    "value_template": "{{states('sensor.test_monitored') == 'off'}}",
+                    "prob_given_true": 0.8,
+                    "prob_given_false": 0.4,
+                }
+            ],
+            "prior": 0.2,
+            "probability_threshold": 0.32,
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", "on")
+    hass.states.async_set("sensor.test_monitored", "on")
 
-        state = self.hass.states.get("binary_sensor.test_binary")
+    state = hass.states.get("binary_sensor.test_binary")
 
-        assert [] == state.attributes.get("observations")
-        assert 0.2 == state.attributes.get("probability")
+    assert [] == state.attributes.get("observations")
+    assert 0.2 == state.attributes.get("probability")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", "on")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", "on")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert state.attributes.get("observations")[0]["prob_given_true"] == 0.8
-        assert state.attributes.get("observations")[0]["prob_given_false"] == 0.4
-        assert round(abs(0.33 - state.attributes.get("probability")), 7) == 0
+    state = hass.states.get("binary_sensor.test_binary")
+    assert state.attributes.get("observations")[0]["prob_given_true"] == 0.8
+    assert state.attributes.get("observations")[0]["prob_given_false"] == 0.4
+    assert round(abs(0.33 - state.attributes.get("probability")), 7) == 0
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", "on")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", "on")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert round(abs(0.2 - state.attributes.get("probability")), 7) == 0
+    state = hass.states.get("binary_sensor.test_binary")
+    assert round(abs(0.2 - state.attributes.get("probability")), 7) == 0
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-    def test_threshold(self):
-        """Test sensor on probability threshold limits."""
-        config = {
-            "binary_sensor": {
-                "name": "Test_Binary",
-                "platform": "bayesian",
-                "observations": [
-                    {
-                        "platform": "state",
-                        "entity_id": "sensor.test_monitored",
-                        "to_state": "on",
-                        "prob_given_true": 1.0,
-                    }
-                ],
-                "prior": 0.5,
-                "probability_threshold": 1.0,
-            }
+
+async def test_threshold(hass):
+    """Test sensor on probability threshold limits."""
+    config = {
+        "binary_sensor": {
+            "name": "Test_Binary",
+            "platform": "bayesian",
+            "observations": [
+                {
+                    "platform": "state",
+                    "entity_id": "sensor.test_monitored",
+                    "to_state": "on",
+                    "prob_given_true": 1.0,
+                }
+            ],
+            "prior": 0.5,
+            "probability_threshold": 1.0,
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", "on")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "on")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert round(abs(1.0 - state.attributes.get("probability")), 7) == 0
+    state = hass.states.get("binary_sensor.test_binary")
+    assert round(abs(1.0 - state.attributes.get("probability")), 7) == 0
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-    def test_multiple_observations(self):
-        """Test sensor with multiple observations of same entity."""
-        config = {
-            "binary_sensor": {
-                "name": "Test_Binary",
-                "platform": "bayesian",
-                "observations": [
-                    {
-                        "platform": "state",
-                        "entity_id": "sensor.test_monitored",
-                        "to_state": "blue",
-                        "prob_given_true": 0.8,
-                        "prob_given_false": 0.4,
-                    },
-                    {
-                        "platform": "state",
-                        "entity_id": "sensor.test_monitored",
-                        "to_state": "red",
-                        "prob_given_true": 0.2,
-                        "prob_given_false": 0.4,
-                    },
-                ],
-                "prior": 0.2,
-                "probability_threshold": 0.32,
-            }
+
+async def test_multiple_observations(hass):
+    """Test sensor with multiple observations of same entity."""
+    config = {
+        "binary_sensor": {
+            "name": "Test_Binary",
+            "platform": "bayesian",
+            "observations": [
+                {
+                    "platform": "state",
+                    "entity_id": "sensor.test_monitored",
+                    "to_state": "blue",
+                    "prob_given_true": 0.8,
+                    "prob_given_false": 0.4,
+                },
+                {
+                    "platform": "state",
+                    "entity_id": "sensor.test_monitored",
+                    "to_state": "red",
+                    "prob_given_true": 0.2,
+                    "prob_given_false": 0.4,
+                },
+            ],
+            "prior": 0.2,
+            "probability_threshold": 0.32,
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", "off")
+    hass.states.async_set("sensor.test_monitored", "off")
 
-        state = self.hass.states.get("binary_sensor.test_binary")
+    state = hass.states.get("binary_sensor.test_binary")
 
-        for key, attrs in state.attributes.items():
-            json.dumps(attrs)
-        assert [] == state.attributes.get("observations")
-        assert 0.2 == state.attributes.get("probability")
+    for key, attrs in state.attributes.items():
+        json.dumps(attrs)
+    assert [] == state.attributes.get("observations")
+    assert 0.2 == state.attributes.get("probability")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", "blue")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", "blue")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "blue")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", "blue")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
+    state = hass.states.get("binary_sensor.test_binary")
 
-        assert state.attributes.get("observations")[0]["prob_given_true"] == 0.8
-        assert state.attributes.get("observations")[0]["prob_given_false"] == 0.4
-        assert round(abs(0.33 - state.attributes.get("probability")), 7) == 0
+    assert state.attributes.get("observations")[0]["prob_given_true"] == 0.8
+    assert state.attributes.get("observations")[0]["prob_given_false"] == 0.4
+    assert round(abs(0.33 - state.attributes.get("probability")), 7) == 0
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", "blue")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored", "red")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "blue")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored", "red")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert round(abs(0.11 - state.attributes.get("probability")), 7) == 0
+    state = hass.states.get("binary_sensor.test_binary")
+    assert round(abs(0.11 - state.attributes.get("probability")), 7) == 0
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-    def test_probability_updates(self):
-        """Test probability update function."""
-        prob_given_true = [0.3, 0.6, 0.8]
-        prob_given_false = [0.7, 0.4, 0.2]
-        prior = 0.5
 
-        for pt, pf in zip(prob_given_true, prob_given_false):
-            prior = bayesian.update_probability(prior, pt, pf)
+async def test_probability_updates(hass):
+    """Test probability update function."""
+    prob_given_true = [0.3, 0.6, 0.8]
+    prob_given_false = [0.7, 0.4, 0.2]
+    prior = 0.5
 
-        assert round(abs(0.720000 - prior), 7) == 0
+    for pt, pf in zip(prob_given_true, prob_given_false):
+        prior = bayesian.update_probability(prior, pt, pf)
 
-        prob_given_true = [0.8, 0.3, 0.9]
-        prob_given_false = [0.6, 0.4, 0.2]
-        prior = 0.7
+    assert round(abs(0.720000 - prior), 7) == 0
 
-        for pt, pf in zip(prob_given_true, prob_given_false):
-            prior = bayesian.update_probability(prior, pt, pf)
+    prob_given_true = [0.8, 0.3, 0.9]
+    prob_given_false = [0.6, 0.4, 0.2]
+    prior = 0.7
 
-        assert round(abs(0.9130434782608695 - prior), 7) == 0
+    for pt, pf in zip(prob_given_true, prob_given_false):
+        prior = bayesian.update_probability(prior, pt, pf)
 
-    def test_observed_entities(self):
-        """Test sensor on observed entities."""
-        config = {
-            "binary_sensor": {
-                "name": "Test_Binary",
-                "platform": "bayesian",
-                "observations": [
-                    {
-                        "platform": "state",
-                        "entity_id": "sensor.test_monitored",
-                        "to_state": "off",
-                        "prob_given_true": 0.9,
-                        "prob_given_false": 0.4,
-                    },
-                    {
-                        "platform": "template",
-                        "value_template": "{{is_state('sensor.test_monitored1','on') and is_state('sensor.test_monitored','off')}}",
-                        "prob_given_true": 0.9,
-                    },
-                ],
-                "prior": 0.2,
-                "probability_threshold": 0.32,
-            }
+    assert round(abs(0.9130434782608695 - prior), 7) == 0
+
+
+async def test_observed_entities(hass):
+    """Test sensor on observed entities."""
+    config = {
+        "binary_sensor": {
+            "name": "Test_Binary",
+            "platform": "bayesian",
+            "observations": [
+                {
+                    "platform": "state",
+                    "entity_id": "sensor.test_monitored",
+                    "to_state": "off",
+                    "prob_given_true": 0.9,
+                    "prob_given_false": 0.4,
+                },
+                {
+                    "platform": "template",
+                    "value_template": "{{is_state('sensor.test_monitored1','on') and is_state('sensor.test_monitored','off')}}",
+                    "prob_given_true": 0.9,
+                },
+            ],
+            "prior": 0.2,
+            "probability_threshold": 0.32,
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", "on")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored1", "off")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "on")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored1", "off")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert [] == state.attributes.get("occurred_observation_entities")
+    state = hass.states.get("binary_sensor.test_binary")
+    assert [] == state.attributes.get("occurred_observation_entities")
 
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert ["sensor.test_monitored"] == state.attributes.get(
-            "occurred_observation_entities"
-        )
+    state = hass.states.get("binary_sensor.test_binary")
+    assert ["sensor.test_monitored"] == state.attributes.get(
+        "occurred_observation_entities"
+    )
 
-        self.hass.states.set("sensor.test_monitored1", "on")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored1", "on")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert ["sensor.test_monitored", "sensor.test_monitored1"] == sorted(
-            state.attributes.get("occurred_observation_entities")
-        )
+    state = hass.states.get("binary_sensor.test_binary")
+    assert ["sensor.test_monitored", "sensor.test_monitored1"] == sorted(
+        state.attributes.get("occurred_observation_entities")
+    )
 
-    def test_state_attributes_are_serializable(self):
-        """Test sensor on observed entities."""
-        config = {
-            "binary_sensor": {
-                "name": "Test_Binary",
-                "platform": "bayesian",
-                "observations": [
-                    {
-                        "platform": "state",
-                        "entity_id": "sensor.test_monitored",
-                        "to_state": "off",
-                        "prob_given_true": 0.9,
-                        "prob_given_false": 0.4,
-                    },
-                    {
-                        "platform": "template",
-                        "value_template": "{{is_state('sensor.test_monitored1','on') and is_state('sensor.test_monitored','off')}}",
-                        "prob_given_true": 0.9,
-                    },
-                ],
-                "prior": 0.2,
-                "probability_threshold": 0.32,
-            }
+
+async def test_state_attributes_are_serializable(hass):
+    """Test sensor on observed entities."""
+    config = {
+        "binary_sensor": {
+            "name": "Test_Binary",
+            "platform": "bayesian",
+            "observations": [
+                {
+                    "platform": "state",
+                    "entity_id": "sensor.test_monitored",
+                    "to_state": "off",
+                    "prob_given_true": 0.9,
+                    "prob_given_false": 0.4,
+                },
+                {
+                    "platform": "template",
+                    "value_template": "{{is_state('sensor.test_monitored1','on') and is_state('sensor.test_monitored','off')}}",
+                    "prob_given_true": 0.9,
+                },
+            ],
+            "prior": 0.2,
+            "probability_threshold": 0.32,
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", "on")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_monitored1", "off")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "on")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_monitored1", "off")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert [] == state.attributes.get("occurred_observation_entities")
+    state = hass.states.get("binary_sensor.test_binary")
+    assert [] == state.attributes.get("occurred_observation_entities")
 
-        self.hass.states.set("sensor.test_monitored", "off")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", "off")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert ["sensor.test_monitored"] == state.attributes.get(
-            "occurred_observation_entities"
-        )
+    state = hass.states.get("binary_sensor.test_binary")
+    assert ["sensor.test_monitored"] == state.attributes.get(
+        "occurred_observation_entities"
+    )
 
-        self.hass.states.set("sensor.test_monitored1", "on")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored1", "on")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_binary")
-        assert ["sensor.test_monitored", "sensor.test_monitored1"] == sorted(
-            state.attributes.get("occurred_observation_entities")
-        )
+    state = hass.states.get("binary_sensor.test_binary")
+    assert ["sensor.test_monitored", "sensor.test_monitored1"] == sorted(
+        state.attributes.get("occurred_observation_entities")
+    )
 
-        for key, attrs in state.attributes.items():
-            json.dumps(attrs)
+    for key, attrs in state.attributes.items():
+        json.dumps(attrs)
 
 
 async def test_template_error(hass, caplog):
diff --git a/tests/components/bom/__init__.py b/tests/components/bom/__init__.py
deleted file mode 100644
index a129618ef2c..00000000000
--- a/tests/components/bom/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Tests for the bom component."""
diff --git a/tests/components/bom/test_sensor.py b/tests/components/bom/test_sensor.py
deleted file mode 100644
index 49cdb3e6ee3..00000000000
--- a/tests/components/bom/test_sensor.py
+++ /dev/null
@@ -1,104 +0,0 @@
-"""The tests for the BOM Weather sensor platform."""
-import json
-import re
-import unittest
-from urllib.parse import urlparse
-
-import requests
-
-from homeassistant.components import sensor
-from homeassistant.components.bom.sensor import BOMCurrentData
-from homeassistant.setup import setup_component
-
-from tests.async_mock import patch
-from tests.common import assert_setup_component, get_test_home_assistant, load_fixture
-
-VALID_CONFIG = {
-    "platform": "bom",
-    "station": "IDN60901.94767",
-    "name": "Fake",
-    "monitored_conditions": ["apparent_t", "press", "weather"],
-}
-
-
-def mocked_requests(*args, **kwargs):
-    """Mock requests.get invocations."""
-
-    class MockResponse:
-        """Class to represent a mocked response."""
-
-        def __init__(self, json_data, status_code):
-            """Initialize the mock response class."""
-            self.json_data = json_data
-            self.status_code = status_code
-
-        def json(self):
-            """Return the json of the response."""
-            return self.json_data
-
-        @property
-        def content(self):
-            """Return the content of the response."""
-            return self.json()
-
-        def raise_for_status(self):
-            """Raise an HTTPError if status is not 200."""
-            if self.status_code != 200:
-                raise requests.HTTPError(self.status_code)
-
-    url = urlparse(args[0])
-    if re.match(r"^/fwo/[\w]+/[\w.]+\.json", url.path):
-        return MockResponse(json.loads(load_fixture("bom_weather.json")), 200)
-
-    raise NotImplementedError(f"Unknown route {url.path}")
-
-
-class TestBOMWeatherSensor(unittest.TestCase):
-    """Test the BOM Weather sensor."""
-
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.config = VALID_CONFIG
-        self.addCleanup(self.hass.stop)
-
-    @patch("requests.get", side_effect=mocked_requests)
-    def test_setup(self, mock_get):
-        """Test the setup with custom settings."""
-        with assert_setup_component(1, sensor.DOMAIN):
-            assert setup_component(self.hass, sensor.DOMAIN, {"sensor": VALID_CONFIG})
-            self.hass.block_till_done()
-
-        fake_entities = [
-            "bom_fake_feels_like_c",
-            "bom_fake_pressure_mb",
-            "bom_fake_weather",
-        ]
-
-        for entity_id in fake_entities:
-            state = self.hass.states.get(f"sensor.{entity_id}")
-            assert state is not None
-
-    @patch("requests.get", side_effect=mocked_requests)
-    def test_sensor_values(self, mock_get):
-        """Test retrieval of sensor values."""
-        assert setup_component(self.hass, sensor.DOMAIN, {"sensor": VALID_CONFIG})
-        self.hass.block_till_done()
-
-        weather = self.hass.states.get("sensor.bom_fake_weather").state
-        assert "Fine" == weather
-
-        pressure = self.hass.states.get("sensor.bom_fake_pressure_mb").state
-        assert "1021.7" == pressure
-
-        feels_like = self.hass.states.get("sensor.bom_fake_feels_like_c").state
-        assert "25.0" == feels_like
-
-
-class TestBOMCurrentData(unittest.TestCase):
-    """Test the BOM data container."""
-
-    def test_should_update_initial(self):
-        """Test that the first update always occurs."""
-        bom_data = BOMCurrentData("IDN60901.94767")
-        assert bom_data.should_update() is True
diff --git a/tests/components/bond/test_cover.py b/tests/components/bond/test_cover.py
index a9083a900e6..dbb8ee0f3b7 100644
--- a/tests/components/bond/test_cover.py
+++ b/tests/components/bond/test_cover.py
@@ -1,6 +1,5 @@
 """Tests for the Bond cover device."""
 from datetime import timedelta
-import logging
 
 from bond_api import Action, DeviceType
 
@@ -24,8 +23,6 @@ from .common import (
 
 from tests.common import async_fire_time_changed
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def shades(name: str):
     """Create motorized shades with given name."""
diff --git a/tests/components/bond/test_light.py b/tests/components/bond/test_light.py
index 17b8c87978f..6d871187e26 100644
--- a/tests/components/bond/test_light.py
+++ b/tests/components/bond/test_light.py
@@ -1,6 +1,5 @@
 """Tests for the Bond light device."""
 from datetime import timedelta
-import logging
 
 from bond_api import Action, DeviceType
 
@@ -29,8 +28,6 @@ from .common import (
 
 from tests.common import async_fire_time_changed
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def ceiling_fan(name: str):
     """Create a ceiling fan (that has built-in light) with given name."""
@@ -52,24 +49,74 @@ def dimmable_ceiling_fan(name: str):
 
 def fireplace(name: str):
     """Create a fireplace with given name."""
-    return {"name": name, "type": DeviceType.FIREPLACE}
+    return {
+        "name": name,
+        "type": DeviceType.FIREPLACE,
+        "actions": [Action.TURN_ON, Action.TURN_OFF],
+    }
 
 
-async def test_entity_registry(hass: core.HomeAssistant):
-    """Tests that the devices are registered in the entity registry."""
+def fireplace_with_light(name: str):
+    """Create a fireplace with given name."""
+    return {
+        "name": name,
+        "type": DeviceType.FIREPLACE,
+        "actions": [
+            Action.TURN_ON,
+            Action.TURN_OFF,
+            Action.TURN_LIGHT_ON,
+            Action.TURN_LIGHT_OFF,
+        ],
+    }
+
+
+async def test_fan_entity_registry(hass: core.HomeAssistant):
+    """Tests that fan with light devices are registered in the entity registry."""
     await setup_platform(
         hass,
         LIGHT_DOMAIN,
-        ceiling_fan("name-1"),
+        ceiling_fan("fan-name"),
         bond_version={"bondid": "test-hub-id"},
         bond_device_id="test-device-id",
     )
 
     registry: EntityRegistry = await hass.helpers.entity_registry.async_get_registry()
-    entity = registry.entities["light.name_1"]
+    entity = registry.entities["light.fan_name"]
     assert entity.unique_id == "test-hub-id_test-device-id"
 
 
+async def test_fireplace_entity_registry(hass: core.HomeAssistant):
+    """Tests that flame fireplace devices are registered in the entity registry."""
+    await setup_platform(
+        hass,
+        LIGHT_DOMAIN,
+        fireplace("fireplace-name"),
+        bond_version={"bondid": "test-hub-id"},
+        bond_device_id="test-device-id",
+    )
+
+    registry: EntityRegistry = await hass.helpers.entity_registry.async_get_registry()
+    entity = registry.entities["light.fireplace_name"]
+    assert entity.unique_id == "test-hub-id_test-device-id"
+
+
+async def test_fireplace_with_light_entity_registry(hass: core.HomeAssistant):
+    """Tests that flame+light devices are registered in the entity registry."""
+    await setup_platform(
+        hass,
+        LIGHT_DOMAIN,
+        fireplace_with_light("fireplace-name"),
+        bond_version={"bondid": "test-hub-id"},
+        bond_device_id="test-device-id",
+    )
+
+    registry: EntityRegistry = await hass.helpers.entity_registry.async_get_registry()
+    entity_flame = registry.entities["light.fireplace_name"]
+    assert entity_flame.unique_id == "test-hub-id_test-device-id"
+    entity_light = registry.entities["light.fireplace_name_2"]
+    assert entity_light.unique_id == "test-hub-id_test-device-id_light"
+
+
 async def test_sbb_trust_state(hass: core.HomeAssistant):
     """Assumed state should be False if device is a Smart by Bond."""
     version = {
diff --git a/tests/components/bond/test_switch.py b/tests/components/bond/test_switch.py
index 2755a491a86..f2568f5fb99 100644
--- a/tests/components/bond/test_switch.py
+++ b/tests/components/bond/test_switch.py
@@ -1,6 +1,5 @@
 """Tests for the Bond switch device."""
 from datetime import timedelta
-import logging
 
 from bond_api import Action, DeviceType
 
@@ -19,8 +18,6 @@ from .common import (
 
 from tests.common import async_fire_time_changed
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def generic_device(name: str):
     """Create a generic device with given name."""
diff --git a/tests/components/brother/test_config_flow.py b/tests/components/brother/test_config_flow.py
index 06e58b83522..153c07deeac 100644
--- a/tests/components/brother/test_config_flow.py
+++ b/tests/components/brother/test_config_flow.py
@@ -76,7 +76,7 @@ async def test_connection_error(hass):
             DOMAIN, context={"source": SOURCE_USER}, data=CONFIG
         )
 
-        assert result["errors"] == {"base": "connection_error"}
+        assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_snmp_error(hass):
@@ -125,7 +125,7 @@ async def test_zeroconf_no_data(hass):
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
 
 
 async def test_zeroconf_not_brother_printer_error(hass):
@@ -156,7 +156,7 @@ async def test_zeroconf_snmp_error(hass):
         )
 
         assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-        assert result["reason"] == "connection_error"
+        assert result["reason"] == "cannot_connect"
 
 
 async def test_zeroconf_device_exists_abort(hass):
diff --git a/tests/components/bsblan/test_config_flow.py b/tests/components/bsblan/test_config_flow.py
index 4c24e10a237..4c04db012ba 100644
--- a/tests/components/bsblan/test_config_flow.py
+++ b/tests/components/bsblan/test_config_flow.py
@@ -40,7 +40,7 @@ async def test_connection_error(
         data={CONF_HOST: "example.local", CONF_PASSKEY: "1234", CONF_PORT: 80},
     )
 
-    assert result["errors"] == {"base": "connection_error"}
+    assert result["errors"] == {"base": "cannot_connect"}
     assert result["step_id"] == "user"
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
 
diff --git a/tests/components/canary/conftest.py b/tests/components/canary/conftest.py
index 0127865f6a1..01527a193c0 100644
--- a/tests/components/canary/conftest.py
+++ b/tests/components/canary/conftest.py
@@ -5,17 +5,12 @@ from pytest import fixture
 from tests.async_mock import MagicMock, patch
 
 
-def mock_canary_update(self, **kwargs):
-    """Get the latest data from py-canary."""
-    self._update(**kwargs)
-
-
 @fixture
 def canary(hass):
     """Mock the CanaryApi for easier testing."""
     with patch.object(Api, "login", return_value=True), patch(
-        "homeassistant.components.canary.CanaryData.update", mock_canary_update
-    ), patch("homeassistant.components.canary.Api") as mock_canary:
+        "homeassistant.components.canary.Api"
+    ) as mock_canary:
         instance = mock_canary.return_value = Api(
             "test-username",
             "test-password",
diff --git a/tests/components/canary/test_alarm_control_panel.py b/tests/components/canary/test_alarm_control_panel.py
index f1b8fc3396e..930fd9613e0 100644
--- a/tests/components/canary/test_alarm_control_panel.py
+++ b/tests/components/canary/test_alarm_control_panel.py
@@ -137,7 +137,7 @@ async def test_alarm_control_panel_services(hass, canary) -> None:
         service_data={"entity_id": entity_id},
         blocking=True,
     )
-    instance.set_location_mode.assert_called_with(100, LOCATION_MODE_AWAY, False)
+    instance.set_location_mode.assert_called_with(100, LOCATION_MODE_AWAY)
 
     # test arm home
     await hass.services.async_call(
@@ -146,7 +146,7 @@ async def test_alarm_control_panel_services(hass, canary) -> None:
         service_data={"entity_id": entity_id},
         blocking=True,
     )
-    instance.set_location_mode.assert_called_with(100, LOCATION_MODE_HOME, False)
+    instance.set_location_mode.assert_called_with(100, LOCATION_MODE_HOME)
 
     # test arm night
     await hass.services.async_call(
@@ -155,7 +155,7 @@ async def test_alarm_control_panel_services(hass, canary) -> None:
         service_data={"entity_id": entity_id},
         blocking=True,
     )
-    instance.set_location_mode.assert_called_with(100, LOCATION_MODE_NIGHT, False)
+    instance.set_location_mode.assert_called_with(100, LOCATION_MODE_NIGHT)
 
     # test disarm
     await hass.services.async_call(
diff --git a/tests/components/canary/test_config_flow.py b/tests/components/canary/test_config_flow.py
index 36c6990a663..e02217dc67e 100644
--- a/tests/components/canary/test_config_flow.py
+++ b/tests/components/canary/test_config_flow.py
@@ -103,7 +103,7 @@ async def test_user_form_single_instance_allowed(hass, canary_config_flow):
     assert result["reason"] == "single_instance_allowed"
 
 
-async def test_options_flow(hass):
+async def test_options_flow(hass, canary):
     """Test updating options."""
     with patch("homeassistant.components.canary.PLATFORMS", []):
         entry = await init_integration(hass)
diff --git a/tests/components/canary/test_sensor.py b/tests/components/canary/test_sensor.py
index 13b82c9a996..d32741d3705 100644
--- a/tests/components/canary/test_sensor.py
+++ b/tests/components/canary/test_sensor.py
@@ -1,4 +1,6 @@
 """The tests for the Canary sensor platform."""
+from datetime import timedelta
+
 from homeassistant.components.canary.const import DOMAIN, MANUFACTURER
 from homeassistant.components.canary.sensor import (
     ATTR_AIR_QUALITY,
@@ -13,14 +15,16 @@ from homeassistant.const import (
     DEVICE_CLASS_SIGNAL_STRENGTH,
     DEVICE_CLASS_TEMPERATURE,
     PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     TEMP_CELSIUS,
 )
 from homeassistant.setup import async_setup_component
+from homeassistant.util.dt import utcnow
 
 from . import mock_device, mock_location, mock_reading
 
 from tests.async_mock import patch
-from tests.common import mock_device_registry, mock_registry
+from tests.common import async_fire_time_changed, mock_device_registry, mock_registry
 
 
 async def test_sensors_pro(hass, canary) -> None:
@@ -124,6 +128,8 @@ async def test_sensors_attributes_pro(hass, canary) -> None:
         mock_reading("air_quality", "0.4"),
     ]
 
+    future = utcnow() + timedelta(seconds=30)
+    async_fire_time_changed(hass, future)
     await hass.helpers.entity_component.async_update_entity(entity_id)
     await hass.async_block_till_done()
 
@@ -137,6 +143,8 @@ async def test_sensors_attributes_pro(hass, canary) -> None:
         mock_reading("air_quality", "1.0"),
     ]
 
+    future += timedelta(seconds=30)
+    async_fire_time_changed(hass, future)
     await hass.helpers.entity_component.async_update_entity(entity_id)
     await hass.async_block_till_done()
 
@@ -180,7 +188,7 @@ async def test_sensors_flex(hass, canary) -> None:
         "home_dining_room_wifi": (
             "20_wifi",
             "-57.0",
-            "dBm",
+            SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
             DEVICE_CLASS_SIGNAL_STRENGTH,
             None,
         ),
diff --git a/tests/components/cast/test_media_player.py b/tests/components/cast/test_media_player.py
index d3348241ec8..86b61d8f687 100644
--- a/tests/components/cast/test_media_player.py
+++ b/tests/components/cast/test_media_player.py
@@ -149,7 +149,7 @@ async def async_setup_media_player_cast(hass: HomeAssistantType, info: Chromecas
         return_value=zconf,
     ):
         await async_setup_component(
-            hass, "cast", {"cast": {"media_player": {"host": info.host}}}
+            hass, "cast", {"cast": {"media_player": {"uuid": info.uuid}}}
         )
         await hass.async_block_till_done()
 
@@ -236,7 +236,7 @@ async def test_create_cast_device_with_uuid(hass):
 
 async def test_replay_past_chromecasts(hass):
     """Test cast platform re-playing past chromecasts when adding new one."""
-    cast_group1 = get_fake_chromecast_info(host="host1", port=8009)
+    cast_group1 = get_fake_chromecast_info(host="host1", port=8009, uuid=FakeUUID)
     cast_group2 = get_fake_chromecast_info(
         host="host2", port=8009, uuid=UUID("9462202c-e747-4af5-a66b-7dce0e1ebc09")
     )
@@ -244,7 +244,7 @@ async def test_replay_past_chromecasts(hass):
     zconf_2 = get_fake_zconf(host="host2", port=8009)
 
     discover_cast, add_dev1 = await async_setup_cast_internal_discovery(
-        hass, config={"host": "host1"}
+        hass, config={"uuid": FakeUUID}
     )
 
     with patch(
@@ -266,41 +266,11 @@ async def test_replay_past_chromecasts(hass):
     assert add_dev1.call_count == 1
 
     add_dev2 = Mock()
-    await cast._async_setup_platform(hass, {"host": "host2"}, add_dev2, None)
+    await cast._async_setup_platform(hass, {"host": "host2"}, add_dev2)
     await hass.async_block_till_done()
     assert add_dev2.call_count == 1
 
 
-async def test_manual_cast_chromecasts_host(hass):
-    """Test only wanted casts are added for manual configuration."""
-    cast_1 = get_fake_chromecast_info(host="configured_host")
-    cast_2 = get_fake_chromecast_info(host="other_host", uuid=FakeUUID2)
-    zconf_1 = get_fake_zconf(host="configured_host")
-    zconf_2 = get_fake_zconf(host="other_host")
-
-    # Manual configuration of media player with host "configured_host"
-    discover_cast, add_dev1 = await async_setup_cast_internal_discovery(
-        hass, config={"host": "configured_host"}
-    )
-    with patch(
-        "homeassistant.components.cast.discovery.ChromeCastZeroconf.get_zeroconf",
-        return_value=zconf_2,
-    ):
-        discover_cast("service2", cast_2)
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()  # having tasks that add jobs
-    assert add_dev1.call_count == 0
-
-    with patch(
-        "homeassistant.components.cast.discovery.ChromeCastZeroconf.get_zeroconf",
-        return_value=zconf_1,
-    ):
-        discover_cast("service1", cast_1)
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()  # having tasks that add jobs
-    assert add_dev1.call_count == 1
-
-
 async def test_manual_cast_chromecasts_uuid(hass):
     """Test only wanted casts are added for manual configuration."""
     cast_1 = get_fake_chromecast_info(host="host_1", uuid=FakeUUID)
@@ -729,7 +699,7 @@ async def test_entry_setup_no_config(hass: HomeAssistantType):
 async def test_entry_setup_single_config(hass: HomeAssistantType):
     """Test setting up entry and having a single config option."""
     await async_setup_component(
-        hass, "cast", {"cast": {"media_player": {"host": "bla"}}}
+        hass, "cast", {"cast": {"media_player": {"uuid": "bla"}}}
     )
     await hass.async_block_till_done()
 
@@ -739,13 +709,13 @@ async def test_entry_setup_single_config(hass: HomeAssistantType):
         await cast.async_setup_entry(hass, MockConfigEntry(), None)
 
     assert len(mock_setup.mock_calls) == 1
-    assert mock_setup.mock_calls[0][1][1] == {"host": "bla"}
+    assert mock_setup.mock_calls[0][1][1] == {"uuid": "bla"}
 
 
 async def test_entry_setup_list_config(hass: HomeAssistantType):
     """Test setting up entry and having multiple config options."""
     await async_setup_component(
-        hass, "cast", {"cast": {"media_player": [{"host": "bla"}, {"host": "blu"}]}}
+        hass, "cast", {"cast": {"media_player": [{"uuid": "bla"}, {"uuid": "blu"}]}}
     )
     await hass.async_block_till_done()
 
@@ -755,14 +725,14 @@ async def test_entry_setup_list_config(hass: HomeAssistantType):
         await cast.async_setup_entry(hass, MockConfigEntry(), None)
 
     assert len(mock_setup.mock_calls) == 2
-    assert mock_setup.mock_calls[0][1][1] == {"host": "bla"}
-    assert mock_setup.mock_calls[1][1][1] == {"host": "blu"}
+    assert mock_setup.mock_calls[0][1][1] == {"uuid": "bla"}
+    assert mock_setup.mock_calls[1][1][1] == {"uuid": "blu"}
 
 
 async def test_entry_setup_platform_not_ready(hass: HomeAssistantType):
     """Test failed setting up entry will raise PlatformNotReady."""
     await async_setup_component(
-        hass, "cast", {"cast": {"media_player": {"host": "bla"}}}
+        hass, "cast", {"cast": {"media_player": {"uuid": "bla"}}}
     )
     await hass.async_block_till_done()
 
@@ -774,4 +744,4 @@ async def test_entry_setup_platform_not_ready(hass: HomeAssistantType):
             await cast.async_setup_entry(hass, MockConfigEntry(), None)
 
     assert len(mock_setup.mock_calls) == 1
-    assert mock_setup.mock_calls[0][1][1] == {"host": "bla"}
+    assert mock_setup.mock_calls[0][1][1] == {"uuid": "bla"}
diff --git a/tests/components/cloudflare/__init__.py b/tests/components/cloudflare/__init__.py
new file mode 100644
index 00000000000..68eed3afd87
--- /dev/null
+++ b/tests/components/cloudflare/__init__.py
@@ -0,0 +1,101 @@
+"""Tests for the Cloudflare integration."""
+from typing import List
+
+from pycfdns import CFRecord
+
+from homeassistant.components.cloudflare.const import CONF_RECORDS, DOMAIN
+from homeassistant.const import CONF_API_TOKEN, CONF_ZONE
+
+from tests.async_mock import AsyncMock, patch
+from tests.common import MockConfigEntry
+
+ENTRY_CONFIG = {
+    CONF_API_TOKEN: "mock-api-token",
+    CONF_ZONE: "mock.com",
+    CONF_RECORDS: ["ha.mock.com", "homeassistant.mock.com"],
+}
+
+ENTRY_OPTIONS = {}
+
+USER_INPUT = {
+    CONF_API_TOKEN: "mock-api-token",
+}
+
+USER_INPUT_ZONE = {CONF_ZONE: "mock.com"}
+
+USER_INPUT_RECORDS = {CONF_RECORDS: ["ha.mock.com", "homeassistant.mock.com"]}
+
+MOCK_ZONE = "mock.com"
+MOCK_ZONE_ID = "mock-zone-id"
+MOCK_ZONE_RECORDS = [
+    {
+        "id": "zone-record-id",
+        "type": "A",
+        "name": "ha.mock.com",
+        "proxied": True,
+        "content": "127.0.0.1",
+    },
+    {
+        "id": "zone-record-id-2",
+        "type": "A",
+        "name": "homeassistant.mock.com",
+        "proxied": True,
+        "content": "127.0.0.1",
+    },
+    {
+        "id": "zone-record-id-3",
+        "type": "A",
+        "name": "mock.com",
+        "proxied": True,
+        "content": "127.0.0.1",
+    },
+]
+
+
+async def init_integration(
+    hass,
+    *,
+    data: dict = ENTRY_CONFIG,
+    options: dict = ENTRY_OPTIONS,
+) -> MockConfigEntry:
+    """Set up the Cloudflare integration in Home Assistant."""
+    entry = MockConfigEntry(domain=DOMAIN, data=data, options=options)
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    return entry
+
+
+def _get_mock_cfupdate(
+    zone: str = MOCK_ZONE,
+    zone_id: str = MOCK_ZONE_ID,
+    records: List = MOCK_ZONE_RECORDS,
+):
+    client = AsyncMock()
+
+    zone_records = [record["name"] for record in records]
+    cf_records = [CFRecord(record) for record in records]
+
+    client.get_zones = AsyncMock(return_value=[zone])
+    client.get_zone_records = AsyncMock(return_value=zone_records)
+    client.get_record_info = AsyncMock(return_value=cf_records)
+    client.get_zone_id = AsyncMock(return_value=zone_id)
+    client.update_records = AsyncMock(return_value=None)
+
+    return client
+
+
+def _patch_async_setup(return_value=True):
+    return patch(
+        "homeassistant.components.cloudflare.async_setup",
+        return_value=return_value,
+    )
+
+
+def _patch_async_setup_entry(return_value=True):
+    return patch(
+        "homeassistant.components.cloudflare.async_setup_entry",
+        return_value=return_value,
+    )
diff --git a/tests/components/cloudflare/conftest.py b/tests/components/cloudflare/conftest.py
new file mode 100644
index 00000000000..1ee381de104
--- /dev/null
+++ b/tests/components/cloudflare/conftest.py
@@ -0,0 +1,28 @@
+"""Define fixtures available for all tests."""
+from pytest import fixture
+
+from . import _get_mock_cfupdate
+
+from tests.async_mock import patch
+
+
+@fixture
+def cfupdate(hass):
+    """Mock the CloudflareUpdater for easier testing."""
+    mock_cfupdate = _get_mock_cfupdate()
+    with patch(
+        "homeassistant.components.cloudflare.CloudflareUpdater",
+        return_value=mock_cfupdate,
+    ) as mock_api:
+        yield mock_api
+
+
+@fixture
+def cfupdate_flow(hass):
+    """Mock the CloudflareUpdater for easier config flow testing."""
+    mock_cfupdate = _get_mock_cfupdate()
+    with patch(
+        "homeassistant.components.cloudflare.config_flow.CloudflareUpdater",
+        return_value=mock_cfupdate,
+    ) as mock_api:
+        yield mock_api
diff --git a/tests/components/cloudflare/test_config_flow.py b/tests/components/cloudflare/test_config_flow.py
new file mode 100644
index 00000000000..abdd69269f5
--- /dev/null
+++ b/tests/components/cloudflare/test_config_flow.py
@@ -0,0 +1,166 @@
+"""Test the Cloudflare config flow."""
+from pycfdns.exceptions import (
+    CloudflareAuthenticationException,
+    CloudflareConnectionException,
+    CloudflareZoneException,
+)
+
+from homeassistant.components.cloudflare.const import CONF_RECORDS, DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.const import CONF_API_TOKEN, CONF_SOURCE, CONF_ZONE
+from homeassistant.data_entry_flow import (
+    RESULT_TYPE_ABORT,
+    RESULT_TYPE_CREATE_ENTRY,
+    RESULT_TYPE_FORM,
+)
+from homeassistant.setup import async_setup_component
+
+from . import (
+    ENTRY_CONFIG,
+    USER_INPUT,
+    USER_INPUT_RECORDS,
+    USER_INPUT_ZONE,
+    _patch_async_setup,
+    _patch_async_setup_entry,
+)
+
+from tests.common import MockConfigEntry
+
+
+async def test_user_form(hass, cfupdate_flow):
+    """Test we get the user initiated form."""
+    await async_setup_component(hass, "persistent_notification", {})
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={CONF_SOURCE: SOURCE_USER}
+    )
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT,
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["step_id"] == "zone"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT_ZONE,
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["step_id"] == "records"
+    assert result["errors"] == {}
+
+    with _patch_async_setup() as mock_setup, _patch_async_setup_entry() as mock_setup_entry:
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            USER_INPUT_RECORDS,
+        )
+        await hass.async_block_till_done()
+
+    assert result["type"] == RESULT_TYPE_CREATE_ENTRY
+    assert result["title"] == USER_INPUT_ZONE[CONF_ZONE]
+
+    assert result["data"]
+    assert result["data"][CONF_API_TOKEN] == USER_INPUT[CONF_API_TOKEN]
+    assert result["data"][CONF_ZONE] == USER_INPUT_ZONE[CONF_ZONE]
+    assert result["data"][CONF_RECORDS] == USER_INPUT_RECORDS[CONF_RECORDS]
+
+    assert result["result"]
+    assert result["result"].unique_id == USER_INPUT_ZONE[CONF_ZONE]
+
+    assert len(mock_setup.mock_calls) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_user_form_cannot_connect(hass, cfupdate_flow):
+    """Test we handle cannot connect error."""
+    instance = cfupdate_flow.return_value
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={CONF_SOURCE: SOURCE_USER}
+    )
+
+    instance.get_zones.side_effect = CloudflareConnectionException()
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT,
+    )
+
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["errors"] == {"base": "cannot_connect"}
+
+
+async def test_user_form_invalid_auth(hass, cfupdate_flow):
+    """Test we handle invalid auth error."""
+    instance = cfupdate_flow.return_value
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={CONF_SOURCE: SOURCE_USER}
+    )
+
+    instance.get_zones.side_effect = CloudflareAuthenticationException()
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT,
+    )
+
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["errors"] == {"base": "invalid_auth"}
+
+
+async def test_user_form_invalid_zone(hass, cfupdate_flow):
+    """Test we handle invalid zone error."""
+    instance = cfupdate_flow.return_value
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={CONF_SOURCE: SOURCE_USER}
+    )
+
+    instance.get_zones.side_effect = CloudflareZoneException()
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT,
+    )
+
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["errors"] == {"base": "invalid_zone"}
+
+
+async def test_user_form_unexpected_exception(hass, cfupdate_flow):
+    """Test we handle unexpected exception."""
+    instance = cfupdate_flow.return_value
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={CONF_SOURCE: SOURCE_USER}
+    )
+
+    instance.get_zones.side_effect = Exception()
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        USER_INPUT,
+    )
+
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["errors"] == {"base": "unknown"}
+
+
+async def test_user_form_single_instance_allowed(hass):
+    """Test that configuring more than one instance is rejected."""
+    entry = MockConfigEntry(domain=DOMAIN, data=ENTRY_CONFIG)
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={CONF_SOURCE: SOURCE_USER},
+        data=USER_INPUT,
+    )
+    assert result["type"] == RESULT_TYPE_ABORT
+    assert result["reason"] == "single_instance_allowed"
diff --git a/tests/components/cloudflare/test_init.py b/tests/components/cloudflare/test_init.py
new file mode 100644
index 00000000000..1fb4af7f9aa
--- /dev/null
+++ b/tests/components/cloudflare/test_init.py
@@ -0,0 +1,58 @@
+"""Test the Cloudflare integration."""
+from pycfdns.exceptions import CloudflareConnectionException
+
+from homeassistant.components.cloudflare.const import DOMAIN, SERVICE_UPDATE_RECORDS
+from homeassistant.config_entries import (
+    ENTRY_STATE_LOADED,
+    ENTRY_STATE_NOT_LOADED,
+    ENTRY_STATE_SETUP_RETRY,
+)
+
+from . import ENTRY_CONFIG, init_integration
+
+from tests.common import MockConfigEntry
+
+
+async def test_unload_entry(hass, cfupdate):
+    """Test successful unload of entry."""
+    entry = await init_integration(hass)
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert entry.state == ENTRY_STATE_LOADED
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert entry.state == ENTRY_STATE_NOT_LOADED
+    assert not hass.data.get(DOMAIN)
+
+
+async def test_async_setup_raises_entry_not_ready(hass, cfupdate):
+    """Test that it throws ConfigEntryNotReady when exception occurs during setup."""
+    instance = cfupdate.return_value
+
+    entry = MockConfigEntry(domain=DOMAIN, data=ENTRY_CONFIG)
+    entry.add_to_hass(hass)
+
+    instance.get_zone_id.side_effect = CloudflareConnectionException()
+    await hass.config_entries.async_setup(entry.entry_id)
+
+    assert entry.state == ENTRY_STATE_SETUP_RETRY
+
+
+async def test_integration_services(hass, cfupdate):
+    """Test integration services."""
+    instance = cfupdate.return_value
+
+    entry = await init_integration(hass)
+    assert entry.state == ENTRY_STATE_LOADED
+
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_UPDATE_RECORDS,
+        {},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    instance.update_records.assert_called_once()
diff --git a/tests/components/coinmarketcap/test_sensor.py b/tests/components/coinmarketcap/test_sensor.py
index 4d1fb31da95..30fc0f0e1f7 100644
--- a/tests/components/coinmarketcap/test_sensor.py
+++ b/tests/components/coinmarketcap/test_sensor.py
@@ -1,43 +1,42 @@
 """Tests for the CoinMarketCap sensor platform."""
 import json
-import unittest
 
-import homeassistant.components.sensor as sensor
-from homeassistant.setup import setup_component
+import pytest
+
+from homeassistant.components.sensor import DOMAIN
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import assert_setup_component, get_test_home_assistant, load_fixture
+from tests.common import assert_setup_component, load_fixture
 
 VALID_CONFIG = {
-    "platform": "coinmarketcap",
-    "currency_id": 1027,
-    "display_currency": "EUR",
-    "display_currency_decimals": 3,
+    DOMAIN: {
+        "platform": "coinmarketcap",
+        "currency_id": 1027,
+        "display_currency": "EUR",
+        "display_currency_decimals": 3,
+    }
 }
 
 
-class TestCoinMarketCapSensor(unittest.TestCase):
-    """Test the CoinMarketCap sensor."""
+@pytest.fixture
+async def setup_sensor(hass):
+    """Set up demo sensor component."""
+    with assert_setup_component(1, DOMAIN):
+        with patch(
+            "coinmarketcap.Market.ticker",
+            return_value=json.loads(load_fixture("coinmarketcap.json")),
+        ):
+            await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+            await hass.async_block_till_done()
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.config = VALID_CONFIG
-        self.addCleanup(self.hass.stop)
 
-    @patch(
-        "coinmarketcap.Market.ticker",
-        return_value=json.loads(load_fixture("coinmarketcap.json")),
-    )
-    def test_setup(self, mock_request):
-        """Test the setup with custom settings."""
-        with assert_setup_component(1, sensor.DOMAIN):
-            assert setup_component(self.hass, sensor.DOMAIN, {"sensor": VALID_CONFIG})
-            self.hass.block_till_done()
+async def test_setup(hass, setup_sensor):
+    """Test the setup with custom settings."""
+    state = hass.states.get("sensor.ethereum")
+    assert state is not None
 
-        state = self.hass.states.get("sensor.ethereum")
-        assert state is not None
-
-        assert state.state == "493.455"
-        assert state.attributes.get("symbol") == "ETH"
-        assert state.attributes.get("unit_of_measurement") == "EUR"
+    assert state.name == "Ethereum"
+    assert state.state == "493.455"
+    assert state.attributes.get("symbol") == "ETH"
+    assert state.attributes.get("unit_of_measurement") == "EUR"
diff --git a/tests/components/configurator/test_init.py b/tests/components/configurator/test_init.py
index 9d696ab5f86..8d116c30105 100644
--- a/tests/components/configurator/test_init.py
+++ b/tests/components/configurator/test_init.py
@@ -1,117 +1,106 @@
 """The tests for the Configurator component."""
-# pylint: disable=protected-access
-import unittest
 
 import homeassistant.components.configurator as configurator
 from homeassistant.const import ATTR_FRIENDLY_NAME, EVENT_TIME_CHANGED
 
-from tests.common import get_test_home_assistant
+
+async def test_request_least_info(hass):
+    """Test request config with least amount of data."""
+    request_id = configurator.async_request_config(hass, "Test Request", lambda _: None)
+
+    assert 1 == len(
+        hass.services.async_services().get(configurator.DOMAIN, [])
+    ), "No new service registered"
+
+    states = hass.states.async_all()
+
+    assert 1 == len(states), "Expected a new state registered"
+
+    state = states[0]
+
+    assert configurator.STATE_CONFIGURE == state.state
+    assert request_id == state.attributes.get(configurator.ATTR_CONFIGURE_ID)
 
 
-class TestConfigurator(unittest.TestCase):
-    """Test the Configurator component."""
-
-    # pylint: disable=invalid-name
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
-
-    def test_request_least_info(self):
-        """Test request config with least amount of data."""
-        request_id = configurator.request_config(
-            self.hass, "Test Request", lambda _: None
-        )
-
-        assert 1 == len(
-            self.hass.services.services.get(configurator.DOMAIN, [])
-        ), "No new service registered"
-
-        states = self.hass.states.all()
-
-        assert 1 == len(states), "Expected a new state registered"
-
-        state = states[0]
-
-        assert configurator.STATE_CONFIGURE == state.state
-        assert request_id == state.attributes.get(configurator.ATTR_CONFIGURE_ID)
-
-    def test_request_all_info(self):
-        """Test request config with all possible info."""
-        exp_attr = {
-            ATTR_FRIENDLY_NAME: "Test Request",
-            configurator.ATTR_DESCRIPTION: """config description
+async def test_request_all_info(hass):
+    """Test request config with all possible info."""
+    exp_attr = {
+        ATTR_FRIENDLY_NAME: "Test Request",
+        configurator.ATTR_DESCRIPTION: """config description
 
 [link name](link url)
 
 ![Description image](config image url)""",
-            configurator.ATTR_SUBMIT_CAPTION: "config submit caption",
-            configurator.ATTR_FIELDS: [],
-            configurator.ATTR_ENTITY_PICTURE: "config entity picture",
-            configurator.ATTR_CONFIGURE_ID: configurator.request_config(
-                self.hass,
-                name="Test Request",
-                callback=lambda _: None,
-                description="config description",
-                description_image="config image url",
-                submit_caption="config submit caption",
-                fields=None,
-                link_name="link name",
-                link_url="link url",
-                entity_picture="config entity picture",
-            ),
-        }
+        configurator.ATTR_SUBMIT_CAPTION: "config submit caption",
+        configurator.ATTR_FIELDS: [],
+        configurator.ATTR_ENTITY_PICTURE: "config entity picture",
+        configurator.ATTR_CONFIGURE_ID: configurator.async_request_config(
+            hass,
+            name="Test Request",
+            callback=lambda _: None,
+            description="config description",
+            description_image="config image url",
+            submit_caption="config submit caption",
+            fields=None,
+            link_name="link name",
+            link_url="link url",
+            entity_picture="config entity picture",
+        ),
+    }
 
-        states = self.hass.states.all()
-        assert 1 == len(states)
-        state = states[0]
+    states = hass.states.async_all()
+    assert 1 == len(states)
+    state = states[0]
 
-        assert configurator.STATE_CONFIGURE == state.state
-        assert exp_attr == state.attributes
+    assert configurator.STATE_CONFIGURE == state.state
+    assert exp_attr == state.attributes
 
-    def test_callback_called_on_configure(self):
-        """Test if our callback gets called when configure service called."""
-        calls = []
-        request_id = configurator.request_config(
-            self.hass, "Test Request", lambda _: calls.append(1)
-        )
 
-        self.hass.services.call(
-            configurator.DOMAIN,
-            configurator.SERVICE_CONFIGURE,
-            {configurator.ATTR_CONFIGURE_ID: request_id},
-        )
+async def test_callback_called_on_configure(hass):
+    """Test if our callback gets called when configure service called."""
+    calls = []
+    request_id = configurator.async_request_config(
+        hass, "Test Request", lambda _: calls.append(1)
+    )
 
-        self.hass.block_till_done()
-        assert 1 == len(calls), "Callback not called"
+    await hass.services.async_call(
+        configurator.DOMAIN,
+        configurator.SERVICE_CONFIGURE,
+        {configurator.ATTR_CONFIGURE_ID: request_id},
+    )
 
-    def test_state_change_on_notify_errors(self):
-        """Test state change on notify errors."""
-        request_id = configurator.request_config(
-            self.hass, "Test Request", lambda _: None
-        )
-        error = "Oh no bad bad bad"
-        configurator.notify_errors(self.hass, request_id, error)
+    await hass.async_block_till_done()
+    assert 1 == len(calls), "Callback not called"
 
-        state = self.hass.states.all()[0]
-        assert error == state.attributes.get(configurator.ATTR_ERRORS)
 
-    def test_notify_errors_fail_silently_on_bad_request_id(self):
-        """Test if notify errors fails silently with a bad request id."""
-        configurator.notify_errors(self.hass, 2015, "Try this error")
+async def test_state_change_on_notify_errors(hass):
+    """Test state change on notify errors."""
+    request_id = configurator.async_request_config(hass, "Test Request", lambda _: None)
+    error = "Oh no bad bad bad"
+    configurator.async_notify_errors(hass, request_id, error)
 
-    def test_request_done_works(self):
-        """Test if calling request done works."""
-        request_id = configurator.request_config(
-            self.hass, "Test Request", lambda _: None
-        )
-        configurator.request_done(self.hass, request_id)
-        assert 1 == len(self.hass.states.all())
+    states = hass.states.async_all()
+    assert 1 == len(states)
+    state = states[0]
+    assert error == state.attributes.get(configurator.ATTR_ERRORS)
 
-        self.hass.bus.fire(EVENT_TIME_CHANGED)
-        self.hass.block_till_done()
-        assert 0 == len(self.hass.states.all())
 
-    def test_request_done_fail_silently_on_bad_request_id(self):
-        """Test that request_done fails silently with a bad request id."""
-        configurator.request_done(self.hass, 2016)
+async def test_notify_errors_fail_silently_on_bad_request_id(hass):
+    """Test if notify errors fails silently with a bad request id."""
+    configurator.async_notify_errors(hass, 2015, "Try this error")
+
+
+async def test_request_done_works(hass):
+    """Test if calling request done works."""
+    request_id = configurator.async_request_config(hass, "Test Request", lambda _: None)
+    configurator.async_request_done(hass, request_id)
+    assert 1 == len(hass.states.async_all())
+
+    hass.bus.async_fire(EVENT_TIME_CHANGED)
+    await hass.async_block_till_done()
+    assert 0 == len(hass.states.async_all())
+
+
+async def test_request_done_fail_silently_on_bad_request_id(hass):
+    """Test that request_done fails silently with a bad request id."""
+    configurator.async_request_done(hass, 2016)
diff --git a/tests/components/coolmaster/test_config_flow.py b/tests/components/coolmaster/test_config_flow.py
index fc296a53ddf..b758a37db1d 100644
--- a/tests/components/coolmaster/test_config_flow.py
+++ b/tests/components/coolmaster/test_config_flow.py
@@ -60,7 +60,7 @@ async def test_form_timeout(hass):
         )
 
     assert result2["type"] == "form"
-    assert result2["errors"] == {"base": "connection_error"}
+    assert result2["errors"] == {"base": "cannot_connect"}
 
 
 async def test_form_connection_refused(hass):
@@ -78,7 +78,7 @@ async def test_form_connection_refused(hass):
         )
 
     assert result2["type"] == "form"
-    assert result2["errors"] == {"base": "connection_error"}
+    assert result2["errors"] == {"base": "cannot_connect"}
 
 
 async def test_form_no_units(hass):
diff --git a/tests/components/daikin/test_config_flow.py b/tests/components/daikin/test_config_flow.py
index 324c73dfb81..3e4ddb6d3fd 100644
--- a/tests/components/daikin/test_config_flow.py
+++ b/tests/components/daikin/test_config_flow.py
@@ -109,10 +109,10 @@ async def test_import(hass, mock_daikin):
 @pytest.mark.parametrize(
     "s_effect,reason",
     [
-        (asyncio.TimeoutError, "device_timeout"),
-        (HTTPForbidden, "forbidden"),
-        (ClientError, "device_fail"),
-        (Exception, "device_fail"),
+        (asyncio.TimeoutError, "cannot_connect"),
+        (HTTPForbidden, "invalid_auth"),
+        (ClientError, "unknown"),
+        (Exception, "unknown"),
     ],
 )
 async def test_device_abort(hass, mock_daikin, s_effect, reason):
diff --git a/tests/components/datadog/test_init.py b/tests/components/datadog/test_init.py
index 06788728115..f46ad027442 100644
--- a/tests/components/datadog/test_init.py
+++ b/tests/components/datadog/test_init.py
@@ -1,5 +1,4 @@
 """The tests for the Datadog component."""
-import unittest
 from unittest import mock
 
 import homeassistant.components.datadog as datadog
@@ -10,59 +9,47 @@ from homeassistant.const import (
     STATE_ON,
 )
 import homeassistant.core as ha
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
-from tests.common import assert_setup_component, get_test_home_assistant
+from tests.async_mock import MagicMock, patch
+from tests.common import assert_setup_component
 
 
-class TestDatadog(unittest.TestCase):
-    """Test the Datadog component."""
-
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_invalid_config(self):
-        """Test invalid configuration."""
-        with assert_setup_component(0):
-            assert not setup_component(
-                self.hass, datadog.DOMAIN, {datadog.DOMAIN: {"host1": "host1"}}
-            )
-
-    @mock.patch("homeassistant.components.datadog.statsd")
-    @mock.patch("homeassistant.components.datadog.initialize")
-    def test_datadog_setup_full(self, mock_connection, mock_client):
-        """Test setup with all data."""
-        self.hass.bus.listen = mock.MagicMock()
-
-        assert setup_component(
-            self.hass,
-            datadog.DOMAIN,
-            {datadog.DOMAIN: {"host": "host", "port": 123, "rate": 1, "prefix": "foo"}},
+async def test_invalid_config(hass):
+    """Test invalid configuration."""
+    with assert_setup_component(0):
+        assert not await async_setup_component(
+            hass, datadog.DOMAIN, {datadog.DOMAIN: {"host1": "host1"}}
         )
 
-        assert mock_connection.call_count == 1
-        assert mock_connection.call_args == mock.call(
-            statsd_host="host", statsd_port=123
-        )
 
-        assert self.hass.bus.listen.called
-        assert EVENT_LOGBOOK_ENTRY == self.hass.bus.listen.call_args_list[0][0][0]
-        assert EVENT_STATE_CHANGED == self.hass.bus.listen.call_args_list[1][0][0]
+async def test_datadog_setup_full(hass):
+    """Test setup with all data."""
+    config = {datadog.DOMAIN: {"host": "host", "port": 123, "rate": 1, "prefix": "foo"}}
+    hass.bus.listen = MagicMock()
 
-    @mock.patch("homeassistant.components.datadog.statsd")
-    @mock.patch("homeassistant.components.datadog.initialize")
-    def test_datadog_setup_defaults(self, mock_connection, mock_client):
-        """Test setup with defaults."""
-        self.hass.bus.listen = mock.MagicMock()
+    with patch("homeassistant.components.datadog.initialize") as mock_init, patch(
+        "homeassistant.components.datadog.statsd"
+    ):
+        assert await async_setup_component(hass, datadog.DOMAIN, config)
 
-        assert setup_component(
-            self.hass,
+        assert mock_init.call_count == 1
+        assert mock_init.call_args == mock.call(statsd_host="host", statsd_port=123)
+
+    assert hass.bus.listen.called
+    assert EVENT_LOGBOOK_ENTRY == hass.bus.listen.call_args_list[0][0][0]
+    assert EVENT_STATE_CHANGED == hass.bus.listen.call_args_list[1][0][0]
+
+
+async def test_datadog_setup_defaults(hass):
+    """Test setup with defaults."""
+    hass.bus.listen = mock.MagicMock()
+
+    with patch("homeassistant.components.datadog.initialize") as mock_init, patch(
+        "homeassistant.components.datadog.statsd"
+    ):
+        assert await async_setup_component(
+            hass,
             datadog.DOMAIN,
             {
                 datadog.DOMAIN: {
@@ -73,26 +60,26 @@ class TestDatadog(unittest.TestCase):
             },
         )
 
-        assert mock_connection.call_count == 1
-        assert mock_connection.call_args == mock.call(
-            statsd_host="host", statsd_port=8125
-        )
-        assert self.hass.bus.listen.called
+        assert mock_init.call_count == 1
+        assert mock_init.call_args == mock.call(statsd_host="host", statsd_port=8125)
+    assert hass.bus.listen.called
 
-    @mock.patch("homeassistant.components.datadog.statsd")
-    @mock.patch("homeassistant.components.datadog.initialize")
-    def test_logbook_entry(self, mock_connection, mock_client):
-        """Test event listener."""
-        self.hass.bus.listen = mock.MagicMock()
 
-        assert setup_component(
-            self.hass,
+async def test_logbook_entry(hass):
+    """Test event listener."""
+    hass.bus.listen = mock.MagicMock()
+
+    with patch("homeassistant.components.datadog.initialize"), patch(
+        "homeassistant.components.datadog.statsd"
+    ) as mock_statsd:
+        assert await async_setup_component(
+            hass,
             datadog.DOMAIN,
             {datadog.DOMAIN: {"host": "host", "rate": datadog.DEFAULT_RATE}},
         )
 
-        assert self.hass.bus.listen.called
-        handler_method = self.hass.bus.listen.call_args_list[0][0][1]
+        assert hass.bus.listen.called
+        handler_method = hass.bus.listen.call_args_list[0][0][1]
 
         event = {
             "domain": "automation",
@@ -102,23 +89,25 @@ class TestDatadog(unittest.TestCase):
         }
         handler_method(mock.MagicMock(data=event))
 
-        assert mock_client.event.call_count == 1
-        assert mock_client.event.call_args == mock.call(
+        assert mock_statsd.event.call_count == 1
+        assert mock_statsd.event.call_args == mock.call(
             title="Home Assistant",
             text="%%% \n **{}** {} \n %%%".format(event["name"], event["message"]),
             tags=["entity:sensor.foo.bar", "domain:automation"],
         )
 
-        mock_client.event.reset_mock()
+        mock_statsd.event.reset_mock()
 
-    @mock.patch("homeassistant.components.datadog.statsd")
-    @mock.patch("homeassistant.components.datadog.initialize")
-    def test_state_changed(self, mock_connection, mock_client):
-        """Test event listener."""
-        self.hass.bus.listen = mock.MagicMock()
 
-        assert setup_component(
-            self.hass,
+async def test_state_changed(hass):
+    """Test event listener."""
+    hass.bus.listen = mock.MagicMock()
+
+    with patch("homeassistant.components.datadog.initialize"), patch(
+        "homeassistant.components.datadog.statsd"
+    ) as mock_statsd:
+        assert await async_setup_component(
+            hass,
             datadog.DOMAIN,
             {
                 datadog.DOMAIN: {
@@ -129,8 +118,8 @@ class TestDatadog(unittest.TestCase):
             },
         )
 
-        assert self.hass.bus.listen.called
-        handler_method = self.hass.bus.listen.call_args_list[1][0][1]
+        assert hass.bus.listen.called
+        handler_method = hass.bus.listen.call_args_list[1][0][1]
 
         valid = {"1": 1, "1.0": 1.0, STATE_ON: 1, STATE_OFF: 0}
 
@@ -145,11 +134,11 @@ class TestDatadog(unittest.TestCase):
             )
             handler_method(mock.MagicMock(data={"new_state": state}))
 
-            assert mock_client.gauge.call_count == 5
+            assert mock_statsd.gauge.call_count == 5
 
             for attribute, value in attributes.items():
                 value = int(value) if isinstance(value, bool) else value
-                mock_client.gauge.assert_has_calls(
+                mock_statsd.gauge.assert_has_calls(
                     [
                         mock.call(
                             f"ha.sensor.{attribute}",
@@ -160,17 +149,17 @@ class TestDatadog(unittest.TestCase):
                     ]
                 )
 
-            assert mock_client.gauge.call_args == mock.call(
+            assert mock_statsd.gauge.call_args == mock.call(
                 "ha.sensor",
                 out,
                 sample_rate=1,
                 tags=[f"entity:{state.entity_id}"],
             )
 
-            mock_client.gauge.reset_mock()
+            mock_statsd.gauge.reset_mock()
 
         for invalid in ("foo", "", object):
             handler_method(
                 mock.MagicMock(data={"new_state": ha.State("domain.test", invalid, {})})
             )
-            assert not mock_client.gauge.called
+            assert not mock_statsd.gauge.called
diff --git a/tests/components/deconz/test_binary_sensor.py b/tests/components/deconz/test_binary_sensor.py
index 8a93c8a5cdb..5872aee1bf1 100644
--- a/tests/components/deconz/test_binary_sensor.py
+++ b/tests/components/deconz/test_binary_sensor.py
@@ -1,12 +1,19 @@
 """deCONZ binary sensor platform tests."""
+
 from copy import deepcopy
 
-from homeassistant.components import deconz
-import homeassistant.components.binary_sensor as binary_sensor
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASS_MOTION,
     DEVICE_CLASS_VIBRATION,
+    DOMAIN as BINARY_SENSOR_DOMAIN,
 )
+from homeassistant.components.deconz.const import (
+    CONF_ALLOW_CLIP_SENSOR,
+    CONF_ALLOW_NEW_DEVICES,
+    DOMAIN as DECONZ_DOMAIN,
+)
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.helpers.entity_registry import async_entries_for_config_entry
 from homeassistant.setup import async_setup_component
 
@@ -57,17 +64,16 @@ async def test_platform_manually_configured(hass):
     """Test that we do not discover anything or try to set up a gateway."""
     assert (
         await async_setup_component(
-            hass, binary_sensor.DOMAIN, {"binary_sensor": {"platform": deconz.DOMAIN}}
+            hass, BINARY_SENSOR_DOMAIN, {"binary_sensor": {"platform": DECONZ_DOMAIN}}
         )
         is True
     )
-    assert deconz.DOMAIN not in hass.data
+    assert DECONZ_DOMAIN not in hass.data
 
 
 async def test_no_binary_sensors(hass):
     """Test that no sensors in deconz results in no sensor entities."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    await setup_deconz_integration(hass)
     assert len(hass.states.async_all()) == 0
 
 
@@ -75,25 +81,17 @@ async def test_binary_sensors(hass):
     """Test successful creation of binary sensor entities."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
-    assert "binary_sensor.presence_sensor" in gateway.deconz_ids
-    assert "binary_sensor.temperature_sensor" not in gateway.deconz_ids
-    assert "binary_sensor.clip_presence_sensor" not in gateway.deconz_ids
-    assert "binary_sensor.vibration_sensor" in gateway.deconz_ids
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+
     assert len(hass.states.async_all()) == 3
-
     presence_sensor = hass.states.get("binary_sensor.presence_sensor")
-    assert presence_sensor.state == "off"
+    assert presence_sensor.state == STATE_OFF
     assert presence_sensor.attributes["device_class"] == DEVICE_CLASS_MOTION
-
-    temperature_sensor = hass.states.get("binary_sensor.temperature_sensor")
-    assert temperature_sensor is None
-
-    clip_presence_sensor = hass.states.get("binary_sensor.clip_presence_sensor")
-    assert clip_presence_sensor is None
-
+    assert hass.states.get("binary_sensor.temperature_sensor") is None
+    assert hass.states.get("binary_sensor.clip_presence_sensor") is None
     vibration_sensor = hass.states.get("binary_sensor.vibration_sensor")
-    assert vibration_sensor.state == "on"
+    assert vibration_sensor.state == STATE_ON
     assert vibration_sensor.attributes["device_class"] == DEVICE_CLASS_VIBRATION
 
     state_changed_event = {
@@ -106,10 +104,9 @@ async def test_binary_sensors(hass):
     gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
-    presence_sensor = hass.states.get("binary_sensor.presence_sensor")
-    assert presence_sensor.state == "on"
+    assert hass.states.get("binary_sensor.presence_sensor").state == STATE_ON
 
-    await gateway.async_reset()
+    await hass.config_entries.async_unload(config_entry.entry_id)
 
     assert len(hass.states.async_all()) == 0
 
@@ -118,56 +115,44 @@ async def test_allow_clip_sensor(hass):
     """Test that CLIP sensors can be allowed."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(
+    config_entry = await setup_deconz_integration(
         hass,
-        options={deconz.gateway.CONF_ALLOW_CLIP_SENSOR: True},
+        options={CONF_ALLOW_CLIP_SENSOR: True},
         get_state_response=data,
     )
-    assert "binary_sensor.presence_sensor" in gateway.deconz_ids
-    assert "binary_sensor.temperature_sensor" not in gateway.deconz_ids
-    assert "binary_sensor.clip_presence_sensor" in gateway.deconz_ids
-    assert "binary_sensor.vibration_sensor" in gateway.deconz_ids
+
     assert len(hass.states.async_all()) == 4
+    assert hass.states.get("binary_sensor.presence_sensor").state == STATE_OFF
+    assert hass.states.get("binary_sensor.temperature_sensor") is None
+    assert hass.states.get("binary_sensor.clip_presence_sensor").state == STATE_OFF
+    assert hass.states.get("binary_sensor.vibration_sensor").state == STATE_ON
 
-    presence_sensor = hass.states.get("binary_sensor.presence_sensor")
-    assert presence_sensor.state == "off"
-
-    temperature_sensor = hass.states.get("binary_sensor.temperature_sensor")
-    assert temperature_sensor is None
-
-    clip_presence_sensor = hass.states.get("binary_sensor.clip_presence_sensor")
-    assert clip_presence_sensor.state == "off"
-
-    vibration_sensor = hass.states.get("binary_sensor.vibration_sensor")
-    assert vibration_sensor.state == "on"
+    # Disallow clip sensors
 
     hass.config_entries.async_update_entry(
-        gateway.config_entry, options={deconz.gateway.CONF_ALLOW_CLIP_SENSOR: False}
+        config_entry, options={CONF_ALLOW_CLIP_SENSOR: False}
     )
     await hass.async_block_till_done()
 
-    assert "binary_sensor.presence_sensor" in gateway.deconz_ids
-    assert "binary_sensor.temperature_sensor" not in gateway.deconz_ids
-    assert "binary_sensor.clip_presence_sensor" not in gateway.deconz_ids
-    assert "binary_sensor.vibration_sensor" in gateway.deconz_ids
     assert len(hass.states.async_all()) == 3
+    assert hass.states.get("binary_sensor.clip_presence_sensor") is None
+
+    # Allow clip sensors
 
     hass.config_entries.async_update_entry(
-        gateway.config_entry, options={deconz.gateway.CONF_ALLOW_CLIP_SENSOR: True}
+        config_entry, options={CONF_ALLOW_CLIP_SENSOR: True}
     )
     await hass.async_block_till_done()
 
-    assert "binary_sensor.presence_sensor" in gateway.deconz_ids
-    assert "binary_sensor.temperature_sensor" not in gateway.deconz_ids
-    assert "binary_sensor.clip_presence_sensor" in gateway.deconz_ids
-    assert "binary_sensor.vibration_sensor" in gateway.deconz_ids
     assert len(hass.states.async_all()) == 4
+    assert hass.states.get("binary_sensor.clip_presence_sensor").state == STATE_OFF
 
 
 async def test_add_new_binary_sensor(hass):
     """Test that adding a new binary sensor works."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+    assert len(hass.states.async_all()) == 0
 
     state_added_event = {
         "t": "event",
@@ -179,18 +164,17 @@ async def test_add_new_binary_sensor(hass):
     gateway.api.event_handler(state_added_event)
     await hass.async_block_till_done()
 
-    assert "binary_sensor.presence_sensor" in gateway.deconz_ids
-
-    presence_sensor = hass.states.get("binary_sensor.presence_sensor")
-    assert presence_sensor.state == "off"
+    assert len(hass.states.async_all()) == 1
+    assert hass.states.get("binary_sensor.presence_sensor").state == STATE_OFF
 
 
 async def test_add_new_binary_sensor_ignored(hass):
     """Test that adding a new binary sensor is not allowed."""
-    gateway = await setup_deconz_integration(
+    config_entry = await setup_deconz_integration(
         hass,
-        options={deconz.gateway.CONF_ALLOW_NEW_DEVICES: False},
+        options={CONF_ALLOW_NEW_DEVICES: False},
     )
+    gateway = get_gateway_from_config_entry(hass, config_entry)
     assert len(hass.states.async_all()) == 0
 
     state_added_event = {
@@ -207,10 +191,5 @@ async def test_add_new_binary_sensor_ignored(hass):
 
     entity_registry = await hass.helpers.entity_registry.async_get_registry()
     assert (
-        len(
-            async_entries_for_config_entry(
-                entity_registry, gateway.config_entry.entry_id
-            )
-        )
-        == 0
+        len(async_entries_for_config_entry(entity_registry, config_entry.entry_id)) == 0
     )
diff --git a/tests/components/deconz/test_climate.py b/tests/components/deconz/test_climate.py
index ddc89295cba..5d2e6d614a3 100644
--- a/tests/components/deconz/test_climate.py
+++ b/tests/components/deconz/test_climate.py
@@ -1,8 +1,29 @@
 """deCONZ climate platform tests."""
+
 from copy import deepcopy
 
-from homeassistant.components import deconz
-import homeassistant.components.climate as climate
+import pytest
+
+from homeassistant.components.climate import (
+    DOMAIN as CLIMATE_DOMAIN,
+    SERVICE_SET_HVAC_MODE,
+    SERVICE_SET_TEMPERATURE,
+)
+from homeassistant.components.climate.const import (
+    ATTR_HVAC_MODE,
+    ATTR_TARGET_TEMP_HIGH,
+    ATTR_TARGET_TEMP_LOW,
+    HVAC_MODE_AUTO,
+    HVAC_MODE_COOL,
+    HVAC_MODE_HEAT,
+    HVAC_MODE_OFF,
+)
+from homeassistant.components.deconz.const import (
+    CONF_ALLOW_CLIP_SENSOR,
+    DOMAIN as DECONZ_DOMAIN,
+)
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE, STATE_OFF
 from homeassistant.setup import async_setup_component
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
@@ -25,14 +46,6 @@ SENSORS = {
         "uniqueid": "00:00:00:00:00:00:00:00-00",
     },
     "2": {
-        "id": "Presence sensor id",
-        "name": "Presence sensor",
-        "type": "ZHAPresence",
-        "state": {"presence": False},
-        "config": {"reachable": True},
-        "uniqueid": "00:00:00:00:00:00:00:01-00",
-    },
-    "3": {
         "id": "CLIP thermostat id",
         "name": "CLIP thermostat",
         "type": "CLIPThermostat",
@@ -47,17 +60,16 @@ async def test_platform_manually_configured(hass):
     """Test that we do not discover anything or try to set up a gateway."""
     assert (
         await async_setup_component(
-            hass, climate.DOMAIN, {"climate": {"platform": deconz.DOMAIN}}
+            hass, CLIMATE_DOMAIN, {"climate": {"platform": DECONZ_DOMAIN}}
         )
         is True
     )
-    assert deconz.DOMAIN not in hass.data
+    assert DECONZ_DOMAIN not in hass.data
 
 
 async def test_no_sensors(hass):
     """Test that no sensors in deconz results in no climate entities."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    await setup_deconz_integration(hass)
     assert len(hass.states.async_all()) == 0
 
 
@@ -65,28 +77,17 @@ async def test_climate_devices(hass):
     """Test successful creation of sensor entities."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
-    assert "climate.thermostat" in gateway.deconz_ids
-    assert "sensor.thermostat" not in gateway.deconz_ids
-    assert "sensor.thermostat_battery_level" in gateway.deconz_ids
-    assert "climate.presence_sensor" not in gateway.deconz_ids
-    assert "climate.clip_thermostat" not in gateway.deconz_ids
-    assert len(hass.states.async_all()) == 3
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
-    thermostat = hass.states.get("climate.thermostat")
-    assert thermostat.state == "auto"
+    assert len(hass.states.async_all()) == 2
+    assert hass.states.get("climate.thermostat").state == HVAC_MODE_AUTO
+    assert hass.states.get("sensor.thermostat") is None
+    assert hass.states.get("sensor.thermostat_battery_level").state == "100"
+    assert hass.states.get("climate.presence_sensor") is None
+    assert hass.states.get("climate.clip_thermostat") is None
 
-    thermostat = hass.states.get("sensor.thermostat")
-    assert thermostat is None
-
-    thermostat_battery_level = hass.states.get("sensor.thermostat_battery_level")
-    assert thermostat_battery_level.state == "100"
-
-    presence_sensor = hass.states.get("climate.presence_sensor")
-    assert presence_sensor is None
-
-    clip_thermostat = hass.states.get("climate.clip_thermostat")
-    assert clip_thermostat is None
+    # Event signals thermostat configured off
 
     state_changed_event = {
         "t": "event",
@@ -98,8 +99,9 @@ async def test_climate_devices(hass):
     gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
-    thermostat = hass.states.get("climate.thermostat")
-    assert thermostat.state == "off"
+    assert hass.states.get("climate.thermostat").state == STATE_OFF
+
+    # Event signals thermostat state on
 
     state_changed_event = {
         "t": "event",
@@ -112,8 +114,9 @@ async def test_climate_devices(hass):
     gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
-    thermostat = hass.states.get("climate.thermostat")
-    assert thermostat.state == "heat"
+    assert hass.states.get("climate.thermostat").state == HVAC_MODE_HEAT
+
+    # Event signals thermostat state off
 
     state_changed_event = {
         "t": "event",
@@ -125,18 +128,19 @@ async def test_climate_devices(hass):
     gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
-    thermostat = hass.states.get("climate.thermostat")
-    assert thermostat.state == "off"
+    assert hass.states.get("climate.thermostat").state == STATE_OFF
 
     # Verify service calls
 
     thermostat_device = gateway.api.sensors["1"]
 
+    # Service set HVAC mode to auto
+
     with patch.object(thermostat_device, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            climate.DOMAIN,
-            climate.SERVICE_SET_HVAC_MODE,
-            {"entity_id": "climate.thermostat", "hvac_mode": "auto"},
+            CLIMATE_DOMAIN,
+            SERVICE_SET_HVAC_MODE,
+            {ATTR_ENTITY_ID: "climate.thermostat", ATTR_HVAC_MODE: HVAC_MODE_AUTO},
             blocking=True,
         )
         await hass.async_block_till_done()
@@ -144,11 +148,13 @@ async def test_climate_devices(hass):
             "put", "/sensors/1/config", json={"mode": "auto"}
         )
 
+    # Service set HVAC mode to heat
+
     with patch.object(thermostat_device, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            climate.DOMAIN,
-            climate.SERVICE_SET_HVAC_MODE,
-            {"entity_id": "climate.thermostat", "hvac_mode": "heat"},
+            CLIMATE_DOMAIN,
+            SERVICE_SET_HVAC_MODE,
+            {ATTR_ENTITY_ID: "climate.thermostat", ATTR_HVAC_MODE: HVAC_MODE_HEAT},
             blocking=True,
         )
         await hass.async_block_till_done()
@@ -156,29 +162,61 @@ async def test_climate_devices(hass):
             "put", "/sensors/1/config", json={"mode": "heat"}
         )
 
+    # Service set HVAC mode to off
+
     with patch.object(thermostat_device, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            climate.DOMAIN,
-            climate.SERVICE_SET_HVAC_MODE,
-            {"entity_id": "climate.thermostat", "hvac_mode": "off"},
+            CLIMATE_DOMAIN,
+            SERVICE_SET_HVAC_MODE,
+            {ATTR_ENTITY_ID: "climate.thermostat", ATTR_HVAC_MODE: HVAC_MODE_OFF},
             blocking=True,
         )
         set_callback.assert_called_with(
             "put", "/sensors/1/config", json={"mode": "off"}
         )
 
+    # Service set HVAC mode to unsupported value
+
+    with patch.object(
+        thermostat_device, "_request", return_value=True
+    ) as set_callback, pytest.raises(ValueError):
+        await hass.services.async_call(
+            CLIMATE_DOMAIN,
+            SERVICE_SET_HVAC_MODE,
+            {ATTR_ENTITY_ID: "climate.thermostat", ATTR_HVAC_MODE: HVAC_MODE_COOL},
+            blocking=True,
+        )
+
+    # Service set temperature to 20
+
     with patch.object(thermostat_device, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            climate.DOMAIN,
-            climate.SERVICE_SET_TEMPERATURE,
-            {"entity_id": "climate.thermostat", "temperature": 20},
+            CLIMATE_DOMAIN,
+            SERVICE_SET_TEMPERATURE,
+            {ATTR_ENTITY_ID: "climate.thermostat", ATTR_TEMPERATURE: 20},
             blocking=True,
         )
         set_callback.assert_called_with(
             "put", "/sensors/1/config", json={"heatsetpoint": 2000.0}
         )
 
-    await gateway.async_reset()
+    # Service set temperature without providing temperature attribute
+
+    with patch.object(
+        thermostat_device, "_request", return_value=True
+    ) as set_callback, pytest.raises(ValueError):
+        await hass.services.async_call(
+            CLIMATE_DOMAIN,
+            SERVICE_SET_TEMPERATURE,
+            {
+                ATTR_ENTITY_ID: "climate.thermostat",
+                ATTR_TARGET_TEMP_HIGH: 30,
+                ATTR_TARGET_TEMP_LOW: 10,
+            },
+            blocking=True,
+        )
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
 
     assert len(hass.states.async_all()) == 0
 
@@ -187,67 +225,47 @@ async def test_clip_climate_device(hass):
     """Test successful creation of sensor entities."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(
+    config_entry = await setup_deconz_integration(
         hass,
-        options={deconz.gateway.CONF_ALLOW_CLIP_SENSOR: True},
+        options={CONF_ALLOW_CLIP_SENSOR: True},
         get_state_response=data,
     )
-    assert "climate.thermostat" in gateway.deconz_ids
-    assert "sensor.thermostat" not in gateway.deconz_ids
-    assert "sensor.thermostat_battery_level" in gateway.deconz_ids
-    assert "climate.presence_sensor" not in gateway.deconz_ids
-    assert "climate.clip_thermostat" in gateway.deconz_ids
-    assert len(hass.states.async_all()) == 4
 
-    thermostat = hass.states.get("climate.thermostat")
-    assert thermostat.state == "auto"
-
-    thermostat = hass.states.get("sensor.thermostat")
-    assert thermostat is None
-
-    thermostat_battery_level = hass.states.get("sensor.thermostat_battery_level")
-    assert thermostat_battery_level.state == "100"
-
-    presence_sensor = hass.states.get("climate.presence_sensor")
-    assert presence_sensor is None
-
-    clip_thermostat = hass.states.get("climate.clip_thermostat")
-    assert clip_thermostat.state == "heat"
-
-    hass.config_entries.async_update_entry(
-        gateway.config_entry, options={deconz.gateway.CONF_ALLOW_CLIP_SENSOR: False}
-    )
-    await hass.async_block_till_done()
-
-    assert "climate.thermostat" in gateway.deconz_ids
-    assert "sensor.thermostat" not in gateway.deconz_ids
-    assert "sensor.thermostat_battery_level" in gateway.deconz_ids
-    assert "climate.presence_sensor" not in gateway.deconz_ids
-    assert "climate.clip_thermostat" not in gateway.deconz_ids
     assert len(hass.states.async_all()) == 3
+    assert hass.states.get("climate.thermostat").state == HVAC_MODE_AUTO
+    assert hass.states.get("sensor.thermostat") is None
+    assert hass.states.get("sensor.thermostat_battery_level").state == "100"
+    assert hass.states.get("climate.clip_thermostat").state == HVAC_MODE_HEAT
+
+    # Disallow clip sensors
 
     hass.config_entries.async_update_entry(
-        gateway.config_entry, options={deconz.gateway.CONF_ALLOW_CLIP_SENSOR: True}
+        config_entry, options={CONF_ALLOW_CLIP_SENSOR: False}
     )
     await hass.async_block_till_done()
 
-    assert "climate.thermostat" in gateway.deconz_ids
-    assert "sensor.thermostat" not in gateway.deconz_ids
-    assert "sensor.thermostat_battery_level" in gateway.deconz_ids
-    assert "climate.presence_sensor" not in gateway.deconz_ids
-    assert "climate.clip_thermostat" in gateway.deconz_ids
-    assert len(hass.states.async_all()) == 4
+    assert len(hass.states.async_all()) == 2
+    assert hass.states.get("climate.clip_thermostat") is None
+
+    # Allow clip sensors
+
+    hass.config_entries.async_update_entry(
+        config_entry, options={CONF_ALLOW_CLIP_SENSOR: True}
+    )
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 3
+    assert hass.states.get("climate.clip_thermostat").state == HVAC_MODE_HEAT
 
 
 async def test_verify_state_update(hass):
     """Test that state update properly."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
-    assert "climate.thermostat" in gateway.deconz_ids
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
-    thermostat = hass.states.get("climate.thermostat")
-    assert thermostat.state == "auto"
+    assert hass.states.get("climate.thermostat").state == HVAC_MODE_AUTO
 
     state_changed_event = {
         "t": "event",
@@ -259,15 +277,15 @@ async def test_verify_state_update(hass):
     gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
-    thermostat = hass.states.get("climate.thermostat")
-    assert thermostat.state == "auto"
+    assert hass.states.get("climate.thermostat").state == HVAC_MODE_AUTO
     assert gateway.api.sensors["1"].changed_keys == {"state", "r", "t", "on", "e", "id"}
 
 
 async def test_add_new_climate_device(hass):
     """Test that adding a new climate device works."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+    assert len(hass.states.async_all()) == 0
 
     state_added_event = {
         "t": "event",
@@ -279,7 +297,6 @@ async def test_add_new_climate_device(hass):
     gateway.api.event_handler(state_added_event)
     await hass.async_block_till_done()
 
-    assert "climate.thermostat" in gateway.deconz_ids
-
-    thermostat = hass.states.get("climate.thermostat")
-    assert thermostat.state == "auto"
+    assert len(hass.states.async_all()) == 2
+    assert hass.states.get("climate.thermostat").state == HVAC_MODE_AUTO
+    assert hass.states.get("sensor.thermostat_battery_level").state == "100"
diff --git a/tests/components/deconz/test_config_flow.py b/tests/components/deconz/test_config_flow.py
index 104edca6cca..dd477e76e7f 100644
--- a/tests/components/deconz/test_config_flow.py
+++ b/tests/components/deconz/test_config_flow.py
@@ -1,11 +1,9 @@
 """Tests for deCONZ config flow."""
+
 import asyncio
 
 import pydeconz
 
-from homeassistant import data_entry_flow
-from homeassistant.components import ssdp
-from homeassistant.components.deconz import config_flow
 from homeassistant.components.deconz.config_flow import (
     CONF_MANUAL_INPUT,
     CONF_SERIAL,
@@ -18,12 +16,25 @@ from homeassistant.components.deconz.const import (
     CONF_MASTER_GATEWAY,
     DOMAIN,
 )
+from homeassistant.components.ssdp import (
+    ATTR_SSDP_LOCATION,
+    ATTR_UPNP_MANUFACTURER_URL,
+    ATTR_UPNP_SERIAL,
+)
+from homeassistant.config_entries import SOURCE_HASSIO, SOURCE_SSDP, SOURCE_USER
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT, CONTENT_TYPE_JSON
+from homeassistant.data_entry_flow import (
+    RESULT_TYPE_ABORT,
+    RESULT_TYPE_CREATE_ENTRY,
+    RESULT_TYPE_FORM,
+)
 
 from .test_gateway import API_KEY, BRIDGEID, setup_deconz_integration
 
 from tests.async_mock import patch
 
+BAD_BRIDGEID = "0000000000000000"
+
 
 async def test_flow_discovered_bridges(hass, aioclient_mock):
     """Test that config flow works for discovered bridges."""
@@ -37,17 +48,17 @@ async def test_flow_discovered_bridges(hass, aioclient_mock):
     )
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "user"}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "user"
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"], user_input={CONF_HOST: "1.2.3.4"}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "link"
 
     aioclient_mock.post(
@@ -60,7 +71,7 @@ async def test_flow_discovered_bridges(hass, aioclient_mock):
         result["flow_id"], user_input={}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["type"] == RESULT_TYPE_CREATE_ENTRY
     assert result["title"] == BRIDGEID
     assert result["data"] == {
         CONF_HOST: "1.2.3.4",
@@ -78,14 +89,14 @@ async def test_flow_manual_configuration_decision(hass, aioclient_mock):
     )
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "user"}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"], user_input={CONF_HOST: CONF_MANUAL_INPUT}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "manual_input"
 
     result = await hass.config_entries.flow.async_configure(
@@ -93,7 +104,7 @@ async def test_flow_manual_configuration_decision(hass, aioclient_mock):
         user_input={CONF_HOST: "1.2.3.4", CONF_PORT: 80},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "link"
 
     aioclient_mock.post(
@@ -112,7 +123,7 @@ async def test_flow_manual_configuration_decision(hass, aioclient_mock):
         result["flow_id"], user_input={}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["type"] == RESULT_TYPE_CREATE_ENTRY
     assert result["title"] == BRIDGEID
     assert result["data"] == {
         CONF_HOST: "1.2.3.4",
@@ -130,10 +141,10 @@ async def test_flow_manual_configuration(hass, aioclient_mock):
     )
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "user"}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "manual_input"
 
     result = await hass.config_entries.flow.async_configure(
@@ -141,7 +152,7 @@ async def test_flow_manual_configuration(hass, aioclient_mock):
         user_input={CONF_HOST: "1.2.3.4", CONF_PORT: 80},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "link"
 
     aioclient_mock.post(
@@ -160,7 +171,7 @@ async def test_flow_manual_configuration(hass, aioclient_mock):
         result["flow_id"], user_input={}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["type"] == RESULT_TYPE_CREATE_ENTRY
     assert result["title"] == BRIDGEID
     assert result["data"] == {
         CONF_HOST: "1.2.3.4",
@@ -174,30 +185,30 @@ async def test_manual_configuration_after_discovery_timeout(hass, aioclient_mock
     aioclient_mock.get(pydeconz.utils.URL_DISCOVER, exc=asyncio.TimeoutError)
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "user"}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "manual_input"
     assert not hass.config_entries.flow._progress[result["flow_id"]].bridges
 
 
 async def test_manual_configuration_after_discovery_ResponseError(hass, aioclient_mock):
     """Test failed discovery fallbacks to manual configuration."""
-    aioclient_mock.get(pydeconz.utils.URL_DISCOVER, exc=config_flow.ResponseError)
+    aioclient_mock.get(pydeconz.utils.URL_DISCOVER, exc=pydeconz.errors.ResponseError)
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "user"}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "manual_input"
     assert not hass.config_entries.flow._progress[result["flow_id"]].bridges
 
 
 async def test_manual_configuration_update_configuration(hass, aioclient_mock):
     """Test that manual configuration can update existing config entry."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
 
     aioclient_mock.get(
         pydeconz.utils.URL_DISCOVER,
@@ -206,10 +217,10 @@ async def test_manual_configuration_update_configuration(hass, aioclient_mock):
     )
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "user"}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "manual_input"
 
     result = await hass.config_entries.flow.async_configure(
@@ -217,7 +228,7 @@ async def test_manual_configuration_update_configuration(hass, aioclient_mock):
         user_input={CONF_HOST: "2.3.4.5", CONF_PORT: 80},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "link"
 
     aioclient_mock.post(
@@ -236,9 +247,9 @@ async def test_manual_configuration_update_configuration(hass, aioclient_mock):
         result["flow_id"], user_input={}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["type"] == RESULT_TYPE_ABORT
     assert result["reason"] == "already_configured"
-    assert gateway.config_entry.data[CONF_HOST] == "2.3.4.5"
+    assert config_entry.data[CONF_HOST] == "2.3.4.5"
 
 
 async def test_manual_configuration_dont_update_configuration(hass, aioclient_mock):
@@ -252,10 +263,10 @@ async def test_manual_configuration_dont_update_configuration(hass, aioclient_mo
     )
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "user"}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "manual_input"
 
     result = await hass.config_entries.flow.async_configure(
@@ -263,7 +274,7 @@ async def test_manual_configuration_dont_update_configuration(hass, aioclient_mo
         user_input={CONF_HOST: "1.2.3.4", CONF_PORT: 80},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "link"
 
     aioclient_mock.post(
@@ -282,7 +293,7 @@ async def test_manual_configuration_dont_update_configuration(hass, aioclient_mo
         result["flow_id"], user_input={}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["type"] == RESULT_TYPE_ABORT
     assert result["reason"] == "already_configured"
 
 
@@ -295,10 +306,10 @@ async def test_manual_configuration_timeout_get_bridge(hass, aioclient_mock):
     )
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "user"}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "manual_input"
 
     result = await hass.config_entries.flow.async_configure(
@@ -306,7 +317,7 @@ async def test_manual_configuration_timeout_get_bridge(hass, aioclient_mock):
         user_input={CONF_HOST: "1.2.3.4", CONF_PORT: 80},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "link"
 
     aioclient_mock.post(
@@ -323,7 +334,7 @@ async def test_manual_configuration_timeout_get_bridge(hass, aioclient_mock):
         result["flow_id"], user_input={}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["type"] == RESULT_TYPE_ABORT
     assert result["reason"] == "no_bridges"
 
 
@@ -336,14 +347,14 @@ async def test_link_get_api_key_ResponseError(hass, aioclient_mock):
     )
 
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": "user"}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"], user_input={CONF_HOST: "1.2.3.4"}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "link"
 
     aioclient_mock.post("http://1.2.3.4:80/api", exc=pydeconz.errors.ResponseError)
@@ -352,7 +363,7 @@ async def test_link_get_api_key_ResponseError(hass, aioclient_mock):
         result["flow_id"], user_input={}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "link"
     assert result["errors"] == {"base": "no_key"}
 
@@ -362,14 +373,14 @@ async def test_flow_ssdp_discovery(hass, aioclient_mock):
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         data={
-            ssdp.ATTR_SSDP_LOCATION: "http://1.2.3.4:80/",
-            ssdp.ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
-            ssdp.ATTR_UPNP_SERIAL: BRIDGEID,
+            ATTR_SSDP_LOCATION: "http://1.2.3.4:80/",
+            ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
+            ATTR_UPNP_SERIAL: BRIDGEID,
         },
-        context={"source": "ssdp"},
+        context={"source": SOURCE_SSDP},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "link"
 
     aioclient_mock.post(
@@ -382,7 +393,7 @@ async def test_flow_ssdp_discovery(hass, aioclient_mock):
         result["flow_id"], user_input={}
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["type"] == RESULT_TYPE_CREATE_ENTRY
     assert result["title"] == BRIDGEID
     assert result["data"] == {
         CONF_HOST: "1.2.3.4",
@@ -391,21 +402,50 @@ async def test_flow_ssdp_discovery(hass, aioclient_mock):
     }
 
 
+async def test_flow_ssdp_discovery_bad_bridge_id_aborts(hass, aioclient_mock):
+    """Test that config flow aborts if deCONZ signals no radio hardware available."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        data={
+            ATTR_SSDP_LOCATION: "http://1.2.3.4:80/",
+            ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
+            ATTR_UPNP_SERIAL: BAD_BRIDGEID,
+        },
+        context={"source": SOURCE_SSDP},
+    )
+
+    assert result["type"] == RESULT_TYPE_FORM
+    assert result["step_id"] == "link"
+
+    aioclient_mock.post(
+        "http://1.2.3.4:80/api",
+        json=[{"success": {"username": API_KEY}}],
+        headers={"content-type": CONTENT_TYPE_JSON},
+    )
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input={}
+    )
+
+    assert result["type"] == RESULT_TYPE_ABORT
+    assert result["reason"] == "no_hardware_available"
+
+
 async def test_ssdp_discovery_not_deconz_bridge(hass):
     """Test a non deconz bridge being discovered over ssdp."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
-        data={ssdp.ATTR_UPNP_MANUFACTURER_URL: "not deconz bridge"},
-        context={"source": "ssdp"},
+        data={ATTR_UPNP_MANUFACTURER_URL: "not deconz bridge"},
+        context={"source": SOURCE_SSDP},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["type"] == RESULT_TYPE_ABORT
     assert result["reason"] == "not_deconz_bridge"
 
 
 async def test_ssdp_discovery_update_configuration(hass):
     """Test if a discovered bridge is configured but updates with new attributes."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
 
     with patch(
         "homeassistant.components.deconz.async_setup_entry",
@@ -414,56 +454,56 @@ async def test_ssdp_discovery_update_configuration(hass):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
             data={
-                ssdp.ATTR_SSDP_LOCATION: "http://2.3.4.5:80/",
-                ssdp.ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
-                ssdp.ATTR_UPNP_SERIAL: BRIDGEID,
+                ATTR_SSDP_LOCATION: "http://2.3.4.5:80/",
+                ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
+                ATTR_UPNP_SERIAL: BRIDGEID,
             },
-            context={"source": "ssdp"},
+            context={"source": SOURCE_SSDP},
         )
         await hass.async_block_till_done()
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["type"] == RESULT_TYPE_ABORT
     assert result["reason"] == "already_configured"
-    assert gateway.config_entry.data[CONF_HOST] == "2.3.4.5"
+    assert config_entry.data[CONF_HOST] == "2.3.4.5"
     assert len(mock_setup_entry.mock_calls) == 1
 
 
 async def test_ssdp_discovery_dont_update_configuration(hass):
     """Test if a discovered bridge has already been configured."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         data={
-            ssdp.ATTR_SSDP_LOCATION: "http://1.2.3.4:80/",
-            ssdp.ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
-            ssdp.ATTR_UPNP_SERIAL: BRIDGEID,
+            ATTR_SSDP_LOCATION: "http://1.2.3.4:80/",
+            ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
+            ATTR_UPNP_SERIAL: BRIDGEID,
         },
-        context={"source": "ssdp"},
+        context={"source": SOURCE_SSDP},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["type"] == RESULT_TYPE_ABORT
     assert result["reason"] == "already_configured"
-    assert gateway.config_entry.data[CONF_HOST] == "1.2.3.4"
+    assert config_entry.data[CONF_HOST] == "1.2.3.4"
 
 
 async def test_ssdp_discovery_dont_update_existing_hassio_configuration(hass):
     """Test to ensure the SSDP discovery does not update an Hass.io entry."""
-    gateway = await setup_deconz_integration(hass, source="hassio")
+    config_entry = await setup_deconz_integration(hass, source=SOURCE_HASSIO)
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
         data={
-            ssdp.ATTR_SSDP_LOCATION: "http://1.2.3.4:80/",
-            ssdp.ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
-            ssdp.ATTR_UPNP_SERIAL: BRIDGEID,
+            ATTR_SSDP_LOCATION: "http://1.2.3.4:80/",
+            ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
+            ATTR_UPNP_SERIAL: BRIDGEID,
         },
-        context={"source": "ssdp"},
+        context={"source": SOURCE_SSDP},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["type"] == RESULT_TYPE_ABORT
     assert result["reason"] == "already_configured"
-    assert gateway.config_entry.data[CONF_HOST] == "1.2.3.4"
+    assert config_entry.data[CONF_HOST] == "1.2.3.4"
 
 
 async def test_flow_hassio_discovery(hass):
@@ -477,9 +517,9 @@ async def test_flow_hassio_discovery(hass):
             CONF_SERIAL: BRIDGEID,
             CONF_API_KEY: API_KEY,
         },
-        context={"source": "hassio"},
+        context={"source": SOURCE_HASSIO},
     )
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "hassio_confirm"
     assert result["description_placeholders"] == {"addon": "Mock Addon"}
 
@@ -494,7 +534,7 @@ async def test_flow_hassio_discovery(hass):
         )
         await hass.async_block_till_done()
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["type"] == RESULT_TYPE_CREATE_ENTRY
     assert result["result"].data == {
         CONF_HOST: "mock-deconz",
         CONF_PORT: 80,
@@ -506,7 +546,7 @@ async def test_flow_hassio_discovery(hass):
 
 async def test_hassio_discovery_update_configuration(hass):
     """Test we can update an existing config entry."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
 
     with patch(
         "homeassistant.components.deconz.async_setup_entry",
@@ -520,15 +560,15 @@ async def test_hassio_discovery_update_configuration(hass):
                 CONF_API_KEY: "updated",
                 CONF_SERIAL: BRIDGEID,
             },
-            context={"source": "hassio"},
+            context={"source": SOURCE_HASSIO},
         )
         await hass.async_block_till_done()
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["type"] == RESULT_TYPE_ABORT
     assert result["reason"] == "already_configured"
-    assert gateway.config_entry.data[CONF_HOST] == "2.3.4.5"
-    assert gateway.config_entry.data[CONF_PORT] == 8080
-    assert gateway.config_entry.data[CONF_API_KEY] == "updated"
+    assert config_entry.data[CONF_HOST] == "2.3.4.5"
+    assert config_entry.data[CONF_PORT] == 8080
+    assert config_entry.data[CONF_API_KEY] == "updated"
     assert len(mock_setup_entry.mock_calls) == 1
 
 
@@ -544,20 +584,20 @@ async def test_hassio_discovery_dont_update_configuration(hass):
             CONF_API_KEY: API_KEY,
             CONF_SERIAL: BRIDGEID,
         },
-        context={"source": "hassio"},
+        context={"source": SOURCE_HASSIO},
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["type"] == RESULT_TYPE_ABORT
     assert result["reason"] == "already_configured"
 
 
 async def test_option_flow(hass):
     """Test config flow options."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
 
-    result = await hass.config_entries.options.async_init(gateway.config_entry.entry_id)
+    result = await hass.config_entries.options.async_init(config_entry.entry_id)
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "deconz_devices"
 
     result = await hass.config_entries.options.async_configure(
@@ -569,7 +609,7 @@ async def test_option_flow(hass):
         },
     )
 
-    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["type"] == RESULT_TYPE_CREATE_ENTRY
     assert result["data"] == {
         CONF_ALLOW_CLIP_SENSOR: False,
         CONF_ALLOW_DECONZ_GROUPS: False,
diff --git a/tests/components/deconz/test_cover.py b/tests/components/deconz/test_cover.py
index 095ae7e4bc5..485ae4239be 100644
--- a/tests/components/deconz/test_cover.py
+++ b/tests/components/deconz/test_cover.py
@@ -1,8 +1,16 @@
 """deCONZ cover platform tests."""
+
 from copy import deepcopy
 
-from homeassistant.components import deconz
-import homeassistant.components.cover as cover
+from homeassistant.components.cover import (
+    DOMAIN as COVER_DOMAIN,
+    SERVICE_CLOSE_COVER,
+    SERVICE_OPEN_COVER,
+    SERVICE_STOP_COVER,
+)
+from homeassistant.components.deconz.const import DOMAIN as DECONZ_DOMAIN
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.const import ATTR_ENTITY_ID, STATE_CLOSED, STATE_OPEN
 from homeassistant.setup import async_setup_component
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
@@ -56,17 +64,16 @@ async def test_platform_manually_configured(hass):
     """Test that we do not discover anything or try to set up a gateway."""
     assert (
         await async_setup_component(
-            hass, cover.DOMAIN, {"cover": {"platform": deconz.DOMAIN}}
+            hass, COVER_DOMAIN, {"cover": {"platform": DECONZ_DOMAIN}}
         )
         is True
     )
-    assert deconz.DOMAIN not in hass.data
+    assert DECONZ_DOMAIN not in hass.data
 
 
 async def test_no_covers(hass):
     """Test that no cover entities are created."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    await setup_deconz_integration(hass)
     assert len(hass.states.async_all()) == 0
 
 
@@ -74,16 +81,17 @@ async def test_cover(hass):
     """Test that all supported cover entities are created."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["lights"] = deepcopy(COVERS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
-    assert "cover.level_controllable_cover" in gateway.deconz_ids
-    assert "cover.window_covering_device" in gateway.deconz_ids
-    assert "cover.unsupported_cover" not in gateway.deconz_ids
-    assert "cover.deconz_old_brightness_cover" in gateway.deconz_ids
-    assert "cover.window_covering_controller" in gateway.deconz_ids
-    assert len(hass.states.async_all()) == 5
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
-    level_controllable_cover = hass.states.get("cover.level_controllable_cover")
-    assert level_controllable_cover.state == "open"
+    assert len(hass.states.async_all()) == 5
+    assert hass.states.get("cover.level_controllable_cover").state == STATE_OPEN
+    assert hass.states.get("cover.window_covering_device").state == STATE_CLOSED
+    assert hass.states.get("cover.unsupported_cover") is None
+    assert hass.states.get("cover.deconz_old_brightness_cover").state == STATE_OPEN
+    assert hass.states.get("cover.window_covering_controller").state == STATE_CLOSED
+
+    # Event signals cover is closed
 
     state_changed_event = {
         "t": "event",
@@ -95,30 +103,35 @@ async def test_cover(hass):
     gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
-    level_controllable_cover = hass.states.get("cover.level_controllable_cover")
-    assert level_controllable_cover.state == "closed"
+    assert hass.states.get("cover.level_controllable_cover").state == STATE_CLOSED
+
+    # Verify service calls
 
     level_controllable_cover_device = gateway.api.lights["1"]
 
+    # Service open cover
+
     with patch.object(
         level_controllable_cover_device, "_request", return_value=True
     ) as set_callback:
         await hass.services.async_call(
-            cover.DOMAIN,
-            cover.SERVICE_OPEN_COVER,
-            {"entity_id": "cover.level_controllable_cover"},
+            COVER_DOMAIN,
+            SERVICE_OPEN_COVER,
+            {ATTR_ENTITY_ID: "cover.level_controllable_cover"},
             blocking=True,
         )
         await hass.async_block_till_done()
         set_callback.assert_called_with("put", "/lights/1/state", json={"on": False})
 
+    # Service close cover
+
     with patch.object(
         level_controllable_cover_device, "_request", return_value=True
     ) as set_callback:
         await hass.services.async_call(
-            cover.DOMAIN,
-            cover.SERVICE_CLOSE_COVER,
-            {"entity_id": "cover.level_controllable_cover"},
+            COVER_DOMAIN,
+            SERVICE_CLOSE_COVER,
+            {ATTR_ENTITY_ID: "cover.level_controllable_cover"},
             blocking=True,
         )
         await hass.async_block_till_done()
@@ -126,21 +139,22 @@ async def test_cover(hass):
             "put", "/lights/1/state", json={"on": True, "bri": 254}
         )
 
+    # Service stop cover movement
+
     with patch.object(
         level_controllable_cover_device, "_request", return_value=True
     ) as set_callback:
         await hass.services.async_call(
-            cover.DOMAIN,
-            cover.SERVICE_STOP_COVER,
-            {"entity_id": "cover.level_controllable_cover"},
+            COVER_DOMAIN,
+            SERVICE_STOP_COVER,
+            {ATTR_ENTITY_ID: "cover.level_controllable_cover"},
             blocking=True,
         )
         await hass.async_block_till_done()
         set_callback.assert_called_with("put", "/lights/1/state", json={"bri_inc": 0})
 
     # Test that a reported cover position of 255 (deconz-rest-api < 2.05.73) is interpreted correctly.
-    deconz_old_brightness_cover = hass.states.get("cover.deconz_old_brightness_cover")
-    assert deconz_old_brightness_cover.state == "open"
+    assert hass.states.get("cover.deconz_old_brightness_cover").state == STATE_OPEN
 
     state_changed_event = {
         "t": "event",
@@ -153,8 +167,9 @@ async def test_cover(hass):
     await hass.async_block_till_done()
 
     deconz_old_brightness_cover = hass.states.get("cover.deconz_old_brightness_cover")
+    assert deconz_old_brightness_cover.state == STATE_CLOSED
     assert deconz_old_brightness_cover.attributes["current_position"] == 0
 
-    await gateway.async_reset()
+    await hass.config_entries.async_unload(config_entry.entry_id)
 
     assert len(hass.states.async_all()) == 0
diff --git a/tests/components/deconz/test_deconz_event.py b/tests/components/deconz/test_deconz_event.py
index 525821e389f..e1492fb0fcf 100644
--- a/tests/components/deconz/test_deconz_event.py
+++ b/tests/components/deconz/test_deconz_event.py
@@ -1,7 +1,9 @@
 """Test deCONZ remote events."""
+
 from copy import deepcopy
 
 from homeassistant.components.deconz.deconz_event import CONF_DECONZ_EVENT
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
 
@@ -55,25 +57,15 @@ async def test_deconz_events(hass):
     """Test successful creation of deconz events."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
-    assert "sensor.switch_1" not in gateway.deconz_ids
-    assert "sensor.switch_1_battery_level" not in gateway.deconz_ids
-    assert "sensor.switch_2" not in gateway.deconz_ids
-    assert "sensor.switch_2_battery_level" in gateway.deconz_ids
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+
     assert len(hass.states.async_all()) == 3
     assert len(gateway.events) == 5
-
-    switch_1 = hass.states.get("sensor.switch_1")
-    assert switch_1 is None
-
-    switch_1_battery_level = hass.states.get("sensor.switch_1_battery_level")
-    assert switch_1_battery_level is None
-
-    switch_2 = hass.states.get("sensor.switch_2")
-    assert switch_2 is None
-
-    switch_2_battery_level = hass.states.get("sensor.switch_2_battery_level")
-    assert switch_2_battery_level.state == "100"
+    assert hass.states.get("sensor.switch_1") is None
+    assert hass.states.get("sensor.switch_1_battery_level") is None
+    assert hass.states.get("sensor.switch_2") is None
+    assert hass.states.get("sensor.switch_2_battery_level").state == "100"
 
     events = async_capture_events(hass, CONF_DECONZ_EVENT)
 
@@ -123,7 +115,7 @@ async def test_deconz_events(hass):
         "xy": [0.5982, 0.3897],
     }
 
-    await gateway.async_reset()
+    await hass.config_entries.async_unload(config_entry.entry_id)
 
     assert len(hass.states.async_all()) == 0
     assert len(gateway.events) == 0
diff --git a/tests/components/deconz/test_device_trigger.py b/tests/components/deconz/test_device_trigger.py
index 61962b00fe6..69c9ae94727 100644
--- a/tests/components/deconz/test_device_trigger.py
+++ b/tests/components/deconz/test_device_trigger.py
@@ -1,7 +1,20 @@
 """deCONZ device automation tests."""
+
 from copy import deepcopy
 
 from homeassistant.components.deconz import device_trigger
+from homeassistant.components.deconz.const import DOMAIN as DECONZ_DOMAIN
+from homeassistant.components.deconz.device_trigger import CONF_SUBTYPE
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.const import (
+    ATTR_BATTERY_LEVEL,
+    ATTR_ENTITY_ID,
+    CONF_DEVICE_ID,
+    CONF_DOMAIN,
+    CONF_PLATFORM,
+    CONF_TYPE,
+)
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
 
@@ -21,10 +34,10 @@ SENSORS = {
         "manufacturername": "IKEA of Sweden",
         "mode": 1,
         "modelid": "TRADFRI on/off switch",
-        "name": "TRADFRI on/off switch ",
+        "name": "TRÅDFRI on/off switch ",
         "state": {"buttonevent": 2002, "lastupdated": "2019-09-07T07:39:39"},
         "swversion": "1.4.018",
-        "type": "ZHASwitch",
+        CONF_TYPE: "ZHASwitch",
         "uniqueid": "d0:cf:5e:ff:fe:71:a4:3a-01-1000",
     }
 }
@@ -34,59 +47,60 @@ async def test_get_triggers(hass):
     """Test triggers work."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
     device_id = gateway.events[0].device_id
     triggers = await async_get_device_automations(hass, "trigger", device_id)
 
     expected_triggers = [
         {
-            "device_id": device_id,
-            "domain": "deconz",
-            "platform": "device",
-            "type": device_trigger.CONF_SHORT_PRESS,
-            "subtype": device_trigger.CONF_TURN_ON,
+            CONF_DEVICE_ID: device_id,
+            CONF_DOMAIN: DECONZ_DOMAIN,
+            CONF_PLATFORM: "device",
+            CONF_TYPE: device_trigger.CONF_SHORT_PRESS,
+            CONF_SUBTYPE: device_trigger.CONF_TURN_ON,
         },
         {
-            "device_id": device_id,
-            "domain": "deconz",
-            "platform": "device",
-            "type": device_trigger.CONF_LONG_PRESS,
-            "subtype": device_trigger.CONF_TURN_ON,
+            CONF_DEVICE_ID: device_id,
+            CONF_DOMAIN: DECONZ_DOMAIN,
+            CONF_PLATFORM: "device",
+            CONF_TYPE: device_trigger.CONF_LONG_PRESS,
+            CONF_SUBTYPE: device_trigger.CONF_TURN_ON,
         },
         {
-            "device_id": device_id,
-            "domain": "deconz",
-            "platform": "device",
-            "type": device_trigger.CONF_LONG_RELEASE,
-            "subtype": device_trigger.CONF_TURN_ON,
+            CONF_DEVICE_ID: device_id,
+            CONF_DOMAIN: DECONZ_DOMAIN,
+            CONF_PLATFORM: "device",
+            CONF_TYPE: device_trigger.CONF_LONG_RELEASE,
+            CONF_SUBTYPE: device_trigger.CONF_TURN_ON,
         },
         {
-            "device_id": device_id,
-            "domain": "deconz",
-            "platform": "device",
-            "type": device_trigger.CONF_SHORT_PRESS,
-            "subtype": device_trigger.CONF_TURN_OFF,
+            CONF_DEVICE_ID: device_id,
+            CONF_DOMAIN: DECONZ_DOMAIN,
+            CONF_PLATFORM: "device",
+            CONF_TYPE: device_trigger.CONF_SHORT_PRESS,
+            CONF_SUBTYPE: device_trigger.CONF_TURN_OFF,
         },
         {
-            "device_id": device_id,
-            "domain": "deconz",
-            "platform": "device",
-            "type": device_trigger.CONF_LONG_PRESS,
-            "subtype": device_trigger.CONF_TURN_OFF,
+            CONF_DEVICE_ID: device_id,
+            CONF_DOMAIN: DECONZ_DOMAIN,
+            CONF_PLATFORM: "device",
+            CONF_TYPE: device_trigger.CONF_LONG_PRESS,
+            CONF_SUBTYPE: device_trigger.CONF_TURN_OFF,
         },
         {
-            "device_id": device_id,
-            "domain": "deconz",
-            "platform": "device",
-            "type": device_trigger.CONF_LONG_RELEASE,
-            "subtype": device_trigger.CONF_TURN_OFF,
+            CONF_DEVICE_ID: device_id,
+            CONF_DOMAIN: DECONZ_DOMAIN,
+            CONF_PLATFORM: "device",
+            CONF_TYPE: device_trigger.CONF_LONG_RELEASE,
+            CONF_SUBTYPE: device_trigger.CONF_TURN_OFF,
         },
         {
-            "device_id": device_id,
-            "domain": "sensor",
-            "entity_id": "sensor.tradfri_on_off_switch_battery_level",
-            "platform": "device",
-            "type": "battery_level",
+            CONF_DEVICE_ID: device_id,
+            CONF_DOMAIN: SENSOR_DOMAIN,
+            ATTR_ENTITY_ID: "sensor.tradfri_on_off_switch_battery_level",
+            CONF_PLATFORM: "device",
+            CONF_TYPE: ATTR_BATTERY_LEVEL,
         },
     ]
 
@@ -97,7 +111,8 @@ async def test_helper_successful(hass):
     """Verify trigger helper."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
     device_id = gateway.events[0].device_id
     deconz_event = device_trigger._get_deconz_event_from_device_id(hass, device_id)
     assert deconz_event == gateway.events[0]
diff --git a/tests/components/deconz/test_fan.py b/tests/components/deconz/test_fan.py
new file mode 100644
index 00000000000..6806071dd75
--- /dev/null
+++ b/tests/components/deconz/test_fan.py
@@ -0,0 +1,211 @@
+"""deCONZ fan platform tests."""
+
+from copy import deepcopy
+
+import pytest
+
+from homeassistant.components.deconz.const import DOMAIN as DECONZ_DOMAIN
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.components.fan import (
+    ATTR_SPEED,
+    DOMAIN as FAN_DOMAIN,
+    SERVICE_SET_SPEED,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    SPEED_HIGH,
+    SPEED_LOW,
+    SPEED_MEDIUM,
+    SPEED_OFF,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
+from homeassistant.setup import async_setup_component
+
+from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
+
+from tests.async_mock import patch
+
+FANS = {
+    "1": {
+        "etag": "432f3de28965052961a99e3c5494daf4",
+        "hascolor": False,
+        "manufacturername": "King Of Fans,  Inc.",
+        "modelid": "HDC52EastwindFan",
+        "name": "Ceiling fan",
+        "state": {
+            "alert": "none",
+            "bri": 254,
+            "on": False,
+            "reachable": True,
+            "speed": 4,
+        },
+        "swversion": "0000000F",
+        "type": "Fan",
+        "uniqueid": "00:22:a3:00:00:27:8b:81-01",
+    }
+}
+
+
+async def test_platform_manually_configured(hass):
+    """Test that we do not discover anything or try to set up a gateway."""
+    assert (
+        await async_setup_component(
+            hass, FAN_DOMAIN, {"fan": {"platform": DECONZ_DOMAIN}}
+        )
+        is True
+    )
+    assert DECONZ_DOMAIN not in hass.data
+
+
+async def test_no_fans(hass):
+    """Test that no fan entities are created."""
+    await setup_deconz_integration(hass)
+    assert len(hass.states.async_all()) == 0
+
+
+async def test_fans(hass):
+    """Test that all supported fan entities are created."""
+    data = deepcopy(DECONZ_WEB_REQUEST)
+    data["lights"] = deepcopy(FANS)
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+
+    assert len(hass.states.async_all()) == 2  # Light and fan
+    assert hass.states.get("fan.ceiling_fan")
+
+    # Test states
+
+    assert hass.states.get("fan.ceiling_fan").state == STATE_ON
+    assert hass.states.get("fan.ceiling_fan").attributes["speed"] == SPEED_HIGH
+
+    state_changed_event = {
+        "t": "event",
+        "e": "changed",
+        "r": "lights",
+        "id": "1",
+        "state": {"speed": 0},
+    }
+    gateway.api.event_handler(state_changed_event)
+    await hass.async_block_till_done()
+
+    assert hass.states.get("fan.ceiling_fan").state == STATE_OFF
+    assert hass.states.get("fan.ceiling_fan").attributes["speed"] == SPEED_OFF
+
+    # Test service calls
+
+    ceiling_fan_device = gateway.api.lights["1"]
+
+    # Service turn on fan
+
+    with patch.object(
+        ceiling_fan_device, "_request", return_value=True
+    ) as set_callback:
+        await hass.services.async_call(
+            FAN_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "fan.ceiling_fan"},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with("put", "/lights/1/state", json={"speed": 4})
+
+    # Service turn off fan
+
+    with patch.object(
+        ceiling_fan_device, "_request", return_value=True
+    ) as set_callback:
+        await hass.services.async_call(
+            FAN_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "fan.ceiling_fan"},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with("put", "/lights/1/state", json={"speed": 0})
+
+    # Service set fan speed to low
+
+    with patch.object(
+        ceiling_fan_device, "_request", return_value=True
+    ) as set_callback:
+        await hass.services.async_call(
+            FAN_DOMAIN,
+            SERVICE_SET_SPEED,
+            {ATTR_ENTITY_ID: "fan.ceiling_fan", ATTR_SPEED: SPEED_LOW},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with("put", "/lights/1/state", json={"speed": 1})
+
+    # Service set fan speed to medium
+
+    with patch.object(
+        ceiling_fan_device, "_request", return_value=True
+    ) as set_callback:
+        await hass.services.async_call(
+            FAN_DOMAIN,
+            SERVICE_SET_SPEED,
+            {ATTR_ENTITY_ID: "fan.ceiling_fan", ATTR_SPEED: SPEED_MEDIUM},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with("put", "/lights/1/state", json={"speed": 2})
+
+    # Service set fan speed to high
+
+    with patch.object(
+        ceiling_fan_device, "_request", return_value=True
+    ) as set_callback:
+        await hass.services.async_call(
+            FAN_DOMAIN,
+            SERVICE_SET_SPEED,
+            {ATTR_ENTITY_ID: "fan.ceiling_fan", ATTR_SPEED: SPEED_HIGH},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with("put", "/lights/1/state", json={"speed": 4})
+
+    # Service set fan speed to off
+
+    with patch.object(
+        ceiling_fan_device, "_request", return_value=True
+    ) as set_callback:
+        await hass.services.async_call(
+            FAN_DOMAIN,
+            SERVICE_SET_SPEED,
+            {ATTR_ENTITY_ID: "fan.ceiling_fan", ATTR_SPEED: SPEED_OFF},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with("put", "/lights/1/state", json={"speed": 0})
+
+    # Service set fan speed to unsupported value
+
+    with patch.object(
+        ceiling_fan_device, "_request", return_value=True
+    ) as set_callback, pytest.raises(ValueError):
+        await hass.services.async_call(
+            FAN_DOMAIN,
+            SERVICE_SET_SPEED,
+            {ATTR_ENTITY_ID: "fan.ceiling_fan", ATTR_SPEED: "bad value"},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+
+    # Events with an unsupported speed gets converted to default speed "medium"
+
+    state_changed_event = {
+        "t": "event",
+        "e": "changed",
+        "r": "lights",
+        "id": "1",
+        "state": {"speed": 3},
+    }
+    gateway.api.event_handler(state_changed_event)
+    await hass.async_block_till_done()
+
+    assert hass.states.get("fan.ceiling_fan").state == STATE_ON
+    assert hass.states.get("fan.ceiling_fan").attributes["speed"] == SPEED_MEDIUM
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
+
+    assert len(hass.states.async_all()) == 0
diff --git a/tests/components/deconz/test_gateway.py b/tests/components/deconz/test_gateway.py
index 64818401bcb..12666cdb692 100644
--- a/tests/components/deconz/test_gateway.py
+++ b/tests/components/deconz/test_gateway.py
@@ -1,11 +1,34 @@
 """Test deCONZ gateway."""
+
 from copy import deepcopy
 
 import pydeconz
 import pytest
 
-from homeassistant import config_entries
-from homeassistant.components import deconz, ssdp
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
+from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
+from homeassistant.components.cover import DOMAIN as COVER_DOMAIN
+from homeassistant.components.deconz.config_flow import DECONZ_MANUFACTURERURL
+from homeassistant.components.deconz.const import DOMAIN as DECONZ_DOMAIN
+from homeassistant.components.deconz.errors import AuthenticationRequired, CannotConnect
+from homeassistant.components.deconz.gateway import (
+    get_gateway,
+    get_gateway_from_config_entry,
+)
+from homeassistant.components.fan import DOMAIN as FAN_DOMAIN
+from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
+from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN
+from homeassistant.components.scene import DOMAIN as SCENE_DOMAIN
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.components.ssdp import (
+    ATTR_SSDP_LOCATION,
+    ATTR_UPNP_MANUFACTURER_URL,
+    ATTR_UPNP_SERIAL,
+    ATTR_UPNP_UDN,
+)
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.config_entries import CONN_CLASS_LOCAL_PUSH, SOURCE_SSDP
+from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from tests.async_mock import Mock, patch
@@ -14,11 +37,7 @@ from tests.common import MockConfigEntry
 API_KEY = "1234567890ABCDEF"
 BRIDGEID = "01234E56789A"
 
-ENTRY_CONFIG = {
-    deconz.config_flow.CONF_API_KEY: API_KEY,
-    deconz.config_flow.CONF_HOST: "1.2.3.4",
-    deconz.config_flow.CONF_PORT: 80,
-}
+ENTRY_CONFIG = {CONF_API_KEY: API_KEY, CONF_HOST: "1.2.3.4", CONF_PORT: 80}
 
 ENTRY_OPTIONS = {}
 
@@ -51,10 +70,10 @@ async def setup_deconz_integration(
 ):
     """Create the deCONZ gateway."""
     config_entry = MockConfigEntry(
-        domain=deconz.DOMAIN,
+        domain=DECONZ_DOMAIN,
         source=source,
         data=deepcopy(config),
-        connection_class=config_entries.CONN_CLASS_LOCAL_PUSH,
+        connection_class=CONN_CLASS_LOCAL_PUSH,
         options=deepcopy(options),
         entry_id=entry_id,
     )
@@ -66,8 +85,7 @@ async def setup_deconz_integration(
         await hass.config_entries.async_setup(config_entry.entry_id)
     await hass.async_block_till_done()
 
-    bridgeid = get_state_response["config"]["bridgeid"]
-    return hass.data[deconz.DOMAIN].get(bridgeid)
+    return config_entry
 
 
 async def test_gateway_setup(hass):
@@ -76,7 +94,8 @@ async def test_gateway_setup(hass):
         "homeassistant.config_entries.ConfigEntries.async_forward_entry_setup",
         return_value=True,
     ) as forward_entry_setup:
-        gateway = await setup_deconz_integration(hass)
+        config_entry = await setup_deconz_integration(hass)
+        gateway = get_gateway_from_config_entry(hass, config_entry)
         assert gateway.bridgeid == BRIDGEID
         assert gateway.master is True
         assert gateway.option_allow_clip_sensor is False
@@ -86,24 +105,28 @@ async def test_gateway_setup(hass):
         assert len(gateway.deconz_ids) == 0
         assert len(hass.states.async_all()) == 0
 
-        entry = gateway.config_entry
-        assert forward_entry_setup.mock_calls[0][1] == (entry, "binary_sensor")
-        assert forward_entry_setup.mock_calls[1][1] == (entry, "climate")
-        assert forward_entry_setup.mock_calls[2][1] == (entry, "cover")
-        assert forward_entry_setup.mock_calls[3][1] == (entry, "light")
-        assert forward_entry_setup.mock_calls[4][1] == (entry, "scene")
-        assert forward_entry_setup.mock_calls[5][1] == (entry, "sensor")
-        assert forward_entry_setup.mock_calls[6][1] == (entry, "switch")
+        assert forward_entry_setup.mock_calls[0][1] == (
+            config_entry,
+            BINARY_SENSOR_DOMAIN,
+        )
+        assert forward_entry_setup.mock_calls[1][1] == (config_entry, CLIMATE_DOMAIN)
+        assert forward_entry_setup.mock_calls[2][1] == (config_entry, COVER_DOMAIN)
+        assert forward_entry_setup.mock_calls[3][1] == (config_entry, FAN_DOMAIN)
+        assert forward_entry_setup.mock_calls[4][1] == (config_entry, LIGHT_DOMAIN)
+        assert forward_entry_setup.mock_calls[5][1] == (config_entry, LOCK_DOMAIN)
+        assert forward_entry_setup.mock_calls[6][1] == (config_entry, SCENE_DOMAIN)
+        assert forward_entry_setup.mock_calls[7][1] == (config_entry, SENSOR_DOMAIN)
+        assert forward_entry_setup.mock_calls[8][1] == (config_entry, SWITCH_DOMAIN)
 
 
 async def test_gateway_retry(hass):
     """Retry setup."""
     with patch(
         "homeassistant.components.deconz.gateway.get_gateway",
-        side_effect=deconz.errors.CannotConnect,
+        side_effect=CannotConnect,
     ):
         await setup_deconz_integration(hass)
-    assert not hass.data[deconz.DOMAIN]
+    assert not hass.data[DECONZ_DOMAIN]
 
 
 async def test_gateway_setup_fails(hass):
@@ -111,13 +134,14 @@ async def test_gateway_setup_fails(hass):
     with patch(
         "homeassistant.components.deconz.gateway.get_gateway", side_effect=Exception
     ):
-        gateway = await setup_deconz_integration(hass)
-        assert gateway is None
+        await setup_deconz_integration(hass)
+    assert not hass.data[DECONZ_DOMAIN]
 
 
 async def test_connection_status_signalling(hass):
     """Make sure that connection status triggers a dispatcher send."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
     event_call = Mock()
     unsub = async_dispatcher_connect(hass, gateway.signal_reachable, event_call)
@@ -133,7 +157,8 @@ async def test_connection_status_signalling(hass):
 
 async def test_update_address(hass):
     """Make sure that connection status triggers a dispatcher send."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
     assert gateway.api.host == "1.2.3.4"
 
     with patch(
@@ -141,14 +166,14 @@ async def test_update_address(hass):
         return_value=True,
     ) as mock_setup_entry:
         await hass.config_entries.flow.async_init(
-            deconz.config_flow.DOMAIN,
+            DECONZ_DOMAIN,
             data={
-                ssdp.ATTR_SSDP_LOCATION: "http://2.3.4.5:80/",
-                ssdp.ATTR_UPNP_MANUFACTURER_URL: deconz.config_flow.DECONZ_MANUFACTURERURL,
-                ssdp.ATTR_UPNP_SERIAL: BRIDGEID,
-                ssdp.ATTR_UPNP_UDN: "uuid:456DEF",
+                ATTR_SSDP_LOCATION: "http://2.3.4.5:80/",
+                ATTR_UPNP_MANUFACTURER_URL: DECONZ_MANUFACTURERURL,
+                ATTR_UPNP_SERIAL: BRIDGEID,
+                ATTR_UPNP_UDN: "uuid:456DEF",
             },
-            context={"source": "ssdp"},
+            context={"source": SOURCE_SSDP},
         )
         await hass.async_block_till_done()
 
@@ -158,7 +183,8 @@ async def test_update_address(hass):
 
 async def test_reset_after_successful_setup(hass):
     """Make sure that connection status triggers a dispatcher send."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
     result = await gateway.async_reset()
     await hass.async_block_till_done()
@@ -169,7 +195,7 @@ async def test_reset_after_successful_setup(hass):
 async def test_get_gateway(hass):
     """Successful call."""
     with patch("pydeconz.DeconzSession.initialize", return_value=True):
-        assert await deconz.gateway.get_gateway(hass, ENTRY_CONFIG, Mock(), Mock())
+        assert await get_gateway(hass, ENTRY_CONFIG, Mock(), Mock())
 
 
 async def test_get_gateway_fails_unauthorized(hass):
@@ -177,11 +203,8 @@ async def test_get_gateway_fails_unauthorized(hass):
     with patch(
         "pydeconz.DeconzSession.initialize",
         side_effect=pydeconz.errors.Unauthorized,
-    ), pytest.raises(deconz.errors.AuthenticationRequired):
-        assert (
-            await deconz.gateway.get_gateway(hass, ENTRY_CONFIG, Mock(), Mock())
-            is False
-        )
+    ), pytest.raises(AuthenticationRequired):
+        assert await get_gateway(hass, ENTRY_CONFIG, Mock(), Mock()) is False
 
 
 async def test_get_gateway_fails_cannot_connect(hass):
@@ -189,8 +212,5 @@ async def test_get_gateway_fails_cannot_connect(hass):
     with patch(
         "pydeconz.DeconzSession.initialize",
         side_effect=pydeconz.errors.RequestError,
-    ), pytest.raises(deconz.errors.CannotConnect):
-        assert (
-            await deconz.gateway.get_gateway(hass, ENTRY_CONFIG, Mock(), Mock())
-            is False
-        )
+    ), pytest.raises(CannotConnect):
+        assert await get_gateway(hass, ENTRY_CONFIG, Mock(), Mock()) is False
diff --git a/tests/components/deconz/test_init.py b/tests/components/deconz/test_init.py
index 8d9d387c91c..ae7ce5b2a39 100644
--- a/tests/components/deconz/test_init.py
+++ b/tests/components/deconz/test_init.py
@@ -1,8 +1,15 @@
 """Test deCONZ component setup process."""
+
 import asyncio
 from copy import deepcopy
 
-from homeassistant.components import deconz
+from homeassistant.components.deconz import (
+    DeconzGateway,
+    async_setup_entry,
+    async_unload_entry,
+)
+from homeassistant.components.deconz.const import DOMAIN as DECONZ_DOMAIN
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
 
@@ -23,74 +30,76 @@ ENTRY2_UUID = "789ACE"
 
 async def setup_entry(hass, entry):
     """Test that setup entry works."""
-    with patch.object(
-        deconz.DeconzGateway, "async_setup", return_value=True
-    ), patch.object(
-        deconz.DeconzGateway, "async_update_device_registry", return_value=True
+    with patch.object(DeconzGateway, "async_setup", return_value=True), patch.object(
+        DeconzGateway, "async_update_device_registry", return_value=True
     ):
-        assert await deconz.async_setup_entry(hass, entry) is True
+        assert await async_setup_entry(hass, entry) is True
 
 
 async def test_setup_entry_fails(hass):
     """Test setup entry fails if deCONZ is not available."""
     with patch("pydeconz.DeconzSession.initialize", side_effect=Exception):
         await setup_deconz_integration(hass)
-    assert not hass.data[deconz.DOMAIN]
+    assert not hass.data[DECONZ_DOMAIN]
 
 
 async def test_setup_entry_no_available_bridge(hass):
     """Test setup entry fails if deCONZ is not available."""
     with patch("pydeconz.DeconzSession.initialize", side_effect=asyncio.TimeoutError):
         await setup_deconz_integration(hass)
-    assert not hass.data[deconz.DOMAIN]
+    assert not hass.data[DECONZ_DOMAIN]
 
 
 async def test_setup_entry_successful(hass):
     """Test setup entry is successful."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
-    assert hass.data[deconz.DOMAIN]
-    assert gateway.bridgeid in hass.data[deconz.DOMAIN]
-    assert hass.data[deconz.DOMAIN][gateway.bridgeid].master
+    assert hass.data[DECONZ_DOMAIN]
+    assert gateway.bridgeid in hass.data[DECONZ_DOMAIN]
+    assert hass.data[DECONZ_DOMAIN][gateway.bridgeid].master
 
 
 async def test_setup_entry_multiple_gateways(hass):
     """Test setup entry is successful with multiple gateways."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["config"]["bridgeid"] = "01234E56789B"
-    gateway2 = await setup_deconz_integration(
+    config_entry2 = await setup_deconz_integration(
         hass, get_state_response=data, entry_id="2"
     )
+    gateway2 = get_gateway_from_config_entry(hass, config_entry2)
 
-    assert len(hass.data[deconz.DOMAIN]) == 2
-    assert hass.data[deconz.DOMAIN][gateway.bridgeid].master
-    assert not hass.data[deconz.DOMAIN][gateway2.bridgeid].master
+    assert len(hass.data[DECONZ_DOMAIN]) == 2
+    assert hass.data[DECONZ_DOMAIN][gateway.bridgeid].master
+    assert not hass.data[DECONZ_DOMAIN][gateway2.bridgeid].master
 
 
 async def test_unload_entry(hass):
     """Test being able to unload an entry."""
-    gateway = await setup_deconz_integration(hass)
-    assert hass.data[deconz.DOMAIN]
+    config_entry = await setup_deconz_integration(hass)
+    assert hass.data[DECONZ_DOMAIN]
 
-    assert await deconz.async_unload_entry(hass, gateway.config_entry)
-    assert not hass.data[deconz.DOMAIN]
+    assert await async_unload_entry(hass, config_entry)
+    assert not hass.data[DECONZ_DOMAIN]
 
 
 async def test_unload_entry_multiple_gateways(hass):
     """Test being able to unload an entry and master gateway gets moved."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
 
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["config"]["bridgeid"] = "01234E56789B"
-    gateway2 = await setup_deconz_integration(
+    config_entry2 = await setup_deconz_integration(
         hass, get_state_response=data, entry_id="2"
     )
+    gateway2 = get_gateway_from_config_entry(hass, config_entry2)
 
-    assert len(hass.data[deconz.DOMAIN]) == 2
+    assert len(hass.data[DECONZ_DOMAIN]) == 2
 
-    assert await deconz.async_unload_entry(hass, gateway.config_entry)
+    assert await async_unload_entry(hass, config_entry)
 
-    assert len(hass.data[deconz.DOMAIN]) == 1
-    assert hass.data[deconz.DOMAIN][gateway2.bridgeid].master
+    assert len(hass.data[DECONZ_DOMAIN]) == 1
+    assert hass.data[DECONZ_DOMAIN][gateway2.bridgeid].master
diff --git a/tests/components/deconz/test_light.py b/tests/components/deconz/test_light.py
index 4e9f6b3d512..460f81e830c 100644
--- a/tests/components/deconz/test_light.py
+++ b/tests/components/deconz/test_light.py
@@ -1,8 +1,34 @@
 """deCONZ light platform tests."""
+
 from copy import deepcopy
 
-from homeassistant.components import deconz
-import homeassistant.components.light as light
+from homeassistant.components.deconz.const import (
+    CONF_ALLOW_DECONZ_GROUPS,
+    DOMAIN as DECONZ_DOMAIN,
+)
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS,
+    ATTR_COLOR_TEMP,
+    ATTR_EFFECT,
+    ATTR_FLASH,
+    ATTR_HS_COLOR,
+    ATTR_MAX_MIREDS,
+    ATTR_MIN_MIREDS,
+    ATTR_TRANSITION,
+    DOMAIN as LIGHT_DOMAIN,
+    EFFECT_COLORLOOP,
+    FLASH_LONG,
+    FLASH_SHORT,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ATTR_SUPPORTED_FEATURES,
+    STATE_OFF,
+    STATE_ON,
+)
 from homeassistant.setup import async_setup_component
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
@@ -83,17 +109,16 @@ async def test_platform_manually_configured(hass):
     """Test that we do not discover anything or try to set up a gateway."""
     assert (
         await async_setup_component(
-            hass, light.DOMAIN, {"light": {"platform": deconz.DOMAIN}}
+            hass, LIGHT_DOMAIN, {"light": {"platform": DECONZ_DOMAIN}}
         )
         is True
     )
-    assert deconz.DOMAIN not in hass.data
+    assert DECONZ_DOMAIN not in hass.data
 
 
 async def test_no_lights_or_groups(hass):
     """Test that no lights or groups entities are created."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    await setup_deconz_integration(hass)
     assert len(hass.states.async_all()) == 0
 
 
@@ -102,45 +127,40 @@ async def test_lights_and_groups(hass):
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["groups"] = deepcopy(GROUPS)
     data["lights"] = deepcopy(LIGHTS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
-    assert "light.rgb_light" in gateway.deconz_ids
-    assert "light.tunable_white_light" in gateway.deconz_ids
-    assert "light.light_group" in gateway.deconz_ids
-    assert "light.empty_group" not in gateway.deconz_ids
-    assert "light.on_off_switch" not in gateway.deconz_ids
-    assert "light.on_off_light" in gateway.deconz_ids
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
     assert len(hass.states.async_all()) == 6
 
     rgb_light = hass.states.get("light.rgb_light")
-    assert rgb_light.state == "on"
-    assert rgb_light.attributes["brightness"] == 255
-    assert rgb_light.attributes["hs_color"] == (224.235, 100.0)
+    assert rgb_light.state == STATE_ON
+    assert rgb_light.attributes[ATTR_BRIGHTNESS] == 255
+    assert rgb_light.attributes[ATTR_HS_COLOR] == (224.235, 100.0)
     assert rgb_light.attributes["is_deconz_group"] is False
-    assert rgb_light.attributes["supported_features"] == 61
+    assert rgb_light.attributes[ATTR_SUPPORTED_FEATURES] == 61
 
     tunable_white_light = hass.states.get("light.tunable_white_light")
-    assert tunable_white_light.state == "on"
-    assert tunable_white_light.attributes["color_temp"] == 2500
-    assert tunable_white_light.attributes["max_mireds"] == 454
-    assert tunable_white_light.attributes["min_mireds"] == 155
-    assert tunable_white_light.attributes["supported_features"] == 2
+    assert tunable_white_light.state == STATE_ON
+    assert tunable_white_light.attributes[ATTR_COLOR_TEMP] == 2500
+    assert tunable_white_light.attributes[ATTR_MAX_MIREDS] == 454
+    assert tunable_white_light.attributes[ATTR_MIN_MIREDS] == 155
+    assert tunable_white_light.attributes[ATTR_SUPPORTED_FEATURES] == 2
 
     tunable_white_light_bad_maxmin = hass.states.get(
         "light.tunable_white_light_with_bad_maxmin_values"
     )
-    assert tunable_white_light_bad_maxmin.state == "on"
-    assert tunable_white_light_bad_maxmin.attributes["color_temp"] == 2500
-    assert tunable_white_light_bad_maxmin.attributes["max_mireds"] == 650
-    assert tunable_white_light_bad_maxmin.attributes["min_mireds"] == 140
-    assert tunable_white_light_bad_maxmin.attributes["supported_features"] == 2
+    assert tunable_white_light_bad_maxmin.state == STATE_ON
+    assert tunable_white_light_bad_maxmin.attributes[ATTR_COLOR_TEMP] == 2500
+    assert tunable_white_light_bad_maxmin.attributes[ATTR_MAX_MIREDS] == 650
+    assert tunable_white_light_bad_maxmin.attributes[ATTR_MIN_MIREDS] == 140
+    assert tunable_white_light_bad_maxmin.attributes[ATTR_SUPPORTED_FEATURES] == 2
 
     on_off_light = hass.states.get("light.on_off_light")
-    assert on_off_light.state == "on"
-    assert on_off_light.attributes["supported_features"] == 0
+    assert on_off_light.state == STATE_ON
+    assert on_off_light.attributes[ATTR_SUPPORTED_FEATURES] == 0
 
     light_group = hass.states.get("light.light_group")
-    assert light_group.state == "on"
+    assert light_group.state == STATE_ON
     assert light_group.attributes["all_on"] is False
 
     empty_group = hass.states.get("light.empty_group")
@@ -157,21 +177,25 @@ async def test_lights_and_groups(hass):
     await hass.async_block_till_done()
 
     rgb_light = hass.states.get("light.rgb_light")
-    assert rgb_light.state == "off"
+    assert rgb_light.state == STATE_OFF
+
+    # Verify service calls
 
     rgb_light_device = gateway.api.lights["1"]
 
+    # Service turn on light with short color loop
+
     with patch.object(rgb_light_device, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            light.DOMAIN,
-            light.SERVICE_TURN_ON,
+            LIGHT_DOMAIN,
+            SERVICE_TURN_ON,
             {
-                "entity_id": "light.rgb_light",
-                "color_temp": 2500,
-                "brightness": 200,
-                "transition": 5,
-                "flash": "short",
-                "effect": "colorloop",
+                ATTR_ENTITY_ID: "light.rgb_light",
+                ATTR_COLOR_TEMP: 2500,
+                ATTR_BRIGHTNESS: 200,
+                ATTR_TRANSITION: 5,
+                ATTR_FLASH: FLASH_SHORT,
+                ATTR_EFFECT: EFFECT_COLORLOOP,
             },
             blocking=True,
         )
@@ -188,15 +212,17 @@ async def test_lights_and_groups(hass):
             },
         )
 
+    # Service turn on light disabling color loop with long flashing
+
     with patch.object(rgb_light_device, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            light.DOMAIN,
-            light.SERVICE_TURN_ON,
+            LIGHT_DOMAIN,
+            SERVICE_TURN_ON,
             {
-                "entity_id": "light.rgb_light",
-                "hs_color": (20, 30),
-                "flash": "long",
-                "effect": "None",
+                ATTR_ENTITY_ID: "light.rgb_light",
+                ATTR_HS_COLOR: (20, 30),
+                ATTR_FLASH: FLASH_LONG,
+                ATTR_EFFECT: "None",
             },
             blocking=True,
         )
@@ -207,11 +233,17 @@ async def test_lights_and_groups(hass):
             json={"xy": (0.411, 0.351), "alert": "lselect", "effect": "none"},
         )
 
+    # Service turn on light with short flashing
+
     with patch.object(rgb_light_device, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            light.DOMAIN,
-            light.SERVICE_TURN_OFF,
-            {"entity_id": "light.rgb_light", "transition": 5, "flash": "short"},
+            LIGHT_DOMAIN,
+            SERVICE_TURN_OFF,
+            {
+                ATTR_ENTITY_ID: "light.rgb_light",
+                ATTR_TRANSITION: 5,
+                ATTR_FLASH: FLASH_SHORT,
+            },
             blocking=True,
         )
         await hass.async_block_till_done()
@@ -227,11 +259,17 @@ async def test_lights_and_groups(hass):
     gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
+    # Service turn off light with short flashing
+
     with patch.object(rgb_light_device, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            light.DOMAIN,
-            light.SERVICE_TURN_OFF,
-            {"entity_id": "light.rgb_light", "transition": 5, "flash": "short"},
+            LIGHT_DOMAIN,
+            SERVICE_TURN_OFF,
+            {
+                ATTR_ENTITY_ID: "light.rgb_light",
+                ATTR_TRANSITION: 5,
+                ATTR_FLASH: FLASH_SHORT,
+            },
             blocking=True,
         )
         await hass.async_block_till_done()
@@ -241,11 +279,13 @@ async def test_lights_and_groups(hass):
             json={"bri": 0, "transitiontime": 50, "alert": "select"},
         )
 
+    # Service turn off light with long flashing
+
     with patch.object(rgb_light_device, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            light.DOMAIN,
-            light.SERVICE_TURN_OFF,
-            {"entity_id": "light.rgb_light", "flash": "long"},
+            LIGHT_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "light.rgb_light", ATTR_FLASH: FLASH_LONG},
             blocking=True,
         )
         await hass.async_block_till_done()
@@ -253,63 +293,40 @@ async def test_lights_and_groups(hass):
             "put", "/lights/1/state", json={"alert": "lselect"}
         )
 
-    await gateway.async_reset()
+    await hass.config_entries.async_unload(config_entry.entry_id)
 
     assert len(hass.states.async_all()) == 0
 
 
 async def test_disable_light_groups(hass):
-    """Test successful creation of sensor entities."""
+    """Test disallowing light groups work."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["groups"] = deepcopy(GROUPS)
     data["lights"] = deepcopy(LIGHTS)
-    gateway = await setup_deconz_integration(
+    config_entry = await setup_deconz_integration(
         hass,
-        options={deconz.gateway.CONF_ALLOW_DECONZ_GROUPS: False},
+        options={CONF_ALLOW_DECONZ_GROUPS: False},
         get_state_response=data,
     )
-    assert "light.rgb_light" in gateway.deconz_ids
-    assert "light.tunable_white_light" in gateway.deconz_ids
-    assert "light.light_group" not in gateway.deconz_ids
-    assert "light.empty_group" not in gateway.deconz_ids
-    assert "light.on_off_switch" not in gateway.deconz_ids
-    # 3 entities
+
     assert len(hass.states.async_all()) == 5
-
-    rgb_light = hass.states.get("light.rgb_light")
-    assert rgb_light is not None
-
-    tunable_white_light = hass.states.get("light.tunable_white_light")
-    assert tunable_white_light is not None
-
-    light_group = hass.states.get("light.light_group")
-    assert light_group is None
-
-    empty_group = hass.states.get("light.empty_group")
-    assert empty_group is None
+    assert hass.states.get("light.rgb_light")
+    assert hass.states.get("light.tunable_white_light")
+    assert hass.states.get("light.light_group") is None
+    assert hass.states.get("light.empty_group") is None
 
     hass.config_entries.async_update_entry(
-        gateway.config_entry, options={deconz.gateway.CONF_ALLOW_DECONZ_GROUPS: True}
+        config_entry, options={CONF_ALLOW_DECONZ_GROUPS: True}
     )
     await hass.async_block_till_done()
 
-    assert "light.rgb_light" in gateway.deconz_ids
-    assert "light.tunable_white_light" in gateway.deconz_ids
-    assert "light.light_group" in gateway.deconz_ids
-    assert "light.empty_group" not in gateway.deconz_ids
-    assert "light.on_off_switch" not in gateway.deconz_ids
-    # 3 entities
     assert len(hass.states.async_all()) == 6
+    assert hass.states.get("light.light_group")
 
     hass.config_entries.async_update_entry(
-        gateway.config_entry, options={deconz.gateway.CONF_ALLOW_DECONZ_GROUPS: False}
+        config_entry, options={CONF_ALLOW_DECONZ_GROUPS: False}
     )
     await hass.async_block_till_done()
 
-    assert "light.rgb_light" in gateway.deconz_ids
-    assert "light.tunable_white_light" in gateway.deconz_ids
-    assert "light.light_group" not in gateway.deconz_ids
-    assert "light.empty_group" not in gateway.deconz_ids
-    assert "light.on_off_switch" not in gateway.deconz_ids
-    # 3 entities
     assert len(hass.states.async_all()) == 5
+    assert hass.states.get("light.light_group") is None
diff --git a/tests/components/deconz/test_lock.py b/tests/components/deconz/test_lock.py
new file mode 100644
index 00000000000..2acfb440b13
--- /dev/null
+++ b/tests/components/deconz/test_lock.py
@@ -0,0 +1,108 @@
+"""deCONZ lock platform tests."""
+
+from copy import deepcopy
+
+from homeassistant.components.deconz.const import DOMAIN as DECONZ_DOMAIN
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.components.lock import (
+    DOMAIN as LOCK_DOMAIN,
+    SERVICE_LOCK,
+    SERVICE_UNLOCK,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_LOCKED, STATE_UNLOCKED
+from homeassistant.setup import async_setup_component
+
+from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
+
+from tests.async_mock import patch
+
+LOCKS = {
+    "1": {
+        "etag": "5c2ec06cde4bd654aef3a555fcd8ad12",
+        "hascolor": False,
+        "lastannounced": None,
+        "lastseen": "2020-08-22T15:29:03Z",
+        "manufacturername": "Danalock",
+        "modelid": "V3-BTZB",
+        "name": "Door lock",
+        "state": {"alert": "none", "on": False, "reachable": True},
+        "swversion": "19042019",
+        "type": "Door Lock",
+        "uniqueid": "00:00:00:00:00:00:00:00-00",
+    }
+}
+
+
+async def test_platform_manually_configured(hass):
+    """Test that we do not discover anything or try to set up a gateway."""
+    assert (
+        await async_setup_component(
+            hass, LOCK_DOMAIN, {"lock": {"platform": DECONZ_DOMAIN}}
+        )
+        is True
+    )
+    assert DECONZ_DOMAIN not in hass.data
+
+
+async def test_no_locks(hass):
+    """Test that no lock entities are created."""
+    await setup_deconz_integration(hass)
+    assert len(hass.states.async_all()) == 0
+
+
+async def test_locks(hass):
+    """Test that all supported lock entities are created."""
+    data = deepcopy(DECONZ_WEB_REQUEST)
+    data["lights"] = deepcopy(LOCKS)
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+
+    assert len(hass.states.async_all()) == 1
+    assert hass.states.get("lock.door_lock").state == STATE_UNLOCKED
+
+    door_lock = hass.states.get("lock.door_lock")
+    assert door_lock.state == STATE_UNLOCKED
+
+    state_changed_event = {
+        "t": "event",
+        "e": "changed",
+        "r": "lights",
+        "id": "1",
+        "state": {"on": True},
+    }
+    gateway.api.event_handler(state_changed_event)
+    await hass.async_block_till_done()
+
+    assert hass.states.get("lock.door_lock").state == STATE_LOCKED
+
+    # Verify service calls
+
+    door_lock_device = gateway.api.lights["1"]
+
+    # Service lock door
+
+    with patch.object(door_lock_device, "_request", return_value=True) as set_callback:
+        await hass.services.async_call(
+            LOCK_DOMAIN,
+            SERVICE_LOCK,
+            {ATTR_ENTITY_ID: "lock.door_lock"},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with("put", "/lights/1/state", json={"on": True})
+
+    # Service unlock door
+
+    with patch.object(door_lock_device, "_request", return_value=True) as set_callback:
+        await hass.services.async_call(
+            LOCK_DOMAIN,
+            SERVICE_UNLOCK,
+            {ATTR_ENTITY_ID: "lock.door_lock"},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with("put", "/lights/1/state", json={"on": False})
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
+
+    assert len(hass.states.async_all()) == 0
diff --git a/tests/components/deconz/test_scene.py b/tests/components/deconz/test_scene.py
index 538c849e831..c4a92538815 100644
--- a/tests/components/deconz/test_scene.py
+++ b/tests/components/deconz/test_scene.py
@@ -1,8 +1,11 @@
 """deCONZ scene platform tests."""
+
 from copy import deepcopy
 
-from homeassistant.components import deconz
-import homeassistant.components.scene as scene
+from homeassistant.components.deconz import DOMAIN as DECONZ_DOMAIN
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.components.scene import DOMAIN as SCENE_DOMAIN, SERVICE_TURN_ON
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.setup import async_setup_component
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
@@ -26,17 +29,16 @@ async def test_platform_manually_configured(hass):
     """Test that we do not discover anything or try to set up a gateway."""
     assert (
         await async_setup_component(
-            hass, scene.DOMAIN, {"scene": {"platform": deconz.DOMAIN}}
+            hass, SCENE_DOMAIN, {"scene": {"platform": DECONZ_DOMAIN}}
         )
         is True
     )
-    assert deconz.DOMAIN not in hass.data
+    assert DECONZ_DOMAIN not in hass.data
 
 
 async def test_no_scenes(hass):
     """Test that scenes can be loaded without scenes being available."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    await setup_deconz_integration(hass)
     assert len(hass.states.async_all()) == 0
 
 
@@ -44,23 +46,28 @@ async def test_scenes(hass):
     """Test that scenes works."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["groups"] = deepcopy(GROUPS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
-    assert "scene.light_group_scene" in gateway.deconz_ids
     assert len(hass.states.async_all()) == 1
+    assert hass.states.get("scene.light_group_scene")
 
-    light_group_scene = hass.states.get("scene.light_group_scene")
-    assert light_group_scene
+    # Verify service calls
 
     group_scene = gateway.api.groups["1"].scenes["1"]
 
+    # Service turn on scene
+
     with patch.object(group_scene, "_request", return_value=True) as set_callback:
         await hass.services.async_call(
-            "scene", "turn_on", {"entity_id": "scene.light_group_scene"}, blocking=True
+            SCENE_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "scene.light_group_scene"},
+            blocking=True,
         )
         await hass.async_block_till_done()
         set_callback.assert_called_with("put", "/groups/1/scenes/1/recall", json={})
 
-    await gateway.async_reset()
+    await hass.config_entries.async_unload(config_entry.entry_id)
 
     assert len(hass.states.async_all()) == 0
diff --git a/tests/components/deconz/test_sensor.py b/tests/components/deconz/test_sensor.py
index 9d87c7b91cb..8b2f1e4da76 100644
--- a/tests/components/deconz/test_sensor.py
+++ b/tests/components/deconz/test_sensor.py
@@ -1,8 +1,13 @@
 """deCONZ sensor platform tests."""
+
 from copy import deepcopy
 
-from homeassistant.components import deconz
-import homeassistant.components.sensor as sensor
+from homeassistant.components.deconz.const import (
+    CONF_ALLOW_CLIP_SENSOR,
+    DOMAIN as DECONZ_DOMAIN,
+)
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.const import (
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_ILLUMINANCE,
@@ -84,17 +89,16 @@ async def test_platform_manually_configured(hass):
     """Test that we do not discover anything or try to set up a gateway."""
     assert (
         await async_setup_component(
-            hass, sensor.DOMAIN, {"sensor": {"platform": deconz.DOMAIN}}
+            hass, SENSOR_DOMAIN, {"sensor": {"platform": DECONZ_DOMAIN}}
         )
         is True
     )
-    assert deconz.DOMAIN not in hass.data
+    assert DECONZ_DOMAIN not in hass.data
 
 
 async def test_no_sensors(hass):
     """Test that no sensors in deconz results in no sensor entities."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    await setup_deconz_integration(hass)
     assert len(hass.states.async_all()) == 0
 
 
@@ -102,41 +106,25 @@ async def test_sensors(hass):
     """Test successful creation of sensor entities."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
-    assert "sensor.light_level_sensor" in gateway.deconz_ids
-    assert "sensor.presence_sensor" not in gateway.deconz_ids
-    assert "sensor.switch_1" not in gateway.deconz_ids
-    assert "sensor.switch_1_battery_level" not in gateway.deconz_ids
-    assert "sensor.switch_2" not in gateway.deconz_ids
-    assert "sensor.switch_2_battery_level" in gateway.deconz_ids
-    assert "sensor.daylight_sensor" not in gateway.deconz_ids
-    assert "sensor.power_sensor" in gateway.deconz_ids
-    assert "sensor.consumption_sensor" in gateway.deconz_ids
-    assert "sensor.clip_light_level_sensor" not in gateway.deconz_ids
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+
     assert len(hass.states.async_all()) == 5
 
     light_level_sensor = hass.states.get("sensor.light_level_sensor")
     assert light_level_sensor.state == "999.8"
     assert light_level_sensor.attributes["device_class"] == DEVICE_CLASS_ILLUMINANCE
 
-    presence_sensor = hass.states.get("sensor.presence_sensor")
-    assert presence_sensor is None
-
-    switch_1 = hass.states.get("sensor.switch_1")
-    assert switch_1 is None
-
-    switch_1_battery_level = hass.states.get("sensor.switch_1_battery_level")
-    assert switch_1_battery_level is None
-
-    switch_2 = hass.states.get("sensor.switch_2")
-    assert switch_2 is None
+    assert hass.states.get("sensor.presence_sensor") is None
+    assert hass.states.get("sensor.switch_1") is None
+    assert hass.states.get("sensor.switch_1_battery_level") is None
+    assert hass.states.get("sensor.switch_2") is None
 
     switch_2_battery_level = hass.states.get("sensor.switch_2_battery_level")
     assert switch_2_battery_level.state == "100"
     assert switch_2_battery_level.attributes["device_class"] == DEVICE_CLASS_BATTERY
 
-    daylight_sensor = hass.states.get("sensor.daylight_sensor")
-    assert daylight_sensor is None
+    assert hass.states.get("sensor.daylight_sensor") is None
 
     power_sensor = hass.states.get("sensor.power_sensor")
     assert power_sensor.state == "6"
@@ -146,6 +134,10 @@ async def test_sensors(hass):
     assert consumption_sensor.state == "0.002"
     assert "device_class" not in consumption_sensor.attributes
 
+    assert hass.states.get("sensor.clip_light_level_sensor") is None
+
+    # Event signals new light level
+
     state_changed_event = {
         "t": "event",
         "e": "changed",
@@ -155,6 +147,10 @@ async def test_sensors(hass):
     }
     gateway.api.event_handler(state_changed_event)
 
+    assert hass.states.get("sensor.light_level_sensor").state == "1.6"
+
+    # Event signals new battery level
+
     state_changed_event = {
         "t": "event",
         "e": "changed",
@@ -165,13 +161,9 @@ async def test_sensors(hass):
     gateway.api.event_handler(state_changed_event)
     await hass.async_block_till_done()
 
-    light_level_sensor = hass.states.get("sensor.light_level_sensor")
-    assert light_level_sensor.state == "1.6"
+    assert hass.states.get("sensor.switch_2_battery_level").state == "75"
 
-    switch_2_battery_level = hass.states.get("sensor.switch_2_battery_level")
-    assert switch_2_battery_level.state == "75"
-
-    await gateway.async_reset()
+    await hass.config_entries.async_unload(config_entry.entry_id)
 
     assert len(hass.states.async_all()) == 0
 
@@ -180,92 +172,41 @@ async def test_allow_clip_sensors(hass):
     """Test that CLIP sensors can be allowed."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = deepcopy(SENSORS)
-    gateway = await setup_deconz_integration(
+    config_entry = await setup_deconz_integration(
         hass,
-        options={deconz.gateway.CONF_ALLOW_CLIP_SENSOR: True},
+        options={CONF_ALLOW_CLIP_SENSOR: True},
         get_state_response=data,
     )
-    assert "sensor.light_level_sensor" in gateway.deconz_ids
-    assert "sensor.presence_sensor" not in gateway.deconz_ids
-    assert "sensor.switch_1" not in gateway.deconz_ids
-    assert "sensor.switch_1_battery_level" not in gateway.deconz_ids
-    assert "sensor.switch_2" not in gateway.deconz_ids
-    assert "sensor.switch_2_battery_level" in gateway.deconz_ids
-    assert "sensor.daylight_sensor" not in gateway.deconz_ids
-    assert "sensor.power_sensor" in gateway.deconz_ids
-    assert "sensor.consumption_sensor" in gateway.deconz_ids
-    assert "sensor.clip_light_level_sensor" in gateway.deconz_ids
+
     assert len(hass.states.async_all()) == 6
+    assert hass.states.get("sensor.clip_light_level_sensor").state == "999.8"
 
-    light_level_sensor = hass.states.get("sensor.light_level_sensor")
-    assert light_level_sensor.state == "999.8"
-
-    presence_sensor = hass.states.get("sensor.presence_sensor")
-    assert presence_sensor is None
-
-    switch_1 = hass.states.get("sensor.switch_1")
-    assert switch_1 is None
-
-    switch_1_battery_level = hass.states.get("sensor.switch_1_battery_level")
-    assert switch_1_battery_level is None
-
-    switch_2 = hass.states.get("sensor.switch_2")
-    assert switch_2 is None
-
-    switch_2_battery_level = hass.states.get("sensor.switch_2_battery_level")
-    assert switch_2_battery_level.state == "100"
-
-    daylight_sensor = hass.states.get("sensor.daylight_sensor")
-    assert daylight_sensor is None
-
-    power_sensor = hass.states.get("sensor.power_sensor")
-    assert power_sensor.state == "6"
-
-    consumption_sensor = hass.states.get("sensor.consumption_sensor")
-    assert consumption_sensor.state == "0.002"
-
-    clip_light_level_sensor = hass.states.get("sensor.clip_light_level_sensor")
-    assert clip_light_level_sensor.state == "999.8"
+    # Disallow clip sensors
 
     hass.config_entries.async_update_entry(
-        gateway.config_entry, options={deconz.gateway.CONF_ALLOW_CLIP_SENSOR: False}
+        config_entry, options={CONF_ALLOW_CLIP_SENSOR: False}
     )
     await hass.async_block_till_done()
 
-    assert "sensor.light_level_sensor" in gateway.deconz_ids
-    assert "sensor.presence_sensor" not in gateway.deconz_ids
-    assert "sensor.switch_1" not in gateway.deconz_ids
-    assert "sensor.switch_1_battery_level" not in gateway.deconz_ids
-    assert "sensor.switch_2" not in gateway.deconz_ids
-    assert "sensor.switch_2_battery_level" in gateway.deconz_ids
-    assert "sensor.daylight_sensor" not in gateway.deconz_ids
-    assert "sensor.power_sensor" in gateway.deconz_ids
-    assert "sensor.consumption_sensor" in gateway.deconz_ids
-    assert "sensor.clip_light_level_sensor" not in gateway.deconz_ids
     assert len(hass.states.async_all()) == 5
+    assert hass.states.get("sensor.clip_light_level_sensor") is None
+
+    # Allow clip sensors
 
     hass.config_entries.async_update_entry(
-        gateway.config_entry, options={deconz.gateway.CONF_ALLOW_CLIP_SENSOR: True}
+        config_entry, options={CONF_ALLOW_CLIP_SENSOR: True}
     )
     await hass.async_block_till_done()
 
-    assert "sensor.light_level_sensor" in gateway.deconz_ids
-    assert "sensor.presence_sensor" not in gateway.deconz_ids
-    assert "sensor.switch_1" not in gateway.deconz_ids
-    assert "sensor.switch_1_battery_level" not in gateway.deconz_ids
-    assert "sensor.switch_2" not in gateway.deconz_ids
-    assert "sensor.switch_2_battery_level" in gateway.deconz_ids
-    assert "sensor.daylight_sensor" not in gateway.deconz_ids
-    assert "sensor.power_sensor" in gateway.deconz_ids
-    assert "sensor.consumption_sensor" in gateway.deconz_ids
-    assert "sensor.clip_light_level_sensor" in gateway.deconz_ids
     assert len(hass.states.async_all()) == 6
+    assert hass.states.get("sensor.clip_light_level_sensor")
 
 
 async def test_add_new_sensor(hass):
     """Test that adding a new sensor works."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+    assert len(hass.states.async_all()) == 0
 
     state_added_event = {
         "t": "event",
@@ -277,28 +218,27 @@ async def test_add_new_sensor(hass):
     gateway.api.event_handler(state_added_event)
     await hass.async_block_till_done()
 
-    assert "sensor.light_level_sensor" in gateway.deconz_ids
-
-    light_level_sensor = hass.states.get("sensor.light_level_sensor")
-    assert light_level_sensor.state == "999.8"
+    assert len(hass.states.async_all()) == 1
+    assert hass.states.get("sensor.light_level_sensor").state == "999.8"
 
 
 async def test_add_battery_later(hass):
     """Test that a sensor without an initial battery state creates a battery sensor once state exist."""
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["sensors"] = {"1": deepcopy(SENSORS["3"])}
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
     remote = gateway.api.sensors["1"]
-    assert len(gateway.deconz_ids) == 0
+
+    assert len(hass.states.async_all()) == 0
     assert len(gateway.events) == 1
-    assert len(remote._callbacks) == 2
+    assert len(remote._callbacks) == 2  # Event and battery tracker
 
     remote.update({"config": {"battery": 50}})
     await hass.async_block_till_done()
 
-    assert len(gateway.deconz_ids) == 1
+    assert len(hass.states.async_all()) == 1
     assert len(gateway.events) == 1
-    assert len(remote._callbacks) == 2
+    assert len(remote._callbacks) == 2  # Event and battery entity
 
-    battery_sensor = hass.states.get("sensor.switch_1_battery_level")
-    assert battery_sensor is not None
+    assert hass.states.get("sensor.switch_1_battery_level")
diff --git a/tests/components/deconz/test_services.py b/tests/components/deconz/test_services.py
index cfbc8cae56c..26524553dbe 100644
--- a/tests/components/deconz/test_services.py
+++ b/tests/components/deconz/test_services.py
@@ -5,8 +5,22 @@ from copy import deepcopy
 import pytest
 import voluptuous as vol
 
-from homeassistant.components import deconz
-from homeassistant.components.deconz.const import CONF_BRIDGE_ID
+from homeassistant.components.deconz.const import (
+    CONF_BRIDGE_ID,
+    DOMAIN as DECONZ_DOMAIN,
+)
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.components.deconz.services import (
+    DECONZ_SERVICES,
+    SERVICE_CONFIGURE_DEVICE,
+    SERVICE_DATA,
+    SERVICE_DEVICE_REFRESH,
+    SERVICE_ENTITY,
+    SERVICE_FIELD,
+    SERVICE_REMOVE_ORPHANED_ENTRIES,
+    async_setup_services,
+    async_unload_services,
+)
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.helpers.entity_registry import async_entries_for_config_entry
 
@@ -61,33 +75,33 @@ SWITCH = {
 
 async def test_service_setup(hass):
     """Verify service setup works."""
-    assert deconz.services.DECONZ_SERVICES not in hass.data
+    assert DECONZ_SERVICES not in hass.data
     with patch(
         "homeassistant.core.ServiceRegistry.async_register", return_value=Mock(True)
     ) as async_register:
-        await deconz.services.async_setup_services(hass)
-        assert hass.data[deconz.services.DECONZ_SERVICES] is True
+        await async_setup_services(hass)
+        assert hass.data[DECONZ_SERVICES] is True
         assert async_register.call_count == 3
 
 
 async def test_service_setup_already_registered(hass):
     """Make sure that services are only registered once."""
-    hass.data[deconz.services.DECONZ_SERVICES] = True
+    hass.data[DECONZ_SERVICES] = True
     with patch(
         "homeassistant.core.ServiceRegistry.async_register", return_value=Mock(True)
     ) as async_register:
-        await deconz.services.async_setup_services(hass)
+        await async_setup_services(hass)
         async_register.assert_not_called()
 
 
 async def test_service_unload(hass):
     """Verify service unload works."""
-    hass.data[deconz.services.DECONZ_SERVICES] = True
+    hass.data[DECONZ_SERVICES] = True
     with patch(
         "homeassistant.core.ServiceRegistry.async_remove", return_value=Mock(True)
     ) as async_remove:
-        await deconz.services.async_unload_services(hass)
-        assert hass.data[deconz.services.DECONZ_SERVICES] is False
+        await async_unload_services(hass)
+        assert hass.data[DECONZ_SERVICES] is False
         assert async_remove.call_count == 3
 
 
@@ -96,8 +110,8 @@ async def test_service_unload_not_registered(hass):
     with patch(
         "homeassistant.core.ServiceRegistry.async_remove", return_value=Mock(True)
     ) as async_remove:
-        await deconz.services.async_unload_services(hass)
-        assert deconz.services.DECONZ_SERVICES not in hass.data
+        await async_unload_services(hass)
+        assert DECONZ_SERVICES not in hass.data
         async_remove.assert_not_called()
 
 
@@ -106,14 +120,14 @@ async def test_configure_service_with_field(hass):
     await setup_deconz_integration(hass)
 
     data = {
-        deconz.services.SERVICE_FIELD: "/light/2",
+        SERVICE_FIELD: "/light/2",
         CONF_BRIDGE_ID: BRIDGEID,
-        deconz.services.SERVICE_DATA: {"on": True, "attr1": 10, "attr2": 20},
+        SERVICE_DATA: {"on": True, "attr1": 10, "attr2": 20},
     }
 
     with patch("pydeconz.DeconzSession.request", return_value=Mock(True)) as put_state:
         await hass.services.async_call(
-            deconz.DOMAIN, deconz.services.SERVICE_CONFIGURE_DEVICE, service_data=data
+            DECONZ_DOMAIN, SERVICE_CONFIGURE_DEVICE, service_data=data
         )
         await hass.async_block_till_done()
         put_state.assert_called_with(
@@ -123,17 +137,18 @@ async def test_configure_service_with_field(hass):
 
 async def test_configure_service_with_entity(hass):
     """Test that service invokes pydeconz with the correct path and data."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
     gateway.deconz_ids["light.test"] = "/light/1"
     data = {
-        deconz.services.SERVICE_ENTITY: "light.test",
-        deconz.services.SERVICE_DATA: {"on": True, "attr1": 10, "attr2": 20},
+        SERVICE_ENTITY: "light.test",
+        SERVICE_DATA: {"on": True, "attr1": 10, "attr2": 20},
     }
 
     with patch("pydeconz.DeconzSession.request", return_value=Mock(True)) as put_state:
         await hass.services.async_call(
-            deconz.DOMAIN, deconz.services.SERVICE_CONFIGURE_DEVICE, service_data=data
+            DECONZ_DOMAIN, SERVICE_CONFIGURE_DEVICE, service_data=data
         )
         await hass.async_block_till_done()
         put_state.assert_called_with(
@@ -143,18 +158,19 @@ async def test_configure_service_with_entity(hass):
 
 async def test_configure_service_with_entity_and_field(hass):
     """Test that service invokes pydeconz with the correct path and data."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
     gateway.deconz_ids["light.test"] = "/light/1"
     data = {
-        deconz.services.SERVICE_ENTITY: "light.test",
-        deconz.services.SERVICE_FIELD: "/state",
-        deconz.services.SERVICE_DATA: {"on": True, "attr1": 10, "attr2": 20},
+        SERVICE_ENTITY: "light.test",
+        SERVICE_FIELD: "/state",
+        SERVICE_DATA: {"on": True, "attr1": 10, "attr2": 20},
     }
 
     with patch("pydeconz.DeconzSession.request", return_value=Mock(True)) as put_state:
         await hass.services.async_call(
-            deconz.DOMAIN, deconz.services.SERVICE_CONFIGURE_DEVICE, service_data=data
+            DECONZ_DOMAIN, SERVICE_CONFIGURE_DEVICE, service_data=data
         )
         await hass.async_block_till_done()
         put_state.assert_called_with(
@@ -166,11 +182,11 @@ async def test_configure_service_with_faulty_field(hass):
     """Test that service invokes pydeconz with the correct path and data."""
     await setup_deconz_integration(hass)
 
-    data = {deconz.services.SERVICE_FIELD: "light/2", deconz.services.SERVICE_DATA: {}}
+    data = {SERVICE_FIELD: "light/2", SERVICE_DATA: {}}
 
     with pytest.raises(vol.Invalid):
         await hass.services.async_call(
-            deconz.DOMAIN, deconz.services.SERVICE_CONFIGURE_DEVICE, service_data=data
+            DECONZ_DOMAIN, SERVICE_CONFIGURE_DEVICE, service_data=data
         )
         await hass.async_block_till_done()
 
@@ -180,13 +196,13 @@ async def test_configure_service_with_faulty_entity(hass):
     await setup_deconz_integration(hass)
 
     data = {
-        deconz.services.SERVICE_ENTITY: "light.nonexisting",
-        deconz.services.SERVICE_DATA: {},
+        SERVICE_ENTITY: "light.nonexisting",
+        SERVICE_DATA: {},
     }
 
     with patch("pydeconz.DeconzSession.request", return_value=Mock(True)) as put_state:
         await hass.services.async_call(
-            deconz.DOMAIN, deconz.services.SERVICE_CONFIGURE_DEVICE, service_data=data
+            DECONZ_DOMAIN, SERVICE_CONFIGURE_DEVICE, service_data=data
         )
         await hass.async_block_till_done()
         put_state.assert_not_called()
@@ -194,7 +210,8 @@ async def test_configure_service_with_faulty_entity(hass):
 
 async def test_service_refresh_devices(hass):
     """Test that service can refresh devices."""
-    gateway = await setup_deconz_integration(hass)
+    config_entry = await setup_deconz_integration(hass)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
     data = {CONF_BRIDGE_ID: BRIDGEID}
 
@@ -203,7 +220,7 @@ async def test_service_refresh_devices(hass):
         return_value={"groups": GROUP, "lights": LIGHT, "sensors": SENSOR},
     ):
         await hass.services.async_call(
-            deconz.DOMAIN, deconz.services.SERVICE_DEVICE_REFRESH, service_data=data
+            DECONZ_DOMAIN, SERVICE_DEVICE_REFRESH, service_data=data
         )
         await hass.async_block_till_done()
 
@@ -220,13 +237,13 @@ async def test_remove_orphaned_entries_service(hass):
     data = deepcopy(DECONZ_WEB_REQUEST)
     data["lights"] = deepcopy(LIGHT)
     data["sensors"] = deepcopy(SWITCH)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
 
     data = {CONF_BRIDGE_ID: BRIDGEID}
 
     device_registry = await hass.helpers.device_registry.async_get_registry()
     device = device_registry.async_get_or_create(
-        config_entry_id=gateway.config_entry.entry_id, identifiers={("mac", "123")}
+        config_entry_id=config_entry.entry_id, identifiers={("mac", "123")}
     )
 
     assert (
@@ -234,34 +251,30 @@ async def test_remove_orphaned_entries_service(hass):
             [
                 entry
                 for entry in device_registry.devices.values()
-                if gateway.config_entry.entry_id in entry.config_entries
+                if config_entry.entry_id in entry.config_entries
             ]
         )
-        == 4  # Gateway, light, switch and orphan
+        == 5  # Host, gateway, light, switch and orphan
     )
 
     entity_registry = await hass.helpers.entity_registry.async_get_registry()
     entity_registry.async_get_or_create(
         SENSOR_DOMAIN,
-        deconz.DOMAIN,
+        DECONZ_DOMAIN,
         "12345",
         suggested_object_id="Orphaned sensor",
-        config_entry=gateway.config_entry,
+        config_entry=config_entry,
         device_id=device.id,
     )
 
     assert (
-        len(
-            async_entries_for_config_entry(
-                entity_registry, gateway.config_entry.entry_id
-            )
-        )
+        len(async_entries_for_config_entry(entity_registry, config_entry.entry_id))
         == 3  # Light, switch battery and orphan
     )
 
     await hass.services.async_call(
-        deconz.DOMAIN,
-        deconz.services.SERVICE_REMOVE_ORPHANED_ENTRIES,
+        DECONZ_DOMAIN,
+        SERVICE_REMOVE_ORPHANED_ENTRIES,
         service_data=data,
     )
     await hass.async_block_till_done()
@@ -271,17 +284,13 @@ async def test_remove_orphaned_entries_service(hass):
             [
                 entry
                 for entry in device_registry.devices.values()
-                if gateway.config_entry.entry_id in entry.config_entries
+                if config_entry.entry_id in entry.config_entries
             ]
         )
-        == 3  # Gateway, light and switch
+        == 4  # Host, gateway, light and switch
     )
 
     assert (
-        len(
-            async_entries_for_config_entry(
-                entity_registry, gateway.config_entry.entry_id
-            )
-        )
+        len(async_entries_for_config_entry(entity_registry, config_entry.entry_id))
         == 2  # Light and switch battery
     )
diff --git a/tests/components/deconz/test_switch.py b/tests/components/deconz/test_switch.py
index b441868859b..4f23be3d1e3 100644
--- a/tests/components/deconz/test_switch.py
+++ b/tests/components/deconz/test_switch.py
@@ -1,15 +1,22 @@
 """deCONZ switch platform tests."""
+
 from copy import deepcopy
 
-from homeassistant.components import deconz
-import homeassistant.components.switch as switch
+from homeassistant.components.deconz import DOMAIN as DECONZ_DOMAIN
+from homeassistant.components.deconz.gateway import get_gateway_from_config_entry
+from homeassistant.components.switch import (
+    DOMAIN as SWITCH_DOMAIN,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+)
+from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
 from homeassistant.setup import async_setup_component
 
 from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration
 
 from tests.async_mock import patch
 
-SWITCHES = {
+POWER_PLUGS = {
     "1": {
         "id": "On off switch id",
         "name": "On off switch",
@@ -25,20 +32,13 @@ SWITCHES = {
         "uniqueid": "00:00:00:00:00:00:00:01-00",
     },
     "3": {
-        "id": "Warning device id",
-        "name": "Warning device",
-        "type": "Warning device",
-        "state": {"alert": "lselect", "reachable": True},
-        "uniqueid": "00:00:00:00:00:00:00:02-00",
-    },
-    "4": {
         "id": "Unsupported switch id",
         "name": "Unsupported switch",
-        "type": "Not a smart plug",
+        "type": "Not a switch",
         "state": {"reachable": True},
         "uniqueid": "00:00:00:00:00:00:00:03-00",
     },
-    "5": {
+    "4": {
         "id": "On off relay id",
         "name": "On off relay",
         "state": {"on": True, "reachable": True},
@@ -47,48 +47,53 @@ SWITCHES = {
     },
 }
 
+SIRENS = {
+    "1": {
+        "id": "Warning device id",
+        "name": "Warning device",
+        "type": "Warning device",
+        "state": {"alert": "lselect", "reachable": True},
+        "uniqueid": "00:00:00:00:00:00:00:00-00",
+    },
+    "2": {
+        "id": "Unsupported switch id",
+        "name": "Unsupported switch",
+        "type": "Not a switch",
+        "state": {"reachable": True},
+        "uniqueid": "00:00:00:00:00:00:00:01-00",
+    },
+}
+
 
 async def test_platform_manually_configured(hass):
     """Test that we do not discover anything or try to set up a gateway."""
     assert (
         await async_setup_component(
-            hass, switch.DOMAIN, {"switch": {"platform": deconz.DOMAIN}}
+            hass, SWITCH_DOMAIN, {"switch": {"platform": DECONZ_DOMAIN}}
         )
         is True
     )
-    assert deconz.DOMAIN not in hass.data
+    assert DECONZ_DOMAIN not in hass.data
 
 
 async def test_no_switches(hass):
     """Test that no switch entities are created."""
-    gateway = await setup_deconz_integration(hass)
-    assert len(gateway.deconz_ids) == 0
+    await setup_deconz_integration(hass)
     assert len(hass.states.async_all()) == 0
 
 
-async def test_switches(hass):
+async def test_power_plugs(hass):
     """Test that all supported switch entities are created."""
     data = deepcopy(DECONZ_WEB_REQUEST)
-    data["lights"] = deepcopy(SWITCHES)
-    gateway = await setup_deconz_integration(hass, get_state_response=data)
-    assert "switch.on_off_switch" in gateway.deconz_ids
-    assert "switch.smart_plug" in gateway.deconz_ids
-    assert "switch.warning_device" in gateway.deconz_ids
-    assert "switch.unsupported_switch" not in gateway.deconz_ids
-    assert "switch.on_off_relay" in gateway.deconz_ids
-    assert len(hass.states.async_all()) == 5
+    data["lights"] = deepcopy(POWER_PLUGS)
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
 
-    on_off_switch = hass.states.get("switch.on_off_switch")
-    assert on_off_switch.state == "on"
-
-    smart_plug = hass.states.get("switch.smart_plug")
-    assert smart_plug.state == "off"
-
-    warning_device = hass.states.get("switch.warning_device")
-    assert warning_device.state == "on"
-
-    on_off_relay = hass.states.get("switch.on_off_relay")
-    assert on_off_relay.state == "on"
+    assert len(hass.states.async_all()) == 4
+    assert hass.states.get("switch.on_off_switch").state == STATE_ON
+    assert hass.states.get("switch.smart_plug").state == STATE_OFF
+    assert hass.states.get("switch.on_off_relay").state == STATE_ON
+    assert hass.states.get("switch.unsupported_switch") is None
 
     state_changed_event = {
         "t": "event",
@@ -98,78 +103,104 @@ async def test_switches(hass):
         "state": {"on": False},
     }
     gateway.api.event_handler(state_changed_event)
-    state_changed_event = {
-        "t": "event",
-        "e": "changed",
-        "r": "lights",
-        "id": "3",
-        "state": {"alert": None},
-    }
-    gateway.api.event_handler(state_changed_event)
-    await hass.async_block_till_done()
 
-    on_off_switch = hass.states.get("switch.on_off_switch")
-    assert on_off_switch.state == "off"
+    assert hass.states.get("switch.on_off_switch").state == STATE_OFF
 
-    warning_device = hass.states.get("switch.warning_device")
-    assert warning_device.state == "off"
+    # Verify service calls
 
     on_off_switch_device = gateway.api.lights["1"]
 
+    # Service turn on power plug
+
     with patch.object(
         on_off_switch_device, "_request", return_value=True
     ) as set_callback:
         await hass.services.async_call(
-            switch.DOMAIN,
-            switch.SERVICE_TURN_ON,
-            {"entity_id": "switch.on_off_switch"},
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.on_off_switch"},
             blocking=True,
         )
         await hass.async_block_till_done()
         set_callback.assert_called_with("put", "/lights/1/state", json={"on": True})
 
+    # Service turn off power plug
+
     with patch.object(
         on_off_switch_device, "_request", return_value=True
     ) as set_callback:
         await hass.services.async_call(
-            switch.DOMAIN,
-            switch.SERVICE_TURN_OFF,
-            {"entity_id": "switch.on_off_switch"},
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "switch.on_off_switch"},
             blocking=True,
         )
         await hass.async_block_till_done()
         set_callback.assert_called_with("put", "/lights/1/state", json={"on": False})
 
-    warning_device_device = gateway.api.lights["3"]
-
-    with patch.object(
-        warning_device_device, "_request", return_value=True
-    ) as set_callback:
-        await hass.services.async_call(
-            switch.DOMAIN,
-            switch.SERVICE_TURN_ON,
-            {"entity_id": "switch.warning_device"},
-            blocking=True,
-        )
-        await hass.async_block_till_done()
-        set_callback.assert_called_with(
-            "put", "/lights/3/state", json={"alert": "lselect"}
-        )
-
-    with patch.object(
-        warning_device_device, "_request", return_value=True
-    ) as set_callback:
-        await hass.services.async_call(
-            switch.DOMAIN,
-            switch.SERVICE_TURN_OFF,
-            {"entity_id": "switch.warning_device"},
-            blocking=True,
-        )
-        await hass.async_block_till_done()
-        set_callback.assert_called_with(
-            "put", "/lights/3/state", json={"alert": "none"}
-        )
-
-    await gateway.async_reset()
+    await hass.config_entries.async_unload(config_entry.entry_id)
+
+    assert len(hass.states.async_all()) == 0
+
+
+async def test_sirens(hass):
+    """Test that siren entities are created."""
+    data = deepcopy(DECONZ_WEB_REQUEST)
+    data["lights"] = deepcopy(SIRENS)
+    config_entry = await setup_deconz_integration(hass, get_state_response=data)
+    gateway = get_gateway_from_config_entry(hass, config_entry)
+
+    assert len(hass.states.async_all()) == 2
+    assert hass.states.get("switch.warning_device").state == STATE_ON
+    assert hass.states.get("switch.unsupported_switch") is None
+
+    state_changed_event = {
+        "t": "event",
+        "e": "changed",
+        "r": "lights",
+        "id": "1",
+        "state": {"alert": None},
+    }
+    gateway.api.event_handler(state_changed_event)
+
+    assert hass.states.get("switch.warning_device").state == STATE_OFF
+
+    # Verify service calls
+
+    warning_device_device = gateway.api.lights["1"]
+
+    # Service turn on siren
+
+    with patch.object(
+        warning_device_device, "_request", return_value=True
+    ) as set_callback:
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.warning_device"},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with(
+            "put", "/lights/1/state", json={"alert": "lselect"}
+        )
+
+    # Service turn off siren
+
+    with patch.object(
+        warning_device_device, "_request", return_value=True
+    ) as set_callback:
+        await hass.services.async_call(
+            SWITCH_DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "switch.warning_device"},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+        set_callback.assert_called_with(
+            "put", "/lights/1/state", json={"alert": "none"}
+        )
+
+    await hass.config_entries.async_unload(config_entry.entry_id)
 
     assert len(hass.states.async_all()) == 0
diff --git a/tests/components/demo/test_climate.py b/tests/components/demo/test_climate.py
index 91e14247834..aa6ff39cb0e 100644
--- a/tests/components/demo/test_climate.py
+++ b/tests/components/demo/test_climate.py
@@ -10,6 +10,7 @@ from homeassistant.components.climate.const import (
     ATTR_FAN_MODE,
     ATTR_HUMIDITY,
     ATTR_HVAC_ACTION,
+    ATTR_HVAC_MODE,
     ATTR_HVAC_MODES,
     ATTR_MAX_HUMIDITY,
     ATTR_MAX_TEMP,
@@ -26,13 +27,25 @@ from homeassistant.components.climate.const import (
     HVAC_MODE_OFF,
     PRESET_AWAY,
     PRESET_ECO,
+    SERVICE_SET_AUX_HEAT,
+    SERVICE_SET_FAN_MODE,
+    SERVICE_SET_HUMIDITY,
+    SERVICE_SET_HVAC_MODE,
+    SERVICE_SET_PRESET_MODE,
+    SERVICE_SET_SWING_MODE,
+    SERVICE_SET_TEMPERATURE,
+)
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ATTR_TEMPERATURE,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_OFF,
+    STATE_ON,
 )
-from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, STATE_ON
 from homeassistant.setup import async_setup_component
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
-from tests.components.climate import common
-
 ENTITY_CLIMATE = "climate.hvac"
 ENTITY_ECOBEE = "climate.ecobee"
 ENTITY_HEATPUMP = "climate.heatpump"
@@ -82,9 +95,14 @@ async def test_set_only_target_temp_bad_attr(hass):
     assert state.attributes.get(ATTR_TEMPERATURE) == 21
 
     with pytest.raises(vol.Invalid):
-        await common.async_set_temperature(hass, None, ENTITY_CLIMATE)
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_TEMPERATURE,
+            {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_TEMPERATURE: None},
+            blocking=True,
+        )
 
-    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_TEMPERATURE) == 21
 
 
@@ -93,8 +111,12 @@ async def test_set_only_target_temp(hass):
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_TEMPERATURE) == 21
 
-    await common.async_set_temperature(hass, 30, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_TEMPERATURE: 30},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_TEMPERATURE) == 30.0
@@ -105,8 +127,12 @@ async def test_set_only_target_temp_with_convert(hass):
     state = hass.states.get(ENTITY_HEATPUMP)
     assert state.attributes.get(ATTR_TEMPERATURE) == 20
 
-    await common.async_set_temperature(hass, 21, ENTITY_HEATPUMP)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: ENTITY_HEATPUMP, ATTR_TEMPERATURE: 21},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_HEATPUMP)
     assert state.attributes.get(ATTR_TEMPERATURE) == 21.0
@@ -119,10 +145,16 @@ async def test_set_target_temp_range(hass):
     assert state.attributes.get(ATTR_TARGET_TEMP_LOW) == 21.0
     assert state.attributes.get(ATTR_TARGET_TEMP_HIGH) == 24.0
 
-    await common.async_set_temperature(
-        hass, target_temp_high=25, target_temp_low=20, entity_id=ENTITY_ECOBEE
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {
+            ATTR_ENTITY_ID: ENTITY_ECOBEE,
+            ATTR_TARGET_TEMP_LOW: 20,
+            ATTR_TARGET_TEMP_HIGH: 25,
+        },
+        blocking=True,
     )
-    await hass.async_block_till_done()
 
     state = hass.states.get(ENTITY_ECOBEE)
     assert state.attributes.get(ATTR_TEMPERATURE) is None
@@ -138,14 +170,16 @@ async def test_set_target_temp_range_bad_attr(hass):
     assert state.attributes.get(ATTR_TARGET_TEMP_HIGH) == 24.0
 
     with pytest.raises(vol.Invalid):
-        await common.async_set_temperature(
-            hass,
-            temperature=None,
-            entity_id=ENTITY_ECOBEE,
-            target_temp_low=None,
-            target_temp_high=None,
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_TEMPERATURE,
+            {
+                ATTR_ENTITY_ID: ENTITY_ECOBEE,
+                ATTR_TARGET_TEMP_LOW: None,
+                ATTR_TARGET_TEMP_HIGH: None,
+            },
+            blocking=True,
         )
-    await hass.async_block_till_done()
 
     state = hass.states.get(ENTITY_ECOBEE)
     assert state.attributes.get(ATTR_TEMPERATURE) is None
@@ -159,8 +193,12 @@ async def test_set_target_humidity_bad_attr(hass):
     assert state.attributes.get(ATTR_HUMIDITY) == 67
 
     with pytest.raises(vol.Invalid):
-        await common.async_set_humidity(hass, None, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_HUMIDITY,
+            {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_HUMIDITY: None},
+            blocking=True,
+        )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_HUMIDITY) == 67
@@ -171,8 +209,12 @@ async def test_set_target_humidity(hass):
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_HUMIDITY) == 67
 
-    await common.async_set_humidity(hass, 64, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HUMIDITY,
+        {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_HUMIDITY: 64},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_HUMIDITY) == 64.0
@@ -184,8 +226,12 @@ async def test_set_fan_mode_bad_attr(hass):
     assert state.attributes.get(ATTR_FAN_MODE) == "On High"
 
     with pytest.raises(vol.Invalid):
-        await common.async_set_fan_mode(hass, None, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_FAN_MODE,
+            {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_FAN_MODE: None},
+            blocking=True,
+        )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_FAN_MODE) == "On High"
@@ -196,8 +242,12 @@ async def test_set_fan_mode(hass):
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_FAN_MODE) == "On High"
 
-    await common.async_set_fan_mode(hass, "On Low", ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_FAN_MODE,
+        {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_FAN_MODE: "On Low"},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_FAN_MODE) == "On Low"
@@ -209,8 +259,12 @@ async def test_set_swing_mode_bad_attr(hass):
     assert state.attributes.get(ATTR_SWING_MODE) == "Off"
 
     with pytest.raises(vol.Invalid):
-        await common.async_set_swing_mode(hass, None, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_SWING_MODE,
+            {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_SWING_MODE: None},
+            blocking=True,
+        )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_SWING_MODE) == "Off"
@@ -221,8 +275,12 @@ async def test_set_swing(hass):
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_SWING_MODE) == "Off"
 
-    await common.async_set_swing_mode(hass, "Auto", ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_SWING_MODE,
+        {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_SWING_MODE: "Auto"},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_SWING_MODE) == "Auto"
@@ -238,8 +296,12 @@ async def test_set_hvac_bad_attr_and_state(hass):
     assert state.state == HVAC_MODE_COOL
 
     with pytest.raises(vol.Invalid):
-        await common.async_set_hvac_mode(hass, None, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_HVAC_MODE,
+            {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_HVAC_MODE: None},
+            blocking=True,
+        )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_HVAC_ACTION) == CURRENT_HVAC_COOL
@@ -251,8 +313,12 @@ async def test_set_hvac(hass):
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == HVAC_MODE_COOL
 
-    await common.async_set_hvac_mode(hass, HVAC_MODE_HEAT, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_HVAC_MODE: HVAC_MODE_HEAT},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == HVAC_MODE_HEAT
@@ -260,8 +326,12 @@ async def test_set_hvac(hass):
 
 async def test_set_hold_mode_away(hass):
     """Test setting the hold mode away."""
-    await common.async_set_preset_mode(hass, PRESET_AWAY, ENTITY_ECOBEE)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ECOBEE, ATTR_PRESET_MODE: PRESET_AWAY},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_ECOBEE)
     assert state.attributes.get(ATTR_PRESET_MODE) == PRESET_AWAY
@@ -269,8 +339,12 @@ async def test_set_hold_mode_away(hass):
 
 async def test_set_hold_mode_eco(hass):
     """Test setting the hold mode eco."""
-    await common.async_set_preset_mode(hass, PRESET_ECO, ENTITY_ECOBEE)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ECOBEE, ATTR_PRESET_MODE: PRESET_ECO},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_ECOBEE)
     assert state.attributes.get(ATTR_PRESET_MODE) == PRESET_ECO
@@ -282,16 +356,25 @@ async def test_set_aux_heat_bad_attr(hass):
     assert state.attributes.get(ATTR_AUX_HEAT) == STATE_OFF
 
     with pytest.raises(vol.Invalid):
-        await common.async_set_aux_heat(hass, None, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_AUX_HEAT,
+            {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_AUX_HEAT: None},
+            blocking=True,
+        )
 
+    state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_AUX_HEAT) == STATE_OFF
 
 
 async def test_set_aux_heat_on(hass):
     """Test setting the axillary heater on/true."""
-    await common.async_set_aux_heat(hass, True, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_AUX_HEAT,
+        {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_AUX_HEAT: True},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_AUX_HEAT) == STATE_ON
@@ -299,8 +382,12 @@ async def test_set_aux_heat_on(hass):
 
 async def test_set_aux_heat_off(hass):
     """Test setting the auxiliary heater off/false."""
-    await common.async_set_aux_heat(hass, False, ENTITY_CLIMATE)
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_AUX_HEAT,
+        {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_AUX_HEAT: False},
+        blocking=True,
+    )
 
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get(ATTR_AUX_HEAT) == STATE_OFF
@@ -308,21 +395,37 @@ async def test_set_aux_heat_off(hass):
 
 async def test_turn_on(hass):
     """Test turn on device."""
-    await common.async_set_hvac_mode(hass, HVAC_MODE_OFF, ENTITY_CLIMATE)
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_HVAC_MODE: HVAC_MODE_OFF},
+        blocking=True,
+    )
+
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == HVAC_MODE_OFF
 
-    await common.async_turn_on(hass, ENTITY_CLIMATE)
+    await hass.services.async_call(
+        DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_CLIMATE}, blocking=True
+    )
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == HVAC_MODE_HEAT
 
 
 async def test_turn_off(hass):
     """Test turn on device."""
-    await common.async_set_hvac_mode(hass, HVAC_MODE_HEAT, ENTITY_CLIMATE)
+    await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_CLIMATE, ATTR_HVAC_MODE: HVAC_MODE_HEAT},
+        blocking=True,
+    )
+
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == HVAC_MODE_HEAT
 
-    await common.async_turn_off(hass, ENTITY_CLIMATE)
+    await hass.services.async_call(
+        DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_CLIMATE}, blocking=True
+    )
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.state == HVAC_MODE_OFF
diff --git a/tests/components/demo/test_fan.py b/tests/components/demo/test_fan.py
index d9c9ac77dc8..2dca57d3e6b 100644
--- a/tests/components/demo/test_fan.py
+++ b/tests/components/demo/test_fan.py
@@ -2,19 +2,19 @@
 import pytest
 
 from homeassistant.components import fan
-from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ENTITY_MATCH_ALL,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_OFF,
+    STATE_ON,
+)
 from homeassistant.setup import async_setup_component
 
-from tests.components.fan import common
-
 FAN_ENTITY_ID = "fan.living_room_fan"
 
 
-def get_entity(hass):
-    """Get the fan entity."""
-    return hass.states.get(FAN_ENTITY_ID)
-
-
 @pytest.fixture(autouse=True)
 async def setup_comp(hass):
     """Initialize components."""
@@ -24,68 +24,122 @@ async def setup_comp(hass):
 
 async def test_turn_on(hass):
     """Test turning on the device."""
-    assert STATE_OFF == get_entity(hass).state
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_OFF
 
-    await common.async_turn_on(hass, FAN_ENTITY_ID)
-    assert STATE_OFF != get_entity(hass).state
+    await hass.services.async_call(
+        fan.DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: FAN_ENTITY_ID}, blocking=True
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_ON
 
-    await common.async_turn_on(hass, FAN_ENTITY_ID, fan.SPEED_HIGH)
-    assert STATE_ON == get_entity(hass).state
-    assert fan.SPEED_HIGH == get_entity(hass).attributes[fan.ATTR_SPEED]
+    await hass.services.async_call(
+        fan.DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: FAN_ENTITY_ID, fan.ATTR_SPEED: fan.SPEED_HIGH},
+        blocking=True,
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_ON
+    assert state.attributes[fan.ATTR_SPEED] == fan.SPEED_HIGH
 
 
 async def test_turn_off(hass):
     """Test turning off the device."""
-    assert STATE_OFF == get_entity(hass).state
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_OFF
 
-    await common.async_turn_on(hass, FAN_ENTITY_ID)
-    assert STATE_OFF != get_entity(hass).state
+    await hass.services.async_call(
+        fan.DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: FAN_ENTITY_ID}, blocking=True
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_ON
 
-    await common.async_turn_off(hass, FAN_ENTITY_ID)
-    assert STATE_OFF == get_entity(hass).state
+    await hass.services.async_call(
+        fan.DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: FAN_ENTITY_ID}, blocking=True
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_OFF
 
 
 async def test_turn_off_without_entity_id(hass):
     """Test turning off all fans."""
-    assert STATE_OFF == get_entity(hass).state
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_OFF
 
-    await common.async_turn_on(hass, FAN_ENTITY_ID)
-    assert STATE_OFF != get_entity(hass).state
+    await hass.services.async_call(
+        fan.DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: FAN_ENTITY_ID}, blocking=True
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_ON
 
-    await common.async_turn_off(hass)
-    assert STATE_OFF == get_entity(hass).state
+    await hass.services.async_call(
+        fan.DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_MATCH_ALL}, blocking=True
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_OFF
 
 
 async def test_set_direction(hass):
     """Test setting the direction of the device."""
-    assert STATE_OFF == get_entity(hass).state
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_OFF
 
-    await common.async_set_direction(hass, FAN_ENTITY_ID, fan.DIRECTION_REVERSE)
-    assert fan.DIRECTION_REVERSE == get_entity(hass).attributes.get("direction")
+    await hass.services.async_call(
+        fan.DOMAIN,
+        fan.SERVICE_SET_DIRECTION,
+        {ATTR_ENTITY_ID: FAN_ENTITY_ID, fan.ATTR_DIRECTION: fan.DIRECTION_REVERSE},
+        blocking=True,
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.attributes[fan.ATTR_DIRECTION] == fan.DIRECTION_REVERSE
 
 
 async def test_set_speed(hass):
     """Test setting the speed of the device."""
-    assert STATE_OFF == get_entity(hass).state
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_OFF
 
-    await common.async_set_speed(hass, FAN_ENTITY_ID, fan.SPEED_LOW)
-    assert fan.SPEED_LOW == get_entity(hass).attributes.get("speed")
+    await hass.services.async_call(
+        fan.DOMAIN,
+        fan.SERVICE_SET_SPEED,
+        {ATTR_ENTITY_ID: FAN_ENTITY_ID, fan.ATTR_SPEED: fan.SPEED_LOW},
+        blocking=True,
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.attributes[fan.ATTR_SPEED] == fan.SPEED_LOW
 
 
 async def test_oscillate(hass):
     """Test oscillating the fan."""
-    assert not get_entity(hass).attributes.get("oscillating")
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.state == STATE_OFF
+    assert not state.attributes.get(fan.ATTR_OSCILLATING)
 
-    await common.async_oscillate(hass, FAN_ENTITY_ID, True)
-    assert get_entity(hass).attributes.get("oscillating")
+    await hass.services.async_call(
+        fan.DOMAIN,
+        fan.SERVICE_OSCILLATE,
+        {ATTR_ENTITY_ID: FAN_ENTITY_ID, fan.ATTR_OSCILLATING: True},
+        blocking=True,
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.attributes[fan.ATTR_OSCILLATING] is True
 
-    await common.async_oscillate(hass, FAN_ENTITY_ID, False)
-    assert not get_entity(hass).attributes.get("oscillating")
+    await hass.services.async_call(
+        fan.DOMAIN,
+        fan.SERVICE_OSCILLATE,
+        {ATTR_ENTITY_ID: FAN_ENTITY_ID, fan.ATTR_OSCILLATING: False},
+        blocking=True,
+    )
+    state = hass.states.get(FAN_ENTITY_ID)
+    assert state.attributes[fan.ATTR_OSCILLATING] is False
 
 
 async def test_is_on(hass):
     """Test is on service call."""
     assert not fan.is_on(hass, FAN_ENTITY_ID)
 
-    await common.async_turn_on(hass, FAN_ENTITY_ID)
+    await hass.services.async_call(
+        fan.DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: FAN_ENTITY_ID}, blocking=True
+    )
     assert fan.is_on(hass, FAN_ENTITY_ID)
diff --git a/tests/components/demo/test_geo_location.py b/tests/components/demo/test_geo_location.py
index ac32fff075f..564d27e7131 100644
--- a/tests/components/demo/test_geo_location.py
+++ b/tests/components/demo/test_geo_location.py
@@ -1,5 +1,4 @@
 """The tests for the demo platform."""
-import unittest
 
 import pytest
 
@@ -14,15 +13,11 @@ from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     LENGTH_KILOMETERS,
 )
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
 from tests.async_mock import patch
-from tests.common import (
-    assert_setup_component,
-    fire_time_changed,
-    get_test_home_assistant,
-)
+from tests.common import assert_setup_component, async_fire_time_changed
 
 CONFIG = {geo_location.DOMAIN: [{"platform": "demo"}]}
 
@@ -33,54 +28,40 @@ def mock_legacy_time(legacy_patchable_time):
     yield
 
 
-class TestDemoPlatform(unittest.TestCase):
-    """Test the demo platform."""
+async def test_setup_platform(hass):
+    """Test setup of demo platform via configuration."""
+    utcnow = dt_util.utcnow()
+    # Patching 'utcnow' to gain more control over the timed update.
+    with patch("homeassistant.util.dt.utcnow", return_value=utcnow):
+        with assert_setup_component(1, geo_location.DOMAIN):
+            assert await async_setup_component(hass, geo_location.DOMAIN, CONFIG)
+        await hass.async_block_till_done()
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
+        # In this test, one zone and geolocation entities have been
+        # generated.
+        all_states = [
+            hass.states.get(entity_id)
+            for entity_id in hass.states.async_entity_ids(geo_location.DOMAIN)
+        ]
+        assert len(all_states) == NUMBER_OF_DEMO_DEVICES
 
-    def test_setup_platform(self):
-        """Test setup of demo platform via configuration."""
-        utcnow = dt_util.utcnow()
-        # Patching 'utcnow' to gain more control over the timed update.
-        with patch("homeassistant.util.dt.utcnow", return_value=utcnow):
-            with assert_setup_component(1, geo_location.DOMAIN):
-                assert setup_component(self.hass, geo_location.DOMAIN, CONFIG)
-            self.hass.block_till_done()
+        for state in all_states:
+            # Check a single device's attributes.
+            if state.domain != geo_location.DOMAIN:
+                # ignore home zone state
+                continue
+            assert abs(state.attributes[ATTR_LATITUDE] - hass.config.latitude) < 1.0
+            assert abs(state.attributes[ATTR_LONGITUDE] - hass.config.longitude) < 1.0
+            assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == LENGTH_KILOMETERS
 
-            # In this test, one zone and geolocation entities have been
-            # generated.
-            all_states = [
-                self.hass.states.get(entity_id)
-                for entity_id in self.hass.states.entity_ids(geo_location.DOMAIN)
-            ]
-            assert len(all_states) == NUMBER_OF_DEMO_DEVICES
-
-            for state in all_states:
-                # Check a single device's attributes.
-                if state.domain != geo_location.DOMAIN:
-                    # ignore home zone state
-                    continue
-                assert (
-                    abs(state.attributes[ATTR_LATITUDE] - self.hass.config.latitude)
-                    < 1.0
-                )
-                assert (
-                    abs(state.attributes[ATTR_LONGITUDE] - self.hass.config.longitude)
-                    < 1.0
-                )
-                assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == LENGTH_KILOMETERS
-
-            # Update (replaces 1 device).
-            fire_time_changed(self.hass, utcnow + DEFAULT_UPDATE_INTERVAL)
-            self.hass.block_till_done()
-            # Get all states again, ensure that the number of states is still
-            # the same, but the lists are different.
-            all_states_updated = [
-                self.hass.states.get(entity_id)
-                for entity_id in self.hass.states.entity_ids(geo_location.DOMAIN)
-            ]
-            assert len(all_states_updated) == NUMBER_OF_DEMO_DEVICES
-            assert all_states != all_states_updated
+        # Update (replaces 1 device).
+        async_fire_time_changed(hass, utcnow + DEFAULT_UPDATE_INTERVAL)
+        await hass.async_block_till_done()
+        # Get all states again, ensure that the number of states is still
+        # the same, but the lists are different.
+        all_states_updated = [
+            hass.states.get(entity_id)
+            for entity_id in hass.states.async_entity_ids(geo_location.DOMAIN)
+        ]
+        assert len(all_states_updated) == NUMBER_OF_DEMO_DEVICES
+        assert all_states != all_states_updated
diff --git a/tests/components/demo/test_media_player.py b/tests/components/demo/test_media_player.py
index 70b05cd25cc..340416f4586 100644
--- a/tests/components/demo/test_media_player.py
+++ b/tests/components/demo/test_media_player.py
@@ -3,12 +3,18 @@ import pytest
 import voluptuous as vol
 
 import homeassistant.components.media_player as mp
-from homeassistant.const import ATTR_SUPPORTED_FEATURES
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ATTR_ENTITY_PICTURE,
+    ATTR_SUPPORTED_FEATURES,
+    STATE_OFF,
+    STATE_PAUSED,
+    STATE_PLAYING,
+)
 from homeassistant.helpers.aiohttp_client import DATA_CLIENTSESSION
 from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.components.media_player import common
 
 TEST_ENTITY_ID = "media_player.walkman"
 
@@ -32,16 +38,47 @@ async def test_source_select(hass):
     )
     await hass.async_block_till_done()
     state = hass.states.get(entity_id)
-    assert state.attributes.get("source") == "dvd"
+    assert state.attributes.get(mp.ATTR_INPUT_SOURCE) == "dvd"
 
     with pytest.raises(vol.Invalid):
-        await common.async_select_source(hass, None, entity_id)
+        await hass.services.async_call(
+            mp.DOMAIN,
+            mp.SERVICE_SELECT_SOURCE,
+            {ATTR_ENTITY_ID: entity_id, mp.ATTR_INPUT_SOURCE: None},
+            blocking=True,
+        )
     state = hass.states.get(entity_id)
-    assert state.attributes.get("source") == "dvd"
+    assert state.attributes.get(mp.ATTR_INPUT_SOURCE) == "dvd"
 
-    await common.async_select_source(hass, "xbox", entity_id)
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_SELECT_SOURCE,
+        {ATTR_ENTITY_ID: entity_id, mp.ATTR_INPUT_SOURCE: "xbox"},
+        blocking=True,
+    )
     state = hass.states.get(entity_id)
-    assert state.attributes.get("source") == "xbox"
+    assert state.attributes.get(mp.ATTR_INPUT_SOURCE) == "xbox"
+
+
+async def test_repeat_set(hass):
+    """Test the repeat set service."""
+    entity_id = "media_player.walkman"
+
+    assert await async_setup_component(
+        hass, mp.DOMAIN, {"media_player": {"platform": "demo"}}
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get(entity_id)
+    assert state.attributes.get(mp.ATTR_MEDIA_REPEAT) == mp.const.REPEAT_MODE_OFF
+
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_REPEAT_SET,
+        {ATTR_ENTITY_ID: entity_id, mp.ATTR_MEDIA_REPEAT: mp.const.REPEAT_MODE_ALL},
+        blocking=True,
+    )
+    state = hass.states.get(entity_id)
+    assert state.attributes.get(mp.ATTR_MEDIA_REPEAT) == mp.const.REPEAT_MODE_ALL
 
 
 async def test_clear_playlist(hass):
@@ -50,10 +87,18 @@ async def test_clear_playlist(hass):
         hass, mp.DOMAIN, {"media_player": {"platform": "demo"}}
     )
     await hass.async_block_till_done()
-    assert hass.states.is_state(TEST_ENTITY_ID, "playing")
 
-    await common.async_clear_playlist(hass, TEST_ENTITY_ID)
-    assert hass.states.is_state(TEST_ENTITY_ID, "off")
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_PLAYING
+
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_CLEAR_PLAYLIST,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_OFF
 
 
 async def test_volume_services(hass):
@@ -62,36 +107,70 @@ async def test_volume_services(hass):
         hass, mp.DOMAIN, {"media_player": {"platform": "demo"}}
     )
     await hass.async_block_till_done()
+
     state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("volume_level") == 1.0
+    assert state.attributes.get(mp.ATTR_MEDIA_VOLUME_LEVEL) == 1.0
 
     with pytest.raises(vol.Invalid):
-        await common.async_set_volume_level(hass, None, TEST_ENTITY_ID)
-    state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("volume_level") == 1.0
+        await hass.services.async_call(
+            mp.DOMAIN,
+            mp.SERVICE_VOLUME_SET,
+            {ATTR_ENTITY_ID: TEST_ENTITY_ID, mp.ATTR_MEDIA_VOLUME_LEVEL: None},
+            blocking=True,
+        )
 
-    await common.async_set_volume_level(hass, 0.5, TEST_ENTITY_ID)
     state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("volume_level") == 0.5
+    assert state.attributes.get(mp.ATTR_MEDIA_VOLUME_LEVEL) == 1.0
 
-    await common.async_volume_down(hass, TEST_ENTITY_ID)
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_VOLUME_SET,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID, mp.ATTR_MEDIA_VOLUME_LEVEL: 0.5},
+        blocking=True,
+    )
     state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("volume_level") == 0.4
+    assert state.attributes.get(mp.ATTR_MEDIA_VOLUME_LEVEL) == 0.5
 
-    await common.async_volume_up(hass, TEST_ENTITY_ID)
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_VOLUME_DOWN,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
     state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("volume_level") == 0.5
+    assert state.attributes.get(mp.ATTR_MEDIA_VOLUME_LEVEL) == 0.4
 
-    assert False is state.attributes.get("is_volume_muted")
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_VOLUME_UP,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.attributes.get(mp.ATTR_MEDIA_VOLUME_LEVEL) == 0.5
+
+    assert state.attributes.get(mp.ATTR_MEDIA_VOLUME_MUTED) is False
 
     with pytest.raises(vol.Invalid):
-        await common.async_mute_volume(hass, None, TEST_ENTITY_ID)
-    state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("is_volume_muted") is False
+        await hass.services.async_call(
+            mp.DOMAIN,
+            mp.SERVICE_VOLUME_MUTE,
+            {ATTR_ENTITY_ID: TEST_ENTITY_ID, mp.ATTR_MEDIA_VOLUME_MUTED: None},
+            blocking=True,
+        )
 
-    await common.async_mute_volume(hass, True, TEST_ENTITY_ID)
     state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("is_volume_muted") is True
+    assert state.attributes.get(mp.ATTR_MEDIA_VOLUME_MUTED) is False
+
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_VOLUME_MUTE,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID, mp.ATTR_MEDIA_VOLUME_MUTED: True},
+        blocking=True,
+    )
+
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.attributes.get(mp.ATTR_MEDIA_VOLUME_MUTED) is True
 
 
 async def test_turning_off_and_on(hass):
@@ -100,17 +179,38 @@ async def test_turning_off_and_on(hass):
         hass, mp.DOMAIN, {"media_player": {"platform": "demo"}}
     )
     await hass.async_block_till_done()
-    assert hass.states.is_state(TEST_ENTITY_ID, "playing")
 
-    await common.async_turn_off(hass, TEST_ENTITY_ID)
-    assert hass.states.is_state(TEST_ENTITY_ID, "off")
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_PLAYING
+
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_OFF
     assert not mp.is_on(hass, TEST_ENTITY_ID)
 
-    await common.async_turn_on(hass, TEST_ENTITY_ID)
-    assert hass.states.is_state(TEST_ENTITY_ID, "playing")
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_PLAYING
+    assert mp.is_on(hass, TEST_ENTITY_ID)
 
-    await common.async_toggle(hass, TEST_ENTITY_ID)
-    assert hass.states.is_state(TEST_ENTITY_ID, "off")
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_TOGGLE,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_OFF
     assert not mp.is_on(hass, TEST_ENTITY_ID)
 
 
@@ -120,19 +220,45 @@ async def test_playing_pausing(hass):
         hass, mp.DOMAIN, {"media_player": {"platform": "demo"}}
     )
     await hass.async_block_till_done()
-    assert hass.states.is_state(TEST_ENTITY_ID, "playing")
 
-    await common.async_media_pause(hass, TEST_ENTITY_ID)
-    assert hass.states.is_state(TEST_ENTITY_ID, "paused")
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_PLAYING
 
-    await common.async_media_play_pause(hass, TEST_ENTITY_ID)
-    assert hass.states.is_state(TEST_ENTITY_ID, "playing")
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_PAUSE,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_PAUSED
 
-    await common.async_media_play_pause(hass, TEST_ENTITY_ID)
-    assert hass.states.is_state(TEST_ENTITY_ID, "paused")
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_PLAY_PAUSE,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_PLAYING
 
-    await common.async_media_play(hass, TEST_ENTITY_ID)
-    assert hass.states.is_state(TEST_ENTITY_ID, "playing")
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_PLAY_PAUSE,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_PAUSED
+
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_PLAY,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_PLAYING
 
 
 async def test_prev_next_track(hass):
@@ -141,36 +267,63 @@ async def test_prev_next_track(hass):
         hass, mp.DOMAIN, {"media_player": {"platform": "demo"}}
     )
     await hass.async_block_till_done()
-    state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("media_track") == 1
 
-    await common.async_media_next_track(hass, TEST_ENTITY_ID)
     state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("media_track") == 2
+    assert state.attributes.get(mp.ATTR_MEDIA_TRACK) == 1
 
-    await common.async_media_next_track(hass, TEST_ENTITY_ID)
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_NEXT_TRACK,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
     state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("media_track") == 3
+    assert state.attributes.get(mp.ATTR_MEDIA_TRACK) == 2
 
-    await common.async_media_previous_track(hass, TEST_ENTITY_ID)
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_NEXT_TRACK,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
     state = hass.states.get(TEST_ENTITY_ID)
-    assert state.attributes.get("media_track") == 2
+    assert state.attributes.get(mp.ATTR_MEDIA_TRACK) == 3
+
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_PREVIOUS_TRACK,
+        {ATTR_ENTITY_ID: TEST_ENTITY_ID},
+        blocking=True,
+    )
+    state = hass.states.get(TEST_ENTITY_ID)
+    assert state.attributes.get(mp.ATTR_MEDIA_TRACK) == 2
 
     assert await async_setup_component(
         hass, mp.DOMAIN, {"media_player": {"platform": "demo"}}
     )
     await hass.async_block_till_done()
+
     ent_id = "media_player.lounge_room"
     state = hass.states.get(ent_id)
-    assert state.attributes.get("media_episode") == 1
+    assert state.attributes.get(mp.ATTR_MEDIA_EPISODE) == 1
 
-    await common.async_media_next_track(hass, ent_id)
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_NEXT_TRACK,
+        {ATTR_ENTITY_ID: ent_id},
+        blocking=True,
+    )
     state = hass.states.get(ent_id)
-    assert state.attributes.get("media_episode") == 2
+    assert state.attributes.get(mp.ATTR_MEDIA_EPISODE) == 2
 
-    await common.async_media_previous_track(hass, ent_id)
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_PREVIOUS_TRACK,
+        {ATTR_ENTITY_ID: ent_id},
+        blocking=True,
+    )
     state = hass.states.get(ent_id)
-    assert state.attributes.get("media_episode") == 1
+    assert state.attributes.get(mp.ATTR_MEDIA_EPISODE) == 1
 
 
 async def test_play_media(hass):
@@ -179,21 +332,36 @@ async def test_play_media(hass):
         hass, mp.DOMAIN, {"media_player": {"platform": "demo"}}
     )
     await hass.async_block_till_done()
+
     ent_id = "media_player.living_room"
     state = hass.states.get(ent_id)
-    assert mp.SUPPORT_PLAY_MEDIA & state.attributes.get("supported_features") > 0
-    assert state.attributes.get("media_content_id") is not None
+    assert mp.SUPPORT_PLAY_MEDIA & state.attributes.get(ATTR_SUPPORTED_FEATURES) > 0
+    assert state.attributes.get(mp.ATTR_MEDIA_CONTENT_ID) is not None
 
     with pytest.raises(vol.Invalid):
-        await common.async_play_media(hass, None, "some_id", ent_id)
+        await hass.services.async_call(
+            mp.DOMAIN,
+            mp.SERVICE_PLAY_MEDIA,
+            {ATTR_ENTITY_ID: ent_id, mp.ATTR_MEDIA_CONTENT_ID: "some_id"},
+            blocking=True,
+        )
     state = hass.states.get(ent_id)
-    assert mp.SUPPORT_PLAY_MEDIA & state.attributes.get("supported_features") > 0
-    assert state.attributes.get("media_content_id") != "some_id"
+    assert mp.SUPPORT_PLAY_MEDIA & state.attributes.get(ATTR_SUPPORTED_FEATURES) > 0
+    assert state.attributes.get(mp.ATTR_MEDIA_CONTENT_ID) != "some_id"
 
-    await common.async_play_media(hass, "youtube", "some_id", ent_id)
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_PLAY_MEDIA,
+        {
+            ATTR_ENTITY_ID: ent_id,
+            mp.ATTR_MEDIA_CONTENT_TYPE: "youtube",
+            mp.ATTR_MEDIA_CONTENT_ID: "some_id",
+        },
+        blocking=True,
+    )
     state = hass.states.get(ent_id)
-    assert mp.SUPPORT_PLAY_MEDIA & state.attributes.get("supported_features") > 0
-    assert state.attributes.get("media_content_id") == "some_id"
+    assert mp.SUPPORT_PLAY_MEDIA & state.attributes.get(ATTR_SUPPORTED_FEATURES) > 0
+    assert state.attributes.get(mp.ATTR_MEDIA_CONTENT_ID) == "some_id"
 
 
 async def test_seek(hass, mock_media_seek):
@@ -202,15 +370,33 @@ async def test_seek(hass, mock_media_seek):
         hass, mp.DOMAIN, {"media_player": {"platform": "demo"}}
     )
     await hass.async_block_till_done()
+
     ent_id = "media_player.living_room"
     state = hass.states.get(ent_id)
     assert state.attributes[ATTR_SUPPORTED_FEATURES] & mp.SUPPORT_SEEK
     assert not mock_media_seek.called
+
     with pytest.raises(vol.Invalid):
-        await common.async_media_seek(hass, None, ent_id)
+        await hass.services.async_call(
+            mp.DOMAIN,
+            mp.SERVICE_MEDIA_SEEK,
+            {
+                ATTR_ENTITY_ID: ent_id,
+                mp.ATTR_MEDIA_SEEK_POSITION: None,
+            },
+            blocking=True,
+        )
     assert not mock_media_seek.called
 
-    await common.async_media_seek(hass, 100, ent_id)
+    await hass.services.async_call(
+        mp.DOMAIN,
+        mp.SERVICE_MEDIA_SEEK,
+        {
+            ATTR_ENTITY_ID: ent_id,
+            mp.ATTR_MEDIA_SEEK_POSITION: 100,
+        },
+        blocking=True,
+    )
     assert mock_media_seek.called
 
 
@@ -250,9 +436,9 @@ async def test_media_image_proxy(hass, hass_client):
 
     hass.data[DATA_CLIENTSESSION] = MockWebsession()
 
-    assert hass.states.is_state(TEST_ENTITY_ID, "playing")
     state = hass.states.get(TEST_ENTITY_ID)
+    assert state.state == STATE_PLAYING
     client = await hass_client()
-    req = await client.get(state.attributes.get("entity_picture"))
+    req = await client.get(state.attributes.get(ATTR_ENTITY_PICTURE))
     assert req.status == 200
     assert await req.text() == fake_picture_data
diff --git a/tests/components/demo/test_notify.py b/tests/components/demo/test_notify.py
index 07b6d968c84..893b9d57e65 100644
--- a/tests/components/demo/test_notify.py
+++ b/tests/components/demo/test_notify.py
@@ -1,5 +1,6 @@
 """The tests for the notify demo platform."""
-import unittest
+
+import logging
 
 import pytest
 import voluptuous as vol
@@ -8,189 +9,198 @@ import homeassistant.components.demo.notify as demo
 import homeassistant.components.notify as notify
 from homeassistant.core import callback
 from homeassistant.helpers import discovery
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import assert_setup_component, get_test_home_assistant
-from tests.components.notify import common
+from tests.common import assert_setup_component
 
 CONFIG = {notify.DOMAIN: {"platform": "demo"}}
 
 
-class TestNotifyDemo(unittest.TestCase):
-    """Test the demo notify."""
+@pytest.fixture
+def events(hass):
+    """Fixture that catches notify events."""
+    events = []
+    hass.bus.async_listen(demo.EVENT_NOTIFY, callback(lambda e: events.append(e)))
+    yield events
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.events = []
-        self.calls = []
 
-        @callback
-        def record_event(event):
-            """Record event to send notification."""
-            self.events.append(event)
+@pytest.fixture
+def calls():
+    """Fixture to calls."""
+    return []
 
-        self.hass.bus.listen(demo.EVENT_NOTIFY, record_event)
-        self.addCleanup(self.tear_down_cleanup)
 
-    def tear_down_cleanup(self):
-        """Stop down everything that was started."""
-        self.hass.stop()
-
-    def _setup_notify(self):
-        with assert_setup_component(1, notify.DOMAIN) as config:
-            assert setup_component(self.hass, notify.DOMAIN, CONFIG)
-        assert config[notify.DOMAIN]
-        self.hass.block_till_done()
-
-    def test_setup(self):
-        """Test setup."""
-        self._setup_notify()
-
-    @patch("homeassistant.components.demo.notify.get_service", autospec=True)
-    def test_no_notify_service(self, mock_demo_get_service):
-        """Test missing platform notify service instance."""
-        mock_demo_get_service.return_value = None
-        with self.assertLogs(
-            "homeassistant.components.notify", level="ERROR"
-        ) as log_handle:
-            self._setup_notify()
-        self.hass.block_till_done()
-        assert mock_demo_get_service.called
-        assert log_handle.output == [
-            "ERROR:homeassistant.components.notify:"
-            "Failed to initialize notification service demo"
-        ]
-
-    @patch("homeassistant.components.demo.notify.get_service", autospec=True)
-    def test_discover_notify(self, mock_demo_get_service):
-        """Test discovery of notify demo platform."""
-        assert notify.DOMAIN not in self.hass.config.components
-        discovery.load_platform(
-            self.hass, "notify", "demo", {"test_key": "test_val"}, {"notify": {}}
-        )
-        self.hass.block_till_done()
-        assert notify.DOMAIN in self.hass.config.components
-        assert mock_demo_get_service.called
-        assert mock_demo_get_service.mock_calls[0][1] == (
-            self.hass,
-            {},
-            {"test_key": "test_val"},
-        )
+@pytest.fixture
+def record_calls(calls):
+    """Fixture to record calls."""
 
     @callback
-    def record_calls(self, *args):
+    def record_calls(*args):
         """Record calls."""
-        self.calls.append(args)
+        calls.append(args)
 
-    def test_sending_none_message(self):
-        """Test send with None as message."""
-        self._setup_notify()
-        with pytest.raises(vol.Invalid):
-            common.send_message(self.hass, None)
-        self.hass.block_till_done()
-        assert len(self.events) == 0
+    return record_calls
 
-    def test_sending_templated_message(self):
-        """Send a templated message."""
-        self._setup_notify()
-        self.hass.states.set("sensor.temperature", 10)
-        common.send_message(
-            self.hass,
-            "{{ states.sensor.temperature.state }}",
-            "{{ states.sensor.temperature.name }}",
+
+@pytest.fixture(name="mock_demo_notify")
+def mock_demo_notify_fixture():
+    """Mock demo notify service."""
+    with patch("homeassistant.components.demo.notify.get_service", autospec=True) as ns:
+        yield ns
+
+
+async def setup_notify(hass):
+    """Test setup."""
+    with assert_setup_component(1, notify.DOMAIN) as config:
+        assert await async_setup_component(hass, notify.DOMAIN, CONFIG)
+    assert config[notify.DOMAIN]
+    await hass.async_block_till_done()
+
+
+async def test_no_notify_service(hass, mock_demo_notify, caplog):
+    """Test missing platform notify service instance."""
+    caplog.set_level(logging.ERROR)
+    mock_demo_notify.return_value = None
+    await setup_notify(hass)
+    await hass.async_block_till_done()
+    assert mock_demo_notify.called
+    assert "Failed to initialize notification service demo" in caplog.text
+
+
+async def test_discover_notify(hass, mock_demo_notify):
+    """Test discovery of notify demo platform."""
+    assert notify.DOMAIN not in hass.config.components
+    mock_demo_notify.return_value = None
+    await discovery.async_load_platform(
+        hass, "notify", "demo", {"test_key": "test_val"}, {"notify": {}}
+    )
+    await hass.async_block_till_done()
+    assert notify.DOMAIN in hass.config.components
+    assert mock_demo_notify.called
+    assert mock_demo_notify.mock_calls[0][1] == (
+        hass,
+        {},
+        {"test_key": "test_val"},
+    )
+
+
+async def test_sending_none_message(hass, events):
+    """Test send with None as message."""
+    await setup_notify(hass)
+    with pytest.raises(vol.Invalid):
+        await hass.services.async_call(
+            notify.DOMAIN, notify.SERVICE_NOTIFY, {notify.ATTR_MESSAGE: None}
         )
-        self.hass.block_till_done()
-        last_event = self.events[-1]
-        assert last_event.data[notify.ATTR_TITLE] == "temperature"
-        assert last_event.data[notify.ATTR_MESSAGE] == "10"
+    await hass.async_block_till_done()
+    assert len(events) == 0
 
-    def test_method_forwards_correct_data(self):
-        """Test that all data from the service gets forwarded to service."""
-        self._setup_notify()
-        common.send_message(self.hass, "my message", "my title", {"hello": "world"})
-        self.hass.block_till_done()
-        assert len(self.events) == 1
-        data = self.events[0].data
-        assert {
-            "message": "my message",
-            "title": "my title",
-            "data": {"hello": "world"},
-        } == data
 
-    def test_calling_notify_from_script_loaded_from_yaml_without_title(self):
-        """Test if we can call a notify from a script."""
-        self._setup_notify()
-        step = {
-            "service": "notify.notify",
-            "data": {
-                "data": {
-                    "push": {"sound": "US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav"}
-                }
-            },
-            "data_template": {"message": "Test 123 {{ 2 + 2 }}\n"},
-        }
-        setup_component(self.hass, "script", {"script": {"test": {"sequence": step}}})
-        self.hass.services.call("script", "test")
-        self.hass.block_till_done()
-        assert len(self.events) == 1
-        assert {
-            "message": "Test 123 4",
-            "data": {
-                "push": {"sound": "US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav"}
-            },
-        } == self.events[0].data
+async def test_sending_templated_message(hass, events):
+    """Send a templated message."""
+    await setup_notify(hass)
+    hass.states.async_set("sensor.temperature", 10)
+    data = {
+        notify.ATTR_MESSAGE: "{{states.sensor.temperature.state}}",
+        notify.ATTR_TITLE: "{{ states.sensor.temperature.name }}",
+    }
+    await hass.services.async_call(notify.DOMAIN, notify.SERVICE_NOTIFY, data)
+    await hass.async_block_till_done()
+    last_event = events[-1]
+    assert last_event.data[notify.ATTR_TITLE] == "temperature"
+    assert last_event.data[notify.ATTR_MESSAGE] == "10"
 
-    def test_calling_notify_from_script_loaded_from_yaml_with_title(self):
-        """Test if we can call a notify from a script."""
-        self._setup_notify()
-        step = {
-            "service": "notify.notify",
-            "data": {
-                "data": {
-                    "push": {"sound": "US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav"}
-                }
-            },
-            "data_template": {"message": "Test 123 {{ 2 + 2 }}\n", "title": "Test"},
-        }
-        setup_component(self.hass, "script", {"script": {"test": {"sequence": step}}})
-        self.hass.services.call("script", "test")
-        self.hass.block_till_done()
-        assert len(self.events) == 1
-        assert {
-            "message": "Test 123 4",
-            "title": "Test",
-            "data": {
-                "push": {"sound": "US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav"}
-            },
-        } == self.events[0].data
 
-    def test_targets_are_services(self):
-        """Test that all targets are exposed as individual services."""
-        self._setup_notify()
-        assert self.hass.services.has_service("notify", "demo") is not None
-        service = "demo_test_target_name"
-        assert self.hass.services.has_service("notify", service) is not None
+async def test_method_forwards_correct_data(hass, events):
+    """Test that all data from the service gets forwarded to service."""
+    await setup_notify(hass)
+    data = {
+        notify.ATTR_MESSAGE: "my message",
+        notify.ATTR_TITLE: "my title",
+        notify.ATTR_DATA: {"hello": "world"},
+    }
+    await hass.services.async_call(notify.DOMAIN, notify.SERVICE_NOTIFY, data)
+    await hass.async_block_till_done()
+    assert len(events) == 1
+    data = events[0].data
+    assert {
+        "message": "my message",
+        "title": "my title",
+        "data": {"hello": "world"},
+    } == data
 
-    def test_messages_to_targets_route(self):
-        """Test message routing to specific target services."""
-        self._setup_notify()
-        self.hass.bus.listen_once("notify", self.record_calls)
 
-        self.hass.services.call(
-            "notify",
-            "demo_test_target_name",
-            {"message": "my message", "title": "my title", "data": {"hello": "world"}},
-        )
+async def test_calling_notify_from_script_loaded_from_yaml_without_title(hass, events):
+    """Test if we can call a notify from a script."""
+    await setup_notify(hass)
+    step = {
+        "service": "notify.notify",
+        "data": {
+            "data": {"push": {"sound": "US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav"}}
+        },
+        "data_template": {"message": "Test 123 {{ 2 + 2 }}\n"},
+    }
+    await async_setup_component(
+        hass, "script", {"script": {"test": {"sequence": step}}}
+    )
+    await hass.services.async_call("script", "test")
+    await hass.async_block_till_done()
+    assert len(events) == 1
+    assert {
+        "message": "Test 123 4",
+        "data": {"push": {"sound": "US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav"}},
+    } == events[0].data
 
-        self.hass.block_till_done()
 
-        data = self.calls[0][0].data
+async def test_calling_notify_from_script_loaded_from_yaml_with_title(hass, events):
+    """Test if we can call a notify from a script."""
+    await setup_notify(hass)
+    step = {
+        "service": "notify.notify",
+        "data": {
+            "data": {"push": {"sound": "US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav"}}
+        },
+        "data_template": {"message": "Test 123 {{ 2 + 2 }}\n", "title": "Test"},
+    }
+    await async_setup_component(
+        hass, "script", {"script": {"test": {"sequence": step}}}
+    )
+    await hass.services.async_call("script", "test")
+    await hass.async_block_till_done()
+    assert len(events) == 1
+    assert {
+        "message": "Test 123 4",
+        "title": "Test",
+        "data": {"push": {"sound": "US-EN-Morgan-Freeman-Roommate-Is-Arriving.wav"}},
+    } == events[0].data
 
-        assert {
-            "message": "my message",
-            "target": ["test target id"],
-            "title": "my title",
-            "data": {"hello": "world"},
-        } == data
+
+async def test_targets_are_services(hass):
+    """Test that all targets are exposed as individual services."""
+    await setup_notify(hass)
+    assert hass.services.has_service("notify", "demo") is not None
+    service = "demo_test_target_name"
+    assert hass.services.has_service("notify", service) is not None
+
+
+async def test_messages_to_targets_route(hass, calls, record_calls):
+    """Test message routing to specific target services."""
+    await setup_notify(hass)
+    hass.bus.async_listen_once("notify", record_calls)
+
+    await hass.services.async_call(
+        "notify",
+        "demo_test_target_name",
+        {"message": "my message", "title": "my title", "data": {"hello": "world"}},
+    )
+
+    await hass.async_block_till_done()
+
+    data = calls[0][0].data
+
+    assert {
+        "message": "my message",
+        "target": ["test target id"],
+        "title": "my title",
+        "data": {"hello": "world"},
+    } == data
diff --git a/tests/components/demo/test_remote.py b/tests/components/demo/test_remote.py
index fa87213768d..bbebac74344 100644
--- a/tests/components/demo/test_remote.py
+++ b/tests/components/demo/test_remote.py
@@ -1,57 +1,63 @@
 """The tests for the demo remote component."""
-# pylint: disable=protected-access
-import unittest
+import pytest
 
 import homeassistant.components.remote as remote
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
-from tests.components.remote import common
+from homeassistant.components.remote import ATTR_COMMAND
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_OFF,
+    STATE_ON,
+)
+from homeassistant.setup import async_setup_component
 
 ENTITY_ID = "remote.remote_one"
+SERVICE_SEND_COMMAND = "send_command"
 
 
-class TestDemoRemote(unittest.TestCase):
-    """Test the demo remote."""
+@pytest.fixture(autouse=True)
+async def setup_component(hass):
+    """Initialize components."""
+    assert await async_setup_component(
+        hass, remote.DOMAIN, {"remote": {"platform": "demo"}}
+    )
+    await hass.async_block_till_done()
 
-    # pylint: disable=invalid-name
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        assert setup_component(
-            self.hass, remote.DOMAIN, {"remote": {"platform": "demo"}}
-        )
-        self.hass.block_till_done()
 
-        self.addCleanup(self.tear_down_cleanup)
+async def test_methods(hass):
+    """Test if services call the entity methods as expected."""
+    await hass.services.async_call(
+        remote.DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_ID}
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == STATE_ON
 
-    def tear_down_cleanup(self):
-        """Stop down everything that was started."""
-        self.hass.stop()
+    await hass.services.async_call(
+        remote.DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == STATE_OFF
 
-    def test_methods(self):
-        """Test if services call the entity methods as expected."""
-        common.turn_on(self.hass, entity_id=ENTITY_ID)
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_ID)
-        assert state.state == STATE_ON
+    await hass.services.async_call(
+        remote.DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_ID}
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_ID)
+    assert state.state == STATE_ON
 
-        common.turn_off(self.hass, entity_id=ENTITY_ID)
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_ID)
-        assert state.state == STATE_OFF
+    data = {
+        ATTR_ENTITY_ID: ENTITY_ID,
+        ATTR_COMMAND: ["test"],
+    }
 
-        common.turn_on(self.hass, entity_id=ENTITY_ID)
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_ID)
-        assert state.state == STATE_ON
-
-        common.send_command(self.hass, "test", entity_id=ENTITY_ID)
-        self.hass.block_till_done()
-        state = self.hass.states.get(ENTITY_ID)
-        assert state.attributes == {
-            "friendly_name": "Remote One",
-            "last_command_sent": "test",
-            "supported_features": 0,
-        }
+    await hass.services.async_call(remote.DOMAIN, SERVICE_SEND_COMMAND, data)
+    await hass.async_block_till_done()
+    state = hass.states.get(ENTITY_ID)
+    assert state.attributes == {
+        "friendly_name": "Remote One",
+        "last_command_sent": "test",
+        "supported_features": 0,
+    }
diff --git a/tests/components/denonavr/test_config_flow.py b/tests/components/denonavr/test_config_flow.py
index 8fcc3af0f26..b8ea6016131 100644
--- a/tests/components/denonavr/test_config_flow.py
+++ b/tests/components/denonavr/test_config_flow.py
@@ -389,7 +389,7 @@ async def test_config_flow_manual_host_connection_error(hass):
         )
 
     assert result["type"] == "abort"
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
 
 
 async def test_config_flow_manual_host_no_device_info(hass):
@@ -416,7 +416,7 @@ async def test_config_flow_manual_host_no_device_info(hass):
         )
 
     assert result["type"] == "abort"
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
 
 
 async def test_config_flow_ssdp(hass):
diff --git a/tests/components/devolo_home_control/test_config_flow.py b/tests/components/devolo_home_control/test_config_flow.py
index 6790c85b777..89e87c78c64 100644
--- a/tests/components/devolo_home_control/test_config_flow.py
+++ b/tests/components/devolo_home_control/test_config_flow.py
@@ -66,7 +66,7 @@ async def test_form_invalid_credentials(hass):
             {"username": "test-username", "password": "test-password"},
         )
 
-        assert result["errors"] == {"base": "invalid_credentials"}
+        assert result["errors"] == {"base": "invalid_auth"}
 
 
 async def test_form_already_configured(hass):
diff --git a/tests/components/dexcom/test_config_flow.py b/tests/components/dexcom/test_config_flow.py
index b95f796b230..6f6d8abe8f9 100644
--- a/tests/components/dexcom/test_config_flow.py
+++ b/tests/components/dexcom/test_config_flow.py
@@ -57,7 +57,7 @@ async def test_form_account_error(hass):
         )
 
     assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result2["errors"] == {"base": "account_error"}
+    assert result2["errors"] == {"base": "invalid_auth"}
 
 
 async def test_form_session_error(hass):
@@ -76,7 +76,7 @@ async def test_form_session_error(hass):
         )
 
     assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result2["errors"] == {"base": "session_error"}
+    assert result2["errors"] == {"base": "cannot_connect"}
 
 
 async def test_form_unknown_error(hass):
diff --git a/tests/components/dsmr/conftest.py b/tests/components/dsmr/conftest.py
new file mode 100644
index 00000000000..d2cec93df95
--- /dev/null
+++ b/tests/components/dsmr/conftest.py
@@ -0,0 +1,71 @@
+"""Common test tools."""
+import asyncio
+
+from dsmr_parser.clients.protocol import DSMRProtocol
+from dsmr_parser.obis_references import EQUIPMENT_IDENTIFIER, EQUIPMENT_IDENTIFIER_GAS
+from dsmr_parser.objects import CosemObject
+import pytest
+
+from tests.async_mock import MagicMock, patch
+
+
+@pytest.fixture
+async def dsmr_connection_fixture(hass):
+    """Fixture that mocks serial connection."""
+
+    transport = MagicMock(spec=asyncio.Transport)
+    protocol = MagicMock(spec=DSMRProtocol)
+
+    async def connection_factory(*args, **kwargs):
+        """Return mocked out Asyncio classes."""
+        return (transport, protocol)
+
+    connection_factory = MagicMock(wraps=connection_factory)
+
+    with patch(
+        "homeassistant.components.dsmr.sensor.create_dsmr_reader", connection_factory
+    ), patch(
+        "homeassistant.components.dsmr.sensor.create_tcp_dsmr_reader",
+        connection_factory,
+    ):
+        yield (connection_factory, transport, protocol)
+
+
+@pytest.fixture
+async def dsmr_connection_send_validate_fixture(hass):
+    """Fixture that mocks serial connection."""
+
+    transport = MagicMock(spec=asyncio.Transport)
+    protocol = MagicMock(spec=DSMRProtocol)
+
+    async def connection_factory(*args, **kwargs):
+        """Return mocked out Asyncio classes."""
+        return (transport, protocol)
+
+    connection_factory = MagicMock(wraps=connection_factory)
+
+    protocol.telegram = {
+        EQUIPMENT_IDENTIFIER: CosemObject([{"value": "12345678", "unit": ""}]),
+        EQUIPMENT_IDENTIFIER_GAS: CosemObject([{"value": "123456789", "unit": ""}]),
+    }
+
+    async def wait_closed():
+        if isinstance(connection_factory.call_args_list[0][0][2], str):
+            # TCP
+            telegram_callback = connection_factory.call_args_list[0][0][3]
+        else:
+            # Serial
+            telegram_callback = connection_factory.call_args_list[0][0][2]
+
+        telegram_callback(protocol.telegram)
+
+    protocol.wait_closed = wait_closed
+
+    with patch(
+        "homeassistant.components.dsmr.config_flow.create_dsmr_reader",
+        connection_factory,
+    ), patch(
+        "homeassistant.components.dsmr.config_flow.create_tcp_dsmr_reader",
+        connection_factory,
+    ):
+        yield (connection_factory, transport, protocol)
diff --git a/tests/components/dsmr/test_config_flow.py b/tests/components/dsmr/test_config_flow.py
index c35562b4024..c6fb57c6ecb 100644
--- a/tests/components/dsmr/test_config_flow.py
+++ b/tests/components/dsmr/test_config_flow.py
@@ -2,64 +2,18 @@
 import asyncio
 from itertools import chain, repeat
 
-from dsmr_parser.clients.protocol import DSMRProtocol
-from dsmr_parser.obis_references import EQUIPMENT_IDENTIFIER, EQUIPMENT_IDENTIFIER_GAS
-from dsmr_parser.objects import CosemObject
-import pytest
 import serial
 
 from homeassistant import config_entries, setup
 from homeassistant.components.dsmr import DOMAIN
 
-from tests.async_mock import DEFAULT, AsyncMock, Mock, patch
+from tests.async_mock import DEFAULT, AsyncMock, patch
 from tests.common import MockConfigEntry
 
 SERIAL_DATA = {"serial_id": "12345678", "serial_id_gas": "123456789"}
 
 
-@pytest.fixture
-def mock_connection_factory(monkeypatch):
-    """Mock the create functions for serial and TCP Asyncio connections."""
-    transport = Mock(spec=asyncio.Transport)
-    protocol = Mock(spec=DSMRProtocol)
-
-    async def connection_factory(*args, **kwargs):
-        """Return mocked out Asyncio classes."""
-        return (transport, protocol)
-
-    connection_factory = Mock(wraps=connection_factory)
-
-    # apply the mock to both connection factories
-    monkeypatch.setattr(
-        "homeassistant.components.dsmr.config_flow.create_dsmr_reader",
-        connection_factory,
-    )
-    monkeypatch.setattr(
-        "homeassistant.components.dsmr.config_flow.create_tcp_dsmr_reader",
-        connection_factory,
-    )
-
-    protocol.telegram = {
-        EQUIPMENT_IDENTIFIER: CosemObject([{"value": "12345678", "unit": ""}]),
-        EQUIPMENT_IDENTIFIER_GAS: CosemObject([{"value": "123456789", "unit": ""}]),
-    }
-
-    async def wait_closed():
-        if isinstance(connection_factory.call_args_list[0][0][2], str):
-            # TCP
-            telegram_callback = connection_factory.call_args_list[0][0][3]
-        else:
-            # Serial
-            telegram_callback = connection_factory.call_args_list[0][0][2]
-
-        telegram_callback(protocol.telegram)
-
-    protocol.wait_closed = wait_closed
-
-    return connection_factory, transport, protocol
-
-
-async def test_import_usb(hass, mock_connection_factory):
+async def test_import_usb(hass, dsmr_connection_send_validate_fixture):
     """Test we can import."""
     await setup.async_setup_component(hass, "persistent_notification", {})
 
@@ -82,9 +36,11 @@ async def test_import_usb(hass, mock_connection_factory):
     assert result["data"] == {**entry_data, **SERIAL_DATA}
 
 
-async def test_import_usb_failed_connection(hass, monkeypatch, mock_connection_factory):
+async def test_import_usb_failed_connection(
+    hass, dsmr_connection_send_validate_fixture
+):
     """Test we can import."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_send_validate_fixture
 
     await setup.async_setup_component(hass, "persistent_notification", {})
 
@@ -101,12 +57,12 @@ async def test_import_usb_failed_connection(hass, monkeypatch, mock_connection_f
         side_effect=chain([serial.serialutil.SerialException], repeat(DEFAULT)),
     )
 
-    monkeypatch.setattr(
+    with patch(
+        "homeassistant.components.dsmr.async_setup_entry", return_value=True
+    ), patch(
         "homeassistant.components.dsmr.config_flow.create_dsmr_reader",
         first_fail_connection_factory,
-    )
-
-    with patch("homeassistant.components.dsmr.async_setup_entry", return_value=True):
+    ):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
             context={"source": config_entries.SOURCE_IMPORT},
@@ -117,9 +73,9 @@ async def test_import_usb_failed_connection(hass, monkeypatch, mock_connection_f
     assert result["reason"] == "cannot_connect"
 
 
-async def test_import_usb_no_data(hass, monkeypatch, mock_connection_factory):
+async def test_import_usb_no_data(hass, dsmr_connection_send_validate_fixture):
     """Test we can import."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_send_validate_fixture
 
     await setup.async_setup_component(hass, "persistent_notification", {})
 
@@ -149,9 +105,9 @@ async def test_import_usb_no_data(hass, monkeypatch, mock_connection_factory):
     assert result["reason"] == "cannot_communicate"
 
 
-async def test_import_usb_wrong_telegram(hass, mock_connection_factory):
+async def test_import_usb_wrong_telegram(hass, dsmr_connection_send_validate_fixture):
     """Test we can import."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_send_validate_fixture
 
     await setup.async_setup_component(hass, "persistent_notification", {})
 
@@ -175,7 +131,7 @@ async def test_import_usb_wrong_telegram(hass, mock_connection_factory):
     assert result["reason"] == "cannot_communicate"
 
 
-async def test_import_network(hass, mock_connection_factory):
+async def test_import_network(hass, dsmr_connection_send_validate_fixture):
     """Test we can import from network."""
     await setup.async_setup_component(hass, "persistent_notification", {})
 
@@ -199,7 +155,7 @@ async def test_import_network(hass, mock_connection_factory):
     assert result["data"] == {**entry_data, **SERIAL_DATA}
 
 
-async def test_import_update(hass, mock_connection_factory):
+async def test_import_update(hass, dsmr_connection_send_validate_fixture):
     """Test we can import."""
     await setup.async_setup_component(hass, "persistent_notification", {})
 
diff --git a/tests/components/dsmr/test_sensor.py b/tests/components/dsmr/test_sensor.py
index f0ff2f85c57..49e9feb80f6 100644
--- a/tests/components/dsmr/test_sensor.py
+++ b/tests/components/dsmr/test_sensor.py
@@ -10,46 +10,17 @@ import datetime
 from decimal import Decimal
 from itertools import chain, repeat
 
-import pytest
-
 from homeassistant.components.dsmr.const import DOMAIN
 from homeassistant.components.dsmr.sensor import DerivativeDSMREntity
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.const import ENERGY_KILO_WATT_HOUR, TIME_HOURS, VOLUME_CUBIC_METERS
 from homeassistant.setup import async_setup_component
 
-import tests.async_mock
-from tests.async_mock import DEFAULT, MagicMock, Mock
+from tests.async_mock import DEFAULT, MagicMock
 from tests.common import MockConfigEntry, patch
 
 
-@pytest.fixture
-def mock_connection_factory(monkeypatch):
-    """Mock the create functions for serial and TCP Asyncio connections."""
-    from dsmr_parser.clients.protocol import DSMRProtocol
-
-    transport = tests.async_mock.Mock(spec=asyncio.Transport)
-    protocol = tests.async_mock.Mock(spec=DSMRProtocol)
-
-    async def connection_factory(*args, **kwargs):
-        """Return mocked out Asyncio classes."""
-        return (transport, protocol)
-
-    connection_factory = Mock(wraps=connection_factory)
-
-    # apply the mock to both connection factories
-    monkeypatch.setattr(
-        "homeassistant.components.dsmr.sensor.create_dsmr_reader", connection_factory
-    )
-    monkeypatch.setattr(
-        "homeassistant.components.dsmr.sensor.create_tcp_dsmr_reader",
-        connection_factory,
-    )
-
-    return connection_factory, transport, protocol
-
-
-async def test_setup_platform(hass, mock_connection_factory):
+async def test_setup_platform(hass, dsmr_connection_fixture):
     """Test setup of platform."""
     async_add_entities = MagicMock()
 
@@ -87,9 +58,9 @@ async def test_setup_platform(hass, mock_connection_factory):
     assert entry.data == {**entry_data, **serial_data}
 
 
-async def test_default_setup(hass, mock_connection_factory):
+async def test_default_setup(hass, dsmr_connection_fixture):
     """Test the default setup."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_fixture
 
     from dsmr_parser.obis_references import (
         CURRENT_ELECTRICITY_USAGE,
@@ -157,10 +128,6 @@ async def test_default_setup(hass, mock_connection_factory):
     assert gas_consumption.state == "745.695"
     assert gas_consumption.attributes.get("unit_of_measurement") == VOLUME_CUBIC_METERS
 
-    await hass.config_entries.async_unload(mock_entry.entry_id)
-
-    assert mock_entry.state == "not_loaded"
-
 
 async def test_derivative():
     """Test calculation of derivative value."""
@@ -202,9 +169,9 @@ async def test_derivative():
     assert entity.unit_of_measurement == f"{VOLUME_CUBIC_METERS}/{TIME_HOURS}"
 
 
-async def test_v4_meter(hass, mock_connection_factory):
+async def test_v4_meter(hass, dsmr_connection_fixture):
     """Test if v4 meter is correctly parsed."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_fixture
 
     from dsmr_parser.obis_references import (
         ELECTRICITY_ACTIVE_TARIFF,
@@ -256,14 +223,10 @@ async def test_v4_meter(hass, mock_connection_factory):
     assert gas_consumption.state == "745.695"
     assert gas_consumption.attributes.get("unit_of_measurement") == VOLUME_CUBIC_METERS
 
-    await hass.config_entries.async_unload(mock_entry.entry_id)
 
-    assert mock_entry.state == "not_loaded"
-
-
-async def test_v5_meter(hass, mock_connection_factory):
+async def test_v5_meter(hass, dsmr_connection_fixture):
     """Test if v5 meter is correctly parsed."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_fixture
 
     from dsmr_parser.obis_references import (
         ELECTRICITY_ACTIVE_TARIFF,
@@ -315,14 +278,10 @@ async def test_v5_meter(hass, mock_connection_factory):
     assert gas_consumption.state == "745.695"
     assert gas_consumption.attributes.get("unit_of_measurement") == VOLUME_CUBIC_METERS
 
-    await hass.config_entries.async_unload(mock_entry.entry_id)
 
-    assert mock_entry.state == "not_loaded"
-
-
-async def test_belgian_meter(hass, mock_connection_factory):
+async def test_belgian_meter(hass, dsmr_connection_fixture):
     """Test if Belgian meter is correctly parsed."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_fixture
 
     from dsmr_parser.obis_references import (
         BELGIUM_HOURLY_GAS_METER_READING,
@@ -374,14 +333,10 @@ async def test_belgian_meter(hass, mock_connection_factory):
     assert gas_consumption.state == "745.695"
     assert gas_consumption.attributes.get("unit_of_measurement") == VOLUME_CUBIC_METERS
 
-    await hass.config_entries.async_unload(mock_entry.entry_id)
 
-    assert mock_entry.state == "not_loaded"
-
-
-async def test_belgian_meter_low(hass, mock_connection_factory):
+async def test_belgian_meter_low(hass, dsmr_connection_fixture):
     """Test if Belgian meter is correctly parsed."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_fixture
 
     from dsmr_parser.obis_references import ELECTRICITY_ACTIVE_TARIFF
     from dsmr_parser.objects import CosemObject
@@ -417,14 +372,10 @@ async def test_belgian_meter_low(hass, mock_connection_factory):
     assert power_tariff.state == "low"
     assert power_tariff.attributes.get("unit_of_measurement") == ""
 
-    await hass.config_entries.async_unload(mock_entry.entry_id)
 
-    assert mock_entry.state == "not_loaded"
-
-
-async def test_tcp(hass, mock_connection_factory):
+async def test_tcp(hass, dsmr_connection_fixture):
     """If proper config provided TCP connection should be made."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_fixture
 
     entry_data = {
         "host": "localhost",
@@ -446,14 +397,10 @@ async def test_tcp(hass, mock_connection_factory):
     assert connection_factory.call_args_list[0][0][0] == "localhost"
     assert connection_factory.call_args_list[0][0][1] == "1234"
 
-    await hass.config_entries.async_unload(mock_entry.entry_id)
 
-    assert mock_entry.state == "not_loaded"
-
-
-async def test_connection_errors_retry(hass, monkeypatch, mock_connection_factory):
+async def test_connection_errors_retry(hass, dsmr_connection_fixture):
     """Connection should be retried on error during setup."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_fixture
 
     entry_data = {
         "port": "/dev/ttyUSB0",
@@ -463,37 +410,32 @@ async def test_connection_errors_retry(hass, monkeypatch, mock_connection_factor
     }
 
     # override the mock to have it fail the first time and succeed after
-    first_fail_connection_factory = tests.async_mock.AsyncMock(
+    first_fail_connection_factory = MagicMock(
         return_value=(transport, protocol),
         side_effect=chain([TimeoutError], repeat(DEFAULT)),
     )
 
-    monkeypatch.setattr(
-        "homeassistant.components.dsmr.sensor.create_dsmr_reader",
-        first_fail_connection_factory,
-    )
-
     mock_entry = MockConfigEntry(
         domain="dsmr", unique_id="/dev/ttyUSB0", data=entry_data
     )
 
     mock_entry.add_to_hass(hass)
 
-    await hass.config_entries.async_setup(mock_entry.entry_id)
-    await hass.async_block_till_done()
+    with patch(
+        "homeassistant.components.dsmr.sensor.create_dsmr_reader",
+        first_fail_connection_factory,
+    ):
+        await hass.config_entries.async_setup(mock_entry.entry_id)
+        await hass.async_block_till_done()
 
-    # wait for sleep to resolve
-    await hass.async_block_till_done()
-    assert first_fail_connection_factory.call_count >= 2, "connecting not retried"
-
-    await hass.config_entries.async_unload(mock_entry.entry_id)
-
-    assert mock_entry.state == "not_loaded"
+        # wait for sleep to resolve
+        await hass.async_block_till_done()
+        assert first_fail_connection_factory.call_count >= 2, "connecting not retried"
 
 
-async def test_reconnect(hass, monkeypatch, mock_connection_factory):
+async def test_reconnect(hass, dsmr_connection_fixture):
     """If transport disconnects, the connection should be retried."""
-    (connection_factory, transport, protocol) = mock_connection_factory
+    (connection_factory, transport, protocol) = dsmr_connection_fixture
 
     entry_data = {
         "port": "/dev/ttyUSB0",
diff --git a/tests/components/dte_energy_bridge/test_sensor.py b/tests/components/dte_energy_bridge/test_sensor.py
index 38d712468c0..b0d2b2b7b2d 100644
--- a/tests/components/dte_energy_bridge/test_sensor.py
+++ b/tests/components/dte_energy_bridge/test_sensor.py
@@ -1,65 +1,56 @@
 """The tests for the DTE Energy Bridge."""
-
-import unittest
-
 import requests_mock
 
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 DTE_ENERGY_BRIDGE_CONFIG = {"platform": "dte_energy_bridge", "ip": "192.168.1.1"}
 
 
-class TestDteEnergyBridgeSetup(unittest.TestCase):
-    """Test the DTE Energy Bridge platform."""
+async def test_setup_with_config(hass):
+    """Test the platform setup with configuration."""
+    assert await async_setup_component(
+        hass, "sensor", {"dte_energy_bridge": DTE_ENERGY_BRIDGE_CONFIG}
+    )
+    await hass.async_block_till_done()
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
 
-    def test_setup_with_config(self):
-        """Test the platform setup with configuration."""
-        assert setup_component(
-            self.hass, "sensor", {"dte_energy_bridge": DTE_ENERGY_BRIDGE_CONFIG}
-        )
-
-    @requests_mock.Mocker()
-    def test_setup_correct_reading(self, mock_req):
-        """Test DTE Energy bridge returns a correct value."""
+async def test_setup_correct_reading(hass):
+    """Test DTE Energy bridge returns a correct value."""
+    with requests_mock.Mocker() as mock_req:
         mock_req.get(
             "http://{}/instantaneousdemand".format(DTE_ENERGY_BRIDGE_CONFIG["ip"]),
             text=".411 kW",
         )
-        assert setup_component(
-            self.hass, "sensor", {"sensor": DTE_ENERGY_BRIDGE_CONFIG}
+        assert await async_setup_component(
+            hass, "sensor", {"sensor": DTE_ENERGY_BRIDGE_CONFIG}
         )
-        self.hass.block_till_done()
-        assert "0.411" == self.hass.states.get("sensor.current_energy_usage").state
+        await hass.async_block_till_done()
+    assert hass.states.get("sensor.current_energy_usage").state == "0.411"
 
-    @requests_mock.Mocker()
-    def test_setup_incorrect_units_reading(self, mock_req):
-        """Test DTE Energy bridge handles a value with incorrect units."""
+
+async def test_setup_incorrect_units_reading(hass):
+    """Test DTE Energy bridge handles a value with incorrect units."""
+    with requests_mock.Mocker() as mock_req:
         mock_req.get(
             "http://{}/instantaneousdemand".format(DTE_ENERGY_BRIDGE_CONFIG["ip"]),
             text="411 kW",
         )
-        assert setup_component(
-            self.hass, "sensor", {"sensor": DTE_ENERGY_BRIDGE_CONFIG}
+        assert await async_setup_component(
+            hass, "sensor", {"sensor": DTE_ENERGY_BRIDGE_CONFIG}
         )
-        self.hass.block_till_done()
-        assert "0.411" == self.hass.states.get("sensor.current_energy_usage").state
+        await hass.async_block_till_done()
+    assert hass.states.get("sensor.current_energy_usage").state == "0.411"
 
-    @requests_mock.Mocker()
-    def test_setup_bad_format_reading(self, mock_req):
-        """Test DTE Energy bridge handles an invalid value."""
+
+async def test_setup_bad_format_reading(hass):
+    """Test DTE Energy bridge handles an invalid value."""
+    with requests_mock.Mocker() as mock_req:
         mock_req.get(
             "http://{}/instantaneousdemand".format(DTE_ENERGY_BRIDGE_CONFIG["ip"]),
             text="411",
         )
-        assert setup_component(
-            self.hass, "sensor", {"sensor": DTE_ENERGY_BRIDGE_CONFIG}
+        assert await async_setup_component(
+            hass, "sensor", {"sensor": DTE_ENERGY_BRIDGE_CONFIG}
         )
-        self.hass.block_till_done()
-        assert "unknown" == self.hass.states.get("sensor.current_energy_usage").state
+        await hass.async_block_till_done()
+    assert hass.states.get("sensor.current_energy_usage").state == "unknown"
diff --git a/tests/components/eafm/conftest.py b/tests/components/eafm/conftest.py
index b25c0f4cdba..7233257f2eb 100644
--- a/tests/components/eafm/conftest.py
+++ b/tests/components/eafm/conftest.py
@@ -1,8 +1,9 @@
 """eafm fixtures."""
 
-from asynctest import patch
 import pytest
 
+from tests.async_mock import patch
+
 
 @pytest.fixture()
 def mock_get_stations():
diff --git a/tests/components/eafm/test_config_flow.py b/tests/components/eafm/test_config_flow.py
index 4656e34a34c..cd71767104f 100644
--- a/tests/components/eafm/test_config_flow.py
+++ b/tests/components/eafm/test_config_flow.py
@@ -1,10 +1,11 @@
 """Tests for eafm config flow."""
-from asynctest import patch
 import pytest
 from voluptuous.error import MultipleInvalid
 
 from homeassistant.components.eafm import const
 
+from tests.async_mock import patch
+
 
 async def test_flow_no_discovered_stations(hass, mock_get_stations):
     """Test config flow discovers no station."""
diff --git a/tests/components/ecobee/test_config_flow.py b/tests/components/ecobee/test_config_flow.py
index 6b53af5daa8..88b7eb7241d 100644
--- a/tests/components/ecobee/test_config_flow.py
+++ b/tests/components/ecobee/test_config_flow.py
@@ -26,7 +26,7 @@ async def test_abort_if_already_setup(hass):
     result = await flow.async_step_user()
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "one_instance_only"
+    assert result["reason"] == "single_instance_allowed"
 
 
 async def test_user_step_without_user_input(hass):
diff --git a/tests/components/efergy/test_sensor.py b/tests/components/efergy/test_sensor.py
index 1cf01bdb96c..3dfbfc354f8 100644
--- a/tests/components/efergy/test_sensor.py
+++ b/tests/components/efergy/test_sensor.py
@@ -1,11 +1,8 @@
 """The tests for Efergy sensor platform."""
-import unittest
 
-import requests_mock
+from homeassistant.setup import async_setup_component
 
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant, load_fixture
+from tests.common import load_fixture
 
 token = "9p6QGJ7dpZfO3fqPTBk1fyEmjV1cGoLT"
 multi_sensor_token = "9r6QGF7dpZfO3fqPTBl1fyRmjV1cGoLT"
@@ -60,49 +57,25 @@ def mock_responses(mock):
     )
 
 
-class TestEfergySensor(unittest.TestCase):
-    """Tests the Efergy Sensor platform."""
+async def test_single_sensor_readings(hass, requests_mock):
+    """Test for successfully setting up the Efergy platform."""
+    mock_responses(requests_mock)
+    assert await async_setup_component(hass, "sensor", {"sensor": ONE_SENSOR_CONFIG})
+    await hass.async_block_till_done()
 
-    DEVICES = []
+    assert "38.21" == hass.states.get("sensor.energy_consumed").state
+    assert "1580" == hass.states.get("sensor.energy_usage").state
+    assert "ok" == hass.states.get("sensor.energy_budget").state
+    assert "5.27" == hass.states.get("sensor.energy_cost").state
+    assert "1628" == hass.states.get("sensor.efergy_728386").state
 
-    @requests_mock.Mocker()
-    def add_entities(self, devices, mock):
-        """Mock add devices."""
-        mock_responses(mock)
-        for device in devices:
-            device.update()
-            self.DEVICES.append(device)
 
-    def setUp(self):
-        """Initialize values for this test case class."""
-        self.hass = get_test_home_assistant()
-        self.config = ONE_SENSOR_CONFIG
-        self.addCleanup(self.tear_down_cleanup)
+async def test_multi_sensor_readings(hass, requests_mock):
+    """Test for multiple sensors in one household."""
+    mock_responses(requests_mock)
+    assert await async_setup_component(hass, "sensor", {"sensor": MULTI_SENSOR_CONFIG})
+    await hass.async_block_till_done()
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    @requests_mock.Mocker()
-    def test_single_sensor_readings(self, mock):
-        """Test for successfully setting up the Efergy platform."""
-        mock_responses(mock)
-        assert setup_component(self.hass, "sensor", {"sensor": ONE_SENSOR_CONFIG})
-        self.hass.block_till_done()
-
-        assert "38.21" == self.hass.states.get("sensor.energy_consumed").state
-        assert "1580" == self.hass.states.get("sensor.energy_usage").state
-        assert "ok" == self.hass.states.get("sensor.energy_budget").state
-        assert "5.27" == self.hass.states.get("sensor.energy_cost").state
-        assert "1628" == self.hass.states.get("sensor.efergy_728386").state
-
-    @requests_mock.Mocker()
-    def test_multi_sensor_readings(self, mock):
-        """Test for multiple sensors in one household."""
-        mock_responses(mock)
-        assert setup_component(self.hass, "sensor", {"sensor": MULTI_SENSOR_CONFIG})
-        self.hass.block_till_done()
-
-        assert "218" == self.hass.states.get("sensor.efergy_728386").state
-        assert "1808" == self.hass.states.get("sensor.efergy_0").state
-        assert "312" == self.hass.states.get("sensor.efergy_728387").state
+    assert "218" == hass.states.get("sensor.efergy_728386").state
+    assert "1808" == hass.states.get("sensor.efergy_0").state
+    assert "312" == hass.states.get("sensor.efergy_728387").state
diff --git a/tests/components/elgato/test_config_flow.py b/tests/components/elgato/test_config_flow.py
index e0d34aecad2..c1dfa697041 100644
--- a/tests/components/elgato/test_config_flow.py
+++ b/tests/components/elgato/test_config_flow.py
@@ -72,7 +72,7 @@ async def test_connection_error(
         data={CONF_HOST: "1.2.3.4", CONF_PORT: 9123},
     )
 
-    assert result["errors"] == {"base": "connection_error"}
+    assert result["errors"] == {"base": "cannot_connect"}
     assert result["step_id"] == "user"
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
 
@@ -89,7 +89,7 @@ async def test_zeroconf_connection_error(
         data={"host": "1.2.3.4", "port": 9123},
     )
 
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
 
 
@@ -110,7 +110,7 @@ async def test_zeroconf_confirm_connection_error(
         user_input={CONF_HOST: "1.2.3.4", CONF_PORT: 9123}
     )
 
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
 
 
@@ -122,7 +122,7 @@ async def test_zeroconf_no_data(
     flow.hass = hass
     result = await flow.async_step_zeroconf()
 
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
 
 
diff --git a/tests/components/esphome/test_config_flow.py b/tests/components/esphome/test_config_flow.py
index 164709e86a8..41c3d6cf528 100644
--- a/tests/components/esphome/test_config_flow.py
+++ b/tests/components/esphome/test_config_flow.py
@@ -174,7 +174,7 @@ async def test_user_invalid_password(hass, mock_api_connection_error, mock_clien
 
     assert result["type"] == RESULT_TYPE_FORM
     assert result["step_id"] == "authenticate"
-    assert result["errors"] == {"base": "invalid_password"}
+    assert result["errors"] == {"base": "invalid_auth"}
 
 
 async def test_discovery_initiation(hass, mock_client):
diff --git a/tests/components/facebook/test_notify.py b/tests/components/facebook/test_notify.py
index c4675a4311a..c9fddc7fcc4 100644
--- a/tests/components/facebook/test_notify.py
+++ b/tests/components/facebook/test_notify.py
@@ -1,29 +1,26 @@
 """The test for the Facebook notify module."""
-import unittest
-
+import pytest
 import requests_mock
 
-# import homeassistant.components.facebook as facebook
-import homeassistant.components.facebook.notify as facebook
+import homeassistant.components.facebook.notify as fb
 
 
-class TestFacebook(unittest.TestCase):
-    """Tests for Facebook notification service."""
+@pytest.fixture
+def facebook():
+    """Fixture for facebook."""
+    access_token = "page-access-token"
+    return fb.FacebookNotificationService(access_token)
 
-    def setUp(self):
-        """Set up test variables."""
-        access_token = "page-access-token"
-        self.facebook = facebook.FacebookNotificationService(access_token)
 
-    @requests_mock.Mocker()
-    def test_send_simple_message(self, mock):
-        """Test sending a simple message with success."""
-        mock.register_uri(requests_mock.POST, facebook.BASE_URL, status_code=200)
+async def test_send_simple_message(hass, facebook):
+    """Test sending a simple message with success."""
+    with requests_mock.Mocker() as mock:
+        mock.register_uri(requests_mock.POST, fb.BASE_URL, status_code=200)
 
         message = "This is just a test"
         target = ["+15555551234"]
 
-        self.facebook.send_message(message=message, target=target)
+        facebook.send_message(message=message, target=target)
         assert mock.called
         assert mock.call_count == 1
 
@@ -38,15 +35,16 @@ class TestFacebook(unittest.TestCase):
         expected_params = {"access_token": ["page-access-token"]}
         assert mock.last_request.qs == expected_params
 
-    @requests_mock.Mocker()
-    def test_sending_multiple_messages(self, mock):
-        """Test sending a message to multiple targets."""
-        mock.register_uri(requests_mock.POST, facebook.BASE_URL, status_code=200)
+
+async def test_send_multiple_message(hass, facebook):
+    """Test sending a message to multiple targets."""
+    with requests_mock.Mocker() as mock:
+        mock.register_uri(requests_mock.POST, fb.BASE_URL, status_code=200)
 
         message = "This is just a test"
         targets = ["+15555551234", "+15555551235"]
 
-        self.facebook.send_message(message=message, target=targets)
+        facebook.send_message(message=message, target=targets)
         assert mock.called
         assert mock.call_count == 2
 
@@ -63,10 +61,11 @@ class TestFacebook(unittest.TestCase):
             expected_params = {"access_token": ["page-access-token"]}
             assert request.qs == expected_params
 
-    @requests_mock.Mocker()
-    def test_send_message_attachment(self, mock):
-        """Test sending a message with a remote attachment."""
-        mock.register_uri(requests_mock.POST, facebook.BASE_URL, status_code=200)
+
+async def test_send_message_attachment(hass, facebook):
+    """Test sending a message with a remote attachment."""
+    with requests_mock.Mocker() as mock:
+        mock.register_uri(requests_mock.POST, fb.BASE_URL, status_code=200)
 
         message = "This will be thrown away."
         data = {
@@ -77,7 +76,7 @@ class TestFacebook(unittest.TestCase):
         }
         target = ["+15555551234"]
 
-        self.facebook.send_message(message=message, data=data, target=target)
+        facebook.send_message(message=message, data=data, target=target)
         assert mock.called
         assert mock.call_count == 1
 
@@ -92,30 +91,30 @@ class TestFacebook(unittest.TestCase):
         expected_params = {"access_token": ["page-access-token"]}
         assert mock.last_request.qs == expected_params
 
-    @requests_mock.Mocker()
-    def test_send_targetless_message(self, mock):
+    async def test_send_targetless_message(hass, facebook):
         """Test sending a message without a target."""
-        mock.register_uri(requests_mock.POST, facebook.BASE_URL, status_code=200)
+        with requests_mock.Mocker() as mock:
+            mock.register_uri(requests_mock.POST, fb.BASE_URL, status_code=200)
 
-        self.facebook.send_message(message="going nowhere")
-        assert not mock.called
+            facebook.send_message(message="going nowhere")
+            assert not mock.called
 
-    @requests_mock.Mocker()
-    def test_send_message_with_400(self, mock):
+    async def test_send_message_with_400(hass, facebook):
         """Test sending a message with a 400 from Facebook."""
-        mock.register_uri(
-            requests_mock.POST,
-            facebook.BASE_URL,
-            status_code=400,
-            json={
-                "error": {
-                    "message": "Invalid OAuth access token.",
-                    "type": "OAuthException",
-                    "code": 190,
-                    "fbtrace_id": "G4Da2pFp2Dp",
-                }
-            },
-        )
-        self.facebook.send_message(message="nope!", target=["+15555551234"])
-        assert mock.called
-        assert mock.call_count == 1
+        with requests_mock.Mocker() as mock:
+            mock.register_uri(
+                requests_mock.POST,
+                fb.BASE_URL,
+                status_code=400,
+                json={
+                    "error": {
+                        "message": "Invalid OAuth access token.",
+                        "type": "OAuthException",
+                        "code": 190,
+                        "fbtrace_id": "G4Da2pFp2Dp",
+                    }
+                },
+            )
+            facebook.send_message(message="nope!", target=["+15555551234"])
+            assert mock.called
+            assert mock.call_count == 1
diff --git a/tests/components/fail2ban/test_sensor.py b/tests/components/fail2ban/test_sensor.py
index fa78c9b1bbf..09daee423aa 100644
--- a/tests/components/fail2ban/test_sensor.py
+++ b/tests/components/fail2ban/test_sensor.py
@@ -1,18 +1,14 @@
 """The tests for local file sensor platform."""
-import unittest
-
-from mock_open import MockOpen
-
 from homeassistant.components.fail2ban.sensor import (
     STATE_ALL_BANS,
     STATE_CURRENT_BANS,
     BanLogParser,
     BanSensor,
 )
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
-from tests.async_mock import Mock, patch
-from tests.common import assert_setup_component, get_test_home_assistant
+from tests.async_mock import Mock, mock_open, patch
+from tests.common import assert_setup_component
 
 
 def fake_log(log_key):
@@ -60,158 +56,140 @@ def fake_log(log_key):
     return fake_log_dict[log_key]
 
 
-class TestBanSensor(unittest.TestCase):
-    """Test the fail2ban sensor."""
+@patch("os.path.isfile", Mock(return_value=True))
+async def test_setup(hass):
+    """Test that sensor can be setup."""
+    config = {"sensor": {"platform": "fail2ban", "jails": ["jail_one"]}}
+    mock_fh = mock_open()
+    with patch("homeassistant.components.fail2ban.sensor.open", mock_fh, create=True):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+    assert_setup_component(1, "sensor")
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
 
-    @patch("os.path.isfile", Mock(return_value=True))
-    def test_setup(self):
-        """Test that sensor can be setup."""
-        config = {"sensor": {"platform": "fail2ban", "jails": ["jail_one"]}}
-        mock_fh = MockOpen()
-        with patch(
-            "homeassistant.components.fail2ban.sensor.open", mock_fh, create=True
-        ):
-            assert setup_component(self.hass, "sensor", config)
-            self.hass.block_till_done()
-        assert_setup_component(1, "sensor")
+@patch("os.path.isfile", Mock(return_value=True))
+async def test_multi_jails(hass):
+    """Test that multiple jails can be set up as sensors.."""
+    config = {"sensor": {"platform": "fail2ban", "jails": ["jail_one", "jail_two"]}}
+    mock_fh = mock_open()
+    with patch("homeassistant.components.fail2ban.sensor.open", mock_fh, create=True):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+    assert_setup_component(2, "sensor")
 
-    @patch("os.path.isfile", Mock(return_value=True))
-    def test_multi_jails(self):
-        """Test that multiple jails can be set up as sensors.."""
-        config = {"sensor": {"platform": "fail2ban", "jails": ["jail_one", "jail_two"]}}
-        mock_fh = MockOpen()
-        with patch(
-            "homeassistant.components.fail2ban.sensor.open", mock_fh, create=True
-        ):
-            assert setup_component(self.hass, "sensor", config)
-            self.hass.block_till_done()
-        assert_setup_component(2, "sensor")
 
-    def test_single_ban(self):
-        """Test that log is parsed correctly for single ban."""
-        log_parser = BanLogParser("/test/fail2ban.log")
-        sensor = BanSensor("fail2ban", "jail_one", log_parser)
-        assert sensor.name == "fail2ban jail_one"
-        mock_fh = MockOpen(read_data=fake_log("single_ban"))
-        with patch(
-            "homeassistant.components.fail2ban.sensor.open", mock_fh, create=True
-        ):
-            sensor.update()
+async def test_single_ban(hass):
+    """Test that log is parsed correctly for single ban."""
+    log_parser = BanLogParser("/test/fail2ban.log")
+    sensor = BanSensor("fail2ban", "jail_one", log_parser)
+    assert sensor.name == "fail2ban jail_one"
+    mock_fh = mock_open(read_data=fake_log("single_ban"))
+    with patch("homeassistant.components.fail2ban.sensor.open", mock_fh, create=True):
+        sensor.update()
 
+    assert sensor.state == "111.111.111.111"
+    assert sensor.state_attributes[STATE_CURRENT_BANS] == ["111.111.111.111"]
+    assert sensor.state_attributes[STATE_ALL_BANS] == ["111.111.111.111"]
+
+
+async def test_ipv6_ban(hass):
+    """Test that log is parsed correctly for IPV6 bans."""
+    log_parser = BanLogParser("/test/fail2ban.log")
+    sensor = BanSensor("fail2ban", "jail_one", log_parser)
+    assert sensor.name == "fail2ban jail_one"
+    mock_fh = mock_open(read_data=fake_log("ipv6_ban"))
+    with patch("homeassistant.components.fail2ban.sensor.open", mock_fh, create=True):
+        sensor.update()
+
+    assert sensor.state == "2607:f0d0:1002:51::4"
+    assert sensor.state_attributes[STATE_CURRENT_BANS] == ["2607:f0d0:1002:51::4"]
+    assert sensor.state_attributes[STATE_ALL_BANS] == ["2607:f0d0:1002:51::4"]
+
+
+async def test_multiple_ban(hass):
+    """Test that log is parsed correctly for multiple ban."""
+    log_parser = BanLogParser("/test/fail2ban.log")
+    sensor = BanSensor("fail2ban", "jail_one", log_parser)
+    assert sensor.name == "fail2ban jail_one"
+    mock_fh = mock_open(read_data=fake_log("multi_ban"))
+    with patch("homeassistant.components.fail2ban.sensor.open", mock_fh, create=True):
+        sensor.update()
+
+    assert sensor.state == "222.222.222.222"
+    assert sensor.state_attributes[STATE_CURRENT_BANS] == [
+        "111.111.111.111",
+        "222.222.222.222",
+    ]
+    assert sensor.state_attributes[STATE_ALL_BANS] == [
+        "111.111.111.111",
+        "222.222.222.222",
+    ]
+
+
+async def test_unban_all(hass):
+    """Test that log is parsed correctly when unbanning."""
+    log_parser = BanLogParser("/test/fail2ban.log")
+    sensor = BanSensor("fail2ban", "jail_one", log_parser)
+    assert sensor.name == "fail2ban jail_one"
+    mock_fh = mock_open(read_data=fake_log("unban_all"))
+    with patch("homeassistant.components.fail2ban.sensor.open", mock_fh, create=True):
+        sensor.update()
+
+    assert sensor.state == "None"
+    assert sensor.state_attributes[STATE_CURRENT_BANS] == []
+    assert sensor.state_attributes[STATE_ALL_BANS] == [
+        "111.111.111.111",
+        "222.222.222.222",
+    ]
+
+
+async def test_unban_one(hass):
+    """Test that log is parsed correctly when unbanning one ip."""
+    log_parser = BanLogParser("/test/fail2ban.log")
+    sensor = BanSensor("fail2ban", "jail_one", log_parser)
+    assert sensor.name == "fail2ban jail_one"
+    mock_fh = mock_open(read_data=fake_log("unban_one"))
+    with patch("homeassistant.components.fail2ban.sensor.open", mock_fh, create=True):
+        sensor.update()
+
+    assert sensor.state == "222.222.222.222"
+    assert sensor.state_attributes[STATE_CURRENT_BANS] == ["222.222.222.222"]
+    assert sensor.state_attributes[STATE_ALL_BANS] == [
+        "111.111.111.111",
+        "222.222.222.222",
+    ]
+
+
+async def test_multi_jail(hass):
+    """Test that log is parsed correctly when using multiple jails."""
+    log_parser = BanLogParser("/test/fail2ban.log")
+    sensor1 = BanSensor("fail2ban", "jail_one", log_parser)
+    sensor2 = BanSensor("fail2ban", "jail_two", log_parser)
+    assert sensor1.name == "fail2ban jail_one"
+    assert sensor2.name == "fail2ban jail_two"
+    mock_fh = mock_open(read_data=fake_log("multi_jail"))
+    with patch("homeassistant.components.fail2ban.sensor.open", mock_fh, create=True):
+        sensor1.update()
+        sensor2.update()
+
+    assert sensor1.state == "111.111.111.111"
+    assert sensor1.state_attributes[STATE_CURRENT_BANS] == ["111.111.111.111"]
+    assert sensor1.state_attributes[STATE_ALL_BANS] == ["111.111.111.111"]
+    assert sensor2.state == "222.222.222.222"
+    assert sensor2.state_attributes[STATE_CURRENT_BANS] == ["222.222.222.222"]
+    assert sensor2.state_attributes[STATE_ALL_BANS] == ["222.222.222.222"]
+
+
+async def test_ban_active_after_update(hass):
+    """Test that ban persists after subsequent update."""
+    log_parser = BanLogParser("/test/fail2ban.log")
+    sensor = BanSensor("fail2ban", "jail_one", log_parser)
+    assert sensor.name == "fail2ban jail_one"
+    mock_fh = mock_open(read_data=fake_log("single_ban"))
+    with patch("homeassistant.components.fail2ban.sensor.open", mock_fh, create=True):
+        sensor.update()
         assert sensor.state == "111.111.111.111"
-        assert sensor.state_attributes[STATE_CURRENT_BANS] == ["111.111.111.111"]
-        assert sensor.state_attributes[STATE_ALL_BANS] == ["111.111.111.111"]
-
-    def test_ipv6_ban(self):
-        """Test that log is parsed correctly for IPV6 bans."""
-        log_parser = BanLogParser("/test/fail2ban.log")
-        sensor = BanSensor("fail2ban", "jail_one", log_parser)
-        assert sensor.name == "fail2ban jail_one"
-        mock_fh = MockOpen(read_data=fake_log("ipv6_ban"))
-        with patch(
-            "homeassistant.components.fail2ban.sensor.open", mock_fh, create=True
-        ):
-            sensor.update()
-
-        assert sensor.state == "2607:f0d0:1002:51::4"
-        assert sensor.state_attributes[STATE_CURRENT_BANS] == ["2607:f0d0:1002:51::4"]
-        assert sensor.state_attributes[STATE_ALL_BANS] == ["2607:f0d0:1002:51::4"]
-
-    def test_multiple_ban(self):
-        """Test that log is parsed correctly for multiple ban."""
-        log_parser = BanLogParser("/test/fail2ban.log")
-        sensor = BanSensor("fail2ban", "jail_one", log_parser)
-        assert sensor.name == "fail2ban jail_one"
-        mock_fh = MockOpen(read_data=fake_log("multi_ban"))
-        with patch(
-            "homeassistant.components.fail2ban.sensor.open", mock_fh, create=True
-        ):
-            sensor.update()
-
-        assert sensor.state == "222.222.222.222"
-        assert sensor.state_attributes[STATE_CURRENT_BANS] == [
-            "111.111.111.111",
-            "222.222.222.222",
-        ]
-        assert sensor.state_attributes[STATE_ALL_BANS] == [
-            "111.111.111.111",
-            "222.222.222.222",
-        ]
-
-    def test_unban_all(self):
-        """Test that log is parsed correctly when unbanning."""
-        log_parser = BanLogParser("/test/fail2ban.log")
-        sensor = BanSensor("fail2ban", "jail_one", log_parser)
-        assert sensor.name == "fail2ban jail_one"
-        mock_fh = MockOpen(read_data=fake_log("unban_all"))
-        with patch(
-            "homeassistant.components.fail2ban.sensor.open", mock_fh, create=True
-        ):
-            sensor.update()
-
-        assert sensor.state == "None"
-        assert sensor.state_attributes[STATE_CURRENT_BANS] == []
-        assert sensor.state_attributes[STATE_ALL_BANS] == [
-            "111.111.111.111",
-            "222.222.222.222",
-        ]
-
-    def test_unban_one(self):
-        """Test that log is parsed correctly when unbanning one ip."""
-        log_parser = BanLogParser("/test/fail2ban.log")
-        sensor = BanSensor("fail2ban", "jail_one", log_parser)
-        assert sensor.name == "fail2ban jail_one"
-        mock_fh = MockOpen(read_data=fake_log("unban_one"))
-        with patch(
-            "homeassistant.components.fail2ban.sensor.open", mock_fh, create=True
-        ):
-            sensor.update()
-
-        assert sensor.state == "222.222.222.222"
-        assert sensor.state_attributes[STATE_CURRENT_BANS] == ["222.222.222.222"]
-        assert sensor.state_attributes[STATE_ALL_BANS] == [
-            "111.111.111.111",
-            "222.222.222.222",
-        ]
-
-    def test_multi_jail(self):
-        """Test that log is parsed correctly when using multiple jails."""
-        log_parser = BanLogParser("/test/fail2ban.log")
-        sensor1 = BanSensor("fail2ban", "jail_one", log_parser)
-        sensor2 = BanSensor("fail2ban", "jail_two", log_parser)
-        assert sensor1.name == "fail2ban jail_one"
-        assert sensor2.name == "fail2ban jail_two"
-        mock_fh = MockOpen(read_data=fake_log("multi_jail"))
-        with patch(
-            "homeassistant.components.fail2ban.sensor.open", mock_fh, create=True
-        ):
-            sensor1.update()
-            sensor2.update()
-
-        assert sensor1.state == "111.111.111.111"
-        assert sensor1.state_attributes[STATE_CURRENT_BANS] == ["111.111.111.111"]
-        assert sensor1.state_attributes[STATE_ALL_BANS] == ["111.111.111.111"]
-        assert sensor2.state == "222.222.222.222"
-        assert sensor2.state_attributes[STATE_CURRENT_BANS] == ["222.222.222.222"]
-        assert sensor2.state_attributes[STATE_ALL_BANS] == ["222.222.222.222"]
-
-    def test_ban_active_after_update(self):
-        """Test that ban persists after subsequent update."""
-        log_parser = BanLogParser("/test/fail2ban.log")
-        sensor = BanSensor("fail2ban", "jail_one", log_parser)
-        assert sensor.name == "fail2ban jail_one"
-        mock_fh = MockOpen(read_data=fake_log("single_ban"))
-        with patch(
-            "homeassistant.components.fail2ban.sensor.open", mock_fh, create=True
-        ):
-            sensor.update()
-            assert sensor.state == "111.111.111.111"
-            sensor.update()
-            assert sensor.state == "111.111.111.111"
-        assert sensor.state_attributes[STATE_CURRENT_BANS] == ["111.111.111.111"]
-        assert sensor.state_attributes[STATE_ALL_BANS] == ["111.111.111.111"]
+        sensor.update()
+        assert sensor.state == "111.111.111.111"
+    assert sensor.state_attributes[STATE_CURRENT_BANS] == ["111.111.111.111"]
+    assert sensor.state_attributes[STATE_ALL_BANS] == ["111.111.111.111"]
diff --git a/tests/components/fan/test_init.py b/tests/components/fan/test_init.py
index 134a5976baa..c481e9f0937 100644
--- a/tests/components/fan/test_init.py
+++ b/tests/components/fan/test_init.py
@@ -1,7 +1,5 @@
 """Tests for fan platforms."""
 
-import unittest
-
 import pytest
 
 from homeassistant.components.fan import FanEntity
@@ -12,32 +10,20 @@ class BaseFan(FanEntity):
 
     def __init__(self):
         """Initialize the fan."""
-        pass
 
 
-class TestFanEntity(unittest.TestCase):
-    """Test coverage for base fan entity class."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.fan = BaseFan()
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Tear down unit test data."""
-        self.fan = None
-
-    def test_fanentity(self):
-        """Test fan entity methods."""
-        assert self.fan.state == "off"
-        assert len(self.fan.speed_list) == 0
-        assert self.fan.supported_features == 0
-        assert self.fan.capability_attributes == {}
-        # Test set_speed not required
-        self.fan.oscillate(True)
-        with pytest.raises(NotImplementedError):
-            self.fan.set_speed("slow")
-        with pytest.raises(NotImplementedError):
-            self.fan.turn_on()
-        with pytest.raises(NotImplementedError):
-            self.fan.turn_off()
+def test_fanentity():
+    """Test fan entity methods."""
+    fan = BaseFan()
+    assert fan.state == "off"
+    assert len(fan.speed_list) == 0
+    assert fan.supported_features == 0
+    assert fan.capability_attributes == {}
+    # Test set_speed not required
+    fan.oscillate(True)
+    with pytest.raises(NotImplementedError):
+        fan.set_speed("slow")
+    with pytest.raises(NotImplementedError):
+        fan.turn_on()
+    with pytest.raises(NotImplementedError):
+        fan.turn_off()
diff --git a/tests/components/file/test_notify.py b/tests/components/file/test_notify.py
index d7f380cf6da..5bb387ea1e3 100644
--- a/tests/components/file/test_notify.py
+++ b/tests/components/file/test_notify.py
@@ -1,91 +1,78 @@
 """The tests for the notify file platform."""
 import os
-import unittest
+
+import pytest
 
 import homeassistant.components.notify as notify
 from homeassistant.components.notify import ATTR_TITLE_DEFAULT
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
 from tests.async_mock import call, mock_open, patch
-from tests.common import assert_setup_component, get_test_home_assistant
+from tests.common import assert_setup_component
 
 
-class TestNotifyFile(unittest.TestCase):
-    """Test the file notify."""
+async def test_bad_config(hass):
+    """Test set up the platform with bad/missing config."""
+    config = {notify.DOMAIN: {"name": "test", "platform": "file"}}
+    with assert_setup_component(0) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+    assert not handle_config[notify.DOMAIN]
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.tear_down_cleanup)
 
-    def tear_down_cleanup(self):
-        """Stop down everything that was started."""
-        self.hass.stop()
+@pytest.mark.parametrize(
+    "timestamp",
+    [
+        False,
+        True,
+    ],
+)
+async def test_notify_file(hass, timestamp):
+    """Test the notify file output."""
+    filename = "mock_file"
+    message = "one, two, testing, testing"
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(
+            hass,
+            notify.DOMAIN,
+            {
+                "notify": {
+                    "name": "test",
+                    "platform": "file",
+                    "filename": filename,
+                    "timestamp": timestamp,
+                }
+            },
+        )
+    assert handle_config[notify.DOMAIN]
 
-    def test_bad_config(self):
-        """Test set up the platform with bad/missing config."""
-        config = {notify.DOMAIN: {"name": "test", "platform": "file"}}
-        with assert_setup_component(0) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert not handle_config[notify.DOMAIN]
+    m_open = mock_open()
+    with patch("homeassistant.components.file.notify.open", m_open, create=True), patch(
+        "homeassistant.components.file.notify.os.stat"
+    ) as mock_st, patch("homeassistant.util.dt.utcnow", return_value=dt_util.utcnow()):
 
-    def _test_notify_file(self, timestamp):
-        """Test the notify file output."""
-        filename = "mock_file"
-        message = "one, two, testing, testing"
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(
-                self.hass,
-                notify.DOMAIN,
-                {
-                    "notify": {
-                        "name": "test",
-                        "platform": "file",
-                        "filename": filename,
-                        "timestamp": timestamp,
-                    }
-                },
-            )
-        assert handle_config[notify.DOMAIN]
+        mock_st.return_value.st_size = 0
+        title = (
+            f"{ATTR_TITLE_DEFAULT} notifications "
+            f"(Log started: {dt_util.utcnow().isoformat()})\n{'-' * 80}\n"
+        )
 
-        m_open = mock_open()
-        with patch(
-            "homeassistant.components.file.notify.open", m_open, create=True
-        ), patch("homeassistant.components.file.notify.os.stat") as mock_st, patch(
-            "homeassistant.util.dt.utcnow", return_value=dt_util.utcnow()
-        ):
+        await hass.services.async_call(
+            "notify", "test", {"message": message}, blocking=True
+        )
 
-            mock_st.return_value.st_size = 0
-            title = (
-                f"{ATTR_TITLE_DEFAULT} notifications "
-                f"(Log started: {dt_util.utcnow().isoformat()})\n{'-' * 80}\n"
-            )
+        full_filename = os.path.join(hass.config.path(), filename)
+        assert m_open.call_count == 1
+        assert m_open.call_args == call(full_filename, "a")
 
-            self.hass.services.call(
-                "notify", "test", {"message": message}, blocking=True
-            )
-
-            full_filename = os.path.join(self.hass.config.path(), filename)
-            assert m_open.call_count == 1
-            assert m_open.call_args == call(full_filename, "a")
-
-            assert m_open.return_value.write.call_count == 2
-            if not timestamp:
-                assert m_open.return_value.write.call_args_list == [
-                    call(title),
-                    call(f"{message}\n"),
-                ]
-            else:
-                assert m_open.return_value.write.call_args_list == [
-                    call(title),
-                    call(f"{dt_util.utcnow().isoformat()} {message}\n"),
-                ]
-
-    def test_notify_file(self):
-        """Test the notify file output without timestamp."""
-        self._test_notify_file(False)
-
-    def test_notify_file_timestamp(self):
-        """Test the notify file output with timestamp."""
-        self._test_notify_file(True)
+        assert m_open.return_value.write.call_count == 2
+        if not timestamp:
+            assert m_open.return_value.write.call_args_list == [
+                call(title),
+                call(f"{message}\n"),
+            ]
+        else:
+            assert m_open.return_value.write.call_args_list == [
+                call(title),
+                call(f"{dt_util.utcnow().isoformat()} {message}\n"),
+            ]
diff --git a/tests/components/file/test_sensor.py b/tests/components/file/test_sensor.py
index 416f3e8c721..31370334f92 100644
--- a/tests/components/file/test_sensor.py
+++ b/tests/components/file/test_sensor.py
@@ -1,85 +1,76 @@
 """The tests for local file sensor platform."""
-import unittest
-
-# Using third party package because of a bug reading binary data in Python 3.4
-# https://bugs.python.org/issue23004
-from mock_open import MockOpen
+import pytest
 
 from homeassistant.const import STATE_UNKNOWN
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
-from tests.async_mock import Mock, patch
-from tests.common import get_test_home_assistant, mock_registry
+from tests.async_mock import Mock, mock_open, patch
+from tests.common import mock_registry
 
 
-class TestFileSensor(unittest.TestCase):
+@pytest.fixture
+def entity_reg(hass):
+    """Return an empty, loaded, registry."""
+    return mock_registry(hass)
+
+
+@patch("os.path.isfile", Mock(return_value=True))
+@patch("os.access", Mock(return_value=True))
+async def test_file_value(hass, entity_reg):
     """Test the File sensor."""
+    config = {
+        "sensor": {"platform": "file", "name": "file1", "file_path": "mock.file1"}
+    }
 
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        # Patch out 'is_allowed_path' as the mock files aren't allowed
-        self.hass.config.is_allowed_path = Mock(return_value=True)
-        mock_registry(self.hass)
+    m_open = mock_open(read_data="43\n45\n21")
+    with patch(
+        "homeassistant.components.file.sensor.open", m_open, create=True
+    ), patch.object(hass.config, "is_allowed_path", return_value=True):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
 
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
+    state = hass.states.get("sensor.file1")
+    assert state.state == "21"
 
-    @patch("os.path.isfile", Mock(return_value=True))
-    @patch("os.access", Mock(return_value=True))
-    def test_file_value(self):
-        """Test the File sensor."""
-        config = {
-            "sensor": {"platform": "file", "name": "file1", "file_path": "mock.file1"}
+
+@patch("os.path.isfile", Mock(return_value=True))
+@patch("os.access", Mock(return_value=True))
+async def test_file_value_template(hass, entity_reg):
+    """Test the File sensor with JSON entries."""
+    config = {
+        "sensor": {
+            "platform": "file",
+            "name": "file2",
+            "file_path": "mock.file2",
+            "value_template": "{{ value_json.temperature }}",
         }
+    }
 
-        m_open = MockOpen(read_data="43\n45\n21")
-        with patch("homeassistant.components.file.sensor.open", m_open, create=True):
-            assert setup_component(self.hass, "sensor", config)
-            self.hass.block_till_done()
+    data = '{"temperature": 29, "humidity": 31}\n' '{"temperature": 26, "humidity": 36}'
 
-        state = self.hass.states.get("sensor.file1")
-        assert state.state == "21"
+    m_open = mock_open(read_data=data)
+    with patch(
+        "homeassistant.components.file.sensor.open", m_open, create=True
+    ), patch.object(hass.config, "is_allowed_path", return_value=True):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
 
-    @patch("os.path.isfile", Mock(return_value=True))
-    @patch("os.access", Mock(return_value=True))
-    def test_file_value_template(self):
-        """Test the File sensor with JSON entries."""
-        config = {
-            "sensor": {
-                "platform": "file",
-                "name": "file2",
-                "file_path": "mock.file2",
-                "value_template": "{{ value_json.temperature }}",
-            }
-        }
+    state = hass.states.get("sensor.file2")
+    assert state.state == "26"
 
-        data = (
-            '{"temperature": 29, "humidity": 31}\n'
-            '{"temperature": 26, "humidity": 36}'
-        )
 
-        m_open = MockOpen(read_data=data)
-        with patch("homeassistant.components.file.sensor.open", m_open, create=True):
-            assert setup_component(self.hass, "sensor", config)
-            self.hass.block_till_done()
+@patch("os.path.isfile", Mock(return_value=True))
+@patch("os.access", Mock(return_value=True))
+async def test_file_empty(hass, entity_reg):
+    """Test the File sensor with an empty file."""
+    config = {"sensor": {"platform": "file", "name": "file3", "file_path": "mock.file"}}
 
-        state = self.hass.states.get("sensor.file2")
-        assert state.state == "26"
+    m_open = mock_open(read_data="")
+    with patch(
+        "homeassistant.components.file.sensor.open", m_open, create=True
+    ), patch.object(hass.config, "is_allowed_path", return_value=True):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
 
-    @patch("os.path.isfile", Mock(return_value=True))
-    @patch("os.access", Mock(return_value=True))
-    def test_file_empty(self):
-        """Test the File sensor with an empty file."""
-        config = {
-            "sensor": {"platform": "file", "name": "file3", "file_path": "mock.file"}
-        }
-
-        m_open = MockOpen(read_data="")
-        with patch("homeassistant.components.file.sensor.open", m_open, create=True):
-            assert setup_component(self.hass, "sensor", config)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get("sensor.file3")
-        assert state.state == STATE_UNKNOWN
+    state = hass.states.get("sensor.file3")
+    assert state.state == STATE_UNKNOWN
diff --git a/tests/components/filesize/test_sensor.py b/tests/components/filesize/test_sensor.py
index e0633d69d03..60f6d273ea4 100644
--- a/tests/components/filesize/test_sensor.py
+++ b/tests/components/filesize/test_sensor.py
@@ -1,15 +1,15 @@
 """The tests for the filesize sensor."""
 import os
-import unittest
+
+import pytest
 
 from homeassistant import config as hass_config
 from homeassistant.components.filesize import DOMAIN
 from homeassistant.components.filesize.sensor import CONF_FILE_PATHS
 from homeassistant.const import SERVICE_RELOAD
-from homeassistant.setup import async_setup_component, setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
 
 TEST_DIR = os.path.join(os.path.dirname(__file__))
 TEST_FILE = os.path.join(TEST_DIR, "mock_file_test_filesize.txt")
@@ -21,40 +21,37 @@ def create_file(path):
         test_file.write("test")
 
 
-class TestFileSensor(unittest.TestCase):
-    """Test the filesize sensor."""
+@pytest.fixture(autouse=True)
+def remove_file():
+    """Remove test file."""
+    yield
+    if os.path.isfile(TEST_FILE):
+        os.remove(TEST_FILE)
 
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.hass.config.allowlist_external_dirs = {TEST_DIR}
 
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        if os.path.isfile(TEST_FILE):
-            os.remove(TEST_FILE)
-        self.hass.stop()
+async def test_invalid_path(hass):
+    """Test that an invalid path is caught."""
+    config = {"sensor": {"platform": "filesize", CONF_FILE_PATHS: ["invalid_path"]}}
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids()) == 0
 
-    def test_invalid_path(self):
-        """Test that an invalid path is caught."""
-        config = {"sensor": {"platform": "filesize", CONF_FILE_PATHS: ["invalid_path"]}}
-        assert setup_component(self.hass, "sensor", config)
-        assert len(self.hass.states.entity_ids()) == 0
 
-    def test_valid_path(self):
-        """Test for a valid path."""
-        create_file(TEST_FILE)
-        config = {"sensor": {"platform": "filesize", CONF_FILE_PATHS: [TEST_FILE]}}
-        assert setup_component(self.hass, "sensor", config)
-        self.hass.block_till_done()
-        assert len(self.hass.states.entity_ids()) == 1
-        state = self.hass.states.get("sensor.mock_file_test_filesize_txt")
-        assert state.state == "0.0"
-        assert state.attributes.get("bytes") == 4
+async def test_valid_path(hass):
+    """Test for a valid path."""
+    create_file(TEST_FILE)
+    config = {"sensor": {"platform": "filesize", CONF_FILE_PATHS: [TEST_FILE]}}
+    hass.config.allowlist_external_dirs = {TEST_DIR}
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids()) == 1
+    state = hass.states.get("sensor.mock_file_test_filesize_txt")
+    assert state.state == "0.0"
+    assert state.attributes.get("bytes") == 4
 
 
 async def test_reload(hass, tmpdir):
-    """Verify we can reload filter sensors."""
+    """Verify we can reload filesize sensors."""
     testfile = f"{tmpdir}/file"
     await hass.async_add_executor_job(create_file, testfile)
     with patch.object(hass.config, "is_allowed_path", return_value=True):
diff --git a/tests/components/flunearyou/test_config_flow.py b/tests/components/flunearyou/test_config_flow.py
index d4e650e2b4a..a43fb7aa52f 100644
--- a/tests/components/flunearyou/test_config_flow.py
+++ b/tests/components/flunearyou/test_config_flow.py
@@ -37,7 +37,7 @@ async def test_general_error(hass):
         result = await hass.config_entries.flow.async_init(
             DOMAIN, context={"source": SOURCE_USER}, data=conf
         )
-        assert result["errors"] == {"base": "general_error"}
+        assert result["errors"] == {"base": "unknown"}
 
 
 async def test_show_form(hass):
diff --git a/tests/components/folder/test_sensor.py b/tests/components/folder/test_sensor.py
index 72185d4eda3..b047aae49ac 100644
--- a/tests/components/folder/test_sensor.py
+++ b/tests/components/folder/test_sensor.py
@@ -1,11 +1,8 @@
 """The tests for the folder sensor."""
 import os
-import unittest
 
 from homeassistant.components.folder.sensor import CONF_FOLDER_PATHS
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 CWD = os.path.join(os.path.dirname(__file__))
 TEST_FOLDER = "test_folder"
@@ -20,36 +17,33 @@ def create_file(path):
         test_file.write("test")
 
 
-class TestFolderSensor(unittest.TestCase):
-    """Test the filesize sensor."""
+def remove_test_file():
+    """Remove test file."""
+    if os.path.isfile(TEST_FILE):
+        os.remove(TEST_FILE)
+        os.rmdir(TEST_DIR)
 
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        if not os.path.isdir(TEST_DIR):
-            os.mkdir(TEST_DIR)
-        self.hass.config.allowlist_external_dirs = {TEST_DIR}
 
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        if os.path.isfile(TEST_FILE):
-            os.remove(TEST_FILE)
-            os.rmdir(TEST_DIR)
-        self.hass.stop()
+async def test_invalid_path(hass):
+    """Test that an invalid path is caught."""
+    config = {"sensor": {"platform": "folder", CONF_FOLDER_PATHS: "invalid_path"}}
+    assert await async_setup_component(hass, "sensor", config)
+    assert len(hass.states.async_entity_ids()) == 0
 
-    def test_invalid_path(self):
-        """Test that an invalid path is caught."""
-        config = {"sensor": {"platform": "folder", CONF_FOLDER_PATHS: "invalid_path"}}
-        assert setup_component(self.hass, "sensor", config)
-        assert len(self.hass.states.entity_ids()) == 0
 
-    def test_valid_path(self):
-        """Test for a valid path."""
-        create_file(TEST_FILE)
-        config = {"sensor": {"platform": "folder", CONF_FOLDER_PATHS: TEST_DIR}}
-        assert setup_component(self.hass, "sensor", config)
-        self.hass.block_till_done()
-        assert len(self.hass.states.entity_ids()) == 1
-        state = self.hass.states.get("sensor.test_folder")
-        assert state.state == "0.0"
-        assert state.attributes.get("number_of_files") == 1
+async def test_valid_path(hass):
+    """Test for a valid path."""
+    if not os.path.isdir(TEST_DIR):
+        os.mkdir(TEST_DIR)
+    create_file(TEST_FILE)
+
+    hass.config.allowlist_external_dirs = {TEST_DIR}
+    config = {"sensor": {"platform": "folder", CONF_FOLDER_PATHS: TEST_DIR}}
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids()) == 1
+    state = hass.states.get("sensor.test_folder")
+    assert state.state == "0.0"
+    assert state.attributes.get("number_of_files") == 1
+
+    remove_test_file()
diff --git a/tests/components/freebox/test_config_flow.py b/tests/components/freebox/test_config_flow.py
index a4c8a950299..addb1762df0 100644
--- a/tests/components/freebox/test_config_flow.py
+++ b/tests/components/freebox/test_config_flow.py
@@ -139,7 +139,7 @@ async def test_on_link_failed(hass):
     ):
         result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-        assert result["errors"] == {"base": "connection_failed"}
+        assert result["errors"] == {"base": "cannot_connect"}
 
     with patch(
         "homeassistant.components.freebox.router.Freepybox.open",
diff --git a/tests/components/fritzbox/test_config_flow.py b/tests/components/fritzbox/test_config_flow.py
index 35b41d52118..41396735441 100644
--- a/tests/components/fritzbox/test_config_flow.py
+++ b/tests/components/fritzbox/test_config_flow.py
@@ -61,7 +61,7 @@ async def test_user_auth_failed(hass: HomeAssistantType, fritz: Mock):
     )
     assert result["type"] == "form"
     assert result["step_id"] == "user"
-    assert result["errors"]["base"] == "auth_failed"
+    assert result["errors"]["base"] == "invalid_auth"
 
 
 async def test_user_not_successful(hass: HomeAssistantType, fritz: Mock):
@@ -72,7 +72,7 @@ async def test_user_not_successful(hass: HomeAssistantType, fritz: Mock):
         DOMAIN, context={"source": "user"}, data=MOCK_USER_DATA
     )
     assert result["type"] == "abort"
-    assert result["reason"] == "not_found"
+    assert result["reason"] == "no_devices_found"
 
 
 async def test_user_already_configured(hass: HomeAssistantType, fritz: Mock):
@@ -162,7 +162,7 @@ async def test_ssdp_auth_failed(hass: HomeAssistantType, fritz: Mock):
     )
     assert result["type"] == "form"
     assert result["step_id"] == "confirm"
-    assert result["errors"]["base"] == "auth_failed"
+    assert result["errors"]["base"] == "invalid_auth"
 
 
 async def test_ssdp_not_successful(hass: HomeAssistantType, fritz: Mock):
@@ -180,7 +180,7 @@ async def test_ssdp_not_successful(hass: HomeAssistantType, fritz: Mock):
         user_input={CONF_PASSWORD: "whatever", CONF_USERNAME: "whatever"},
     )
     assert result["type"] == "abort"
-    assert result["reason"] == "not_found"
+    assert result["reason"] == "no_devices_found"
 
 
 async def test_ssdp_not_supported(hass: HomeAssistantType, fritz: Mock):
diff --git a/tests/components/geo_rss_events/test_sensor.py b/tests/components/geo_rss_events/test_sensor.py
index 61e4ab1e7d1..8c55b8ad4dd 100644
--- a/tests/components/geo_rss_events/test_sensor.py
+++ b/tests/components/geo_rss_events/test_sensor.py
@@ -1,6 +1,5 @@
 """The test for the geo rss events sensor platform."""
-import unittest
-from unittest import mock
+import pytest
 
 from homeassistant.components import sensor
 import homeassistant.components.geo_rss_events.sensor as geo_rss_events
@@ -10,15 +9,11 @@ from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     EVENT_HOMEASSISTANT_START,
 )
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
 from tests.async_mock import MagicMock, patch
-from tests.common import (
-    assert_setup_component,
-    fire_time_changed,
-    get_test_home_assistant,
-)
+from tests.common import assert_setup_component, async_fire_time_changed
 
 URL = "http://geo.rss.local/geo_rss_events.xml"
 VALID_CONFIG_WITH_CATEGORIES = {
@@ -34,124 +29,125 @@ VALID_CONFIG = {
     sensor.DOMAIN: [{"platform": "geo_rss_events", geo_rss_events.CONF_URL: URL}]
 }
 
+"""Test the GeoRss service updater."""
 
-class TestGeoRssServiceUpdater(unittest.TestCase):
-    """Test the GeoRss service updater."""
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        # self.config = VALID_CONFIG_WITHOUT_CATEGORIES
-        self.addCleanup(self.hass.stop)
+@pytest.fixture
+def mock_feed():
+    """Pytest fixture for homeassistant.components.geo_rss_events.sensor.GenericFeed."""
+    with patch(
+        "homeassistant.components.geo_rss_events.sensor.GenericFeed"
+    ) as mock_feed:
+        yield mock_feed
 
-    @staticmethod
-    def _generate_mock_feed_entry(
-        external_id, title, distance_to_home, coordinates, category
-    ):
-        """Construct a mock feed entry for testing purposes."""
-        feed_entry = MagicMock()
-        feed_entry.external_id = external_id
-        feed_entry.title = title
-        feed_entry.distance_to_home = distance_to_home
-        feed_entry.coordinates = coordinates
-        feed_entry.category = category
-        return feed_entry
 
-    @mock.patch("homeassistant.components.geo_rss_events.sensor.GenericFeed")
-    def test_setup(self, mock_feed):
-        """Test the general setup of the platform."""
-        # Set up some mock feed entries for this test.
-        mock_entry_1 = self._generate_mock_feed_entry(
-            "1234", "Title 1", 15.5, (-31.0, 150.0), "Category 1"
-        )
-        mock_entry_2 = self._generate_mock_feed_entry(
-            "2345", "Title 2", 20.5, (-31.1, 150.1), "Category 1"
-        )
-        mock_feed.return_value.update.return_value = "OK", [mock_entry_1, mock_entry_2]
+def _generate_mock_feed_entry(
+    external_id, title, distance_to_home, coordinates, category
+):
+    """Construct a mock feed entry for testing purposes."""
+    feed_entry = MagicMock()
+    feed_entry.external_id = external_id
+    feed_entry.title = title
+    feed_entry.distance_to_home = distance_to_home
+    feed_entry.coordinates = coordinates
+    feed_entry.category = category
+    return feed_entry
 
-        utcnow = dt_util.utcnow()
-        # Patching 'utcnow' to gain more control over the timed update.
-        with patch("homeassistant.util.dt.utcnow", return_value=utcnow):
-            with assert_setup_component(1, sensor.DOMAIN):
-                assert setup_component(self.hass, sensor.DOMAIN, VALID_CONFIG)
-                # Artificially trigger update.
-                self.hass.bus.fire(EVENT_HOMEASSISTANT_START)
-                # Collect events.
-                self.hass.block_till_done()
 
-                all_states = self.hass.states.all()
-                assert len(all_states) == 1
-
-                state = self.hass.states.get("sensor.event_service_any")
-                assert state is not None
-                assert state.name == "Event Service Any"
-                assert int(state.state) == 2
-                assert state.attributes == {
-                    ATTR_FRIENDLY_NAME: "Event Service Any",
-                    ATTR_UNIT_OF_MEASUREMENT: "Events",
-                    ATTR_ICON: "mdi:alert",
-                    "Title 1": "16km",
-                    "Title 2": "20km",
-                }
-
-                # Simulate an update - empty data, but successful update,
-                # so no changes to entities.
-                mock_feed.return_value.update.return_value = "OK_NO_DATA", None
-                fire_time_changed(self.hass, utcnow + geo_rss_events.SCAN_INTERVAL)
-                self.hass.block_till_done()
-
-                all_states = self.hass.states.all()
-                assert len(all_states) == 1
-                state = self.hass.states.get("sensor.event_service_any")
-                assert int(state.state) == 2
-
-                # Simulate an update - empty data, removes all entities
-                mock_feed.return_value.update.return_value = "ERROR", None
-                fire_time_changed(self.hass, utcnow + 2 * geo_rss_events.SCAN_INTERVAL)
-                self.hass.block_till_done()
-
-                all_states = self.hass.states.all()
-                assert len(all_states) == 1
-                state = self.hass.states.get("sensor.event_service_any")
-                assert int(state.state) == 0
-                assert state.attributes == {
-                    ATTR_FRIENDLY_NAME: "Event Service Any",
-                    ATTR_UNIT_OF_MEASUREMENT: "Events",
-                    ATTR_ICON: "mdi:alert",
-                }
-
-    @mock.patch("homeassistant.components.geo_rss_events.sensor.GenericFeed")
-    def test_setup_with_categories(self, mock_feed):
-        """Test the general setup of the platform."""
-        # Set up some mock feed entries for this test.
-        mock_entry_1 = self._generate_mock_feed_entry(
-            "1234", "Title 1", 15.5, (-31.0, 150.0), "Category 1"
-        )
-        mock_entry_2 = self._generate_mock_feed_entry(
-            "2345", "Title 2", 20.5, (-31.1, 150.1), "Category 1"
-        )
-        mock_feed.return_value.update.return_value = "OK", [mock_entry_1, mock_entry_2]
+async def test_setup(hass, mock_feed):
+    """Test the general setup of the platform."""
+    # Set up some mock feed entries for this test.
+    mock_entry_1 = _generate_mock_feed_entry(
+        "1234", "Title 1", 15.5, (-31.0, 150.0), "Category 1"
+    )
+    mock_entry_2 = _generate_mock_feed_entry(
+        "2345", "Title 2", 20.5, (-31.1, 150.1), "Category 1"
+    )
+    mock_feed.return_value.update.return_value = "OK", [mock_entry_1, mock_entry_2]
 
+    utcnow = dt_util.utcnow()
+    # Patching 'utcnow' to gain more control over the timed update.
+    with patch("homeassistant.util.dt.utcnow", return_value=utcnow):
         with assert_setup_component(1, sensor.DOMAIN):
-            assert setup_component(
-                self.hass, sensor.DOMAIN, VALID_CONFIG_WITH_CATEGORIES
-            )
+            assert await async_setup_component(hass, sensor.DOMAIN, VALID_CONFIG)
             # Artificially trigger update.
-            self.hass.bus.fire(EVENT_HOMEASSISTANT_START)
+            hass.bus.fire(EVENT_HOMEASSISTANT_START)
             # Collect events.
-            self.hass.block_till_done()
+            await hass.async_block_till_done()
 
-            all_states = self.hass.states.all()
+            all_states = hass.states.async_all()
             assert len(all_states) == 1
 
-            state = self.hass.states.get("sensor.event_service_category_1")
+            state = hass.states.get("sensor.event_service_any")
             assert state is not None
-            assert state.name == "Event Service Category 1"
+            assert state.name == "Event Service Any"
             assert int(state.state) == 2
             assert state.attributes == {
-                ATTR_FRIENDLY_NAME: "Event Service Category 1",
+                ATTR_FRIENDLY_NAME: "Event Service Any",
                 ATTR_UNIT_OF_MEASUREMENT: "Events",
                 ATTR_ICON: "mdi:alert",
                 "Title 1": "16km",
                 "Title 2": "20km",
             }
+
+            # Simulate an update - empty data, but successful update,
+            # so no changes to entities.
+            mock_feed.return_value.update.return_value = "OK_NO_DATA", None
+            async_fire_time_changed(hass, utcnow + geo_rss_events.SCAN_INTERVAL)
+            await hass.async_block_till_done()
+
+            all_states = hass.states.async_all()
+            assert len(all_states) == 1
+            state = hass.states.get("sensor.event_service_any")
+            assert int(state.state) == 2
+
+            # Simulate an update - empty data, removes all entities
+            mock_feed.return_value.update.return_value = "ERROR", None
+            async_fire_time_changed(hass, utcnow + 2 * geo_rss_events.SCAN_INTERVAL)
+            await hass.async_block_till_done()
+
+            all_states = hass.states.async_all()
+            assert len(all_states) == 1
+            state = hass.states.get("sensor.event_service_any")
+            assert int(state.state) == 0
+            assert state.attributes == {
+                ATTR_FRIENDLY_NAME: "Event Service Any",
+                ATTR_UNIT_OF_MEASUREMENT: "Events",
+                ATTR_ICON: "mdi:alert",
+            }
+
+
+async def test_setup_with_categories(hass, mock_feed):
+    """Test the general setup of the platform."""
+    # Set up some mock feed entries for this test.
+    mock_entry_1 = _generate_mock_feed_entry(
+        "1234", "Title 1", 15.5, (-31.0, 150.0), "Category 1"
+    )
+    mock_entry_2 = _generate_mock_feed_entry(
+        "2345", "Title 2", 20.5, (-31.1, 150.1), "Category 1"
+    )
+    mock_feed.return_value.update.return_value = "OK", [mock_entry_1, mock_entry_2]
+
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass, sensor.DOMAIN, VALID_CONFIG_WITH_CATEGORIES
+        )
+        # Artificially trigger update.
+        hass.bus.fire(EVENT_HOMEASSISTANT_START)
+        # Collect events.
+        await hass.async_block_till_done()
+
+        all_states = hass.states.async_all()
+        assert len(all_states) == 1
+
+        state = hass.states.get("sensor.event_service_category_1")
+        assert state is not None
+        assert state.name == "Event Service Category 1"
+        assert int(state.state) == 2
+        assert state.attributes == {
+            ATTR_FRIENDLY_NAME: "Event Service Category 1",
+            ATTR_UNIT_OF_MEASUREMENT: "Events",
+            ATTR_ICON: "mdi:alert",
+            "Title 1": "16km",
+            "Title 2": "20km",
+        }
diff --git a/tests/components/geonetnz_volcano/test_config_flow.py b/tests/components/geonetnz_volcano/test_config_flow.py
index 91ca7a1f553..21d74bb5e96 100644
--- a/tests/components/geonetnz_volcano/test_config_flow.py
+++ b/tests/components/geonetnz_volcano/test_config_flow.py
@@ -23,7 +23,7 @@ async def test_duplicate_error(hass, config_entry):
     flow.hass = hass
 
     result = await flow.async_step_user(user_input=conf)
-    assert result["errors"] == {"base": "identifier_exists"}
+    assert result["errors"] == {"base": "already_configured"}
 
 
 async def test_show_form(hass):
diff --git a/tests/components/goalzero/test_config_flow.py b/tests/components/goalzero/test_config_flow.py
index 5a367c452c6..906a84d7882 100644
--- a/tests/components/goalzero/test_config_flow.py
+++ b/tests/components/goalzero/test_config_flow.py
@@ -46,11 +46,6 @@ async def test_flow_user(hass):
             DOMAIN,
             context={"source": SOURCE_USER},
         )
-        assert result["type"] == RESULT_TYPE_FORM
-        assert result["step_id"] == "user"
-        assert result["errors"] == {}
-        _flow_next(hass, result["flow_id"])
-
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             user_input=CONF_CONFIG_FLOW,
diff --git a/tests/components/google_assistant/test_helpers.py b/tests/components/google_assistant/test_helpers.py
index 2bd68926da1..87e3cac657c 100644
--- a/tests/components/google_assistant/test_helpers.py
+++ b/tests/components/google_assistant/test_helpers.py
@@ -9,6 +9,7 @@ from homeassistant.components.google_assistant.const import (  # noqa: F401
     NOT_EXPOSE_LOCAL,
 )
 from homeassistant.config import async_process_ha_core_config
+from homeassistant.core import State
 from homeassistant.setup import async_setup_component
 from homeassistant.util import dt
 
@@ -242,3 +243,12 @@ async def test_sync_entities_all(agents, result):
         res = await config.async_sync_entities_all()
         assert sorted(mock.mock_calls) == sorted([call(agent) for agent in agents])
         assert res == result
+
+
+def test_supported_features_string(caplog):
+    """Test bad supported features."""
+    entity = helpers.GoogleEntity(
+        None, None, State("test.entity_id", "on", {"supported_features": "invalid"})
+    )
+    assert entity.is_supported() is False
+    assert "Entity test.entity_id contains invalid supported_features value invalid"
diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py
index d415c4f2476..d1f5f9a1293 100644
--- a/tests/components/google_assistant/test_trait.py
+++ b/tests/components/google_assistant/test_trait.py
@@ -1,6 +1,5 @@
 """Tests for the Google Assistant traits."""
 from datetime import datetime, timedelta
-import logging
 
 import pytest
 
@@ -57,8 +56,6 @@ from . import BASIC_CONFIG, MockConfig
 from tests.async_mock import patch
 from tests.common import async_mock_service
 
-_LOGGER = logging.getLogger(__name__)
-
 REQ_ID = "ff36a3cc-ec34-11e6-b1a0-64510650abcf"
 
 BASIC_DATA = helpers.RequestData(
diff --git a/tests/components/gree/__init__.py b/tests/components/gree/__init__.py
new file mode 100644
index 00000000000..2e2884381a3
--- /dev/null
+++ b/tests/components/gree/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Gree Climate integration."""
diff --git a/tests/components/gree/common.py b/tests/components/gree/common.py
new file mode 100644
index 00000000000..8894730c8ca
--- /dev/null
+++ b/tests/components/gree/common.py
@@ -0,0 +1,35 @@
+"""Common helpers for gree test cases."""
+from tests.async_mock import AsyncMock, Mock
+
+
+def build_device_info_mock(
+    name="fake-device-1", ipAddress="1.1.1.1", mac="aabbcc112233"
+):
+    """Build mock device info structure."""
+    mock = Mock(ip=ipAddress, port=7000, mac=mac)
+    mock.name = name
+    return mock
+
+
+def build_device_mock(name="fake-device-1", ipAddress="1.1.1.1", mac="aabbcc112233"):
+    """Build mock device object."""
+    mock = Mock(
+        device_info=build_device_info_mock(name, ipAddress, mac),
+        name=name,
+        bind=AsyncMock(),
+        update_state=AsyncMock(),
+        push_state_update=AsyncMock(),
+        temperature_units=0,
+        mode=0,
+        fan_speed=0,
+        horizontal_swing=0,
+        vertical_swing=0,
+        target_temperature=25,
+        power=False,
+        sleep=False,
+        quiet=False,
+        turbo=False,
+        power_save=False,
+        steady_heat=False,
+    )
+    return mock
diff --git a/tests/components/gree/conftest.py b/tests/components/gree/conftest.py
new file mode 100644
index 00000000000..b102f0f36fe
--- /dev/null
+++ b/tests/components/gree/conftest.py
@@ -0,0 +1,36 @@
+"""Pytest module configuration."""
+import pytest
+
+from .common import build_device_info_mock, build_device_mock
+
+from tests.async_mock import AsyncMock, patch
+
+
+@pytest.fixture(name="discovery")
+def discovery_fixture():
+    """Patch the discovery service."""
+    with patch(
+        "homeassistant.components.gree.bridge.Discovery.search_devices",
+        new_callable=AsyncMock,
+        return_value=[build_device_info_mock()],
+    ) as mock:
+        yield mock
+
+
+@pytest.fixture(name="device")
+def device_fixture():
+    """Path the device search and bind."""
+    with patch(
+        "homeassistant.components.gree.bridge.Device",
+        return_value=build_device_mock(),
+    ) as mock:
+        yield mock
+
+
+@pytest.fixture(name="setup")
+def setup_fixture():
+    """Patch the climate setup."""
+    with patch(
+        "homeassistant.components.gree.climate.async_setup_entry", return_value=True
+    ) as setup:
+        yield setup
diff --git a/tests/components/gree/test_climate.py b/tests/components/gree/test_climate.py
new file mode 100644
index 00000000000..9f3946e6ade
--- /dev/null
+++ b/tests/components/gree/test_climate.py
@@ -0,0 +1,781 @@
+"""Tests for gree component."""
+from datetime import timedelta
+
+from greeclimate.device import HorizontalSwing, VerticalSwing
+from greeclimate.exceptions import DeviceNotBoundError, DeviceTimeoutError
+import pytest
+
+from homeassistant.components.climate.const import (
+    ATTR_FAN_MODE,
+    ATTR_HVAC_MODE,
+    ATTR_PRESET_MODE,
+    ATTR_SWING_MODE,
+    DOMAIN,
+    FAN_AUTO,
+    FAN_HIGH,
+    FAN_LOW,
+    FAN_MEDIUM,
+    HVAC_MODE_AUTO,
+    HVAC_MODE_COOL,
+    HVAC_MODE_DRY,
+    HVAC_MODE_FAN_ONLY,
+    HVAC_MODE_HEAT,
+    HVAC_MODE_OFF,
+    PRESET_AWAY,
+    PRESET_BOOST,
+    PRESET_ECO,
+    PRESET_NONE,
+    PRESET_SLEEP,
+    SERVICE_SET_FAN_MODE,
+    SERVICE_SET_HVAC_MODE,
+    SERVICE_SET_PRESET_MODE,
+    SERVICE_SET_SWING_MODE,
+    SERVICE_SET_TEMPERATURE,
+    SWING_BOTH,
+    SWING_HORIZONTAL,
+    SWING_OFF,
+    SWING_VERTICAL,
+)
+from homeassistant.components.gree.climate import (
+    FAN_MODES_REVERSE,
+    HVAC_MODES_REVERSE,
+    SUPPORTED_FEATURES,
+)
+from homeassistant.components.gree.const import (
+    DOMAIN as GREE_DOMAIN,
+    FAN_MEDIUM_HIGH,
+    FAN_MEDIUM_LOW,
+)
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    ATTR_FRIENDLY_NAME,
+    ATTR_SUPPORTED_FEATURES,
+    ATTR_TEMPERATURE,
+    STATE_UNAVAILABLE,
+)
+from homeassistant.setup import async_setup_component
+import homeassistant.util.dt as dt_util
+
+from .common import build_device_mock
+
+from tests.async_mock import DEFAULT as DEFAULT_MOCK, AsyncMock, patch
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+ENTITY_ID = f"{DOMAIN}.fake_device_1"
+
+
+@pytest.fixture
+def mock_now():
+    """Fixture for dtutil.now."""
+    return dt_util.utcnow()
+
+
+async def async_setup_gree(hass):
+    """Set up the gree platform."""
+    MockConfigEntry(domain=GREE_DOMAIN).add_to_hass(hass)
+    await async_setup_component(hass, GREE_DOMAIN, {GREE_DOMAIN: {"climate": {}}})
+    await hass.async_block_till_done()
+
+
+async def test_discovery_called_once(hass, discovery, device):
+    """Test discovery is only ever called once."""
+    await async_setup_gree(hass)
+    assert discovery.call_count == 1
+
+    await async_setup_gree(hass)
+    assert discovery.call_count == 1
+
+
+async def test_discovery_setup(hass, discovery, device):
+    """Test setup of platform."""
+    MockDevice1 = build_device_mock(
+        name="fake-device-1", ipAddress="1.1.1.1", mac="aabbcc112233"
+    )
+    MockDevice2 = build_device_mock(
+        name="fake-device-2", ipAddress="2.2.2.2", mac="bbccdd223344"
+    )
+
+    discovery.return_value = [MockDevice1.device_info, MockDevice2.device_info]
+    device.side_effect = [MockDevice1, MockDevice2]
+
+    await async_setup_gree(hass)
+    await hass.async_block_till_done()
+    assert discovery.call_count == 1
+    assert len(hass.states.async_all(DOMAIN)) == 2
+
+
+async def test_discovery_setup_connection_error(hass, discovery, device):
+    """Test gree integration is setup."""
+    MockDevice1 = build_device_mock(name="fake-device-1")
+    MockDevice1.bind = AsyncMock(side_effect=DeviceNotBoundError)
+
+    MockDevice2 = build_device_mock(name="fake-device-2")
+    MockDevice2.bind = AsyncMock(side_effect=DeviceNotBoundError)
+
+    device.side_effect = [MockDevice1, MockDevice2]
+
+    await async_setup_gree(hass)
+    await hass.async_block_till_done()
+    assert discovery.call_count == 1
+
+    assert not hass.states.async_all(DOMAIN)
+
+
+async def test_update_connection_failure(hass, discovery, device, mock_now):
+    """Testing update hvac connection failure exception."""
+    device().update_state.side_effect = [
+        DEFAULT_MOCK,
+        DeviceTimeoutError,
+        DeviceTimeoutError,
+    ]
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    # First update to make the device available
+    state = hass.states.get(ENTITY_ID)
+    assert state.name == "fake-device-1"
+    assert state.state != STATE_UNAVAILABLE
+
+    next_update = mock_now + timedelta(minutes=10)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    next_update = mock_now + timedelta(minutes=15)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    # Then two more update failures to make the device unavailable
+    state = hass.states.get(ENTITY_ID)
+    assert state.name == "fake-device-1"
+    assert state.state == STATE_UNAVAILABLE
+
+
+async def test_update_connection_failure_recovery(hass, discovery, device, mock_now):
+    """Testing update hvac connection failure recovery."""
+    device().update_state.side_effect = [DeviceTimeoutError, DEFAULT_MOCK]
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.name == "fake-device-1"
+    assert state.state == STATE_UNAVAILABLE
+
+    next_update = mock_now + timedelta(minutes=10)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.name == "fake-device-1"
+    assert state.state != STATE_UNAVAILABLE
+
+
+async def test_update_unhandled_exception(hass, discovery, device, mock_now):
+    """Testing update hvac connection unhandled response exception."""
+    device().update_state.side_effect = [DEFAULT_MOCK, Exception]
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.name == "fake-device-1"
+    assert state.state != STATE_UNAVAILABLE
+
+    next_update = mock_now + timedelta(minutes=10)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.name == "fake-device-1"
+    assert state.state == STATE_UNAVAILABLE
+
+
+async def test_send_command_device_timeout(hass, discovery, device, mock_now):
+    """Test for sending power on command to the device with a device timeout."""
+    await async_setup_gree(hass)
+
+    # First update to make the device available
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state.name == "fake-device-1"
+    assert state.state != STATE_UNAVAILABLE
+
+    device().update_state.side_effect = DeviceTimeoutError
+    device().push_state_update.side_effect = DeviceTimeoutError
+
+    # Second update to make an initial error (device is still available)
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.name == "fake-device-1"
+    assert state.state != STATE_UNAVAILABLE
+
+    # Second attempt should make the device unavailable
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVAC_MODE_AUTO},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
+
+
+async def test_send_command_device_unknown_error(hass, discovery, device, mock_now):
+    """Test for sending power on command to the device with a device timeout."""
+    device().update_state.side_effect = [DEFAULT_MOCK, Exception]
+    device().push_state_update.side_effect = Exception
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    # First update to make the device available
+    state = hass.states.get(ENTITY_ID)
+    assert state.name == "fake-device-1"
+    assert state.state != STATE_UNAVAILABLE
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVAC_MODE_AUTO},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.state == STATE_UNAVAILABLE
+
+
+async def test_send_power_on(hass, discovery, device, mock_now):
+    """Test for sending power on command to the device."""
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVAC_MODE_AUTO},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.state == HVAC_MODE_AUTO
+
+
+async def test_send_power_on_device_timeout(hass, discovery, device, mock_now):
+    """Test for sending power on command to the device with a device timeout."""
+    device().push_state_update.side_effect = DeviceTimeoutError
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: HVAC_MODE_AUTO},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.state == HVAC_MODE_AUTO
+
+
+async def test_send_target_temperature(hass, discovery, device, mock_now):
+    """Test for sending target temperature command to the device."""
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: 25.1},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_TEMPERATURE) == 25
+
+
+async def test_send_target_temperature_device_timeout(
+    hass, discovery, device, mock_now
+):
+    """Test for sending target temperature command to the device with a device timeout."""
+    device().push_state_update.side_effect = DeviceTimeoutError
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_TEMPERATURE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_TEMPERATURE: 25.1},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_TEMPERATURE) == 25
+
+
+async def test_update_target_temperature(hass, discovery, device, mock_now):
+    """Test for updating target temperature from the device."""
+    device().target_temperature = 32
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_TEMPERATURE) == 32
+
+
+@pytest.mark.parametrize(
+    "preset", (PRESET_AWAY, PRESET_ECO, PRESET_SLEEP, PRESET_BOOST, PRESET_NONE)
+)
+async def test_send_preset_mode(hass, discovery, device, mock_now, preset):
+    """Test for sending preset mode command to the device."""
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: preset},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_PRESET_MODE) == preset
+
+
+async def test_send_invalid_preset_mode(hass, discovery, device, mock_now):
+    """Test for sending preset mode command to the device."""
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    with pytest.raises(ValueError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_PRESET_MODE,
+            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: "invalid"},
+            blocking=True,
+        )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_PRESET_MODE) != "invalid"
+
+
+@pytest.mark.parametrize(
+    "preset", (PRESET_AWAY, PRESET_ECO, PRESET_SLEEP, PRESET_BOOST, PRESET_NONE)
+)
+async def test_send_preset_mode_device_timeout(
+    hass, discovery, device, mock_now, preset
+):
+    """Test for sending preset mode command to the device with a device timeout."""
+    device().push_state_update.side_effect = DeviceTimeoutError
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_PRESET_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_PRESET_MODE: preset},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_PRESET_MODE) == preset
+
+
+@pytest.mark.parametrize(
+    "preset", (PRESET_AWAY, PRESET_ECO, PRESET_SLEEP, PRESET_BOOST, PRESET_NONE)
+)
+async def test_update_preset_mode(hass, discovery, device, mock_now, preset):
+    """Test for updating preset mode from the device."""
+    device().steady_heat = preset == PRESET_AWAY
+    device().power_save = preset == PRESET_ECO
+    device().sleep = preset == PRESET_SLEEP
+    device().turbo = preset == PRESET_BOOST
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_PRESET_MODE) == preset
+
+
+@pytest.mark.parametrize(
+    "hvac_mode",
+    (
+        HVAC_MODE_OFF,
+        HVAC_MODE_AUTO,
+        HVAC_MODE_COOL,
+        HVAC_MODE_DRY,
+        HVAC_MODE_FAN_ONLY,
+        HVAC_MODE_HEAT,
+    ),
+)
+async def test_send_hvac_mode(hass, discovery, device, mock_now, hvac_mode):
+    """Test for sending hvac mode command to the device."""
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: hvac_mode},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.state == hvac_mode
+
+
+@pytest.mark.parametrize(
+    "hvac_mode",
+    (HVAC_MODE_AUTO, HVAC_MODE_COOL, HVAC_MODE_DRY, HVAC_MODE_FAN_ONLY, HVAC_MODE_HEAT),
+)
+async def test_send_hvac_mode_device_timeout(
+    hass, discovery, device, mock_now, hvac_mode
+):
+    """Test for sending hvac mode command to the device with a device timeout."""
+    device().push_state_update.side_effect = DeviceTimeoutError
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_HVAC_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_HVAC_MODE: hvac_mode},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.state == hvac_mode
+
+
+@pytest.mark.parametrize(
+    "hvac_mode",
+    (
+        HVAC_MODE_OFF,
+        HVAC_MODE_AUTO,
+        HVAC_MODE_COOL,
+        HVAC_MODE_DRY,
+        HVAC_MODE_FAN_ONLY,
+        HVAC_MODE_HEAT,
+    ),
+)
+async def test_update_hvac_mode(hass, discovery, device, mock_now, hvac_mode):
+    """Test for updating hvac mode from the device."""
+    device().power = hvac_mode != HVAC_MODE_OFF
+    device().mode = HVAC_MODES_REVERSE.get(hvac_mode)
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.state == hvac_mode
+
+
+@pytest.mark.parametrize(
+    "fan_mode",
+    (FAN_AUTO, FAN_LOW, FAN_MEDIUM_LOW, FAN_MEDIUM, FAN_MEDIUM_HIGH, FAN_HIGH),
+)
+async def test_send_fan_mode(hass, discovery, device, mock_now, fan_mode):
+    """Test for sending fan mode command to the device."""
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_FAN_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: fan_mode},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_FAN_MODE) == fan_mode
+
+
+async def test_send_invalid_fan_mode(hass, discovery, device, mock_now):
+    """Test for sending fan mode command to the device."""
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    with pytest.raises(ValueError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_FAN_MODE,
+            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: "invalid"},
+            blocking=True,
+        )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_FAN_MODE) != "invalid"
+
+
+@pytest.mark.parametrize(
+    "fan_mode",
+    (FAN_AUTO, FAN_LOW, FAN_MEDIUM_LOW, FAN_MEDIUM, FAN_MEDIUM_HIGH, FAN_HIGH),
+)
+async def test_send_fan_mode_device_timeout(
+    hass, discovery, device, mock_now, fan_mode
+):
+    """Test for sending fan mode command to the device with a device timeout."""
+    device().push_state_update.side_effect = DeviceTimeoutError
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_FAN_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_FAN_MODE: fan_mode},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_FAN_MODE) == fan_mode
+
+
+@pytest.mark.parametrize(
+    "fan_mode",
+    (FAN_AUTO, FAN_LOW, FAN_MEDIUM_LOW, FAN_MEDIUM, FAN_MEDIUM_HIGH, FAN_HIGH),
+)
+async def test_update_fan_mode(hass, discovery, device, mock_now, fan_mode):
+    """Test for updating fan mode from the device."""
+    device().fan_speed = FAN_MODES_REVERSE.get(fan_mode)
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_FAN_MODE) == fan_mode
+
+
+@pytest.mark.parametrize(
+    "swing_mode", (SWING_OFF, SWING_BOTH, SWING_VERTICAL, SWING_HORIZONTAL)
+)
+async def test_send_swing_mode(hass, discovery, device, mock_now, swing_mode):
+    """Test for sending swing mode command to the device."""
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_SWING_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_SWING_MODE: swing_mode},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_SWING_MODE) == swing_mode
+
+
+async def test_send_invalid_swing_mode(hass, discovery, device, mock_now):
+    """Test for sending swing mode command to the device."""
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    with pytest.raises(ValueError):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_SET_SWING_MODE,
+            {ATTR_ENTITY_ID: ENTITY_ID, ATTR_SWING_MODE: "invalid"},
+            blocking=True,
+        )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_SWING_MODE) != "invalid"
+
+
+@pytest.mark.parametrize(
+    "swing_mode", (SWING_OFF, SWING_BOTH, SWING_VERTICAL, SWING_HORIZONTAL)
+)
+async def test_send_swing_mode_device_timeout(
+    hass, discovery, device, mock_now, swing_mode
+):
+    """Test for sending swing mode command to the device with a device timeout."""
+    device().push_state_update.side_effect = DeviceTimeoutError
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    assert await hass.services.async_call(
+        DOMAIN,
+        SERVICE_SET_SWING_MODE,
+        {ATTR_ENTITY_ID: ENTITY_ID, ATTR_SWING_MODE: swing_mode},
+        blocking=True,
+    )
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_SWING_MODE) == swing_mode
+
+
+@pytest.mark.parametrize(
+    "swing_mode", (SWING_OFF, SWING_BOTH, SWING_VERTICAL, SWING_HORIZONTAL)
+)
+async def test_update_swing_mode(hass, discovery, device, mock_now, swing_mode):
+    """Test for updating swing mode from the device."""
+    device().horizontal_swing = (
+        HorizontalSwing.FullSwing
+        if swing_mode in (SWING_BOTH, SWING_HORIZONTAL)
+        else HorizontalSwing.Default
+    )
+    device().vertical_swing = (
+        VerticalSwing.FullSwing
+        if swing_mode in (SWING_BOTH, SWING_VERTICAL)
+        else VerticalSwing.Default
+    )
+
+    await async_setup_gree(hass)
+
+    next_update = mock_now + timedelta(minutes=5)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(ENTITY_ID)
+    assert state is not None
+    assert state.attributes.get(ATTR_SWING_MODE) == swing_mode
+
+
+async def test_name(hass, discovery, device):
+    """Test for name property."""
+    await async_setup_gree(hass)
+    state = hass.states.get(ENTITY_ID)
+    assert state.attributes[ATTR_FRIENDLY_NAME] == "fake-device-1"
+
+
+async def test_supported_features_with_turnon(hass, discovery, device):
+    """Test for supported_features property."""
+    await async_setup_gree(hass)
+    state = hass.states.get(ENTITY_ID)
+    assert state.attributes[ATTR_SUPPORTED_FEATURES] == SUPPORTED_FEATURES
diff --git a/tests/components/gree/test_config_flow.py b/tests/components/gree/test_config_flow.py
new file mode 100644
index 00000000000..bb5f59b573d
--- /dev/null
+++ b/tests/components/gree/test_config_flow.py
@@ -0,0 +1,20 @@
+"""Tests for the Gree Integration."""
+from homeassistant import config_entries, data_entry_flow
+from homeassistant.components.gree.const import DOMAIN as GREE_DOMAIN
+
+
+async def test_creating_entry_sets_up_climate(hass, discovery, device, setup):
+    """Test setting up Gree creates the climate components."""
+    result = await hass.config_entries.flow.async_init(
+        GREE_DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    # Confirmation form
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    assert len(setup.mock_calls) == 1
diff --git a/tests/components/gree/test_init.py b/tests/components/gree/test_init.py
new file mode 100644
index 00000000000..1ea0727b220
--- /dev/null
+++ b/tests/components/gree/test_init.py
@@ -0,0 +1,38 @@
+"""Tests for the Gree Integration."""
+
+from homeassistant.components.gree.const import DOMAIN as GREE_DOMAIN
+from homeassistant.config_entries import ENTRY_STATE_LOADED, ENTRY_STATE_NOT_LOADED
+from homeassistant.setup import async_setup_component
+
+from tests.async_mock import patch
+from tests.common import MockConfigEntry
+
+
+async def test_setup_simple(hass):
+    """Test gree integration is setup."""
+    await async_setup_component(hass, GREE_DOMAIN, {})
+    await hass.async_block_till_done()
+
+    # No flows started
+    assert len(hass.config_entries.flow.async_progress()) == 0
+
+
+async def test_unload_config_entry(hass):
+    """Test that the async_unload_entry works."""
+    # As we have currently no configuration, we just to pass the domain here.
+    entry = MockConfigEntry(domain=GREE_DOMAIN)
+    entry.add_to_hass(hass)
+
+    with patch(
+        "homeassistant.components.gree.climate.async_setup_entry",
+        return_value=True,
+    ) as climate_setup:
+        assert await async_setup_component(hass, GREE_DOMAIN, {})
+        await hass.async_block_till_done()
+
+        assert len(climate_setup.mock_calls) == 1
+        assert entry.state == ENTRY_STATE_LOADED
+
+    await hass.config_entries.async_unload(entry.entry_id)
+
+    assert entry.state == ENTRY_STATE_NOT_LOADED
diff --git a/tests/components/group/test_cover.py b/tests/components/group/test_cover.py
index efdbc40ee46..2ffe02570c9 100644
--- a/tests/components/group/test_cover.py
+++ b/tests/components/group/test_cover.py
@@ -494,6 +494,7 @@ async def test_is_opening_closing(hass, setup_comp):
     await hass.services.async_call(
         DOMAIN, SERVICE_OPEN_COVER, {ATTR_ENTITY_ID: COVER_GROUP}, blocking=True
     )
+    await hass.async_block_till_done()
 
     assert hass.states.get(DEMO_COVER_POS).state == STATE_OPENING
     assert hass.states.get(DEMO_COVER_TILT).state == STATE_OPENING
diff --git a/tests/components/group/test_init.py b/tests/components/group/test_init.py
index 5006461d32c..0004719b28d 100644
--- a/tests/components/group/test_init.py
+++ b/tests/components/group/test_init.py
@@ -763,6 +763,7 @@ async def test_group_climate_all_cool(hass):
     hass.states.async_set("climate.two", "cool")
     hass.states.async_set("climate.three", "cool")
 
+    assert await async_setup_component(hass, "climate", {})
     assert await async_setup_component(
         hass,
         "group",
@@ -772,7 +773,6 @@ async def test_group_climate_all_cool(hass):
             }
         },
     )
-    assert await async_setup_component(hass, "climate", {})
     await hass.async_block_till_done()
 
     assert hass.states.get("group.group_zero").state == STATE_ON
@@ -1041,6 +1041,7 @@ async def test_cover_added_after_group(hass):
         "cover.downstairs",
     ]
 
+    assert await async_setup_component(hass, "cover", {})
     assert await async_setup_component(
         hass,
         "group",
@@ -1125,6 +1126,8 @@ async def test_group_that_references_a_group_of_covers(hass):
             }
         },
     )
+
+    assert await async_setup_component(hass, "cover", {})
     await hass.async_block_till_done()
 
     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
@@ -1147,6 +1150,7 @@ async def test_group_that_references_two_groups_of_covers(hass):
         hass.states.async_set(entity_id, "closed")
     await hass.async_block_till_done()
 
+    assert await async_setup_component(hass, "cover", {})
     assert await async_setup_component(
         hass,
         "group",
@@ -1192,6 +1196,7 @@ async def test_group_that_references_two_types_of_groups(hass):
         hass.states.async_set(entity_id, "home")
     await hass.async_block_till_done()
 
+    assert await async_setup_component(hass, "device_tracker", {})
     assert await async_setup_component(
         hass,
         "group",
@@ -1205,6 +1210,7 @@ async def test_group_that_references_two_types_of_groups(hass):
             }
         },
     )
+    assert await async_setup_component(hass, "cover", {})
     await hass.async_block_till_done()
 
     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
diff --git a/tests/components/group/test_light.py b/tests/components/group/test_light.py
index ba8fecbed32..8ce9f4bf9f3 100644
--- a/tests/components/group/test_light.py
+++ b/tests/components/group/test_light.py
@@ -764,5 +764,41 @@ async def test_reload_with_base_integration_platform_not_setup(hass):
     assert hass.states.get("light.outside_patio_lights_g").state == STATE_OFF
 
 
+async def test_nested_group(hass):
+    """Test nested light group."""
+    hass.states.async_set("light.kitchen", "on")
+    await async_setup_component(
+        hass,
+        LIGHT_DOMAIN,
+        {
+            LIGHT_DOMAIN: [
+                {
+                    "platform": DOMAIN,
+                    "entities": ["light.bedroom_group"],
+                    "name": "Nested Group",
+                },
+                {
+                    "platform": DOMAIN,
+                    "entities": ["light.kitchen", "light.bedroom"],
+                    "name": "Bedroom Group",
+                },
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("light.bedroom_group")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes.get(ATTR_ENTITY_ID) == ["light.kitchen", "light.bedroom"]
+
+    state = hass.states.get("light.nested_group")
+    assert state is not None
+    assert state.state == STATE_ON
+    assert state.attributes.get(ATTR_ENTITY_ID) == ["light.bedroom_group"]
+
+
 def _get_fixtures_base_path():
     return path.dirname(path.dirname(path.dirname(__file__)))
diff --git a/tests/components/guardian/test_config_flow.py b/tests/components/guardian/test_config_flow.py
index a10bee374f8..db0cf877d37 100644
--- a/tests/components/guardian/test_config_flow.py
+++ b/tests/components/guardian/test_config_flow.py
@@ -138,4 +138,4 @@ async def test_step_zeroconf_no_discovery_info(hass):
         DOMAIN, context={"source": SOURCE_ZEROCONF}
     )
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
diff --git a/tests/components/hassio/test_http.py b/tests/components/hassio/test_http.py
index d069b311ab2..ea087cdc620 100644
--- a/tests/components/hassio/test_http.py
+++ b/tests/components/hassio/test_http.py
@@ -151,6 +151,27 @@ async def test_snapshot_upload_headers(hassio_client, aioclient_mock):
     req_headers["Content-Type"] == content_type
 
 
+async def test_snapshot_download_headers(hassio_client, aioclient_mock):
+    """Test that we forward the full header for snapshot download."""
+    content_disposition = "attachment; filename=test.tar"
+    aioclient_mock.get(
+        "http://127.0.0.1/snapshots/slug/download",
+        headers={
+            "Content-Length": "50000000",
+            "Content-Disposition": content_disposition,
+        },
+    )
+
+    resp = await hassio_client.get("/api/hassio/snapshots/slug/download")
+
+    # Check we got right response
+    assert resp.status == 200
+
+    assert len(aioclient_mock.mock_calls) == 1
+
+    resp.headers["Content-Disposition"] == content_disposition
+
+
 def test_need_auth(hass):
     """Test if the requested path needs authentication."""
     assert not _need_auth(hass, "addons/test/logo")
diff --git a/tests/components/heos/test_config_flow.py b/tests/components/heos/test_config_flow.py
index 800814df013..bcc2ed67b29 100644
--- a/tests/components/heos/test_config_flow.py
+++ b/tests/components/heos/test_config_flow.py
@@ -20,7 +20,7 @@ async def test_flow_aborts_already_setup(hass, config_entry):
     flow.hass = hass
     result = await flow.async_step_user()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "single_instance_allowed"
 
 
 async def test_no_host_shows_form(hass):
@@ -41,7 +41,7 @@ async def test_cannot_connect_shows_error_form(hass, controller):
     )
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "user"
-    assert result["errors"][CONF_HOST] == "connection_failure"
+    assert result["errors"][CONF_HOST] == "cannot_connect"
     assert controller.connect.call_count == 1
     assert controller.disconnect.call_count == 1
     controller.connect.reset_mock()
@@ -118,7 +118,7 @@ async def test_discovery_flow_aborts_already_setup(
     flow.hass = hass
     result = await flow.async_step_ssdp(discovery_data)
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "single_instance_allowed"
 
 
 async def test_discovery_sets_the_unique_id(hass, controller, discovery_data):
diff --git a/tests/components/heos/test_media_player.py b/tests/components/heos/test_media_player.py
index b2d96707d7e..eba0eb0f3fb 100644
--- a/tests/components/heos/test_media_player.py
+++ b/tests/components/heos/test_media_player.py
@@ -120,6 +120,7 @@ async def test_updates_from_signals(hass, config_entry, config, controller, favo
         const.SIGNAL_PLAYER_EVENT, player.player_id, const.EVENT_PLAYER_STATE_CHANGED
     )
     await hass.async_block_till_done()
+
     state = hass.states.get("media_player.test_player")
     assert state.state == STATE_PLAYING
 
@@ -227,6 +228,7 @@ async def test_updates_from_players_changed(
         const.SIGNAL_CONTROLLER_EVENT, const.EVENT_PLAYERS_CHANGED, change_data
     )
     await event.wait()
+    await hass.async_block_till_done()
     assert hass.states.get("media_player.test_player").state == STATE_PLAYING
 
 
diff --git a/tests/components/history/test_init.py b/tests/components/history/test_init.py
index 494ea89b3b8..0b35d5194fb 100644
--- a/tests/components/history/test_init.py
+++ b/tests/components/history/test_init.py
@@ -763,7 +763,7 @@ async def test_fetch_period_api(hass, hass_client):
     """Test the fetch period view for history."""
     await hass.async_add_executor_job(init_recorder_component, hass)
     await async_setup_component(hass, "history", {})
-    await hass.async_add_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
+    await hass.async_add_executor_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
     client = await hass_client()
     response = await client.get(f"/api/history/period/{dt_util.utcnow().isoformat()}")
     assert response.status == 200
@@ -775,7 +775,7 @@ async def test_fetch_period_api_with_use_include_order(hass, hass_client):
     await async_setup_component(
         hass, "history", {history.DOMAIN: {history.CONF_ORDER: True}}
     )
-    await hass.async_add_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
+    await hass.async_add_executor_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
     client = await hass_client()
     response = await client.get(f"/api/history/period/{dt_util.utcnow().isoformat()}")
     assert response.status == 200
@@ -785,7 +785,7 @@ async def test_fetch_period_api_with_minimal_response(hass, hass_client):
     """Test the fetch period view for history with minimal_response."""
     await hass.async_add_executor_job(init_recorder_component, hass)
     await async_setup_component(hass, "history", {})
-    await hass.async_add_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
+    await hass.async_add_executor_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
     client = await hass_client()
     response = await client.get(
         f"/api/history/period/{dt_util.utcnow().isoformat()}?minimal_response"
@@ -797,7 +797,7 @@ async def test_fetch_period_api_with_no_timestamp(hass, hass_client):
     """Test the fetch period view for history with no timestamp."""
     await hass.async_add_executor_job(init_recorder_component, hass)
     await async_setup_component(hass, "history", {})
-    await hass.async_add_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
+    await hass.async_add_executor_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
     client = await hass_client()
     response = await client.get("/api/history/period")
     assert response.status == 200
@@ -816,7 +816,7 @@ async def test_fetch_period_api_with_include_order(hass, hass_client):
             }
         },
     )
-    await hass.async_add_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
+    await hass.async_add_executor_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
     client = await hass_client()
     response = await client.get(
         f"/api/history/period/{dt_util.utcnow().isoformat()}",
@@ -970,3 +970,41 @@ async def test_entity_ids_limit_via_api(hass, hass_client):
     assert len(response_json) == 2
     assert response_json[0][0]["entity_id"] == "light.kitchen"
     assert response_json[1][0]["entity_id"] == "light.cow"
+
+
+async def test_entity_ids_limit_via_api_with_skip_initial_state(hass, hass_client):
+    """Test limiting history to entity_ids with skip_initial_state."""
+    await hass.async_add_executor_job(init_recorder_component, hass)
+    await async_setup_component(
+        hass,
+        "history",
+        {"history": {}},
+    )
+    await hass.async_add_executor_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
+    hass.states.async_set("light.kitchen", "on")
+    hass.states.async_set("light.cow", "on")
+    hass.states.async_set("light.nomatch", "on")
+
+    await hass.async_block_till_done()
+
+    await hass.async_add_executor_job(trigger_db_commit, hass)
+    await hass.async_block_till_done()
+    await hass.async_add_executor_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
+
+    client = await hass_client()
+    response = await client.get(
+        f"/api/history/period/{dt_util.utcnow().isoformat()}?filter_entity_id=light.kitchen,light.cow&skip_initial_state",
+    )
+    assert response.status == 200
+    response_json = await response.json()
+    assert len(response_json) == 0
+
+    when = dt_util.utcnow() - timedelta(minutes=1)
+    response = await client.get(
+        f"/api/history/period/{when.isoformat()}?filter_entity_id=light.kitchen,light.cow&skip_initial_state",
+    )
+    assert response.status == 200
+    response_json = await response.json()
+    assert len(response_json) == 2
+    assert response_json[0][0]["entity_id"] == "light.kitchen"
+    assert response_json[1][0]["entity_id"] == "light.cow"
diff --git a/tests/components/homeassistant/test_init.py b/tests/components/homeassistant/test_init.py
index b2ca49712d1..3ad3ef76483 100644
--- a/tests/components/homeassistant/test_init.py
+++ b/tests/components/homeassistant/test_init.py
@@ -269,7 +269,7 @@ async def test_turn_on_to_not_block_for_domains_without_service(hass):
         "homeassistant.core.ServiceRegistry.async_call",
         return_value=None,
     ) as mock_call:
-        await service.func(service_call)
+        await service.job.target(service_call)
 
     assert mock_call.call_count == 2
     assert mock_call.call_args_list[0][0] == (
diff --git a/tests/components/homeassistant/triggers/test_event.py b/tests/components/homeassistant/triggers/test_event.py
index 0e4c2674b1b..babb2bf4d87 100644
--- a/tests/components/homeassistant/triggers/test_event.py
+++ b/tests/components/homeassistant/triggers/test_event.py
@@ -15,6 +15,12 @@ def calls(hass):
     return async_mock_service(hass, "test", "automation")
 
 
+@pytest.fixture
+def context_with_user():
+    """Track calls to a mock service."""
+    return Context(user_id="test_user_id")
+
+
 @pytest.fixture(autouse=True)
 def setup_comp(hass):
     """Initialize components."""
@@ -53,8 +59,8 @@ async def test_if_fires_on_event(hass, calls):
     assert len(calls) == 1
 
 
-async def test_if_fires_on_event_extra_data(hass, calls):
-    """Test the firing of events still matches with event data."""
+async def test_if_fires_on_event_extra_data(hass, calls, context_with_user):
+    """Test the firing of events still matches with event data and context."""
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -65,8 +71,9 @@ async def test_if_fires_on_event_extra_data(hass, calls):
             }
         },
     )
-
-    hass.bus.async_fire("test_event", {"extra_key": "extra_data"})
+    hass.bus.async_fire(
+        "test_event", {"extra_key": "extra_data"}, context=context_with_user
+    )
     await hass.async_block_till_done()
     assert len(calls) == 1
 
@@ -82,8 +89,8 @@ async def test_if_fires_on_event_extra_data(hass, calls):
     assert len(calls) == 1
 
 
-async def test_if_fires_on_event_with_data(hass, calls):
-    """Test the firing of events with data."""
+async def test_if_fires_on_event_with_data_and_context(hass, calls, context_with_user):
+    """Test the firing of events with data and context."""
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -96,6 +103,7 @@ async def test_if_fires_on_event_with_data(hass, calls):
                         "some_attr": "some_value",
                         "second_attr": "second_value",
                     },
+                    "context": {"user_id": context_with_user.user_id},
                 },
                 "action": {"service": "test.automation"},
             }
@@ -105,17 +113,31 @@ async def test_if_fires_on_event_with_data(hass, calls):
     hass.bus.async_fire(
         "test_event",
         {"some_attr": "some_value", "another": "value", "second_attr": "second_value"},
+        context=context_with_user,
     )
     await hass.async_block_till_done()
     assert len(calls) == 1
 
-    hass.bus.async_fire("test_event", {"some_attr": "some_value", "another": "value"})
+    hass.bus.async_fire(
+        "test_event",
+        {"some_attr": "some_value", "another": "value"},
+        context=context_with_user,
+    )
     await hass.async_block_till_done()
     assert len(calls) == 1  # No new call
 
+    hass.bus.async_fire(
+        "test_event",
+        {"some_attr": "some_value", "another": "value", "second_attr": "second_value"},
+    )
+    await hass.async_block_till_done()
+    assert len(calls) == 1
 
-async def test_if_fires_on_event_with_empty_data_config(hass, calls):
-    """Test the firing of events with empty data config.
+
+async def test_if_fires_on_event_with_empty_data_and_context_config(
+    hass, calls, context_with_user
+):
+    """Test the firing of events with empty data and context config.
 
     The frontend automation editor can produce configurations with an
     empty dict for event_data instead of no key.
@@ -129,13 +151,18 @@ async def test_if_fires_on_event_with_empty_data_config(hass, calls):
                     "platform": "event",
                     "event_type": "test_event",
                     "event_data": {},
+                    "context": {},
                 },
                 "action": {"service": "test.automation"},
             }
         },
     )
 
-    hass.bus.async_fire("test_event", {"some_attr": "some_value", "another": "value"})
+    hass.bus.async_fire(
+        "test_event",
+        {"some_attr": "some_value", "another": "value"},
+        context=context_with_user,
+    )
     await hass.async_block_till_done()
     assert len(calls) == 1
 
@@ -165,7 +192,7 @@ async def test_if_fires_on_event_with_nested_data(hass, calls):
 
 
 async def test_if_not_fires_if_event_data_not_matches(hass, calls):
-    """Test firing of event if no match."""
+    """Test firing of event if no data match."""
     assert await async_setup_component(
         hass,
         automation.DOMAIN,
@@ -184,3 +211,83 @@ async def test_if_not_fires_if_event_data_not_matches(hass, calls):
     hass.bus.async_fire("test_event", {"some_attr": "some_other_value"})
     await hass.async_block_till_done()
     assert len(calls) == 0
+
+
+async def test_if_not_fires_if_event_context_not_matches(
+    hass, calls, context_with_user
+):
+    """Test firing of event if no context match."""
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "trigger": {
+                    "platform": "event",
+                    "event_type": "test_event",
+                    "context": {"user_id": "some_user"},
+                },
+                "action": {"service": "test.automation"},
+            }
+        },
+    )
+
+    hass.bus.async_fire("test_event", {}, context=context_with_user)
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+
+async def test_if_fires_on_multiple_user_ids(hass, calls, context_with_user):
+    """Test the firing of event when the trigger has multiple user ids."""
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "trigger": {
+                    "platform": "event",
+                    "event_type": "test_event",
+                    "event_data": {},
+                    "context": {"user_id": [context_with_user.user_id, "another id"]},
+                },
+                "action": {"service": "test.automation"},
+            }
+        },
+    )
+
+    hass.bus.async_fire("test_event", {}, context=context_with_user)
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+
+async def test_event_data_with_list(hass, calls):
+    """Test the (non)firing of event when the data schema has lists."""
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "trigger": {
+                    "platform": "event",
+                    "event_type": "test_event",
+                    "event_data": {"some_attr": [1, 2]},
+                    "context": {},
+                },
+                "action": {"service": "test.automation"},
+            }
+        },
+    )
+
+    hass.bus.async_fire("test_event", {"some_attr": [1, 2]})
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+    # don't match a single value
+    hass.bus.async_fire("test_event", {"some_attr": 1})
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+    # don't match a containing list
+    hass.bus.async_fire("test_event", {"some_attr": [1, 2, 3]})
+    await hass.async_block_till_done()
+    assert len(calls) == 1
diff --git a/tests/components/homeassistant/triggers/test_time.py b/tests/components/homeassistant/triggers/test_time.py
index d38f82be11c..db10e836629 100644
--- a/tests/components/homeassistant/triggers/test_time.py
+++ b/tests/components/homeassistant/triggers/test_time.py
@@ -93,7 +93,7 @@ async def test_if_fires_using_at_input_datetime(hass, calls, has_date, has_time)
 
     time_that_will_not_match_right_away = trigger_dt - timedelta(minutes=1)
 
-    some_data = "{{ trigger.platform }}-{{ trigger.now.day }}-{{ trigger.now.hour }}"
+    some_data = "{{ trigger.platform }}-{{ trigger.now.day }}-{{ trigger.now.hour }}-{{trigger.entity_id}}"
     with patch(
         "homeassistant.util.dt.utcnow",
         return_value=dt_util.as_utc(time_that_will_not_match_right_away),
@@ -117,7 +117,10 @@ async def test_if_fires_using_at_input_datetime(hass, calls, has_date, has_time)
     await hass.async_block_till_done()
 
     assert len(calls) == 1
-    assert calls[0].data["some"] == f"time-{trigger_dt.day}-{trigger_dt.hour}"
+    assert (
+        calls[0].data["some"]
+        == f"time-{trigger_dt.day}-{trigger_dt.hour}-input_datetime.trigger"
+    )
 
     if has_date:
         trigger_dt += timedelta(days=1)
@@ -138,7 +141,10 @@ async def test_if_fires_using_at_input_datetime(hass, calls, has_date, has_time)
     await hass.async_block_till_done()
 
     assert len(calls) == 2
-    assert calls[1].data["some"] == f"time-{trigger_dt.day}-{trigger_dt.hour}"
+    assert (
+        calls[1].data["some"]
+        == f"time-{trigger_dt.day}-{trigger_dt.hour}-input_datetime.trigger"
+    )
 
 
 async def test_if_fires_using_multiple_at(hass, calls):
diff --git a/tests/components/homekit/test_config_flow.py b/tests/components/homekit/test_config_flow.py
index 6e4e03f2137..e161d746c3c 100644
--- a/tests/components/homekit/test_config_flow.py
+++ b/tests/components/homekit/test_config_flow.py
@@ -123,8 +123,8 @@ async def test_import(hass):
     assert len(mock_setup_entry.mock_calls) == 2
 
 
-async def test_options_flow_advanced(hass):
-    """Test config flow options."""
+async def test_options_flow_exclude_mode_advanced(hass):
+    """Test config flow options in exclude mode with advanced options."""
 
     config_entry = _mock_config_entry_with_options_populated()
     config_entry.add_to_hass(hass)
@@ -141,15 +141,15 @@ async def test_options_flow_advanced(hass):
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"include_domains": ["fan", "vacuum", "climate", "humidifier"]},
+        user_input={"domains": ["fan", "vacuum", "climate", "humidifier"]},
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result["step_id"] == "exclude"
+    assert result["step_id"] == "include_exclude"
 
     result2 = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"exclude_entities": ["climate.old"]},
+        user_input={"entities": ["climate.old"], "include_exclude_mode": "exclude"},
     )
     assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result2["step_id"] == "advanced"
@@ -163,6 +163,7 @@ async def test_options_flow_advanced(hass):
     assert result3["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
     assert config_entry.options == {
         "auto_start": True,
+        "mode": "bridge",
         "filter": {
             "exclude_domains": [],
             "exclude_entities": ["climate.old"],
@@ -173,8 +174,8 @@ async def test_options_flow_advanced(hass):
     }
 
 
-async def test_options_flow_basic(hass):
-    """Test config flow options."""
+async def test_options_flow_exclude_mode_basic(hass):
+    """Test config flow options in exclude mode."""
 
     config_entry = _mock_config_entry_with_options_populated()
     config_entry.add_to_hass(hass)
@@ -191,15 +192,15 @@ async def test_options_flow_basic(hass):
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"include_domains": ["fan", "vacuum", "climate"]},
+        user_input={"domains": ["fan", "vacuum", "climate"]},
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result["step_id"] == "exclude"
+    assert result["step_id"] == "include_exclude"
 
     result2 = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"exclude_entities": ["climate.old"]},
+        user_input={"entities": ["climate.old"], "include_exclude_mode": "exclude"},
     )
     assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result2["step_id"] == "advanced"
@@ -213,6 +214,7 @@ async def test_options_flow_basic(hass):
     assert result3["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
     assert config_entry.options == {
         "auto_start": False,
+        "mode": "bridge",
         "filter": {
             "exclude_domains": [],
             "exclude_entities": ["climate.old"],
@@ -223,8 +225,61 @@ async def test_options_flow_basic(hass):
     }
 
 
-async def test_options_flow_with_cameras(hass):
-    """Test config flow options."""
+async def test_options_flow_include_mode_basic(hass):
+    """Test config flow options in include mode."""
+
+    config_entry = _mock_config_entry_with_options_populated()
+    config_entry.add_to_hass(hass)
+
+    hass.states.async_set("climate.old", "off")
+    hass.states.async_set("climate.new", "off")
+
+    await hass.async_block_till_done()
+
+    result = await hass.config_entries.options.async_init(
+        config_entry.entry_id, context={"show_advanced_options": False}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"domains": ["fan", "vacuum", "climate"]},
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "include_exclude"
+
+    result2 = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"entities": ["climate.new"], "include_exclude_mode": "include"},
+    )
+    assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result2["step_id"] == "advanced"
+
+    with patch("homeassistant.components.homekit.async_setup_entry", return_value=True):
+        result3 = await hass.config_entries.options.async_configure(
+            result2["flow_id"],
+            user_input={"safe_mode": True},
+        )
+
+    assert result3["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert config_entry.options == {
+        "auto_start": False,
+        "mode": "bridge",
+        "filter": {
+            "exclude_domains": [],
+            "exclude_entities": [],
+            "include_domains": ["fan", "vacuum"],
+            "include_entities": ["climate.new"],
+        },
+        "safe_mode": True,
+    }
+
+
+async def test_options_flow_exclude_mode_with_cameras(hass):
+    """Test config flow options in exclude mode with cameras."""
 
     config_entry = _mock_config_entry_with_options_populated()
     config_entry.add_to_hass(hass)
@@ -245,15 +300,18 @@ async def test_options_flow_with_cameras(hass):
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"include_domains": ["fan", "vacuum", "climate", "camera"]},
+        user_input={"domains": ["fan", "vacuum", "climate", "camera"]},
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result["step_id"] == "exclude"
+    assert result["step_id"] == "include_exclude"
 
     result2 = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"exclude_entities": ["climate.old", "camera.excluded"]},
+        user_input={
+            "entities": ["climate.old", "camera.excluded"],
+            "include_exclude_mode": "exclude",
+        },
     )
     assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result2["step_id"] == "cameras"
@@ -275,6 +333,7 @@ async def test_options_flow_with_cameras(hass):
     assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
     assert config_entry.options == {
         "auto_start": False,
+        "mode": "bridge",
         "filter": {
             "exclude_domains": [],
             "exclude_entities": ["climate.old", "camera.excluded"],
@@ -296,15 +355,18 @@ async def test_options_flow_with_cameras(hass):
 
     result = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"include_domains": ["fan", "vacuum", "climate", "camera"]},
+        user_input={"domains": ["fan", "vacuum", "climate", "camera"]},
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result["step_id"] == "exclude"
+    assert result["step_id"] == "include_exclude"
 
     result2 = await hass.config_entries.options.async_configure(
         result["flow_id"],
-        user_input={"exclude_entities": ["climate.old", "camera.excluded"]},
+        user_input={
+            "entities": ["climate.old", "camera.excluded"],
+            "include_exclude_mode": "exclude",
+        },
     )
     assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result2["step_id"] == "cameras"
@@ -326,6 +388,129 @@ async def test_options_flow_with_cameras(hass):
     assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
     assert config_entry.options == {
         "auto_start": False,
+        "mode": "bridge",
+        "filter": {
+            "exclude_domains": [],
+            "exclude_entities": ["climate.old", "camera.excluded"],
+            "include_domains": ["fan", "vacuum", "climate", "camera"],
+            "include_entities": [],
+        },
+        "entity_config": {"camera.native_h264": {}},
+        "safe_mode": True,
+    }
+
+
+async def test_options_flow_include_mode_with_cameras(hass):
+    """Test config flow options in include mode with cameras."""
+
+    config_entry = _mock_config_entry_with_options_populated()
+    config_entry.add_to_hass(hass)
+
+    hass.states.async_set("climate.old", "off")
+    hass.states.async_set("camera.native_h264", "off")
+    hass.states.async_set("camera.transcode_h264", "off")
+    hass.states.async_set("camera.excluded", "off")
+
+    await hass.async_block_till_done()
+
+    result = await hass.config_entries.options.async_init(
+        config_entry.entry_id, context={"show_advanced_options": False}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"domains": ["fan", "vacuum", "climate", "camera"]},
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "include_exclude"
+
+    result2 = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "entities": ["camera.native_h264", "camera.transcode_h264"],
+            "include_exclude_mode": "include",
+        },
+    )
+    assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result2["step_id"] == "cameras"
+
+    result3 = await hass.config_entries.options.async_configure(
+        result2["flow_id"],
+        user_input={"camera_copy": ["camera.native_h264"]},
+    )
+
+    assert result3["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result3["step_id"] == "advanced"
+
+    with patch("homeassistant.components.homekit.async_setup_entry", return_value=True):
+        result4 = await hass.config_entries.options.async_configure(
+            result3["flow_id"],
+            user_input={"safe_mode": True},
+        )
+
+    assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert config_entry.options == {
+        "auto_start": False,
+        "mode": "bridge",
+        "filter": {
+            "exclude_domains": [],
+            "exclude_entities": [],
+            "include_domains": ["fan", "vacuum", "climate"],
+            "include_entities": ["camera.native_h264", "camera.transcode_h264"],
+        },
+        "entity_config": {"camera.native_h264": {"video_codec": "copy"}},
+        "safe_mode": True,
+    }
+
+    # Now run though again and verify we can turn off copy
+
+    result = await hass.config_entries.options.async_init(
+        config_entry.entry_id, context={"show_advanced_options": False}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"domains": ["fan", "vacuum", "climate", "camera"]},
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "include_exclude"
+
+    result2 = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "entities": ["climate.old", "camera.excluded"],
+            "include_exclude_mode": "exclude",
+        },
+    )
+    assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result2["step_id"] == "cameras"
+
+    result3 = await hass.config_entries.options.async_configure(
+        result2["flow_id"],
+        user_input={"camera_copy": []},
+    )
+
+    assert result3["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result3["step_id"] == "advanced"
+
+    with patch("homeassistant.components.homekit.async_setup_entry", return_value=True):
+        result4 = await hass.config_entries.options.async_configure(
+            result3["flow_id"],
+            user_input={"safe_mode": True},
+        )
+
+    assert result4["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert config_entry.options == {
+        "auto_start": False,
+        "mode": "bridge",
         "filter": {
             "exclude_domains": [],
             "exclude_entities": ["climate.old", "camera.excluded"],
@@ -375,3 +560,56 @@ async def test_options_flow_blocked_when_from_yaml(hass):
             user_input={},
         )
         assert result2["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+
+async def test_options_flow_include_mode_basic_accessory(hass):
+    """Test config flow options in include mode with a single accessory."""
+
+    config_entry = _mock_config_entry_with_options_populated()
+    config_entry.add_to_hass(hass)
+
+    hass.states.async_set("media_player.tv", "off")
+    hass.states.async_set("media_player.sonos", "off")
+
+    await hass.async_block_till_done()
+
+    result = await hass.config_entries.options.async_init(
+        config_entry.entry_id, context={"show_advanced_options": False}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"domains": ["media_player"], "mode": "accessory"},
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "include_exclude"
+
+    result2 = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"entities": "media_player.tv"},
+    )
+    assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result2["step_id"] == "advanced"
+
+    with patch("homeassistant.components.homekit.async_setup_entry", return_value=True):
+        result3 = await hass.config_entries.options.async_configure(
+            result2["flow_id"],
+            user_input={"safe_mode": False},
+        )
+
+    assert result3["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert config_entry.options == {
+        "auto_start": False,
+        "mode": "accessory",
+        "filter": {
+            "exclude_domains": [],
+            "exclude_entities": [],
+            "include_domains": [],
+            "include_entities": ["media_player.tv"],
+        },
+        "safe_mode": False,
+    }
diff --git a/tests/components/homekit/test_homekit.py b/tests/components/homekit/test_homekit.py
index c22d6286e76..ccf1749636e 100644
--- a/tests/components/homekit/test_homekit.py
+++ b/tests/components/homekit/test_homekit.py
@@ -2,6 +2,7 @@
 import os
 from typing import Dict
 
+from pyhap.accessory import Accessory
 import pytest
 
 from homeassistant import config as hass_config
@@ -31,6 +32,8 @@ from homeassistant.components.homekit.const import (
     DOMAIN,
     HOMEKIT,
     HOMEKIT_FILE,
+    HOMEKIT_MODE_ACCESSORY,
+    HOMEKIT_MODE_BRIDGE,
     SERVICE_HOMEKIT_RESET_ACCESSORY,
     SERVICE_HOMEKIT_START,
 )
@@ -118,6 +121,7 @@ async def test_setup_min(hass):
         ANY,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         None,
         entry.entry_id,
     )
@@ -154,6 +158,7 @@ async def test_setup_auto_start_disabled(hass):
         ANY,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         None,
         entry.entry_id,
     )
@@ -200,10 +205,13 @@ async def test_homekit_setup(hass, hk_driver):
         {},
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
 
+    hass.states.async_set("light.demo", "on")
+    hass.states.async_set("light.demo2", "on")
     zeroconf_mock = MagicMock()
     with patch(
         f"{PATH_HOMEKIT}.accessories.HomeDriver", return_value=hk_driver
@@ -212,7 +220,6 @@ async def test_homekit_setup(hass, hk_driver):
         await hass.async_add_executor_job(homekit.setup, zeroconf_mock)
 
     path = get_persist_fullpath_for_entry_id(hass, entry.entry_id)
-    assert isinstance(homekit.bridge, HomeBridge)
     mock_driver.assert_called_with(
         hass,
         entry.entry_id,
@@ -245,6 +252,7 @@ async def test_homekit_setup_ip_address(hass, hk_driver):
         {},
         {},
         None,
+        HOMEKIT_MODE_BRIDGE,
         None,
         entry_id=entry.entry_id,
     )
@@ -283,6 +291,7 @@ async def test_homekit_setup_advertise_ip(hass, hk_driver):
         {},
         {},
         None,
+        HOMEKIT_MODE_BRIDGE,
         "192.168.1.100",
         entry_id=entry.entry_id,
     )
@@ -321,6 +330,7 @@ async def test_homekit_setup_safe_mode(hass, hk_driver):
         {},
         {},
         True,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -342,6 +352,7 @@ async def test_homekit_add_accessory(hass):
         lambda entity_id: True,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -378,6 +389,7 @@ async def test_homekit_remove_accessory(hass):
         lambda entity_id: True,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -403,6 +415,7 @@ async def test_homekit_entity_filter(hass):
         entity_filter,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -439,6 +452,7 @@ async def test_homekit_entity_glob_filter(hass):
         entity_filter,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -478,6 +492,7 @@ async def test_homekit_start(hass, hk_driver, device_reg, debounce_patcher):
         {},
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -486,6 +501,7 @@ async def test_homekit_start(hass, hk_driver, device_reg, debounce_patcher):
     homekit.driver = hk_driver
     # pylint: disable=protected-access
     homekit._filter = Mock(return_value=True)
+    homekit.driver.accessory = Accessory(hk_driver, "any")
 
     connection = (device_registry.CONNECTION_NETWORK_MAC, "AA:BB:CC:DD:EE:FF")
     bridge_with_wrong_mac = device_reg.async_get_or_create(
@@ -497,6 +513,7 @@ async def test_homekit_start(hass, hk_driver, device_reg, debounce_patcher):
     )
 
     hass.states.async_set("light.demo", "on")
+    hass.states.async_set("light.demo2", "on")
     state = hass.states.async_all()[0]
 
     with patch(f"{PATH_HOMEKIT}.HomeKit.add_bridge_accessory") as mock_add_acc, patch(
@@ -509,7 +526,7 @@ async def test_homekit_start(hass, hk_driver, device_reg, debounce_patcher):
         await homekit.async_start()
 
     await hass.async_block_till_done()
-    mock_add_acc.assert_called_with(state)
+    mock_add_acc.assert_any_call(state)
     mock_setup_msg.assert_called_with(hass, entry.entry_id, None, pin, ANY)
     hk_driver_add_acc.assert_called_with(homekit.bridge)
     assert hk_driver_start.called
@@ -568,6 +585,7 @@ async def test_homekit_start_with_a_broken_accessory(hass, hk_driver, debounce_p
         entity_filter,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -575,6 +593,7 @@ async def test_homekit_start_with_a_broken_accessory(hass, hk_driver, debounce_p
     homekit.bridge = Mock()
     homekit.bridge.accessories = []
     homekit.driver = hk_driver
+    homekit.driver.accessory = Accessory(hk_driver, "any")
 
     hass.states.async_set("light.demo", "on")
     hass.states.async_set("light.broken", "on")
@@ -613,6 +632,7 @@ async def test_homekit_stop(hass):
         {},
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -653,6 +673,7 @@ async def test_homekit_reset_accessories(hass):
         {},
         {entity_id: {}},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -687,7 +708,7 @@ async def test_homekit_reset_accessories(hass):
         homekit.status = STATUS_READY
 
 
-async def test_homekit_too_many_accessories(hass, hk_driver):
+async def test_homekit_too_many_accessories(hass, hk_driver, caplog):
     """Test adding too many accessories to HomeKit."""
     entry = await async_init_integration(hass)
 
@@ -701,24 +722,32 @@ async def test_homekit_too_many_accessories(hass, hk_driver):
         entity_filter,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
-    homekit.bridge = Mock()
-    # The bridge itself counts as an accessory
-    homekit.bridge.accessories = range(MAX_DEVICES)
+
+    def _mock_bridge(*_):
+        mock_bridge = HomeBridge(hass, hk_driver, "mock_bridge")
+        # The bridge itself counts as an accessory
+        mock_bridge.accessories = range(MAX_DEVICES)
+        return mock_bridge
+
     homekit.driver = hk_driver
+    homekit.driver.accessory = Accessory(hk_driver, "any")
 
     hass.states.async_set("light.demo", "on")
+    hass.states.async_set("light.demo2", "on")
+    hass.states.async_set("light.demo3", "on")
 
     with patch("pyhap.accessory_driver.AccessoryDriver.start_service"), patch(
         "pyhap.accessory_driver.AccessoryDriver.add_accessory"
-    ), patch("homeassistant.components.homekit._LOGGER.warning") as mock_warn, patch(
-        f"{PATH_HOMEKIT}.show_setup_message"
+    ), patch(f"{PATH_HOMEKIT}.show_setup_message"), patch(
+        f"{PATH_HOMEKIT}.accessories.HomeBridge", _mock_bridge
     ):
         await homekit.async_start()
         await hass.async_block_till_done()
-        assert mock_warn.called is True
+        assert "would exceeded" in caplog.text
 
 
 async def test_homekit_finds_linked_batteries(
@@ -735,6 +764,7 @@ async def test_homekit_finds_linked_batteries(
         {},
         {"light.demo": {}},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -821,6 +851,7 @@ async def test_homekit_async_get_integration_fails(
         {},
         {"light.demo": {}},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -927,6 +958,7 @@ async def test_setup_imported(hass):
         ANY,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         None,
         entry.entry_id,
     )
@@ -981,6 +1013,7 @@ async def test_yaml_updates_update_config_entry_for_name(hass):
         ANY,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         None,
         entry.entry_id,
     )
@@ -1053,6 +1086,7 @@ async def test_homekit_ignored_missing_devices(
         {},
         {"light.demo": {}},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -1094,6 +1128,7 @@ async def test_homekit_ignored_missing_devices(
     device_reg.async_remove_device(device_entry.id)
 
     hass.states.async_set(light.entity_id, STATE_ON)
+    hass.states.async_set("light.two", STATE_ON)
 
     def _mock_get_accessory(*args, **kwargs):
         return [None, "acc", None]
@@ -1106,7 +1141,7 @@ async def test_homekit_ignored_missing_devices(
         await homekit.async_start()
     await hass.async_block_till_done()
 
-    mock_get_acc.assert_called_with(
+    mock_get_acc.assert_any_call(
         hass,
         hk_driver,
         ANY,
@@ -1133,6 +1168,7 @@ async def test_homekit_finds_linked_motion_sensors(
         {},
         {"camera.camera_demo": {}},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -1208,6 +1244,7 @@ async def test_homekit_finds_linked_humidity_sensors(
         {},
         {"humidifier.humidifier": {}},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         advertise_ip=None,
         entry_id=entry.entry_id,
     )
@@ -1297,6 +1334,7 @@ async def test_reload(hass):
         ANY,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         None,
         entry.entry_id,
     )
@@ -1333,6 +1371,7 @@ async def test_reload(hass):
         ANY,
         {},
         DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_BRIDGE,
         None,
         entry.entry_id,
     )
@@ -1341,3 +1380,45 @@ async def test_reload(hass):
 
 def _get_fixtures_base_path():
     return os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+
+
+async def test_homekit_start_in_accessory_mode(
+    hass, hk_driver, device_reg, debounce_patcher
+):
+    """Test HomeKit start method in accessory mode."""
+    entry = await async_init_integration(hass)
+
+    pin = b"123-45-678"
+    homekit = HomeKit(
+        hass,
+        None,
+        None,
+        None,
+        {},
+        {},
+        DEFAULT_SAFE_MODE,
+        HOMEKIT_MODE_ACCESSORY,
+        advertise_ip=None,
+        entry_id=entry.entry_id,
+    )
+    homekit.bridge = Mock()
+    homekit.bridge.accessories = []
+    homekit.driver = hk_driver
+    # pylint: disable=protected-access
+    homekit._filter = Mock(return_value=True)
+    homekit.driver.accessory = Accessory(hk_driver, "any")
+
+    hass.states.async_set("light.demo", "on")
+
+    with patch(f"{PATH_HOMEKIT}.HomeKit.add_bridge_accessory") as mock_add_acc, patch(
+        "pyhap.accessory_driver.AccessoryDriver.add_accessory"
+    ), patch(f"{PATH_HOMEKIT}.show_setup_message") as mock_setup_msg, patch(
+        "pyhap.accessory_driver.AccessoryDriver.start_service"
+    ) as hk_driver_start:
+        await homekit.async_start()
+
+    await hass.async_block_till_done()
+    mock_add_acc.assert_not_called()
+    mock_setup_msg.assert_called_with(hass, entry.entry_id, None, pin, ANY)
+    assert hk_driver_start.called
+    assert homekit.status == STATUS_RUNNING
diff --git a/tests/components/homekit_controller/specific_devices/test_aqara_gateway.py b/tests/components/homekit_controller/specific_devices/test_aqara_gateway.py
index 292c4169688..8bee6e0591d 100644
--- a/tests/components/homekit_controller/specific_devices/test_aqara_gateway.py
+++ b/tests/components/homekit_controller/specific_devices/test_aqara_gateway.py
@@ -1,7 +1,7 @@
 """
 Regression tests for Aqara Gateway V3.
 
-https://github.com/home-assistant/home-assistant/issues/20957
+https://github.com/home-assistant/core/issues/20957
 """
 
 from homeassistant.components.light import SUPPORT_BRIGHTNESS, SUPPORT_COLOR
diff --git a/tests/components/homekit_controller/specific_devices/test_ecobee3.py b/tests/components/homekit_controller/specific_devices/test_ecobee3.py
index ee048f93ca7..c1a956f3f4d 100644
--- a/tests/components/homekit_controller/specific_devices/test_ecobee3.py
+++ b/tests/components/homekit_controller/specific_devices/test_ecobee3.py
@@ -1,7 +1,7 @@
 """
 Regression tests for Ecobee 3.
 
-https://github.com/home-assistant/home-assistant/issues/15336
+https://github.com/home-assistant/core/issues/15336
 """
 
 from unittest import mock
diff --git a/tests/components/homekit_controller/specific_devices/test_ecobee_occupancy.py b/tests/components/homekit_controller/specific_devices/test_ecobee_occupancy.py
index b1a8c0a636f..6823cdc16ea 100644
--- a/tests/components/homekit_controller/specific_devices/test_ecobee_occupancy.py
+++ b/tests/components/homekit_controller/specific_devices/test_ecobee_occupancy.py
@@ -1,7 +1,7 @@
 """
 Regression tests for Ecobee occupancy.
 
-https://github.com/home-assistant/home-assistant/issues/31827
+https://github.com/home-assistant/core/issues/31827
 """
 
 from tests.components.homekit_controller.common import (
diff --git a/tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py b/tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py
index 2abd12b3df4..4682d4b2bcc 100644
--- a/tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py
+++ b/tests/components/homekit_controller/specific_devices/test_koogeek_ls1.py
@@ -59,7 +59,7 @@ async def test_recover_from_failure(hass, utcnow, failure_cls):
     """
     Test that entity actually recovers from a network connection drop.
 
-    See https://github.com/home-assistant/home-assistant/issues/18949
+    See https://github.com/home-assistant/core/issues/18949
     """
     accessories = await setup_accessories_from_file(hass, "koogeek_ls1.json")
     config_entry, pairing = await setup_test_accessories(hass, accessories)
diff --git a/tests/components/homekit_controller/specific_devices/test_lennox_e30.py b/tests/components/homekit_controller/specific_devices/test_lennox_e30.py
index 3209139ae1e..fe7b0c7783f 100644
--- a/tests/components/homekit_controller/specific_devices/test_lennox_e30.py
+++ b/tests/components/homekit_controller/specific_devices/test_lennox_e30.py
@@ -1,7 +1,7 @@
 """
 Regression tests for Aqara Gateway V3.
 
-https://github.com/home-assistant/home-assistant/issues/20885
+https://github.com/home-assistant/core/issues/20885
 """
 
 from homeassistant.components.climate.const import SUPPORT_TARGET_TEMPERATURE
diff --git a/tests/components/homekit_controller/specific_devices/test_simpleconnect_fan.py b/tests/components/homekit_controller/specific_devices/test_simpleconnect_fan.py
index a83a31166f4..b30dd1e9c89 100644
--- a/tests/components/homekit_controller/specific_devices/test_simpleconnect_fan.py
+++ b/tests/components/homekit_controller/specific_devices/test_simpleconnect_fan.py
@@ -1,7 +1,7 @@
 """
 Test against characteristics captured from a SIMPLEconnect Fan.
 
-https://github.com/home-assistant/home-assistant/issues/26180
+https://github.com/home-assistant/core/issues/26180
 """
 
 from homeassistant.components.fan import SUPPORT_DIRECTION, SUPPORT_SET_SPEED
diff --git a/tests/components/homematic/test_notify.py b/tests/components/homematic/test_notify.py
index e1bd2f4f229..aa9e9b3eb4e 100644
--- a/tests/components/homematic/test_notify.py
+++ b/tests/components/homematic/test_notify.py
@@ -1,77 +1,65 @@
 """The tests for the Homematic notification platform."""
 
-import unittest
-
 import homeassistant.components.notify as notify_comp
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
-from tests.common import assert_setup_component, get_test_home_assistant
+from tests.common import assert_setup_component
 
 
-class TestHomematicNotify(unittest.TestCase):
-    """Test the Homematic notifications."""
-
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Stop down everything that was started."""
-        self.hass.stop()
-
-    def test_setup_full(self):
-        """Test valid configuration."""
-        setup_component(
-            self.hass,
-            "homematic",
-            {"homematic": {"hosts": {"ccu2": {"host": "127.0.0.1"}}}},
+async def test_setup_full(hass):
+    """Test valid configuration."""
+    await async_setup_component(
+        hass,
+        "homematic",
+        {"homematic": {"hosts": {"ccu2": {"host": "127.0.0.1"}}}},
+    )
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(
+            hass,
+            "notify",
+            {
+                "notify": {
+                    "name": "test",
+                    "platform": "homematic",
+                    "address": "NEQXXXXXXX",
+                    "channel": 2,
+                    "param": "SUBMIT",
+                    "value": "1,1,108000,2",
+                    "interface": "my-interface",
+                }
+            },
         )
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(
-                self.hass,
-                "notify",
-                {
-                    "notify": {
-                        "name": "test",
-                        "platform": "homematic",
-                        "address": "NEQXXXXXXX",
-                        "channel": 2,
-                        "param": "SUBMIT",
-                        "value": "1,1,108000,2",
-                        "interface": "my-interface",
-                    }
-                },
-            )
-        assert handle_config[notify_comp.DOMAIN]
+    assert handle_config[notify_comp.DOMAIN]
 
-    def test_setup_without_optional(self):
-        """Test valid configuration without optional."""
-        setup_component(
-            self.hass,
-            "homematic",
-            {"homematic": {"hosts": {"ccu2": {"host": "127.0.0.1"}}}},
+
+async def test_setup_without_optional(hass):
+    """Test valid configuration without optional."""
+    await async_setup_component(
+        hass,
+        "homematic",
+        {"homematic": {"hosts": {"ccu2": {"host": "127.0.0.1"}}}},
+    )
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(
+            hass,
+            "notify",
+            {
+                "notify": {
+                    "name": "test",
+                    "platform": "homematic",
+                    "address": "NEQXXXXXXX",
+                    "channel": 2,
+                    "param": "SUBMIT",
+                    "value": "1,1,108000,2",
+                }
+            },
         )
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(
-                self.hass,
-                "notify",
-                {
-                    "notify": {
-                        "name": "test",
-                        "platform": "homematic",
-                        "address": "NEQXXXXXXX",
-                        "channel": 2,
-                        "param": "SUBMIT",
-                        "value": "1,1,108000,2",
-                    }
-                },
-            )
-        assert handle_config[notify_comp.DOMAIN]
+    assert handle_config[notify_comp.DOMAIN]
 
-    def test_bad_config(self):
-        """Test invalid configuration."""
-        config = {notify_comp.DOMAIN: {"name": "test", "platform": "homematic"}}
-        with assert_setup_component(0) as handle_config:
-            assert setup_component(self.hass, notify_comp.DOMAIN, config)
-        assert not handle_config[notify_comp.DOMAIN]
+
+async def test_bad_config(hass):
+    """Test invalid configuration."""
+    config = {notify_comp.DOMAIN: {"name": "test", "platform": "homematic"}}
+    with assert_setup_component(0) as handle_config:
+        assert await async_setup_component(hass, notify_comp.DOMAIN, config)
+    assert not handle_config[notify_comp.DOMAIN]
diff --git a/tests/components/huawei_lte/test_config_flow.py b/tests/components/huawei_lte/test_config_flow.py
index ae1e8184727..2547aa3f01f 100644
--- a/tests/components/huawei_lte/test_config_flow.py
+++ b/tests/components/huawei_lte/test_config_flow.py
@@ -17,6 +17,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 
+from tests.async_mock import patch
 from tests.common import MockConfigEntry
 
 FIXTURE_USER_INPUT = {
@@ -84,7 +85,7 @@ async def test_connection_error(hass, requests_mock):
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "user"
-    assert result["errors"] == {CONF_URL: "unknown_connection_error"}
+    assert result["errors"] == {CONF_URL: "unknown"}
 
 
 @pytest.fixture
@@ -111,7 +112,7 @@ def login_requests_mock(requests_mock):
         (LoginErrorEnum.PASSWORD_WRONG, {CONF_PASSWORD: "incorrect_password"}),
         (
             LoginErrorEnum.USERNAME_PWD_WRONG,
-            {CONF_USERNAME: "incorrect_username_or_password"},
+            {CONF_USERNAME: "invalid_auth"},
         ),
         (LoginErrorEnum.USERNAME_PWD_ORERRUN, {"base": "login_attempts_exceeded"}),
         (ResponseCodeEnum.ERROR_SYSTEM_UNKNOWN, {"base": "response_error"}),
@@ -140,9 +141,15 @@ async def test_success(hass, login_requests_mock):
         f"{FIXTURE_USER_INPUT[CONF_URL]}api/user/login",
         text="<response>OK</response>",
     )
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": config_entries.SOURCE_USER}, data=FIXTURE_USER_INPUT
-    )
+    with patch("homeassistant.components.huawei_lte.async_setup"), patch(
+        "homeassistant.components.huawei_lte.async_setup_entry"
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_USER},
+            data=FIXTURE_USER_INPUT,
+        )
+        await hass.async_block_till_done()
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
     assert result["data"][CONF_URL] == FIXTURE_USER_INPUT[CONF_URL]
diff --git a/tests/components/huawei_lte/test_sensor.py b/tests/components/huawei_lte/test_sensor.py
index f9834349750..92bb8cbac5e 100644
--- a/tests/components/huawei_lte/test_sensor.py
+++ b/tests/components/huawei_lte/test_sensor.py
@@ -3,11 +3,19 @@
 import pytest
 
 from homeassistant.components.huawei_lte import sensor
+from homeassistant.const import (
+    SIGNAL_STRENGTH_DECIBELS,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+)
 
 
 @pytest.mark.parametrize(
     ("value", "expected"),
-    (("-71 dBm", (-71, "dBm")), ("15dB", (15, "dB")), (">=-51dBm", (-51, "dBm"))),
+    (
+        ("-71 dBm", (-71, SIGNAL_STRENGTH_DECIBELS_MILLIWATT)),
+        ("15dB", (15, SIGNAL_STRENGTH_DECIBELS)),
+        (">=-51dBm", (-51, SIGNAL_STRENGTH_DECIBELS_MILLIWATT)),
+    ),
 )
 def test_format_default(value, expected):
     """Test that default formatter copes with expected values."""
diff --git a/tests/components/hue/conftest.py b/tests/components/hue/conftest.py
index 52ae43d65b4..094378f47c9 100644
--- a/tests/components/hue/conftest.py
+++ b/tests/components/hue/conftest.py
@@ -3,6 +3,7 @@ from collections import deque
 
 from aiohue.groups import Groups
 from aiohue.lights import Lights
+from aiohue.scenes import Scenes
 from aiohue.sensors import Sensors
 import pytest
 
@@ -10,7 +11,7 @@ from homeassistant import config_entries
 from homeassistant.components import hue
 from homeassistant.components.hue import sensor_base as hue_sensor_base
 
-from tests.async_mock import Mock, patch
+from tests.async_mock import AsyncMock, Mock, patch
 
 
 @pytest.fixture(autouse=True)
@@ -65,6 +66,39 @@ def create_mock_bridge(hass):
     return bridge
 
 
+@pytest.fixture
+def mock_api(hass):
+    """Mock the Hue api."""
+    api = Mock(initialize=AsyncMock())
+    api.mock_requests = []
+    api.mock_light_responses = deque()
+    api.mock_group_responses = deque()
+    api.mock_sensor_responses = deque()
+    api.mock_scene_responses = deque()
+
+    async def mock_request(method, path, **kwargs):
+        kwargs["method"] = method
+        kwargs["path"] = path
+        api.mock_requests.append(kwargs)
+
+        if path == "lights":
+            return api.mock_light_responses.popleft()
+        if path == "groups":
+            return api.mock_group_responses.popleft()
+        if path == "sensors":
+            return api.mock_sensor_responses.popleft()
+        if path == "scenes":
+            return api.mock_scene_responses.popleft()
+        return None
+
+    api.config.apiversion = "9.9.9"
+    api.lights = Lights({}, mock_request)
+    api.groups = Groups({}, mock_request)
+    api.sensors = Sensors({}, mock_request)
+    api.scenes = Scenes({}, mock_request)
+    return api
+
+
 @pytest.fixture
 def mock_bridge(hass):
     """Mock a Hue bridge."""
diff --git a/tests/components/hue/test_bridge.py b/tests/components/hue/test_bridge.py
index 19b642b0283..06dd459723d 100644
--- a/tests/components/hue/test_bridge.py
+++ b/tests/components/hue/test_bridge.py
@@ -1,6 +1,8 @@
 """Test Hue bridge."""
 import pytest
 
+from homeassistant import config_entries
+from homeassistant.components import hue
 from homeassistant.components.hue import bridge, errors
 from homeassistant.components.hue.const import (
     CONF_ALLOW_HUE_GROUPS,
@@ -88,7 +90,7 @@ async def test_reset_unloads_entry_if_setup(hass):
     ), patch.object(hass.config_entries, "async_forward_entry_setup") as mock_forward:
         assert await hue_bridge.async_setup() is True
 
-    assert len(hass.services.async_services()) == 1
+    assert len(hass.services.async_services()) == 0
     assert len(mock_forward.mock_calls) == 3
 
     with patch.object(
@@ -120,3 +122,131 @@ async def test_handle_unauthorized(hass):
     assert hue_bridge.authorized is False
     assert len(mock_create.mock_calls) == 1
     assert mock_create.mock_calls[0][1][1] == "1.2.3.4"
+
+
+GROUP_RESPONSE = {
+    "group_1": {
+        "name": "Group 1",
+        "lights": ["1", "2"],
+        "type": "LightGroup",
+        "action": {
+            "on": True,
+            "bri": 254,
+            "hue": 10000,
+            "sat": 254,
+            "effect": "none",
+            "xy": [0.5, 0.5],
+            "ct": 250,
+            "alert": "select",
+            "colormode": "ct",
+        },
+        "state": {"any_on": True, "all_on": False},
+    }
+}
+SCENE_RESPONSE = {
+    "scene_1": {
+        "name": "Cozy dinner",
+        "lights": ["1", "2"],
+        "owner": "ffffffffe0341b1b376a2389376a2389",
+        "recycle": True,
+        "locked": False,
+        "appdata": {"version": 1, "data": "myAppData"},
+        "picture": "",
+        "lastupdated": "2015-12-03T10:09:22",
+        "version": 2,
+    }
+}
+
+
+async def test_hue_activate_scene(hass, mock_api):
+    """Test successful hue_activate_scene."""
+    config_entry = config_entries.ConfigEntry(
+        1,
+        hue.DOMAIN,
+        "Mock Title",
+        {"host": "mock-host", "username": "mock-username"},
+        "test",
+        config_entries.CONN_CLASS_LOCAL_POLL,
+        system_options={},
+        options={CONF_ALLOW_HUE_GROUPS: True, CONF_ALLOW_UNREACHABLE: False},
+    )
+    hue_bridge = bridge.HueBridge(hass, config_entry)
+
+    mock_api.mock_group_responses.append(GROUP_RESPONSE)
+    mock_api.mock_scene_responses.append(SCENE_RESPONSE)
+
+    with patch("aiohue.Bridge", return_value=mock_api), patch.object(
+        hass.config_entries, "async_forward_entry_setup"
+    ):
+        assert await hue_bridge.async_setup() is True
+
+    assert hue_bridge.api is mock_api
+
+    call = Mock()
+    call.data = {"group_name": "Group 1", "scene_name": "Cozy dinner"}
+    with patch("aiohue.Bridge", return_value=mock_api):
+        assert await hue_bridge.hue_activate_scene(call) is None
+
+    assert len(mock_api.mock_requests) == 3
+    assert mock_api.mock_requests[2]["json"]["scene"] == "scene_1"
+    assert mock_api.mock_requests[2]["path"] == "groups/group_1/action"
+
+
+async def test_hue_activate_scene_group_not_found(hass, mock_api):
+    """Test failed hue_activate_scene due to missing group."""
+    config_entry = config_entries.ConfigEntry(
+        1,
+        hue.DOMAIN,
+        "Mock Title",
+        {"host": "mock-host", "username": "mock-username"},
+        "test",
+        config_entries.CONN_CLASS_LOCAL_POLL,
+        system_options={},
+        options={CONF_ALLOW_HUE_GROUPS: True, CONF_ALLOW_UNREACHABLE: False},
+    )
+    hue_bridge = bridge.HueBridge(hass, config_entry)
+
+    mock_api.mock_group_responses.append({})
+    mock_api.mock_scene_responses.append(SCENE_RESPONSE)
+
+    with patch("aiohue.Bridge", return_value=mock_api), patch.object(
+        hass.config_entries, "async_forward_entry_setup"
+    ):
+        assert await hue_bridge.async_setup() is True
+
+    assert hue_bridge.api is mock_api
+
+    call = Mock()
+    call.data = {"group_name": "Group 1", "scene_name": "Cozy dinner"}
+    with patch("aiohue.Bridge", return_value=mock_api):
+        assert await hue_bridge.hue_activate_scene(call) is False
+
+
+async def test_hue_activate_scene_scene_not_found(hass, mock_api):
+    """Test failed hue_activate_scene due to missing scene."""
+    config_entry = config_entries.ConfigEntry(
+        1,
+        hue.DOMAIN,
+        "Mock Title",
+        {"host": "mock-host", "username": "mock-username"},
+        "test",
+        config_entries.CONN_CLASS_LOCAL_POLL,
+        system_options={},
+        options={CONF_ALLOW_HUE_GROUPS: True, CONF_ALLOW_UNREACHABLE: False},
+    )
+    hue_bridge = bridge.HueBridge(hass, config_entry)
+
+    mock_api.mock_group_responses.append(GROUP_RESPONSE)
+    mock_api.mock_scene_responses.append({})
+
+    with patch("aiohue.Bridge", return_value=mock_api), patch.object(
+        hass.config_entries, "async_forward_entry_setup"
+    ):
+        assert await hue_bridge.async_setup() is True
+
+    assert hue_bridge.api is mock_api
+
+    call = Mock()
+    call.data = {"group_name": "Group 1", "scene_name": "Cozy dinner"}
+    with patch("aiohue.Bridge", return_value=mock_api):
+        assert await hue_bridge.hue_activate_scene(call) is False
diff --git a/tests/components/hue/test_config_flow.py b/tests/components/hue/test_config_flow.py
index 21bb489ffe7..a551e623e63 100644
--- a/tests/components/hue/test_config_flow.py
+++ b/tests/components/hue/test_config_flow.py
@@ -92,6 +92,10 @@ async def test_manual_flow_works(hass, aioclient_mock):
     """Test config flow discovers only already configured bridges."""
     mock_bridge = get_mock_bridge()
 
+    MockConfigEntry(
+        domain="hue", source=config_entries.SOURCE_IGNORE, unique_id="bla"
+    ).add_to_hass(hass)
+
     with patch(
         "homeassistant.components.hue.config_flow.discover_nupnp",
         return_value=[mock_bridge],
@@ -137,7 +141,7 @@ async def test_manual_flow_works(hass, aioclient_mock):
         "username": "username-abc",
     }
     entries = hass.config_entries.async_entries("hue")
-    assert len(entries) == 1
+    assert len(entries) == 2
     entry = entries[-1]
     assert entry.unique_id == "id-1234"
 
diff --git a/tests/components/hue/test_init_multiple_bridges.py b/tests/components/hue/test_init_multiple_bridges.py
new file mode 100644
index 00000000000..32be7677398
--- /dev/null
+++ b/tests/components/hue/test_init_multiple_bridges.py
@@ -0,0 +1,185 @@
+"""Test Hue init with multiple bridges."""
+
+from aiohue.groups import Groups
+from aiohue.lights import Lights
+from aiohue.scenes import Scenes
+from aiohue.sensors import Sensors
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components import hue
+from homeassistant.components.hue import sensor_base as hue_sensor_base
+from homeassistant.setup import async_setup_component
+
+from tests.async_mock import Mock, patch
+
+
+async def setup_component(hass):
+    """Hue component."""
+    with patch.object(hue, "async_setup_entry", return_value=True):
+        assert (
+            await async_setup_component(
+                hass,
+                hue.DOMAIN,
+                {},
+            )
+            is True
+        )
+
+
+async def test_hue_activate_scene_both_responds(
+    hass, mock_bridge1, mock_bridge2, mock_config_entry1, mock_config_entry2
+):
+    """Test that makes both bridges successfully activate a scene."""
+
+    await setup_component(hass)
+
+    await setup_bridge(hass, mock_bridge1, mock_config_entry1)
+    await setup_bridge(hass, mock_bridge2, mock_config_entry2)
+
+    with patch.object(
+        mock_bridge1, "hue_activate_scene", return_value=None
+    ) as mock_hue_activate_scene1, patch.object(
+        mock_bridge2, "hue_activate_scene", return_value=None
+    ) as mock_hue_activate_scene2:
+        await hass.services.async_call(
+            "hue",
+            "hue_activate_scene",
+            {"group_name": "group_2", "scene_name": "my_scene"},
+            blocking=True,
+        )
+
+    mock_hue_activate_scene1.assert_called_once()
+    mock_hue_activate_scene2.assert_called_once()
+
+
+async def test_hue_activate_scene_one_responds(
+    hass, mock_bridge1, mock_bridge2, mock_config_entry1, mock_config_entry2
+):
+    """Test that makes only one bridge successfully activate a scene."""
+
+    await setup_component(hass)
+
+    await setup_bridge(hass, mock_bridge1, mock_config_entry1)
+    await setup_bridge(hass, mock_bridge2, mock_config_entry2)
+
+    with patch.object(
+        mock_bridge1, "hue_activate_scene", return_value=None
+    ) as mock_hue_activate_scene1, patch.object(
+        mock_bridge2, "hue_activate_scene", return_value=False
+    ) as mock_hue_activate_scene2:
+        await hass.services.async_call(
+            "hue",
+            "hue_activate_scene",
+            {"group_name": "group_2", "scene_name": "my_scene"},
+            blocking=True,
+        )
+
+    mock_hue_activate_scene1.assert_called_once()
+    mock_hue_activate_scene2.assert_called_once()
+
+
+async def test_hue_activate_scene_zero_responds(
+    hass, mock_bridge1, mock_bridge2, mock_config_entry1, mock_config_entry2
+):
+    """Test that makes no bridge successfully activate a scene."""
+
+    await setup_component(hass)
+
+    await setup_bridge(hass, mock_bridge1, mock_config_entry1)
+    await setup_bridge(hass, mock_bridge2, mock_config_entry2)
+
+    with patch.object(
+        mock_bridge1, "hue_activate_scene", return_value=False
+    ) as mock_hue_activate_scene1, patch.object(
+        mock_bridge2, "hue_activate_scene", return_value=False
+    ) as mock_hue_activate_scene2:
+        await hass.services.async_call(
+            "hue",
+            "hue_activate_scene",
+            {"group_name": "group_2", "scene_name": "my_scene"},
+            blocking=True,
+        )
+
+    # both were retried
+    assert mock_hue_activate_scene1.call_count == 2
+    assert mock_hue_activate_scene2.call_count == 2
+
+
+async def setup_bridge(hass, mock_bridge, config_entry):
+    """Load the Hue light platform with the provided bridge."""
+    mock_bridge.config_entry = config_entry
+    hass.data[hue.DOMAIN][config_entry.entry_id] = mock_bridge
+    await hass.config_entries.async_forward_entry_setup(config_entry, "light")
+    # To flush out the service call to update the group
+    await hass.async_block_till_done()
+
+
+@pytest.fixture
+def mock_config_entry1(hass):
+    """Mock a config entry."""
+    return create_config_entry()
+
+
+@pytest.fixture
+def mock_config_entry2(hass):
+    """Mock a config entry."""
+    return create_config_entry()
+
+
+def create_config_entry():
+    """Mock a config entry."""
+    return config_entries.ConfigEntry(
+        1,
+        hue.DOMAIN,
+        "Mock Title",
+        {"host": "mock-host"},
+        "test",
+        config_entries.CONN_CLASS_LOCAL_POLL,
+        system_options={},
+    )
+
+
+@pytest.fixture
+def mock_bridge1(hass):
+    """Mock a Hue bridge."""
+    return create_mock_bridge(hass)
+
+
+@pytest.fixture
+def mock_bridge2(hass):
+    """Mock a Hue bridge."""
+    return create_mock_bridge(hass)
+
+
+def create_mock_bridge(hass):
+    """Create a mock Hue bridge."""
+    bridge = Mock(
+        hass=hass,
+        available=True,
+        authorized=True,
+        allow_unreachable=False,
+        allow_groups=False,
+        api=Mock(),
+        reset_jobs=[],
+        spec=hue.HueBridge,
+    )
+    bridge.sensor_manager = hue_sensor_base.SensorManager(bridge)
+    bridge.mock_requests = []
+
+    async def mock_request(method, path, **kwargs):
+        kwargs["method"] = method
+        kwargs["path"] = path
+        bridge.mock_requests.append(kwargs)
+        return {}
+
+    async def async_request_call(task):
+        await task()
+
+    bridge.async_request_call = async_request_call
+    bridge.api.config.apiversion = "9.9.9"
+    bridge.api.lights = Lights({}, mock_request)
+    bridge.api.groups = Groups({}, mock_request)
+    bridge.api.sensors = Sensors({}, mock_request)
+    bridge.api.scenes = Scenes({}, mock_request)
+    return bridge
diff --git a/tests/components/hue/test_light.py b/tests/components/hue/test_light.py
index 630e74cb1af..2029c32c82f 100644
--- a/tests/components/hue/test_light.py
+++ b/tests/components/hue/test_light.py
@@ -1,6 +1,5 @@
 """Philips Hue lights platform tests."""
 import asyncio
-import logging
 
 import aiohue
 
@@ -11,8 +10,6 @@ from homeassistant.util import color
 
 from tests.async_mock import Mock
 
-_LOGGER = logging.getLogger(__name__)
-
 HUE_LIGHT_NS = "homeassistant.components.light.hue."
 GROUP_RESPONSE = {
     "1": {
diff --git a/tests/components/hue/test_sensor_base.py b/tests/components/hue/test_sensor_base.py
index e50ac71c03a..fcf3513bc7c 100644
--- a/tests/components/hue/test_sensor_base.py
+++ b/tests/components/hue/test_sensor_base.py
@@ -1,6 +1,5 @@
 """Philips Hue sensors platform tests."""
 import asyncio
-import logging
 
 import aiohue
 
@@ -10,8 +9,6 @@ from .conftest import create_mock_bridge, setup_bridge_for_sensors as setup_brid
 
 from tests.async_mock import Mock
 
-_LOGGER = logging.getLogger(__name__)
-
 PRESENCE_SENSOR_1_PRESENT = {
     "state": {"presence": True, "lastupdated": "2019-01-01T01:00:00"},
     "swupdate": {"state": "noupdates", "lastinstall": "2019-01-01T00:00:00"},
diff --git a/tests/components/hyperion/test_light.py b/tests/components/hyperion/test_light.py
index c400e34db51..8250cc6c9c2 100644
--- a/tests/components/hyperion/test_light.py
+++ b/tests/components/hyperion/test_light.py
@@ -1,6 +1,4 @@
 """Tests for the Hyperion integration."""
-# from tests.async_mock import AsyncMock, MagicMock, patch
-from asynctest import CoroutineMock, Mock, call, patch
 from hyperion import const
 
 from homeassistant.components.hyperion import light as hyperion_light
@@ -13,6 +11,8 @@ from homeassistant.components.light import (
 from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON
 from homeassistant.setup import async_setup_component
 
+from tests.async_mock import AsyncMock, Mock, call, patch
+
 TEST_HOST = "test-hyperion-host"
 TEST_PORT = const.DEFAULT_PORT
 TEST_NAME = "test_hyperion_name"
@@ -23,7 +23,7 @@ TEST_ENTITY_ID = f"{DOMAIN}.{TEST_NAME}"
 def create_mock_client():
     """Create a mock Hyperion client."""
     mock_client = Mock()
-    mock_client.async_client_connect = CoroutineMock(return_value=True)
+    mock_client.async_client_connect = AsyncMock(return_value=True)
     mock_client.adjustment = None
     mock_client.effects = None
     mock_client.id = "%s:%i" % (TEST_HOST, TEST_PORT)
@@ -65,7 +65,7 @@ async def test_setup_platform(hass):
 async def test_setup_platform_not_ready(hass):
     """Test the platform not being ready."""
     client = create_mock_client()
-    client.async_client_connect = CoroutineMock(return_value=False)
+    client.async_client_connect = AsyncMock(return_value=False)
 
     await setup_entity(hass, client=client)
     assert hass.states.get(TEST_ENTITY_ID) is None
@@ -97,7 +97,7 @@ async def test_light_async_turn_on(hass):
     await setup_entity(hass, client=client)
 
     # On (=), 100% (=), solid (=), [255,255,255] (=)
-    client.async_send_set_color = CoroutineMock(return_value=True)
+    client.async_send_set_color = AsyncMock(return_value=True)
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: TEST_ENTITY_ID}, blocking=True
     )
@@ -113,8 +113,8 @@ async def test_light_async_turn_on(hass):
     # On (=), 50% (!), solid (=), [255,255,255] (=)
     # ===
     brightness = 128
-    client.async_send_set_color = CoroutineMock(return_value=True)
-    client.async_send_set_adjustment = CoroutineMock(return_value=True)
+    client.async_send_set_color = AsyncMock(return_value=True)
+    client.async_send_set_adjustment = AsyncMock(return_value=True)
     await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
@@ -142,7 +142,7 @@ async def test_light_async_turn_on(hass):
 
     # On (=), 50% (=), solid (=), [0,255,255] (!)
     hs_color = (180.0, 100.0)
-    client.async_send_set_color = CoroutineMock(return_value=True)
+    client.async_send_set_color = AsyncMock(return_value=True)
     await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
@@ -171,8 +171,8 @@ async def test_light_async_turn_on(hass):
 
     # On (=), 100% (!), solid, [0,255,255] (=)
     brightness = 255
-    client.async_send_set_color = CoroutineMock(return_value=True)
-    client.async_send_set_adjustment = CoroutineMock(return_value=True)
+    client.async_send_set_color = AsyncMock(return_value=True)
+    client.async_send_set_adjustment = AsyncMock(return_value=True)
 
     await hass.services.async_call(
         DOMAIN,
@@ -198,8 +198,8 @@ async def test_light_async_turn_on(hass):
 
     # On (=), 100% (=), V4L (!), [0,255,255] (=)
     effect = const.KEY_COMPONENTID_EXTERNAL_SOURCES[2]  # V4L
-    client.async_send_clear = CoroutineMock(return_value=True)
-    client.async_send_set_component = CoroutineMock(return_value=True)
+    client.async_send_clear = AsyncMock(return_value=True)
+    client.async_send_set_component = AsyncMock(return_value=True)
     await hass.services.async_call(
         DOMAIN,
         SERVICE_TURN_ON,
@@ -244,8 +244,8 @@ async def test_light_async_turn_on(hass):
 
     # On (=), 100% (=), "Warm Blobs" (!), [0,255,255] (=)
     effect = "Warm Blobs"
-    client.async_send_clear = CoroutineMock(return_value=True)
-    client.async_send_set_effect = CoroutineMock(return_value=True)
+    client.async_send_clear = AsyncMock(return_value=True)
+    client.async_send_set_effect = AsyncMock(return_value=True)
 
     await hass.services.async_call(
         DOMAIN,
@@ -276,8 +276,8 @@ async def test_light_async_turn_on(hass):
     # No calls if disconnected.
     client.has_loaded_state = False
     call_registered_callback(client, "client-update", {"loaded-state": False})
-    client.async_send_clear = CoroutineMock(return_value=True)
-    client.async_send_set_effect = CoroutineMock(return_value=True)
+    client.async_send_clear = AsyncMock(return_value=True)
+    client.async_send_set_effect = AsyncMock(return_value=True)
 
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: TEST_ENTITY_ID}, blocking=True
@@ -292,7 +292,7 @@ async def test_light_async_turn_off(hass):
     client = create_mock_client()
     await setup_entity(hass, client=client)
 
-    client.async_send_set_component = CoroutineMock(return_value=True)
+    client.async_send_set_component = AsyncMock(return_value=True)
     await hass.services.async_call(
         DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: TEST_ENTITY_ID}, blocking=True
     )
@@ -308,7 +308,7 @@ async def test_light_async_turn_off(hass):
 
     # No calls if no state loaded.
     client.has_loaded_state = False
-    client.async_send_set_component = CoroutineMock(return_value=True)
+    client.async_send_set_component = AsyncMock(return_value=True)
     call_registered_callback(client, "client-update", {"loaded-state": False})
 
     await hass.services.async_call(
diff --git a/tests/components/iaqualink/test_config_flow.py b/tests/components/iaqualink/test_config_flow.py
index d2fa4633d80..38dd2ec1a3a 100644
--- a/tests/components/iaqualink/test_config_flow.py
+++ b/tests/components/iaqualink/test_config_flow.py
@@ -58,7 +58,7 @@ async def test_with_invalid_credentials(hass, step):
 
     assert result["type"] == "form"
     assert result["step_id"] == "user"
-    assert result["errors"] == {"base": "connection_failure"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 @pytest.mark.parametrize("step", ["import", "user"])
diff --git a/tests/components/icloud/test_config_flow.py b/tests/components/icloud/test_config_flow.py
index 3123ead4eeb..5ed46a6136f 100644
--- a/tests/components/icloud/test_config_flow.py
+++ b/tests/components/icloud/test_config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.components.icloud.const import (
     DEFAULT_WITH_FAMILY,
     DOMAIN,
 )
-from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
+from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH, SOURCE_USER
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers.typing import HomeAssistantType
 
@@ -26,10 +26,19 @@ from tests.common import MockConfigEntry
 USERNAME = "username@me.com"
 USERNAME_2 = "second_username@icloud.com"
 PASSWORD = "password"
+PASSWORD_2 = "second_password"
 WITH_FAMILY = True
 MAX_INTERVAL = 15
 GPS_ACCURACY_THRESHOLD = 250
 
+MOCK_CONFIG = {
+    CONF_USERNAME: USERNAME,
+    CONF_PASSWORD: PASSWORD,
+    CONF_WITH_FAMILY: DEFAULT_WITH_FAMILY,
+    CONF_MAX_INTERVAL: DEFAULT_MAX_INTERVAL,
+    CONF_GPS_ACCURACY_THRESHOLD: DEFAULT_GPS_ACCURACY_THRESHOLD,
+}
+
 TRUSTED_DEVICES = [
     {"deviceType": "SMS", "areaCode": "", "phoneNumber": "*******58", "deviceId": "1"}
 ]
@@ -275,7 +284,7 @@ async def test_login_failed(hass: HomeAssistantType):
             data={CONF_USERNAME: USERNAME, CONF_PASSWORD: PASSWORD},
         )
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-        assert result["errors"] == {CONF_USERNAME: "login"}
+        assert result["errors"] == {CONF_PASSWORD: "invalid_auth"}
 
 
 async def test_no_device(
@@ -397,3 +406,56 @@ async def test_validate_verification_code_failed(
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == CONF_TRUSTED_DEVICE
     assert result["errors"] == {"base": "validate_verification_code"}
+
+
+async def test_password_update(
+    hass: HomeAssistantType, service_authenticated: MagicMock
+):
+    """Test that password reauthentication works successfully."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN, data=MOCK_CONFIG, entry_id="test", unique_id=USERNAME
+    )
+    config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_REAUTH},
+        data={**MOCK_CONFIG, "unique_id": USERNAME},
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_PASSWORD: PASSWORD_2}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["reason"] == "reauth_successful"
+    assert config_entry.data[CONF_PASSWORD] == PASSWORD_2
+
+
+async def test_password_update_wrong_password(hass: HomeAssistantType):
+    """Test that during password reauthentication wrong password returns correct error."""
+    config_entry = MockConfigEntry(
+        domain=DOMAIN, data=MOCK_CONFIG, entry_id="test", unique_id=USERNAME
+    )
+    config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_REAUTH},
+        data={**MOCK_CONFIG, "unique_id": USERNAME},
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+
+    with patch(
+        "homeassistant.components.icloud.config_flow.PyiCloudService.authenticate",
+        side_effect=PyiCloudFailedLoginException(),
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], {CONF_PASSWORD: PASSWORD_2}
+        )
+
+        assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+        assert result["errors"] == {CONF_PASSWORD: "invalid_auth"}
diff --git a/tests/components/imap_email_content/test_sensor.py b/tests/components/imap_email_content/test_sensor.py
index 3a0c006d15f..241dc4dc506 100644
--- a/tests/components/imap_email_content/test_sensor.py
+++ b/tests/components/imap_email_content/test_sensor.py
@@ -4,14 +4,11 @@ import datetime
 import email
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-import unittest
 
 from homeassistant.components.imap_email_content import sensor as imap_email_content
-from homeassistant.helpers.event import track_state_change
+from homeassistant.helpers.event import async_track_state_change
 from homeassistant.helpers.template import Template
 
-from tests.common import get_test_home_assistant
-
 
 class FakeEMailReader:
     """A test class for sending test emails."""
@@ -31,207 +28,203 @@ class FakeEMailReader:
         return self._messages.popleft()
 
 
-class EmailContentSensor(unittest.TestCase):
-    """Test the IMAP email content sensor."""
+async def test_allowed_sender(hass):
+    """Test emails from allowed sender."""
+    test_message = email.message.Message()
+    test_message["From"] = "sender@test.com"
+    test_message["Subject"] = "Test"
+    test_message["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
+    test_message.set_payload("Test Message")
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
+    sensor = imap_email_content.EmailContentSensor(
+        hass,
+        FakeEMailReader(deque([test_message])),
+        "test_emails_sensor",
+        ["sender@test.com"],
+        None,
+    )
 
-    def test_allowed_sender(self):
-        """Test emails from allowed sender."""
-        test_message = email.message.Message()
-        test_message["From"] = "sender@test.com"
-        test_message["Subject"] = "Test"
-        test_message["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
-        test_message.set_payload("Test Message")
+    sensor.entity_id = "sensor.emailtest"
+    sensor.async_schedule_update_ha_state(True)
+    await hass.async_block_till_done()
+    assert "Test" == sensor.state
+    assert "Test Message" == sensor.device_state_attributes["body"]
+    assert "sender@test.com" == sensor.device_state_attributes["from"]
+    assert "Test" == sensor.device_state_attributes["subject"]
+    assert (
+        datetime.datetime(2016, 1, 1, 12, 44, 57)
+        == sensor.device_state_attributes["date"]
+    )
 
-        sensor = imap_email_content.EmailContentSensor(
-            self.hass,
-            FakeEMailReader(deque([test_message])),
-            "test_emails_sensor",
-            ["sender@test.com"],
-            None,
-        )
 
-        sensor.entity_id = "sensor.emailtest"
-        sensor.schedule_update_ha_state(True)
-        self.hass.block_till_done()
-        assert "Test" == sensor.state
-        assert "Test Message" == sensor.device_state_attributes["body"]
-        assert "sender@test.com" == sensor.device_state_attributes["from"]
-        assert "Test" == sensor.device_state_attributes["subject"]
-        assert (
-            datetime.datetime(2016, 1, 1, 12, 44, 57)
-            == sensor.device_state_attributes["date"]
-        )
+async def test_multi_part_with_text(hass):
+    """Test multi part emails."""
+    msg = MIMEMultipart("alternative")
+    msg["Subject"] = "Link"
+    msg["From"] = "sender@test.com"
 
-    def test_multi_part_with_text(self):
-        """Test multi part emails."""
-        msg = MIMEMultipart("alternative")
-        msg["Subject"] = "Link"
-        msg["From"] = "sender@test.com"
+    text = "Test Message"
+    html = "<html><head></head><body>Test Message</body></html>"
 
-        text = "Test Message"
-        html = "<html><head></head><body>Test Message</body></html>"
+    textPart = MIMEText(text, "plain")
+    htmlPart = MIMEText(html, "html")
 
-        textPart = MIMEText(text, "plain")
-        htmlPart = MIMEText(html, "html")
+    msg.attach(textPart)
+    msg.attach(htmlPart)
 
-        msg.attach(textPart)
-        msg.attach(htmlPart)
+    sensor = imap_email_content.EmailContentSensor(
+        hass,
+        FakeEMailReader(deque([msg])),
+        "test_emails_sensor",
+        ["sender@test.com"],
+        None,
+    )
 
-        sensor = imap_email_content.EmailContentSensor(
-            self.hass,
-            FakeEMailReader(deque([msg])),
-            "test_emails_sensor",
-            ["sender@test.com"],
-            None,
-        )
+    sensor.entity_id = "sensor.emailtest"
+    sensor.async_schedule_update_ha_state(True)
+    await hass.async_block_till_done()
+    assert "Link" == sensor.state
+    assert "Test Message" == sensor.device_state_attributes["body"]
 
-        sensor.entity_id = "sensor.emailtest"
-        sensor.schedule_update_ha_state(True)
-        self.hass.block_till_done()
-        assert "Link" == sensor.state
-        assert "Test Message" == sensor.device_state_attributes["body"]
 
-    def test_multi_part_only_html(self):
-        """Test multi part emails with only HTML."""
-        msg = MIMEMultipart("alternative")
-        msg["Subject"] = "Link"
-        msg["From"] = "sender@test.com"
+async def test_multi_part_only_html(hass):
+    """Test multi part emails with only HTML."""
+    msg = MIMEMultipart("alternative")
+    msg["Subject"] = "Link"
+    msg["From"] = "sender@test.com"
 
-        html = "<html><head></head><body>Test Message</body></html>"
+    html = "<html><head></head><body>Test Message</body></html>"
 
-        htmlPart = MIMEText(html, "html")
+    htmlPart = MIMEText(html, "html")
 
-        msg.attach(htmlPart)
+    msg.attach(htmlPart)
 
-        sensor = imap_email_content.EmailContentSensor(
-            self.hass,
-            FakeEMailReader(deque([msg])),
-            "test_emails_sensor",
-            ["sender@test.com"],
-            None,
-        )
+    sensor = imap_email_content.EmailContentSensor(
+        hass,
+        FakeEMailReader(deque([msg])),
+        "test_emails_sensor",
+        ["sender@test.com"],
+        None,
+    )
 
-        sensor.entity_id = "sensor.emailtest"
-        sensor.schedule_update_ha_state(True)
-        self.hass.block_till_done()
-        assert "Link" == sensor.state
-        assert (
-            "<html><head></head><body>Test Message</body></html>"
-            == sensor.device_state_attributes["body"]
-        )
+    sensor.entity_id = "sensor.emailtest"
+    sensor.async_schedule_update_ha_state(True)
+    await hass.async_block_till_done()
+    assert "Link" == sensor.state
+    assert (
+        "<html><head></head><body>Test Message</body></html>"
+        == sensor.device_state_attributes["body"]
+    )
 
-    def test_multi_part_only_other_text(self):
-        """Test multi part emails with only other text."""
-        msg = MIMEMultipart("alternative")
-        msg["Subject"] = "Link"
-        msg["From"] = "sender@test.com"
 
-        other = "Test Message"
+async def test_multi_part_only_other_text(hass):
+    """Test multi part emails with only other text."""
+    msg = MIMEMultipart("alternative")
+    msg["Subject"] = "Link"
+    msg["From"] = "sender@test.com"
 
-        htmlPart = MIMEText(other, "other")
+    other = "Test Message"
 
-        msg.attach(htmlPart)
+    htmlPart = MIMEText(other, "other")
 
-        sensor = imap_email_content.EmailContentSensor(
-            self.hass,
-            FakeEMailReader(deque([msg])),
-            "test_emails_sensor",
-            ["sender@test.com"],
-            None,
-        )
+    msg.attach(htmlPart)
 
-        sensor.entity_id = "sensor.emailtest"
-        sensor.schedule_update_ha_state(True)
-        self.hass.block_till_done()
-        assert "Link" == sensor.state
-        assert "Test Message" == sensor.device_state_attributes["body"]
+    sensor = imap_email_content.EmailContentSensor(
+        hass,
+        FakeEMailReader(deque([msg])),
+        "test_emails_sensor",
+        ["sender@test.com"],
+        None,
+    )
 
-    def test_multiple_emails(self):
-        """Test multiple emails."""
-        states = []
+    sensor.entity_id = "sensor.emailtest"
+    sensor.async_schedule_update_ha_state(True)
+    await hass.async_block_till_done()
+    assert "Link" == sensor.state
+    assert "Test Message" == sensor.device_state_attributes["body"]
 
-        test_message1 = email.message.Message()
-        test_message1["From"] = "sender@test.com"
-        test_message1["Subject"] = "Test"
-        test_message1["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
-        test_message1.set_payload("Test Message")
 
-        test_message2 = email.message.Message()
-        test_message2["From"] = "sender@test.com"
-        test_message2["Subject"] = "Test 2"
-        test_message2["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
-        test_message2.set_payload("Test Message 2")
+async def test_multiple_emails(hass):
+    """Test multiple emails."""
+    states = []
 
-        def state_changed_listener(entity_id, from_s, to_s):
-            states.append(to_s)
+    test_message1 = email.message.Message()
+    test_message1["From"] = "sender@test.com"
+    test_message1["Subject"] = "Test"
+    test_message1["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
+    test_message1.set_payload("Test Message")
 
-        track_state_change(self.hass, ["sensor.emailtest"], state_changed_listener)
+    test_message2 = email.message.Message()
+    test_message2["From"] = "sender@test.com"
+    test_message2["Subject"] = "Test 2"
+    test_message2["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
+    test_message2.set_payload("Test Message 2")
 
-        sensor = imap_email_content.EmailContentSensor(
-            self.hass,
-            FakeEMailReader(deque([test_message1, test_message2])),
-            "test_emails_sensor",
-            ["sender@test.com"],
-            None,
-        )
+    def state_changed_listener(entity_id, from_s, to_s):
+        states.append(to_s)
 
-        sensor.entity_id = "sensor.emailtest"
+    async_track_state_change(hass, ["sensor.emailtest"], state_changed_listener)
 
-        sensor.schedule_update_ha_state(True)
-        self.hass.block_till_done()
-        sensor.schedule_update_ha_state(True)
-        self.hass.block_till_done()
+    sensor = imap_email_content.EmailContentSensor(
+        hass,
+        FakeEMailReader(deque([test_message1, test_message2])),
+        "test_emails_sensor",
+        ["sender@test.com"],
+        None,
+    )
 
-        assert "Test" == states[0].state
-        assert "Test 2" == states[1].state
+    sensor.entity_id = "sensor.emailtest"
 
-        assert "Test Message 2" == sensor.device_state_attributes["body"]
+    sensor.async_schedule_update_ha_state(True)
+    await hass.async_block_till_done()
+    sensor.async_schedule_update_ha_state(True)
+    await hass.async_block_till_done()
 
-    def test_sender_not_allowed(self):
-        """Test not whitelisted emails."""
-        test_message = email.message.Message()
-        test_message["From"] = "sender@test.com"
-        test_message["Subject"] = "Test"
-        test_message["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
-        test_message.set_payload("Test Message")
+    assert "Test" == states[0].state
+    assert "Test 2" == states[1].state
 
-        sensor = imap_email_content.EmailContentSensor(
-            self.hass,
-            FakeEMailReader(deque([test_message])),
-            "test_emails_sensor",
-            ["other@test.com"],
-            None,
-        )
+    assert "Test Message 2" == sensor.device_state_attributes["body"]
 
-        sensor.entity_id = "sensor.emailtest"
-        sensor.schedule_update_ha_state(True)
-        self.hass.block_till_done()
-        assert sensor.state is None
 
-    def test_template(self):
-        """Test value template."""
-        test_message = email.message.Message()
-        test_message["From"] = "sender@test.com"
-        test_message["Subject"] = "Test"
-        test_message["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
-        test_message.set_payload("Test Message")
+async def test_sender_not_allowed(hass):
+    """Test not whitelisted emails."""
+    test_message = email.message.Message()
+    test_message["From"] = "sender@test.com"
+    test_message["Subject"] = "Test"
+    test_message["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
+    test_message.set_payload("Test Message")
 
-        sensor = imap_email_content.EmailContentSensor(
-            self.hass,
-            FakeEMailReader(deque([test_message])),
-            "test_emails_sensor",
-            ["sender@test.com"],
-            Template(
-                "{{ subject }} from {{ from }} with message {{ body }}", self.hass
-            ),
-        )
+    sensor = imap_email_content.EmailContentSensor(
+        hass,
+        FakeEMailReader(deque([test_message])),
+        "test_emails_sensor",
+        ["other@test.com"],
+        None,
+    )
 
-        sensor.entity_id = "sensor.emailtest"
-        sensor.schedule_update_ha_state(True)
-        self.hass.block_till_done()
-        assert "Test from sender@test.com with message Test Message" == sensor.state
+    sensor.entity_id = "sensor.emailtest"
+    sensor.async_schedule_update_ha_state(True)
+    await hass.async_block_till_done()
+    assert sensor.state is None
+
+
+async def test_template(hass):
+    """Test value template."""
+    test_message = email.message.Message()
+    test_message["From"] = "sender@test.com"
+    test_message["Subject"] = "Test"
+    test_message["Date"] = datetime.datetime(2016, 1, 1, 12, 44, 57)
+    test_message.set_payload("Test Message")
+
+    sensor = imap_email_content.EmailContentSensor(
+        hass,
+        FakeEMailReader(deque([test_message])),
+        "test_emails_sensor",
+        ["sender@test.com"],
+        Template("{{ subject }} from {{ from }} with message {{ body }}", hass),
+    )
+
+    sensor.entity_id = "sensor.emailtest"
+    sensor.async_schedule_update_ha_state(True)
+    await hass.async_block_till_done()
+    assert "Test from sender@test.com with message Test Message" == sensor.state
diff --git a/tests/components/influxdb/test_init.py b/tests/components/influxdb/test_init.py
index edb85e7b98d..da405e3975b 100644
--- a/tests/components/influxdb/test_init.py
+++ b/tests/components/influxdb/test_init.py
@@ -61,10 +61,17 @@ def mock_client_fixture(request):
 @pytest.fixture(name="get_mock_call")
 def get_mock_call_fixture(request):
     """Get version specific lambda to make write API call mock."""
+
+    def v2_call(body, precision):
+        data = {"bucket": DEFAULT_BUCKET, "record": body}
+
+        if precision is not None:
+            data["write_precision"] = precision
+
+        return call(**data)
+
     if request.param == influxdb.API_VERSION_2:
-        return lambda body, precision=None: call(
-            bucket=DEFAULT_BUCKET, record=body, write_precision=precision
-        )
+        return lambda body, precision=None: v2_call(body, precision)
     # pylint: disable=unnecessary-lambda
     return lambda body, precision=None: call(body, time_precision=precision)
 
@@ -1066,6 +1073,79 @@ async def test_event_listener_component_override_measurement(
         write_api.reset_mock()
 
 
+@pytest.mark.parametrize(
+    "mock_client, config_ext, get_write_api, get_mock_call",
+    [
+        (
+            influxdb.DEFAULT_API_VERSION,
+            BASE_V1_CONFIG,
+            _get_write_api_mock_v1,
+            influxdb.DEFAULT_API_VERSION,
+        ),
+        (
+            influxdb.API_VERSION_2,
+            BASE_V2_CONFIG,
+            _get_write_api_mock_v2,
+            influxdb.API_VERSION_2,
+        ),
+    ],
+    indirect=["mock_client", "get_mock_call"],
+)
+async def test_event_listener_component_measurement_attr(
+    hass, mock_client, config_ext, get_write_api, get_mock_call
+):
+    """Test the event listener with a different measurement_attr."""
+    config = {
+        "measurement_attr": "domain__device_class",
+        "component_config": {
+            "sensor.fake_humidity": {"override_measurement": "humidity"}
+        },
+        "component_config_glob": {
+            "binary_sensor.*motion": {"override_measurement": "motion"}
+        },
+        "component_config_domain": {"climate": {"override_measurement": "hvac"}},
+    }
+    config.update(config_ext)
+    handler_method = await _setup(hass, mock_client, config, get_write_api)
+
+    test_components = [
+        {
+            "domain": "sensor",
+            "id": "fake_temperature",
+            "attrs": {"device_class": "humidity"},
+            "res": "sensor__humidity",
+        },
+        {"domain": "sensor", "id": "fake_humidity", "attrs": {}, "res": "humidity"},
+        {"domain": "binary_sensor", "id": "fake_motion", "attrs": {}, "res": "motion"},
+        {"domain": "climate", "id": "fake_thermostat", "attrs": {}, "res": "hvac"},
+        {"domain": "other", "id": "just_fake", "attrs": {}, "res": "other"},
+    ]
+    for comp in test_components:
+        state = MagicMock(
+            state=1,
+            domain=comp["domain"],
+            entity_id=f"{comp['domain']}.{comp['id']}",
+            object_id=comp["id"],
+            attributes=comp["attrs"],
+        )
+        event = MagicMock(data={"new_state": state}, time_fired=12345)
+        body = [
+            {
+                "measurement": comp["res"],
+                "tags": {"domain": comp["domain"], "entity_id": comp["id"]},
+                "time": 12345,
+                "fields": {"value": 1},
+            }
+        ]
+        handler_method(event)
+        hass.data[influxdb.DOMAIN].block_till_done()
+
+        write_api = get_write_api(mock_client)
+        assert write_api.call_count == 1
+        assert write_api.call_args == get_mock_call(body)
+        write_api.reset_mock()
+
+
 @pytest.mark.parametrize(
     "mock_client, config_ext, get_write_api, get_mock_call",
     [
diff --git a/tests/components/insteon/mock_devices.py b/tests/components/insteon/mock_devices.py
index e57d06d210c..f2afd6083a3 100644
--- a/tests/components/insteon/mock_devices.py
+++ b/tests/components/insteon/mock_devices.py
@@ -1,6 +1,4 @@
 """Mock devices object to test Insteon."""
-import logging
-
 from pyinsteon.address import Address
 from pyinsteon.device_types import (
     GeneralController_MiniRemote_4,
@@ -10,8 +8,6 @@ from pyinsteon.device_types import (
 
 from tests.async_mock import AsyncMock, MagicMock
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class MockSwitchLinc(SwitchedLightingControl_SwitchLinc):
     """Mock SwitchLinc device."""
diff --git a/tests/components/insteon/test_init.py b/tests/components/insteon/test_init.py
index eed1ee76e8c..73620df6776 100644
--- a/tests/components/insteon/test_init.py
+++ b/tests/components/insteon/test_init.py
@@ -1,6 +1,5 @@
 """Test the init file for the Insteon component."""
 import asyncio
-import logging
 
 from pyinsteon.address import Address
 
@@ -44,8 +43,6 @@ from .mock_devices import MockDevices
 from tests.async_mock import patch
 from tests.common import MockConfigEntry
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def mock_successful_connection(*args, **kwargs):
     """Return a successful connection."""
diff --git a/tests/components/ipp/test_config_flow.py b/tests/components/ipp/test_config_flow.py
index 19ee2f73231..24ead324243 100644
--- a/tests/components/ipp/test_config_flow.py
+++ b/tests/components/ipp/test_config_flow.py
@@ -65,7 +65,7 @@ async def test_connection_error(
 
     assert result["step_id"] == "user"
     assert result["type"] == RESULT_TYPE_FORM
-    assert result["errors"] == {"base": "connection_error"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_zeroconf_connection_error(
@@ -82,7 +82,7 @@ async def test_zeroconf_connection_error(
     )
 
     assert result["type"] == RESULT_TYPE_ABORT
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
 
 
 async def test_zeroconf_confirm_connection_error(
@@ -97,7 +97,7 @@ async def test_zeroconf_confirm_connection_error(
     )
 
     assert result["type"] == RESULT_TYPE_ABORT
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
 
 
 async def test_user_connection_upgrade_required(
diff --git a/tests/components/islamic_prayer_times/test_config_flow.py b/tests/components/islamic_prayer_times/test_config_flow.py
index 4ffd6e4f25d..3b966c9e861 100644
--- a/tests/components/islamic_prayer_times/test_config_flow.py
+++ b/tests/components/islamic_prayer_times/test_config_flow.py
@@ -83,4 +83,4 @@ async def test_integration_already_configured(hass):
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "one_instance_allowed"
+    assert result["reason"] == "single_instance_allowed"
diff --git a/tests/components/kodi/test_device_trigger.py b/tests/components/kodi/test_device_trigger.py
index 5819f2128c8..de2d69212ef 100644
--- a/tests/components/kodi/test_device_trigger.py
+++ b/tests/components/kodi/test_device_trigger.py
@@ -112,6 +112,7 @@ async def test_if_fires_on_state_change(hass, calls, kodi_media_player):
             ]
         },
     )
+    await hass.async_block_till_done()
 
     await hass.services.async_call(
         MP_DOMAIN,
diff --git a/tests/components/litejet/test_trigger.py b/tests/components/litejet/test_trigger.py
index c001f417982..b8699785d5e 100644
--- a/tests/components/litejet/test_trigger.py
+++ b/tests/components/litejet/test_trigger.py
@@ -73,7 +73,7 @@ async def simulate_press(hass, mock_lj, number):
         return_value=mock_lj.start_time + mock_lj.last_delta,
     ):
         if callback is not None:
-            await hass.async_add_job(callback)
+            await hass.async_add_executor_job(callback)
         await hass.async_block_till_done()
 
 
@@ -86,7 +86,7 @@ async def simulate_release(hass, mock_lj, number):
         return_value=mock_lj.start_time + mock_lj.last_delta,
     ):
         if callback is not None:
-            await hass.async_add_job(callback)
+            await hass.async_add_executor_job(callback)
         await hass.async_block_till_done()
 
 
diff --git a/tests/components/logbook/test_init.py b/tests/components/logbook/test_init.py
index 96a5634d350..7c16faf2361 100644
--- a/tests/components/logbook/test_init.py
+++ b/tests/components/logbook/test_init.py
@@ -3,7 +3,6 @@
 import collections
 from datetime import datetime, timedelta
 import json
-import logging
 import unittest
 
 import pytest
@@ -42,8 +41,6 @@ from tests.async_mock import Mock, patch
 from tests.common import get_test_home_assistant, init_recorder_component, mock_platform
 from tests.components.recorder.common import trigger_db_commit
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class TestComponentLogbook(unittest.TestCase):
     """Test the History component."""
@@ -1599,7 +1596,7 @@ async def test_empty_config(hass, hass_client):
     )
     await hass.async_add_executor_job(init_recorder_component, hass)
     await async_setup_component(hass, "logbook", config)
-    await hass.async_add_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
+    await hass.async_add_executor_job(hass.data[recorder.DATA_INSTANCE].block_till_done)
 
     hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
     hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
diff --git a/tests/components/logentries/test_init.py b/tests/components/logentries/test_init.py
index 2d7b7ee6c25..22cbfb41c76 100644
--- a/tests/components/logentries/test_init.py
+++ b/tests/components/logentries/test_init.py
@@ -1,82 +1,74 @@
 """The tests for the Logentries component."""
 
-import unittest
-from unittest import mock
+import pytest
 
 import homeassistant.components.logentries as logentries
 from homeassistant.const import EVENT_STATE_CHANGED, STATE_OFF, STATE_ON
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
-from tests.common import get_test_home_assistant
+from tests.async_mock import MagicMock, call, patch
 
 
-class TestLogentries(unittest.TestCase):
-    """Test the Logentries component."""
+async def test_setup_config_full(hass):
+    """Test setup with all data."""
+    config = {"logentries": {"token": "secret"}}
+    hass.bus.listen = MagicMock()
+    assert await async_setup_component(hass, logentries.DOMAIN, config)
+    assert hass.bus.listen.called
+    assert EVENT_STATE_CHANGED == hass.bus.listen.call_args_list[0][0][0]
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.tear_down_cleanup)
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+async def test_setup_config_defaults(hass):
+    """Test setup with defaults."""
+    config = {"logentries": {"token": "token"}}
+    hass.bus.listen = MagicMock()
+    assert await async_setup_component(hass, logentries.DOMAIN, config)
+    assert hass.bus.listen.called
+    assert EVENT_STATE_CHANGED == hass.bus.listen.call_args_list[0][0][0]
 
-    def test_setup_config_full(self):
-        """Test setup with all data."""
-        config = {"logentries": {"token": "secret"}}
-        self.hass.bus.listen = mock.MagicMock()
-        assert setup_component(self.hass, logentries.DOMAIN, config)
-        assert self.hass.bus.listen.called
-        assert EVENT_STATE_CHANGED == self.hass.bus.listen.call_args_list[0][0][0]
 
-    def test_setup_config_defaults(self):
-        """Test setup with defaults."""
-        config = {"logentries": {"token": "token"}}
-        self.hass.bus.listen = mock.MagicMock()
-        assert setup_component(self.hass, logentries.DOMAIN, config)
-        assert self.hass.bus.listen.called
-        assert EVENT_STATE_CHANGED == self.hass.bus.listen.call_args_list[0][0][0]
+@pytest.fixture
+def mock_dump():
+    """Mock json dumps."""
+    with patch("json.dumps") as mock_dump:
+        yield mock_dump
 
-    def _setup(self, mock_requests):
-        """Test the setup."""
-        self.mock_post = mock_requests.post
-        self.mock_request_exception = Exception
-        mock_requests.exceptions.RequestException = self.mock_request_exception
-        config = {"logentries": {"token": "token"}}
-        self.hass.bus.listen = mock.MagicMock()
-        setup_component(self.hass, logentries.DOMAIN, config)
-        self.handler_method = self.hass.bus.listen.call_args_list[0][0][1]
 
-    @mock.patch.object(logentries, "requests")
-    @mock.patch("json.dumps")
-    def test_event_listener(self, mock_dump, mock_requests):
-        """Test event listener."""
-        mock_dump.side_effect = lambda x: x
-        self._setup(mock_requests)
+@pytest.fixture
+def mock_requests():
+    """Mock requests."""
+    with patch.object(logentries, "requests") as mock_requests:
+        yield mock_requests
 
-        valid = {"1": 1, "1.0": 1.0, STATE_ON: 1, STATE_OFF: 0, "foo": "foo"}
-        for in_, out in valid.items():
-            state = mock.MagicMock(
-                state=in_, domain="fake", object_id="entity", attributes={}
-            )
-            event = mock.MagicMock(data={"new_state": state}, time_fired=12345)
-            body = [
-                {
-                    "domain": "fake",
-                    "entity_id": "entity",
-                    "attributes": {},
-                    "time": "12345",
-                    "value": out,
-                }
-            ]
-            payload = {
-                "host": "https://webhook.logentries.com/noformat/logs/token",
-                "event": body,
+
+async def test_event_listener(hass, mock_dump, mock_requests):
+    """Test event listener."""
+    mock_dump.side_effect = lambda x: x
+    mock_post = mock_requests.post
+    mock_requests.exceptions.RequestException = Exception
+    config = {"logentries": {"token": "token"}}
+    hass.bus.listen = MagicMock()
+    assert await async_setup_component(hass, logentries.DOMAIN, config)
+    handler_method = hass.bus.listen.call_args_list[0][0][1]
+
+    valid = {"1": 1, "1.0": 1.0, STATE_ON: 1, STATE_OFF: 0, "foo": "foo"}
+    for in_, out in valid.items():
+        state = MagicMock(state=in_, domain="fake", object_id="entity", attributes={})
+        event = MagicMock(data={"new_state": state}, time_fired=12345)
+        body = [
+            {
+                "domain": "fake",
+                "entity_id": "entity",
+                "attributes": {},
+                "time": "12345",
+                "value": out,
             }
-            self.handler_method(event)
-            assert self.mock_post.call_count == 1
-            assert self.mock_post.call_args == mock.call(
-                payload["host"], data=payload, timeout=10
-            )
-            self.mock_post.reset_mock()
+        ]
+        payload = {
+            "host": "https://webhook.logentries.com/noformat/logs/token",
+            "event": body,
+        }
+        handler_method(event)
+        assert mock_post.call_count == 1
+        assert mock_post.call_args == call(payload["host"], data=payload, timeout=10)
+        mock_post.reset_mock()
diff --git a/tests/components/logi_circle/test_config_flow.py b/tests/components/logi_circle/test_config_flow.py
index 43dea15f7e6..c743cce7519 100644
--- a/tests/components/logi_circle/test_config_flow.py
+++ b/tests/components/logi_circle/test_config_flow.py
@@ -116,7 +116,7 @@ async def test_abort_if_no_implementation_registered(hass):
 
     result = await flow.async_step_user()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "no_flows"
+    assert result["reason"] == "missing_configuration"
 
 
 async def test_abort_if_already_setup(hass):
@@ -126,17 +126,17 @@ async def test_abort_if_already_setup(hass):
     with patch.object(hass.config_entries, "async_entries", return_value=[{}]):
         result = await flow.async_step_user()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "already_configured"
 
     with patch.object(hass.config_entries, "async_entries", return_value=[{}]):
         result = await flow.async_step_import()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "already_configured"
 
     with patch.object(hass.config_entries, "async_entries", return_value=[{}]):
         result = await flow.async_step_code()
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "already_configured"
 
     with patch.object(hass.config_entries, "async_entries", return_value=[{}]):
         result = await flow.async_step_auth()
@@ -146,7 +146,10 @@ async def test_abort_if_already_setup(hass):
 
 @pytest.mark.parametrize(
     "side_effect,error",
-    [(asyncio.TimeoutError, "auth_timeout"), (AuthorizationFailed, "auth_error")],
+    [
+        (asyncio.TimeoutError, "authorize_url_timeout"),
+        (AuthorizationFailed, "invalid_auth"),
+    ],
 )
 async def test_abort_if_authorize_fails(
     hass, mock_logi_circle, side_effect, error
diff --git a/tests/components/met/test_config_flow.py b/tests/components/met/test_config_flow.py
index 4d820c1c7c6..52959428917 100644
--- a/tests/components/met/test_config_flow.py
+++ b/tests/components/met/test_config_flow.py
@@ -91,7 +91,7 @@ async def test_flow_entry_already_exists(hass):
     )
 
     assert result["type"] == "form"
-    assert result["errors"]["name"] == "name_exists"
+    assert result["errors"]["name"] == "already_configured"
 
 
 async def test_onboarding_step(hass):
diff --git a/tests/components/mhz19/test_sensor.py b/tests/components/mhz19/test_sensor.py
index 05d462f02a0..6305f86cedc 100644
--- a/tests/components/mhz19/test_sensor.py
+++ b/tests/components/mhz19/test_sensor.py
@@ -1,5 +1,6 @@
 """Tests for MH-Z19 sensor."""
-import unittest
+from pmsensor import co2sensor
+from pmsensor.co2sensor import read_mh_z19_with_temperature
 
 import homeassistant.components.mhz19.sensor as mhz19
 from homeassistant.components.sensor import DOMAIN
@@ -8,130 +9,113 @@ from homeassistant.const import (
     TEMP_CELSIUS,
     TEMP_FAHRENHEIT,
 )
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import DEFAULT, Mock, patch
-from tests.common import assert_setup_component, get_test_home_assistant
+from tests.common import assert_setup_component
 
 
-class TestMHZ19Sensor(unittest.TestCase):
-    """Test the MH-Z19 sensor."""
-
-    hass = None
-
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_setup_missing_config(self):
-        """Test setup with configuration missing required entries."""
-        with assert_setup_component(0):
-            assert setup_component(self.hass, DOMAIN, {"sensor": {"platform": "mhz19"}})
-
-    @patch("pmsensor.co2sensor.read_mh_z19", side_effect=OSError("test error"))
-    def test_setup_failed_connect(self, mock_co2):
-        """Test setup when connection error occurs."""
-        assert not mhz19.setup_platform(
-            self.hass,
-            {"platform": "mhz19", mhz19.CONF_SERIAL_DEVICE: "test.serial"},
-            None,
+async def test_setup_missing_config(hass):
+    """Test setup with configuration missing required entries."""
+    with assert_setup_component(0):
+        assert await async_setup_component(
+            hass, DOMAIN, {"sensor": {"platform": "mhz19"}}
         )
 
-    def test_setup_connected(self):
-        """Test setup when connection succeeds."""
-        with patch.multiple(
-            "pmsensor.co2sensor",
-            read_mh_z19=DEFAULT,
-            read_mh_z19_with_temperature=DEFAULT,
-        ):
-            from pmsensor.co2sensor import read_mh_z19_with_temperature
 
-            read_mh_z19_with_temperature.return_value = None
-            mock_add = Mock()
-            assert mhz19.setup_platform(
-                self.hass,
-                {
-                    "platform": "mhz19",
-                    "monitored_conditions": ["co2", "temperature"],
-                    mhz19.CONF_SERIAL_DEVICE: "test.serial",
-                },
-                mock_add,
-            )
-        assert mock_add.call_count == 1
-
-    @patch(
-        "pmsensor.co2sensor.read_mh_z19_with_temperature",
-        side_effect=OSError("test error"),
+@patch("pmsensor.co2sensor.read_mh_z19", side_effect=OSError("test error"))
+async def test_setup_failed_connect(mock_co2, hass):
+    """Test setup when connection error occurs."""
+    assert not mhz19.setup_platform(
+        hass,
+        {"platform": "mhz19", mhz19.CONF_SERIAL_DEVICE: "test.serial"},
+        None,
     )
-    def aiohttp_client_update_oserror(self, mock_function):
-        """Test MHZClient when library throws OSError."""
-        from pmsensor import co2sensor
 
-        client = mhz19.MHZClient(co2sensor, "test.serial")
-        client.update()
-        assert {} == client.data
 
-    @patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(5001, 24))
-    def aiohttp_client_update_ppm_overflow(self, mock_function):
-        """Test MHZClient when ppm is too high."""
-        from pmsensor import co2sensor
-
-        client = mhz19.MHZClient(co2sensor, "test.serial")
-        client.update()
-        assert client.data.get("co2") is None
-
-    @patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(1000, 24))
-    def aiohttp_client_update_good_read(self, mock_function):
-        """Test MHZClient when ppm is too high."""
-        from pmsensor import co2sensor
-
-        client = mhz19.MHZClient(co2sensor, "test.serial")
-        client.update()
-        assert {"temperature": 24, "co2": 1000} == client.data
-
-    @patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(1000, 24))
-    def test_co2_sensor(self, mock_function):
-        """Test CO2 sensor."""
-        from pmsensor import co2sensor
-
-        client = mhz19.MHZClient(co2sensor, "test.serial")
-        sensor = mhz19.MHZ19Sensor(client, mhz19.SENSOR_CO2, None, "name")
-        sensor.update()
-
-        assert sensor.name == "name: CO2"
-        assert sensor.state == 1000
-        assert sensor.unit_of_measurement == CONCENTRATION_PARTS_PER_MILLION
-        assert sensor.should_poll
-        assert sensor.device_state_attributes == {"temperature": 24}
-
-    @patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(1000, 24))
-    def test_temperature_sensor(self, mock_function):
-        """Test temperature sensor."""
-        from pmsensor import co2sensor
-
-        client = mhz19.MHZClient(co2sensor, "test.serial")
-        sensor = mhz19.MHZ19Sensor(client, mhz19.SENSOR_TEMPERATURE, None, "name")
-        sensor.update()
-
-        assert sensor.name == "name: Temperature"
-        assert sensor.state == 24
-        assert sensor.unit_of_measurement == TEMP_CELSIUS
-        assert sensor.should_poll
-        assert sensor.device_state_attributes == {"co2_concentration": 1000}
-
-    @patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(1000, 24))
-    def test_temperature_sensor_f(self, mock_function):
-        """Test temperature sensor."""
-        from pmsensor import co2sensor
-
-        client = mhz19.MHZClient(co2sensor, "test.serial")
-        sensor = mhz19.MHZ19Sensor(
-            client, mhz19.SENSOR_TEMPERATURE, TEMP_FAHRENHEIT, "name"
+async def test_setup_connected(hass):
+    """Test setup when connection succeeds."""
+    with patch.multiple(
+        "pmsensor.co2sensor",
+        read_mh_z19=DEFAULT,
+        read_mh_z19_with_temperature=DEFAULT,
+    ):
+        read_mh_z19_with_temperature.return_value = None
+        mock_add = Mock()
+        assert mhz19.setup_platform(
+            hass,
+            {
+                "platform": "mhz19",
+                "monitored_conditions": ["co2", "temperature"],
+                mhz19.CONF_SERIAL_DEVICE: "test.serial",
+            },
+            mock_add,
         )
-        sensor.update()
+    assert mock_add.call_count == 1
 
-        assert sensor.state == 75.2
+
+@patch(
+    "pmsensor.co2sensor.read_mh_z19_with_temperature",
+    side_effect=OSError("test error"),
+)
+async def aiohttp_client_update_oserror(mock_function):
+    """Test MHZClient when library throws OSError."""
+    client = mhz19.MHZClient(co2sensor, "test.serial")
+    client.update()
+    assert {} == client.data
+
+
+@patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(5001, 24))
+async def aiohttp_client_update_ppm_overflow(mock_function):
+    """Test MHZClient when ppm is too high."""
+    client = mhz19.MHZClient(co2sensor, "test.serial")
+    client.update()
+    assert client.data.get("co2") is None
+
+
+@patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(1000, 24))
+async def aiohttp_client_update_good_read(mock_function):
+    """Test MHZClient when ppm is too high."""
+    client = mhz19.MHZClient(co2sensor, "test.serial")
+    client.update()
+    assert {"temperature": 24, "co2": 1000} == client.data
+
+
+@patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(1000, 24))
+async def test_co2_sensor(mock_function):
+    """Test CO2 sensor."""
+    client = mhz19.MHZClient(co2sensor, "test.serial")
+    sensor = mhz19.MHZ19Sensor(client, mhz19.SENSOR_CO2, None, "name")
+    sensor.update()
+
+    assert sensor.name == "name: CO2"
+    assert sensor.state == 1000
+    assert sensor.unit_of_measurement == CONCENTRATION_PARTS_PER_MILLION
+    assert sensor.should_poll
+    assert sensor.device_state_attributes == {"temperature": 24}
+
+
+@patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(1000, 24))
+async def test_temperature_sensor(mock_function):
+    """Test temperature sensor."""
+    client = mhz19.MHZClient(co2sensor, "test.serial")
+    sensor = mhz19.MHZ19Sensor(client, mhz19.SENSOR_TEMPERATURE, None, "name")
+    sensor.update()
+
+    assert sensor.name == "name: Temperature"
+    assert sensor.state == 24
+    assert sensor.unit_of_measurement == TEMP_CELSIUS
+    assert sensor.should_poll
+    assert sensor.device_state_attributes == {"co2_concentration": 1000}
+
+
+@patch("pmsensor.co2sensor.read_mh_z19_with_temperature", return_value=(1000, 24))
+async def test_temperature_sensor_f(mock_function):
+    """Test temperature sensor."""
+    client = mhz19.MHZClient(co2sensor, "test.serial")
+    sensor = mhz19.MHZ19Sensor(
+        client, mhz19.SENSOR_TEMPERATURE, TEMP_FAHRENHEIT, "name"
+    )
+    sensor.update()
+
+    assert sensor.state == 75.2
diff --git a/tests/components/mikrotik/test_config_flow.py b/tests/components/mikrotik/test_config_flow.py
index b47bb941af4..ad3a27d724a 100644
--- a/tests/components/mikrotik/test_config_flow.py
+++ b/tests/components/mikrotik/test_config_flow.py
@@ -203,6 +203,6 @@ async def test_wrong_credentials(hass, auth_error):
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["errors"] == {
-        CONF_USERNAME: "wrong_credentials",
-        CONF_PASSWORD: "wrong_credentials",
+        CONF_USERNAME: "invalid_auth",
+        CONF_PASSWORD: "invalid_auth",
     }
diff --git a/tests/components/mill/test_config_flow.py b/tests/components/mill/test_config_flow.py
index 0bd059a1786..ff95af44ff5 100644
--- a/tests/components/mill/test_config_flow.py
+++ b/tests/components/mill/test_config_flow.py
@@ -87,4 +87,4 @@ async def test_connection_error(hass):
         )
 
     assert result["type"] == "form"
-    assert result["errors"]["connection_error"] == "connection_error"
+    assert result["errors"]["cannot_connect"] == "cannot_connect"
diff --git a/tests/components/min_max/test_sensor.py b/tests/components/min_max/test_sensor.py
index 66de0d47b53..0d3a2e8fdcd 100644
--- a/tests/components/min_max/test_sensor.py
+++ b/tests/components/min_max/test_sensor.py
@@ -1,7 +1,6 @@
 """The test for the min/max sensor platform."""
 from os import path
 import statistics
-import unittest
 
 from homeassistant import config as hass_config
 from homeassistant.components.min_max import DOMAIN
@@ -14,329 +13,334 @@ from homeassistant.const import (
     TEMP_CELSIUS,
     TEMP_FAHRENHEIT,
 )
-from homeassistant.setup import async_setup_component, setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
+
+VALUES = [17, 20, 15.3]
+COUNT = len(VALUES)
+MIN_VALUE = min(VALUES)
+MAX_VALUE = max(VALUES)
+MEAN = round(sum(VALUES) / COUNT, 2)
+MEAN_1_DIGIT = round(sum(VALUES) / COUNT, 1)
+MEAN_4_DIGITS = round(sum(VALUES) / COUNT, 4)
+MEDIAN = round(statistics.median(VALUES), 2)
 
 
-class TestMinMaxSensor(unittest.TestCase):
-    """Test the min/max sensor."""
-
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.values = [17, 20, 15.3]
-        self.count = len(self.values)
-        self.min = min(self.values)
-        self.max = max(self.values)
-        self.mean = round(sum(self.values) / self.count, 2)
-        self.mean_1_digit = round(sum(self.values) / self.count, 1)
-        self.mean_4_digits = round(sum(self.values) / self.count, 4)
-        self.median = round(statistics.median(self.values), 2)
-
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_min_sensor(self):
-        """Test the min sensor."""
-        config = {
-            "sensor": {
-                "platform": "min_max",
-                "name": "test_min",
-                "type": "min",
-                "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            }
+async def test_min_sensor(hass):
+    """Test the min sensor."""
+    config = {
+        "sensor": {
+            "platform": "min_max",
+            "name": "test_min",
+            "type": "min",
+            "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        entity_ids = config["sensor"]["entity_ids"]
+    entity_ids = config["sensor"]["entity_ids"]
 
-        for entity_id, value in dict(zip(entity_ids, self.values)).items():
-            self.hass.states.set(entity_id, value)
-            self.hass.block_till_done()
+    for entity_id, value in dict(zip(entity_ids, VALUES)).items():
+        hass.states.async_set(entity_id, value)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_min")
+    state = hass.states.get("sensor.test_min")
 
-        assert str(float(self.min)) == state.state
-        assert entity_ids[2] == state.attributes.get("min_entity_id")
-        assert self.max == state.attributes.get("max_value")
-        assert entity_ids[1] == state.attributes.get("max_entity_id")
-        assert self.mean == state.attributes.get("mean")
-        assert self.median == state.attributes.get("median")
+    assert str(float(MIN_VALUE)) == state.state
+    assert entity_ids[2] == state.attributes.get("min_entity_id")
+    assert MAX_VALUE == state.attributes.get("max_value")
+    assert entity_ids[1] == state.attributes.get("max_entity_id")
+    assert MEAN == state.attributes.get("mean")
+    assert MEDIAN == state.attributes.get("median")
 
-    def test_max_sensor(self):
-        """Test the max sensor."""
-        config = {
-            "sensor": {
-                "platform": "min_max",
-                "name": "test_max",
-                "type": "max",
-                "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            }
+
+async def test_max_sensor(hass):
+    """Test the max sensor."""
+    config = {
+        "sensor": {
+            "platform": "min_max",
+            "name": "test_max",
+            "type": "max",
+            "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        entity_ids = config["sensor"]["entity_ids"]
+    entity_ids = config["sensor"]["entity_ids"]
 
-        for entity_id, value in dict(zip(entity_ids, self.values)).items():
-            self.hass.states.set(entity_id, value)
-            self.hass.block_till_done()
+    for entity_id, value in dict(zip(entity_ids, VALUES)).items():
+        hass.states.async_set(entity_id, value)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_max")
+    state = hass.states.get("sensor.test_max")
 
-        assert str(float(self.max)) == state.state
-        assert entity_ids[2] == state.attributes.get("min_entity_id")
-        assert self.min == state.attributes.get("min_value")
-        assert entity_ids[1] == state.attributes.get("max_entity_id")
-        assert self.mean == state.attributes.get("mean")
-        assert self.median == state.attributes.get("median")
+    assert str(float(MAX_VALUE)) == state.state
+    assert entity_ids[2] == state.attributes.get("min_entity_id")
+    assert MIN_VALUE == state.attributes.get("min_value")
+    assert entity_ids[1] == state.attributes.get("max_entity_id")
+    assert MEAN == state.attributes.get("mean")
+    assert MEDIAN == state.attributes.get("median")
 
-    def test_mean_sensor(self):
-        """Test the mean sensor."""
-        config = {
-            "sensor": {
-                "platform": "min_max",
-                "name": "test_mean",
-                "type": "mean",
-                "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            }
+
+async def test_mean_sensor(hass):
+    """Test the mean sensor."""
+    config = {
+        "sensor": {
+            "platform": "min_max",
+            "name": "test_mean",
+            "type": "mean",
+            "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        entity_ids = config["sensor"]["entity_ids"]
+    entity_ids = config["sensor"]["entity_ids"]
 
-        for entity_id, value in dict(zip(entity_ids, self.values)).items():
-            self.hass.states.set(entity_id, value)
-            self.hass.block_till_done()
+    for entity_id, value in dict(zip(entity_ids, VALUES)).items():
+        hass.states.async_set(entity_id, value)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_mean")
+    state = hass.states.get("sensor.test_mean")
 
-        assert str(float(self.mean)) == state.state
-        assert self.min == state.attributes.get("min_value")
-        assert entity_ids[2] == state.attributes.get("min_entity_id")
-        assert self.max == state.attributes.get("max_value")
-        assert entity_ids[1] == state.attributes.get("max_entity_id")
-        assert self.median == state.attributes.get("median")
+    assert str(float(MEAN)) == state.state
+    assert MIN_VALUE == state.attributes.get("min_value")
+    assert entity_ids[2] == state.attributes.get("min_entity_id")
+    assert MAX_VALUE == state.attributes.get("max_value")
+    assert entity_ids[1] == state.attributes.get("max_entity_id")
+    assert MEDIAN == state.attributes.get("median")
 
-    def test_mean_1_digit_sensor(self):
-        """Test the mean with 1-digit precision sensor."""
-        config = {
-            "sensor": {
-                "platform": "min_max",
-                "name": "test_mean",
-                "type": "mean",
-                "round_digits": 1,
-                "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            }
+
+async def test_mean_1_digit_sensor(hass):
+    """Test the mean with 1-digit precision sensor."""
+    config = {
+        "sensor": {
+            "platform": "min_max",
+            "name": "test_mean",
+            "type": "mean",
+            "round_digits": 1,
+            "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        entity_ids = config["sensor"]["entity_ids"]
+    entity_ids = config["sensor"]["entity_ids"]
 
-        for entity_id, value in dict(zip(entity_ids, self.values)).items():
-            self.hass.states.set(entity_id, value)
-            self.hass.block_till_done()
+    for entity_id, value in dict(zip(entity_ids, VALUES)).items():
+        hass.states.async_set(entity_id, value)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_mean")
+    state = hass.states.get("sensor.test_mean")
 
-        assert str(float(self.mean_1_digit)) == state.state
-        assert self.min == state.attributes.get("min_value")
-        assert entity_ids[2] == state.attributes.get("min_entity_id")
-        assert self.max == state.attributes.get("max_value")
-        assert entity_ids[1] == state.attributes.get("max_entity_id")
-        assert self.median == state.attributes.get("median")
+    assert str(float(MEAN_1_DIGIT)) == state.state
+    assert MIN_VALUE == state.attributes.get("min_value")
+    assert entity_ids[2] == state.attributes.get("min_entity_id")
+    assert MAX_VALUE == state.attributes.get("max_value")
+    assert entity_ids[1] == state.attributes.get("max_entity_id")
+    assert MEDIAN == state.attributes.get("median")
 
-    def test_mean_4_digit_sensor(self):
-        """Test the mean with 1-digit precision sensor."""
-        config = {
-            "sensor": {
-                "platform": "min_max",
-                "name": "test_mean",
-                "type": "mean",
-                "round_digits": 4,
-                "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            }
+
+async def test_mean_4_digit_sensor(hass):
+    """Test the mean with 1-digit precision sensor."""
+    config = {
+        "sensor": {
+            "platform": "min_max",
+            "name": "test_mean",
+            "type": "mean",
+            "round_digits": 4,
+            "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        entity_ids = config["sensor"]["entity_ids"]
+    entity_ids = config["sensor"]["entity_ids"]
 
-        for entity_id, value in dict(zip(entity_ids, self.values)).items():
-            self.hass.states.set(entity_id, value)
-            self.hass.block_till_done()
+    for entity_id, value in dict(zip(entity_ids, VALUES)).items():
+        hass.states.async_set(entity_id, value)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_mean")
+    state = hass.states.get("sensor.test_mean")
 
-        assert str(float(self.mean_4_digits)) == state.state
-        assert self.min == state.attributes.get("min_value")
-        assert entity_ids[2] == state.attributes.get("min_entity_id")
-        assert self.max == state.attributes.get("max_value")
-        assert entity_ids[1] == state.attributes.get("max_entity_id")
-        assert self.median == state.attributes.get("median")
+    assert str(float(MEAN_4_DIGITS)) == state.state
+    assert MIN_VALUE == state.attributes.get("min_value")
+    assert entity_ids[2] == state.attributes.get("min_entity_id")
+    assert MAX_VALUE == state.attributes.get("max_value")
+    assert entity_ids[1] == state.attributes.get("max_entity_id")
+    assert MEDIAN == state.attributes.get("median")
 
-    def test_median_sensor(self):
-        """Test the median sensor."""
-        config = {
-            "sensor": {
-                "platform": "min_max",
-                "name": "test_median",
-                "type": "median",
-                "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            }
+
+async def test_median_sensor(hass):
+    """Test the median sensor."""
+    config = {
+        "sensor": {
+            "platform": "min_max",
+            "name": "test_median",
+            "type": "median",
+            "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        entity_ids = config["sensor"]["entity_ids"]
+    entity_ids = config["sensor"]["entity_ids"]
 
-        for entity_id, value in dict(zip(entity_ids, self.values)).items():
-            self.hass.states.set(entity_id, value)
-            self.hass.block_till_done()
+    for entity_id, value in dict(zip(entity_ids, VALUES)).items():
+        hass.states.async_set(entity_id, value)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_median")
+    state = hass.states.get("sensor.test_median")
 
-        assert str(float(self.median)) == state.state
-        assert self.min == state.attributes.get("min_value")
-        assert entity_ids[2] == state.attributes.get("min_entity_id")
-        assert self.max == state.attributes.get("max_value")
-        assert entity_ids[1] == state.attributes.get("max_entity_id")
-        assert self.mean == state.attributes.get("mean")
+    assert str(float(MEDIAN)) == state.state
+    assert MIN_VALUE == state.attributes.get("min_value")
+    assert entity_ids[2] == state.attributes.get("min_entity_id")
+    assert MAX_VALUE == state.attributes.get("max_value")
+    assert entity_ids[1] == state.attributes.get("max_entity_id")
+    assert MEAN == state.attributes.get("mean")
 
-    def test_not_enough_sensor_value(self):
-        """Test that there is nothing done if not enough values available."""
-        config = {
-            "sensor": {
-                "platform": "min_max",
-                "name": "test_max",
-                "type": "max",
-                "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            }
+
+async def test_not_enough_sensor_value(hass):
+    """Test that there is nothing done if not enough values available."""
+    config = {
+        "sensor": {
+            "platform": "min_max",
+            "name": "test_max",
+            "type": "max",
+            "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        entity_ids = config["sensor"]["entity_ids"]
+    entity_ids = config["sensor"]["entity_ids"]
 
-        self.hass.states.set(entity_ids[0], STATE_UNKNOWN)
-        self.hass.block_till_done()
+    hass.states.async_set(entity_ids[0], STATE_UNKNOWN)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_max")
-        assert STATE_UNKNOWN == state.state
-        assert state.attributes.get("min_entity_id") is None
-        assert state.attributes.get("min_value") is None
-        assert state.attributes.get("max_entity_id") is None
-        assert state.attributes.get("max_value") is None
-        assert state.attributes.get("median") is None
+    state = hass.states.get("sensor.test_max")
+    assert STATE_UNKNOWN == state.state
+    assert state.attributes.get("min_entity_id") is None
+    assert state.attributes.get("min_value") is None
+    assert state.attributes.get("max_entity_id") is None
+    assert state.attributes.get("max_value") is None
+    assert state.attributes.get("median") is None
 
-        self.hass.states.set(entity_ids[1], self.values[1])
-        self.hass.block_till_done()
+    hass.states.async_set(entity_ids[1], VALUES[1])
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_max")
-        assert STATE_UNKNOWN != state.state
-        assert entity_ids[1] == state.attributes.get("min_entity_id")
-        assert self.values[1] == state.attributes.get("min_value")
-        assert entity_ids[1] == state.attributes.get("max_entity_id")
-        assert self.values[1] == state.attributes.get("max_value")
+    state = hass.states.get("sensor.test_max")
+    assert STATE_UNKNOWN != state.state
+    assert entity_ids[1] == state.attributes.get("min_entity_id")
+    assert VALUES[1] == state.attributes.get("min_value")
+    assert entity_ids[1] == state.attributes.get("max_entity_id")
+    assert VALUES[1] == state.attributes.get("max_value")
 
-        self.hass.states.set(entity_ids[2], STATE_UNKNOWN)
-        self.hass.block_till_done()
+    hass.states.async_set(entity_ids[2], STATE_UNKNOWN)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_max")
-        assert STATE_UNKNOWN != state.state
-        assert entity_ids[1] == state.attributes.get("min_entity_id")
-        assert self.values[1] == state.attributes.get("min_value")
-        assert entity_ids[1] == state.attributes.get("max_entity_id")
-        assert self.values[1] == state.attributes.get("max_value")
+    state = hass.states.get("sensor.test_max")
+    assert STATE_UNKNOWN != state.state
+    assert entity_ids[1] == state.attributes.get("min_entity_id")
+    assert VALUES[1] == state.attributes.get("min_value")
+    assert entity_ids[1] == state.attributes.get("max_entity_id")
+    assert VALUES[1] == state.attributes.get("max_value")
 
-        self.hass.states.set(entity_ids[1], STATE_UNAVAILABLE)
-        self.hass.block_till_done()
+    hass.states.async_set(entity_ids[1], STATE_UNAVAILABLE)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test_max")
-        assert STATE_UNKNOWN == state.state
-        assert state.attributes.get("min_entity_id") is None
-        assert state.attributes.get("min_value") is None
-        assert state.attributes.get("max_entity_id") is None
-        assert state.attributes.get("max_value") is None
+    state = hass.states.get("sensor.test_max")
+    assert STATE_UNKNOWN == state.state
+    assert state.attributes.get("min_entity_id") is None
+    assert state.attributes.get("min_value") is None
+    assert state.attributes.get("max_entity_id") is None
+    assert state.attributes.get("max_value") is None
 
-    def test_different_unit_of_measurement(self):
-        """Test for different unit of measurement."""
-        config = {
-            "sensor": {
-                "platform": "min_max",
-                "name": "test",
-                "type": "mean",
-                "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            }
+
+async def test_different_unit_of_measurement(hass):
+    """Test for different unit of measurement."""
+    config = {
+        "sensor": {
+            "platform": "min_max",
+            "name": "test",
+            "type": "mean",
+            "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        entity_ids = config["sensor"]["entity_ids"]
+    entity_ids = config["sensor"]["entity_ids"]
 
-        self.hass.states.set(
-            entity_ids[0], self.values[0], {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
+    hass.states.async_set(
+        entity_ids[0], VALUES[0], {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test")
+    state = hass.states.get("sensor.test")
 
-        assert str(float(self.values[0])) == state.state
-        assert state.attributes.get("unit_of_measurement") == TEMP_CELSIUS
+    assert str(float(VALUES[0])) == state.state
+    assert state.attributes.get("unit_of_measurement") == TEMP_CELSIUS
 
-        self.hass.states.set(
-            entity_ids[1], self.values[1], {ATTR_UNIT_OF_MEASUREMENT: TEMP_FAHRENHEIT}
-        )
-        self.hass.block_till_done()
+    hass.states.async_set(
+        entity_ids[1], VALUES[1], {ATTR_UNIT_OF_MEASUREMENT: TEMP_FAHRENHEIT}
+    )
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test")
+    state = hass.states.get("sensor.test")
 
-        assert STATE_UNKNOWN == state.state
-        assert state.attributes.get("unit_of_measurement") == "ERR"
+    assert STATE_UNKNOWN == state.state
+    assert state.attributes.get("unit_of_measurement") == "ERR"
 
-        self.hass.states.set(
-            entity_ids[2], self.values[2], {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
-        )
-        self.hass.block_till_done()
+    hass.states.async_set(
+        entity_ids[2], VALUES[2], {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
+    )
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test")
+    state = hass.states.get("sensor.test")
 
-        assert STATE_UNKNOWN == state.state
-        assert state.attributes.get("unit_of_measurement") == "ERR"
+    assert STATE_UNKNOWN == state.state
+    assert state.attributes.get("unit_of_measurement") == "ERR"
 
-    def test_last_sensor(self):
-        """Test the last sensor."""
-        config = {
-            "sensor": {
-                "platform": "min_max",
-                "name": "test_last",
-                "type": "last",
-                "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
-            }
+
+async def test_last_sensor(hass):
+    """Test the last sensor."""
+    config = {
+        "sensor": {
+            "platform": "min_max",
+            "name": "test_last",
+            "type": "last",
+            "entity_ids": ["sensor.test_1", "sensor.test_2", "sensor.test_3"],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        entity_ids = config["sensor"]["entity_ids"]
-        state = self.hass.states.get("sensor.test_last")
+    entity_ids = config["sensor"]["entity_ids"]
 
-        for entity_id, value in dict(zip(entity_ids, self.values)).items():
-            self.hass.states.set(entity_id, value)
-            self.hass.block_till_done()
-            state = self.hass.states.get("sensor.test_last")
-            assert str(float(value)) == state.state
-            assert entity_id == state.attributes.get("last_entity_id")
+    for entity_id, value in dict(zip(entity_ids, VALUES)).items():
+        hass.states.async_set(entity_id, value)
+        await hass.async_block_till_done()
+        state = hass.states.get("sensor.test_last")
+        assert str(float(value)) == state.state
+        assert entity_id == state.attributes.get("last_entity_id")
 
-        assert self.min == state.attributes.get("min_value")
-        assert self.max == state.attributes.get("max_value")
-        assert self.mean == state.attributes.get("mean")
-        assert self.median == state.attributes.get("median")
+    assert MIN_VALUE == state.attributes.get("min_value")
+    assert MAX_VALUE == state.attributes.get("max_value")
+    assert MEAN == state.attributes.get("mean")
+    assert MEDIAN == state.attributes.get("median")
 
 
 async def test_reload(hass):
diff --git a/tests/components/mobile_app/test_entity.py b/tests/components/mobile_app/test_entity.py
index 1ec97c8c4e2..ba121d766ac 100644
--- a/tests/components/mobile_app/test_entity.py
+++ b/tests/components/mobile_app/test_entity.py
@@ -1,12 +1,7 @@
 """Entity tests for mobile_app."""
-
-import logging
-
 from homeassistant.const import PERCENTAGE, STATE_UNKNOWN
 from homeassistant.helpers import device_registry
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def test_sensor(hass, create_registrations, webhook_client):
     """Test that sensors can be registered and updated."""
diff --git a/tests/components/mobile_app/test_webhook.py b/tests/components/mobile_app/test_webhook.py
index dec919317f5..b56b56f239a 100644
--- a/tests/components/mobile_app/test_webhook.py
+++ b/tests/components/mobile_app/test_webhook.py
@@ -1,6 +1,4 @@
 """Webhook tests for mobile_app."""
-import logging
-
 import pytest
 
 from homeassistant.components.camera import SUPPORT_STREAM as CAMERA_SUPPORT_STREAM
@@ -16,8 +14,6 @@ from .const import CALL_SERVICE, FIRE_EVENT, REGISTER_CLEARTEXT, RENDER_TEMPLATE
 from tests.async_mock import patch
 from tests.common import async_mock_service
 
-_LOGGER = logging.getLogger(__name__)
-
 
 def encrypt_payload(secret_key, payload):
     """Return a encrypted payload given a key and dictionary of data."""
@@ -70,13 +66,26 @@ async def test_webhook_handle_render_template(create_registrations, webhook_clie
     """Test that we render templates properly."""
     resp = await webhook_client.post(
         "/api/webhook/{}".format(create_registrations[1]["webhook_id"]),
-        json=RENDER_TEMPLATE,
+        json={
+            "type": "render_template",
+            "data": {
+                "one": {"template": "Hello world"},
+                "two": {"template": "{{ now() | random }}"},
+                "three": {"template": "{{ now() 3 }}"},
+            },
+        },
     )
 
     assert resp.status == 200
 
     json = await resp.json()
-    assert json == {"one": "Hello world"}
+    assert json == {
+        "one": "Hello world",
+        "two": {"error": "TypeError: object of type 'datetime.datetime' has no len()"},
+        "three": {
+            "error": "TemplateSyntaxError: expected token 'end of print statement', got 'integer'"
+        },
+    }
 
 
 async def test_webhook_handle_call_services(hass, create_registrations, webhook_client):
diff --git a/tests/components/modbus/conftest.py b/tests/components/modbus/conftest.py
index 66f4d542525..ca3e44dbe1d 100644
--- a/tests/components/modbus/conftest.py
+++ b/tests/components/modbus/conftest.py
@@ -1,6 +1,4 @@
 """The tests for the Modbus sensor component."""
-from datetime import timedelta
-import logging
 from unittest import mock
 
 import pytest
@@ -16,19 +14,18 @@ from homeassistant.const import CONF_PLATFORM, CONF_SCAN_INTERVAL
 from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
-from tests.common import MockModule, async_fire_time_changed, mock_integration
-
-_LOGGER = logging.getLogger(__name__)
+from tests.async_mock import patch
+from tests.common import async_fire_time_changed
 
 
 @pytest.fixture()
 def mock_hub(hass):
     """Mock hub."""
-    mock_integration(hass, MockModule(DOMAIN))
-    hub = mock.MagicMock()
-    hub.name = "hub"
-    hass.data[DOMAIN] = {DEFAULT_HUB: hub}
-    return hub
+    with patch("homeassistant.components.modbus.setup", return_value=True):
+        hub = mock.MagicMock()
+        hub.name = "hub"
+        hass.data[DOMAIN] = {DEFAULT_HUB: hub}
+        yield hub
 
 
 class ReadResult:
@@ -40,20 +37,17 @@ class ReadResult:
         self.bits = register_words
 
 
-async def run_base_test(
+async def setup_base_test(
     sensor_name,
     hass,
     use_mock_hub,
     data_array,
-    register_type,
     entity_domain,
-    register_words,
-    expected,
+    scan_interval,
 ):
-    """Run test for given config."""
+    """Run setup device for given config."""
 
     # Full sensor configuration
-    scan_interval = 5
     config = {
         entity_domain: {
             CONF_PLATFORM: "modbus",
@@ -62,6 +56,28 @@ async def run_base_test(
         }
     }
 
+    # Initialize sensor
+    now = dt_util.utcnow()
+    with mock.patch("homeassistant.helpers.event.dt_util.utcnow", return_value=now):
+        assert await async_setup_component(hass, entity_domain, config)
+        await hass.async_block_till_done()
+
+    entity_id = f"{entity_domain}.{sensor_name}"
+    device = hass.states.get(entity_id)
+    return entity_id, now, device
+
+
+async def run_base_read_test(
+    entity_id,
+    hass,
+    use_mock_hub,
+    register_type,
+    register_words,
+    expected,
+    now,
+):
+    """Run test for given config."""
+
     # Setup inputs for the sensor
     read_result = ReadResult(register_words)
     if register_type == CALL_TYPE_COIL:
@@ -73,14 +89,11 @@ async def run_base_test(
     else:  # CALL_TYPE_REGISTER_HOLDING
         use_mock_hub.read_holding_registers.return_value = read_result
 
-    # Initialize sensor
-    now = dt_util.utcnow()
-    with mock.patch("homeassistant.helpers.event.dt_util.utcnow", return_value=now):
-        assert await async_setup_component(hass, entity_domain, config)
-        await hass.async_block_till_done()
-
     # Trigger update call with time_changed event
-    now += timedelta(seconds=scan_interval + 1)
     with mock.patch("homeassistant.helpers.event.dt_util.utcnow", return_value=now):
         async_fire_time_changed(hass, now)
         await hass.async_block_till_done()
+
+    # Check state
+    state = hass.states.get(entity_id).state
+    assert state == expected
diff --git a/tests/components/modbus/test_modbus_binary_sensor.py b/tests/components/modbus/test_modbus_binary_sensor.py
index ff64ad8723a..91374cde22d 100644
--- a/tests/components/modbus/test_modbus_binary_sensor.py
+++ b/tests/components/modbus/test_modbus_binary_sensor.py
@@ -1,5 +1,7 @@
 """The tests for the Modbus sensor component."""
-import logging
+from datetime import timedelta
+
+import pytest
 
 from homeassistant.components.binary_sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.components.modbus.const import (
@@ -11,88 +13,81 @@ from homeassistant.components.modbus.const import (
 )
 from homeassistant.const import CONF_NAME, STATE_OFF, STATE_ON
 
-from .conftest import run_base_test
-
-_LOGGER = logging.getLogger(__name__)
+from .conftest import run_base_read_test, setup_base_test
 
 
-async def run_sensor_test(hass, use_mock_hub, register_config, value, expected):
+@pytest.mark.parametrize(
+    "cfg,regs,expected",
+    [
+        (
+            {
+                CONF_INPUT_TYPE: CALL_TYPE_COIL,
+            },
+            [0xFF],
+            STATE_ON,
+        ),
+        (
+            {
+                CONF_INPUT_TYPE: CALL_TYPE_COIL,
+            },
+            [0x01],
+            STATE_ON,
+        ),
+        (
+            {
+                CONF_INPUT_TYPE: CALL_TYPE_COIL,
+            },
+            [0x00],
+            STATE_OFF,
+        ),
+        (
+            {
+                CONF_INPUT_TYPE: CALL_TYPE_COIL,
+            },
+            [0x80],
+            STATE_OFF,
+        ),
+        (
+            {
+                CONF_INPUT_TYPE: CALL_TYPE_COIL,
+            },
+            [0xFE],
+            STATE_OFF,
+        ),
+        (
+            {
+                CONF_INPUT_TYPE: CALL_TYPE_DISCRETE,
+            },
+            [0xFF],
+            STATE_ON,
+        ),
+        (
+            {
+                CONF_INPUT_TYPE: CALL_TYPE_DISCRETE,
+            },
+            [0x00],
+            STATE_OFF,
+        ),
+    ],
+)
+async def test_coil_true(hass, mock_hub, cfg, regs, expected):
     """Run test for given config."""
     sensor_name = "modbus_test_binary_sensor"
-    entity_domain = SENSOR_DOMAIN
-    data_array = {
-        CONF_INPUTS: [
-            dict(**{CONF_NAME: sensor_name, CONF_ADDRESS: 1234}, **register_config)
-        ]
-    }
-    await run_base_test(
+    scan_interval = 5
+    entity_id, now, device = await setup_base_test(
         sensor_name,
         hass,
-        use_mock_hub,
-        data_array,
-        register_config.get(CONF_INPUT_TYPE),
-        entity_domain,
-        value,
+        mock_hub,
+        {CONF_INPUTS: [dict(**{CONF_NAME: sensor_name, CONF_ADDRESS: 1234}, **cfg)]},
+        SENSOR_DOMAIN,
+        scan_interval,
+    )
+    await run_base_read_test(
+        entity_id,
+        hass,
+        mock_hub,
+        cfg.get(CONF_INPUT_TYPE),
+        regs,
         expected,
-    )
-
-    # Check state
-    entity_id = f"{entity_domain}.{sensor_name}"
-    state = hass.states.get(entity_id).state
-    assert state == expected
-
-
-async def test_coil_true(hass, mock_hub):
-    """Test conversion of single word register."""
-    register_config = {
-        CONF_INPUT_TYPE: CALL_TYPE_COIL,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        [0xFF],
-        STATE_ON,
-    )
-
-
-async def test_coil_false(hass, mock_hub):
-    """Test conversion of single word register."""
-    register_config = {
-        CONF_INPUT_TYPE: CALL_TYPE_COIL,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        [0x00],
-        STATE_OFF,
-    )
-
-
-async def test_discrete_true(hass, mock_hub):
-    """Test conversion of single word register."""
-    register_config = {
-        CONF_INPUT_TYPE: CALL_TYPE_DISCRETE,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        [0xFF],
-        expected="on",
-    )
-
-
-async def test_discrete_false(hass, mock_hub):
-    """Test conversion of single word register."""
-    register_config = {
-        CONF_INPUT_TYPE: CALL_TYPE_DISCRETE,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        [0x00],
-        expected="off",
+        now + timedelta(seconds=scan_interval + 1),
     )
diff --git a/tests/components/modbus/test_modbus_sensor.py b/tests/components/modbus/test_modbus_sensor.py
index 5ade2f197dd..68cdbffa462 100644
--- a/tests/components/modbus/test_modbus_sensor.py
+++ b/tests/components/modbus/test_modbus_sensor.py
@@ -1,5 +1,7 @@
 """The tests for the Modbus sensor component."""
-import logging
+from datetime import timedelta
+
+import pytest
 
 from homeassistant.components.modbus.const import (
     CALL_TYPE_REGISTER_HOLDING,
@@ -21,373 +23,241 @@ from homeassistant.components.modbus.const import (
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.const import CONF_NAME
 
-from .conftest import run_base_test
-
-_LOGGER = logging.getLogger(__name__)
+from .conftest import run_base_read_test, setup_base_test
 
 
-async def run_sensor_test(
-    hass, use_mock_hub, register_config, register_words, expected
-):
+@pytest.mark.parametrize(
+    "cfg,regs,expected",
+    [
+        (
+            {
+                CONF_COUNT: 1,
+                CONF_DATA_TYPE: DATA_TYPE_INT,
+                CONF_SCALE: 1,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 0,
+            },
+            [0],
+            "0",
+        ),
+        (
+            {},
+            [0x8000],
+            "-32768",
+        ),
+        (
+            {
+                CONF_COUNT: 1,
+                CONF_DATA_TYPE: DATA_TYPE_INT,
+                CONF_SCALE: 1,
+                CONF_OFFSET: 13,
+                CONF_PRECISION: 0,
+            },
+            [7],
+            "20",
+        ),
+        (
+            {
+                CONF_COUNT: 1,
+                CONF_DATA_TYPE: DATA_TYPE_INT,
+                CONF_SCALE: 3,
+                CONF_OFFSET: 13,
+                CONF_PRECISION: 0,
+            },
+            [7],
+            "34",
+        ),
+        (
+            {
+                CONF_COUNT: 1,
+                CONF_DATA_TYPE: DATA_TYPE_UINT,
+                CONF_SCALE: 3,
+                CONF_OFFSET: 13,
+                CONF_PRECISION: 4,
+            },
+            [7],
+            "34.0000",
+        ),
+        (
+            {
+                CONF_COUNT: 1,
+                CONF_DATA_TYPE: DATA_TYPE_INT,
+                CONF_SCALE: 1.5,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 0,
+            },
+            [1],
+            "2",
+        ),
+        (
+            {
+                CONF_COUNT: 1,
+                CONF_DATA_TYPE: DATA_TYPE_INT,
+                CONF_SCALE: "1.5",
+                CONF_OFFSET: "5",
+                CONF_PRECISION: "1",
+            },
+            [9],
+            "18.5",
+        ),
+        (
+            {
+                CONF_COUNT: 1,
+                CONF_DATA_TYPE: DATA_TYPE_INT,
+                CONF_SCALE: 2.4,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 2,
+            },
+            [1],
+            "2.40",
+        ),
+        (
+            {
+                CONF_COUNT: 1,
+                CONF_DATA_TYPE: DATA_TYPE_INT,
+                CONF_SCALE: 1,
+                CONF_OFFSET: -10.3,
+                CONF_PRECISION: 1,
+            },
+            [2],
+            "-8.3",
+        ),
+        (
+            {
+                CONF_COUNT: 2,
+                CONF_DATA_TYPE: DATA_TYPE_INT,
+                CONF_SCALE: 1,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 0,
+            },
+            [0x89AB, 0xCDEF],
+            "-1985229329",
+        ),
+        (
+            {
+                CONF_COUNT: 2,
+                CONF_DATA_TYPE: DATA_TYPE_UINT,
+                CONF_SCALE: 1,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 0,
+            },
+            [0x89AB, 0xCDEF],
+            str(0x89ABCDEF),
+        ),
+        (
+            {
+                CONF_COUNT: 2,
+                CONF_DATA_TYPE: DATA_TYPE_UINT,
+                CONF_REVERSE_ORDER: True,
+            },
+            [0x89AB, 0xCDEF],
+            str(0xCDEF89AB),
+        ),
+        (
+            {
+                CONF_COUNT: 4,
+                CONF_DATA_TYPE: DATA_TYPE_UINT,
+                CONF_SCALE: 1,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 0,
+            },
+            [0x89AB, 0xCDEF, 0x0123, 0x4567],
+            "9920249030613615975",
+        ),
+        (
+            {
+                CONF_COUNT: 4,
+                CONF_DATA_TYPE: DATA_TYPE_UINT,
+                CONF_SCALE: 2,
+                CONF_OFFSET: 3,
+                CONF_PRECISION: 0,
+            },
+            [0x0123, 0x4567, 0x89AB, 0xCDEF],
+            "163971058432973793",
+        ),
+        (
+            {
+                CONF_COUNT: 4,
+                CONF_DATA_TYPE: DATA_TYPE_UINT,
+                CONF_SCALE: 2.0,
+                CONF_OFFSET: 3.0,
+                CONF_PRECISION: 0,
+            },
+            [0x0123, 0x4567, 0x89AB, 0xCDEF],
+            "163971058432973792",
+        ),
+        (
+            {
+                CONF_COUNT: 2,
+                CONF_REGISTER_TYPE: CALL_TYPE_REGISTER_INPUT,
+                CONF_DATA_TYPE: DATA_TYPE_UINT,
+                CONF_SCALE: 1,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 0,
+            },
+            [0x89AB, 0xCDEF],
+            str(0x89ABCDEF),
+        ),
+        (
+            {
+                CONF_COUNT: 2,
+                CONF_REGISTER_TYPE: CALL_TYPE_REGISTER_HOLDING,
+                CONF_DATA_TYPE: DATA_TYPE_UINT,
+                CONF_SCALE: 1,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 0,
+            },
+            [0x89AB, 0xCDEF],
+            str(0x89ABCDEF),
+        ),
+        (
+            {
+                CONF_COUNT: 2,
+                CONF_REGISTER_TYPE: CALL_TYPE_REGISTER_HOLDING,
+                CONF_DATA_TYPE: DATA_TYPE_FLOAT,
+                CONF_SCALE: 1,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 5,
+            },
+            [16286, 1617],
+            "1.23457",
+        ),
+        (
+            {
+                CONF_COUNT: 8,
+                CONF_REGISTER_TYPE: CALL_TYPE_REGISTER_HOLDING,
+                CONF_DATA_TYPE: DATA_TYPE_STRING,
+                CONF_SCALE: 1,
+                CONF_OFFSET: 0,
+                CONF_PRECISION: 0,
+            },
+            [0x3037, 0x2D30, 0x352D, 0x3230, 0x3230, 0x2031, 0x343A, 0x3335],
+            "07-05-2020 14:35",
+        ),
+    ],
+)
+async def test_all_sensor(hass, mock_hub, cfg, regs, expected):
     """Run test for sensor."""
     sensor_name = "modbus_test_sensor"
-    entity_domain = SENSOR_DOMAIN
-    data_array = {
-        CONF_REGISTERS: [
-            dict(**{CONF_NAME: sensor_name, CONF_REGISTER: 1234}, **register_config)
-        ]
-    }
-
-    await run_base_test(
+    scan_interval = 5
+    entity_id, now, device = await setup_base_test(
         sensor_name,
         hass,
-        use_mock_hub,
-        data_array,
-        register_config.get(CONF_REGISTER_TYPE),
-        entity_domain,
-        register_words,
+        mock_hub,
+        {
+            CONF_REGISTERS: [
+                dict(**{CONF_NAME: sensor_name, CONF_REGISTER: 1234}, **cfg)
+            ]
+        },
+        SENSOR_DOMAIN,
+        scan_interval,
+    )
+    await run_base_read_test(
+        entity_id,
+        hass,
+        mock_hub,
+        cfg.get(CONF_REGISTER_TYPE),
+        regs,
         expected,
-    )
-
-    # Check state
-    entity_id = f"{entity_domain}.{sensor_name}"
-    state = hass.states.get(entity_id).state
-    assert state == expected
-
-
-async def test_simple_word_register(hass, mock_hub):
-    """Test conversion of single word register."""
-    register_config = {
-        CONF_COUNT: 1,
-        CONF_DATA_TYPE: DATA_TYPE_INT,
-        CONF_SCALE: 1,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0],
-        expected="0",
-    )
-
-
-async def test_optional_conf_keys(hass, mock_hub):
-    """Test handling of optional configuration keys."""
-    register_config = {}
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x8000],
-        expected="-32768",
-    )
-
-
-async def test_offset(hass, mock_hub):
-    """Test offset calculation."""
-    register_config = {
-        CONF_COUNT: 1,
-        CONF_DATA_TYPE: DATA_TYPE_INT,
-        CONF_SCALE: 1,
-        CONF_OFFSET: 13,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[7],
-        expected="20",
-    )
-
-
-async def test_scale_and_offset(hass, mock_hub):
-    """Test handling of scale and offset."""
-    register_config = {
-        CONF_COUNT: 1,
-        CONF_DATA_TYPE: DATA_TYPE_INT,
-        CONF_SCALE: 3,
-        CONF_OFFSET: 13,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[7],
-        expected="34",
-    )
-
-
-async def test_ints_can_have_precision(hass, mock_hub):
-    """Test precision can be specified event if using integer values only."""
-    register_config = {
-        CONF_COUNT: 1,
-        CONF_DATA_TYPE: DATA_TYPE_UINT,
-        CONF_SCALE: 3,
-        CONF_OFFSET: 13,
-        CONF_PRECISION: 4,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[7],
-        expected="34.0000",
-    )
-
-
-async def test_floats_get_rounded_correctly(hass, mock_hub):
-    """Test that floating point values get rounded correctly."""
-    register_config = {
-        CONF_COUNT: 1,
-        CONF_DATA_TYPE: DATA_TYPE_INT,
-        CONF_SCALE: 1.5,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[1],
-        expected="2",
-    )
-
-
-async def test_parameters_as_strings(hass, mock_hub):
-    """Test that scale, offset and precision can be given as strings."""
-    register_config = {
-        CONF_COUNT: 1,
-        CONF_DATA_TYPE: DATA_TYPE_INT,
-        CONF_SCALE: "1.5",
-        CONF_OFFSET: "5",
-        CONF_PRECISION: "1",
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[9],
-        expected="18.5",
-    )
-
-
-async def test_floating_point_scale(hass, mock_hub):
-    """Test use of floating point scale."""
-    register_config = {
-        CONF_COUNT: 1,
-        CONF_DATA_TYPE: DATA_TYPE_INT,
-        CONF_SCALE: 2.4,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 2,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[1],
-        expected="2.40",
-    )
-
-
-async def test_floating_point_offset(hass, mock_hub):
-    """Test use of floating point scale."""
-    register_config = {
-        CONF_COUNT: 1,
-        CONF_DATA_TYPE: DATA_TYPE_INT,
-        CONF_SCALE: 1,
-        CONF_OFFSET: -10.3,
-        CONF_PRECISION: 1,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[2],
-        expected="-8.3",
-    )
-
-
-async def test_signed_two_word_register(hass, mock_hub):
-    """Test reading of signed register with two words."""
-    register_config = {
-        CONF_COUNT: 2,
-        CONF_DATA_TYPE: DATA_TYPE_INT,
-        CONF_SCALE: 1,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x89AB, 0xCDEF],
-        expected="-1985229329",
-    )
-
-
-async def test_unsigned_two_word_register(hass, mock_hub):
-    """Test reading of unsigned register with two words."""
-    register_config = {
-        CONF_COUNT: 2,
-        CONF_DATA_TYPE: DATA_TYPE_UINT,
-        CONF_SCALE: 1,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x89AB, 0xCDEF],
-        expected=str(0x89ABCDEF),
-    )
-
-
-async def test_reversed(hass, mock_hub):
-    """Test handling of reversed register words."""
-    register_config = {
-        CONF_COUNT: 2,
-        CONF_DATA_TYPE: DATA_TYPE_UINT,
-        CONF_REVERSE_ORDER: True,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x89AB, 0xCDEF],
-        expected=str(0xCDEF89AB),
-    )
-
-
-async def test_four_word_register(hass, mock_hub):
-    """Test reading of 64-bit register."""
-    register_config = {
-        CONF_COUNT: 4,
-        CONF_DATA_TYPE: DATA_TYPE_UINT,
-        CONF_SCALE: 1,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x89AB, 0xCDEF, 0x0123, 0x4567],
-        expected="9920249030613615975",
-    )
-
-
-async def test_four_word_register_precision_is_intact_with_int_params(hass, mock_hub):
-    """Test that precision is not lost when doing integer arithmetic for 64-bit register."""
-    register_config = {
-        CONF_COUNT: 4,
-        CONF_DATA_TYPE: DATA_TYPE_UINT,
-        CONF_SCALE: 2,
-        CONF_OFFSET: 3,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x0123, 0x4567, 0x89AB, 0xCDEF],
-        expected="163971058432973793",
-    )
-
-
-async def test_four_word_register_precision_is_lost_with_float_params(hass, mock_hub):
-    """Test that precision is affected when floating point conversion is done."""
-    register_config = {
-        CONF_COUNT: 4,
-        CONF_DATA_TYPE: DATA_TYPE_UINT,
-        CONF_SCALE: 2.0,
-        CONF_OFFSET: 3.0,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x0123, 0x4567, 0x89AB, 0xCDEF],
-        expected="163971058432973792",
-    )
-
-
-async def test_two_word_input_register(hass, mock_hub):
-    """Test reaging of input register."""
-    register_config = {
-        CONF_COUNT: 2,
-        CONF_REGISTER_TYPE: CALL_TYPE_REGISTER_INPUT,
-        CONF_DATA_TYPE: DATA_TYPE_UINT,
-        CONF_SCALE: 1,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x89AB, 0xCDEF],
-        expected=str(0x89ABCDEF),
-    )
-
-
-async def test_two_word_holding_register(hass, mock_hub):
-    """Test reaging of holding register."""
-    register_config = {
-        CONF_COUNT: 2,
-        CONF_REGISTER_TYPE: CALL_TYPE_REGISTER_HOLDING,
-        CONF_DATA_TYPE: DATA_TYPE_UINT,
-        CONF_SCALE: 1,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x89AB, 0xCDEF],
-        expected=str(0x89ABCDEF),
-    )
-
-
-async def test_float_data_type(hass, mock_hub):
-    """Test floating point register data type."""
-    register_config = {
-        CONF_COUNT: 2,
-        CONF_REGISTER_TYPE: CALL_TYPE_REGISTER_HOLDING,
-        CONF_DATA_TYPE: DATA_TYPE_FLOAT,
-        CONF_SCALE: 1,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 5,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[16286, 1617],
-        expected="1.23457",
-    )
-
-
-async def test_string_data_type(hass, mock_hub):
-    """Test byte string register data type."""
-    register_config = {
-        CONF_COUNT: 8,
-        CONF_REGISTER_TYPE: CALL_TYPE_REGISTER_HOLDING,
-        CONF_DATA_TYPE: DATA_TYPE_STRING,
-        CONF_SCALE: 1,
-        CONF_OFFSET: 0,
-        CONF_PRECISION: 0,
-    }
-    await run_sensor_test(
-        hass,
-        mock_hub,
-        register_config,
-        register_words=[0x3037, 0x2D30, 0x352D, 0x3230, 0x3230, 0x2031, 0x343A, 0x3335],
-        expected="07-05-2020 14:35",
+        now + timedelta(seconds=scan_interval + 1),
     )
diff --git a/tests/components/modbus/test_modbus_switch.py b/tests/components/modbus/test_modbus_switch.py
new file mode 100644
index 00000000000..75255389bea
--- /dev/null
+++ b/tests/components/modbus/test_modbus_switch.py
@@ -0,0 +1,63 @@
+"""The tests for the Modbus switch component."""
+from datetime import timedelta
+
+import pytest
+
+from homeassistant.components.modbus.const import CALL_TYPE_COIL, CONF_COILS
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.const import CONF_NAME, CONF_SLAVE, STATE_OFF, STATE_ON
+
+from .conftest import run_base_read_test, setup_base_test
+
+
+@pytest.mark.parametrize(
+    "regs,expected",
+    [
+        (
+            [0x00],
+            STATE_OFF,
+        ),
+        (
+            [0x80],
+            STATE_OFF,
+        ),
+        (
+            [0xFE],
+            STATE_OFF,
+        ),
+        (
+            [0xFF],
+            STATE_ON,
+        ),
+        (
+            [0x01],
+            STATE_ON,
+        ),
+    ],
+)
+async def test_coil_switch(hass, mock_hub, regs, expected):
+    """Run test for given config."""
+    switch_name = "modbus_test_switch"
+    scan_interval = 5
+    entity_id, now, device = await setup_base_test(
+        switch_name,
+        hass,
+        mock_hub,
+        {
+            CONF_COILS: [
+                {CONF_NAME: switch_name, CALL_TYPE_COIL: 1234, CONF_SLAVE: 1},
+            ]
+        },
+        SWITCH_DOMAIN,
+        scan_interval,
+    )
+
+    await run_base_read_test(
+        entity_id,
+        hass,
+        mock_hub,
+        CALL_TYPE_COIL,
+        regs,
+        expected,
+        now + timedelta(seconds=scan_interval + 1),
+    )
diff --git a/tests/components/mold_indicator/test_sensor.py b/tests/components/mold_indicator/test_sensor.py
index a67873fd4e4..a923d4a2cf3 100644
--- a/tests/components/mold_indicator/test_sensor.py
+++ b/tests/components/mold_indicator/test_sensor.py
@@ -1,5 +1,5 @@
 """The tests for the MoldIndicator sensor."""
-import unittest
+import pytest
 
 from homeassistant.components.mold_indicator.sensor import (
     ATTR_CRITICAL_TEMP,
@@ -12,284 +12,280 @@ from homeassistant.const import (
     STATE_UNKNOWN,
     TEMP_CELSIUS,
 )
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 
-class TestSensorMoldIndicator(unittest.TestCase):
-    """Test the MoldIndicator sensor."""
+@pytest.fixture(autouse=True)
+def init_sensors_fixture(hass):
+    """Set up things to be run when tests are started."""
+    hass.states.async_set(
+        "test.indoortemp", "20", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    hass.states.async_set(
+        "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    hass.states.async_set(
+        "test.indoorhumidity", "50", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
+    )
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.hass.states.set(
-            "test.indoortemp", "20", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.states.set(
-            "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.states.set(
-            "test.indoorhumidity", "50", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
-        )
-        self.addCleanup(self.tear_down_cleanup)
 
-    def tear_down_cleanup(self):
-        """Stop down everything that was started."""
-        self.hass.stop()
+async def test_setup(hass):
+    """Test the mold indicator sensor setup."""
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "mold_indicator",
+                "indoor_temp_sensor": "test.indoortemp",
+                "outdoor_temp_sensor": "test.outdoortemp",
+                "indoor_humidity_sensor": "test.indoorhumidity",
+                "calibration_factor": 2.0,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
+    assert PERCENTAGE == moldind.attributes.get("unit_of_measurement")
 
-    def test_setup(self):
-        """Test the mold indicator sensor setup."""
-        assert setup_component(
-            self.hass,
-            sensor.DOMAIN,
-            {
-                "sensor": {
-                    "platform": "mold_indicator",
-                    "indoor_temp_sensor": "test.indoortemp",
-                    "outdoor_temp_sensor": "test.outdoortemp",
-                    "indoor_humidity_sensor": "test.indoorhumidity",
-                    "calibration_factor": 2.0,
-                }
-            },
-        )
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
-        assert PERCENTAGE == moldind.attributes.get("unit_of_measurement")
 
-    def test_invalidcalib(self):
-        """Test invalid sensor values."""
-        self.hass.states.set(
-            "test.indoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.states.set(
-            "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.states.set(
-            "test.indoorhumidity", "0", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
-        )
+async def test_invalidcalib(hass):
+    """Test invalid sensor values."""
+    hass.states.async_set(
+        "test.indoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    hass.states.async_set(
+        "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    hass.states.async_set(
+        "test.indoorhumidity", "0", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
+    )
 
-        assert setup_component(
-            self.hass,
-            sensor.DOMAIN,
-            {
-                "sensor": {
-                    "platform": "mold_indicator",
-                    "indoor_temp_sensor": "test.indoortemp",
-                    "outdoor_temp_sensor": "test.outdoortemp",
-                    "indoor_humidity_sensor": "test.indoorhumidity",
-                    "calibration_factor": 0,
-                }
-            },
-        )
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
-        assert moldind.state == "unavailable"
-        assert moldind.attributes.get(ATTR_DEWPOINT) is None
-        assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "mold_indicator",
+                "indoor_temp_sensor": "test.indoortemp",
+                "outdoor_temp_sensor": "test.outdoortemp",
+                "indoor_humidity_sensor": "test.indoorhumidity",
+                "calibration_factor": 0,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
+    assert moldind.state == "unavailable"
+    assert moldind.attributes.get(ATTR_DEWPOINT) is None
+    assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
 
-    def test_invalidhum(self):
-        """Test invalid sensor values."""
-        self.hass.states.set(
-            "test.indoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.states.set(
-            "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.states.set(
-            "test.indoorhumidity", "-1", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
-        )
 
-        assert setup_component(
-            self.hass,
-            sensor.DOMAIN,
-            {
-                "sensor": {
-                    "platform": "mold_indicator",
-                    "indoor_temp_sensor": "test.indoortemp",
-                    "outdoor_temp_sensor": "test.outdoortemp",
-                    "indoor_humidity_sensor": "test.indoorhumidity",
-                    "calibration_factor": 2.0,
-                }
-            },
-        )
+async def test_invalidhum(hass):
+    """Test invalid sensor values."""
+    hass.states.async_set(
+        "test.indoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    hass.states.async_set(
+        "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    hass.states.async_set(
+        "test.indoorhumidity", "-1", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
+    )
 
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
-        assert moldind.state == "unavailable"
-        assert moldind.attributes.get(ATTR_DEWPOINT) is None
-        assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "mold_indicator",
+                "indoor_temp_sensor": "test.indoortemp",
+                "outdoor_temp_sensor": "test.outdoortemp",
+                "indoor_humidity_sensor": "test.indoorhumidity",
+                "calibration_factor": 2.0,
+            }
+        },
+    )
 
-        self.hass.states.set(
-            "test.indoorhumidity", "A", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
-        )
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
-        assert moldind.state == "unavailable"
-        assert moldind.attributes.get(ATTR_DEWPOINT) is None
-        assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
+    assert moldind.state == "unavailable"
+    assert moldind.attributes.get(ATTR_DEWPOINT) is None
+    assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
 
-        self.hass.states.set(
-            "test.indoorhumidity", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
-        assert moldind.state == "unavailable"
-        assert moldind.attributes.get(ATTR_DEWPOINT) is None
-        assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
+    hass.states.async_set(
+        "test.indoorhumidity", "A", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
+    )
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
+    assert moldind.state == "unavailable"
+    assert moldind.attributes.get(ATTR_DEWPOINT) is None
+    assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
 
-    def test_calculation(self):
-        """Test the mold indicator internal calculations."""
-        assert setup_component(
-            self.hass,
-            sensor.DOMAIN,
-            {
-                "sensor": {
-                    "platform": "mold_indicator",
-                    "indoor_temp_sensor": "test.indoortemp",
-                    "outdoor_temp_sensor": "test.outdoortemp",
-                    "indoor_humidity_sensor": "test.indoorhumidity",
-                    "calibration_factor": 2.0,
-                }
-            },
-        )
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
+    hass.states.async_set(
+        "test.indoorhumidity", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
+    assert moldind.state == "unavailable"
+    assert moldind.attributes.get(ATTR_DEWPOINT) is None
+    assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
 
-        # assert dewpoint
-        dewpoint = moldind.attributes.get(ATTR_DEWPOINT)
-        assert dewpoint
-        assert dewpoint > 9.25
-        assert dewpoint < 9.26
 
-        # assert temperature estimation
-        esttemp = moldind.attributes.get(ATTR_CRITICAL_TEMP)
-        assert esttemp
-        assert esttemp > 14.9
-        assert esttemp < 15.1
+async def test_calculation(hass):
+    """Test the mold indicator internal calculations."""
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "mold_indicator",
+                "indoor_temp_sensor": "test.indoortemp",
+                "outdoor_temp_sensor": "test.outdoortemp",
+                "indoor_humidity_sensor": "test.indoorhumidity",
+                "calibration_factor": 2.0,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
 
-        # assert mold indicator value
-        state = moldind.state
-        assert state
-        assert state == "68"
+    # assert dewpoint
+    dewpoint = moldind.attributes.get(ATTR_DEWPOINT)
+    assert dewpoint
+    assert dewpoint > 9.25
+    assert dewpoint < 9.26
 
-    def test_unknown_sensor(self):
-        """Test the sensor_changed function."""
-        assert setup_component(
-            self.hass,
-            sensor.DOMAIN,
-            {
-                "sensor": {
-                    "platform": "mold_indicator",
-                    "indoor_temp_sensor": "test.indoortemp",
-                    "outdoor_temp_sensor": "test.outdoortemp",
-                    "indoor_humidity_sensor": "test.indoorhumidity",
-                    "calibration_factor": 2.0,
-                }
-            },
-        )
-        self.hass.block_till_done()
-        self.hass.start()
+    # assert temperature estimation
+    esttemp = moldind.attributes.get(ATTR_CRITICAL_TEMP)
+    assert esttemp
+    assert esttemp > 14.9
+    assert esttemp < 15.1
 
-        self.hass.states.set(
-            "test.indoortemp", STATE_UNKNOWN, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
-        assert moldind.state == "unavailable"
-        assert moldind.attributes.get(ATTR_DEWPOINT) is None
-        assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
+    # assert mold indicator value
+    state = moldind.state
+    assert state
+    assert state == "68"
 
-        self.hass.states.set(
-            "test.indoortemp", "30", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.states.set(
-            "test.outdoortemp", STATE_UNKNOWN, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
-        assert moldind.state == "unavailable"
-        assert moldind.attributes.get(ATTR_DEWPOINT) is None
-        assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
 
-        self.hass.states.set(
-            "test.outdoortemp", "25", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.states.set(
-            "test.indoorhumidity",
-            STATE_UNKNOWN,
-            {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
-        )
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
-        assert moldind.state == "unavailable"
-        assert moldind.attributes.get(ATTR_DEWPOINT) is None
-        assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
+async def test_unknown_sensor(hass):
+    """Test the sensor_changed function."""
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "mold_indicator",
+                "indoor_temp_sensor": "test.indoortemp",
+                "outdoor_temp_sensor": "test.outdoortemp",
+                "indoor_humidity_sensor": "test.indoorhumidity",
+                "calibration_factor": 2.0,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
 
-        self.hass.states.set(
-            "test.indoorhumidity", "20", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
-        )
-        self.hass.block_till_done()
-        moldind = self.hass.states.get("sensor.mold_indicator")
-        assert moldind
-        assert moldind.state == "23"
+    hass.states.async_set(
+        "test.indoortemp", STATE_UNKNOWN, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
+    assert moldind.state == "unavailable"
+    assert moldind.attributes.get(ATTR_DEWPOINT) is None
+    assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
 
-        dewpoint = moldind.attributes.get(ATTR_DEWPOINT)
-        assert dewpoint
-        assert dewpoint > 4.58
-        assert dewpoint < 4.59
+    hass.states.async_set(
+        "test.indoortemp", "30", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    hass.states.async_set(
+        "test.outdoortemp", STATE_UNKNOWN, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
+    assert moldind.state == "unavailable"
+    assert moldind.attributes.get(ATTR_DEWPOINT) is None
+    assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
 
-        esttemp = moldind.attributes.get(ATTR_CRITICAL_TEMP)
-        assert esttemp
-        assert esttemp == 27.5
+    hass.states.async_set(
+        "test.outdoortemp", "25", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    hass.states.async_set(
+        "test.indoorhumidity",
+        STATE_UNKNOWN,
+        {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
+    )
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
+    assert moldind.state == "unavailable"
+    assert moldind.attributes.get(ATTR_DEWPOINT) is None
+    assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None
 
-    def test_sensor_changed(self):
-        """Test the sensor_changed function."""
-        assert setup_component(
-            self.hass,
-            sensor.DOMAIN,
-            {
-                "sensor": {
-                    "platform": "mold_indicator",
-                    "indoor_temp_sensor": "test.indoortemp",
-                    "outdoor_temp_sensor": "test.outdoortemp",
-                    "indoor_humidity_sensor": "test.indoorhumidity",
-                    "calibration_factor": 2.0,
-                }
-            },
-        )
-        self.hass.block_till_done()
-        self.hass.start()
+    hass.states.async_set(
+        "test.indoorhumidity", "20", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
+    )
+    await hass.async_block_till_done()
+    moldind = hass.states.get("sensor.mold_indicator")
+    assert moldind
+    assert moldind.state == "23"
 
-        self.hass.states.set(
-            "test.indoortemp", "30", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
-        assert self.hass.states.get("sensor.mold_indicator").state == "90"
+    dewpoint = moldind.attributes.get(ATTR_DEWPOINT)
+    assert dewpoint
+    assert dewpoint > 4.58
+    assert dewpoint < 4.59
 
-        self.hass.states.set(
-            "test.outdoortemp", "25", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
-        assert self.hass.states.get("sensor.mold_indicator").state == "57"
+    esttemp = moldind.attributes.get(ATTR_CRITICAL_TEMP)
+    assert esttemp
+    assert esttemp == 27.5
 
-        self.hass.states.set(
-            "test.indoorhumidity", "20", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
-        )
-        self.hass.block_till_done()
-        assert self.hass.states.get("sensor.mold_indicator").state == "23"
+
+async def test_sensor_changed(hass):
+    """Test the sensor_changed function."""
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "mold_indicator",
+                "indoor_temp_sensor": "test.indoortemp",
+                "outdoor_temp_sensor": "test.outdoortemp",
+                "indoor_humidity_sensor": "test.indoorhumidity",
+                "calibration_factor": 2.0,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
+
+    hass.states.async_set(
+        "test.indoortemp", "30", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get("sensor.mold_indicator").state == "90"
+
+    hass.states.async_set(
+        "test.outdoortemp", "25", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get("sensor.mold_indicator").state == "57"
+
+    hass.states.async_set(
+        "test.indoorhumidity", "20", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE}
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get("sensor.mold_indicator").state == "23"
diff --git a/tests/components/mqtt/test_alarm_control_panel.py b/tests/components/mqtt/test_alarm_control_panel.py
index 7eb890903fd..524448e5839 100644
--- a/tests/components/mqtt/test_alarm_control_panel.py
+++ b/tests/components/mqtt/test_alarm_control_panel.py
@@ -65,7 +65,7 @@ DEFAULT_CONFIG_CODE = {
         "name": "test",
         "state_topic": "alarm/state",
         "command_topic": "alarm/command",
-        "code": "1234",
+        "code": "0123",
         "code_arm_required": True,
     }
 }
@@ -396,10 +396,10 @@ async def test_disarm_publishes_mqtt_with_template(hass, mqtt_mock):
     When command_template set to output json
     """
     config = copy.deepcopy(DEFAULT_CONFIG_CODE)
-    config[alarm_control_panel.DOMAIN]["code"] = "1234"
-    config[alarm_control_panel.DOMAIN]["command_template"] = (
-        '{"action":"{{ action }}",' '"code":"{{ code }}"}'
-    )
+    config[alarm_control_panel.DOMAIN]["code"] = "0123"
+    config[alarm_control_panel.DOMAIN][
+        "command_template"
+    ] = '{"action":"{{ action }}","code":"{{ code }}"}'
     assert await async_setup_component(
         hass,
         alarm_control_panel.DOMAIN,
@@ -407,9 +407,9 @@ async def test_disarm_publishes_mqtt_with_template(hass, mqtt_mock):
     )
     await hass.async_block_till_done()
 
-    await common.async_alarm_disarm(hass, 1234)
+    await common.async_alarm_disarm(hass, "0123")
     mqtt_mock.async_publish.assert_called_once_with(
-        "alarm/command", '{"action":"DISARM","code":"1234"}', 0, False
+        "alarm/command", '{"action":"DISARM","code":"0123"}', 0, False
     )
 
 
diff --git a/tests/components/mqtt/test_binary_sensor.py b/tests/components/mqtt/test_binary_sensor.py
index d2375278c4d..d4c837de023 100644
--- a/tests/components/mqtt/test_binary_sensor.py
+++ b/tests/components/mqtt/test_binary_sensor.py
@@ -5,8 +5,7 @@ import json
 
 import pytest
 
-from homeassistant.components import binary_sensor, mqtt
-from homeassistant.components.mqtt.discovery import async_start
+from homeassistant.components import binary_sensor
 from homeassistant.const import (
     EVENT_STATE_CHANGED,
     STATE_OFF,
@@ -53,9 +52,7 @@ DEFAULT_CONFIG = {
 }
 
 
-async def test_setting_sensor_value_expires_availability_topic(
-    hass, mqtt_mock, legacy_patchable_time, caplog
-):
+async def test_setting_sensor_value_expires_availability_topic(hass, mqtt_mock, caplog):
     """Test the expiration of the value."""
     assert await async_setup_component(
         hass,
@@ -85,9 +82,7 @@ async def test_setting_sensor_value_expires_availability_topic(
     await expires_helper(hass, mqtt_mock, caplog)
 
 
-async def test_setting_sensor_value_expires(
-    hass, mqtt_mock, legacy_patchable_time, caplog
-):
+async def test_setting_sensor_value_expires(hass, mqtt_mock, caplog):
     """Test the expiration of the value."""
     assert await async_setup_component(
         hass,
@@ -113,7 +108,8 @@ async def test_setting_sensor_value_expires(
 
 async def expires_helper(hass, mqtt_mock, caplog):
     """Run the basic expiry code."""
-    now = datetime(2017, 1, 1, 1, tzinfo=dt_util.UTC)
+    realnow = dt_util.utcnow()
+    now = datetime(realnow.year + 1, 1, 1, 1, tzinfo=dt_util.UTC)
     with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
         async_fire_time_changed(hass, now)
         async_fire_mqtt_message(hass, "test-topic", "ON")
@@ -161,6 +157,86 @@ async def expires_helper(hass, mqtt_mock, caplog):
     assert state.state == STATE_UNAVAILABLE
 
 
+async def test_expiration_on_discovery_and_discovery_update_of_binary_sensor(
+    hass, mqtt_mock, caplog
+):
+    """Test that binary_sensor with expire_after set behaves correctly on discovery and discovery update."""
+    config = {
+        "name": "Test",
+        "state_topic": "test-topic",
+        "expire_after": 4,
+        "force_update": True,
+    }
+
+    config_msg = json.dumps(config)
+
+    # Set time and publish config message to create binary_sensor via discovery with 4 s expiry
+    realnow = dt_util.utcnow()
+    now = datetime(realnow.year + 1, 1, 1, 1, tzinfo=dt_util.UTC)
+    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
+        async_fire_time_changed(hass, now)
+        async_fire_mqtt_message(
+            hass, "homeassistant/binary_sensor/bla/config", config_msg
+        )
+        await hass.async_block_till_done()
+
+    # Test that binary_sensor is not available
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_UNAVAILABLE
+
+    # Publish state message
+    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
+        async_fire_mqtt_message(hass, "test-topic", "ON")
+        await hass.async_block_till_done()
+
+    # Test that binary_sensor has correct state
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_ON
+
+    # Advance +3 seconds
+    now = now + timedelta(seconds=3)
+    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
+        async_fire_time_changed(hass, now)
+        await hass.async_block_till_done()
+
+    # binary_sensor is not yet expired
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_ON
+
+    # Resend config message to update discovery
+    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
+        async_fire_time_changed(hass, now)
+        async_fire_mqtt_message(
+            hass, "homeassistant/binary_sensor/bla/config", config_msg
+        )
+        await hass.async_block_till_done()
+
+    # Test that binary_sensor has not expired
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_ON
+
+    # Add +2 seconds
+    now = now + timedelta(seconds=2)
+    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
+        async_fire_time_changed(hass, now)
+        await hass.async_block_till_done()
+
+    # Test that binary_sensor has expired
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_UNAVAILABLE
+
+    # Resend config message to update discovery
+    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
+        async_fire_mqtt_message(
+            hass, "homeassistant/binary_sensor/bla/config", config_msg
+        )
+        await hass.async_block_till_done()
+
+    # Test that binary_sensor is still expired
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_UNAVAILABLE
+
+
 async def test_setting_sensor_value_via_mqtt_message(hass, mqtt_mock):
     """Test the setting of the value via MQTT."""
     assert await async_setup_component(
@@ -666,88 +742,6 @@ async def test_discovery_update_unchanged_binary_sensor(hass, mqtt_mock, caplog)
         )
 
 
-async def test_expiration_on_discovery_and_discovery_update_of_binary_sensor(
-    hass, mqtt_mock, legacy_patchable_time, caplog
-):
-    """Test that binary_sensor with expire_after set behaves correctly on discovery and discovery update."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
-
-    config = {
-        "name": "Test",
-        "state_topic": "test-topic",
-        "expire_after": 4,
-        "force_update": True,
-    }
-
-    config_msg = json.dumps(config)
-
-    # Set time and publish config message to create binary_sensor via discovery with 4 s expiry
-    now = datetime(2017, 1, 1, 1, tzinfo=dt_util.UTC)
-    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
-        async_fire_time_changed(hass, now)
-        async_fire_mqtt_message(
-            hass, "homeassistant/binary_sensor/bla/config", config_msg
-        )
-        await hass.async_block_till_done()
-
-    # Test that binary_sensor is not available
-    state = hass.states.get("binary_sensor.test")
-    assert state.state == STATE_UNAVAILABLE
-
-    # Publish state message
-    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
-        async_fire_mqtt_message(hass, "test-topic", "ON")
-        await hass.async_block_till_done()
-
-    # Test that binary_sensor has correct state
-    state = hass.states.get("binary_sensor.test")
-    assert state.state == STATE_ON
-
-    # Advance +3 seconds
-    now = now + timedelta(seconds=3)
-    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
-        async_fire_time_changed(hass, now)
-        await hass.async_block_till_done()
-
-    # binary_sensor is not yet expired
-    state = hass.states.get("binary_sensor.test")
-    assert state.state == STATE_ON
-
-    # Resend config message to update discovery
-    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
-        async_fire_time_changed(hass, now)
-        async_fire_mqtt_message(
-            hass, "homeassistant/binary_sensor/bla/config", config_msg
-        )
-        await hass.async_block_till_done()
-
-    # Test that binary_sensor has not expired
-    state = hass.states.get("binary_sensor.test")
-    assert state.state == STATE_ON
-
-    # Add +2 seconds
-    now = now + timedelta(seconds=2)
-    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
-        async_fire_time_changed(hass, now)
-        await hass.async_block_till_done()
-
-    # Test that binary_sensor has expired
-    state = hass.states.get("binary_sensor.test")
-    assert state.state == STATE_UNAVAILABLE
-
-    # Resend config message to update discovery
-    with patch(("homeassistant.helpers.event.dt_util.utcnow"), return_value=now):
-        async_fire_mqtt_message(
-            hass, "homeassistant/binary_sensor/bla/config", config_msg
-        )
-        await hass.async_block_till_done()
-
-    # Test that binary_sensor is still expired
-    state = hass.states.get("binary_sensor.test")
-    assert state.state == STATE_UNAVAILABLE
-
-
 @pytest.mark.no_fail_on_log_exception
 async def test_discovery_broken(hass, mqtt_mock, caplog):
     """Test handling of bad discovery message."""
diff --git a/tests/components/mqtt/test_camera.py b/tests/components/mqtt/test_camera.py
index 22f714fdcf7..1f3acee119e 100644
--- a/tests/components/mqtt/test_camera.py
+++ b/tests/components/mqtt/test_camera.py
@@ -3,8 +3,7 @@ import json
 
 import pytest
 
-from homeassistant.components import camera, mqtt
-from homeassistant.components.mqtt.discovery import async_start
+from homeassistant.components import camera
 from homeassistant.setup import async_setup_component
 
 from .test_common import (
@@ -152,9 +151,6 @@ async def test_discovery_removal_camera(hass, mqtt_mock, caplog):
 
 async def test_discovery_update_camera(hass, mqtt_mock, caplog):
     """Test update of discovered camera."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
-
     data1 = '{ "name": "Beer", "topic": "test_topic"}'
     data2 = '{ "name": "Milk", "topic": "test_topic"}'
 
@@ -177,9 +173,6 @@ async def test_discovery_update_unchanged_camera(hass, mqtt_mock, caplog):
 @pytest.mark.no_fail_on_log_exception
 async def test_discovery_broken(hass, mqtt_mock, caplog):
     """Test handling of bad discovery message."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
-
     data1 = '{ "name": "Beer" }'
     data2 = '{ "name": "Milk", "topic": "test_topic"}'
 
diff --git a/tests/components/mqtt/test_climate.py b/tests/components/mqtt/test_climate.py
index d60af211d71..3c629a82012 100644
--- a/tests/components/mqtt/test_climate.py
+++ b/tests/components/mqtt/test_climate.py
@@ -322,7 +322,9 @@ async def test_set_target_temperature(hass, mqtt_mock):
     await common.async_set_temperature(hass, temperature=47, entity_id=ENTITY_CLIMATE)
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("temperature") == 47
-    mqtt_mock.async_publish.assert_called_once_with("temperature-topic", 47, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "temperature-topic", "47.0", 0, False
+    )
 
     # also test directly supplying the operation mode to set_temperature
     mqtt_mock.async_publish.reset_mock()
@@ -333,7 +335,10 @@ async def test_set_target_temperature(hass, mqtt_mock):
     assert state.state == "cool"
     assert state.attributes.get("temperature") == 21
     mqtt_mock.async_publish.assert_has_calls(
-        [call("mode-topic", "cool", 0, False), call("temperature-topic", 21, 0, False)]
+        [
+            call("mode-topic", "cool", 0, False),
+            call("temperature-topic", "21.0", 0, False),
+        ]
     )
     mqtt_mock.async_publish.reset_mock()
 
@@ -372,8 +377,8 @@ async def test_set_target_temperature_low_high(hass, mqtt_mock):
     state = hass.states.get(ENTITY_CLIMATE)
     assert state.attributes.get("target_temp_low") == 20
     assert state.attributes.get("target_temp_high") == 23
-    mqtt_mock.async_publish.assert_any_call("temperature-low-topic", 20, 0, False)
-    mqtt_mock.async_publish.assert_any_call("temperature-high-topic", 23, 0, False)
+    mqtt_mock.async_publish.assert_any_call("temperature-low-topic", "20.0", 0, False)
+    mqtt_mock.async_publish.assert_any_call("temperature-high-topic", "23.0", 0, False)
 
 
 async def test_set_target_temperature_low_highpessimistic(hass, mqtt_mock):
diff --git a/tests/components/mqtt/test_common.py b/tests/components/mqtt/test_common.py
index 27ee060ebfa..e706bc47418 100644
--- a/tests/components/mqtt/test_common.py
+++ b/tests/components/mqtt/test_common.py
@@ -2,17 +2,15 @@
 import copy
 from datetime import datetime
 import json
-from unittest import mock
 
 from homeassistant.components import mqtt
 from homeassistant.components.mqtt import debug_info
 from homeassistant.components.mqtt.const import MQTT_DISCONNECTED
-from homeassistant.components.mqtt.discovery import async_start
 from homeassistant.const import ATTR_ASSUMED_STATE, STATE_UNAVAILABLE
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.setup import async_setup_component
 
-from tests.async_mock import ANY
+from tests.async_mock import ANY, patch
 from tests.common import async_fire_mqtt_message, mock_registry
 
 DEFAULT_CONFIG_DEVICE_INFO_ID = {
@@ -287,8 +285,6 @@ async def help_test_discovery_update_availability(
     data2 = json.dumps(config2[domain])
     data3 = json.dumps(config3[domain])
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", data1)
     await hass.async_block_till_done()
 
@@ -451,8 +447,6 @@ async def help_test_discovery_update_attr(hass, mqtt_mock, caplog, domain, confi
     data1 = json.dumps(config1[domain])
     data2 = json.dumps(config2[domain])
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", data1)
     await hass.async_block_till_done()
     async_fire_mqtt_message(hass, "attr-topic1", '{ "val": "100" }')
@@ -486,9 +480,6 @@ async def help_test_discovery_removal(hass, mqtt_mock, caplog, domain, data):
 
     This is a test helper for the MqttDiscoveryUpdate mixin.
     """
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", data)
     await hass.async_block_till_done()
 
@@ -517,9 +508,6 @@ async def help_test_discovery_update(
 
     This is a test helper for the MqttDiscoveryUpdate mixin.
     """
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", discovery_data1)
     await hass.async_block_till_done()
 
@@ -567,9 +555,6 @@ async def help_test_discovery_update_unchanged(
 
     This is a test helper for the MqttDiscoveryUpdate mixin.
     """
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", data1)
     await hass.async_block_till_done()
 
@@ -585,9 +570,6 @@ async def help_test_discovery_update_unchanged(
 
 async def help_test_discovery_broken(hass, mqtt_mock, caplog, domain, data1, data2):
     """Test handling of bad discovery message."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(hass, f"homeassistant/{domain}/bla/config", data1)
     await hass.async_block_till_done()
 
@@ -614,8 +596,6 @@ async def help_test_entity_device_info_with_identifier(hass, mqtt_mock, domain,
     config["device"] = copy.deepcopy(DEFAULT_CONFIG_DEVICE_INFO_ID)
     config["unique_id"] = "veryunique"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -641,8 +621,6 @@ async def help_test_entity_device_info_with_connection(hass, mqtt_mock, domain,
     config["device"] = copy.deepcopy(DEFAULT_CONFIG_DEVICE_INFO_MAC)
     config["unique_id"] = "veryunique"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -665,8 +643,6 @@ async def help_test_entity_device_info_remove(hass, mqtt_mock, domain, config):
     config["device"] = copy.deepcopy(DEFAULT_CONFIG_DEVICE_INFO_ID)
     config["unique_id"] = "veryunique"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     dev_registry = await hass.helpers.device_registry.async_get_registry()
     ent_registry = await hass.helpers.entity_registry.async_get_registry()
 
@@ -696,8 +672,6 @@ async def help_test_entity_device_info_update(hass, mqtt_mock, domain, config):
     config["device"] = copy.deepcopy(DEFAULT_CONFIG_DEVICE_INFO_ID)
     config["unique_id"] = "veryunique"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -772,8 +746,6 @@ async def help_test_entity_id_update_discovery_update(
         config[domain]["availability_topic"] = "avty-topic"
         topic = "avty-topic"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     ent_registry = mock_registry(hass, {})
 
     data = json.dumps(config[domain])
@@ -812,8 +784,6 @@ async def help_test_entity_debug_info(hass, mqtt_mock, domain, config):
     config["device"] = copy.deepcopy(DEFAULT_CONFIG_DEVICE_INFO_ID)
     config["unique_id"] = "veryunique"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -847,8 +817,6 @@ async def help_test_entity_debug_info_max_messages(hass, mqtt_mock, domain, conf
     config["device"] = copy.deepcopy(DEFAULT_CONFIG_DEVICE_INFO_ID)
     config["unique_id"] = "veryunique"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -865,7 +833,7 @@ async def help_test_entity_debug_info_max_messages(hass, mqtt_mock, domain, conf
     ]
 
     start_dt = datetime(2019, 1, 1, 0, 0, 0)
-    with mock.patch("homeassistant.util.dt.utcnow") as dt_utcnow:
+    with patch("homeassistant.util.dt.utcnow") as dt_utcnow:
         dt_utcnow.return_value = start_dt
         for i in range(0, debug_info.STORED_MESSAGES + 1):
             async_fire_mqtt_message(hass, "test-topic", f"{i}")
@@ -911,8 +879,6 @@ async def help_test_entity_debug_info_message(
     if payload is None:
         payload = "ON"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -929,7 +895,7 @@ async def help_test_entity_debug_info_message(
     ]
 
     start_dt = datetime(2019, 1, 1, 0, 0, 0)
-    with mock.patch("homeassistant.util.dt.utcnow") as dt_utcnow:
+    with patch("homeassistant.util.dt.utcnow") as dt_utcnow:
         dt_utcnow.return_value = start_dt
         async_fire_mqtt_message(hass, topic, payload)
 
@@ -959,8 +925,6 @@ async def help_test_entity_debug_info_remove(hass, mqtt_mock, domain, config):
     config["device"] = copy.deepcopy(DEFAULT_CONFIG_DEVICE_INFO_ID)
     config["unique_id"] = "veryunique"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -1004,8 +968,6 @@ async def help_test_entity_debug_info_update_entity_id(hass, mqtt_mock, domain,
     config["device"] = copy.deepcopy(DEFAULT_CONFIG_DEVICE_INFO_ID)
     config["unique_id"] = "veryunique"
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     dev_registry = await hass.helpers.device_registry.async_get_registry()
     ent_registry = mock_registry(hass, {})
 
diff --git a/tests/components/mqtt/test_config_flow.py b/tests/components/mqtt/test_config_flow.py
index ef6e7a7656c..41dc4745528 100644
--- a/tests/components/mqtt/test_config_flow.py
+++ b/tests/components/mqtt/test_config_flow.py
@@ -5,7 +5,6 @@ import voluptuous as vol
 
 from homeassistant import data_entry_flow
 from homeassistant.components import mqtt
-from homeassistant.components.mqtt.discovery import async_start
 from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
@@ -45,7 +44,7 @@ async def test_user_connection_works(hass, mock_try_connection, mock_finish_setu
     assert result["result"].data == {
         "broker": "127.0.0.1",
         "port": 1883,
-        "discovery": False,
+        "discovery": True,
     }
     # Check we tried the connection
     assert len(mock_try_connection.mock_calls) == 1
@@ -154,7 +153,6 @@ async def test_option_flow(hass, mqtt_mock, mock_try_connection):
     """Test config flow options."""
     mock_try_connection.return_value = True
     config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
     config_entry.data = {
         mqtt.CONF_BROKER: "test-broker",
         mqtt.CONF_PORT: 1234,
@@ -227,7 +225,6 @@ async def test_disable_birth_will(hass, mqtt_mock, mock_try_connection):
     """Test disabling birth and will."""
     mock_try_connection.return_value = True
     config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
     config_entry.data = {
         mqtt.CONF_BROKER: "test-broker",
         mqtt.CONF_PORT: 1234,
@@ -310,7 +307,6 @@ async def test_option_flow_default_suggested_values(
     """Test config flow options has default/suggested values."""
     mock_try_connection.return_value = True
     config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
     config_entry.data = {
         mqtt.CONF_BROKER: "test-broker",
         mqtt.CONF_PORT: 1234,
diff --git a/tests/components/mqtt/test_cover.py b/tests/components/mqtt/test_cover.py
index d1529e63fc7..629d9674b22 100644
--- a/tests/components/mqtt/test_cover.py
+++ b/tests/components/mqtt/test_cover.py
@@ -734,7 +734,7 @@ async def test_set_position_untemplated(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("position-topic", 62, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with("position-topic", "62", 0, False)
 
 
 async def test_set_position_untemplated_custom_percentage_range(hass, mqtt_mock):
@@ -766,7 +766,7 @@ async def test_set_position_untemplated_custom_percentage_range(hass, mqtt_mock)
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("position-topic", 62, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with("position-topic", "62", 0, False)
 
 
 async def test_no_command_topic(hass, mqtt_mock):
@@ -898,7 +898,9 @@ async def test_tilt_via_invocation_defaults(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 100, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "100", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     await hass.services.async_call(
@@ -908,7 +910,7 @@ async def test_tilt_via_invocation_defaults(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 0, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", "0", 0, False)
     mqtt_mock.async_publish.reset_mock()
 
     # Close tilt status would be received from device when non-optimistic
@@ -926,7 +928,9 @@ async def test_tilt_via_invocation_defaults(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 100, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "100", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     # Open tilt status would be received from device when non-optimistic
@@ -944,7 +948,7 @@ async def test_tilt_via_invocation_defaults(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 0, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", "0", 0, False)
 
 
 async def test_tilt_given_value(hass, mqtt_mock):
@@ -978,7 +982,9 @@ async def test_tilt_given_value(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 80, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "80", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     await hass.services.async_call(
@@ -988,7 +994,9 @@ async def test_tilt_given_value(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 25, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "25", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     # Close tilt status would be received from device when non-optimistic
@@ -1006,7 +1014,9 @@ async def test_tilt_given_value(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 80, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "80", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     # Open tilt status would be received from device when non-optimistic
@@ -1024,7 +1034,9 @@ async def test_tilt_given_value(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 25, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "25", 0, False
+    )
 
 
 async def test_tilt_given_value_optimistic(hass, mqtt_mock):
@@ -1064,7 +1076,9 @@ async def test_tilt_given_value_optimistic(hass, mqtt_mock):
     ]
     assert current_cover_tilt_position == 80
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 80, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "80", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     await hass.services.async_call(
@@ -1079,7 +1093,9 @@ async def test_tilt_given_value_optimistic(hass, mqtt_mock):
     ]
     assert current_cover_tilt_position == 25
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 25, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "25", 0, False
+    )
 
 
 async def test_tilt_given_value_altered_range(hass, mqtt_mock):
@@ -1121,7 +1137,9 @@ async def test_tilt_given_value_altered_range(hass, mqtt_mock):
     ]
     assert current_cover_tilt_position == 50
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 25, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "25", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     await hass.services.async_call(
@@ -1136,7 +1154,7 @@ async def test_tilt_given_value_altered_range(hass, mqtt_mock):
     ]
     assert current_cover_tilt_position == 0
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 0, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", "0", 0, False)
     mqtt_mock.async_publish.reset_mock()
 
     await hass.services.async_call(
@@ -1151,7 +1169,9 @@ async def test_tilt_given_value_altered_range(hass, mqtt_mock):
     ]
     assert current_cover_tilt_position == 50
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 25, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "25", 0, False
+    )
 
 
 async def test_tilt_via_topic(hass, mqtt_mock):
@@ -1355,7 +1375,9 @@ async def test_tilt_position(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 50, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "50", 0, False
+    )
 
 
 async def test_tilt_position_altered_range(hass, mqtt_mock):
@@ -1391,7 +1413,9 @@ async def test_tilt_position_altered_range(hass, mqtt_mock):
         blocking=True,
     )
 
-    mqtt_mock.async_publish.assert_called_once_with("tilt-command-topic", 25, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tilt-command-topic", "25", 0, False
+    )
 
 
 async def test_find_percentage_in_range_defaults(hass, mqtt_mock):
diff --git a/tests/components/mqtt/test_device_trigger.py b/tests/components/mqtt/test_device_trigger.py
index 43b483c074b..844f34e8d4f 100644
--- a/tests/components/mqtt/test_device_trigger.py
+++ b/tests/components/mqtt/test_device_trigger.py
@@ -6,7 +6,6 @@ import pytest
 import homeassistant.components.automation as automation
 from homeassistant.components.mqtt import DOMAIN, debug_info
 from homeassistant.components.mqtt.device_trigger import async_attach_trigger
-from homeassistant.components.mqtt.discovery import async_start
 from homeassistant.setup import async_setup_component
 
 from tests.common import (
@@ -39,9 +38,6 @@ def calls(hass):
 
 async def test_get_triggers(hass, device_reg, entity_reg, mqtt_mock):
     """Test we get the expected triggers from a discovered mqtt device."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data1 = (
         '{ "automation_type":"trigger",'
         '  "device":{"identifiers":["0AFFD2"]},'
@@ -70,9 +66,6 @@ async def test_get_triggers(hass, device_reg, entity_reg, mqtt_mock):
 
 async def test_get_unknown_triggers(hass, device_reg, entity_reg, mqtt_mock):
     """Test we don't get unknown triggers."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     # Discover a sensor (without device triggers)
     data1 = (
         '{ "device":{"identifiers":["0AFFD2"]},'
@@ -113,9 +106,6 @@ async def test_get_unknown_triggers(hass, device_reg, entity_reg, mqtt_mock):
 
 async def test_get_non_existing_triggers(hass, device_reg, entity_reg, mqtt_mock):
     """Test getting non existing triggers."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     # Discover a sensor (without device triggers)
     data1 = (
         '{ "device":{"identifiers":["0AFFD2"]},'
@@ -133,9 +123,6 @@ async def test_get_non_existing_triggers(hass, device_reg, entity_reg, mqtt_mock
 @pytest.mark.no_fail_on_log_exception
 async def test_discover_bad_triggers(hass, device_reg, entity_reg, mqtt_mock):
     """Test bad discovery message."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     # Test sending bad data
     data0 = (
         '{ "automation_type":"trigger",'
@@ -178,9 +165,6 @@ async def test_discover_bad_triggers(hass, device_reg, entity_reg, mqtt_mock):
 
 async def test_update_remove_triggers(hass, device_reg, entity_reg, mqtt_mock):
     """Test triggers can be updated and removed."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data1 = (
         '{ "automation_type":"trigger",'
         '  "device":{"identifiers":["0AFFD2"]},'
@@ -234,9 +218,6 @@ async def test_update_remove_triggers(hass, device_reg, entity_reg, mqtt_mock):
 
 async def test_if_fires_on_mqtt_message(hass, device_reg, calls, mqtt_mock):
     """Test triggers firing."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data1 = (
         '{ "automation_type":"trigger",'
         '  "device":{"identifiers":["0AFFD2"]},'
@@ -312,9 +293,6 @@ async def test_if_fires_on_mqtt_message_late_discover(
     hass, device_reg, calls, mqtt_mock
 ):
     """Test triggers firing of MQTT device triggers discovered after setup."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data0 = (
         '{ "device":{"identifiers":["0AFFD2"]},'
         '  "state_topic": "foobar/sensor",'
@@ -398,9 +376,6 @@ async def test_if_fires_on_mqtt_message_after_update(
     hass, device_reg, calls, mqtt_mock
 ):
     """Test triggers firing after update."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data1 = (
         '{ "automation_type":"trigger",'
         '  "device":{"identifiers":["0AFFD2"]},'
@@ -474,9 +449,6 @@ async def test_if_fires_on_mqtt_message_after_update(
 
 async def test_no_resubscribe_same_topic(hass, device_reg, mqtt_mock):
     """Test subscription to topics without change."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data1 = (
         '{ "automation_type":"trigger",'
         '  "device":{"identifiers":["0AFFD2"]},'
@@ -521,9 +493,6 @@ async def test_not_fires_on_mqtt_message_after_remove_by_mqtt(
     hass, device_reg, calls, mqtt_mock
 ):
     """Test triggers not firing after removal."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data1 = (
         '{ "automation_type":"trigger",'
         '  "device":{"identifiers":["0AFFD2"]},'
@@ -584,9 +553,6 @@ async def test_not_fires_on_mqtt_message_after_remove_from_registry(
     hass, device_reg, calls, mqtt_mock
 ):
     """Test triggers not firing after removal."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data1 = (
         '{ "automation_type":"trigger",'
         '  "device":{"identifiers":["0AFFD2"]},'
@@ -637,9 +603,6 @@ async def test_not_fires_on_mqtt_message_after_remove_from_registry(
 
 async def test_attach_remove(hass, device_reg, mqtt_mock):
     """Test attach and removal of trigger."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data1 = (
         '{ "automation_type":"trigger",'
         '  "device":{"identifiers":["0AFFD2"]},'
@@ -689,9 +652,6 @@ async def test_attach_remove(hass, device_reg, mqtt_mock):
 
 async def test_attach_remove_late(hass, device_reg, mqtt_mock):
     """Test attach and removal of trigger ."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data0 = (
         '{ "device":{"identifiers":["0AFFD2"]},'
         '  "state_topic": "foobar/sensor",'
@@ -749,9 +709,6 @@ async def test_attach_remove_late(hass, device_reg, mqtt_mock):
 
 async def test_attach_remove_late2(hass, device_reg, mqtt_mock):
     """Test attach and removal of trigger ."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data0 = (
         '{ "device":{"identifiers":["0AFFD2"]},'
         '  "state_topic": "foobar/sensor",'
@@ -803,8 +760,6 @@ async def test_attach_remove_late2(hass, device_reg, mqtt_mock):
 
 async def test_entity_device_info_with_connection(hass, mqtt_mock):
     """Test MQTT device registry integration."""
-    entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(
@@ -836,8 +791,6 @@ async def test_entity_device_info_with_connection(hass, mqtt_mock):
 
 async def test_entity_device_info_with_identifier(hass, mqtt_mock):
     """Test MQTT device registry integration."""
-    entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(
@@ -869,8 +822,6 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
 
 async def test_entity_device_info_update(hass, mqtt_mock):
     """Test device registry update."""
-    entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     config = {
@@ -908,9 +859,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
 
 async def test_cleanup_trigger(hass, device_reg, entity_reg, mqtt_mock):
     """Test trigger discovery topic is cleaned when device is removed from registry."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config = {
         "automation_type": "trigger",
         "topic": "test-topic",
@@ -946,9 +894,6 @@ async def test_cleanup_trigger(hass, device_reg, entity_reg, mqtt_mock):
 
 async def test_cleanup_device(hass, device_reg, entity_reg, mqtt_mock):
     """Test removal from device registry when trigger is removed."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config = {
         "automation_type": "trigger",
         "topic": "test-topic",
@@ -978,9 +923,6 @@ async def test_cleanup_device(hass, device_reg, entity_reg, mqtt_mock):
 
 async def test_cleanup_device_several_triggers(hass, device_reg, entity_reg, mqtt_mock):
     """Test removal from device registry when the last trigger is removed."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config1 = {
         "automation_type": "trigger",
         "topic": "test-topic",
@@ -1037,9 +979,6 @@ async def test_cleanup_device_with_entity1(hass, device_reg, entity_reg, mqtt_mo
 
     Trigger removed first, then entity.
     """
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config1 = {
         "automation_type": "trigger",
         "topic": "test-topic",
@@ -1092,9 +1031,6 @@ async def test_cleanup_device_with_entity2(hass, device_reg, entity_reg, mqtt_mo
 
     Entity removed first, then trigger.
     """
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config1 = {
         "automation_type": "trigger",
         "topic": "test-topic",
@@ -1147,8 +1083,6 @@ async def test_trigger_debug_info(hass, mqtt_mock):
 
     This is a test helper for MQTT debug_info.
     """
-    entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     config = {
diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py
index 59687aaff62..e1365418483 100644
--- a/tests/components/mqtt/test_discovery.py
+++ b/tests/components/mqtt/test_discovery.py
@@ -4,6 +4,7 @@ import re
 
 import pytest
 
+from homeassistant import config_entries
 from homeassistant.components import mqtt
 from homeassistant.components.mqtt.abbreviations import (
     ABBREVIATIONS,
@@ -13,7 +14,12 @@ from homeassistant.components.mqtt.discovery import ALREADY_DISCOVERED, async_st
 from homeassistant.const import STATE_OFF, STATE_ON
 
 from tests.async_mock import AsyncMock, patch
-from tests.common import async_fire_mqtt_message, mock_device_registry, mock_registry
+from tests.common import (
+    async_fire_mqtt_message,
+    mock_device_registry,
+    mock_entity_platform,
+    mock_registry,
+)
 
 
 @pytest.fixture
@@ -28,6 +34,10 @@ def entity_reg(hass):
     return mock_registry(hass)
 
 
+@pytest.mark.parametrize(
+    "mqtt_config",
+    [{mqtt.CONF_BROKER: "mock-broker", mqtt.CONF_DISCOVERY: False}],
+)
 async def test_subscribing_config_topic(hass, mqtt_mock):
     """Test setting up discovery."""
     entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
@@ -46,10 +56,7 @@ async def test_invalid_topic(hass, mqtt_mock):
     with patch(
         "homeassistant.components.mqtt.discovery.async_dispatcher_send"
     ) as mock_dispatcher_send:
-        entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
         mock_dispatcher_send = AsyncMock(return_value=None)
-        await async_start(hass, "homeassistant", entry)
 
         async_fire_mqtt_message(
             hass, "homeassistant/binary_sensor/bla/not_config", "{}"
@@ -63,10 +70,8 @@ async def test_invalid_json(hass, mqtt_mock, caplog):
     with patch(
         "homeassistant.components.mqtt.discovery.async_dispatcher_send"
     ) as mock_dispatcher_send:
-        entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
 
         mock_dispatcher_send = AsyncMock(return_value=None)
-        await async_start(hass, "homeassistant", entry)
 
         async_fire_mqtt_message(
             hass, "homeassistant/binary_sensor/bla/config", "not json"
@@ -81,12 +86,10 @@ async def test_only_valid_components(hass, mqtt_mock, caplog):
     with patch(
         "homeassistant.components.mqtt.discovery.async_dispatcher_send"
     ) as mock_dispatcher_send:
-        entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
 
         invalid_component = "timer"
 
         mock_dispatcher_send = AsyncMock(return_value=None)
-        await async_start(hass, "homeassistant", entry)
 
         async_fire_mqtt_message(
             hass, f"homeassistant/{invalid_component}/bla/config", "{}"
@@ -101,10 +104,6 @@ async def test_only_valid_components(hass, mqtt_mock, caplog):
 
 async def test_correct_config_discovery(hass, mqtt_mock, caplog):
     """Test sending in correct JSON."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(
         hass,
         "homeassistant/binary_sensor/bla/config",
@@ -121,10 +120,6 @@ async def test_correct_config_discovery(hass, mqtt_mock, caplog):
 
 async def test_discover_fan(hass, mqtt_mock, caplog):
     """Test discovering an MQTT fan."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(
         hass,
         "homeassistant/fan/bla/config",
@@ -141,10 +136,6 @@ async def test_discover_fan(hass, mqtt_mock, caplog):
 
 async def test_discover_climate(hass, mqtt_mock, caplog):
     """Test discovering an MQTT climate component."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     data = (
         '{ "name": "ClimateTest",'
         '  "current_temperature_topic": "climate/bla/current_temp",'
@@ -163,10 +154,6 @@ async def test_discover_climate(hass, mqtt_mock, caplog):
 
 async def test_discover_alarm_control_panel(hass, mqtt_mock, caplog):
     """Test discovering an MQTT alarm control panel component."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     data = (
         '{ "name": "AlarmControlPanelTest",'
         '  "state_topic": "test_topic",'
@@ -185,10 +172,6 @@ async def test_discover_alarm_control_panel(hass, mqtt_mock, caplog):
 
 async def test_discovery_incl_nodeid(hass, mqtt_mock, caplog):
     """Test sending in correct JSON with optional node_id included."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(
         hass,
         "homeassistant/binary_sensor/my_node_id/bla/config",
@@ -205,10 +188,6 @@ async def test_discovery_incl_nodeid(hass, mqtt_mock, caplog):
 
 async def test_non_duplicate_discovery(hass, mqtt_mock, caplog):
     """Test for a non duplicate component."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(
         hass,
         "homeassistant/binary_sensor/bla/config",
@@ -232,10 +211,6 @@ async def test_non_duplicate_discovery(hass, mqtt_mock, caplog):
 
 async def test_removal(hass, mqtt_mock, caplog):
     """Test removal of component through empty discovery message."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(
         hass,
         "homeassistant/binary_sensor/bla/config",
@@ -253,10 +228,6 @@ async def test_removal(hass, mqtt_mock, caplog):
 
 async def test_rediscover(hass, mqtt_mock, caplog):
     """Test rediscover of removed component."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(
         hass,
         "homeassistant/binary_sensor/bla/config",
@@ -283,10 +254,6 @@ async def test_rediscover(hass, mqtt_mock, caplog):
 
 async def test_duplicate_removal(hass, mqtt_mock, caplog):
     """Test for a non duplicate component."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     async_fire_mqtt_message(
         hass,
         "homeassistant/binary_sensor/bla/config",
@@ -305,9 +272,6 @@ async def test_duplicate_removal(hass, mqtt_mock, caplog):
 
 async def test_cleanup_device(hass, device_reg, entity_reg, mqtt_mock):
     """Test discvered device is cleaned up when removed from registry."""
-    config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data = (
         '{ "device":{"identifiers":["0AFFD2"]},'
         '  "state_topic": "foobar/sensor",'
@@ -348,10 +312,6 @@ async def test_cleanup_device(hass, device_reg, entity_reg, mqtt_mock):
 
 async def test_discovery_expansion(hass, mqtt_mock, caplog):
     """Test expansion of abbreviated discovery payload."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     data = (
         '{ "~": "some/base/topic",'
         '  "name": "DiscoveryExpansionTest1",'
@@ -440,10 +400,6 @@ async def test_missing_discover_abbreviations(hass, mqtt_mock, caplog):
 
 async def test_no_implicit_state_topic_switch(hass, mqtt_mock, caplog):
     """Test no implicit state topic for switch."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "homeassistant", entry)
-
     data = '{ "name": "Test1",' '  "command_topic": "cmnd"' "}"
 
     async_fire_mqtt_message(hass, "homeassistant/switch/bla/config", data)
@@ -463,12 +419,17 @@ async def test_no_implicit_state_topic_switch(hass, mqtt_mock, caplog):
     assert state.state == "off"
 
 
+@pytest.mark.parametrize(
+    "mqtt_config",
+    [
+        {
+            mqtt.CONF_BROKER: "mock-broker",
+            mqtt.CONF_DISCOVERY_PREFIX: "my_home/homeassistant/register",
+        }
+    ],
+)
 async def test_complex_discovery_topic_prefix(hass, mqtt_mock, caplog):
     """Tests handling of discovery topic prefix with multiple slashes."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-
-    await async_start(hass, "my_home/homeassistant/register", entry)
-
     async_fire_mqtt_message(
         hass,
         ("my_home/homeassistant/register/binary_sensor/node1/object1/config"),
@@ -481,3 +442,75 @@ async def test_complex_discovery_topic_prefix(hass, mqtt_mock, caplog):
     assert state is not None
     assert state.name == "Beer"
     assert ("binary_sensor", "node1 object1") in hass.data[ALREADY_DISCOVERED]
+
+
+async def test_mqtt_integration_discovery_subscribe_unsubscribe(
+    hass, mqtt_client_mock, mqtt_mock
+):
+    """Check MQTT integration discovery subscribe and unsubscribe."""
+    mock_entity_platform(hass, "config_flow.comp", None)
+
+    entry = hass.config_entries.async_entries("mqtt")[0]
+    mqtt_mock().connected = True
+
+    with patch(
+        "homeassistant.components.mqtt.discovery.async_get_mqtt",
+        return_value={"comp": ["comp/discovery/#"]},
+    ):
+        await async_start(hass, "homeassistant", entry)
+        await hass.async_block_till_done()
+
+    mqtt_client_mock.subscribe.assert_any_call("comp/discovery/#", 0)
+    assert not mqtt_client_mock.unsubscribe.called
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        async def async_step_mqtt(self, discovery_info):
+            """Test mqtt step."""
+            return self.async_abort(reason="already_configured")
+
+    with patch.dict(config_entries.HANDLERS, {"comp": TestFlow}):
+        mqtt_client_mock.subscribe.assert_any_call("comp/discovery/#", 0)
+        assert not mqtt_client_mock.unsubscribe.called
+
+        async_fire_mqtt_message(hass, "comp/discovery/bla/config", "")
+        await hass.async_block_till_done()
+        mqtt_client_mock.unsubscribe.assert_called_once_with("comp/discovery/#")
+        mqtt_client_mock.unsubscribe.reset_mock()
+
+        async_fire_mqtt_message(hass, "comp/discovery/bla/config", "")
+        await hass.async_block_till_done()
+        assert not mqtt_client_mock.unsubscribe.called
+
+
+async def test_mqtt_discovery_unsubscribe_once(hass, mqtt_client_mock, mqtt_mock):
+    """Check MQTT integration discovery unsubscribe once."""
+    mock_entity_platform(hass, "config_flow.comp", None)
+
+    entry = hass.config_entries.async_entries("mqtt")[0]
+    mqtt_mock().connected = True
+
+    with patch(
+        "homeassistant.components.mqtt.discovery.async_get_mqtt",
+        return_value={"comp": ["comp/discovery/#"]},
+    ):
+        await async_start(hass, "homeassistant", entry)
+        await hass.async_block_till_done()
+
+    mqtt_client_mock.subscribe.assert_any_call("comp/discovery/#", 0)
+    assert not mqtt_client_mock.unsubscribe.called
+
+    class TestFlow(config_entries.ConfigFlow):
+        """Test flow."""
+
+        async def async_step_mqtt(self, discovery_info):
+            """Test mqtt step."""
+            return self.async_abort(reason="already_configured")
+
+    with patch.dict(config_entries.HANDLERS, {"comp": TestFlow}):
+        async_fire_mqtt_message(hass, "comp/discovery/bla/config", "")
+        async_fire_mqtt_message(hass, "comp/discovery/bla/config", "")
+        await hass.async_block_till_done()
+        await hass.async_block_till_done()
+        mqtt_client_mock.unsubscribe.assert_called_once_with("comp/discovery/#")
diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py
index a4d1261daf8..39ea8bc92ec 100644
--- a/tests/components/mqtt/test_init.py
+++ b/tests/components/mqtt/test_init.py
@@ -9,7 +9,6 @@ import voluptuous as vol
 
 from homeassistant.components import mqtt, websocket_api
 from homeassistant.components.mqtt import debug_info
-from homeassistant.components.mqtt.discovery import async_start
 from homeassistant.const import (
     ATTR_DOMAIN,
     ATTR_SERVICE,
@@ -625,6 +624,10 @@ async def test_not_calling_unsubscribe_with_active_subscribers(
     assert not mqtt_client_mock.unsubscribe.called
 
 
+@pytest.mark.parametrize(
+    "mqtt_config",
+    [{mqtt.CONF_BROKER: "mock-broker", mqtt.CONF_DISCOVERY: False}],
+)
 async def test_restore_subscriptions_on_reconnect(hass, mqtt_client_mock, mqtt_mock):
     """Test subscriptions are restored on reconnect."""
     # Fake that the client is connected
@@ -640,6 +643,10 @@ async def test_restore_subscriptions_on_reconnect(hass, mqtt_client_mock, mqtt_m
     assert mqtt_client_mock.subscribe.call_count == 2
 
 
+@pytest.mark.parametrize(
+    "mqtt_config",
+    [{mqtt.CONF_BROKER: "mock-broker", mqtt.CONF_DISCOVERY: False}],
+)
 async def test_restore_all_active_subscriptions_on_reconnect(
     hass, mqtt_client_mock, mqtt_mock
 ):
@@ -840,7 +847,13 @@ async def test_no_will_message(hass, mqtt_client_mock, mqtt_mock):
 
 @pytest.mark.parametrize(
     "mqtt_config",
-    [{mqtt.CONF_BROKER: "mock-broker", mqtt.CONF_BIRTH_MESSAGE: {}}],
+    [
+        {
+            mqtt.CONF_BROKER: "mock-broker",
+            mqtt.CONF_BIRTH_MESSAGE: {},
+            mqtt.CONF_DISCOVERY: False,
+        }
+    ],
 )
 async def test_mqtt_subscribes_topics_on_connect(hass, mqtt_client_mock, mqtt_mock):
     """Test subscription to topic on connect."""
@@ -933,9 +946,6 @@ async def test_mqtt_ws_remove_discovered_device(
     hass, device_reg, entity_reg, hass_ws_client, mqtt_mock
 ):
     """Test MQTT websocket device removal."""
-    config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data = (
         '{ "device":{"identifiers":["0AFFD2"]},'
         '  "state_topic": "foobar/sensor",'
@@ -965,9 +975,6 @@ async def test_mqtt_ws_remove_discovered_device_twice(
     hass, device_reg, hass_ws_client, mqtt_mock
 ):
     """Test MQTT websocket device removal."""
-    config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data = (
         '{ "device":{"identifiers":["0AFFD2"]},'
         '  "state_topic": "foobar/sensor",'
@@ -999,9 +1006,6 @@ async def test_mqtt_ws_remove_discovered_device_same_topic(
     hass, device_reg, hass_ws_client, mqtt_mock
 ):
     """Test MQTT websocket device removal."""
-    config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     data = (
         '{ "device":{"identifiers":["0AFFD2"]},'
         '  "state_topic": "foobar/sensor",'
@@ -1056,9 +1060,6 @@ async def test_mqtt_ws_get_device_debug_info(
     hass, device_reg, hass_ws_client, mqtt_mock
 ):
     """Test MQTT websocket device debug info."""
-    config_entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config = {
         "device": {"identifiers": ["0AFFD2"]},
         "platform": "mqtt",
@@ -1141,8 +1142,6 @@ async def test_debug_info_multiple_devices(hass, mqtt_mock):
         },
     ]
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     for d in devices:
@@ -1222,8 +1221,6 @@ async def test_debug_info_multiple_entities_triggers(hass, mqtt_mock):
         },
     ]
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     for c in config:
@@ -1299,8 +1296,6 @@ async def test_debug_info_wildcard(hass, mqtt_mock):
         "unique_id": "veryunique",
     }
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -1347,8 +1342,6 @@ async def test_debug_info_filter_same(hass, mqtt_mock):
         "unique_id": "veryunique",
     }
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -1408,8 +1401,6 @@ async def test_debug_info_same_topic(hass, mqtt_mock):
         "unique_id": "veryunique",
     }
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -1461,8 +1452,6 @@ async def test_debug_info_qos_retain(hass, mqtt_mock):
         "unique_id": "veryunique",
     }
 
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(config)
@@ -1508,3 +1497,50 @@ async def test_debug_info_qos_retain(hass, mqtt_mock):
         "time": start_dt,
         "topic": "sensor/abc",
     } in debug_info_data["entities"][0]["subscriptions"][0]["messages"]
+
+
+async def test_publish_json_from_template(hass, mqtt_mock):
+    """Test the publishing of call to services."""
+    test_str = "{'valid': 'python', 'invalid': 'json'}"
+    test_str_tpl = "{'valid': '{{ \"python\" }}', 'invalid': 'json'}"
+
+    await async_setup_component(
+        hass,
+        "script",
+        {
+            "script": {
+                "test_script_payload": {
+                    "sequence": {
+                        "service": "mqtt.publish",
+                        "data": {"topic": "test-topic", "payload": test_str_tpl},
+                    }
+                },
+                "test_script_payload_template": {
+                    "sequence": {
+                        "service": "mqtt.publish",
+                        "data": {
+                            "topic": "test-topic",
+                            "payload_template": test_str_tpl,
+                        },
+                    }
+                },
+            }
+        },
+    )
+
+    await hass.services.async_call("script", "test_script_payload", blocking=True)
+    await hass.async_block_till_done()
+
+    assert mqtt_mock.async_publish.called
+    assert mqtt_mock.async_publish.call_args[0][1] == test_str
+
+    mqtt_mock.async_publish.reset_mock()
+    assert not mqtt_mock.async_publish.called
+
+    await hass.services.async_call(
+        "script", "test_script_payload_template", blocking=True
+    )
+    await hass.async_block_till_done()
+
+    assert mqtt_mock.async_publish.called
+    assert mqtt_mock.async_publish.call_args[0][1] == test_str
diff --git a/tests/components/mqtt/test_light.py b/tests/components/mqtt/test_light.py
index 5481b8b2565..102d1726ccc 100644
--- a/tests/components/mqtt/test_light.py
+++ b/tests/components/mqtt/test_light.py
@@ -159,8 +159,7 @@ from os import path
 import pytest
 
 from homeassistant import config as hass_config
-from homeassistant.components import light, mqtt
-from homeassistant.components.mqtt.discovery import async_start
+from homeassistant.components import light
 from homeassistant.const import ATTR_ASSUMED_STATE, SERVICE_RELOAD, STATE_OFF, STATE_ON
 import homeassistant.core as ha
 from homeassistant.setup import async_setup_component
@@ -290,13 +289,13 @@ async def test_controlling_state_via_topic(hass, mqtt_mock):
 
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("rgb_color") == (255, 255, 255)
-    assert state.attributes.get("brightness") == 255
-    assert state.attributes.get("color_temp") == 150
-    assert state.attributes.get("effect") == "none"
-    assert state.attributes.get("hs_color") == (0, 0)
-    assert state.attributes.get("white_value") == 255
-    assert state.attributes.get("xy_color") == (0.323, 0.329)
+    assert state.attributes.get("rgb_color") is None
+    assert state.attributes.get("brightness") is None
+    assert state.attributes.get("color_temp") is None
+    assert state.attributes.get("effect") is None
+    assert state.attributes.get("hs_color") is None
+    assert state.attributes.get("white_value") is None
+    assert state.attributes.get("xy_color") is None
 
     async_fire_mqtt_message(hass, "test_light_rgb/status", "0")
 
@@ -384,12 +383,17 @@ async def test_invalid_state_via_topic(hass, mqtt_mock, caplog):
     assert not state.attributes.get(ATTR_ASSUMED_STATE)
 
     async_fire_mqtt_message(hass, "test_light_rgb/status", "1")
+    async_fire_mqtt_message(hass, "test_light_rgb/rgb/status", "255,255,255")
+    async_fire_mqtt_message(hass, "test_light_rgb/brightness/status", "255")
+    async_fire_mqtt_message(hass, "test_light_rgb/color_temp/status", "153")
+    async_fire_mqtt_message(hass, "test_light_rgb/effect/status", "none")
+    async_fire_mqtt_message(hass, "test_light_rgb/white_value/status", "255")
 
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
     assert state.attributes.get("rgb_color") == (255, 255, 255)
     assert state.attributes.get("brightness") == 255
-    assert state.attributes.get("color_temp") == 150
+    assert state.attributes.get("color_temp") == 153
     assert state.attributes.get("effect") == "none"
     assert state.attributes.get("hs_color") == (0, 0)
     assert state.attributes.get("white_value") == 255
@@ -408,7 +412,7 @@ async def test_invalid_state_via_topic(hass, mqtt_mock, caplog):
     async_fire_mqtt_message(hass, "test_light_rgb/color_temp/status", "")
     assert "Ignoring empty color temp message" in caplog.text
     light_state = hass.states.get("light.test")
-    assert light_state.attributes["color_temp"] == 150
+    assert light_state.attributes["color_temp"] == 153
 
     async_fire_mqtt_message(hass, "test_light_rgb/effect/status", "")
     assert "Ignoring empty effect message" in caplog.text
@@ -473,7 +477,7 @@ async def test_brightness_controlling_scale(hass, mqtt_mock):
 
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("brightness") == 255
+    assert state.attributes.get("brightness") is None
 
     async_fire_mqtt_message(hass, "test_scale/status", "off")
 
@@ -559,7 +563,7 @@ async def test_white_value_controlling_scale(hass, mqtt_mock):
 
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("white_value") == 255
+    assert state.attributes.get("white_value") is None
 
     async_fire_mqtt_message(hass, "test_scale/status", "off")
 
@@ -756,11 +760,11 @@ async def test_sending_mqtt_commands_and_optimistic(hass, mqtt_mock):
         [
             call("test_light_rgb/set", "on", 2, False),
             call("test_light_rgb/rgb/set", "255,128,0", 2, False),
-            call("test_light_rgb/brightness/set", 50, 2, False),
+            call("test_light_rgb/brightness/set", "50", 2, False),
             call("test_light_rgb/hs/set", "359.0,78.0", 2, False),
-            call("test_light_rgb/white_value/set", 80, 2, False),
+            call("test_light_rgb/white_value/set", "80", 2, False),
             call("test_light_rgb/xy/set", "0.14,0.131", 2, False),
-            call("test_light_rgb/color_temp/set", 125, 2, False),
+            call("test_light_rgb/color_temp/set", "125", 2, False),
         ],
         any_order=True,
     )
@@ -847,162 +851,6 @@ async def test_sending_mqtt_color_temp_command_with_template(hass, mqtt_mock):
     assert state.attributes["color_temp"] == 100
 
 
-async def test_show_brightness_if_only_command_topic(hass, mqtt_mock):
-    """Test the brightness if only a command topic is present."""
-    config = {
-        light.DOMAIN: {
-            "platform": "mqtt",
-            "name": "test",
-            "brightness_command_topic": "test_light_rgb/brightness/set",
-            "command_topic": "test_light_rgb/set",
-            "state_topic": "test_light_rgb/status",
-        }
-    }
-
-    assert await async_setup_component(hass, light.DOMAIN, config)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_OFF
-    assert state.attributes.get("brightness") is None
-
-    async_fire_mqtt_message(hass, "test_light_rgb/status", "ON")
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("brightness") == 255
-
-
-async def test_show_color_temp_only_if_command_topic(hass, mqtt_mock):
-    """Test the color temp only if a command topic is present."""
-    config = {
-        light.DOMAIN: {
-            "platform": "mqtt",
-            "name": "test",
-            "color_temp_command_topic": "test_light_rgb/brightness/set",
-            "command_topic": "test_light_rgb/set",
-            "state_topic": "test_light_rgb/status",
-        }
-    }
-
-    assert await async_setup_component(hass, light.DOMAIN, config)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_OFF
-    assert state.attributes.get("color_temp") is None
-
-    async_fire_mqtt_message(hass, "test_light_rgb/status", "ON")
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("color_temp") == 150
-
-
-async def test_show_effect_only_if_command_topic(hass, mqtt_mock):
-    """Test the effect only if a command topic is present."""
-    config = {
-        light.DOMAIN: {
-            "platform": "mqtt",
-            "name": "test",
-            "effect_command_topic": "test_light_rgb/effect/set",
-            "command_topic": "test_light_rgb/set",
-            "state_topic": "test_light_rgb/status",
-        }
-    }
-
-    assert await async_setup_component(hass, light.DOMAIN, config)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_OFF
-    assert state.attributes.get("effect") is None
-
-    async_fire_mqtt_message(hass, "test_light_rgb/status", "ON")
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("effect") == "none"
-
-
-async def test_show_hs_if_only_command_topic(hass, mqtt_mock):
-    """Test the hs if only a command topic is present."""
-    config = {
-        light.DOMAIN: {
-            "platform": "mqtt",
-            "name": "test",
-            "hs_command_topic": "test_light_rgb/hs/set",
-            "command_topic": "test_light_rgb/set",
-            "state_topic": "test_light_rgb/status",
-        }
-    }
-
-    assert await async_setup_component(hass, light.DOMAIN, config)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_OFF
-    assert state.attributes.get("hs_color") is None
-
-    async_fire_mqtt_message(hass, "test_light_rgb/status", "ON")
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("hs_color") == (0, 0)
-
-
-async def test_show_white_value_if_only_command_topic(hass, mqtt_mock):
-    """Test the white_value if only a command topic is present."""
-    config = {
-        light.DOMAIN: {
-            "platform": "mqtt",
-            "name": "test",
-            "white_value_command_topic": "test_light_rgb/white_value/set",
-            "command_topic": "test_light_rgb/set",
-            "state_topic": "test_light_rgb/status",
-        }
-    }
-
-    assert await async_setup_component(hass, light.DOMAIN, config)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_OFF
-    assert state.attributes.get("white_value") is None
-
-    async_fire_mqtt_message(hass, "test_light_rgb/status", "ON")
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("white_value") == 255
-
-
-async def test_show_xy_if_only_command_topic(hass, mqtt_mock):
-    """Test the xy if only a command topic is present."""
-    config = {
-        light.DOMAIN: {
-            "platform": "mqtt",
-            "name": "test",
-            "xy_command_topic": "test_light_rgb/xy/set",
-            "command_topic": "test_light_rgb/set",
-            "state_topic": "test_light_rgb/status",
-        }
-    }
-
-    assert await async_setup_component(hass, light.DOMAIN, config)
-    await hass.async_block_till_done()
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_OFF
-    assert state.attributes.get("xy_color") is None
-
-    async_fire_mqtt_message(hass, "test_light_rgb/status", "ON")
-
-    state = hass.states.get("light.test")
-    assert state.state == STATE_ON
-    assert state.attributes.get("xy_color") == (0.323, 0.329)
-
-
 async def test_on_command_first(hass, mqtt_mock):
     """Test on command being sent before brightness."""
     config = {
@@ -1029,7 +877,7 @@ async def test_on_command_first(hass, mqtt_mock):
     mqtt_mock.async_publish.assert_has_calls(
         [
             call("test_light/set", "ON", 0, False),
-            call("test_light/bright", 50, 0, False),
+            call("test_light/bright", "50", 0, False),
         ],
     )
     mqtt_mock.async_publish.reset_mock()
@@ -1063,7 +911,7 @@ async def test_on_command_last(hass, mqtt_mock):
     #    test_light/set: 'ON'
     mqtt_mock.async_publish.assert_has_calls(
         [
-            call("test_light/bright", 50, 0, False),
+            call("test_light/bright", "50", 0, False),
             call("test_light/set", "ON", 0, False),
         ],
     )
@@ -1098,7 +946,9 @@ async def test_on_command_brightness(hass, mqtt_mock):
 
     # Should get the following MQTT messages.
     #    test_light/bright: 255
-    mqtt_mock.async_publish.assert_called_once_with("test_light/bright", 255, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "test_light/bright", "255", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     await common.async_turn_off(hass, "light.test")
@@ -1109,7 +959,7 @@ async def test_on_command_brightness(hass, mqtt_mock):
     # Turn on w/ brightness
     await common.async_turn_on(hass, "light.test", brightness=50)
 
-    mqtt_mock.async_publish.assert_called_once_with("test_light/bright", 50, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with("test_light/bright", "50", 0, False)
     mqtt_mock.async_publish.reset_mock()
 
     await common.async_turn_off(hass, "light.test")
@@ -1121,7 +971,7 @@ async def test_on_command_brightness(hass, mqtt_mock):
     mqtt_mock.async_publish.assert_has_calls(
         [
             call("test_light/rgb", "255,128,0", 0, False),
-            call("test_light/bright", 50, 0, False),
+            call("test_light/bright", "50", 0, False),
         ],
         any_order=True,
     )
@@ -1152,7 +1002,9 @@ async def test_on_command_brightness_scaled(hass, mqtt_mock):
 
     # Should get the following MQTT messages.
     #    test_light/bright: 100
-    mqtt_mock.async_publish.assert_called_once_with("test_light/bright", 100, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "test_light/bright", "100", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     await common.async_turn_off(hass, "light.test")
@@ -1163,19 +1015,21 @@ async def test_on_command_brightness_scaled(hass, mqtt_mock):
     # Turn on w/ brightness
     await common.async_turn_on(hass, "light.test", brightness=50)
 
-    mqtt_mock.async_publish.assert_called_once_with("test_light/bright", 20, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with("test_light/bright", "20", 0, False)
     mqtt_mock.async_publish.reset_mock()
 
     # Turn on w/ max brightness
     await common.async_turn_on(hass, "light.test", brightness=255)
 
-    mqtt_mock.async_publish.assert_called_once_with("test_light/bright", 100, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "test_light/bright", "100", 0, False
+    )
     mqtt_mock.async_publish.reset_mock()
 
     # Turn on w/ min brightness
     await common.async_turn_on(hass, "light.test", brightness=1)
 
-    mqtt_mock.async_publish.assert_called_once_with("test_light/bright", 1, 0, False)
+    mqtt_mock.async_publish.assert_called_once_with("test_light/bright", "1", 0, False)
     mqtt_mock.async_publish.reset_mock()
 
     await common.async_turn_off(hass, "light.test")
@@ -1187,7 +1041,7 @@ async def test_on_command_brightness_scaled(hass, mqtt_mock):
     mqtt_mock.async_publish.assert_has_calls(
         [
             call("test_light/rgb", "255,128,0", 0, False),
-            call("test_light/bright", 1, 0, False),
+            call("test_light/bright", "1", 0, False),
         ],
         any_order=True,
     )
@@ -1455,8 +1309,6 @@ async def test_discovery_removal_light(hass, mqtt_mock, caplog):
 
 async def test_discovery_deprecated(hass, mqtt_mock, caplog):
     """Test discovery of mqtt light with deprecated platform option."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     data = (
         '{ "name": "Beer",' '  "platform": "mqtt",' '  "command_topic": "test_topic"}'
     )
diff --git a/tests/components/mqtt/test_light_json.py b/tests/components/mqtt/test_light_json.py
index 9a3d9abacc9..e41575968da 100644
--- a/tests/components/mqtt/test_light_json.py
+++ b/tests/components/mqtt/test_light_json.py
@@ -796,7 +796,7 @@ async def test_effect(hass, mqtt_mock):
     mqtt_mock.async_publish.reset_mock()
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("effect") == "none"
+    assert state.attributes.get("effect") is None
 
     await common.async_turn_on(hass, "light.test", effect="rainbow")
 
@@ -942,7 +942,7 @@ async def test_brightness_scale(hass, mqtt_mock):
 
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("brightness") == 255
+    assert state.attributes.get("brightness") is None
 
     # Turn on the light with brightness
     async_fire_mqtt_message(
diff --git a/tests/components/mqtt/test_light_template.py b/tests/components/mqtt/test_light_template.py
index 17b3332da40..6767375a50e 100644
--- a/tests/components/mqtt/test_light_template.py
+++ b/tests/components/mqtt/test_light_template.py
@@ -317,6 +317,14 @@ async def test_sending_mqtt_commands_and_optimistic(hass, mqtt_mock):
                         "{{ blue|d }}",
                         "command_off_template": "off",
                         "effect_list": ["colorloop", "random"],
+                        "optimistic": True,
+                        "state_template": '{{ value.split(",")[0] }}',
+                        "color_temp_template": '{{ value.split(",")[2] }}',
+                        "white_value_template": '{{ value.split(",")[3] }}',
+                        "red_template": '{{ value.split(",")[4].' 'split("-")[0] }}',
+                        "green_template": '{{ value.split(",")[4].' 'split("-")[1] }}',
+                        "blue_template": '{{ value.split(",")[4].' 'split("-")[2] }}',
+                        "effect_template": '{{ value.split(",")[5] }}',
                         "qos": 2,
                     }
                 },
@@ -325,7 +333,6 @@ async def test_sending_mqtt_commands_and_optimistic(hass, mqtt_mock):
 
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("brightness") == 95
     assert state.attributes.get("hs_color") == (100, 100)
     assert state.attributes.get("effect") == "random"
     assert state.attributes.get("color_temp") == 100
@@ -366,7 +373,6 @@ async def test_sending_mqtt_commands_and_optimistic(hass, mqtt_mock):
     mqtt_mock.async_publish.reset_mock()
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("brightness") == 255
 
     # Full brightness - no scaling of RGB values sent over MQTT
     await common.async_turn_on(
@@ -399,7 +405,6 @@ async def test_sending_mqtt_commands_and_optimistic(hass, mqtt_mock):
     mqtt_mock.async_publish.reset_mock()
     state = hass.states.get("light.test")
     assert state.state == STATE_ON
-    assert state.attributes.get("brightness") == 128
 
     # Half brightness - scaling of RGB values sent over MQTT
     await common.async_turn_on(
diff --git a/tests/components/mqtt/test_sensor.py b/tests/components/mqtt/test_sensor.py
index 77fd8c561b2..7e92579753b 100644
--- a/tests/components/mqtt/test_sensor.py
+++ b/tests/components/mqtt/test_sensor.py
@@ -5,8 +5,6 @@ import json
 
 import pytest
 
-from homeassistant.components import mqtt
-from homeassistant.components.mqtt.discovery import async_start
 import homeassistant.components.sensor as sensor
 from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNAVAILABLE
 import homeassistant.core as ha
@@ -75,9 +73,7 @@ async def test_setting_sensor_value_via_mqtt_message(hass, mqtt_mock):
     assert state.attributes.get("unit_of_measurement") == "fav unit"
 
 
-async def test_setting_sensor_value_expires_availability_topic(
-    hass, mqtt_mock, legacy_patchable_time, caplog
-):
+async def test_setting_sensor_value_expires_availability_topic(hass, mqtt_mock, caplog):
     """Test the expiration of the value."""
     assert await async_setup_component(
         hass,
@@ -107,9 +103,7 @@ async def test_setting_sensor_value_expires_availability_topic(
     await expires_helper(hass, mqtt_mock, caplog)
 
 
-async def test_setting_sensor_value_expires(
-    hass, mqtt_mock, legacy_patchable_time, caplog
-):
+async def test_setting_sensor_value_expires(hass, mqtt_mock, caplog):
     """Test the expiration of the value."""
     assert await async_setup_component(
         hass,
@@ -564,9 +558,6 @@ async def test_entity_id_update_discovery_update(hass, mqtt_mock):
 
 async def test_entity_device_info_with_hub(hass, mqtt_mock):
     """Test MQTT sensor device registry integration."""
-    entry = hass.config_entries.async_entries(mqtt.DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
-
     registry = await hass.helpers.device_registry.async_get_registry()
     hub = registry.async_get_or_create(
         config_entry_id="123",
diff --git a/tests/components/mqtt/test_subscription.py b/tests/components/mqtt/test_subscription.py
index 05f14107384..19797f28c3f 100644
--- a/tests/components/mqtt/test_subscription.py
+++ b/tests/components/mqtt/test_subscription.py
@@ -1,12 +1,11 @@
 """The tests for the MQTT subscription component."""
-from unittest import mock
-
 from homeassistant.components.mqtt.subscription import (
     async_subscribe_topics,
     async_unsubscribe_topics,
 )
 from homeassistant.core import callback
 
+from tests.async_mock import ANY
 from tests.common import async_fire_mqtt_message
 
 
@@ -131,9 +130,7 @@ async def test_qos_encoding_default(hass, mqtt_mock, caplog):
         sub_state,
         {"test_topic1": {"topic": "test-topic1", "msg_callback": msg_callback}},
     )
-    mqtt_mock.async_subscribe.assert_called_once_with(
-        "test-topic1", mock.ANY, 0, "utf-8"
-    )
+    mqtt_mock.async_subscribe.assert_called_once_with("test-topic1", ANY, 0, "utf-8")
 
 
 async def test_qos_encoding_custom(hass, mqtt_mock, caplog):
@@ -157,9 +154,7 @@ async def test_qos_encoding_custom(hass, mqtt_mock, caplog):
             }
         },
     )
-    mqtt_mock.async_subscribe.assert_called_once_with(
-        "test-topic1", mock.ANY, 1, "utf-16"
-    )
+    mqtt_mock.async_subscribe.assert_called_once_with("test-topic1", ANY, 1, "utf-16")
 
 
 async def test_no_change(hass, mqtt_mock, caplog):
diff --git a/tests/components/mqtt/test_tag.py b/tests/components/mqtt/test_tag.py
index fa041fb58ad..bed05ac6384 100644
--- a/tests/components/mqtt/test_tag.py
+++ b/tests/components/mqtt/test_tag.py
@@ -4,9 +4,6 @@ import json
 
 import pytest
 
-from homeassistant.components.mqtt import DOMAIN
-from homeassistant.components.mqtt.discovery import async_start
-
 from tests.async_mock import ANY, patch
 from tests.common import (
     async_fire_mqtt_message,
@@ -63,9 +60,6 @@ async def test_discover_bad_tag(hass, device_reg, entity_reg, mqtt_mock, tag_moc
     """Test bad discovery message."""
     config1 = copy.deepcopy(DEFAULT_CONFIG_DEVICE)
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     # Test sending bad data
     data0 = '{ "device":{"identifiers":["0AFFD2"]}, "topics": "foobar/tag_scanned" }'
     async_fire_mqtt_message(hass, "homeassistant/tag/bla/config", data0)
@@ -89,9 +83,6 @@ async def test_if_fires_on_mqtt_message_with_device(
     """Test tag scanning, with device."""
     config = copy.deepcopy(DEFAULT_CONFIG_DEVICE)
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config))
     await hass.async_block_till_done()
     device_entry = device_reg.async_get_device({("mqtt", "0AFFD2")}, set())
@@ -108,9 +99,6 @@ async def test_if_fires_on_mqtt_message_without_device(
     """Test tag scanning, without device."""
     config = copy.deepcopy(DEFAULT_CONFIG)
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config))
     await hass.async_block_till_done()
 
@@ -126,9 +114,6 @@ async def test_if_fires_on_mqtt_message_with_template(
     """Test tag scanning, with device."""
     config = copy.deepcopy(DEFAULT_CONFIG_JSON)
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config))
     await hass.async_block_till_done()
     device_entry = device_reg.async_get_device({("mqtt", "0AFFD2")}, set())
@@ -143,9 +128,6 @@ async def test_strip_tag_id(hass, device_reg, mqtt_mock, tag_mock):
     """Test strip whitespace from tag_id."""
     config = copy.deepcopy(DEFAULT_CONFIG)
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config))
     await hass.async_block_till_done()
 
@@ -163,9 +145,6 @@ async def test_if_fires_on_mqtt_message_after_update_with_device(
     config2 = copy.deepcopy(DEFAULT_CONFIG_DEVICE)
     config2["topic"] = "foobar/tag_scanned2"
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config1))
     await hass.async_block_till_done()
     device_entry = device_reg.async_get_device({("mqtt", "0AFFD2")}, set())
@@ -210,9 +189,6 @@ async def test_if_fires_on_mqtt_message_after_update_without_device(
     config2 = copy.deepcopy(DEFAULT_CONFIG)
     config2["topic"] = "foobar/tag_scanned2"
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config1))
     await hass.async_block_till_done()
 
@@ -257,9 +233,6 @@ async def test_if_fires_on_mqtt_message_after_update_with_template(
     config2["value_template"] = "{{ value_json.RDM6300.UID }}"
     tag_scan_2 = '{"Time":"2020-09-28T17:02:10","RDM6300":{"UID":"E9F35959", "DATA":"ILOVETASMOTA"}}'
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config1))
     await hass.async_block_till_done()
     device_entry = device_reg.async_get_device({("mqtt", "0AFFD2")}, set())
@@ -300,9 +273,6 @@ async def test_no_resubscribe_same_topic(hass, device_reg, mqtt_mock):
     """Test subscription to topics without change."""
     config = copy.deepcopy(DEFAULT_CONFIG_DEVICE)
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config))
     await hass.async_block_till_done()
     assert device_reg.async_get_device({("mqtt", "0AFFD2")}, set())
@@ -319,9 +289,6 @@ async def test_not_fires_on_mqtt_message_after_remove_by_mqtt_with_device(
     """Test tag scanning after removal."""
     config = copy.deepcopy(DEFAULT_CONFIG_DEVICE)
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config))
     await hass.async_block_till_done()
     device_entry = device_reg.async_get_device({("mqtt", "0AFFD2")}, set())
@@ -355,9 +322,6 @@ async def test_not_fires_on_mqtt_message_after_remove_by_mqtt_without_device(
     """Test tag scanning not firing after removal."""
     config = copy.deepcopy(DEFAULT_CONFIG)
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config))
     await hass.async_block_till_done()
 
@@ -393,9 +357,6 @@ async def test_not_fires_on_mqtt_message_after_remove_from_registry(
     """Test tag scanning after removal."""
     config = copy.deepcopy(DEFAULT_CONFIG_DEVICE)
 
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     async_fire_mqtt_message(hass, "homeassistant/tag/bla1/config", json.dumps(config))
     await hass.async_block_till_done()
     device_entry = device_reg.async_get_device({("mqtt", "0AFFD2")}, set())
@@ -417,8 +378,6 @@ async def test_not_fires_on_mqtt_message_after_remove_from_registry(
 
 async def test_entity_device_info_with_connection(hass, mqtt_mock):
     """Test MQTT device registry integration."""
-    entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(
@@ -447,8 +406,6 @@ async def test_entity_device_info_with_connection(hass, mqtt_mock):
 
 async def test_entity_device_info_with_identifier(hass, mqtt_mock):
     """Test MQTT device registry integration."""
-    entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     data = json.dumps(
@@ -477,8 +434,6 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
 
 async def test_entity_device_info_update(hass, mqtt_mock):
     """Test device registry update."""
-    entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", entry)
     registry = await hass.helpers.device_registry.async_get_registry()
 
     config = {
@@ -513,9 +468,6 @@ async def test_entity_device_info_update(hass, mqtt_mock):
 
 async def test_cleanup_tag(hass, device_reg, entity_reg, mqtt_mock):
     """Test tag discovery topic is cleaned when device is removed from registry."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config = {
         "topic": "test-topic",
         "device": {"identifiers": ["helloworld"]},
@@ -545,9 +497,6 @@ async def test_cleanup_tag(hass, device_reg, entity_reg, mqtt_mock):
 
 async def test_cleanup_device(hass, device_reg, entity_reg, mqtt_mock):
     """Test removal from device registry when tag is removed."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config = {
         "topic": "test-topic",
         "device": {"identifiers": ["helloworld"]},
@@ -573,9 +522,6 @@ async def test_cleanup_device_several_tags(
     hass, device_reg, entity_reg, mqtt_mock, tag_mock
 ):
     """Test removal from device registry when the last tag is removed."""
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config1 = {
         "topic": "test-topic1",
         "device": {"identifiers": ["helloworld"]},
@@ -623,9 +569,6 @@ async def test_cleanup_device_with_entity_and_trigger_1(
 
     Tag removed first, then trigger and entity.
     """
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config1 = {
         "topic": "test-topic",
         "device": {"identifiers": ["helloworld"]},
@@ -686,9 +629,6 @@ async def test_cleanup_device_with_entity2(hass, device_reg, entity_reg, mqtt_mo
 
     Trigger and entity removed first, then tag.
     """
-    config_entry = hass.config_entries.async_entries(DOMAIN)[0]
-    await async_start(hass, "homeassistant", config_entry)
-
     config1 = {
         "topic": "test-topic",
         "device": {"identifiers": ["helloworld"]},
diff --git a/tests/components/mqtt/test_trigger.py b/tests/components/mqtt/test_trigger.py
index 13e96c69adc..b35082ef2c6 100644
--- a/tests/components/mqtt/test_trigger.py
+++ b/tests/components/mqtt/test_trigger.py
@@ -1,12 +1,11 @@
 """The tests for the MQTT automation."""
-from unittest import mock
-
 import pytest
 
 import homeassistant.components.automation as automation
 from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_OFF
 from homeassistant.setup import async_setup_component
 
+from tests.async_mock import ANY
 from tests.common import async_fire_mqtt_message, async_mock_service, mock_component
 
 
@@ -115,9 +114,7 @@ async def test_encoding_default(hass, calls, mqtt_mock):
         },
     )
 
-    mqtt_mock.async_subscribe.assert_called_once_with(
-        "test-topic", mock.ANY, 0, "utf-8"
-    )
+    mqtt_mock.async_subscribe.assert_called_once_with("test-topic", ANY, 0, "utf-8")
 
 
 async def test_encoding_custom(hass, calls, mqtt_mock):
@@ -133,4 +130,4 @@ async def test_encoding_custom(hass, calls, mqtt_mock):
         },
     )
 
-    mqtt_mock.async_subscribe.assert_called_once_with("test-topic", mock.ANY, 0, None)
+    mqtt_mock.async_subscribe.assert_called_once_with("test-topic", ANY, 0, None)
diff --git a/tests/components/mqtt_eventstream/test_init.py b/tests/components/mqtt_eventstream/test_init.py
index 87139a0f3ee..87ac4696a31 100644
--- a/tests/components/mqtt_eventstream/test_init.py
+++ b/tests/components/mqtt_eventstream/test_init.py
@@ -1,8 +1,6 @@
 """The tests for the MQTT eventstream component."""
 import json
 
-import pytest
-
 import homeassistant.components.mqtt_eventstream as eventstream
 from homeassistant.const import EVENT_STATE_CHANGED
 from homeassistant.core import State, callback
@@ -18,11 +16,6 @@ from tests.common import (
 )
 
 
-@pytest.fixture(autouse=True)
-def mock_storage(hass_storage):
-    """Autouse hass_storage for the TestCase tests."""
-
-
 async def add_eventstream(hass, sub_topic=None, pub_topic=None, ignore_event=None):
     """Add a mqtt_eventstream component."""
     config = {}
diff --git a/tests/components/mqtt_json/test_device_tracker.py b/tests/components/mqtt_json/test_device_tracker.py
index d0f798c18ae..89b37e28b52 100644
--- a/tests/components/mqtt_json/test_device_tracker.py
+++ b/tests/components/mqtt_json/test_device_tracker.py
@@ -15,8 +15,6 @@ from homeassistant.setup import async_setup_component
 from tests.async_mock import patch
 from tests.common import async_fire_mqtt_message
 
-_LOGGER = logging.getLogger(__name__)
-
 LOCATION_MESSAGE = {
     "longitude": 1.0,
     "gps_accuracy": 60,
diff --git a/tests/components/neato/test_config_flow.py b/tests/components/neato/test_config_flow.py
index be69e0853ad..31c2cddd09d 100644
--- a/tests/components/neato/test_config_flow.py
+++ b/tests/components/neato/test_config_flow.py
@@ -118,7 +118,7 @@ async def test_abort_on_invalid_credentials(hass):
             }
         )
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-        assert result["errors"] == {"base": "invalid_credentials"}
+        assert result["errors"] == {"base": "invalid_auth"}
 
         result = await flow.async_step_import(
             {
@@ -128,7 +128,7 @@ async def test_abort_on_invalid_credentials(hass):
             }
         )
         assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-        assert result["reason"] == "invalid_credentials"
+        assert result["reason"] == "invalid_auth"
 
 
 async def test_abort_on_unexpected_error(hass):
@@ -147,7 +147,7 @@ async def test_abort_on_unexpected_error(hass):
             }
         )
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-        assert result["errors"] == {"base": "unexpected_error"}
+        assert result["errors"] == {"base": "unknown"}
 
         result = await flow.async_step_import(
             {
@@ -157,4 +157,4 @@ async def test_abort_on_unexpected_error(hass):
             }
         )
         assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-        assert result["reason"] == "unexpected_error"
+        assert result["reason"] == "unknown"
diff --git a/tests/components/nest/sensor_sdm_test.py b/tests/components/nest/sensor_sdm_test.py
new file mode 100644
index 00000000000..ab2cae3d9f3
--- /dev/null
+++ b/tests/components/nest/sensor_sdm_test.py
@@ -0,0 +1,300 @@
+"""
+Test for Nest sensors platform for the Smart Device Management API.
+
+These tests fake out the subscriber/devicemanager, and are not using a real
+pubsub subscriber.
+"""
+
+import time
+
+from google_nest_sdm.device import Device
+from google_nest_sdm.device_manager import DeviceManager
+from google_nest_sdm.event import EventCallback, EventMessage
+from google_nest_sdm.google_nest_subscriber import GoogleNestSubscriber
+
+from homeassistant.components.nest import DOMAIN
+from homeassistant.setup import async_setup_component
+
+from tests.async_mock import patch
+from tests.common import MockConfigEntry
+
+PLATFORM = "sensor"
+
+CONFIG = {
+    "nest": {
+        "client_id": "some-client-id",
+        "client_secret": "some-client-secret",
+        # Required fields for using SDM API
+        "project_id": "some-project-id",
+        "subscriber_id": "some-subscriber-id",
+    },
+}
+
+CONFIG_ENTRY_DATA = {
+    "sdm": {},  # Indicates new SDM API, not legacy API
+    "auth_implementation": "local",
+    "token": {
+        "expires_at": time.time() + 86400,
+        "access_token": {
+            "token": "some-token",
+        },
+    },
+}
+
+THERMOSTAT_TYPE = "sdm.devices.types.THERMOSTAT"
+
+
+class FakeDeviceManager(DeviceManager):
+    """Fake DeviceManager that can supply a list of devices and structures."""
+
+    def __init__(self, devices: dict, structures: dict):
+        """Initialize FakeDeviceManager."""
+        super().__init__()
+        self._devices = devices
+
+    @property
+    def structures(self) -> dict:
+        """Override structures with fake result."""
+        return self._structures
+
+    @property
+    def devices(self) -> dict:
+        """Override devices with fake result."""
+        return self._devices
+
+
+class FakeSubscriber(GoogleNestSubscriber):
+    """Fake subscriber that supplies a FakeDeviceManager."""
+
+    def __init__(self, device_manager: FakeDeviceManager):
+        """Initialize Fake Subscriber."""
+        self._device_manager = device_manager
+        self._callback = None
+
+    def set_update_callback(self, callback: EventCallback):
+        """Capture the callback set by Home Assistant."""
+        self._callback = callback
+
+    async def start_async(self) -> DeviceManager:
+        """Return the fake device manager."""
+        return self._device_manager
+
+    @property
+    async def async_device_manager(self) -> DeviceManager:
+        """Return the fake device manager."""
+        return self._device_manager
+
+    def stop_async(self):
+        """No-op to stop the subscriber."""
+        return None
+
+    def receive_event(self, event_message: EventMessage):
+        """Simulate a received pubsub message, invoked by tests."""
+        # Update device state, then invoke HomeAssistant to refresh
+        self._device_manager.handle_event(event_message)
+        self._callback.handle_event(event_message)
+
+
+async def setup_sensor(hass, devices={}, structures={}):
+    """Set up the platform and prerequisites."""
+    MockConfigEntry(domain=DOMAIN, data=CONFIG_ENTRY_DATA).add_to_hass(hass)
+    device_manager = FakeDeviceManager(devices=devices, structures=structures)
+    subscriber = FakeSubscriber(device_manager)
+    with patch(
+        "homeassistant.helpers.config_entry_oauth2_flow.async_get_config_entry_implementation"
+    ), patch("homeassistant.components.nest.PLATFORMS", [PLATFORM]), patch(
+        "homeassistant.components.nest.GoogleNestSubscriber", return_value=subscriber
+    ):
+        assert await async_setup_component(hass, DOMAIN, CONFIG)
+        await hass.async_block_till_done()
+    return subscriber
+
+
+async def test_thermostat_device(hass):
+    """Test a thermostat with temperature and humidity sensors."""
+    devices = {
+        "some-device-id": Device.MakeDevice(
+            {
+                "name": "some-device-id",
+                "type": THERMOSTAT_TYPE,
+                "traits": {
+                    "sdm.devices.traits.Info": {
+                        "customName": "My Sensor",
+                    },
+                    "sdm.devices.traits.Temperature": {
+                        "ambientTemperatureCelsius": 25.1,
+                    },
+                    "sdm.devices.traits.Humidity": {
+                        "ambientHumidityPercent": 35.0,
+                    },
+                },
+            },
+            auth=None,
+        )
+    }
+    await setup_sensor(hass, devices)
+
+    temperature = hass.states.get("sensor.my_sensor_temperature")
+    assert temperature is not None
+    assert temperature.state == "25.1"
+
+    humidity = hass.states.get("sensor.my_sensor_humidity")
+    assert humidity is not None
+    assert humidity.state == "35.0"
+
+    registry = await hass.helpers.entity_registry.async_get_registry()
+    entry = registry.async_get("sensor.my_sensor_temperature")
+    assert entry.unique_id == "some-device-id-temperature"
+    assert entry.original_name == "My Sensor Temperature"
+    assert entry.domain == "sensor"
+
+    device_registry = await hass.helpers.device_registry.async_get_registry()
+    device = device_registry.async_get(entry.device_id)
+    assert device.name == "My Sensor"
+    assert device.model == "Thermostat"
+    assert device.identifiers == {("nest", "some-device-id")}
+
+
+async def test_no_devices(hass):
+    """Test no devices returned by the api."""
+    await setup_sensor(hass)
+
+    temperature = hass.states.get("sensor.my_sensor_temperature")
+    assert temperature is None
+
+    humidity = hass.states.get("sensor.my_sensor_humidity")
+    assert humidity is None
+
+
+async def test_device_no_sensor_traits(hass):
+    """Test a device with applicable sensor traits."""
+    devices = {
+        "some-device-id": Device.MakeDevice(
+            {
+                "name": "some-device-id",
+                "type": THERMOSTAT_TYPE,
+                "traits": {},
+            },
+            auth=None,
+        )
+    }
+    await setup_sensor(hass, devices)
+
+    temperature = hass.states.get("sensor.my_sensor_temperature")
+    assert temperature is None
+
+    humidity = hass.states.get("sensor.my_sensor_humidity")
+    assert humidity is None
+
+
+async def test_device_name_from_structure(hass):
+    """Test a device without a custom name, inferring name from structure."""
+    devices = {
+        "some-device-id": Device.MakeDevice(
+            {
+                "name": "some-device-id",
+                "type": THERMOSTAT_TYPE,
+                "traits": {
+                    "sdm.devices.traits.Temperature": {
+                        "ambientTemperatureCelsius": 25.2,
+                    },
+                },
+                "parentRelations": [
+                    {"parent": "some-structure-id", "displayName": "Some Room"}
+                ],
+            },
+            auth=None,
+        )
+    }
+    await setup_sensor(hass, devices)
+
+    temperature = hass.states.get("sensor.some_room_temperature")
+    assert temperature is not None
+    assert temperature.state == "25.2"
+
+
+async def test_event_updates_sensor(hass):
+    """Test a pubsub message received by subscriber to update temperature."""
+    devices = {
+        "some-device-id": Device.MakeDevice(
+            {
+                "name": "some-device-id",
+                "type": THERMOSTAT_TYPE,
+                "traits": {
+                    "sdm.devices.traits.Info": {
+                        "customName": "My Sensor",
+                    },
+                    "sdm.devices.traits.Temperature": {
+                        "ambientTemperatureCelsius": 25.1,
+                    },
+                },
+            },
+            auth=None,
+        )
+    }
+    subscriber = await setup_sensor(hass, devices)
+
+    temperature = hass.states.get("sensor.my_sensor_temperature")
+    assert temperature is not None
+    assert temperature.state == "25.1"
+
+    # Simulate a pubsub message received by the subscriber with a trait update
+    event = EventMessage(
+        {
+            "eventId": "some-event-id",
+            "timestamp": "2019-01-01T00:00:01Z",
+            "resourceUpdate": {
+                "name": "some-device-id",
+                "traits": {
+                    "sdm.devices.traits.Temperature": {
+                        "ambientTemperatureCelsius": 26.2,
+                    },
+                },
+            },
+        },
+        auth=None,
+    )
+    subscriber.receive_event(event)
+    await hass.async_block_till_done()  # Process dispatch/update signal
+
+    temperature = hass.states.get("sensor.my_sensor_temperature")
+    assert temperature is not None
+    assert temperature.state == "26.2"
+
+
+async def test_device_with_unknown_type(hass):
+    """Test a device without a custom name, inferring name from structure."""
+    devices = {
+        "some-device-id": Device.MakeDevice(
+            {
+                "name": "some-device-id",
+                "type": "some-unknown-type",
+                "traits": {
+                    "sdm.devices.traits.Info": {
+                        "customName": "My Sensor",
+                    },
+                    "sdm.devices.traits.Temperature": {
+                        "ambientTemperatureCelsius": 25.1,
+                    },
+                },
+            },
+            auth=None,
+        )
+    }
+    await setup_sensor(hass, devices)
+
+    temperature = hass.states.get("sensor.my_sensor_temperature")
+    assert temperature is not None
+    assert temperature.state == "25.1"
+
+    registry = await hass.helpers.entity_registry.async_get_registry()
+    entry = registry.async_get("sensor.my_sensor_temperature")
+    assert entry.unique_id == "some-device-id-temperature"
+    assert entry.original_name == "My Sensor Temperature"
+    assert entry.domain == "sensor"
+
+    device_registry = await hass.helpers.device_registry.async_get_registry()
+    device = device_registry.async_get(entry.device_id)
+    assert device.name == "My Sensor"
+    assert device.model is None
+    assert device.identifiers == {("nest", "some-device-id")}
diff --git a/tests/components/nest/test_config_flow.py b/tests/components/nest/test_config_flow_legacy.py
similarity index 97%
rename from tests/components/nest/test_config_flow.py
rename to tests/components/nest/test_config_flow_legacy.py
index 6c0c0197a74..e0e93bf626a 100644
--- a/tests/components/nest/test_config_flow.py
+++ b/tests/components/nest/test_config_flow_legacy.py
@@ -17,10 +17,10 @@ async def test_abort_if_no_implementation_registered(hass):
     result = await flow.async_step_init()
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "no_flows"
+    assert result["reason"] == "missing_configuration"
 
 
-async def test_abort_if_already_setup(hass):
+async def test_abort_if_single_instance_allowed(hass):
     """Test we abort if Nest is already setup."""
     flow = config_flow.NestFlowHandler()
     flow.hass = hass
@@ -29,7 +29,7 @@ async def test_abort_if_already_setup(hass):
         result = await flow.async_step_init()
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "single_instance_allowed"
 
 
 async def test_full_flow_implementation(hass):
@@ -140,7 +140,7 @@ async def test_verify_code_invalid(hass):
     result = await flow.async_step_link({"code": "123ABC"})
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "link"
-    assert result["errors"] == {"code": "invalid_code"}
+    assert result["errors"] == {"code": "invalid_pin"}
 
 
 async def test_verify_code_unknown_error(hass):
diff --git a/tests/components/nest/test_config_flow_sdm.py b/tests/components/nest/test_config_flow_sdm.py
new file mode 100644
index 00000000000..1df751f3980
--- /dev/null
+++ b/tests/components/nest/test_config_flow_sdm.py
@@ -0,0 +1,66 @@
+"""Test the Google Nest Device Access config flow."""
+from homeassistant import config_entries, setup
+from homeassistant.components.nest.const import DOMAIN, OAUTH2_AUTHORIZE, OAUTH2_TOKEN
+from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
+from homeassistant.helpers import config_entry_oauth2_flow
+
+from tests.async_mock import patch
+
+CLIENT_ID = "1234"
+CLIENT_SECRET = "5678"
+PROJECT_ID = "project-id-4321"
+SUBSCRIBER_ID = "subscriber-id-9876"
+
+
+async def test_full_flow(hass, aiohttp_client, aioclient_mock, current_request):
+    """Check full flow."""
+    assert await setup.async_setup_component(
+        hass,
+        DOMAIN,
+        {
+            DOMAIN: {
+                "project_id": PROJECT_ID,
+                "subscriber_id": SUBSCRIBER_ID,
+                CONF_CLIENT_ID: CLIENT_ID,
+                CONF_CLIENT_SECRET: CLIENT_SECRET,
+            },
+            "http": {"base_url": "https://example.com"},
+        },
+    )
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(hass, {"flow_id": result["flow_id"]})
+
+    oauth_authorize = OAUTH2_AUTHORIZE.format(project_id=PROJECT_ID)
+    assert result["url"] == (
+        f"{oauth_authorize}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope=https://www.googleapis.com/auth/sdm.service"
+        "+https://www.googleapis.com/auth/pubsub"
+        "&access_type=offline&prompt=consent"
+    )
+
+    client = await aiohttp_client(hass.http.app)
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    aioclient_mock.post(
+        OAUTH2_TOKEN,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    with patch(
+        "homeassistant.components.nest.async_setup_entry", return_value=True
+    ) as mock_setup:
+        await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup.mock_calls) == 1
diff --git a/tests/components/notify/test_persistent_notification.py b/tests/components/notify/test_persistent_notification.py
new file mode 100644
index 00000000000..957e354ff75
--- /dev/null
+++ b/tests/components/notify/test_persistent_notification.py
@@ -0,0 +1,25 @@
+"""The tests for the notify.persistent_notification service."""
+from homeassistant.components import notify
+import homeassistant.components.persistent_notification as pn
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+
+async def test_async_send_message(hass: HomeAssistant):
+    """Test sending a message to notify.persistent_notification service."""
+    await async_setup_component(hass, pn.DOMAIN, {"core": {}})
+    await async_setup_component(hass, notify.DOMAIN, {})
+    await hass.async_block_till_done()
+
+    message = {"message": "Hello", "title": "Test notification"}
+    await hass.services.async_call(
+        notify.DOMAIN, notify.SERVICE_PERSISTENT_NOTIFICATION, message
+    )
+    await hass.async_block_till_done()
+
+    entity_ids = hass.states.async_entity_ids(pn.DOMAIN)
+    assert len(entity_ids) == 1
+
+    state = hass.states.get(entity_ids[0])
+    assert state.attributes.get("message") == "Hello"
+    assert state.attributes.get("title") == "Test notification"
diff --git a/tests/components/notion/test_config_flow.py b/tests/components/notion/test_config_flow.py
index 6aaf7df9505..7a887ac3468 100644
--- a/tests/components/notion/test_config_flow.py
+++ b/tests/components/notion/test_config_flow.py
@@ -53,7 +53,7 @@ async def test_invalid_credentials(hass, mock_aionotion):
     flow.context = {"source": SOURCE_USER}
 
     result = await flow.async_step_user(user_input=conf)
-    assert result["errors"] == {"base": "invalid_credentials"}
+    assert result["errors"] == {"base": "invalid_auth"}
 
 
 async def test_show_form(hass):
diff --git a/tests/components/nsw_fuel_station/test_sensor.py b/tests/components/nsw_fuel_station/test_sensor.py
index d4e10ff5129..e99a7bfc079 100644
--- a/tests/components/nsw_fuel_station/test_sensor.py
+++ b/tests/components/nsw_fuel_station/test_sensor.py
@@ -1,11 +1,9 @@
 """The tests for the NSW Fuel Station sensor platform."""
-import unittest
-
 from homeassistant.components import sensor
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import assert_setup_component, get_test_home_assistant
+from tests.common import assert_setup_component
 
 VALID_CONFIG = {
     "platform": "nsw_fuel_station",
@@ -72,39 +70,33 @@ class FuelCheckClientMock:
         )
 
 
-class TestNSWFuelStation(unittest.TestCase):
-    """Test the NSW Fuel Station sensor platform."""
+@patch(
+    "homeassistant.components.nsw_fuel_station.sensor.FuelCheckClient",
+    new=FuelCheckClientMock,
+)
+async def test_setup(hass):
+    """Test the setup with custom settings."""
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass, sensor.DOMAIN, {"sensor": VALID_CONFIG}
+        )
+        await hass.async_block_till_done()
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.config = VALID_CONFIG
-        self.addCleanup(self.hass.stop)
+    fake_entities = ["my_fake_station_p95", "my_fake_station_e10"]
 
-    @patch(
-        "homeassistant.components.nsw_fuel_station.sensor.FuelCheckClient",
-        new=FuelCheckClientMock,
-    )
-    def test_setup(self):
-        """Test the setup with custom settings."""
-        with assert_setup_component(1, sensor.DOMAIN):
-            assert setup_component(self.hass, sensor.DOMAIN, {"sensor": VALID_CONFIG})
-            self.hass.block_till_done()
+    for entity_id in fake_entities:
+        state = hass.states.get(f"sensor.{entity_id}")
+        assert state is not None
 
-        fake_entities = ["my_fake_station_p95", "my_fake_station_e10"]
 
-        for entity_id in fake_entities:
-            state = self.hass.states.get(f"sensor.{entity_id}")
-            assert state is not None
+@patch(
+    "homeassistant.components.nsw_fuel_station.sensor.FuelCheckClient",
+    new=FuelCheckClientMock,
+)
+async def test_sensor_values(hass):
+    """Test retrieval of sensor values."""
+    assert await async_setup_component(hass, sensor.DOMAIN, {"sensor": VALID_CONFIG})
+    await hass.async_block_till_done()
 
-    @patch(
-        "homeassistant.components.nsw_fuel_station.sensor.FuelCheckClient",
-        new=FuelCheckClientMock,
-    )
-    def test_sensor_values(self):
-        """Test retrieval of sensor values."""
-        assert setup_component(self.hass, sensor.DOMAIN, {"sensor": VALID_CONFIG})
-        self.hass.block_till_done()
-
-        assert "140.0" == self.hass.states.get("sensor.my_fake_station_e10").state
-        assert "150.0" == self.hass.states.get("sensor.my_fake_station_p95").state
+    assert "140.0" == hass.states.get("sensor.my_fake_station_e10").state
+    assert "150.0" == hass.states.get("sensor.my_fake_station_p95").state
diff --git a/tests/components/nuheat/mocks.py b/tests/components/nuheat/mocks.py
index 9755335ccc1..ccfb031f043 100644
--- a/tests/components/nuheat/mocks.py
+++ b/tests/components/nuheat/mocks.py
@@ -103,6 +103,8 @@ def _get_mock_thermostat_schedule_temporary_hold():
         target_celsius=43,
         target_fahrenheit=99,
         target_temperature=3729,
+        max_temperature=5000,
+        min_temperature=1,
     )
 
     thermostat.get_data = Mock()
diff --git a/tests/components/nuheat/test_climate.py b/tests/components/nuheat/test_climate.py
index 51e80e6b3c1..453f0dab110 100644
--- a/tests/components/nuheat/test_climate.py
+++ b/tests/components/nuheat/test_climate.py
@@ -1,6 +1,10 @@
 """The test for the NuHeat thermostat module."""
+from datetime import timedelta
+
 from homeassistant.components.nuheat.const import DOMAIN
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.setup import async_setup_component
+import homeassistant.util.dt as dt_util
 
 from .mocks import (
     _get_mock_nuheat,
@@ -12,6 +16,7 @@ from .mocks import (
 )
 
 from tests.async_mock import patch
+from tests.common import async_fire_time_changed
 
 
 async def test_climate_thermostat_run(hass):
@@ -135,3 +140,23 @@ async def test_climate_thermostat_schedule_temporary_hold(hass):
     # Only test for a subset of attributes in case
     # HA changes the implementation and a new one appears
     assert all(item in state.attributes.items() for item in expected_attributes.items())
+
+    await hass.services.async_call(
+        "climate",
+        "set_temperature",
+        service_data={ATTR_ENTITY_ID: "climate.temp_bathroom", "temperature": 90},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    # opportunistic set
+    state = hass.states.get("climate.temp_bathroom")
+    assert state.attributes["preset_mode"] == "Temporary Hold"
+    assert state.attributes["temperature"] == 50.0
+
+    # and the api poll returns it to the mock
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=3))
+    await hass.async_block_till_done()
+    state = hass.states.get("climate.temp_bathroom")
+    assert state.attributes["preset_mode"] == "Run Schedule"
+    assert state.attributes["temperature"] == 37.2
diff --git a/tests/components/nzbget/test_sensor.py b/tests/components/nzbget/test_sensor.py
index 8bbee0047a9..c9f1ea71f0c 100644
--- a/tests/components/nzbget/test_sensor.py
+++ b/tests/components/nzbget/test_sensor.py
@@ -17,7 +17,7 @@ from tests.async_mock import patch
 async def test_sensors(hass, nzbget_api) -> None:
     """Test the creation and values of the sensors."""
     now = dt_util.utcnow().replace(microsecond=0)
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
+    with patch("homeassistant.components.nzbget.sensor.utcnow", return_value=now):
         entry = await init_integration(hass)
 
     registry = await hass.helpers.entity_registry.async_get_registry()
diff --git a/tests/components/onewire/__init__.py b/tests/components/onewire/__init__.py
new file mode 100644
index 00000000000..e5de65bc71e
--- /dev/null
+++ b/tests/components/onewire/__init__.py
@@ -0,0 +1 @@
+"""Tests for 1-Wire integration."""
diff --git a/tests/components/onewire/test_entity_owserver.py b/tests/components/onewire/test_entity_owserver.py
new file mode 100644
index 00000000000..95b0137f7eb
--- /dev/null
+++ b/tests/components/onewire/test_entity_owserver.py
@@ -0,0 +1,204 @@
+"""Tests for 1-Wire devices connected on OWServer."""
+from unittest.mock import patch
+
+from pyownet.protocol import Error as ProtocolError
+import pytest
+
+from homeassistant.components.onewire.const import (
+    DEFAULT_OWSERVER_PORT,
+    DOMAIN,
+    PRESSURE_CBAR,
+)
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.const import PERCENTAGE, TEMP_CELSIUS
+from homeassistant.setup import async_setup_component
+
+from tests.common import mock_registry
+
+MOCK_CONFIG = {
+    "sensor": {
+        "platform": DOMAIN,
+        "host": "localhost",
+        "port": DEFAULT_OWSERVER_PORT,
+        "names": {
+            "10.111111111111": "My DS18B20",
+        },
+    }
+}
+
+MOCK_DEVICE_SENSORS = {
+    "00.111111111111": {"sensors": []},
+    "10.111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.my_ds18b20_temperature",
+                "unique_id": "/10.111111111111/temperature",
+                "injected_value": b"    25.123",
+                "result": "25.1",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "1D.111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.1d_111111111111_counter_a",
+                "unique_id": "/1D.111111111111/counter.A",
+                "injected_value": b"    251123",
+                "result": "251123",
+                "unit": "count",
+            },
+            {
+                "entity_id": "sensor.1d_111111111111_counter_b",
+                "unique_id": "/1D.111111111111/counter.B",
+                "injected_value": b"    248125",
+                "result": "248125",
+                "unit": "count",
+            },
+        ]
+    },
+    "22.111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.22_111111111111_temperature",
+                "unique_id": "/22.111111111111/temperature",
+                "injected_value": ProtocolError,
+                "result": "unknown",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "28.111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.28_111111111111_temperature",
+                "unique_id": "/28.111111111111/temperature",
+                "injected_value": b"    26.984",
+                "result": "27.0",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "3B.111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.3b_111111111111_temperature",
+                "unique_id": "/3B.111111111111/temperature",
+                "injected_value": b"    28.243",
+                "result": "28.2",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "42.111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.42_111111111111_temperature",
+                "unique_id": "/42.111111111111/temperature",
+                "injected_value": b"    29.123",
+                "result": "29.1",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "EF.111111111111": {
+        "inject_reads": [
+            b"HobbyBoards_EF",  # read type
+        ],
+        "sensors": [
+            {
+                "entity_id": "sensor.ef_111111111111_humidity",
+                "unique_id": "/EF.111111111111/humidity/humidity_corrected",
+                "injected_value": b"    67.745",
+                "result": "67.7",
+                "unit": PERCENTAGE,
+            },
+            {
+                "entity_id": "sensor.ef_111111111111_humidity_raw",
+                "unique_id": "/EF.111111111111/humidity/humidity_raw",
+                "injected_value": b"    65.541",
+                "result": "65.5",
+                "unit": PERCENTAGE,
+            },
+            {
+                "entity_id": "sensor.ef_111111111111_temperature",
+                "unique_id": "/EF.111111111111/humidity/temperature",
+                "injected_value": b"    25.123",
+                "result": "25.1",
+                "unit": TEMP_CELSIUS,
+            },
+        ],
+    },
+    "EF.111111111112": {
+        "inject_reads": [
+            b"HB_MOISTURE_METER",  # read type
+            b"         1",  # read is_leaf_0
+            b"         1",  # read is_leaf_1
+            b"         0",  # read is_leaf_2
+            b"         0",  # read is_leaf_3
+        ],
+        "sensors": [
+            {
+                "entity_id": "sensor.ef_111111111112_wetness_0",
+                "unique_id": "/EF.111111111112/moisture/sensor.0",
+                "injected_value": b"    41.745",
+                "result": "41.7",
+                "unit": PERCENTAGE,
+            },
+            {
+                "entity_id": "sensor.ef_111111111112_wetness_1",
+                "unique_id": "/EF.111111111112/moisture/sensor.1",
+                "injected_value": b"    42.541",
+                "result": "42.5",
+                "unit": PERCENTAGE,
+            },
+            {
+                "entity_id": "sensor.ef_111111111112_moisture_2",
+                "unique_id": "/EF.111111111112/moisture/sensor.2",
+                "injected_value": b"    43.123",
+                "result": "43.1",
+                "unit": PRESSURE_CBAR,
+            },
+            {
+                "entity_id": "sensor.ef_111111111112_moisture_3",
+                "unique_id": "/EF.111111111112/moisture/sensor.3",
+                "injected_value": b"    44.123",
+                "result": "44.1",
+                "unit": PRESSURE_CBAR,
+            },
+        ],
+    },
+}
+
+
+@pytest.mark.parametrize("device_id", MOCK_DEVICE_SENSORS.keys())
+async def test_owserver_setup_valid_device(hass, device_id):
+    """Test for 1-Wire device."""
+    entity_registry = mock_registry(hass)
+
+    dir_return_value = [f"/{device_id}/"]
+    read_side_effect = [device_id[0:2].encode()]
+    if "inject_reads" in MOCK_DEVICE_SENSORS[device_id]:
+        read_side_effect += MOCK_DEVICE_SENSORS[device_id]["inject_reads"]
+
+    expected_sensors = MOCK_DEVICE_SENSORS[device_id]["sensors"]
+    for expected_sensor in expected_sensors:
+        read_side_effect.append(expected_sensor["injected_value"])
+
+    with patch("homeassistant.components.onewire.sensor.protocol.proxy") as owproxy:
+        owproxy.return_value.dir.return_value = dir_return_value
+        owproxy.return_value.read.side_effect = read_side_effect
+
+        assert await async_setup_component(hass, SENSOR_DOMAIN, MOCK_CONFIG)
+        await hass.async_block_till_done()
+
+    assert len(entity_registry.entities) == len(expected_sensors)
+
+    for expected_sensor in expected_sensors:
+        entity_id = expected_sensor["entity_id"]
+        registry_entry = entity_registry.entities.get(entity_id)
+        assert registry_entry is not None
+        assert registry_entry.unique_id == expected_sensor["unique_id"]
+        assert registry_entry.unit_of_measurement == expected_sensor["unit"]
+        state = hass.states.get(entity_id)
+        assert state.state == expected_sensor["result"]
diff --git a/tests/components/onewire/test_entity_sysbus.py b/tests/components/onewire/test_entity_sysbus.py
new file mode 100644
index 00000000000..8a233315ab2
--- /dev/null
+++ b/tests/components/onewire/test_entity_sysbus.py
@@ -0,0 +1,121 @@
+"""Tests for 1-Wire devices connected on SysBus."""
+from unittest.mock import PropertyMock, patch
+
+from pi1wire import InvalidCRCException, UnsupportResponseException
+import pytest
+
+from homeassistant.components.onewire.const import DEFAULT_SYSBUS_MOUNT_DIR, DOMAIN
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.const import TEMP_CELSIUS
+from homeassistant.setup import async_setup_component
+
+from tests.common import mock_registry
+
+MOCK_CONFIG = {
+    "sensor": {
+        "platform": DOMAIN,
+        "mount_dir": DEFAULT_SYSBUS_MOUNT_DIR,
+        "names": {
+            "10-111111111111": "My DS18B20",
+        },
+    }
+}
+
+MOCK_DEVICE_SENSORS = {
+    "00-111111111111": {"sensors": []},
+    "10-111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.my_ds18b20_temperature",
+                "unique_id": "/sys/bus/w1/devices/10-111111111111/w1_slave",
+                "injected_value": 25.123,
+                "result": "25.1",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "1D-111111111111": {"sensors": []},
+    "22-111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.22_111111111111_temperature",
+                "unique_id": "/sys/bus/w1/devices/22-111111111111/w1_slave",
+                "injected_value": FileNotFoundError,
+                "result": "unknown",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "28-111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.28_111111111111_temperature",
+                "unique_id": "/sys/bus/w1/devices/28-111111111111/w1_slave",
+                "injected_value": InvalidCRCException,
+                "result": "unknown",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "3B-111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.3b_111111111111_temperature",
+                "unique_id": "/sys/bus/w1/devices/3B-111111111111/w1_slave",
+                "injected_value": 29.993,
+                "result": "30.0",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "42-111111111111": {
+        "sensors": [
+            {
+                "entity_id": "sensor.42_111111111111_temperature",
+                "unique_id": "/sys/bus/w1/devices/42-111111111111/w1_slave",
+                "injected_value": UnsupportResponseException,
+                "result": "unknown",
+                "unit": TEMP_CELSIUS,
+            },
+        ]
+    },
+    "EF-111111111111": {
+        "sensors": [],
+    },
+    "EF-111111111112": {
+        "sensors": [],
+    },
+}
+
+
+@pytest.mark.parametrize("device_id", MOCK_DEVICE_SENSORS.keys())
+async def test_onewiredirect_setup_valid_device(hass, device_id):
+    """Test that sysbus config entry works correctly."""
+    entity_registry = mock_registry(hass)
+
+    read_side_effect = []
+    expected_sensors = MOCK_DEVICE_SENSORS[device_id]["sensors"]
+    for expected_sensor in expected_sensors:
+        read_side_effect.append(expected_sensor["injected_value"])
+
+    with patch(
+        "homeassistant.components.onewire.sensor.Pi1Wire"
+    ) as mock_pi1wire, patch("pi1wire.OneWire") as mock_owsensor:
+        type(mock_owsensor).mac_address = PropertyMock(
+            return_value=device_id.replace("-", "")
+        )
+        mock_owsensor.get_temperature.side_effect = read_side_effect
+        mock_pi1wire.return_value.find_all_sensors.return_value = [mock_owsensor]
+        assert await async_setup_component(hass, SENSOR_DOMAIN, MOCK_CONFIG)
+        await hass.async_block_till_done()
+
+    assert len(entity_registry.entities) == len(expected_sensors)
+
+    for expected_sensor in expected_sensors:
+        entity_id = expected_sensor["entity_id"]
+        registry_entry = entity_registry.entities.get(entity_id)
+        assert registry_entry is not None
+        assert registry_entry.unique_id == expected_sensor["unique_id"]
+        assert registry_entry.unit_of_measurement == expected_sensor["unit"]
+        state = hass.states.get(entity_id)
+        assert state.state == expected_sensor["result"]
diff --git a/tests/components/onewire/test_sensor.py b/tests/components/onewire/test_sensor.py
new file mode 100644
index 00000000000..0aa02a9906d
--- /dev/null
+++ b/tests/components/onewire/test_sensor.py
@@ -0,0 +1,43 @@
+"""Tests for 1-Wire sensor platform."""
+from homeassistant.components.onewire.const import DEFAULT_SYSBUS_MOUNT_DIR
+import homeassistant.components.sensor as sensor
+from homeassistant.setup import async_setup_component
+
+from tests.common import assert_setup_component
+
+
+async def test_setup_minimum(hass):
+    """Test setup with minimum configuration."""
+    config = {"sensor": {"platform": "onewire"}}
+    with assert_setup_component(1, "sensor"):
+        assert await async_setup_component(hass, sensor.DOMAIN, config)
+    await hass.async_block_till_done()
+
+
+async def test_setup_sysbus(hass):
+    """Test setup with SysBus configuration."""
+    config = {
+        "sensor": {
+            "platform": "onewire",
+            "mount_dir": DEFAULT_SYSBUS_MOUNT_DIR,
+        }
+    }
+    with assert_setup_component(1, "sensor"):
+        assert await async_setup_component(hass, sensor.DOMAIN, config)
+    await hass.async_block_till_done()
+
+
+async def test_setup_owserver(hass):
+    """Test setup with OWServer configuration."""
+    config = {"sensor": {"platform": "onewire", "host": "localhost"}}
+    with assert_setup_component(1, "sensor"):
+        assert await async_setup_component(hass, sensor.DOMAIN, config)
+    await hass.async_block_till_done()
+
+
+async def test_setup_owserver_with_port(hass):
+    """Test setup with OWServer configuration."""
+    config = {"sensor": {"platform": "onewire", "host": "localhost", "port": "1234"}}
+    with assert_setup_component(1, "sensor"):
+        assert await async_setup_component(hass, sensor.DOMAIN, config)
+    await hass.async_block_till_done()
diff --git a/tests/components/onvif/test_config_flow.py b/tests/components/onvif/test_config_flow.py
index 864968f848d..b8be96a123c 100644
--- a/tests/components/onvif/test_config_flow.py
+++ b/tests/components/onvif/test_config_flow.py
@@ -69,6 +69,7 @@ def setup_mock_onvif_camera(
     mock_onvif_camera.update_xaddrs = AsyncMock(return_value=True)
     mock_onvif_camera.create_devicemgmt_service = MagicMock(return_value=devicemgmt)
     mock_onvif_camera.create_media_service = MagicMock(return_value=media_service)
+    mock_onvif_camera.close = AsyncMock(return_value=None)
 
     def mock_constructor(
         host,
@@ -210,15 +211,22 @@ async def test_flow_discovered_devices(hass):
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
         assert result["step_id"] == "auth"
 
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                config_flow.CONF_USERNAME: USERNAME,
-                config_flow.CONF_PASSWORD: PASSWORD,
-            },
-        )
+        with patch(
+            "homeassistant.components.onvif.async_setup", return_value=True
+        ) as mock_setup, patch(
+            "homeassistant.components.onvif.async_setup_entry", return_value=True
+        ) as mock_setup_entry:
+            result = await hass.config_entries.flow.async_configure(
+                result["flow_id"],
+                user_input={
+                    config_flow.CONF_USERNAME: USERNAME,
+                    config_flow.CONF_PASSWORD: PASSWORD,
+                },
+            )
 
-        await hass.async_block_till_done()
+            await hass.async_block_till_done()
+            assert len(mock_setup.mock_calls) == 1
+            assert len(mock_setup_entry.mock_calls) == 1
 
         assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
         assert result["title"] == f"{URN} - {MAC}"
@@ -377,15 +385,22 @@ async def test_flow_manual_entry(hass):
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
         assert result["step_id"] == "auth"
 
-        result = await hass.config_entries.flow.async_configure(
-            result["flow_id"],
-            user_input={
-                config_flow.CONF_USERNAME: USERNAME,
-                config_flow.CONF_PASSWORD: PASSWORD,
-            },
-        )
+        with patch(
+            "homeassistant.components.onvif.async_setup", return_value=True
+        ) as mock_setup, patch(
+            "homeassistant.components.onvif.async_setup_entry", return_value=True
+        ) as mock_setup_entry:
+            result = await hass.config_entries.flow.async_configure(
+                result["flow_id"],
+                user_input={
+                    config_flow.CONF_USERNAME: USERNAME,
+                    config_flow.CONF_PASSWORD: PASSWORD,
+                },
+            )
 
-        await hass.async_block_till_done()
+            await hass.async_block_till_done()
+            assert len(mock_setup.mock_calls) == 1
+            assert len(mock_setup_entry.mock_calls) == 1
 
         assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
         assert result["title"] == f"{NAME} - {MAC}"
@@ -404,7 +419,11 @@ async def test_flow_import_no_mac(hass):
         "homeassistant.components.onvif.config_flow.get_device"
     ) as mock_onvif_camera, patch(
         "homeassistant.components.onvif.ONVIFDevice"
-    ) as mock_device:
+    ) as mock_device, patch(
+        "homeassistant.components.onvif.async_setup", return_value=True
+    ) as mock_setup, patch(
+        "homeassistant.components.onvif.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
         setup_mock_onvif_camera(mock_onvif_camera, with_interfaces=False)
         setup_mock_device(mock_device)
 
@@ -421,6 +440,8 @@ async def test_flow_import_no_mac(hass):
         )
 
         await hass.async_block_till_done()
+        assert len(mock_setup.mock_calls) == 1
+        assert len(mock_setup_entry.mock_calls) == 1
 
         assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
         assert result["title"] == f"{NAME} - {SERIAL_NUMBER}"
@@ -531,7 +552,7 @@ async def test_flow_import_onvif_auth_error(hass):
 
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
         assert result["step_id"] == "auth"
-        assert result["errors"]["base"] == "connection_failed"
+        assert result["errors"]["base"] == "cannot_connect"
 
 
 async def test_option_flow(hass):
diff --git a/tests/components/openhardwaremonitor/test_sensor.py b/tests/components/openhardwaremonitor/test_sensor.py
index 3cf5ba84a25..192bdf27119 100644
--- a/tests/components/openhardwaremonitor/test_sensor.py
+++ b/tests/components/openhardwaremonitor/test_sensor.py
@@ -1,55 +1,36 @@
 """The tests for the Open Hardware Monitor platform."""
-import unittest
+from homeassistant.setup import async_setup_component
 
-import requests_mock
-
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant, load_fixture
+from tests.common import load_fixture
 
 
-class TestOpenHardwareMonitorSetup(unittest.TestCase):
-    """Test the Open Hardware Monitor platform."""
-
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.config = {
-            "sensor": {
-                "platform": "openhardwaremonitor",
-                "host": "localhost",
-                "port": 8085,
-            }
+async def test_setup(hass, requests_mock):
+    """Test for successfully setting up the platform."""
+    config = {
+        "sensor": {
+            "platform": "openhardwaremonitor",
+            "host": "localhost",
+            "port": 8085,
         }
-        self.addCleanup(self.tear_down_cleanup)
+    }
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+    requests_mock.get(
+        "http://localhost:8085/data.json",
+        text=load_fixture("openhardwaremonitor.json"),
+    )
 
-    @requests_mock.Mocker()
-    def test_setup(self, mock_req):
-        """Test for successfully setting up the platform."""
-        mock_req.get(
-            "http://localhost:8085/data.json",
-            text=load_fixture("openhardwaremonitor.json"),
-        )
+    await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        assert setup_component(self.hass, "sensor", self.config)
-        self.hass.block_till_done()
-        entities = self.hass.states.async_entity_ids("sensor")
-        assert len(entities) == 38
+    entities = hass.states.async_entity_ids("sensor")
+    assert len(entities) == 38
 
-        state = self.hass.states.get(
-            "sensor.test_pc_intel_core_i7_7700_temperatures_cpu_core_1"
-        )
+    state = hass.states.get("sensor.test_pc_intel_core_i7_7700_temperatures_cpu_core_1")
 
-        assert state is not None
-        assert state.state == "31.0"
+    assert state is not None
+    assert state.state == "31.0"
 
-        state = self.hass.states.get(
-            "sensor.test_pc_intel_core_i7_7700_temperatures_cpu_core_2"
-        )
+    state = hass.states.get("sensor.test_pc_intel_core_i7_7700_temperatures_cpu_core_2")
 
-        assert state is not None
-        assert state.state == "30.0"
+    assert state is not None
+    assert state.state == "30.0"
diff --git a/tests/components/openweathermap/test_config_flow.py b/tests/components/openweathermap/test_config_flow.py
index 672e7358803..4b3297563ed 100644
--- a/tests/components/openweathermap/test_config_flow.py
+++ b/tests/components/openweathermap/test_config_flow.py
@@ -1,5 +1,4 @@
 """Define tests for the OpenWeatherMap config flow."""
-from asynctest import MagicMock, patch
 from pyowm.exceptions.api_call_error import APICallError
 from pyowm.exceptions.api_response_error import UnauthorizedError
 
@@ -19,6 +18,7 @@ from homeassistant.const import (
     CONF_NAME,
 )
 
+from tests.async_mock import MagicMock, patch
 from tests.common import MockConfigEntry
 
 CONFIG = {
@@ -166,7 +166,7 @@ async def test_form_invalid_api_key(hass):
             DOMAIN, context={"source": SOURCE_USER}, data=CONFIG
         )
 
-        assert result["errors"] == {"base": "auth"}
+        assert result["errors"] == {"base": "invalid_api_key"}
 
 
 async def test_form_api_call_error(hass):
@@ -182,7 +182,7 @@ async def test_form_api_call_error(hass):
             DOMAIN, context={"source": SOURCE_USER}, data=CONFIG
         )
 
-        assert result["errors"] == {"base": "connection"}
+        assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_form_api_offline(hass):
@@ -197,7 +197,7 @@ async def test_form_api_offline(hass):
             DOMAIN, context={"source": SOURCE_USER}, data=CONFIG
         )
 
-        assert result["errors"] == {"base": "auth"}
+        assert result["errors"] == {"base": "invalid_api_key"}
 
 
 def _create_mocked_owm(is_api_online: bool):
diff --git a/tests/components/ovo_energy/test_config_flow.py b/tests/components/ovo_energy/test_config_flow.py
index b89a9729c35..58006488764 100644
--- a/tests/components/ovo_energy/test_config_flow.py
+++ b/tests/components/ovo_energy/test_config_flow.py
@@ -41,7 +41,7 @@ async def test_authorization_error(hass: HomeAssistant) -> None:
 
     assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result2["step_id"] == "user"
-    assert result2["errors"] == {"base": "authorization_error"}
+    assert result2["errors"] == {"base": "invalid_auth"}
 
 
 async def test_connection_error(hass: HomeAssistant) -> None:
@@ -64,7 +64,7 @@ async def test_connection_error(hass: HomeAssistant) -> None:
 
     assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result2["step_id"] == "user"
-    assert result2["errors"] == {"base": "connection_error"}
+    assert result2["errors"] == {"base": "cannot_connect"}
 
 
 async def test_full_flow_implementation(hass: HomeAssistant) -> None:
diff --git a/tests/components/owntracks/test_config_flow.py b/tests/components/owntracks/test_config_flow.py
index 396870c2975..2290e3e17a4 100644
--- a/tests/components/owntracks/test_config_flow.py
+++ b/tests/components/owntracks/test_config_flow.py
@@ -111,12 +111,12 @@ async def test_abort_if_already_setup(hass):
     # Should fail, already setup (import)
     result = await flow.async_step_import({})
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "one_instance_allowed"
+    assert result["reason"] == "single_instance_allowed"
 
     # Should fail, already setup (flow)
     result = await flow.async_step_user({})
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "one_instance_allowed"
+    assert result["reason"] == "single_instance_allowed"
 
 
 async def test_user_not_supports_encryption(hass, not_supports_encryption):
diff --git a/tests/components/ozw/conftest.py b/tests/components/ozw/conftest.py
index 3e30b60129b..3af9594d868 100644
--- a/tests/components/ozw/conftest.py
+++ b/tests/components/ozw/conftest.py
@@ -33,18 +33,6 @@ def light_new_ozw_data_fixture():
     return load_fixture("ozw/light_new_ozw_network_dump.csv")
 
 
-@pytest.fixture(name="light_pure_rgb_dimmer_data", scope="session")
-def light_pure_rgb_dimmer_data_fixture():
-    """Load light rgb and dimmer MQTT data and return it."""
-    return load_fixture("ozw/light_pure_rgb_dimmer_dump.csv")
-
-
-@pytest.fixture(name="light_no_rgb_data", scope="session")
-def light_no_rgb_data_fixture():
-    """Load light dimmer MQTT data and return it."""
-    return load_fixture("ozw/light_no_rgb_network_dump.csv")
-
-
 @pytest.fixture(name="light_no_ww_data", scope="session")
 def light_no_ww_data_fixture():
     """Load light dimmer MQTT data and return it."""
diff --git a/tests/components/ozw/test_config_flow.py b/tests/components/ozw/test_config_flow.py
index 3446bbfc7de..1af6787a952 100644
--- a/tests/components/ozw/test_config_flow.py
+++ b/tests/components/ozw/test_config_flow.py
@@ -51,4 +51,4 @@ async def test_one_instance_allowed(hass):
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
     assert result["type"] == "abort"
-    assert result["reason"] == "one_instance_allowed"
+    assert result["reason"] == "single_instance_allowed"
diff --git a/tests/components/ozw/test_light.py b/tests/components/ozw/test_light.py
index 498bf4d0cd9..6388629be8c 100644
--- a/tests/components/ozw/test_light.py
+++ b/tests/components/ozw/test_light.py
@@ -351,10 +351,10 @@ async def test_light(hass, light_data, light_msg, light_rgb_msg, sent_messages):
 
 
 async def test_pure_rgb_dimmer_light(
-    hass, light_pure_rgb_dimmer_data, light_msg, light_pure_rgb_msg, sent_messages
+    hass, light_data, light_pure_rgb_msg, sent_messages
 ):
     """Test light with no color channels command class."""
-    receive_message = await setup_ozw(hass, fixture=light_pure_rgb_dimmer_data)
+    receive_message = await setup_ozw(hass, fixture=light_data)
 
     # Test loaded
     state = hass.states.get("light.kitchen_rgb_strip_level")
@@ -392,9 +392,9 @@ async def test_pure_rgb_dimmer_light(
     assert state.attributes["hs_color"] == (300.0, 70.196)
 
 
-async def test_no_rgb_light(hass, light_no_rgb_data, light_no_rgb_msg, sent_messages):
+async def test_no_rgb_light(hass, light_data, light_no_rgb_msg, sent_messages):
     """Test setting up config entry."""
-    receive_message = await setup_ozw(hass, fixture=light_no_rgb_data)
+    receive_message = await setup_ozw(hass, fixture=light_data)
 
     # Test loaded no RGBW support (dimmer only)
     state = hass.states.get("light.master_bedroom_l_level")
diff --git a/tests/components/ozw/test_lock.py b/tests/components/ozw/test_lock.py
index c85bd198bdd..f32d073c562 100644
--- a/tests/components/ozw/test_lock.py
+++ b/tests/components/ozw/test_lock.py
@@ -80,7 +80,4 @@ async def test_lock(hass, lock_data, sent_messages, lock_msg, caplog):
         blocking=True,
     )
     assert len(sent_messages) == 5
-    assert (
-        "Invalid code provided: (123) user code must be at least 4 digits"
-        in caplog.text
-    )
+    assert "User code must be at least 4 digits" in caplog.text
diff --git a/tests/components/ozw/test_services.py b/tests/components/ozw/test_services.py
index 1460e69b9c9..7c71b234242 100644
--- a/tests/components/ozw/test_services.py
+++ b/tests/components/ozw/test_services.py
@@ -1,8 +1,12 @@
 """Test Z-Wave Services."""
+from openzwavemqtt.const import ATTR_POSITION, ATTR_VALUE
+from openzwavemqtt.exceptions import InvalidValueError, NotFoundError, WrongTypeError
+import pytest
+
 from .common import setup_ozw
 
 
-async def test_services(hass, light_data, sent_messages, light_msg, caplog):
+async def test_services(hass, light_data, sent_messages):
     """Test services on lock."""
     await setup_ozw(hass, fixture=light_data)
 
@@ -43,34 +47,48 @@ async def test_services(hass, light_data, sent_messages, light_msg, caplog):
     assert msg["payload"] == {"Value": 55, "ValueIDKey": 844425594667027}
 
     # Test set_config_parameter invalid list int
-    await hass.services.async_call(
-        "ozw",
-        "set_config_parameter",
-        {"node_id": 39, "parameter": 1, "value": 12},
-        blocking=True,
-    )
+    with pytest.raises(NotFoundError):
+        assert await hass.services.async_call(
+            "ozw",
+            "set_config_parameter",
+            {"node_id": 39, "parameter": 1, "value": 12},
+            blocking=True,
+        )
     assert len(sent_messages) == 3
-    assert "Invalid value 12 for parameter 1" in caplog.text
 
-    # Test set_config_parameter invalid list string
-    await hass.services.async_call(
-        "ozw",
-        "set_config_parameter",
-        {"node_id": 39, "parameter": 1, "value": "Blah"},
-        blocking=True,
-    )
+    # Test set_config_parameter invalid list value
+    with pytest.raises(NotFoundError):
+        assert await hass.services.async_call(
+            "ozw",
+            "set_config_parameter",
+            {"node_id": 39, "parameter": 1, "value": "Blah"},
+            blocking=True,
+        )
+    assert len(sent_messages) == 3
+
+    # Test set_config_parameter invalid list value type
+    with pytest.raises(WrongTypeError):
+        assert await hass.services.async_call(
+            "ozw",
+            "set_config_parameter",
+            {
+                "node_id": 39,
+                "parameter": 1,
+                "value": {ATTR_VALUE: True, ATTR_POSITION: 1},
+            },
+            blocking=True,
+        )
     assert len(sent_messages) == 3
-    assert "Invalid value Blah for parameter 1" in caplog.text
 
     # Test set_config_parameter int out of range
-    await hass.services.async_call(
-        "ozw",
-        "set_config_parameter",
-        {"node_id": 39, "parameter": 3, "value": 2147483657},
-        blocking=True,
-    )
+    with pytest.raises(InvalidValueError):
+        assert await hass.services.async_call(
+            "ozw",
+            "set_config_parameter",
+            {"node_id": 39, "parameter": 3, "value": 2147483657},
+            blocking=True,
+        )
     assert len(sent_messages) == 3
-    assert "Value 2147483657 out of range for parameter 3" in caplog.text
 
     # Test set_config_parameter short
     await hass.services.async_call(
diff --git a/tests/components/ozw/test_websocket_api.py b/tests/components/ozw/test_websocket_api.py
index 353615c1812..d4194b0a537 100644
--- a/tests/components/ozw/test_websocket_api.py
+++ b/tests/components/ozw/test_websocket_api.py
@@ -1,5 +1,15 @@
 """Test OpenZWave Websocket API."""
+from openzwavemqtt.const import (
+    ATTR_CODE_SLOT,
+    ATTR_LABEL,
+    ATTR_OPTIONS,
+    ATTR_POSITION,
+    ATTR_VALUE,
+    ValueType,
+)
 
+from homeassistant.components.ozw.const import ATTR_CONFIG_PARAMETER
+from homeassistant.components.ozw.lock import ATTR_USERCODE
 from homeassistant.components.ozw.websocket_api import (
     ATTR_IS_AWAKE,
     ATTR_IS_BEAMING,
@@ -17,9 +27,15 @@ from homeassistant.components.ozw.websocket_api import (
     ID,
     NODE_ID,
     OZW_INSTANCE,
+    PARAMETER,
     TYPE,
+    VALUE,
+)
+from homeassistant.components.websocket_api.const import (
+    ERR_INVALID_FORMAT,
+    ERR_NOT_FOUND,
+    ERR_NOT_SUPPORTED,
 )
-from homeassistant.components.websocket_api.const import ERR_NOT_FOUND
 
 from .common import MQTTMessage, setup_ozw
 
@@ -119,6 +135,188 @@ async def test_websocket_api(hass, generic_data, hass_ws_client):
     assert result[2][ATTR_IS_AWAKE]
     assert not result[1][ATTR_IS_FAILED]
 
+    # Test get config parameters
+    await client.send_json({ID: 13, TYPE: "ozw/get_config_parameters", NODE_ID: 39})
+    msg = await client.receive_json()
+    result = msg["result"]
+    assert len(result) == 8
+    for config_param in result:
+        assert config_param["type"] in (
+            ValueType.LIST.value,
+            ValueType.BOOL.value,
+            ValueType.INT.value,
+            ValueType.BYTE.value,
+            ValueType.SHORT.value,
+            ValueType.BITSET.value,
+        )
+
+    # Test set config parameter
+    config_param = result[0]
+    current_val = config_param[ATTR_VALUE]
+    new_val = next(
+        option["Value"]
+        for option in config_param[ATTR_OPTIONS]
+        if option["Label"] != current_val
+    )
+    new_label = next(
+        option["Label"]
+        for option in config_param[ATTR_OPTIONS]
+        if option["Label"] != current_val and option["Value"] != new_val
+    )
+    await client.send_json(
+        {
+            ID: 14,
+            TYPE: "ozw/set_config_parameter",
+            NODE_ID: 39,
+            PARAMETER: config_param[ATTR_CONFIG_PARAMETER],
+            VALUE: new_val,
+        }
+    )
+    msg = await client.receive_json()
+    assert msg["success"]
+    await client.send_json(
+        {
+            ID: 15,
+            TYPE: "ozw/set_config_parameter",
+            NODE_ID: 39,
+            PARAMETER: config_param[ATTR_CONFIG_PARAMETER],
+            VALUE: new_label,
+        }
+    )
+    msg = await client.receive_json()
+    assert msg["success"]
+
+    # Test OZW Instance not found error
+    await client.send_json(
+        {ID: 16, TYPE: "ozw/get_config_parameters", OZW_INSTANCE: 999, NODE_ID: 1}
+    )
+    msg = await client.receive_json()
+    result = msg["error"]
+    assert result["code"] == ERR_NOT_FOUND
+
+    # Test OZW Node not found error
+    await client.send_json(
+        {
+            ID: 18,
+            TYPE: "ozw/set_config_parameter",
+            NODE_ID: 999,
+            PARAMETER: 0,
+            VALUE: "test",
+        }
+    )
+    msg = await client.receive_json()
+    result = msg["error"]
+    assert result["code"] == ERR_NOT_FOUND
+
+    # Test parameter not found
+    await client.send_json(
+        {
+            ID: 19,
+            TYPE: "ozw/set_config_parameter",
+            NODE_ID: 39,
+            PARAMETER: 45,
+            VALUE: "test",
+        }
+    )
+    msg = await client.receive_json()
+    result = msg["error"]
+    assert result["code"] == ERR_NOT_FOUND
+
+    # Test list value not found
+    await client.send_json(
+        {
+            ID: 20,
+            TYPE: "ozw/set_config_parameter",
+            NODE_ID: 39,
+            PARAMETER: config_param[ATTR_CONFIG_PARAMETER],
+            VALUE: "test",
+        }
+    )
+    msg = await client.receive_json()
+    result = msg["error"]
+    assert result["code"] == ERR_NOT_FOUND
+
+    # Test value type invalid
+    await client.send_json(
+        {
+            ID: 21,
+            TYPE: "ozw/set_config_parameter",
+            NODE_ID: 39,
+            PARAMETER: 3,
+            VALUE: 0,
+        }
+    )
+    msg = await client.receive_json()
+    result = msg["error"]
+    assert result["code"] == ERR_NOT_SUPPORTED
+
+    # Test invalid bitset format
+    await client.send_json(
+        {
+            ID: 22,
+            TYPE: "ozw/set_config_parameter",
+            NODE_ID: 39,
+            PARAMETER: 3,
+            VALUE: {ATTR_POSITION: 1, ATTR_VALUE: True, ATTR_LABEL: "test"},
+        }
+    )
+    msg = await client.receive_json()
+    result = msg["error"]
+    assert result["code"] == ERR_INVALID_FORMAT
+
+    # Test valid bitset format passes validation
+    await client.send_json(
+        {
+            ID: 23,
+            TYPE: "ozw/set_config_parameter",
+            NODE_ID: 39,
+            PARAMETER: 10000,
+            VALUE: {ATTR_POSITION: 1, ATTR_VALUE: True},
+        }
+    )
+    msg = await client.receive_json()
+    result = msg["error"]
+    assert result["code"] == ERR_NOT_FOUND
+
+
+async def test_ws_locks(hass, lock_data, hass_ws_client):
+    """Test lock websocket apis."""
+    await setup_ozw(hass, fixture=lock_data)
+    client = await hass_ws_client(hass)
+
+    await client.send_json(
+        {
+            ID: 1,
+            TYPE: "ozw/get_code_slots",
+            NODE_ID: 10,
+        }
+    )
+    msg = await client.receive_json()
+    assert msg["success"]
+
+    await client.send_json(
+        {
+            ID: 2,
+            TYPE: "ozw/set_usercode",
+            NODE_ID: 10,
+            ATTR_CODE_SLOT: 1,
+            ATTR_USERCODE: "1234",
+        }
+    )
+    msg = await client.receive_json()
+    assert msg["success"]
+
+    await client.send_json(
+        {
+            ID: 3,
+            TYPE: "ozw/clear_usercode",
+            NODE_ID: 10,
+            ATTR_CODE_SLOT: 1,
+        }
+    )
+    msg = await client.receive_json()
+    assert msg["success"]
+
 
 async def test_refresh_node(hass, generic_data, sent_messages, hass_ws_client):
     """Test the ozw refresh node api."""
diff --git a/tests/components/panasonic_viera/test_config_flow.py b/tests/components/panasonic_viera/test_config_flow.py
index 5359811c52c..15e6b73202d 100644
--- a/tests/components/panasonic_viera/test_config_flow.py
+++ b/tests/components/panasonic_viera/test_config_flow.py
@@ -4,16 +4,20 @@ import pytest
 
 from homeassistant import config_entries
 from homeassistant.components.panasonic_viera.const import (
+    ATTR_DEVICE_INFO,
+    ATTR_FRIENDLY_NAME,
+    ATTR_MANUFACTURER,
+    ATTR_MODEL_NUMBER,
+    ATTR_UDN,
     CONF_APP_ID,
     CONF_ENCRYPTION_KEY,
     CONF_ON_ACTION,
+    DEFAULT_MANUFACTURER,
+    DEFAULT_MODEL_NUMBER,
     DEFAULT_NAME,
     DEFAULT_PORT,
     DOMAIN,
     ERROR_INVALID_PIN_CODE,
-    ERROR_NOT_CONNECTED,
-    REASON_NOT_CONNECTED,
-    REASON_UNKNOWN,
 )
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PIN, CONF_PORT
 
@@ -35,10 +39,15 @@ def panasonic_viera_setup_fixture():
 
 def get_mock_remote(
     host="1.2.3.4",
+    request_error=None,
     authorize_error=None,
     encrypted=False,
     app_id=None,
     encryption_key=None,
+    name=DEFAULT_NAME,
+    manufacturer=DEFAULT_MANUFACTURER,
+    model_number=DEFAULT_MODEL_NUMBER,
+    unique_id="mock-unique-id",
 ):
     """Return a mock remote."""
     mock_remote = Mock()
@@ -48,7 +57,8 @@ def get_mock_remote(
     mock_remote.enc_key = encryption_key
 
     def request_pin_code(name=None):
-        return
+        if request_error is not None:
+            raise request_error
 
     mock_remote.request_pin_code = request_pin_code
 
@@ -61,6 +71,16 @@ def get_mock_remote(
 
     mock_remote.authorize_pin_code = authorize_pin_code
 
+    def get_device_info():
+        return {
+            ATTR_FRIENDLY_NAME: name,
+            ATTR_MANUFACTURER: manufacturer,
+            ATTR_MODEL_NUMBER: model_number,
+            ATTR_UDN: unique_id,
+        }
+
+    mock_remote.get_device_info = get_device_info
+
     return mock_remote
 
 
@@ -92,6 +112,12 @@ async def test_flow_non_encrypted(hass):
         CONF_NAME: DEFAULT_NAME,
         CONF_PORT: DEFAULT_PORT,
         CONF_ON_ACTION: None,
+        ATTR_DEVICE_INFO: {
+            ATTR_FRIENDLY_NAME: DEFAULT_NAME,
+            ATTR_MANUFACTURER: DEFAULT_MANUFACTURER,
+            ATTR_MODEL_NUMBER: DEFAULT_MODEL_NUMBER,
+            ATTR_UDN: "mock-unique-id",
+        },
     }
 
 
@@ -116,7 +142,7 @@ async def test_flow_not_connected_error(hass):
 
     assert result["type"] == "form"
     assert result["step_id"] == "user"
-    assert result["errors"] == {"base": ERROR_NOT_CONNECTED}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_flow_unknown_abort(hass):
@@ -139,7 +165,57 @@ async def test_flow_unknown_abort(hass):
         )
 
     assert result["type"] == "abort"
-    assert result["reason"] == REASON_UNKNOWN
+    assert result["reason"] == "unknown"
+
+
+async def test_flow_encrypted_not_connected_pin_code_request(hass):
+    """Test flow with encryption and PIN code request connection error abortion during pairing request step."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "user"
+
+    mock_remote = get_mock_remote(encrypted=True, request_error=TimeoutError)
+
+    with patch(
+        "homeassistant.components.panasonic_viera.config_flow.RemoteControl",
+        return_value=mock_remote,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_HOST: "1.2.3.4", CONF_NAME: DEFAULT_NAME},
+        )
+
+    assert result["type"] == "abort"
+    assert result["reason"] == "cannot_connect"
+
+
+async def test_flow_encrypted_unknown_pin_code_request(hass):
+    """Test flow with encryption and PIN code request unknown error abortion during pairing request step."""
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "user"
+
+    mock_remote = get_mock_remote(encrypted=True, request_error=Exception)
+
+    with patch(
+        "homeassistant.components.panasonic_viera.config_flow.RemoteControl",
+        return_value=mock_remote,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {CONF_HOST: "1.2.3.4", CONF_NAME: DEFAULT_NAME},
+        )
+
+    assert result["type"] == "abort"
+    assert result["reason"] == "unknown"
 
 
 async def test_flow_encrypted_valid_pin_code(hass):
@@ -184,6 +260,12 @@ async def test_flow_encrypted_valid_pin_code(hass):
         CONF_ON_ACTION: None,
         CONF_APP_ID: "test-app-id",
         CONF_ENCRYPTION_KEY: "test-encryption-key",
+        ATTR_DEVICE_INFO: {
+            ATTR_FRIENDLY_NAME: DEFAULT_NAME,
+            ATTR_MANUFACTURER: DEFAULT_MANUFACTURER,
+            ATTR_MODEL_NUMBER: DEFAULT_MODEL_NUMBER,
+            ATTR_UDN: "mock-unique-id",
+        },
     }
 
 
@@ -255,7 +337,7 @@ async def test_flow_encrypted_not_connected_abort(hass):
     )
 
     assert result["type"] == "abort"
-    assert result["reason"] == REASON_NOT_CONNECTED
+    assert result["reason"] == "cannot_connect"
 
 
 async def test_flow_encrypted_unknown_abort(hass):
@@ -288,7 +370,7 @@ async def test_flow_encrypted_unknown_abort(hass):
     )
 
     assert result["type"] == "abort"
-    assert result["reason"] == REASON_UNKNOWN
+    assert result["reason"] == "unknown"
 
 
 async def test_flow_non_encrypted_already_configured_abort(hass):
@@ -362,6 +444,12 @@ async def test_imported_flow_non_encrypted(hass):
         CONF_NAME: DEFAULT_NAME,
         CONF_PORT: DEFAULT_PORT,
         CONF_ON_ACTION: "test-on-action",
+        ATTR_DEVICE_INFO: {
+            ATTR_FRIENDLY_NAME: DEFAULT_NAME,
+            ATTR_MANUFACTURER: DEFAULT_MANUFACTURER,
+            ATTR_MODEL_NUMBER: DEFAULT_MODEL_NUMBER,
+            ATTR_UDN: "mock-unique-id",
+        },
     }
 
 
@@ -406,6 +494,12 @@ async def test_imported_flow_encrypted_valid_pin_code(hass):
         CONF_ON_ACTION: "test-on-action",
         CONF_APP_ID: "test-app-id",
         CONF_ENCRYPTION_KEY: "test-encryption-key",
+        ATTR_DEVICE_INFO: {
+            ATTR_FRIENDLY_NAME: DEFAULT_NAME,
+            ATTR_MANUFACTURER: DEFAULT_MANUFACTURER,
+            ATTR_MODEL_NUMBER: DEFAULT_MODEL_NUMBER,
+            ATTR_UDN: "mock-unique-id",
+        },
     }
 
 
@@ -475,7 +569,7 @@ async def test_imported_flow_encrypted_not_connected_abort(hass):
     )
 
     assert result["type"] == "abort"
-    assert result["reason"] == REASON_NOT_CONNECTED
+    assert result["reason"] == "cannot_connect"
 
 
 async def test_imported_flow_encrypted_unknown_abort(hass):
@@ -507,7 +601,7 @@ async def test_imported_flow_encrypted_unknown_abort(hass):
     )
 
     assert result["type"] == "abort"
-    assert result["reason"] == REASON_UNKNOWN
+    assert result["reason"] == "unknown"
 
 
 async def test_imported_flow_not_connected_error(hass):
@@ -530,7 +624,7 @@ async def test_imported_flow_not_connected_error(hass):
 
     assert result["type"] == "form"
     assert result["step_id"] == "user"
-    assert result["errors"] == {"base": ERROR_NOT_CONNECTED}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_imported_flow_unknown_abort(hass):
@@ -552,7 +646,7 @@ async def test_imported_flow_unknown_abort(hass):
         )
 
     assert result["type"] == "abort"
-    assert result["reason"] == REASON_UNKNOWN
+    assert result["reason"] == "unknown"
 
 
 async def test_imported_flow_non_encrypted_already_configured_abort(hass):
diff --git a/tests/components/panasonic_viera/test_init.py b/tests/components/panasonic_viera/test_init.py
index a4a1ca94fe5..3ac6b7e12da 100644
--- a/tests/components/panasonic_viera/test_init.py
+++ b/tests/components/panasonic_viera/test_init.py
@@ -1,8 +1,15 @@
 """Test the Panasonic Viera setup process."""
 from homeassistant.components.panasonic_viera.const import (
+    ATTR_DEVICE_INFO,
+    ATTR_FRIENDLY_NAME,
+    ATTR_MANUFACTURER,
+    ATTR_MODEL_NUMBER,
+    ATTR_UDN,
     CONF_APP_ID,
     CONF_ENCRYPTION_KEY,
     CONF_ON_ACTION,
+    DEFAULT_MANUFACTURER,
+    DEFAULT_MODEL_NUMBER,
     DEFAULT_NAME,
     DEFAULT_PORT,
     DOMAIN,
@@ -26,8 +33,15 @@ MOCK_ENCRYPTION_DATA = {
     CONF_ENCRYPTION_KEY: "mock-encryption-key",
 }
 
+MOCK_DEVICE_INFO = {
+    ATTR_FRIENDLY_NAME: DEFAULT_NAME,
+    ATTR_MANUFACTURER: DEFAULT_MANUFACTURER,
+    ATTR_MODEL_NUMBER: DEFAULT_MODEL_NUMBER,
+    ATTR_UDN: "mock-unique-id",
+}
 
-def get_mock_remote():
+
+def get_mock_remote(device_info=MOCK_DEVICE_INFO):
     """Return a mock remote."""
     mock_remote = Mock()
 
@@ -36,6 +50,11 @@ def get_mock_remote():
 
     mock_remote.async_create_remote_control = async_create_remote_control
 
+    async def async_get_device_info():
+        return device_info
+
+    mock_remote.async_get_device_info = async_get_device_info
+
     return mock_remote
 
 
@@ -43,8 +62,8 @@ async def test_setup_entry_encrypted(hass):
     """Test setup with encrypted config entry."""
     mock_entry = MockConfigEntry(
         domain=DOMAIN,
-        unique_id=MOCK_CONFIG_DATA[CONF_HOST],
-        data={**MOCK_CONFIG_DATA, **MOCK_ENCRYPTION_DATA},
+        unique_id=MOCK_DEVICE_INFO[ATTR_UDN],
+        data={**MOCK_CONFIG_DATA, **MOCK_ENCRYPTION_DATA, **MOCK_DEVICE_INFO},
     )
 
     mock_entry.add_to_hass(hass)
@@ -64,8 +83,89 @@ async def test_setup_entry_encrypted(hass):
         assert state.name == DEFAULT_NAME
 
 
+async def test_setup_entry_encrypted_missing_device_info(hass):
+    """Test setup with encrypted config entry and missing device info."""
+    mock_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=MOCK_CONFIG_DATA[CONF_HOST],
+        data={**MOCK_CONFIG_DATA, **MOCK_ENCRYPTION_DATA},
+    )
+
+    mock_entry.add_to_hass(hass)
+
+    mock_remote = get_mock_remote()
+
+    with patch(
+        "homeassistant.components.panasonic_viera.Remote",
+        return_value=mock_remote,
+    ):
+        await hass.config_entries.async_setup(mock_entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert mock_entry.data[ATTR_DEVICE_INFO] == MOCK_DEVICE_INFO
+        assert mock_entry.unique_id == MOCK_DEVICE_INFO[ATTR_UDN]
+
+        state = hass.states.get("media_player.panasonic_viera_tv")
+
+        assert state
+        assert state.name == DEFAULT_NAME
+
+
+async def test_setup_entry_encrypted_missing_device_info_none(hass):
+    """Test setup with encrypted config entry and device info set to None."""
+    mock_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=MOCK_CONFIG_DATA[CONF_HOST],
+        data={**MOCK_CONFIG_DATA, **MOCK_ENCRYPTION_DATA},
+    )
+
+    mock_entry.add_to_hass(hass)
+
+    mock_remote = get_mock_remote(device_info=None)
+
+    with patch(
+        "homeassistant.components.panasonic_viera.Remote",
+        return_value=mock_remote,
+    ):
+        await hass.config_entries.async_setup(mock_entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert mock_entry.data[ATTR_DEVICE_INFO] is None
+        assert mock_entry.unique_id == MOCK_CONFIG_DATA[CONF_HOST]
+
+        state = hass.states.get("media_player.panasonic_viera_tv")
+
+        assert state
+        assert state.name == DEFAULT_NAME
+
+
 async def test_setup_entry_unencrypted(hass):
     """Test setup with unencrypted config entry."""
+    mock_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=MOCK_DEVICE_INFO[ATTR_UDN],
+        data={**MOCK_CONFIG_DATA, **MOCK_DEVICE_INFO},
+    )
+
+    mock_entry.add_to_hass(hass)
+
+    mock_remote = get_mock_remote()
+
+    with patch(
+        "homeassistant.components.panasonic_viera.Remote",
+        return_value=mock_remote,
+    ):
+        await hass.config_entries.async_setup(mock_entry.entry_id)
+        await hass.async_block_till_done()
+
+        state = hass.states.get("media_player.panasonic_viera_tv")
+
+        assert state
+        assert state.name == DEFAULT_NAME
+
+
+async def test_setup_entry_unencrypted_missing_device_info(hass):
+    """Test setup with unencrypted config entry and missing device info."""
     mock_entry = MockConfigEntry(
         domain=DOMAIN,
         unique_id=MOCK_CONFIG_DATA[CONF_HOST],
@@ -83,6 +183,37 @@ async def test_setup_entry_unencrypted(hass):
         await hass.config_entries.async_setup(mock_entry.entry_id)
         await hass.async_block_till_done()
 
+        assert mock_entry.data[ATTR_DEVICE_INFO] == MOCK_DEVICE_INFO
+        assert mock_entry.unique_id == MOCK_DEVICE_INFO[ATTR_UDN]
+
+        state = hass.states.get("media_player.panasonic_viera_tv")
+
+        assert state
+        assert state.name == DEFAULT_NAME
+
+
+async def test_setup_entry_unencrypted_missing_device_info_none(hass):
+    """Test setup with unencrypted config entry and device info set to None."""
+    mock_entry = MockConfigEntry(
+        domain=DOMAIN,
+        unique_id=MOCK_CONFIG_DATA[CONF_HOST],
+        data=MOCK_CONFIG_DATA,
+    )
+
+    mock_entry.add_to_hass(hass)
+
+    mock_remote = get_mock_remote(device_info=None)
+
+    with patch(
+        "homeassistant.components.panasonic_viera.Remote",
+        return_value=mock_remote,
+    ):
+        await hass.config_entries.async_setup(mock_entry.entry_id)
+        await hass.async_block_till_done()
+
+        assert mock_entry.data[ATTR_DEVICE_INFO] is None
+        assert mock_entry.unique_id == MOCK_CONFIG_DATA[CONF_HOST]
+
         state = hass.states.get("media_player.panasonic_viera_tv")
 
         assert state
@@ -106,7 +237,7 @@ async def test_setup_config_flow_initiated(hass):
 async def test_setup_unload_entry(hass):
     """Test if config entry is unloaded."""
     mock_entry = MockConfigEntry(
-        domain=DOMAIN, unique_id=MOCK_CONFIG_DATA[CONF_HOST], data=MOCK_CONFIG_DATA
+        domain=DOMAIN, unique_id=MOCK_DEVICE_INFO[ATTR_UDN], data=MOCK_CONFIG_DATA
     )
 
     mock_entry.add_to_hass(hass)
diff --git a/tests/components/panel_iframe/test_init.py b/tests/components/panel_iframe/test_init.py
index 7d42c4d03d3..5a52e4af3e7 100644
--- a/tests/components/panel_iframe/test_init.py
+++ b/tests/components/panel_iframe/test_init.py
@@ -1,100 +1,87 @@
 """The tests for the panel_iframe component."""
-import unittest
+import pytest
 
-from homeassistant import setup
 from homeassistant.components import frontend
-
-from tests.async_mock import patch
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 
-class TestPanelIframe(unittest.TestCase):
-    """Test the panel_iframe component."""
+@pytest.mark.parametrize(
+    "config_to_try",
+    (
+        {"invalid space": {"url": "https://home-assistant.io"}},
+        {"router": {"url": "not-a-url"}},
+    ),
+)
+async def test_wrong_config(hass, config_to_try):
+    """Test setup with wrong configuration."""
+    assert not await async_setup_component(
+        hass, "panel_iframe", {"panel_iframe": config_to_try}
+    )
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
 
-    def test_wrong_config(self):
-        """Test setup with wrong configuration."""
-        to_try = [
-            {"invalid space": {"url": "https://home-assistant.io"}},
-            {"router": {"url": "not-a-url"}},
-        ]
-
-        for conf in to_try:
-            with patch(
-                "homeassistant.components.http.start_http_server_and_save_config"
-            ):
-                assert not setup.setup_component(
-                    self.hass, "panel_iframe", {"panel_iframe": conf}
-                )
-
-    def test_correct_config(self):
-        """Test correct config."""
-        with patch("homeassistant.components.http.start_http_server_and_save_config"):
-            assert setup.setup_component(
-                self.hass,
-                "panel_iframe",
-                {
-                    "panel_iframe": {
-                        "router": {
-                            "icon": "mdi:network-wireless",
-                            "title": "Router",
-                            "url": "http://192.168.1.1",
-                            "require_admin": True,
-                        },
-                        "weather": {
-                            "icon": "mdi:weather",
-                            "title": "Weather",
-                            "url": "https://www.wunderground.com/us/ca/san-diego",
-                            "require_admin": True,
-                        },
-                        "api": {"icon": "mdi:weather", "title": "Api", "url": "/api"},
-                        "ftp": {
-                            "icon": "mdi:weather",
-                            "title": "FTP",
-                            "url": "ftp://some/ftp",
-                        },
-                    }
+async def test_correct_config(hass):
+    """Test correct config."""
+    assert await async_setup_component(
+        hass,
+        "panel_iframe",
+        {
+            "panel_iframe": {
+                "router": {
+                    "icon": "mdi:network-wireless",
+                    "title": "Router",
+                    "url": "http://192.168.1.1",
+                    "require_admin": True,
                 },
-            )
+                "weather": {
+                    "icon": "mdi:weather",
+                    "title": "Weather",
+                    "url": "https://www.wunderground.com/us/ca/san-diego",
+                    "require_admin": True,
+                },
+                "api": {"icon": "mdi:weather", "title": "Api", "url": "/api"},
+                "ftp": {
+                    "icon": "mdi:weather",
+                    "title": "FTP",
+                    "url": "ftp://some/ftp",
+                },
+            }
+        },
+    )
 
-        panels = self.hass.data[frontend.DATA_PANELS]
+    panels = hass.data[frontend.DATA_PANELS]
 
-        assert panels.get("router").to_response() == {
-            "component_name": "iframe",
-            "config": {"url": "http://192.168.1.1"},
-            "icon": "mdi:network-wireless",
-            "title": "Router",
-            "url_path": "router",
-            "require_admin": True,
-        }
+    assert panels.get("router").to_response() == {
+        "component_name": "iframe",
+        "config": {"url": "http://192.168.1.1"},
+        "icon": "mdi:network-wireless",
+        "title": "Router",
+        "url_path": "router",
+        "require_admin": True,
+    }
 
-        assert panels.get("weather").to_response() == {
-            "component_name": "iframe",
-            "config": {"url": "https://www.wunderground.com/us/ca/san-diego"},
-            "icon": "mdi:weather",
-            "title": "Weather",
-            "url_path": "weather",
-            "require_admin": True,
-        }
+    assert panels.get("weather").to_response() == {
+        "component_name": "iframe",
+        "config": {"url": "https://www.wunderground.com/us/ca/san-diego"},
+        "icon": "mdi:weather",
+        "title": "Weather",
+        "url_path": "weather",
+        "require_admin": True,
+    }
 
-        assert panels.get("api").to_response() == {
-            "component_name": "iframe",
-            "config": {"url": "/api"},
-            "icon": "mdi:weather",
-            "title": "Api",
-            "url_path": "api",
-            "require_admin": False,
-        }
+    assert panels.get("api").to_response() == {
+        "component_name": "iframe",
+        "config": {"url": "/api"},
+        "icon": "mdi:weather",
+        "title": "Api",
+        "url_path": "api",
+        "require_admin": False,
+    }
 
-        assert panels.get("ftp").to_response() == {
-            "component_name": "iframe",
-            "config": {"url": "ftp://some/ftp"},
-            "icon": "mdi:weather",
-            "title": "FTP",
-            "url_path": "ftp",
-            "require_admin": False,
-        }
+    assert panels.get("ftp").to_response() == {
+        "component_name": "iframe",
+        "config": {"url": "ftp://some/ftp"},
+        "icon": "mdi:weather",
+        "title": "FTP",
+        "url_path": "ftp",
+        "require_admin": False,
+    }
diff --git a/tests/components/pilight/test_init.py b/tests/components/pilight/test_init.py
index 1e7e71f8236..24aa48ddf75 100644
--- a/tests/components/pilight/test_init.py
+++ b/tests/components/pilight/test_init.py
@@ -403,7 +403,8 @@ class TestPilightCallrateThrottler(unittest.TestCase):
         for i in range(3):
             action(i)
 
-        assert runs == []
+        self.hass.block_till_done()
+        assert runs == [0]
 
         exp = []
         now = dt_util.utcnow()
diff --git a/tests/components/plex/conftest.py b/tests/components/plex/conftest.py
index 4e59b551574..b3fc235bfc8 100644
--- a/tests/components/plex/conftest.py
+++ b/tests/components/plex/conftest.py
@@ -4,7 +4,7 @@ import pytest
 from homeassistant.components.plex.const import DOMAIN
 
 from .const import DEFAULT_DATA, DEFAULT_OPTIONS
-from .mock_classes import MockPlexAccount, MockPlexServer
+from .mock_classes import MockGDM, MockPlexAccount, MockPlexServer
 
 from tests.async_mock import patch
 from tests.common import MockConfigEntry
@@ -43,8 +43,12 @@ def setup_plex_server(hass, entry, mock_plex_account, mock_websocket):
     async def _wrapper(**kwargs):
         """Wrap the fixture to allow passing arguments to the MockPlexServer instance."""
         config_entry = kwargs.get("config_entry", entry)
+        disable_gdm = kwargs.pop("disable_gdm", True)
         plex_server = MockPlexServer(**kwargs)
-        with patch("plexapi.server.PlexServer", return_value=plex_server):
+        with patch("plexapi.server.PlexServer", return_value=plex_server), patch(
+            "homeassistant.components.plex.GDM",
+            return_value=MockGDM(disabled=disable_gdm),
+        ):
             config_entry.add_to_hass(hass)
             assert await hass.config_entries.async_setup(config_entry.entry_id)
             await hass.async_block_till_done()
diff --git a/tests/components/plex/const.py b/tests/components/plex/const.py
index bfc4b8ef78e..548be2edeb8 100644
--- a/tests/components/plex/const.py
+++ b/tests/components/plex/const.py
@@ -43,6 +43,16 @@ DEFAULT_DATA = {
     },
     const.CONF_SERVER_IDENTIFIER: MOCK_SERVERS[0][const.CONF_SERVER_IDENTIFIER],
 }
+SECONDARY_DATA = {
+    const.CONF_SERVER: MOCK_SERVERS[1][const.CONF_SERVER],
+    const.PLEX_SERVER_CONFIG: {
+        CONF_CLIENT_ID: "00000000-0000-0000-0000-000000000002",
+        CONF_TOKEN: MOCK_TOKEN,
+        CONF_URL: f"https://{MOCK_SERVERS[1][CONF_HOST]}:{MOCK_SERVERS[1][CONF_PORT]}",
+        CONF_VERIFY_SSL: True,
+    },
+    const.CONF_SERVER_IDENTIFIER: MOCK_SERVERS[1][const.CONF_SERVER_IDENTIFIER],
+}
 
 DEFAULT_OPTIONS = {
     MP_DOMAIN: {
diff --git a/tests/components/plex/mock_classes.py b/tests/components/plex/mock_classes.py
index e16d5cdc13b..13fe4c4113b 100644
--- a/tests/components/plex/mock_classes.py
+++ b/tests/components/plex/mock_classes.py
@@ -13,7 +13,7 @@ from homeassistant.const import CONF_URL
 
 from .const import DEFAULT_DATA, MOCK_SERVERS, MOCK_USERS
 
-GDM_PAYLOAD = [
+GDM_SERVER_PAYLOAD = [
     {
         "data": {
             "Content-Type": "plex/media-server",
@@ -27,17 +27,73 @@ GDM_PAYLOAD = [
     }
 ]
 
+GDM_CLIENT_PAYLOAD = [
+    {
+        "data": {
+            "Content-Type": "plex/media-player",
+            "Device-Class": "stb",
+            "Name": "plexamp",
+            "Port": "36000",
+            "Product": "Plexamp",
+            "Protocol": "plex",
+            "Protocol-Capabilities": "timeline,playback,playqueues,playqueues-creation",
+            "Protocol-Version": "1",
+            "Resource-Identifier": "client-2",
+            "Version": "1.1.0",
+        },
+        "from": ("1.2.3.10", 32412),
+    },
+    {
+        "data": {
+            "Content-Type": "plex/media-player",
+            "Device-Class": "pc",
+            "Name": "Chrome",
+            "Port": "32400",
+            "Product": "Plex Web",
+            "Protocol": "plex",
+            "Protocol-Capabilities": "timeline,playback,navigation,mirror,playqueues",
+            "Protocol-Version": "3",
+            "Resource-Identifier": "client-1",
+            "Version": "4.40.1",
+        },
+        "from": ("1.2.3.4", 32412),
+    },
+    {
+        "data": {
+            "Content-Type": "plex/media-player",
+            "Device-Class": "mobile",
+            "Name": "SHIELD Android TV",
+            "Port": "32500",
+            "Product": "Plex for Android (TV)",
+            "Protocol": "plex",
+            "Protocol-Capabilities": "timeline,playback,navigation,mirror,playqueues,provider-playback",
+            "Protocol-Version": "1",
+            "Resource-Identifier": "client-999",
+            "Updated-At": "1597686153",
+            "Version": "8.5.0.19697",
+        },
+        "from": ("1.2.3.11", 32412),
+    },
+]
+
 
 class MockGDM:
     """Mock a GDM instance."""
 
-    def __init__(self):
+    def __init__(self, disabled=False):
         """Initialize the object."""
-        self.entries = GDM_PAYLOAD
+        self.entries = []
+        self.disabled = disabled
 
-    def scan(self):
+    def scan(self, scan_for_clients=False):
         """Mock the scan call."""
-        pass
+        if self.disabled:
+            return
+
+        if scan_for_clients:
+            self.entries = GDM_CLIENT_PAYLOAD
+        else:
+            self.entries = GDM_SERVER_PAYLOAD
 
 
 class MockResource:
@@ -56,7 +112,9 @@ class MockResource:
             self.name = f"plex.tv Resource Player {index+10}"
             self.clientIdentifier = f"client-{index+10}"
             self.provides = ["player"]
-            self.device = MockPlexClient(f"http://192.168.0.1{index}:32500", index + 10)
+            self.device = MockPlexClient(
+                baseurl=f"http://192.168.0.1{index}:32500", index=index + 10
+            )
             self.presence = index == 0
             self.publicAddressMatches = True
 
@@ -122,6 +180,7 @@ class MockPlexServer:
         self._systemAccounts = list(map(MockPlexSystemAccount, range(num_users)))
 
         self._clients = []
+        self._session = None
         self._sessions = []
         self.set_clients(num_users)
         self.set_sessions(num_users, session_type)
@@ -130,7 +189,9 @@ class MockPlexServer:
 
     def set_clients(self, num_clients):
         """Set up mock PlexClients for this PlexServer."""
-        self._clients = [MockPlexClient(self._baseurl, x) for x in range(num_clients)]
+        self._clients = [
+            MockPlexClient(baseurl=self._baseurl, index=x) for x in range(num_clients)
+        ]
 
     def set_sessions(self, num_sessions, session_type):
         """Set up mock PlexSessions for this PlexServer."""
@@ -151,6 +212,10 @@ class MockPlexServer:
         """Mock the clients method."""
         return self._clients
 
+    def createToken(self):
+        """Mock the createToken method."""
+        return "temporary_token"
+
     def sessions(self):
         """Mock the sessions method."""
         return self._sessions
@@ -204,10 +269,10 @@ class MockPlexServer:
 class MockPlexClient:
     """Mock a PlexClient instance."""
 
-    def __init__(self, url, index=0):
+    def __init__(self, server=None, baseurl=None, token=None, index=0):
         """Initialize the object."""
         self.machineIdentifier = f"client-{index+1}"
-        self._baseurl = url
+        self._baseurl = baseurl
         self._index = index
 
     def url(self, key):
diff --git a/tests/components/plex/test_config_flow.py b/tests/components/plex/test_config_flow.py
index 476c342f176..a7a2896d307 100644
--- a/tests/components/plex/test_config_flow.py
+++ b/tests/components/plex/test_config_flow.py
@@ -37,7 +37,13 @@ from homeassistant.const import (
 
 from .const import DEFAULT_OPTIONS, MOCK_SERVERS, MOCK_TOKEN
 from .helpers import trigger_plex_update
-from .mock_classes import MockGDM, MockPlexAccount, MockPlexServer, MockResource
+from .mock_classes import (
+    MockGDM,
+    MockPlexAccount,
+    MockPlexClient,
+    MockPlexServer,
+    MockResource,
+)
 
 from tests.async_mock import patch
 from tests.common import MockConfigEntry
@@ -434,10 +440,11 @@ async def test_option_flow_new_users_available(
     OPTIONS_OWNER_ONLY[MP_DOMAIN][CONF_MONITORED_USERS] = {"Owner": {"enabled": True}}
     entry.options = OPTIONS_OWNER_ONLY
 
-    mock_plex_server = await setup_plex_server(config_entry=entry)
+    mock_plex_server = await setup_plex_server(config_entry=entry, disable_gdm=False)
 
-    trigger_plex_update(mock_websocket)
-    await hass.async_block_till_done()
+    with patch("homeassistant.components.plex.server.PlexClient", new=MockPlexClient):
+        trigger_plex_update(mock_websocket)
+        await hass.async_block_till_done()
 
     server_id = mock_plex_server.machineIdentifier
     monitored_users = hass.data[DOMAIN][SERVERS][server_id].option_monitored_users
@@ -640,7 +647,11 @@ async def test_manual_config(hass):
 
     with patch("plexapi.server.PlexServer", return_value=mock_plex_server), patch(
         "homeassistant.components.plex.PlexWebsocket", autospec=True
-    ), patch("plexapi.myplex.MyPlexAccount", return_value=MockPlexAccount()):
+    ), patch(
+        "homeassistant.components.plex.GDM", return_value=MockGDM(disabled=True)
+    ), patch(
+        "plexapi.myplex.MyPlexAccount", return_value=MockPlexAccount()
+    ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"], user_input=MANUAL_SERVER
         )
@@ -674,7 +685,11 @@ async def test_manual_config_with_token(hass):
 
     with patch("plexapi.myplex.MyPlexAccount", return_value=MockPlexAccount()), patch(
         "plexapi.server.PlexServer", return_value=mock_plex_server
-    ), patch("homeassistant.components.plex.PlexWebsocket", autospec=True):
+    ), patch(
+        "homeassistant.components.plex.GDM", return_value=MockGDM(disabled=True)
+    ), patch(
+        "homeassistant.components.plex.PlexWebsocket", autospec=True
+    ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"], user_input={CONF_TOKEN: MOCK_TOKEN}
         )
diff --git a/tests/components/plex/test_init.py b/tests/components/plex/test_init.py
index 3c4f9031fad..13e33791459 100644
--- a/tests/components/plex/test_init.py
+++ b/tests/components/plex/test_init.py
@@ -18,7 +18,7 @@ import homeassistant.util.dt as dt_util
 
 from .const import DEFAULT_DATA, DEFAULT_OPTIONS
 from .helpers import trigger_plex_update
-from .mock_classes import MockPlexAccount, MockPlexServer
+from .mock_classes import MockGDM, MockPlexAccount, MockPlexServer
 
 from tests.async_mock import patch
 from tests.common import MockConfigEntry, async_fire_time_changed
@@ -183,6 +183,8 @@ async def test_bad_token_with_tokenless_server(hass, entry):
     """Test setup with a bad token and a server with token auth disabled."""
     with patch("plexapi.server.PlexServer", return_value=MockPlexServer()), patch(
         "plexapi.myplex.MyPlexAccount", side_effect=plexapi.exceptions.Unauthorized
+    ), patch(
+        "homeassistant.components.plex.GDM", return_value=MockGDM(disabled=True)
     ), patch(
         "homeassistant.components.plex.PlexWebsocket", autospec=True
     ) as mock_websocket:
diff --git a/tests/components/plex/test_media_players.py b/tests/components/plex/test_media_players.py
index fdacd6051ae..94703d5dfb3 100644
--- a/tests/components/plex/test_media_players.py
+++ b/tests/components/plex/test_media_players.py
@@ -26,7 +26,7 @@ async def test_plex_tv_clients(hass, entry, mock_plex_account, setup_plex_server
     # Ensure one more client is discovered
     await hass.config_entries.async_unload(entry.entry_id)
 
-    mock_plex_server = await setup_plex_server(config_entry=entry)
+    mock_plex_server = await setup_plex_server()
     plex_server = hass.data[DOMAIN][SERVERS][server_id]
 
     await plex_server._async_update_platforms()
@@ -38,7 +38,7 @@ async def test_plex_tv_clients(hass, entry, mock_plex_account, setup_plex_server
     # Ensure only plex.tv resource client is found
     await hass.config_entries.async_unload(entry.entry_id)
 
-    mock_plex_server = await setup_plex_server(config_entry=entry)
+    mock_plex_server = await setup_plex_server()
     mock_plex_server.clear_clients()
     mock_plex_server.clear_sessions()
 
diff --git a/tests/components/plex/test_playback.py b/tests/components/plex/test_playback.py
index bd694419421..5119286d3b8 100644
--- a/tests/components/plex/test_playback.py
+++ b/tests/components/plex/test_playback.py
@@ -6,11 +6,19 @@ from homeassistant.components.media_player.const import (
     ATTR_MEDIA_CONTENT_TYPE,
     MEDIA_TYPE_MUSIC,
 )
-from homeassistant.components.plex.const import DOMAIN, SERVERS, SERVICE_PLAY_ON_SONOS
+from homeassistant.components.plex.const import (
+    CONF_SERVER,
+    DOMAIN,
+    SERVERS,
+    SERVICE_PLAY_ON_SONOS,
+)
 from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.exceptions import HomeAssistantError
 
+from .const import DEFAULT_OPTIONS, SECONDARY_DATA
+
 from tests.async_mock import patch
+from tests.common import MockConfigEntry
 
 
 async def test_sonos_playback(hass, mock_plex_server):
@@ -108,6 +116,8 @@ async def test_sonos_playback(hass, mock_plex_server):
         hass.components.sonos,
         "get_coordinator_name",
         return_value="media_player.sonos_kitchen",
+    ), patch(
+        "plexapi.playqueue.PlayQueue.create"
     ):
         assert await hass.services.async_call(
             DOMAIN,
@@ -119,3 +129,32 @@ async def test_sonos_playback(hass, mock_plex_server):
             },
             True,
         )
+
+
+async def test_playback_multiple_servers(hass, mock_websocket, setup_plex_server):
+    """Test playing media when multiple servers available."""
+    secondary_entry = MockConfigEntry(
+        domain=DOMAIN,
+        data=SECONDARY_DATA,
+        options=DEFAULT_OPTIONS,
+        unique_id=SECONDARY_DATA["server_id"],
+    )
+
+    await setup_plex_server()
+    await setup_plex_server(config_entry=secondary_entry)
+
+    with patch.object(
+        hass.components.sonos,
+        "get_coordinator_name",
+        return_value="media_player.sonos_kitchen",
+    ), patch("plexapi.playqueue.PlayQueue.create"):
+        assert await hass.services.async_call(
+            DOMAIN,
+            SERVICE_PLAY_ON_SONOS,
+            {
+                ATTR_ENTITY_ID: "media_player.sonos_kitchen",
+                ATTR_MEDIA_CONTENT_TYPE: MEDIA_TYPE_MUSIC,
+                ATTR_MEDIA_CONTENT_ID: f'{{"plex_server": "{SECONDARY_DATA[CONF_SERVER]}", "library_name": "Music", "artist_name": "Artist", "album_name": "Album"}}',
+            },
+            True,
+        )
diff --git a/tests/components/plex/test_server.py b/tests/components/plex/test_server.py
index b650821b3f2..8ac707c393f 100644
--- a/tests/components/plex/test_server.py
+++ b/tests/components/plex/test_server.py
@@ -2,7 +2,7 @@
 import copy
 
 from plexapi.exceptions import BadRequest, NotFound
-from requests.exceptions import RequestException
+from requests.exceptions import ConnectionError, RequestException
 
 from homeassistant.components.media_player import DOMAIN as MP_DOMAIN
 from homeassistant.components.media_player.const import (
@@ -28,6 +28,7 @@ from homeassistant.const import ATTR_ENTITY_ID
 from .const import DEFAULT_DATA, DEFAULT_OPTIONS
 from .helpers import trigger_plex_update
 from .mock_classes import (
+    MockGDM,
     MockPlexAccount,
     MockPlexAlbum,
     MockPlexArtist,
@@ -125,6 +126,24 @@ async def test_network_error_during_refresh(
     )
 
 
+async def test_gdm_client_failure(hass, mock_websocket, setup_plex_server):
+    """Test connection failure to a GDM discovered client."""
+    mock_plex_server = await setup_plex_server(disable_gdm=False)
+
+    with patch(
+        "homeassistant.components.plex.server.PlexClient", side_effect=ConnectionError
+    ):
+        trigger_plex_update(mock_websocket)
+        await hass.async_block_till_done()
+
+    sensor = hass.states.get("sensor.plex_plex_server_1")
+    assert sensor.state == str(len(mock_plex_server.accounts))
+
+    with patch.object(mock_plex_server, "clients", side_effect=RequestException):
+        trigger_plex_update(mock_websocket)
+        await hass.async_block_till_done()
+
+
 async def test_mark_sessions_idle(hass, mock_plex_server, mock_websocket):
     """Test marking media_players as idle when sessions end."""
     server_id = mock_plex_server.machineIdentifier
@@ -156,7 +175,7 @@ async def test_ignore_plex_web_client(hass, entry, mock_websocket):
 
     with patch("plexapi.server.PlexServer", return_value=mock_plex_server), patch(
         "plexapi.myplex.MyPlexAccount", return_value=MockPlexAccount(players=0)
-    ):
+    ), patch("homeassistant.components.plex.GDM", return_value=MockGDM(disabled=True)):
         entry.add_to_hass(hass)
         assert await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
diff --git a/tests/components/plugwise/conftest.py b/tests/components/plugwise/conftest.py
index 11e077c8a24..5af2bf2ccd3 100644
--- a/tests/components/plugwise/conftest.py
+++ b/tests/components/plugwise/conftest.py
@@ -7,7 +7,7 @@ from Plugwise_Smile.Smile import Smile
 import jsonpickle
 import pytest
 
-from tests.async_mock import AsyncMock, patch
+from tests.async_mock import AsyncMock, Mock, patch
 from tests.common import load_fixture
 from tests.test_util.aiohttp import AiohttpClientMocker
 
@@ -47,7 +47,7 @@ def mock_smile_error(aioclient_mock: AiohttpClientMocker) -> None:
 @pytest.fixture(name="mock_smile_notconnect")
 def mock_smile_notconnect():
     """Mock the Plugwise Smile general connection failure for Home Assistant."""
-    with patch("homeassistant.components.plugwise.Smile") as smile_mock:
+    with patch("homeassistant.components.plugwise.gateway.Smile") as smile_mock:
         smile_mock.InvalidAuthentication = Smile.InvalidAuthentication
         smile_mock.ConnectionFailedError = Smile.ConnectionFailedError
         smile_mock.PlugwiseError = Smile.PlugwiseError
@@ -64,7 +64,7 @@ def _get_device_data(chosen_env, device_id):
 def mock_smile_adam():
     """Create a Mock Adam environment for testing exceptions."""
     chosen_env = "adam_multiple_devices_per_zone"
-    with patch("homeassistant.components.plugwise.Smile") as smile_mock:
+    with patch("homeassistant.components.plugwise.gateway.Smile") as smile_mock:
         smile_mock.InvalidAuthentication = Smile.InvalidAuthentication
         smile_mock.ConnectionFailedError = Smile.ConnectionFailedError
         smile_mock.XMLDataMissingError = Smile.XMLDataMissingError
@@ -79,6 +79,9 @@ def mock_smile_adam():
         smile_mock.return_value.full_update_device.side_effect = AsyncMock(
             return_value=True
         )
+        smile_mock.return_value.single_master_thermostat.side_effect = Mock(
+            return_value=False
+        )
         smile_mock.return_value.set_schedule_state.side_effect = AsyncMock(
             return_value=True
         )
@@ -104,7 +107,7 @@ def mock_smile_adam():
 def mock_smile_anna():
     """Create a Mock Anna environment for testing exceptions."""
     chosen_env = "anna_heatpump"
-    with patch("homeassistant.components.plugwise.Smile") as smile_mock:
+    with patch("homeassistant.components.plugwise.gateway.Smile") as smile_mock:
         smile_mock.InvalidAuthentication = Smile.InvalidAuthentication
         smile_mock.ConnectionFailedError = Smile.ConnectionFailedError
         smile_mock.XMLDataMissingError = Smile.XMLDataMissingError
@@ -119,6 +122,9 @@ def mock_smile_anna():
         smile_mock.return_value.full_update_device.side_effect = AsyncMock(
             return_value=True
         )
+        smile_mock.return_value.single_master_thermostat.side_effect = Mock(
+            return_value=True
+        )
         smile_mock.return_value.set_schedule_state.side_effect = AsyncMock(
             return_value=True
         )
@@ -144,7 +150,7 @@ def mock_smile_anna():
 def mock_smile_p1():
     """Create a Mock P1 DSMR environment for testing exceptions."""
     chosen_env = "p1v3_full_option"
-    with patch("homeassistant.components.plugwise.Smile") as smile_mock:
+    with patch("homeassistant.components.plugwise.gateway.Smile") as smile_mock:
         smile_mock.InvalidAuthentication = Smile.InvalidAuthentication
         smile_mock.ConnectionFailedError = Smile.ConnectionFailedError
         smile_mock.XMLDataMissingError = Smile.XMLDataMissingError
@@ -160,6 +166,10 @@ def mock_smile_p1():
             return_value=True
         )
 
+        smile_mock.return_value.single_master_thermostat.side_effect = Mock(
+            return_value=None
+        )
+
         smile_mock.return_value.get_all_devices.return_value = _read_json(
             chosen_env, "get_all_devices"
         )
diff --git a/tests/components/plugwise/test_climate.py b/tests/components/plugwise/test_climate.py
index 02375b49709..7c74d970d7e 100644
--- a/tests/components/plugwise/test_climate.py
+++ b/tests/components/plugwise/test_climate.py
@@ -13,7 +13,7 @@ async def test_adam_climate_entity_attributes(hass, mock_smile_adam):
     state = hass.states.get("climate.zone_lisa_wk")
     attrs = state.attributes
 
-    assert attrs["hvac_modes"] is None
+    assert attrs["hvac_modes"] == ["heat", "auto"]
 
     assert "preset_modes" in attrs
     assert "no_frost" in attrs["preset_modes"]
@@ -29,7 +29,7 @@ async def test_adam_climate_entity_attributes(hass, mock_smile_adam):
     state = hass.states.get("climate.zone_thermostat_jessie")
     attrs = state.attributes
 
-    assert attrs["hvac_modes"] is None
+    assert attrs["hvac_modes"] == ["heat", "auto"]
 
     assert "preset_modes" in attrs
     assert "no_frost" in attrs["preset_modes"]
diff --git a/tests/components/plugwise/test_init.py b/tests/components/plugwise/test_init.py
index 713cd4930d7..d968f1825f0 100644
--- a/tests/components/plugwise/test_init.py
+++ b/tests/components/plugwise/test_init.py
@@ -4,11 +4,14 @@ import asyncio
 
 from Plugwise_Smile.Smile import Smile
 
+from homeassistant.components.plugwise import DOMAIN
+from homeassistant.components.plugwise.gateway import async_unload_entry
 from homeassistant.config_entries import (
     ENTRY_STATE_SETUP_ERROR,
     ENTRY_STATE_SETUP_RETRY,
 )
 
+from tests.common import AsyncMock
 from tests.components.plugwise.common import async_init_integration
 
 
@@ -43,3 +46,12 @@ async def test_smile_adam_xmlerror(hass, mock_smile_adam):
     mock_smile_adam.full_update_device.side_effect = Smile.XMLDataMissingError
     entry = await async_init_integration(hass, mock_smile_adam)
     assert entry.state == ENTRY_STATE_SETUP_RETRY
+
+
+async def test_unload_entry(hass, mock_smile_adam):
+    """Test being able to unload an entry."""
+    entry = await async_init_integration(hass, mock_smile_adam)
+
+    mock_smile_adam.async_reset = AsyncMock(return_value=True)
+    assert await async_unload_entry(hass, entry)
+    assert not hass.data[DOMAIN]
diff --git a/tests/components/point/test_config_flow.py b/tests/components/point/test_config_flow.py
index d1f8688da24..b6c780e937a 100644
--- a/tests/components/point/test_config_flow.py
+++ b/tests/components/point/test_config_flow.py
@@ -33,11 +33,13 @@ def mock_pypoint(is_authorized):  # pylint: disable=redefined-outer-name
     with patch(
         "homeassistant.components.point.config_flow.PointSession"
     ) as PointSession:
-        PointSession.return_value.get_access_token.return_value = {
-            "access_token": "boo"
-        }
+        PointSession.return_value.get_access_token = AsyncMock(
+            return_value={"access_token": "boo"}
+        )
         PointSession.return_value.is_authorized = is_authorized
-        PointSession.return_value.user.return_value = {"email": "john.doe@example.com"}
+        PointSession.return_value.user = AsyncMock(
+            return_value={"email": "john.doe@example.com"}
+        )
         yield PointSession
 
 
diff --git a/tests/components/powerwall/mocks.py b/tests/components/powerwall/mocks.py
index a384725daa8..6beb31c293a 100644
--- a/tests/components/powerwall/mocks.py
+++ b/tests/components/powerwall/mocks.py
@@ -6,11 +6,11 @@ import os
 from tesla_powerwall import (
     DeviceType,
     GridStatus,
-    MetersAggregateResponse,
+    MetersAggregates,
     Powerwall,
-    PowerwallStatusResponse,
-    SiteInfoResponse,
-    SitemasterResponse,
+    PowerwallStatus,
+    SiteInfo,
+    SiteMaster,
 )
 
 from homeassistant.components.powerwall.const import DOMAIN
@@ -29,12 +29,12 @@ async def _mock_powerwall_with_fixtures(hass):
     device_type = await _async_load_json_fixture(hass, "device_type.json")
 
     return _mock_powerwall_return_value(
-        site_info=SiteInfoResponse(site_info),
-        charge=47,
-        sitemaster=SitemasterResponse(sitemaster),
-        meters=MetersAggregateResponse(meters),
+        site_info=SiteInfo(site_info),
+        charge=47.34587394586,
+        sitemaster=SiteMaster(sitemaster),
+        meters=MetersAggregates(meters),
         grid_status=GridStatus.CONNECTED,
-        status=PowerwallStatusResponse(status),
+        status=PowerwallStatus(status),
         device_type=DeviceType(device_type["device_type"]),
         serial_numbers=["TG0123456789AB", "TG9876543210BA"],
     )
@@ -66,10 +66,9 @@ def _mock_powerwall_return_value(
 async def _mock_powerwall_site_name(hass, site_name):
     powerwall_mock = MagicMock(Powerwall("1.2.3.4"))
 
-    site_info_resp = SiteInfoResponse(
-        await _async_load_json_fixture(hass, "site_info.json")
-    )
-    site_info_resp.site_name = site_name
+    site_info_resp = SiteInfo(await _async_load_json_fixture(hass, "site_info.json"))
+    # Sets site_info_resp.site_name to return site_name
+    site_info_resp.response["site_name"] = site_name
     powerwall_mock.get_site_info = Mock(return_value=site_info_resp)
 
     return powerwall_mock
diff --git a/tests/components/powerwall/test_config_flow.py b/tests/components/powerwall/test_config_flow.py
index 9f72f1900f0..5f9445debe0 100644
--- a/tests/components/powerwall/test_config_flow.py
+++ b/tests/components/powerwall/test_config_flow.py
@@ -1,6 +1,6 @@
 """Test the Powerwall config flow."""
 
-from tesla_powerwall import APIChangedError, PowerwallUnreachableError
+from tesla_powerwall import MissingAttributeError, PowerwallUnreachableError
 
 from homeassistant import config_entries, setup
 from homeassistant.components.powerwall.const import DOMAIN
@@ -99,7 +99,9 @@ async def test_form_wrong_version(hass):
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
 
-    mock_powerwall = _mock_powerwall_side_effect(site_info=APIChangedError(object, {}))
+    mock_powerwall = _mock_powerwall_side_effect(
+        site_info=MissingAttributeError({}, "")
+    )
 
     with patch(
         "homeassistant.components.powerwall.config_flow.Powerwall",
diff --git a/tests/components/profiler/__init__.py b/tests/components/profiler/__init__.py
new file mode 100644
index 00000000000..d3042599223
--- /dev/null
+++ b/tests/components/profiler/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Profiler integration."""
diff --git a/tests/components/profiler/test_config_flow.py b/tests/components/profiler/test_config_flow.py
new file mode 100644
index 00000000000..e6cb62421af
--- /dev/null
+++ b/tests/components/profiler/test_config_flow.py
@@ -0,0 +1,45 @@
+"""Test the Profiler config flow."""
+from homeassistant import config_entries, setup
+from homeassistant.components.profiler.const import DOMAIN
+
+from tests.async_mock import patch
+from tests.common import MockConfigEntry
+
+
+async def test_form_user(hass):
+    """Test we can setup by the user."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == "form"
+    assert result["errors"] is None
+
+    with patch(
+        "homeassistant.components.profiler.async_setup", return_value=True
+    ) as mock_setup, patch(
+        "homeassistant.components.profiler.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {},
+        )
+
+    assert result2["type"] == "create_entry"
+    assert result2["title"] == "Profiler"
+    assert result2["data"] == {}
+    await hass.async_block_till_done()
+    assert len(mock_setup.mock_calls) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_form_user_only_once(hass):
+    """Test we can setup by the user only once."""
+    MockConfigEntry(domain=DOMAIN).add_to_hass(hass)
+    await setup.async_setup_component(hass, "persistent_notification", {})
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == "abort"
+    assert result["reason"] == "single_instance_allowed"
diff --git a/tests/components/profiler/test_init.py b/tests/components/profiler/test_init.py
new file mode 100644
index 00000000000..2373e64a593
--- /dev/null
+++ b/tests/components/profiler/test_init.py
@@ -0,0 +1,41 @@
+"""Test the Profiler config flow."""
+import os
+
+from homeassistant import setup
+from homeassistant.components.profiler import CONF_SECONDS, SERVICE_START
+from homeassistant.components.profiler.const import DOMAIN
+
+from tests.async_mock import patch
+from tests.common import MockConfigEntry
+
+
+async def test_basic_usage(hass, tmpdir):
+    """Test we can setup and the service is registered."""
+    test_dir = tmpdir.mkdir("profiles")
+
+    await setup.async_setup_component(hass, "persistent_notification", {})
+    entry = MockConfigEntry(domain=DOMAIN)
+    entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert hass.services.has_service(DOMAIN, SERVICE_START)
+
+    last_filename = None
+
+    def _mock_path(filename):
+        nonlocal last_filename
+        last_filename = f"{test_dir}/{filename}"
+        return last_filename
+
+    with patch("homeassistant.components.profiler.cProfile.Profile"), patch.object(
+        hass.config, "path", _mock_path
+    ):
+        await hass.services.async_call(DOMAIN, SERVICE_START, {CONF_SECONDS: 0.000001})
+        await hass.async_block_till_done()
+
+    assert os.path.exists(last_filename)
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
diff --git a/tests/components/proximity/test_init.py b/tests/components/proximity/test_init.py
index 55aca3223f0..b0b4d7c0dcc 100644
--- a/tests/components/proximity/test_init.py
+++ b/tests/components/proximity/test_init.py
@@ -1,557 +1,589 @@
 """The tests for the Proximity component."""
-import unittest
 
-from homeassistant.components import proximity
 from homeassistant.components.proximity import DOMAIN
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 
-class TestProximity(unittest.TestCase):
-    """Test the Proximity component."""
-
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.hass.config.components.add("zone")
-        self.hass.states.set(
-            "zone.home",
-            "zoning",
-            {"name": "home", "latitude": 2.1, "longitude": 1.1, "radius": 10},
-        )
-        self.hass.states.set(
-            "zone.work",
-            "zoning",
-            {"name": "work", "latitude": 2.3, "longitude": 1.3, "radius": 10},
-        )
-        self.addCleanup(self.hass.stop)
-
-    def test_proximities(self):
-        """Test a list of proximities."""
-        config = {
-            "proximity": {
-                "home": {
-                    "ignored_zones": ["work"],
-                    "devices": ["device_tracker.test1", "device_tracker.test2"],
-                    "tolerance": "1",
-                },
-                "work": {"devices": ["device_tracker.test1"], "tolerance": "1"},
-            }
+async def test_proximities(hass):
+    """Test a list of proximities."""
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1", "device_tracker.test2"],
+                "tolerance": "1",
+            },
+            "work": {"devices": ["device_tracker.test1"], "tolerance": "1"},
         }
+    }
 
-        assert setup_component(self.hass, DOMAIN, config)
+    assert await async_setup_component(hass, DOMAIN, config)
 
-        proximities = ["home", "work"]
+    proximities = ["home", "work"]
 
-        for prox in proximities:
-            state = self.hass.states.get(f"proximity.{prox}")
-            assert state.state == "not set"
-            assert state.attributes.get("nearest") == "not set"
-            assert state.attributes.get("dir_of_travel") == "not set"
-
-            self.hass.states.set(f"proximity.{prox}", "0")
-            self.hass.block_till_done()
-            state = self.hass.states.get(f"proximity.{prox}")
-            assert state.state == "0"
-
-    def test_proximities_setup(self):
-        """Test a list of proximities with missing devices."""
-        config = {
-            "proximity": {
-                "home": {
-                    "ignored_zones": ["work"],
-                    "devices": ["device_tracker.test1", "device_tracker.test2"],
-                    "tolerance": "1",
-                },
-                "work": {"tolerance": "1"},
-            }
-        }
-
-        assert setup_component(self.hass, DOMAIN, config)
-
-    def test_proximity(self):
-        """Test the proximity."""
-        config = {
-            "proximity": {
-                "home": {
-                    "ignored_zones": ["work"],
-                    "devices": ["device_tracker.test1", "device_tracker.test2"],
-                    "tolerance": "1",
-                }
-            }
-        }
-
-        assert setup_component(self.hass, DOMAIN, config)
-
-        state = self.hass.states.get("proximity.home")
+    for prox in proximities:
+        state = hass.states.get(f"proximity.{prox}")
         assert state.state == "not set"
         assert state.attributes.get("nearest") == "not set"
         assert state.attributes.get("dir_of_travel") == "not set"
 
-        self.hass.states.set("proximity.home", "0")
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
+        hass.states.async_set(f"proximity.{prox}", "0")
+        await hass.async_block_till_done()
+        state = hass.states.get(f"proximity.{prox}")
         assert state.state == "0"
 
-    def test_device_tracker_test1_in_zone(self):
-        """Test for tracker in zone."""
-        config = {
-            "proximity": {
-                "home": {
-                    "ignored_zones": ["work"],
-                    "devices": ["device_tracker.test1"],
-                    "tolerance": "1",
-                }
+
+async def test_proximities_setup(hass):
+    """Test a list of proximities with missing devices."""
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1", "device_tracker.test2"],
+                "tolerance": "1",
+            },
+            "work": {"tolerance": "1"},
+        }
+    }
+
+    assert await async_setup_component(hass, DOMAIN, config)
+
+
+async def test_proximity(hass):
+    """Test the proximity."""
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1", "device_tracker.test2"],
+                "tolerance": "1",
             }
         }
+    }
 
-        assert setup_component(self.hass, DOMAIN, config)
+    assert await async_setup_component(hass, DOMAIN, config)
 
-        self.hass.states.set(
-            "device_tracker.test1",
-            "home",
-            {"friendly_name": "test1", "latitude": 2.1, "longitude": 1.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.state == "0"
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "arrived"
+    state = hass.states.get("proximity.home")
+    assert state.state == "not set"
+    assert state.attributes.get("nearest") == "not set"
+    assert state.attributes.get("dir_of_travel") == "not set"
 
-    def test_device_trackers_in_zone(self):
-        """Test for trackers in zone."""
-        config = {
+    hass.states.async_set("proximity.home", "0")
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.state == "0"
+
+
+async def test_device_tracker_test1_in_zone(hass):
+    """Test for tracker in zone."""
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1"],
+                "tolerance": "1",
+            }
+        }
+    }
+
+    assert await async_setup_component(hass, DOMAIN, config)
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "home",
+        {"friendly_name": "test1", "latitude": 2.1, "longitude": 1.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.state == "0"
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "arrived"
+
+
+async def test_device_trackers_in_zone(hass):
+    """Test for trackers in zone."""
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1", "device_tracker.test2"],
+                "tolerance": "1",
+            }
+        }
+    }
+
+    assert await async_setup_component(hass, DOMAIN, config)
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "home",
+        {"friendly_name": "test1", "latitude": 2.1, "longitude": 1.1},
+    )
+    await hass.async_block_till_done()
+    hass.states.async_set(
+        "device_tracker.test2",
+        "home",
+        {"friendly_name": "test2", "latitude": 2.1, "longitude": 1.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.state == "0"
+    assert (state.attributes.get("nearest") == "test1, test2") or (
+        state.attributes.get("nearest") == "test2, test1"
+    )
+    assert state.attributes.get("dir_of_travel") == "arrived"
+
+
+async def test_device_tracker_test1_away(hass):
+    """Test for tracker state away."""
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1"],
+                "tolerance": "1",
+            }
+        }
+    }
+
+    assert await async_setup_component(hass, DOMAIN, config)
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
+    )
+
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
+
+
+async def test_device_tracker_test1_awayfurther(hass):
+    """Test for tracker state away further."""
+
+    config_zones(hass)
+    await hass.async_block_till_done()
+
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1"],
+                "tolerance": "1",
+            }
+        }
+    }
+
+    assert await async_setup_component(hass, DOMAIN, config)
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 40.1, "longitude": 20.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "away_from"
+
+
+async def test_device_tracker_test1_awaycloser(hass):
+    """Test for tracker state away closer."""
+    config_zones(hass)
+    await hass.async_block_till_done()
+
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1"],
+                "tolerance": "1",
+            }
+        }
+    }
+
+    assert await async_setup_component(hass, DOMAIN, config)
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 40.1, "longitude": 20.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "towards"
+
+
+async def test_all_device_trackers_in_ignored_zone(hass):
+    """Test for tracker in ignored zone."""
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1"],
+                "tolerance": "1",
+            }
+        }
+    }
+
+    assert await async_setup_component(hass, DOMAIN, config)
+
+    hass.states.async_set("device_tracker.test1", "work", {"friendly_name": "test1"})
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.state == "not set"
+    assert state.attributes.get("nearest") == "not set"
+    assert state.attributes.get("dir_of_travel") == "not set"
+
+
+async def test_device_tracker_test1_no_coordinates(hass):
+    """Test for tracker with no coordinates."""
+    config = {
+        "proximity": {
+            "home": {
+                "ignored_zones": ["work"],
+                "devices": ["device_tracker.test1"],
+                "tolerance": "1",
+            }
+        }
+    }
+
+    assert await async_setup_component(hass, DOMAIN, config)
+
+    hass.states.async_set(
+        "device_tracker.test1", "not_home", {"friendly_name": "test1"}
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "not set"
+    assert state.attributes.get("dir_of_travel") == "not set"
+
+
+async def test_device_tracker_test1_awayfurther_than_test2_first_test1(hass):
+    """Test for tracker ordering."""
+    config_zones(hass)
+    await hass.async_block_till_done()
+
+    hass.states.async_set(
+        "device_tracker.test1", "not_home", {"friendly_name": "test1"}
+    )
+    await hass.async_block_till_done()
+    hass.states.async_set(
+        "device_tracker.test2", "not_home", {"friendly_name": "test2"}
+    )
+    await hass.async_block_till_done()
+
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {
             "proximity": {
                 "home": {
                     "ignored_zones": ["work"],
                     "devices": ["device_tracker.test1", "device_tracker.test2"],
                     "tolerance": "1",
+                    "zone": "home",
                 }
             }
-        }
+        },
+    )
 
-        assert setup_component(self.hass, DOMAIN, config)
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
 
-        self.hass.states.set(
-            "device_tracker.test1",
-            "home",
-            {"friendly_name": "test1", "latitude": 2.1, "longitude": 1.1},
-        )
-        self.hass.block_till_done()
-        self.hass.states.set(
-            "device_tracker.test2",
-            "home",
-            {"friendly_name": "test2", "latitude": 2.1, "longitude": 1.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.state == "0"
-        assert (state.attributes.get("nearest") == "test1, test2") or (
-            state.attributes.get("nearest") == "test2, test1"
-        )
-        assert state.attributes.get("dir_of_travel") == "arrived"
+    hass.states.async_set(
+        "device_tracker.test2",
+        "not_home",
+        {"friendly_name": "test2", "latitude": 40.1, "longitude": 20.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
 
-    def test_device_tracker_test1_away(self):
-        """Test for tracker state away."""
-        config = {
+
+async def test_device_tracker_test1_awayfurther_than_test2_first_test2(hass):
+    """Test for tracker ordering."""
+    config_zones(hass)
+    await hass.async_block_till_done()
+
+    hass.states.async_set(
+        "device_tracker.test1", "not_home", {"friendly_name": "test1"}
+    )
+    await hass.async_block_till_done()
+    hass.states.async_set(
+        "device_tracker.test2", "not_home", {"friendly_name": "test2"}
+    )
+    await hass.async_block_till_done()
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {
+            "proximity": {
+                "home": {
+                    "ignored_zones": ["work"],
+                    "devices": ["device_tracker.test1", "device_tracker.test2"],
+                    "zone": "home",
+                }
+            }
+        },
+    )
+
+    hass.states.async_set(
+        "device_tracker.test2",
+        "not_home",
+        {"friendly_name": "test2", "latitude": 40.1, "longitude": 20.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test2"
+    assert state.attributes.get("dir_of_travel") == "unknown"
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
+
+
+async def test_device_tracker_test1_awayfurther_test2_in_ignored_zone(hass):
+    """Test for tracker states."""
+    hass.states.async_set(
+        "device_tracker.test1", "not_home", {"friendly_name": "test1"}
+    )
+    await hass.async_block_till_done()
+    hass.states.async_set("device_tracker.test2", "work", {"friendly_name": "test2"})
+    await hass.async_block_till_done()
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {
+            "proximity": {
+                "home": {
+                    "ignored_zones": ["work"],
+                    "devices": ["device_tracker.test1", "device_tracker.test2"],
+                    "zone": "home",
+                }
+            }
+        },
+    )
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
+
+
+async def test_device_tracker_test1_awayfurther_test2_first(hass):
+    """Test for tracker state."""
+    config_zones(hass)
+    await hass.async_block_till_done()
+
+    hass.states.async_set(
+        "device_tracker.test1", "not_home", {"friendly_name": "test1"}
+    )
+    await hass.async_block_till_done()
+    hass.states.async_set(
+        "device_tracker.test2", "not_home", {"friendly_name": "test2"}
+    )
+    await hass.async_block_till_done()
+
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {
+            "proximity": {
+                "home": {
+                    "ignored_zones": ["work"],
+                    "devices": ["device_tracker.test1", "device_tracker.test2"],
+                    "zone": "home",
+                }
+            }
+        },
+    )
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 10.1, "longitude": 5.1},
+    )
+    await hass.async_block_till_done()
+
+    hass.states.async_set(
+        "device_tracker.test2",
+        "not_home",
+        {"friendly_name": "test2", "latitude": 20.1, "longitude": 10.1},
+    )
+    await hass.async_block_till_done()
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 40.1, "longitude": 20.1},
+    )
+    await hass.async_block_till_done()
+
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 35.1, "longitude": 15.1},
+    )
+    await hass.async_block_till_done()
+
+    hass.states.async_set("device_tracker.test1", "work", {"friendly_name": "test1"})
+    await hass.async_block_till_done()
+
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test2"
+    assert state.attributes.get("dir_of_travel") == "unknown"
+
+
+async def test_device_tracker_test1_awayfurther_a_bit(hass):
+    """Test for tracker states."""
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {
             "proximity": {
                 "home": {
                     "ignored_zones": ["work"],
                     "devices": ["device_tracker.test1"],
-                    "tolerance": "1",
+                    "tolerance": 1000,
+                    "zone": "home",
                 }
             }
-        }
+        },
+    )
 
-        assert setup_component(self.hass, DOMAIN, config)
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1000001, "longitude": 10.1000001},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
 
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
-        )
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1000002, "longitude": 10.1000002},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "stationary"
 
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
 
-    def test_device_tracker_test1_awayfurther(self):
-        """Test for tracker state away further."""
-        config = {
+async def test_device_tracker_test1_nearest_after_test2_in_ignored_zone(hass):
+    """Test for tracker states."""
+    config_zones(hass)
+    await hass.async_block_till_done()
+
+    hass.states.async_set(
+        "device_tracker.test1", "not_home", {"friendly_name": "test1"}
+    )
+    await hass.async_block_till_done()
+    hass.states.async_set(
+        "device_tracker.test2", "not_home", {"friendly_name": "test2"}
+    )
+    await hass.async_block_till_done()
+
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {
             "proximity": {
                 "home": {
                     "ignored_zones": ["work"],
-                    "devices": ["device_tracker.test1"],
-                    "tolerance": "1",
+                    "devices": ["device_tracker.test1", "device_tracker.test2"],
+                    "zone": "home",
                 }
             }
-        }
+        },
+    )
 
-        assert setup_component(self.hass, DOMAIN, config)
+    hass.states.async_set(
+        "device_tracker.test1",
+        "not_home",
+        {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
 
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
+    hass.states.async_set(
+        "device_tracker.test2",
+        "not_home",
+        {"friendly_name": "test2", "latitude": 10.1, "longitude": 5.1},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test2"
+    assert state.attributes.get("dir_of_travel") == "unknown"
 
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 40.1, "longitude": 20.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "away_from"
+    hass.states.async_set(
+        "device_tracker.test2",
+        "work",
+        {"friendly_name": "test2", "latitude": 12.6, "longitude": 7.6},
+    )
+    await hass.async_block_till_done()
+    state = hass.states.get("proximity.home")
+    assert state.attributes.get("nearest") == "test1"
+    assert state.attributes.get("dir_of_travel") == "unknown"
 
-    def test_device_tracker_test1_awaycloser(self):
-        """Test for tracker state away closer."""
-        config = {
-            "proximity": {
-                "home": {
-                    "ignored_zones": ["work"],
-                    "devices": ["device_tracker.test1"],
-                    "tolerance": "1",
-                }
-            }
-        }
 
-        assert setup_component(self.hass, DOMAIN, config)
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 40.1, "longitude": 20.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "towards"
-
-    def test_all_device_trackers_in_ignored_zone(self):
-        """Test for tracker in ignored zone."""
-        config = {
-            "proximity": {
-                "home": {
-                    "ignored_zones": ["work"],
-                    "devices": ["device_tracker.test1"],
-                    "tolerance": "1",
-                }
-            }
-        }
-
-        assert setup_component(self.hass, DOMAIN, config)
-
-        self.hass.states.set("device_tracker.test1", "work", {"friendly_name": "test1"})
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.state == "not set"
-        assert state.attributes.get("nearest") == "not set"
-        assert state.attributes.get("dir_of_travel") == "not set"
-
-    def test_device_tracker_test1_no_coordinates(self):
-        """Test for tracker with no coordinates."""
-        config = {
-            "proximity": {
-                "home": {
-                    "ignored_zones": ["work"],
-                    "devices": ["device_tracker.test1"],
-                    "tolerance": "1",
-                }
-            }
-        }
-
-        assert setup_component(self.hass, DOMAIN, config)
-
-        self.hass.states.set(
-            "device_tracker.test1", "not_home", {"friendly_name": "test1"}
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "not set"
-        assert state.attributes.get("dir_of_travel") == "not set"
-
-    def test_device_tracker_test1_awayfurther_than_test2_first_test1(self):
-        """Test for tracker ordering."""
-        self.hass.states.set(
-            "device_tracker.test1", "not_home", {"friendly_name": "test1"}
-        )
-        self.hass.block_till_done()
-        self.hass.states.set(
-            "device_tracker.test2", "not_home", {"friendly_name": "test2"}
-        )
-        self.hass.block_till_done()
-
-        assert proximity.setup(
-            self.hass,
-            {
-                "proximity": {
-                    "home": {
-                        "ignored_zones": ["work"],
-                        "devices": ["device_tracker.test1", "device_tracker.test2"],
-                        "tolerance": "1",
-                        "zone": "home",
-                    }
-                }
-            },
-        )
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-        self.hass.states.set(
-            "device_tracker.test2",
-            "not_home",
-            {"friendly_name": "test2", "latitude": 40.1, "longitude": 20.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-    def test_device_tracker_test1_awayfurther_than_test2_first_test2(self):
-        """Test for tracker ordering."""
-        self.hass.states.set(
-            "device_tracker.test1", "not_home", {"friendly_name": "test1"}
-        )
-        self.hass.block_till_done()
-        self.hass.states.set(
-            "device_tracker.test2", "not_home", {"friendly_name": "test2"}
-        )
-        self.hass.block_till_done()
-        assert proximity.setup(
-            self.hass,
-            {
-                "proximity": {
-                    "home": {
-                        "ignored_zones": ["work"],
-                        "devices": ["device_tracker.test1", "device_tracker.test2"],
-                        "zone": "home",
-                    }
-                }
-            },
-        )
-
-        self.hass.states.set(
-            "device_tracker.test2",
-            "not_home",
-            {"friendly_name": "test2", "latitude": 40.1, "longitude": 20.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test2"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-    def test_device_tracker_test1_awayfurther_test2_in_ignored_zone(self):
-        """Test for tracker states."""
-        self.hass.states.set(
-            "device_tracker.test1", "not_home", {"friendly_name": "test1"}
-        )
-        self.hass.block_till_done()
-        self.hass.states.set("device_tracker.test2", "work", {"friendly_name": "test2"})
-        self.hass.block_till_done()
-        assert proximity.setup(
-            self.hass,
-            {
-                "proximity": {
-                    "home": {
-                        "ignored_zones": ["work"],
-                        "devices": ["device_tracker.test1", "device_tracker.test2"],
-                        "zone": "home",
-                    }
-                }
-            },
-        )
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-    def test_device_tracker_test1_awayfurther_test2_first(self):
-        """Test for tracker state."""
-        self.hass.states.set(
-            "device_tracker.test1", "not_home", {"friendly_name": "test1"}
-        )
-        self.hass.block_till_done()
-        self.hass.states.set(
-            "device_tracker.test2", "not_home", {"friendly_name": "test2"}
-        )
-        self.hass.block_till_done()
-
-        assert proximity.setup(
-            self.hass,
-            {
-                "proximity": {
-                    "home": {
-                        "ignored_zones": ["work"],
-                        "devices": ["device_tracker.test1", "device_tracker.test2"],
-                        "zone": "home",
-                    }
-                }
-            },
-        )
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 10.1, "longitude": 5.1},
-        )
-        self.hass.block_till_done()
-
-        self.hass.states.set(
-            "device_tracker.test2",
-            "not_home",
-            {"friendly_name": "test2", "latitude": 20.1, "longitude": 10.1},
-        )
-        self.hass.block_till_done()
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 40.1, "longitude": 20.1},
-        )
-        self.hass.block_till_done()
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 35.1, "longitude": 15.1},
-        )
-        self.hass.block_till_done()
-
-        self.hass.states.set("device_tracker.test1", "work", {"friendly_name": "test1"})
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test2"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-    def test_device_tracker_test1_awayfurther_a_bit(self):
-        """Test for tracker states."""
-        assert proximity.setup(
-            self.hass,
-            {
-                "proximity": {
-                    "home": {
-                        "ignored_zones": ["work"],
-                        "devices": ["device_tracker.test1"],
-                        "tolerance": 1000,
-                        "zone": "home",
-                    }
-                }
-            },
-        )
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 20.1000001, "longitude": 10.1000001},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 20.1000002, "longitude": 10.1000002},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "stationary"
-
-    def test_device_tracker_test1_nearest_after_test2_in_ignored_zone(self):
-        """Test for tracker states."""
-        self.hass.states.set(
-            "device_tracker.test1", "not_home", {"friendly_name": "test1"}
-        )
-        self.hass.block_till_done()
-        self.hass.states.set(
-            "device_tracker.test2", "not_home", {"friendly_name": "test2"}
-        )
-        self.hass.block_till_done()
-
-        assert proximity.setup(
-            self.hass,
-            {
-                "proximity": {
-                    "home": {
-                        "ignored_zones": ["work"],
-                        "devices": ["device_tracker.test1", "device_tracker.test2"],
-                        "zone": "home",
-                    }
-                }
-            },
-        )
-
-        self.hass.states.set(
-            "device_tracker.test1",
-            "not_home",
-            {"friendly_name": "test1", "latitude": 20.1, "longitude": 10.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-        self.hass.states.set(
-            "device_tracker.test2",
-            "not_home",
-            {"friendly_name": "test2", "latitude": 10.1, "longitude": 5.1},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test2"
-        assert state.attributes.get("dir_of_travel") == "unknown"
-
-        self.hass.states.set(
-            "device_tracker.test2",
-            "work",
-            {"friendly_name": "test2", "latitude": 12.6, "longitude": 7.6},
-        )
-        self.hass.block_till_done()
-        state = self.hass.states.get("proximity.home")
-        assert state.attributes.get("nearest") == "test1"
-        assert state.attributes.get("dir_of_travel") == "unknown"
+def config_zones(hass):
+    """Set up zones for test."""
+    hass.config.components.add("zone")
+    hass.states.async_set(
+        "zone.home",
+        "zoning",
+        {"name": "home", "latitude": 2.1, "longitude": 1.1, "radius": 10},
+    )
+    hass.states.async_set(
+        "zone.work",
+        "zoning",
+        {"name": "work", "latitude": 2.3, "longitude": 1.3, "radius": 10},
+    )
diff --git a/tests/components/ps4/test_config_flow.py b/tests/components/ps4/test_config_flow.py
index d7754cf1c8f..0febf142d02 100644
--- a/tests/components/ps4/test_config_flow.py
+++ b/tests/components/ps4/test_config_flow.py
@@ -284,7 +284,7 @@ async def test_duplicate_abort(hass):
             result["flow_id"], user_input=MOCK_AUTO
         )
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "devices_configured"
+    assert result["reason"] == "already_configured"
 
 
 async def test_additional_device(hass):
@@ -515,7 +515,7 @@ async def test_device_connection_error(hass):
         )
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "link"
-    assert result["errors"] == {"base": "not_ready"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_manual_mode_no_ip_error(hass):
diff --git a/tests/components/pushbullet/test_notify.py b/tests/components/pushbullet/test_notify.py
index b0fb55e152d..12bfc686d17 100644
--- a/tests/components/pushbullet/test_notify.py
+++ b/tests/components/pushbullet/test_notify.py
@@ -1,301 +1,273 @@
 """The tests for the pushbullet notification platform."""
 import json
-import unittest
 
 from pushbullet import PushBullet
-import requests_mock
+import pytest
 
 import homeassistant.components.notify as notify
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import assert_setup_component, get_test_home_assistant, load_fixture
+from tests.common import assert_setup_component, load_fixture
 
 
-class TestPushBullet(unittest.TestCase):
-    """Tests the Pushbullet Component."""
-
-    def setUp(self):
-        """Initialize values for this test case class."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Stop everything that we started."""
-        self.hass.stop()
-
-    @patch.object(
+@pytest.fixture
+def mock_pushbullet():
+    """Mock pushbullet."""
+    with patch.object(
         PushBullet,
         "_get_data",
         return_value=json.loads(load_fixture("pushbullet_devices.json")),
+    ):
+        yield
+
+
+async def test_pushbullet_config(hass, mock_pushbullet):
+    """Test setup."""
+    config = {
+        notify.DOMAIN: {
+            "name": "test",
+            "platform": "pushbullet",
+            "api_key": "MYFAKEKEY",
+        }
+    }
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+        await hass.async_block_till_done()
+    assert handle_config[notify.DOMAIN]
+
+
+async def test_pushbullet_config_bad(hass):
+    """Test set up the platform with bad/missing configuration."""
+    config = {notify.DOMAIN: {"platform": "pushbullet"}}
+    with assert_setup_component(0) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+        await hass.async_block_till_done()
+    assert not handle_config[notify.DOMAIN]
+
+
+async def test_pushbullet_push_default(hass, requests_mock, mock_pushbullet):
+    """Test pushbullet push to default target."""
+    config = {
+        notify.DOMAIN: {
+            "name": "test",
+            "platform": "pushbullet",
+            "api_key": "MYFAKEKEY",
+        }
+    }
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+        await hass.async_block_till_done()
+    assert handle_config[notify.DOMAIN]
+    requests_mock.register_uri(
+        "POST",
+        "https://api.pushbullet.com/v2/pushes",
+        status_code=200,
+        json={"mock_response": "Ok"},
     )
-    def test_pushbullet_config(self, mock__get_data):
-        """Test setup."""
-        config = {
-            notify.DOMAIN: {
-                "name": "test",
-                "platform": "pushbullet",
-                "api_key": "MYFAKEKEY",
-            }
+    data = {"title": "Test Title", "message": "Test Message"}
+    await hass.services.async_call(notify.DOMAIN, "test", data)
+    await hass.async_block_till_done()
+    assert requests_mock.called
+    assert requests_mock.call_count == 1
+
+    expected_body = {"body": "Test Message", "title": "Test Title", "type": "note"}
+    assert requests_mock.last_request.json() == expected_body
+
+
+async def test_pushbullet_push_device(hass, requests_mock, mock_pushbullet):
+    """Test pushbullet push to default target."""
+    config = {
+        notify.DOMAIN: {
+            "name": "test",
+            "platform": "pushbullet",
+            "api_key": "MYFAKEKEY",
         }
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert handle_config[notify.DOMAIN]
-
-    def test_pushbullet_config_bad(self):
-        """Test set up the platform with bad/missing configuration."""
-        config = {notify.DOMAIN: {"platform": "pushbullet"}}
-        with assert_setup_component(0) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert not handle_config[notify.DOMAIN]
-
-    @requests_mock.Mocker()
-    @patch.object(
-        PushBullet,
-        "_get_data",
-        return_value=json.loads(load_fixture("pushbullet_devices.json")),
+    }
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+        await hass.async_block_till_done()
+    assert handle_config[notify.DOMAIN]
+    requests_mock.register_uri(
+        "POST",
+        "https://api.pushbullet.com/v2/pushes",
+        status_code=200,
+        json={"mock_response": "Ok"},
     )
-    def test_pushbullet_push_default(self, mock, mock__get_data):
-        """Test pushbullet push to default target."""
-        config = {
-            notify.DOMAIN: {
-                "name": "test",
-                "platform": "pushbullet",
-                "api_key": "MYFAKEKEY",
-            }
+    data = {
+        "title": "Test Title",
+        "message": "Test Message",
+        "target": ["device/DESKTOP"],
+    }
+    await hass.services.async_call(notify.DOMAIN, "test", data)
+    await hass.async_block_till_done()
+    assert requests_mock.called
+    assert requests_mock.call_count == 1
+
+    expected_body = {
+        "body": "Test Message",
+        "device_iden": "identity1",
+        "title": "Test Title",
+        "type": "note",
+    }
+    assert requests_mock.last_request.json() == expected_body
+
+
+async def test_pushbullet_push_devices(hass, requests_mock, mock_pushbullet):
+    """Test pushbullet push to default target."""
+    config = {
+        notify.DOMAIN: {
+            "name": "test",
+            "platform": "pushbullet",
+            "api_key": "MYFAKEKEY",
         }
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert handle_config[notify.DOMAIN]
-        mock.register_uri(
-            requests_mock.POST,
-            "https://api.pushbullet.com/v2/pushes",
-            status_code=200,
-            json={"mock_response": "Ok"},
-        )
-        data = {"title": "Test Title", "message": "Test Message"}
-        self.hass.services.call(notify.DOMAIN, "test", data)
-        self.hass.block_till_done()
-        assert mock.called
-        assert mock.call_count == 1
-
-        expected_body = {"body": "Test Message", "title": "Test Title", "type": "note"}
-        assert mock.last_request.json() == expected_body
-
-    @requests_mock.Mocker()
-    @patch.object(
-        PushBullet,
-        "_get_data",
-        return_value=json.loads(load_fixture("pushbullet_devices.json")),
+    }
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+        await hass.async_block_till_done()
+    assert handle_config[notify.DOMAIN]
+    requests_mock.register_uri(
+        "POST",
+        "https://api.pushbullet.com/v2/pushes",
+        status_code=200,
+        json={"mock_response": "Ok"},
     )
-    def test_pushbullet_push_device(self, mock, mock__get_data):
-        """Test pushbullet push to default target."""
-        config = {
-            notify.DOMAIN: {
-                "name": "test",
-                "platform": "pushbullet",
-                "api_key": "MYFAKEKEY",
-            }
-        }
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert handle_config[notify.DOMAIN]
-        mock.register_uri(
-            requests_mock.POST,
-            "https://api.pushbullet.com/v2/pushes",
-            status_code=200,
-            json={"mock_response": "Ok"},
-        )
-        data = {
-            "title": "Test Title",
-            "message": "Test Message",
-            "target": ["device/DESKTOP"],
-        }
-        self.hass.services.call(notify.DOMAIN, "test", data)
-        self.hass.block_till_done()
-        assert mock.called
-        assert mock.call_count == 1
+    data = {
+        "title": "Test Title",
+        "message": "Test Message",
+        "target": ["device/DESKTOP", "device/My iPhone"],
+    }
+    await hass.services.async_call(notify.DOMAIN, "test", data)
+    await hass.async_block_till_done()
+    assert requests_mock.called
+    assert requests_mock.call_count == 2
+    assert len(requests_mock.request_history) == 2
 
-        expected_body = {
-            "body": "Test Message",
-            "device_iden": "identity1",
-            "title": "Test Title",
-            "type": "note",
-        }
-        assert mock.last_request.json() == expected_body
+    expected_body = {
+        "body": "Test Message",
+        "device_iden": "identity1",
+        "title": "Test Title",
+        "type": "note",
+    }
+    assert requests_mock.request_history[0].json() == expected_body
+    expected_body = {
+        "body": "Test Message",
+        "device_iden": "identity2",
+        "title": "Test Title",
+        "type": "note",
+    }
+    assert requests_mock.request_history[1].json() == expected_body
 
-    @requests_mock.Mocker()
-    @patch.object(
-        PushBullet,
-        "_get_data",
-        return_value=json.loads(load_fixture("pushbullet_devices.json")),
+
+async def test_pushbullet_push_email(hass, requests_mock, mock_pushbullet):
+    """Test pushbullet push to default target."""
+    config = {
+        notify.DOMAIN: {
+            "name": "test",
+            "platform": "pushbullet",
+            "api_key": "MYFAKEKEY",
+        }
+    }
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+        await hass.async_block_till_done()
+    assert handle_config[notify.DOMAIN]
+    requests_mock.register_uri(
+        "POST",
+        "https://api.pushbullet.com/v2/pushes",
+        status_code=200,
+        json={"mock_response": "Ok"},
     )
-    def test_pushbullet_push_devices(self, mock, mock__get_data):
-        """Test pushbullet push to default target."""
-        config = {
-            notify.DOMAIN: {
-                "name": "test",
-                "platform": "pushbullet",
-                "api_key": "MYFAKEKEY",
-            }
-        }
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert handle_config[notify.DOMAIN]
-        mock.register_uri(
-            requests_mock.POST,
-            "https://api.pushbullet.com/v2/pushes",
-            status_code=200,
-            json={"mock_response": "Ok"},
-        )
-        data = {
-            "title": "Test Title",
-            "message": "Test Message",
-            "target": ["device/DESKTOP", "device/My iPhone"],
-        }
-        self.hass.services.call(notify.DOMAIN, "test", data)
-        self.hass.block_till_done()
-        assert mock.called
-        assert mock.call_count == 2
-        assert len(mock.request_history) == 2
+    data = {
+        "title": "Test Title",
+        "message": "Test Message",
+        "target": ["email/user@host.net"],
+    }
+    await hass.services.async_call(notify.DOMAIN, "test", data)
+    await hass.async_block_till_done()
+    assert requests_mock.called
+    assert requests_mock.call_count == 1
+    assert len(requests_mock.request_history) == 1
 
-        expected_body = {
-            "body": "Test Message",
-            "device_iden": "identity1",
-            "title": "Test Title",
-            "type": "note",
-        }
-        assert mock.request_history[0].json() == expected_body
-        expected_body = {
-            "body": "Test Message",
-            "device_iden": "identity2",
-            "title": "Test Title",
-            "type": "note",
-        }
-        assert mock.request_history[1].json() == expected_body
+    expected_body = {
+        "body": "Test Message",
+        "email": "user@host.net",
+        "title": "Test Title",
+        "type": "note",
+    }
+    assert requests_mock.request_history[0].json() == expected_body
 
-    @requests_mock.Mocker()
-    @patch.object(
-        PushBullet,
-        "_get_data",
-        return_value=json.loads(load_fixture("pushbullet_devices.json")),
+
+async def test_pushbullet_push_mixed(hass, requests_mock, mock_pushbullet):
+    """Test pushbullet push to default target."""
+    config = {
+        notify.DOMAIN: {
+            "name": "test",
+            "platform": "pushbullet",
+            "api_key": "MYFAKEKEY",
+        }
+    }
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+        await hass.async_block_till_done()
+    assert handle_config[notify.DOMAIN]
+    requests_mock.register_uri(
+        "POST",
+        "https://api.pushbullet.com/v2/pushes",
+        status_code=200,
+        json={"mock_response": "Ok"},
     )
-    def test_pushbullet_push_email(self, mock, mock__get_data):
-        """Test pushbullet push to default target."""
-        config = {
-            notify.DOMAIN: {
-                "name": "test",
-                "platform": "pushbullet",
-                "api_key": "MYFAKEKEY",
-            }
-        }
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert handle_config[notify.DOMAIN]
-        mock.register_uri(
-            requests_mock.POST,
-            "https://api.pushbullet.com/v2/pushes",
-            status_code=200,
-            json={"mock_response": "Ok"},
-        )
-        data = {
-            "title": "Test Title",
-            "message": "Test Message",
-            "target": ["email/user@host.net"],
-        }
-        self.hass.services.call(notify.DOMAIN, "test", data)
-        self.hass.block_till_done()
-        assert mock.called
-        assert mock.call_count == 1
-        assert len(mock.request_history) == 1
+    data = {
+        "title": "Test Title",
+        "message": "Test Message",
+        "target": ["device/DESKTOP", "email/user@host.net"],
+    }
+    await hass.services.async_call(notify.DOMAIN, "test", data)
+    await hass.async_block_till_done()
+    assert requests_mock.called
+    assert requests_mock.call_count == 2
+    assert len(requests_mock.request_history) == 2
 
-        expected_body = {
-            "body": "Test Message",
-            "email": "user@host.net",
-            "title": "Test Title",
-            "type": "note",
-        }
-        assert mock.request_history[0].json() == expected_body
+    expected_body = {
+        "body": "Test Message",
+        "device_iden": "identity1",
+        "title": "Test Title",
+        "type": "note",
+    }
+    assert requests_mock.request_history[0].json() == expected_body
+    expected_body = {
+        "body": "Test Message",
+        "email": "user@host.net",
+        "title": "Test Title",
+        "type": "note",
+    }
+    assert requests_mock.request_history[1].json() == expected_body
 
-    @requests_mock.Mocker()
-    @patch.object(
-        PushBullet,
-        "_get_data",
-        return_value=json.loads(load_fixture("pushbullet_devices.json")),
+
+async def test_pushbullet_push_no_file(hass, requests_mock, mock_pushbullet):
+    """Test pushbullet push to default target."""
+    config = {
+        notify.DOMAIN: {
+            "name": "test",
+            "platform": "pushbullet",
+            "api_key": "MYFAKEKEY",
+        }
+    }
+    with assert_setup_component(1) as handle_config:
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+        await hass.async_block_till_done()
+    assert handle_config[notify.DOMAIN]
+    requests_mock.register_uri(
+        "POST",
+        "https://api.pushbullet.com/v2/pushes",
+        status_code=200,
+        json={"mock_response": "Ok"},
     )
-    def test_pushbullet_push_mixed(self, mock, mock__get_data):
-        """Test pushbullet push to default target."""
-        config = {
-            notify.DOMAIN: {
-                "name": "test",
-                "platform": "pushbullet",
-                "api_key": "MYFAKEKEY",
-            }
-        }
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert handle_config[notify.DOMAIN]
-        mock.register_uri(
-            requests_mock.POST,
-            "https://api.pushbullet.com/v2/pushes",
-            status_code=200,
-            json={"mock_response": "Ok"},
-        )
-        data = {
-            "title": "Test Title",
-            "message": "Test Message",
-            "target": ["device/DESKTOP", "email/user@host.net"],
-        }
-        self.hass.services.call(notify.DOMAIN, "test", data)
-        self.hass.block_till_done()
-        assert mock.called
-        assert mock.call_count == 2
-        assert len(mock.request_history) == 2
-
-        expected_body = {
-            "body": "Test Message",
-            "device_iden": "identity1",
-            "title": "Test Title",
-            "type": "note",
-        }
-        assert mock.request_history[0].json() == expected_body
-        expected_body = {
-            "body": "Test Message",
-            "email": "user@host.net",
-            "title": "Test Title",
-            "type": "note",
-        }
-        assert mock.request_history[1].json() == expected_body
-
-    @requests_mock.Mocker()
-    @patch.object(
-        PushBullet,
-        "_get_data",
-        return_value=json.loads(load_fixture("pushbullet_devices.json")),
-    )
-    def test_pushbullet_push_no_file(self, mock, mock__get_data):
-        """Test pushbullet push to default target."""
-        config = {
-            notify.DOMAIN: {
-                "name": "test",
-                "platform": "pushbullet",
-                "api_key": "MYFAKEKEY",
-            }
-        }
-        with assert_setup_component(1) as handle_config:
-            assert setup_component(self.hass, notify.DOMAIN, config)
-        assert handle_config[notify.DOMAIN]
-        mock.register_uri(
-            requests_mock.POST,
-            "https://api.pushbullet.com/v2/pushes",
-            status_code=200,
-            json={"mock_response": "Ok"},
-        )
-        data = {
-            "title": "Test Title",
-            "message": "Test Message",
-            "target": ["device/DESKTOP", "device/My iPhone"],
-            "data": {"file": "not_a_file"},
-        }
-        assert not self.hass.services.call(notify.DOMAIN, "test", data)
-        self.hass.block_till_done()
+    data = {
+        "title": "Test Title",
+        "message": "Test Message",
+        "target": ["device/DESKTOP", "device/My iPhone"],
+        "data": {"file": "not_a_file"},
+    }
+    assert not await hass.services.async_call(notify.DOMAIN, "test", data)
+    await hass.async_block_till_done()
diff --git a/tests/components/python_script/test_init.py b/tests/components/python_script/test_init.py
index 90d2ac67faf..bcd846889fa 100644
--- a/tests/components/python_script/test_init.py
+++ b/tests/components/python_script/test_init.py
@@ -60,7 +60,7 @@ async def test_execute_with_data(hass, caplog):
 hass.states.set('test.entity', data.get('name', 'not set'))
     """
 
-    hass.async_add_job(execute, hass, "test.py", source, {"name": "paulus"})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {"name": "paulus"})
     await hass.async_block_till_done()
 
     assert hass.states.is_state("test.entity", "paulus")
@@ -76,7 +76,7 @@ async def test_execute_warns_print(hass, caplog):
 print("This triggers warning.")
     """
 
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert "Don't use print() inside scripts." in caplog.text
@@ -89,7 +89,7 @@ async def test_execute_logging(hass, caplog):
 logger.info('Logging from inside script')
     """
 
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert "Logging from inside script" in caplog.text
@@ -102,7 +102,7 @@ async def test_execute_compile_error(hass, caplog):
 this is not valid Python
     """
 
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert "Error loading script test.py" in caplog.text
@@ -115,7 +115,7 @@ async def test_execute_runtime_error(hass, caplog):
 raise Exception('boom')
     """
 
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert "Error executing script: boom" in caplog.text
@@ -128,7 +128,7 @@ async def test_accessing_async_methods(hass, caplog):
 hass.async_stop()
     """
 
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert "Not allowed to access async methods" in caplog.text
@@ -143,7 +143,7 @@ mylist = [1, 2, 3, 4]
 logger.info('Logging from inside script: %s %s' % (mydict["a"], mylist[2]))
     """
 
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert "Logging from inside script: 1 3" in caplog.text
@@ -160,7 +160,7 @@ async def test_accessing_forbidden_methods(hass, caplog):
         "time.tzset()": "TimeWrapper.tzset",
     }.items():
         caplog.records.clear()
-        hass.async_add_job(execute, hass, "test.py", source, {})
+        hass.async_add_executor_job(execute, hass, "test.py", source, {})
         await hass.async_block_till_done()
         assert f"Not allowed to access {name}" in caplog.text
 
@@ -172,7 +172,7 @@ for i in [1, 2]:
     hass.states.set('hello.{}'.format(i), 'world')
     """
 
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert hass.states.is_state("hello.1", "world")
@@ -190,7 +190,7 @@ hass.states.set('hello.b', b)
 hass.states.set('hello.ab_list', '{}'.format(ab_list))
 """
 
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert hass.states.is_state("hello.a", "1")
@@ -211,7 +211,7 @@ hass.states.set('hello.a', a[0])
 hass.states.set('hello.b', a[1])
 hass.states.set('hello.c', a[2])
 """
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert hass.states.is_state("hello.a", "1")
@@ -232,7 +232,7 @@ hass.states.set('module.datetime',
                 datetime.timedelta(minutes=1).total_seconds())
 """
 
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert hass.states.is_state("module.time", "1986")
@@ -256,7 +256,7 @@ def b():
 
 b()
 """
-    hass.async_add_job(execute, hass, "test.py", source, {})
+    hass.async_add_executor_job(execute, hass, "test.py", source, {})
     await hass.async_block_till_done()
 
     assert hass.states.is_state("hello.a", "one")
@@ -400,7 +400,7 @@ time.sleep(5)
 """
 
     with patch("homeassistant.components.python_script.time.sleep"):
-        hass.async_add_job(execute, hass, "test.py", source, {})
+        hass.async_add_executor_job(execute, hass, "test.py", source, {})
         await hass.async_block_till_done()
 
     assert caplog.text.count("time.sleep") == 1
diff --git a/tests/components/qwikswitch/test_init.py b/tests/components/qwikswitch/test_init.py
index 5a68a6e6e7b..7d92d40f987 100644
--- a/tests/components/qwikswitch/test_init.py
+++ b/tests/components/qwikswitch/test_init.py
@@ -1,6 +1,5 @@
 """Test qwikswitch sensors."""
 import asyncio
-import logging
 
 from aiohttp.client_exceptions import ClientError
 import pytest
@@ -12,8 +11,6 @@ from homeassistant.setup import async_setup_component
 from tests.async_mock import Mock
 from tests.test_util.aiohttp import AiohttpClientMockResponse, MockLongPollSideEffect
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @pytest.fixture
 def qs_devices():
diff --git a/tests/components/rachio/test_config_flow.py b/tests/components/rachio/test_config_flow.py
index b107bd1514f..eb6b5ef4386 100644
--- a/tests/components/rachio/test_config_flow.py
+++ b/tests/components/rachio/test_config_flow.py
@@ -11,11 +11,11 @@ from tests.async_mock import MagicMock, patch
 from tests.common import MockConfigEntry
 
 
-def _mock_rachio_return_value(get=None, getInfo=None):
+def _mock_rachio_return_value(get=None, info=None):
     rachio_mock = MagicMock()
     person_mock = MagicMock()
     type(person_mock).get = MagicMock(return_value=get)
-    type(person_mock).getInfo = MagicMock(return_value=getInfo)
+    type(person_mock).info = MagicMock(return_value=info)
     type(rachio_mock).person = person_mock
     return rachio_mock
 
@@ -31,7 +31,7 @@ async def test_form(hass):
 
     rachio_mock = _mock_rachio_return_value(
         get=({"status": 200}, {"username": "myusername"}),
-        getInfo=({"status": 200}, {"id": "myid"}),
+        info=({"status": 200}, {"id": "myid"}),
     )
 
     with patch(
@@ -71,7 +71,7 @@ async def test_form_invalid_auth(hass):
 
     rachio_mock = _mock_rachio_return_value(
         get=({"status": 200}, {"username": "myusername"}),
-        getInfo=({"status": 412}, {"error": "auth fail"}),
+        info=({"status": 412}, {"error": "auth fail"}),
     )
     with patch(
         "homeassistant.components.rachio.config_flow.Rachio", return_value=rachio_mock
@@ -93,7 +93,7 @@ async def test_form_cannot_connect(hass):
 
     rachio_mock = _mock_rachio_return_value(
         get=({"status": 599}, {"username": "myusername"}),
-        getInfo=({"status": 200}, {"id": "myid"}),
+        info=({"status": 200}, {"id": "myid"}),
     )
     with patch(
         "homeassistant.components.rachio.config_flow.Rachio", return_value=rachio_mock
diff --git a/tests/components/radarr/test_sensor.py b/tests/components/radarr/test_sensor.py
index 96575f81154..aa6a2a02679 100644
--- a/tests/components/radarr/test_sensor.py
+++ b/tests/components/radarr/test_sensor.py
@@ -1,13 +1,10 @@
 """The tests for the Radarr platform."""
-import unittest
-
 import pytest
 
-import homeassistant.components.radarr.sensor as radarr
 from homeassistant.const import DATA_GIGABYTES
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
 
 
 def mocked_exception(*args, **kwargs):
@@ -192,32 +189,10 @@ def mocked_requests_get(*args, **kwargs):
     return MockResponse({"error": "Unauthorized"}, 401)
 
 
-class TestRadarrSetup(unittest.TestCase):
-    """Test the Radarr platform."""
-
-    # pylint: disable=invalid-name
-    DEVICES = []
-
-    def add_entities(self, devices, update):
-        """Mock add devices."""
-        for device in devices:
-            self.DEVICES.append(device)
-
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.DEVICES = []
-        self.hass = get_test_home_assistant()
-        self.hass.config.time_zone = "America/Los_Angeles"
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    @patch("requests.get", side_effect=mocked_requests_get)
-    def test_diskspace_no_paths(self, req_mock):
-        """Test getting all disk space."""
-        config = {
+async def test_diskspace_no_paths(hass):
+    """Test getting all disk space."""
+    config = {
+        "sensor": {
             "platform": "radarr",
             "api_key": "foo",
             "days": "2",
@@ -225,19 +200,28 @@ class TestRadarrSetup(unittest.TestCase):
             "include_paths": [],
             "monitored_conditions": ["diskspace"],
         }
-        radarr.setup_platform(self.hass, config, self.add_entities, None)
-        for device in self.DEVICES:
-            device.update()
-            assert "263.10" == device.state
-            assert "mdi:harddisk" == device.icon
-            assert DATA_GIGABYTES == device.unit_of_measurement
-            assert "Radarr Disk Space" == device.name
-            assert "263.10/465.42GB (56.53%)" == device.device_state_attributes["/data"]
+    }
 
-    @patch("requests.get", side_effect=mocked_requests_get)
-    def test_diskspace_paths(self, req_mock):
-        """Test getting diskspace for included paths."""
-        config = {
+    with patch(
+        "requests.get",
+        side_effect=mocked_requests_get,
+    ):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+
+        entity = hass.states.get("sensor.radarr_disk_space")
+        assert entity is not None
+        assert "263.10" == entity.state
+        assert "mdi:harddisk" == entity.attributes["icon"]
+        assert DATA_GIGABYTES == entity.attributes["unit_of_measurement"]
+        assert "Radarr Disk Space" == entity.attributes["friendly_name"]
+        assert "263.10/465.42GB (56.53%)" == entity.attributes["/data"]
+
+
+async def test_diskspace_paths(hass):
+    """Test getting diskspace for included paths."""
+    config = {
+        "sensor": {
             "platform": "radarr",
             "api_key": "foo",
             "days": "2",
@@ -245,19 +229,28 @@ class TestRadarrSetup(unittest.TestCase):
             "include_paths": ["/data"],
             "monitored_conditions": ["diskspace"],
         }
-        radarr.setup_platform(self.hass, config, self.add_entities, None)
-        for device in self.DEVICES:
-            device.update()
-            assert "263.10" == device.state
-            assert "mdi:harddisk" == device.icon
-            assert DATA_GIGABYTES == device.unit_of_measurement
-            assert "Radarr Disk Space" == device.name
-            assert "263.10/465.42GB (56.53%)" == device.device_state_attributes["/data"]
+    }
 
-    @patch("requests.get", side_effect=mocked_requests_get)
-    def test_commands(self, req_mock):
-        """Test getting running commands."""
-        config = {
+    with patch(
+        "requests.get",
+        side_effect=mocked_requests_get,
+    ):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+
+        entity = hass.states.get("sensor.radarr_disk_space")
+        assert entity is not None
+        assert "263.10" == entity.state
+        assert "mdi:harddisk" == entity.attributes["icon"]
+        assert DATA_GIGABYTES == entity.attributes["unit_of_measurement"]
+        assert "Radarr Disk Space" == entity.attributes["friendly_name"]
+        assert "263.10/465.42GB (56.53%)" == entity.attributes["/data"]
+
+
+async def test_commands(hass):
+    """Test getting running commands."""
+    config = {
+        "sensor": {
             "platform": "radarr",
             "api_key": "foo",
             "days": "2",
@@ -265,19 +258,28 @@ class TestRadarrSetup(unittest.TestCase):
             "include_paths": ["/data"],
             "monitored_conditions": ["commands"],
         }
-        radarr.setup_platform(self.hass, config, self.add_entities, None)
-        for device in self.DEVICES:
-            device.update()
-            assert 1 == device.state
-            assert "mdi:code-braces" == device.icon
-            assert "Commands" == device.unit_of_measurement
-            assert "Radarr Commands" == device.name
-            assert "pending" == device.device_state_attributes["RescanMovie"]
+    }
 
-    @patch("requests.get", side_effect=mocked_requests_get)
-    def test_movies(self, req_mock):
-        """Test getting the number of movies."""
-        config = {
+    with patch(
+        "requests.get",
+        side_effect=mocked_requests_get,
+    ):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+
+        entity = hass.states.get("sensor.radarr_commands")
+        assert entity is not None
+        assert 1 == int(entity.state)
+        assert "mdi:code-braces" == entity.attributes["icon"]
+        assert "Commands" == entity.attributes["unit_of_measurement"]
+        assert "Radarr Commands" == entity.attributes["friendly_name"]
+        assert "pending" == entity.attributes["RescanMovie"]
+
+
+async def test_movies(hass):
+    """Test getting the number of movies."""
+    config = {
+        "sensor": {
             "platform": "radarr",
             "api_key": "foo",
             "days": "2",
@@ -285,19 +287,28 @@ class TestRadarrSetup(unittest.TestCase):
             "include_paths": ["/data"],
             "monitored_conditions": ["movies"],
         }
-        radarr.setup_platform(self.hass, config, self.add_entities, None)
-        for device in self.DEVICES:
-            device.update()
-            assert 1 == device.state
-            assert "mdi:television" == device.icon
-            assert "Movies" == device.unit_of_measurement
-            assert "Radarr Movies" == device.name
-            assert "false" == device.device_state_attributes["Assassin's Creed (2016)"]
+    }
 
-    @patch("requests.get", side_effect=mocked_requests_get)
-    def test_upcoming_multiple_days(self, req_mock):
-        """Test the upcoming movies for multiple days."""
-        config = {
+    with patch(
+        "requests.get",
+        side_effect=mocked_requests_get,
+    ):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+
+        entity = hass.states.get("sensor.radarr_movies")
+        assert entity is not None
+        assert 1 == int(entity.state)
+        assert "mdi:television" == entity.attributes["icon"]
+        assert "Movies" == entity.attributes["unit_of_measurement"]
+        assert "Radarr Movies" == entity.attributes["friendly_name"]
+        assert "false" == entity.attributes["Assassin's Creed (2016)"]
+
+
+async def test_upcoming_multiple_days(hass):
+    """Test the upcoming movies for multiple days."""
+    config = {
+        "sensor": {
             "platform": "radarr",
             "api_key": "foo",
             "days": "2",
@@ -305,26 +316,32 @@ class TestRadarrSetup(unittest.TestCase):
             "include_paths": ["/data"],
             "monitored_conditions": ["upcoming"],
         }
-        radarr.setup_platform(self.hass, config, self.add_entities, None)
-        for device in self.DEVICES:
-            device.update()
-            assert 1 == device.state
-            assert "mdi:television" == device.icon
-            assert "Movies" == device.unit_of_measurement
-            assert "Radarr Upcoming" == device.name
-            assert (
-                "2017-01-27T00:00:00Z"
-                == device.device_state_attributes["Resident Evil (2017)"]
-            )
+    }
 
-    @pytest.mark.skip
-    @patch("requests.get", side_effect=mocked_requests_get)
-    def test_upcoming_today(self, req_mock):
-        """Test filtering for a single day.
+    with patch(
+        "requests.get",
+        side_effect=mocked_requests_get,
+    ):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
 
-        Radarr needs to respond with at least 2 days.
-        """
-        config = {
+        entity = hass.states.get("sensor.radarr_upcoming")
+        assert entity is not None
+        assert 1 == int(entity.state)
+        assert "mdi:television" == entity.attributes["icon"]
+        assert "Movies" == entity.attributes["unit_of_measurement"]
+        assert "Radarr Upcoming" == entity.attributes["friendly_name"]
+        assert "2017-01-27T00:00:00Z" == entity.attributes["Resident Evil (2017)"]
+
+
+@pytest.mark.skip
+async def test_upcoming_today(hass):
+    """Test filtering for a single day.
+
+    Radarr needs to respond with at least 2 days.
+    """
+    config = {
+        "sensor": {
             "platform": "radarr",
             "api_key": "foo",
             "days": "1",
@@ -332,22 +349,25 @@ class TestRadarrSetup(unittest.TestCase):
             "include_paths": ["/data"],
             "monitored_conditions": ["upcoming"],
         }
-        radarr.setup_platform(self.hass, config, self.add_entities, None)
-        for device in self.DEVICES:
-            device.update()
-            assert 1 == device.state
-            assert "mdi:television" == device.icon
-            assert "Movies" == device.unit_of_measurement
-            assert "Radarr Upcoming" == device.name
-            assert (
-                "2017-01-27T00:00:00Z"
-                == device.device_state_attributes["Resident Evil (2017)"]
-            )
+    }
+    with patch(
+        "requests.get",
+        side_effect=mocked_requests_get,
+    ):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+        entity = hass.states.get("sensor.radarr_upcoming")
+        assert 1 == int(entity.state)
+        assert "mdi:television" == entity.attributes["icon"]
+        assert "Movies" == entity.attributes["unit_of_measurement"]
+        assert "Radarr Upcoming" == entity.attributes["friendly_name"]
+        assert "2017-01-27T00:00:00Z" == entity.attributes["Resident Evil (2017)"]
 
-    @patch("requests.get", side_effect=mocked_requests_get)
-    def test_system_status(self, req_mock):
-        """Test the getting of the system status."""
-        config = {
+
+async def test_system_status(hass):
+    """Test the getting of the system status."""
+    config = {
+        "sensor": {
             "platform": "radarr",
             "api_key": "foo",
             "days": "2",
@@ -355,19 +375,25 @@ class TestRadarrSetup(unittest.TestCase):
             "include_paths": ["/data"],
             "monitored_conditions": ["status"],
         }
-        radarr.setup_platform(self.hass, config, self.add_entities, None)
-        for device in self.DEVICES:
-            device.update()
-            assert "0.2.0.210" == device.state
-            assert "mdi:information" == device.icon
-            assert "Radarr Status" == device.name
-            assert "4.8.13.1" == device.device_state_attributes["osVersion"]
+    }
+    with patch(
+        "requests.get",
+        side_effect=mocked_requests_get,
+    ):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+        entity = hass.states.get("sensor.radarr_status")
+        assert entity is not None
+        assert "0.2.0.210" == entity.state
+        assert "mdi:information" == entity.attributes["icon"]
+        assert "Radarr Status" == entity.attributes["friendly_name"]
+        assert "4.8.13.1" == entity.attributes["osVersion"]
 
-    @pytest.mark.skip
-    @patch("requests.get", side_effect=mocked_requests_get)
-    def test_ssl(self, req_mock):
-        """Test SSL being enabled."""
-        config = {
+
+async def test_ssl(hass):
+    """Test SSL being enabled."""
+    config = {
+        "sensor": {
             "platform": "radarr",
             "api_key": "foo",
             "days": "1",
@@ -376,23 +402,26 @@ class TestRadarrSetup(unittest.TestCase):
             "monitored_conditions": ["upcoming"],
             "ssl": "true",
         }
-        radarr.setup_platform(self.hass, config, self.add_entities, None)
-        for device in self.DEVICES:
-            device.update()
-            assert 1 == device.state
-            assert "s" == device.ssl
-            assert "mdi:television" == device.icon
-            assert "Movies" == device.unit_of_measurement
-            assert "Radarr Upcoming" == device.name
-            assert (
-                "2017-01-27T00:00:00Z"
-                == device.device_state_attributes["Resident Evil (2017)"]
-            )
+    }
+    with patch(
+        "requests.get",
+        side_effect=mocked_requests_get,
+    ):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+        entity = hass.states.get("sensor.radarr_upcoming")
+        assert entity is not None
+        assert 1 == int(entity.state)
+        assert "mdi:television" == entity.attributes["icon"]
+        assert "Movies" == entity.attributes["unit_of_measurement"]
+        assert "Radarr Upcoming" == entity.attributes["friendly_name"]
+        assert "2017-01-27T00:00:00Z" == entity.attributes["Resident Evil (2017)"]
 
-    @patch("requests.get", side_effect=mocked_exception)
-    def test_exception_handling(self, req_mock):
-        """Test exception being handled."""
-        config = {
+
+async def test_exception_handling(hass):
+    """Test exception being handled."""
+    config = {
+        "sensor": {
             "platform": "radarr",
             "api_key": "foo",
             "days": "1",
@@ -400,7 +429,13 @@ class TestRadarrSetup(unittest.TestCase):
             "include_paths": ["/data"],
             "monitored_conditions": ["upcoming"],
         }
-        radarr.setup_platform(self.hass, config, self.add_entities, None)
-        for device in self.DEVICES:
-            device.update()
-            assert device.state is None
+    }
+    with patch(
+        "requests.get",
+        side_effect=mocked_exception,
+    ):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+        entity = hass.states.get("sensor.radarr_upcoming")
+        assert entity is not None
+        assert "unavailable" == entity.state
diff --git a/tests/components/rainmachine/test_config_flow.py b/tests/components/rainmachine/test_config_flow.py
index be4a5fd20fe..b07e5ab81d3 100644
--- a/tests/components/rainmachine/test_config_flow.py
+++ b/tests/components/rainmachine/test_config_flow.py
@@ -54,7 +54,7 @@ async def test_invalid_password(hass):
         side_effect=RainMachineError,
     ):
         result = await flow.async_step_user(user_input=conf)
-        assert result["errors"] == {CONF_PASSWORD: "invalid_credentials"}
+        assert result["errors"] == {CONF_PASSWORD: "invalid_auth"}
 
 
 async def test_show_form(hass):
@@ -69,38 +69,6 @@ async def test_show_form(hass):
     assert result["step_id"] == "user"
 
 
-async def test_step_import(hass):
-    """Test that the import step works."""
-    conf = {
-        CONF_IP_ADDRESS: "192.168.1.100",
-        CONF_PASSWORD: "password",
-        CONF_PORT: 8080,
-        CONF_SSL: True,
-        CONF_SCAN_INTERVAL: 60,
-    }
-
-    flow = config_flow.RainMachineFlowHandler()
-    flow.hass = hass
-    flow.context = {"source": SOURCE_USER}
-
-    with patch(
-        "regenmaschine.client.Client.load_local",
-        return_value=True,
-    ):
-        result = await flow.async_step_import(import_config=conf)
-
-        assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
-        assert result["title"] == "192.168.1.100"
-        assert result["data"] == {
-            CONF_IP_ADDRESS: "192.168.1.100",
-            CONF_PASSWORD: "password",
-            CONF_PORT: 8080,
-            CONF_SSL: True,
-            CONF_SCAN_INTERVAL: 60,
-            CONF_ZONE_RUN_TIME: 600,
-        }
-
-
 async def test_step_user(hass):
     """Test that the user step works."""
     conf = {
diff --git a/tests/components/random/test_binary_sensor.py b/tests/components/random/test_binary_sensor.py
index 2f15243c71e..85a8e32018c 100644
--- a/tests/components/random/test_binary_sensor.py
+++ b/tests/components/random/test_binary_sensor.py
@@ -1,45 +1,44 @@
 """The test for the Random binary sensor platform."""
-import unittest
-
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
 
 
-class TestRandomSensor(unittest.TestCase):
+async def test_random_binary_sensor_on(hass):
     """Test the Random binary sensor."""
+    config = {"binary_sensor": {"platform": "random", "name": "test"}}
 
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
+    with patch(
+        "homeassistant.components.random.binary_sensor.getrandbits",
+        return_value=1,
+    ):
+        assert await async_setup_component(
+            hass,
+            "binary_sensor",
+            config,
+        )
+        await hass.async_block_till_done()
 
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
+    state = hass.states.get("binary_sensor.test")
 
-    @patch("homeassistant.components.random.binary_sensor.getrandbits", return_value=1)
-    def test_random_binary_sensor_on(self, mocked):
-        """Test the Random binary sensor."""
-        config = {"binary_sensor": {"platform": "random", "name": "test"}}
+    assert state.state == "on"
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test")
+async def test_random_binary_sensor_off(hass):
+    """Test the Random binary sensor."""
+    config = {"binary_sensor": {"platform": "random", "name": "test"}}
 
-        assert state.state == "on"
+    with patch(
+        "homeassistant.components.random.binary_sensor.getrandbits",
+        return_value=False,
+    ):
+        assert await async_setup_component(
+            hass,
+            "binary_sensor",
+            config,
+        )
+        await hass.async_block_till_done()
 
-    @patch(
-        "homeassistant.components.random.binary_sensor.getrandbits", return_value=False
-    )
-    def test_random_binary_sensor_off(self, mocked):
-        """Test the Random binary sensor."""
-        config = {"binary_sensor": {"platform": "random", "name": "test"}}
+    state = hass.states.get("binary_sensor.test")
 
-        assert setup_component(self.hass, "binary_sensor", config)
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("binary_sensor.test")
-
-        assert state.state == "off"
+    assert state.state == "off"
diff --git a/tests/components/random/test_sensor.py b/tests/components/random/test_sensor.py
index 657efc9a0cc..9ac2588ff0a 100644
--- a/tests/components/random/test_sensor.py
+++ b/tests/components/random/test_sensor.py
@@ -1,37 +1,26 @@
 """The test for the random number sensor platform."""
-import unittest
-
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 
-class TestRandomSensor(unittest.TestCase):
+async def test_random_sensor(hass):
     """Test the Random number sensor."""
-
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_random_sensor(self):
-        """Test the Random number sensor."""
-        config = {
-            "sensor": {
-                "platform": "random",
-                "name": "test",
-                "minimum": 10,
-                "maximum": 20,
-            }
+    config = {
+        "sensor": {
+            "platform": "random",
+            "name": "test",
+            "minimum": 10,
+            "maximum": 20,
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        config,
+    )
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.test")
+    state = hass.states.get("sensor.test")
 
-        assert int(state.state) <= config["sensor"]["maximum"]
-        assert int(state.state) >= config["sensor"]["minimum"]
+    assert int(state.state) <= config["sensor"]["maximum"]
+    assert int(state.state) >= config["sensor"]["minimum"]
diff --git a/tests/components/recorder/common.py b/tests/components/recorder/common.py
index 4c25771398c..1d0e6dbbfa0 100644
--- a/tests/components/recorder/common.py
+++ b/tests/components/recorder/common.py
@@ -1,12 +1,12 @@
 """Common test utils for working with recorder."""
 
+from datetime import timedelta
+
 from homeassistant.components import recorder
 from homeassistant.util import dt as dt_util
 
 from tests.common import fire_time_changed
 
-DB_COMMIT_INTERVAL = 50
-
 
 def wait_recording_done(hass):
     """Block till recording is done."""
@@ -18,6 +18,6 @@ def wait_recording_done(hass):
 
 def trigger_db_commit(hass):
     """Force the recorder to commit."""
-    for _ in range(DB_COMMIT_INTERVAL):
+    for _ in range(recorder.DEFAULT_COMMIT_INTERVAL):
         # We only commit on time change
-        fire_time_changed(hass, dt_util.utcnow())
+        fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=1))
diff --git a/tests/components/recorder/conftest.py b/tests/components/recorder/conftest.py
new file mode 100644
index 00000000000..d91a86402ac
--- /dev/null
+++ b/tests/components/recorder/conftest.py
@@ -0,0 +1,24 @@
+"""Common test tools."""
+
+import pytest
+
+from homeassistant.components.recorder.const import DATA_INSTANCE
+
+from tests.common import get_test_home_assistant, init_recorder_component
+
+
+@pytest.fixture
+def hass_recorder():
+    """Home Assistant fixture with in-memory recorder."""
+    hass = get_test_home_assistant()
+
+    def setup_recorder(config=None):
+        """Set up with params."""
+        init_recorder_component(hass, config)
+        hass.start()
+        hass.block_till_done()
+        hass.data[DATA_INSTANCE].block_till_done()
+        return hass
+
+    yield setup_recorder
+    hass.stop()
diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py
index c33455c0858..fcda7b0bb67 100644
--- a/tests/components/recorder/test_init.py
+++ b/tests/components/recorder/test_init.py
@@ -1,9 +1,7 @@
 """The tests for the Recorder component."""
 # pylint: disable=protected-access
 from datetime import datetime, timedelta
-import unittest
 
-import pytest
 from sqlalchemy.exc import OperationalError
 
 from homeassistant.components.recorder import (
@@ -25,99 +23,107 @@ from homeassistant.util import dt as dt_util
 from .common import wait_recording_done
 
 from tests.async_mock import patch
-from tests.common import (
-    async_fire_time_changed,
-    get_test_home_assistant,
-    init_recorder_component,
-)
+from tests.common import async_fire_time_changed, get_test_home_assistant
 
 
-class TestRecorder(unittest.TestCase):
-    """Test the recorder module."""
+def test_saving_state(hass, hass_recorder):
+    """Test saving and restoring a state."""
+    hass = hass_recorder()
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        init_recorder_component(self.hass)
-        self.hass.start()
-        self.addCleanup(self.tear_down_cleanup)
+    entity_id = "test.recorder"
+    state = "restoring_from_db"
+    attributes = {"test_attr": 5, "test_attr_10": "nice"}
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+    hass.states.set(entity_id, state, attributes)
 
-    def test_saving_state(self):
-        """Test saving and restoring a state."""
-        entity_id = "test.recorder"
-        state = "restoring_from_db"
-        attributes = {"test_attr": 5, "test_attr_10": "nice"}
+    wait_recording_done(hass)
 
-        self.hass.states.set(entity_id, state, attributes)
+    with session_scope(hass=hass) as session:
+        db_states = list(session.query(States))
+        assert len(db_states) == 1
+        assert db_states[0].event_id > 0
+        state = db_states[0].to_native()
 
-        wait_recording_done(self.hass)
-
-        with session_scope(hass=self.hass) as session:
-            db_states = list(session.query(States))
-            assert len(db_states) == 1
-            assert db_states[0].event_id > 0
-            state = db_states[0].to_native()
-
-        assert state == _state_empty_context(self.hass, entity_id)
-
-    def test_saving_event(self):
-        """Test saving and restoring an event."""
-        event_type = "EVENT_TEST"
-        event_data = {"test_attr": 5, "test_attr_10": "nice"}
-
-        events = []
-
-        @callback
-        def event_listener(event):
-            """Record events from eventbus."""
-            if event.event_type == event_type:
-                events.append(event)
-
-        self.hass.bus.listen(MATCH_ALL, event_listener)
-
-        self.hass.bus.fire(event_type, event_data)
-
-        wait_recording_done(self.hass)
-
-        assert len(events) == 1
-        event = events[0]
-
-        self.hass.data[DATA_INSTANCE].block_till_done()
-
-        with session_scope(hass=self.hass) as session:
-            db_events = list(session.query(Events).filter_by(event_type=event_type))
-            assert len(db_events) == 1
-            db_event = db_events[0].to_native()
-
-        assert event.event_type == db_event.event_type
-        assert event.data == db_event.data
-        assert event.origin == db_event.origin
-
-        # Recorder uses SQLite and stores datetimes as integer unix timestamps
-        assert event.time_fired.replace(microsecond=0) == db_event.time_fired.replace(
-            microsecond=0
-        )
+    assert state == _state_empty_context(hass, entity_id)
 
 
-@pytest.fixture
-def hass_recorder():
-    """Home Assistant fixture with in-memory recorder."""
-    hass = get_test_home_assistant()
+def test_saving_state_with_exception(hass, hass_recorder, caplog):
+    """Test saving and restoring a state."""
+    hass = hass_recorder()
 
-    def setup_recorder(config=None):
-        """Set up with params."""
-        init_recorder_component(hass, config)
-        hass.start()
-        hass.block_till_done()
-        hass.data[DATA_INSTANCE].block_till_done()
-        return hass
+    entity_id = "test.recorder"
+    state = "restoring_from_db"
+    attributes = {"test_attr": 5, "test_attr_10": "nice"}
 
-    yield setup_recorder
-    hass.stop()
+    def _throw_if_state_in_session(*args, **kwargs):
+        for obj in hass.data[DATA_INSTANCE].event_session:
+            if isinstance(obj, States):
+                raise OperationalError(
+                    "insert the state", "fake params", "forced to fail"
+                )
+
+    with patch("time.sleep"), patch.object(
+        hass.data[DATA_INSTANCE].event_session,
+        "flush",
+        side_effect=_throw_if_state_in_session,
+    ):
+        hass.states.set(entity_id, "fail", attributes)
+        wait_recording_done(hass)
+
+    assert "Error executing query" in caplog.text
+    assert "Error saving events" not in caplog.text
+
+    caplog.clear()
+    hass.states.set(entity_id, state, attributes)
+    wait_recording_done(hass)
+
+    with session_scope(hass=hass) as session:
+        db_states = list(session.query(States))
+        assert len(db_states) >= 1
+
+    assert "Error executing query" not in caplog.text
+    assert "Error saving events" not in caplog.text
+
+
+def test_saving_event(hass, hass_recorder):
+    """Test saving and restoring an event."""
+    hass = hass_recorder()
+
+    event_type = "EVENT_TEST"
+    event_data = {"test_attr": 5, "test_attr_10": "nice"}
+
+    events = []
+
+    @callback
+    def event_listener(event):
+        """Record events from eventbus."""
+        if event.event_type == event_type:
+            events.append(event)
+
+    hass.bus.listen(MATCH_ALL, event_listener)
+
+    hass.bus.fire(event_type, event_data)
+
+    wait_recording_done(hass)
+
+    assert len(events) == 1
+    event = events[0]
+
+    hass.data[DATA_INSTANCE].block_till_done()
+
+    with session_scope(hass=hass) as session:
+        db_events = list(session.query(Events).filter_by(event_type=event_type))
+        assert len(db_events) == 1
+        db_event = db_events[0].to_native()
+
+    assert event.event_type == db_event.event_type
+    assert event.data == db_event.data
+    assert event.origin == db_event.origin
+
+    # Recorder uses SQLite and stores datetimes as integer unix timestamps
+    assert event.time_fired.replace(microsecond=0) == db_event.time_fired.replace(
+        microsecond=0
+    )
 
 
 def _add_entities(hass, entity_ids):
@@ -453,41 +459,3 @@ def test_run_information(hass_recorder):
 
 class CannotSerializeMe:
     """A class that the JSONEncoder cannot serialize."""
-
-
-def test_saving_state_with_exception(hass, hass_recorder, caplog):
-    """Test saving and restoring a state."""
-    hass = hass_recorder()
-
-    entity_id = "test.recorder"
-    state = "restoring_from_db"
-    attributes = {"test_attr": 5, "test_attr_10": "nice"}
-
-    def _throw_if_state_in_session(*args, **kwargs):
-        for obj in hass.data[DATA_INSTANCE].event_session:
-            if isinstance(obj, States):
-                raise OperationalError(
-                    "insert the state", "fake params", "forced to fail"
-                )
-
-    with patch("time.sleep"), patch.object(
-        hass.data[DATA_INSTANCE].event_session,
-        "flush",
-        side_effect=_throw_if_state_in_session,
-    ):
-        hass.states.set(entity_id, "fail", attributes)
-        wait_recording_done(hass)
-
-    assert "Error executing query" in caplog.text
-    assert "Error saving events" not in caplog.text
-
-    caplog.clear()
-    hass.states.set(entity_id, state, attributes)
-    wait_recording_done(hass)
-
-    with session_scope(hass=hass) as session:
-        db_states = list(session.query(States))
-        assert len(db_states) >= 1
-
-    assert "Error executing query" not in caplog.text
-    assert "Error saving events" not in caplog.text
diff --git a/tests/components/recorder/test_models.py b/tests/components/recorder/test_models.py
index bf659282e3e..26a1e487ba8 100644
--- a/tests/components/recorder/test_models.py
+++ b/tests/components/recorder/test_models.py
@@ -1,6 +1,5 @@
 """The tests for the Recorder component."""
 from datetime import datetime
-import unittest
 
 import pytest
 import pytz
@@ -19,151 +18,114 @@ from homeassistant.const import EVENT_STATE_CHANGED
 import homeassistant.core as ha
 from homeassistant.exceptions import InvalidEntityFormatError
 from homeassistant.util import dt
-
-ENGINE = None
-SESSION = None
+import homeassistant.util.dt as dt_util
 
 
-def setUpModule():  # pylint: disable=invalid-name
-    """Set up a database to use."""
-    global ENGINE
-    global SESSION
-
-    ENGINE = create_engine("sqlite://")
-    Base.metadata.create_all(ENGINE)
-    session_factory = sessionmaker(bind=ENGINE)
-    SESSION = scoped_session(session_factory)
+def test_from_event_to_db_event():
+    """Test converting event to db event."""
+    event = ha.Event("test_event", {"some_data": 15})
+    assert event == Events.from_event(event).to_native()
 
 
-def tearDownModule():  # pylint: disable=invalid-name
-    """Close database."""
-    global ENGINE
-    global SESSION
-
-    ENGINE.dispose()
-    ENGINE = None
-    SESSION = None
+def test_from_event_to_db_state():
+    """Test converting event to db state."""
+    state = ha.State("sensor.temperature", "18")
+    event = ha.Event(
+        EVENT_STATE_CHANGED,
+        {"entity_id": "sensor.temperature", "old_state": None, "new_state": state},
+        context=state.context,
+    )
+    # We don't restore context unless we need it by joining the
+    # events table on the event_id for state_changed events
+    state.context = ha.Context(id=None)
+    assert state == States.from_event(event).to_native()
 
 
-class TestEvents(unittest.TestCase):
-    """Test Events model."""
+def test_from_event_to_delete_state():
+    """Test converting deleting state event to db state."""
+    event = ha.Event(
+        EVENT_STATE_CHANGED,
+        {
+            "entity_id": "sensor.temperature",
+            "old_state": ha.State("sensor.temperature", "18"),
+            "new_state": None,
+        },
+    )
+    db_state = States.from_event(event)
 
-    # pylint: disable=no-self-use
-    def test_from_event(self):
-        """Test converting event to db event."""
-        event = ha.Event("test_event", {"some_data": 15})
-        assert event == Events.from_event(event).to_native()
+    assert db_state.entity_id == "sensor.temperature"
+    assert db_state.domain == "sensor"
+    assert db_state.state == ""
+    assert db_state.last_changed == event.time_fired
+    assert db_state.last_updated == event.time_fired
 
 
-class TestStates(unittest.TestCase):
-    """Test States model."""
+def test_entity_ids():
+    """Test if entity ids helper method works."""
+    engine = create_engine("sqlite://")
+    Base.metadata.create_all(engine)
+    session_factory = sessionmaker(bind=engine)
 
-    # pylint: disable=no-self-use
+    session = scoped_session(session_factory)
+    session.query(Events).delete()
+    session.query(States).delete()
+    session.query(RecorderRuns).delete()
 
-    def test_from_event(self):
-        """Test converting event to db state."""
-        state = ha.State("sensor.temperature", "18")
-        event = ha.Event(
-            EVENT_STATE_CHANGED,
-            {"entity_id": "sensor.temperature", "old_state": None, "new_state": state},
-            context=state.context,
+    run = RecorderRuns(
+        start=datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC),
+        end=datetime(2016, 7, 9, 23, 0, 0, tzinfo=dt.UTC),
+        closed_incorrect=False,
+        created=datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC),
+    )
+
+    session.add(run)
+    session.commit()
+
+    before_run = datetime(2016, 7, 9, 8, 0, 0, tzinfo=dt.UTC)
+    in_run = datetime(2016, 7, 9, 13, 0, 0, tzinfo=dt.UTC)
+    in_run2 = datetime(2016, 7, 9, 15, 0, 0, tzinfo=dt.UTC)
+    in_run3 = datetime(2016, 7, 9, 18, 0, 0, tzinfo=dt.UTC)
+    after_run = datetime(2016, 7, 9, 23, 30, 0, tzinfo=dt.UTC)
+
+    assert run.to_native() == run
+    assert run.entity_ids() == []
+
+    session.add(
+        States(
+            entity_id="sensor.temperature",
+            state="20",
+            last_changed=before_run,
+            last_updated=before_run,
         )
-        # We don't restore context unless we need it by joining the
-        # events table on the event_id for state_changed events
-        state.context = ha.Context(id=None)
-        assert state == States.from_event(event).to_native()
-
-    def test_from_event_to_delete_state(self):
-        """Test converting deleting state event to db state."""
-        event = ha.Event(
-            EVENT_STATE_CHANGED,
-            {
-                "entity_id": "sensor.temperature",
-                "old_state": ha.State("sensor.temperature", "18"),
-                "new_state": None,
-            },
+    )
+    session.add(
+        States(
+            entity_id="sensor.sound",
+            state="10",
+            last_changed=after_run,
+            last_updated=after_run,
         )
-        db_state = States.from_event(event)
+    )
 
-        assert db_state.entity_id == "sensor.temperature"
-        assert db_state.domain == "sensor"
-        assert db_state.state == ""
-        assert db_state.last_changed == event.time_fired
-        assert db_state.last_updated == event.time_fired
-
-
-class TestRecorderRuns(unittest.TestCase):
-    """Test recorder run model."""
-
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up recorder runs."""
-        self.session = session = SESSION()
-        session.query(Events).delete()
-        session.query(States).delete()
-        session.query(RecorderRuns).delete()
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Clean up."""
-        self.session.rollback()
-
-    def test_entity_ids(self):
-        """Test if entity ids helper method works."""
-        run = RecorderRuns(
-            start=datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC),
-            end=datetime(2016, 7, 9, 23, 0, 0, tzinfo=dt.UTC),
-            closed_incorrect=False,
-            created=datetime(2016, 7, 9, 11, 0, 0, tzinfo=dt.UTC),
+    session.add(
+        States(
+            entity_id="sensor.humidity",
+            state="76",
+            last_changed=in_run,
+            last_updated=in_run,
         )
-
-        self.session.add(run)
-        self.session.commit()
-
-        before_run = datetime(2016, 7, 9, 8, 0, 0, tzinfo=dt.UTC)
-        in_run = datetime(2016, 7, 9, 13, 0, 0, tzinfo=dt.UTC)
-        in_run2 = datetime(2016, 7, 9, 15, 0, 0, tzinfo=dt.UTC)
-        in_run3 = datetime(2016, 7, 9, 18, 0, 0, tzinfo=dt.UTC)
-        after_run = datetime(2016, 7, 9, 23, 30, 0, tzinfo=dt.UTC)
-
-        assert run.to_native() == run
-        assert run.entity_ids() == []
-
-        self.session.add(
-            States(
-                entity_id="sensor.temperature",
-                state="20",
-                last_changed=before_run,
-                last_updated=before_run,
-            )
-        )
-        self.session.add(
-            States(
-                entity_id="sensor.sound",
-                state="10",
-                last_changed=after_run,
-                last_updated=after_run,
-            )
+    )
+    session.add(
+        States(
+            entity_id="sensor.lux",
+            state="5",
+            last_changed=in_run3,
+            last_updated=in_run3,
         )
+    )
 
-        self.session.add(
-            States(
-                entity_id="sensor.humidity",
-                state="76",
-                last_changed=in_run,
-                last_updated=in_run,
-            )
-        )
-        self.session.add(
-            States(
-                entity_id="sensor.lux",
-                state="5",
-                last_changed=in_run3,
-                last_updated=in_run3,
-            )
-        )
-
-        assert sorted(run.entity_ids()) == ["sensor.humidity", "sensor.lux"]
-        assert run.entity_ids(in_run2) == ["sensor.humidity"]
+    assert sorted(run.entity_ids()) == ["sensor.humidity", "sensor.lux"]
+    assert run.entity_ids(in_run2) == ["sensor.humidity"]
 
 
 def test_states_from_native_invalid_entity_id():
@@ -241,3 +203,16 @@ async def test_process_timestamp_to_utc_isoformat():
         == "2016-07-09T21:31:00+00:00"
     )
     assert process_timestamp_to_utc_isoformat(None) is None
+
+
+async def test_event_to_db_model():
+    """Test we can round trip Event conversion."""
+    event = ha.Event(
+        "state_changed", {"some": "attr"}, ha.EventOrigin.local, dt_util.utcnow()
+    )
+    native = Events.from_event(event).to_native()
+    assert native == event
+
+    native = Events.from_event(event, event_data="{}").to_native()
+    event.data = {}
+    assert native == event
diff --git a/tests/components/recorder/test_purge.py b/tests/components/recorder/test_purge.py
index a93e3537905..91a2299e4b6 100644
--- a/tests/components/recorder/test_purge.py
+++ b/tests/components/recorder/test_purge.py
@@ -1,7 +1,6 @@
 """Test data purging."""
 from datetime import datetime, timedelta
 import json
-import unittest
 
 from homeassistant.components import recorder
 from homeassistant.components.recorder.const import DATA_INSTANCE
@@ -13,226 +12,216 @@ from homeassistant.util import dt as dt_util
 from .common import wait_recording_done
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant, init_recorder_component
 
 
-class TestRecorderPurge(unittest.TestCase):
-    """Base class for common recorder tests."""
+def test_purge_old_states(hass, hass_recorder):
+    """Test deleting old states."""
+    hass = hass_recorder()
+    _add_test_states(hass)
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        init_recorder_component(self.hass)
-        self.hass.start()
-        self.addCleanup(self.tear_down_cleanup)
+    # make sure we start with 6 states
+    with session_scope(hass=hass) as session:
+        states = session.query(States)
+        assert states.count() == 6
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+        # run purge_old_data()
+        finished = purge_old_data(hass.data[DATA_INSTANCE], 4, repack=False)
+        assert not finished
+        assert states.count() == 4
 
-    def _add_test_states(self):
-        """Add multiple states to the db for testing."""
-        now = datetime.now()
-        five_days_ago = now - timedelta(days=5)
-        eleven_days_ago = now - timedelta(days=11)
-        attributes = {"test_attr": 5, "test_attr_10": "nice"}
+        finished = purge_old_data(hass.data[DATA_INSTANCE], 4, repack=False)
+        assert not finished
+        assert states.count() == 2
 
-        self.hass.block_till_done()
-        self.hass.data[DATA_INSTANCE].block_till_done()
-        wait_recording_done(self.hass)
+        finished = purge_old_data(hass.data[DATA_INSTANCE], 4, repack=False)
+        assert finished
+        assert states.count() == 2
 
-        with recorder.session_scope(hass=self.hass) as session:
-            for event_id in range(6):
-                if event_id < 2:
-                    timestamp = eleven_days_ago
-                    state = "autopurgeme"
-                elif event_id < 4:
-                    timestamp = five_days_ago
-                    state = "purgeme"
-                else:
-                    timestamp = now
-                    state = "dontpurgeme"
 
-                session.add(
-                    States(
-                        entity_id="test.recorder2",
-                        domain="sensor",
-                        state=state,
-                        attributes=json.dumps(attributes),
-                        last_changed=timestamp,
-                        last_updated=timestamp,
-                        created=timestamp,
-                        event_id=event_id + 1000,
-                    )
-                )
+def test_purge_old_events(hass, hass_recorder):
+    """Test deleting old events."""
+    hass = hass_recorder()
+    _add_test_events(hass)
 
-    def _add_test_events(self):
-        """Add a few events for testing."""
-        now = datetime.now()
-        five_days_ago = now - timedelta(days=5)
-        eleven_days_ago = now - timedelta(days=11)
-        event_data = {"test_attr": 5, "test_attr_10": "nice"}
+    with session_scope(hass=hass) as session:
+        events = session.query(Events).filter(Events.event_type.like("EVENT_TEST%"))
+        assert events.count() == 6
 
-        self.hass.block_till_done()
-        self.hass.data[DATA_INSTANCE].block_till_done()
-        wait_recording_done(self.hass)
+        # run purge_old_data()
+        finished = purge_old_data(hass.data[DATA_INSTANCE], 4, repack=False)
+        assert not finished
+        assert events.count() == 4
 
-        with recorder.session_scope(hass=self.hass) as session:
-            for event_id in range(6):
-                if event_id < 2:
-                    timestamp = eleven_days_ago
-                    event_type = "EVENT_TEST_AUTOPURGE"
-                elif event_id < 4:
-                    timestamp = five_days_ago
-                    event_type = "EVENT_TEST_PURGE"
-                else:
-                    timestamp = now
-                    event_type = "EVENT_TEST"
+        finished = purge_old_data(hass.data[DATA_INSTANCE], 4, repack=False)
+        assert not finished
+        assert events.count() == 2
 
-                session.add(
-                    Events(
-                        event_type=event_type,
-                        event_data=json.dumps(event_data),
-                        origin="LOCAL",
-                        created=timestamp,
-                        time_fired=timestamp,
-                    )
-                )
+        # we should only have 2 events left
+        finished = purge_old_data(hass.data[DATA_INSTANCE], 4, repack=False)
+        assert finished
+        assert events.count() == 2
 
-    def _add_test_recorder_runs(self):
-        """Add a few recorder_runs for testing."""
-        now = datetime.now()
-        five_days_ago = now - timedelta(days=5)
-        eleven_days_ago = now - timedelta(days=11)
 
-        self.hass.block_till_done()
-        self.hass.data[DATA_INSTANCE].block_till_done()
-        wait_recording_done(self.hass)
+def test_purge_method(hass, hass_recorder):
+    """Test purge method."""
+    hass = hass_recorder()
+    service_data = {"keep_days": 4}
+    _add_test_events(hass)
+    _add_test_states(hass)
+    _add_test_recorder_runs(hass)
 
-        with recorder.session_scope(hass=self.hass) as session:
-            for rec_id in range(6):
-                if rec_id < 2:
-                    timestamp = eleven_days_ago
-                elif rec_id < 4:
-                    timestamp = five_days_ago
-                else:
-                    timestamp = now
+    # make sure we start with 6 states
+    with session_scope(hass=hass) as session:
+        states = session.query(States)
+        assert states.count() == 6
 
-                session.add(
-                    RecorderRuns(
-                        start=timestamp,
-                        created=dt_util.utcnow(),
-                        end=timestamp + timedelta(days=1),
-                    )
-                )
+        events = session.query(Events).filter(Events.event_type.like("EVENT_TEST%"))
+        assert events.count() == 6
 
-    def test_purge_old_states(self):
-        """Test deleting old states."""
-        self._add_test_states()
-        # make sure we start with 6 states
-        with session_scope(hass=self.hass) as session:
-            states = session.query(States)
-            assert states.count() == 6
+        recorder_runs = session.query(RecorderRuns)
+        assert recorder_runs.count() == 7
 
-            # run purge_old_data()
-            finished = purge_old_data(self.hass.data[DATA_INSTANCE], 4, repack=False)
-            assert not finished
-            assert states.count() == 4
+        hass.data[DATA_INSTANCE].block_till_done()
+        wait_recording_done(hass)
 
-            finished = purge_old_data(self.hass.data[DATA_INSTANCE], 4, repack=False)
-            assert not finished
-            assert states.count() == 2
+        # run purge method - no service data, use defaults
+        hass.services.call("recorder", "purge")
+        hass.block_till_done()
 
-            finished = purge_old_data(self.hass.data[DATA_INSTANCE], 4, repack=False)
-            assert finished
-            assert states.count() == 2
+        # Small wait for recorder thread
+        hass.data[DATA_INSTANCE].block_till_done()
+        wait_recording_done(hass)
 
-    def test_purge_old_events(self):
-        """Test deleting old events."""
-        self._add_test_events()
+        # only purged old events
+        assert states.count() == 4
+        assert events.count() == 4
 
-        with session_scope(hass=self.hass) as session:
-            events = session.query(Events).filter(Events.event_type.like("EVENT_TEST%"))
-            assert events.count() == 6
+        # run purge method - correct service data
+        hass.services.call("recorder", "purge", service_data=service_data)
+        hass.block_till_done()
 
-            # run purge_old_data()
-            finished = purge_old_data(self.hass.data[DATA_INSTANCE], 4, repack=False)
-            assert not finished
-            assert events.count() == 4
+        # Small wait for recorder thread
+        hass.data[DATA_INSTANCE].block_till_done()
+        wait_recording_done(hass)
 
-            finished = purge_old_data(self.hass.data[DATA_INSTANCE], 4, repack=False)
-            assert not finished
-            assert events.count() == 2
+        # we should only have 2 states left after purging
+        assert states.count() == 2
 
-            # we should only have 2 events left
-            finished = purge_old_data(self.hass.data[DATA_INSTANCE], 4, repack=False)
-            assert finished
-            assert events.count() == 2
+        # now we should only have 2 events left
+        assert events.count() == 2
 
-    def test_purge_method(self):
-        """Test purge method."""
-        service_data = {"keep_days": 4}
-        self._add_test_events()
-        self._add_test_states()
-        self._add_test_recorder_runs()
+        # now we should only have 3 recorder runs left
+        assert recorder_runs.count() == 3
 
-        # make sure we start with 6 states
-        with session_scope(hass=self.hass) as session:
-            states = session.query(States)
-            assert states.count() == 6
+        assert not ("EVENT_TEST_PURGE" in (event.event_type for event in events.all()))
 
-            events = session.query(Events).filter(Events.event_type.like("EVENT_TEST%"))
-            assert events.count() == 6
-
-            recorder_runs = session.query(RecorderRuns)
-            assert recorder_runs.count() == 7
-
-            self.hass.data[DATA_INSTANCE].block_till_done()
-            wait_recording_done(self.hass)
-
-            # run purge method - no service data, use defaults
-            self.hass.services.call("recorder", "purge")
-            self.hass.block_till_done()
-
-            # Small wait for recorder thread
-            self.hass.data[DATA_INSTANCE].block_till_done()
-            wait_recording_done(self.hass)
-
-            # only purged old events
-            assert states.count() == 4
-            assert events.count() == 4
-
-            # run purge method - correct service data
-            self.hass.services.call("recorder", "purge", service_data=service_data)
-            self.hass.block_till_done()
-
-            # Small wait for recorder thread
-            self.hass.data[DATA_INSTANCE].block_till_done()
-            wait_recording_done(self.hass)
-
-            # we should only have 2 states left after purging
-            assert states.count() == 2
-
-            # now we should only have 2 events left
-            assert events.count() == 2
-
-            # now we should only have 3 recorder runs left
-            assert recorder_runs.count() == 3
-
-            assert not (
-                "EVENT_TEST_PURGE" in (event.event_type for event in events.all())
+        # run purge method - correct service data, with repack
+        with patch("homeassistant.components.recorder.purge._LOGGER") as mock_logger:
+            service_data["repack"] = True
+            hass.services.call("recorder", "purge", service_data=service_data)
+            hass.block_till_done()
+            hass.data[DATA_INSTANCE].block_till_done()
+            wait_recording_done(hass)
+            assert (
+                mock_logger.debug.mock_calls[5][1][0]
+                == "Vacuuming SQL DB to free space"
             )
 
-            # run purge method - correct service data, with repack
-            with patch(
-                "homeassistant.components.recorder.purge._LOGGER"
-            ) as mock_logger:
-                service_data["repack"] = True
-                self.hass.services.call("recorder", "purge", service_data=service_data)
-                self.hass.block_till_done()
-                self.hass.data[DATA_INSTANCE].block_till_done()
-                wait_recording_done(self.hass)
-                assert (
-                    mock_logger.debug.mock_calls[5][1][0]
-                    == "Vacuuming SQL DB to free space"
+
+def _add_test_states(hass):
+    """Add multiple states to the db for testing."""
+    now = datetime.now()
+    five_days_ago = now - timedelta(days=5)
+    eleven_days_ago = now - timedelta(days=11)
+    attributes = {"test_attr": 5, "test_attr_10": "nice"}
+
+    hass.block_till_done()
+    hass.data[DATA_INSTANCE].block_till_done()
+    wait_recording_done(hass)
+
+    with recorder.session_scope(hass=hass) as session:
+        for event_id in range(6):
+            if event_id < 2:
+                timestamp = eleven_days_ago
+                state = "autopurgeme"
+            elif event_id < 4:
+                timestamp = five_days_ago
+                state = "purgeme"
+            else:
+                timestamp = now
+                state = "dontpurgeme"
+
+            session.add(
+                States(
+                    entity_id="test.recorder2",
+                    domain="sensor",
+                    state=state,
+                    attributes=json.dumps(attributes),
+                    last_changed=timestamp,
+                    last_updated=timestamp,
+                    created=timestamp,
+                    event_id=event_id + 1000,
                 )
+            )
+
+
+def _add_test_events(hass):
+    """Add a few events for testing."""
+    now = datetime.now()
+    five_days_ago = now - timedelta(days=5)
+    eleven_days_ago = now - timedelta(days=11)
+    event_data = {"test_attr": 5, "test_attr_10": "nice"}
+
+    hass.block_till_done()
+    hass.data[DATA_INSTANCE].block_till_done()
+    wait_recording_done(hass)
+
+    with recorder.session_scope(hass=hass) as session:
+        for event_id in range(6):
+            if event_id < 2:
+                timestamp = eleven_days_ago
+                event_type = "EVENT_TEST_AUTOPURGE"
+            elif event_id < 4:
+                timestamp = five_days_ago
+                event_type = "EVENT_TEST_PURGE"
+            else:
+                timestamp = now
+                event_type = "EVENT_TEST"
+
+            session.add(
+                Events(
+                    event_type=event_type,
+                    event_data=json.dumps(event_data),
+                    origin="LOCAL",
+                    created=timestamp,
+                    time_fired=timestamp,
+                )
+            )
+
+
+def _add_test_recorder_runs(hass):
+    """Add a few recorder_runs for testing."""
+    now = datetime.now()
+    five_days_ago = now - timedelta(days=5)
+    eleven_days_ago = now - timedelta(days=11)
+
+    hass.block_till_done()
+    hass.data[DATA_INSTANCE].block_till_done()
+    wait_recording_done(hass)
+
+    with recorder.session_scope(hass=hass) as session:
+        for rec_id in range(6):
+            if rec_id < 2:
+                timestamp = eleven_days_ago
+            elif rec_id < 4:
+                timestamp = five_days_ago
+            else:
+                timestamp = now
+
+            session.add(
+                RecorderRuns(
+                    start=timestamp,
+                    created=dt_util.utcnow(),
+                    end=timestamp + timedelta(days=1),
+                )
+            )
diff --git a/tests/components/reddit/test_sensor.py b/tests/components/reddit/test_sensor.py
index faa3679f492..c49abd4038a 100644
--- a/tests/components/reddit/test_sensor.py
+++ b/tests/components/reddit/test_sensor.py
@@ -1,6 +1,5 @@
 """The tests for the Reddit platform."""
 import copy
-import unittest
 
 from homeassistant.components.reddit.sensor import (
     ATTR_BODY,
@@ -22,10 +21,9 @@ from homeassistant.const import (
     CONF_PASSWORD,
     CONF_USERNAME,
 )
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
 
 VALID_CONFIG = {
     "sensor": {
@@ -151,46 +149,36 @@ class MockSubreddit:
         return data["results"][:limit]
 
 
-class TestRedditSetup(unittest.TestCase):
-    """Test the Reddit platform."""
+@patch("praw.Reddit", new=MockPraw)
+async def test_setup_with_valid_config(hass):
+    """Test the platform setup with Reddit configuration."""
+    assert await async_setup_component(hass, "sensor", VALID_CONFIG)
+    await hass.async_block_till_done()
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.tear_down_cleanup)
+    state = hass.states.get("sensor.reddit_worldnews")
+    assert int(state.state) == MOCK_RESULTS_LENGTH
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+    state = hass.states.get("sensor.reddit_news")
+    assert int(state.state) == MOCK_RESULTS_LENGTH
 
-    @patch("praw.Reddit", new=MockPraw)
-    def test_setup_with_valid_config(self):
-        """Test the platform setup with Reddit configuration."""
-        setup_component(self.hass, "sensor", VALID_CONFIG)
-        self.hass.block_till_done()
+    assert state.attributes[ATTR_SUBREDDIT] == "news"
 
-        state = self.hass.states.get("sensor.reddit_worldnews")
-        assert int(state.state) == MOCK_RESULTS_LENGTH
+    assert state.attributes[ATTR_POSTS][0] == {
+        ATTR_ID: 0,
+        ATTR_URL: "http://example.com/1",
+        ATTR_TITLE: "example1",
+        ATTR_SCORE: "1",
+        ATTR_COMMENTS_NUMBER: "1",
+        ATTR_CREATED: "",
+        ATTR_BODY: "example1 selftext",
+    }
 
-        state = self.hass.states.get("sensor.reddit_news")
-        assert int(state.state) == MOCK_RESULTS_LENGTH
+    assert state.attributes[CONF_SORT_BY] == "hot"
 
-        assert state.attributes[ATTR_SUBREDDIT] == "news"
 
-        assert state.attributes[ATTR_POSTS][0] == {
-            ATTR_ID: 0,
-            ATTR_URL: "http://example.com/1",
-            ATTR_TITLE: "example1",
-            ATTR_SCORE: "1",
-            ATTR_COMMENTS_NUMBER: "1",
-            ATTR_CREATED: "",
-            ATTR_BODY: "example1 selftext",
-        }
-
-        assert state.attributes[CONF_SORT_BY] == "hot"
-
-    @patch("praw.Reddit", new=MockPraw)
-    def test_setup_with_invalid_config(self):
-        """Test the platform setup with invalid Reddit configuration."""
-        setup_component(self.hass, "sensor", INVALID_SORT_BY_CONFIG)
-        assert not self.hass.states.get("sensor.reddit_worldnews")
+@patch("praw.Reddit", new=MockPraw)
+async def test_setup_with_invalid_config(hass):
+    """Test the platform setup with invalid Reddit configuration."""
+    assert await async_setup_component(hass, "sensor", INVALID_SORT_BY_CONFIG)
+    await hass.async_block_till_done()
+    assert not hass.states.get("sensor.reddit_worldnews")
diff --git a/tests/components/remember_the_milk/const.py b/tests/components/remember_the_milk/const.py
new file mode 100644
index 00000000000..8423c7f4651
--- /dev/null
+++ b/tests/components/remember_the_milk/const.py
@@ -0,0 +1,14 @@
+"""Constants for remember_the_milk tests."""
+
+import json
+
+PROFILE = "myprofile"
+TOKEN = "mytoken"
+JSON_STRING = json.dumps(
+    {
+        "myprofile": {
+            "token": "mytoken",
+            "id_map": {"1234": {"list_id": "0", "timeseries_id": "1", "task_id": "2"}},
+        }
+    }
+)
diff --git a/tests/components/remember_the_milk/test_init.py b/tests/components/remember_the_milk/test_init.py
index 1c9438c602b..e03475c9131 100644
--- a/tests/components/remember_the_milk/test_init.py
+++ b/tests/components/remember_the_milk/test_init.py
@@ -1,89 +1,61 @@
 """Tests for the Remember The Milk component."""
-
-import json
-import logging
-import unittest
-
 import homeassistant.components.remember_the_milk as rtm
 
+from .const import JSON_STRING, PROFILE, TOKEN
+
 from tests.async_mock import Mock, mock_open, patch
-from tests.common import get_test_home_assistant
-
-_LOGGER = logging.getLogger(__name__)
 
 
-class TestConfiguration(unittest.TestCase):
-    """Basic tests for the class RememberTheMilkConfiguration."""
+def test_create_new(hass):
+    """Test creating a new config file."""
+    with patch("builtins.open", mock_open()), patch(
+        "os.path.isfile", Mock(return_value=False)
+    ), patch.object(rtm.RememberTheMilkConfiguration, "save_config"):
+        config = rtm.RememberTheMilkConfiguration(hass)
+        config.set_token(PROFILE, TOKEN)
+    assert config.get_token(PROFILE) == TOKEN
 
-    def setUp(self):
-        """Set up test Home Assistant main loop."""
-        self.hass = get_test_home_assistant()
-        self.profile = "myprofile"
-        self.token = "mytoken"
-        self.json_string = json.dumps(
-            {
-                "myprofile": {
-                    "token": "mytoken",
-                    "id_map": {
-                        "1234": {"list_id": "0", "timeseries_id": "1", "task_id": "2"}
-                    },
-                }
-            }
-        )
-        self.addCleanup(self.tear_down_cleanup)
 
-    def tear_down_cleanup(self):
-        """Exit Home Assistant."""
-        self.hass.stop()
+def test_load_config(hass):
+    """Test loading an existing token from the file."""
+    with patch("builtins.open", mock_open(read_data=JSON_STRING)), patch(
+        "os.path.isfile", Mock(return_value=True)
+    ):
+        config = rtm.RememberTheMilkConfiguration(hass)
+    assert config.get_token(PROFILE) == TOKEN
 
-    def test_create_new(self):
-        """Test creating a new config file."""
-        with patch("builtins.open", mock_open()), patch(
-            "os.path.isfile", Mock(return_value=False)
-        ), patch.object(rtm.RememberTheMilkConfiguration, "save_config"):
-            config = rtm.RememberTheMilkConfiguration(self.hass)
-            config.set_token(self.profile, self.token)
-        assert config.get_token(self.profile) == self.token
 
-    def test_load_config(self):
-        """Test loading an existing token from the file."""
-        with patch("builtins.open", mock_open(read_data=self.json_string)), patch(
-            "os.path.isfile", Mock(return_value=True)
-        ):
-            config = rtm.RememberTheMilkConfiguration(self.hass)
-        assert config.get_token(self.profile) == self.token
+def test_invalid_data(hass):
+    """Test starts with invalid data and should not raise an exception."""
+    with patch("builtins.open", mock_open(read_data="random characters")), patch(
+        "os.path.isfile", Mock(return_value=True)
+    ):
+        config = rtm.RememberTheMilkConfiguration(hass)
+    assert config is not None
 
-    def test_invalid_data(self):
-        """Test starts with invalid data and should not raise an exception."""
-        with patch("builtins.open", mock_open(read_data="random characters")), patch(
-            "os.path.isfile", Mock(return_value=True)
-        ):
-            config = rtm.RememberTheMilkConfiguration(self.hass)
-        assert config is not None
 
-    def test_id_map(self):
-        """Test the hass to rtm task is mapping."""
-        hass_id = "hass-id-1234"
-        list_id = "mylist"
-        timeseries_id = "my_timeseries"
-        rtm_id = "rtm-id-4567"
-        with patch("builtins.open", mock_open()), patch(
-            "os.path.isfile", Mock(return_value=False)
-        ), patch.object(rtm.RememberTheMilkConfiguration, "save_config"):
-            config = rtm.RememberTheMilkConfiguration(self.hass)
+def test_id_map(hass):
+    """Test the hass to rtm task is mapping."""
+    hass_id = "hass-id-1234"
+    list_id = "mylist"
+    timeseries_id = "my_timeseries"
+    rtm_id = "rtm-id-4567"
+    with patch("builtins.open", mock_open()), patch(
+        "os.path.isfile", Mock(return_value=False)
+    ), patch.object(rtm.RememberTheMilkConfiguration, "save_config"):
+        config = rtm.RememberTheMilkConfiguration(hass)
 
-            assert config.get_rtm_id(self.profile, hass_id) is None
-            config.set_rtm_id(self.profile, hass_id, list_id, timeseries_id, rtm_id)
-            assert (list_id, timeseries_id, rtm_id) == config.get_rtm_id(
-                self.profile, hass_id
-            )
-            config.delete_rtm_id(self.profile, hass_id)
-            assert config.get_rtm_id(self.profile, hass_id) is None
+        assert config.get_rtm_id(PROFILE, hass_id) is None
+        config.set_rtm_id(PROFILE, hass_id, list_id, timeseries_id, rtm_id)
+        assert (list_id, timeseries_id, rtm_id) == config.get_rtm_id(PROFILE, hass_id)
+        config.delete_rtm_id(PROFILE, hass_id)
+        assert config.get_rtm_id(PROFILE, hass_id) is None
 
-    def test_load_key_map(self):
-        """Test loading an existing key map from the file."""
-        with patch("builtins.open", mock_open(read_data=self.json_string)), patch(
-            "os.path.isfile", Mock(return_value=True)
-        ):
-            config = rtm.RememberTheMilkConfiguration(self.hass)
-        assert ("0", "1", "2") == config.get_rtm_id(self.profile, "1234")
+
+def test_load_key_map(hass):
+    """Test loading an existing key map from the file."""
+    with patch("builtins.open", mock_open(read_data=JSON_STRING)), patch(
+        "os.path.isfile", Mock(return_value=True)
+    ):
+        config = rtm.RememberTheMilkConfiguration(hass)
+    assert ("0", "1", "2") == config.get_rtm_id(PROFILE, "1234")
diff --git a/tests/components/remote/common.py b/tests/components/remote/common.py
index 1f4a5268440..ef9ca91dada 100644
--- a/tests/components/remote/common.py
+++ b/tests/components/remote/common.py
@@ -7,11 +7,13 @@ from homeassistant.components.remote import (
     ATTR_ACTIVITY,
     ATTR_ALTERNATIVE,
     ATTR_COMMAND,
+    ATTR_COMMAND_TYPE,
     ATTR_DELAY_SECS,
     ATTR_DEVICE,
     ATTR_NUM_REPEATS,
     ATTR_TIMEOUT,
     DOMAIN,
+    SERVICE_DELETE_COMMAND,
     SERVICE_LEARN_COMMAND,
     SERVICE_SEND_COMMAND,
 )
@@ -81,6 +83,7 @@ def learn_command(
     device=None,
     command=None,
     alternative=None,
+    command_type=None,
     timeout=None,
 ):
     """Learn a command from a device."""
@@ -94,6 +97,9 @@ def learn_command(
     if command:
         data[ATTR_COMMAND] = command
 
+    if command_type:
+        data[ATTR_COMMAND_TYPE] = command_type
+
     if alternative:
         data[ATTR_ALTERNATIVE] = alternative
 
@@ -101,3 +107,24 @@ def learn_command(
         data[ATTR_TIMEOUT] = timeout
 
     hass.services.call(DOMAIN, SERVICE_LEARN_COMMAND, data)
+
+
+@bind_hass
+def delete_command(
+    hass,
+    entity_id=ENTITY_MATCH_ALL,
+    device=None,
+    command=None,
+):
+    """Delete commands from the database."""
+    data = {}
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    if device:
+        data[ATTR_DEVICE] = device
+
+    if command:
+        data[ATTR_COMMAND] = command
+
+    hass.services.call(DOMAIN, SERVICE_DELETE_COMMAND, data)
diff --git a/tests/components/remote/test_init.py b/tests/components/remote/test_init.py
index eb47d365f83..1f57b97884c 100644
--- a/tests/components/remote/test_init.py
+++ b/tests/components/remote/test_init.py
@@ -1,9 +1,16 @@
 """The tests for the Remote component, adapted from Light Test."""
-# pylint: disable=protected-access
-
-import unittest
 
 import homeassistant.components.remote as remote
+from homeassistant.components.remote import (
+    ATTR_ALTERNATIVE,
+    ATTR_COMMAND,
+    ATTR_COMMAND_TYPE,
+    ATTR_DELAY_SECS,
+    ATTR_DEVICE,
+    ATTR_NUM_REPEATS,
+    ATTR_TIMEOUT,
+    DOMAIN,
+)
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_PLATFORM,
@@ -13,109 +20,128 @@ from homeassistant.const import (
     STATE_ON,
 )
 
-from tests.common import get_test_home_assistant, mock_service
-from tests.components.remote import common
+from tests.common import async_mock_service
 
-TEST_PLATFORM = {remote.DOMAIN: {CONF_PLATFORM: "test"}}
+TEST_PLATFORM = {DOMAIN: {CONF_PLATFORM: "test"}}
 SERVICE_SEND_COMMAND = "send_command"
 SERVICE_LEARN_COMMAND = "learn_command"
+SERVICE_DELETE_COMMAND = "delete_command"
+ENTITY_ID = "entity_id_val"
 
 
-class TestRemote(unittest.TestCase):
-    """Test the remote module."""
+async def test_is_on(hass):
+    """Test is_on."""
+    hass.states.async_set("remote.test", STATE_ON)
+    assert remote.is_on(hass, "remote.test")
 
-    # pylint: disable=invalid-name
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
-
-    def test_is_on(self):
-        """Test is_on."""
-        self.hass.states.set("remote.test", STATE_ON)
-        assert remote.is_on(self.hass, "remote.test")
-
-        self.hass.states.set("remote.test", STATE_OFF)
-        assert not remote.is_on(self.hass, "remote.test")
-
-    def test_turn_on(self):
-        """Test turn_on."""
-        turn_on_calls = mock_service(self.hass, remote.DOMAIN, SERVICE_TURN_ON)
-
-        common.turn_on(self.hass, entity_id="entity_id_val")
-
-        self.hass.block_till_done()
-
-        assert len(turn_on_calls) == 1
-        call = turn_on_calls[-1]
-
-        assert remote.DOMAIN == call.domain
-
-    def test_turn_off(self):
-        """Test turn_off."""
-        turn_off_calls = mock_service(self.hass, remote.DOMAIN, SERVICE_TURN_OFF)
-
-        common.turn_off(self.hass, entity_id="entity_id_val")
-
-        self.hass.block_till_done()
-
-        assert len(turn_off_calls) == 1
-        call = turn_off_calls[-1]
-
-        assert call.domain == remote.DOMAIN
-        assert call.service == SERVICE_TURN_OFF
-        assert call.data[ATTR_ENTITY_ID] == "entity_id_val"
-
-    def test_send_command(self):
-        """Test send_command."""
-        send_command_calls = mock_service(
-            self.hass, remote.DOMAIN, SERVICE_SEND_COMMAND
-        )
-
-        common.send_command(
-            self.hass,
-            entity_id="entity_id_val",
-            device="test_device",
-            command=["test_command"],
-            num_repeats="4",
-            delay_secs="0.6",
-        )
-
-        self.hass.block_till_done()
-
-        assert len(send_command_calls) == 1
-        call = send_command_calls[-1]
-
-        assert call.domain == remote.DOMAIN
-        assert call.service == SERVICE_SEND_COMMAND
-        assert call.data[ATTR_ENTITY_ID] == "entity_id_val"
-
-    def test_learn_command(self):
-        """Test learn_command."""
-        learn_command_calls = mock_service(
-            self.hass, remote.DOMAIN, SERVICE_LEARN_COMMAND
-        )
-
-        common.learn_command(
-            self.hass,
-            entity_id="entity_id_val",
-            device="test_device",
-            command=["test_command"],
-            alternative=True,
-            timeout=20,
-        )
-
-        self.hass.block_till_done()
-
-        assert len(learn_command_calls) == 1
-        call = learn_command_calls[-1]
-
-        assert call.domain == remote.DOMAIN
-        assert call.service == SERVICE_LEARN_COMMAND
-        assert call.data[ATTR_ENTITY_ID] == "entity_id_val"
+    hass.states.async_set("remote.test", STATE_OFF)
+    assert not remote.is_on(hass, "remote.test")
 
 
-def test_deprecated_base_class(caplog):
+async def test_turn_on(hass):
+    """Test turn_on."""
+    turn_on_calls = async_mock_service(hass, DOMAIN, SERVICE_TURN_ON)
+    await hass.services.async_call(DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: ENTITY_ID})
+
+    await hass.async_block_till_done()
+
+    assert len(turn_on_calls) == 1
+    call = turn_on_calls[-1]
+
+    assert DOMAIN == call.domain
+
+
+async def test_turn_off(hass):
+    """Test turn_off."""
+    turn_off_calls = async_mock_service(hass, DOMAIN, SERVICE_TURN_OFF)
+
+    await hass.services.async_call(
+        DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: ENTITY_ID}
+    )
+
+    await hass.async_block_till_done()
+
+    assert len(turn_off_calls) == 1
+    call = turn_off_calls[-1]
+
+    assert call.domain == DOMAIN
+    assert call.service == SERVICE_TURN_OFF
+    assert call.data[ATTR_ENTITY_ID] == ENTITY_ID
+
+
+async def test_send_command(hass):
+    """Test send_command."""
+    send_command_calls = async_mock_service(hass, DOMAIN, SERVICE_SEND_COMMAND)
+
+    data = {
+        ATTR_ENTITY_ID: ENTITY_ID,
+        ATTR_DEVICE: "test_device",
+        ATTR_COMMAND: ["test_command"],
+        ATTR_NUM_REPEATS: "4",
+        ATTR_DELAY_SECS: "0.6",
+    }
+
+    await hass.services.async_call(DOMAIN, SERVICE_SEND_COMMAND, data)
+
+    await hass.async_block_till_done()
+
+    assert len(send_command_calls) == 1
+    call = send_command_calls[-1]
+
+    assert call.domain == DOMAIN
+    assert call.service == SERVICE_SEND_COMMAND
+    assert call.data[ATTR_ENTITY_ID] == ENTITY_ID
+
+
+async def test_learn_command(hass):
+    """Test learn_command."""
+    learn_command_calls = async_mock_service(hass, DOMAIN, SERVICE_LEARN_COMMAND)
+
+    data = {
+        ATTR_ENTITY_ID: ENTITY_ID,
+        ATTR_DEVICE: "test_device",
+        ATTR_COMMAND: ["test_command"],
+        ATTR_COMMAND_TYPE: "rf",
+        ATTR_ALTERNATIVE: True,
+        ATTR_TIMEOUT: 20,
+    }
+    await hass.services.async_call(DOMAIN, SERVICE_LEARN_COMMAND, data)
+
+    await hass.async_block_till_done()
+
+    assert len(learn_command_calls) == 1
+    call = learn_command_calls[-1]
+
+    assert call.domain == DOMAIN
+    assert call.service == SERVICE_LEARN_COMMAND
+    assert call.data[ATTR_ENTITY_ID] == ENTITY_ID
+
+
+async def test_delete_command(hass):
+    """Test delete_command."""
+    delete_command_calls = async_mock_service(
+        hass, remote.DOMAIN, SERVICE_DELETE_COMMAND
+    )
+
+    data = {
+        ATTR_ENTITY_ID: ENTITY_ID,
+        ATTR_DEVICE: "test_device",
+        ATTR_COMMAND: ["test_command"],
+    }
+
+    await hass.services.async_call(DOMAIN, SERVICE_DELETE_COMMAND, data)
+
+    await hass.async_block_till_done()
+
+    assert len(delete_command_calls) == 1
+    call = delete_command_calls[-1]
+
+    assert call.domain == remote.DOMAIN
+    assert call.service == SERVICE_DELETE_COMMAND
+    assert call.data[ATTR_ENTITY_ID] == ENTITY_ID
+
+
+async def test_deprecated_base_class(caplog):
     """Test deprecated base class."""
 
     class CustomRemote(remote.RemoteDevice):
diff --git a/tests/components/rest/test_binary_sensor.py b/tests/components/rest/test_binary_sensor.py
index b18d8f300cf..276dc293f87 100644
--- a/tests/components/rest/test_binary_sensor.py
+++ b/tests/components/rest/test_binary_sensor.py
@@ -1,267 +1,381 @@
 """The tests for the REST binary sensor platform."""
-import unittest
 
-import pytest
-from pytest import raises
-import requests
-from requests.exceptions import Timeout
-import requests_mock
+import asyncio
+from os import path
 
+import httpx
+import respx
+
+from homeassistant import config as hass_config
 import homeassistant.components.binary_sensor as binary_sensor
-import homeassistant.components.rest.binary_sensor as rest
-from homeassistant.const import CONTENT_TYPE_JSON, STATE_OFF, STATE_ON
-from homeassistant.exceptions import PlatformNotReady
-from homeassistant.helpers import template
-from homeassistant.setup import setup_component
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    CONTENT_TYPE_JSON,
+    SERVICE_RELOAD,
+    STATE_OFF,
+    STATE_ON,
+    STATE_UNAVAILABLE,
+)
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import Mock, patch
-from tests.common import assert_setup_component, get_test_home_assistant
 
 
-class TestRestBinarySensorSetup(unittest.TestCase):
-    """Tests for setting up the REST binary sensor platform."""
-
-    DEVICES = []
-
-    def add_devices(self, devices, update_before_add=False):
-        """Mock add devices."""
-        for device in devices:
-            self.DEVICES.append(device)
-
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        # Reset for this test.
-        self.DEVICES = []
-        self.addCleanup(self.hass.stop)
-
-    def test_setup_missing_config(self):
-        """Test setup with configuration missing required entries."""
-        with assert_setup_component(0):
-            assert setup_component(
-                self.hass, binary_sensor.DOMAIN, {"binary_sensor": {"platform": "rest"}}
-            )
-
-    def test_setup_missing_schema(self):
-        """Test setup with resource missing schema."""
-        with pytest.raises(PlatformNotReady):
-            rest.setup_platform(
-                self.hass,
-                {"platform": "rest", "resource": "localhost", "method": "GET"},
-                None,
-            )
-
-    @patch("requests.Session.send", side_effect=requests.exceptions.ConnectionError())
-    def test_setup_failed_connect(self, mock_req):
-        """Test setup when connection error occurs."""
-        with raises(PlatformNotReady):
-            rest.setup_platform(
-                self.hass,
-                {"platform": "rest", "resource": "http://localhost", "method": "GET"},
-                self.add_devices,
-                None,
-            )
-        assert len(self.DEVICES) == 0
-
-    @patch("requests.Session.send", side_effect=Timeout())
-    def test_setup_timeout(self, mock_req):
-        """Test setup when connection timeout occurs."""
-        with raises(PlatformNotReady):
-            rest.setup_platform(
-                self.hass,
-                {"platform": "rest", "resource": "http://localhost", "method": "GET"},
-                self.add_devices,
-                None,
-            )
-        assert len(self.DEVICES) == 0
-
-    @requests_mock.Mocker()
-    def test_setup_minimum(self, mock_req):
-        """Test setup with minimum configuration."""
-        mock_req.get("http://localhost", status_code=200)
-        with assert_setup_component(1, "binary_sensor"):
-            assert setup_component(
-                self.hass,
-                "binary_sensor",
-                {"binary_sensor": {"platform": "rest", "resource": "http://localhost"}},
-            )
-            self.hass.block_till_done()
-        assert 1 == mock_req.call_count
-
-    @requests_mock.Mocker()
-    def test_setup_minimum_resource_template(self, mock_req):
-        """Test setup with minimum configuration (resource_template)."""
-        mock_req.get("http://localhost", status_code=200)
-        with assert_setup_component(1, "binary_sensor"):
-            assert setup_component(
-                self.hass,
-                "binary_sensor",
-                {
-                    "binary_sensor": {
-                        "platform": "rest",
-                        "resource_template": "http://localhost",
-                    }
-                },
-            )
-            self.hass.block_till_done()
-        assert mock_req.call_count == 1
-
-    @requests_mock.Mocker()
-    def test_setup_duplicate_resource(self, mock_req):
-        """Test setup with duplicate resources."""
-        mock_req.get("http://localhost", status_code=200)
-        with assert_setup_component(0, "binary_sensor"):
-            assert setup_component(
-                self.hass,
-                "binary_sensor",
-                {
-                    "binary_sensor": {
-                        "platform": "rest",
-                        "resource": "http://localhost",
-                        "resource_template": "http://localhost",
-                    }
-                },
-            )
-            self.hass.block_till_done()
-
-    @requests_mock.Mocker()
-    def test_setup_get(self, mock_req):
-        """Test setup with valid configuration."""
-        mock_req.get("http://localhost", status_code=200)
-        with assert_setup_component(1, "binary_sensor"):
-            assert setup_component(
-                self.hass,
-                "binary_sensor",
-                {
-                    "binary_sensor": {
-                        "platform": "rest",
-                        "resource": "http://localhost",
-                        "method": "GET",
-                        "value_template": "{{ value_json.key }}",
-                        "name": "foo",
-                        "verify_ssl": "true",
-                        "authentication": "basic",
-                        "username": "my username",
-                        "password": "my password",
-                        "headers": {"Accept": CONTENT_TYPE_JSON},
-                    }
-                },
-            )
-            self.hass.block_till_done()
-        assert 1 == mock_req.call_count
-
-    @requests_mock.Mocker()
-    def test_setup_post(self, mock_req):
-        """Test setup with valid configuration."""
-        mock_req.post("http://localhost", status_code=200)
-        with assert_setup_component(1, "binary_sensor"):
-            assert setup_component(
-                self.hass,
-                "binary_sensor",
-                {
-                    "binary_sensor": {
-                        "platform": "rest",
-                        "resource": "http://localhost",
-                        "method": "POST",
-                        "value_template": "{{ value_json.key }}",
-                        "payload": '{ "device": "toaster"}',
-                        "name": "foo",
-                        "verify_ssl": "true",
-                        "authentication": "basic",
-                        "username": "my username",
-                        "password": "my password",
-                        "headers": {"Accept": CONTENT_TYPE_JSON},
-                    }
-                },
-            )
-            self.hass.block_till_done()
-        assert 1 == mock_req.call_count
+async def test_setup_missing_basic_config(hass):
+    """Test setup with configuration missing required entries."""
+    assert await async_setup_component(
+        hass, binary_sensor.DOMAIN, {"binary_sensor": {"platform": "rest"}}
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
 
 
-class TestRestBinarySensor(unittest.TestCase):
-    """Tests for REST binary sensor platform."""
+async def test_setup_missing_config(hass):
+    """Test setup with configuration missing required entries."""
+    assert await async_setup_component(
+        hass,
+        binary_sensor.DOMAIN,
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "localhost",
+                "method": "GET",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.rest = Mock("RestData")
-        self.rest.update = Mock(
-            "RestData.update", side_effect=self.update_side_effect('{ "key": false }')
+
+@respx.mock
+async def test_setup_failed_connect(hass):
+    """Test setup when connection error occurs."""
+    respx.get(
+        "http://localhost", content=httpx.RequestError(message="any", request=Mock())
+    )
+    assert await async_setup_component(
+        hass,
+        binary_sensor.DOMAIN,
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
+
+
+@respx.mock
+async def test_setup_timeout(hass):
+    """Test setup when connection timeout occurs."""
+    respx.get("http://localhost", content=asyncio.TimeoutError())
+    assert await async_setup_component(
+        hass,
+        binary_sensor.DOMAIN,
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "localhost",
+                "method": "GET",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
+
+
+@respx.mock
+async def test_setup_minimum(hass):
+    """Test setup with minimum configuration."""
+    respx.get("http://localhost", status_code=200)
+    assert await async_setup_component(
+        hass,
+        binary_sensor.DOMAIN,
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_minimum_resource_template(hass):
+    """Test setup with minimum configuration (resource_template)."""
+    respx.get("http://localhost", status_code=200)
+    assert await async_setup_component(
+        hass,
+        binary_sensor.DOMAIN,
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource_template": "http://localhost",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_duplicate_resource_template(hass):
+    """Test setup with duplicate resources."""
+    respx.get("http://localhost", status_code=200)
+    assert await async_setup_component(
+        hass,
+        binary_sensor.DOMAIN,
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "resource_template": "http://localhost",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
+
+
+@respx.mock
+async def test_setup_get(hass):
+    """Test setup with valid configuration."""
+    respx.get("http://localhost", status_code=200, content="{}")
+    assert await async_setup_component(
+        hass,
+        "binary_sensor",
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.key }}",
+                "name": "foo",
+                "verify_ssl": "true",
+                "timeout": 30,
+                "authentication": "basic",
+                "username": "my username",
+                "password": "my password",
+                "headers": {"Accept": CONTENT_TYPE_JSON},
+            }
+        },
+    )
+
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_get_digest_auth(hass):
+    """Test setup with valid configuration."""
+    respx.get("http://localhost", status_code=200, content="{}")
+    assert await async_setup_component(
+        hass,
+        "binary_sensor",
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.key }}",
+                "name": "foo",
+                "verify_ssl": "true",
+                "timeout": 30,
+                "authentication": "digest",
+                "username": "my username",
+                "password": "my password",
+                "headers": {"Accept": CONTENT_TYPE_JSON},
+            }
+        },
+    )
+
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_post(hass):
+    """Test setup with valid configuration."""
+    respx.post("http://localhost", status_code=200, content="{}")
+    assert await async_setup_component(
+        hass,
+        "binary_sensor",
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "POST",
+                "value_template": "{{ value_json.key }}",
+                "payload": '{ "device": "toaster"}',
+                "name": "foo",
+                "verify_ssl": "true",
+                "timeout": 30,
+                "authentication": "basic",
+                "username": "my username",
+                "password": "my password",
+                "headers": {"Accept": CONTENT_TYPE_JSON},
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_get_off(hass):
+    """Test setup with valid off configuration."""
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": "text/json"},
+        content='{"dog": false}',
+    )
+    assert await async_setup_component(
+        hass,
+        "binary_sensor",
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.dog }}",
+                "name": "foo",
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+    state = hass.states.get("binary_sensor.foo")
+    assert state.state == STATE_OFF
+
+
+@respx.mock
+async def test_setup_get_on(hass):
+    """Test setup with valid on configuration."""
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": "text/json"},
+        content='{"dog": true}',
+    )
+    assert await async_setup_component(
+        hass,
+        "binary_sensor",
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.dog }}",
+                "name": "foo",
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+    state = hass.states.get("binary_sensor.foo")
+    assert state.state == STATE_ON
+
+
+@respx.mock
+async def test_setup_with_exception(hass):
+    """Test setup with exception."""
+    respx.get("http://localhost", status_code=200, content="{}")
+    assert await async_setup_component(
+        hass,
+        "binary_sensor",
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.dog }}",
+                "name": "foo",
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+    state = hass.states.get("binary_sensor.foo")
+    assert state.state == STATE_OFF
+
+    await async_setup_component(hass, "homeassistant", {})
+    await hass.async_block_till_done()
+
+    respx.clear()
+    respx.get(
+        "http://localhost", content=httpx.RequestError(message="any", request=Mock())
+    )
+    await hass.services.async_call(
+        "homeassistant",
+        "update_entity",
+        {ATTR_ENTITY_ID: ["binary_sensor.foo"]},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.foo")
+    assert state.state == STATE_UNAVAILABLE
+
+
+@respx.mock
+async def test_reload(hass):
+    """Verify we can reload reset sensors."""
+
+    respx.get("http://localhost", status_code=200)
+
+    await async_setup_component(
+        hass,
+        "binary_sensor",
+        {
+            "binary_sensor": {
+                "platform": "rest",
+                "method": "GET",
+                "name": "mockrest",
+                "resource": "http://localhost",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 1
+
+    assert hass.states.get("binary_sensor.mockrest")
+
+    yaml_path = path.join(
+        _get_fixtures_base_path(),
+        "fixtures",
+        "rest/configuration.yaml",
+    )
+    with patch.object(hass_config, "YAML_CONFIG_FILE", yaml_path):
+        await hass.services.async_call(
+            "rest",
+            SERVICE_RELOAD,
+            {},
+            blocking=True,
         )
-        self.name = "foo"
-        self.device_class = "light"
-        self.value_template = template.Template("{{ value_json.key }}", self.hass)
-        self.force_update = False
-        self.resource_template = None
+        await hass.async_block_till_done()
 
-        self.binary_sensor = rest.RestBinarySensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.device_class,
-            self.value_template,
-            self.force_update,
-            self.resource_template,
-        )
-        self.addCleanup(self.hass.stop)
+    assert hass.states.get("binary_sensor.mockreset") is None
+    assert hass.states.get("binary_sensor.rollout")
 
-    def update_side_effect(self, data):
-        """Side effect function for mocking RestData.update()."""
-        self.rest.data = data
 
-    def test_name(self):
-        """Test the name."""
-        assert self.name == self.binary_sensor.name
-
-    def test_device_class(self):
-        """Test the device class."""
-        assert self.device_class == self.binary_sensor.device_class
-
-    def test_initial_state(self):
-        """Test the initial state."""
-        self.binary_sensor.update()
-        assert STATE_OFF == self.binary_sensor.state
-
-    def test_update_when_value_is_none(self):
-        """Test state gets updated to unknown when sensor returns no data."""
-        self.rest.update = Mock(
-            "RestData.update", side_effect=self.update_side_effect(None)
-        )
-        self.binary_sensor.update()
-        assert not self.binary_sensor.available
-
-    def test_update_when_value_changed(self):
-        """Test state gets updated when sensor returns a new status."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect('{ "key": true }'),
-        )
-        self.binary_sensor.update()
-        assert STATE_ON == self.binary_sensor.state
-        assert self.binary_sensor.available
-
-    def test_update_when_failed_request(self):
-        """Test state gets updated when sensor returns a new status."""
-        self.rest.update = Mock(
-            "rest.RestData.update", side_effect=self.update_side_effect(None)
-        )
-        self.binary_sensor.update()
-        assert not self.binary_sensor.available
-
-    def test_update_with_no_template(self):
-        """Test update when there is no value template."""
-        self.rest.update = Mock(
-            "rest.RestData.update", side_effect=self.update_side_effect("true")
-        )
-        self.binary_sensor = rest.RestBinarySensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.device_class,
-            None,
-            self.force_update,
-            self.resource_template,
-        )
-        self.binary_sensor.update()
-        assert STATE_ON == self.binary_sensor.state
-        assert self.binary_sensor.available
+def _get_fixtures_base_path():
+    return path.dirname(path.dirname(path.dirname(__file__)))
diff --git a/tests/components/rest/test_sensor.py b/tests/components/rest/test_sensor.py
index 5ffa12c6167..6a7e444cedd 100644
--- a/tests/components/rest/test_sensor.py
+++ b/tests/components/rest/test_sensor.py
@@ -1,696 +1,665 @@
 """The tests for the REST sensor platform."""
+import asyncio
 from os import path
-import unittest
 
-import pytest
-from pytest import raises
-import requests
-from requests.exceptions import RequestException, Timeout
-from requests.structures import CaseInsensitiveDict
-import requests_mock
+import httpx
+import respx
 
 from homeassistant import config as hass_config
-import homeassistant.components.rest.sensor as rest
 import homeassistant.components.sensor as sensor
 from homeassistant.const import (
+    ATTR_UNIT_OF_MEASUREMENT,
     CONTENT_TYPE_JSON,
-    CONTENT_TYPE_TEXT_PLAIN,
     DATA_MEGABYTES,
     SERVICE_RELOAD,
+    STATE_UNKNOWN,
 )
-from homeassistant.exceptions import PlatformNotReady
-from homeassistant.helpers.config_validation import template
-from homeassistant.setup import async_setup_component, setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import Mock, patch
-from tests.common import assert_setup_component, get_test_home_assistant
 
 
-class TestRestSensorSetup(unittest.TestCase):
-    """Tests for setting up the REST sensor platform."""
-
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
-
-    def test_setup_missing_config(self):
-        """Test setup with configuration missing required entries."""
-        with assert_setup_component(0):
-            assert setup_component(
-                self.hass, sensor.DOMAIN, {"sensor": {"platform": "rest"}}
-            )
-
-    def test_setup_missing_schema(self):
-        """Test setup with resource missing schema."""
-        with pytest.raises(PlatformNotReady):
-            rest.setup_platform(
-                self.hass,
-                {"platform": "rest", "resource": "localhost", "method": "GET"},
-                None,
-            )
-
-    @patch("requests.Session.send", side_effect=requests.exceptions.ConnectionError())
-    def test_setup_failed_connect(self, mock_req):
-        """Test setup when connection error occurs."""
-        with raises(PlatformNotReady):
-            rest.setup_platform(
-                self.hass,
-                {"platform": "rest", "resource": "http://localhost", "method": "GET"},
-                lambda devices, update=True: None,
-            )
-
-    @patch("requests.Session.send", side_effect=Timeout())
-    def test_setup_timeout(self, mock_req):
-        """Test setup when connection timeout occurs."""
-        with raises(PlatformNotReady):
-            rest.setup_platform(
-                self.hass,
-                {"platform": "rest", "resource": "http://localhost", "method": "GET"},
-                lambda devices, update=True: None,
-            )
-
-    @requests_mock.Mocker()
-    def test_setup_minimum(self, mock_req):
-        """Test setup with minimum configuration."""
-        mock_req.get("http://localhost", status_code=200)
-        with assert_setup_component(1, "sensor"):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {"sensor": {"platform": "rest", "resource": "http://localhost"}},
-            )
-            self.hass.block_till_done()
-        assert 2 == mock_req.call_count
-
-    @requests_mock.Mocker()
-    def test_setup_minimum_resource_template(self, mock_req):
-        """Test setup with minimum configuration (resource_template)."""
-        mock_req.get("http://localhost", status_code=200)
-        with assert_setup_component(1, "sensor"):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "rest",
-                        "resource_template": "http://localhost",
-                    }
-                },
-            )
-            self.hass.block_till_done()
-        assert mock_req.call_count == 2
-
-    @requests_mock.Mocker()
-    def test_setup_duplicate_resource(self, mock_req):
-        """Test setup with duplicate resources."""
-        mock_req.get("http://localhost", status_code=200)
-        with assert_setup_component(0, "sensor"):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "rest",
-                        "resource": "http://localhost",
-                        "resource_template": "http://localhost",
-                    }
-                },
-            )
-            self.hass.block_till_done()
-
-    @requests_mock.Mocker()
-    def test_setup_get(self, mock_req):
-        """Test setup with valid configuration."""
-        mock_req.get("http://localhost", status_code=200)
-        with assert_setup_component(1, "sensor"):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "rest",
-                        "resource": "http://localhost",
-                        "method": "GET",
-                        "value_template": "{{ value_json.key }}",
-                        "name": "foo",
-                        "unit_of_measurement": DATA_MEGABYTES,
-                        "verify_ssl": "true",
-                        "timeout": 30,
-                        "authentication": "basic",
-                        "username": "my username",
-                        "password": "my password",
-                        "headers": {"Accept": CONTENT_TYPE_JSON},
-                    }
-                },
-            )
-            self.hass.block_till_done()
-        assert 2 == mock_req.call_count
-
-    @requests_mock.Mocker()
-    def test_setup_post(self, mock_req):
-        """Test setup with valid configuration."""
-        mock_req.post("http://localhost", status_code=200)
-        with assert_setup_component(1, "sensor"):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "rest",
-                        "resource": "http://localhost",
-                        "method": "POST",
-                        "value_template": "{{ value_json.key }}",
-                        "payload": '{ "device": "toaster"}',
-                        "name": "foo",
-                        "unit_of_measurement": DATA_MEGABYTES,
-                        "verify_ssl": "true",
-                        "timeout": 30,
-                        "authentication": "basic",
-                        "username": "my username",
-                        "password": "my password",
-                        "headers": {"Accept": CONTENT_TYPE_JSON},
-                    }
-                },
-            )
-            self.hass.block_till_done()
-        assert 2 == mock_req.call_count
-
-    @requests_mock.Mocker()
-    def test_setup_get_xml(self, mock_req):
-        """Test setup with valid configuration."""
-        mock_req.get("http://localhost", status_code=200)
-        with assert_setup_component(1, "sensor"):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "rest",
-                        "resource": "http://localhost",
-                        "method": "GET",
-                        "value_template": "{{ value_json.key }}",
-                        "name": "foo",
-                        "unit_of_measurement": DATA_MEGABYTES,
-                        "verify_ssl": "true",
-                        "timeout": 30,
-                        "authentication": "basic",
-                        "username": "my username",
-                        "password": "my password",
-                        "headers": {"Accept": "text/xml"},
-                    }
-                },
-            )
-            self.hass.block_till_done()
-        assert 2 == mock_req.call_count
+async def test_setup_missing_config(hass):
+    """Test setup with configuration missing required entries."""
+    assert await async_setup_component(
+        hass, sensor.DOMAIN, {"sensor": {"platform": "rest"}}
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
 
 
-class TestRestSensor(unittest.TestCase):
-    """Tests for REST sensor platform."""
-
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.initial_state = "initial_state"
-        self.rest = Mock("rest.RestData")
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                '{ "key": "' + self.initial_state + '" }',
-                CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_JSON}),
-            ),
-        )
-        self.name = "foo"
-        self.unit_of_measurement = DATA_MEGABYTES
-        self.device_class = None
-        self.value_template = template("{{ value_json.key }}")
-        self.json_attrs_path = None
-        self.value_template.hass = self.hass
-        self.force_update = False
-        self.resource_template = None
-
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            self.value_template,
-            [],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-        self.addCleanup(self.hass.stop)
-
-    def update_side_effect(self, data, headers):
-        """Side effect function for mocking RestData.update()."""
-        self.rest.data = data
-        self.rest.headers = headers
-
-    def test_name(self):
-        """Test the name."""
-        assert self.name == self.sensor.name
-
-    def test_unit_of_measurement(self):
-        """Test the unit of measurement."""
-        assert self.unit_of_measurement == self.sensor.unit_of_measurement
-
-    def test_force_update(self):
-        """Test the unit of measurement."""
-        assert self.force_update == self.sensor.force_update
-
-    def test_state(self):
-        """Test the initial state."""
-        self.sensor.update()
-        assert self.initial_state == self.sensor.state
-
-    def test_update_when_value_is_none(self):
-        """Test state gets updated to unknown when sensor returns no data."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(None, CaseInsensitiveDict()),
-        )
-        self.sensor.update()
-        assert self.sensor.state is None
-        assert not self.sensor.available
-
-    def test_update_when_value_changed(self):
-        """Test state gets updated when sensor returns a new status."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                '{ "key": "updated_state" }',
-                CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_JSON}),
-            ),
-        )
-        self.sensor.update()
-        assert "updated_state" == self.sensor.state
-        assert self.sensor.available
-
-    def test_update_with_no_template(self):
-        """Test update when there is no value template."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                "plain_state", CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_JSON})
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            None,
-            [],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-        self.sensor.update()
-        assert "plain_state" == self.sensor.state
-        assert self.sensor.available
-
-    def test_update_with_json_attrs(self):
-        """Test attributes get extracted from a JSON result."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                '{ "key": "some_json_value" }',
-                CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_JSON}),
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            None,
-            ["key"],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-        self.sensor.update()
-        assert "some_json_value" == self.sensor.device_state_attributes["key"]
-
-    def test_update_with_json_attrs_list_dict(self):
-        """Test attributes get extracted from a JSON list[0] result."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                '[{ "key": "another_value" }]',
-                CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_JSON}),
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            None,
-            ["key"],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-        self.sensor.update()
-        assert "another_value" == self.sensor.device_state_attributes["key"]
-
-    @patch("homeassistant.components.rest.sensor._LOGGER")
-    def test_update_with_json_attrs_no_data(self, mock_logger):
-        """Test attributes when no JSON result fetched."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                None, CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_JSON})
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            None,
-            ["key"],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-        self.sensor.update()
-        assert {} == self.sensor.device_state_attributes
-        assert mock_logger.warning.called
-
-    @patch("homeassistant.components.rest.sensor._LOGGER")
-    def test_update_with_json_attrs_not_dict(self, mock_logger):
-        """Test attributes get extracted from a JSON result."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                '["list", "of", "things"]',
-                CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_JSON}),
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            None,
-            ["key"],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-        self.sensor.update()
-        assert {} == self.sensor.device_state_attributes
-        assert mock_logger.warning.called
-
-    @patch("homeassistant.components.rest.sensor._LOGGER")
-    def test_update_with_json_attrs_bad_JSON(self, mock_logger):
-        """Test attributes get extracted from a JSON result."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                "This is text rather than JSON data.",
-                CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_TEXT_PLAIN}),
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            None,
-            ["key"],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-        self.sensor.update()
-        assert {} == self.sensor.device_state_attributes
-        assert mock_logger.warning.called
-        assert mock_logger.debug.called
-
-    def test_update_with_json_attrs_and_template(self):
-        """Test attributes get extracted from a JSON result."""
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                '{ "key": "json_state_updated_value" }',
-                CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_JSON}),
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            self.value_template,
-            ["key"],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-        self.sensor.update()
-
-        assert "json_state_updated_value" == self.sensor.state
-        assert (
-            "json_state_updated_value" == self.sensor.device_state_attributes["key"]
-        ), self.force_update
-
-    def test_update_with_json_attrs_with_json_attrs_path(self):
-        """Test attributes get extracted from a JSON result with a template for the attributes."""
-        json_attrs_path = "$.toplevel.second_level"
-        value_template = template("{{ value_json.toplevel.master_value }}")
-        value_template.hass = self.hass
-
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                '{ "toplevel": {"master_value": "master", "second_level": {"some_json_key": "some_json_value", "some_json_key2": "some_json_value2" } } }',
-                CaseInsensitiveDict({"Content-Type": CONTENT_TYPE_JSON}),
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            value_template,
-            ["some_json_key", "some_json_key2"],
-            self.force_update,
-            self.resource_template,
-            json_attrs_path,
-        )
-
-        self.sensor.update()
-        assert "some_json_value" == self.sensor.device_state_attributes["some_json_key"]
-        assert (
-            "some_json_value2" == self.sensor.device_state_attributes["some_json_key2"]
-        )
-        assert "master" == self.sensor.state
-
-    def test_update_with_xml_convert_json_attrs_with_json_attrs_path(self):
-        """Test attributes get extracted from a JSON result that was converted from XML with a template for the attributes."""
-        json_attrs_path = "$.toplevel.second_level"
-        value_template = template("{{ value_json.toplevel.master_value }}")
-        value_template.hass = self.hass
-
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                "<toplevel><master_value>master</master_value><second_level><some_json_key>some_json_value</some_json_key><some_json_key2>some_json_value2</some_json_key2></second_level></toplevel>",
-                CaseInsensitiveDict({"Content-Type": "text/xml+svg"}),
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            value_template,
-            ["some_json_key", "some_json_key2"],
-            self.force_update,
-            self.resource_template,
-            json_attrs_path,
-        )
-
-        self.sensor.update()
-        assert "some_json_value" == self.sensor.device_state_attributes["some_json_key"]
-        assert (
-            "some_json_value2" == self.sensor.device_state_attributes["some_json_key2"]
-        )
-        assert "master" == self.sensor.state
-
-    def test_update_with_xml_convert_json_attrs_with_jsonattr_template(self):
-        """Test attributes get extracted from a JSON result that was converted from XML."""
-        json_attrs_path = "$.response"
-        value_template = template("{{ value_json.response.bss.wlan }}")
-        value_template.hass = self.hass
-
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                '<?xml version="1.0" encoding="utf-8"?><response><scan>0</scan><ver>12556</ver><count>48</count><ssid>alexander</ssid><bss><valid>0</valid><name>0</name><privacy>0</privacy><wlan>bogus</wlan><strength>0</strength></bss><led0>0</led0><led1>0</led1><led2>0</led2><led3>0</led3><led4>0</led4><led5>0</led5><led6>0</led6><led7>0</led7><btn0>up</btn0><btn1>up</btn1><btn2>up</btn2><btn3>up</btn3><pot0>0</pot0><usr0>0</usr0><temp0>0x0XF0x0XF</temp0><time0> 0</time0></response>',
-                CaseInsensitiveDict({"Content-Type": "text/xml"}),
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            value_template,
-            ["led0", "led1", "temp0", "time0", "ver"],
-            self.force_update,
-            self.resource_template,
-            json_attrs_path,
-        )
-
-        self.sensor.update()
-        assert "0" == self.sensor.device_state_attributes["led0"]
-        assert "0" == self.sensor.device_state_attributes["led1"]
-        assert "0x0XF0x0XF" == self.sensor.device_state_attributes["temp0"]
-        assert "0" == self.sensor.device_state_attributes["time0"]
-        assert "12556" == self.sensor.device_state_attributes["ver"]
-        assert "bogus" == self.sensor.state
-
-    def test_update_with_application_xml_convert_json_attrs_with_jsonattr_template(
-        self,
-    ):
-        """Test attributes get extracted from a JSON result that was converted from XML with application/xml mime type."""
-        json_attrs_path = "$.main"
-        value_template = template("{{ value_json.main.dog }}")
-        value_template.hass = self.hass
-
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                "<main><dog>1</dog><cat>3</cat></main>",
-                CaseInsensitiveDict({"Content-Type": "application/xml"}),
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            value_template,
-            ["dog", "cat"],
-            self.force_update,
-            self.resource_template,
-            json_attrs_path,
-        )
-
-        self.sensor.update()
-        assert "3" == self.sensor.device_state_attributes["cat"]
-        assert "1" == self.sensor.device_state_attributes["dog"]
-        assert "1" == self.sensor.state
-
-    @patch("homeassistant.components.rest.sensor._LOGGER")
-    def test_update_with_xml_convert_bad_xml(self, mock_logger):
-        """Test attributes get extracted from a XML result with bad xml."""
-        value_template = template("{{ value_json.toplevel.master_value }}")
-        value_template.hass = self.hass
-
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(
-                "this is not xml", CaseInsensitiveDict({"Content-Type": "text/xml"})
-            ),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            value_template,
-            ["key"],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-
-        self.sensor.update()
-        assert {} == self.sensor.device_state_attributes
-        assert mock_logger.warning.called
-        assert mock_logger.debug.called
-
-    @patch("homeassistant.components.rest.sensor._LOGGER")
-    def test_update_with_failed_get(self, mock_logger):
-        """Test attributes get extracted from a XML result with bad xml."""
-        value_template = template("{{ value_json.toplevel.master_value }}")
-        value_template.hass = self.hass
-
-        self.rest.update = Mock(
-            "rest.RestData.update",
-            side_effect=self.update_side_effect(None, None),
-        )
-        self.sensor = rest.RestSensor(
-            self.hass,
-            self.rest,
-            self.name,
-            self.unit_of_measurement,
-            self.device_class,
-            value_template,
-            ["key"],
-            self.force_update,
-            self.resource_template,
-            self.json_attrs_path,
-        )
-
-        self.sensor.update()
-        assert {} == self.sensor.device_state_attributes
-        assert mock_logger.warning.called
-        assert mock_logger.debug.called
-        assert self.sensor.state is None
-        assert self.sensor.available is False
+async def test_setup_missing_schema(hass):
+    """Test setup with resource missing schema."""
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {"sensor": {"platform": "rest", "resource": "localhost", "method": "GET"}},
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
 
 
-class TestRestData(unittest.TestCase):
-    """Tests for RestData."""
-
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.method = "GET"
-        self.resource = "http://localhost"
-        self.verify_ssl = True
-        self.timeout = 10
-        self.rest = rest.RestData(
-            self.method, self.resource, None, None, None, self.verify_ssl, self.timeout
-        )
-
-    @requests_mock.Mocker()
-    def test_update(self, mock_req):
-        """Test update."""
-        mock_req.get("http://localhost", text="test data")
-        self.rest.update()
-        assert "test data" == self.rest.data
-
-    @patch("requests.Session.request", side_effect=RequestException)
-    def test_update_request_exception(self, mock_req):
-        """Test update when a request exception occurs."""
-        self.rest.update()
-        assert self.rest.data is None
+@respx.mock
+async def test_setup_failed_connect(hass):
+    """Test setup when connection error occurs."""
+    respx.get(
+        "http://localhost", content=httpx.RequestError(message="any", request=Mock())
+    )
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
 
 
-async def test_reload(hass, requests_mock):
+@respx.mock
+async def test_setup_timeout(hass):
+    """Test setup when connection timeout occurs."""
+    respx.get("http://localhost", content=asyncio.TimeoutError())
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {"sensor": {"platform": "rest", "resource": "localhost", "method": "GET"}},
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
+
+
+@respx.mock
+async def test_setup_minimum(hass):
+    """Test setup with minimum configuration."""
+    respx.get("http://localhost", status_code=200)
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_minimum_resource_template(hass):
+    """Test setup with minimum configuration (resource_template)."""
+    respx.get("http://localhost", status_code=200)
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource_template": "http://localhost",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_duplicate_resource_template(hass):
+    """Test setup with duplicate resources."""
+    respx.get("http://localhost", status_code=200)
+    assert await async_setup_component(
+        hass,
+        sensor.DOMAIN,
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "resource_template": "http://localhost",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 0
+
+
+@respx.mock
+async def test_setup_get(hass):
+    """Test setup with valid configuration."""
+    respx.get("http://localhost", status_code=200, content="{}")
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.key }}",
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+                "authentication": "basic",
+                "username": "my username",
+                "password": "my password",
+                "headers": {"Accept": CONTENT_TYPE_JSON},
+            }
+        },
+    )
+
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_get_digest_auth(hass):
+    """Test setup with valid configuration."""
+    respx.get("http://localhost", status_code=200, content="{}")
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.key }}",
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+                "authentication": "digest",
+                "username": "my username",
+                "password": "my password",
+                "headers": {"Accept": CONTENT_TYPE_JSON},
+            }
+        },
+    )
+
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_post(hass):
+    """Test setup with valid configuration."""
+    respx.post("http://localhost", status_code=200, content="{}")
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "POST",
+                "value_template": "{{ value_json.key }}",
+                "payload": '{ "device": "toaster"}',
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+                "authentication": "basic",
+                "username": "my username",
+                "password": "my password",
+                "headers": {"Accept": CONTENT_TYPE_JSON},
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+
+@respx.mock
+async def test_setup_get_xml(hass):
+    """Test setup with valid xml configuration."""
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": "text/xml"},
+        content="<dog>abc</dog>",
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.dog }}",
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+    state = hass.states.get("sensor.foo")
+    assert state.state == "abc"
+    assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == DATA_MEGABYTES
+
+
+@respx.mock
+async def test_update_with_json_attrs(hass):
+    """Test attributes get extracted from a JSON result."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": CONTENT_TYPE_JSON},
+        content='{ "key": "some_json_value" }',
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.key }}",
+                "json_attributes": ["key"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+    state = hass.states.get("sensor.foo")
+    assert state.state == "some_json_value"
+    assert state.attributes["key"] == "some_json_value"
+
+
+@respx.mock
+async def test_update_with_no_template(hass):
+    """Test update when there is no value template."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": CONTENT_TYPE_JSON},
+        content='{ "key": "some_json_value" }',
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "json_attributes": ["key"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+                "headers": {"Accept": "text/xml"},
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+    state = hass.states.get("sensor.foo")
+    assert state.state == '{ "key": "some_json_value" }'
+
+
+@respx.mock
+async def test_update_with_json_attrs_no_data(hass, caplog):
+    """Test attributes when no JSON result fetched."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": CONTENT_TYPE_JSON},
+        content="",
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.key }}",
+                "json_attributes": ["key"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+                "headers": {"Accept": "text/xml"},
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+    state = hass.states.get("sensor.foo")
+    assert state.state == STATE_UNKNOWN
+    assert state.attributes == {"unit_of_measurement": "MB", "friendly_name": "foo"}
+    assert "Empty reply" in caplog.text
+
+
+@respx.mock
+async def test_update_with_json_attrs_not_dict(hass, caplog):
+    """Test attributes get extracted from a JSON result."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": CONTENT_TYPE_JSON},
+        content='["list", "of", "things"]',
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.key }}",
+                "json_attributes": ["key"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+                "headers": {"Accept": "text/xml"},
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+    state = hass.states.get("sensor.foo")
+    assert state.state == ""
+    assert state.attributes == {"unit_of_measurement": "MB", "friendly_name": "foo"}
+    assert "not a dictionary or list" in caplog.text
+
+
+@respx.mock
+async def test_update_with_json_attrs_bad_JSON(hass, caplog):
+    """Test attributes get extracted from a JSON result."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": CONTENT_TYPE_JSON},
+        content="This is text rather than JSON data.",
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.key }}",
+                "json_attributes": ["key"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+                "headers": {"Accept": "text/xml"},
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+
+    state = hass.states.get("sensor.foo")
+    assert state.state == STATE_UNKNOWN
+    assert state.attributes == {"unit_of_measurement": "MB", "friendly_name": "foo"}
+    assert "Erroneous JSON" in caplog.text
+
+
+@respx.mock
+async def test_update_with_json_attrs_with_json_attrs_path(hass):
+    """Test attributes get extracted from a JSON result with a template for the attributes."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": CONTENT_TYPE_JSON},
+        content='{ "toplevel": {"master_value": "master", "second_level": {"some_json_key": "some_json_value", "some_json_key2": "some_json_value2" } } }',
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.toplevel.master_value }}",
+                "json_attributes_path": "$.toplevel.second_level",
+                "json_attributes": ["some_json_key", "some_json_key2"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+                "headers": {"Accept": "text/xml"},
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+    state = hass.states.get("sensor.foo")
+
+    assert state.state == "master"
+    assert state.attributes["some_json_key"] == "some_json_value"
+    assert state.attributes["some_json_key2"] == "some_json_value2"
+
+
+@respx.mock
+async def test_update_with_xml_convert_json_attrs_with_json_attrs_path(hass):
+    """Test attributes get extracted from a JSON result that was converted from XML with a template for the attributes."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": "text/xml"},
+        content="<toplevel><master_value>master</master_value><second_level><some_json_key>some_json_value</some_json_key><some_json_key2>some_json_value2</some_json_key2></second_level></toplevel>",
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.toplevel.master_value }}",
+                "json_attributes_path": "$.toplevel.second_level",
+                "json_attributes": ["some_json_key", "some_json_key2"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+    state = hass.states.get("sensor.foo")
+
+    assert state.state == "master"
+    assert state.attributes["some_json_key"] == "some_json_value"
+    assert state.attributes["some_json_key2"] == "some_json_value2"
+
+
+@respx.mock
+async def test_update_with_xml_convert_json_attrs_with_jsonattr_template(hass):
+    """Test attributes get extracted from a JSON result that was converted from XML."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": "text/xml"},
+        content='<?xml version="1.0" encoding="utf-8"?><response><scan>0</scan><ver>12556</ver><count>48</count><ssid>alexander</ssid><bss><valid>0</valid><name>0</name><privacy>0</privacy><wlan>bogus</wlan><strength>0</strength></bss><led0>0</led0><led1>0</led1><led2>0</led2><led3>0</led3><led4>0</led4><led5>0</led5><led6>0</led6><led7>0</led7><btn0>up</btn0><btn1>up</btn1><btn2>up</btn2><btn3>up</btn3><pot0>0</pot0><usr0>0</usr0><temp0>0x0XF0x0XF</temp0><time0> 0</time0></response>',
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.response.bss.wlan }}",
+                "json_attributes_path": "$.response",
+                "json_attributes": ["led0", "led1", "temp0", "time0", "ver"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+    state = hass.states.get("sensor.foo")
+
+    assert state.state == "bogus"
+    assert state.attributes["led0"] == "0"
+    assert state.attributes["led1"] == "0"
+    assert state.attributes["temp0"] == "0x0XF0x0XF"
+    assert state.attributes["time0"] == "0"
+    assert state.attributes["ver"] == "12556"
+
+
+@respx.mock
+async def test_update_with_application_xml_convert_json_attrs_with_jsonattr_template(
+    hass,
+):
+    """Test attributes get extracted from a JSON result that was converted from XML with application/xml mime type."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": "application/xml"},
+        content="<main><dog>1</dog><cat>3</cat></main>",
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.main.dog }}",
+                "json_attributes_path": "$.main",
+                "json_attributes": ["dog", "cat"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+    state = hass.states.get("sensor.foo")
+
+    assert state.state == "1"
+    assert state.attributes["dog"] == "1"
+    assert state.attributes["cat"] == "3"
+
+
+@respx.mock
+async def test_update_with_xml_convert_bad_xml(hass, caplog):
+    """Test attributes get extracted from a XML result with bad xml."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": "text/xml"},
+        content="",
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.toplevel.master_value }}",
+                "json_attributes": ["key"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+    state = hass.states.get("sensor.foo")
+
+    assert state.state == STATE_UNKNOWN
+    assert "Erroneous XML" in caplog.text
+    assert "Empty reply" in caplog.text
+
+
+@respx.mock
+async def test_update_with_failed_get(hass, caplog):
+    """Test attributes get extracted from a XML result with bad xml."""
+
+    respx.get(
+        "http://localhost",
+        status_code=200,
+        headers={"content-type": "text/xml"},
+        content="",
+    )
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": "rest",
+                "resource": "http://localhost",
+                "method": "GET",
+                "value_template": "{{ value_json.toplevel.master_value }}",
+                "json_attributes": ["key"],
+                "name": "foo",
+                "unit_of_measurement": DATA_MEGABYTES,
+                "verify_ssl": "true",
+                "timeout": 30,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    assert len(hass.states.async_all()) == 1
+    state = hass.states.get("sensor.foo")
+
+    assert state.state == STATE_UNKNOWN
+    assert "Erroneous XML" in caplog.text
+    assert "Empty reply" in caplog.text
+
+
+@respx.mock
+async def test_reload(hass):
     """Verify we can reload reset sensors."""
 
-    requests_mock.get("http://localhost", text="test data")
+    respx.get("http://localhost", status_code=200)
 
     await async_setup_component(
         hass,
@@ -726,8 +695,6 @@ async def test_reload(hass, requests_mock):
         )
         await hass.async_block_till_done()
 
-    assert len(hass.states.async_all()) == 1
-
     assert hass.states.get("sensor.mockreset") is None
     assert hass.states.get("sensor.rollout")
 
diff --git a/tests/components/rflink/test_cover.py b/tests/components/rflink/test_cover.py
index 392008e838d..fd3f5b84314 100644
--- a/tests/components/rflink/test_cover.py
+++ b/tests/components/rflink/test_cover.py
@@ -4,9 +4,6 @@ Test setup of RFLink covers component/platform. State tracking and
 control of RFLink cover devices.
 
 """
-
-import logging
-
 from homeassistant.components.rflink import EVENT_BUTTON_PRESSED
 from homeassistant.const import (
     ATTR_ENTITY_ID,
@@ -37,8 +34,6 @@ CONFIG = {
     },
 }
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def test_default_setup(hass, monkeypatch):
     """Test all basic functionality of the RFLink cover component."""
diff --git a/tests/components/rfxtrx/conftest.py b/tests/components/rfxtrx/conftest.py
index 1eb39f00691..82c4bd7aacd 100644
--- a/tests/components/rfxtrx/conftest.py
+++ b/tests/components/rfxtrx/conftest.py
@@ -4,11 +4,23 @@ from datetime import timedelta
 import pytest
 
 from homeassistant.components import rfxtrx
-from homeassistant.setup import async_setup_component
+from homeassistant.components.rfxtrx import DOMAIN
 from homeassistant.util.dt import utcnow
 
 from tests.async_mock import patch
-from tests.common import async_fire_time_changed
+from tests.common import MockConfigEntry, async_fire_time_changed
+
+
+def create_rfx_test_cfg(device="abcd", automatic_add=False, devices=None):
+    """Create rfxtrx config entry data."""
+    return {
+        "device": device,
+        "host": None,
+        "port": None,
+        "automatic_add": automatic_add,
+        "debug": False,
+        "devices": devices,
+    }
 
 
 @pytest.fixture(autouse=True, name="rfxtrx")
@@ -37,12 +49,12 @@ async def rfxtrx_fixture(hass):
 @pytest.fixture(name="rfxtrx_automatic")
 async def rfxtrx_automatic_fixture(hass, rfxtrx):
     """Fixture that starts up with automatic additions."""
+    entry_data = create_rfx_test_cfg(automatic_add=True, devices={})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
 
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "automatic_add": True}},
-    )
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
     yield rfxtrx
diff --git a/tests/components/rfxtrx/test_binary_sensor.py b/tests/components/rfxtrx/test_binary_sensor.py
index ee757192aaf..a52b390395a 100644
--- a/tests/components/rfxtrx/test_binary_sensor.py
+++ b/tests/components/rfxtrx/test_binary_sensor.py
@@ -1,11 +1,12 @@
 """The tests for the Rfxtrx sensor platform."""
 import pytest
 
+from homeassistant.components.rfxtrx import DOMAIN
 from homeassistant.components.rfxtrx.const import ATTR_EVENT
 from homeassistant.core import State
-from homeassistant.setup import async_setup_component
 
-from tests.common import mock_restore_cache
+from tests.common import MockConfigEntry, mock_restore_cache
+from tests.components.rfxtrx.conftest import create_rfx_test_cfg
 
 EVENT_SMOKE_DETECTOR_PANIC = "08200300a109000670"
 EVENT_SMOKE_DETECTOR_NO_PANIC = "08200300a109000770"
@@ -21,11 +22,12 @@ EVENT_AC_118CDEA_2_ON = "0b1100100118cdea02010f70"
 
 async def test_one(hass, rfxtrx):
     """Test with 1 sensor."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0b1100cd0213c7f230010f71": {}}}},
-    )
+    entry_data = create_rfx_test_cfg(devices={"0b1100cd0213c7f230010f71": {}})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     state = hass.states.get("binary_sensor.ac_213c7f2_48")
@@ -36,22 +38,20 @@ async def test_one(hass, rfxtrx):
 
 async def test_one_pt2262(hass, rfxtrx):
     """Test with 1 sensor."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0913000022670e013970": {
-                        "data_bits": 4,
-                        "command_on": 0xE,
-                        "command_off": 0x7,
-                    }
-                },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0913000022670e013970": {
+                "data_bits": 4,
+                "command_on": 0xE,
+                "command_off": 0x7,
             }
-        },
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -71,19 +71,14 @@ async def test_one_pt2262(hass, rfxtrx):
 
 async def test_pt2262_unconfigured(hass, rfxtrx):
     """Test with discovery for PT2262."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0913000022670e013970": {},
-                    "09130000226707013970": {},
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={"0913000022670e013970": {}, "09130000226707013970": {}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -109,11 +104,12 @@ async def test_state_restore(hass, rfxtrx, state, event):
 
     mock_restore_cache(hass, [State(entity_id, state, attributes={ATTR_EVENT: event})])
 
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0b1100cd0213c7f230010f71": {}}}},
-    )
+    entry_data = create_rfx_test_cfg(devices={"0b1100cd0213c7f230010f71": {}})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     assert hass.states.get(entity_id).state == state
@@ -121,20 +117,18 @@ async def test_state_restore(hass, rfxtrx, state, event):
 
 async def test_several(hass, rfxtrx):
     """Test with 3."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0b1100cd0213c7f230010f71": {},
-                    "0b1100100118cdea02010f70": {},
-                    "0b1100101118cdea02010f70": {},
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0b1100cd0213c7f230010f71": {},
+            "0b1100100118cdea02010f70": {},
+            "0b1100101118cdea02010f70": {},
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     state = hass.states.get("binary_sensor.ac_213c7f2_48")
@@ -181,16 +175,12 @@ async def test_off_delay_restore(hass, rfxtrx):
         ],
     )
 
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {EVENT_AC_118CDEA_2_ON: {"off_delay": 5}},
-            }
-        },
-    )
+    entry_data = create_rfx_test_cfg(devices={EVENT_AC_118CDEA_2_ON: {"off_delay": 5}})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -201,16 +191,14 @@ async def test_off_delay_restore(hass, rfxtrx):
 
 async def test_off_delay(hass, rfxtrx, timestep):
     """Test with discovery."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {"0b1100100118cdea02010f70": {"off_delay": 5}},
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={"0b1100100118cdea02010f70": {"off_delay": 5}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -295,27 +283,25 @@ async def test_light(hass, rfxtrx_automatic):
 
 async def test_pt2262_duplicate_id(hass, rfxtrx):
     """Test with 1 sensor."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0913000022670e013970": {
-                        "data_bits": 4,
-                        "command_on": 0xE,
-                        "command_off": 0x7,
-                    },
-                    "09130000226707013970": {
-                        "data_bits": 4,
-                        "command_on": 0xE,
-                        "command_off": 0x7,
-                    },
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0913000022670e013970": {
+                "data_bits": 4,
+                "command_on": 0xE,
+                "command_off": 0x7,
+            },
+            "09130000226707013970": {
+                "data_bits": 4,
+                "command_on": 0xE,
+                "command_off": 0x7,
+            },
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
diff --git a/tests/components/rfxtrx/test_config_flow.py b/tests/components/rfxtrx/test_config_flow.py
index 53f3b317d53..6ba045d60a6 100644
--- a/tests/components/rfxtrx/test_config_flow.py
+++ b/tests/components/rfxtrx/test_config_flow.py
@@ -1,19 +1,306 @@
 """Test the Tado config flow."""
-from homeassistant import config_entries, setup
-from homeassistant.components.rfxtrx import DOMAIN
+import os
 
+import serial.tools.list_ports
+
+from homeassistant import config_entries, data_entry_flow, setup
+from homeassistant.components.rfxtrx import DOMAIN, config_flow
+from homeassistant.helpers.device_registry import (
+    async_entries_for_config_entry,
+    async_get_registry as async_get_device_registry,
+)
+from homeassistant.helpers.entity_registry import (
+    async_get_registry as async_get_entity_registry,
+)
+
+from tests.async_mock import MagicMock, patch, sentinel
 from tests.common import MockConfigEntry
 
 
-async def test_import(hass):
+def serial_connect(self):
+    """Mock a serial connection."""
+    self.serial = True
+
+
+def serial_connect_fail(self):
+    """Mock a failed serial connection."""
+    self.serial = None
+
+
+def com_port():
+    """Mock of a serial port."""
+    port = serial.tools.list_ports_common.ListPortInfo()
+    port.serial_number = "1234"
+    port.manufacturer = "Virtual serial port"
+    port.device = "/dev/ttyUSB1234"
+    port.description = "Some serial port"
+
+    return port
+
+
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PyNetworkTransport.connect",
+    return_value=None,
+)
+async def test_setup_network(connect_mock, hass):
+    """Test we can setup network."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {"type": "Network"},
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_network"
+    assert result["errors"] == {}
+
+    with patch("homeassistant.components.rfxtrx.async_setup_entry", return_value=True):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], {"host": "10.10.0.1", "port": 1234}
+        )
+
+    assert result["type"] == "create_entry"
+    assert result["title"] == "RFXTRX"
+    assert result["data"] == {
+        "host": "10.10.0.1",
+        "port": 1234,
+        "device": None,
+        "automatic_add": False,
+        "devices": {},
+    }
+
+
+@patch("serial.tools.list_ports.comports", return_value=[com_port()])
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PySerialTransport.connect",
+    serial_connect,
+)
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PySerialTransport.close",
+    return_value=None,
+)
+async def test_setup_serial(com_mock, connect_mock, hass):
+    """Test we can setup serial."""
+    port = com_port()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {"type": "Serial"},
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_serial"
+    assert result["errors"] == {}
+
+    with patch("homeassistant.components.rfxtrx.async_setup_entry", return_value=True):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], {"device": port.device}
+        )
+
+    assert result["type"] == "create_entry"
+    assert result["title"] == "RFXTRX"
+    assert result["data"] == {
+        "host": None,
+        "port": None,
+        "device": port.device,
+        "automatic_add": False,
+        "devices": {},
+    }
+
+
+@patch("serial.tools.list_ports.comports", return_value=[com_port()])
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PySerialTransport.connect",
+    serial_connect,
+)
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PySerialTransport.close",
+    return_value=None,
+)
+async def test_setup_serial_manual(com_mock, connect_mock, hass):
+    """Test we can setup serial with manual entry."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {"type": "Serial"},
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_serial"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"device": "Enter Manually"}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_serial_manual_path"
+    assert result["errors"] == {}
+
+    with patch("homeassistant.components.rfxtrx.async_setup_entry", return_value=True):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], {"device": "/dev/ttyUSB0"}
+        )
+
+    assert result["type"] == "create_entry"
+    assert result["title"] == "RFXTRX"
+    assert result["data"] == {
+        "host": None,
+        "port": None,
+        "device": "/dev/ttyUSB0",
+        "automatic_add": False,
+        "devices": {},
+    }
+
+
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PyNetworkTransport.connect",
+    side_effect=OSError,
+)
+async def test_setup_network_fail(connect_mock, hass):
+    """Test we can setup network."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {"type": "Network"},
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_network"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"host": "10.10.0.1", "port": 1234}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_network"
+    assert result["errors"] == {"base": "cannot_connect"}
+
+
+@patch("serial.tools.list_ports.comports", return_value=[com_port()])
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PySerialTransport.connect",
+    side_effect=serial.serialutil.SerialException,
+)
+async def test_setup_serial_fail(com_mock, connect_mock, hass):
+    """Test setup serial failed connection."""
+    port = com_port()
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {"type": "Serial"},
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_serial"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"device": port.device}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_serial"
+    assert result["errors"] == {"base": "cannot_connect"}
+
+
+@patch("serial.tools.list_ports.comports", return_value=[com_port()])
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PySerialTransport.connect",
+    serial_connect_fail,
+)
+async def test_setup_serial_manual_fail(com_mock, hass):
+    """Test setup serial failed connection."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "user"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        {"type": "Serial"},
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_serial"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"device": "Enter Manually"}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_serial_manual_path"
+    assert result["errors"] == {}
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"device": "/dev/ttyUSB0"}
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "setup_serial_manual_path"
+    assert result["errors"] == {"base": "cannot_connect"}
+
+
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PySerialTransport.connect",
+    serial_connect,
+)
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PySerialTransport.close",
+    return_value=None,
+)
+async def test_import_serial(connect_mock, hass):
     """Test we can import."""
     await setup.async_setup_component(hass, "persistent_notification", {})
 
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data={"host": None, "port": None, "device": "/dev/tty123", "debug": False},
-    )
+    with patch("homeassistant.components.rfxtrx.async_setup_entry", return_value=True):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_IMPORT},
+            data={"host": None, "port": None, "device": "/dev/tty123", "debug": False},
+        )
 
     assert result["type"] == "create_entry"
     assert result["title"] == "RFXTRX"
@@ -25,10 +312,87 @@ async def test_import(hass):
     }
 
 
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PyNetworkTransport.connect",
+    return_value=None,
+)
+async def test_import_network(connect_mock, hass):
+    """Test we can import."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    with patch("homeassistant.components.rfxtrx.async_setup_entry", return_value=True):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_IMPORT},
+            data={"host": "localhost", "port": 1234, "device": None, "debug": False},
+        )
+
+    assert result["type"] == "create_entry"
+    assert result["title"] == "RFXTRX"
+    assert result["data"] == {
+        "host": "localhost",
+        "port": 1234,
+        "device": None,
+        "debug": False,
+    }
+
+
+@patch(
+    "homeassistant.components.rfxtrx.rfxtrxmod.PyNetworkTransport.connect",
+    side_effect=OSError,
+)
+async def test_import_network_connection_fail(connect_mock, hass):
+    """Test we can import."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    with patch("homeassistant.components.rfxtrx.async_setup_entry", return_value=True):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_IMPORT},
+            data={"host": "localhost", "port": 1234, "device": None, "debug": False},
+        )
+
+    assert result["type"] == "abort"
+    assert result["reason"] == "cannot_connect"
+
+
 async def test_import_update(hass):
     """Test we can import."""
     await setup.async_setup_component(hass, "persistent_notification", {})
 
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "debug": False,
+            "devices": {},
+        },
+        unique_id=DOMAIN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": config_entries.SOURCE_IMPORT},
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "debug": True,
+            "devices": {},
+        },
+    )
+
+    assert result["type"] == "abort"
+    assert result["reason"] == "already_configured"
+
+
+async def test_import_migrate(hass):
+    """Test we can import."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
     entry = MockConfigEntry(
         domain=DOMAIN,
         data={"host": None, "port": None, "device": "/dev/tty123", "debug": False},
@@ -36,12 +400,751 @@ async def test_import_update(hass):
     )
     entry.add_to_hass(hass)
 
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": config_entries.SOURCE_IMPORT},
-        data={"host": None, "port": None, "device": "/dev/tty123", "debug": True},
-    )
+    with patch("homeassistant.components.rfxtrx.async_setup_entry", return_value=True):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": config_entries.SOURCE_IMPORT},
+            data={
+                "host": None,
+                "port": None,
+                "device": "/dev/tty123",
+                "debug": True,
+                "automatic_add": True,
+                "devices": {},
+            },
+        )
 
     assert result["type"] == "abort"
     assert result["reason"] == "already_configured"
-    assert entry.data["debug"]
+
+    assert entry.data["devices"] == {}
+
+
+async def test_options_global(hass):
+    """Test if we can set global options."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "automatic_add": False,
+            "devices": {},
+        },
+        unique_id=DOMAIN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input={"automatic_add": True}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    assert entry.data["automatic_add"]
+
+
+async def test_options_add_device(hass):
+    """Test we can add a device."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "automatic_add": False,
+            "devices": {},
+        },
+        unique_id=DOMAIN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    # Try with invalid event code
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"automatic_add": True, "event_code": "1234"},
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+    assert result["errors"]
+    assert result["errors"]["event_code"] == "invalid_event_code"
+
+    # Try with valid event code
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "automatic_add": True,
+            "event_code": "0b1100cd0213c7f230010f71",
+        },
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "set_device_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"], user_input={"fire_event": True, "signal_repetitions": 5}
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    assert entry.data["automatic_add"]
+
+    assert entry.data["devices"]["0b1100cd0213c7f230010f71"]
+    assert entry.data["devices"]["0b1100cd0213c7f230010f71"]["fire_event"]
+    assert entry.data["devices"]["0b1100cd0213c7f230010f71"]["signal_repetitions"] == 5
+    assert "delay_off" not in entry.data["devices"]["0b1100cd0213c7f230010f71"]
+
+    state = hass.states.get("binary_sensor.ac_213c7f2_48")
+    assert state
+    assert state.state == "off"
+    assert state.attributes.get("friendly_name") == "AC 213c7f2:48"
+
+
+async def test_options_add_duplicate_device(hass):
+    """Test we can add a device."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "debug": False,
+            "automatic_add": False,
+            "devices": {"0b1100cd0213c7f230010f71": {"signal_repetitions": 1}},
+        },
+        unique_id=DOMAIN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "automatic_add": True,
+            "event_code": "0b1100cd0213c7f230010f71",
+        },
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+    assert result["errors"]
+    assert result["errors"]["event_code"] == "already_configured_device"
+
+
+async def test_options_add_remove_device(hass):
+    """Test we can add a device."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "automatic_add": False,
+            "devices": {},
+        },
+        unique_id=DOMAIN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "automatic_add": True,
+            "event_code": "0b1100cd0213c7f230010f71",
+        },
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "set_device_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={"fire_event": True, "signal_repetitions": 5, "off_delay": "4"},
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    assert entry.data["automatic_add"]
+
+    assert entry.data["devices"]["0b1100cd0213c7f230010f71"]
+    assert entry.data["devices"]["0b1100cd0213c7f230010f71"]["fire_event"]
+    assert entry.data["devices"]["0b1100cd0213c7f230010f71"]["signal_repetitions"] == 5
+    assert entry.data["devices"]["0b1100cd0213c7f230010f71"]["off_delay"] == 4
+
+    state = hass.states.get("binary_sensor.ac_213c7f2_48")
+    assert state
+    assert state.state == "off"
+    assert state.attributes.get("friendly_name") == "AC 213c7f2:48"
+
+    device_registry = await async_get_device_registry(hass)
+    device_entries = async_entries_for_config_entry(device_registry, entry.entry_id)
+
+    assert device_entries[0].id
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "automatic_add": False,
+            "remove_device": [device_entries[0].id],
+        },
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    assert not entry.data["automatic_add"]
+
+    assert "0b1100cd0213c7f230010f71" not in entry.data["devices"]
+
+    state = hass.states.get("binary_sensor.ac_213c7f2_48")
+    assert not state
+
+
+async def test_options_replace_sensor_device(hass):
+    """Test we can replace a sensor device."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "automatic_add": False,
+            "devices": {
+                "0a520101f00400e22d0189": {"device_id": ["52", "1", "f0:04"]},
+                "0a520105230400c3260279": {"device_id": ["52", "1", "23:04"]},
+            },
+        },
+        unique_id=DOMAIN,
+    )
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_rssi_numeric"
+    )
+    assert state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_battery_numeric"
+    )
+    assert state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_humidity"
+    )
+    assert state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_humidity_status"
+    )
+    assert state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_temperature"
+    )
+    assert state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_rssi_numeric"
+    )
+    assert state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_battery_numeric"
+    )
+    assert state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_humidity"
+    )
+    assert state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_humidity_status"
+    )
+    assert state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_temperature"
+    )
+    assert state
+
+    device_registry = await async_get_device_registry(hass)
+    device_entries = async_entries_for_config_entry(device_registry, entry.entry_id)
+
+    old_device = next(
+        (
+            elem.id
+            for elem in device_entries
+            if next(iter(elem.identifiers))[1:] == ("52", "1", "f0:04")
+        ),
+        None,
+    )
+    new_device = next(
+        (
+            elem.id
+            for elem in device_entries
+            if next(iter(elem.identifiers))[1:] == ("52", "1", "23:04")
+        ),
+        None,
+    )
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "automatic_add": False,
+            "device": old_device,
+        },
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "set_device_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "replace_device": new_device,
+        },
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    entity_registry = await async_get_entity_registry(hass)
+
+    entry = entity_registry.async_get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_rssi_numeric"
+    )
+    assert entry
+    assert entry.device_id == new_device
+    entry = entity_registry.async_get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_humidity"
+    )
+    assert entry
+    assert entry.device_id == new_device
+    entry = entity_registry.async_get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_humidity_status"
+    )
+    assert entry
+    assert entry.device_id == new_device
+    entry = entity_registry.async_get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_battery_numeric"
+    )
+    assert entry
+    assert entry.device_id == new_device
+    entry = entity_registry.async_get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_f0_04_temperature"
+    )
+    assert entry
+    assert entry.device_id == new_device
+
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_rssi_numeric"
+    )
+    assert not state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_battery_numeric"
+    )
+    assert not state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_humidity"
+    )
+    assert not state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_humidity_status"
+    )
+    assert not state
+    state = hass.states.get(
+        "sensor.thgn122_123_thgn132_thgr122_228_238_268_23_04_temperature"
+    )
+    assert not state
+
+
+async def test_options_replace_control_device(hass):
+    """Test we can replace a control device."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "automatic_add": False,
+            "devices": {
+                "0b1100100118cdea02010f70": {
+                    "device_id": ["11", "0", "118cdea:2"],
+                    "signal_repetitions": 1,
+                },
+                "0b1100101118cdea02010f70": {
+                    "device_id": ["11", "0", "1118cdea:2"],
+                    "signal_repetitions": 1,
+                },
+            },
+        },
+        unique_id=DOMAIN,
+    )
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.ac_118cdea_2")
+    assert state
+    state = hass.states.get("sensor.ac_118cdea_2_rssi_numeric")
+    assert state
+    state = hass.states.get("switch.ac_118cdea_2")
+    assert state
+    state = hass.states.get("binary_sensor.ac_1118cdea_2")
+    assert state
+    state = hass.states.get("sensor.ac_1118cdea_2_rssi_numeric")
+    assert state
+    state = hass.states.get("switch.ac_1118cdea_2")
+    assert state
+
+    device_registry = await async_get_device_registry(hass)
+    device_entries = async_entries_for_config_entry(device_registry, entry.entry_id)
+
+    old_device = next(
+        (
+            elem.id
+            for elem in device_entries
+            if next(iter(elem.identifiers))[1:] == ("11", "0", "118cdea:2")
+        ),
+        None,
+    )
+    new_device = next(
+        (
+            elem.id
+            for elem in device_entries
+            if next(iter(elem.identifiers))[1:] == ("11", "0", "1118cdea:2")
+        ),
+        None,
+    )
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "automatic_add": False,
+            "device": old_device,
+        },
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "set_device_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "replace_device": new_device,
+        },
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    entity_registry = await async_get_entity_registry(hass)
+
+    entry = entity_registry.async_get("binary_sensor.ac_118cdea_2")
+    assert entry
+    assert entry.device_id == new_device
+    entry = entity_registry.async_get("sensor.ac_118cdea_2_rssi_numeric")
+    assert entry
+    assert entry.device_id == new_device
+    entry = entity_registry.async_get("switch.ac_118cdea_2")
+    assert entry
+    assert entry.device_id == new_device
+
+    state = hass.states.get("binary_sensor.ac_1118cdea_2")
+    assert not state
+    state = hass.states.get("sensor.ac_1118cdea_2_rssi_numeric")
+    assert not state
+    state = hass.states.get("switch.ac_1118cdea_2")
+    assert not state
+
+
+async def test_options_remove_multiple_devices(hass):
+    """Test we can add a device."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "automatic_add": False,
+            "devices": {
+                "0b1100cd0213c7f230010f71": {"device_id": ["11", "0", "213c7f2:48"]},
+                "0b1100100118cdea02010f70": {"device_id": ["11", "0", "118cdea:2"]},
+                "0b1100101118cdea02010f70": {"device_id": ["11", "0", "1118cdea:2"]},
+            },
+        },
+        unique_id=DOMAIN,
+    )
+    entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.ac_213c7f2_48")
+    assert state
+    state = hass.states.get("binary_sensor.ac_118cdea_2")
+    assert state
+    state = hass.states.get("binary_sensor.ac_1118cdea_2")
+    assert state
+
+    device_registry = await async_get_device_registry(hass)
+    device_entries = async_entries_for_config_entry(device_registry, entry.entry_id)
+
+    assert len(device_entries) == 3
+
+    def match_device_id(entry):
+        device_id = next(iter(entry.identifiers))[1:]
+        if device_id == ("11", "0", "213c7f2:48"):
+            return True
+        if device_id == ("11", "0", "118cdea:2"):
+            return True
+        return False
+
+    remove_devices = [elem.id for elem in device_entries if match_device_id(elem)]
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "automatic_add": False,
+            "remove_device": remove_devices,
+        },
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.ac_213c7f2_48")
+    assert not state
+    state = hass.states.get("binary_sensor.ac_118cdea_2")
+    assert not state
+    state = hass.states.get("binary_sensor.ac_1118cdea_2")
+    assert state
+
+
+async def test_options_add_and_configure_device(hass):
+    """Test we can add a device."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        data={
+            "host": None,
+            "port": None,
+            "device": "/dev/tty123",
+            "automatic_add": False,
+            "devices": {},
+        },
+        unique_id=DOMAIN,
+    )
+    entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "automatic_add": True,
+            "event_code": "0913000022670e013970",
+        },
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "set_device_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "fire_event": False,
+            "signal_repetitions": 5,
+            "data_bits": 4,
+            "off_delay": "abcdef",
+            "command_on": "xyz",
+            "command_off": "xyz",
+        },
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "set_device_options"
+    assert result["errors"]
+    assert result["errors"]["off_delay"] == "invalid_input_off_delay"
+    assert result["errors"]["command_on"] == "invalid_input_2262_on"
+    assert result["errors"]["command_off"] == "invalid_input_2262_off"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "fire_event": False,
+            "signal_repetitions": 5,
+            "data_bits": 4,
+            "command_on": "0xE",
+            "command_off": "0x7",
+            "off_delay": "9",
+        },
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    assert entry.data["automatic_add"]
+
+    assert entry.data["devices"]["0913000022670e013970"]
+    assert not entry.data["devices"]["0913000022670e013970"]["fire_event"]
+    assert entry.data["devices"]["0913000022670e013970"]["signal_repetitions"] == 5
+    assert entry.data["devices"]["0913000022670e013970"]["off_delay"] == 9
+
+    state = hass.states.get("binary_sensor.pt2262_22670e")
+    assert state
+    assert state.state == "off"
+    assert state.attributes.get("friendly_name") == "PT2262 22670e"
+
+    device_registry = await async_get_device_registry(hass)
+    device_entries = async_entries_for_config_entry(device_registry, entry.entry_id)
+
+    assert device_entries[0].id
+
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "prompt_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "automatic_add": False,
+            "device": device_entries[0].id,
+        },
+    )
+
+    assert result["type"] == "form"
+    assert result["step_id"] == "set_device_options"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            "fire_event": True,
+            "signal_repetitions": 5,
+            "data_bits": 4,
+            "command_on": "0xE",
+            "command_off": "0x7",
+        },
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+    await hass.async_block_till_done()
+
+    assert entry.data["devices"]["0913000022670e013970"]
+    assert entry.data["devices"]["0913000022670e013970"]["fire_event"]
+    assert entry.data["devices"]["0913000022670e013970"]["signal_repetitions"] == 5
+    assert "delay_off" not in entry.data["devices"]["0913000022670e013970"]
+
+
+def test_get_serial_by_id_no_dir():
+    """Test serial by id conversion if there's no /dev/serial/by-id."""
+    p1 = patch("os.path.isdir", MagicMock(return_value=False))
+    p2 = patch("os.scandir")
+    with p1 as is_dir_mock, p2 as scan_mock:
+        res = config_flow.get_serial_by_id(sentinel.path)
+        assert res is sentinel.path
+        assert is_dir_mock.call_count == 1
+        assert scan_mock.call_count == 0
+
+
+def test_get_serial_by_id():
+    """Test serial by id conversion."""
+    p1 = patch("os.path.isdir", MagicMock(return_value=True))
+    p2 = patch("os.scandir")
+
+    def _realpath(path):
+        if path is sentinel.matched_link:
+            return sentinel.path
+        return sentinel.serial_link_path
+
+    p3 = patch("os.path.realpath", side_effect=_realpath)
+    with p1 as is_dir_mock, p2 as scan_mock, p3:
+        res = config_flow.get_serial_by_id(sentinel.path)
+        assert res is sentinel.path
+        assert is_dir_mock.call_count == 1
+        assert scan_mock.call_count == 1
+
+        entry1 = MagicMock(spec_set=os.DirEntry)
+        entry1.is_symlink.return_value = True
+        entry1.path = sentinel.some_path
+
+        entry2 = MagicMock(spec_set=os.DirEntry)
+        entry2.is_symlink.return_value = False
+        entry2.path = sentinel.other_path
+
+        entry3 = MagicMock(spec_set=os.DirEntry)
+        entry3.is_symlink.return_value = True
+        entry3.path = sentinel.matched_link
+
+        scan_mock.return_value = [entry1, entry2, entry3]
+        res = config_flow.get_serial_by_id(sentinel.path)
+        assert res is sentinel.matched_link
+        assert is_dir_mock.call_count == 2
+        assert scan_mock.call_count == 2
diff --git a/tests/components/rfxtrx/test_cover.py b/tests/components/rfxtrx/test_cover.py
index 05ce26ebc10..b3e5ce224c6 100644
--- a/tests/components/rfxtrx/test_cover.py
+++ b/tests/components/rfxtrx/test_cover.py
@@ -3,19 +3,23 @@ from unittest.mock import call
 
 import pytest
 
+from homeassistant.components.rfxtrx import DOMAIN
 from homeassistant.core import State
-from homeassistant.setup import async_setup_component
 
-from tests.common import mock_restore_cache
+from tests.common import MockConfigEntry, mock_restore_cache
+from tests.components.rfxtrx.conftest import create_rfx_test_cfg
 
 
 async def test_one_cover(hass, rfxtrx):
     """Test with 1 cover."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0b1400cd0213c7f20d010f51": {}}}},
+    entry_data = create_rfx_test_cfg(
+        devices={"0b1400cd0213c7f20d010f51": {"signal_repetitions": 1}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     state = hass.states.get("cover.lightwaverf_siemens_0213c7_242")
@@ -57,11 +61,14 @@ async def test_state_restore(hass, rfxtrx, state):
 
     mock_restore_cache(hass, [State(entity_id, state)])
 
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0b1400cd0213c7f20d010f51": {}}}},
+    entry_data = create_rfx_test_cfg(
+        devices={"0b1400cd0213c7f20d010f51": {"signal_repetitions": 1}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     assert hass.states.get(entity_id).state == state
@@ -69,20 +76,18 @@ async def test_state_restore(hass, rfxtrx, state):
 
 async def test_several_covers(hass, rfxtrx):
     """Test with 3 covers."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0b1400cd0213c7f20d010f51": {},
-                    "0A1400ADF394AB010D0060": {},
-                    "09190000009ba8010100": {},
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0b1400cd0213c7f20d010f51": {"signal_repetitions": 1},
+            "0A1400ADF394AB010D0060": {"signal_repetitions": 1},
+            "09190000009ba8010100": {"signal_repetitions": 1},
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     state = hass.states.get("cover.lightwaverf_siemens_0213c7_242")
@@ -118,19 +123,17 @@ async def test_discover_covers(hass, rfxtrx_automatic):
 
 async def test_duplicate_cover(hass, rfxtrx):
     """Test with 2 duplicate covers."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0b1400cd0213c7f20d010f51": {},
-                    "0b1400cd0213c7f20d010f50": {},
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0b1400cd0213c7f20d010f51": {"signal_repetitions": 1},
+            "0b1400cd0213c7f20d010f50": {"signal_repetitions": 1},
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     state = hass.states.get("cover.lightwaverf_siemens_0213c7_242")
diff --git a/tests/components/rfxtrx/test_init.py b/tests/components/rfxtrx/test_init.py
index abe7c3c0441..037b08b7cc6 100644
--- a/tests/components/rfxtrx/test_init.py
+++ b/tests/components/rfxtrx/test_init.py
@@ -1,10 +1,13 @@
 """The tests for the Rfxtrx component."""
 
+from homeassistant.components.rfxtrx import DOMAIN
 from homeassistant.components.rfxtrx.const import EVENT_RFXTRX_EVENT
 from homeassistant.core import callback
 from homeassistant.setup import async_setup_component
 
 from tests.async_mock import call
+from tests.common import MockConfigEntry
+from tests.components.rfxtrx.conftest import create_rfx_test_cfg
 
 
 async def test_valid_config(hass):
@@ -55,21 +58,19 @@ async def test_invalid_config(hass):
 
 async def test_fire_event(hass, rfxtrx):
     """Test fire event."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "/dev/serial/by-id/usb"
-                + "-RFXCOM_RFXtrx433_A1Y0NJGR-if00-port0",
-                "automatic_add": True,
-                "devices": {
-                    "0b1100cd0213c7f210010f51": {"fire_event": True},
-                    "0716000100900970": {"fire_event": True},
-                },
-            }
+    entry_data = create_rfx_test_cfg(
+        device="/dev/serial/by-id/usb-RFXCOM_RFXtrx433_A1Y0NJGR-if00-port0",
+        automatic_add=True,
+        devices={
+            "0b1100cd0213c7f210010f51": {"fire_event": True},
+            "0716000100900970": {"fire_event": True},
         },
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -101,16 +102,19 @@ async def test_fire_event(hass, rfxtrx):
             "type_string": "Byron SX",
             "id_string": "00:90",
             "data": "0716000100900970",
-            "values": {"Sound": 9, "Battery numeric": 0, "Rssi numeric": 7},
+            "values": {"Command": "Chime", "Rssi numeric": 7, "Sound": 9},
         },
     ]
 
 
 async def test_send(hass, rfxtrx):
     """Test configuration."""
-    assert await async_setup_component(
-        hass, "rfxtrx", {"rfxtrx": {"device": "/dev/null"}}
-    )
+    entry_data = create_rfx_test_cfg(device="/dev/null", devices={})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     await hass.services.async_call(
diff --git a/tests/components/rfxtrx/test_light.py b/tests/components/rfxtrx/test_light.py
index f6f056fa16a..78151c5fa9c 100644
--- a/tests/components/rfxtrx/test_light.py
+++ b/tests/components/rfxtrx/test_light.py
@@ -4,19 +4,23 @@ from unittest.mock import call
 import pytest
 
 from homeassistant.components.light import ATTR_BRIGHTNESS
+from homeassistant.components.rfxtrx import DOMAIN
 from homeassistant.core import State
-from homeassistant.setup import async_setup_component
 
-from tests.common import mock_restore_cache
+from tests.common import MockConfigEntry, mock_restore_cache
+from tests.components.rfxtrx.conftest import create_rfx_test_cfg
 
 
 async def test_one_light(hass, rfxtrx):
     """Test with 1 light."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0b1100cd0213c7f210020f51": {}}}},
+    entry_data = create_rfx_test_cfg(
+        devices={"0b1100cd0213c7f210020f51": {"signal_repetitions": 1}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     state = hass.states.get("light.ac_213c7f2_16")
@@ -95,11 +99,14 @@ async def test_state_restore(hass, rfxtrx, state, brightness):
         hass, [State(entity_id, state, attributes={ATTR_BRIGHTNESS: brightness})]
     )
 
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0b1100cd0213c7f210020f51": {}}}},
+    entry_data = create_rfx_test_cfg(
+        devices={"0b1100cd0213c7f210020f51": {"signal_repetitions": 1}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     assert hass.states.get(entity_id).state == state
@@ -108,20 +115,18 @@ async def test_state_restore(hass, rfxtrx, state, brightness):
 
 async def test_several_lights(hass, rfxtrx):
     """Test with 3 lights."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0b1100cd0213c7f230020f71": {},
-                    "0b1100100118cdea02020f70": {},
-                    "0b1100101118cdea02050f70": {},
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0b1100cd0213c7f230020f71": {"signal_repetitions": 1},
+            "0b1100100118cdea02020f70": {"signal_repetitions": 1},
+            "0b1100101118cdea02050f70": {"signal_repetitions": 1},
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -160,18 +165,14 @@ async def test_several_lights(hass, rfxtrx):
 @pytest.mark.parametrize("repetitions", [1, 3])
 async def test_repetitions(hass, rfxtrx, repetitions):
     """Test signal repetitions."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0b1100cd0213c7f230020f71": {"signal_repetitions": repetitions}
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={"0b1100cd0213c7f230020f71": {"signal_repetitions": repetitions}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     await hass.services.async_call(
diff --git a/tests/components/rfxtrx/test_sensor.py b/tests/components/rfxtrx/test_sensor.py
index d0100e4ea14..77f9960de49 100644
--- a/tests/components/rfxtrx/test_sensor.py
+++ b/tests/components/rfxtrx/test_sensor.py
@@ -1,19 +1,28 @@
 """The tests for the Rfxtrx sensor platform."""
 import pytest
 
+from homeassistant.components.rfxtrx import DOMAIN
 from homeassistant.components.rfxtrx.const import ATTR_EVENT
-from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, PERCENTAGE, TEMP_CELSIUS
+from homeassistant.const import (
+    ATTR_UNIT_OF_MEASUREMENT,
+    PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    TEMP_CELSIUS,
+)
 from homeassistant.core import State
-from homeassistant.setup import async_setup_component
 
-from tests.common import mock_restore_cache
+from tests.common import MockConfigEntry, mock_restore_cache
+from tests.components.rfxtrx.conftest import create_rfx_test_cfg
 
 
 async def test_default_config(hass, rfxtrx):
     """Test with 0 sensor."""
-    await async_setup_component(
-        hass, "sensor", {"sensor": {"platform": "rfxtrx", "devices": {}}}
-    )
+    entry_data = create_rfx_test_cfg(devices={})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     assert len(hass.states.async_all()) == 0
@@ -21,11 +30,12 @@ async def test_default_config(hass, rfxtrx):
 
 async def test_one_sensor(hass, rfxtrx):
     """Test with 1 sensor."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0a52080705020095220269": {}}}},
-    )
+    entry_data = create_rfx_test_cfg(devices={"0a52080705020095220269": {}})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     state = hass.states.get("sensor.wt260_wt260h_wt440h_wt450_wt450h_05_02_temperature")
@@ -49,11 +59,12 @@ async def test_state_restore(hass, rfxtrx, state, event):
 
     mock_restore_cache(hass, [State(entity_id, state, attributes={ATTR_EVENT: event})])
 
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0a520801070100b81b0279": {}}}},
-    )
+    entry_data = create_rfx_test_cfg(devices={"0a520801070100b81b0279": {}})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     assert hass.states.get(entity_id).state == state
@@ -61,11 +72,12 @@ async def test_state_restore(hass, rfxtrx, state, event):
 
 async def test_one_sensor_no_datatype(hass, rfxtrx):
     """Test with 1 sensor."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0a52080705020095220269": {}}}},
-    )
+    entry_data = create_rfx_test_cfg(devices={"0a52080705020095220269": {}})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     base_id = "sensor.wt260_wt260h_wt440h_wt450_wt450h_05_02"
@@ -93,7 +105,10 @@ async def test_one_sensor_no_datatype(hass, rfxtrx):
     assert state
     assert state.state == "unknown"
     assert state.attributes.get("friendly_name") == f"{base_name} Rssi numeric"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
+    assert (
+        state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        == SIGNAL_STRENGTH_DECIBELS_MILLIWATT
+    )
 
     state = hass.states.get(f"{base_id}_battery_numeric")
     assert state
@@ -104,19 +119,17 @@ async def test_one_sensor_no_datatype(hass, rfxtrx):
 
 async def test_several_sensors(hass, rfxtrx):
     """Test with 3 sensors."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0a52080705020095220269": {},
-                    "0a520802060100ff0e0269": {},
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0a52080705020095220269": {},
+            "0a520802060100ff0e0269": {},
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -169,7 +182,10 @@ async def test_discover_sensor(hass, rfxtrx_automatic):
     state = hass.states.get(f"{base_id}_rssi_numeric")
     assert state
     assert state.state == "-64"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
+    assert (
+        state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        == SIGNAL_STRENGTH_DECIBELS_MILLIWATT
+    )
 
     state = hass.states.get(f"{base_id}_temperature")
     assert state
@@ -198,7 +214,10 @@ async def test_discover_sensor(hass, rfxtrx_automatic):
     state = hass.states.get(f"{base_id}_rssi_numeric")
     assert state
     assert state.state == "-64"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
+    assert (
+        state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        == SIGNAL_STRENGTH_DECIBELS_MILLIWATT
+    )
 
     state = hass.states.get(f"{base_id}_temperature")
     assert state
@@ -227,7 +246,10 @@ async def test_discover_sensor(hass, rfxtrx_automatic):
     state = hass.states.get(f"{base_id}_rssi_numeric")
     assert state
     assert state.state == "-64"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
+    assert (
+        state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        == SIGNAL_STRENGTH_DECIBELS_MILLIWATT
+    )
 
     state = hass.states.get(f"{base_id}_temperature")
     assert state
@@ -244,19 +266,17 @@ async def test_discover_sensor(hass, rfxtrx_automatic):
 
 async def test_update_of_sensors(hass, rfxtrx):
     """Test with 3 sensors."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0a52080705020095220269": {},
-                    "0a520802060100ff0e0269": {},
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0a52080705020095220269": {},
+            "0a520802060100ff0e0269": {},
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -290,23 +310,21 @@ async def test_update_of_sensors(hass, rfxtrx):
 
 async def test_rssi_sensor(hass, rfxtrx):
     """Test with 1 sensor."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0913000022670e013b70": {
-                        "data_bits": 4,
-                        "command_on": 0xE,
-                        "command_off": 0x7,
-                    },
-                    "0b1100cd0213c7f230010f71": {},
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0913000022670e013b70": {
+                "data_bits": 4,
+                "command_on": 0xE,
+                "command_off": 0x7,
+            },
+            "0b1100cd0213c7f230010f71": {},
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -314,13 +332,19 @@ async def test_rssi_sensor(hass, rfxtrx):
     assert state
     assert state.state == "unknown"
     assert state.attributes.get("friendly_name") == "PT2262 22670e Rssi numeric"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
+    assert (
+        state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        == SIGNAL_STRENGTH_DECIBELS_MILLIWATT
+    )
 
     state = hass.states.get("sensor.ac_213c7f2_48_rssi_numeric")
     assert state
     assert state.state == "unknown"
     assert state.attributes.get("friendly_name") == "AC 213c7f2:48 Rssi numeric"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "dBm"
+    assert (
+        state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        == SIGNAL_STRENGTH_DECIBELS_MILLIWATT
+    )
 
     await rfxtrx.signal("0913000022670e013b70")
     await rfxtrx.signal("0b1100cd0213c7f230010f71")
diff --git a/tests/components/rfxtrx/test_switch.py b/tests/components/rfxtrx/test_switch.py
index 1fed6a65562..ee4fd265fc9 100644
--- a/tests/components/rfxtrx/test_switch.py
+++ b/tests/components/rfxtrx/test_switch.py
@@ -5,9 +5,9 @@ import pytest
 
 from homeassistant.components.rfxtrx import DOMAIN
 from homeassistant.core import State
-from homeassistant.setup import async_setup_component
 
-from tests.common import mock_restore_cache
+from tests.common import MockConfigEntry, mock_restore_cache
+from tests.components.rfxtrx.conftest import create_rfx_test_cfg
 
 EVENT_RFY_ENABLE_SUN_AUTO = "081a00000301010113"
 EVENT_RFY_DISABLE_SUN_AUTO = "081a00000301010114"
@@ -15,11 +15,14 @@ EVENT_RFY_DISABLE_SUN_AUTO = "081a00000301010114"
 
 async def test_one_switch(hass, rfxtrx):
     """Test with 1 switch."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0b1100cd0213c7f210010f51": {}}}},
+    entry_data = create_rfx_test_cfg(
+        devices={"0b1100cd0213c7f210010f51": {"signal_repetitions": 1}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     state = hass.states.get("switch.ac_213c7f2_16")
@@ -55,11 +58,14 @@ async def test_state_restore(hass, rfxtrx, state):
 
     mock_restore_cache(hass, [State(entity_id, state)])
 
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {"rfxtrx": {"device": "abcd", "devices": {"0b1100cd0213c7f210010f51": {}}}},
+    entry_data = create_rfx_test_cfg(
+        devices={"0b1100cd0213c7f210010f51": {"signal_repetitions": 1}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     assert hass.states.get(entity_id).state == state
@@ -67,20 +73,18 @@ async def test_state_restore(hass, rfxtrx, state):
 
 async def test_several_switches(hass, rfxtrx):
     """Test with 3 switches."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0b1100cd0213c7f230010f71": {},
-                    "0b1100100118cdea02010f70": {},
-                    "0b1100101118cdea02010f70": {},
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={
+            "0b1100cd0213c7f230010f71": {"signal_repetitions": 1},
+            "0b1100100118cdea02010f70": {"signal_repetitions": 1},
+            "0b1100101118cdea02010f70": {"signal_repetitions": 1},
+        }
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     state = hass.states.get("switch.ac_213c7f2_48")
@@ -102,18 +106,14 @@ async def test_several_switches(hass, rfxtrx):
 @pytest.mark.parametrize("repetitions", [1, 3])
 async def test_repetitions(hass, rfxtrx, repetitions):
     """Test signal repetitions."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {
-                    "0b1100cd0213c7f230010f71": {"signal_repetitions": repetitions}
-                },
-            }
-        },
+    entry_data = create_rfx_test_cfg(
+        devices={"0b1100cd0213c7f230010f71": {"signal_repetitions": repetitions}}
     )
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     await hass.services.async_call(
@@ -156,16 +156,12 @@ async def test_discover_rfy_sun_switch(hass, rfxtrx_automatic):
 
 async def test_unknown_event_code(hass, rfxtrx):
     """Test with 3 switches."""
-    assert await async_setup_component(
-        hass,
-        "rfxtrx",
-        {
-            "rfxtrx": {
-                "device": "abcd",
-                "devices": {"1234567890": {}},
-            }
-        },
-    )
+    entry_data = create_rfx_test_cfg(devices={"1234567890": {"signal_repetitions": 1}})
+    mock_entry = MockConfigEntry(domain="rfxtrx", unique_id=DOMAIN, data=entry_data)
+
+    mock_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(mock_entry.entry_id)
     await hass.async_block_till_done()
 
     conf_entries = hass.config_entries.async_entries(DOMAIN)
diff --git a/tests/components/ring/test_init.py b/tests/components/ring/test_init.py
index 4ad056150dd..c7a87ae880a 100644
--- a/tests/components/ring/test_init.py
+++ b/tests/components/ring/test_init.py
@@ -1,13 +1,10 @@
 """The tests for the Ring component."""
-from asyncio import run_coroutine_threadsafe
 from datetime import timedelta
-import unittest
-
-import requests_mock
 
 import homeassistant.components.ring as ring
+from homeassistant.setup import async_setup_component
 
-from tests.common import get_test_home_assistant, load_fixture
+from tests.common import load_fixture
 
 ATTRIBUTION = "Data provided by Ring.com"
 
@@ -16,43 +13,28 @@ VALID_CONFIG = {
 }
 
 
-class TestRing(unittest.TestCase):
-    """Tests the Ring component."""
+async def test_setup(hass, requests_mock):
+    """Test the setup."""
+    await async_setup_component(hass, ring.DOMAIN, {})
 
-    def setUp(self):
-        """Initialize values for this test case class."""
-        self.hass = get_test_home_assistant()
-        self.config = VALID_CONFIG
-        self.addCleanup(self.tear_down_cleanup)
+    requests_mock.post(
+        "https://oauth.ring.com/oauth/token", text=load_fixture("ring_oauth.json")
+    )
+    requests_mock.post(
+        "https://api.ring.com/clients_api/session",
+        text=load_fixture("ring_session.json"),
+    )
+    requests_mock.get(
+        "https://api.ring.com/clients_api/ring_devices",
+        text=load_fixture("ring_devices.json"),
+    )
+    requests_mock.get(
+        "https://api.ring.com/clients_api/chimes/999999/health",
+        text=load_fixture("ring_chime_health_attrs.json"),
+    )
+    requests_mock.get(
+        "https://api.ring.com/clients_api/doorbots/987652/health",
+        text=load_fixture("ring_doorboot_health_attrs.json"),
+    )
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    @requests_mock.Mocker()
-    def test_setup(self, mock):
-        """Test the setup."""
-        mock.post(
-            "https://oauth.ring.com/oauth/token", text=load_fixture("ring_oauth.json")
-        )
-        mock.post(
-            "https://api.ring.com/clients_api/session",
-            text=load_fixture("ring_session.json"),
-        )
-        mock.get(
-            "https://api.ring.com/clients_api/ring_devices",
-            text=load_fixture("ring_devices.json"),
-        )
-        mock.get(
-            "https://api.ring.com/clients_api/chimes/999999/health",
-            text=load_fixture("ring_chime_health_attrs.json"),
-        )
-        mock.get(
-            "https://api.ring.com/clients_api/doorbots/987652/health",
-            text=load_fixture("ring_doorboot_health_attrs.json"),
-        )
-        response = run_coroutine_threadsafe(
-            ring.async_setup(self.hass, self.config), self.hass.loop
-        ).result()
-
-        assert response
+    assert await ring.async_setup(hass, VALID_CONFIG)
diff --git a/tests/components/ruckus_unleashed/__init__.py b/tests/components/ruckus_unleashed/__init__.py
new file mode 100644
index 00000000000..7efbfc03457
--- /dev/null
+++ b/tests/components/ruckus_unleashed/__init__.py
@@ -0,0 +1,92 @@
+"""Tests for the Ruckus Unleashed integration."""
+from homeassistant.components.ruckus_unleashed import DOMAIN
+from homeassistant.components.ruckus_unleashed.const import (
+    API_ACCESS_POINT,
+    API_AP,
+    API_DEVICE_NAME,
+    API_ID,
+    API_IP,
+    API_MAC,
+    API_MODEL,
+    API_NAME,
+    API_SERIAL,
+    API_SYSTEM_OVERVIEW,
+    API_VERSION,
+)
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
+
+from tests.async_mock import patch
+from tests.common import MockConfigEntry
+
+DEFAULT_TITLE = "Ruckus Mesh"
+DEFAULT_UNIQUE_ID = "123456789012"
+DEFAULT_SYSTEM_INFO = {
+    API_SYSTEM_OVERVIEW: {
+        API_SERIAL: DEFAULT_UNIQUE_ID,
+        API_VERSION: "v1.0.0",
+    }
+}
+DEFAULT_AP_INFO = {
+    API_AP: {
+        API_ID: {
+            "1": {
+                API_MAC: "00:11:22:33:44:55",
+                API_DEVICE_NAME: "Test Device",
+                API_MODEL: "r510",
+            }
+        }
+    }
+}
+
+CONFIG = {
+    CONF_HOST: "1.1.1.1",
+    CONF_USERNAME: "test-username",
+    CONF_PASSWORD: "test-password",
+}
+
+TEST_CLIENT_ENTITY_ID = "device_tracker.ruckus_test_device"
+TEST_CLIENT = {
+    API_IP: "1.1.1.2",
+    API_MAC: "AA:BB:CC:DD:EE:FF",
+    API_NAME: "Ruckus Test Device",
+    API_ACCESS_POINT: "00:11:22:33:44:55",
+}
+
+
+def mock_config_entry() -> MockConfigEntry:
+    """Return a Ruckus Unleashed mock config entry."""
+    return MockConfigEntry(
+        domain=DOMAIN,
+        title=DEFAULT_TITLE,
+        unique_id=DEFAULT_UNIQUE_ID,
+        data=CONFIG,
+        options=None,
+    )
+
+
+async def init_integration(hass) -> MockConfigEntry:
+    """Set up the Ruckus Unleashed integration in Home Assistant."""
+    entry = mock_config_entry()
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.connect",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.mesh_name",
+        return_value=DEFAULT_TITLE,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.system_info",
+        return_value=DEFAULT_SYSTEM_INFO,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.ap_info",
+        return_value=DEFAULT_AP_INFO,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.RuckusUnleashedDataUpdateCoordinator._fetch_clients",
+        return_value={
+            TEST_CLIENT[API_MAC]: TEST_CLIENT,
+        },
+    ):
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    return entry
diff --git a/tests/components/ruckus_unleashed/test_config_flow.py b/tests/components/ruckus_unleashed/test_config_flow.py
new file mode 100644
index 00000000000..8348ec4f2a8
--- /dev/null
+++ b/tests/components/ruckus_unleashed/test_config_flow.py
@@ -0,0 +1,172 @@
+"""Test the Ruckus Unleashed config flow."""
+from datetime import timedelta
+
+from pyruckus.exceptions import AuthenticationError
+
+from homeassistant import config_entries
+from homeassistant.components.ruckus_unleashed.const import DOMAIN
+from homeassistant.util import utcnow
+
+from tests.async_mock import patch
+from tests.common import async_fire_time_changed
+from tests.components.ruckus_unleashed import CONFIG, DEFAULT_SYSTEM_INFO, DEFAULT_TITLE
+
+
+async def test_form(hass):
+    """Test we get the form."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == "form"
+    assert result["errors"] == {}
+
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.connect",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.mesh_name",
+        return_value=DEFAULT_TITLE,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.system_info",
+        return_value=DEFAULT_SYSTEM_INFO,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.async_setup", return_value=True
+    ) as mock_setup, patch(
+        "homeassistant.components.ruckus_unleashed.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            CONFIG,
+        )
+
+    assert result2["type"] == "create_entry"
+    assert result2["title"] == DEFAULT_TITLE
+    assert result2["data"] == CONFIG
+    await hass.async_block_till_done()
+    assert len(mock_setup.mock_calls) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
+async def test_form_invalid_auth(hass):
+    """Test we handle invalid auth."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.connect",
+        side_effect=AuthenticationError,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            CONFIG,
+        )
+
+    assert result2["type"] == "form"
+    assert result2["errors"] == {"base": "invalid_auth"}
+
+
+async def test_form_cannot_connect(hass):
+    """Test we handle cannot connect error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.connect",
+        side_effect=ConnectionError,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            CONFIG,
+        )
+
+    assert result2["type"] == "form"
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_form_unknown_error(hass):
+    """Test we handle unknown error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.connect",
+        side_effect=Exception,
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            CONFIG,
+        )
+
+    assert result2["type"] == "form"
+    assert result2["errors"] == {"base": "unknown"}
+
+
+async def test_form_cannot_connect_unknown_serial(hass):
+    """Test we handle cannot connect error on invalid serial number."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == "form"
+    assert result["errors"] == {}
+
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.connect",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.mesh_name",
+        return_value=DEFAULT_TITLE,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.system_info",
+        return_value={},
+    ):
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            CONFIG,
+        )
+
+    assert result2["type"] == "form"
+    assert result2["errors"] == {"base": "cannot_connect"}
+
+
+async def test_form_duplicate_error(hass):
+    """Test we handle duplicate error."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.connect",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.mesh_name",
+        return_value=DEFAULT_TITLE,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.system_info",
+        return_value=DEFAULT_SYSTEM_INFO,
+    ):
+        await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            CONFIG,
+        )
+
+        future = utcnow() + timedelta(minutes=60)
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": config_entries.SOURCE_USER}
+        )
+        assert result["type"] == "form"
+        assert result["errors"] == {}
+
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            CONFIG,
+        )
+
+    assert result2["type"] == "abort"
+    assert result2["reason"] == "already_configured"
diff --git a/tests/components/ruckus_unleashed/test_device_tracker.py b/tests/components/ruckus_unleashed/test_device_tracker.py
new file mode 100644
index 00000000000..38736b0117f
--- /dev/null
+++ b/tests/components/ruckus_unleashed/test_device_tracker.py
@@ -0,0 +1,135 @@
+"""The sensor tests for the Ruckus Unleashed platform."""
+from datetime import timedelta
+
+from homeassistant.components.ruckus_unleashed import API_MAC, DOMAIN
+from homeassistant.components.ruckus_unleashed.const import API_AP, API_ID, API_NAME
+from homeassistant.const import STATE_HOME, STATE_NOT_HOME, STATE_UNAVAILABLE
+from homeassistant.helpers import entity_registry
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.util import utcnow
+
+from tests.async_mock import patch
+from tests.common import async_fire_time_changed
+from tests.components.ruckus_unleashed import (
+    DEFAULT_AP_INFO,
+    DEFAULT_SYSTEM_INFO,
+    DEFAULT_TITLE,
+    DEFAULT_UNIQUE_ID,
+    TEST_CLIENT,
+    TEST_CLIENT_ENTITY_ID,
+    init_integration,
+    mock_config_entry,
+)
+
+
+async def test_client_connected(hass):
+    """Test client connected."""
+    await init_integration(hass)
+
+    future = utcnow() + timedelta(minutes=60)
+    with patch(
+        "homeassistant.components.ruckus_unleashed.RuckusUnleashedDataUpdateCoordinator._fetch_clients",
+        return_value={
+            TEST_CLIENT[API_MAC]: TEST_CLIENT,
+        },
+    ):
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+        await hass.helpers.entity_component.async_update_entity(TEST_CLIENT_ENTITY_ID)
+
+    test_client = hass.states.get(TEST_CLIENT_ENTITY_ID)
+    assert test_client.state == STATE_HOME
+
+
+async def test_client_disconnected(hass):
+    """Test client disconnected."""
+    await init_integration(hass)
+
+    future = utcnow() + timedelta(minutes=60)
+    with patch(
+        "homeassistant.components.ruckus_unleashed.RuckusUnleashedDataUpdateCoordinator._fetch_clients",
+        return_value={},
+    ):
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+        await hass.helpers.entity_component.async_update_entity(TEST_CLIENT_ENTITY_ID)
+        test_client = hass.states.get(TEST_CLIENT_ENTITY_ID)
+        assert test_client.state == STATE_NOT_HOME
+
+
+async def test_clients_update_failed(hass):
+    """Test failed update."""
+    await init_integration(hass)
+
+    future = utcnow() + timedelta(minutes=60)
+    with patch(
+        "homeassistant.components.ruckus_unleashed.RuckusUnleashedDataUpdateCoordinator._fetch_clients",
+        side_effect=ConnectionError,
+    ):
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+        await hass.helpers.entity_component.async_update_entity(TEST_CLIENT_ENTITY_ID)
+        test_client = hass.states.get(TEST_CLIENT_ENTITY_ID)
+        assert test_client.state == STATE_UNAVAILABLE
+
+
+async def test_restoring_clients(hass):
+    """Test restoring existing device_tracker entities if not detected on startup."""
+    entry = mock_config_entry()
+    entry.add_to_hass(hass)
+
+    registry = await entity_registry.async_get_registry(hass)
+    registry.async_get_or_create(
+        "device_tracker",
+        DOMAIN,
+        DEFAULT_UNIQUE_ID,
+        suggested_object_id="ruckus_test_device",
+        config_entry=entry,
+    )
+
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.connect",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.mesh_name",
+        return_value=DEFAULT_TITLE,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.system_info",
+        return_value=DEFAULT_SYSTEM_INFO,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.ap_info",
+        return_value=DEFAULT_AP_INFO,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.RuckusUnleashedDataUpdateCoordinator._fetch_clients",
+        return_value={},
+    ):
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    device = hass.states.get(TEST_CLIENT_ENTITY_ID)
+    assert device is not None
+    assert device.state == STATE_NOT_HOME
+
+
+async def test_client_device_setup(hass):
+    """Test a client device is created."""
+    await init_integration(hass)
+
+    router_info = DEFAULT_AP_INFO[API_AP][API_ID]["1"]
+
+    device_registry = await hass.helpers.device_registry.async_get_registry()
+    client_device = device_registry.async_get_device(
+        identifiers={},
+        connections={(CONNECTION_NETWORK_MAC, TEST_CLIENT[API_MAC])},
+    )
+    router_device = device_registry.async_get_device(
+        identifiers={(CONNECTION_NETWORK_MAC, router_info[API_MAC])},
+        connections={(CONNECTION_NETWORK_MAC, router_info[API_MAC])},
+    )
+
+    assert client_device
+    assert client_device.name == TEST_CLIENT[API_NAME]
+    assert client_device.via_device_id == router_device.id
diff --git a/tests/components/ruckus_unleashed/test_init.py b/tests/components/ruckus_unleashed/test_init.py
new file mode 100644
index 00000000000..5c694a5ee24
--- /dev/null
+++ b/tests/components/ruckus_unleashed/test_init.py
@@ -0,0 +1,114 @@
+"""Test the Ruckus Unleashed config flow."""
+from pyruckus.exceptions import AuthenticationError
+
+from homeassistant.components.ruckus_unleashed import (
+    API_AP,
+    API_DEVICE_NAME,
+    API_ID,
+    API_MAC,
+    API_MODEL,
+    API_SYSTEM_OVERVIEW,
+    API_VERSION,
+    DOMAIN,
+    MANUFACTURER,
+)
+from homeassistant.config_entries import (
+    ENTRY_STATE_LOADED,
+    ENTRY_STATE_NOT_LOADED,
+    ENTRY_STATE_SETUP_RETRY,
+)
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+
+from tests.async_mock import patch
+from tests.components.ruckus_unleashed import (
+    DEFAULT_AP_INFO,
+    DEFAULT_SYSTEM_INFO,
+    DEFAULT_TITLE,
+    init_integration,
+    mock_config_entry,
+)
+
+
+async def test_setup_entry_login_error(hass):
+    """Test entry setup failed due to login error."""
+    entry = mock_config_entry()
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus",
+        side_effect=AuthenticationError,
+    ):
+        entry.add_to_hass(hass)
+        result = await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert result is False
+
+
+async def test_setup_entry_connection_error(hass):
+    """Test entry setup failed due to connection error."""
+    entry = mock_config_entry()
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus",
+        side_effect=ConnectionError,
+    ):
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert entry.state == ENTRY_STATE_SETUP_RETRY
+
+
+async def test_router_device_setup(hass):
+    """Test a router device is created."""
+    await init_integration(hass)
+
+    device_info = DEFAULT_AP_INFO[API_AP][API_ID]["1"]
+
+    device_registry = await hass.helpers.device_registry.async_get_registry()
+    device = device_registry.async_get_device(
+        identifiers={(CONNECTION_NETWORK_MAC, device_info[API_MAC])},
+        connections={(CONNECTION_NETWORK_MAC, device_info[API_MAC])},
+    )
+
+    assert device
+    assert device.manufacturer == MANUFACTURER
+    assert device.model == device_info[API_MODEL]
+    assert device.name == device_info[API_DEVICE_NAME]
+    assert device.sw_version == DEFAULT_SYSTEM_INFO[API_SYSTEM_OVERVIEW][API_VERSION]
+    assert device.via_device_id is None
+
+
+async def test_unload_entry(hass):
+    """Test successful unload of entry."""
+    entry = await init_integration(hass)
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert entry.state == ENTRY_STATE_LOADED
+
+    assert await hass.config_entries.async_unload(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert entry.state == ENTRY_STATE_NOT_LOADED
+    assert not hass.data.get(DOMAIN)
+
+
+async def test_config_not_ready_during_setup(hass):
+    """Test we throw a ConfigNotReady if Coordinator update fails."""
+    entry = mock_config_entry()
+    with patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.connect",
+        return_value=None,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.mesh_name",
+        return_value=DEFAULT_TITLE,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.Ruckus.system_info",
+        return_value=DEFAULT_SYSTEM_INFO,
+    ), patch(
+        "homeassistant.components.ruckus_unleashed.RuckusUnleashedDataUpdateCoordinator._async_update_data",
+        side_effect=ConnectionError,
+    ):
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
+
+    assert entry.state == ENTRY_STATE_SETUP_RETRY
diff --git a/tests/components/samsungtv/test_config_flow.py b/tests/components/samsungtv/test_config_flow.py
index 0e83255c6e3..f8a362e9842 100644
--- a/tests/components/samsungtv/test_config_flow.py
+++ b/tests/components/samsungtv/test_config_flow.py
@@ -211,7 +211,7 @@ async def test_user_not_successful(hass):
             DOMAIN, context={"source": "user"}, data=MOCK_USER_DATA
         )
         assert result["type"] == "abort"
-        assert result["reason"] == "not_successful"
+        assert result["reason"] == "cannot_connect"
 
 
 async def test_user_not_successful_2(hass):
@@ -229,7 +229,7 @@ async def test_user_not_successful_2(hass):
             DOMAIN, context={"source": "user"}, data=MOCK_USER_DATA
         )
         assert result["type"] == "abort"
-        assert result["reason"] == "not_successful"
+        assert result["reason"] == "cannot_connect"
 
 
 async def test_user_already_configured(hass, remote):
@@ -389,7 +389,7 @@ async def test_ssdp_not_successful(hass):
             result["flow_id"], user_input="whatever"
         )
         assert result["type"] == "abort"
-        assert result["reason"] == "not_successful"
+        assert result["reason"] == "cannot_connect"
 
 
 async def test_ssdp_not_successful_2(hass):
@@ -416,7 +416,7 @@ async def test_ssdp_not_successful_2(hass):
             result["flow_id"], user_input="whatever"
         )
         assert result["type"] == "abort"
-        assert result["reason"] == "not_successful"
+        assert result["reason"] == "cannot_connect"
 
 
 async def test_ssdp_already_in_progress(hass, remote):
@@ -570,7 +570,7 @@ async def test_autodetect_none(hass, remote, remotews):
             DOMAIN, context={"source": "user"}, data=MOCK_USER_DATA
         )
         assert result["type"] == "abort"
-        assert result["reason"] == "not_successful"
+        assert result["reason"] == "cannot_connect"
         assert remote.call_count == 1
         assert remote.call_args_list == [
             call(AUTODETECT_LEGACY),
diff --git a/tests/components/scene/test_init.py b/tests/components/scene/test_init.py
index 7f8308d3e20..44696e6f370 100644
--- a/tests/components/scene/test_init.py
+++ b/tests/components/scene/test_init.py
@@ -1,149 +1,143 @@
 """The tests for the Scene component."""
 import io
-import unittest
+
+import pytest
 
 from homeassistant.components import light, scene
-from homeassistant.setup import async_setup_component, setup_component
+from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_ON
+from homeassistant.setup import async_setup_component
 from homeassistant.util.yaml import loader as yaml_loader
 
-from tests.common import get_test_home_assistant, mock_service
-from tests.components.light import common as common_light
-from tests.components.scene import common
+from tests.common import async_mock_service
 
 
-class TestScene(unittest.TestCase):
-    """Test the scene component."""
+@pytest.fixture(autouse=True)
+def entities(hass):
+    """Initialize the test light."""
+    platform = getattr(hass.components, "test.light")
+    platform.init()
+    yield platform.ENTITIES[0:2]
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        test_light = getattr(self.hass.components, "test.light")
-        test_light.init()
 
-        assert setup_component(
-            self.hass, light.DOMAIN, {light.DOMAIN: {"platform": "test"}}
-        )
-        self.hass.block_till_done()
+async def test_config_yaml_alias_anchor(hass, entities):
+    """Test the usage of YAML aliases and anchors.
 
-        self.light_1, self.light_2 = test_light.ENTITIES[0:2]
+    The following test scene configuration is equivalent to:
 
-        common_light.turn_off(
-            self.hass, [self.light_1.entity_id, self.light_2.entity_id]
-        )
+    scene:
+      - name: test
+        entities:
+          light_1: &light_1_state
+            state: 'on'
+            brightness: 100
+          light_2: *light_1_state
 
-        self.hass.block_till_done()
+    When encountering a YAML alias/anchor, the PyYAML parser will use a
+    reference to the original dictionary, instead of creating a copy, so
+    care needs to be taken to not modify the original.
+    """
+    light_1, light_2 = await setup_lights(hass, entities)
+    entity_state = {"state": "on", "brightness": 100}
 
-        assert not self.light_1.is_on
-        assert not self.light_2.is_on
-        self.addCleanup(self.tear_down_cleanup)
+    assert await async_setup_component(
+        hass,
+        scene.DOMAIN,
+        {
+            "scene": [
+                {
+                    "name": "test",
+                    "entities": {
+                        light_1.entity_id: entity_state,
+                        light_2.entity_id: entity_state,
+                    },
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+    await activate(hass, "scene.test")
 
-    def test_config_yaml_alias_anchor(self):
-        """Test the usage of YAML aliases and anchors.
+    assert light.is_on(hass, light_1.entity_id)
+    assert light.is_on(hass, light_2.entity_id)
+    assert 100 == light_1.last_call("turn_on")[1].get("brightness")
+    assert 100 == light_2.last_call("turn_on")[1].get("brightness")
 
-        The following test scene configuration is equivalent to:
 
-        scene:
-          - name: test
-            entities:
-              light_1: &light_1_state
-                state: 'on'
-                brightness: 100
-              light_2: *light_1_state
+async def test_config_yaml_bool(hass, entities):
+    """Test parsing of booleans in yaml config."""
+    light_1, light_2 = await setup_lights(hass, entities)
 
-        When encountering a YAML alias/anchor, the PyYAML parser will use a
-        reference to the original dictionary, instead of creating a copy, so
-        care needs to be taken to not modify the original.
-        """
-        entity_state = {"state": "on", "brightness": 100}
-        assert setup_component(
-            self.hass,
-            scene.DOMAIN,
-            {
-                "scene": [
-                    {
-                        "name": "test",
-                        "entities": {
-                            self.light_1.entity_id: entity_state,
-                            self.light_2.entity_id: entity_state,
-                        },
-                    }
-                ]
-            },
-        )
-        self.hass.block_till_done()
+    config = (
+        "scene:\n"
+        "  - name: test\n"
+        "    entities:\n"
+        f"      {light_1.entity_id}: on\n"
+        f"      {light_2.entity_id}:\n"
+        "        state: on\n"
+        "        brightness: 100\n"
+    )
 
-        common.activate(self.hass, "scene.test")
-        self.hass.block_till_done()
+    with io.StringIO(config) as file:
+        doc = yaml_loader.yaml.safe_load(file)
 
-        assert self.light_1.is_on
-        assert self.light_2.is_on
-        assert 100 == self.light_1.last_call("turn_on")[1].get("brightness")
-        assert 100 == self.light_2.last_call("turn_on")[1].get("brightness")
+    assert await async_setup_component(hass, scene.DOMAIN, doc)
+    await hass.async_block_till_done()
 
-    def test_config_yaml_bool(self):
-        """Test parsing of booleans in yaml config."""
-        config = (
-            "scene:\n"
-            "  - name: test\n"
-            "    entities:\n"
-            f"      {self.light_1.entity_id}: on\n"
-            f"      {self.light_2.entity_id}:\n"
-            "        state: on\n"
-            "        brightness: 100\n"
-        )
+    await activate(hass, "scene.test")
 
-        with io.StringIO(config) as file:
-            doc = yaml_loader.yaml.safe_load(file)
+    assert light.is_on(hass, light_1.entity_id)
+    assert light.is_on(hass, light_2.entity_id)
+    assert 100 == light_2.last_call("turn_on")[1].get("brightness")
 
-        assert setup_component(self.hass, scene.DOMAIN, doc)
-        common.activate(self.hass, "scene.test")
-        self.hass.block_till_done()
 
-        assert self.light_1.is_on
-        assert self.light_2.is_on
-        assert 100 == self.light_2.last_call("turn_on")[1].get("brightness")
+async def test_activate_scene(hass, entities):
+    """Test active scene."""
+    light_1, light_2 = await setup_lights(hass, entities)
 
-    def test_activate_scene(self):
-        """Test active scene."""
-        assert setup_component(
-            self.hass,
-            scene.DOMAIN,
-            {
-                "scene": [
-                    {
-                        "name": "test",
-                        "entities": {
-                            self.light_1.entity_id: "on",
-                            self.light_2.entity_id: {"state": "on", "brightness": 100},
-                        },
-                    }
-                ]
-            },
-        )
-        self.hass.block_till_done()
+    assert await async_setup_component(
+        hass,
+        scene.DOMAIN,
+        {
+            "scene": [
+                {
+                    "name": "test",
+                    "entities": {
+                        light_1.entity_id: "on",
+                        light_2.entity_id: {"state": "on", "brightness": 100},
+                    },
+                }
+            ]
+        },
+    )
+    await hass.async_block_till_done()
+    await activate(hass, "scene.test")
 
-        common.activate(self.hass, "scene.test")
-        self.hass.block_till_done()
+    assert light.is_on(hass, light_1.entity_id)
+    assert light.is_on(hass, light_2.entity_id)
+    assert light_2.last_call("turn_on")[1].get("brightness") == 100
 
-        assert self.light_1.is_on
-        assert self.light_2.is_on
-        assert self.light_2.last_call("turn_on")[1].get("brightness") == 100
+    calls = async_mock_service(hass, "light", "turn_on")
 
-        turn_on_calls = mock_service(self.hass, "light", "turn_on")
+    await hass.services.async_call(
+        scene.DOMAIN, "turn_on", {"transition": 42, "entity_id": "scene.test"}
+    )
+    await hass.async_block_till_done()
 
-        self.hass.services.call(
-            scene.DOMAIN, "turn_on", {"transition": 42, "entity_id": "scene.test"}
-        )
-        self.hass.block_till_done()
+    assert len(calls) == 1
+    assert calls[0].domain == "light"
+    assert calls[0].service == "turn_on"
+    assert calls[0].data.get("transition") == 42
 
-        assert len(turn_on_calls) == 1
-        assert turn_on_calls[0].domain == "light"
-        assert turn_on_calls[0].service == "turn_on"
-        assert turn_on_calls[0].data.get("transition") == 42
+
+async def activate(hass, entity_id=ENTITY_MATCH_ALL):
+    """Activate a scene."""
+    data = {}
+
+    if entity_id:
+        data[ATTR_ENTITY_ID] = entity_id
+
+    await hass.services.async_call(scene.DOMAIN, SERVICE_TURN_ON, data, blocking=True)
 
 
 async def test_services_registered(hass):
@@ -152,3 +146,26 @@ async def test_services_registered(hass):
     assert hass.services.has_service("scene", "reload")
     assert hass.services.has_service("scene", "turn_on")
     assert hass.services.has_service("scene", "apply")
+
+
+async def setup_lights(hass, entities):
+    """Set up the light component."""
+    assert await async_setup_component(
+        hass, light.DOMAIN, {light.DOMAIN: {"platform": "test"}}
+    )
+    await hass.async_block_till_done()
+
+    light_1, light_2 = entities
+
+    await hass.services.async_call(
+        "light",
+        "turn_off",
+        {"entity_id": [light_1.entity_id, light_2.entity_id]},
+        blocking=True,
+    )
+    await hass.async_block_till_done()
+
+    assert not light.is_on(hass, light_1.entity_id)
+    assert not light.is_on(hass, light_2.entity_id)
+
+    return light_1, light_2
diff --git a/tests/components/script/test_init.py b/tests/components/script/test_init.py
index 152c74d8fe9..068b0b91a2c 100644
--- a/tests/components/script/test_init.py
+++ b/tests/components/script/test_init.py
@@ -705,4 +705,4 @@ async def test_script_variables(hass, caplog):
     await hass.services.async_call("script", "script3", {"break": 0}, blocking=True)
 
     assert len(mock_calls) == 4
-    assert mock_calls[3].data["value"] == "1"
+    assert mock_calls[3].data["value"] == 1
diff --git a/tests/components/season/test_sensor.py b/tests/components/season/test_sensor.py
index 8918099405a..943036e9c00 100644
--- a/tests/components/season/test_sensor.py
+++ b/tests/components/season/test_sensor.py
@@ -1,12 +1,20 @@
 """The tests for the Season sensor platform."""
-# pylint: disable=protected-access
 from datetime import datetime
-import unittest
 
-import homeassistant.components.season.sensor as season
-from homeassistant.setup import setup_component
+import pytest
 
-from tests.common import get_test_home_assistant
+from homeassistant.components.season.sensor import (
+    STATE_AUTUMN,
+    STATE_SPRING,
+    STATE_SUMMER,
+    STATE_WINTER,
+    TYPE_ASTRONOMICAL,
+    TYPE_METEOROLOGICAL,
+)
+from homeassistant.const import STATE_UNKNOWN
+from homeassistant.setup import async_setup_component
+
+from tests.async_mock import patch
 
 HEMISPHERE_NORTHERN = {
     "homeassistant": {"latitude": "48.864716", "longitude": "2.349014"},
@@ -28,217 +36,90 @@ HEMISPHERE_EMPTY = {
     "sensor": {"platform": "season", "type": "meteorological"},
 }
 
+NORTHERN_PARAMETERS = [
+    (TYPE_ASTRONOMICAL, datetime(2017, 9, 3, 0, 0), STATE_SUMMER),
+    (TYPE_METEOROLOGICAL, datetime(2017, 8, 13, 0, 0), STATE_SUMMER),
+    (TYPE_ASTRONOMICAL, datetime(2017, 9, 23, 0, 0), STATE_AUTUMN),
+    (TYPE_METEOROLOGICAL, datetime(2017, 9, 3, 0, 0), STATE_AUTUMN),
+    (TYPE_ASTRONOMICAL, datetime(2017, 12, 25, 0, 0), STATE_WINTER),
+    (TYPE_METEOROLOGICAL, datetime(2017, 12, 3, 0, 0), STATE_WINTER),
+    (TYPE_ASTRONOMICAL, datetime(2017, 4, 1, 0, 0), STATE_SPRING),
+    (TYPE_METEOROLOGICAL, datetime(2017, 3, 3, 0, 0), STATE_SPRING),
+]
 
-# pylint: disable=invalid-name
-class TestSeason(unittest.TestCase):
-    """Test the season platform."""
+SOUTHERN_PARAMETERS = [
+    (TYPE_ASTRONOMICAL, datetime(2017, 12, 25, 0, 0), STATE_SUMMER),
+    (TYPE_METEOROLOGICAL, datetime(2017, 12, 3, 0, 0), STATE_SUMMER),
+    (TYPE_ASTRONOMICAL, datetime(2017, 4, 1, 0, 0), STATE_AUTUMN),
+    (TYPE_METEOROLOGICAL, datetime(2017, 3, 3, 0, 0), STATE_AUTUMN),
+    (TYPE_ASTRONOMICAL, datetime(2017, 9, 3, 0, 0), STATE_WINTER),
+    (TYPE_METEOROLOGICAL, datetime(2017, 8, 13, 0, 0), STATE_WINTER),
+    (TYPE_ASTRONOMICAL, datetime(2017, 9, 23, 0, 0), STATE_SPRING),
+    (TYPE_METEOROLOGICAL, datetime(2017, 9, 3, 0, 0), STATE_SPRING),
+]
 
-    DEVICE = None
-    CONFIG_ASTRONOMICAL = {"type": "astronomical"}
-    CONFIG_METEOROLOGICAL = {"type": "meteorological"}
 
-    def add_entities(self, devices):
-        """Mock add devices."""
-        for device in devices:
-            self.DEVICE = device
+def idfn(val):
+    """Provide IDs for pytest parametrize."""
+    if isinstance(val, (datetime)):
+        return val.strftime("%Y%m%d")
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
 
-    def test_season_should_be_summer_northern_astronomical(self):
-        """Test that season should be summer."""
-        # A known day in summer
-        summer_day = datetime(2017, 9, 3, 0, 0)
-        current_season = season.get_season(
-            summer_day, season.NORTHERN, season.TYPE_ASTRONOMICAL
-        )
-        assert season.STATE_SUMMER == current_season
+@pytest.mark.parametrize("type,day,expected", NORTHERN_PARAMETERS, ids=idfn)
+async def test_season_northern_hemisphere(hass, type, day, expected):
+    """Test that season should be summer."""
+    hass.config.latitude = HEMISPHERE_NORTHERN["homeassistant"]["latitude"]
 
-    def test_season_should_be_summer_northern_meteorological(self):
-        """Test that season should be summer."""
-        # A known day in summer
-        summer_day = datetime(2017, 8, 13, 0, 0)
-        current_season = season.get_season(
-            summer_day, season.NORTHERN, season.TYPE_METEOROLOGICAL
-        )
-        assert season.STATE_SUMMER == current_season
+    config = {
+        **HEMISPHERE_NORTHERN,
+        "sensor": {"platform": "season", "type": type},
+    }
 
-    def test_season_should_be_autumn_northern_astronomical(self):
-        """Test that season should be autumn."""
-        # A known day in autumn
-        autumn_day = datetime(2017, 9, 23, 0, 0)
-        current_season = season.get_season(
-            autumn_day, season.NORTHERN, season.TYPE_ASTRONOMICAL
-        )
-        assert season.STATE_AUTUMN == current_season
+    with patch("homeassistant.components.season.sensor.utcnow", return_value=day):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
 
-    def test_season_should_be_autumn_northern_meteorological(self):
-        """Test that season should be autumn."""
-        # A known day in autumn
-        autumn_day = datetime(2017, 9, 3, 0, 0)
-        current_season = season.get_season(
-            autumn_day, season.NORTHERN, season.TYPE_METEOROLOGICAL
-        )
-        assert season.STATE_AUTUMN == current_season
+    state = hass.states.get("sensor.season")
+    assert state
+    assert state.state == expected
 
-    def test_season_should_be_winter_northern_astronomical(self):
-        """Test that season should be winter."""
-        # A known day in winter
-        winter_day = datetime(2017, 12, 25, 0, 0)
-        current_season = season.get_season(
-            winter_day, season.NORTHERN, season.TYPE_ASTRONOMICAL
-        )
-        assert season.STATE_WINTER == current_season
 
-    def test_season_should_be_winter_northern_meteorological(self):
-        """Test that season should be winter."""
-        # A known day in winter
-        winter_day = datetime(2017, 12, 3, 0, 0)
-        current_season = season.get_season(
-            winter_day, season.NORTHERN, season.TYPE_METEOROLOGICAL
-        )
-        assert season.STATE_WINTER == current_season
+@pytest.mark.parametrize("type,day,expected", SOUTHERN_PARAMETERS, ids=idfn)
+async def test_season_southern_hemisphere(hass, type, day, expected):
+    """Test that season should be summer."""
+    hass.config.latitude = HEMISPHERE_SOUTHERN["homeassistant"]["latitude"]
 
-    def test_season_should_be_spring_northern_astronomical(self):
-        """Test that season should be spring."""
-        # A known day in spring
-        spring_day = datetime(2017, 4, 1, 0, 0)
-        current_season = season.get_season(
-            spring_day, season.NORTHERN, season.TYPE_ASTRONOMICAL
-        )
-        assert season.STATE_SPRING == current_season
+    config = {
+        **HEMISPHERE_SOUTHERN,
+        "sensor": {"platform": "season", "type": type},
+    }
 
-    def test_season_should_be_spring_northern_meteorological(self):
-        """Test that season should be spring."""
-        # A known day in spring
-        spring_day = datetime(2017, 3, 3, 0, 0)
-        current_season = season.get_season(
-            spring_day, season.NORTHERN, season.TYPE_METEOROLOGICAL
-        )
-        assert season.STATE_SPRING == current_season
+    with patch("homeassistant.components.season.sensor.utcnow", return_value=day):
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
 
-    def test_season_should_be_winter_southern_astronomical(self):
-        """Test that season should be winter."""
-        # A known day in winter
-        winter_day = datetime(2017, 9, 3, 0, 0)
-        current_season = season.get_season(
-            winter_day, season.SOUTHERN, season.TYPE_ASTRONOMICAL
-        )
-        assert season.STATE_WINTER == current_season
+    state = hass.states.get("sensor.season")
+    assert state
+    assert state.state == expected
 
-    def test_season_should_be_winter_southern_meteorological(self):
-        """Test that season should be winter."""
-        # A known day in winter
-        winter_day = datetime(2017, 8, 13, 0, 0)
-        current_season = season.get_season(
-            winter_day, season.SOUTHERN, season.TYPE_METEOROLOGICAL
-        )
-        assert season.STATE_WINTER == current_season
 
-    def test_season_should_be_spring_southern_astronomical(self):
-        """Test that season should be spring."""
-        # A known day in spring
-        spring_day = datetime(2017, 9, 23, 0, 0)
-        current_season = season.get_season(
-            spring_day, season.SOUTHERN, season.TYPE_ASTRONOMICAL
-        )
-        assert season.STATE_SPRING == current_season
+async def test_season_equator(hass):
+    """Test that season should be unknown for equator."""
+    hass.config.latitude = HEMISPHERE_EQUATOR["homeassistant"]["latitude"]
+    day = datetime(2017, 9, 3, 0, 0)
 
-    def test_season_should_be_spring_southern_meteorological(self):
-        """Test that season should be spring."""
-        # A known day in spring
-        spring_day = datetime(2017, 9, 3, 0, 0)
-        current_season = season.get_season(
-            spring_day, season.SOUTHERN, season.TYPE_METEOROLOGICAL
-        )
-        assert season.STATE_SPRING == current_season
+    with patch("homeassistant.components.season.sensor.utcnow", return_value=day):
+        assert await async_setup_component(hass, "sensor", HEMISPHERE_EQUATOR)
+        await hass.async_block_till_done()
 
-    def test_season_should_be_summer_southern_astronomical(self):
-        """Test that season should be summer."""
-        # A known day in summer
-        summer_day = datetime(2017, 12, 25, 0, 0)
-        current_season = season.get_season(
-            summer_day, season.SOUTHERN, season.TYPE_ASTRONOMICAL
-        )
-        assert season.STATE_SUMMER == current_season
+    state = hass.states.get("sensor.season")
+    assert state
+    assert state.state == STATE_UNKNOWN
 
-    def test_season_should_be_summer_southern_meteorological(self):
-        """Test that season should be summer."""
-        # A known day in summer
-        summer_day = datetime(2017, 12, 3, 0, 0)
-        current_season = season.get_season(
-            summer_day, season.SOUTHERN, season.TYPE_METEOROLOGICAL
-        )
-        assert season.STATE_SUMMER == current_season
 
-    def test_season_should_be_autumn_southern_astronomical(self):
-        """Test that season should be spring."""
-        # A known day in spring
-        autumn_day = datetime(2017, 4, 1, 0, 0)
-        current_season = season.get_season(
-            autumn_day, season.SOUTHERN, season.TYPE_ASTRONOMICAL
-        )
-        assert season.STATE_AUTUMN == current_season
-
-    def test_season_should_be_autumn_southern_meteorological(self):
-        """Test that season should be autumn."""
-        # A known day in autumn
-        autumn_day = datetime(2017, 3, 3, 0, 0)
-        current_season = season.get_season(
-            autumn_day, season.SOUTHERN, season.TYPE_METEOROLOGICAL
-        )
-        assert season.STATE_AUTUMN == current_season
-
-    def test_on_equator_results_in_none(self):
-        """Test that season should be unknown."""
-        # A known day in summer if astronomical and northern
-        summer_day = datetime(2017, 9, 3, 0, 0)
-        current_season = season.get_season(
-            summer_day, season.EQUATOR, season.TYPE_ASTRONOMICAL
-        )
-        assert current_season is None
-
-    def test_setup_hemisphere_northern(self):
-        """Test platform setup of northern hemisphere."""
-        self.hass.config.latitude = HEMISPHERE_NORTHERN["homeassistant"]["latitude"]
-        assert setup_component(self.hass, "sensor", HEMISPHERE_NORTHERN)
-        self.hass.block_till_done()
-        assert (
-            self.hass.config.as_dict()["latitude"]
-            == HEMISPHERE_NORTHERN["homeassistant"]["latitude"]
-        )
-        state = self.hass.states.get("sensor.season")
-        assert state.attributes.get("friendly_name") == "Season"
-
-    def test_setup_hemisphere_southern(self):
-        """Test platform setup of southern hemisphere."""
-        self.hass.config.latitude = HEMISPHERE_SOUTHERN["homeassistant"]["latitude"]
-        assert setup_component(self.hass, "sensor", HEMISPHERE_SOUTHERN)
-        self.hass.block_till_done()
-        assert (
-            self.hass.config.as_dict()["latitude"]
-            == HEMISPHERE_SOUTHERN["homeassistant"]["latitude"]
-        )
-        state = self.hass.states.get("sensor.season")
-        assert state.attributes.get("friendly_name") == "Season"
-
-    def test_setup_hemisphere_equator(self):
-        """Test platform setup of equator."""
-        self.hass.config.latitude = HEMISPHERE_EQUATOR["homeassistant"]["latitude"]
-        assert setup_component(self.hass, "sensor", HEMISPHERE_EQUATOR)
-        self.hass.block_till_done()
-        assert (
-            self.hass.config.as_dict()["latitude"]
-            == HEMISPHERE_EQUATOR["homeassistant"]["latitude"]
-        )
-        state = self.hass.states.get("sensor.season")
-        assert state.attributes.get("friendly_name") == "Season"
-
-    def test_setup_hemisphere_empty(self):
-        """Test platform setup of missing latlong."""
-        self.hass.config.latitude = None
-        assert setup_component(self.hass, "sensor", HEMISPHERE_EMPTY)
-        self.hass.block_till_done()
-        assert self.hass.config.as_dict()["latitude"] is None
+async def test_setup_hemisphere_empty(hass):
+    """Test platform setup of missing latlong."""
+    hass.config.latitude = None
+    assert await async_setup_component(hass, "sensor", HEMISPHERE_EMPTY)
+    await hass.async_block_till_done()
+    assert hass.config.as_dict()["latitude"] is None
diff --git a/tests/components/seventeentrack/test_sensor.py b/tests/components/seventeentrack/test_sensor.py
index 330f4a66152..798620e2af7 100644
--- a/tests/components/seventeentrack/test_sensor.py
+++ b/tests/components/seventeentrack/test_sensor.py
@@ -140,6 +140,8 @@ async def _goto_future(hass, future=None):
     with patch("homeassistant.util.utcnow", return_value=future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
 
 
 async def test_full_valid_config(hass):
@@ -247,6 +249,8 @@ async def test_delivered_not_shown(hass):
 
     hass.components.persistent_notification = MagicMock()
     await _setup_seventeentrack(hass, VALID_CONFIG_FULL_NO_DELIVERED)
+    await _goto_future(hass)
+
     assert not hass.states.async_entity_ids()
     hass.components.persistent_notification.create.assert_called()
 
diff --git a/tests/components/shell_command/test_init.py b/tests/components/shell_command/test_init.py
index 1f8e442e93d..f5ad37cc617 100644
--- a/tests/components/shell_command/test_init.py
+++ b/tests/components/shell_command/test_init.py
@@ -1,15 +1,13 @@
 """The tests for the Shell command component."""
-import asyncio
+
 import os
 import tempfile
 from typing import Tuple
-import unittest
 
 from homeassistant.components import shell_command
-from homeassistant.setup import async_setup_component, setup_component
+from homeassistant.setup import async_setup_component
 
-from tests.async_mock import Mock, patch
-from tests.common import get_test_home_assistant
+from tests.async_mock import MagicMock, patch
 
 
 def mock_process_creator(error: bool = False):
@@ -22,161 +20,151 @@ def mock_process_creator(error: bool = False):
         """
         return b"I am stdout", b"I am stderr"
 
-    mock_process = Mock()
+    mock_process = MagicMock()
     mock_process.communicate = communicate
     mock_process.returncode = int(error)
     return mock_process
 
 
-class TestShellCommand(unittest.TestCase):
-    """Test the shell_command component."""
-
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started.
-
-        Also seems to require a child watcher attached to the loop when run
-        from pytest.
-        """
-        self.hass = get_test_home_assistant()
-        asyncio.get_child_watcher().attach_loop(self.hass.loop)
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_executing_service(self):
-        """Test if able to call a configured service."""
-        with tempfile.TemporaryDirectory() as tempdirname:
-            path = os.path.join(tempdirname, "called.txt")
-            assert setup_component(
-                self.hass,
-                shell_command.DOMAIN,
-                {shell_command.DOMAIN: {"test_service": f"date > {path}"}},
-            )
-
-            self.hass.services.call("shell_command", "test_service", blocking=True)
-            self.hass.block_till_done()
-            assert os.path.isfile(path)
-
-    def test_config_not_dict(self):
-        """Test that setup fails if config is not a dict."""
-        assert not setup_component(
-            self.hass,
+async def test_executing_service(hass):
+    """Test if able to call a configured service."""
+    with tempfile.TemporaryDirectory() as tempdirname:
+        path = os.path.join(tempdirname, "called.txt")
+        assert await async_setup_component(
+            hass,
             shell_command.DOMAIN,
-            {shell_command.DOMAIN: ["some", "weird", "list"]},
+            {shell_command.DOMAIN: {"test_service": f"date > {path}"}},
         )
+        await hass.async_block_till_done()
 
-    def test_config_not_valid_service_names(self):
-        """Test that setup fails if config contains invalid service names."""
-        assert not setup_component(
-            self.hass,
-            shell_command.DOMAIN,
-            {shell_command.DOMAIN: {"this is invalid because space": "touch bla.txt"}},
-        )
+        await hass.services.async_call("shell_command", "test_service", blocking=True)
+        await hass.async_block_till_done()
+        assert os.path.isfile(path)
 
-    @patch(
-        "homeassistant.components.shell_command.asyncio.subprocess"
-        ".create_subprocess_shell"
+
+async def test_config_not_dict(hass):
+    """Test that setup fails if config is not a dict."""
+    assert not await async_setup_component(
+        hass,
+        shell_command.DOMAIN,
+        {shell_command.DOMAIN: ["some", "weird", "list"]},
     )
-    def test_template_render_no_template(self, mock_call):
-        """Ensure shell_commands without templates get rendered properly."""
-        mock_call.return_value = mock_process_creator(error=False)
 
-        assert setup_component(
-            self.hass,
+
+async def test_config_not_valid_service_names(hass):
+    """Test that setup fails if config contains invalid service names."""
+    assert not await async_setup_component(
+        hass,
+        shell_command.DOMAIN,
+        {shell_command.DOMAIN: {"this is invalid because space": "touch bla.txt"}},
+    )
+
+
+@patch(
+    "homeassistant.components.shell_command.asyncio.subprocess"
+    ".create_subprocess_shell"
+)
+async def test_template_render_no_template(mock_call, hass):
+    """Ensure shell_commands without templates get rendered properly."""
+    mock_call.return_value = mock_process_creator(error=False)
+
+    assert await async_setup_component(
+        hass,
+        shell_command.DOMAIN,
+        {shell_command.DOMAIN: {"test_service": "ls /bin"}},
+    )
+    await hass.async_block_till_done()
+
+    await hass.services.async_call("shell_command", "test_service", blocking=True)
+    await hass.async_block_till_done()
+    cmd = mock_call.mock_calls[0][1][0]
+
+    assert mock_call.call_count == 1
+    assert "ls /bin" == cmd
+
+
+@patch(
+    "homeassistant.components.shell_command.asyncio.subprocess"
+    ".create_subprocess_exec"
+)
+async def test_template_render(mock_call, hass):
+    """Ensure shell_commands with templates get rendered properly."""
+    hass.states.async_set("sensor.test_state", "Works")
+    mock_call.return_value = mock_process_creator(error=False)
+    assert await async_setup_component(
+        hass,
+        shell_command.DOMAIN,
+        {
+            shell_command.DOMAIN: {
+                "test_service": ("ls /bin {{ states.sensor.test_state.state }}")
+            }
+        },
+    )
+
+    await hass.services.async_call("shell_command", "test_service", blocking=True)
+
+    await hass.async_block_till_done()
+    cmd = mock_call.mock_calls[0][1]
+
+    assert mock_call.call_count == 1
+    assert ("ls", "/bin", "Works") == cmd
+
+
+@patch(
+    "homeassistant.components.shell_command.asyncio.subprocess"
+    ".create_subprocess_shell"
+)
+@patch("homeassistant.components.shell_command._LOGGER.error")
+async def test_subprocess_error(mock_error, mock_call, hass):
+    """Test subprocess that returns an error."""
+    mock_call.return_value = mock_process_creator(error=True)
+    with tempfile.TemporaryDirectory() as tempdirname:
+        path = os.path.join(tempdirname, "called.txt")
+        assert await async_setup_component(
+            hass,
             shell_command.DOMAIN,
-            {shell_command.DOMAIN: {"test_service": "ls /bin"}},
+            {shell_command.DOMAIN: {"test_service": f"touch {path}"}},
         )
 
-        self.hass.services.call("shell_command", "test_service", blocking=True)
-
-        self.hass.block_till_done()
-        cmd = mock_call.mock_calls[0][1][0]
-
+        await hass.services.async_call("shell_command", "test_service", blocking=True)
+        await hass.async_block_till_done()
         assert mock_call.call_count == 1
-        assert "ls /bin" == cmd
+        assert mock_error.call_count == 1
+        assert not os.path.isfile(path)
 
-    @patch(
-        "homeassistant.components.shell_command.asyncio.subprocess"
-        ".create_subprocess_exec"
+
+@patch("homeassistant.components.shell_command._LOGGER.debug")
+async def test_stdout_captured(mock_output, hass):
+    """Test subprocess that has stdout."""
+    test_phrase = "I have output"
+    assert await async_setup_component(
+        hass,
+        shell_command.DOMAIN,
+        {shell_command.DOMAIN: {"test_service": f"echo {test_phrase}"}},
     )
-    def test_template_render(self, mock_call):
-        """Ensure shell_commands with templates get rendered properly."""
-        self.hass.states.set("sensor.test_state", "Works")
-        mock_call.return_value = mock_process_creator(error=False)
-        assert setup_component(
-            self.hass,
-            shell_command.DOMAIN,
-            {
-                shell_command.DOMAIN: {
-                    "test_service": ("ls /bin {{ states.sensor.test_state.state }}")
-                }
-            },
-        )
 
-        self.hass.services.call("shell_command", "test_service", blocking=True)
+    await hass.services.async_call("shell_command", "test_service", blocking=True)
 
-        self.hass.block_till_done()
-        cmd = mock_call.mock_calls[0][1]
+    await hass.async_block_till_done()
+    assert mock_output.call_count == 1
+    assert test_phrase.encode() + b"\n" == mock_output.call_args_list[0][0][-1]
 
-        assert mock_call.call_count == 1
-        assert ("ls", "/bin", "Works") == cmd
 
-    @patch(
-        "homeassistant.components.shell_command.asyncio.subprocess"
-        ".create_subprocess_shell"
+@patch("homeassistant.components.shell_command._LOGGER.debug")
+async def test_stderr_captured(mock_output, hass):
+    """Test subprocess that has stderr."""
+    test_phrase = "I have error"
+    assert await async_setup_component(
+        hass,
+        shell_command.DOMAIN,
+        {shell_command.DOMAIN: {"test_service": f">&2 echo {test_phrase}"}},
     )
-    @patch("homeassistant.components.shell_command._LOGGER.error")
-    def test_subprocess_error(self, mock_error, mock_call):
-        """Test subprocess that returns an error."""
-        mock_call.return_value = mock_process_creator(error=True)
-        with tempfile.TemporaryDirectory() as tempdirname:
-            path = os.path.join(tempdirname, "called.txt")
-            assert setup_component(
-                self.hass,
-                shell_command.DOMAIN,
-                {shell_command.DOMAIN: {"test_service": f"touch {path}"}},
-            )
 
-            self.hass.services.call("shell_command", "test_service", blocking=True)
+    await hass.services.async_call("shell_command", "test_service", blocking=True)
 
-            self.hass.block_till_done()
-            assert mock_call.call_count == 1
-            assert mock_error.call_count == 1
-            assert not os.path.isfile(path)
-
-    @patch("homeassistant.components.shell_command._LOGGER.debug")
-    def test_stdout_captured(self, mock_output):
-        """Test subprocess that has stdout."""
-        test_phrase = "I have output"
-        assert setup_component(
-            self.hass,
-            shell_command.DOMAIN,
-            {shell_command.DOMAIN: {"test_service": f"echo {test_phrase}"}},
-        )
-
-        self.hass.services.call("shell_command", "test_service", blocking=True)
-
-        self.hass.block_till_done()
-        assert mock_output.call_count == 1
-        assert test_phrase.encode() + b"\n" == mock_output.call_args_list[0][0][-1]
-
-    @patch("homeassistant.components.shell_command._LOGGER.debug")
-    def test_stderr_captured(self, mock_output):
-        """Test subprocess that has stderr."""
-        test_phrase = "I have error"
-        assert setup_component(
-            self.hass,
-            shell_command.DOMAIN,
-            {shell_command.DOMAIN: {"test_service": f">&2 echo {test_phrase}"}},
-        )
-
-        self.hass.services.call("shell_command", "test_service", blocking=True)
-
-        self.hass.block_till_done()
-        assert mock_output.call_count == 1
-        assert test_phrase.encode() + b"\n" == mock_output.call_args_list[0][0][-1]
+    await hass.async_block_till_done()
+    assert mock_output.call_count == 1
+    assert test_phrase.encode() + b"\n" == mock_output.call_args_list[0][0][-1]
 
 
 async def test_do_no_run_forever(hass, caplog):
diff --git a/tests/components/shelly/test_config_flow.py b/tests/components/shelly/test_config_flow.py
index 03eb907d09b..280688a0618 100644
--- a/tests/components/shelly/test_config_flow.py
+++ b/tests/components/shelly/test_config_flow.py
@@ -11,6 +11,21 @@ from homeassistant.components.shelly.const import DOMAIN
 from tests.async_mock import AsyncMock, Mock, patch
 from tests.common import MockConfigEntry
 
+MOCK_SETTINGS = {
+    "name": "Test name",
+    "device": {"mac": "test-mac", "hostname": "test-host"},
+}
+DISCOVERY_INFO = {
+    "host": "1.1.1.1",
+    "name": "shelly1pm-12345",
+    "properties": {"id": "shelly1pm-12345"},
+}
+SWITCH25_DISCOVERY_INFO = {
+    "host": "1.1.1.1",
+    "name": "shellyswitch25-12345",
+    "properties": {"id": "shellyswitch25-12345"},
+}
+
 
 async def test_form(hass):
     """Test we get the form."""
@@ -29,7 +44,7 @@ async def test_form(hass):
         new=AsyncMock(
             return_value=Mock(
                 shutdown=AsyncMock(),
-                settings={"name": "Test name", "device": {"mac": "test-mac"}},
+                settings=MOCK_SETTINGS,
             )
         ),
     ), patch(
@@ -53,6 +68,51 @@ async def test_form(hass):
     assert len(mock_setup_entry.mock_calls) == 1
 
 
+async def test_title_without_name_and_prefix(hass):
+    """Test we set the title to the hostname when the device doesn't have a name."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == "form"
+    assert result["errors"] == {}
+
+    settings = MOCK_SETTINGS.copy()
+    settings["name"] = None
+    settings["device"] = settings["device"].copy()
+    settings["device"]["hostname"] = "shelly1pm-12345"
+    with patch(
+        "aioshelly.get_info",
+        return_value={"mac": "test-mac", "type": "SHSW-1", "auth": False},
+    ), patch(
+        "aioshelly.Device.create",
+        new=AsyncMock(
+            return_value=Mock(
+                shutdown=AsyncMock(),
+                settings=settings,
+            )
+        ),
+    ), patch(
+        "homeassistant.components.shelly.async_setup", return_value=True
+    ) as mock_setup, patch(
+        "homeassistant.components.shelly.async_setup_entry",
+        return_value=True,
+    ) as mock_setup_entry:
+        result2 = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            {"host": "1.1.1.1"},
+        )
+
+    assert result2["type"] == "create_entry"
+    assert result2["title"] == "shelly1pm-12345"
+    assert result2["data"] == {
+        "host": "1.1.1.1",
+    }
+    await hass.async_block_till_done()
+    assert len(mock_setup.mock_calls) == 1
+    assert len(mock_setup_entry.mock_calls) == 1
+
+
 async def test_form_auth(hass):
     """Test manual configuration if auth is required."""
     result = await hass.config_entries.flow.async_init(
@@ -78,7 +138,7 @@ async def test_form_auth(hass):
         new=AsyncMock(
             return_value=Mock(
                 shutdown=AsyncMock(),
-                settings={"name": "Test name", "device": {"mac": "test-mac"}},
+                settings=MOCK_SETTINGS,
             )
         ),
     ), patch(
@@ -234,18 +294,23 @@ async def test_zeroconf(hass):
     ):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
-            data={"host": "1.1.1.1", "name": "shelly1pm-12345"},
+            data=DISCOVERY_INFO,
             context={"source": config_entries.SOURCE_ZEROCONF},
         )
         assert result["type"] == "form"
         assert result["errors"] == {}
-
+        context = next(
+            flow["context"]
+            for flow in hass.config_entries.flow.async_progress()
+            if flow["flow_id"] == result["flow_id"]
+        )
+        assert context["title_placeholders"]["name"] == "shelly1pm-12345"
     with patch(
         "aioshelly.Device.create",
         new=AsyncMock(
             return_value=Mock(
                 shutdown=AsyncMock(),
-                settings={"name": "Test name", "device": {"mac": "test-mac"}},
+                settings=MOCK_SETTINGS,
             )
         ),
     ), patch(
@@ -269,6 +334,29 @@ async def test_zeroconf(hass):
     assert len(mock_setup_entry.mock_calls) == 1
 
 
+async def test_zeroconf_with_switch_prefix(hass):
+    """Test we get remove shelly from the prefix."""
+    await setup.async_setup_component(hass, "persistent_notification", {})
+
+    with patch(
+        "aioshelly.get_info",
+        return_value={"mac": "test-mac", "type": "SHSW-1", "auth": False},
+    ):
+        result = await hass.config_entries.flow.async_init(
+            DOMAIN,
+            data=SWITCH25_DISCOVERY_INFO,
+            context={"source": config_entries.SOURCE_ZEROCONF},
+        )
+        assert result["type"] == "form"
+        assert result["errors"] == {}
+        context = next(
+            flow["context"]
+            for flow in hass.config_entries.flow.async_progress()
+            if flow["flow_id"] == result["flow_id"]
+        )
+        assert context["title_placeholders"]["name"] == "switch25-12345"
+
+
 @pytest.mark.parametrize(
     "error", [(asyncio.TimeoutError, "cannot_connect"), (ValueError, "unknown")]
 )
@@ -283,7 +371,7 @@ async def test_zeroconf_confirm_error(hass, error):
     ):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
-            data={"host": "1.1.1.1", "name": "shelly1pm-12345"},
+            data=DISCOVERY_INFO,
             context={"source": config_entries.SOURCE_ZEROCONF},
         )
         assert result["type"] == "form"
@@ -316,7 +404,7 @@ async def test_zeroconf_already_configured(hass):
     ):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
-            data={"host": "1.1.1.1", "name": "shelly1pm-12345"},
+            data=DISCOVERY_INFO,
             context={"source": config_entries.SOURCE_ZEROCONF},
         )
         assert result["type"] == "abort"
@@ -331,7 +419,7 @@ async def test_zeroconf_firmware_unsupported(hass):
     with patch("aioshelly.get_info", side_effect=aioshelly.FirmwareUnsupported):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
-            data={"host": "1.1.1.1", "name": "shelly1pm-12345"},
+            data=DISCOVERY_INFO,
             context={"source": config_entries.SOURCE_ZEROCONF},
         )
 
@@ -344,7 +432,7 @@ async def test_zeroconf_cannot_connect(hass):
     with patch("aioshelly.get_info", side_effect=asyncio.TimeoutError):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
-            data={"host": "1.1.1.1", "name": "shelly1pm-12345"},
+            data=DISCOVERY_INFO,
             context={"source": config_entries.SOURCE_ZEROCONF},
         )
         assert result["type"] == "abort"
@@ -361,7 +449,7 @@ async def test_zeroconf_require_auth(hass):
     ):
         result = await hass.config_entries.flow.async_init(
             DOMAIN,
-            data={"host": "1.1.1.1", "name": "shelly1pm-12345"},
+            data=DISCOVERY_INFO,
             context={"source": config_entries.SOURCE_ZEROCONF},
         )
         assert result["type"] == "form"
@@ -379,7 +467,7 @@ async def test_zeroconf_require_auth(hass):
         new=AsyncMock(
             return_value=Mock(
                 shutdown=AsyncMock(),
-                settings={"name": "Test name", "device": {"mac": "test-mac"}},
+                settings=MOCK_SETTINGS,
             )
         ),
     ), patch(
diff --git a/tests/components/sigfox/test_sensor.py b/tests/components/sigfox/test_sensor.py
index 923392bbaf8..a7d293a052e 100644
--- a/tests/components/sigfox/test_sensor.py
+++ b/tests/components/sigfox/test_sensor.py
@@ -1,6 +1,5 @@
 """Tests for the sigfox sensor."""
 import re
-import unittest
 
 import requests_mock
 
@@ -9,9 +8,7 @@ from homeassistant.components.sigfox.sensor import (
     CONF_API_LOGIN,
     CONF_API_PASSWORD,
 )
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 TEST_API_LOGIN = "foo"
 TEST_API_PASSWORD = "ebcd1234"
@@ -33,39 +30,32 @@ VALID_MESSAGE = """
 """
 
 
-class TestSigfoxSensor(unittest.TestCase):
-    """Test the sigfox platform."""
+async def test_invalid_credentials(hass):
+    """Test for invalid credentials."""
+    with requests_mock.Mocker() as mock_req:
+        url = re.compile(API_URL + "devicetypes")
+        mock_req.get(url, text="{}", status_code=401)
+        assert await async_setup_component(hass, "sensor", VALID_CONFIG)
+        await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids()) == 0
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
 
-    def test_invalid_credentials(self):
-        """Test for invalid credentials."""
-        with requests_mock.Mocker() as mock_req:
-            url = re.compile(API_URL + "devicetypes")
-            mock_req.get(url, text="{}", status_code=401)
-            assert setup_component(self.hass, "sensor", VALID_CONFIG)
-            self.hass.block_till_done()
-        assert len(self.hass.states.entity_ids()) == 0
+async def test_valid_credentials(hass):
+    """Test for valid credentials."""
+    with requests_mock.Mocker() as mock_req:
+        url1 = re.compile(API_URL + "devicetypes")
+        mock_req.get(url1, text='{"data":[{"id":"fake_type"}]}', status_code=200)
 
-    def test_valid_credentials(self):
-        """Test for valid credentials."""
-        with requests_mock.Mocker() as mock_req:
-            url1 = re.compile(API_URL + "devicetypes")
-            mock_req.get(url1, text='{"data":[{"id":"fake_type"}]}', status_code=200)
+        url2 = re.compile(API_URL + "devicetypes/fake_type/devices")
+        mock_req.get(url2, text='{"data":[{"id":"fake_id"}]}')
 
-            url2 = re.compile(API_URL + "devicetypes/fake_type/devices")
-            mock_req.get(url2, text='{"data":[{"id":"fake_id"}]}')
+        url3 = re.compile(API_URL + "devices/fake_id/messages*")
+        mock_req.get(url3, text=VALID_MESSAGE)
 
-            url3 = re.compile(API_URL + "devices/fake_id/messages*")
-            mock_req.get(url3, text=VALID_MESSAGE)
+        assert await async_setup_component(hass, "sensor", VALID_CONFIG)
+        await hass.async_block_till_done()
 
-            assert setup_component(self.hass, "sensor", VALID_CONFIG)
-            self.hass.block_till_done()
-
-            assert len(self.hass.states.entity_ids()) == 1
-            state = self.hass.states.get("sensor.sigfox_fake_id")
-            assert state.state == "payload"
-            assert state.attributes.get("snr") == "50.0"
+        assert len(hass.states.async_entity_ids()) == 1
+        state = hass.states.get("sensor.sigfox_fake_id")
+        assert state.state == "payload"
+        assert state.attributes.get("snr") == "50.0"
diff --git a/tests/components/simplisafe/test_config_flow.py b/tests/components/simplisafe/test_config_flow.py
index e3d0b0479c4..d4ba26bd484 100644
--- a/tests/components/simplisafe/test_config_flow.py
+++ b/tests/components/simplisafe/test_config_flow.py
@@ -7,7 +7,7 @@ from simplipy.errors import (
 
 from homeassistant import data_entry_flow
 from homeassistant.components.simplisafe import DOMAIN
-from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
+from homeassistant.config_entries import SOURCE_USER
 from homeassistant.const import CONF_CODE, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
 
 from tests.async_mock import AsyncMock, MagicMock, PropertyMock, patch
@@ -54,7 +54,7 @@ async def test_invalid_credentials(hass):
         result = await hass.config_entries.flow.async_init(
             DOMAIN, context={"source": SOURCE_USER}, data=conf
         )
-        assert result["errors"] == {"base": "invalid_credentials"}
+        assert result["errors"] == {"base": "invalid_auth"}
 
 
 async def test_options_flow(hass):
@@ -88,39 +88,13 @@ async def test_options_flow(hass):
 async def test_show_form(hass):
     """Test that the form is served with no input."""
     result = await hass.config_entries.flow.async_init(
-        DOMAIN, context={"source": SOURCE_IMPORT}
+        DOMAIN, context={"source": SOURCE_USER}
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "user"
 
 
-async def test_step_import(hass):
-    """Test that the import step works."""
-    conf = {
-        CONF_USERNAME: "user@email.com",
-        CONF_PASSWORD: "password",
-        CONF_CODE: "1234",
-    }
-
-    with patch(
-        "homeassistant.components.simplisafe.async_setup_entry", return_value=True
-    ), patch(
-        "simplipy.API.login_via_credentials", new=AsyncMock(return_value=mock_api())
-    ):
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN, context={"source": SOURCE_USER}, data=conf
-        )
-
-        assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
-        assert result["title"] == "user@email.com"
-        assert result["data"] == {
-            CONF_USERNAME: "user@email.com",
-            CONF_TOKEN: "12345abc",
-            CONF_CODE: "1234",
-        }
-
-
 async def test_step_reauth(hass):
     """Test that the reauth step works."""
     MockConfigEntry(
diff --git a/tests/components/simulated/test_sensor.py b/tests/components/simulated/test_sensor.py
index 09e77f7b283..781b5d494ba 100644
--- a/tests/components/simulated/test_sensor.py
+++ b/tests/components/simulated/test_sensor.py
@@ -1,6 +1,4 @@
 """The tests for the simulated sensor."""
-import unittest
-
 from homeassistant.components.simulated.sensor import (
     CONF_AMP,
     CONF_FWHM,
@@ -19,37 +17,24 @@ from homeassistant.components.simulated.sensor import (
     DEFAULT_SEED,
 )
 from homeassistant.const import CONF_FRIENDLY_NAME
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 
-class TestSimulatedSensor(unittest.TestCase):
-    """Test the simulated sensor."""
+async def test_simulated_sensor_default_config(hass):
+    """Test default config."""
+    config = {"sensor": {"platform": "simulated"}}
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
+    assert len(hass.states.async_entity_ids()) == 1
+    state = hass.states.get("sensor.simulated")
 
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_default_config(self):
-        """Test default config."""
-        config = {"sensor": {"platform": "simulated"}}
-        assert setup_component(self.hass, "sensor", config)
-        self.hass.block_till_done()
-
-        assert len(self.hass.states.entity_ids()) == 1
-        state = self.hass.states.get("sensor.simulated")
-
-        assert state.attributes.get(CONF_FRIENDLY_NAME) == DEFAULT_NAME
-        assert state.attributes.get(CONF_AMP) == DEFAULT_AMP
-        assert state.attributes.get(CONF_UNIT) is None
-        assert state.attributes.get(CONF_MEAN) == DEFAULT_MEAN
-        assert state.attributes.get(CONF_PERIOD) == 60.0
-        assert state.attributes.get(CONF_PHASE) == DEFAULT_PHASE
-        assert state.attributes.get(CONF_FWHM) == DEFAULT_FWHM
-        assert state.attributes.get(CONF_SEED) == DEFAULT_SEED
-        assert state.attributes.get(CONF_RELATIVE_TO_EPOCH) == DEFAULT_RELATIVE_TO_EPOCH
+    assert state.attributes.get(CONF_FRIENDLY_NAME) == DEFAULT_NAME
+    assert state.attributes.get(CONF_AMP) == DEFAULT_AMP
+    assert state.attributes.get(CONF_UNIT) is None
+    assert state.attributes.get(CONF_MEAN) == DEFAULT_MEAN
+    assert state.attributes.get(CONF_PERIOD) == 60.0
+    assert state.attributes.get(CONF_PHASE) == DEFAULT_PHASE
+    assert state.attributes.get(CONF_FWHM) == DEFAULT_FWHM
+    assert state.attributes.get(CONF_SEED) == DEFAULT_SEED
+    assert state.attributes.get(CONF_RELATIVE_TO_EPOCH) == DEFAULT_RELATIVE_TO_EPOCH
diff --git a/tests/components/slack/__init__.py b/tests/components/slack/__init__.py
new file mode 100644
index 00000000000..b32ec5ef7b1
--- /dev/null
+++ b/tests/components/slack/__init__.py
@@ -0,0 +1 @@
+"""Slack notification tests."""
diff --git a/tests/components/slack/test_notify.py b/tests/components/slack/test_notify.py
new file mode 100644
index 00000000000..bfd78b20900
--- /dev/null
+++ b/tests/components/slack/test_notify.py
@@ -0,0 +1,66 @@
+"""Test slack notifications."""
+from unittest.mock import Mock
+
+from homeassistant.components.slack.notify import SlackNotificationService
+
+from tests.async_mock import AsyncMock
+
+
+async def test_message_includes_default_emoji():
+    """Tests that default icon is used when no message icon is given."""
+    mock_client = Mock()
+    mock_client.chat_postMessage = AsyncMock()
+    expected_icon = ":robot_face:"
+    service = SlackNotificationService(None, mock_client, "_", "_", expected_icon)
+
+    await service.async_send_message("test")
+
+    mock_fn = mock_client.chat_postMessage
+    mock_fn.assert_called_once()
+    _, kwargs = mock_fn.call_args
+    assert kwargs["icon_emoji"] == expected_icon
+
+
+async def test_message_emoji_overrides_default():
+    """Tests that overriding the default icon emoji when sending a message works."""
+    mock_client = Mock()
+    mock_client.chat_postMessage = AsyncMock()
+    service = SlackNotificationService(None, mock_client, "_", "_", "default_icon")
+
+    expected_icon = ":new:"
+    await service.async_send_message("test", data={"icon": expected_icon})
+
+    mock_fn = mock_client.chat_postMessage
+    mock_fn.assert_called_once()
+    _, kwargs = mock_fn.call_args
+    assert kwargs["icon_emoji"] == expected_icon
+
+
+async def test_message_includes_default_icon_url():
+    """Tests that overriding the default icon url when sending a message works."""
+    mock_client = Mock()
+    mock_client.chat_postMessage = AsyncMock()
+    expected_icon = "https://example.com/hass.png"
+    service = SlackNotificationService(None, mock_client, "_", "_", expected_icon)
+
+    await service.async_send_message("test")
+
+    mock_fn = mock_client.chat_postMessage
+    mock_fn.assert_called_once()
+    _, kwargs = mock_fn.call_args
+    assert kwargs["icon_url"] == expected_icon
+
+
+async def test_message_icon_url_overrides_default():
+    """Tests that overriding the default icon url when sending a message works."""
+    mock_client = Mock()
+    mock_client.chat_postMessage = AsyncMock()
+    service = SlackNotificationService(None, mock_client, "_", "_", "default_icon")
+
+    expected_icon = "https://example.com/hass.png"
+    await service.async_send_message("test", data={"icon": expected_icon})
+
+    mock_fn = mock_client.chat_postMessage
+    mock_fn.assert_called_once()
+    _, kwargs = mock_fn.call_args
+    assert kwargs["icon_url"] == expected_icon
diff --git a/tests/components/sleepiq/test_binary_sensor.py b/tests/components/sleepiq/test_binary_sensor.py
index ab51a08d4c6..c1577a21cd2 100644
--- a/tests/components/sleepiq/test_binary_sensor.py
+++ b/tests/components/sleepiq/test_binary_sensor.py
@@ -1,67 +1,44 @@
 """The tests for SleepIQ binary sensor platform."""
-import unittest
-
-import requests_mock
-
 from homeassistant.components.sleepiq import binary_sensor as sleepiq
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import MagicMock
-from tests.common import get_test_home_assistant
 from tests.components.sleepiq.test_init import mock_responses
 
+CONFIG = {"username": "foo", "password": "bar"}
 
-class TestSleepIQBinarySensorSetup(unittest.TestCase):
-    """Tests the SleepIQ Binary Sensor platform."""
 
-    DEVICES = []
+async def test_sensor_setup(hass, requests_mock):
+    """Test for successfully setting up the SleepIQ platform."""
+    mock_responses(requests_mock)
 
-    def add_entities(self, devices):
-        """Mock add devices."""
-        for device in devices:
-            self.DEVICES.append(device)
+    await async_setup_component(hass, "sleepiq", {"sleepiq": CONFIG})
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.username = "foo"
-        self.password = "bar"
-        self.config = {"username": self.username, "password": self.password}
-        self.DEVICES = []
-        self.addCleanup(self.tear_down_cleanup)
+    device_mock = MagicMock()
+    sleepiq.setup_platform(hass, CONFIG, device_mock, MagicMock())
+    devices = device_mock.call_args[0][0]
+    assert 2 == len(devices)
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+    left_side = devices[1]
+    assert "SleepNumber ILE Test1 Is In Bed" == left_side.name
+    assert "on" == left_side.state
 
-    @requests_mock.Mocker()
-    def test_setup(self, mock):
-        """Test for successfully setting up the SleepIQ platform."""
-        mock_responses(mock)
+    right_side = devices[0]
+    assert "SleepNumber ILE Test2 Is In Bed" == right_side.name
+    assert "off" == right_side.state
 
-        setup_component(self.hass, "sleepiq", {"sleepiq": self.config})
 
-        sleepiq.setup_platform(self.hass, self.config, self.add_entities, MagicMock())
-        assert 2 == len(self.DEVICES)
+async def test_setup_single(hass, requests_mock):
+    """Test for successfully setting up the SleepIQ platform."""
+    mock_responses(requests_mock, single=True)
 
-        left_side = self.DEVICES[1]
-        assert "SleepNumber ILE Test1 Is In Bed" == left_side.name
-        assert "on" == left_side.state
+    await async_setup_component(hass, "sleepiq", {"sleepiq": CONFIG})
 
-        right_side = self.DEVICES[0]
-        assert "SleepNumber ILE Test2 Is In Bed" == right_side.name
-        assert "off" == right_side.state
+    device_mock = MagicMock()
+    sleepiq.setup_platform(hass, CONFIG, device_mock, MagicMock())
+    devices = device_mock.call_args[0][0]
+    assert 1 == len(devices)
 
-    @requests_mock.Mocker()
-    def test_setup_single(self, mock):
-        """Test for successfully setting up the SleepIQ platform."""
-        mock_responses(mock, single=True)
-
-        setup_component(self.hass, "sleepiq", {"sleepiq": self.config})
-
-        sleepiq.setup_platform(self.hass, self.config, self.add_entities, MagicMock())
-        assert 1 == len(self.DEVICES)
-
-        right_side = self.DEVICES[0]
-        assert "SleepNumber ILE Test1 Is In Bed" == right_side.name
-        assert "on" == right_side.state
+    right_side = devices[0]
+    assert "SleepNumber ILE Test1 Is In Bed" == right_side.name
+    assert "on" == right_side.state
diff --git a/tests/components/sleepiq/test_init.py b/tests/components/sleepiq/test_init.py
index 850d42763d1..70aaca2e17d 100644
--- a/tests/components/sleepiq/test_init.py
+++ b/tests/components/sleepiq/test_init.py
@@ -1,13 +1,11 @@
 """The tests for the SleepIQ component."""
-import unittest
-
-import requests_mock
-
 from homeassistant import setup
 import homeassistant.components.sleepiq as sleepiq
 
 from tests.async_mock import MagicMock, patch
-from tests.common import get_test_home_assistant, load_fixture
+from tests.common import load_fixture
+
+CONFIG = {"sleepiq": {"username": "foo", "password": "bar"}}
 
 
 def mock_responses(mock, single=False):
@@ -26,55 +24,40 @@ def mock_responses(mock, single=False):
     )
 
 
-class TestSleepIQ(unittest.TestCase):
-    """Tests the SleepIQ component."""
+async def test_setup(hass, requests_mock):
+    """Test the setup."""
+    mock_responses(requests_mock)
 
-    def setUp(self):
-        """Initialize values for this test case class."""
-        self.hass = get_test_home_assistant()
-        self.username = "foo"
-        self.password = "bar"
-        self.config = {
-            "sleepiq": {"username": self.username, "password": self.password}
-        }
-        self.addCleanup(self.tear_down_cleanup)
+    # We're mocking the load_platform discoveries or else the platforms
+    # will be setup during tear down when blocking till done, but the mocks
+    # are no longer active.
+    with patch("homeassistant.helpers.discovery.load_platform", MagicMock()):
+        assert sleepiq.setup(hass, CONFIG)
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
 
-    @requests_mock.Mocker()
-    def test_setup(self, mock):
-        """Test the setup."""
-        mock_responses(mock)
+async def test_setup_login_failed(hass, requests_mock):
+    """Test the setup if a bad username or password is given."""
+    mock_responses(requests_mock)
+    requests_mock.put(
+        "https://prod-api.sleepiq.sleepnumber.com/rest/login",
+        status_code=401,
+        json=load_fixture("sleepiq-login-failed.json"),
+    )
 
-        # We're mocking the load_platform discoveries or else the platforms
-        # will be setup during tear down when blocking till done, but the mocks
-        # are no longer active.
-        with patch("homeassistant.helpers.discovery.load_platform", MagicMock()):
-            assert sleepiq.setup(self.hass, self.config)
+    response = sleepiq.setup(hass, CONFIG)
+    assert not response
 
-    @requests_mock.Mocker()
-    def test_setup_login_failed(self, mock):
-        """Test the setup if a bad username or password is given."""
-        mock.put(
-            "https://prod-api.sleepiq.sleepnumber.com/rest/login",
-            status_code=401,
-            json=load_fixture("sleepiq-login-failed.json"),
-        )
 
-        response = sleepiq.setup(self.hass, self.config)
-        assert not response
+async def test_setup_component_no_login(hass):
+    """Test the setup when no login is configured."""
+    conf = CONFIG.copy()
+    del conf["sleepiq"]["username"]
+    assert not await setup.async_setup_component(hass, sleepiq.DOMAIN, conf)
 
-    def test_setup_component_no_login(self):
-        """Test the setup when no login is configured."""
-        conf = self.config.copy()
-        del conf["sleepiq"]["username"]
-        assert not setup.setup_component(self.hass, sleepiq.DOMAIN, conf)
 
-    def test_setup_component_no_password(self):
-        """Test the setup when no password is configured."""
-        conf = self.config.copy()
-        del conf["sleepiq"]["password"]
+async def test_setup_component_no_password(hass):
+    """Test the setup when no password is configured."""
+    conf = CONFIG.copy()
+    del conf["sleepiq"]["password"]
 
-        assert not setup.setup_component(self.hass, sleepiq.DOMAIN, conf)
+    assert not await setup.async_setup_component(hass, sleepiq.DOMAIN, conf)
diff --git a/tests/components/sleepiq/test_sensor.py b/tests/components/sleepiq/test_sensor.py
index 3e5cbc657e1..53ee4de973f 100644
--- a/tests/components/sleepiq/test_sensor.py
+++ b/tests/components/sleepiq/test_sensor.py
@@ -1,67 +1,44 @@
 """The tests for SleepIQ sensor platform."""
-import unittest
-
-import requests_mock
-
 import homeassistant.components.sleepiq.sensor as sleepiq
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import MagicMock
-from tests.common import get_test_home_assistant
 from tests.components.sleepiq.test_init import mock_responses
 
+CONFIG = {"username": "foo", "password": "bar"}
 
-class TestSleepIQSensorSetup(unittest.TestCase):
-    """Tests the SleepIQ Sensor platform."""
 
-    DEVICES = []
+async def test_setup(hass, requests_mock):
+    """Test for successfully setting up the SleepIQ platform."""
+    mock_responses(requests_mock)
 
-    def add_entities(self, devices):
-        """Mock add devices."""
-        for device in devices:
-            self.DEVICES.append(device)
+    assert await async_setup_component(hass, "sleepiq", {"sleepiq": CONFIG})
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.username = "foo"
-        self.password = "bar"
-        self.config = {"username": self.username, "password": self.password}
-        self.DEVICES = []
-        self.addCleanup(self.tear_down_cleanup)
+    device_mock = MagicMock()
+    sleepiq.setup_platform(hass, CONFIG, device_mock, MagicMock())
+    devices = device_mock.call_args[0][0]
+    assert 2 == len(devices)
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+    left_side = devices[1]
+    assert "SleepNumber ILE Test1 SleepNumber" == left_side.name
+    assert 40 == left_side.state
 
-    @requests_mock.Mocker()
-    def test_setup(self, mock):
-        """Test for successfully setting up the SleepIQ platform."""
-        mock_responses(mock)
+    right_side = devices[0]
+    assert "SleepNumber ILE Test2 SleepNumber" == right_side.name
+    assert 80 == right_side.state
 
-        assert setup_component(self.hass, "sleepiq", {"sleepiq": self.config})
 
-        sleepiq.setup_platform(self.hass, self.config, self.add_entities, MagicMock())
-        assert 2 == len(self.DEVICES)
+async def test_setup_sigle(hass, requests_mock):
+    """Test for successfully setting up the SleepIQ platform."""
+    mock_responses(requests_mock, single=True)
 
-        left_side = self.DEVICES[1]
-        assert "SleepNumber ILE Test1 SleepNumber" == left_side.name
-        assert 40 == left_side.state
+    assert await async_setup_component(hass, "sleepiq", {"sleepiq": CONFIG})
 
-        right_side = self.DEVICES[0]
-        assert "SleepNumber ILE Test2 SleepNumber" == right_side.name
-        assert 80 == right_side.state
+    device_mock = MagicMock()
+    sleepiq.setup_platform(hass, CONFIG, device_mock, MagicMock())
+    devices = device_mock.call_args[0][0]
+    assert 1 == len(devices)
 
-    @requests_mock.Mocker()
-    def test_setup_sigle(self, mock):
-        """Test for successfully setting up the SleepIQ platform."""
-        mock_responses(mock, single=True)
-
-        assert setup_component(self.hass, "sleepiq", {"sleepiq": self.config})
-
-        sleepiq.setup_platform(self.hass, self.config, self.add_entities, MagicMock())
-        assert 1 == len(self.DEVICES)
-
-        right_side = self.DEVICES[0]
-        assert "SleepNumber ILE Test1 SleepNumber" == right_side.name
-        assert 40 == right_side.state
+    right_side = devices[0]
+    assert "SleepNumber ILE Test1 SleepNumber" == right_side.name
+    assert 40 == right_side.state
diff --git a/tests/components/sma/test_sensor.py b/tests/components/sma/test_sensor.py
index f12af1f3849..8aa8c3e5b4c 100644
--- a/tests/components/sma/test_sensor.py
+++ b/tests/components/sma/test_sensor.py
@@ -1,13 +1,10 @@
 """SMA sensor tests."""
-import logging
-
 from homeassistant.components.sensor import DOMAIN
 from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, VOLT
 from homeassistant.setup import async_setup_component
 
 from tests.common import assert_setup_component
 
-_LOGGER = logging.getLogger(__name__)
 BASE_CFG = {
     "platform": "sma",
     "host": "1.1.1.1",
diff --git a/tests/components/smappee/test_config_flow.py b/tests/components/smappee/test_config_flow.py
index 2200dd66490..7434d469f96 100644
--- a/tests/components/smappee/test_config_flow.py
+++ b/tests/components/smappee/test_config_flow.py
@@ -72,7 +72,7 @@ async def test_show_zeroconf_connection_error_form(hass):
         )
 
         assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-        assert result["reason"] == "connection_error"
+        assert result["reason"] == "cannot_connect"
         assert len(hass.config_entries.async_entries(DOMAIN)) == 0
 
 
@@ -95,7 +95,7 @@ async def test_connection_error(hass):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"], {"host": "1.2.3.4"}
         )
-        assert result["reason"] == "connection_error"
+        assert result["reason"] == "cannot_connect"
         assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
 
 
diff --git a/tests/components/smart_meter_texas/test_init.py b/tests/components/smart_meter_texas/test_init.py
index 1ccb15714b1..861425601ec 100644
--- a/tests/components/smart_meter_texas/test_init.py
+++ b/tests/components/smart_meter_texas/test_init.py
@@ -45,6 +45,7 @@ async def test_update_failure(hass, config_entry, aioclient_mock):
     """Test that the coordinator handles a bad response."""
     await setup_integration(hass, config_entry, aioclient_mock, bad_reading=True)
     await async_setup_component(hass, HA_DOMAIN, {})
+    await hass.async_block_till_done()
     with patch("smart_meter_texas.Meter.read_meter") as updater:
         await hass.services.async_call(
             HA_DOMAIN,
diff --git a/tests/components/smarthab/test_config_flow.py b/tests/components/smarthab/test_config_flow.py
index 6303fd44def..d15fe58999e 100644
--- a/tests/components/smarthab/test_config_flow.py
+++ b/tests/components/smarthab/test_config_flow.py
@@ -55,7 +55,7 @@ async def test_form_invalid_auth(hass):
         )
 
     assert result2["type"] == "form"
-    assert result2["errors"] == {"base": "wrong_login"}
+    assert result2["errors"] == {"base": "invalid_auth"}
 
 
 async def test_form_service_error(hass):
@@ -93,7 +93,7 @@ async def test_form_unknown_error(hass):
         )
 
     assert result2["type"] == "form"
-    assert result2["errors"] == {"base": "unknown_error"}
+    assert result2["errors"] == {"base": "unknown"}
 
 
 async def test_import(hass):
diff --git a/tests/components/smtp/test_notify.py b/tests/components/smtp/test_notify.py
index 6320614c059..754df5945af 100644
--- a/tests/components/smtp/test_notify.py
+++ b/tests/components/smtp/test_notify.py
@@ -1,7 +1,8 @@
 """The tests for the notify smtp platform."""
 from os import path
 import re
-import unittest
+
+import pytest
 
 from homeassistant import config as hass_config
 import homeassistant.components.notify as notify
@@ -11,7 +12,6 @@ from homeassistant.const import SERVICE_RELOAD
 from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
 
 
 class MockSMTP(MailNotificationService):
@@ -22,77 +22,6 @@ class MockSMTP(MailNotificationService):
         return msg.as_string()
 
 
-class TestNotifySmtp(unittest.TestCase):
-    """Test the smtp notify."""
-
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.mailer = MockSMTP(
-            "localhost",
-            25,
-            5,
-            "test@test.com",
-            1,
-            "testuser",
-            "testpass",
-            ["recip1@example.com", "testrecip@test.com"],
-            "Home Assistant",
-            0,
-        )
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Stop down everything that was started."""
-        self.hass.stop()
-
-    @patch("email.utils.make_msgid", return_value="<mock@mock>")
-    def test_text_email(self, mock_make_msgid):
-        """Test build of default text email behavior."""
-        msg = self.mailer.send_message("Test msg")
-        expected = (
-            '^Content-Type: text/plain; charset="us-ascii"\n'
-            "MIME-Version: 1.0\n"
-            "Content-Transfer-Encoding: 7bit\n"
-            "Subject: Home Assistant\n"
-            "To: recip1@example.com,testrecip@test.com\n"
-            "From: Home Assistant <test@test.com>\n"
-            "X-Mailer: Home Assistant\n"
-            "Date: [^\n]+\n"
-            "Message-Id: <[^@]+@[^>]+>\n"
-            "\n"
-            "Test msg$"
-        )
-        assert re.search(expected, msg)
-
-    @patch("email.utils.make_msgid", return_value="<mock@mock>")
-    def test_mixed_email(self, mock_make_msgid):
-        """Test build of mixed text email behavior."""
-        msg = self.mailer.send_message("Test msg", data={"images": ["test.jpg"]})
-        assert "Content-Type: multipart/related" in msg
-
-    @patch("email.utils.make_msgid", return_value="<mock@mock>")
-    def test_html_email(self, mock_make_msgid):
-        """Test build of html email behavior."""
-        html = """
-        <!DOCTYPE html>
-        <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
-            <head><meta charset="UTF-8"></head>
-            <body>
-              <div>
-                <h1>Intruder alert at apartment!!</h1>
-              </div>
-              <div>
-                <img alt="test.jpg" src="cid:test.jpg"/>
-              </div>
-            </body>
-        </html>"""
-        msg = self.mailer.send_message(
-            "Test msg", data={"html": html, "images": ["test.jpg"]}
-        )
-        assert "Content-Type: multipart/related" in msg
-
-
 async def test_reload_notify(hass):
     """Verify we can reload the notify service."""
 
@@ -139,3 +68,100 @@ async def test_reload_notify(hass):
 
 def _get_fixtures_base_path():
     return path.dirname(path.dirname(path.dirname(__file__)))
+
+
+@pytest.fixture
+def message():
+    """Return MockSMTP object with test data."""
+    mailer = MockSMTP(
+        "localhost",
+        25,
+        5,
+        "test@test.com",
+        1,
+        "testuser",
+        "testpass",
+        ["recip1@example.com", "testrecip@test.com"],
+        "Home Assistant",
+        0,
+    )
+    yield mailer
+
+
+HTML = """
+        <!DOCTYPE html>
+        <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+            <head><meta charset="UTF-8"></head>
+            <body>
+              <div>
+                <h1>Intruder alert at apartment!!</h1>
+              </div>
+              <div>
+                <img alt="tests/testing_config/notify/test.jpg" src="cid:tests/testing_config/notify/test.jpg"/>
+              </div>
+            </body>
+        </html>"""
+
+
+EMAIL_DATA = [
+    (
+        "Test msg",
+        {"images": ["tests/testing_config/notify/test.jpg"]},
+        "Content-Type: multipart/related",
+    ),
+    (
+        "Test msg",
+        {"html": HTML, "images": ["tests/testing_config/notify/test.jpg"]},
+        "Content-Type: multipart/related",
+    ),
+    (
+        "Test msg",
+        {"html": HTML, "images": ["test.jpg"]},
+        "Content-Type: multipart/related",
+    ),
+    (
+        "Test msg",
+        {"html": HTML, "images": ["tests/testing_config/notify/test.pdf"]},
+        "Content-Type: multipart/related",
+    ),
+]
+
+
+@pytest.mark.parametrize(
+    "message_data, data, content_type",
+    EMAIL_DATA,
+    ids=[
+        "Tests when sending text message and images.",
+        "Tests when sending text message, HTML Template and images.",
+        "Tests when image does not exist at mentioned location.",
+        "Tests when image type cannot be detected or is of wrong type.",
+    ],
+)
+def test_send_message(message_data, data, content_type, hass, message):
+    """Verify if we can send messages of all types correctly."""
+    sample_email = "<mock@mock>"
+    with patch("email.utils.make_msgid", return_value=sample_email):
+        result = message.send_message(message_data, data=data)
+        assert content_type in result
+
+
+def test_send_text_message(hass, message):
+    """Verify if we can send simple text message."""
+    expected = (
+        '^Content-Type: text/plain; charset="us-ascii"\n'
+        "MIME-Version: 1.0\n"
+        "Content-Transfer-Encoding: 7bit\n"
+        "Subject: Home Assistant\n"
+        "To: recip1@example.com,testrecip@test.com\n"
+        "From: Home Assistant <test@test.com>\n"
+        "X-Mailer: Home Assistant\n"
+        "Date: [^\n]+\n"
+        "Message-Id: <[^@]+@[^>]+>\n"
+        "\n"
+        "Test msg$"
+    )
+    sample_email = "<mock@mock>"
+    message_data = "Test msg"
+    with patch("email.utils.make_msgid", return_value=sample_email):
+        result = message.send_message(message_data)
+        assert re.search(expected, result)
diff --git a/tests/components/snips/test_init.py b/tests/components/snips/test_init.py
index dc69c10a7fb..82811b61925 100644
--- a/tests/components/snips/test_init.py
+++ b/tests/components/snips/test_init.py
@@ -402,7 +402,7 @@ async def test_intent_special_slots(hass, mqtt_mock):
     assert len(calls) == 1
     assert calls[0].domain == "light"
     assert calls[0].service == "turn_on"
-    assert calls[0].data["confidenceScore"] == "0.85"
+    assert calls[0].data["confidenceScore"] == 0.85
     assert calls[0].data["site_id"] == "default"
 
 
diff --git a/tests/components/sonarr/__init__.py b/tests/components/sonarr/__init__.py
index a66184887d5..61afac099d3 100644
--- a/tests/components/sonarr/__init__.py
+++ b/tests/components/sonarr/__init__.py
@@ -28,13 +28,6 @@ PORT = 8989
 BASE_PATH = "/api"
 API_KEY = "MOCK_API_KEY"
 
-MOCK_SENSOR_CONFIG = {
-    "platform": DOMAIN,
-    "host": HOST,
-    "api_key": API_KEY,
-    "days": 3,
-}
-
 MOCK_REAUTH_INPUT = {CONF_API_KEY: "test-api-key-reauth"}
 
 MOCK_USER_INPUT = {
diff --git a/tests/components/sonarr/test_config_flow.py b/tests/components/sonarr/test_config_flow.py
index 2c39e4384e5..f872f7f8c18 100644
--- a/tests/components/sonarr/test_config_flow.py
+++ b/tests/components/sonarr/test_config_flow.py
@@ -6,7 +6,7 @@ from homeassistant.components.sonarr.const import (
     DEFAULT_WANTED_MAX_ITEMS,
     DOMAIN,
 )
-from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH, SOURCE_USER
+from homeassistant.config_entries import SOURCE_REAUTH, SOURCE_USER
 from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_SOURCE, CONF_VERIFY_SSL
 from homeassistant.data_entry_flow import (
     RESULT_TYPE_ABORT,
@@ -96,28 +96,6 @@ async def test_unknown_error(
     assert result["reason"] == "unknown"
 
 
-async def test_full_import_flow_implementation(
-    hass: HomeAssistantType, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test the full manual import flow from start to finish."""
-    mock_connection(aioclient_mock)
-
-    user_input = MOCK_USER_INPUT.copy()
-
-    with _patch_async_setup(), _patch_async_setup_entry():
-        result = await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={CONF_SOURCE: SOURCE_IMPORT},
-            data=user_input,
-        )
-
-    assert result["type"] == RESULT_TYPE_CREATE_ENTRY
-    assert result["title"] == HOST
-
-    assert result["data"]
-    assert result["data"][CONF_HOST] == HOST
-
-
 async def test_full_reauth_flow_implementation(
     hass: HomeAssistantType, aioclient_mock: AiohttpClientMocker
 ) -> None:
diff --git a/tests/components/sonarr/test_sensor.py b/tests/components/sonarr/test_sensor.py
index 93c8d7d4d9e..94230c9e726 100644
--- a/tests/components/sonarr/test_sensor.py
+++ b/tests/components/sonarr/test_sensor.py
@@ -4,8 +4,7 @@ from datetime import timedelta
 import pytest
 
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
-from homeassistant.components.sonarr.const import CONF_BASE_PATH, DOMAIN
-from homeassistant.config_entries import ENTRY_STATE_LOADED
+from homeassistant.components.sonarr.const import DOMAIN
 from homeassistant.const import (
     ATTR_ICON,
     ATTR_UNIT_OF_MEASUREMENT,
@@ -13,42 +12,16 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
 )
 from homeassistant.helpers.typing import HomeAssistantType
-from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
 from tests.async_mock import patch
 from tests.common import async_fire_time_changed
-from tests.components.sonarr import (
-    MOCK_SENSOR_CONFIG,
-    _patch_async_setup,
-    _patch_async_setup_entry,
-    mock_connection,
-    setup_integration,
-)
+from tests.components.sonarr import mock_connection, setup_integration
 from tests.test_util.aiohttp import AiohttpClientMocker
 
 UPCOMING_ENTITY_ID = f"{SENSOR_DOMAIN}.sonarr_upcoming"
 
 
-async def test_import_from_sensor_component(
-    hass: HomeAssistantType, aioclient_mock: AiohttpClientMocker
-) -> None:
-    """Test import from sensor platform."""
-    mock_connection(aioclient_mock)
-
-    with _patch_async_setup(), _patch_async_setup_entry():
-        assert await async_setup_component(
-            hass, SENSOR_DOMAIN, {SENSOR_DOMAIN: MOCK_SENSOR_CONFIG}
-        )
-        await hass.async_block_till_done()
-
-    entries = hass.config_entries.async_entries(DOMAIN)
-    assert len(entries) == 1
-
-    assert entries[0].state == ENTRY_STATE_LOADED
-    assert entries[0].data[CONF_BASE_PATH] == "/api"
-
-
 async def test_sensors(
     hass: HomeAssistantType, aioclient_mock: AiohttpClientMocker
 ) -> None:
diff --git a/tests/components/sonos/conftest.py b/tests/components/sonos/conftest.py
index e8441576013..f6249d0bc81 100644
--- a/tests/components/sonos/conftest.py
+++ b/tests/components/sonos/conftest.py
@@ -23,6 +23,7 @@ def soco_fixture(music_library, speaker_info, dummy_soco_service):
     ):
         mock_soco = mock.return_value
         mock_soco.uid = "RINCON_test"
+        mock_soco.play_mode = "NORMAL"
         mock_soco.music_library = music_library
         mock_soco.get_speaker_info.return_value = speaker_info
         mock_soco.avTransport = dummy_soco_service
diff --git a/tests/components/speedtestdotnet/test_config_flow.py b/tests/components/speedtestdotnet/test_config_flow.py
index 8e7edc2d986..d421113a2d7 100644
--- a/tests/components/speedtestdotnet/test_config_flow.py
+++ b/tests/components/speedtestdotnet/test_config_flow.py
@@ -135,4 +135,4 @@ async def test_integration_already_configured(hass):
         speedtestdotnet.DOMAIN, context={"source": "user"}
     )
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "one_instance_allowed"
+    assert result["reason"] == "single_instance_allowed"
diff --git a/tests/components/sql/test_sensor.py b/tests/components/sql/test_sensor.py
index 8b8bca5e37c..ddab7b1ba36 100644
--- a/tests/components/sql/test_sensor.py
+++ b/tests/components/sql/test_sensor.py
@@ -1,71 +1,57 @@
 """The test for the sql sensor platform."""
-import unittest
-
 import pytest
 import voluptuous as vol
 
 from homeassistant.components.sql.sensor import validate_sql_select
 from homeassistant.const import STATE_UNKNOWN
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 
-class TestSQLSensor(unittest.TestCase):
+async def test_query(hass):
     """Test the SQL sensor."""
-
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_query(self):
-        """Test the SQL sensor."""
-        config = {
-            "sensor": {
-                "platform": "sql",
-                "db_url": "sqlite://",
-                "queries": [
-                    {
-                        "name": "count_tables",
-                        "query": "SELECT 5 as value",
-                        "column": "value",
-                    }
-                ],
-            }
+    config = {
+        "sensor": {
+            "platform": "sql",
+            "db_url": "sqlite://",
+            "queries": [
+                {
+                    "name": "count_tables",
+                    "query": "SELECT 5 as value",
+                    "column": "value",
+                }
+            ],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.count_tables")
-        assert state.state == "5"
-        assert state.attributes["value"] == 5
+    state = hass.states.get("sensor.count_tables")
+    assert state.state == "5"
+    assert state.attributes["value"] == 5
 
-    def test_invalid_query(self):
-        """Test the SQL sensor for invalid queries."""
-        with pytest.raises(vol.Invalid):
-            validate_sql_select("DROP TABLE *")
 
-        config = {
-            "sensor": {
-                "platform": "sql",
-                "db_url": "sqlite://",
-                "queries": [
-                    {
-                        "name": "count_tables",
-                        "query": "SELECT * value FROM sqlite_master;",
-                        "column": "value",
-                    }
-                ],
-            }
+async def test_invalid_query(hass):
+    """Test the SQL sensor for invalid queries."""
+    with pytest.raises(vol.Invalid):
+        validate_sql_select("DROP TABLE *")
+
+    config = {
+        "sensor": {
+            "platform": "sql",
+            "db_url": "sqlite://",
+            "queries": [
+                {
+                    "name": "count_tables",
+                    "query": "SELECT * value FROM sqlite_master;",
+                    "column": "value",
+                }
+            ],
         }
+    }
 
-        assert setup_component(self.hass, "sensor", config)
-        self.hass.block_till_done()
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("sensor.count_tables")
-        assert state.state == STATE_UNKNOWN
+    state = hass.states.get("sensor.count_tables")
+    assert state.state == STATE_UNKNOWN
diff --git a/tests/components/statsd/test_init.py b/tests/components/statsd/test_init.py
index 9564de85a97..30b52659685 100644
--- a/tests/components/statsd/test_init.py
+++ b/tests/components/statsd/test_init.py
@@ -1,5 +1,4 @@
 """The tests for the StatsD feeder."""
-import unittest
 from unittest import mock
 
 import pytest
@@ -8,133 +7,128 @@ import voluptuous as vol
 import homeassistant.components.statsd as statsd
 from homeassistant.const import EVENT_STATE_CHANGED, STATE_OFF, STATE_ON
 import homeassistant.core as ha
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
-from tests.common import get_test_home_assistant
+from tests.async_mock import MagicMock, patch
 
 
-class TestStatsd(unittest.TestCase):
-    """Test the StatsD component."""
+@pytest.fixture
+def mock_client():
+    """Pytest fixture for statsd library."""
+    with patch("statsd.StatsClient") as mock_client:
+        yield mock_client.return_value
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.tear_down_cleanup)
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
+def test_invalid_config():
+    """Test configuration with defaults."""
+    config = {"statsd": {"host1": "host1"}}
 
-    def test_invalid_config(self):
-        """Test configuration with defaults."""
-        config = {"statsd": {"host1": "host1"}}
+    with pytest.raises(vol.Invalid):
+        statsd.CONFIG_SCHEMA(None)
+    with pytest.raises(vol.Invalid):
+        statsd.CONFIG_SCHEMA(config)
 
-        with pytest.raises(vol.Invalid):
-            statsd.CONFIG_SCHEMA(None)
-        with pytest.raises(vol.Invalid):
-            statsd.CONFIG_SCHEMA(config)
 
-    @mock.patch("statsd.StatsClient")
-    def test_statsd_setup_full(self, mock_connection):
-        """Test setup with all data."""
-        config = {"statsd": {"host": "host", "port": 123, "rate": 1, "prefix": "foo"}}
-        self.hass.bus.listen = mock.MagicMock()
-        assert setup_component(self.hass, statsd.DOMAIN, config)
-        assert mock_connection.call_count == 1
-        assert mock_connection.call_args == mock.call(
-            host="host", port=123, prefix="foo"
+async def test_statsd_setup_full(hass):
+    """Test setup with all data."""
+    config = {"statsd": {"host": "host", "port": 123, "rate": 1, "prefix": "foo"}}
+    hass.bus.listen = MagicMock()
+    with patch("statsd.StatsClient") as mock_init:
+        assert await async_setup_component(hass, statsd.DOMAIN, config)
+
+        assert mock_init.call_count == 1
+        assert mock_init.call_args == mock.call(host="host", port=123, prefix="foo")
+
+    assert hass.bus.listen.called
+    assert EVENT_STATE_CHANGED == hass.bus.listen.call_args_list[0][0][0]
+
+
+async def test_statsd_setup_defaults(hass):
+    """Test setup with defaults."""
+    config = {"statsd": {"host": "host"}}
+
+    config["statsd"][statsd.CONF_PORT] = statsd.DEFAULT_PORT
+    config["statsd"][statsd.CONF_PREFIX] = statsd.DEFAULT_PREFIX
+
+    hass.bus.listen = MagicMock()
+    with patch("statsd.StatsClient") as mock_init:
+        assert await async_setup_component(hass, statsd.DOMAIN, config)
+
+        assert mock_init.call_count == 1
+        assert mock_init.call_args == mock.call(host="host", port=8125, prefix="hass")
+    assert hass.bus.listen.called
+
+
+async def test_event_listener_defaults(hass, mock_client):
+    """Test event listener."""
+    config = {"statsd": {"host": "host", "value_mapping": {"custom": 3}}}
+
+    config["statsd"][statsd.CONF_RATE] = statsd.DEFAULT_RATE
+
+    hass.bus.listen = MagicMock()
+    await async_setup_component(hass, statsd.DOMAIN, config)
+    assert hass.bus.listen.called
+    handler_method = hass.bus.listen.call_args_list[0][0][1]
+
+    valid = {"1": 1, "1.0": 1.0, "custom": 3, STATE_ON: 1, STATE_OFF: 0}
+    for in_, out in valid.items():
+        state = MagicMock(state=in_, attributes={"attribute key": 3.2})
+        handler_method(MagicMock(data={"new_state": state}))
+        mock_client.gauge.assert_has_calls(
+            [mock.call(state.entity_id, out, statsd.DEFAULT_RATE)]
         )
 
-        assert self.hass.bus.listen.called
-        assert EVENT_STATE_CHANGED == self.hass.bus.listen.call_args_list[0][0][0]
+        mock_client.gauge.reset_mock()
 
-    @mock.patch("statsd.StatsClient")
-    def test_statsd_setup_defaults(self, mock_connection):
-        """Test setup with defaults."""
-        config = {"statsd": {"host": "host"}}
-
-        config["statsd"][statsd.CONF_PORT] = statsd.DEFAULT_PORT
-        config["statsd"][statsd.CONF_PREFIX] = statsd.DEFAULT_PREFIX
-
-        self.hass.bus.listen = mock.MagicMock()
-        assert setup_component(self.hass, statsd.DOMAIN, config)
-        assert mock_connection.call_count == 1
-        assert mock_connection.call_args == mock.call(
-            host="host", port=8125, prefix="hass"
+        assert mock_client.incr.call_count == 1
+        assert mock_client.incr.call_args == mock.call(
+            state.entity_id, rate=statsd.DEFAULT_RATE
         )
-        assert self.hass.bus.listen.called
+        mock_client.incr.reset_mock()
 
-    @mock.patch("statsd.StatsClient")
-    def test_event_listener_defaults(self, mock_client):
-        """Test event listener."""
-        config = {"statsd": {"host": "host", "value_mapping": {"custom": 3}}}
+    for invalid in ("foo", "", object):
+        handler_method(
+            MagicMock(data={"new_state": ha.State("domain.test", invalid, {})})
+        )
+        assert not mock_client.gauge.called
+        assert mock_client.incr.called
 
-        config["statsd"][statsd.CONF_RATE] = statsd.DEFAULT_RATE
 
-        self.hass.bus.listen = mock.MagicMock()
-        setup_component(self.hass, statsd.DOMAIN, config)
-        assert self.hass.bus.listen.called
-        handler_method = self.hass.bus.listen.call_args_list[0][0][1]
+async def test_event_listener_attr_details(hass, mock_client):
+    """Test event listener."""
+    config = {"statsd": {"host": "host", "log_attributes": True}}
 
-        valid = {"1": 1, "1.0": 1.0, "custom": 3, STATE_ON: 1, STATE_OFF: 0}
-        for in_, out in valid.items():
-            state = mock.MagicMock(state=in_, attributes={"attribute key": 3.2})
-            handler_method(mock.MagicMock(data={"new_state": state}))
-            mock_client.return_value.gauge.assert_has_calls(
-                [mock.call(state.entity_id, out, statsd.DEFAULT_RATE)]
-            )
+    config["statsd"][statsd.CONF_RATE] = statsd.DEFAULT_RATE
 
-            mock_client.return_value.gauge.reset_mock()
+    hass.bus.listen = MagicMock()
+    await async_setup_component(hass, statsd.DOMAIN, config)
+    assert hass.bus.listen.called
+    handler_method = hass.bus.listen.call_args_list[0][0][1]
 
-            assert mock_client.return_value.incr.call_count == 1
-            assert mock_client.return_value.incr.call_args == mock.call(
-                state.entity_id, rate=statsd.DEFAULT_RATE
-            )
-            mock_client.return_value.incr.reset_mock()
+    valid = {"1": 1, "1.0": 1.0, STATE_ON: 1, STATE_OFF: 0}
+    for in_, out in valid.items():
+        state = MagicMock(state=in_, attributes={"attribute key": 3.2})
+        handler_method(MagicMock(data={"new_state": state}))
+        mock_client.gauge.assert_has_calls(
+            [
+                mock.call("%s.state" % state.entity_id, out, statsd.DEFAULT_RATE),
+                mock.call(
+                    "%s.attribute_key" % state.entity_id, 3.2, statsd.DEFAULT_RATE
+                ),
+            ]
+        )
 
-        for invalid in ("foo", "", object):
-            handler_method(
-                mock.MagicMock(data={"new_state": ha.State("domain.test", invalid, {})})
-            )
-            assert not mock_client.return_value.gauge.called
-            assert mock_client.return_value.incr.called
+        mock_client.gauge.reset_mock()
 
-    @mock.patch("statsd.StatsClient")
-    def test_event_listener_attr_details(self, mock_client):
-        """Test event listener."""
-        config = {"statsd": {"host": "host", "log_attributes": True}}
+        assert mock_client.incr.call_count == 1
+        assert mock_client.incr.call_args == mock.call(
+            state.entity_id, rate=statsd.DEFAULT_RATE
+        )
+        mock_client.incr.reset_mock()
 
-        config["statsd"][statsd.CONF_RATE] = statsd.DEFAULT_RATE
-
-        self.hass.bus.listen = mock.MagicMock()
-        setup_component(self.hass, statsd.DOMAIN, config)
-        assert self.hass.bus.listen.called
-        handler_method = self.hass.bus.listen.call_args_list[0][0][1]
-
-        valid = {"1": 1, "1.0": 1.0, STATE_ON: 1, STATE_OFF: 0}
-        for in_, out in valid.items():
-            state = mock.MagicMock(state=in_, attributes={"attribute key": 3.2})
-            handler_method(mock.MagicMock(data={"new_state": state}))
-            mock_client.return_value.gauge.assert_has_calls(
-                [
-                    mock.call("%s.state" % state.entity_id, out, statsd.DEFAULT_RATE),
-                    mock.call(
-                        "%s.attribute_key" % state.entity_id, 3.2, statsd.DEFAULT_RATE
-                    ),
-                ]
-            )
-
-            mock_client.return_value.gauge.reset_mock()
-
-            assert mock_client.return_value.incr.call_count == 1
-            assert mock_client.return_value.incr.call_args == mock.call(
-                state.entity_id, rate=statsd.DEFAULT_RATE
-            )
-            mock_client.return_value.incr.reset_mock()
-
-        for invalid in ("foo", "", object):
-            handler_method(
-                mock.MagicMock(data={"new_state": ha.State("domain.test", invalid, {})})
-            )
-            assert not mock_client.return_value.gauge.called
-            assert mock_client.return_value.incr.called
+    for invalid in ("foo", "", object):
+        handler_method(
+            MagicMock(data={"new_state": ha.State("domain.test", invalid, {})})
+        )
+        assert not mock_client.gauge.called
+        assert mock_client.incr.called
diff --git a/tests/components/stream/common.py b/tests/components/stream/common.py
index 2359a771035..c99cdef7984 100644
--- a/tests/components/stream/common.py
+++ b/tests/components/stream/common.py
@@ -1,7 +1,6 @@
 """Collection of test helpers."""
 from fractions import Fraction
 import io
-import logging
 
 import av
 import numpy as np
@@ -9,8 +8,6 @@ import numpy as np
 from homeassistant.components.stream import Stream
 from homeassistant.components.stream.const import ATTR_STREAMS, DOMAIN
 
-_LOGGER = logging.getLogger(__name__)
-
 AUDIO_SAMPLE_RATE = 8000
 
 
diff --git a/tests/components/switch/test_light.py b/tests/components/switch/test_light.py
index 3034877c6d6..e260ce83dbf 100644
--- a/tests/components/switch/test_light.py
+++ b/tests/components/switch/test_light.py
@@ -56,6 +56,7 @@ async def test_light_service_calls(hass):
     assert hass.states.get("light.light_switch").state == "on"
 
     await common.async_turn_off(hass, "light.light_switch")
+    await hass.async_block_till_done()
 
     assert hass.states.get("switch.decorative_lights").state == "off"
     assert hass.states.get("light.light_switch").state == "off"
@@ -74,11 +75,13 @@ async def test_switch_service_calls(hass):
     assert hass.states.get("light.light_switch").state == "on"
 
     await switch_common.async_turn_off(hass, "switch.decorative_lights")
+    await hass.async_block_till_done()
 
     assert hass.states.get("switch.decorative_lights").state == "off"
     assert hass.states.get("light.light_switch").state == "off"
 
     await switch_common.async_turn_on(hass, "switch.decorative_lights")
+    await hass.async_block_till_done()
 
     assert hass.states.get("switch.decorative_lights").state == "on"
     assert hass.states.get("light.light_switch").state == "on"
diff --git a/tests/components/synology_dsm/test_config_flow.py b/tests/components/synology_dsm/test_config_flow.py
index 738a5bed332..5a1a86ef673 100644
--- a/tests/components/synology_dsm/test_config_flow.py
+++ b/tests/components/synology_dsm/test_config_flow.py
@@ -1,6 +1,4 @@
 """Tests for the Synology DSM config flow."""
-import logging
-
 import pytest
 from synology_dsm.exceptions import (
     SynologyDSMException,
@@ -39,9 +37,6 @@ from homeassistant.helpers.typing import HomeAssistantType
 from tests.async_mock import MagicMock, Mock, patch
 from tests.common import MockConfigEntry
 
-_LOGGER = logging.getLogger(__name__)
-
-
 HOST = "nas.meontheinternet.com"
 SERIAL = "mySerial"
 HOST_2 = "nas.worldwide.me"
@@ -290,7 +285,7 @@ async def test_login_failed(hass: HomeAssistantType, service: MagicMock):
         data={CONF_HOST: HOST, CONF_USERNAME: USERNAME, CONF_PASSWORD: PASSWORD},
     )
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result["errors"] == {CONF_USERNAME: "login"}
+    assert result["errors"] == {CONF_USERNAME: "invalid_auth"}
 
 
 async def test_connection_failed(hass: HomeAssistantType, service: MagicMock):
@@ -306,7 +301,7 @@ async def test_connection_failed(hass: HomeAssistantType, service: MagicMock):
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result["errors"] == {CONF_HOST: "connection"}
+    assert result["errors"] == {CONF_HOST: "cannot_connect"}
 
 
 async def test_unknown_failed(hass: HomeAssistantType, service: MagicMock):
diff --git a/tests/components/system_log/test_init.py b/tests/components/system_log/test_init.py
index 49cd2d8ea8b..85e86d9c78f 100644
--- a/tests/components/system_log/test_init.py
+++ b/tests/components/system_log/test_init.py
@@ -230,9 +230,7 @@ async def test_clear_logs(hass, simple_queue, hass_client):
     _LOGGER.error("error message")
     await _async_block_until_queue_empty(hass, simple_queue)
 
-    hass.async_add_job(
-        hass.services.async_call(system_log.DOMAIN, system_log.SERVICE_CLEAR, {})
-    )
+    await hass.services.async_call(system_log.DOMAIN, system_log.SERVICE_CLEAR, {})
     await _async_block_until_queue_empty(hass, simple_queue)
 
     # Assert done by get_error_log
@@ -244,10 +242,8 @@ async def test_write_log(hass):
     await async_setup_component(hass, system_log.DOMAIN, BASIC_CONFIG)
     logger = MagicMock()
     with patch("logging.getLogger", return_value=logger) as mock_logging:
-        hass.async_add_job(
-            hass.services.async_call(
-                system_log.DOMAIN, system_log.SERVICE_WRITE, {"message": "test_message"}
-            )
+        await hass.services.async_call(
+            system_log.DOMAIN, system_log.SERVICE_WRITE, {"message": "test_message"}
         )
         await hass.async_block_till_done()
     mock_logging.assert_called_once_with("homeassistant.components.system_log.external")
@@ -258,12 +254,10 @@ async def test_write_choose_logger(hass):
     """Test that correct logger is chosen."""
     await async_setup_component(hass, system_log.DOMAIN, BASIC_CONFIG)
     with patch("logging.getLogger") as mock_logging:
-        hass.async_add_job(
-            hass.services.async_call(
-                system_log.DOMAIN,
-                system_log.SERVICE_WRITE,
-                {"message": "test_message", "logger": "myLogger"},
-            )
+        await hass.services.async_call(
+            system_log.DOMAIN,
+            system_log.SERVICE_WRITE,
+            {"message": "test_message", "logger": "myLogger"},
         )
         await hass.async_block_till_done()
     mock_logging.assert_called_once_with("myLogger")
@@ -274,12 +268,10 @@ async def test_write_choose_level(hass):
     await async_setup_component(hass, system_log.DOMAIN, BASIC_CONFIG)
     logger = MagicMock()
     with patch("logging.getLogger", return_value=logger):
-        hass.async_add_job(
-            hass.services.async_call(
-                system_log.DOMAIN,
-                system_log.SERVICE_WRITE,
-                {"message": "test_message", "level": "debug"},
-            )
+        await hass.services.async_call(
+            system_log.DOMAIN,
+            system_log.SERVICE_WRITE,
+            {"message": "test_message", "level": "debug"},
         )
         await hass.async_block_till_done()
     assert logger.method_calls[0] == ("debug", ("test_message",))
diff --git a/tests/components/tag/test_init.py b/tests/components/tag/test_init.py
index ecb927c1c5c..442d3263f0a 100644
--- a/tests/components/tag/test_init.py
+++ b/tests/components/tag/test_init.py
@@ -1,6 +1,4 @@
 """Tests for the tag component."""
-import logging
-
 import pytest
 
 from homeassistant.components.tag import DOMAIN, TAGS, async_scan_tag
@@ -10,8 +8,6 @@ from homeassistant.util import dt as dt_util
 
 from tests.async_mock import patch
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @pytest.fixture
 def storage_setup(hass, hass_storage):
diff --git a/tests/components/tasmota/__init__.py b/tests/components/tasmota/__init__.py
new file mode 100644
index 00000000000..201e9c3df18
--- /dev/null
+++ b/tests/components/tasmota/__init__.py
@@ -0,0 +1 @@
+"""Tests for Tasmota component."""
diff --git a/tests/components/tasmota/conftest.py b/tests/components/tasmota/conftest.py
new file mode 100644
index 00000000000..09a3bfa4d63
--- /dev/null
+++ b/tests/components/tasmota/conftest.py
@@ -0,0 +1,83 @@
+"""Test fixtures for Tasmota component."""
+
+from hatasmota.discovery import get_status_sensor_entities
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components.tasmota.const import (
+    CONF_DISCOVERY_PREFIX,
+    DEFAULT_PREFIX,
+    DOMAIN,
+)
+
+from tests.async_mock import patch
+from tests.common import (
+    MockConfigEntry,
+    async_mock_service,
+    mock_device_registry,
+    mock_registry,
+)
+
+
+@pytest.fixture
+def device_reg(hass):
+    """Return an empty, loaded, registry."""
+    return mock_device_registry(hass)
+
+
+@pytest.fixture
+def entity_reg(hass):
+    """Return an empty, loaded, registry."""
+    return mock_registry(hass)
+
+
+@pytest.fixture
+def calls(hass):
+    """Track calls to a mock service."""
+    return async_mock_service(hass, "test", "automation")
+
+
+@pytest.fixture(autouse=True)
+def disable_debounce():
+    """Set MQTT debounce timer to zero."""
+    with patch("hatasmota.mqtt.DEBOUNCE_TIMEOUT", 0):
+        yield
+
+
+@pytest.fixture
+def status_sensor_disabled():
+    """Fixture to allow overriding MQTT config."""
+    return True
+
+
+@pytest.fixture(autouse=True)
+def disable_status_sensor(status_sensor_disabled):
+    """Disable Tasmota status sensor."""
+    wraps = None if status_sensor_disabled else get_status_sensor_entities
+    with patch("hatasmota.discovery.get_status_sensor_entities", wraps=wraps):
+        yield
+
+
+async def setup_tasmota_helper(hass):
+    """Set up Tasmota."""
+    hass.config.components.add("tasmota")
+
+    entry = MockConfigEntry(
+        connection_class=config_entries.CONN_CLASS_LOCAL_PUSH,
+        data={CONF_DISCOVERY_PREFIX: DEFAULT_PREFIX},
+        domain=DOMAIN,
+        title="Tasmota",
+    )
+
+    entry.add_to_hass(hass)
+
+    assert await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert "tasmota" in hass.config.components
+
+
+@pytest.fixture
+async def setup_tasmota(hass):
+    """Set up Tasmota."""
+    await setup_tasmota_helper(hass)
diff --git a/tests/components/tasmota/test_binary_sensor.py b/tests/components/tasmota/test_binary_sensor.py
new file mode 100644
index 00000000000..52ab88b0ecb
--- /dev/null
+++ b/tests/components/tasmota/test_binary_sensor.py
@@ -0,0 +1,259 @@
+"""The tests for the Tasmota binary sensor platform."""
+import copy
+from datetime import timedelta
+import json
+
+from hatasmota.utils import (
+    get_topic_stat_status,
+    get_topic_stat_switch,
+    get_topic_tele_sensor,
+    get_topic_tele_will,
+)
+
+from homeassistant.components import binary_sensor
+from homeassistant.components.tasmota.const import DEFAULT_PREFIX
+from homeassistant.const import (
+    ATTR_ASSUMED_STATE,
+    EVENT_STATE_CHANGED,
+    STATE_OFF,
+    STATE_ON,
+)
+import homeassistant.core as ha
+import homeassistant.util.dt as dt_util
+
+from .test_common import (
+    DEFAULT_CONFIG,
+    help_test_availability,
+    help_test_availability_discovery_update,
+    help_test_availability_poll_state,
+    help_test_availability_when_connection_lost,
+    help_test_discovery_device_remove,
+    help_test_discovery_removal,
+    help_test_discovery_update_unchanged,
+    help_test_entity_id_update_discovery_update,
+    help_test_entity_id_update_subscriptions,
+)
+
+from tests.async_mock import patch
+from tests.common import async_fire_mqtt_message, async_fire_time_changed
+
+
+async def test_controlling_state_via_mqtt(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 1
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_OFF
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    # Test normal state update
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1", '{"STATE":"ON"}')
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1", '{"STATE":"OFF"}')
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_OFF
+
+    # Test periodic state update
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/SENSOR", '{"Switch1":"ON"}')
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/SENSOR", '{"Switch1":"OFF"}')
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_OFF
+
+    # Test polled state update
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/stat/STATUS8", '{"StatusSNS":{"Switch1":"ON"}}'
+    )
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/stat/STATUS8", '{"StatusSNS":{"Switch1":"OFF"}}'
+    )
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_OFF
+
+
+async def test_friendly_names(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["swc"][0] = 1
+    config["swc"][1] = 1
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.tasmota_binary_sensor_1")
+    assert state.state == "unavailable"
+    assert state.attributes.get("friendly_name") == "Tasmota binary_sensor 1"
+
+    state = hass.states.get("binary_sensor.beer")
+    assert state.state == "unavailable"
+    assert state.attributes.get("friendly_name") == "Beer"
+
+
+async def test_off_delay(hass, mqtt_mock, setup_tasmota):
+    """Test off_delay option."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 13  # PUSHON: 1s off_delay
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    events = []
+
+    @ha.callback
+    def callback(event):
+        """Verify event got called."""
+        events.append(event.data["new_state"].state)
+
+    hass.bus.async_listen(EVENT_STATE_CHANGED, callback)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    await hass.async_block_till_done()
+    assert events == ["off"]
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1", '{"STATE":"ON"}')
+    await hass.async_block_till_done()
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_ON
+    assert events == ["off", "on"]
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1", '{"STATE":"ON"}')
+    await hass.async_block_till_done()
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_ON
+    assert events == ["off", "on", "on"]
+
+    async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=1))
+    await hass.async_block_till_done()
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == STATE_OFF
+    assert events == ["off", "on", "on", "off"]
+
+
+async def test_availability_when_connection_lost(
+    hass, mqtt_client_mock, mqtt_mock, setup_tasmota
+):
+    """Test availability after MQTT disconnection."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 1
+    await help_test_availability_when_connection_lost(
+        hass, mqtt_client_mock, mqtt_mock, binary_sensor.DOMAIN, config
+    )
+
+
+async def test_availability(hass, mqtt_mock, setup_tasmota):
+    """Test availability."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 1
+    await help_test_availability(hass, mqtt_mock, binary_sensor.DOMAIN, config)
+
+
+async def test_availability_discovery_update(hass, mqtt_mock, setup_tasmota):
+    """Test availability discovery update."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 1
+    await help_test_availability_discovery_update(
+        hass, mqtt_mock, binary_sensor.DOMAIN, config
+    )
+
+
+async def test_availability_poll_state(
+    hass, mqtt_client_mock, mqtt_mock, setup_tasmota
+):
+    """Test polling after MQTT connection (re)established."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 1
+    poll_topic = "tasmota_49A3BC/cmnd/STATUS"
+    await help_test_availability_poll_state(
+        hass, mqtt_client_mock, mqtt_mock, binary_sensor.DOMAIN, config, poll_topic, "8"
+    )
+
+
+async def test_discovery_removal_binary_sensor(hass, mqtt_mock, caplog, setup_tasmota):
+    """Test removal of discovered binary_sensor."""
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["swc"][0] = 1
+    config2["swc"][0] = 0
+
+    await help_test_discovery_removal(
+        hass, mqtt_mock, caplog, binary_sensor.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_update_unchanged_binary_sensor(
+    hass, mqtt_mock, caplog, setup_tasmota
+):
+    """Test update of discovered binary_sensor."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 1
+    with patch(
+        "homeassistant.components.tasmota.binary_sensor.TasmotaBinarySensor.discovery_update"
+    ) as discovery_update:
+        await help_test_discovery_update_unchanged(
+            hass, mqtt_mock, caplog, binary_sensor.DOMAIN, config, discovery_update
+        )
+
+
+async def test_discovery_device_remove(hass, mqtt_mock, setup_tasmota):
+    """Test device registry remove."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 1
+    unique_id = f"{DEFAULT_CONFIG['mac']}_binary_sensor_switch_0"
+    await help_test_discovery_device_remove(
+        hass, mqtt_mock, binary_sensor.DOMAIN, unique_id, config
+    )
+
+
+async def test_entity_id_update_subscriptions(hass, mqtt_mock, setup_tasmota):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 1
+    topics = [
+        get_topic_stat_switch(config, 0),
+        get_topic_tele_sensor(config),
+        get_topic_stat_status(config, 8),
+        get_topic_tele_will(config),
+    ]
+    await help_test_entity_id_update_subscriptions(
+        hass, mqtt_mock, binary_sensor.DOMAIN, config, topics
+    )
+
+
+async def test_entity_id_update_discovery_update(hass, mqtt_mock, setup_tasmota):
+    """Test MQTT discovery update when entity_id is updated."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 1
+    await help_test_entity_id_update_discovery_update(
+        hass, mqtt_mock, binary_sensor.DOMAIN, config
+    )
diff --git a/tests/components/tasmota/test_common.py b/tests/components/tasmota/test_common.py
new file mode 100644
index 00000000000..5c18f2f401c
--- /dev/null
+++ b/tests/components/tasmota/test_common.py
@@ -0,0 +1,554 @@
+"""Common test objects."""
+import copy
+import json
+
+from hatasmota.const import (
+    CONF_MAC,
+    CONF_OFFLINE,
+    CONF_ONLINE,
+    CONF_PREFIX,
+    PREFIX_CMND,
+    PREFIX_TELE,
+)
+from hatasmota.utils import (
+    config_get_state_offline,
+    config_get_state_online,
+    get_topic_tele_state,
+    get_topic_tele_will,
+)
+
+from homeassistant.components.tasmota.const import DEFAULT_PREFIX
+from homeassistant.const import STATE_UNAVAILABLE
+
+from tests.async_mock import ANY
+from tests.common import async_fire_mqtt_message
+
+DEFAULT_CONFIG = {
+    "ip": "192.168.15.10",
+    "dn": "Tasmota",
+    "fn": ["Test", "Beer", "Milk", "Four", None],
+    "hn": "tasmota_49A3BC-0956",
+    "lk": 1,  # RGB + white channels linked to a single light
+    "mac": "00000049A3BC",
+    "md": "Sonoff Basic",
+    "ofln": "Offline",
+    "onln": "Online",
+    "state": ["OFF", "ON", "TOGGLE", "HOLD"],
+    "sw": "8.4.0.2",
+    "t": "tasmota_49A3BC",
+    "ft": "%topic%/%prefix%/",
+    "tp": ["cmnd", "stat", "tele"],
+    "rl": [0, 0, 0, 0, 0, 0, 0, 0],
+    "swc": [-1, -1, -1, -1, -1, -1, -1, -1],
+    "btn": [0, 0, 0, 0],
+    "so": {
+        "11": 0,  # Swap button single and double press functionality
+        "13": 0,  # Allow immediate action on single button press
+        "17": 1,  # Show Color string as hex or comma-separated
+        "20": 0,  # Update of Dimmer/Color/CT without turning power on
+        "30": 0,  # Enforce Home Assistant auto-discovery as light
+        "68": 0,  # Multi-channel PWM instead of a single light
+        "73": 0,  # Enable Buttons decoupling and send multi-press and hold MQTT messages
+        "80": 0,  # Blinds and shutters support
+        "82": 0,  # Reduce the CT range from 153..500 to 200.380
+    },
+    "ty": 0,  # Tuya MCU
+    "lt_st": 0,
+    "ver": 1,
+}
+
+
+async def help_test_availability_when_connection_lost(
+    hass,
+    mqtt_client_mock,
+    mqtt_mock,
+    domain,
+    config,
+    sensor_config=None,
+    entity_id="test",
+):
+    """Test availability after MQTT disconnection.
+
+    This is a test helper for the TasmotaAvailability mixin.
+    """
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    if sensor_config:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/sensors",
+            json.dumps(sensor_config),
+        )
+        await hass.async_block_till_done()
+
+    # Device online
+    async_fire_mqtt_message(
+        hass,
+        get_topic_tele_will(config),
+        config_get_state_online(config),
+    )
+
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state != STATE_UNAVAILABLE
+
+    # Disconnected from MQTT server -> state changed to unavailable
+    mqtt_mock.connected = False
+    await hass.async_add_executor_job(mqtt_client_mock.on_disconnect, None, None, 0)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state == STATE_UNAVAILABLE
+
+    # Reconnected to MQTT server -> state still unavailable
+    mqtt_mock.connected = True
+    await hass.async_add_executor_job(mqtt_client_mock.on_connect, None, None, None, 0)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state == STATE_UNAVAILABLE
+
+    # Receive LWT again
+    async_fire_mqtt_message(
+        hass,
+        get_topic_tele_will(config),
+        config_get_state_online(config),
+    )
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state != STATE_UNAVAILABLE
+
+
+async def help_test_availability(
+    hass,
+    mqtt_mock,
+    domain,
+    config,
+    sensor_config=None,
+    entity_id="test",
+):
+    """Test availability.
+
+    This is a test helper for the TasmotaAvailability mixin.
+    """
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    if sensor_config:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/sensors",
+            json.dumps(sensor_config),
+        )
+        await hass.async_block_till_done()
+
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state == STATE_UNAVAILABLE
+
+    async_fire_mqtt_message(
+        hass,
+        get_topic_tele_will(config),
+        config_get_state_online(config),
+    )
+
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state != STATE_UNAVAILABLE
+
+    async_fire_mqtt_message(
+        hass,
+        get_topic_tele_will(config),
+        config_get_state_offline(config),
+    )
+
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state == STATE_UNAVAILABLE
+
+
+async def help_test_availability_discovery_update(
+    hass,
+    mqtt_mock,
+    domain,
+    config,
+    sensor_config=None,
+    entity_id="test",
+):
+    """Test update of discovered TasmotaAvailability.
+
+    This is a test helper for the TasmotaAvailability mixin.
+    """
+    # customize availability topic
+    config1 = copy.deepcopy(config)
+    config1[CONF_PREFIX][PREFIX_TELE] = "tele1"
+    config1[CONF_OFFLINE] = "offline1"
+    config1[CONF_ONLINE] = "online1"
+    config2 = copy.deepcopy(config)
+    config2[CONF_PREFIX][PREFIX_TELE] = "tele2"
+    config2[CONF_OFFLINE] = "offline2"
+    config2[CONF_ONLINE] = "online2"
+    data1 = json.dumps(config1)
+    data2 = json.dumps(config2)
+
+    availability_topic1 = get_topic_tele_will(config1)
+    availability_topic2 = get_topic_tele_will(config2)
+    assert availability_topic1 != availability_topic2
+    offline1 = config_get_state_offline(config1)
+    offline2 = config_get_state_offline(config2)
+    assert offline1 != offline2
+    online1 = config_get_state_online(config1)
+    online2 = config_get_state_online(config2)
+    assert online1 != online2
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config1[CONF_MAC]}/config", data1)
+    await hass.async_block_till_done()
+    if sensor_config:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/sensors",
+            json.dumps(sensor_config),
+        )
+        await hass.async_block_till_done()
+
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state == STATE_UNAVAILABLE
+
+    async_fire_mqtt_message(hass, availability_topic1, online1)
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state != STATE_UNAVAILABLE
+
+    async_fire_mqtt_message(hass, availability_topic1, offline1)
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state == STATE_UNAVAILABLE
+
+    # Change availability settings
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config2[CONF_MAC]}/config", data2)
+    await hass.async_block_till_done()
+
+    # Verify we are no longer subscribing to the old topic or payload
+    async_fire_mqtt_message(hass, availability_topic1, online1)
+    async_fire_mqtt_message(hass, availability_topic1, online2)
+    async_fire_mqtt_message(hass, availability_topic2, online1)
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state == STATE_UNAVAILABLE
+
+    # Verify we are subscribing to the new topic
+    async_fire_mqtt_message(hass, availability_topic2, online2)
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state != STATE_UNAVAILABLE
+
+
+async def help_test_availability_poll_state(
+    hass,
+    mqtt_client_mock,
+    mqtt_mock,
+    domain,
+    config,
+    poll_topic,
+    poll_payload,
+    sensor_config=None,
+):
+    """Test polling of state when device is available.
+
+    This is a test helper for the TasmotaAvailability mixin.
+    """
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    if sensor_config:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/sensors",
+            json.dumps(sensor_config),
+        )
+        await hass.async_block_till_done()
+    mqtt_mock.async_publish.reset_mock()
+
+    # Device online, verify poll for state
+    async_fire_mqtt_message(
+        hass,
+        get_topic_tele_will(config),
+        config_get_state_online(config),
+    )
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    mqtt_mock.async_publish.assert_called_once_with(poll_topic, poll_payload, 0, False)
+    mqtt_mock.async_publish.reset_mock()
+
+    # Disconnected from MQTT server
+    mqtt_mock.connected = False
+    await hass.async_add_executor_job(mqtt_client_mock.on_disconnect, None, None, 0)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    assert not mqtt_mock.async_publish.called
+
+    # Reconnected to MQTT server
+    mqtt_mock.connected = True
+    await hass.async_add_executor_job(mqtt_client_mock.on_connect, None, None, None, 0)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    assert not mqtt_mock.async_publish.called
+
+    # Device online, verify poll for state
+    async_fire_mqtt_message(
+        hass,
+        get_topic_tele_will(config),
+        config_get_state_online(config),
+    )
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    mqtt_mock.async_publish.assert_called_once_with(poll_topic, poll_payload, 0, False)
+
+
+async def help_test_discovery_removal(
+    hass,
+    mqtt_mock,
+    caplog,
+    domain,
+    config1,
+    config2,
+    sensor_config1=None,
+    sensor_config2=None,
+    entity_id="test",
+    name="Test",
+):
+    """Test removal of discovered entity."""
+    device_reg = await hass.helpers.device_registry.async_get_registry()
+    entity_reg = await hass.helpers.entity_registry.async_get_registry()
+
+    data1 = json.dumps(config1)
+    data2 = json.dumps(config2)
+    assert config1[CONF_MAC] == config2[CONF_MAC]
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config1[CONF_MAC]}/config", data1)
+    await hass.async_block_till_done()
+    if sensor_config1:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config1[CONF_MAC]}/sensors",
+            json.dumps(sensor_config1),
+        )
+        await hass.async_block_till_done()
+
+    # Verify device and entity registry entries are created
+    device_entry = device_reg.async_get_device(set(), {("mac", config1[CONF_MAC])})
+    assert device_entry is not None
+    entity_entry = entity_reg.async_get(f"{domain}.{entity_id}")
+    assert entity_entry is not None
+
+    # Verify state is added
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state is not None
+    assert state.name == name
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config2[CONF_MAC]}/config", data2)
+    await hass.async_block_till_done()
+    if sensor_config1:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config2[CONF_MAC]}/sensors",
+            json.dumps(sensor_config2),
+        )
+        await hass.async_block_till_done()
+
+    # Verify entity registry entries are cleared
+    device_entry = device_reg.async_get_device(set(), {("mac", config2[CONF_MAC])})
+    assert device_entry is not None
+    entity_entry = entity_reg.async_get(f"{domain}.{entity_id}")
+    assert entity_entry is None
+
+    # Verify state is removed
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state is None
+
+
+async def help_test_discovery_update_unchanged(
+    hass,
+    mqtt_mock,
+    caplog,
+    domain,
+    config,
+    discovery_update,
+    sensor_config=None,
+    entity_id="test",
+    name="Test",
+):
+    """Test update of discovered component with and without changes.
+
+    This is a test helper for the MqttDiscoveryUpdate mixin.
+    """
+    config1 = copy.deepcopy(config)
+    config2 = copy.deepcopy(config)
+    config2[CONF_PREFIX][PREFIX_CMND] = "cmnd2"
+    config2[CONF_PREFIX][PREFIX_TELE] = "tele2"
+    data1 = json.dumps(config1)
+    data2 = json.dumps(config2)
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", data1)
+    await hass.async_block_till_done()
+    if sensor_config:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/sensors",
+            json.dumps(sensor_config),
+        )
+        await hass.async_block_till_done()
+
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state is not None
+    assert state.name == name
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", data1)
+    await hass.async_block_till_done()
+    if sensor_config:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/sensors",
+            json.dumps(sensor_config),
+        )
+        await hass.async_block_till_done()
+
+    assert not discovery_update.called
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", data2)
+    await hass.async_block_till_done()
+
+    assert discovery_update.called
+
+
+async def help_test_discovery_device_remove(
+    hass, mqtt_mock, domain, unique_id, config, sensor_config=None
+):
+    """Test domain entity is removed when device is removed."""
+    device_reg = await hass.helpers.device_registry.async_get_registry()
+    entity_reg = await hass.helpers.entity_registry.async_get_registry()
+
+    config = copy.deepcopy(config)
+
+    data = json.dumps(config)
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", data)
+    await hass.async_block_till_done()
+    if sensor_config:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/sensors",
+            json.dumps(sensor_config),
+        )
+        await hass.async_block_till_done()
+
+    device = device_reg.async_get_device(set(), {("mac", config[CONF_MAC])})
+    assert device is not None
+    assert entity_reg.async_get_entity_id(domain, "tasmota", unique_id)
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", "")
+    await hass.async_block_till_done()
+
+    device = device_reg.async_get_device(set(), {("mac", config[CONF_MAC])})
+    assert device is None
+    assert not entity_reg.async_get_entity_id(domain, "tasmota", unique_id)
+
+
+async def help_test_entity_id_update_subscriptions(
+    hass, mqtt_mock, domain, config, topics=None, sensor_config=None, entity_id="test"
+):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    entity_reg = await hass.helpers.entity_registry.async_get_registry()
+
+    config = copy.deepcopy(config)
+    data = json.dumps(config)
+
+    mqtt_mock.async_subscribe.reset_mock()
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", data)
+    await hass.async_block_till_done()
+    if sensor_config:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/sensors",
+            json.dumps(sensor_config),
+        )
+        await hass.async_block_till_done()
+
+    if not topics:
+        topics = [get_topic_tele_state(config), get_topic_tele_will(config)]
+    assert len(topics) > 0
+
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state is not None
+    assert mqtt_mock.async_subscribe.call_count == len(topics)
+    for topic in topics:
+        mqtt_mock.async_subscribe.assert_any_call(topic, ANY, ANY, ANY)
+    mqtt_mock.async_subscribe.reset_mock()
+
+    entity_reg.async_update_entity(
+        f"{domain}.{entity_id}", new_entity_id=f"{domain}.milk"
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state is None
+
+    state = hass.states.get(f"{domain}.milk")
+    assert state is not None
+    for topic in topics:
+        mqtt_mock.async_subscribe.assert_any_call(topic, ANY, ANY, ANY)
+
+
+async def help_test_entity_id_update_discovery_update(
+    hass, mqtt_mock, domain, config, sensor_config=None, entity_id="test"
+):
+    """Test MQTT discovery update after entity_id is updated."""
+    entity_reg = await hass.helpers.entity_registry.async_get_registry()
+
+    config = copy.deepcopy(config)
+    data = json.dumps(config)
+
+    topic = get_topic_tele_will(config)
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", data)
+    await hass.async_block_till_done()
+    if sensor_config:
+        async_fire_mqtt_message(
+            hass,
+            f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/sensors",
+            json.dumps(sensor_config),
+        )
+        await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, topic, config_get_state_online(config))
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state != STATE_UNAVAILABLE
+
+    async_fire_mqtt_message(hass, topic, config_get_state_offline(config))
+    state = hass.states.get(f"{domain}.{entity_id}")
+    assert state.state == STATE_UNAVAILABLE
+
+    entity_reg.async_update_entity(
+        f"{domain}.{entity_id}", new_entity_id=f"{domain}.milk"
+    )
+    await hass.async_block_till_done()
+    assert hass.states.get(f"{domain}.milk")
+
+    assert config[CONF_PREFIX][PREFIX_TELE] != "tele2"
+    config[CONF_PREFIX][PREFIX_TELE] = "tele2"
+    data = json.dumps(config)
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", data)
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids(domain)) == 1
+
+    topic = get_topic_tele_will(config)
+    async_fire_mqtt_message(hass, topic, config_get_state_online(config))
+    state = hass.states.get(f"{domain}.milk")
+    assert state.state != STATE_UNAVAILABLE
diff --git a/tests/components/tasmota/test_config_flow.py b/tests/components/tasmota/test_config_flow.py
new file mode 100644
index 00000000000..469e5e29812
--- /dev/null
+++ b/tests/components/tasmota/test_config_flow.py
@@ -0,0 +1,117 @@
+"""Test config flow."""
+from homeassistant.components.mqtt.models import Message
+
+from tests.common import MockConfigEntry
+
+
+async def test_mqtt_abort_if_existing_entry(hass, mqtt_mock):
+    """Check MQTT flow aborts when an entry already exist."""
+    MockConfigEntry(domain="tasmota").add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        "tasmota", context={"source": "mqtt"}
+    )
+
+    assert result["type"] == "abort"
+    assert result["reason"] == "single_instance_allowed"
+
+
+async def test_mqtt_abort_invalid_topic(hass, mqtt_mock):
+    """Check MQTT flow aborts if discovery topic is invalid."""
+    discovery_info = Message("", "", 0, False, subscribed_topic="custom_prefix/##")
+    result = await hass.config_entries.flow.async_init(
+        "tasmota", context={"source": "mqtt"}, data=discovery_info
+    )
+    assert result["type"] == "abort"
+    assert result["reason"] == "invalid_discovery_info"
+
+
+async def test_mqtt_setup(hass, mqtt_mock) -> None:
+    """Test we can finish a config flow through MQTT with custom prefix."""
+    discovery_info = Message("", "", 0, False, subscribed_topic="custom_prefix/123/#")
+    result = await hass.config_entries.flow.async_init(
+        "tasmota", context={"source": "mqtt"}, data=discovery_info
+    )
+    assert result["type"] == "form"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] == "create_entry"
+    assert result["result"].data == {
+        "discovery_prefix": "custom_prefix/123",
+    }
+
+
+async def test_user_setup(hass, mqtt_mock):
+    """Test we can finish a config flow."""
+    result = await hass.config_entries.flow.async_init(
+        "tasmota", context={"source": "user"}
+    )
+    assert result["type"] == "form"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] == "create_entry"
+    assert result["result"].data == {
+        "discovery_prefix": "tasmota/discovery",
+    }
+
+
+async def test_user_setup_advanced(hass, mqtt_mock):
+    """Test we can finish a config flow."""
+    result = await hass.config_entries.flow.async_init(
+        "tasmota", context={"source": "user", "show_advanced_options": True}
+    )
+    assert result["type"] == "form"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"discovery_prefix": "test_tasmota/discovery"}
+    )
+
+    assert result["type"] == "create_entry"
+    assert result["result"].data == {
+        "discovery_prefix": "test_tasmota/discovery",
+    }
+
+
+async def test_user_setup_advanced_strip_wildcard(hass, mqtt_mock):
+    """Test we can finish a config flow."""
+    result = await hass.config_entries.flow.async_init(
+        "tasmota", context={"source": "user", "show_advanced_options": True}
+    )
+    assert result["type"] == "form"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"discovery_prefix": "test_tasmota/discovery/#"}
+    )
+
+    assert result["type"] == "create_entry"
+    assert result["result"].data == {
+        "discovery_prefix": "test_tasmota/discovery",
+    }
+
+
+async def test_user_setup_invalid_topic_prefix(hass, mqtt_mock):
+    """Test abort on invalid discovery topic."""
+    result = await hass.config_entries.flow.async_init(
+        "tasmota", context={"source": "user", "show_advanced_options": True}
+    )
+    assert result["type"] == "form"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {"discovery_prefix": "tasmota/config/##"}
+    )
+
+    assert result["type"] == "form"
+    assert result["errors"]["base"] == "invalid_discovery_topic"
+
+
+async def test_user_single_instance(hass, mqtt_mock):
+    """Test we only allow a single config flow."""
+    MockConfigEntry(domain="tasmota").add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        "tasmota", context={"source": "user"}
+    )
+    assert result["type"] == "abort"
+    assert result["reason"] == "single_instance_allowed"
diff --git a/tests/components/tasmota/test_device_trigger.py b/tests/components/tasmota/test_device_trigger.py
new file mode 100644
index 00000000000..b027b2c095d
--- /dev/null
+++ b/tests/components/tasmota/test_device_trigger.py
@@ -0,0 +1,882 @@
+"""The tests for MQTT device triggers."""
+import copy
+import json
+
+from hatasmota.switch import TasmotaSwitchTriggerConfig
+import pytest
+
+import homeassistant.components.automation as automation
+from homeassistant.components.tasmota.const import DEFAULT_PREFIX, DOMAIN
+from homeassistant.components.tasmota.device_trigger import async_attach_trigger
+from homeassistant.setup import async_setup_component
+
+from .test_common import DEFAULT_CONFIG
+
+from tests.async_mock import patch
+from tests.common import (
+    assert_lists_same,
+    async_fire_mqtt_message,
+    async_get_device_automations,
+)
+
+
+async def test_get_triggers(hass, device_reg, entity_reg, mqtt_mock, setup_tasmota):
+    """Test we get the expected triggers from a discovered mqtt device."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 0
+    mac = config["mac"]
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    expected_triggers = [
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+            "type": "button_short_press",
+            "subtype": "switch_1",
+        },
+    ]
+    triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
+    assert_lists_same(triggers, expected_triggers)
+
+
+async def test_get_unknown_triggers(
+    hass, device_reg, entity_reg, mqtt_mock, setup_tasmota
+):
+    """Test we don't get unknown triggers."""
+    # Discover a device without device triggers
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = -1
+    mac = config["mac"]
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": device_entry.id,
+                        "discovery_id": "00000049A3BC_switch_0_2",
+                        "type": "button_short_press",
+                        "subtype": "button_1",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": ("short_press")},
+                    },
+                },
+            ]
+        },
+    )
+
+    triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
+    assert_lists_same(triggers, [])
+
+
+async def test_get_non_existing_triggers(
+    hass, device_reg, entity_reg, mqtt_mock, setup_tasmota
+):
+    """Test getting non existing triggers."""
+    # Discover a device without device triggers
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["swc"][0] = -1
+    mac = config1["mac"]
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config1))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
+    assert_lists_same(triggers, [])
+
+
+@pytest.mark.no_fail_on_log_exception
+async def test_discover_bad_triggers(
+    hass, device_reg, entity_reg, mqtt_mock, setup_tasmota
+):
+    """Test exception handling when discovering trigger."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 0
+    mac = config["mac"]
+
+    # Trigger an exception when the entity is discovered
+    with patch(
+        "hatasmota.discovery.get_switch_triggers",
+        return_value=[object()],
+    ):
+        async_fire_mqtt_message(
+            hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config)
+        )
+        await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
+    assert_lists_same(triggers, [])
+
+    # Trigger an exception when the entity is discovered
+    class FakeTrigger(TasmotaSwitchTriggerConfig):
+        """Bad TasmotaSwitchTriggerConfig to cause exceptions."""
+
+        @property
+        def is_active(self):
+            return True
+
+    with patch(
+        "hatasmota.discovery.get_switch_triggers",
+        return_value=[
+            FakeTrigger(
+                event=None,
+                idx=1,
+                mac=None,
+                source=None,
+                subtype=None,
+                trigger_topic=None,
+                type=None,
+            )
+        ],
+    ):
+        async_fire_mqtt_message(
+            hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config)
+        )
+        await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
+    assert_lists_same(triggers, [])
+
+    # Rediscover without exception
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    expected_triggers = [
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+            "type": "button_short_press",
+            "subtype": "switch_1",
+        },
+    ]
+    triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
+    assert_lists_same(triggers, expected_triggers)
+
+
+async def test_update_remove_triggers(
+    hass, device_reg, entity_reg, mqtt_mock, setup_tasmota
+):
+    """Test triggers can be updated and removed."""
+    # Discover a device with toggle + hold trigger
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["swc"][0] = 5
+    mac = config1["mac"]
+
+    # Discover a device with toggle + double press trigger
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["swc"][0] = 8
+
+    # Discover a device with no trigger
+    config3 = copy.deepcopy(DEFAULT_CONFIG)
+    config3["swc"][0] = -1
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config1))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    expected_triggers1 = [
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+            "type": "button_short_press",
+            "subtype": "switch_1",
+        },
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_HOLD",
+            "type": "button_long_press",
+            "subtype": "switch_1",
+        },
+    ]
+    expected_triggers2 = copy.deepcopy(expected_triggers1)
+    expected_triggers2[1]["type"] = "button_double_press"
+
+    triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
+    for expected in expected_triggers1:
+        assert expected in triggers
+
+    # Update trigger
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config2))
+    await hass.async_block_till_done()
+
+    triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
+    for expected in expected_triggers2:
+        assert expected in triggers
+
+    # Remove trigger
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config3))
+    await hass.async_block_till_done()
+
+    triggers = await async_get_device_automations(hass, "trigger", device_entry.id)
+    assert triggers == []
+
+
+async def test_if_fires_on_mqtt_message(
+    hass, device_reg, calls, mqtt_mock, setup_tasmota
+):
+    """Test triggers firing."""
+    # Discover a device with 2 device triggers
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 0
+    config["swc"][2] = 9
+    mac = config["mac"]
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": device_entry.id,
+                        "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+                        "type": "button_short_press",
+                        "subtype": "switch_1",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": ("short_press")},
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": device_entry.id,
+                        "discovery_id": "00000049A3BC_switch_3_HOLD",
+                        "subtype": "switch_3",
+                        "type": "button_double_press",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": ("long_press")},
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake short press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "short_press"
+
+    # Fake long press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH3T", '{"TRIG":"HOLD"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+    assert calls[1].data["some"] == "long_press"
+
+
+async def test_if_fires_on_mqtt_message_late_discover(
+    hass, device_reg, calls, mqtt_mock, setup_tasmota
+):
+    """Test triggers firing of MQTT device triggers discovered after setup."""
+    # Discover a device without device triggers
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["swc"][0] = -1
+    mac = config1["mac"]
+
+    # Discover a device with 2 device triggers
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["swc"][0] = 0
+    config2["swc"][3] = 9
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config1))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": device_entry.id,
+                        "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+                        "type": "button_short_press",
+                        "subtype": "switch_1",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": ("short_press")},
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": device_entry.id,
+                        "discovery_id": "00000049A3BC_switch_4_HOLD",
+                        "type": "switch_4",
+                        "subtype": "button_double_press",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": ("double_press")},
+                    },
+                },
+            ]
+        },
+    )
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config2))
+    await hass.async_block_till_done()
+
+    # Fake short press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0].data["some"] == "short_press"
+
+    # Fake long press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH4T", '{"TRIG":"HOLD"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+    assert calls[1].data["some"] == "double_press"
+
+
+async def test_if_fires_on_mqtt_message_after_update(
+    hass, device_reg, calls, mqtt_mock, setup_tasmota
+):
+    """Test triggers firing after update."""
+    # Discover a device with device trigger
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["swc"][0] = 0
+    config2["swc"][0] = 0
+    config2["tp"][1] = "status"
+    mac = config1["mac"]
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config1))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": device_entry.id,
+                        "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+                        "type": "button_short_press",
+                        "subtype": "switch_1",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": ("short_press")},
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake short press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+    # Update the trigger with different topic
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config2))
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/status/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+
+    # Update the trigger with same topic
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config2))
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/status/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 3
+
+
+async def test_no_resubscribe_same_topic(hass, device_reg, mqtt_mock, setup_tasmota):
+    """Test subscription to topics without change."""
+    # Discover a device with device trigger
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 0
+    mac = config["mac"]
+
+    mqtt_mock.async_subscribe.reset_mock()
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": device_entry.id,
+                        "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+                        "type": "button_short_press",
+                        "subtype": "switch_1",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": ("short_press")},
+                    },
+                },
+            ]
+        },
+    )
+
+    call_count = mqtt_mock.async_subscribe.call_count
+    assert call_count == 1
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+    assert mqtt_mock.async_subscribe.call_count == call_count
+
+
+async def test_not_fires_on_mqtt_message_after_remove_by_mqtt(
+    hass, device_reg, calls, mqtt_mock, setup_tasmota
+):
+    """Test triggers not firing after removal."""
+    # Discover a device with device trigger
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 0
+    mac = config["mac"]
+
+    mqtt_mock.async_subscribe.reset_mock()
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": device_entry.id,
+                        "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+                        "type": "button_short_press",
+                        "subtype": "switch_1",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": ("short_press")},
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake short press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+    # Remove the trigger
+    config["swc"][0] = -1
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+    # Rediscover the trigger
+    config["swc"][0] = 0
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 2
+
+
+async def test_not_fires_on_mqtt_message_after_remove_from_registry(
+    hass, device_reg, calls, mqtt_mock, setup_tasmota
+):
+    """Test triggers not firing after removal."""
+    # Discover a device with device trigger
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 0
+    mac = config["mac"]
+
+    mqtt_mock.async_subscribe.reset_mock()
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "device",
+                        "domain": DOMAIN,
+                        "device_id": device_entry.id,
+                        "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+                        "type": "button_short_press",
+                        "subtype": "switch_1",
+                    },
+                    "action": {
+                        "service": "test.automation",
+                        "data_template": {"some": ("short_press")},
+                    },
+                },
+            ]
+        },
+    )
+
+    # Fake short press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+    # Remove the device
+    device_reg.async_remove_device(device_entry.id)
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+
+async def test_attach_remove(hass, device_reg, mqtt_mock, setup_tasmota):
+    """Test attach and removal of trigger."""
+    # Discover a device with device trigger
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 0
+    mac = config["mac"]
+
+    mqtt_mock.async_subscribe.reset_mock()
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    calls = []
+
+    def callback(trigger, context):
+        calls.append(trigger["trigger"]["description"])
+
+    remove = await async_attach_trigger(
+        hass,
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+            "type": "button_short_press",
+            "subtype": "switch_1",
+        },
+        callback,
+        None,
+    )
+
+    # Fake short press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0] == "event 'tasmota_event'"
+
+    # Remove the trigger
+    remove()
+    await hass.async_block_till_done()
+
+    # Verify the triggers are no longer active
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+
+async def test_attach_remove_late(hass, device_reg, mqtt_mock, setup_tasmota):
+    """Test attach and removal of trigger."""
+    # Discover a device without device triggers
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["swc"][0] = -1
+    mac = config1["mac"]
+
+    # Discover a device with device triggers
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["swc"][0] = 0
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config1))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    calls = []
+
+    def callback(trigger, context):
+        calls.append(trigger["trigger"]["description"])
+
+    remove = await async_attach_trigger(
+        hass,
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+            "type": "button_short_press",
+            "subtype": "switch_1",
+        },
+        callback,
+        None,
+    )
+
+    # Fake short press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config2))
+    await hass.async_block_till_done()
+
+    # Fake short press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0] == "event 'tasmota_event'"
+
+    # Remove the trigger
+    remove()
+    await hass.async_block_till_done()
+
+    # Verify the triggers are no longer active
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+
+async def test_attach_remove_late2(hass, device_reg, mqtt_mock, setup_tasmota):
+    """Test attach and removal of trigger."""
+    # Discover a device without device triggers
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["swc"][0] = -1
+    mac = config1["mac"]
+
+    # Discover a device with device triggers
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["swc"][0] = 0
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config1))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    calls = []
+
+    def callback(trigger, context):
+        calls.append(trigger["trigger"]["description"])
+
+    remove = await async_attach_trigger(
+        hass,
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+            "type": "button_short_press",
+            "subtype": "switch_1",
+        },
+        callback,
+        None,
+    )
+
+    # Remove the trigger
+    remove()
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config1))
+    await hass.async_block_till_done()
+
+    # Verify the triggers is not active
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 0
+
+
+async def test_attach_remove_unknown1(hass, device_reg, mqtt_mock, setup_tasmota):
+    """Test attach and removal of unknown trigger."""
+    # Discover a device without device triggers
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["swc"][0] = -1
+    mac = config1["mac"]
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config1))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    remove = await async_attach_trigger(
+        hass,
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+            "type": "button_short_press",
+            "subtype": "switch_1",
+        },
+        None,
+        None,
+    )
+
+    # Remove the trigger
+    remove()
+    await hass.async_block_till_done()
+
+
+async def test_attach_unknown_remove_device_from_registry(
+    hass, device_reg, mqtt_mock, setup_tasmota
+):
+    """Test attach and removal of device with unknown trigger."""
+    # Discover a device without device triggers
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["swc"][0] = -1
+    mac = config1["mac"]
+
+    # Discover a device with device triggers
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["swc"][0] = 0
+
+    # Discovery a device with device triggers to load Tasmota device trigger integration
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config2))
+    await hass.async_block_till_done()
+
+    # Forget the trigger
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config1))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    await async_attach_trigger(
+        hass,
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+            "type": "button_short_press",
+            "subtype": "switch_1",
+        },
+        None,
+        None,
+    )
+
+    # Remove the device
+    device_reg.async_remove_device(device_entry.id)
+    await hass.async_block_till_done()
+
+
+async def test_attach_remove_config_entry(hass, device_reg, mqtt_mock, setup_tasmota):
+    """Test trigger cleanup when removing a Tasmota config entry."""
+    # Discover a device with device trigger
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["swc"][0] = 0
+    mac = config["mac"]
+
+    mqtt_mock.async_subscribe.reset_mock()
+
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+
+    calls = []
+
+    def callback(trigger, context):
+        calls.append(trigger["trigger"]["description"])
+
+    await async_attach_trigger(
+        hass,
+        {
+            "platform": "device",
+            "domain": DOMAIN,
+            "device_id": device_entry.id,
+            "discovery_id": "00000049A3BC_switch_1_TOGGLE",
+            "type": "button_short_press",
+            "subtype": "switch_1",
+        },
+        callback,
+        None,
+    )
+
+    # Fake short press.
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+    assert calls[0] == "event 'tasmota_event'"
+
+    # Remove the Tasmota config entry
+    config_entries = hass.config_entries.async_entries("tasmota")
+    await hass.config_entries.async_remove(config_entries[0].entry_id)
+    await hass.async_block_till_done()
+
+    # Verify the triggers are no longer active
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/SWITCH1T", '{"TRIG":"TOGGLE"}')
+    await hass.async_block_till_done()
+    assert len(calls) == 1
diff --git a/tests/components/tasmota/test_discovery.py b/tests/components/tasmota/test_discovery.py
new file mode 100644
index 00000000000..607676615a7
--- /dev/null
+++ b/tests/components/tasmota/test_discovery.py
@@ -0,0 +1,322 @@
+"""The tests for the MQTT discovery."""
+import copy
+import json
+
+from homeassistant.components.tasmota.const import DEFAULT_PREFIX
+from homeassistant.components.tasmota.discovery import ALREADY_DISCOVERED
+
+from .conftest import setup_tasmota_helper
+from .test_common import DEFAULT_CONFIG
+
+from tests.async_mock import patch
+from tests.common import async_fire_mqtt_message
+
+
+async def test_subscribing_config_topic(hass, mqtt_mock, setup_tasmota):
+    """Test setting up discovery."""
+    discovery_topic = DEFAULT_PREFIX
+
+    assert mqtt_mock.async_subscribe.called
+    call_args = mqtt_mock.async_subscribe.mock_calls[0][1]
+    assert call_args[0] == discovery_topic + "/#"
+    assert call_args[2] == 0
+
+
+async def test_valid_discovery_message(hass, mqtt_mock, caplog):
+    """Test discovery callback called."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+
+    with patch(
+        "homeassistant.components.tasmota.discovery.tasmota_get_device_config",
+        return_value={},
+    ) as mock_tasmota_get_device_config:
+        await setup_tasmota_helper(hass)
+
+        async_fire_mqtt_message(
+            hass, f"{DEFAULT_PREFIX}/00000049A3BC/config", json.dumps(config)
+        )
+        await hass.async_block_till_done()
+        assert mock_tasmota_get_device_config.called
+
+
+async def test_invalid_topic(hass, mqtt_mock):
+    """Test receiving discovery message on wrong topic."""
+    with patch(
+        "homeassistant.components.tasmota.discovery.tasmota_get_device_config"
+    ) as mock_tasmota_get_device_config:
+        await setup_tasmota_helper(hass)
+
+        async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/123456/configuration", "{}")
+        await hass.async_block_till_done()
+        assert not mock_tasmota_get_device_config.called
+
+
+async def test_invalid_message(hass, mqtt_mock, caplog):
+    """Test receiving an invalid message."""
+    with patch(
+        "homeassistant.components.tasmota.discovery.tasmota_get_device_config"
+    ) as mock_tasmota_get_device_config:
+        await setup_tasmota_helper(hass)
+
+        async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/123456/config", "asd")
+        await hass.async_block_till_done()
+        assert "Invalid discovery message" in caplog.text
+        assert not mock_tasmota_get_device_config.called
+
+
+async def test_invalid_mac(hass, mqtt_mock, caplog):
+    """Test topic is not matching device MAC."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+
+    with patch(
+        "homeassistant.components.tasmota.discovery.tasmota_get_device_config"
+    ) as mock_tasmota_get_device_config:
+        await setup_tasmota_helper(hass)
+
+        async_fire_mqtt_message(
+            hass, f"{DEFAULT_PREFIX}/00000049A3BA/config", json.dumps(config)
+        )
+        await hass.async_block_till_done()
+        assert "MAC mismatch" in caplog.text
+        assert not mock_tasmota_get_device_config.called
+
+
+async def test_correct_config_discovery(
+    hass, mqtt_mock, caplog, device_reg, entity_reg, setup_tasmota
+):
+    """Test receiving valid discovery message."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device and registry entries are created
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is not None
+    entity_entry = entity_reg.async_get("switch.test")
+    assert entity_entry is not None
+
+    state = hass.states.get("switch.test")
+    assert state is not None
+    assert state.name == "Test"
+
+    assert (mac, "switch", "relay", 0) in hass.data[ALREADY_DISCOVERED]
+
+
+async def test_device_discover(
+    hass, mqtt_mock, caplog, device_reg, entity_reg, setup_tasmota
+):
+    """Test setting up a device."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device and registry entries are created
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is not None
+    assert device_entry.manufacturer == "Tasmota"
+    assert device_entry.model == config["md"]
+    assert device_entry.name == config["dn"]
+    assert device_entry.sw_version == config["sw"]
+
+
+async def test_device_update(
+    hass, mqtt_mock, caplog, device_reg, entity_reg, setup_tasmota
+):
+    """Test updating a device."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["md"] = "Model 1"
+    config["dn"] = "Name 1"
+    config["sw"] = "v1.2.3.4"
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device entry is created
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is not None
+
+    # Update device parameters
+    config["md"] = "Another model"
+    config["dn"] = "Another name"
+    config["sw"] = "v6.6.6"
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device entry is updated
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is not None
+    assert device_entry.model == "Another model"
+    assert device_entry.name == "Another name"
+    assert device_entry.sw_version == "v6.6.6"
+
+
+async def test_device_remove(
+    hass, mqtt_mock, caplog, device_reg, entity_reg, setup_tasmota
+):
+    """Test removing a discovered device."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device entry is created
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is not None
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        "",
+    )
+    await hass.async_block_till_done()
+
+    # Verify device entry is removed
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is None
+
+
+async def test_device_remove_stale(hass, mqtt_mock, caplog, device_reg, setup_tasmota):
+    """Test removing a stale (undiscovered) device does not throw."""
+    mac = "00000049A3BC"
+
+    config_entry = hass.config_entries.async_entries("tasmota")[0]
+
+    # Create a device
+    device_reg.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={("mac", mac)},
+    )
+
+    # Verify device entry was created
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is not None
+
+    # Remove the device
+    device_reg.async_remove_device(device_entry.id)
+
+    # Verify device entry is removed
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is None
+
+
+async def test_device_rediscover(
+    hass, mqtt_mock, caplog, device_reg, entity_reg, setup_tasmota
+):
+    """Test removing a device."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device entry is created
+    device_entry1 = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry1 is not None
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        "",
+    )
+    await hass.async_block_till_done()
+
+    # Verify device entry is removed
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is None
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    # Verify device entry is created, and id is reused
+    device_entry = device_reg.async_get_device(set(), {("mac", mac)})
+    assert device_entry is not None
+    assert device_entry1.id == device_entry.id
+
+
+async def test_entity_duplicate_discovery(hass, mqtt_mock, caplog, setup_tasmota):
+    """Test entities are not duplicated."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("switch.test")
+    state_duplicate = hass.states.get("binary_sensor.beer1")
+
+    assert state is not None
+    assert state.name == "Test"
+    assert state_duplicate is None
+    assert (
+        f"Entity already added, sending update: switch ('{mac}', 'switch', 'relay', 0)"
+        in caplog.text
+    )
+
+
+async def test_entity_duplicate_removal(hass, mqtt_mock, caplog, setup_tasmota):
+    """Test removing entity twice."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    config["rl"][0] = 0
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+    assert f"Removing entity: switch ('{mac}', 'switch', 'relay', 0)" in caplog.text
+
+    caplog.clear()
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{mac}/config", json.dumps(config))
+    await hass.async_block_till_done()
+    assert "Removing entity: switch" not in caplog.text
diff --git a/tests/components/tasmota/test_light.py b/tests/components/tasmota/test_light.py
new file mode 100644
index 00000000000..48b1dec7232
--- /dev/null
+++ b/tests/components/tasmota/test_light.py
@@ -0,0 +1,1026 @@
+"""The tests for the Tasmota light platform."""
+import copy
+import json
+
+from hatasmota.const import CONF_MAC
+from hatasmota.utils import (
+    get_topic_stat_result,
+    get_topic_tele_state,
+    get_topic_tele_will,
+)
+
+from homeassistant.components import light
+from homeassistant.components.light import (
+    SUPPORT_BRIGHTNESS,
+    SUPPORT_COLOR,
+    SUPPORT_COLOR_TEMP,
+    SUPPORT_EFFECT,
+    SUPPORT_TRANSITION,
+    SUPPORT_WHITE_VALUE,
+)
+from homeassistant.components.tasmota.const import DEFAULT_PREFIX
+from homeassistant.const import ATTR_ASSUMED_STATE, STATE_OFF, STATE_ON
+
+from .test_common import (
+    DEFAULT_CONFIG,
+    help_test_availability,
+    help_test_availability_discovery_update,
+    help_test_availability_poll_state,
+    help_test_availability_when_connection_lost,
+    help_test_discovery_device_remove,
+    help_test_discovery_removal,
+    help_test_discovery_update_unchanged,
+    help_test_entity_id_update_discovery_update,
+    help_test_entity_id_update_subscriptions,
+)
+
+from tests.async_mock import patch
+from tests.common import async_fire_mqtt_message
+from tests.components.light import common
+
+
+async def test_attributes_on_off(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["so"]["30"] = 1  # Enforce Home Assistant auto-discovery as light
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.attributes.get("effect_list") is None
+    assert state.attributes.get("min_mireds") is None
+    assert state.attributes.get("max_mireds") is None
+    assert state.attributes.get("supported_features") == 0
+
+
+async def test_attributes_dimmer(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (dimmer)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.attributes.get("effect_list") is None
+    assert state.attributes.get("min_mireds") is None
+    assert state.attributes.get("max_mireds") is None
+    assert (
+        state.attributes.get("supported_features")
+        == SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION
+    )
+
+
+async def test_attributes_ct(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 2  # 2 channel light (CW)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.attributes.get("effect_list") is None
+    assert state.attributes.get("min_mireds") == 153
+    assert state.attributes.get("max_mireds") == 500
+    assert (
+        state.attributes.get("supported_features")
+        == SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP | SUPPORT_TRANSITION
+    )
+
+
+async def test_attributes_ct_reduced(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 2  # 2 channel light (CW)
+    config["so"]["82"] = 1  # Reduced CT range
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.attributes.get("effect_list") is None
+    assert state.attributes.get("min_mireds") == 200
+    assert state.attributes.get("max_mireds") == 380
+    assert (
+        state.attributes.get("supported_features")
+        == SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP | SUPPORT_TRANSITION
+    )
+
+
+async def test_attributes_rgb(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 3  # 3 channel light (RGB)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.attributes.get("effect_list") == [
+        "None",
+        "Wake up",
+        "Cycle up",
+        "Cycle down",
+        "Random",
+    ]
+    assert state.attributes.get("min_mireds") is None
+    assert state.attributes.get("max_mireds") is None
+    assert (
+        state.attributes.get("supported_features")
+        == SUPPORT_BRIGHTNESS | SUPPORT_COLOR | SUPPORT_EFFECT | SUPPORT_TRANSITION
+    )
+
+
+async def test_attributes_rgbw(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 4  # 5 channel light (RGBW)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.attributes.get("effect_list") == [
+        "None",
+        "Wake up",
+        "Cycle up",
+        "Cycle down",
+        "Random",
+    ]
+    assert state.attributes.get("min_mireds") is None
+    assert state.attributes.get("max_mireds") is None
+    assert (
+        state.attributes.get("supported_features")
+        == SUPPORT_BRIGHTNESS
+        | SUPPORT_COLOR
+        | SUPPORT_EFFECT
+        | SUPPORT_TRANSITION
+        | SUPPORT_WHITE_VALUE
+    )
+
+
+async def test_attributes_rgbww(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 5  # 5 channel light (RGBCW)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.attributes.get("effect_list") == [
+        "None",
+        "Wake up",
+        "Cycle up",
+        "Cycle down",
+        "Random",
+    ]
+    assert state.attributes.get("min_mireds") == 153
+    assert state.attributes.get("max_mireds") == 500
+    assert (
+        state.attributes.get("supported_features")
+        == SUPPORT_BRIGHTNESS
+        | SUPPORT_COLOR
+        | SUPPORT_COLOR_TEMP
+        | SUPPORT_EFFECT
+        | SUPPORT_TRANSITION
+        | SUPPORT_WHITE_VALUE
+    )
+
+
+async def test_attributes_rgbww_reduced(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 5  # 5 channel light (RGBCW)
+    config["so"]["82"] = 1  # Reduced CT range
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.attributes.get("effect_list") == [
+        "None",
+        "Wake up",
+        "Cycle up",
+        "Cycle down",
+        "Random",
+    ]
+    assert state.attributes.get("min_mireds") == 200
+    assert state.attributes.get("max_mireds") == 380
+    assert (
+        state.attributes.get("supported_features")
+        == SUPPORT_BRIGHTNESS
+        | SUPPORT_COLOR
+        | SUPPORT_COLOR_TEMP
+        | SUPPORT_EFFECT
+        | SUPPORT_TRANSITION
+        | SUPPORT_WHITE_VALUE
+    )
+
+
+async def test_controlling_state_via_mqtt_on_off(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["so"]["30"] = 1  # Enforce Home Assistant auto-discovery as light
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("light.test")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"OFF"}')
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/RESULT", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/RESULT", '{"POWER":"OFF"}')
+
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+
+
+async def test_controlling_state_via_mqtt_ct(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 2  # 2 channel light (CT)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("light.test")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"OFF"}')
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON","Dimmer":50}'
+    )
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("brightness") == 127.5
+
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON","CT":300}'
+    )
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("color_temp") == 300
+
+    # Tasmota will send "Color" also for CT light, this should be ignored
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON","Color":"255,128"}'
+    )
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("color_temp") == 300
+    assert state.attributes.get("brightness") == 127.5
+
+
+async def test_controlling_state_via_mqtt_rgbww(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 5  # 5 channel light (RGBCW)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("light.test")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"OFF"}')
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON","Dimmer":50}'
+    )
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("brightness") == 127.5
+
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON","Color":"255,128,0"}'
+    )
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("rgb_color") == (255, 128, 0)
+
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON","White":50}'
+    )
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("white_value") == 127.5
+
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON","CT":300}'
+    )
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("color_temp") == 300
+
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON","Scheme":3}'
+    )
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("effect") == "Cycle down"
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/RESULT", '{"POWER":"ON"}')
+
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/RESULT", '{"POWER":"OFF"}')
+
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+
+
+async def test_sending_mqtt_commands_on_off(hass, mqtt_mock, setup_tasmota):
+    """Test the sending MQTT commands."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["so"]["30"] = 1  # Enforce Home Assistant auto-discovery as light
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    mqtt_mock.async_publish.reset_mock()
+
+    # Turn the light on and verify MQTT message is sent
+    await common.async_turn_on(hass, "light.test")
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Power1", "ON", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Tasmota is not optimistic, the state should still be off
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+
+    # Turn the light off and verify MQTT message is sent
+    await common.async_turn_off(hass, "light.test")
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Power1", "OFF", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+
+async def test_sending_mqtt_commands_rgbww(hass, mqtt_mock, setup_tasmota):
+    """Test the sending MQTT commands."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 5  # 5 channel light (RGBCW)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    mqtt_mock.async_publish.reset_mock()
+
+    # Turn the light on and verify MQTT message is sent
+    await common.async_turn_on(hass, "light.test")
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog", "NoDelay;Fade 0;NoDelay;Power1 ON", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Tasmota is not optimistic, the state should still be off
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+
+    # Turn the light off and verify MQTT message is sent
+    await common.async_turn_off(hass, "light.test")
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog", "NoDelay;Fade 0;NoDelay;Power1 OFF", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Turn the light on and verify MQTT messages are sent
+    await common.async_turn_on(hass, "light.test", brightness=192)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog", "NoDelay;Fade 0;NoDelay;Dimmer 75", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_on(hass, "light.test", rgb_color=[255, 128, 0])
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog",
+        "NoDelay;Fade 0;NoDelay;Power1 ON;NoDelay;Color2 255,128,0",
+        0,
+        False,
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_on(hass, "light.test", color_temp=200)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog",
+        "NoDelay;Fade 0;NoDelay;Power1 ON;NoDelay;CT 200",
+        0,
+        False,
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_on(hass, "light.test", white_value=128)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog",
+        "NoDelay;Fade 0;NoDelay;Power1 ON;NoDelay;White 50",
+        0,
+        False,
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    await common.async_turn_on(hass, "light.test", effect="Random")
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog",
+        "NoDelay;Fade 0;NoDelay;Power1 ON;NoDelay;Scheme 4",
+        0,
+        False,
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+
+async def test_sending_mqtt_commands_power_unlinked(hass, mqtt_mock, setup_tasmota):
+    """Test the sending MQTT commands to a light with unlinked dimlevel and power."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (dimmer)
+    config["so"]["20"] = 1  # Update of Dimmer/Color/CT without turning power on
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    mqtt_mock.async_publish.reset_mock()
+
+    # Turn the light on and verify MQTT message is sent
+    await common.async_turn_on(hass, "light.test")
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog", "NoDelay;Fade 0;NoDelay;Power1 ON", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Tasmota is not optimistic, the state should still be off
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+
+    # Turn the light off and verify MQTT message is sent
+    await common.async_turn_off(hass, "light.test")
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog", "NoDelay;Fade 0;NoDelay;Power1 OFF", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Turn the light on and verify MQTT messages are sent; POWER should be sent
+    await common.async_turn_on(hass, "light.test", brightness=192)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog",
+        "NoDelay;Fade 0;NoDelay;Dimmer 75;NoDelay;Power1 ON",
+        0,
+        False,
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+
+async def test_transition(hass, mqtt_mock, setup_tasmota):
+    """Test transition commands."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 5  # 5 channel light (RGBCW)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("light.test")
+    assert state.state == STATE_OFF
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    mqtt_mock.async_publish.reset_mock()
+
+    # Dim the light from 0->100: Speed should be 4*2=8
+    await common.async_turn_on(hass, "light.test", brightness=255, transition=4)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog",
+        "NoDelay;Fade 1;NoDelay;Speed 8;NoDelay;Dimmer 100",
+        0,
+        False,
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Dim the light from 0->50: Speed should be 4*2/2=4
+    await common.async_turn_on(hass, "light.test", brightness=128, transition=4)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog",
+        "NoDelay;Fade 1;NoDelay;Speed 4;NoDelay;Dimmer 50",
+        0,
+        False,
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Fake state update from the light
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON","Dimmer":50}'
+    )
+    state = hass.states.get("light.test")
+    assert state.state == STATE_ON
+    assert state.attributes.get("brightness") == 127.5
+
+    # Dim the light from 50->0: Speed should be 6*2/2=6
+    await common.async_turn_off(hass, "light.test", transition=6)
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Backlog",
+        "NoDelay;Fade 1;NoDelay;Speed 6;NoDelay;Power1 OFF",
+        0,
+        False,
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+
+async def test_relay_as_light(hass, mqtt_mock, setup_tasmota):
+    """Test relay show up as light in light mode."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["so"]["30"] = 1  # Enforce Home Assistant auto-discovery as light
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("switch.test")
+    assert state is None
+    state = hass.states.get("light.test")
+    assert state is not None
+
+
+async def _test_split_light(hass, mqtt_mock, config, num_lights, num_switches):
+    """Test multi-channel light split to single-channel dimmers."""
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids("switch")) == num_switches
+    assert len(hass.states.async_entity_ids("light")) == num_lights
+
+    lights = hass.states.async_entity_ids("light")
+    for idx, entity in enumerate(lights):
+        mqtt_mock.async_publish.reset_mock()
+        # Turn the light on and verify MQTT message is sent
+        await common.async_turn_on(hass, entity)
+        mqtt_mock.async_publish.assert_called_once_with(
+            "tasmota_49A3BC/cmnd/Backlog",
+            f"NoDelay;Fade 0;NoDelay;Power{idx+num_switches+1} ON",
+            0,
+            False,
+        )
+
+        mqtt_mock.async_publish.reset_mock()
+        # Dim the light and verify MQTT message is sent
+        await common.async_turn_on(hass, entity, brightness=(idx + 1) * 25.5)
+        mqtt_mock.async_publish.assert_called_once_with(
+            "tasmota_49A3BC/cmnd/Backlog",
+            f"NoDelay;Fade 0;NoDelay;Channel{idx+num_switches+1} {(idx+1)*10}",
+            0,
+            False,
+        )
+
+
+async def test_split_light(hass, mqtt_mock, setup_tasmota):
+    """Test multi-channel light split to single-channel dimmers."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["rl"][1] = 2
+    config["rl"][2] = 2
+    config["rl"][3] = 2
+    config["rl"][4] = 2
+    config["so"][68] = 1  # Multi-channel PWM instead of a single light
+    config["lt_st"] = 5  # 5 channel light (RGBCW)
+
+    await _test_split_light(hass, mqtt_mock, config, 5, 0)
+
+
+async def test_split_light2(hass, mqtt_mock, setup_tasmota):
+    """Test multi-channel light split to single-channel dimmers."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["rl"][1] = 1
+    config["rl"][2] = 2
+    config["rl"][3] = 2
+    config["rl"][4] = 2
+    config["rl"][5] = 2
+    config["rl"][6] = 2
+    config["so"][68] = 1  # Multi-channel PWM instead of a single light
+    config["lt_st"] = 5  # 5 channel light (RGBCW)
+
+    await _test_split_light(hass, mqtt_mock, config, 5, 2)
+
+
+async def _test_unlinked_light(hass, mqtt_mock, config, num_switches):
+    """Test rgbww light split to rgb+ww."""
+    mac = config["mac"]
+    num_lights = 2
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    assert len(hass.states.async_entity_ids("switch")) == num_switches
+    assert len(hass.states.async_entity_ids("light")) == num_lights
+
+    lights = hass.states.async_entity_ids("light")
+    for idx, entity in enumerate(lights):
+        mqtt_mock.async_publish.reset_mock()
+        # Turn the light on and verify MQTT message is sent
+        await common.async_turn_on(hass, entity)
+        mqtt_mock.async_publish.assert_called_once_with(
+            "tasmota_49A3BC/cmnd/Backlog",
+            f"NoDelay;Fade 0;NoDelay;Power{idx+num_switches+1} ON",
+            0,
+            False,
+        )
+
+        mqtt_mock.async_publish.reset_mock()
+        # Dim the light and verify MQTT message is sent
+        await common.async_turn_on(hass, entity, brightness=(idx + 1) * 25.5)
+        mqtt_mock.async_publish.assert_called_once_with(
+            "tasmota_49A3BC/cmnd/Backlog",
+            f"NoDelay;Fade 0;NoDelay;Dimmer{idx+1} {(idx+1)*10}",
+            0,
+            False,
+        )
+
+
+async def test_unlinked_light(hass, mqtt_mock, setup_tasmota):
+    """Test rgbww light split to rgb+ww."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["rl"][1] = 2
+    config["lk"] = 0  # RGB + white channels unlinked
+    config["lt_st"] = 5  # 5 channel light (RGBCW)
+
+    await _test_unlinked_light(hass, mqtt_mock, config, 0)
+
+
+async def test_unlinked_light2(hass, mqtt_mock, setup_tasmota):
+    """Test rgbww light split to rgb+ww."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["rl"][1] = 1
+    config["rl"][2] = 2
+    config["rl"][3] = 2
+    config["lk"] = 0  # RGB + white channels unlinked
+    config["lt_st"] = 5  # 5 channel light (RGBCW)
+
+    await _test_unlinked_light(hass, mqtt_mock, config, 2)
+
+
+async def test_discovery_update_reconfigure_light(
+    hass, mqtt_mock, caplog, setup_tasmota
+):
+    """Test reconfigure of discovered light."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (Dimmer)
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["rl"][0] = 2
+    config2["lt_st"] = 3  # 3 channel light (RGB)
+    data1 = json.dumps(config)
+    data2 = json.dumps(config2)
+
+    # Simple dimmer
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", data1)
+    await hass.async_block_till_done()
+    state = hass.states.get("light.test")
+    assert (
+        state.attributes.get("supported_features")
+        == SUPPORT_BRIGHTNESS | SUPPORT_TRANSITION
+    )
+
+    # Reconfigure as RGB light
+    async_fire_mqtt_message(hass, f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config", data2)
+    await hass.async_block_till_done()
+    state = hass.states.get("light.test")
+    assert (
+        state.attributes.get("supported_features")
+        == SUPPORT_BRIGHTNESS | SUPPORT_COLOR | SUPPORT_EFFECT | SUPPORT_TRANSITION
+    )
+
+
+async def test_availability_when_connection_lost(
+    hass, mqtt_client_mock, mqtt_mock, setup_tasmota
+):
+    """Test availability after MQTT disconnection."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (Dimmer)
+    await help_test_availability_when_connection_lost(
+        hass, mqtt_client_mock, mqtt_mock, light.DOMAIN, config
+    )
+
+
+async def test_availability(hass, mqtt_mock, setup_tasmota):
+    """Test availability."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (Dimmer)
+    await help_test_availability(hass, mqtt_mock, light.DOMAIN, config)
+
+
+async def test_availability_discovery_update(hass, mqtt_mock, setup_tasmota):
+    """Test availability discovery update."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (Dimmer)
+    await help_test_availability_discovery_update(hass, mqtt_mock, light.DOMAIN, config)
+
+
+async def test_availability_poll_state(
+    hass, mqtt_client_mock, mqtt_mock, setup_tasmota
+):
+    """Test polling after MQTT connection (re)established."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (Dimmer)
+    poll_topic = "tasmota_49A3BC/cmnd/STATE"
+    await help_test_availability_poll_state(
+        hass, mqtt_client_mock, mqtt_mock, light.DOMAIN, config, poll_topic, ""
+    )
+
+
+async def test_discovery_removal_light(hass, mqtt_mock, caplog, setup_tasmota):
+    """Test removal of discovered light."""
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["rl"][0] = 2
+    config1["lt_st"] = 1  # 1 channel light (Dimmer)
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["rl"][0] = 0
+    config2["lt_st"] = 0
+
+    await help_test_discovery_removal(
+        hass, mqtt_mock, caplog, light.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_removal_relay_as_light(hass, mqtt_mock, caplog, setup_tasmota):
+    """Test removal of discovered relay as light."""
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["rl"][0] = 1
+    config1["so"]["30"] = 1  # Enforce Home Assistant auto-discovery as light
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["rl"][0] = 1
+    config2["so"]["30"] = 0  # Disable Home Assistant auto-discovery as light
+
+    await help_test_discovery_removal(
+        hass, mqtt_mock, caplog, light.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_removal_relay_as_light2(
+    hass, mqtt_mock, caplog, setup_tasmota
+):
+    """Test removal of discovered relay as light."""
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["rl"][0] = 1
+    config1["so"]["30"] = 1  # Enforce Home Assistant auto-discovery as light
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["rl"][0] = 0
+    config2["so"]["30"] = 0  # Disable Home Assistant auto-discovery as light
+
+    await help_test_discovery_removal(
+        hass, mqtt_mock, caplog, light.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_update_unchanged_light(hass, mqtt_mock, caplog, setup_tasmota):
+    """Test update of discovered light."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (Dimmer)
+    with patch(
+        "homeassistant.components.tasmota.light.TasmotaLight.discovery_update"
+    ) as discovery_update:
+        await help_test_discovery_update_unchanged(
+            hass, mqtt_mock, caplog, light.DOMAIN, config, discovery_update
+        )
+
+
+async def test_discovery_device_remove(hass, mqtt_mock, setup_tasmota):
+    """Test device registry remove."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (Dimmer)
+    unique_id = f"{DEFAULT_CONFIG['mac']}_light_light_0"
+    await help_test_discovery_device_remove(
+        hass, mqtt_mock, light.DOMAIN, unique_id, config
+    )
+
+
+async def test_discovery_device_remove_relay_as_light(hass, mqtt_mock, setup_tasmota):
+    """Test device registry remove."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["so"]["30"] = 1  # Enforce Home Assistant auto-discovery as light
+    unique_id = f"{DEFAULT_CONFIG['mac']}_light_relay_0"
+    await help_test_discovery_device_remove(
+        hass, mqtt_mock, light.DOMAIN, unique_id, config
+    )
+
+
+async def test_entity_id_update_subscriptions(hass, mqtt_mock, setup_tasmota):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (Dimmer)
+    topics = [
+        get_topic_stat_result(config),
+        get_topic_tele_state(config),
+        get_topic_tele_will(config),
+    ]
+    await help_test_entity_id_update_subscriptions(
+        hass, mqtt_mock, light.DOMAIN, config, topics
+    )
+
+
+async def test_entity_id_update_discovery_update(hass, mqtt_mock, setup_tasmota):
+    """Test MQTT discovery update when entity_id is updated."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 2
+    config["lt_st"] = 1  # 1 channel light (Dimmer)
+    await help_test_entity_id_update_discovery_update(
+        hass, mqtt_mock, light.DOMAIN, config
+    )
diff --git a/tests/components/tasmota/test_mixins.py b/tests/components/tasmota/test_mixins.py
new file mode 100644
index 00000000000..a90d4c01fd7
--- /dev/null
+++ b/tests/components/tasmota/test_mixins.py
@@ -0,0 +1,53 @@
+"""The tests for the Tasmota mixins."""
+import copy
+import json
+
+from hatasmota.const import CONF_MAC
+from hatasmota.utils import config_get_state_online, get_topic_tele_will
+
+from homeassistant.components.tasmota.const import DEFAULT_PREFIX
+
+from .test_common import DEFAULT_CONFIG
+
+from tests.async_mock import call
+from tests.common import async_fire_mqtt_message
+
+
+async def test_availability_poll_state_once(
+    hass, mqtt_client_mock, mqtt_mock, setup_tasmota
+):
+    """Test several entities send a single message to update state."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["rl"][1] = 1
+    config["swc"][0] = 1
+    config["swc"][1] = 1
+    poll_payload_relay = ""
+    poll_payload_switch = "8"
+    poll_topic_relay = "tasmota_49A3BC/cmnd/STATE"
+    poll_topic_switch = "tasmota_49A3BC/cmnd/STATUS"
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{config[CONF_MAC]}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    mqtt_mock.async_publish.reset_mock()
+
+    # Device online, verify poll for state
+    async_fire_mqtt_message(
+        hass,
+        get_topic_tele_will(config),
+        config_get_state_online(config),
+    )
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    mqtt_mock.async_publish.assert_has_calls(
+        [
+            call(poll_topic_relay, poll_payload_relay, 0, False),
+            call(poll_topic_switch, poll_payload_switch, 0, False),
+        ],
+        any_order=True,
+    )
diff --git a/tests/components/tasmota/test_sensor.py b/tests/components/tasmota/test_sensor.py
new file mode 100644
index 00000000000..ab8498ed04c
--- /dev/null
+++ b/tests/components/tasmota/test_sensor.py
@@ -0,0 +1,572 @@
+"""The tests for the Tasmota sensor platform."""
+import copy
+from datetime import timedelta
+import json
+
+from hatasmota.utils import (
+    get_topic_stat_status,
+    get_topic_tele_sensor,
+    get_topic_tele_will,
+)
+import pytest
+
+from homeassistant import config_entries
+from homeassistant.components import sensor
+from homeassistant.components.tasmota.const import DEFAULT_PREFIX
+from homeassistant.const import ATTR_ASSUMED_STATE, STATE_UNKNOWN
+from homeassistant.util import dt
+
+from .test_common import (
+    DEFAULT_CONFIG,
+    help_test_availability,
+    help_test_availability_discovery_update,
+    help_test_availability_poll_state,
+    help_test_availability_when_connection_lost,
+    help_test_discovery_device_remove,
+    help_test_discovery_removal,
+    help_test_discovery_update_unchanged,
+    help_test_entity_id_update_discovery_update,
+    help_test_entity_id_update_subscriptions,
+)
+
+from tests.async_mock import patch
+from tests.common import async_fire_mqtt_message, async_fire_time_changed
+
+DEFAULT_SENSOR_CONFIG = {
+    "sn": {
+        "Time": "2020-09-25T12:47:15",
+        "DHT11": {"Temperature": None},
+        "TempUnit": "C",
+    }
+}
+
+INDEXED_SENSOR_CONFIG = {
+    "sn": {
+        "Time": "2020-09-25T12:47:15",
+        "ENERGY": {
+            "TotalStartTime": "2018-11-23T15:33:47",
+            "Total": 0.017,
+            "TotalTariff": [0.000, 0.017],
+            "Yesterday": 0.000,
+            "Today": 0.002,
+            "ExportActive": 0.000,
+            "ExportTariff": [0.000, 0.000],
+            "Period": 0.00,
+            "Power": 0.00,
+            "ApparentPower": 7.84,
+            "ReactivePower": -7.21,
+            "Factor": 0.39,
+            "Frequency": 50.0,
+            "Voltage": 234.31,
+            "Current": 0.039,
+            "ImportActive": 12.580,
+            "ImportReactive": 0.002,
+            "ExportReactive": 39.131,
+            "PhaseAngle": 290.45,
+        },
+    }
+}
+
+
+NESTED_SENSOR_CONFIG = {
+    "sn": {
+        "Time": "2020-03-03T00:00:00+00:00",
+        "TX23": {
+            "Speed": {"Act": 14.8, "Avg": 8.5, "Min": 12.2, "Max": 14.8},
+            "Dir": {
+                "Card": "WSW",
+                "Deg": 247.5,
+                "Avg": 266.1,
+                "AvgCard": "W",
+                "Range": 0,
+            },
+        },
+        "SpeedUnit": "km/h",
+    }
+}
+
+
+async def test_controlling_state_via_mqtt(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/sensors",
+        json.dumps(sensor_config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.dht11_temperature")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("sensor.dht11_temperature")
+    assert state.state == STATE_UNKNOWN
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    # Test periodic state update
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/SENSOR", '{"DHT11":{"Temperature":20.5}}'
+    )
+    state = hass.states.get("sensor.dht11_temperature")
+    assert state.state == "20.5"
+
+    # Test polled state update
+    async_fire_mqtt_message(
+        hass,
+        "tasmota_49A3BC/stat/STATUS8",
+        '{"StatusSNS":{"DHT11":{"Temperature":20.0}}}',
+    )
+    state = hass.states.get("sensor.dht11_temperature")
+    assert state.state == "20.0"
+
+
+async def test_nested_sensor_state_via_mqtt(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(NESTED_SENSOR_CONFIG)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/sensors",
+        json.dumps(sensor_config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.tx23_speed_act")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("sensor.tx23_speed_act")
+    assert state.state == STATE_UNKNOWN
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    # Test periodic state update
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/SENSOR", '{"TX23":{"Speed":{"Act":"12.3"}}}'
+    )
+    state = hass.states.get("sensor.tx23_speed_act")
+    assert state.state == "12.3"
+
+    # Test polled state update
+    async_fire_mqtt_message(
+        hass,
+        "tasmota_49A3BC/stat/STATUS8",
+        '{"StatusSNS":{"TX23":{"Speed":{"Act":"23.4"}}}}',
+    )
+    state = hass.states.get("sensor.tx23_speed_act")
+    assert state.state == "23.4"
+
+
+async def test_indexed_sensor_state_via_mqtt(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(INDEXED_SENSOR_CONFIG)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/sensors",
+        json.dumps(sensor_config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.energy_totaltariff_1")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("sensor.energy_totaltariff_1")
+    assert state.state == STATE_UNKNOWN
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    # Test periodic state update
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/SENSOR", '{"ENERGY":{"TotalTariff":[1.2,3.4]}}'
+    )
+    state = hass.states.get("sensor.energy_totaltariff_1")
+    assert state.state == "3.4"
+
+    # Test polled state update
+    async_fire_mqtt_message(
+        hass,
+        "tasmota_49A3BC/stat/STATUS8",
+        '{"StatusSNS":{"ENERGY":{"TotalTariff":[5.6,7.8]}}}',
+    )
+    state = hass.states.get("sensor.energy_totaltariff_1")
+    assert state.state == "7.8"
+
+
+@pytest.mark.parametrize("status_sensor_disabled", [False])
+async def test_status_sensor_state_via_mqtt(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    entity_reg = await hass.helpers.entity_registry.async_get_registry()
+
+    # Pre-enable the status sensor
+    entity_reg.async_get_or_create(
+        sensor.DOMAIN,
+        "tasmota",
+        "00000049A3BC_status_sensor_status_sensor_status_signal",
+        suggested_object_id="tasmota_status",
+        disabled_by=None,
+    )
+
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.tasmota_status")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("sensor.tasmota_status")
+    assert state.state == STATE_UNKNOWN
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    # Test pushed state update
+    async_fire_mqtt_message(
+        hass, "tasmota_49A3BC/tele/STATE", '{"Wifi":{"Signal":20.5}}'
+    )
+    state = hass.states.get("sensor.tasmota_status")
+    assert state.state == "20.5"
+
+    # Test polled state update
+    async_fire_mqtt_message(
+        hass,
+        "tasmota_49A3BC/stat/STATUS11",
+        '{"StatusSTS":{"Wifi":{"Signal":20.0}}}',
+    )
+    state = hass.states.get("sensor.tasmota_status")
+    assert state.state == "20.0"
+
+
+async def test_attributes(hass, mqtt_mock, setup_tasmota):
+    """Test correct attributes for sensors."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = {
+        "sn": {
+            "DHT11": {"Temperature": None},
+            "Beer": {"CarbonDioxide": None},
+            "TempUnit": "C",
+        }
+    }
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/sensors",
+        json.dumps(sensor_config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.dht11_temperature")
+    assert state.attributes.get("device_class") == "temperature"
+    assert state.attributes.get("friendly_name") == "DHT11 Temperature"
+    assert state.attributes.get("icon") is None
+    assert state.attributes.get("unit_of_measurement") == "C"
+
+    state = hass.states.get("sensor.beer_CarbonDioxide")
+    assert state.attributes.get("device_class") is None
+    assert state.attributes.get("friendly_name") == "Beer CarbonDioxide"
+    assert state.attributes.get("icon") == "mdi:molecule-co2"
+    assert state.attributes.get("unit_of_measurement") == "ppm"
+
+
+async def test_nested_sensor_attributes(hass, mqtt_mock, setup_tasmota):
+    """Test correct attributes for sensors."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(NESTED_SENSOR_CONFIG)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/sensors",
+        json.dumps(sensor_config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.tx23_speed_act")
+    assert state.attributes.get("device_class") is None
+    assert state.attributes.get("friendly_name") == "TX23 Speed Act"
+    assert state.attributes.get("icon") is None
+    assert state.attributes.get("unit_of_measurement") == "km/h"
+
+    state = hass.states.get("sensor.tx23_dir_avg")
+    assert state.attributes.get("device_class") is None
+    assert state.attributes.get("friendly_name") == "TX23 Dir Avg"
+    assert state.attributes.get("icon") is None
+    assert state.attributes.get("unit_of_measurement") == " "
+
+
+async def test_indexed_sensor_attributes(hass, mqtt_mock, setup_tasmota):
+    """Test correct attributes for sensors."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = {
+        "sn": {
+            "Dummy1": {"Temperature": [None, None]},
+            "Dummy2": {"CarbonDioxide": [None, None]},
+            "TempUnit": "C",
+        }
+    }
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/sensors",
+        json.dumps(sensor_config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.dummy1_temperature_0")
+    assert state.attributes.get("device_class") == "temperature"
+    assert state.attributes.get("friendly_name") == "Dummy1 Temperature 0"
+    assert state.attributes.get("icon") is None
+    assert state.attributes.get("unit_of_measurement") == "C"
+
+    state = hass.states.get("sensor.dummy2_carbondioxide_1")
+    assert state.attributes.get("device_class") is None
+    assert state.attributes.get("friendly_name") == "Dummy2 CarbonDioxide 1"
+    assert state.attributes.get("icon") == "mdi:molecule-co2"
+    assert state.attributes.get("unit_of_measurement") == "ppm"
+
+
+@pytest.mark.parametrize("status_sensor_disabled", [False])
+async def test_enable_status_sensor(hass, mqtt_mock, setup_tasmota):
+    """Test enabling status sensor."""
+    entity_reg = await hass.helpers.entity_registry.async_get_registry()
+
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.tasmota_status")
+    assert state is None
+    entry = entity_reg.async_get("sensor.tasmota_status")
+    assert entry.disabled
+    assert entry.disabled_by == "integration"
+
+    # Enable the status sensor
+    updated_entry = entity_reg.async_update_entity(
+        "sensor.tasmota_status", disabled_by=None
+    )
+    assert updated_entry != entry
+    assert updated_entry.disabled is False
+    await hass.async_block_till_done()
+
+    async_fire_time_changed(
+        hass,
+        dt.utcnow()
+        + timedelta(
+            seconds=config_entries.EntityRegistryDisabledHandler.RELOAD_AFTER_UPDATE_DELAY
+            + 1
+        ),
+    )
+    await hass.async_block_till_done()
+
+    # Fake re-send of retained discovery message
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.tasmota_status")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("sensor.tasmota_status")
+    assert state.state == STATE_UNKNOWN
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+
+async def test_availability_when_connection_lost(
+    hass, mqtt_client_mock, mqtt_mock, setup_tasmota
+):
+    """Test availability after MQTT disconnection."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+    await help_test_availability_when_connection_lost(
+        hass,
+        mqtt_client_mock,
+        mqtt_mock,
+        sensor.DOMAIN,
+        config,
+        sensor_config,
+        "dht11_temperature",
+    )
+
+
+async def test_availability(hass, mqtt_mock, setup_tasmota):
+    """Test availability."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+    await help_test_availability(
+        hass, mqtt_mock, sensor.DOMAIN, config, sensor_config, "dht11_temperature"
+    )
+
+
+async def test_availability_discovery_update(hass, mqtt_mock, setup_tasmota):
+    """Test availability discovery update."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+    await help_test_availability_discovery_update(
+        hass, mqtt_mock, sensor.DOMAIN, config, sensor_config, "dht11_temperature"
+    )
+
+
+async def test_availability_poll_state(
+    hass, mqtt_client_mock, mqtt_mock, setup_tasmota
+):
+    """Test polling after MQTT connection (re)established."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+    poll_topic = "tasmota_49A3BC/cmnd/STATUS"
+    await help_test_availability_poll_state(
+        hass,
+        mqtt_client_mock,
+        mqtt_mock,
+        sensor.DOMAIN,
+        config,
+        poll_topic,
+        "8",
+        sensor_config,
+    )
+
+
+async def test_discovery_removal_sensor(hass, mqtt_mock, caplog, setup_tasmota):
+    """Test removal of discovered sensor."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config1 = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+
+    await help_test_discovery_removal(
+        hass,
+        mqtt_mock,
+        caplog,
+        sensor.DOMAIN,
+        config,
+        config,
+        sensor_config1,
+        {},
+        "dht11_temperature",
+        "DHT11 Temperature",
+    )
+
+
+async def test_discovery_update_unchanged_sensor(
+    hass, mqtt_mock, caplog, setup_tasmota
+):
+    """Test update of discovered sensor."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+    with patch(
+        "homeassistant.components.tasmota.sensor.TasmotaSensor.discovery_update"
+    ) as discovery_update:
+        await help_test_discovery_update_unchanged(
+            hass,
+            mqtt_mock,
+            caplog,
+            sensor.DOMAIN,
+            config,
+            discovery_update,
+            sensor_config,
+            "dht11_temperature",
+            "DHT11 Temperature",
+        )
+
+
+async def test_discovery_device_remove(hass, mqtt_mock, setup_tasmota):
+    """Test device registry remove."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+    unique_id = f"{DEFAULT_CONFIG['mac']}_sensor_sensor_DHT11_Temperature"
+    await help_test_discovery_device_remove(
+        hass, mqtt_mock, sensor.DOMAIN, unique_id, config, sensor_config
+    )
+
+
+async def test_entity_id_update_subscriptions(hass, mqtt_mock, setup_tasmota):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+    topics = [
+        get_topic_tele_sensor(config),
+        get_topic_stat_status(config, 8),
+        get_topic_tele_will(config),
+    ]
+    await help_test_entity_id_update_subscriptions(
+        hass,
+        mqtt_mock,
+        sensor.DOMAIN,
+        config,
+        topics,
+        sensor_config,
+        "dht11_temperature",
+    )
+
+
+async def test_entity_id_update_discovery_update(hass, mqtt_mock, setup_tasmota):
+    """Test MQTT discovery update when entity_id is updated."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    sensor_config = copy.deepcopy(DEFAULT_SENSOR_CONFIG)
+    await help_test_entity_id_update_discovery_update(
+        hass, mqtt_mock, sensor.DOMAIN, config, sensor_config, "dht11_temperature"
+    )
diff --git a/tests/components/tasmota/test_switch.py b/tests/components/tasmota/test_switch.py
new file mode 100644
index 00000000000..208026c2de5
--- /dev/null
+++ b/tests/components/tasmota/test_switch.py
@@ -0,0 +1,246 @@
+"""The tests for the Tasmota switch platform."""
+import copy
+import json
+
+from hatasmota.utils import (
+    get_topic_stat_result,
+    get_topic_tele_state,
+    get_topic_tele_will,
+)
+
+from homeassistant.components import switch
+from homeassistant.components.tasmota.const import DEFAULT_PREFIX
+from homeassistant.const import ATTR_ASSUMED_STATE, STATE_OFF, STATE_ON
+
+from .test_common import (
+    DEFAULT_CONFIG,
+    help_test_availability,
+    help_test_availability_discovery_update,
+    help_test_availability_poll_state,
+    help_test_availability_when_connection_lost,
+    help_test_discovery_device_remove,
+    help_test_discovery_removal,
+    help_test_discovery_update_unchanged,
+    help_test_entity_id_update_discovery_update,
+    help_test_entity_id_update_subscriptions,
+)
+
+from tests.async_mock import patch
+from tests.common import async_fire_mqtt_message
+from tests.components.switch import common
+
+
+async def test_controlling_state_via_mqtt(hass, mqtt_mock, setup_tasmota):
+    """Test state update via MQTT."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("switch.test")
+    assert state.state == "unavailable"
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("switch.test")
+    assert state.state == STATE_OFF
+    assert not state.attributes.get(ATTR_ASSUMED_STATE)
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"ON"}')
+
+    state = hass.states.get("switch.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/STATE", '{"POWER":"OFF"}')
+
+    state = hass.states.get("switch.test")
+    assert state.state == STATE_OFF
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/RESULT", '{"POWER":"ON"}')
+
+    state = hass.states.get("switch.test")
+    assert state.state == STATE_ON
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/stat/RESULT", '{"POWER":"OFF"}')
+
+    state = hass.states.get("switch.test")
+    assert state.state == STATE_OFF
+
+
+async def test_sending_mqtt_commands(hass, mqtt_mock, setup_tasmota):
+    """Test the sending MQTT commands."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    async_fire_mqtt_message(hass, "tasmota_49A3BC/tele/LWT", "Online")
+    state = hass.states.get("switch.test")
+    assert state.state == STATE_OFF
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+    mqtt_mock.async_publish.reset_mock()
+
+    # Turn the switch on and verify MQTT message is sent
+    await common.async_turn_on(hass, "switch.test")
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Power1", "ON", 0, False
+    )
+    mqtt_mock.async_publish.reset_mock()
+
+    # Tasmota is not optimistic, the state should still be off
+    state = hass.states.get("switch.test")
+    assert state.state == STATE_OFF
+
+    # Turn the switch off and verify MQTT message is sent
+    await common.async_turn_off(hass, "switch.test")
+    mqtt_mock.async_publish.assert_called_once_with(
+        "tasmota_49A3BC/cmnd/Power1", "OFF", 0, False
+    )
+
+    state = hass.states.get("switch.test")
+    assert state.state == STATE_OFF
+
+
+async def test_relay_as_light(hass, mqtt_mock, setup_tasmota):
+    """Test relay does not show up as switch in light mode."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    config["so"]["30"] = 1  # Enforce Home Assistant auto-discovery as light
+    mac = config["mac"]
+
+    async_fire_mqtt_message(
+        hass,
+        f"{DEFAULT_PREFIX}/{mac}/config",
+        json.dumps(config),
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("switch.test")
+    assert state is None
+    state = hass.states.get("light.test")
+    assert state is not None
+
+
+async def test_availability_when_connection_lost(
+    hass, mqtt_client_mock, mqtt_mock, setup_tasmota
+):
+    """Test availability after MQTT disconnection."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    await help_test_availability_when_connection_lost(
+        hass, mqtt_client_mock, mqtt_mock, switch.DOMAIN, config
+    )
+
+
+async def test_availability(hass, mqtt_mock, setup_tasmota):
+    """Test availability."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    await help_test_availability(hass, mqtt_mock, switch.DOMAIN, config)
+
+
+async def test_availability_discovery_update(hass, mqtt_mock, setup_tasmota):
+    """Test availability discovery update."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    await help_test_availability_discovery_update(
+        hass, mqtt_mock, switch.DOMAIN, config
+    )
+
+
+async def test_availability_poll_state(
+    hass, mqtt_client_mock, mqtt_mock, setup_tasmota
+):
+    """Test polling after MQTT connection (re)established."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    poll_topic = "tasmota_49A3BC/cmnd/STATE"
+    await help_test_availability_poll_state(
+        hass, mqtt_client_mock, mqtt_mock, switch.DOMAIN, config, poll_topic, ""
+    )
+
+
+async def test_discovery_removal_switch(hass, mqtt_mock, caplog, setup_tasmota):
+    """Test removal of discovered switch."""
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["rl"][0] = 1
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["rl"][0] = 0
+
+    await help_test_discovery_removal(
+        hass, mqtt_mock, caplog, switch.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_removal_relay_as_light(hass, mqtt_mock, caplog, setup_tasmota):
+    """Test removal of discovered relay as light."""
+    config1 = copy.deepcopy(DEFAULT_CONFIG)
+    config1["rl"][0] = 1
+    config1["so"]["30"] = 0  # Disable Home Assistant auto-discovery as light
+    config2 = copy.deepcopy(DEFAULT_CONFIG)
+    config2["rl"][0] = 1
+    config2["so"]["30"] = 1  # Enforce Home Assistant auto-discovery as light
+
+    await help_test_discovery_removal(
+        hass, mqtt_mock, caplog, switch.DOMAIN, config1, config2
+    )
+
+
+async def test_discovery_update_unchanged_switch(
+    hass, mqtt_mock, caplog, setup_tasmota
+):
+    """Test update of discovered switch."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    with patch(
+        "homeassistant.components.tasmota.switch.TasmotaSwitch.discovery_update"
+    ) as discovery_update:
+        await help_test_discovery_update_unchanged(
+            hass, mqtt_mock, caplog, switch.DOMAIN, config, discovery_update
+        )
+
+
+async def test_discovery_device_remove(hass, mqtt_mock, setup_tasmota):
+    """Test device registry remove."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    unique_id = f"{DEFAULT_CONFIG['mac']}_switch_relay_0"
+    await help_test_discovery_device_remove(
+        hass, mqtt_mock, switch.DOMAIN, unique_id, config
+    )
+
+
+async def test_entity_id_update_subscriptions(hass, mqtt_mock, setup_tasmota):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    topics = [
+        get_topic_stat_result(config),
+        get_topic_tele_state(config),
+        get_topic_tele_will(config),
+    ]
+    await help_test_entity_id_update_subscriptions(
+        hass, mqtt_mock, switch.DOMAIN, config, topics
+    )
+
+
+async def test_entity_id_update_discovery_update(hass, mqtt_mock, setup_tasmota):
+    """Test MQTT discovery update when entity_id is updated."""
+    config = copy.deepcopy(DEFAULT_CONFIG)
+    config["rl"][0] = 1
+    await help_test_entity_id_update_discovery_update(
+        hass, mqtt_mock, switch.DOMAIN, config
+    )
diff --git a/tests/components/tellduslive/test_config_flow.py b/tests/components/tellduslive/test_config_flow.py
index a8f188fffc7..66476c8735d 100644
--- a/tests/components/tellduslive/test_config_flow.py
+++ b/tests/components/tellduslive/test_config_flow.py
@@ -201,7 +201,7 @@ async def test_wrong_auth_flow_implementation(hass, mock_tellduslive):
     result = await flow.async_step_auth("")
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "auth"
-    assert result["errors"]["base"] == "auth_error"
+    assert result["errors"]["base"] == "invalid_auth"
 
 
 async def test_not_pick_host_if_only_one(hass, mock_tellduslive):
diff --git a/tests/components/template/test_alarm_control_panel.py b/tests/components/template/test_alarm_control_panel.py
index d8d4b8fdcf2..abb2e7b4765 100644
--- a/tests/components/template/test_alarm_control_panel.py
+++ b/tests/components/template/test_alarm_control_panel.py
@@ -1,11 +1,10 @@
 """The tests for the Template alarm control panel platform."""
-import logging
-
 from homeassistant import setup
 from homeassistant.const import (
     STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_ARMED_HOME,
     STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMING,
     STATE_ALARM_DISARMED,
     STATE_ALARM_PENDING,
     STATE_ALARM_TRIGGERED,
@@ -14,8 +13,6 @@ from homeassistant.const import (
 from tests.common import async_mock_service
 from tests.components.alarm_control_panel import common
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def test_template_state_text(hass):
     """Test the state text of a template."""
@@ -76,6 +73,12 @@ async def test_template_state_text(hass):
     state = hass.states.get("alarm_control_panel.test_template_panel")
     assert state.state == STATE_ALARM_ARMED_NIGHT
 
+    hass.states.async_set("alarm_control_panel.test", STATE_ALARM_ARMING)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("alarm_control_panel.test_template_panel")
+    assert state.state == STATE_ALARM_ARMING
+
     hass.states.async_set("alarm_control_panel.test", STATE_ALARM_DISARMED)
     await hass.async_block_till_done()
 
diff --git a/tests/components/template/test_binary_sensor.py b/tests/components/template/test_binary_sensor.py
index f9db8be37c6..a6aa253e746 100644
--- a/tests/components/template/test_binary_sensor.py
+++ b/tests/components/template/test_binary_sensor.py
@@ -1,10 +1,9 @@
 """The tests for the Template Binary sensor platform."""
 from datetime import timedelta
 import logging
-import unittest
-from unittest import mock
 
 from homeassistant import setup
+from homeassistant.components import binary_sensor
 from homeassistant.const import (
     ATTR_DEVICE_CLASS,
     EVENT_HOMEASSISTANT_START,
@@ -15,207 +14,198 @@ from homeassistant.const import (
 from homeassistant.core import CoreState
 import homeassistant.util.dt as dt_util
 
-from tests.common import (
-    assert_setup_component,
-    async_fire_time_changed,
-    get_test_home_assistant,
-)
+from tests.async_mock import patch
+from tests.common import assert_setup_component, async_fire_time_changed
 
 
-class TestBinarySensorTemplate(unittest.TestCase):
-    """Test for Binary sensor template platform."""
-
-    hass = None
-    # pylint: disable=invalid-name
-
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_setup(self):
-        """Test the setup."""
-        config = {
-            "binary_sensor": {
-                "platform": "template",
-                "sensors": {
-                    "test": {
-                        "friendly_name": "virtual thingy",
-                        "value_template": "{{ foo }}",
-                        "device_class": "motion",
-                    }
-                },
-            }
+async def test_setup(hass):
+    """Test the setup."""
+    config = {
+        "binary_sensor": {
+            "platform": "template",
+            "sensors": {
+                "test": {
+                    "friendly_name": "virtual thingy",
+                    "value_template": "{{ foo }}",
+                    "device_class": "motion",
+                }
+            },
         }
-        with assert_setup_component(1):
-            assert setup.setup_component(self.hass, "binary_sensor", config)
+    }
+    with assert_setup_component(1):
+        assert await setup.async_setup_component(hass, binary_sensor.DOMAIN, config)
 
-    def test_setup_no_sensors(self):
-        """Test setup with no sensors."""
-        with assert_setup_component(0):
-            assert setup.setup_component(
-                self.hass, "binary_sensor", {"binary_sensor": {"platform": "template"}}
-            )
 
-    def test_setup_invalid_device(self):
-        """Test the setup with invalid devices."""
-        with assert_setup_component(0):
-            assert setup.setup_component(
-                self.hass,
-                "binary_sensor",
-                {"binary_sensor": {"platform": "template", "sensors": {"foo bar": {}}}},
-            )
+async def test_setup_no_sensors(hass):
+    """Test setup with no sensors."""
+    with assert_setup_component(0):
+        assert await setup.async_setup_component(
+            hass, binary_sensor.DOMAIN, {"binary_sensor": {"platform": "template"}}
+        )
 
-    def test_setup_invalid_device_class(self):
-        """Test setup with invalid sensor class."""
-        with assert_setup_component(0):
-            assert setup.setup_component(
-                self.hass,
-                "binary_sensor",
-                {
-                    "binary_sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test": {
-                                "value_template": "{{ foo }}",
-                                "device_class": "foobarnotreal",
-                            }
-                        },
-                    }
-                },
-            )
 
-    def test_setup_invalid_missing_template(self):
-        """Test setup with invalid and missing template."""
-        with assert_setup_component(0):
-            assert setup.setup_component(
-                self.hass,
-                "binary_sensor",
-                {
-                    "binary_sensor": {
-                        "platform": "template",
-                        "sensors": {"test": {"device_class": "motion"}},
-                    }
-                },
-            )
+async def test_setup_invalid_device(hass):
+    """Test the setup with invalid devices."""
+    with assert_setup_component(0):
+        assert await setup.async_setup_component(
+            hass,
+            binary_sensor.DOMAIN,
+            {"binary_sensor": {"platform": "template", "sensors": {"foo bar": {}}}},
+        )
 
-    def test_icon_template(self):
-        """Test icon template."""
-        with assert_setup_component(1):
-            assert setup.setup_component(
-                self.hass,
-                "binary_sensor",
-                {
-                    "binary_sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{{ states.sensor.xyz.state }}",
-                                "icon_template": "{% if "
-                                "states.binary_sensor.test_state.state == "
-                                "'Works' %}"
-                                "mdi:check"
-                                "{% endif %}",
-                            }
-                        },
-                    }
-                },
-            )
 
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
+async def test_setup_invalid_device_class(hass):
+    """Test setup with invalid sensor class."""
+    with assert_setup_component(0):
+        assert await setup.async_setup_component(
+            hass,
+            binary_sensor.DOMAIN,
+            {
+                "binary_sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test": {
+                            "value_template": "{{ foo }}",
+                            "device_class": "foobarnotreal",
+                        }
+                    },
+                }
+            },
+        )
 
-        state = self.hass.states.get("binary_sensor.test_template_sensor")
-        assert state.attributes.get("icon") == ""
 
-        self.hass.states.set("binary_sensor.test_state", "Works")
-        self.hass.block_till_done()
-        state = self.hass.states.get("binary_sensor.test_template_sensor")
-        assert state.attributes["icon"] == "mdi:check"
+async def test_setup_invalid_missing_template(hass):
+    """Test setup with invalid and missing template."""
+    with assert_setup_component(0):
+        assert await setup.async_setup_component(
+            hass,
+            binary_sensor.DOMAIN,
+            {
+                "binary_sensor": {
+                    "platform": "template",
+                    "sensors": {"test": {"device_class": "motion"}},
+                }
+            },
+        )
 
-    def test_entity_picture_template(self):
-        """Test entity_picture template."""
-        with assert_setup_component(1):
-            assert setup.setup_component(
-                self.hass,
-                "binary_sensor",
-                {
-                    "binary_sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{{ states.sensor.xyz.state }}",
-                                "entity_picture_template": "{% if "
-                                "states.binary_sensor.test_state.state == "
-                                "'Works' %}"
-                                "/local/sensor.png"
-                                "{% endif %}",
-                            }
-                        },
-                    }
-                },
-            )
 
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
+async def test_icon_template(hass):
+    """Test icon template."""
+    with assert_setup_component(1):
+        assert await setup.async_setup_component(
+            hass,
+            binary_sensor.DOMAIN,
+            {
+                "binary_sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "{{ states.sensor.xyz.state }}",
+                            "icon_template": "{% if "
+                            "states.binary_sensor.test_state.state == "
+                            "'Works' %}"
+                            "mdi:check"
+                            "{% endif %}",
+                        }
+                    },
+                }
+            },
+        )
 
-        state = self.hass.states.get("binary_sensor.test_template_sensor")
-        assert state.attributes.get("entity_picture") == ""
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
 
-        self.hass.states.set("binary_sensor.test_state", "Works")
-        self.hass.block_till_done()
-        state = self.hass.states.get("binary_sensor.test_template_sensor")
-        assert state.attributes["entity_picture"] == "/local/sensor.png"
+    state = hass.states.get("binary_sensor.test_template_sensor")
+    assert state.attributes.get("icon") == ""
 
-    def test_attribute_templates(self):
-        """Test attribute_templates template."""
-        with assert_setup_component(1):
-            assert setup.setup_component(
-                self.hass,
-                "binary_sensor",
-                {
-                    "binary_sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{{ states.sensor.xyz.state }}",
-                                "attribute_templates": {
-                                    "test_attribute": "It {{ states.sensor.test_state.state }}."
-                                },
-                            }
-                        },
-                    }
-                },
-            )
+    hass.states.async_set("binary_sensor.test_state", "Works")
+    await hass.async_block_till_done()
+    state = hass.states.get("binary_sensor.test_template_sensor")
+    assert state.attributes["icon"] == "mdi:check"
 
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test_template_sensor")
-        assert state.attributes.get("test_attribute") == "It ."
-        self.hass.states.set("sensor.test_state", "Works2")
-        self.hass.block_till_done()
-        self.hass.states.set("sensor.test_state", "Works")
-        self.hass.block_till_done()
-        state = self.hass.states.get("binary_sensor.test_template_sensor")
-        assert state.attributes["test_attribute"] == "It Works."
+async def test_entity_picture_template(hass):
+    """Test entity_picture template."""
+    with assert_setup_component(1):
+        assert await setup.async_setup_component(
+            hass,
+            binary_sensor.DOMAIN,
+            {
+                "binary_sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "{{ states.sensor.xyz.state }}",
+                            "entity_picture_template": "{% if "
+                            "states.binary_sensor.test_state.state == "
+                            "'Works' %}"
+                            "/local/sensor.png"
+                            "{% endif %}",
+                        }
+                    },
+                }
+            },
+        )
 
-    @mock.patch(
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.test_template_sensor")
+    assert state.attributes.get("entity_picture") == ""
+
+    hass.states.async_set("binary_sensor.test_state", "Works")
+    await hass.async_block_till_done()
+    state = hass.states.get("binary_sensor.test_template_sensor")
+    assert state.attributes["entity_picture"] == "/local/sensor.png"
+
+
+async def test_attribute_templates(hass):
+    """Test attribute_templates template."""
+    with assert_setup_component(1):
+        assert await setup.async_setup_component(
+            hass,
+            binary_sensor.DOMAIN,
+            {
+                "binary_sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "{{ states.sensor.xyz.state }}",
+                            "attribute_templates": {
+                                "test_attribute": "It {{ states.sensor.test_state.state }}."
+                            },
+                        }
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.test_template_sensor")
+    assert state.attributes.get("test_attribute") == "It ."
+    hass.states.async_set("sensor.test_state", "Works2")
+    await hass.async_block_till_done()
+    hass.states.async_set("sensor.test_state", "Works")
+    await hass.async_block_till_done()
+    state = hass.states.get("binary_sensor.test_template_sensor")
+    assert state.attributes["test_attribute"] == "It Works."
+
+
+async def test_match_all(hass):
+    """Test template that is rerendered on any state lifecycle."""
+    with patch(
         "homeassistant.components.template.binary_sensor."
         "BinarySensorTemplate._update_state"
-    )
-    def test_match_all(self, _update_state):
-        """Test template that is rerendered on any state lifecycle."""
+    ) as _update_state:
         with assert_setup_component(1):
-            assert setup.setup_component(
-                self.hass,
-                "binary_sensor",
+            assert await setup.async_setup_component(
+                hass,
+                binary_sensor.DOMAIN,
                 {
                     "binary_sensor": {
                         "platform": "template",
@@ -234,43 +224,44 @@ class TestBinarySensorTemplate(unittest.TestCase):
                 },
             )
 
-        self.hass.start()
-        self.hass.block_till_done()
-        init_calls = len(_update_state.mock_calls)
+            await hass.async_start()
+            await hass.async_block_till_done()
+            init_calls = len(_update_state.mock_calls)
 
-        self.hass.states.set("sensor.any_state", "update")
-        self.hass.block_till_done()
-        assert len(_update_state.mock_calls) == init_calls
+            hass.states.async_set("sensor.any_state", "update")
+            await hass.async_block_till_done()
+            assert len(_update_state.mock_calls) == init_calls
 
-    def test_event(self):
-        """Test the event."""
-        config = {
-            "binary_sensor": {
-                "platform": "template",
-                "sensors": {
-                    "test": {
-                        "friendly_name": "virtual thingy",
-                        "value_template": "{{ states.sensor.test_state.state == 'on' }}",
-                        "device_class": "motion",
-                    }
-                },
-            }
+
+async def test_event(hass):
+    """Test the event."""
+    config = {
+        "binary_sensor": {
+            "platform": "template",
+            "sensors": {
+                "test": {
+                    "friendly_name": "virtual thingy",
+                    "value_template": "{{ states.sensor.test_state.state == 'on' }}",
+                    "device_class": "motion",
+                }
+            },
         }
-        with assert_setup_component(1):
-            assert setup.setup_component(self.hass, "binary_sensor", config)
+    }
+    with assert_setup_component(1):
+        assert await setup.async_setup_component(hass, binary_sensor.DOMAIN, config)
 
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test")
-        assert state.state == "off"
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_state", "on")
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_state", "on")
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.test")
-        assert state.state == "on"
+    state = hass.states.get("binary_sensor.test")
+    assert state.state == "on"
 
 
 async def test_template_delay_on(hass):
@@ -288,7 +279,7 @@ async def test_template_delay_on(hass):
             },
         }
     }
-    await setup.async_setup_component(hass, "binary_sensor", config)
+    await setup.async_setup_component(hass, binary_sensor.DOMAIN, config)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -348,7 +339,7 @@ async def test_template_delay_off(hass):
         }
     }
     hass.states.async_set("sensor.test_state", "on")
-    await setup.async_setup_component(hass, "binary_sensor", config)
+    await setup.async_setup_component(hass, binary_sensor.DOMAIN, config)
     await hass.async_block_till_done()
     await hass.async_start()
 
@@ -407,7 +398,7 @@ async def test_available_without_availability_template(hass):
             },
         }
     }
-    await setup.async_setup_component(hass, "binary_sensor", config)
+    await setup.async_setup_component(hass, binary_sensor.DOMAIN, config)
     await hass.async_block_till_done()
     await hass.async_start()
     await hass.async_block_till_done()
@@ -434,7 +425,7 @@ async def test_availability_template(hass):
             },
         }
     }
-    await setup.async_setup_component(hass, "binary_sensor", config)
+    await setup.async_setup_component(hass, binary_sensor.DOMAIN, config)
     await hass.async_block_till_done()
     await hass.async_start()
     await hass.async_block_till_done()
@@ -459,7 +450,7 @@ async def test_invalid_attribute_template(hass, caplog):
 
     await setup.async_setup_component(
         hass,
-        "binary_sensor",
+        binary_sensor.DOMAIN,
         {
             "binary_sensor": {
                 "platform": "template",
@@ -488,7 +479,7 @@ async def test_invalid_availability_template_keeps_component_available(hass, cap
 
     await setup.async_setup_component(
         hass,
-        "binary_sensor",
+        binary_sensor.DOMAIN,
         {
             "binary_sensor": {
                 "platform": "template",
@@ -517,7 +508,7 @@ async def test_no_update_template_match_all(hass, caplog):
 
     await setup.async_setup_component(
         hass,
-        "binary_sensor",
+        binary_sensor.DOMAIN,
         {
             "binary_sensor": {
                 "platform": "template",
@@ -583,7 +574,7 @@ async def test_unique_id(hass):
     """Test unique_id option only creates one binary sensor per id."""
     await setup.async_setup_component(
         hass,
-        "binary_sensor",
+        binary_sensor.DOMAIN,
         {
             "binary_sensor": {
                 "platform": "template",
@@ -625,7 +616,7 @@ async def test_template_validation_error(hass, caplog):
             },
         },
     }
-    await setup.async_setup_component(hass, "binary_sensor", config)
+    await setup.async_setup_component(hass, binary_sensor.DOMAIN, config)
     await hass.async_block_till_done()
     await hass.async_start()
     await hass.async_block_till_done()
diff --git a/tests/components/template/test_cover.py b/tests/components/template/test_cover.py
index 7202d8a3a1b..08c789633fc 100644
--- a/tests/components/template/test_cover.py
+++ b/tests/components/template/test_cover.py
@@ -1,6 +1,4 @@
 """The tests the cover command line platform."""
-import logging
-
 import pytest
 
 from homeassistant import setup
@@ -25,8 +23,6 @@ from homeassistant.const import (
 
 from tests.common import assert_setup_component, async_mock_service
 
-_LOGGER = logging.getLogger(__name__)
-
 ENTITY_COVER = "cover.test_template_cover"
 
 
diff --git a/tests/components/template/test_fan.py b/tests/components/template/test_fan.py
index 10af5fd0b74..8e7c519def9 100644
--- a/tests/components/template/test_fan.py
+++ b/tests/components/template/test_fan.py
@@ -1,6 +1,4 @@
 """The tests for the Template fan platform."""
-import logging
-
 import pytest
 import voluptuous as vol
 
@@ -20,9 +18,6 @@ from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE
 from tests.common import assert_setup_component, async_mock_service
 from tests.components.fan import common
 
-_LOGGER = logging.getLogger(__name__)
-
-
 _TEST_FAN = "fan.test_fan"
 # Represent for fan's state
 _STATE_INPUT_BOOLEAN = "input_boolean.state"
@@ -662,7 +657,7 @@ def _verify(
     """Verify fan's state, speed and osc."""
     state = hass.states.get(_TEST_FAN)
     attributes = state.attributes
-    assert state.state == expected_state
+    assert state.state == str(expected_state)
     assert attributes.get(ATTR_SPEED) == expected_speed
     assert attributes.get(ATTR_OSCILLATING) == expected_oscillating
     assert attributes.get(ATTR_DIRECTION) == expected_direction
diff --git a/tests/components/template/test_init.py b/tests/components/template/test_init.py
index 2d14ec97574..1c932c5af30 100644
--- a/tests/components/template/test_init.py
+++ b/tests/components/template/test_init.py
@@ -1,10 +1,14 @@
 """The test for the Template sensor platform."""
+from datetime import timedelta
 from os import path
 from unittest.mock import patch
 
 from homeassistant import config
 from homeassistant.components.template import DOMAIN, SERVICE_RELOAD
 from homeassistant.setup import async_setup_component
+from homeassistant.util import dt as dt_util
+
+from tests.common import async_fire_time_changed
 
 
 async def test_reloadable(hass):
@@ -253,5 +257,50 @@ async def test_reloadable_multiple_platforms(hass):
     assert float(hass.states.get("sensor.combined_sensor_energy_usage").state) == 0
 
 
+async def test_reload_sensors_that_reference_other_template_sensors(hass):
+    """Test that we can reload sensor that reference other template sensors."""
+
+    await async_setup_component(
+        hass,
+        "sensor",
+        {
+            "sensor": {
+                "platform": DOMAIN,
+                "sensors": {
+                    "state": {"value_template": "{{ 1 }}"},
+                },
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    yaml_path = path.join(
+        _get_fixtures_base_path(),
+        "fixtures",
+        "template/ref_configuration.yaml",
+    )
+    with patch.object(config, "YAML_CONFIG_FILE", yaml_path):
+        await hass.services.async_call(
+            DOMAIN,
+            SERVICE_RELOAD,
+            {},
+            blocking=True,
+        )
+        await hass.async_block_till_done()
+
+    assert len(hass.states.async_all()) == 3
+    await hass.async_block_till_done()
+
+    next_time = dt_util.utcnow() + timedelta(seconds=1.2)
+    with patch(
+        "homeassistant.helpers.ratelimit.dt_util.utcnow", return_value=next_time
+    ):
+        async_fire_time_changed(hass, next_time)
+        await hass.async_block_till_done()
+
+    assert hass.states.get("sensor.test1").state == "3"
+    assert hass.states.get("sensor.test2").state == "1"
+    assert hass.states.get("sensor.test3").state == "2"
+
+
 def _get_fixtures_base_path():
     return path.dirname(path.dirname(path.dirname(__file__)))
diff --git a/tests/components/template/test_light.py b/tests/components/template/test_light.py
index 5353aaa7d17..1b99e1cec0a 100644
--- a/tests/components/template/test_light.py
+++ b/tests/components/template/test_light.py
@@ -550,7 +550,7 @@ class TestTemplateLight:
         )
         self.hass.block_till_done()
         assert len(self.calls) == 1
-        assert self.calls[0].data["white_value"] == "124"
+        assert self.calls[0].data["white_value"] == 124
 
         state = self.hass.states.get("light.test_template_light")
         assert state is not None
@@ -649,7 +649,7 @@ class TestTemplateLight:
         common.turn_on(self.hass, "light.test_template_light", **{ATTR_BRIGHTNESS: 124})
         self.hass.block_till_done()
         assert len(self.calls) == 1
-        assert self.calls[0].data["brightness"] == "124"
+        assert self.calls[0].data["brightness"] == 124
 
         state = self.hass.states.get("light.test_template_light")
         _LOGGER.info(str(state.attributes))
@@ -802,7 +802,7 @@ class TestTemplateLight:
         common.turn_on(self.hass, "light.test_template_light", **{ATTR_COLOR_TEMP: 345})
         self.hass.block_till_done()
         assert len(self.calls) == 1
-        assert self.calls[0].data["color_temp"] == "345"
+        assert self.calls[0].data["color_temp"] == 345
 
         state = self.hass.states.get("light.test_template_light")
         _LOGGER.info(str(state.attributes))
@@ -1008,18 +1008,18 @@ class TestTemplateLight:
         )
         self.hass.block_till_done()
         assert len(self.calls) == 2
-        assert self.calls[0].data["h"] == "40"
-        assert self.calls[0].data["s"] == "50"
-        assert self.calls[1].data["h"] == "40"
-        assert self.calls[1].data["s"] == "50"
+        assert self.calls[0].data["h"] == 40
+        assert self.calls[0].data["s"] == 50
+        assert self.calls[1].data["h"] == 40
+        assert self.calls[1].data["s"] == 50
 
         state = self.hass.states.get("light.test_template_light")
         _LOGGER.info(str(state.attributes))
         assert state is not None
-        assert self.calls[0].data["h"] == "40"
-        assert self.calls[0].data["s"] == "50"
-        assert self.calls[1].data["h"] == "40"
-        assert self.calls[1].data["s"] == "50"
+        assert self.calls[0].data["h"] == 40
+        assert self.calls[0].data["s"] == 50
+        assert self.calls[1].data["h"] == 40
+        assert self.calls[1].data["s"] == 50
 
     @pytest.mark.parametrize(
         "expected_hs,template",
diff --git a/tests/components/template/test_lock.py b/tests/components/template/test_lock.py
index db1be64c379..a00ca3b7e91 100644
--- a/tests/components/template/test_lock.py
+++ b/tests/components/template/test_lock.py
@@ -1,280 +1,34 @@
 """The tests for the Template lock platform."""
-import logging
+import pytest
 
 from homeassistant import setup
 from homeassistant.components import lock
 from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON, STATE_UNAVAILABLE
-from homeassistant.core import callback
 
-from tests.common import assert_setup_component, get_test_home_assistant
-
-_LOGGER = logging.getLogger(__name__)
+from tests.common import assert_setup_component, async_mock_service
 
 
-class TestTemplateLock:
-    """Test the Template lock."""
+@pytest.fixture
+def calls(hass):
+    """Track calls to a mock service."""
+    return async_mock_service(hass, "test", "automation")
 
-    hass = None
-    calls = None
-    # pylint: disable=invalid-name
 
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.calls = []
-
-        @callback
-        def record_call(service):
-            """Track function calls."""
-            self.calls.append(service)
-
-        self.hass.services.register("test", "automation", record_call)
-
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_template_state(self):
-        """Test template."""
-        with assert_setup_component(1, "lock"):
-            assert setup.setup_component(
-                self.hass,
-                "lock",
-                {
-                    "lock": {
-                        "platform": "template",
-                        "name": "Test template lock",
-                        "value_template": "{{ states.switch.test_state.state }}",
-                        "lock": {
-                            "service": "switch.turn_on",
-                            "entity_id": "switch.test_state",
-                        },
-                        "unlock": {
-                            "service": "switch.turn_off",
-                            "entity_id": "switch.test_state",
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        self.hass.states.set("switch.test_state", STATE_ON)
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("lock.test_template_lock")
-        assert state.state == lock.STATE_LOCKED
-
-        self.hass.states.set("switch.test_state", STATE_OFF)
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("lock.test_template_lock")
-        assert state.state == lock.STATE_UNLOCKED
-
-    def test_template_state_boolean_on(self):
-        """Test the setting of the state with boolean on."""
-        with assert_setup_component(1, "lock"):
-            assert setup.setup_component(
-                self.hass,
-                "lock",
-                {
-                    "lock": {
-                        "platform": "template",
-                        "value_template": "{{ 1 == 1 }}",
-                        "lock": {
-                            "service": "switch.turn_on",
-                            "entity_id": "switch.test_state",
-                        },
-                        "unlock": {
-                            "service": "switch.turn_off",
-                            "entity_id": "switch.test_state",
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("lock.template_lock")
-        assert state.state == lock.STATE_LOCKED
-
-    def test_template_state_boolean_off(self):
-        """Test the setting of the state with off."""
-        with assert_setup_component(1, "lock"):
-            assert setup.setup_component(
-                self.hass,
-                "lock",
-                {
-                    "lock": {
-                        "platform": "template",
-                        "value_template": "{{ 1 == 2 }}",
-                        "lock": {
-                            "service": "switch.turn_on",
-                            "entity_id": "switch.test_state",
-                        },
-                        "unlock": {
-                            "service": "switch.turn_off",
-                            "entity_id": "switch.test_state",
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("lock.template_lock")
-        assert state.state == lock.STATE_UNLOCKED
-
-    def test_template_syntax_error(self):
-        """Test templating syntax error."""
-        with assert_setup_component(0, "lock"):
-            assert setup.setup_component(
-                self.hass,
-                "lock",
-                {
-                    "lock": {
-                        "platform": "template",
-                        "value_template": "{% if rubbish %}",
-                        "lock": {
-                            "service": "switch.turn_on",
-                            "entity_id": "switch.test_state",
-                        },
-                        "unlock": {
-                            "service": "switch.turn_off",
-                            "entity_id": "switch.test_state",
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        assert self.hass.states.all() == []
-
-    def test_invalid_name_does_not_create(self):
-        """Test invalid name."""
-        with assert_setup_component(0, "lock"):
-            assert setup.setup_component(
-                self.hass,
-                "lock",
-                {
-                    "switch": {
-                        "platform": "lock",
-                        "name": "{{%}",
-                        "value_template": "{{ rubbish }",
-                        "lock": {
-                            "service": "switch.turn_on",
-                            "entity_id": "switch.test_state",
-                        },
-                        "unlock": {
-                            "service": "switch.turn_off",
-                            "entity_id": "switch.test_state",
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        assert self.hass.states.all() == []
-
-    def test_invalid_lock_does_not_create(self):
-        """Test invalid lock."""
-        with assert_setup_component(0, "lock"):
-            assert setup.setup_component(
-                self.hass,
-                "lock",
-                {"lock": {"platform": "template", "value_template": "Invalid"}},
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        assert self.hass.states.all() == []
-
-    def test_missing_template_does_not_create(self):
-        """Test missing template."""
-        with assert_setup_component(0, "lock"):
-            assert setup.setup_component(
-                self.hass,
-                "lock",
-                {
-                    "lock": {
-                        "platform": "template",
-                        "not_value_template": "{{ states.switch.test_state.state }}",
-                        "lock": {
-                            "service": "switch.turn_on",
-                            "entity_id": "switch.test_state",
-                        },
-                        "unlock": {
-                            "service": "switch.turn_off",
-                            "entity_id": "switch.test_state",
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        assert self.hass.states.all() == []
-
-    def test_template_static(self, caplog):
-        """Test that we allow static templates."""
-        with assert_setup_component(1, "lock"):
-            assert setup.setup_component(
-                self.hass,
-                "lock",
-                {
-                    "lock": {
-                        "platform": "template",
-                        "value_template": "{{ 1 + 1 }}",
-                        "lock": {
-                            "service": "switch.turn_on",
-                            "entity_id": "switch.test_state",
-                        },
-                        "unlock": {
-                            "service": "switch.turn_off",
-                            "entity_id": "switch.test_state",
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("lock.template_lock")
-        assert state.state == lock.STATE_UNLOCKED
-
-        self.hass.states.set("lock.template_lock", lock.STATE_LOCKED)
-        self.hass.block_till_done()
-        state = self.hass.states.get("lock.template_lock")
-        assert state.state == lock.STATE_LOCKED
-
-    def test_lock_action(self):
-        """Test lock action."""
-        assert setup.setup_component(
-            self.hass,
-            "lock",
+async def test_template_state(hass):
+    """Test template."""
+    with assert_setup_component(1, lock.DOMAIN):
+        assert await setup.async_setup_component(
+            hass,
+            lock.DOMAIN,
             {
                 "lock": {
                     "platform": "template",
+                    "name": "Test template lock",
                     "value_template": "{{ states.switch.test_state.state }}",
-                    "lock": {"service": "test.automation"},
+                    "lock": {
+                        "service": "switch.turn_on",
+                        "entity_id": "switch.test_state",
+                    },
                     "unlock": {
                         "service": "switch.turn_off",
                         "entity_id": "switch.test_state",
@@ -283,57 +37,292 @@ class TestTemplateLock:
             },
         )
 
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
 
-        self.hass.states.set("switch.test_state", STATE_OFF)
-        self.hass.block_till_done()
+    hass.states.async_set("switch.test_state", STATE_ON)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("lock.template_lock")
-        assert state.state == lock.STATE_UNLOCKED
+    state = hass.states.get("lock.test_template_lock")
+    assert state.state == lock.STATE_LOCKED
 
-        self.hass.services.call(
-            lock.DOMAIN, lock.SERVICE_LOCK, {ATTR_ENTITY_ID: "lock.template_lock"}
-        )
-        self.hass.block_till_done()
+    hass.states.async_set("switch.test_state", STATE_OFF)
+    await hass.async_block_till_done()
 
-        assert len(self.calls) == 1
+    state = hass.states.get("lock.test_template_lock")
+    assert state.state == lock.STATE_UNLOCKED
 
-    def test_unlock_action(self):
-        """Test unlock action."""
-        assert setup.setup_component(
-            self.hass,
-            "lock",
+
+async def test_template_state_boolean_on(hass):
+    """Test the setting of the state with boolean on."""
+    with assert_setup_component(1, lock.DOMAIN):
+        assert await setup.async_setup_component(
+            hass,
+            lock.DOMAIN,
             {
                 "lock": {
                     "platform": "template",
-                    "value_template": "{{ states.switch.test_state.state }}",
+                    "value_template": "{{ 1 == 1 }}",
                     "lock": {
                         "service": "switch.turn_on",
                         "entity_id": "switch.test_state",
                     },
-                    "unlock": {"service": "test.automation"},
+                    "unlock": {
+                        "service": "switch.turn_off",
+                        "entity_id": "switch.test_state",
+                    },
                 }
             },
         )
 
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
 
-        self.hass.states.set("switch.test_state", STATE_ON)
-        self.hass.block_till_done()
+    state = hass.states.get("lock.template_lock")
+    assert state.state == lock.STATE_LOCKED
 
-        state = self.hass.states.get("lock.template_lock")
-        assert state.state == lock.STATE_LOCKED
 
-        self.hass.services.call(
-            lock.DOMAIN, lock.SERVICE_UNLOCK, {ATTR_ENTITY_ID: "lock.template_lock"}
+async def test_template_state_boolean_off(hass):
+    """Test the setting of the state with off."""
+    with assert_setup_component(1, lock.DOMAIN):
+        assert await setup.async_setup_component(
+            hass,
+            lock.DOMAIN,
+            {
+                "lock": {
+                    "platform": "template",
+                    "value_template": "{{ 1 == 2 }}",
+                    "lock": {
+                        "service": "switch.turn_on",
+                        "entity_id": "switch.test_state",
+                    },
+                    "unlock": {
+                        "service": "switch.turn_off",
+                        "entity_id": "switch.test_state",
+                    },
+                }
+            },
         )
-        self.hass.block_till_done()
 
-        assert len(self.calls) == 1
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("lock.template_lock")
+    assert state.state == lock.STATE_UNLOCKED
+
+
+async def test_template_syntax_error(hass):
+    """Test templating syntax error."""
+    with assert_setup_component(0, lock.DOMAIN):
+        assert await setup.async_setup_component(
+            hass,
+            lock.DOMAIN,
+            {
+                "lock": {
+                    "platform": "template",
+                    "value_template": "{% if rubbish %}",
+                    "lock": {
+                        "service": "switch.turn_on",
+                        "entity_id": "switch.test_state",
+                    },
+                    "unlock": {
+                        "service": "switch.turn_off",
+                        "entity_id": "switch.test_state",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert hass.states.async_all() == []
+
+
+async def test_invalid_name_does_not_create(hass):
+    """Test invalid name."""
+    with assert_setup_component(0, lock.DOMAIN):
+        assert await setup.async_setup_component(
+            hass,
+            lock.DOMAIN,
+            {
+                "switch": {
+                    "platform": "lock",
+                    "name": "{{%}",
+                    "value_template": "{{ rubbish }",
+                    "lock": {
+                        "service": "switch.turn_on",
+                        "entity_id": "switch.test_state",
+                    },
+                    "unlock": {
+                        "service": "switch.turn_off",
+                        "entity_id": "switch.test_state",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert hass.states.async_all() == []
+
+
+async def test_invalid_lock_does_not_create(hass):
+    """Test invalid lock."""
+    with assert_setup_component(0, lock.DOMAIN):
+        assert await setup.async_setup_component(
+            hass,
+            lock.DOMAIN,
+            {"lock": {"platform": "template", "value_template": "Invalid"}},
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert hass.states.async_all() == []
+
+
+async def test_missing_template_does_not_create(hass):
+    """Test missing template."""
+    with assert_setup_component(0, lock.DOMAIN):
+        assert await setup.async_setup_component(
+            hass,
+            lock.DOMAIN,
+            {
+                "lock": {
+                    "platform": "template",
+                    "not_value_template": "{{ states.switch.test_state.state }}",
+                    "lock": {
+                        "service": "switch.turn_on",
+                        "entity_id": "switch.test_state",
+                    },
+                    "unlock": {
+                        "service": "switch.turn_off",
+                        "entity_id": "switch.test_state",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert hass.states.async_all() == []
+
+
+async def test_template_static(hass, caplog):
+    """Test that we allow static templates."""
+    with assert_setup_component(1, lock.DOMAIN):
+        assert await setup.async_setup_component(
+            hass,
+            lock.DOMAIN,
+            {
+                "lock": {
+                    "platform": "template",
+                    "value_template": "{{ 1 + 1 }}",
+                    "lock": {
+                        "service": "switch.turn_on",
+                        "entity_id": "switch.test_state",
+                    },
+                    "unlock": {
+                        "service": "switch.turn_off",
+                        "entity_id": "switch.test_state",
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("lock.template_lock")
+    assert state.state == lock.STATE_UNLOCKED
+
+    hass.states.async_set("lock.template_lock", lock.STATE_LOCKED)
+    await hass.async_block_till_done()
+    state = hass.states.get("lock.template_lock")
+    assert state.state == lock.STATE_LOCKED
+
+
+async def test_lock_action(hass, calls):
+    """Test lock action."""
+    assert await setup.async_setup_component(
+        hass,
+        lock.DOMAIN,
+        {
+            "lock": {
+                "platform": "template",
+                "value_template": "{{ states.switch.test_state.state }}",
+                "lock": {"service": "test.automation"},
+                "unlock": {
+                    "service": "switch.turn_off",
+                    "entity_id": "switch.test_state",
+                },
+            }
+        },
+    )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    hass.states.async_set("switch.test_state", STATE_OFF)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("lock.template_lock")
+    assert state.state == lock.STATE_UNLOCKED
+
+    await hass.services.async_call(
+        lock.DOMAIN, lock.SERVICE_LOCK, {ATTR_ENTITY_ID: "lock.template_lock"}
+    )
+    await hass.async_block_till_done()
+
+    assert len(calls) == 1
+
+
+async def test_unlock_action(hass, calls):
+    """Test unlock action."""
+    assert await setup.async_setup_component(
+        hass,
+        lock.DOMAIN,
+        {
+            "lock": {
+                "platform": "template",
+                "value_template": "{{ states.switch.test_state.state }}",
+                "lock": {
+                    "service": "switch.turn_on",
+                    "entity_id": "switch.test_state",
+                },
+                "unlock": {"service": "test.automation"},
+            }
+        },
+    )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    hass.states.async_set("switch.test_state", STATE_ON)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("lock.template_lock")
+    assert state.state == lock.STATE_LOCKED
+
+    await hass.services.async_call(
+        lock.DOMAIN, lock.SERVICE_UNLOCK, {ATTR_ENTITY_ID: "lock.template_lock"}
+    )
+    await hass.async_block_till_done()
+
+    assert len(calls) == 1
 
 
 async def test_available_template_with_entities(hass):
@@ -341,7 +330,7 @@ async def test_available_template_with_entities(hass):
 
     await setup.async_setup_component(
         hass,
-        "lock",
+        lock.DOMAIN,
         {
             "lock": {
                 "platform": "template",
@@ -379,7 +368,7 @@ async def test_invalid_availability_template_keeps_component_available(hass, cap
     """Test that an invalid availability keeps the device available."""
     await setup.async_setup_component(
         hass,
-        "lock",
+        lock.DOMAIN,
         {
             "lock": {
                 "platform": "template",
@@ -406,7 +395,7 @@ async def test_unique_id(hass):
     """Test unique_id option only creates one lock per id."""
     await setup.async_setup_component(
         hass,
-        "lock",
+        lock.DOMAIN,
         {
             "lock": {
                 "platform": "template",
@@ -424,7 +413,7 @@ async def test_unique_id(hass):
 
     await setup.async_setup_component(
         hass,
-        "lock",
+        lock.DOMAIN,
         {
             "lock": {
                 "platform": "template",
diff --git a/tests/components/template/test_sensor.py b/tests/components/template/test_sensor.py
index 8f582f01ef5..681794e910f 100644
--- a/tests/components/template/test_sensor.py
+++ b/tests/components/template/test_sensor.py
@@ -1,9 +1,9 @@
 """The test for the Template sensor platform."""
 from asyncio import Event
 from datetime import timedelta
-from unittest.mock import patch
 
 from homeassistant.bootstrap import async_from_config_dict
+from homeassistant.components import sensor
 from homeassistant.const import (
     ATTR_ENTITY_PICTURE,
     ATTR_ICON,
@@ -15,443 +15,393 @@ from homeassistant.const import (
 )
 from homeassistant.core import CoreState, callback
 from homeassistant.helpers.template import Template
-from homeassistant.setup import ATTR_COMPONENT, async_setup_component, setup_component
+from homeassistant.setup import ATTR_COMPONENT, async_setup_component
 import homeassistant.util.dt as dt_util
 
-from tests.common import (
-    assert_setup_component,
-    async_fire_time_changed,
-    get_test_home_assistant,
-)
+from tests.async_mock import patch
+from tests.common import assert_setup_component, async_fire_time_changed
 
 
-class TestTemplateSensor:
-    """Test the Template sensor."""
-
-    hass = None
-    # pylint: disable=invalid-name
-
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_template(self):
-        """Test template."""
-        with assert_setup_component(1):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "It {{ states.sensor.test_state.state }}."
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.state == "It ."
-
-        self.hass.states.set("sensor.test_state", "Works")
-        self.hass.block_till_done()
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.state == "It Works."
-
-    def test_icon_template(self):
-        """Test icon template."""
-        with assert_setup_component(1):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{{ states.sensor.test_state.state }}",
-                                "icon_template": "{% if states.sensor.test_state.state == "
-                                "'Works' %}"
-                                "mdi:check"
-                                "{% endif %}",
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes.get("icon") == ""
-
-        self.hass.states.set("sensor.test_state", "Works")
-        self.hass.block_till_done()
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes["icon"] == "mdi:check"
-
-    def test_entity_picture_template(self):
-        """Test entity_picture template."""
-        with assert_setup_component(1):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{{ states.sensor.test_state.state }}",
-                                "entity_picture_template": "{% if states.sensor.test_state.state == "
-                                "'Works' %}"
-                                "/local/sensor.png"
-                                "{% endif %}",
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes.get("entity_picture") == ""
-
-        self.hass.states.set("sensor.test_state", "Works")
-        self.hass.block_till_done()
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes["entity_picture"] == "/local/sensor.png"
-
-    def test_friendly_name_template(self):
-        """Test friendly_name template."""
-        with assert_setup_component(1):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{{ states.sensor.test_state.state }}",
-                                "friendly_name_template": "It {{ states.sensor.test_state.state }}.",
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes.get("friendly_name") == "It ."
-
-        self.hass.states.set("sensor.test_state", "Works")
-        self.hass.block_till_done()
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes["friendly_name"] == "It Works."
-
-    def test_friendly_name_template_with_unknown_state(self):
-        """Test friendly_name template with an unknown value_template."""
-        with assert_setup_component(1):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{{ states.fourohfour.state }}",
-                                "friendly_name_template": "It {{ states.sensor.test_state.state }}.",
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes["friendly_name"] == "It ."
-
-        self.hass.states.set("sensor.test_state", "Works")
-        self.hass.block_till_done()
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes["friendly_name"] == "It Works."
-
-    def test_attribute_templates(self):
-        """Test attribute_templates template."""
-        with assert_setup_component(1):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{{ states.sensor.test_state.state }}",
-                                "attribute_templates": {
-                                    "test_attribute": "It {{ states.sensor.test_state.state }}."
-                                },
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes.get("test_attribute") == "It ."
-
-        self.hass.states.set("sensor.test_state", "Works")
-        self.hass.block_till_done()
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.attributes["test_attribute"] == "It Works."
-
-    def test_template_syntax_error(self):
-        """Test templating syntax error."""
-        with assert_setup_component(0):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{% if rubbish %}"
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-        assert self.hass.states.all() == []
-
-    def test_template_attribute_missing(self):
-        """Test missing attribute template."""
-        with assert_setup_component(1):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "It {{ states.sensor.test_state"
-                                ".attributes.missing }}."
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("sensor.test_template_sensor")
-        assert state.state == STATE_UNAVAILABLE
-
-    def test_invalid_name_does_not_create(self):
-        """Test invalid name."""
-        with assert_setup_component(0):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test INVALID sensor": {
-                                "value_template": "{{ states.sensor.test_state.state }}"
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        assert self.hass.states.all() == []
-
-    def test_invalid_sensor_does_not_create(self):
-        """Test invalid sensor."""
-        with assert_setup_component(0):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {"test_template_sensor": "invalid"},
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-
-        assert self.hass.states.all() == []
-
-    def test_no_sensors_does_not_create(self):
-        """Test no sensors."""
-        with assert_setup_component(0):
-            assert setup_component(
-                self.hass, "sensor", {"sensor": {"platform": "template"}}
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        assert self.hass.states.all() == []
-
-    def test_missing_template_does_not_create(self):
-        """Test missing template."""
-        with assert_setup_component(0):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "not_value_template": "{{ states.sensor.test_state.state }}"
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        assert self.hass.states.all() == []
-
-    def test_setup_invalid_device_class(self):
-        """Test setup with invalid device_class."""
-        with assert_setup_component(0):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test": {
-                                "value_template": "{{ states.sensor.test_sensor.state }}",
-                                "device_class": "foobarnotreal",
-                            }
-                        },
-                    }
-                },
-            )
-
-    def test_setup_valid_device_class(self):
-        """Test setup with valid device_class."""
-        with assert_setup_component(1):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test1": {
-                                "value_template": "{{ states.sensor.test_sensor.state }}",
-                                "device_class": "temperature",
-                            },
-                            "test2": {
-                                "value_template": "{{ states.sensor.test_sensor.state }}"
-                            },
-                        },
-                    }
-                },
-            )
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("sensor.test1")
-        assert state.attributes["device_class"] == "temperature"
-        state = self.hass.states.get("sensor.test2")
-        assert "device_class" not in state.attributes
-
-    def test_available_template_with_entities(self):
-        """Test availability tempalates with values from other entities."""
-
-        with assert_setup_component(1):
-            assert setup_component(
-                self.hass,
-                "sensor",
-                {
-                    "sensor": {
-                        "platform": "template",
-                        "sensors": {
-                            "test_template_sensor": {
-                                "value_template": "{{ states.sensor.test_state.state }}",
-                                "availability_template": "{{ is_state('availability_boolean.state', 'on') }}",
-                            }
-                        },
-                    }
-                },
-            )
-
-        self.hass.block_till_done()
-        self.hass.start()
-        self.hass.block_till_done()
-
-        # When template returns true..
-        self.hass.states.set("availability_boolean.state", STATE_ON)
-        self.hass.block_till_done()
-
-        # Device State should not be unavailable
-        assert (
-            self.hass.states.get("sensor.test_template_sensor").state
-            != STATE_UNAVAILABLE
+async def test_template(hass):
+    """Test template."""
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "It {{ states.sensor.test_state.state }}."
+                        }
+                    },
+                }
+            },
         )
 
-        # When Availability template returns false
-        self.hass.states.set("availability_boolean.state", STATE_OFF)
-        self.hass.block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
 
-        # device state should be unavailable
-        assert (
-            self.hass.states.get("sensor.test_template_sensor").state
-            == STATE_UNAVAILABLE
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.state == "It ."
+
+    hass.states.async_set("sensor.test_state", "Works")
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.state == "It Works."
+
+
+async def test_icon_template(hass):
+    """Test icon template."""
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "{{ states.sensor.test_state.state }}",
+                            "icon_template": "{% if states.sensor.test_state.state == "
+                            "'Works' %}"
+                            "mdi:check"
+                            "{% endif %}",
+                        }
+                    },
+                }
+            },
         )
 
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes.get("icon") == ""
+
+    hass.states.async_set("sensor.test_state", "Works")
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes["icon"] == "mdi:check"
+
+
+async def test_entity_picture_template(hass):
+    """Test entity_picture template."""
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "{{ states.sensor.test_state.state }}",
+                            "entity_picture_template": "{% if states.sensor.test_state.state == "
+                            "'Works' %}"
+                            "/local/sensor.png"
+                            "{% endif %}",
+                        }
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes.get("entity_picture") == ""
+
+    hass.states.async_set("sensor.test_state", "Works")
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes["entity_picture"] == "/local/sensor.png"
+
+
+async def test_friendly_name_template(hass):
+    """Test friendly_name template."""
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "{{ states.sensor.test_state.state }}",
+                            "friendly_name_template": "It {{ states.sensor.test_state.state }}.",
+                        }
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes.get("friendly_name") == "It ."
+
+    hass.states.async_set("sensor.test_state", "Works")
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes["friendly_name"] == "It Works."
+
+
+async def test_friendly_name_template_with_unknown_state(hass):
+    """Test friendly_name template with an unknown value_template."""
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "{{ states.fourohfour.state }}",
+                            "friendly_name_template": "It {{ states.sensor.test_state.state }}.",
+                        }
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes["friendly_name"] == "It ."
+
+    hass.states.async_set("sensor.test_state", "Works")
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes["friendly_name"] == "It Works."
+
+
+async def test_attribute_templates(hass):
+    """Test attribute_templates template."""
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "{{ states.sensor.test_state.state }}",
+                            "attribute_templates": {
+                                "test_attribute": "It {{ states.sensor.test_state.state }}."
+                            },
+                        }
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes.get("test_attribute") == "It ."
+
+    hass.states.async_set("sensor.test_state", "Works")
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.attributes["test_attribute"] == "It Works."
+
+
+async def test_template_syntax_error(hass):
+    """Test templating syntax error."""
+    with assert_setup_component(0, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {"value_template": "{% if rubbish %}"}
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+    assert hass.states.async_all() == []
+
+
+async def test_template_attribute_missing(hass):
+    """Test missing attribute template."""
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "value_template": "It {{ states.sensor.test_state"
+                            ".attributes.missing }}."
+                        }
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.test_template_sensor")
+    assert state.state == STATE_UNAVAILABLE
+
+
+async def test_invalid_name_does_not_create(hass):
+    """Test invalid name."""
+    with assert_setup_component(0, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test INVALID sensor": {
+                            "value_template": "{{ states.sensor.test_state.state }}"
+                        }
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert hass.states.async_all() == []
+
+
+async def test_invalid_sensor_does_not_create(hass):
+    """Test invalid sensor."""
+    with assert_setup_component(0, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {"test_template_sensor": "invalid"},
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+
+    assert hass.states.async_all() == []
+
+
+async def test_no_sensors_does_not_create(hass):
+    """Test no sensors."""
+    with assert_setup_component(0, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass, sensor.DOMAIN, {"sensor": {"platform": "template"}}
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert hass.states.async_all() == []
+
+
+async def test_missing_template_does_not_create(hass):
+    """Test missing template."""
+    with assert_setup_component(0, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test_template_sensor": {
+                            "not_value_template": "{{ states.sensor.test_state.state }}"
+                        }
+                    },
+                }
+            },
+        )
+
+    await hass.async_block_till_done()
+    await hass.async_start()
+    await hass.async_block_till_done()
+
+    assert hass.states.async_all() == []
+
+
+async def test_setup_invalid_device_class(hass):
+    """Test setup with invalid device_class."""
+    with assert_setup_component(0, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test": {
+                            "value_template": "{{ states.sensor.test_sensor.state }}",
+                            "device_class": "foobarnotreal",
+                        }
+                    },
+                }
+            },
+        )
+
+
+async def test_setup_valid_device_class(hass):
+    """Test setup with valid device_class."""
+    with assert_setup_component(1, sensor.DOMAIN):
+        assert await async_setup_component(
+            hass,
+            sensor.DOMAIN,
+            {
+                "sensor": {
+                    "platform": "template",
+                    "sensors": {
+                        "test1": {
+                            "value_template": "{{ states.sensor.test_sensor.state }}",
+                            "device_class": "temperature",
+                        },
+                        "test2": {
+                            "value_template": "{{ states.sensor.test_sensor.state }}"
+                        },
+                    },
+                }
+            },
+        )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.test1")
+    assert state.attributes["device_class"] == "temperature"
+    state = hass.states.get("sensor.test2")
+    assert "device_class" not in state.attributes
+
 
 async def test_creating_sensor_loads_group(hass):
     """Test setting up template sensor loads group component first."""
@@ -496,10 +446,10 @@ async def test_creating_sensor_loads_group(hass):
 async def test_available_template_with_entities(hass):
     """Test availability tempalates with values from other entities."""
     hass.states.async_set("sensor.availability_sensor", STATE_OFF)
-    with assert_setup_component(1, "sensor"):
+    with assert_setup_component(1, sensor.DOMAIN):
         assert await async_setup_component(
             hass,
-            "sensor",
+            sensor.DOMAIN,
             {
                 "sensor": {
                     "platform": "template",
@@ -538,7 +488,7 @@ async def test_invalid_attribute_template(hass, caplog):
 
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
@@ -569,7 +519,7 @@ async def test_invalid_availability_template_keeps_component_available(hass, cap
 
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
@@ -599,7 +549,7 @@ async def test_no_template_match_all(hass, caplog):
 
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
@@ -681,7 +631,7 @@ async def test_unique_id(hass):
     """Test unique_id option only creates one sensor per id."""
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
@@ -716,7 +666,7 @@ async def test_sun_renders_once_per_sensor(hass):
 
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
@@ -772,7 +722,7 @@ async def test_self_referencing_sensor_loop(hass, caplog):
 
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
@@ -807,7 +757,7 @@ async def test_self_referencing_sensor_with_icon_loop(hass, caplog):
 
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
@@ -845,7 +795,7 @@ async def test_self_referencing_sensor_with_icon_and_picture_entity_loop(hass, c
 
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
@@ -885,7 +835,7 @@ async def test_self_referencing_entity_picture_loop(hass, caplog):
 
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
@@ -917,7 +867,7 @@ async def test_self_referencing_entity_picture_loop(hass, caplog):
 
     state = hass.states.get("sensor.test")
     assert int(state.state) == 1
-    assert state.attributes[ATTR_ENTITY_PICTURE] == "2"
+    assert state.attributes[ATTR_ENTITY_PICTURE] == 2
 
     await hass.async_block_till_done()
     assert int(state.state) == 1
@@ -961,7 +911,7 @@ async def test_self_referencing_icon_with_no_loop(hass, caplog):
 
     await async_setup_component(
         hass,
-        "sensor",
+        sensor.DOMAIN,
         {
             "sensor": {
                 "platform": "template",
diff --git a/tests/components/template/test_switch.py b/tests/components/template/test_switch.py
index 6dab2569e59..9bf7ef99956 100644
--- a/tests/components/template/test_switch.py
+++ b/tests/components/template/test_switch.py
@@ -3,7 +3,15 @@
 import pytest
 
 from homeassistant import setup
-from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE
+from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_OFF,
+    STATE_ON,
+    STATE_UNAVAILABLE,
+)
 from homeassistant.core import CoreState, State
 from homeassistant.setup import async_setup_component
 
@@ -13,7 +21,6 @@ from tests.common import (
     mock_component,
     mock_restore_cache,
 )
-from tests.components.switch import common
 
 
 @pytest.fixture
@@ -418,8 +425,12 @@ async def test_on_action(hass, calls):
     state = hass.states.get("switch.test_template_switch")
     assert state.state == STATE_OFF
 
-    await common.async_turn_on(hass, "switch.test_template_switch")
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "switch.test_template_switch"},
+        blocking=True,
+    )
 
     assert len(calls) == 1
 
@@ -454,8 +465,12 @@ async def test_on_action_optimistic(hass, calls):
     state = hass.states.get("switch.test_template_switch")
     assert state.state == STATE_OFF
 
-    await common.async_turn_on(hass, "switch.test_template_switch")
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_ON,
+        {ATTR_ENTITY_ID: "switch.test_template_switch"},
+        blocking=True,
+    )
 
     state = hass.states.get("switch.test_template_switch")
     assert len(calls) == 1
@@ -494,8 +509,12 @@ async def test_off_action(hass, calls):
     state = hass.states.get("switch.test_template_switch")
     assert state.state == STATE_ON
 
-    await common.async_turn_off(hass, "switch.test_template_switch")
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "switch.test_template_switch"},
+        blocking=True,
+    )
 
     assert len(calls) == 1
 
@@ -530,8 +549,12 @@ async def test_off_action_optimistic(hass, calls):
     state = hass.states.get("switch.test_template_switch")
     assert state.state == STATE_ON
 
-    await common.async_turn_off(hass, "switch.test_template_switch")
-    await hass.async_block_till_done()
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        SERVICE_TURN_OFF,
+        {ATTR_ENTITY_ID: "switch.test_template_switch"},
+        blocking=True,
+    )
 
     state = hass.states.get("switch.test_template_switch")
     assert len(calls) == 1
diff --git a/tests/components/template/test_vacuum.py b/tests/components/template/test_vacuum.py
index 23b03262a78..e18f8ecc059 100644
--- a/tests/components/template/test_vacuum.py
+++ b/tests/components/template/test_vacuum.py
@@ -1,6 +1,4 @@
 """The tests for the Template vacuum platform."""
-import logging
-
 import pytest
 
 from homeassistant import setup
@@ -17,8 +15,6 @@ from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, STATE_UN
 from tests.common import assert_setup_component, async_mock_service
 from tests.components.vacuum import common
 
-_LOGGER = logging.getLogger(__name__)
-
 _TEST_VACUUM = "vacuum.test_vacuum"
 _STATE_INPUT_SELECT = "input_select.state"
 _SPOT_CLEANING_INPUT_BOOLEAN = "input_boolean.spot_cleaning"
diff --git a/tests/components/tesla/test_config_flow.py b/tests/components/tesla/test_config_flow.py
index a59daee9ac6..8b75fd904b9 100644
--- a/tests/components/tesla/test_config_flow.py
+++ b/tests/components/tesla/test_config_flow.py
@@ -70,7 +70,7 @@ async def test_form_invalid_auth(hass):
         )
 
     assert result2["type"] == "form"
-    assert result2["errors"] == {"base": "invalid_credentials"}
+    assert result2["errors"] == {"base": "invalid_auth"}
 
 
 async def test_form_cannot_connect(hass):
@@ -89,7 +89,7 @@ async def test_form_cannot_connect(hass):
         )
 
     assert result2["type"] == "form"
-    assert result2["errors"] == {"base": "connection_error"}
+    assert result2["errors"] == {"base": "cannot_connect"}
 
 
 async def test_form_repeat_identifier(hass):
@@ -110,7 +110,7 @@ async def test_form_repeat_identifier(hass):
         )
 
     assert result2["type"] == "form"
-    assert result2["errors"] == {CONF_USERNAME: "identifier_exists"}
+    assert result2["errors"] == {CONF_USERNAME: "already_configured"}
 
 
 async def test_import(hass):
diff --git a/tests/components/threshold/test_binary_sensor.py b/tests/components/threshold/test_binary_sensor.py
index 3eb6299b3be..66ab9e6cac1 100644
--- a/tests/components/threshold/test_binary_sensor.py
+++ b/tests/components/threshold/test_binary_sensor.py
@@ -1,384 +1,385 @@
 """The test for the threshold sensor platform."""
-import unittest
 
 from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, STATE_UNKNOWN, TEMP_CELSIUS
-from homeassistant.setup import setup_component
-
-from tests.common import get_test_home_assistant
+from homeassistant.setup import async_setup_component
 
 
-class TestThresholdSensor(unittest.TestCase):
-    """Test the threshold sensor."""
-
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_sensor_upper(self):
-        """Test if source is above threshold."""
-        config = {
-            "binary_sensor": {
-                "platform": "threshold",
-                "upper": "15",
-                "entity_id": "sensor.test_monitored",
-            }
+async def test_sensor_upper(hass):
+    """Test if source is above threshold."""
+    config = {
+        "binary_sensor": {
+            "platform": "threshold",
+            "upper": "15",
+            "entity_id": "sensor.test_monitored",
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set(
-            "sensor.test_monitored", 16, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
+    hass.states.async_set(
+        "sensor.test_monitored", 16, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "sensor.test_monitored" == state.attributes.get("entity_id")
-        assert 16 == state.attributes.get("sensor_value")
-        assert "above" == state.attributes.get("position")
-        assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
-        assert 0.0 == state.attributes.get("hysteresis")
-        assert "upper" == state.attributes.get("type")
+    assert "sensor.test_monitored" == state.attributes.get("entity_id")
+    assert 16 == state.attributes.get("sensor_value")
+    assert "above" == state.attributes.get("position")
+    assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
+    assert 0.0 == state.attributes.get("hysteresis")
+    assert "upper" == state.attributes.get("type")
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", 14)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 14)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 15)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 15)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-    def test_sensor_lower(self):
-        """Test if source is below threshold."""
-        config = {
-            "binary_sensor": {
-                "platform": "threshold",
-                "lower": "15",
-                "entity_id": "sensor.test_monitored",
-            }
+
+async def test_sensor_lower(hass):
+    """Test if source is below threshold."""
+    config = {
+        "binary_sensor": {
+            "platform": "threshold",
+            "lower": "15",
+            "entity_id": "sensor.test_monitored",
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", 16)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 16)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "above" == state.attributes.get("position")
-        assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
-        assert 0.0 == state.attributes.get("hysteresis")
-        assert "lower" == state.attributes.get("type")
+    assert "above" == state.attributes.get("position")
+    assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
+    assert 0.0 == state.attributes.get("hysteresis")
+    assert "lower" == state.attributes.get("type")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 14)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 14)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-    def test_sensor_hysteresis(self):
-        """Test if source is above threshold using hysteresis."""
-        config = {
-            "binary_sensor": {
-                "platform": "threshold",
-                "upper": "15",
-                "hysteresis": "2.5",
-                "entity_id": "sensor.test_monitored",
-            }
+
+async def test_sensor_hysteresis(hass):
+    """Test if source is above threshold using hysteresis."""
+    config = {
+        "binary_sensor": {
+            "platform": "threshold",
+            "upper": "15",
+            "hysteresis": "2.5",
+            "entity_id": "sensor.test_monitored",
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", 20)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 20)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "above" == state.attributes.get("position")
-        assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
-        assert 2.5 == state.attributes.get("hysteresis")
-        assert "upper" == state.attributes.get("type")
+    assert "above" == state.attributes.get("position")
+    assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
+    assert 2.5 == state.attributes.get("hysteresis")
+    assert "upper" == state.attributes.get("type")
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", 13)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 13)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", 12)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 12)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 17)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 17)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 18)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 18)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-    def test_sensor_in_range_no_hysteresis(self):
-        """Test if source is within the range."""
-        config = {
-            "binary_sensor": {
-                "platform": "threshold",
-                "lower": "10",
-                "upper": "20",
-                "entity_id": "sensor.test_monitored",
-            }
+
+async def test_sensor_in_range_no_hysteresis(hass):
+    """Test if source is within the range."""
+    config = {
+        "binary_sensor": {
+            "platform": "threshold",
+            "lower": "10",
+            "upper": "20",
+            "entity_id": "sensor.test_monitored",
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set(
-            "sensor.test_monitored", 16, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
+    hass.states.async_set(
+        "sensor.test_monitored", 16, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "sensor.test_monitored" == state.attributes.get("entity_id")
-        assert 16 == state.attributes.get("sensor_value")
-        assert "in_range" == state.attributes.get("position")
-        assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
-        assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
-        assert 0.0 == state.attributes.get("hysteresis")
-        assert "range" == state.attributes.get("type")
+    assert state.attributes.get("entity_id") == "sensor.test_monitored"
+    assert 16 == state.attributes.get("sensor_value")
+    assert "in_range" == state.attributes.get("position")
+    assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
+    assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
+    assert 0.0 == state.attributes.get("hysteresis")
+    assert "range" == state.attributes.get("type")
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", 9)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 9)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "below" == state.attributes.get("position")
-        assert state.state == "off"
+    assert "below" == state.attributes.get("position")
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 21)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 21)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "above" == state.attributes.get("position")
-        assert state.state == "off"
+    assert "above" == state.attributes.get("position")
+    assert state.state == "off"
 
-    def test_sensor_in_range_with_hysteresis(self):
-        """Test if source is within the range."""
-        config = {
-            "binary_sensor": {
-                "platform": "threshold",
-                "lower": "10",
-                "upper": "20",
-                "hysteresis": "2",
-                "entity_id": "sensor.test_monitored",
-            }
+
+async def test_sensor_in_range_with_hysteresis(hass):
+    """Test if source is within the range."""
+    config = {
+        "binary_sensor": {
+            "platform": "threshold",
+            "lower": "10",
+            "upper": "20",
+            "hysteresis": "2",
+            "entity_id": "sensor.test_monitored",
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set(
-            "sensor.test_monitored", 16, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
+    hass.states.async_set(
+        "sensor.test_monitored", 16, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "sensor.test_monitored" == state.attributes.get("entity_id")
-        assert 16 == state.attributes.get("sensor_value")
-        assert "in_range" == state.attributes.get("position")
-        assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
-        assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
-        assert float(config["binary_sensor"]["hysteresis"]) == state.attributes.get(
-            "hysteresis"
-        )
-        assert "range" == state.attributes.get("type")
+    assert "sensor.test_monitored" == state.attributes.get("entity_id")
+    assert 16 == state.attributes.get("sensor_value")
+    assert "in_range" == state.attributes.get("position")
+    assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
+    assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
+    assert float(config["binary_sensor"]["hysteresis"]) == state.attributes.get(
+        "hysteresis"
+    )
+    assert "range" == state.attributes.get("type")
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", 8)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 8)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "in_range" == state.attributes.get("position")
-        assert state.state == "on"
+    assert "in_range" == state.attributes.get("position")
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", 7)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 7)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "below" == state.attributes.get("position")
-        assert state.state == "off"
+    assert "below" == state.attributes.get("position")
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 12)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 12)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "below" == state.attributes.get("position")
-        assert state.state == "off"
+    assert "below" == state.attributes.get("position")
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 13)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 13)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "in_range" == state.attributes.get("position")
-        assert state.state == "on"
+    assert "in_range" == state.attributes.get("position")
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", 22)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 22)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "in_range" == state.attributes.get("position")
-        assert state.state == "on"
+    assert "in_range" == state.attributes.get("position")
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", 23)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 23)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "above" == state.attributes.get("position")
-        assert state.state == "off"
+    assert "above" == state.attributes.get("position")
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 18)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 18)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "above" == state.attributes.get("position")
-        assert state.state == "off"
+    assert "above" == state.attributes.get("position")
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 17)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 17)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "in_range" == state.attributes.get("position")
-        assert state.state == "on"
+    assert "in_range" == state.attributes.get("position")
+    assert state.state == "on"
 
-    def test_sensor_in_range_unknown_state(self):
-        """Test if source is within the range."""
-        config = {
-            "binary_sensor": {
-                "platform": "threshold",
-                "lower": "10",
-                "upper": "20",
-                "entity_id": "sensor.test_monitored",
-            }
+
+async def test_sensor_in_range_unknown_state(hass):
+    """Test if source is within the range."""
+    config = {
+        "binary_sensor": {
+            "platform": "threshold",
+            "lower": "10",
+            "upper": "20",
+            "entity_id": "sensor.test_monitored",
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set(
-            "sensor.test_monitored", 16, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
-        )
-        self.hass.block_till_done()
+    hass.states.async_set(
+        "sensor.test_monitored", 16, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}
+    )
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "sensor.test_monitored" == state.attributes.get("entity_id")
-        assert 16 == state.attributes.get("sensor_value")
-        assert "in_range" == state.attributes.get("position")
-        assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
-        assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
-        assert 0.0 == state.attributes.get("hysteresis")
-        assert "range" == state.attributes.get("type")
+    assert "sensor.test_monitored" == state.attributes.get("entity_id")
+    assert 16 == state.attributes.get("sensor_value")
+    assert "in_range" == state.attributes.get("position")
+    assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
+    assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
+    assert 0.0 == state.attributes.get("hysteresis")
+    assert "range" == state.attributes.get("type")
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-        self.hass.states.set("sensor.test_monitored", STATE_UNKNOWN)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", STATE_UNKNOWN)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "unknown" == state.attributes.get("position")
-        assert state.state == "off"
+    assert "unknown" == state.attributes.get("position")
+    assert state.state == "off"
 
-    def test_sensor_lower_zero_threshold(self):
-        """Test if a lower threshold of zero is set."""
-        config = {
-            "binary_sensor": {
-                "platform": "threshold",
-                "lower": "0",
-                "entity_id": "sensor.test_monitored",
-            }
+
+async def test_sensor_lower_zero_threshold(hass):
+    """Test if a lower threshold of zero is set."""
+    config = {
+        "binary_sensor": {
+            "platform": "threshold",
+            "lower": "0",
+            "entity_id": "sensor.test_monitored",
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", 16)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 16)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "lower" == state.attributes.get("type")
-        assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
+    assert "lower" == state.attributes.get("type")
+    assert float(config["binary_sensor"]["lower"]) == state.attributes.get("lower")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", -3)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", -3)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert state.state == "on"
+    assert state.state == "on"
 
-    def test_sensor_upper_zero_threshold(self):
-        """Test if an upper threshold of zero is set."""
-        config = {
-            "binary_sensor": {
-                "platform": "threshold",
-                "upper": "0",
-                "entity_id": "sensor.test_monitored",
-            }
+
+async def test_sensor_upper_zero_threshold(hass):
+    """Test if an upper threshold of zero is set."""
+    config = {
+        "binary_sensor": {
+            "platform": "threshold",
+            "upper": "0",
+            "entity_id": "sensor.test_monitored",
         }
+    }
 
-        assert setup_component(self.hass, "binary_sensor", config)
+    assert await async_setup_component(hass, "binary_sensor", config)
+    await hass.async_block_till_done()
 
-        self.hass.states.set("sensor.test_monitored", -10)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", -10)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert "upper" == state.attributes.get("type")
-        assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
+    assert "upper" == state.attributes.get("type")
+    assert float(config["binary_sensor"]["upper"]) == state.attributes.get("upper")
 
-        assert state.state == "off"
+    assert state.state == "off"
 
-        self.hass.states.set("sensor.test_monitored", 2)
-        self.hass.block_till_done()
+    hass.states.async_set("sensor.test_monitored", 2)
+    await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.threshold")
+    state = hass.states.get("binary_sensor.threshold")
 
-        assert state.state == "on"
+    assert state.state == "on"
diff --git a/tests/components/tile/test_config_flow.py b/tests/components/tile/test_config_flow.py
index a1812d34a57..b9d4799dc2f 100644
--- a/tests/components/tile/test_config_flow.py
+++ b/tests/components/tile/test_config_flow.py
@@ -44,7 +44,7 @@ async def test_invalid_credentials(hass):
             DOMAIN, context={"source": SOURCE_USER}, data=conf
         )
         assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-        assert result["errors"] == {"base": "invalid_credentials"}
+        assert result["errors"] == {"base": "invalid_auth"}
 
 
 async def test_step_import(hass):
diff --git a/tests/components/time_date/test_sensor.py b/tests/components/time_date/test_sensor.py
index c5e8ccecc40..a20afb61fe3 100644
--- a/tests/components/time_date/test_sensor.py
+++ b/tests/components/time_date/test_sensor.py
@@ -1,172 +1,159 @@
 """The tests for time_date sensor platform."""
-import unittest
+import pytest
 
 import homeassistant.components.time_date.sensor as time_date
 import homeassistant.util.dt as dt_util
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
+
+ORIG_TZ = dt_util.DEFAULT_TIME_ZONE
 
 
-class TestTimeDateSensor(unittest.TestCase):
-    """Tests the time_date Sensor platform."""
+@pytest.fixture(autouse=True)
+def restore_ts():
+    """Restore default TZ."""
+    yield
+    dt_util.DEFAULT_TIME_ZONE = ORIG_TZ
 
-    # pylint: disable=invalid-name
-    DEVICES = []
 
-    def add_entities(self, devices):
-        """Mock add devices."""
-        for device in devices:
-            self.DEVICES.append(device)
+# pylint: disable=protected-access
+async def test_intervals(hass):
+    """Test timing intervals of sensors."""
+    device = time_date.TimeDateSensor(hass, "time")
+    now = dt_util.utc_from_timestamp(45)
+    next_time = device.get_next_interval(now)
+    assert next_time == dt_util.utc_from_timestamp(60)
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.DEFAULT_TIME_ZONE = dt_util.DEFAULT_TIME_ZONE
-        self.addCleanup(self.tear_down_cleanup)
+    device = time_date.TimeDateSensor(hass, "beat")
+    now = dt_util.utc_from_timestamp(29)
+    next_time = device.get_next_interval(now)
+    assert next_time == dt_util.utc_from_timestamp(86.4)
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        dt_util.set_default_time_zone(self.DEFAULT_TIME_ZONE)
-        self.hass.stop()
+    device = time_date.TimeDateSensor(hass, "date_time")
+    now = dt_util.utc_from_timestamp(1495068899)
+    next_time = device.get_next_interval(now)
+    assert next_time == dt_util.utc_from_timestamp(1495068900)
 
-    # pylint: disable=protected-access
-    def test_intervals(self):
-        """Test timing intervals of sensors."""
-        device = time_date.TimeDateSensor(self.hass, "time")
-        now = dt_util.utc_from_timestamp(45)
-        next_time = device.get_next_interval(now)
-        assert next_time == dt_util.utc_from_timestamp(60)
+    now = dt_util.utcnow()
+    device = time_date.TimeDateSensor(hass, "time_date")
+    next_time = device.get_next_interval()
+    assert next_time > now
 
-        device = time_date.TimeDateSensor(self.hass, "beat")
-        now = dt_util.utc_from_timestamp(29)
-        next_time = device.get_next_interval(now)
-        assert next_time == dt_util.utc_from_timestamp(86.4)
 
-        device = time_date.TimeDateSensor(self.hass, "date_time")
-        now = dt_util.utc_from_timestamp(1495068899)
-        next_time = device.get_next_interval(now)
-        assert next_time == dt_util.utc_from_timestamp(1495068900)
+async def test_states(hass):
+    """Test states of sensors."""
+    now = dt_util.utc_from_timestamp(1495068856)
+    device = time_date.TimeDateSensor(hass, "time")
+    device._update_internal_state(now)
+    assert device.state == "00:54"
 
-        now = dt_util.utcnow()
-        device = time_date.TimeDateSensor(self.hass, "time_date")
-        next_time = device.get_next_interval()
-        assert next_time > now
+    device = time_date.TimeDateSensor(hass, "date")
+    device._update_internal_state(now)
+    assert device.state == "2017-05-18"
 
-    def test_states(self):
-        """Test states of sensors."""
-        now = dt_util.utc_from_timestamp(1495068856)
-        device = time_date.TimeDateSensor(self.hass, "time")
-        device._update_internal_state(now)
-        assert device.state == "00:54"
+    device = time_date.TimeDateSensor(hass, "time_utc")
+    device._update_internal_state(now)
+    assert device.state == "00:54"
 
-        device = time_date.TimeDateSensor(self.hass, "date")
-        device._update_internal_state(now)
-        assert device.state == "2017-05-18"
+    device = time_date.TimeDateSensor(hass, "date_time")
+    device._update_internal_state(now)
+    assert device.state == "2017-05-18, 00:54"
 
-        device = time_date.TimeDateSensor(self.hass, "time_utc")
-        device._update_internal_state(now)
-        assert device.state == "00:54"
+    device = time_date.TimeDateSensor(hass, "date_time_utc")
+    device._update_internal_state(now)
+    assert device.state == "2017-05-18, 00:54"
 
-        device = time_date.TimeDateSensor(self.hass, "date_time")
-        device._update_internal_state(now)
-        assert device.state == "2017-05-18, 00:54"
+    device = time_date.TimeDateSensor(hass, "beat")
+    device._update_internal_state(now)
+    assert device.state == "@079"
 
-        device = time_date.TimeDateSensor(self.hass, "date_time_utc")
-        device._update_internal_state(now)
-        assert device.state == "2017-05-18, 00:54"
+    device = time_date.TimeDateSensor(hass, "date_time_iso")
+    device._update_internal_state(now)
+    assert device.state == "2017-05-18T00:54:00"
 
-        device = time_date.TimeDateSensor(self.hass, "beat")
-        device._update_internal_state(now)
-        assert device.state == "@079"
 
-        device = time_date.TimeDateSensor(self.hass, "date_time_iso")
-        device._update_internal_state(now)
-        assert device.state == "2017-05-18T00:54:00"
+async def test_states_non_default_timezone(hass):
+    """Test states of sensors in a timezone other than UTC."""
+    new_tz = dt_util.get_time_zone("America/New_York")
+    assert new_tz is not None
+    dt_util.set_default_time_zone(new_tz)
 
-    def test_states_non_default_timezone(self):
-        """Test states of sensors in a timezone other than UTC."""
-        new_tz = dt_util.get_time_zone("America/New_York")
-        assert new_tz is not None
-        dt_util.set_default_time_zone(new_tz)
+    now = dt_util.utc_from_timestamp(1495068856)
+    device = time_date.TimeDateSensor(hass, "time")
+    device._update_internal_state(now)
+    assert device.state == "20:54"
 
-        now = dt_util.utc_from_timestamp(1495068856)
-        device = time_date.TimeDateSensor(self.hass, "time")
-        device._update_internal_state(now)
-        assert device.state == "20:54"
+    device = time_date.TimeDateSensor(hass, "date")
+    device._update_internal_state(now)
+    assert device.state == "2017-05-17"
 
-        device = time_date.TimeDateSensor(self.hass, "date")
-        device._update_internal_state(now)
-        assert device.state == "2017-05-17"
+    device = time_date.TimeDateSensor(hass, "time_utc")
+    device._update_internal_state(now)
+    assert device.state == "00:54"
 
-        device = time_date.TimeDateSensor(self.hass, "time_utc")
-        device._update_internal_state(now)
-        assert device.state == "00:54"
+    device = time_date.TimeDateSensor(hass, "date_time")
+    device._update_internal_state(now)
+    assert device.state == "2017-05-17, 20:54"
 
-        device = time_date.TimeDateSensor(self.hass, "date_time")
-        device._update_internal_state(now)
-        assert device.state == "2017-05-17, 20:54"
+    device = time_date.TimeDateSensor(hass, "date_time_utc")
+    device._update_internal_state(now)
+    assert device.state == "2017-05-18, 00:54"
 
-        device = time_date.TimeDateSensor(self.hass, "date_time_utc")
-        device._update_internal_state(now)
-        assert device.state == "2017-05-18, 00:54"
+    device = time_date.TimeDateSensor(hass, "beat")
+    device._update_internal_state(now)
+    assert device.state == "@079"
 
-        device = time_date.TimeDateSensor(self.hass, "beat")
-        device._update_internal_state(now)
-        assert device.state == "@079"
+    device = time_date.TimeDateSensor(hass, "date_time_iso")
+    device._update_internal_state(now)
+    assert device.state == "2017-05-17T20:54:00"
 
-        device = time_date.TimeDateSensor(self.hass, "date_time_iso")
-        device._update_internal_state(now)
-        assert device.state == "2017-05-17T20:54:00"
 
-    # pylint: disable=no-member
-    def test_timezone_intervals(self):
-        """Test date sensor behavior in a timezone besides UTC."""
-        new_tz = dt_util.get_time_zone("America/New_York")
-        assert new_tz is not None
-        dt_util.set_default_time_zone(new_tz)
+# pylint: disable=no-member
+async def test_timezone_intervals(hass):
+    """Test date sensor behavior in a timezone besides UTC."""
+    new_tz = dt_util.get_time_zone("America/New_York")
+    assert new_tz is not None
+    dt_util.set_default_time_zone(new_tz)
 
-        device = time_date.TimeDateSensor(self.hass, "date")
-        now = dt_util.utc_from_timestamp(50000)
-        next_time = device.get_next_interval(now)
-        # start of local day in EST was 18000.0
-        # so the second day was 18000 + 86400
-        assert next_time.timestamp() == 104400
+    device = time_date.TimeDateSensor(hass, "date")
+    now = dt_util.utc_from_timestamp(50000)
+    next_time = device.get_next_interval(now)
+    # start of local day in EST was 18000.0
+    # so the second day was 18000 + 86400
+    assert next_time.timestamp() == 104400
 
-        new_tz = dt_util.get_time_zone("America/Edmonton")
-        assert new_tz is not None
-        dt_util.set_default_time_zone(new_tz)
-        now = dt_util.parse_datetime("2017-11-13 19:47:19-07:00")
-        device = time_date.TimeDateSensor(self.hass, "date")
-        next_time = device.get_next_interval(now)
-        assert next_time.timestamp() == dt_util.as_timestamp(
-            "2017-11-14 00:00:00-07:00"
-        )
+    new_tz = dt_util.get_time_zone("America/Edmonton")
+    assert new_tz is not None
+    dt_util.set_default_time_zone(new_tz)
+    now = dt_util.parse_datetime("2017-11-13 19:47:19-07:00")
+    device = time_date.TimeDateSensor(hass, "date")
+    next_time = device.get_next_interval(now)
+    assert next_time.timestamp() == dt_util.as_timestamp("2017-11-14 00:00:00-07:00")
 
-    @patch(
-        "homeassistant.util.dt.utcnow",
-        return_value=dt_util.parse_datetime("2017-11-14 02:47:19-00:00"),
-    )
-    def test_timezone_intervals_empty_parameter(self, _):
-        """Test get_interval() without parameters."""
-        new_tz = dt_util.get_time_zone("America/Edmonton")
-        assert new_tz is not None
-        dt_util.set_default_time_zone(new_tz)
-        device = time_date.TimeDateSensor(self.hass, "date")
-        next_time = device.get_next_interval()
-        assert next_time.timestamp() == dt_util.as_timestamp(
-            "2017-11-14 00:00:00-07:00"
-        )
 
-    def test_icons(self):
-        """Test attributes of sensors."""
-        device = time_date.TimeDateSensor(self.hass, "time")
-        assert device.icon == "mdi:clock"
-        device = time_date.TimeDateSensor(self.hass, "date")
-        assert device.icon == "mdi:calendar"
-        device = time_date.TimeDateSensor(self.hass, "date_time")
-        assert device.icon == "mdi:calendar-clock"
-        device = time_date.TimeDateSensor(self.hass, "date_time_utc")
-        assert device.icon == "mdi:calendar-clock"
-        device = time_date.TimeDateSensor(self.hass, "date_time_iso")
-        assert device.icon == "mdi:calendar-clock"
+@patch(
+    "homeassistant.util.dt.utcnow",
+    return_value=dt_util.parse_datetime("2017-11-14 02:47:19-00:00"),
+)
+async def test_timezone_intervals_empty_parameter(hass):
+    """Test get_interval() without parameters."""
+    new_tz = dt_util.get_time_zone("America/Edmonton")
+    assert new_tz is not None
+    dt_util.set_default_time_zone(new_tz)
+    device = time_date.TimeDateSensor(hass, "date")
+    next_time = device.get_next_interval()
+    assert next_time.timestamp() == dt_util.as_timestamp("2017-11-14 00:00:00-07:00")
+
+
+async def test_icons(hass):
+    """Test attributes of sensors."""
+    device = time_date.TimeDateSensor(hass, "time")
+    assert device.icon == "mdi:clock"
+    device = time_date.TimeDateSensor(hass, "date")
+    assert device.icon == "mdi:calendar"
+    device = time_date.TimeDateSensor(hass, "date_time")
+    assert device.icon == "mdi:calendar-clock"
+    device = time_date.TimeDateSensor(hass, "date_time_utc")
+    assert device.icon == "mdi:calendar-clock"
+    device = time_date.TimeDateSensor(hass, "date_time_iso")
+    assert device.icon == "mdi:calendar-clock"
diff --git a/tests/components/tod/test_binary_sensor.py b/tests/components/tod/test_binary_sensor.py
index b776477be5c..b0bca3e1c01 100644
--- a/tests/components/tod/test_binary_sensor.py
+++ b/tests/components/tod/test_binary_sensor.py
@@ -1,19 +1,17 @@
 """Test Times of the Day Binary Sensor."""
 from datetime import datetime, timedelta
-import unittest
 
 import pytest
 import pytz
 
-from homeassistant import setup
 from homeassistant.const import STATE_OFF, STATE_ON
 import homeassistant.core as ha
 from homeassistant.helpers.sun import get_astral_event_date, get_astral_event_next
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
 from tests.async_mock import patch
-from tests.common import assert_setup_component, get_test_home_assistant
+from tests.common import assert_setup_component
 
 
 @pytest.fixture(autouse=True)
@@ -22,885 +20,890 @@ def mock_legacy_time(legacy_patchable_time):
     yield
 
 
-class TestBinarySensorTod(unittest.TestCase):
-    """Test for Binary sensor tod platform."""
+@pytest.fixture(autouse=True)
+def setup_fixture(hass):
+    """Set up things to be run when tests are started."""
+    hass.config.latitude = 50.27583
+    hass.config.longitude = 18.98583
 
-    hass = None
-    # pylint: disable=invalid-name
 
-    def setup_method(self, method):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.hass.config.latitude = 50.27583
-        self.hass.config.longitude = 18.98583
+async def test_setup(hass):
+    """Test the setup."""
+    config = {
+        "binary_sensor": [
+            {
+                "platform": "tod",
+                "name": "Early Morning",
+                "after": "sunrise",
+                "after_offset": "-02:00",
+                "before": "7:00",
+                "before_offset": "1:00",
+            },
+            {
+                "platform": "tod",
+                "name": "Morning",
+                "after": "sunrise",
+                "before": "12:00",
+            },
+        ]
+    }
+    with assert_setup_component(2):
+        assert await async_setup_component(hass, "binary_sensor", config)
 
-    def teardown_method(self, method):
-        """Stop everything that was started."""
-        self.hass.stop()
 
-    def test_setup(self):
-        """Test the setup."""
-        config = {
-            "binary_sensor": [
-                {
-                    "platform": "tod",
-                    "name": "Early Morning",
-                    "after": "sunrise",
-                    "after_offset": "-02:00",
-                    "before": "7:00",
-                    "before_offset": "1:00",
-                },
-                {
-                    "platform": "tod",
-                    "name": "Morning",
-                    "after": "sunrise",
-                    "before": "12:00",
-                },
-            ]
-        }
-        with assert_setup_component(2):
-            assert setup.setup_component(self.hass, "binary_sensor", config)
+async def test_setup_no_sensors(hass):
+    """Test setup with no sensors."""
+    with assert_setup_component(0):
+        assert await async_setup_component(
+            hass, "binary_sensor", {"binary_sensor": {"platform": "tod"}}
+        )
 
-    def test_setup_no_sensors(self):
-        """Test setup with no sensors."""
-        with assert_setup_component(0):
-            assert setup.setup_component(
-                self.hass, "binary_sensor", {"binary_sensor": {"platform": "tod"}}
-            )
 
-    def test_in_period_on_start(self):
-        """Test simple setting."""
-        test_time = datetime(2019, 1, 10, 18, 43, 0, tzinfo=self.hass.config.time_zone)
-        config = {
-            "binary_sensor": [
-                {
-                    "platform": "tod",
-                    "name": "Evening",
-                    "after": "18:00",
-                    "before": "22:00",
-                }
-            ]
-        }
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=test_time,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
+async def test_in_period_on_start(hass):
+    """Test simple setting."""
+    test_time = datetime(2019, 1, 10, 18, 43, 0, tzinfo=hass.config.time_zone)
+    config = {
+        "binary_sensor": [
+            {
+                "platform": "tod",
+                "name": "Evening",
+                "after": "18:00",
+                "before": "22:00",
+            }
+        ]
+    }
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=test_time,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.evening")
+    state = hass.states.get("binary_sensor.evening")
+    assert state.state == STATE_ON
+
+
+async def test_midnight_turnover_before_midnight_inside_period(hass):
+    """Test midnight turnover setting before midnight inside period ."""
+    test_time = datetime(2019, 1, 10, 22, 30, 0, tzinfo=hass.config.time_zone)
+    config = {
+        "binary_sensor": [
+            {"platform": "tod", "name": "Night", "after": "22:00", "before": "5:00"}
+        ]
+    }
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=test_time,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.night")
+    assert state.state == STATE_ON
+
+
+async def test_midnight_turnover_after_midnight_inside_period(hass):
+    """Test midnight turnover setting before midnight inside period ."""
+    test_time = hass.config.time_zone.localize(
+        datetime(2019, 1, 10, 21, 0, 0)
+    ).astimezone(pytz.UTC)
+    config = {
+        "binary_sensor": [
+            {"platform": "tod", "name": "Night", "after": "22:00", "before": "5:00"}
+        ]
+    }
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=test_time,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+        state = hass.states.get("binary_sensor.night")
+        assert state.state == STATE_OFF
+
+        await hass.async_block_till_done()
+
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=test_time + timedelta(hours=1),
+    ):
+
+        hass.bus.async_fire(
+            ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: test_time + timedelta(hours=1)}
+        )
+
+        await hass.async_block_till_done()
+        state = hass.states.get("binary_sensor.night")
         assert state.state == STATE_ON
 
-    def test_midnight_turnover_before_midnight_inside_period(self):
-        """Test midnight turnover setting before midnight inside period ."""
-        test_time = datetime(2019, 1, 10, 22, 30, 0, tzinfo=self.hass.config.time_zone)
-        config = {
-            "binary_sensor": [
-                {"platform": "tod", "name": "Night", "after": "22:00", "before": "5:00"}
-            ]
-        }
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=test_time,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
 
-        state = self.hass.states.get("binary_sensor.night")
+async def test_midnight_turnover_before_midnight_outside_period(hass):
+    """Test midnight turnover setting before midnight outside period."""
+    test_time = hass.config.time_zone.localize(
+        datetime(2019, 1, 10, 20, 30, 0)
+    ).astimezone(pytz.UTC)
+    config = {
+        "binary_sensor": [
+            {"platform": "tod", "name": "Night", "after": "22:00", "before": "5:00"}
+        ]
+    }
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=test_time,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.night")
+    assert state.state == STATE_OFF
+
+
+async def test_midnight_turnover_after_midnight_outside_period(hass):
+    """Test midnight turnover setting before midnight inside period ."""
+    test_time = hass.config.time_zone.localize(
+        datetime(2019, 1, 10, 20, 0, 0)
+    ).astimezone(pytz.UTC)
+
+    config = {
+        "binary_sensor": [
+            {"platform": "tod", "name": "Night", "after": "22:00", "before": "5:00"}
+        ]
+    }
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=test_time,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("binary_sensor.night")
+    assert state.state == STATE_OFF
+
+    switchover_time = hass.config.time_zone.localize(
+        datetime(2019, 1, 11, 4, 59, 0)
+    ).astimezone(pytz.UTC)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=switchover_time,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: switchover_time})
+        await hass.async_block_till_done()
+        state = hass.states.get("binary_sensor.night")
         assert state.state == STATE_ON
 
-    def test_midnight_turnover_after_midnight_inside_period(self):
-        """Test midnight turnover setting before midnight inside period ."""
-        test_time = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 10, 21, 0, 0)
-        ).astimezone(pytz.UTC)
-        config = {
-            "binary_sensor": [
-                {"platform": "tod", "name": "Night", "after": "22:00", "before": "5:00"}
-            ]
-        }
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=test_time,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=switchover_time + timedelta(minutes=1, seconds=1),
+    ):
 
-            state = self.hass.states.get("binary_sensor.night")
-            assert state.state == STATE_OFF
+        hass.bus.async_fire(
+            ha.EVENT_TIME_CHANGED,
+            {ha.ATTR_NOW: switchover_time + timedelta(minutes=1, seconds=1)},
+        )
 
-            self.hass.block_till_done()
-
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=test_time + timedelta(hours=1),
-        ):
-
-            self.hass.bus.fire(
-                ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: test_time + timedelta(hours=1)}
-            )
-
-            self.hass.block_till_done()
-            state = self.hass.states.get("binary_sensor.night")
-            assert state.state == STATE_ON
-
-    def test_midnight_turnover_before_midnight_outside_period(self):
-        """Test midnight turnover setting before midnight outside period."""
-        test_time = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 10, 20, 30, 0)
-        ).astimezone(pytz.UTC)
-        config = {
-            "binary_sensor": [
-                {"platform": "tod", "name": "Night", "after": "22:00", "before": "5:00"}
-            ]
-        }
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=test_time,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get("binary_sensor.night")
+        await hass.async_block_till_done()
+        state = hass.states.get("binary_sensor.night")
         assert state.state == STATE_OFF
 
-    def test_midnight_turnover_after_midnight_outside_period(self):
-        """Test midnight turnover setting before midnight inside period ."""
-        test_time = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 10, 20, 0, 0)
-        ).astimezone(pytz.UTC)
 
-        config = {
-            "binary_sensor": [
-                {"platform": "tod", "name": "Night", "after": "22:00", "before": "5:00"}
-            ]
-        }
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=test_time,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
+async def test_from_sunrise_to_sunset(hass):
+    """Test period from sunrise to sunset."""
+    test_time = hass.config.time_zone.localize(datetime(2019, 1, 12)).astimezone(
+        pytz.UTC
+    )
+    sunrise = dt_util.as_local(
+        get_astral_event_date(hass, "sunrise", dt_util.as_utc(test_time))
+    )
+    sunset = dt_util.as_local(
+        get_astral_event_date(hass, "sunset", dt_util.as_utc(test_time))
+    )
+    config = {
+        "binary_sensor": [
+            {
+                "platform": "tod",
+                "name": "Day",
+                "after": "sunrise",
+                "before": "sunset",
+            }
+        ]
+    }
+    entity_id = "binary_sensor.day"
+    testtime = sunrise + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
 
-        state = self.hass.states.get("binary_sensor.night")
+        await hass.async_block_till_done()
+        state = hass.states.get(entity_id)
         assert state.state == STATE_OFF
 
-        switchover_time = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 11, 4, 59, 0)
-        ).astimezone(pytz.UTC)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=switchover_time,
-        ):
+    testtime = sunrise
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
 
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: switchover_time})
-            self.hass.block_till_done()
-            state = self.hass.states.get("binary_sensor.night")
-            assert state.state == STATE_ON
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
 
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=switchover_time + timedelta(minutes=1, seconds=1),
-        ):
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
 
-            self.hass.bus.fire(
-                ha.EVENT_TIME_CHANGED,
-                {ha.ATTR_NOW: switchover_time + timedelta(minutes=1, seconds=1)},
-            )
+    testtime = sunrise + timedelta(seconds=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
 
-            self.hass.block_till_done()
-            state = self.hass.states.get("binary_sensor.night")
-            assert state.state == STATE_OFF
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
 
-    def test_from_sunrise_to_sunset(self):
-        """Test period from sunrise to sunset."""
-        test_time = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 12)
-        ).astimezone(pytz.UTC)
-        sunrise = dt_util.as_local(
-            get_astral_event_date(self.hass, "sunrise", dt_util.as_utc(test_time))
-        )
-        sunset = dt_util.as_local(
-            get_astral_event_date(self.hass, "sunset", dt_util.as_utc(test_time))
-        )
-        config = {
-            "binary_sensor": [
-                {
-                    "platform": "tod",
-                    "name": "Day",
-                    "after": "sunrise",
-                    "before": "sunset",
-                }
-            ]
-        }
-        entity_id = "binary_sensor.day"
-        testtime = sunrise + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
 
-            self.hass.block_till_done()
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
+    await hass.async_block_till_done()
 
-        testtime = sunrise
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
+    testtime = sunset + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
 
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
 
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
 
-        testtime = sunrise + timedelta(seconds=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
+    await hass.async_block_till_done()
 
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
+    testtime = sunset
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
 
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
 
-        self.hass.block_till_done()
-
-        testtime = sunset + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        self.hass.block_till_done()
-
-        testtime = sunset
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        self.hass.block_till_done()
-
-        testtime = sunset + timedelta(seconds=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-    def test_from_sunset_to_sunrise(self):
-        """Test period from sunset to sunrise."""
-        test_time = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 12)
-        ).astimezone(pytz.UTC)
-        sunset = dt_util.as_local(get_astral_event_date(self.hass, "sunset", test_time))
-        sunrise = dt_util.as_local(get_astral_event_next(self.hass, "sunrise", sunset))
-        # assert sunset == sunrise
-        config = {
-            "binary_sensor": [
-                {
-                    "platform": "tod",
-                    "name": "Night",
-                    "after": "sunset",
-                    "before": "sunrise",
-                }
-            ]
-        }
-        entity_id = "binary_sensor.night"
-        testtime = sunset + timedelta(minutes=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
-
-            self.hass.block_till_done()
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        testtime = sunset
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        testtime = sunset + timedelta(minutes=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        testtime = sunrise + timedelta(minutes=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        testtime = sunrise
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            self.hass.block_till_done()
-            # assert state == "dupa"
-            assert state.state == STATE_OFF
-
-        testtime = sunrise + timedelta(minutes=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-    def test_offset(self):
-        """Test offset."""
-        after = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 10, 18, 0, 0)
-        ).astimezone(pytz.UTC) + timedelta(hours=1, minutes=34)
-
-        before = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 10, 22, 0, 0)
-        ).astimezone(pytz.UTC) + timedelta(hours=1, minutes=45)
-
-        entity_id = "binary_sensor.evening"
-        config = {
-            "binary_sensor": [
-                {
-                    "platform": "tod",
-                    "name": "Evening",
-                    "after": "18:00",
-                    "after_offset": "1:34",
-                    "before": "22:00",
-                    "before_offset": "1:45",
-                }
-            ]
-        }
-        testtime = after + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get(entity_id)
+        state = hass.states.get(entity_id)
         assert state.state == STATE_OFF
 
-        testtime = after
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
+    await hass.async_block_till_done()
 
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
+    testtime = sunset + timedelta(seconds=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
 
-        testtime = before + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
 
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        testtime = before
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        testtime = before + timedelta(seconds=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-    def test_offset_overnight(self):
-        """Test offset overnight."""
-        after = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 10, 18, 0, 0)
-        ).astimezone(pytz.UTC) + timedelta(hours=1, minutes=34)
-        entity_id = "binary_sensor.evening"
-        config = {
-            "binary_sensor": [
-                {
-                    "platform": "tod",
-                    "name": "Evening",
-                    "after": "18:00",
-                    "after_offset": "1:34",
-                    "before": "22:00",
-                    "before_offset": "3:00",
-                }
-            ]
-        }
-        testtime = after + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
-
-        state = self.hass.states.get(entity_id)
+        state = hass.states.get(entity_id)
         assert state.state == STATE_OFF
 
-        testtime = after
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-    def test_norwegian_case_winter(self):
-        """Test location in Norway where the sun doesn't set in summer."""
-        self.hass.config.latitude = 69.6
-        self.hass.config.longitude = 18.8
-
-        test_time = self.hass.config.time_zone.localize(
-            datetime(2010, 1, 1)
-        ).astimezone(pytz.UTC)
-        sunrise = dt_util.as_local(
-            get_astral_event_next(self.hass, "sunrise", dt_util.as_utc(test_time))
-        )
-        sunset = dt_util.as_local(
-            get_astral_event_next(self.hass, "sunset", dt_util.as_utc(test_time))
-        )
-        config = {
-            "binary_sensor": [
-                {
-                    "platform": "tod",
-                    "name": "Day",
-                    "after": "sunrise",
-                    "before": "sunset",
-                }
-            ]
-        }
-        entity_id = "binary_sensor.day"
-        testtime = test_time
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
-
-            self.hass.block_till_done()
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        testtime = sunrise + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        testtime = sunrise
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        testtime = sunrise + timedelta(seconds=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        self.hass.block_till_done()
-
-        testtime = sunset + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        self.hass.block_till_done()
-
-        testtime = sunset
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        self.hass.block_till_done()
-
-        testtime = sunset + timedelta(seconds=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-    def test_norwegian_case_summer(self):
-        """Test location in Norway where the sun doesn't set in summer."""
-        self.hass.config.latitude = 69.6
-        self.hass.config.longitude = 18.8
-
-        test_time = self.hass.config.time_zone.localize(
-            datetime(2010, 6, 1)
-        ).astimezone(pytz.UTC)
-
-        sunrise = dt_util.as_local(
-            get_astral_event_next(self.hass, "sunrise", dt_util.as_utc(test_time))
-        )
-        sunset = dt_util.as_local(
-            get_astral_event_next(self.hass, "sunset", dt_util.as_utc(test_time))
-        )
-        config = {
-            "binary_sensor": [
-                {
-                    "platform": "tod",
-                    "name": "Day",
-                    "after": "sunrise",
-                    "before": "sunset",
-                }
-            ]
-        }
-        entity_id = "binary_sensor.day"
-        testtime = test_time
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
-
-            self.hass.block_till_done()
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        testtime = sunrise + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        testtime = sunrise
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        testtime = sunrise + timedelta(seconds=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        self.hass.block_till_done()
-
-        testtime = sunset + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        self.hass.block_till_done()
-
-        testtime = sunset
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        self.hass.block_till_done()
-
-        testtime = sunset + timedelta(seconds=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-    def test_sun_offset(self):
-        """Test sun event with offset."""
-        test_time = self.hass.config.time_zone.localize(
-            datetime(2019, 1, 12)
-        ).astimezone(pytz.UTC)
-        sunrise = dt_util.as_local(
-            get_astral_event_date(self.hass, "sunrise", dt_util.as_utc(test_time))
-            + timedelta(hours=-1, minutes=-30)
-        )
-        sunset = dt_util.as_local(
-            get_astral_event_date(self.hass, "sunset", dt_util.as_utc(test_time))
-            + timedelta(hours=1, minutes=30)
-        )
-        config = {
-            "binary_sensor": [
-                {
-                    "platform": "tod",
-                    "name": "Day",
-                    "after": "sunrise",
-                    "after_offset": "-1:30",
-                    "before": "sunset",
-                    "before_offset": "1:30",
-                }
-            ]
-        }
-        entity_id = "binary_sensor.day"
-        testtime = sunrise + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
-
-            self.hass.block_till_done()
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        testtime = sunrise
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        testtime = sunrise + timedelta(seconds=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        self.hass.block_till_done()
-
-        testtime = sunset + timedelta(seconds=-1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-        self.hass.block_till_done()
-
-        testtime = sunset
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        self.hass.block_till_done()
-
-        testtime = sunset + timedelta(seconds=1)
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_OFF
-
-        test_time = test_time + timedelta(days=1)
-        sunrise = dt_util.as_local(
-            get_astral_event_date(self.hass, "sunrise", dt_util.as_utc(test_time))
-            + timedelta(hours=-1, minutes=-30)
-        )
-        testtime = sunrise
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-
-            self.hass.bus.fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
-            self.hass.block_till_done()
-
-            state = self.hass.states.get(entity_id)
-            assert state.state == STATE_ON
-
-    def test_dst(self):
-        """Test sun event with offset."""
-        self.hass.config.time_zone = pytz.timezone("CET")
-        test_time = self.hass.config.time_zone.localize(
-            datetime(2019, 3, 30, 3, 0, 0)
-        ).astimezone(pytz.UTC)
-        config = {
-            "binary_sensor": [
-                {"platform": "tod", "name": "Day", "after": "2:30", "before": "2:40"}
-            ]
-        }
-        # after 2019-03-30 03:00 CET the next update should ge scheduled
-        # at 3:30 not 2:30 local time
-        # Internally the
-        entity_id = "binary_sensor.day"
-        testtime = test_time
-        with patch(
-            "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
-            return_value=testtime,
-        ):
-            setup_component(self.hass, "binary_sensor", config)
-            self.hass.block_till_done()
-
-            self.hass.block_till_done()
-            state = self.hass.states.get(entity_id)
-            state.attributes["after"] == "2019-03-31T03:30:00+02:00"
-            state.attributes["before"] == "2019-03-31T03:40:00+02:00"
-            state.attributes["next_update"] == "2019-03-31T03:30:00+02:00"
-            assert state.state == STATE_OFF
+
+async def test_from_sunset_to_sunrise(hass):
+    """Test period from sunset to sunrise."""
+    test_time = hass.config.time_zone.localize(datetime(2019, 1, 12)).astimezone(
+        pytz.UTC
+    )
+    sunset = dt_util.as_local(get_astral_event_date(hass, "sunset", test_time))
+    sunrise = dt_util.as_local(get_astral_event_next(hass, "sunrise", sunset))
+    # assert sunset == sunrise
+    config = {
+        "binary_sensor": [
+            {
+                "platform": "tod",
+                "name": "Night",
+                "after": "sunset",
+                "before": "sunrise",
+            }
+        ]
+    }
+    entity_id = "binary_sensor.night"
+    testtime = sunset + timedelta(minutes=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+        await hass.async_block_till_done()
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    testtime = sunset
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    testtime = sunset + timedelta(minutes=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    testtime = sunrise + timedelta(minutes=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    testtime = sunrise
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        await hass.async_block_till_done()
+        # assert state == "dupa"
+        assert state.state == STATE_OFF
+
+    testtime = sunrise + timedelta(minutes=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+
+async def test_offset(hass):
+    """Test offset."""
+    after = hass.config.time_zone.localize(datetime(2019, 1, 10, 18, 0, 0)).astimezone(
+        pytz.UTC
+    ) + timedelta(hours=1, minutes=34)
+
+    before = hass.config.time_zone.localize(datetime(2019, 1, 10, 22, 0, 0)).astimezone(
+        pytz.UTC
+    ) + timedelta(hours=1, minutes=45)
+
+    entity_id = "binary_sensor.evening"
+    config = {
+        "binary_sensor": [
+            {
+                "platform": "tod",
+                "name": "Evening",
+                "after": "18:00",
+                "after_offset": "1:34",
+                "before": "22:00",
+                "before_offset": "1:45",
+            }
+        ]
+    }
+    testtime = after + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+    assert state.state == STATE_OFF
+
+    testtime = after
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    testtime = before + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    testtime = before
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    testtime = before + timedelta(seconds=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+
+async def test_offset_overnight(hass):
+    """Test offset overnight."""
+    after = hass.config.time_zone.localize(datetime(2019, 1, 10, 18, 0, 0)).astimezone(
+        pytz.UTC
+    ) + timedelta(hours=1, minutes=34)
+    entity_id = "binary_sensor.evening"
+    config = {
+        "binary_sensor": [
+            {
+                "platform": "tod",
+                "name": "Evening",
+                "after": "18:00",
+                "after_offset": "1:34",
+                "before": "22:00",
+                "before_offset": "3:00",
+            }
+        ]
+    }
+    testtime = after + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(entity_id)
+    assert state.state == STATE_OFF
+
+    testtime = after
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+
+async def test_norwegian_case_winter(hass):
+    """Test location in Norway where the sun doesn't set in summer."""
+    hass.config.latitude = 69.6
+    hass.config.longitude = 18.8
+
+    test_time = hass.config.time_zone.localize(datetime(2010, 1, 1)).astimezone(
+        pytz.UTC
+    )
+    sunrise = dt_util.as_local(
+        get_astral_event_next(hass, "sunrise", dt_util.as_utc(test_time))
+    )
+    sunset = dt_util.as_local(
+        get_astral_event_next(hass, "sunset", dt_util.as_utc(test_time))
+    )
+    config = {
+        "binary_sensor": [
+            {
+                "platform": "tod",
+                "name": "Day",
+                "after": "sunrise",
+                "before": "sunset",
+            }
+        ]
+    }
+    entity_id = "binary_sensor.day"
+    testtime = test_time
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+        await hass.async_block_till_done()
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    testtime = sunrise + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    testtime = sunrise
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    testtime = sunrise + timedelta(seconds=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    await hass.async_block_till_done()
+
+    testtime = sunset + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    await hass.async_block_till_done()
+
+    testtime = sunset
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    await hass.async_block_till_done()
+
+    testtime = sunset + timedelta(seconds=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+
+async def test_norwegian_case_summer(hass):
+    """Test location in Norway where the sun doesn't set in summer."""
+    hass.config.latitude = 69.6
+    hass.config.longitude = 18.8
+
+    test_time = hass.config.time_zone.localize(datetime(2010, 6, 1)).astimezone(
+        pytz.UTC
+    )
+
+    sunrise = dt_util.as_local(
+        get_astral_event_next(hass, "sunrise", dt_util.as_utc(test_time))
+    )
+    sunset = dt_util.as_local(
+        get_astral_event_next(hass, "sunset", dt_util.as_utc(test_time))
+    )
+    config = {
+        "binary_sensor": [
+            {
+                "platform": "tod",
+                "name": "Day",
+                "after": "sunrise",
+                "before": "sunset",
+            }
+        ]
+    }
+    entity_id = "binary_sensor.day"
+    testtime = test_time
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+        await hass.async_block_till_done()
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    testtime = sunrise + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    testtime = sunrise
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    testtime = sunrise + timedelta(seconds=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    await hass.async_block_till_done()
+
+    testtime = sunset + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    await hass.async_block_till_done()
+
+    testtime = sunset
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    await hass.async_block_till_done()
+
+    testtime = sunset + timedelta(seconds=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+
+async def test_sun_offset(hass):
+    """Test sun event with offset."""
+    test_time = hass.config.time_zone.localize(datetime(2019, 1, 12)).astimezone(
+        pytz.UTC
+    )
+    sunrise = dt_util.as_local(
+        get_astral_event_date(hass, "sunrise", dt_util.as_utc(test_time))
+        + timedelta(hours=-1, minutes=-30)
+    )
+    sunset = dt_util.as_local(
+        get_astral_event_date(hass, "sunset", dt_util.as_utc(test_time))
+        + timedelta(hours=1, minutes=30)
+    )
+    config = {
+        "binary_sensor": [
+            {
+                "platform": "tod",
+                "name": "Day",
+                "after": "sunrise",
+                "after_offset": "-1:30",
+                "before": "sunset",
+                "before_offset": "1:30",
+            }
+        ]
+    }
+    entity_id = "binary_sensor.day"
+    testtime = sunrise + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+        await hass.async_block_till_done()
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    testtime = sunrise
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    testtime = sunrise + timedelta(seconds=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    await hass.async_block_till_done()
+
+    testtime = sunset + timedelta(seconds=-1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+    await hass.async_block_till_done()
+
+    testtime = sunset
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    await hass.async_block_till_done()
+
+    testtime = sunset + timedelta(seconds=1)
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_OFF
+
+    test_time = test_time + timedelta(days=1)
+    sunrise = dt_util.as_local(
+        get_astral_event_date(hass, "sunrise", dt_util.as_utc(test_time))
+        + timedelta(hours=-1, minutes=-30)
+    )
+    testtime = sunrise
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+
+        hass.bus.async_fire(ha.EVENT_TIME_CHANGED, {ha.ATTR_NOW: testtime})
+        await hass.async_block_till_done()
+
+        state = hass.states.get(entity_id)
+        assert state.state == STATE_ON
+
+
+async def test_dst(hass):
+    """Test sun event with offset."""
+    hass.config.time_zone = pytz.timezone("CET")
+    test_time = hass.config.time_zone.localize(
+        datetime(2019, 3, 30, 3, 0, 0)
+    ).astimezone(pytz.UTC)
+    config = {
+        "binary_sensor": [
+            {"platform": "tod", "name": "Day", "after": "2:30", "before": "2:40"}
+        ]
+    }
+    # after 2019-03-30 03:00 CET the next update should ge scheduled
+    # at 3:30 not 2:30 local time
+    # Internally the
+    entity_id = "binary_sensor.day"
+    testtime = test_time
+    with patch(
+        "homeassistant.components.tod.binary_sensor.dt_util.utcnow",
+        return_value=testtime,
+    ):
+        await async_setup_component(hass, "binary_sensor", config)
+        await hass.async_block_till_done()
+
+        await hass.async_block_till_done()
+        state = hass.states.get(entity_id)
+        state.attributes["after"] == "2019-03-31T03:30:00+02:00"
+        state.attributes["before"] == "2019-03-31T03:40:00+02:00"
+        state.attributes["next_update"] == "2019-03-31T03:30:00+02:00"
+        assert state.state == STATE_OFF
diff --git a/tests/components/totalconnect/test_config_flow.py b/tests/components/totalconnect/test_config_flow.py
index 80cfe7a81f8..fd8cdcc5116 100644
--- a/tests/components/totalconnect/test_config_flow.py
+++ b/tests/components/totalconnect/test_config_flow.py
@@ -100,4 +100,4 @@ async def test_login_failed(hass):
         )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result["errors"] == {"base": "login"}
+    assert result["errors"] == {"base": "invalid_auth"}
diff --git a/tests/components/tplink/test_common.py b/tests/components/tplink/test_common.py
deleted file mode 100644
index 9c219f1ba83..00000000000
--- a/tests/components/tplink/test_common.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""Common code tests."""
-from datetime import timedelta
-
-from pyHS100 import SmartDeviceException
-
-from homeassistant.components.tplink.common import async_add_entities_retry
-from homeassistant.helpers.typing import HomeAssistantType
-
-from tests.async_mock import MagicMock
-
-
-async def test_async_add_entities_retry(hass: HomeAssistantType):
-    """Test interval callback."""
-    async_add_entities_callback = MagicMock()
-
-    # The objects that will be passed to async_add_entities_callback.
-    objects = ["Object 1", "Object 2", "Object 3", "Object 4"]
-
-    # For each call to async_add_entities_callback, the following side effects
-    # will be triggered in order. This set of side effects accurateley simulates
-    # 3 attempts to add all entities while also handling several return types.
-    # To help understand what's going on, a comment exists describing what the
-    # object list looks like throughout the iterations.
-    callback_side_effects = [
-        # OB1, OB2, OB3, OB4
-        False,
-        False,
-        True,  # Object 3
-        False,
-        # OB1, OB2, OB4
-        True,  # Object 1
-        SmartDeviceException("My error"),
-        False,
-        # OB2, OB4
-        True,  # Object 2
-        True,  # Object 4
-    ]
-
-    callback = MagicMock(side_effect=callback_side_effects)
-
-    await async_add_entities_retry(
-        hass,
-        async_add_entities_callback,
-        objects,
-        callback,
-        interval=timedelta(milliseconds=100),
-    )
-    await hass.async_block_till_done()
-
-    assert callback.call_count == len(callback_side_effects)
-
-
-async def test_async_add_entities_retry_cancel(hass: HomeAssistantType):
-    """Test interval callback."""
-    async_add_entities_callback = MagicMock()
-
-    callback_side_effects = [
-        False,
-        False,
-        True,  # Object 1
-        False,
-        True,  # Object 2
-        SmartDeviceException("My error"),
-        False,
-        True,  # Object 3
-        True,  # Object 4
-    ]
-
-    callback = MagicMock(side_effect=callback_side_effects)
-
-    objects = ["Object 1", "Object 2", "Object 3", "Object 4"]
-    cancel = await async_add_entities_retry(
-        hass,
-        async_add_entities_callback,
-        objects,
-        callback,
-        interval=timedelta(milliseconds=100),
-    )
-    cancel()
-    await hass.async_block_till_done()
-
-    assert callback.call_count == 4
diff --git a/tests/components/tplink/test_light.py b/tests/components/tplink/test_light.py
index cc9ecff896f..48812f8fb2b 100644
--- a/tests/components/tplink/test_light.py
+++ b/tests/components/tplink/test_light.py
@@ -1,4 +1,6 @@
 """Tests for light platform."""
+from datetime import timedelta
+import logging
 from typing import Callable, NamedTuple
 
 from pyHS100 import SmartDeviceException
@@ -20,6 +22,7 @@ from homeassistant.components.tplink.common import (
     CONF_DISCOVERY,
     CONF_LIGHT,
 )
+from homeassistant.components.tplink.light import SLEEP_TIME
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     CONF_HOST,
@@ -28,8 +31,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
+from homeassistant.util.dt import utcnow
 
 from tests.async_mock import Mock, PropertyMock, patch
+from tests.common import async_fire_time_changed
 
 
 class LightMockData(NamedTuple):
@@ -474,20 +479,6 @@ async def test_get_light_state_retry(
 
     light_mock_data.get_sysinfo_mock.side_effect = get_sysinfo_side_effect
 
-    # Setup test for retries of getting state information.
-    get_state_call_count = 0
-
-    def get_light_state_side_effect():
-        nonlocal get_state_call_count
-        get_state_call_count += 1
-
-        if get_state_call_count == 1:
-            raise SmartDeviceException()
-
-        return light_mock_data.light_state
-
-    light_mock_data.get_light_state_mock.side_effect = get_light_state_side_effect
-
     # Setup test for retries of setting state information.
     set_state_call_count = 0
 
@@ -534,3 +525,92 @@ async def test_get_light_state_retry(
     assert light_mock_data.get_sysinfo_mock.call_count < 40
     assert light_mock_data.get_light_state_mock.call_count < 40
     assert light_mock_data.set_light_state_mock.call_count < 10
+
+
+async def test_update_failure(
+    hass: HomeAssistant, light_mock_data: LightMockData, caplog
+):
+    """Test that update failures are logged."""
+
+    await async_setup_component(hass, HA_DOMAIN, {})
+    await hass.async_block_till_done()
+
+    await async_setup_component(
+        hass,
+        tplink.DOMAIN,
+        {
+            tplink.DOMAIN: {
+                CONF_DISCOVERY: False,
+                CONF_LIGHT: [{CONF_HOST: "123.123.123.123"}],
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    caplog.clear()
+    caplog.set_level(logging.WARNING)
+    await hass.helpers.entity_component.async_update_entity("light.light1")
+    assert caplog.text == ""
+
+    with patch("homeassistant.components.tplink.light.MAX_ATTEMPTS", 0):
+        caplog.clear()
+        caplog.set_level(logging.WARNING)
+        await hass.helpers.entity_component.async_update_entity("light.light1")
+        assert "Could not read state for 123.123.123.123|light1" in caplog.text
+
+    get_state_call_count = 0
+
+    def get_light_state_side_effect():
+        nonlocal get_state_call_count
+        get_state_call_count += 1
+
+        if get_state_call_count == 1:
+            raise SmartDeviceException()
+
+        return light_mock_data.light_state
+
+    light_mock_data.get_light_state_mock.side_effect = get_light_state_side_effect
+
+    with patch("homeassistant.components.tplink.light", MAX_ATTEMPTS=2, SLEEP_TIME=0):
+        caplog.clear()
+        caplog.set_level(logging.DEBUG)
+
+        await update_entity(hass, "light.light1")
+        assert (
+            f"Retrying in {SLEEP_TIME} seconds for 123.123.123.123|light1"
+            in caplog.text
+        )
+        assert "Device 123.123.123.123|light1 responded after " in caplog.text
+
+
+async def test_async_setup_entry_unavailable(
+    hass: HomeAssistant, light_mock_data: LightMockData, caplog
+):
+    """Test unavailable devices trigger a later retry."""
+    caplog.clear()
+    caplog.set_level(logging.WARNING)
+
+    with patch(
+        "homeassistant.components.tplink.common.SmartDevice.get_sysinfo",
+        side_effect=SmartDeviceException,
+    ):
+        await async_setup_component(hass, HA_DOMAIN, {})
+        await hass.async_block_till_done()
+
+        await async_setup_component(
+            hass,
+            tplink.DOMAIN,
+            {
+                tplink.DOMAIN: {
+                    CONF_DISCOVERY: False,
+                    CONF_LIGHT: [{CONF_HOST: "123.123.123.123"}],
+                }
+            },
+        )
+
+        await hass.async_block_till_done()
+        assert not hass.states.get("light.light1")
+
+    future = utcnow() + timedelta(seconds=30)
+    async_fire_time_changed(hass, future)
+    await hass.async_block_till_done()
+    assert hass.states.get("light.light1")
diff --git a/tests/components/transmission/test_config_flow.py b/tests/components/transmission/test_config_flow.py
index 0820e71ae3b..0b57ab59913 100644
--- a/tests/components/transmission/test_config_flow.py
+++ b/tests/components/transmission/test_config_flow.py
@@ -264,8 +264,8 @@ async def test_error_on_wrong_credentials(hass, auth_error):
     )
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["errors"] == {
-        CONF_USERNAME: "wrong_credentials",
-        CONF_PASSWORD: "wrong_credentials",
+        CONF_USERNAME: "invalid_auth",
+        CONF_PASSWORD: "invalid_auth",
     }
 
 
diff --git a/tests/components/transport_nsw/test_sensor.py b/tests/components/transport_nsw/test_sensor.py
index d2aa8fb9387..a6f9c7dfd7f 100644
--- a/tests/components/transport_nsw/test_sensor.py
+++ b/tests/components/transport_nsw/test_sensor.py
@@ -1,10 +1,7 @@
 """The tests for the Transport NSW (AU) sensor platform."""
-import unittest
-
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
 
 VALID_CONFIG = {
     "sensor": {
@@ -31,24 +28,16 @@ def get_departuresMock(_stop_id, route, destination, api_key):
     return data
 
 
-class TestRMVtransportSensor(unittest.TestCase):
-    """Test the TransportNSW sensor."""
-
-    def setUp(self):
-        """Set up things to run when tests begin."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
-
-    @patch("TransportNSW.TransportNSW.get_departures", side_effect=get_departuresMock)
-    def test_transportnsw_config(self, mock_get_departures):
-        """Test minimal TransportNSW configuration."""
-        assert setup_component(self.hass, "sensor", VALID_CONFIG)
-        self.hass.block_till_done()
-        state = self.hass.states.get("sensor.next_bus")
-        assert state.state == "16"
-        assert state.attributes["stop_id"] == "209516"
-        assert state.attributes["route"] == "199"
-        assert state.attributes["delay"] == 6
-        assert state.attributes["real_time"] == "y"
-        assert state.attributes["destination"] == "Palm Beach"
-        assert state.attributes["mode"] == "Bus"
+@patch("TransportNSW.TransportNSW.get_departures", side_effect=get_departuresMock)
+async def test_transportnsw_config(mocked_get_departures, hass):
+    """Test minimal TransportNSW configuration."""
+    assert await async_setup_component(hass, "sensor", VALID_CONFIG)
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.next_bus")
+    assert state.state == "16"
+    assert state.attributes["stop_id"] == "209516"
+    assert state.attributes["route"] == "199"
+    assert state.attributes["delay"] == 6
+    assert state.attributes["real_time"] == "y"
+    assert state.attributes["destination"] == "Palm Beach"
+    assert state.attributes["mode"] == "Bus"
diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py
index d5f099175b1..d66efec8c64 100644
--- a/tests/components/tts/test_init.py
+++ b/tests/components/tts/test_init.py
@@ -73,7 +73,7 @@ def empty_cache_dir(tmp_path, mock_init_cache_dir, mock_get_cache_files, request
     assert False
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture()
 def mutagen_mock():
     """Mock writing tags."""
     with patch(
@@ -480,7 +480,7 @@ async def test_setup_component_and_test_service_with_receive_voice(
         "42f18378fd4393d18c8dd11d03fa9563c1e54491_en_-_demo.mp3",
         demo_data,
         demo_provider,
-        "AI person is in front of your door.",
+        "There is someone at the door.",
         "en",
         None,
     )
@@ -716,3 +716,24 @@ async def test_setup_component_and_web_get_url_bad_config(hass, hass_client):
 
     req = await client.post(url, json=data)
     assert req.status == 400
+
+
+async def test_tags_with_wave(hass, demo_provider):
+    """Set up the demo platform and call service and receive voice."""
+
+    # below data represents an empty wav file
+    demo_data = bytes.fromhex(
+        "52 49 46 46 24 00 00 00 57 41 56 45 66 6d 74 20 10 00 00 00 01 00 02 00"
+        + "22 56 00 00 88 58 01 00 04 00 10 00 64 61 74 61 00 00 00 00"
+    )
+
+    tagged_data = tts.SpeechManager.write_tags(
+        "42f18378fd4393d18c8dd11d03fa9563c1e54491_en_-_demo.wav",
+        demo_data,
+        demo_provider,
+        "AI person is in front of your door.",
+        "en",
+        None,
+    )
+
+    assert tagged_data != demo_data
diff --git a/tests/components/tts/test_notify.py b/tests/components/tts/test_notify.py
new file mode 100644
index 00000000000..90c0175831f
--- /dev/null
+++ b/tests/components/tts/test_notify.py
@@ -0,0 +1,92 @@
+"""The tests for the TTS component."""
+import pytest
+import yarl
+
+import homeassistant.components.media_player as media_player
+from homeassistant.components.media_player.const import (
+    DOMAIN as DOMAIN_MP,
+    SERVICE_PLAY_MEDIA,
+)
+import homeassistant.components.notify as notify
+import homeassistant.components.tts as tts
+from homeassistant.config import async_process_ha_core_config
+from homeassistant.setup import async_setup_component
+
+from tests.async_mock import patch
+from tests.common import assert_setup_component, async_mock_service
+
+
+def relative_url(url):
+    """Convert an absolute url to a relative one."""
+    return str(yarl.URL(url).relative())
+
+
+@pytest.fixture(autouse=True)
+def mutagen_mock():
+    """Mock writing tags."""
+    with patch(
+        "homeassistant.components.tts.SpeechManager.write_tags",
+        side_effect=lambda *args: args[1],
+    ):
+        yield
+
+
+@pytest.fixture(autouse=True)
+async def internal_url_mock(hass):
+    """Mock internal URL of the instance."""
+    await async_process_ha_core_config(
+        hass,
+        {"internal_url": "http://example.local:8123"},
+    )
+
+
+async def test_setup_platform(hass):
+    """Set up the tts platform ."""
+    config = {
+        notify.DOMAIN: {
+            "platform": "tts",
+            "name": "tts_test",
+            "tts_service": "tts.demo_say",
+            "media_player": "media_player.demo",
+        }
+    }
+    with assert_setup_component(1, notify.DOMAIN):
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+
+    assert hass.services.has_service(notify.DOMAIN, "tts_test")
+
+
+async def test_setup_component_and_test_service(hass):
+    """Set up the demo platform and call service."""
+    calls = async_mock_service(hass, DOMAIN_MP, SERVICE_PLAY_MEDIA)
+
+    config = {
+        tts.DOMAIN: {"platform": "demo"},
+        media_player.DOMAIN: {"platform": "demo"},
+        notify.DOMAIN: {
+            "platform": "tts",
+            "name": "tts_test",
+            "tts_service": "tts.demo_say",
+            "media_player": "media_player.demo",
+            "language": "en",
+        },
+    }
+
+    with assert_setup_component(1, tts.DOMAIN):
+        assert await async_setup_component(hass, tts.DOMAIN, config)
+
+    with assert_setup_component(1, notify.DOMAIN):
+        assert await async_setup_component(hass, notify.DOMAIN, config)
+
+    await hass.services.async_call(
+        notify.DOMAIN,
+        "tts_test",
+        {
+            tts.ATTR_MESSAGE: "There is someone at the door.",
+        },
+        blocking=True,
+    )
+
+    await hass.async_block_till_done()
+
+    assert len(calls) == 1
diff --git a/tests/components/tuya/test_config_flow.py b/tests/components/tuya/test_config_flow.py
index 2ce298640de..81154a368ff 100644
--- a/tests/components/tuya/test_config_flow.py
+++ b/tests/components/tuya/test_config_flow.py
@@ -120,14 +120,14 @@ async def test_abort_on_invalid_credentials(hass, tuya):
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result["errors"] == {"base": "auth_failed"}
+    assert result["errors"] == {"base": "invalid_auth"}
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=TUYA_USER_DATA
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "auth_failed"
+    assert result["reason"] == "invalid_auth"
 
 
 async def test_abort_on_connection_error(hass, tuya):
@@ -139,11 +139,11 @@ async def test_abort_on_connection_error(hass, tuya):
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "conn_error"
+    assert result["reason"] == "cannot_connect"
 
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": config_entries.SOURCE_IMPORT}, data=TUYA_USER_DATA
     )
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "conn_error"
+    assert result["reason"] == "cannot_connect"
diff --git a/tests/components/twentemilieu/test_config_flow.py b/tests/components/twentemilieu/test_config_flow.py
index d176c6b1ee4..ec3edf73f29 100644
--- a/tests/components/twentemilieu/test_config_flow.py
+++ b/tests/components/twentemilieu/test_config_flow.py
@@ -43,7 +43,7 @@ async def test_connection_error(hass, aioclient_mock):
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     assert result["step_id"] == "user"
-    assert result["errors"] == {"base": "connection_error"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_invalid_address(hass, aioclient_mock):
@@ -80,7 +80,7 @@ async def test_address_already_set_up(hass, aioclient_mock):
     result = await flow.async_step_user(user_input=FIXTURE_USER_INPUT)
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "address_already_set_up"
+    assert result["reason"] == "already_configured"
 
 
 async def test_full_flow_implementation(hass, aioclient_mock):
diff --git a/tests/components/uk_transport/test_sensor.py b/tests/components/uk_transport/test_sensor.py
index 81cfa7ae8ae..ff6cf3d1142 100644
--- a/tests/components/uk_transport/test_sensor.py
+++ b/tests/components/uk_transport/test_sensor.py
@@ -1,6 +1,5 @@
 """The tests for the uk_transport platform."""
 import re
-import unittest
 
 import requests_mock
 
@@ -16,11 +15,11 @@ from homeassistant.components.uk_transport.sensor import (
     CONF_API_APP_KEY,
     UkTransportSensor,
 )
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import now
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant, load_fixture
+from tests.common import load_fixture
 
 BUS_ATCOCODE = "340000368SHE"
 BUS_DIRECTION = "Wantage"
@@ -28,73 +27,63 @@ TRAIN_STATION_CODE = "WIM"
 TRAIN_DESTINATION_NAME = "WAT"
 
 VALID_CONFIG = {
-    "platform": "uk_transport",
-    CONF_API_APP_ID: "foo",
-    CONF_API_APP_KEY: "ebcd1234",
-    "queries": [
-        {"mode": "bus", "origin": BUS_ATCOCODE, "destination": BUS_DIRECTION},
-        {
-            "mode": "train",
-            "origin": TRAIN_STATION_CODE,
-            "destination": TRAIN_DESTINATION_NAME,
-        },
-    ],
+    "sensor": {
+        "platform": "uk_transport",
+        CONF_API_APP_ID: "foo",
+        CONF_API_APP_KEY: "ebcd1234",
+        "queries": [
+            {"mode": "bus", "origin": BUS_ATCOCODE, "destination": BUS_DIRECTION},
+            {
+                "mode": "train",
+                "origin": TRAIN_STATION_CODE,
+                "destination": TRAIN_DESTINATION_NAME,
+            },
+        ],
+    }
 }
 
 
-class TestUkTransportSensor(unittest.TestCase):
-    """Test the uk_transport platform."""
+async def test_bus(hass):
+    """Test for operational uk_transport sensor with proper attributes."""
+    with requests_mock.Mocker() as mock_req:
+        uri = re.compile(UkTransportSensor.TRANSPORT_API_URL_BASE + "*")
+        mock_req.get(uri, text=load_fixture("uk_transport_bus.json"))
+        assert await async_setup_component(hass, "sensor", VALID_CONFIG)
+        await hass.async_block_till_done()
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.config = VALID_CONFIG
-        self.addCleanup(self.hass.stop)
+    bus_state = hass.states.get("sensor.next_bus_to_wantage")
+    assert None is not bus_state
+    assert f"Next bus to {BUS_DIRECTION}" == bus_state.name
+    assert BUS_ATCOCODE == bus_state.attributes[ATTR_ATCOCODE]
+    assert "Harwell Campus" == bus_state.attributes[ATTR_LOCALITY]
+    assert "Bus Station" == bus_state.attributes[ATTR_STOP_NAME]
+    assert 2 == len(bus_state.attributes.get(ATTR_NEXT_BUSES))
 
-    @requests_mock.Mocker()
-    def test_bus(self, mock_req):
-        """Test for operational uk_transport sensor with proper attributes."""
-        with requests_mock.Mocker() as mock_req:
-            uri = re.compile(UkTransportSensor.TRANSPORT_API_URL_BASE + "*")
-            mock_req.get(uri, text=load_fixture("uk_transport_bus.json"))
-            assert setup_component(self.hass, "sensor", {"sensor": self.config})
-            self.hass.block_till_done()
+    direction_re = re.compile(BUS_DIRECTION)
+    for bus in bus_state.attributes.get(ATTR_NEXT_BUSES):
+        assert None is not bus
+        assert None is not direction_re.search(bus["direction"])
 
-        bus_state = self.hass.states.get("sensor.next_bus_to_wantage")
 
-        assert type(bus_state.state) == str
-        assert bus_state.name == f"Next bus to {BUS_DIRECTION}"
-        assert bus_state.attributes.get(ATTR_ATCOCODE) == BUS_ATCOCODE
-        assert bus_state.attributes.get(ATTR_LOCALITY) == "Harwell Campus"
-        assert bus_state.attributes.get(ATTR_STOP_NAME) == "Bus Station"
-        assert len(bus_state.attributes.get(ATTR_NEXT_BUSES)) == 2
+async def test_train(hass):
+    """Test for operational uk_transport sensor with proper attributes."""
+    with requests_mock.Mocker() as mock_req, patch(
+        "homeassistant.util.dt.now", return_value=now().replace(hour=13)
+    ):
+        uri = re.compile(UkTransportSensor.TRANSPORT_API_URL_BASE + "*")
+        mock_req.get(uri, text=load_fixture("uk_transport_train.json"))
+        assert await async_setup_component(hass, "sensor", VALID_CONFIG)
+        await hass.async_block_till_done()
 
-        direction_re = re.compile(BUS_DIRECTION)
-        for bus in bus_state.attributes.get(ATTR_NEXT_BUSES):
-            print(bus["direction"], direction_re.match(bus["direction"]))
-            assert direction_re.search(bus["direction"]) is not None
+    train_state = hass.states.get("sensor.next_train_to_WAT")
+    assert None is not train_state
+    assert f"Next train to {TRAIN_DESTINATION_NAME}" == train_state.name
+    assert TRAIN_STATION_CODE == train_state.attributes[ATTR_STATION_CODE]
+    assert TRAIN_DESTINATION_NAME == train_state.attributes[ATTR_CALLING_AT]
+    assert 25 == len(train_state.attributes.get(ATTR_NEXT_TRAINS))
 
-    @requests_mock.Mocker()
-    def test_train(self, mock_req):
-        """Test for operational uk_transport sensor with proper attributes."""
-        with requests_mock.Mocker() as mock_req, patch(
-            "homeassistant.util.dt.now", return_value=now().replace(hour=13)
-        ):
-            uri = re.compile(UkTransportSensor.TRANSPORT_API_URL_BASE + "*")
-            mock_req.get(uri, text=load_fixture("uk_transport_train.json"))
-            assert setup_component(self.hass, "sensor", {"sensor": self.config})
-            self.hass.block_till_done()
-
-        train_state = self.hass.states.get("sensor.next_train_to_WAT")
-
-        assert type(train_state.state) == str
-        assert train_state.name == f"Next train to {TRAIN_DESTINATION_NAME}"
-        assert train_state.attributes.get(ATTR_STATION_CODE) == TRAIN_STATION_CODE
-        assert train_state.attributes.get(ATTR_CALLING_AT) == TRAIN_DESTINATION_NAME
-        assert len(train_state.attributes.get(ATTR_NEXT_TRAINS)) == 25
-
-        assert (
-            train_state.attributes.get(ATTR_NEXT_TRAINS)[0]["destination_name"]
-            == "London Waterloo"
-        )
-        assert train_state.attributes.get(ATTR_NEXT_TRAINS)[0]["estimated"] == "06:13"
+    assert (
+        "London Waterloo"
+        == train_state.attributes[ATTR_NEXT_TRAINS][0]["destination_name"]
+    )
+    assert "06:13" == train_state.attributes[ATTR_NEXT_TRAINS][0]["estimated"]
diff --git a/tests/components/upb/test_config_flow.py b/tests/components/upb/test_config_flow.py
index c1440caedfd..f0b44a4bad8 100644
--- a/tests/components/upb/test_config_flow.py
+++ b/tests/components/upb/test_config_flow.py
@@ -107,7 +107,7 @@ async def test_form_user_with_already_configured(hass):
     _ = await valid_tcp_flow(hass)
     result2 = await valid_tcp_flow(hass)
     assert result2["type"] == "abort"
-    assert result2["reason"] == "address_already_configured"
+    assert result2["reason"] == "already_configured"
     await hass.async_block_till_done()
 
 
diff --git a/tests/components/upcloud/__init__.py b/tests/components/upcloud/__init__.py
new file mode 100644
index 00000000000..543ee65c713
--- /dev/null
+++ b/tests/components/upcloud/__init__.py
@@ -0,0 +1 @@
+"""Tests for the UpCloud integration."""
diff --git a/tests/components/upcloud/test_config_flow.py b/tests/components/upcloud/test_config_flow.py
new file mode 100644
index 00000000000..7fce853b5d3
--- /dev/null
+++ b/tests/components/upcloud/test_config_flow.py
@@ -0,0 +1,94 @@
+"""Tests for the UpCloud config flow."""
+
+import requests.exceptions
+from requests_mock import ANY
+from upcloud_api import UpCloudAPIError
+
+from homeassistant import config_entries, data_entry_flow
+from homeassistant.components.upcloud.const import DOMAIN
+from homeassistant.const import CONF_PASSWORD, CONF_SCAN_INTERVAL, CONF_USERNAME
+
+from tests.common import MockConfigEntry
+
+FIXTURE_USER_INPUT = {
+    CONF_USERNAME: "user",
+    CONF_PASSWORD: "pass",
+}
+
+FIXTURE_USER_INPUT_OPTIONS = {
+    CONF_SCAN_INTERVAL: "120",
+}
+
+
+async def test_show_set_form(hass):
+    """Test that the setup form is served."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}, data=None
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+
+
+async def test_connection_error(hass, requests_mock):
+    """Test we show user form on connection error."""
+    requests_mock.request(ANY, ANY, exc=requests.exceptions.ConnectionError())
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}, data=FIXTURE_USER_INPUT
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "cannot_connect"}
+
+
+async def test_login_error(hass, requests_mock):
+    """Test we show user form with appropriate error on response failure."""
+    requests_mock.request(
+        ANY,
+        ANY,
+        exc=UpCloudAPIError(
+            error_code="AUTHENTICATION_FAILED",
+            error_message="Authentication failed using the given username and password.",
+        ),
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}, data=FIXTURE_USER_INPUT
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "user"
+    assert result["errors"] == {"base": "invalid_auth"}
+
+
+async def test_success(hass, requests_mock):
+    """Test successful flow provides entry creation data."""
+    requests_mock.request(ANY, ANY, text='{"account":{"username":"user"}}')
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}, data=FIXTURE_USER_INPUT
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["data"][CONF_USERNAME] == FIXTURE_USER_INPUT[CONF_USERNAME]
+    assert result["data"][CONF_PASSWORD] == FIXTURE_USER_INPUT[CONF_PASSWORD]
+
+
+async def test_options(hass):
+    """Test options produce expected data."""
+
+    config_entry = MockConfigEntry(
+        domain=DOMAIN, data=FIXTURE_USER_INPUT, options=FIXTURE_USER_INPUT_OPTIONS
+    )
+    config_entry.add_to_hass(hass)
+
+    result = await hass.config_entries.options.async_init(config_entry.entry_id)
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
+
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input=FIXTURE_USER_INPUT_OPTIONS,
+    )
+    assert result["data"][CONF_SCAN_INTERVAL] == int(
+        FIXTURE_USER_INPUT_OPTIONS[CONF_SCAN_INTERVAL]
+    )
diff --git a/tests/components/uptime/test_sensor.py b/tests/components/uptime/test_sensor.py
index 08758741b95..fd0c03239f7 100644
--- a/tests/components/uptime/test_sensor.py
+++ b/tests/components/uptime/test_sensor.py
@@ -1,90 +1,85 @@
 """The tests for the uptime sensor platform."""
-import asyncio
 from datetime import timedelta
-import unittest
 
 from homeassistant.components.uptime.sensor import UptimeSensor
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
 from tests.async_mock import patch
-from tests.common import get_test_home_assistant
 
 
-class TestUptimeSensor(unittest.TestCase):
-    """Test the uptime sensor."""
+async def test_uptime_min_config(hass):
+    """Test minimum uptime configuration."""
+    config = {"sensor": {"platform": "uptime"}}
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.uptime")
+    assert state.attributes.get("unit_of_measurement") == "days"
 
-    def setUp(self):
-        """Set up things to run when tests begin."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
 
-    def test_uptime_min_config(self):
-        """Test minimum uptime configuration."""
-        config = {"sensor": {"platform": "uptime"}}
-        assert setup_component(self.hass, "sensor", config)
+async def test_uptime_sensor_name_change(hass):
+    """Test uptime sensor with different name."""
+    config = {"sensor": {"platform": "uptime", "name": "foobar"}}
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.foobar")
+    assert state.attributes.get("unit_of_measurement") == "days"
 
-    def test_uptime_sensor_name_change(self):
-        """Test uptime sensor with different name."""
-        config = {"sensor": {"platform": "uptime", "name": "foobar"}}
-        assert setup_component(self.hass, "sensor", config)
 
-    def test_uptime_sensor_config_hours(self):
-        """Test uptime sensor with hours defined in config."""
-        config = {"sensor": {"platform": "uptime", "unit_of_measurement": "hours"}}
-        assert setup_component(self.hass, "sensor", config)
+async def test_uptime_sensor_config_hours(hass):
+    """Test uptime sensor with hours defined in config."""
+    config = {"sensor": {"platform": "uptime", "unit_of_measurement": "hours"}}
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.uptime")
+    assert state.attributes.get("unit_of_measurement") == "hours"
 
-    def test_uptime_sensor_config_minutes(self):
-        """Test uptime sensor with minutes defined in config."""
-        config = {"sensor": {"platform": "uptime", "unit_of_measurement": "minutes"}}
-        assert setup_component(self.hass, "sensor", config)
 
-    def test_uptime_sensor_days_output(self):
-        """Test uptime sensor output data."""
-        sensor = UptimeSensor("test", "days")
-        assert sensor.unit_of_measurement == "days"
-        new_time = sensor.initial + timedelta(days=1)
-        with patch("homeassistant.util.dt.now", return_value=new_time):
-            asyncio.run_coroutine_threadsafe(
-                sensor.async_update(), self.hass.loop
-            ).result()
-            assert sensor.state == 1.00
-        new_time = sensor.initial + timedelta(days=111.499)
-        with patch("homeassistant.util.dt.now", return_value=new_time):
-            asyncio.run_coroutine_threadsafe(
-                sensor.async_update(), self.hass.loop
-            ).result()
-            assert sensor.state == 111.50
+async def test_uptime_sensor_config_minutes(hass):
+    """Test uptime sensor with minutes defined in config."""
+    config = {"sensor": {"platform": "uptime", "unit_of_measurement": "minutes"}}
+    assert await async_setup_component(hass, "sensor", config)
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.uptime")
+    assert state.attributes.get("unit_of_measurement") == "minutes"
 
-    def test_uptime_sensor_hours_output(self):
-        """Test uptime sensor output data."""
-        sensor = UptimeSensor("test", "hours")
-        assert sensor.unit_of_measurement == "hours"
-        new_time = sensor.initial + timedelta(hours=16)
-        with patch("homeassistant.util.dt.now", return_value=new_time):
-            asyncio.run_coroutine_threadsafe(
-                sensor.async_update(), self.hass.loop
-            ).result()
-            assert sensor.state == 16.00
-        new_time = sensor.initial + timedelta(hours=72.499)
-        with patch("homeassistant.util.dt.now", return_value=new_time):
-            asyncio.run_coroutine_threadsafe(
-                sensor.async_update(), self.hass.loop
-            ).result()
-            assert sensor.state == 72.50
 
-    def test_uptime_sensor_minutes_output(self):
-        """Test uptime sensor output data."""
-        sensor = UptimeSensor("test", "minutes")
-        assert sensor.unit_of_measurement == "minutes"
-        new_time = sensor.initial + timedelta(minutes=16)
-        with patch("homeassistant.util.dt.now", return_value=new_time):
-            asyncio.run_coroutine_threadsafe(
-                sensor.async_update(), self.hass.loop
-            ).result()
-            assert sensor.state == 16.00
-        new_time = sensor.initial + timedelta(minutes=12.499)
-        with patch("homeassistant.util.dt.now", return_value=new_time):
-            asyncio.run_coroutine_threadsafe(
-                sensor.async_update(), self.hass.loop
-            ).result()
-            assert sensor.state == 12.50
+async def test_uptime_sensor_days_output(hass):
+    """Test uptime sensor output data."""
+    sensor = UptimeSensor("test", "days")
+    assert sensor.unit_of_measurement == "days"
+    new_time = sensor.initial + timedelta(days=1)
+    with patch("homeassistant.util.dt.now", return_value=new_time):
+        await sensor.async_update()
+        assert sensor.state == 1.00
+    new_time = sensor.initial + timedelta(days=111.499)
+    with patch("homeassistant.util.dt.now", return_value=new_time):
+        await sensor.async_update()
+        assert sensor.state == 111.50
+
+
+async def test_uptime_sensor_hours_output(hass):
+    """Test uptime sensor output data."""
+    sensor = UptimeSensor("test", "hours")
+    assert sensor.unit_of_measurement == "hours"
+    new_time = sensor.initial + timedelta(hours=16)
+    with patch("homeassistant.util.dt.now", return_value=new_time):
+        await sensor.async_update()
+        assert sensor.state == 16.00
+    new_time = sensor.initial + timedelta(hours=72.499)
+    with patch("homeassistant.util.dt.now", return_value=new_time):
+        await sensor.async_update()
+        assert sensor.state == 72.50
+
+
+async def test_uptime_sensor_minutes_output(hass):
+    """Test uptime sensor output data."""
+    sensor = UptimeSensor("test", "minutes")
+    assert sensor.unit_of_measurement == "minutes"
+    new_time = sensor.initial + timedelta(minutes=16)
+    with patch("homeassistant.util.dt.now", return_value=new_time):
+        await sensor.async_update()
+        assert sensor.state == 16.00
+    new_time = sensor.initial + timedelta(minutes=12.499)
+    with patch("homeassistant.util.dt.now", return_value=new_time):
+        await sensor.async_update()
+        assert sensor.state == 12.50
diff --git a/tests/components/utility_meter/test_init.py b/tests/components/utility_meter/test_init.py
index f946ce352a5..c3a5d829a05 100644
--- a/tests/components/utility_meter/test_init.py
+++ b/tests/components/utility_meter/test_init.py
@@ -1,6 +1,5 @@
 """The tests for the utility_meter component."""
 from datetime import timedelta
-import logging
 
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.components.utility_meter.const import (
@@ -21,8 +20,6 @@ import homeassistant.util.dt as dt_util
 
 from tests.async_mock import patch
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def test_services(hass):
     """Test energy sensor reset service."""
diff --git a/tests/components/utility_meter/test_sensor.py b/tests/components/utility_meter/test_sensor.py
index 1fff168b748..6a2de3a1cd0 100644
--- a/tests/components/utility_meter/test_sensor.py
+++ b/tests/components/utility_meter/test_sensor.py
@@ -1,7 +1,6 @@
 """The tests for the utility_meter sensor platform."""
 from contextlib import contextmanager
 from datetime import timedelta
-import logging
 
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.components.utility_meter.const import (
@@ -23,8 +22,6 @@ import homeassistant.util.dt as dt_util
 from tests.async_mock import patch
 from tests.common import async_fire_time_changed
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @contextmanager
 def alter_time(retval):
diff --git a/tests/components/vesync/test_config_flow.py b/tests/components/vesync/test_config_flow.py
index aedf94da4ab..c82307d351c 100644
--- a/tests/components/vesync/test_config_flow.py
+++ b/tests/components/vesync/test_config_flow.py
@@ -17,7 +17,7 @@ async def test_abort_already_setup(hass):
     result = await flow.async_step_user()
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "already_setup"
+    assert result["reason"] == "single_instance_allowed"
 
 
 async def test_invalid_login_error(hass):
@@ -29,7 +29,7 @@ async def test_invalid_login_error(hass):
         result = await flow.async_step_user(user_input=test_dict)
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-    assert result["errors"] == {"base": "invalid_login"}
+    assert result["errors"] == {"base": "invalid_auth"}
 
 
 async def test_config_flow_configuration_yaml(hass):
diff --git a/tests/components/vilfo/test_config_flow.py b/tests/components/vilfo/test_config_flow.py
index 167fc71a78a..f14ec123ba5 100644
--- a/tests/components/vilfo/test_config_flow.py
+++ b/tests/components/vilfo/test_config_flow.py
@@ -5,7 +5,7 @@ from homeassistant import config_entries, data_entry_flow, setup
 from homeassistant.components.vilfo.const import DOMAIN
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_ID, CONF_MAC
 
-from tests.async_mock import patch
+from tests.async_mock import Mock, patch
 
 
 async def test_form(hass):
@@ -29,6 +29,7 @@ async def test_form(hass):
             result["flow_id"],
             {CONF_HOST: "testadmin.vilfo.com", CONF_ACCESS_TOKEN: "test-token"},
         )
+        await hass.async_block_till_done()
 
     assert result2["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
     assert result2["title"] == "testadmin.vilfo.com"
@@ -142,7 +143,10 @@ async def test_form_unexpected_exception(hass):
         DOMAIN, context={"source": config_entries.SOURCE_USER}
     )
 
-    with patch("vilfo.Client.ping", side_effect=Exception):
+    with patch(
+        "homeassistant.components.vilfo.config_flow.VilfoClient",
+    ) as mock_client:
+        mock_client.return_value.ping = Mock(side_effect=Exception)
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             {"host": "testadmin.vilfo.com", "access_token": "test-token"},
diff --git a/tests/components/vizio/const.py b/tests/components/vizio/const.py
index 6ec746b2c54..963947f1bd3 100644
--- a/tests/components/vizio/const.py
+++ b/tests/components/vizio/const.py
@@ -1,6 +1,4 @@
 """Constants for the Vizio integration tests."""
-import logging
-
 from homeassistant.components.media_player import (
     DEVICE_CLASS_SPEAKER,
     DEVICE_CLASS_TV,
@@ -30,8 +28,6 @@ from homeassistant.const import (
 )
 from homeassistant.util import slugify
 
-_LOGGER = logging.getLogger(__name__)
-
 NAME = "Vizio"
 NAME2 = "Vizio2"
 HOST = "192.168.1.1:9000"
diff --git a/tests/components/vizio/test_config_flow.py b/tests/components/vizio/test_config_flow.py
index 2506a685e43..5cbc2fa5564 100644
--- a/tests/components/vizio/test_config_flow.py
+++ b/tests/components/vizio/test_config_flow.py
@@ -1,6 +1,4 @@
 """Tests for Vizio config flow."""
-import logging
-
 import pytest
 import voluptuous as vol
 
@@ -55,8 +53,6 @@ from .const import (
 
 from tests.common import MockConfigEntry
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def test_user_flow_minimum_fields(
     hass: HomeAssistantType,
diff --git a/tests/components/vizio/test_media_player.py b/tests/components/vizio/test_media_player.py
index c4620b07025..996d46e08a7 100644
--- a/tests/components/vizio/test_media_player.py
+++ b/tests/components/vizio/test_media_player.py
@@ -1,7 +1,6 @@
 """Tests for Vizio config flow."""
 from contextlib import asynccontextmanager
 from datetime import timedelta
-import logging
 from typing import Any, Dict, List, Optional
 
 import pytest
@@ -78,8 +77,6 @@ from .const import (
 from tests.async_mock import call, patch
 from tests.common import MockConfigEntry, async_fire_time_changed
 
-_LOGGER = logging.getLogger(__name__)
-
 
 async def _add_config_entry_to_hass(
     hass: HomeAssistantType, config_entry: MockConfigEntry
diff --git a/tests/components/wake_on_lan/test_switch.py b/tests/components/wake_on_lan/test_switch.py
index 4eae15911c2..598eb3a522e 100644
--- a/tests/components/wake_on_lan/test_switch.py
+++ b/tests/components/wake_on_lan/test_switch.py
@@ -1,266 +1,277 @@
 """The tests for the wake on lan switch platform."""
-import unittest
+import platform
+import subprocess
+
+import pytest
 
 import homeassistant.components.switch as switch
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.setup import setup_component
+from homeassistant.const import (
+    ATTR_ENTITY_ID,
+    SERVICE_TURN_OFF,
+    SERVICE_TURN_ON,
+    STATE_OFF,
+    STATE_ON,
+)
+from homeassistant.setup import async_setup_component
 
-from tests.async_mock import Mock, patch
-from tests.common import get_test_home_assistant, mock_service
-from tests.components.switch import common
-
-TEST_STATE = None
+from tests.async_mock import patch
+from tests.common import async_mock_service
 
 
-def call(cmd, stdout, stderr):
-    """Return fake subprocess return codes."""
-    if cmd[5] == "validhostname" and TEST_STATE:
-        return 0
-    return 2
+@pytest.fixture(autouse=True)
+def mock_send_magic_packet():
+    """Mock magic packet."""
+    with patch("wakeonlan.send_magic_packet") as mock_send:
+        yield mock_send
 
 
-def system():
-    """Fake system call to test the windows platform."""
-    return "Windows"
+async def test_valid_hostname(hass):
+    """Test with valid hostname."""
+    assert await async_setup_component(
+        hass,
+        switch.DOMAIN,
+        {
+            "switch": {
+                "platform": "wake_on_lan",
+                "mac": "00-01-02-03-04-05",
+                "host": "validhostname",
+            }
+        },
+    )
+    await hass.async_block_till_done()
 
+    state = hass.states.get("switch.wake_on_lan")
+    assert STATE_OFF == state.state
 
-class TestWolSwitch(unittest.TestCase):
-    """Test the wol switch."""
+    with patch.object(subprocess, "call", return_value=0):
 
-    send_magic_packet = Mock(return_value=None)
-
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.addCleanup(self.hass.stop)
-
-    @patch("wakeonlan.send_magic_packet", new=send_magic_packet)
-    @patch("subprocess.call", new=call)
-    def test_valid_hostname(self):
-        """Test with valid hostname."""
-        global TEST_STATE
-        TEST_STATE = False
-        assert setup_component(
-            self.hass,
+        await hass.services.async_call(
             switch.DOMAIN,
-            {
-                "switch": {
-                    "platform": "wake_on_lan",
-                    "mac": "00-01-02-03-04-05",
-                    "host": "validhostname",
-                }
-            },
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.wake_on_lan"},
+            blocking=True,
         )
-        self.hass.block_till_done()
 
-        state = self.hass.states.get("switch.wake_on_lan")
-        assert STATE_OFF == state.state
-
-        TEST_STATE = True
-
-        common.turn_on(self.hass, "switch.wake_on_lan")
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("switch.wake_on_lan")
+        state = hass.states.get("switch.wake_on_lan")
         assert STATE_ON == state.state
 
-        common.turn_off(self.hass, "switch.wake_on_lan")
-        self.hass.block_till_done()
+        await hass.services.async_call(
+            switch.DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "switch.wake_on_lan"},
+            blocking=True,
+        )
 
-        state = self.hass.states.get("switch.wake_on_lan")
+        state = hass.states.get("switch.wake_on_lan")
         assert STATE_ON == state.state
 
-    @patch("wakeonlan.send_magic_packet", new=send_magic_packet)
-    @patch("subprocess.call", new=call)
-    @patch("platform.system", new=system)
-    def test_valid_hostname_windows(self):
-        """Test with valid hostname on windows."""
-        global TEST_STATE
-        TEST_STATE = False
-        assert setup_component(
-            self.hass,
+
+async def test_valid_hostname_windows(hass):
+    """Test with valid hostname on windows."""
+    assert await async_setup_component(
+        hass,
+        switch.DOMAIN,
+        {
+            "switch": {
+                "platform": "wake_on_lan",
+                "mac": "00-01-02-03-04-05",
+                "host": "validhostname",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("switch.wake_on_lan")
+    assert STATE_OFF == state.state
+
+    with patch.object(subprocess, "call", return_value=0), patch.object(
+        platform, "system", return_value="Windows"
+    ):
+        await hass.services.async_call(
             switch.DOMAIN,
-            {
-                "switch": {
-                    "platform": "wake_on_lan",
-                    "mac": "00-01-02-03-04-05",
-                    "host": "validhostname",
-                }
-            },
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.wake_on_lan"},
+            blocking=True,
         )
-        self.hass.block_till_done()
 
-        state = self.hass.states.get("switch.wake_on_lan")
-        assert STATE_OFF == state.state
+    state = hass.states.get("switch.wake_on_lan")
+    assert STATE_ON == state.state
 
-        TEST_STATE = True
 
-        common.turn_on(self.hass, "switch.wake_on_lan")
-        self.hass.block_till_done()
+async def test_broadcast_config_ip_and_port(hass, mock_send_magic_packet):
+    """Test with broadcast address and broadcast port config."""
+    mac = "00-01-02-03-04-05"
+    broadcast_address = "255.255.255.255"
+    port = 999
 
-        state = self.hass.states.get("switch.wake_on_lan")
-        assert STATE_ON == state.state
+    assert await async_setup_component(
+        hass,
+        switch.DOMAIN,
+        {
+            "switch": {
+                "platform": "wake_on_lan",
+                "mac": mac,
+                "broadcast_address": broadcast_address,
+                "broadcast_port": port,
+            }
+        },
+    )
+    await hass.async_block_till_done()
 
-    @patch("wakeonlan.send_magic_packet", new=send_magic_packet)
-    @patch("subprocess.call", new=call)
-    def test_broadcast_config_ip_and_port(self):
-        """Test with broadcast address and broadcast port config."""
+    state = hass.states.get("switch.wake_on_lan")
+    assert STATE_OFF == state.state
 
-        mac = "00-01-02-03-04-05"
-        broadcast_address = "255.255.255.255"
-        port = 999
+    with patch.object(subprocess, "call", return_value=0):
 
-        assert setup_component(
-            self.hass,
+        await hass.services.async_call(
             switch.DOMAIN,
-            {
-                "switch": {
-                    "platform": "wake_on_lan",
-                    "mac": mac,
-                    "broadcast_address": broadcast_address,
-                    "broadcast_port": port,
-                }
-            },
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.wake_on_lan"},
+            blocking=True,
         )
-        self.hass.block_till_done()
 
-        state = self.hass.states.get("switch.wake_on_lan")
-        assert STATE_OFF == state.state
-
-        common.turn_on(self.hass, "switch.wake_on_lan")
-        self.hass.block_till_done()
-
-        self.send_magic_packet.assert_called_with(
+        mock_send_magic_packet.assert_called_with(
             mac, ip_address=broadcast_address, port=port
         )
 
-    @patch("wakeonlan.send_magic_packet", new=send_magic_packet)
-    @patch("subprocess.call", new=call)
-    def test_broadcast_config_ip(self):
-        """Test with only broadcast address."""
 
-        mac = "00-01-02-03-04-05"
-        broadcast_address = "255.255.255.255"
+async def test_broadcast_config_ip(hass, mock_send_magic_packet):
+    """Test with only broadcast address."""
 
-        assert setup_component(
-            self.hass,
+    mac = "00-01-02-03-04-05"
+    broadcast_address = "255.255.255.255"
+
+    assert await async_setup_component(
+        hass,
+        switch.DOMAIN,
+        {
+            "switch": {
+                "platform": "wake_on_lan",
+                "mac": mac,
+                "broadcast_address": broadcast_address,
+            }
+        },
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("switch.wake_on_lan")
+    assert STATE_OFF == state.state
+
+    with patch.object(subprocess, "call", return_value=0):
+
+        await hass.services.async_call(
             switch.DOMAIN,
-            {
-                "switch": {
-                    "platform": "wake_on_lan",
-                    "mac": mac,
-                    "broadcast_address": broadcast_address,
-                }
-            },
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.wake_on_lan"},
+            blocking=True,
         )
-        self.hass.block_till_done()
 
-        state = self.hass.states.get("switch.wake_on_lan")
-        assert STATE_OFF == state.state
+        mock_send_magic_packet.assert_called_with(mac, ip_address=broadcast_address)
 
-        common.turn_on(self.hass, "switch.wake_on_lan")
-        self.hass.block_till_done()
 
-        self.send_magic_packet.assert_called_with(mac, ip_address=broadcast_address)
+async def test_broadcast_config_port(hass, mock_send_magic_packet):
+    """Test with only broadcast port config."""
 
-    @patch("wakeonlan.send_magic_packet", new=send_magic_packet)
-    @patch("subprocess.call", new=call)
-    def test_broadcast_config_port(self):
-        """Test with only broadcast port config."""
+    mac = "00-01-02-03-04-05"
+    port = 999
 
-        mac = "00-01-02-03-04-05"
-        port = 999
+    assert await async_setup_component(
+        hass,
+        switch.DOMAIN,
+        {"switch": {"platform": "wake_on_lan", "mac": mac, "broadcast_port": port}},
+    )
+    await hass.async_block_till_done()
 
-        assert setup_component(
-            self.hass,
+    state = hass.states.get("switch.wake_on_lan")
+    assert STATE_OFF == state.state
+
+    with patch.object(subprocess, "call", return_value=0):
+
+        await hass.services.async_call(
             switch.DOMAIN,
-            {
-                "switch": {
-                    "platform": "wake_on_lan",
-                    "mac": mac,
-                    "broadcast_port": port,
-                }
-            },
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.wake_on_lan"},
+            blocking=True,
         )
-        self.hass.block_till_done()
 
-        state = self.hass.states.get("switch.wake_on_lan")
-        assert STATE_OFF == state.state
+        mock_send_magic_packet.assert_called_with(mac, port=port)
 
-        common.turn_on(self.hass, "switch.wake_on_lan")
-        self.hass.block_till_done()
 
-        self.send_magic_packet.assert_called_with(mac, port=port)
+async def test_off_script(hass):
+    """Test with turn off script."""
 
-    @patch("wakeonlan.send_magic_packet", new=send_magic_packet)
-    @patch("subprocess.call", new=call)
-    def test_off_script(self):
-        """Test with turn off script."""
-        global TEST_STATE
-        TEST_STATE = False
-        assert setup_component(
-            self.hass,
+    assert await async_setup_component(
+        hass,
+        switch.DOMAIN,
+        {
+            "switch": {
+                "platform": "wake_on_lan",
+                "mac": "00-01-02-03-04-05",
+                "host": "validhostname",
+                "turn_off": {"service": "shell_command.turn_off_target"},
+            }
+        },
+    )
+    await hass.async_block_till_done()
+    calls = async_mock_service(hass, "shell_command", "turn_off_target")
+
+    state = hass.states.get("switch.wake_on_lan")
+    assert STATE_OFF == state.state
+
+    with patch.object(subprocess, "call", return_value=0):
+
+        await hass.services.async_call(
             switch.DOMAIN,
-            {
-                "switch": {
-                    "platform": "wake_on_lan",
-                    "mac": "00-01-02-03-04-05",
-                    "host": "validhostname",
-                    "turn_off": {"service": "shell_command.turn_off_target"},
-                }
-            },
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.wake_on_lan"},
+            blocking=True,
         )
-        self.hass.block_till_done()
-        calls = mock_service(self.hass, "shell_command", "turn_off_target")
 
-        state = self.hass.states.get("switch.wake_on_lan")
-        assert STATE_OFF == state.state
-
-        TEST_STATE = True
-
-        common.turn_on(self.hass, "switch.wake_on_lan")
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("switch.wake_on_lan")
+        state = hass.states.get("switch.wake_on_lan")
         assert STATE_ON == state.state
         assert len(calls) == 0
 
-        TEST_STATE = False
+    with patch.object(subprocess, "call", return_value=2):
 
-        common.turn_off(self.hass, "switch.wake_on_lan")
-        self.hass.block_till_done()
+        await hass.services.async_call(
+            switch.DOMAIN,
+            SERVICE_TURN_OFF,
+            {ATTR_ENTITY_ID: "switch.wake_on_lan"},
+            blocking=True,
+        )
 
-        state = self.hass.states.get("switch.wake_on_lan")
+        state = hass.states.get("switch.wake_on_lan")
         assert STATE_OFF == state.state
         assert len(calls) == 1
 
-    @patch("wakeonlan.send_magic_packet", new=send_magic_packet)
-    @patch("subprocess.call", new=call)
-    @patch("platform.system", new=system)
-    def test_invalid_hostname_windows(self):
-        """Test with invalid hostname on windows."""
-        global TEST_STATE
-        TEST_STATE = False
-        assert setup_component(
-            self.hass,
+
+async def test_invalid_hostname_windows(hass):
+    """Test with invalid hostname on windows."""
+
+    assert await async_setup_component(
+        hass,
+        switch.DOMAIN,
+        {
+            "switch": {
+                "platform": "wake_on_lan",
+                "mac": "00-01-02-03-04-05",
+                "host": "invalidhostname",
+            }
+        },
+    )
+    await hass.async_block_till_done()
+
+    state = hass.states.get("switch.wake_on_lan")
+    assert STATE_OFF == state.state
+
+    with patch.object(subprocess, "call", return_value=2):
+
+        await hass.services.async_call(
             switch.DOMAIN,
-            {
-                "switch": {
-                    "platform": "wake_on_lan",
-                    "mac": "00-01-02-03-04-05",
-                    "host": "invalidhostname",
-                }
-            },
+            SERVICE_TURN_ON,
+            {ATTR_ENTITY_ID: "switch.wake_on_lan"},
+            blocking=True,
         )
-        self.hass.block_till_done()
 
-        state = self.hass.states.get("switch.wake_on_lan")
-        assert STATE_OFF == state.state
-
-        TEST_STATE = True
-
-        common.turn_on(self.hass, "switch.wake_on_lan")
-        self.hass.block_till_done()
-
-        state = self.hass.states.get("switch.wake_on_lan")
+        state = hass.states.get("switch.wake_on_lan")
         assert STATE_OFF == state.state
diff --git a/tests/components/water_heater/test_device_action.py b/tests/components/water_heater/test_device_action.py
new file mode 100644
index 00000000000..3d3e70444b7
--- /dev/null
+++ b/tests/components/water_heater/test_device_action.py
@@ -0,0 +1,104 @@
+"""The tests for Water Heater device actions."""
+import pytest
+
+import homeassistant.components.automation as automation
+from homeassistant.components.water_heater import DOMAIN
+from homeassistant.helpers import device_registry
+from homeassistant.setup import async_setup_component
+
+from tests.common import (
+    MockConfigEntry,
+    assert_lists_same,
+    async_get_device_automations,
+    async_mock_service,
+    mock_device_registry,
+    mock_registry,
+)
+
+
+@pytest.fixture
+def device_reg(hass):
+    """Return an empty, loaded, registry."""
+    return mock_device_registry(hass)
+
+
+@pytest.fixture
+def entity_reg(hass):
+    """Return an empty, loaded, registry."""
+    return mock_registry(hass)
+
+
+async def test_get_actions(hass, device_reg, entity_reg):
+    """Test we get the expected actions from a water_heater."""
+    config_entry = MockConfigEntry(domain="test", data={})
+    config_entry.add_to_hass(hass)
+    device_entry = device_reg.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(device_registry.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
+    )
+    entity_reg.async_get_or_create(DOMAIN, "test", "5678", device_id=device_entry.id)
+    expected_actions = [
+        {
+            "domain": DOMAIN,
+            "type": "turn_on",
+            "device_id": device_entry.id,
+            "entity_id": "water_heater.test_5678",
+        },
+        {
+            "domain": DOMAIN,
+            "type": "turn_off",
+            "device_id": device_entry.id,
+            "entity_id": "water_heater.test_5678",
+        },
+    ]
+    actions = await async_get_device_automations(hass, "action", device_entry.id)
+    assert_lists_same(actions, expected_actions)
+
+
+async def test_action(hass):
+    """Test for turn_on and turn_off actions."""
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: [
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_turn_off",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": "water_heater.entity",
+                        "type": "turn_off",
+                    },
+                },
+                {
+                    "trigger": {
+                        "platform": "event",
+                        "event_type": "test_event_turn_on",
+                    },
+                    "action": {
+                        "domain": DOMAIN,
+                        "device_id": "abcdefgh",
+                        "entity_id": "water_heater.entity",
+                        "type": "turn_on",
+                    },
+                },
+            ]
+        },
+    )
+
+    turn_off_calls = async_mock_service(hass, "water_heater", "turn_off")
+    turn_on_calls = async_mock_service(hass, "water_heater", "turn_on")
+
+    hass.bus.async_fire("test_event_turn_off")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
+    assert len(turn_on_calls) == 0
+
+    hass.bus.async_fire("test_event_turn_on")
+    await hass.async_block_till_done()
+    assert len(turn_off_calls) == 1
+    assert len(turn_on_calls) == 1
diff --git a/tests/components/weather/test_weather.py b/tests/components/weather/test_weather.py
index ccddb35ad0a..c32c4d09523 100644
--- a/tests/components/weather/test_weather.py
+++ b/tests/components/weather/test_weather.py
@@ -1,6 +1,4 @@
 """The tests for the Weather component."""
-import unittest
-
 from homeassistant.components import weather
 from homeassistant.components.weather import (
     ATTR_FORECAST,
@@ -17,68 +15,58 @@ from homeassistant.components.weather import (
     ATTR_WEATHER_WIND_BEARING,
     ATTR_WEATHER_WIND_SPEED,
 )
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
-from tests.common import get_test_home_assistant
+
+async def test_attributes(hass):
+    """Test weather attributes."""
+    assert await async_setup_component(
+        hass, weather.DOMAIN, {"weather": {"platform": "demo"}}
+    )
+    hass.config.units = METRIC_SYSTEM
+    await hass.async_block_till_done()
+
+    state = hass.states.get("weather.demo_weather_south")
+    assert state is not None
+
+    assert state.state == "sunny"
+
+    data = state.attributes
+    assert data.get(ATTR_WEATHER_TEMPERATURE) == 21.6
+    assert data.get(ATTR_WEATHER_HUMIDITY) == 92
+    assert data.get(ATTR_WEATHER_PRESSURE) == 1099
+    assert data.get(ATTR_WEATHER_WIND_SPEED) == 0.5
+    assert data.get(ATTR_WEATHER_WIND_BEARING) is None
+    assert data.get(ATTR_WEATHER_OZONE) is None
+    assert data.get(ATTR_WEATHER_ATTRIBUTION) == "Powered by Home Assistant"
+    assert data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_CONDITION) == "rainy"
+    assert data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_PRECIPITATION) == 1
+    assert data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_PRECIPITATION_PROBABILITY) == 60
+    assert data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_TEMP) == 22
+    assert data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_TEMP_LOW) == 15
+    assert data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_CONDITION) == "fog"
+    assert data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_PRECIPITATION) == 0.2
+    assert data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_TEMP) == 21
+    assert data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_TEMP_LOW) == 12
+    assert (
+        data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_PRECIPITATION_PROBABILITY) == 100
+    )
+    assert len(data.get(ATTR_FORECAST)) == 7
 
 
-class TestWeather(unittest.TestCase):
-    """Test the Weather component."""
+async def test_temperature_convert(hass):
+    """Test temperature conversion."""
+    assert await async_setup_component(
+        hass, weather.DOMAIN, {"weather": {"platform": "demo"}}
+    )
+    hass.config.units = METRIC_SYSTEM
+    await hass.async_block_till_done()
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.hass.config.units = METRIC_SYSTEM
-        assert setup_component(
-            self.hass, weather.DOMAIN, {"weather": {"platform": "demo"}}
-        )
-        self.hass.block_till_done()
-        self.addCleanup(self.tear_down_cleanup)
+    state = hass.states.get("weather.demo_weather_north")
+    assert state is not None
 
-    def tear_down_cleanup(self):
-        """Stop down everything that was started."""
-        self.hass.stop()
+    assert state.state == "rainy"
 
-    def test_attributes(self):
-        """Test weather attributes."""
-        state = self.hass.states.get("weather.demo_weather_south")
-        assert state is not None
-
-        assert state.state == "sunny"
-
-        data = state.attributes
-        assert data.get(ATTR_WEATHER_TEMPERATURE) == 21.6
-        assert data.get(ATTR_WEATHER_HUMIDITY) == 92
-        assert data.get(ATTR_WEATHER_PRESSURE) == 1099
-        assert data.get(ATTR_WEATHER_WIND_SPEED) == 0.5
-        assert data.get(ATTR_WEATHER_WIND_BEARING) is None
-        assert data.get(ATTR_WEATHER_OZONE) is None
-        assert data.get(ATTR_WEATHER_ATTRIBUTION) == "Powered by Home Assistant"
-        assert data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_CONDITION) == "rainy"
-        assert data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_PRECIPITATION) == 1
-        assert (
-            data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_PRECIPITATION_PROBABILITY)
-            == 60
-        )
-        assert data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_TEMP) == 22
-        assert data.get(ATTR_FORECAST)[0].get(ATTR_FORECAST_TEMP_LOW) == 15
-        assert data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_CONDITION) == "fog"
-        assert data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_PRECIPITATION) == 0.2
-        assert data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_TEMP) == 21
-        assert data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_TEMP_LOW) == 12
-        assert (
-            data.get(ATTR_FORECAST)[6].get(ATTR_FORECAST_PRECIPITATION_PROBABILITY)
-            == 100
-        )
-        assert len(data.get(ATTR_FORECAST)) == 7
-
-    def test_temperature_convert(self):
-        """Test temperature conversion."""
-        state = self.hass.states.get("weather.demo_weather_north")
-        assert state is not None
-
-        assert state.state == "rainy"
-
-        data = state.attributes
-        assert data.get(ATTR_WEATHER_TEMPERATURE) == -24
+    data = state.attributes
+    assert data.get(ATTR_WEATHER_TEMPERATURE) == -24
diff --git a/tests/components/webhook/test_trigger.py b/tests/components/webhook/test_trigger.py
index fcd024652e8..30601ef6bec 100644
--- a/tests/components/webhook/test_trigger.py
+++ b/tests/components/webhook/test_trigger.py
@@ -4,6 +4,8 @@ import pytest
 from homeassistant.core import callback
 from homeassistant.setup import async_setup_component
 
+from tests.async_mock import patch
+
 
 @pytest.fixture(autouse=True)
 async def setup_http(hass):
@@ -109,3 +111,60 @@ async def test_webhook_query(hass, aiohttp_client):
 
     assert len(events) == 1
     assert events[0].data["hello"] == "yo world"
+
+
+async def test_webhook_reload(hass, aiohttp_client):
+    """Test reloading a webhook."""
+    events = []
+
+    @callback
+    def store_event(event):
+        """Helepr to store events."""
+        events.append(event)
+
+    hass.bus.async_listen("test_success", store_event)
+
+    assert await async_setup_component(
+        hass,
+        "automation",
+        {
+            "automation": {
+                "trigger": {"platform": "webhook", "webhook_id": "post_webhook"},
+                "action": {
+                    "event": "test_success",
+                    "event_data_template": {"hello": "yo {{ trigger.data.hello }}"},
+                },
+            }
+        },
+    )
+
+    client = await aiohttp_client(hass.http.app)
+
+    await client.post("/api/webhook/post_webhook", data={"hello": "world"})
+
+    assert len(events) == 1
+    assert events[0].data["hello"] == "yo world"
+
+    with patch(
+        "homeassistant.config.load_yaml_config_file",
+        autospec=True,
+        return_value={
+            "automation": {
+                "trigger": {"platform": "webhook", "webhook_id": "post_webhook"},
+                "action": {
+                    "event": "test_success",
+                    "event_data_template": {"hello": "yo2 {{ trigger.data.hello }}"},
+                },
+            }
+        },
+    ):
+        await hass.services.async_call(
+            "automation",
+            "reload",
+            blocking=True,
+        )
+
+    await client.post("/api/webhook/post_webhook", data={"hello": "world"})
+
+    assert len(events) == 2
+    assert events[1].data["hello"] == "yo2 world"
diff --git a/tests/components/websocket_api/test_commands.py b/tests/components/websocket_api/test_commands.py
index 5c9aaf09c9e..721d178430e 100644
--- a/tests/components/websocket_api/test_commands.py
+++ b/tests/components/websocket_api/test_commands.py
@@ -201,10 +201,7 @@ async def test_get_states(hass, websocket_client):
 
     states = []
     for state in hass.states.async_all():
-        state = state.as_dict()
-        state["last_changed"] = state["last_changed"].isoformat()
-        state["last_updated"] = state["last_updated"].isoformat()
-        states.append(state)
+        states.append(state.as_dict())
 
     assert msg["result"] == states
 
@@ -420,7 +417,12 @@ async def test_render_template_renders_template(hass, websocket_client):
     event = msg["event"]
     assert event == {
         "result": "State is: on",
-        "listeners": {"all": False, "domains": [], "entities": ["light.test"]},
+        "listeners": {
+            "all": False,
+            "domains": [],
+            "entities": ["light.test"],
+            "time": False,
+        },
     }
 
     hass.states.async_set("light.test", "off")
@@ -430,7 +432,12 @@ async def test_render_template_renders_template(hass, websocket_client):
     event = msg["event"]
     assert event == {
         "result": "State is: off",
-        "listeners": {"all": False, "domains": [], "entities": ["light.test"]},
+        "listeners": {
+            "all": False,
+            "domains": [],
+            "entities": ["light.test"],
+            "time": False,
+        },
     }
 
 
@@ -459,7 +466,12 @@ async def test_render_template_manual_entity_ids_no_longer_needed(
     event = msg["event"]
     assert event == {
         "result": "State is: on",
-        "listeners": {"all": False, "domains": [], "entities": ["light.test"]},
+        "listeners": {
+            "all": False,
+            "domains": [],
+            "entities": ["light.test"],
+            "time": False,
+        },
     }
 
     hass.states.async_set("light.test", "off")
@@ -469,7 +481,12 @@ async def test_render_template_manual_entity_ids_no_longer_needed(
     event = msg["event"]
     assert event == {
         "result": "State is: off",
-        "listeners": {"all": False, "domains": [], "entities": ["light.test"]},
+        "listeners": {
+            "all": False,
+            "domains": [],
+            "entities": ["light.test"],
+            "time": False,
+        },
     }
 
 
@@ -556,7 +573,12 @@ async def test_render_template_with_delayed_error(hass, websocket_client, caplog
     event = msg["event"]
     assert event == {
         "result": "on",
-        "listeners": {"all": False, "domains": [], "entities": ["sensor.test"]},
+        "listeners": {
+            "all": False,
+            "domains": [],
+            "entities": ["sensor.test"],
+            "time": False,
+        },
     }
 
     msg = await websocket_client.receive_json()
diff --git a/tests/components/websocket_api/test_messages.py b/tests/components/websocket_api/test_messages.py
index 832b72c5c1c..3ec156e6949 100644
--- a/tests/components/websocket_api/test_messages.py
+++ b/tests/components/websocket_api/test_messages.py
@@ -1,6 +1,7 @@
 """Test Websocket API messages module."""
 
 from homeassistant.components.websocket_api.messages import (
+    _cached_event_message as lru_event_cache,
     cached_event_message,
     message_to_json,
 )
@@ -24,6 +25,7 @@ async def test_cached_event_message(hass):
     await hass.async_block_till_done()
 
     assert len(events) == 2
+    lru_event_cache.cache_clear()
 
     msg0 = cached_event_message(2, events[0])
     assert msg0 == cached_event_message(2, events[0])
@@ -33,18 +35,49 @@ async def test_cached_event_message(hass):
 
     assert msg0 != msg1
 
-    cache_info = cached_event_message.cache_info()
+    cache_info = lru_event_cache.cache_info()
     assert cache_info.hits == 2
     assert cache_info.misses == 2
     assert cache_info.currsize == 2
 
     cached_event_message(2, events[1])
-    cache_info = cached_event_message.cache_info()
+    cache_info = lru_event_cache.cache_info()
     assert cache_info.hits == 3
     assert cache_info.misses == 2
     assert cache_info.currsize == 2
 
 
+async def test_cached_event_message_with_different_idens(hass):
+    """Test that we cache event messages when the subscrition idens differ."""
+
+    events = []
+
+    @callback
+    def _event_listener(event):
+        events.append(event)
+
+    hass.bus.async_listen(EVENT_STATE_CHANGED, _event_listener)
+
+    hass.states.async_set("light.window", "on")
+    await hass.async_block_till_done()
+
+    assert len(events) == 1
+
+    lru_event_cache.cache_clear()
+
+    msg0 = cached_event_message(2, events[0])
+    msg1 = cached_event_message(3, events[0])
+    msg2 = cached_event_message(4, events[0])
+
+    assert msg0 != msg1
+    assert msg0 != msg2
+
+    cache_info = lru_event_cache.cache_info()
+    assert cache_info.hits == 2
+    assert cache_info.misses == 1
+    assert cache_info.currsize == 1
+
+
 async def test_message_to_json(caplog):
     """Test we can serialize websocket messages."""
 
diff --git a/tests/components/wilight/test_config_flow.py b/tests/components/wilight/test_config_flow.py
index 7ca6b3241ff..c8476cbe349 100644
--- a/tests/components/wilight/test_config_flow.py
+++ b/tests/components/wilight/test_config_flow.py
@@ -1,5 +1,4 @@
 """Test the WiLight config flow."""
-from asynctest import patch
 import pytest
 
 from homeassistant.components.wilight.config_flow import (
@@ -16,6 +15,7 @@ from homeassistant.data_entry_flow import (
 )
 from homeassistant.helpers.typing import HomeAssistantType
 
+from tests.async_mock import patch
 from tests.common import MockConfigEntry
 from tests.components.wilight import (
     CONF_COMPONENTS,
diff --git a/tests/components/wilight/test_init.py b/tests/components/wilight/test_init.py
index 01ed57fdcd1..efd779a29df 100644
--- a/tests/components/wilight/test_init.py
+++ b/tests/components/wilight/test_init.py
@@ -1,5 +1,4 @@
 """Tests for the WiLight integration."""
-from asynctest import patch
 import pytest
 import pywilight
 
@@ -11,6 +10,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.helpers.typing import HomeAssistantType
 
+from tests.async_mock import patch
 from tests.components.wilight import (
     HOST,
     UPNP_MAC_ADDRESS,
diff --git a/tests/components/wilight/test_light.py b/tests/components/wilight/test_light.py
index 4d4a32604ad..d02c7233e60 100644
--- a/tests/components/wilight/test_light.py
+++ b/tests/components/wilight/test_light.py
@@ -1,5 +1,4 @@
 """Tests for the WiLight integration."""
-from asynctest import patch
 import pytest
 import pywilight
 
@@ -17,6 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.helpers.typing import HomeAssistantType
 
+from tests.async_mock import patch
 from tests.components.wilight import (
     HOST,
     UPNP_MAC_ADDRESS,
diff --git a/tests/components/withings/test_config_flow.py b/tests/components/withings/test_config_flow.py
index 2b4776c0ca5..cb0ea5b29ab 100644
--- a/tests/components/withings/test_config_flow.py
+++ b/tests/components/withings/test_config_flow.py
@@ -30,7 +30,7 @@ async def test_config_non_unique_profile(hass: HomeAssistant) -> None:
     )
 
     assert result
-    assert result["errors"]["base"] == "profile_exists"
+    assert result["errors"]["base"] == "already_configured"
 
 
 async def test_config_reauth_profile(
diff --git a/tests/components/wled/test_config_flow.py b/tests/components/wled/test_config_flow.py
index 7793dc2a378..aed10ca3466 100644
--- a/tests/components/wled/test_config_flow.py
+++ b/tests/components/wled/test_config_flow.py
@@ -75,7 +75,7 @@ async def test_connection_error(
         data={CONF_HOST: "example.com"},
     )
 
-    assert result["errors"] == {"base": "connection_error"}
+    assert result["errors"] == {"base": "cannot_connect"}
     assert result["step_id"] == "user"
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
 
@@ -93,7 +93,7 @@ async def test_zeroconf_connection_error(
         data={"host": "192.168.1.123", "hostname": "example.local.", "properties": {}},
     )
 
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
 
 
@@ -114,7 +114,7 @@ async def test_zeroconf_confirm_connection_error(
         data={"host": "192.168.1.123", "hostname": "example.com.", "properties": {}},
     )
 
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
 
 
@@ -127,7 +127,7 @@ async def test_zeroconf_no_data(
     flow.hass = hass
     result = await flow.async_step_zeroconf()
 
-    assert result["reason"] == "connection_error"
+    assert result["reason"] == "cannot_connect"
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
 
 
diff --git a/tests/components/wled/test_light.py b/tests/components/wled/test_light.py
index 66aa50cb71b..e2db58b1246 100644
--- a/tests/components/wled/test_light.py
+++ b/tests/components/wled/test_light.py
@@ -456,6 +456,7 @@ async def test_effect_service(
                 ATTR_EFFECT: "Rainbow",
                 ATTR_ENTITY_ID: "light.wled_rgb_light_segment_0",
                 ATTR_INTENSITY: 200,
+                ATTR_PALETTE: "Tiamat",
                 ATTR_REVERSE: True,
                 ATTR_SPEED: 100,
             },
@@ -465,6 +466,7 @@ async def test_effect_service(
         light_mock.assert_called_once_with(
             effect="Rainbow",
             intensity=200,
+            palette="Tiamat",
             reverse=True,
             segment_id=0,
             speed=100,
@@ -510,6 +512,7 @@ async def test_effect_service(
             {
                 ATTR_EFFECT: "Rainbow",
                 ATTR_ENTITY_ID: "light.wled_rgb_light_segment_0",
+                ATTR_PALETTE: "Tiamat",
                 ATTR_REVERSE: True,
                 ATTR_SPEED: 100,
             },
@@ -518,6 +521,7 @@ async def test_effect_service(
         await hass.async_block_till_done()
         light_mock.assert_called_once_with(
             effect="Rainbow",
+            palette="Tiamat",
             reverse=True,
             segment_id=0,
             speed=100,
diff --git a/tests/components/wled/test_sensor.py b/tests/components/wled/test_sensor.py
index 39cde51dbfd..d5c1c738d2f 100644
--- a/tests/components/wled/test_sensor.py
+++ b/tests/components/wled/test_sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components.wled.const import (
     ATTR_MAX_POWER,
     CURRENT_MA,
     DOMAIN,
-    SIGNAL_DBM,
 )
 from homeassistant.const import (
     ATTR_DEVICE_CLASS,
@@ -20,6 +19,7 @@ from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     DATA_BYTES,
     PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.util import dt as dt_util
@@ -138,7 +138,10 @@ async def test_sensors(
     state = hass.states.get("sensor.wled_rgb_light_wifi_rssi")
     assert state
     assert state.attributes.get(ATTR_ICON) == "mdi:wifi"
-    assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == SIGNAL_DBM
+    assert (
+        state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+        == SIGNAL_STRENGTH_DECIBELS_MILLIWATT
+    )
     assert state.state == "-62"
 
     entry = registry.async_get("sensor.wled_rgb_light_wifi_rssi")
diff --git a/tests/components/worldclock/test_sensor.py b/tests/components/worldclock/test_sensor.py
index e029ce783d3..8ed808b9d04 100644
--- a/tests/components/worldclock/test_sensor.py
+++ b/tests/components/worldclock/test_sensor.py
@@ -1,49 +1,52 @@
 """The test for the World clock sensor platform."""
-import unittest
+import pytest
 
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 import homeassistant.util.dt as dt_util
 
-from tests.common import get_test_home_assistant
+
+@pytest.fixture
+def time_zone():
+    """Fixture for time zone."""
+    return dt_util.get_time_zone("America/New_York")
 
 
-class TestWorldClockSensor(unittest.TestCase):
-    """Test the World clock sensor."""
+async def test_time(hass, time_zone):
+    """Test the time at a different location."""
+    config = {"sensor": {"platform": "worldclock", "time_zone": "America/New_York"}}
 
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.hass = get_test_home_assistant()
-        self.time_zone = dt_util.get_time_zone("America/New_York")
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        config,
+    )
+    await hass.async_block_till_done()
 
-    def test_time(self):
-        """Test the time at a different location."""
-        config = {"sensor": {"platform": "worldclock", "time_zone": "America/New_York"}}
-        assert setup_component(self.hass, "sensor", config)
-        self.hass.block_till_done()
-        self.addCleanup(self.hass.stop)
+    state = hass.states.get("sensor.worldclock_sensor")
+    assert state is not None
 
-        state = self.hass.states.get("sensor.worldclock_sensor")
-        assert state is not None
+    assert state.state == dt_util.now(time_zone=time_zone).strftime("%H:%M")
 
-        assert state.state == dt_util.now(time_zone=self.time_zone).strftime("%H:%M")
 
-    def test_time_format(self):
-        """Test time_format setting."""
-        time_format = "%a, %b %d, %Y %I:%M %p"
-        config = {
-            "sensor": {
-                "platform": "worldclock",
-                "time_zone": "America/New_York",
-                "time_format": time_format,
-            }
+async def test_time_format(hass, time_zone):
+    """Test time_format setting."""
+    time_format = "%a, %b %d, %Y %I:%M %p"
+    config = {
+        "sensor": {
+            "platform": "worldclock",
+            "time_zone": "America/New_York",
+            "time_format": time_format,
         }
-        assert setup_component(self.hass, "sensor", config)
-        self.hass.block_till_done()
-        self.addCleanup(self.hass.stop)
+    }
 
-        state = self.hass.states.get("sensor.worldclock_sensor")
-        assert state is not None
+    assert await async_setup_component(
+        hass,
+        "sensor",
+        config,
+    )
+    await hass.async_block_till_done()
 
-        assert state.state == dt_util.now(time_zone=self.time_zone).strftime(
-            time_format
-        )
+    state = hass.states.get("sensor.worldclock_sensor")
+    assert state is not None
+
+    assert state.state == dt_util.now(time_zone=time_zone).strftime(time_format)
diff --git a/tests/components/wsdot/test_sensor.py b/tests/components/wsdot/test_sensor.py
index 73190b6897a..1b1c2e090f2 100644
--- a/tests/components/wsdot/test_sensor.py
+++ b/tests/components/wsdot/test_sensor.py
@@ -1,9 +1,6 @@
 """The tests for the WSDOT platform."""
 from datetime import datetime, timedelta, timezone
 import re
-import unittest
-
-import requests_mock
 
 import homeassistant.components.wsdot.sensor as wsdot
 from homeassistant.components.wsdot.sensor import (
@@ -16,56 +13,46 @@ from homeassistant.components.wsdot.sensor import (
     RESOURCE,
     SCAN_INTERVAL,
 )
-from homeassistant.setup import setup_component
+from homeassistant.setup import async_setup_component
 
-from tests.common import get_test_home_assistant, load_fixture
+from tests.common import load_fixture
+
+config = {
+    CONF_API_KEY: "foo",
+    SCAN_INTERVAL: timedelta(seconds=120),
+    CONF_TRAVEL_TIMES: [{CONF_ID: 96, CONF_NAME: "I90 EB"}],
+}
 
 
-class TestWSDOT(unittest.TestCase):
-    """Test the WSDOT platform."""
+async def test_setup_with_config(hass):
+    """Test the platform setup with configuration."""
+    assert await async_setup_component(hass, "sensor", {"wsdot": config})
 
-    def add_entities(self, new_entities, update_before_add=False):
+
+async def test_setup(hass, requests_mock):
+    """Test for operational WSDOT sensor with proper attributes."""
+    entities = []
+
+    def add_entities(new_entities, update_before_add=False):
         """Mock add entities."""
         if update_before_add:
             for entity in new_entities:
                 entity.update()
 
         for entity in new_entities:
-            self.entities.append(entity)
+            entities.append(entity)
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.config = {
-            CONF_API_KEY: "foo",
-            SCAN_INTERVAL: timedelta(seconds=120),
-            CONF_TRAVEL_TIMES: [{CONF_ID: 96, CONF_NAME: "I90 EB"}],
-        }
-        self.entities = []
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    def test_setup_with_config(self):
-        """Test the platform setup with configuration."""
-        assert setup_component(self.hass, "sensor", {"wsdot": self.config})
-
-    @requests_mock.Mocker()
-    def test_setup(self, mock_req):
-        """Test for operational WSDOT sensor with proper attributes."""
-        uri = re.compile(RESOURCE + "*")
-        mock_req.get(uri, text=load_fixture("wsdot.json"))
-        wsdot.setup_platform(self.hass, self.config, self.add_entities)
-        assert len(self.entities) == 1
-        sensor = self.entities[0]
-        assert sensor.name == "I90 EB"
-        assert sensor.state == 11
-        assert (
-            sensor.device_state_attributes[ATTR_DESCRIPTION]
-            == "Downtown Seattle to Downtown Bellevue via I-90"
-        )
-        assert sensor.device_state_attributes[ATTR_TIME_UPDATED] == datetime(
-            2017, 1, 21, 15, 10, tzinfo=timezone(timedelta(hours=-8))
-        )
+    uri = re.compile(RESOURCE + "*")
+    requests_mock.get(uri, text=load_fixture("wsdot.json"))
+    wsdot.setup_platform(hass, config, add_entities)
+    assert len(entities) == 1
+    sensor = entities[0]
+    assert sensor.name == "I90 EB"
+    assert sensor.state == 11
+    assert (
+        sensor.device_state_attributes[ATTR_DESCRIPTION]
+        == "Downtown Seattle to Downtown Bellevue via I-90"
+    )
+    assert sensor.device_state_attributes[ATTR_TIME_UPDATED] == datetime(
+        2017, 1, 21, 15, 10, tzinfo=timezone(timedelta(hours=-8))
+    )
diff --git a/tests/components/xbox/__init__.py b/tests/components/xbox/__init__.py
new file mode 100644
index 00000000000..ffd286a280e
--- /dev/null
+++ b/tests/components/xbox/__init__.py
@@ -0,0 +1 @@
+"""Tests for the xbox integration."""
diff --git a/tests/components/xbox/test_config_flow.py b/tests/components/xbox/test_config_flow.py
new file mode 100644
index 00000000000..176c5eea60a
--- /dev/null
+++ b/tests/components/xbox/test_config_flow.py
@@ -0,0 +1,69 @@
+"""Test the xbox config flow."""
+from homeassistant import config_entries, data_entry_flow, setup
+from homeassistant.components.xbox.const import DOMAIN, OAUTH2_AUTHORIZE, OAUTH2_TOKEN
+from homeassistant.helpers import config_entry_oauth2_flow
+
+from tests.async_mock import patch
+from tests.common import MockConfigEntry
+
+CLIENT_ID = "1234"
+CLIENT_SECRET = "5678"
+
+
+async def test_abort_if_existing_entry(hass):
+    """Check flow abort when an entry already exist."""
+    MockConfigEntry(domain=DOMAIN).add_to_hass(hass)
+
+    result = await hass.config_entries.flow.async_init(
+        "xbox", context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["reason"] == "single_instance_allowed"
+
+
+async def test_full_flow(hass, aiohttp_client, aioclient_mock, current_request):
+    """Check full flow."""
+    assert await setup.async_setup_component(
+        hass,
+        "xbox",
+        {
+            "xbox": {"client_id": CLIENT_ID, "client_secret": CLIENT_SECRET},
+            "http": {"base_url": "https://example.com"},
+        },
+    )
+
+    result = await hass.config_entries.flow.async_init(
+        "xbox", context={"source": config_entries.SOURCE_USER}
+    )
+    state = config_entry_oauth2_flow._encode_jwt(hass, {"flow_id": result["flow_id"]})
+
+    scope = "+".join(["Xboxlive.signin", "Xboxlive.offline_access"])
+
+    assert result["url"] == (
+        f"{OAUTH2_AUTHORIZE}?response_type=code&client_id={CLIENT_ID}"
+        "&redirect_uri=https://example.com/auth/external/callback"
+        f"&state={state}&scope={scope}"
+    )
+
+    client = await aiohttp_client(hass.http.app)
+    resp = await client.get(f"/auth/external/callback?code=abcd&state={state}")
+    assert resp.status == 200
+    assert resp.headers["content-type"] == "text/html; charset=utf-8"
+
+    aioclient_mock.post(
+        OAUTH2_TOKEN,
+        json={
+            "refresh_token": "mock-refresh-token",
+            "access_token": "mock-access-token",
+            "type": "Bearer",
+            "expires_in": 60,
+        },
+    )
+
+    with patch(
+        "homeassistant.components.xbox.async_setup_entry", return_value=True
+    ) as mock_setup:
+        await hass.config_entries.flow.async_configure(result["flow_id"])
+
+    assert len(hass.config_entries.async_entries(DOMAIN)) == 1
+    assert len(mock_setup.mock_calls) == 1
diff --git a/tests/components/xiaomi_miio/test_config_flow.py b/tests/components/xiaomi_miio/test_config_flow.py
index d620e739e18..d8ddd657efc 100644
--- a/tests/components/xiaomi_miio/test_config_flow.py
+++ b/tests/components/xiaomi_miio/test_config_flow.py
@@ -90,7 +90,7 @@ async def test_config_flow_step_gateway_connect_error(hass):
 
     assert result["type"] == "form"
     assert result["step_id"] == "gateway"
-    assert result["errors"] == {"base": "connect_error"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
 
 async def test_config_flow_gateway_success(hass):
diff --git a/tests/components/xiaomi_miio/test_vacuum.py b/tests/components/xiaomi_miio/test_vacuum.py
index 3b1234622ad..0fa241fb0b9 100644
--- a/tests/components/xiaomi_miio/test_vacuum.py
+++ b/tests/components/xiaomi_miio/test_vacuum.py
@@ -2,6 +2,7 @@
 from datetime import datetime, time, timedelta
 from unittest import mock
 
+from miio import DeviceException
 import pytest
 from pytz import utc
 
@@ -52,9 +53,12 @@ from homeassistant.const import (
     CONF_PLATFORM,
     STATE_OFF,
     STATE_ON,
+    STATE_UNAVAILABLE,
 )
 from homeassistant.setup import async_setup_component
 
+from tests.async_mock import MagicMock, patch
+
 PLATFORM = "xiaomi_miio"
 
 # calls made when device status is requested
@@ -70,7 +74,7 @@ STATUS_CALLS = [
 @pytest.fixture(name="mock_mirobo_is_got_error")
 def mirobo_is_got_error_fixture():
     """Mock mock_mirobo."""
-    mock_vacuum = mock.MagicMock()
+    mock_vacuum = MagicMock()
     mock_vacuum.status().data = {"test": "raw"}
     mock_vacuum.status().is_on = False
     mock_vacuum.status().fanspeed = 38
@@ -98,21 +102,19 @@ def mirobo_is_got_error_fixture():
     mock_vacuum.dnd_status().start = time(hour=22, minute=0)
     mock_vacuum.dnd_status().end = time(hour=6, minute=0)
 
-    mock_timer_1 = mock.MagicMock()
+    mock_timer_1 = MagicMock()
     mock_timer_1.enabled = True
     mock_timer_1.cron = "5 5 1 8 1"
     mock_timer_1.next_schedule = datetime(2020, 5, 23, 13, 21, 10, tzinfo=utc)
 
-    mock_timer_2 = mock.MagicMock()
+    mock_timer_2 = MagicMock()
     mock_timer_2.enabled = False
     mock_timer_2.cron = "5 5 1 8 2"
     mock_timer_2.next_schedule = datetime(2020, 5, 23, 13, 21, 10, tzinfo=utc)
 
     mock_vacuum.timer.return_value = [mock_timer_1, mock_timer_2]
 
-    with mock.patch(
-        "homeassistant.components.xiaomi_miio.vacuum.Vacuum"
-    ) as mock_vaccum_cls:
+    with patch("homeassistant.components.xiaomi_miio.vacuum.Vacuum") as mock_vaccum_cls:
         mock_vaccum_cls.return_value = mock_vacuum
         yield mock_vacuum
 
@@ -135,14 +137,12 @@ new_fanspeeds = {
 @pytest.fixture(name="mock_mirobo_fanspeeds", params=[old_fanspeeds, new_fanspeeds])
 def mirobo_old_speeds_fixture(request):
     """Fixture for testing both types of fanspeeds."""
-    mock_vacuum = mock.MagicMock()
+    mock_vacuum = MagicMock()
     mock_vacuum.status().battery = 32
     mock_vacuum.fan_speed_presets.return_value = request.param
     mock_vacuum.status().fanspeed = list(request.param.values())[0]
 
-    with mock.patch(
-        "homeassistant.components.xiaomi_miio.vacuum.Vacuum"
-    ) as mock_vaccum_cls:
+    with patch("homeassistant.components.xiaomi_miio.vacuum.Vacuum") as mock_vaccum_cls:
         mock_vaccum_cls.return_value = mock_vacuum
         yield mock_vacuum
 
@@ -150,7 +150,7 @@ def mirobo_old_speeds_fixture(request):
 @pytest.fixture(name="mock_mirobo_is_on")
 def mirobo_is_on_fixture():
     """Mock mock_mirobo."""
-    mock_vacuum = mock.MagicMock()
+    mock_vacuum = MagicMock()
     mock_vacuum.status().data = {"test": "raw"}
     mock_vacuum.status().is_on = True
     mock_vacuum.status().fanspeed = 99
@@ -176,46 +176,53 @@ def mirobo_is_on_fixture():
     mock_vacuum.status().state_code = 5
     mock_vacuum.dnd_status().enabled = False
 
-    mock_timer_1 = mock.MagicMock()
+    mock_timer_1 = MagicMock()
     mock_timer_1.enabled = True
     mock_timer_1.cron = "5 5 1 8 1"
     mock_timer_1.next_schedule = datetime(2020, 5, 23, 13, 21, 10, tzinfo=utc)
 
-    mock_timer_2 = mock.MagicMock()
+    mock_timer_2 = MagicMock()
     mock_timer_2.enabled = False
     mock_timer_2.cron = "5 5 1 8 2"
     mock_timer_2.next_schedule = datetime(2020, 5, 23, 13, 21, 10, tzinfo=utc)
 
     mock_vacuum.timer.return_value = [mock_timer_1, mock_timer_2]
 
-    with mock.patch(
-        "homeassistant.components.xiaomi_miio.vacuum.Vacuum"
-    ) as mock_vaccum_cls:
+    with patch("homeassistant.components.xiaomi_miio.vacuum.Vacuum") as mock_vaccum_cls:
         mock_vaccum_cls.return_value = mock_vacuum
         yield mock_vacuum
 
 
-@pytest.fixture(name="mock_mirobo_errors")
-def mirobo_errors_fixture():
-    """Mock mock_mirobo_errors to simulate a bad vacuum status request."""
-    mock_vacuum = mock.MagicMock()
-    mock_vacuum.status.side_effect = OSError()
-    with mock.patch(
-        "homeassistant.components.xiaomi_miio.vacuum.Vacuum"
-    ) as mock_vaccum_cls:
-        mock_vaccum_cls.return_value = mock_vacuum
-        yield mock_vacuum
-
-
-async def test_xiaomi_exceptions(hass, caplog, mock_mirobo_errors):
-    """Test vacuum supported features."""
+async def test_xiaomi_exceptions(hass, caplog, mock_mirobo_is_on):
+    """Test error logging on exceptions."""
     entity_name = "test_vacuum_cleaner_error"
-    await setup_component(hass, entity_name)
+    entity_id = await setup_component(hass, entity_name)
 
+    def is_available():
+        state = hass.states.get(entity_id)
+        return state.state != STATE_UNAVAILABLE
+
+    # The initial setup has to be done successfully
     assert "Initializing with host 192.168.1.100 (token 12345...)" in caplog.text
-    assert mock_mirobo_errors.status.call_count == 1
-    assert "ERROR" in caplog.text
-    assert "Got OSError while fetching the state" in caplog.text
+    assert "WARNING" not in caplog.text
+    assert is_available()
+
+    # Second update causes an exception, which should be logged
+    mock_mirobo_is_on.status.side_effect = DeviceException("dummy exception")
+    await hass.helpers.entity_component.async_update_entity(entity_id)
+    assert "WARNING" in caplog.text
+    assert "Got exception while fetching the state" in caplog.text
+    assert not is_available()
+
+    # Third update does not get logged as the device is already unavailable,
+    # so we clear the log and reset the status to test that
+    caplog.clear()
+    mock_mirobo_is_on.status.reset_mock()
+
+    await hass.helpers.entity_component.async_update_entity(entity_id)
+    assert "Got exception while fetching the state" not in caplog.text
+    assert not is_available()
+    assert mock_mirobo_is_on.status.call_count == 1
 
 
 async def test_xiaomi_vacuum_services(hass, caplog, mock_mirobo_is_got_error):
@@ -463,7 +470,7 @@ async def test_xiaomi_vacuum_fanspeeds(hass, caplog, mock_mirobo_fanspeeds):
         {"entity_id": entity_id, "fan_speed": "invent"},
         blocking=True,
     )
-    assert "ERROR" in caplog.text
+    assert "Fan speed step not recognized" in caplog.text
 
 
 async def test_xiaomi_vacuum_goto_service(hass, caplog, mock_mirobo_is_on):
diff --git a/tests/components/yessssms/test_notify.py b/tests/components/yessssms/test_notify.py
index d940e782be4..742b983fa83 100644
--- a/tests/components/yessssms/test_notify.py
+++ b/tests/components/yessssms/test_notify.py
@@ -1,9 +1,7 @@
 """The tests for the notify yessssms platform."""
 import logging
-import unittest
 
 import pytest
-import requests_mock
 
 from homeassistant.components.yessssms.const import CONF_PROVIDER
 import homeassistant.components.yessssms.notify as yessssms
@@ -151,210 +149,219 @@ async def test_connection_error_on_init(hass, caplog, valid_settings, connection
             )
 
 
-class TestNotifyYesssSMS(unittest.TestCase):
-    """Test the yessssms notify."""
+@pytest.fixture(name="yessssms")
+def yessssms_init():
+    """Set up things to be run when tests are started."""
+    login = "06641234567"
+    passwd = "testpasswd"
+    recipient = "06501234567"
+    client = yessssms.YesssSMS(login, passwd)
+    return yessssms.YesssSMSNotificationService(client, recipient)
 
-    def setUp(self):  # pylint: disable=invalid-name
-        """Set up things to be run when tests are started."""
-        login = "06641234567"
-        passwd = "testpasswd"
-        recipient = "06501234567"
-        client = yessssms.YesssSMS(login, passwd)
-        self.yessssms = yessssms.YesssSMSNotificationService(client, recipient)
 
-    @requests_mock.Mocker()
-    def test_login_error(self, mock):
-        """Test login that fails."""
-        mock.register_uri(
-            requests_mock.POST,
-            # pylint: disable=protected-access
-            self.yessssms.yesss._login_url,
-            status_code=200,
-            text="BlaBlaBla<strong>Login nicht erfolgreichBlaBla",
-        )
-
-        message = "Testing YesssSMS platform :)"
-
-        with self.assertLogs("homeassistant.components.yessssms.notify", level="ERROR"):
-            self.yessssms.send_message(message)
-        self.assertTrue(mock.called)
-        self.assertEqual(mock.call_count, 1)
-
-    def test_empty_message_error(self):
-        """Test for an empty SMS message error."""
-        message = ""
-        with self.assertLogs("homeassistant.components.yessssms.notify", level="ERROR"):
-            self.yessssms.send_message(message)
-
-    @requests_mock.Mocker()
-    def test_error_account_suspended(self, mock):
-        """Test login that fails after multiple attempts."""
-        mock.register_uri(
-            "POST",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._login_url,
-            status_code=200,
-            text="BlaBlaBla<strong>Login nicht erfolgreichBlaBla",
-        )
-
-        message = "Testing YesssSMS platform :)"
-
-        with self.assertLogs("homeassistant.components.yessssms.notify", level="ERROR"):
-            self.yessssms.send_message(message)
-        self.assertTrue(mock.called)
-        self.assertEqual(mock.call_count, 1)
-
-        mock.register_uri(
-            "POST",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._login_url,
-            status_code=200,
-            text="Wegen 3 ungültigen Login-Versuchen ist Ihr Account für "
-            "eine Stunde gesperrt.",
-        )
-
-        message = "Testing YesssSMS platform :)"
-
-        with self.assertLogs("homeassistant.components.yessssms.notify", level="ERROR"):
-            self.yessssms.send_message(message)
-        self.assertTrue(mock.called)
-        self.assertEqual(mock.call_count, 2)
-
-    def test_error_account_suspended_2(self):
-        """Test login that fails after multiple attempts."""
-        message = "Testing YesssSMS platform :)"
+async def test_login_error(yessssms, requests_mock, caplog):
+    """Test login that fails."""
+    requests_mock.post(
         # pylint: disable=protected-access
-        self.yessssms.yesss._suspended = True
+        yessssms.yesss._login_url,
+        status_code=200,
+        text="BlaBlaBla<strong>Login nicht erfolgreichBlaBla",
+    )
 
-        with self.assertLogs(
-            "homeassistant.components.yessssms.notify", level="ERROR"
-        ) as context:
-            self.yessssms.send_message(message)
-        self.assertIn("Account is suspended, cannot send SMS.", context.output[0])
+    message = "Testing YesssSMS platform :)"
 
-    @requests_mock.Mocker()
-    def test_send_message(self, mock):
-        """Test send message."""
-        message = "Testing YesssSMS platform :)"
-        mock.register_uri(
-            "POST",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._login_url,
-            status_code=302,
-            # pylint: disable=protected-access
-            headers={"location": self.yessssms.yesss._kontomanager},
-        )
+    with caplog.at_level(logging.ERROR):
+        yessssms.send_message(message)
+    assert requests_mock.called is True
+    assert requests_mock.call_count == 1
+
+
+async def test_empty_message_error(yessssms, caplog):
+    """Test for an empty SMS message error."""
+    message = ""
+    with caplog.at_level(logging.ERROR):
+        yessssms.send_message(message)
+
+    for record in caplog.records:
+        if (
+            record.levelname == "ERROR"
+            and record.name == "homeassistant.components.yessssms.notify"
+        ):
+            assert "Cannot send empty SMS message" in record.message
+
+
+async def test_error_account_suspended(yessssms, requests_mock, caplog):
+    """Test login that fails after multiple attempts."""
+    requests_mock.post(
         # pylint: disable=protected-access
-        login = self.yessssms.yesss._logindata["login_rufnummer"]
-        mock.register_uri(
-            "GET",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._kontomanager,
-            status_code=200,
-            text=f"test...{login}</a>",
-        )
-        mock.register_uri(
-            "POST",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._websms_url,
-            status_code=200,
-            text="<h1>Ihre SMS wurde erfolgreich verschickt!</h1>",
-        )
-        mock.register_uri(
-            "GET",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._logout_url,
-            status_code=200,
-        )
+        yessssms.yesss._login_url,
+        status_code=200,
+        text="BlaBlaBla<strong>Login nicht erfolgreichBlaBla",
+    )
 
-        with self.assertLogs(
-            "homeassistant.components.yessssms.notify", level="INFO"
-        ) as context:
-            self.yessssms.send_message(message)
-        self.assertIn("SMS sent", context.output[0])
-        self.assertTrue(mock.called)
-        self.assertEqual(mock.call_count, 4)
-        self.assertIn(
-            mock.last_request.scheme
-            + "://"
-            + mock.last_request.hostname
-            + mock.last_request.path
-            + "?"
-            + mock.last_request.query,
-            # pylint: disable=protected-access
-            self.yessssms.yesss._logout_url,
-        )
+    message = "Testing YesssSMS platform :)"
 
-    def test_no_recipient_error(self):
-        """Test for missing/empty recipient."""
-        message = "Testing YesssSMS platform :)"
+    yessssms.send_message(message)
+    assert requests_mock.called is True
+    assert requests_mock.call_count == 1
+
+    requests_mock.post(
         # pylint: disable=protected-access
-        self.yessssms._recipient = ""
+        yessssms.yesss._login_url,
+        status_code=200,
+        text="Wegen 3 ungültigen Login-Versuchen ist Ihr Account für "
+        "eine Stunde gesperrt.",
+    )
 
-        with self.assertLogs(
-            "homeassistant.components.yessssms.notify", level="ERROR"
-        ) as context:
-            self.yessssms.send_message(message)
+    message = "Testing YesssSMS platform :)"
 
-        self.assertIn(
-            "You need to provide a recipient for SMS notification", context.output[0]
-        )
+    with caplog.at_level(logging.ERROR):
+        yessssms.send_message(message)
+    assert requests_mock.called is True
+    assert requests_mock.call_count == 2
 
-    @requests_mock.Mocker()
-    def test_sms_sending_error(self, mock):
-        """Test sms sending error."""
-        mock.register_uri(
-            "POST",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._login_url,
-            status_code=302,
-            # pylint: disable=protected-access
-            headers={"location": self.yessssms.yesss._kontomanager},
-        )
+
+async def test_error_account_suspended_2(yessssms, caplog):
+    """Test login that fails after multiple attempts."""
+    message = "Testing YesssSMS platform :)"
+    # pylint: disable=protected-access
+    yessssms.yesss._suspended = True
+
+    with caplog.at_level(logging.ERROR):
+        yessssms.send_message(message)
+    for record in caplog.records:
+        if (
+            record.levelname == "ERROR"
+            and record.name == "homeassistant.components.yessssms.notify"
+        ):
+            assert "Account is suspended, cannot send SMS." in record.message
+
+
+async def test_send_message(yessssms, requests_mock, caplog):
+    """Test send message."""
+    message = "Testing YesssSMS platform :)"
+    requests_mock.post(
         # pylint: disable=protected-access
-        login = self.yessssms.yesss._logindata["login_rufnummer"]
-        mock.register_uri(
-            "GET",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._kontomanager,
-            status_code=200,
-            text=f"test...{login}</a>",
-        )
-        mock.register_uri(
-            "POST",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._websms_url,
-            status_code=HTTP_INTERNAL_SERVER_ERROR,
-        )
+        yessssms.yesss._login_url,
+        status_code=302,
+        # pylint: disable=protected-access
+        headers={"location": yessssms.yesss._kontomanager},
+    )
+    # pylint: disable=protected-access
+    login = yessssms.yesss._logindata["login_rufnummer"]
+    requests_mock.get(
+        # pylint: disable=protected-access
+        yessssms.yesss._kontomanager,
+        status_code=200,
+        text=f"test...{login}</a>",
+    )
+    requests_mock.post(
+        # pylint: disable=protected-access
+        yessssms.yesss._websms_url,
+        status_code=200,
+        text="<h1>Ihre SMS wurde erfolgreich verschickt!</h1>",
+    )
+    requests_mock.get(
+        # pylint: disable=protected-access
+        yessssms.yesss._logout_url,
+        status_code=200,
+    )
 
-        message = "Testing YesssSMS platform :)"
+    with caplog.at_level(logging.INFO):
+        yessssms.send_message(message)
+    for record in caplog.records:
+        if (
+            record.levelname == "INFO"
+            and record.name == "homeassistant.components.yessssms.notify"
+        ):
+            assert "SMS sent" in record.message
 
-        with self.assertLogs(
-            "homeassistant.components.yessssms.notify", level="ERROR"
-        ) as context:
-            self.yessssms.send_message(message)
+    assert requests_mock.called is True
+    assert requests_mock.call_count == 4
+    assert (
+        requests_mock.last_request.scheme
+        + "://"
+        + requests_mock.last_request.hostname
+        + requests_mock.last_request.path
+        + "?"
+        + requests_mock.last_request.query
+    ) in yessssms.yesss._logout_url  # pylint: disable=protected-access
 
-        self.assertTrue(mock.called)
-        self.assertEqual(mock.call_count, 3)
-        self.assertIn("YesssSMS: error sending SMS", context.output[0])
 
-    @requests_mock.Mocker()
-    def test_connection_error(self, mock):
-        """Test connection error."""
-        mock.register_uri(
-            "POST",
-            # pylint: disable=protected-access
-            self.yessssms.yesss._login_url,
-            exc=yessssms.YesssSMS.ConnectionError,
-        )
+async def test_no_recipient_error(yessssms, caplog):
+    """Test for missing/empty recipient."""
+    message = "Testing YesssSMS platform :)"
+    # pylint: disable=protected-access
+    yessssms._recipient = ""
 
-        message = "Testing YesssSMS platform :)"
+    with caplog.at_level(logging.ERROR):
+        yessssms.send_message(message)
+    for record in caplog.records:
+        if (
+            record.levelname == "ERROR"
+            and record.name == "homeassistant.components.yessssms.notify"
+        ):
+            assert (
+                "You need to provide a recipient for SMS notification" in record.message
+            )
 
-        with self.assertLogs(
-            "homeassistant.components.yessssms.notify", level="ERROR"
-        ) as context:
-            self.yessssms.send_message(message)
 
-        self.assertTrue(mock.called)
-        self.assertEqual(mock.call_count, 1)
-        self.assertIn("cannot connect to provider", context.output[0])
+async def test_sms_sending_error(yessssms, requests_mock, caplog):
+    """Test sms sending error."""
+    requests_mock.post(
+        # pylint: disable=protected-access
+        yessssms.yesss._login_url,
+        status_code=302,
+        # pylint: disable=protected-access
+        headers={"location": yessssms.yesss._kontomanager},
+    )
+    # pylint: disable=protected-access
+    login = yessssms.yesss._logindata["login_rufnummer"]
+    requests_mock.get(
+        # pylint: disable=protected-access
+        yessssms.yesss._kontomanager,
+        status_code=200,
+        text=f"test...{login}</a>",
+    )
+    requests_mock.post(
+        # pylint: disable=protected-access
+        yessssms.yesss._websms_url,
+        status_code=HTTP_INTERNAL_SERVER_ERROR,
+    )
+
+    message = "Testing YesssSMS platform :)"
+
+    with caplog.at_level(logging.ERROR):
+        yessssms.send_message(message)
+
+    assert requests_mock.called is True
+    assert requests_mock.call_count == 3
+    for record in caplog.records:
+        if (
+            record.levelname == "ERROR"
+            and record.name == "homeassistant.components.yessssms.notify"
+        ):
+            assert "YesssSMS: error sending SMS" in record.message
+
+
+async def test_connection_error(yessssms, requests_mock, caplog):
+    """Test connection error."""
+    requests_mock.post(
+        # pylint: disable=protected-access
+        yessssms.yesss._login_url,
+        exc=yessssms.yesss.ConnectionError,
+    )
+
+    message = "Testing YesssSMS platform :)"
+
+    with caplog.at_level(logging.ERROR):
+        yessssms.send_message(message)
+
+    assert requests_mock.called is True
+    assert requests_mock.call_count == 1
+    for record in caplog.records:
+        if (
+            record.levelname == "ERROR"
+            and record.name == "homeassistant.components.yessssms.notify"
+        ):
+            assert "cannot connect to provider" in record.message
diff --git a/tests/components/zha/test_gateway.py b/tests/components/zha/test_gateway.py
index 718c7cdba19..5d7f66bacd5 100644
--- a/tests/components/zha/test_gateway.py
+++ b/tests/components/zha/test_gateway.py
@@ -1,6 +1,5 @@
 """Test ZHA Gateway."""
 import asyncio
-import logging
 import time
 from unittest.mock import patch
 
@@ -17,7 +16,6 @@ from .common import async_enable_traffic, async_find_group_entity_id, get_zha_ga
 
 IEEE_GROUPABLE_DEVICE = "01:2d:6f:00:0a:90:69:e8"
 IEEE_GROUPABLE_DEVICE2 = "02:2d:6f:00:0a:90:69:e8"
-_LOGGER = logging.getLogger(__name__)
 
 
 @pytest.fixture
diff --git a/tests/components/zha/zha_devices_list.py b/tests/components/zha/zha_devices_list.py
index 6de4bd79a72..a6287592395 100644
--- a/tests/components/zha/zha_devices_list.py
+++ b/tests/components/zha/zha_devices_list.py
@@ -784,7 +784,7 @@ DEVICES = [
             },
             ("binary_sensor", "00:11:22:33:44:55:66:77-1-6"): {
                 "channels": ["on_off"],
-                "entity_class": "Opening",
+                "entity_class": "Motion",
                 "entity_id": "binary_sensor.ikea_of_sweden_tradfri_motion_sensor_77665544_on_off",
             },
         },
@@ -3464,4 +3464,248 @@ DEVICES = [
         "model": "unk_model",
         "node_descriptor": b"\x01@\x8e\x10\x11RR\x00\x00\x00R\x00\x00",
     },
+    {
+        "device_no": 98,
+        "endpoints": {
+            208: {
+                "endpoint_id": 208,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006, 0x000C],
+                "out_clusters": [],
+            },
+            209: {
+                "endpoint_id": 209,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006, 0x000C],
+                "out_clusters": [],
+            },
+            210: {
+                "endpoint_id": 210,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006, 0x000C],
+                "out_clusters": [],
+            },
+            211: {
+                "endpoint_id": 211,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006, 0x000C],
+                "out_clusters": [],
+            },
+            212: {
+                "endpoint_id": 212,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006],
+                "out_clusters": [],
+            },
+            213: {
+                "endpoint_id": 213,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006],
+                "out_clusters": [],
+            },
+            214: {
+                "endpoint_id": 214,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006],
+                "out_clusters": [],
+            },
+            215: {
+                "endpoint_id": 215,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006, 0x000C],
+                "out_clusters": [],
+            },
+            216: {
+                "endpoint_id": 216,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006],
+                "out_clusters": [],
+            },
+            217: {
+                "endpoint_id": 217,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006],
+                "out_clusters": [],
+            },
+            218: {
+                "endpoint_id": 218,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006, 0x000D],
+                "out_clusters": [],
+            },
+            219: {
+                "endpoint_id": 219,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006, 0x000D],
+                "out_clusters": [],
+            },
+            220: {
+                "endpoint_id": 220,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006],
+                "out_clusters": [],
+            },
+            221: {
+                "endpoint_id": 221,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006],
+                "out_clusters": [],
+            },
+            222: {
+                "endpoint_id": 222,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0006],
+                "out_clusters": [],
+            },
+            232: {
+                "endpoint_id": 232,
+                "profile_id": 49413,
+                "device_type": 0x0001,
+                "in_clusters": [0x0011, 0x0092],
+                "out_clusters": [0x0008, 0x0011],
+            },
+        },
+        "entities": [
+            "switch.digi_xbee3_77665544_on_off",
+            "switch.digi_xbee3_77665544_on_off_2",
+            "switch.digi_xbee3_77665544_on_off_3",
+            "switch.digi_xbee3_77665544_on_off_4",
+            "switch.digi_xbee3_77665544_on_off_5",
+            "switch.digi_xbee3_77665544_on_off_6",
+            "switch.digi_xbee3_77665544_on_off_7",
+            "switch.digi_xbee3_77665544_on_off_8",
+            "switch.digi_xbee3_77665544_on_off_9",
+            "switch.digi_xbee3_77665544_on_off_10",
+            "switch.digi_xbee3_77665544_on_off_11",
+            "switch.digi_xbee3_77665544_on_off_12",
+            "switch.digi_xbee3_77665544_on_off_13",
+            "switch.digi_xbee3_77665544_on_off_14",
+            "switch.digi_xbee3_77665544_on_off_15",
+            "sensor.digi_xbee3_77665544_analog_input",
+            "sensor.digi_xbee3_77665544_analog_input_2",
+            "sensor.digi_xbee3_77665544_analog_input_3",
+            "sensor.digi_xbee3_77665544_analog_input_4",
+        ],
+        "entity_map": {
+            ("switch", "00:11:22:33:44:55:66:77-208-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-209-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_2",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-210-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_3",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-211-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_4",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-212-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_5",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-213-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_6",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-214-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_7",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-215-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_8",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-216-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_9",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-217-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_10",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-218-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_11",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-219-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_12",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-220-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_13",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-221-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_14",
+            },
+            ("switch", "00:11:22:33:44:55:66:77-222-6"): {
+                "channels": ["on_off"],
+                "entity_class": "Switch",
+                "entity_id": "switch.digi_xbee3_77665544_on_off_15",
+            },
+            ("sensor", "00:11:22:33:44:55:66:77-208-12"): {
+                "channels": ["analog_input"],
+                "entity_class": "AnalogInput",
+                "entity_id": "sensor.digi_xbee3_77665544_analog_input",
+            },
+            ("sensor", "00:11:22:33:44:55:66:77-209-12"): {
+                "channels": ["analog_input"],
+                "entity_class": "AnalogInput",
+                "entity_id": "sensor.digi_xbee3_77665544_analog_input_2",
+            },
+            ("sensor", "00:11:22:33:44:55:66:77-210-12"): {
+                "channels": ["analog_input"],
+                "entity_class": "AnalogInput",
+                "entity_id": "sensor.digi_xbee3_77665544_analog_input_3",
+            },
+            ("sensor", "00:11:22:33:44:55:66:77-211-12"): {
+                "channels": ["analog_input"],
+                "entity_class": "AnalogInput",
+                "entity_id": "sensor.digi_xbee3_77665544_analog_input_4",
+            },
+            ("sensor", "00:11:22:33:44:55:66:77-215-12"): {
+                "channels": ["analog_input"],
+                "entity_class": "AnalogInput",
+                "entity_id": "sensor.digi_xbee3_77665544_analog_input_5",
+            },
+        },
+        "event_channels": ["232:0x0008"],
+        "manufacturer": "Digi",
+        "model": "XBee3",
+        "node_descriptor": b"\x01@\x8e\x1e\x10R\xff\x00\x00,\xff\x00\x00",
+    },
 ]
diff --git a/tests/components/zwave/conftest.py b/tests/components/zwave/conftest.py
index 50edcfec157..146347620bd 100644
--- a/tests/components/zwave/conftest.py
+++ b/tests/components/zwave/conftest.py
@@ -1,8 +1,10 @@
 """Fixtures for Z-Wave tests."""
 import pytest
 
-from tests.async_mock import MagicMock, patch
-from tests.mock.zwave import MockNetwork, MockOption
+from homeassistant.components.zwave import const
+
+from tests.async_mock import AsyncMock, MagicMock, patch
+from tests.mock.zwave import MockNetwork, MockNode, MockOption, MockValue
 
 
 @pytest.fixture
@@ -24,3 +26,53 @@ def mock_openzwave():
         },
     ):
         yield base_mock
+
+
+@pytest.fixture
+def mock_discovery():
+    """Mock discovery."""
+    discovery = MagicMock()
+    discovery.async_load_platform = AsyncMock(return_value=None)
+    yield discovery
+
+
+@pytest.fixture
+def mock_import_module():
+    """Mock import module."""
+    platform = MagicMock()
+    mock_device = MagicMock()
+    mock_device.name = "test_device"
+    platform.get_device.return_value = mock_device
+
+    import_module = MagicMock()
+    import_module.return_value = platform
+    yield import_module
+
+
+@pytest.fixture
+def mock_values():
+    """Mock values."""
+    node = MockNode()
+    mock_schema = {
+        const.DISC_COMPONENT: "mock_component",
+        const.DISC_VALUES: {
+            const.DISC_PRIMARY: {const.DISC_COMMAND_CLASS: ["mock_primary_class"]},
+            "secondary": {const.DISC_COMMAND_CLASS: ["mock_secondary_class"]},
+            "optional": {
+                const.DISC_COMMAND_CLASS: ["mock_optional_class"],
+                const.DISC_OPTIONAL: True,
+            },
+        },
+    }
+    value_class = MagicMock()
+    value_class.primary = MockValue(
+        command_class="mock_primary_class", node=node, value_id=1000
+    )
+    value_class.secondary = MockValue(command_class="mock_secondary_class", node=node)
+    value_class.duplicate_secondary = MockValue(
+        command_class="mock_secondary_class", node=node
+    )
+    value_class.optional = MockValue(command_class="mock_optional_class", node=node)
+    value_class.no_match_value = MockValue(command_class="mock_bad_class", node=node)
+
+    yield (node, value_class, mock_schema)
diff --git a/tests/components/zwave/test_binary_sensor.py b/tests/components/zwave/test_binary_sensor.py
index 8ac6370ad35..815563d2a5e 100644
--- a/tests/components/zwave/test_binary_sensor.py
+++ b/tests/components/zwave/test_binary_sensor.py
@@ -80,13 +80,13 @@ async def test_trigger_sensor_value_changed(hass, mock_openzwave):
     assert not device.is_on
 
     value.data = True
-    await hass.async_add_job(value_changed, value)
+    await hass.async_add_executor_job(value_changed, value)
     assert device.invalidate_after is None
 
     device.hass = hass
 
     value.data = True
-    await hass.async_add_job(value_changed, value)
+    await hass.async_add_executor_job(value_changed, value)
     assert device.is_on
 
     test_time = device.invalidate_after - datetime.timedelta(seconds=1)
diff --git a/tests/components/zwave/test_init.py b/tests/components/zwave/test_init.py
index 4cf639e7faf..5f408518271 100644
--- a/tests/components/zwave/test_init.py
+++ b/tests/components/zwave/test_init.py
@@ -2,7 +2,6 @@
 import asyncio
 from collections import OrderedDict
 from datetime import datetime
-import unittest
 
 import pytest
 from pytz import utc
@@ -17,13 +16,12 @@ from homeassistant.components.zwave import (
     const,
 )
 from homeassistant.components.zwave.binary_sensor import get_device
-from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_START
+from homeassistant.const import ATTR_ENTITY_ID
 from homeassistant.helpers.device_registry import async_get_registry as get_dev_reg
 from homeassistant.helpers.entity_registry import async_get_registry
-from homeassistant.setup import setup_component
 
-from tests.async_mock import AsyncMock, MagicMock, patch
-from tests.common import async_fire_time_changed, get_test_home_assistant, mock_registry
+from tests.async_mock import MagicMock, patch
+from tests.common import async_fire_time_changed, mock_registry
 from tests.mock.zwave import MockEntityValues, MockNetwork, MockNode, MockValue
 
 
@@ -32,6 +30,22 @@ def mock_storage(hass_storage):
     """Autouse hass_storage for the TestCase tests."""
 
 
+@pytest.fixture
+async def zwave_setup(hass):
+    """Zwave setup."""
+    await async_setup_component(hass, "zwave", {"zwave": {}})
+    await hass.async_block_till_done()
+
+
+@pytest.fixture
+async def zwave_setup_ready(hass, zwave_setup):
+    """Zwave setup and set network to ready."""
+    zwave_network = hass.data[DATA_NETWORK]
+    zwave_network.state = MockNetwork.STATE_READY
+
+    await hass.async_start()
+
+
 async def test_valid_device_config(hass, mock_openzwave):
     """Test valid device config."""
     device_config = {"light.kitchen": {"ignored": "true"}}
@@ -175,12 +189,8 @@ async def test_setup_platform(hass, mock_openzwave):
     assert async_add_entities.mock_calls[0][1][0] == [mock_device]
 
 
-async def test_zwave_ready_wait(hass, mock_openzwave):
+async def test_zwave_ready_wait(hass, mock_openzwave, zwave_setup):
     """Test that zwave continues after waiting for network ready."""
-    # Initialize zwave
-    await async_setup_component(hass, "zwave", {"zwave": {}})
-    await hass.async_block_till_done()
-
     sleeps = []
 
     def utcnow():
@@ -197,8 +207,8 @@ async def test_zwave_ready_wait(hass, mock_openzwave):
         with patch("asyncio.sleep", new=sleep):
             with patch.object(zwave, "_LOGGER") as mock_logger:
                 hass.data[DATA_NETWORK].state = MockNetwork.STATE_STARTED
-                hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
-                await hass.async_block_till_done()
+
+                await hass.async_start()
 
                 assert len(sleeps) == const.NETWORK_READY_WAIT_SECS
                 assert mock_logger.warning.called
@@ -298,7 +308,7 @@ async def test_node_discovery(hass, mock_openzwave):
     assert len(mock_receivers) == 1
 
     node = MockNode(node_id=14)
-    hass.async_add_job(mock_receivers[0], node)
+    await hass.async_add_executor_job(mock_receivers[0], node)
     await hass.async_block_till_done()
 
     assert hass.states.get("zwave.mock_node").state == "unknown"
@@ -335,7 +345,7 @@ async def test_unparsed_node_discovery(hass, mock_openzwave):
     with patch("homeassistant.components.zwave.dt_util.utcnow", new=utcnow):
         with patch("asyncio.sleep", new=sleep):
             with patch.object(zwave, "_LOGGER") as mock_logger:
-                hass.async_add_job(mock_receivers[0], node)
+                await hass.async_add_executor_job(mock_receivers[0], node)
                 await hass.async_block_till_done()
 
                 assert len(sleeps) == const.NODE_READY_WAIT_SECS
@@ -367,7 +377,7 @@ async def test_node_ignored(hass, mock_openzwave):
     assert len(mock_receivers) == 1
 
     node = MockNode(node_id=14)
-    hass.async_add_job(mock_receivers[0], node)
+    await hass.async_add_executor_job(mock_receivers[0], node)
     await hass.async_block_till_done()
 
     assert hass.states.get("zwave.mock_node") is None
@@ -397,7 +407,7 @@ async def test_value_discovery(hass, mock_openzwave):
         type=const.TYPE_BOOL,
         genre=const.GENRE_USER,
     )
-    hass.async_add_job(mock_receivers[0], node, value)
+    await hass.async_add_executor_job(mock_receivers[0], node, value)
     await hass.async_block_till_done()
 
     assert hass.states.get("binary_sensor.mock_node_mock_value").state == "off"
@@ -416,12 +426,14 @@ async def test_value_entities(hass, mock_openzwave):
 
     zwave_network = hass.data[DATA_NETWORK]
     zwave_network.state = MockNetwork.STATE_READY
-    hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
-    await hass.async_block_till_done()
+
+    await hass.async_start()
 
     assert mock_receivers
 
-    hass.async_add_job(mock_receivers[MockNetwork.SIGNAL_ALL_NODES_QUERIED])
+    await hass.async_add_executor_job(
+        mock_receivers[MockNetwork.SIGNAL_ALL_NODES_QUERIED]
+    )
     node = MockNode(node_id=11, generic=const.GENERIC_TYPE_SENSOR_BINARY)
     zwave_network.nodes = {node.node_id: node}
     value = MockValue(
@@ -446,9 +458,15 @@ async def test_value_entities(hass, mock_openzwave):
     )
     node.values[value2.value_id] = value2
 
-    hass.async_add_job(mock_receivers[MockNetwork.SIGNAL_NODE_ADDED], node)
-    hass.async_add_job(mock_receivers[MockNetwork.SIGNAL_VALUE_ADDED], node, value)
-    hass.async_add_job(mock_receivers[MockNetwork.SIGNAL_VALUE_ADDED], node, value2)
+    await hass.async_add_executor_job(
+        mock_receivers[MockNetwork.SIGNAL_NODE_ADDED], node
+    )
+    await hass.async_add_executor_job(
+        mock_receivers[MockNetwork.SIGNAL_VALUE_ADDED], node, value
+    )
+    await hass.async_add_executor_job(
+        mock_receivers[MockNetwork.SIGNAL_VALUE_ADDED], node, value2
+    )
     await hass.async_block_till_done()
 
     assert hass.states.get("binary_sensor.mock_node_mock_value").state == "off"
@@ -594,7 +612,7 @@ async def test_value_discovery_existing_entity(hass, mock_openzwave):
         genre=const.GENRE_USER,
     )
 
-    hass.async_add_job(mock_receivers[0], node, thermostat_mode)
+    await hass.async_add_executor_job(mock_receivers[0], node, thermostat_mode)
     await hass.async_block_till_done()
 
     def mock_update(self):
@@ -603,7 +621,7 @@ async def test_value_discovery_existing_entity(hass, mock_openzwave):
     with patch.object(
         zwave.node_entity.ZWaveBaseEntity, "maybe_schedule_update", new=mock_update
     ):
-        hass.async_add_job(mock_receivers[0], node, setpoint_heating)
+        await hass.async_add_executor_job(mock_receivers[0], node, setpoint_heating)
         await hass.async_block_till_done()
 
     assert (
@@ -628,7 +646,7 @@ async def test_value_discovery_existing_entity(hass, mock_openzwave):
             genre=const.GENRE_USER,
             units="C",
         )
-        hass.async_add_job(mock_receivers[0], node, temperature)
+        await hass.async_add_executor_job(mock_receivers[0], node, temperature)
         await hass.async_block_till_done()
 
     assert (
@@ -670,7 +688,7 @@ async def test_value_discovery_legacy_thermostat(hass, mock_openzwave):
         genre=const.GENRE_USER,
     )
 
-    hass.async_add_job(mock_receivers[0], node, setpoint_heating)
+    await hass.async_add_executor_job(mock_receivers[0], node, setpoint_heating)
     await hass.async_block_till_done()
 
     assert (
@@ -703,7 +721,7 @@ async def test_power_schemes(hass, mock_openzwave):
         genre=const.GENRE_USER,
         type=const.TYPE_BOOL,
     )
-    await hass.async_add_job(mock_receivers[0], node, switch)
+    await hass.async_add_executor_job(mock_receivers[0], node, switch)
 
     await hass.async_block_till_done()
 
@@ -727,7 +745,7 @@ async def test_power_schemes(hass, mock_openzwave):
             command_class=const.COMMAND_CLASS_SENSOR_MULTILEVEL,
             genre=const.GENRE_USER,  # to avoid exception
         )
-        await hass.async_add_job(mock_receivers[0], node, power)
+        await hass.async_add_executor_job(mock_receivers[0], node, power)
         await hass.async_block_till_done()
 
     assert (
@@ -757,7 +775,7 @@ async def test_network_ready(hass, mock_openzwave):
 
     hass.bus.async_listen(const.EVENT_NETWORK_COMPLETE, listener)
 
-    hass.async_add_job(mock_receivers[0])
+    await hass.async_add_executor_job(mock_receivers[0])
     await hass.async_block_till_done()
 
     assert len(events) == 1
@@ -784,7 +802,7 @@ async def test_network_complete(hass, mock_openzwave):
 
     hass.bus.async_listen(const.EVENT_NETWORK_READY, listener)
 
-    hass.async_add_job(mock_receivers[0])
+    await hass.async_add_executor_job(mock_receivers[0])
     await hass.async_block_till_done()
 
     assert len(events) == 1
@@ -811,1064 +829,1183 @@ async def test_network_complete_some_dead(hass, mock_openzwave):
 
     hass.bus.async_listen(const.EVENT_NETWORK_COMPLETE_SOME_DEAD, listener)
 
-    hass.async_add_job(mock_receivers[0])
+    await hass.async_add_executor_job(mock_receivers[0])
     await hass.async_block_till_done()
 
     assert len(events) == 1
 
 
-class TestZWaveDeviceEntityValues(unittest.TestCase):
-    """Tests for the ZWaveDeviceEntityValues helper."""
+async def test_entity_discovery(
+    hass, mock_discovery, mock_import_module, mock_values, mock_openzwave, zwave_setup
+):
+    """Test the creation of a new entity."""
+    (node, value_class, mock_schema) = mock_values
 
-    @pytest.fixture(autouse=True)
-    def set_mock_openzwave(self, mock_openzwave):
-        """Use the mock_openzwave fixture for this class."""
-        self.mock_openzwave = mock_openzwave
+    registry = mock_registry(hass)
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.hass.start()
-        self.registry = mock_registry(self.hass)
+    entity_id = "mock_component.mock_node_mock_value"
+    zwave_config = {"zwave": {}}
+    device_config = {entity_id: {}}
 
-        setup_component(self.hass, "zwave", {"zwave": {}})
-        self.hass.block_till_done()
-
-        self.node = MockNode()
-        self.mock_schema = {
-            const.DISC_COMPONENT: "mock_component",
-            const.DISC_VALUES: {
-                const.DISC_PRIMARY: {const.DISC_COMMAND_CLASS: ["mock_primary_class"]},
-                "secondary": {const.DISC_COMMAND_CLASS: ["mock_secondary_class"]},
-                "optional": {
-                    const.DISC_COMMAND_CLASS: ["mock_optional_class"],
-                    const.DISC_OPTIONAL: True,
-                },
-            },
-        }
-        self.primary = MockValue(
-            command_class="mock_primary_class", node=self.node, value_id=1000
-        )
-        self.secondary = MockValue(command_class="mock_secondary_class", node=self.node)
-        self.duplicate_secondary = MockValue(
-            command_class="mock_secondary_class", node=self.node
-        )
-        self.optional = MockValue(command_class="mock_optional_class", node=self.node)
-        self.no_match_value = MockValue(command_class="mock_bad_class", node=self.node)
-
-        self.entity_id = "mock_component.mock_node_mock_value"
-        self.zwave_config = {"zwave": {}}
-        self.device_config = {self.entity_id: {}}
-        self.addCleanup(self.tear_down_cleanup)
-
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    @patch.object(zwave, "import_module")
-    @patch.object(zwave, "discovery")
-    def test_entity_discovery(self, discovery, import_module):
-        """Test the creation of a new entity."""
-        discovery.async_load_platform = AsyncMock(return_value=None)
-        mock_platform = MagicMock()
-        import_module.return_value = mock_platform
-        mock_device = MagicMock()
-        mock_device.name = "test_device"
-        mock_platform.get_device.return_value = mock_device
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
         values = zwave.ZWaveDeviceEntityValues(
-            hass=self.hass,
-            schema=self.mock_schema,
-            primary_value=self.primary,
-            zwave_config=self.zwave_config,
-            device_config=self.device_config,
-            registry=self.registry,
+            hass=hass,
+            schema=mock_schema,
+            primary_value=value_class.primary,
+            zwave_config=zwave_config,
+            device_config=device_config,
+            registry=registry,
         )
+        assert not mock_discovery.async_load_platform.called
 
-        assert values.primary is self.primary
-        assert len(list(values)) == 3
-        assert sorted(list(values), key=lambda a: id(a)) == sorted(
-            [self.primary, None, None], key=lambda a: id(a)
-        )
-        assert not discovery.async_load_platform.called
+    assert values.primary is value_class.primary
+    assert len(list(values)) == 3
+    assert sorted(list(values), key=lambda a: id(a)) == sorted(
+        [value_class.primary, None, None], key=lambda a: id(a)
+    )
 
-        values.check_value(self.secondary)
-        self.hass.block_till_done()
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
+        values.check_value(value_class.secondary)
+        await hass.async_block_till_done()
 
-        assert values.secondary is self.secondary
-        assert len(list(values)) == 3
-        assert sorted(list(values), key=lambda a: id(a)) == sorted(
-            [self.primary, self.secondary, None], key=lambda a: id(a)
-        )
+        assert mock_discovery.async_load_platform.called
+        assert len(mock_discovery.async_load_platform.mock_calls) == 1
 
-        assert discovery.async_load_platform.called
-        assert len(discovery.async_load_platform.mock_calls) == 1
-        args = discovery.async_load_platform.mock_calls[0][1]
-        assert args[0] == self.hass
+        args = mock_discovery.async_load_platform.mock_calls[0][1]
+        assert args[0] == hass
         assert args[1] == "mock_component"
         assert args[2] == "zwave"
-        assert args[3] == {const.DISCOVERY_DEVICE: mock_device.unique_id}
-        assert args[4] == self.zwave_config
-
-        discovery.async_load_platform.reset_mock()
-        values.check_value(self.optional)
-        values.check_value(self.duplicate_secondary)
-        values.check_value(self.no_match_value)
-        self.hass.block_till_done()
-
-        assert values.optional is self.optional
-        assert len(list(values)) == 3
-        assert sorted(list(values), key=lambda a: id(a)) == sorted(
-            [self.primary, self.secondary, self.optional], key=lambda a: id(a)
-        )
-        assert not discovery.async_load_platform.called
-
-        assert values._entity.value_added.called
-        assert len(values._entity.value_added.mock_calls) == 1
-        assert values._entity.value_changed.called
-        assert len(values._entity.value_changed.mock_calls) == 1
-
-    @patch.object(zwave, "import_module")
-    @patch.object(zwave, "discovery")
-    def test_entity_existing_values(self, discovery, import_module):
-        """Test the loading of already discovered values."""
-        discovery.async_load_platform = AsyncMock(return_value=None)
-        mock_platform = MagicMock()
-        import_module.return_value = mock_platform
-        mock_device = MagicMock()
-        mock_device.name = "test_device"
-        mock_platform.get_device.return_value = mock_device
-        self.node.values = {
-            self.primary.value_id: self.primary,
-            self.secondary.value_id: self.secondary,
-            self.optional.value_id: self.optional,
-            self.no_match_value.value_id: self.no_match_value,
+        assert args[3] == {
+            const.DISCOVERY_DEVICE: mock_import_module().get_device().unique_id
         }
+        assert args[4] == zwave_config
 
+    assert values.secondary is value_class.secondary
+    assert len(list(values)) == 3
+    assert sorted(list(values), key=lambda a: id(a)) == sorted(
+        [value_class.primary, value_class.secondary, None], key=lambda a: id(a)
+    )
+
+    mock_discovery.async_load_platform.reset_mock()
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
+        values.check_value(value_class.optional)
+        values.check_value(value_class.duplicate_secondary)
+        values.check_value(value_class.no_match_value)
+        await hass.async_block_till_done()
+
+        assert not mock_discovery.async_load_platform.called
+
+    assert values.optional is value_class.optional
+    assert len(list(values)) == 3
+    assert sorted(list(values), key=lambda a: id(a)) == sorted(
+        [value_class.primary, value_class.secondary, value_class.optional],
+        key=lambda a: id(a),
+    )
+
+    assert values._entity.value_added.called
+    assert len(values._entity.value_added.mock_calls) == 1
+    assert values._entity.value_changed.called
+    assert len(values._entity.value_changed.mock_calls) == 1
+
+
+async def test_entity_existing_values(
+    hass, mock_discovery, mock_import_module, mock_values, mock_openzwave, zwave_setup
+):
+    """Test the loading of already discovered values."""
+    (node, value_class, mock_schema) = mock_values
+
+    registry = mock_registry(hass)
+
+    entity_id = "mock_component.mock_node_mock_value"
+    zwave_config = {"zwave": {}}
+    device_config = {entity_id: {}}
+
+    node.values = {
+        value_class.primary.value_id: value_class.primary,
+        value_class.secondary.value_id: value_class.secondary,
+        value_class.optional.value_id: value_class.optional,
+        value_class.no_match_value.value_id: value_class.no_match_value,
+    }
+
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
         values = zwave.ZWaveDeviceEntityValues(
-            hass=self.hass,
-            schema=self.mock_schema,
-            primary_value=self.primary,
-            zwave_config=self.zwave_config,
-            device_config=self.device_config,
-            registry=self.registry,
+            hass=hass,
+            schema=mock_schema,
+            primary_value=value_class.primary,
+            zwave_config=zwave_config,
+            device_config=device_config,
+            registry=registry,
         )
-        self.hass.block_till_done()
+        await hass.async_block_till_done()
 
-        assert values.primary is self.primary
-        assert values.secondary is self.secondary
-        assert values.optional is self.optional
-        assert len(list(values)) == 3
-        assert sorted(list(values), key=lambda a: id(a)) == sorted(
-            [self.primary, self.secondary, self.optional], key=lambda a: id(a)
-        )
-
-        assert discovery.async_load_platform.called
-        assert len(discovery.async_load_platform.mock_calls) == 1
-        args = discovery.async_load_platform.mock_calls[0][1]
-        assert args[0] == self.hass
+        assert mock_discovery.async_load_platform.called
+        assert len(mock_discovery.async_load_platform.mock_calls) == 1
+        args = mock_discovery.async_load_platform.mock_calls[0][1]
+        assert args[0] == hass
         assert args[1] == "mock_component"
         assert args[2] == "zwave"
-        assert args[3] == {const.DISCOVERY_DEVICE: mock_device.unique_id}
-        assert args[4] == self.zwave_config
-        assert not self.primary.enable_poll.called
-
-    @patch.object(zwave, "import_module")
-    @patch.object(zwave, "discovery")
-    def test_node_schema_mismatch(self, discovery, import_module):
-        """Test node schema mismatch."""
-        self.node.generic = "no_match"
-        self.node.values = {
-            self.primary.value_id: self.primary,
-            self.secondary.value_id: self.secondary,
+        assert args[3] == {
+            const.DISCOVERY_DEVICE: mock_import_module().get_device().unique_id
         }
-        self.mock_schema[const.DISC_GENERIC_DEVICE_CLASS] = ["generic_match"]
+        assert args[4] == zwave_config
+        assert not value_class.primary.enable_poll.called
+
+    assert values.primary is value_class.primary
+    assert values.secondary is value_class.secondary
+    assert values.optional is value_class.optional
+    assert len(list(values)) == 3
+    assert sorted(list(values), key=lambda a: id(a)) == sorted(
+        [value_class.primary, value_class.secondary, value_class.optional],
+        key=lambda a: id(a),
+    )
+
+
+async def test_node_schema_mismatch(
+    hass, mock_discovery, mock_import_module, mock_values, mock_openzwave, zwave_setup
+):
+    """Test node schema mismatch."""
+    (node, value_class, mock_schema) = mock_values
+
+    registry = mock_registry(hass)
+
+    entity_id = "mock_component.mock_node_mock_value"
+    zwave_config = {"zwave": {}}
+    device_config = {entity_id: {}}
+
+    node.generic = "no_match"
+    node.values = {
+        value_class.primary.value_id: value_class.primary,
+        value_class.secondary.value_id: value_class.secondary,
+    }
+    mock_schema[const.DISC_GENERIC_DEVICE_CLASS] = ["generic_match"]
+
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
         values = zwave.ZWaveDeviceEntityValues(
-            hass=self.hass,
-            schema=self.mock_schema,
-            primary_value=self.primary,
-            zwave_config=self.zwave_config,
-            device_config=self.device_config,
-            registry=self.registry,
+            hass=hass,
+            schema=mock_schema,
+            primary_value=value_class.primary,
+            zwave_config=zwave_config,
+            device_config=device_config,
+            registry=registry,
         )
         values._check_entity_ready()
-        self.hass.block_till_done()
+        await hass.async_block_till_done()
 
-        assert not discovery.async_load_platform.called
+        assert not mock_discovery.async_load_platform.called
 
-    @patch.object(zwave, "import_module")
-    @patch.object(zwave, "discovery")
-    def test_entity_workaround_component(self, discovery, import_module):
-        """Test component workaround."""
-        discovery.async_load_platform = AsyncMock(return_value=None)
-        mock_platform = MagicMock()
-        import_module.return_value = mock_platform
-        mock_device = MagicMock()
-        mock_device.name = "test_device"
-        mock_platform.get_device.return_value = mock_device
-        self.node.manufacturer_id = "010f"
-        self.node.product_type = "0b00"
-        self.primary.command_class = const.COMMAND_CLASS_SENSOR_ALARM
-        self.entity_id = "binary_sensor.mock_node_mock_value"
-        self.device_config = {self.entity_id: {}}
 
-        self.mock_schema = {
-            const.DISC_COMPONENT: "mock_component",
-            const.DISC_VALUES: {
-                const.DISC_PRIMARY: {
-                    const.DISC_COMMAND_CLASS: [const.COMMAND_CLASS_SWITCH_BINARY]
-                }
-            },
-        }
+async def test_entity_workaround_component(
+    hass, mock_discovery, mock_import_module, mock_values, mock_openzwave, zwave_setup
+):
+    """Test component workaround."""
+    (node, value_class, mock_schema) = mock_values
 
-        with patch.object(zwave, "async_dispatcher_send") as mock_dispatch_send:
+    registry = mock_registry(hass)
 
-            values = zwave.ZWaveDeviceEntityValues(
-                hass=self.hass,
-                schema=self.mock_schema,
-                primary_value=self.primary,
-                zwave_config=self.zwave_config,
-                device_config=self.device_config,
-                registry=self.registry,
-            )
-            values._check_entity_ready()
-            self.hass.block_till_done()
+    node.manufacturer_id = "010f"
+    node.product_type = "0b00"
+    value_class.primary.command_class = const.COMMAND_CLASS_SENSOR_ALARM
 
-            assert mock_dispatch_send.called
-            assert len(mock_dispatch_send.mock_calls) == 1
-            args = mock_dispatch_send.mock_calls[0][1]
-            assert args[1] == "zwave_new_binary_sensor"
+    entity_id = "binary_sensor.mock_node_mock_value"
+    zwave_config = {"zwave": {}}
+    device_config = {entity_id: {}}
 
-    @patch.object(zwave, "import_module")
-    @patch.object(zwave, "discovery")
-    def test_entity_workaround_ignore(self, discovery, import_module):
-        """Test ignore workaround."""
-        self.node.manufacturer_id = "010f"
-        self.node.product_type = "0301"
-        self.primary.command_class = const.COMMAND_CLASS_SWITCH_BINARY
+    mock_schema = {
+        const.DISC_COMPONENT: "mock_component",
+        const.DISC_VALUES: {
+            const.DISC_PRIMARY: {
+                const.DISC_COMMAND_CLASS: [const.COMMAND_CLASS_SWITCH_BINARY]
+            }
+        },
+    }
 
-        self.mock_schema = {
-            const.DISC_COMPONENT: "mock_component",
-            const.DISC_VALUES: {
-                const.DISC_PRIMARY: {
-                    const.DISC_COMMAND_CLASS: [const.COMMAND_CLASS_SWITCH_BINARY]
-                }
-            },
-        }
+    with patch.object(
+        zwave, "async_dispatcher_send"
+    ) as mock_dispatch_send, patch.object(
+        zwave, "discovery", mock_discovery
+    ), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
 
         values = zwave.ZWaveDeviceEntityValues(
-            hass=self.hass,
-            schema=self.mock_schema,
-            primary_value=self.primary,
-            zwave_config=self.zwave_config,
-            device_config=self.device_config,
-            registry=self.registry,
+            hass=hass,
+            schema=mock_schema,
+            primary_value=value_class.primary,
+            zwave_config=zwave_config,
+            device_config=device_config,
+            registry=registry,
         )
         values._check_entity_ready()
-        self.hass.block_till_done()
+        await hass.async_block_till_done()
 
-        assert not discovery.async_load_platform.called
+        assert mock_dispatch_send.called
+        assert len(mock_dispatch_send.mock_calls) == 1
+        args = mock_dispatch_send.mock_calls[0][1]
+        assert args[1] == "zwave_new_binary_sensor"
 
-    @patch.object(zwave, "import_module")
-    @patch.object(zwave, "discovery")
-    def test_entity_config_ignore(self, discovery, import_module):
-        """Test ignore config."""
-        self.node.values = {
-            self.primary.value_id: self.primary,
-            self.secondary.value_id: self.secondary,
-        }
-        self.device_config = {self.entity_id: {zwave.CONF_IGNORED: True}}
+
+async def test_entity_workaround_ignore(
+    hass, mock_discovery, mock_import_module, mock_values, mock_openzwave, zwave_setup
+):
+    """Test ignore workaround."""
+    (node, value_class, mock_schema) = mock_values
+
+    registry = mock_registry(hass)
+
+    entity_id = "mock_component.mock_node_mock_value"
+    zwave_config = {"zwave": {}}
+    device_config = {entity_id: {}}
+
+    node.manufacturer_id = "010f"
+    node.product_type = "0301"
+    value_class.primary.command_class = const.COMMAND_CLASS_SWITCH_BINARY
+
+    mock_schema = {
+        const.DISC_COMPONENT: "mock_component",
+        const.DISC_VALUES: {
+            const.DISC_PRIMARY: {
+                const.DISC_COMMAND_CLASS: [const.COMMAND_CLASS_SWITCH_BINARY]
+            }
+        },
+    }
+
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
         values = zwave.ZWaveDeviceEntityValues(
-            hass=self.hass,
-            schema=self.mock_schema,
-            primary_value=self.primary,
-            zwave_config=self.zwave_config,
-            device_config=self.device_config,
-            registry=self.registry,
+            hass=hass,
+            schema=mock_schema,
+            primary_value=value_class.primary,
+            zwave_config=zwave_config,
+            device_config=device_config,
+            registry=registry,
         )
         values._check_entity_ready()
-        self.hass.block_till_done()
+        await hass.async_block_till_done()
 
-        assert not discovery.async_load_platform.called
+        assert not mock_discovery.async_load_platform.called
 
-    @patch.object(zwave, "import_module")
-    @patch.object(zwave, "discovery")
-    def test_entity_config_ignore_with_registry(self, discovery, import_module):
-        """Test ignore config.
 
-        The case when the device is in entity registry.
-        """
-        self.node.values = {
-            self.primary.value_id: self.primary,
-            self.secondary.value_id: self.secondary,
-        }
-        self.device_config = {"mock_component.registry_id": {zwave.CONF_IGNORED: True}}
-        with patch.object(self.registry, "async_schedule_save"):
-            self.registry.async_get_or_create(
-                "mock_component",
-                zwave.DOMAIN,
-                "567-1000",
-                suggested_object_id="registry_id",
-            )
+async def test_entity_config_ignore(
+    hass, mock_discovery, mock_import_module, mock_values, mock_openzwave, zwave_setup
+):
+    """Test ignore config."""
+    (node, value_class, mock_schema) = mock_values
 
+    registry = mock_registry(hass)
+
+    entity_id = "mock_component.mock_node_mock_value"
+    zwave_config = {"zwave": {}}
+    device_config = {entity_id: {}}
+
+    node.values = {
+        value_class.primary.value_id: value_class.primary,
+        value_class.secondary.value_id: value_class.secondary,
+    }
+    device_config = {entity_id: {zwave.CONF_IGNORED: True}}
+
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
+        values = zwave.ZWaveDeviceEntityValues(
+            hass=hass,
+            schema=mock_schema,
+            primary_value=value_class.primary,
+            zwave_config=zwave_config,
+            device_config=device_config,
+            registry=registry,
+        )
+        values._check_entity_ready()
+        await hass.async_block_till_done()
+
+        assert not mock_discovery.async_load_platform.called
+
+
+async def test_entity_config_ignore_with_registry(
+    hass, mock_discovery, mock_import_module, mock_values, mock_openzwave, zwave_setup
+):
+    """Test ignore config.
+
+    The case when the device is in entity registry.
+    """
+    (node, value_class, mock_schema) = mock_values
+
+    registry = mock_registry(hass)
+
+    entity_id = "mock_component.mock_node_mock_value"
+    zwave_config = {"zwave": {}}
+    device_config = {entity_id: {}}
+
+    node.values = {
+        value_class.primary.value_id: value_class.primary,
+        value_class.secondary.value_id: value_class.secondary,
+    }
+    device_config = {"mock_component.registry_id": {zwave.CONF_IGNORED: True}}
+    with patch.object(registry, "async_schedule_save"):
+        registry.async_get_or_create(
+            "mock_component",
+            zwave.DOMAIN,
+            "567-1000",
+            suggested_object_id="registry_id",
+        )
+
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
         zwave.ZWaveDeviceEntityValues(
-            hass=self.hass,
-            schema=self.mock_schema,
-            primary_value=self.primary,
-            zwave_config=self.zwave_config,
-            device_config=self.device_config,
-            registry=self.registry,
+            hass=hass,
+            schema=mock_schema,
+            primary_value=value_class.primary,
+            zwave_config=zwave_config,
+            device_config=device_config,
+            registry=registry,
         )
-        self.hass.block_till_done()
+        await hass.async_block_till_done()
 
-        assert not discovery.async_load_platform.called
+        assert not mock_discovery.async_load_platform.called
 
-    @patch.object(zwave, "import_module")
-    @patch.object(zwave, "discovery")
-    def test_entity_platform_ignore(self, discovery, import_module):
-        """Test platform ignore device."""
-        self.node.values = {
-            self.primary.value_id: self.primary,
-            self.secondary.value_id: self.secondary,
-        }
-        platform = MagicMock()
-        import_module.return_value = platform
-        platform.get_device.return_value = None
+
+async def test_entity_platform_ignore(
+    hass, mock_discovery, mock_import_module, mock_values, mock_openzwave, zwave_setup
+):
+    """Test platform ignore device."""
+    (node, value_class, mock_schema) = mock_values
+
+    registry = mock_registry(hass)
+
+    entity_id = "mock_component.mock_node_mock_value"
+    zwave_config = {"zwave": {}}
+    device_config = {entity_id: {}}
+
+    node.values = {
+        value_class.primary.value_id: value_class.primary,
+        value_class.secondary.value_id: value_class.secondary,
+    }
+
+    import_module = MagicMock()
+    platform = MagicMock()
+    import_module.return_value = platform
+    platform.get_device.return_value = None
+
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", import_module
+    ):
         zwave.ZWaveDeviceEntityValues(
-            hass=self.hass,
-            schema=self.mock_schema,
-            primary_value=self.primary,
-            zwave_config=self.zwave_config,
-            device_config=self.device_config,
-            registry=self.registry,
+            hass=hass,
+            schema=mock_schema,
+            primary_value=value_class.primary,
+            zwave_config=zwave_config,
+            device_config=device_config,
+            registry=registry,
         )
-        self.hass.block_till_done()
+        await hass.async_block_till_done()
 
-        assert not discovery.async_load_platform.called
+        assert not mock_discovery.async_load_platform.called
 
-    @patch.object(zwave, "import_module")
-    @patch.object(zwave, "discovery")
-    def test_config_polling_intensity(self, discovery, import_module):
-        """Test polling intensity."""
-        mock_platform = MagicMock()
-        import_module.return_value = mock_platform
-        mock_device = MagicMock()
-        mock_device.name = "test_device"
-        mock_platform.get_device.return_value = mock_device
-        self.node.values = {
-            self.primary.value_id: self.primary,
-            self.secondary.value_id: self.secondary,
-        }
-        self.device_config = {self.entity_id: {zwave.CONF_POLLING_INTENSITY: 123}}
+
+async def test_config_polling_intensity(
+    hass, mock_discovery, mock_import_module, mock_values, mock_openzwave, zwave_setup
+):
+    """Test polling intensity."""
+    (node, value_class, mock_schema) = mock_values
+
+    registry = mock_registry(hass)
+
+    entity_id = "mock_component.mock_node_mock_value"
+    zwave_config = {"zwave": {}}
+    device_config = {entity_id: {}}
+
+    node.values = {
+        value_class.primary.value_id: value_class.primary,
+        value_class.secondary.value_id: value_class.secondary,
+    }
+    device_config = {entity_id: {zwave.CONF_POLLING_INTENSITY: 123}}
+
+    with patch.object(zwave, "discovery", mock_discovery), patch.object(
+        zwave, "import_module", mock_import_module
+    ):
         values = zwave.ZWaveDeviceEntityValues(
-            hass=self.hass,
-            schema=self.mock_schema,
-            primary_value=self.primary,
-            zwave_config=self.zwave_config,
-            device_config=self.device_config,
-            registry=self.registry,
+            hass=hass,
+            schema=mock_schema,
+            primary_value=value_class.primary,
+            zwave_config=zwave_config,
+            device_config=device_config,
+            registry=registry,
         )
         values._check_entity_ready()
-        self.hass.block_till_done()
+        await hass.async_block_till_done()
 
-        assert discovery.async_load_platform.called
-        assert self.primary.enable_poll.called
-        assert len(self.primary.enable_poll.mock_calls) == 1
-        assert self.primary.enable_poll.mock_calls[0][1][0] == 123
+        assert mock_discovery.async_load_platform.called
+
+    assert value_class.primary.enable_poll.called
+    assert len(value_class.primary.enable_poll.mock_calls) == 1
+    assert value_class.primary.enable_poll.mock_calls[0][1][0] == 123
 
 
-class TestZwave(unittest.TestCase):
-    """Test zwave init."""
-
-    def test_device_config_glob_is_ordered(self):
-        """Test that device_config_glob preserves order."""
-        conf = CONFIG_SCHEMA({"zwave": {CONF_DEVICE_CONFIG_GLOB: OrderedDict()}})
-        assert isinstance(conf["zwave"][CONF_DEVICE_CONFIG_GLOB], OrderedDict)
+async def test_device_config_glob_is_ordered():
+    """Test that device_config_glob preserves order."""
+    conf = CONFIG_SCHEMA({"zwave": {CONF_DEVICE_CONFIG_GLOB: OrderedDict()}})
+    assert isinstance(conf["zwave"][CONF_DEVICE_CONFIG_GLOB], OrderedDict)
 
 
-class TestZWaveServices(unittest.TestCase):
-    """Tests for zwave services."""
+async def test_add_node(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave add_node service."""
+    zwave_network = hass.data[DATA_NETWORK]
 
-    @pytest.fixture(autouse=True)
-    def set_mock_openzwave(self, mock_openzwave):
-        """Use the mock_openzwave fixture for this class."""
-        self.mock_openzwave = mock_openzwave
+    await hass.services.async_call("zwave", "add_node", {})
+    await hass.async_block_till_done()
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.hass.start()
+    assert zwave_network.controller.add_node.called
+    assert len(zwave_network.controller.add_node.mock_calls) == 1
+    assert len(zwave_network.controller.add_node.mock_calls[0][1]) == 0
 
-        # Initialize zwave
-        setup_component(self.hass, "zwave", {"zwave": {}})
-        self.hass.block_till_done()
-        self.zwave_network = self.hass.data[DATA_NETWORK]
-        self.zwave_network.state = MockNetwork.STATE_READY
-        self.hass.bus.fire(EVENT_HOMEASSISTANT_START)
-        self.hass.block_till_done()
-        self.addCleanup(self.tear_down_cleanup)
 
-    def tear_down_cleanup(self):
-        """Stop everything that was started."""
-        self.hass.services.call("zwave", "stop_network", {})
-        self.hass.block_till_done()
-        self.hass.stop()
+async def test_add_node_secure(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave add_node_secure service."""
+    zwave_network = hass.data[DATA_NETWORK]
 
-    def test_add_node(self):
-        """Test zwave add_node service."""
-        self.hass.services.call("zwave", "add_node", {})
-        self.hass.block_till_done()
+    await hass.services.async_call("zwave", "add_node_secure", {})
+    await hass.async_block_till_done()
 
-        assert self.zwave_network.controller.add_node.called
-        assert len(self.zwave_network.controller.add_node.mock_calls) == 1
-        assert len(self.zwave_network.controller.add_node.mock_calls[0][1]) == 0
+    assert zwave_network.controller.add_node.called
+    assert len(zwave_network.controller.add_node.mock_calls) == 1
+    assert zwave_network.controller.add_node.mock_calls[0][1][0] is True
 
-    def test_add_node_secure(self):
-        """Test zwave add_node_secure service."""
-        self.hass.services.call("zwave", "add_node_secure", {})
-        self.hass.block_till_done()
 
-        assert self.zwave_network.controller.add_node.called
-        assert len(self.zwave_network.controller.add_node.mock_calls) == 1
-        assert self.zwave_network.controller.add_node.mock_calls[0][1][0] is True
+async def test_remove_node(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave remove_node service."""
+    zwave_network = hass.data[DATA_NETWORK]
 
-    def test_remove_node(self):
-        """Test zwave remove_node service."""
-        self.hass.services.call("zwave", "remove_node", {})
-        self.hass.block_till_done()
+    await hass.services.async_call("zwave", "remove_node", {})
+    await hass.async_block_till_done()
 
-        assert self.zwave_network.controller.remove_node.called
-        assert len(self.zwave_network.controller.remove_node.mock_calls) == 1
+    assert zwave_network.controller.remove_node.called
+    assert len(zwave_network.controller.remove_node.mock_calls) == 1
 
-    def test_cancel_command(self):
-        """Test zwave cancel_command service."""
-        self.hass.services.call("zwave", "cancel_command", {})
-        self.hass.block_till_done()
 
-        assert self.zwave_network.controller.cancel_command.called
-        assert len(self.zwave_network.controller.cancel_command.mock_calls) == 1
+async def test_cancel_command(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave cancel_command service."""
+    zwave_network = hass.data[DATA_NETWORK]
 
-    def test_heal_network(self):
-        """Test zwave heal_network service."""
-        self.hass.services.call("zwave", "heal_network", {})
-        self.hass.block_till_done()
+    await hass.services.async_call("zwave", "cancel_command", {})
+    await hass.async_block_till_done()
 
-        assert self.zwave_network.heal.called
-        assert len(self.zwave_network.heal.mock_calls) == 1
+    assert zwave_network.controller.cancel_command.called
+    assert len(zwave_network.controller.cancel_command.mock_calls) == 1
 
-    def test_soft_reset(self):
-        """Test zwave soft_reset service."""
-        self.hass.services.call("zwave", "soft_reset", {})
-        self.hass.block_till_done()
 
-        assert self.zwave_network.controller.soft_reset.called
-        assert len(self.zwave_network.controller.soft_reset.mock_calls) == 1
+async def test_heal_network(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave heal_network service."""
+    zwave_network = hass.data[DATA_NETWORK]
 
-    def test_test_network(self):
-        """Test zwave test_network service."""
-        self.hass.services.call("zwave", "test_network", {})
-        self.hass.block_till_done()
+    await hass.services.async_call("zwave", "heal_network", {})
+    await hass.async_block_till_done()
 
-        assert self.zwave_network.test.called
-        assert len(self.zwave_network.test.mock_calls) == 1
+    assert zwave_network.heal.called
+    assert len(zwave_network.heal.mock_calls) == 1
 
-    def test_stop_network(self):
-        """Test zwave stop_network service."""
-        with patch.object(self.hass.bus, "fire") as mock_fire:
-            self.hass.services.call("zwave", "stop_network", {})
-            self.hass.block_till_done()
 
-            assert self.zwave_network.stop.called
-            assert len(self.zwave_network.stop.mock_calls) == 1
-            assert mock_fire.called
-            assert len(mock_fire.mock_calls) == 1
-            assert mock_fire.mock_calls[0][1][0] == const.EVENT_NETWORK_STOP
+async def test_soft_reset(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave soft_reset service."""
+    zwave_network = hass.data[DATA_NETWORK]
 
-    def test_rename_node(self):
-        """Test zwave rename_node service."""
-        self.zwave_network.nodes = {11: MagicMock()}
-        self.hass.services.call(
-            "zwave",
-            "rename_node",
-            {const.ATTR_NODE_ID: 11, const.ATTR_NAME: "test_name"},
+    await hass.services.async_call("zwave", "soft_reset", {})
+    await hass.async_block_till_done()
+
+    assert zwave_network.controller.soft_reset.called
+    assert len(zwave_network.controller.soft_reset.mock_calls) == 1
+
+
+async def test_test_network(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave test_network service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    await hass.services.async_call("zwave", "test_network", {})
+    await hass.async_block_till_done()
+
+    assert zwave_network.test.called
+    assert len(zwave_network.test.mock_calls) == 1
+
+
+async def test_stop_network(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave stop_network service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    with patch.object(hass.bus, "fire") as mock_fire:
+        await hass.services.async_call("zwave", "stop_network", {})
+        await hass.async_block_till_done()
+
+        assert zwave_network.stop.called
+        assert len(zwave_network.stop.mock_calls) == 1
+        assert mock_fire.called
+        assert len(mock_fire.mock_calls) == 1
+        assert mock_fire.mock_calls[0][1][0] == const.EVENT_NETWORK_STOP
+
+
+async def test_rename_node(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave rename_node service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    zwave_network.nodes = {11: MagicMock()}
+    await hass.services.async_call(
+        "zwave",
+        "rename_node",
+        {const.ATTR_NODE_ID: 11, const.ATTR_NAME: "test_name"},
+    )
+    await hass.async_block_till_done()
+
+    assert zwave_network.nodes[11].name == "test_name"
+
+
+async def test_rename_value(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave rename_value service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(node_id=14)
+    value = MockValue(index=12, value_id=123456, label="Old Label")
+    node.values = {123456: value}
+    zwave_network.nodes = {11: node}
+
+    assert value.label == "Old Label"
+    await hass.services.async_call(
+        "zwave",
+        "rename_value",
+        {
+            const.ATTR_NODE_ID: 11,
+            const.ATTR_VALUE_ID: 123456,
+            const.ATTR_NAME: "New Label",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert value.label == "New Label"
+
+
+async def test_set_poll_intensity_enable(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave set_poll_intensity service, successful set."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(node_id=14)
+    value = MockValue(index=12, value_id=123456, poll_intensity=0)
+    node.values = {123456: value}
+    zwave_network.nodes = {11: node}
+
+    assert value.poll_intensity == 0
+    await hass.services.async_call(
+        "zwave",
+        "set_poll_intensity",
+        {
+            const.ATTR_NODE_ID: 11,
+            const.ATTR_VALUE_ID: 123456,
+            const.ATTR_POLL_INTENSITY: 4,
+        },
+    )
+    await hass.async_block_till_done()
+
+    enable_poll = value.enable_poll
+    assert value.enable_poll.called
+    assert len(enable_poll.mock_calls) == 2
+    assert enable_poll.mock_calls[0][1][0] == 4
+
+
+async def test_set_poll_intensity_enable_failed(
+    hass, mock_openzwave, zwave_setup_ready
+):
+    """Test zwave set_poll_intensity service, failed set."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(node_id=14)
+    value = MockValue(index=12, value_id=123456, poll_intensity=0)
+    value.enable_poll.return_value = False
+    node.values = {123456: value}
+    zwave_network.nodes = {11: node}
+
+    assert value.poll_intensity == 0
+    await hass.services.async_call(
+        "zwave",
+        "set_poll_intensity",
+        {
+            const.ATTR_NODE_ID: 11,
+            const.ATTR_VALUE_ID: 123456,
+            const.ATTR_POLL_INTENSITY: 4,
+        },
+    )
+    await hass.async_block_till_done()
+
+    enable_poll = value.enable_poll
+    assert value.enable_poll.called
+    assert len(enable_poll.mock_calls) == 1
+
+
+async def test_set_poll_intensity_disable(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave set_poll_intensity service, successful disable."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(node_id=14)
+    value = MockValue(index=12, value_id=123456, poll_intensity=4)
+    node.values = {123456: value}
+    zwave_network.nodes = {11: node}
+
+    assert value.poll_intensity == 4
+    await hass.services.async_call(
+        "zwave",
+        "set_poll_intensity",
+        {
+            const.ATTR_NODE_ID: 11,
+            const.ATTR_VALUE_ID: 123456,
+            const.ATTR_POLL_INTENSITY: 0,
+        },
+    )
+    await hass.async_block_till_done()
+
+    disable_poll = value.disable_poll
+    assert value.disable_poll.called
+    assert len(disable_poll.mock_calls) == 2
+
+
+async def test_set_poll_intensity_disable_failed(
+    hass, mock_openzwave, zwave_setup_ready
+):
+    """Test zwave set_poll_intensity service, failed disable."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(node_id=14)
+    value = MockValue(index=12, value_id=123456, poll_intensity=4)
+    value.disable_poll.return_value = False
+    node.values = {123456: value}
+    zwave_network.nodes = {11: node}
+
+    assert value.poll_intensity == 4
+    await hass.services.async_call(
+        "zwave",
+        "set_poll_intensity",
+        {
+            const.ATTR_NODE_ID: 11,
+            const.ATTR_VALUE_ID: 123456,
+            const.ATTR_POLL_INTENSITY: 0,
+        },
+    )
+    await hass.async_block_till_done()
+
+    disable_poll = value.disable_poll
+    assert value.disable_poll.called
+    assert len(disable_poll.mock_calls) == 1
+
+
+async def test_remove_failed_node(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave remove_failed_node service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    await hass.services.async_call(
+        "zwave", "remove_failed_node", {const.ATTR_NODE_ID: 12}
+    )
+    await hass.async_block_till_done()
+
+    remove_failed_node = zwave_network.controller.remove_failed_node
+    assert remove_failed_node.called
+    assert len(remove_failed_node.mock_calls) == 1
+    assert remove_failed_node.mock_calls[0][1][0] == 12
+
+
+async def test_replace_failed_node(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave replace_failed_node service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    await hass.services.async_call(
+        "zwave", "replace_failed_node", {const.ATTR_NODE_ID: 13}
+    )
+    await hass.async_block_till_done()
+
+    replace_failed_node = zwave_network.controller.replace_failed_node
+    assert replace_failed_node.called
+    assert len(replace_failed_node.mock_calls) == 1
+    assert replace_failed_node.mock_calls[0][1][0] == 13
+
+
+async def test_set_config_parameter(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave set_config_parameter service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    value_byte = MockValue(
+        index=12,
+        command_class=const.COMMAND_CLASS_CONFIGURATION,
+        type=const.TYPE_BYTE,
+    )
+    value_list = MockValue(
+        index=13,
+        command_class=const.COMMAND_CLASS_CONFIGURATION,
+        type=const.TYPE_LIST,
+        data_items=["item1", "item2", "item3"],
+    )
+    value_button = MockValue(
+        index=14,
+        command_class=const.COMMAND_CLASS_CONFIGURATION,
+        type=const.TYPE_BUTTON,
+    )
+    value_list_int = MockValue(
+        index=15,
+        command_class=const.COMMAND_CLASS_CONFIGURATION,
+        type=const.TYPE_LIST,
+        data_items=["1", "2", "3"],
+    )
+    value_bool = MockValue(
+        index=16,
+        command_class=const.COMMAND_CLASS_CONFIGURATION,
+        type=const.TYPE_BOOL,
+    )
+    node = MockNode(node_id=14)
+    node.get_values.return_value = {
+        12: value_byte,
+        13: value_list,
+        14: value_button,
+        15: value_list_int,
+        16: value_bool,
+    }
+    zwave_network.nodes = {14: node}
+
+    # Byte
+    await hass.services.async_call(
+        "zwave",
+        "set_config_parameter",
+        {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_CONFIG_PARAMETER: 12,
+            const.ATTR_CONFIG_VALUE: 7,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert value_byte.data == 7
+
+    # List
+    await hass.services.async_call(
+        "zwave",
+        "set_config_parameter",
+        {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_CONFIG_PARAMETER: 13,
+            const.ATTR_CONFIG_VALUE: "item3",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert value_list.data == "item3"
+
+    # Button
+    await hass.services.async_call(
+        "zwave",
+        "set_config_parameter",
+        {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_CONFIG_PARAMETER: 14,
+            const.ATTR_CONFIG_VALUE: True,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert zwave_network.manager.pressButton.called
+    assert zwave_network.manager.releaseButton.called
+
+    # List of Ints
+    await hass.services.async_call(
+        "zwave",
+        "set_config_parameter",
+        {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_CONFIG_PARAMETER: 15,
+            const.ATTR_CONFIG_VALUE: 3,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert value_list_int.data == "3"
+
+    # Boolean Truthy
+    await hass.services.async_call(
+        "zwave",
+        "set_config_parameter",
+        {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_CONFIG_PARAMETER: 16,
+            const.ATTR_CONFIG_VALUE: "True",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert value_bool.data == 1
+
+    # Boolean Falsy
+    await hass.services.async_call(
+        "zwave",
+        "set_config_parameter",
+        {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_CONFIG_PARAMETER: 16,
+            const.ATTR_CONFIG_VALUE: "False",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert value_bool.data == 0
+
+    # Different Parameter Size
+    await hass.services.async_call(
+        "zwave",
+        "set_config_parameter",
+        {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_CONFIG_PARAMETER: 19,
+            const.ATTR_CONFIG_VALUE: 0x01020304,
+            const.ATTR_CONFIG_SIZE: 4,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert node.set_config_param.called
+    assert len(node.set_config_param.mock_calls) == 1
+    assert node.set_config_param.mock_calls[0][1][0] == 19
+    assert node.set_config_param.mock_calls[0][1][1] == 0x01020304
+    assert node.set_config_param.mock_calls[0][1][2] == 4
+    node.set_config_param.reset_mock()
+
+
+async def test_print_config_parameter(hass, mock_openzwave, zwave_setup_ready, caplog):
+    """Test zwave print_config_parameter service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    value1 = MockValue(
+        index=12, command_class=const.COMMAND_CLASS_CONFIGURATION, data=1234
+    )
+    value2 = MockValue(
+        index=13, command_class=const.COMMAND_CLASS_CONFIGURATION, data=2345
+    )
+    node = MockNode(node_id=14)
+    node.values = {12: value1, 13: value2}
+    zwave_network.nodes = {14: node}
+
+    caplog.clear()
+
+    await hass.services.async_call(
+        "zwave",
+        "print_config_parameter",
+        {const.ATTR_NODE_ID: 14, const.ATTR_CONFIG_PARAMETER: 13},
+    )
+    await hass.async_block_till_done()
+
+    assert "Config parameter 13 on Node 14: 2345" in caplog.text
+
+
+async def test_print_node(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave print_node_parameter service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(node_id=14)
+
+    zwave_network.nodes = {14: node}
+
+    with patch.object(zwave, "_LOGGER") as mock_logger:
+        await hass.services.async_call("zwave", "print_node", {const.ATTR_NODE_ID: 14})
+        await hass.async_block_till_done()
+
+        assert "FOUND NODE " in mock_logger.info.mock_calls[0][1][0]
+
+
+async def test_set_wakeup(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave set_wakeup service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    value = MockValue(index=12, command_class=const.COMMAND_CLASS_WAKE_UP)
+    node = MockNode(node_id=14)
+    node.values = {12: value}
+    node.get_values.return_value = node.values
+    zwave_network.nodes = {14: node}
+
+    await hass.services.async_call(
+        "zwave", "set_wakeup", {const.ATTR_NODE_ID: 14, const.ATTR_CONFIG_VALUE: 15}
+    )
+    await hass.async_block_till_done()
+
+    assert value.data == 15
+
+    node.can_wake_up_value = False
+    await hass.services.async_call(
+        "zwave", "set_wakeup", {const.ATTR_NODE_ID: 14, const.ATTR_CONFIG_VALUE: 20}
+    )
+    await hass.async_block_till_done()
+
+    assert value.data == 15
+
+
+async def test_reset_node_meters(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave reset_node_meters service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    value = MockValue(
+        instance=1, index=8, data=99.5, command_class=const.COMMAND_CLASS_METER
+    )
+    reset_value = MockValue(
+        instance=1, index=33, command_class=const.COMMAND_CLASS_METER
+    )
+    node = MockNode(node_id=14)
+    node.values = {8: value, 33: reset_value}
+    node.get_values.return_value = node.values
+    zwave_network.nodes = {14: node}
+
+    await hass.services.async_call(
+        "zwave",
+        "reset_node_meters",
+        {const.ATTR_NODE_ID: 14, const.ATTR_INSTANCE: 2},
+    )
+    await hass.async_block_till_done()
+
+    assert not zwave_network.manager.pressButton.called
+    assert not zwave_network.manager.releaseButton.called
+
+    await hass.services.async_call(
+        "zwave", "reset_node_meters", {const.ATTR_NODE_ID: 14}
+    )
+    await hass.async_block_till_done()
+
+    assert zwave_network.manager.pressButton.called
+    (value_id,) = zwave_network.manager.pressButton.mock_calls.pop(0)[1]
+    assert value_id == reset_value.value_id
+    assert zwave_network.manager.releaseButton.called
+    (value_id,) = zwave_network.manager.releaseButton.mock_calls.pop(0)[1]
+    assert value_id == reset_value.value_id
+
+
+async def test_add_association(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave change_association service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    ZWaveGroup = mock_openzwave.group.ZWaveGroup
+    group = MagicMock()
+    ZWaveGroup.return_value = group
+
+    value = MockValue(index=12, command_class=const.COMMAND_CLASS_WAKE_UP)
+    node = MockNode(node_id=14)
+    node.values = {12: value}
+    node.get_values.return_value = node.values
+    zwave_network.nodes = {14: node}
+
+    await hass.services.async_call(
+        "zwave",
+        "change_association",
+        {
+            const.ATTR_ASSOCIATION: "add",
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_TARGET_NODE_ID: 24,
+            const.ATTR_GROUP: 3,
+            const.ATTR_INSTANCE: 5,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert ZWaveGroup.called
+    assert len(ZWaveGroup.mock_calls) == 2
+    assert ZWaveGroup.mock_calls[0][1][0] == 3
+    assert ZWaveGroup.mock_calls[0][1][2] == 14
+    assert group.add_association.called
+    assert len(group.add_association.mock_calls) == 1
+    assert group.add_association.mock_calls[0][1][0] == 24
+    assert group.add_association.mock_calls[0][1][1] == 5
+
+
+async def test_remove_association(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave change_association service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    ZWaveGroup = mock_openzwave.group.ZWaveGroup
+    group = MagicMock()
+    ZWaveGroup.return_value = group
+
+    value = MockValue(index=12, command_class=const.COMMAND_CLASS_WAKE_UP)
+    node = MockNode(node_id=14)
+    node.values = {12: value}
+    node.get_values.return_value = node.values
+    zwave_network.nodes = {14: node}
+
+    await hass.services.async_call(
+        "zwave",
+        "change_association",
+        {
+            const.ATTR_ASSOCIATION: "remove",
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_TARGET_NODE_ID: 24,
+            const.ATTR_GROUP: 3,
+            const.ATTR_INSTANCE: 5,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert ZWaveGroup.called
+    assert len(ZWaveGroup.mock_calls) == 2
+    assert ZWaveGroup.mock_calls[0][1][0] == 3
+    assert ZWaveGroup.mock_calls[0][1][2] == 14
+    assert group.remove_association.called
+    assert len(group.remove_association.mock_calls) == 1
+    assert group.remove_association.mock_calls[0][1][0] == 24
+    assert group.remove_association.mock_calls[0][1][1] == 5
+
+
+async def test_refresh_entity(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave refresh_entity service."""
+    node = MockNode()
+    value = MockValue(
+        data=False, node=node, command_class=const.COMMAND_CLASS_SENSOR_BINARY
+    )
+    power_value = MockValue(data=50, node=node, command_class=const.COMMAND_CLASS_METER)
+    values = MockEntityValues(primary=value, power=power_value)
+    device = get_device(node=node, values=values, node_config={})
+    device.hass = hass
+    device.entity_id = "binary_sensor.mock_entity_id"
+    await device.async_added_to_hass()
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        "zwave", "refresh_entity", {ATTR_ENTITY_ID: "binary_sensor.mock_entity_id"}
+    )
+    await hass.async_block_till_done()
+
+    assert node.refresh_value.called
+    assert len(node.refresh_value.mock_calls) == 2
+    assert (
+        sorted(
+            [
+                node.refresh_value.mock_calls[0][1][0],
+                node.refresh_value.mock_calls[1][1][0],
+            ]
         )
-        self.hass.block_till_done()
-
-        assert self.zwave_network.nodes[11].name == "test_name"
-
-    def test_rename_value(self):
-        """Test zwave rename_value service."""
-        node = MockNode(node_id=14)
-        value = MockValue(index=12, value_id=123456, label="Old Label")
-        node.values = {123456: value}
-        self.zwave_network.nodes = {11: node}
-
-        assert value.label == "Old Label"
-        self.hass.services.call(
-            "zwave",
-            "rename_value",
-            {
-                const.ATTR_NODE_ID: 11,
-                const.ATTR_VALUE_ID: 123456,
-                const.ATTR_NAME: "New Label",
-            },
-        )
-        self.hass.block_till_done()
-
-        assert value.label == "New Label"
-
-    def test_set_poll_intensity_enable(self):
-        """Test zwave set_poll_intensity service, successful set."""
-        node = MockNode(node_id=14)
-        value = MockValue(index=12, value_id=123456, poll_intensity=0)
-        node.values = {123456: value}
-        self.zwave_network.nodes = {11: node}
-
-        assert value.poll_intensity == 0
-        self.hass.services.call(
-            "zwave",
-            "set_poll_intensity",
-            {
-                const.ATTR_NODE_ID: 11,
-                const.ATTR_VALUE_ID: 123456,
-                const.ATTR_POLL_INTENSITY: 4,
-            },
-        )
-        self.hass.block_till_done()
-
-        enable_poll = value.enable_poll
-        assert value.enable_poll.called
-        assert len(enable_poll.mock_calls) == 2
-        assert enable_poll.mock_calls[0][1][0] == 4
-
-    def test_set_poll_intensity_enable_failed(self):
-        """Test zwave set_poll_intensity service, failed set."""
-        node = MockNode(node_id=14)
-        value = MockValue(index=12, value_id=123456, poll_intensity=0)
-        value.enable_poll.return_value = False
-        node.values = {123456: value}
-        self.zwave_network.nodes = {11: node}
-
-        assert value.poll_intensity == 0
-        self.hass.services.call(
-            "zwave",
-            "set_poll_intensity",
-            {
-                const.ATTR_NODE_ID: 11,
-                const.ATTR_VALUE_ID: 123456,
-                const.ATTR_POLL_INTENSITY: 4,
-            },
-        )
-        self.hass.block_till_done()
-
-        enable_poll = value.enable_poll
-        assert value.enable_poll.called
-        assert len(enable_poll.mock_calls) == 1
-
-    def test_set_poll_intensity_disable(self):
-        """Test zwave set_poll_intensity service, successful disable."""
-        node = MockNode(node_id=14)
-        value = MockValue(index=12, value_id=123456, poll_intensity=4)
-        node.values = {123456: value}
-        self.zwave_network.nodes = {11: node}
-
-        assert value.poll_intensity == 4
-        self.hass.services.call(
-            "zwave",
-            "set_poll_intensity",
-            {
-                const.ATTR_NODE_ID: 11,
-                const.ATTR_VALUE_ID: 123456,
-                const.ATTR_POLL_INTENSITY: 0,
-            },
-        )
-        self.hass.block_till_done()
-
-        disable_poll = value.disable_poll
-        assert value.disable_poll.called
-        assert len(disable_poll.mock_calls) == 2
-
-    def test_set_poll_intensity_disable_failed(self):
-        """Test zwave set_poll_intensity service, failed disable."""
-        node = MockNode(node_id=14)
-        value = MockValue(index=12, value_id=123456, poll_intensity=4)
-        value.disable_poll.return_value = False
-        node.values = {123456: value}
-        self.zwave_network.nodes = {11: node}
-
-        assert value.poll_intensity == 4
-        self.hass.services.call(
-            "zwave",
-            "set_poll_intensity",
-            {
-                const.ATTR_NODE_ID: 11,
-                const.ATTR_VALUE_ID: 123456,
-                const.ATTR_POLL_INTENSITY: 0,
-            },
-        )
-        self.hass.block_till_done()
-
-        disable_poll = value.disable_poll
-        assert value.disable_poll.called
-        assert len(disable_poll.mock_calls) == 1
-
-    def test_remove_failed_node(self):
-        """Test zwave remove_failed_node service."""
-        self.hass.services.call("zwave", "remove_failed_node", {const.ATTR_NODE_ID: 12})
-        self.hass.block_till_done()
-
-        remove_failed_node = self.zwave_network.controller.remove_failed_node
-        assert remove_failed_node.called
-        assert len(remove_failed_node.mock_calls) == 1
-        assert remove_failed_node.mock_calls[0][1][0] == 12
-
-    def test_replace_failed_node(self):
-        """Test zwave replace_failed_node service."""
-        self.hass.services.call(
-            "zwave", "replace_failed_node", {const.ATTR_NODE_ID: 13}
-        )
-        self.hass.block_till_done()
-
-        replace_failed_node = self.zwave_network.controller.replace_failed_node
-        assert replace_failed_node.called
-        assert len(replace_failed_node.mock_calls) == 1
-        assert replace_failed_node.mock_calls[0][1][0] == 13
-
-    def test_set_config_parameter(self):
-        """Test zwave set_config_parameter service."""
-        value_byte = MockValue(
-            index=12,
-            command_class=const.COMMAND_CLASS_CONFIGURATION,
-            type=const.TYPE_BYTE,
-        )
-        value_list = MockValue(
-            index=13,
-            command_class=const.COMMAND_CLASS_CONFIGURATION,
-            type=const.TYPE_LIST,
-            data_items=["item1", "item2", "item3"],
-        )
-        value_button = MockValue(
-            index=14,
-            command_class=const.COMMAND_CLASS_CONFIGURATION,
-            type=const.TYPE_BUTTON,
-        )
-        value_list_int = MockValue(
-            index=15,
-            command_class=const.COMMAND_CLASS_CONFIGURATION,
-            type=const.TYPE_LIST,
-            data_items=["1", "2", "3"],
-        )
-        value_bool = MockValue(
-            index=16,
-            command_class=const.COMMAND_CLASS_CONFIGURATION,
-            type=const.TYPE_BOOL,
-        )
-        node = MockNode(node_id=14)
-        node.get_values.return_value = {
-            12: value_byte,
-            13: value_list,
-            14: value_button,
-            15: value_list_int,
-            16: value_bool,
-        }
-        self.zwave_network.nodes = {14: node}
-
-        # Byte
-        self.hass.services.call(
-            "zwave",
-            "set_config_parameter",
-            {
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_CONFIG_PARAMETER: 12,
-                const.ATTR_CONFIG_VALUE: 7,
-            },
-        )
-        self.hass.block_till_done()
-
-        assert value_byte.data == 7
-
-        # List
-        self.hass.services.call(
-            "zwave",
-            "set_config_parameter",
-            {
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_CONFIG_PARAMETER: 13,
-                const.ATTR_CONFIG_VALUE: "item3",
-            },
-        )
-        self.hass.block_till_done()
-
-        assert value_list.data == "item3"
-
-        # Button
-        self.hass.services.call(
-            "zwave",
-            "set_config_parameter",
-            {
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_CONFIG_PARAMETER: 14,
-                const.ATTR_CONFIG_VALUE: True,
-            },
-        )
-        self.hass.block_till_done()
-
-        assert self.zwave_network.manager.pressButton.called
-        assert self.zwave_network.manager.releaseButton.called
-
-        # List of Ints
-        self.hass.services.call(
-            "zwave",
-            "set_config_parameter",
-            {
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_CONFIG_PARAMETER: 15,
-                const.ATTR_CONFIG_VALUE: 3,
-            },
-        )
-        self.hass.block_till_done()
-
-        assert value_list_int.data == "3"
-
-        # Boolean Truthy
-        self.hass.services.call(
-            "zwave",
-            "set_config_parameter",
-            {
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_CONFIG_PARAMETER: 16,
-                const.ATTR_CONFIG_VALUE: "True",
-            },
-        )
-        self.hass.block_till_done()
-
-        assert value_bool.data == 1
-
-        # Boolean Falsy
-        self.hass.services.call(
-            "zwave",
-            "set_config_parameter",
-            {
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_CONFIG_PARAMETER: 16,
-                const.ATTR_CONFIG_VALUE: "False",
-            },
-        )
-        self.hass.block_till_done()
-
-        assert value_bool.data == 0
-
-        # Different Parameter Size
-        self.hass.services.call(
-            "zwave",
-            "set_config_parameter",
-            {
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_CONFIG_PARAMETER: 19,
-                const.ATTR_CONFIG_VALUE: 0x01020304,
-                const.ATTR_CONFIG_SIZE: 4,
-            },
-        )
-        self.hass.block_till_done()
-
-        assert node.set_config_param.called
-        assert len(node.set_config_param.mock_calls) == 1
-        assert node.set_config_param.mock_calls[0][1][0] == 19
-        assert node.set_config_param.mock_calls[0][1][1] == 0x01020304
-        assert node.set_config_param.mock_calls[0][1][2] == 4
-        node.set_config_param.reset_mock()
-
-    def test_print_config_parameter(self):
-        """Test zwave print_config_parameter service."""
-        value1 = MockValue(
-            index=12, command_class=const.COMMAND_CLASS_CONFIGURATION, data=1234
-        )
-        value2 = MockValue(
-            index=13, command_class=const.COMMAND_CLASS_CONFIGURATION, data=2345
-        )
-        node = MockNode(node_id=14)
-        node.values = {12: value1, 13: value2}
-        self.zwave_network.nodes = {14: node}
-
-        with patch.object(zwave, "_LOGGER") as mock_logger:
-            self.hass.services.call(
-                "zwave",
-                "print_config_parameter",
-                {const.ATTR_NODE_ID: 14, const.ATTR_CONFIG_PARAMETER: 13},
-            )
-            self.hass.block_till_done()
-
-            assert mock_logger.info.called
-            assert len(mock_logger.info.mock_calls) == 1
-            assert mock_logger.info.mock_calls[0][1][1] == 13
-            assert mock_logger.info.mock_calls[0][1][2] == 14
-            assert mock_logger.info.mock_calls[0][1][3] == 2345
-
-    def test_print_node(self):
-        """Test zwave print_node_parameter service."""
-        node = MockNode(node_id=14)
-
-        self.zwave_network.nodes = {14: node}
-
-        with self.assertLogs(level="DEBUG") as mock_logger:
-            self.hass.services.call("zwave", "print_node", {const.ATTR_NODE_ID: 14})
-            self.hass.block_till_done()
-
-            assert "FOUND NODE " in mock_logger.output[1]
-
-    def test_set_wakeup(self):
-        """Test zwave set_wakeup service."""
-        value = MockValue(index=12, command_class=const.COMMAND_CLASS_WAKE_UP)
-        node = MockNode(node_id=14)
-        node.values = {12: value}
-        node.get_values.return_value = node.values
-        self.zwave_network.nodes = {14: node}
-
-        self.hass.services.call(
-            "zwave", "set_wakeup", {const.ATTR_NODE_ID: 14, const.ATTR_CONFIG_VALUE: 15}
-        )
-        self.hass.block_till_done()
-
-        assert value.data == 15
-
-        node.can_wake_up_value = False
-        self.hass.services.call(
-            "zwave", "set_wakeup", {const.ATTR_NODE_ID: 14, const.ATTR_CONFIG_VALUE: 20}
-        )
-        self.hass.block_till_done()
-
-        assert value.data == 15
-
-    def test_reset_node_meters(self):
-        """Test zwave reset_node_meters service."""
-        value = MockValue(
-            instance=1, index=8, data=99.5, command_class=const.COMMAND_CLASS_METER
-        )
-        reset_value = MockValue(
-            instance=1, index=33, command_class=const.COMMAND_CLASS_METER
-        )
-        node = MockNode(node_id=14)
-        node.values = {8: value, 33: reset_value}
-        node.get_values.return_value = node.values
-        self.zwave_network.nodes = {14: node}
-
-        self.hass.services.call(
-            "zwave",
-            "reset_node_meters",
-            {const.ATTR_NODE_ID: 14, const.ATTR_INSTANCE: 2},
-        )
-        self.hass.block_till_done()
-
-        assert not self.zwave_network.manager.pressButton.called
-        assert not self.zwave_network.manager.releaseButton.called
-
-        self.hass.services.call("zwave", "reset_node_meters", {const.ATTR_NODE_ID: 14})
-        self.hass.block_till_done()
-
-        assert self.zwave_network.manager.pressButton.called
-        (value_id,) = self.zwave_network.manager.pressButton.mock_calls.pop(0)[1]
-        assert value_id == reset_value.value_id
-        assert self.zwave_network.manager.releaseButton.called
-        (value_id,) = self.zwave_network.manager.releaseButton.mock_calls.pop(0)[1]
-        assert value_id == reset_value.value_id
-
-    def test_add_association(self):
-        """Test zwave change_association service."""
-        ZWaveGroup = self.mock_openzwave.group.ZWaveGroup
-        group = MagicMock()
-        ZWaveGroup.return_value = group
-
-        value = MockValue(index=12, command_class=const.COMMAND_CLASS_WAKE_UP)
-        node = MockNode(node_id=14)
-        node.values = {12: value}
-        node.get_values.return_value = node.values
-        self.zwave_network.nodes = {14: node}
-
-        self.hass.services.call(
-            "zwave",
-            "change_association",
-            {
-                const.ATTR_ASSOCIATION: "add",
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_TARGET_NODE_ID: 24,
-                const.ATTR_GROUP: 3,
-                const.ATTR_INSTANCE: 5,
-            },
-        )
-        self.hass.block_till_done()
-
-        assert ZWaveGroup.called
-        assert len(ZWaveGroup.mock_calls) == 2
-        assert ZWaveGroup.mock_calls[0][1][0] == 3
-        assert ZWaveGroup.mock_calls[0][1][2] == 14
-        assert group.add_association.called
-        assert len(group.add_association.mock_calls) == 1
-        assert group.add_association.mock_calls[0][1][0] == 24
-        assert group.add_association.mock_calls[0][1][1] == 5
-
-    def test_remove_association(self):
-        """Test zwave change_association service."""
-        ZWaveGroup = self.mock_openzwave.group.ZWaveGroup
-        group = MagicMock()
-        ZWaveGroup.return_value = group
-
-        value = MockValue(index=12, command_class=const.COMMAND_CLASS_WAKE_UP)
-        node = MockNode(node_id=14)
-        node.values = {12: value}
-        node.get_values.return_value = node.values
-        self.zwave_network.nodes = {14: node}
-
-        self.hass.services.call(
-            "zwave",
-            "change_association",
-            {
-                const.ATTR_ASSOCIATION: "remove",
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_TARGET_NODE_ID: 24,
-                const.ATTR_GROUP: 3,
-                const.ATTR_INSTANCE: 5,
-            },
-        )
-        self.hass.block_till_done()
-
-        assert ZWaveGroup.called
-        assert len(ZWaveGroup.mock_calls) == 2
-        assert ZWaveGroup.mock_calls[0][1][0] == 3
-        assert ZWaveGroup.mock_calls[0][1][2] == 14
-        assert group.remove_association.called
-        assert len(group.remove_association.mock_calls) == 1
-        assert group.remove_association.mock_calls[0][1][0] == 24
-        assert group.remove_association.mock_calls[0][1][1] == 5
-
-    def test_refresh_entity(self):
-        """Test zwave refresh_entity service."""
-        node = MockNode()
-        value = MockValue(
-            data=False, node=node, command_class=const.COMMAND_CLASS_SENSOR_BINARY
-        )
-        power_value = MockValue(
-            data=50, node=node, command_class=const.COMMAND_CLASS_METER
-        )
-        values = MockEntityValues(primary=value, power=power_value)
-        device = get_device(node=node, values=values, node_config={})
-        device.hass = self.hass
-        device.entity_id = "binary_sensor.mock_entity_id"
-        self.hass.add_job(device.async_added_to_hass())
-        self.hass.block_till_done()
-
-        self.hass.services.call(
-            "zwave", "refresh_entity", {ATTR_ENTITY_ID: "binary_sensor.mock_entity_id"}
-        )
-        self.hass.block_till_done()
-
-        assert node.refresh_value.called
-        assert len(node.refresh_value.mock_calls) == 2
-        assert (
-            sorted(
-                [
-                    node.refresh_value.mock_calls[0][1][0],
-                    node.refresh_value.mock_calls[1][1][0],
-                ]
-            )
-            == sorted([value.value_id, power_value.value_id])
-        )
-
-    def test_refresh_node(self):
-        """Test zwave refresh_node service."""
-        node = MockNode(node_id=14)
-        self.zwave_network.nodes = {14: node}
-        self.hass.services.call("zwave", "refresh_node", {const.ATTR_NODE_ID: 14})
-        self.hass.block_till_done()
-
-        assert node.refresh_info.called
-        assert len(node.refresh_info.mock_calls) == 1
-
-    def test_set_node_value(self):
-        """Test zwave set_node_value service."""
-        value = MockValue(index=12, command_class=const.COMMAND_CLASS_INDICATOR, data=4)
-        node = MockNode(node_id=14, command_classes=[const.COMMAND_CLASS_INDICATOR])
-        node.values = {12: value}
-        node.get_values.return_value = node.values
-        self.zwave_network.nodes = {14: node}
-
-        self.hass.services.call(
-            "zwave",
-            "set_node_value",
-            {
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_VALUE_ID: 12,
-                const.ATTR_CONFIG_VALUE: 2,
-            },
-        )
-        self.hass.block_till_done()
-
-        assert self.zwave_network.nodes[14].values[12].data == 2
-
-    def test_set_node_value_with_long_id_and_text_value(self):
-        """Test zwave set_node_value service."""
-        value = MockValue(
-            index=87512398541236578,
-            command_class=const.COMMAND_CLASS_SWITCH_COLOR,
-            data="#ff0000",
-        )
-        node = MockNode(node_id=14, command_classes=[const.COMMAND_CLASS_SWITCH_COLOR])
-        node.values = {87512398541236578: value}
-        node.get_values.return_value = node.values
-        self.zwave_network.nodes = {14: node}
-
-        self.hass.services.call(
-            "zwave",
-            "set_node_value",
-            {
-                const.ATTR_NODE_ID: 14,
-                const.ATTR_VALUE_ID: "87512398541236578",
-                const.ATTR_CONFIG_VALUE: "#00ff00",
-            },
-        )
-        self.hass.block_till_done()
-
-        assert self.zwave_network.nodes[14].values[87512398541236578].data == "#00ff00"
-
-    def test_refresh_node_value(self):
-        """Test zwave refresh_node_value service."""
-        node = MockNode(
-            node_id=14,
-            command_classes=[const.COMMAND_CLASS_INDICATOR],
-            network=self.zwave_network,
-        )
-        value = MockValue(
-            node=node, index=12, command_class=const.COMMAND_CLASS_INDICATOR, data=2
-        )
-        value.refresh = MagicMock()
-
-        node.values = {12: value}
-        node.get_values.return_value = node.values
-        self.zwave_network.nodes = {14: node}
-
-        self.hass.services.call(
-            "zwave",
-            "refresh_node_value",
-            {const.ATTR_NODE_ID: 14, const.ATTR_VALUE_ID: 12},
-        )
-        self.hass.block_till_done()
-
-        assert value.refresh.called
-
-    def test_heal_node(self):
-        """Test zwave heal_node service."""
-        node = MockNode(node_id=19)
-        self.zwave_network.nodes = {19: node}
-        self.hass.services.call("zwave", "heal_node", {const.ATTR_NODE_ID: 19})
-        self.hass.block_till_done()
-
-        assert node.heal.called
-        assert len(node.heal.mock_calls) == 1
-
-    def test_test_node(self):
-        """Test the zwave test_node service."""
-        node = MockNode(node_id=19)
-        self.zwave_network.nodes = {19: node}
-        self.hass.services.call("zwave", "test_node", {const.ATTR_NODE_ID: 19})
-        self.hass.block_till_done()
-
-        assert node.test.called
-        assert len(node.test.mock_calls) == 1
+        == sorted([value.value_id, power_value.value_id])
+    )
+
+
+async def test_refresh_node(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave refresh_node service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(node_id=14)
+    zwave_network.nodes = {14: node}
+    await hass.services.async_call("zwave", "refresh_node", {const.ATTR_NODE_ID: 14})
+    await hass.async_block_till_done()
+
+    assert node.refresh_info.called
+    assert len(node.refresh_info.mock_calls) == 1
+
+
+async def test_set_node_value(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave set_node_value service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    value = MockValue(index=12, command_class=const.COMMAND_CLASS_INDICATOR, data=4)
+    node = MockNode(node_id=14, command_classes=[const.COMMAND_CLASS_INDICATOR])
+    node.values = {12: value}
+    node.get_values.return_value = node.values
+    zwave_network.nodes = {14: node}
+
+    await hass.services.async_call(
+        "zwave",
+        "set_node_value",
+        {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_VALUE_ID: 12,
+            const.ATTR_CONFIG_VALUE: 2,
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert zwave_network.nodes[14].values[12].data == 2
+
+
+async def test_set_node_value_with_long_id_and_text_value(
+    hass, mock_openzwave, zwave_setup_ready
+):
+    """Test zwave set_node_value service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    value = MockValue(
+        index=87512398541236578,
+        command_class=const.COMMAND_CLASS_SWITCH_COLOR,
+        data="#ff0000",
+    )
+    node = MockNode(node_id=14, command_classes=[const.COMMAND_CLASS_SWITCH_COLOR])
+    node.values = {87512398541236578: value}
+    node.get_values.return_value = node.values
+    zwave_network.nodes = {14: node}
+
+    await hass.services.async_call(
+        "zwave",
+        "set_node_value",
+        {
+            const.ATTR_NODE_ID: 14,
+            const.ATTR_VALUE_ID: "87512398541236578",
+            const.ATTR_CONFIG_VALUE: "#00ff00",
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert zwave_network.nodes[14].values[87512398541236578].data == "#00ff00"
+
+
+async def test_refresh_node_value(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave refresh_node_value service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(
+        node_id=14,
+        command_classes=[const.COMMAND_CLASS_INDICATOR],
+        network=zwave_network,
+    )
+    value = MockValue(
+        node=node, index=12, command_class=const.COMMAND_CLASS_INDICATOR, data=2
+    )
+    value.refresh = MagicMock()
+
+    node.values = {12: value}
+    node.get_values.return_value = node.values
+    zwave_network.nodes = {14: node}
+
+    await hass.services.async_call(
+        "zwave",
+        "refresh_node_value",
+        {const.ATTR_NODE_ID: 14, const.ATTR_VALUE_ID: 12},
+    )
+    await hass.async_block_till_done()
+
+    assert value.refresh.called
+
+
+async def test_heal_node(hass, mock_openzwave, zwave_setup_ready):
+    """Test zwave heal_node service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(node_id=19)
+    zwave_network.nodes = {19: node}
+    await hass.services.async_call("zwave", "heal_node", {const.ATTR_NODE_ID: 19})
+    await hass.async_block_till_done()
+
+    assert node.heal.called
+    assert len(node.heal.mock_calls) == 1
+
+
+async def test_test_node(hass, mock_openzwave, zwave_setup_ready):
+    """Test the zwave test_node service."""
+    zwave_network = hass.data[DATA_NETWORK]
+
+    node = MockNode(node_id=19)
+    zwave_network.nodes = {19: node}
+    await hass.services.async_call("zwave", "test_node", {const.ATTR_NODE_ID: 19})
+    await hass.async_block_till_done()
+
+    assert node.test.called
+    assert len(node.test.mock_calls) == 1
diff --git a/tests/components/zwave/test_node_entity.py b/tests/components/zwave/test_node_entity.py
index 8306899ce02..29c1126b5d1 100644
--- a/tests/components/zwave/test_node_entity.py
+++ b/tests/components/zwave/test_node_entity.py
@@ -1,8 +1,4 @@
 """Test Z-Wave node entity."""
-import unittest
-
-import pytest
-
 from homeassistant.components.zwave import const, node_entity
 from homeassistant.const import ATTR_ENTITY_ID
 
@@ -235,436 +231,492 @@ async def test_application_version(hass, mock_openzwave):
     )
 
 
-@pytest.mark.usefixtures("mock_openzwave")
-class TestZWaveNodeEntity(unittest.TestCase):
-    """Class to test ZWaveNodeEntity."""
+async def test_network_node_changed_from_value(hass, mock_openzwave):
+    """Test for network_node_changed."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+    value = mock_zwave.MockValue(node=node)
+    with patch.object(entity, "maybe_schedule_update") as mock:
+        mock_zwave.value_changed(value)
+        mock.assert_called_once_with()
 
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.zwave_network = MagicMock()
-        self.node = mock_zwave.MockNode(
-            query_stage="Dynamic",
-            is_awake=True,
-            is_ready=False,
-            is_failed=False,
-            is_info_received=True,
-            max_baud_rate=40000,
-            is_zwave_plus=False,
-            capabilities=[],
-            neighbors=[],
-            location=None,
-        )
-        self.entity = node_entity.ZWaveNodeEntity(self.node, self.zwave_network)
 
-    def test_network_node_changed_from_value(self):
-        """Test for network_node_changed."""
-        value = mock_zwave.MockValue(node=self.node)
-        with patch.object(self.entity, "maybe_schedule_update") as mock:
-            mock_zwave.value_changed(value)
-            mock.assert_called_once_with()
+async def test_network_node_changed_from_node(hass, mock_openzwave):
+    """Test for network_node_changed."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+    with patch.object(entity, "maybe_schedule_update") as mock:
+        mock_zwave.node_changed(node)
+        mock.assert_called_once_with()
 
-    def test_network_node_changed_from_node(self):
-        """Test for network_node_changed."""
-        with patch.object(self.entity, "maybe_schedule_update") as mock:
-            mock_zwave.node_changed(self.node)
-            mock.assert_called_once_with()
 
-    def test_network_node_changed_from_another_node(self):
-        """Test for network_node_changed."""
-        with patch.object(self.entity, "maybe_schedule_update") as mock:
-            node = mock_zwave.MockNode(node_id=1024)
-            mock_zwave.node_changed(node)
-            assert not mock.called
+async def test_network_node_changed_from_another_node(hass, mock_openzwave):
+    """Test for network_node_changed."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+    with patch.object(entity, "maybe_schedule_update") as mock:
+        another_node = mock_zwave.MockNode(node_id=1024)
+        mock_zwave.node_changed(another_node)
+        assert not mock.called
 
-    def test_network_node_changed_from_notification(self):
-        """Test for network_node_changed."""
-        with patch.object(self.entity, "maybe_schedule_update") as mock:
-            mock_zwave.notification(node_id=self.node.node_id)
-            mock.assert_called_once_with()
 
-    def test_network_node_changed_from_another_notification(self):
-        """Test for network_node_changed."""
-        with patch.object(self.entity, "maybe_schedule_update") as mock:
-            mock_zwave.notification(node_id=1024)
-            assert not mock.called
+async def test_network_node_changed_from_notification(hass, mock_openzwave):
+    """Test for network_node_changed."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+    with patch.object(entity, "maybe_schedule_update") as mock:
+        mock_zwave.notification(node_id=node.node_id)
+        mock.assert_called_once_with()
 
-    def test_node_changed(self):
-        """Test node_changed function."""
-        self.maxDiff = None
-        assert {
-            "node_id": self.node.node_id,
-            "node_name": "Mock Node",
-            "manufacturer_name": "Test Manufacturer",
-            "product_name": "Test Product",
-        } == self.entity.device_state_attributes
 
-        self.node.get_values.return_value = {1: mock_zwave.MockValue(data=1800)}
-        self.zwave_network.manager.getNodeStatistics.return_value = {
-            "receivedCnt": 4,
-            "ccData": [
-                {"receivedCnt": 0, "commandClassId": 134, "sentCnt": 0},
-                {"receivedCnt": 1, "commandClassId": 133, "sentCnt": 1},
-                {"receivedCnt": 1, "commandClassId": 115, "sentCnt": 1},
-                {"receivedCnt": 0, "commandClassId": 114, "sentCnt": 0},
-                {"receivedCnt": 0, "commandClassId": 112, "sentCnt": 0},
-                {"receivedCnt": 1, "commandClassId": 32, "sentCnt": 1},
-                {"receivedCnt": 0, "commandClassId": 0, "sentCnt": 0},
-            ],
-            "receivedUnsolicited": 0,
-            "sentTS": "2017-03-27 15:38:15:620 ",
-            "averageRequestRTT": 2462,
-            "lastResponseRTT": 3679,
-            "retries": 0,
-            "sentFailed": 1,
-            "sentCnt": 7,
-            "quality": 0,
-            "lastRequestRTT": 1591,
-            "lastReceivedMessage": [
-                0,
-                4,
-                0,
-                15,
-                3,
-                32,
-                3,
-                0,
-                221,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-            ],
-            "receivedDups": 1,
-            "averageResponseRTT": 2443,
-            "receivedTS": "2017-03-27 15:38:19:298 ",
-        }
-        self.entity.node_changed()
-        assert {
-            "node_id": self.node.node_id,
-            "node_name": "Mock Node",
-            "manufacturer_name": "Test Manufacturer",
-            "product_name": "Test Product",
-            "query_stage": "Dynamic",
-            "is_awake": True,
-            "is_ready": False,
-            "is_failed": False,
-            "is_info_received": True,
-            "max_baud_rate": 40000,
-            "is_zwave_plus": False,
-            "battery_level": 42,
-            "wake_up_interval": 1800,
-            "averageRequestRTT": 2462,
-            "averageResponseRTT": 2443,
-            "lastRequestRTT": 1591,
-            "lastResponseRTT": 3679,
-            "receivedCnt": 4,
-            "receivedDups": 1,
-            "receivedTS": "2017-03-27 15:38:19:298 ",
-            "receivedUnsolicited": 0,
-            "retries": 0,
-            "sentCnt": 7,
-            "sentFailed": 1,
-            "sentTS": "2017-03-27 15:38:15:620 ",
-        } == self.entity.device_state_attributes
+async def test_network_node_changed_from_another_notification(hass, mock_openzwave):
+    """Test for network_node_changed."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+    with patch.object(entity, "maybe_schedule_update") as mock:
+        mock_zwave.notification(node_id=1024)
+        assert not mock.called
 
-        self.node.can_wake_up_value = False
-        self.entity.node_changed()
 
-        assert "wake_up_interval" not in self.entity.device_state_attributes
+async def test_node_changed(hass, mock_openzwave):
+    """Test node_changed function."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode(
+        query_stage="Dynamic",
+        is_awake=True,
+        is_ready=False,
+        is_failed=False,
+        is_info_received=True,
+        max_baud_rate=40000,
+        is_zwave_plus=False,
+        capabilities=[],
+        neighbors=[],
+        location=None,
+    )
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
 
-    def test_name(self):
-        """Test name property."""
-        assert self.entity.name == "Mock Node"
+    assert {
+        "node_id": node.node_id,
+        "node_name": "Mock Node",
+        "manufacturer_name": "Test Manufacturer",
+        "product_name": "Test Product",
+    } == entity.device_state_attributes
 
-    def test_state_before_update(self):
-        """Test state before update was called."""
-        assert self.entity.state is None
+    node.get_values.return_value = {1: mock_zwave.MockValue(data=1800)}
+    zwave_network.manager.getNodeStatistics.return_value = {
+        "receivedCnt": 4,
+        "ccData": [
+            {"receivedCnt": 0, "commandClassId": 134, "sentCnt": 0},
+            {"receivedCnt": 1, "commandClassId": 133, "sentCnt": 1},
+            {"receivedCnt": 1, "commandClassId": 115, "sentCnt": 1},
+            {"receivedCnt": 0, "commandClassId": 114, "sentCnt": 0},
+            {"receivedCnt": 0, "commandClassId": 112, "sentCnt": 0},
+            {"receivedCnt": 1, "commandClassId": 32, "sentCnt": 1},
+            {"receivedCnt": 0, "commandClassId": 0, "sentCnt": 0},
+        ],
+        "receivedUnsolicited": 0,
+        "sentTS": "2017-03-27 15:38:15:620 ",
+        "averageRequestRTT": 2462,
+        "lastResponseRTT": 3679,
+        "retries": 0,
+        "sentFailed": 1,
+        "sentCnt": 7,
+        "quality": 0,
+        "lastRequestRTT": 1591,
+        "lastReceivedMessage": [
+            0,
+            4,
+            0,
+            15,
+            3,
+            32,
+            3,
+            0,
+            221,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+            0,
+        ],
+        "receivedDups": 1,
+        "averageResponseRTT": 2443,
+        "receivedTS": "2017-03-27 15:38:19:298 ",
+    }
+    entity.node_changed()
+    assert {
+        "node_id": node.node_id,
+        "node_name": "Mock Node",
+        "manufacturer_name": "Test Manufacturer",
+        "product_name": "Test Product",
+        "query_stage": "Dynamic",
+        "is_awake": True,
+        "is_ready": False,
+        "is_failed": False,
+        "is_info_received": True,
+        "max_baud_rate": 40000,
+        "is_zwave_plus": False,
+        "battery_level": 42,
+        "wake_up_interval": 1800,
+        "averageRequestRTT": 2462,
+        "averageResponseRTT": 2443,
+        "lastRequestRTT": 1591,
+        "lastResponseRTT": 3679,
+        "receivedCnt": 4,
+        "receivedDups": 1,
+        "receivedTS": "2017-03-27 15:38:19:298 ",
+        "receivedUnsolicited": 0,
+        "retries": 0,
+        "sentCnt": 7,
+        "sentFailed": 1,
+        "sentTS": "2017-03-27 15:38:15:620 ",
+    } == entity.device_state_attributes
 
-    def test_state_not_ready(self):
-        """Test state property."""
-        self.node.is_ready = False
-        self.entity.node_changed()
-        assert self.entity.state == "initializing"
+    node.can_wake_up_value = False
+    entity.node_changed()
 
-        self.node.is_failed = True
-        self.node.query_stage = "Complete"
-        self.entity.node_changed()
-        assert self.entity.state == "dead"
+    assert "wake_up_interval" not in entity.device_state_attributes
 
-        self.node.is_failed = False
-        self.node.is_awake = False
-        self.entity.node_changed()
-        assert self.entity.state == "sleeping"
 
-    def test_state_ready(self):
-        """Test state property."""
-        self.node.query_stage = "Complete"
-        self.node.is_ready = True
-        self.entity.node_changed()
-        assert self.entity.state == "ready"
+async def test_name(hass, mock_openzwave):
+    """Test name property."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+    assert entity.name == "Mock Node"
 
-        self.node.is_failed = True
-        self.entity.node_changed()
-        assert self.entity.state == "dead"
 
-        self.node.is_failed = False
-        self.node.is_awake = False
-        self.entity.node_changed()
-        assert self.entity.state == "sleeping"
+async def test_state_before_update(hass, mock_openzwave):
+    """Test state before update was called."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+    assert entity.state is None
 
-    def test_not_polled(self):
-        """Test should_poll property."""
-        assert not self.entity.should_poll
 
-    def test_unique_id(self):
-        """Test unique_id."""
-        assert self.entity.unique_id == "node-567"
+async def test_state_not_ready(hass, mock_openzwave):
+    """Test state property."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode(
+        query_stage="Dynamic",
+        is_awake=True,
+        is_ready=False,
+        is_failed=False,
+        is_info_received=True,
+    )
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
 
-    def test_unique_id_missing_data(self):
-        """Test unique_id."""
-        self.node.manufacturer_name = None
-        self.node.name = None
-        entity = node_entity.ZWaveNodeEntity(self.node, self.zwave_network)
+    node.is_ready = False
+    entity.node_changed()
+    assert entity.state == "initializing"
 
-        assert entity.unique_id is None
+    node.is_failed = True
+    node.query_stage = "Complete"
+    entity.node_changed()
+    assert entity.state == "dead"
+
+    node.is_failed = False
+    node.is_awake = False
+    entity.node_changed()
+    assert entity.state == "sleeping"
+
+
+async def test_state_ready(hass, mock_openzwave):
+    """Test state property."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode(
+        query_stage="Dynamic",
+        is_awake=True,
+        is_ready=False,
+        is_failed=False,
+        is_info_received=True,
+    )
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+
+    node.query_stage = "Complete"
+    node.is_ready = True
+    entity.node_changed()
+    await hass.async_block_till_done()
+    assert entity.state == "ready"
+
+    node.is_failed = True
+    entity.node_changed()
+    assert entity.state == "dead"
+
+    node.is_failed = False
+    node.is_awake = False
+    entity.node_changed()
+    assert entity.state == "sleeping"
+
+
+async def test_not_polled(hass, mock_openzwave):
+    """Test should_poll property."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+    assert not entity.should_poll
+
+
+async def test_unique_id(hass, mock_openzwave):
+    """Test unique_id."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+    assert entity.unique_id == "node-567"
+
+
+async def test_unique_id_missing_data(hass, mock_openzwave):
+    """Test unique_id."""
+    zwave_network = MagicMock()
+    node = mock_zwave.MockNode()
+    node.manufacturer_name = None
+    node.name = None
+    node.is_ready = False
+    entity = node_entity.ZWaveNodeEntity(node, zwave_network)
+
+    assert entity.unique_id is None
diff --git a/tests/conftest.py b/tests/conftest.py
index d6da979bb5e..285179e3a9b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -109,7 +109,18 @@ def hass(loop, hass_storage, request):
 
     def exc_handle(loop, context):
         """Handle exceptions by rethrowing them, which will fail the test."""
-        exceptions.append(context["exception"])
+        # Most of these contexts will contain an exception, but not all.
+        # The docs note the key as "optional"
+        # See https://docs.python.org/3/library/asyncio-eventloop.html#asyncio.loop.call_exception_handler
+        if "exception" in context:
+            exceptions.append(context["exception"])
+        else:
+            exceptions.append(
+                Exception(
+                    "Received exception handler without exception, but with message: %s"
+                    % context["message"]
+                )
+            )
         orig_exception_handler(loop, context)
 
     exceptions = []
@@ -357,10 +368,12 @@ def mqtt_client_mock(hass):
             return FakeInfo(mid)
 
         def _subscribe(topic, qos=0):
+            mid = get_mid()
             mock_client.on_subscribe(0, 0, mid)
             return (0, mid)
 
         def _unsubscribe(topic):
+            mid = get_mid()
             mock_client.on_unsubscribe(0, 0, mid)
             return (0, mid)
 
@@ -382,9 +395,13 @@ async def mqtt_mock(hass, mqtt_client_mock, mqtt_config):
     assert result
     await hass.async_block_till_done()
 
+    # Workaround: asynctest==0.13 fails on @functools.lru_cache
+    spec = dir(hass.data["mqtt"])
+    spec.remove("_matching_subscriptions")
+
     mqtt_component_mock = MagicMock(
         return_value=hass.data["mqtt"],
-        spec_set=hass.data["mqtt"],
+        spec_set=spec,
         wraps=hass.data["mqtt"],
     )
     mqtt_component_mock._mqttc = mqtt_client_mock
@@ -413,6 +430,10 @@ def legacy_patchable_time():
         # Ensure point_in_time is UTC
         point_in_time = event.dt_util.as_utc(point_in_time)
 
+        # Since this is called once, we accept a HassJob so we can avoid
+        # having to figure out how to call the action every time its called.
+        job = action if isinstance(action, ha.HassJob) else ha.HassJob(action)
+
         @ha.callback
         def point_in_time_listener(event):
             """Listen for matching time_changed events."""
@@ -429,7 +450,7 @@ def legacy_patchable_time():
             setattr(point_in_time_listener, "run", True)
             async_unsub()
 
-            hass.async_run_job(action, now)
+            hass.async_run_hass_job(job, now)
 
         async_unsub = hass.bus.async_listen(EVENT_TIME_CHANGED, point_in_time_listener)
 
@@ -441,6 +462,8 @@ def legacy_patchable_time():
         hass, action, hour=None, minute=None, second=None, local=False
     ):
         """Add a listener that will fire if time matches a pattern."""
+
+        job = ha.HassJob(action)
         # We do not have to wrap the function with time pattern matching logic
         # if no pattern given
         if all(val is None for val in (hour, minute, second)):
@@ -448,7 +471,7 @@ def legacy_patchable_time():
             @ha.callback
             def time_change_listener(ev) -> None:
                 """Fire every time event that comes in."""
-                hass.async_run_job(action, ev.data[ATTR_NOW])
+                hass.async_run_hass_job(job, ev.data[ATTR_NOW])
 
             return hass.bus.async_listen(EVENT_TIME_CHANGED, time_change_listener)
 
@@ -485,8 +508,8 @@ def legacy_patchable_time():
             last_now = now
 
             if next_time <= now:
-                hass.async_run_job(
-                    action, event.dt_util.as_local(now) if local else now
+                hass.async_run_hass_job(
+                    job, event.dt_util.as_local(now) if local else now
                 )
                 calculate_next(now + datetime.timedelta(seconds=1))
 
diff --git a/tests/fixtures/advantage_air/getSystemData.json b/tests/fixtures/advantage_air/getSystemData.json
new file mode 100644
index 00000000000..65dbf8d672b
--- /dev/null
+++ b/tests/fixtures/advantage_air/getSystemData.json
@@ -0,0 +1,155 @@
+{
+    "aircons": {
+        "ac1": {
+            "info": {
+                "climateControlModeIsRunning": false,
+                "countDownToOff": 10,
+                "countDownToOn": 0,
+                "fan": "high",
+                "filterCleanStatus": 0,
+                "freshAirStatus": "off",
+                "mode": "vent",
+                "myZone": 0,
+                "name": "AC One",
+                "setTemp": 24,
+                "state": "on"
+            },
+            "zones": {
+                "z01": {
+                    "error": 0,
+                    "maxDamper": 100,
+                    "measuredTemp": 25,
+                    "minDamper": 0,
+                    "motion": 1,
+                    "motionConfig": 2,
+                    "name": "Zone open with Sensor",
+                    "number": 1,
+                    "rssi": 40,
+                    "setTemp": 24,
+                    "state": "open",
+                    "type": 1,
+                    "value": 100
+                },
+                "z02": {
+                    "error": 0,
+                    "maxDamper": 100,
+                    "measuredTemp": 25,
+                    "minDamper": 0,
+                    "motion": 0,
+                    "motionConfig": 2,
+                    "name": "Zone closed with Sensor",
+                    "number": 1,
+                    "rssi": 10,
+                    "setTemp": 24,
+                    "state": "close",
+                    "type": 1,
+                    "value": 0
+                },
+                "z03": {
+                    "error": 0,
+                    "maxDamper": 100,
+                    "measuredTemp": 25,
+                    "minDamper": 0,
+                    "motion": 1,
+                    "motionConfig": 1,
+                    "name": "Zone 3",
+                    "number": 1,
+                    "rssi": 25,
+                    "setTemp": 24,
+                    "state": "close",
+                    "type": 1,
+                    "value": 0
+                },
+                "z04": {
+                    "error": 0,
+                    "maxDamper": 100,
+                    "measuredTemp": 25,
+                    "minDamper": 0,
+                    "motion": 1,
+                    "motionConfig": 1,
+                    "name": "Zone 4",
+                    "number": 1,
+                    "rssi": 75,
+                    "setTemp": 24,
+                    "state": "close",
+                    "type": 1,
+                    "value": 0
+                },
+                "z05": {
+                    "error": 0,
+                    "maxDamper": 100,
+                    "measuredTemp": 25,
+                    "minDamper": 0,
+                    "motion": 1,
+                    "motionConfig": 1,
+                    "name": "Zone 5",
+                    "number": 1,
+                    "rssi": 100,
+                    "setTemp": 24,
+                    "state": "close",
+                    "type": 1,
+                    "value": 0
+                }
+            }
+        },
+        "ac2": {
+            "info": {
+                "climateControlModeIsRunning": false,
+                "countDownToOff": 0,
+                "countDownToOn": 20,
+                "fan": "low",
+                "filterCleanStatus": 1,
+                "freshAirStatus": "none",
+                "mode": "cool",
+                "myZone": 1,
+                "name": "AC Two",
+                "setTemp": 24,
+                "state": "off"
+            },
+            "zones": {
+                "z01": {
+                    "error": 0,
+                    "maxDamper": 100,
+                    "measuredTemp": 0,
+                    "minDamper": 0,
+                    "motion": 0,
+                    "motionConfig": 0,
+                    "name": "Zone open without sensor",
+                    "number": 1,
+                    "rssi": 0,
+                    "setTemp": 24,
+                    "state": "open",
+                    "type": 0,
+                    "value": 100
+                },
+                "z02": {
+                    "error": 0,
+                    "maxDamper": 100,
+                    "measuredTemp": 0,
+                    "minDamper": 0,
+                    "motion": 0,
+                    "motionConfig": 0,
+                    "name": "Zone closed without sensor",
+                    "number": 1,
+                    "rssi": 0,
+                    "setTemp": 24,
+                    "state": "close",
+                    "type": 0,
+                    "value": 0
+                }
+            }
+        }
+    },
+    "system": {
+        "hasAircons": true,
+        "hasLights": false,
+        "hasSensors": false,
+        "hasThings": false,
+        "hasThingsBOG": false,
+        "hasThingsLight": false,
+        "name": "testname",
+        "rid": "uniqueid",
+        "sysType": "e-zone",
+        "myAppRev": "testversion"
+    }
+}
\ No newline at end of file
diff --git a/tests/fixtures/advantage_air/setAircon.json b/tests/fixtures/advantage_air/setAircon.json
new file mode 100644
index 00000000000..ca439c142ae
--- /dev/null
+++ b/tests/fixtures/advantage_air/setAircon.json
@@ -0,0 +1,4 @@
+{
+    "ack": true,
+    "request": "setAircon"
+}
\ No newline at end of file
diff --git a/tests/fixtures/ozw/light_network_dump.csv b/tests/fixtures/ozw/light_network_dump.csv
index 2a2329a1c39..2f0cc7019dc 100644
--- a/tests/fixtures/ozw/light_network_dump.csv
+++ b/tests/fixtures/ozw/light_network_dump.csv
@@ -52,4 +52,176 @@ OpenZWave/1/node/39/association/1/,{    "Name": "Lifeline",    "Help": "",    "M
 OpenZWave/1/node/39/instance/1/commandclass/43/,{    "Instance": 1,    "CommandClassId": 43,    "CommandClass": "COMMAND_CLASS_SCENE_ACTIVATION",    "TimeStamp": 1579566891}
 OpenZWave/1/node/39/instance/1/commandclass/43/value/562950622511127/,{    "Label": "Scene",    "Value": 0,    "Units": "",    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SCENE_ACTIVATION",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "",    "ValueIDKey": 122339347,    "ReadOnly": false,    "WriteOnly": false,    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Event": "valueChanged",    "TimeStamp": 1579630367}
 OpenZWave/1/node/39/instance/1/commandclass/91/,{    "Instance": 1,    "CommandClassId": 91,    "CommandClass": "COMMAND_CLASS_CENTRAL_SCENE",    "TimeStamp": 1579630630}
-OpenZWave/1/node/39/instance/1/commandclass/91/value/281476005806100/,{    "Label": "Scene 1",    "Value": {        "List": [            {                "Value": 0,                "Label": "Inactive"            },            {                "Value": 1,                "Label": "Pressed 1 Time"            },            {                "Value": 2,                "Label": "Key Released"            },            {                "Value": 3,                "Label": "Key Held down"            }        ],        "Selected": "Inactive",    "Selected_id": 0    },    "Units": "",    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CENTRAL_SCENE",    "Index": 1,    "Node": 61,    "Genre": "User",    "Help": "",    "ValueIDKey": 281476005806100,    "ReadOnly": false,    "WriteOnly": false,    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Event": "valueChanged",    "TimeStamp": 1579640710}
\ No newline at end of file
+OpenZWave/1/node/39/instance/1/commandclass/91/value/281476005806100/,{    "Label": "Scene 1",    "Value": {        "List": [            {                "Value": 0,                "Label": "Inactive"            },            {                "Value": 1,                "Label": "Pressed 1 Time"            },            {                "Value": 2,                "Label": "Key Released"            },            {                "Value": 3,                "Label": "Key Held down"            }        ],        "Selected": "Inactive",    "Selected_id": 0    },    "Units": "",    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CENTRAL_SCENE",    "Index": 1,    "Node": 61,    "Genre": "User",    "Help": "",    "ValueIDKey": 281476005806100,    "ReadOnly": false,    "WriteOnly": false,    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Event": "valueChanged",    "TimeStamp": 1579640710}
+OpenZWave/1/status/,{    "OpenZWave_Version": "1.6.1008",    "OZWDeamon_Version": "0.1",    "QTOpenZWave_Version": "1.0.0",    "QT_Version": "5.12.5",    "Status": "driverAllNodesQueried",    "TimeStamp": 1579566933,    "ManufacturerSpecificDBReady": true,    "homeID": 3245146787,    "getControllerNodeId": 1,    "getSUCNodeId": 1,    "isPrimaryController": true,    "isBridgeController": false,    "hasExtendedTXStatistics": true,    "getControllerLibraryVersion": "Z-Wave 3.95",    "getControllerLibraryType": "Static Controller",    "getControllerPath": "/dev/zwave"}
+OpenZWave/1/node/7/,{    "NodeID": 7,    "NodeQueryStage": "Complete",    "isListening": true,    "isFlirs": false,    "isBeaming": true,    "isRouting": true,    "isSecurityv1": false,    "isZWavePlus": false,    "isNIFRecieved": true,    "isAwake": true,    "isFailed": false,    "MetaData": {        "OZWInfoURL": "http://www.openzwave.com/device-database/010F:1000:0900",        "ZWAProductURL": "",        "ProductPic": "images/fibaro/fgrgbwm441.png",        "Description": "RGBW Controller",        "ProductManualURL": "",        "ProductPageURL": "",        "InclusionHelp": "",        "ExclusionHelp": "",        "ResetHelp": "",        "WakeupHelp": "",        "ProductSupportURL": "",        "Frequency": "",        "Name": "FIBARO RGBW Dimmer",        "ProductPicBase64": "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"    },    "Event": "nodeQueriesComplete",    "TimeStamp": 1597142985,    "NodeManufacturerName": "FIBARO System",    "NodeProductName": "FGRGBWM441 RGBW Controller",    "NodeBasicString": "Routing Slave",    "NodeBasic": 4,    "NodeGenericString": "Multilevel Switch",    "NodeGeneric": 17,    "NodeSpecificString": "Multilevel Power Switch",    "NodeSpecific": 1,    "NodeManufacturerID": "0x010f",    "NodeProductType": "0x0900",    "NodeProductID": "0x1000",    "NodeBaudRate": 40000,    "NodeVersion": 4,    "NodeGroups": 5,    "NodeName": "Kitchen RGB Strip",    "NodeLocation": "",    "NodeDeviceTypeString": "Unknown Type (0x0000)",    "NodeDeviceType": 0,    "NodeRole": 0,    "NodeRoleString": "Central Controller",    "NodePlusType": 0,    "NodePlusTypeString": "Z-Wave+ node",    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ]}
+OpenZWave/1/node/7/instance/1/,{    "Instance": 1,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/51/,{    "Instance": 1,    "CommandClassId": 51,    "CommandClass": "COMMAND_CLASS_COLOR",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/51/value/122470423/,{    "Label": "Color",    "Value": "#FFFFFF00",    "Units": "#RRGGBBWW",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_COLOR",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "Color (in RGB format)",    "ValueIDKey": 122470423,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/51/value/281475099181076/,{    "Label": "Color Index",    "Value": {        "List": [            {                "Value": 0,                "Label": "Off"            },            {                "Value": 1,                "Label": "Cool White"            },            {                "Value": 2,                "Label": "Warm White"            },            {                "Value": 3,                "Label": "Red"            },            {                "Value": 4,                "Label": "Lime"            },            {                "Value": 5,                "Label": "Blue"            },            {                "Value": 6,                "Label": "Yellow"            },            {                "Value": 7,                "Label": "Cyan"            },            {                "Value": 8,                "Label": "Magenta"            },            {                "Value": 9,                "Label": "Silver"            },            {                "Value": 10,                "Label": "Gray"            },            {                "Value": 11,                "Label": "Maroon"            },            {                "Value": 12,                "Label": "Olive"            },            {                "Value": 13,                "Label": "Green"            },            {                "Value": 14,                "Label": "Purple"            },            {                "Value": 15,                "Label": "Teal"            },            {                "Value": 16,                "Label": "Navy"            },            {                "Value": 17,                "Label": "Custom"            }        ],        "Selected": "Cool White",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_COLOR",    "Index": 1,    "Node": 7,    "Genre": "User",    "Help": "Preset Color",    "ValueIDKey": 281475099181076,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/,{    "Instance": 1,    "CommandClassId": 112,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "CommandClassVersion": 1,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/281475104374804/,{    "Label": "Enable/Disable ALL ON/OFF",    "Value": {        "List": [            {                "Value": 0,                "Label": "ALL ON disabled/ ALL OFF disabled"            },            {                "Value": 1,                "Label": "ALL ON disabled/ ALL OFF active"            },            {                "Value": 2,                "Label": "ALL ON active / ALL OFF disabled"            },            {                "Value": 255,                "Label": "ALL ON active / ALL OFF active"            }        ],        "Selected": "ALL ON active / ALL OFF active",        "Selected_id": 255    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 1,    "Node": 7,    "Genre": "Config",    "Help": "Enable/Disable ALL ON/OFF",    "ValueIDKey": 281475104374804,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/1688849987928084/,{    "Label": "Associations command class choice",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 1,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET/START/STOP_STATE_CHANGE"            },            {                "Value": 2,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET"            },            {                "Value": 3,                "Label": "Brightness - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 4,                "Label": "Rainbow (RGBW) - COLOR_CONTROL_SET"            }        ],        "Selected": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 6,    "Node": 7,    "Genre": "Config",    "Help": "Choose which command classes are sent to associated devices.",    "ValueIDKey": 1688849987928084,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/2251799941349396/,{    "Label": "Outputs state change mode",    "Value": {        "List": [            {                "Value": 0,                "Label": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)"            },            {                "Value": 1,                "Label": "MODE 2 - Constant Time (RGB/RBGW only. Time is defined by parameter 11)"            }        ],        "Selected": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 8,    "Node": 7,    "Genre": "Config",    "Help": "Choose the behaviour of transitions between different levels.",    "ValueIDKey": 2251799941349396,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/2533274918060049/,{    "Label": "Dimming step value (for MODE 1)",    "Value": 1,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 9,    "Node": 7,    "Genre": "Config",    "Help": "Size of the step for each change in level during the transition.",    "ValueIDKey": 2533274918060049,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/2814749894770710/,{    "Label": "Time between dimming steps (for MODE 1)",    "Value": 10,    "Units": "ms",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 60000,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 10,    "Node": 7,    "Genre": "Config",    "Help": "Time between each step in a transition between levels. Setting this to zero means an instantaneous change.",    "ValueIDKey": 2814749894770710,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3096224871481361/,{    "Label": "Time to complete the entire transition (for MODE 2)",    "Value": 67,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 11,    "Node": 7,    "Genre": "Config",    "Help": "0 - immediate change; 1->63: 20ms->126ms (value*20ms); 65->127: 1s->63s (value-64)*1s; 129->191: 10s->630s (value-128)*10s; 193->255: 1min->63min (value-192)*1min. Default setting: 67 (3s)",    "ValueIDKey": 3096224871481361,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3377699848192017/,{    "Label": "Maximum dimmer level",    "Value": 255,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 3,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 12,    "Node": 7,    "Genre": "Config",    "Help": "Maximum brightness level for the dimmer",    "ValueIDKey": 3377699848192017,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3659174824902673/,{    "Label": "Minimum dimmer level",    "Value": 2,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 2,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 13,    "Node": 7,    "Genre": "Config",    "Help": "Minimum brightness level for the dimmer",    "ValueIDKey": 3659174824902673,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3940649801613334/,{    "Label": "Inputs / Outputs configuration",    "Value": 4369,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 14,    "Node": 7,    "Genre": "Config",    "Help": "This is too complex to describe here, since this value is built up from 4-bits for each of the 4 channels. Refer to the table in the product manual. Default value is 4369 (1111 in hex).",    "ValueIDKey": 3940649801613334,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/4222124778323988/,{    "Label": "Option double click",    "Value": {        "List": [            {                "Value": 0,                "Label": "Double click disabled"            },            {                "Value": 1,                "Label": "Double click enabled"            }        ],        "Selected": "Double click enabled",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 15,    "Node": 7,    "Genre": "Config",    "Help": "Option double click (lighting set at 100%). 0 - Double click disabled, 1 - Double click enabled. Default setting 1",    "ValueIDKey": 4222124778323988,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/4503599755034644/,{    "Label": "Saving state before power failure",    "Value": {        "List": [            {                "Value": 0,                "Label": "State NOT saved at power failure, all outputs are set to OFF upon power restore"            },            {                "Value": 1,                "Label": "State saved at power failure, all outputs are set to previous state upon power restore"            }        ],        "Selected": "State saved at power failure, all outputs are set to previous state upon power restore",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 16,    "Node": 7,    "Genre": "Config",    "Help": "Saving state before power failure",    "ValueIDKey": 4503599755034644,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/8444249428983828/,{    "Label": "Alarm",    "Value": {        "List": [            {                "Value": 0,                "Label": "INACTIVE - no response to alarm frames"            },            {                "Value": 1,                "Label": "ALARM ON - the device turns on once alarm is detected (all channels set to 99%)"            },            {                "Value": 2,                "Label": "ALARM OFF - the device turns off once alarm is detected (all channels set to 0%)"            },            {                "Value": 3,                "Label": "ALARM PROGRAM - alarm sequence turns on (program selected in parameter 38)"            }        ],        "Selected": "INACTIVE - no response to alarm frames",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 30,    "Node": 7,    "Genre": "Config",    "Help": "Alarm of any type (general alarm, water flooding alarm, smoke alarm: CO, CO2, temperature alarm). Default setting 0 (Inactive)",    "ValueIDKey": 8444249428983828,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/10696049242669073/,{    "Label": "Alarm sequence program",    "Value": 10,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 38,    "Node": 7,    "Genre": "Config",    "Help": "Program number selected from the 10 available.",    "ValueIDKey": 10696049242669073,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/10977524219379734/,{    "Label": "Active PROGRAM alarm time",    "Value": 600,    "Units": "s",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 39,    "Node": 7,    "Genre": "Config",    "Help": "In ALARM PROGRAM mode (see parameter 30), this defines the time in seconds the program lasts (1s->65534s)",    "ValueIDKey": 10977524219379734,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/11821949149511700/,{    "Label": "Command class reporting Outputs status change",    "Value": {        "List": [            {                "Value": 0,                "Label": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)"            },            {                "Value": 1,                "Label": "Reporting as a result inputs actions (SWITCH MULTILEVEL)"            },            {                "Value": 2,                "Label": "Reporting as a result inputs actions (COLOUR_CONTROL)"            }        ],        "Selected": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 42,    "Node": 7,    "Genre": "Config",    "Help": "Specify which command class is used to report output status changes",    "ValueIDKey": 11821949149511700,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/12103424126222353/,{    "Label": "Reporting 0-10v analog inputs change threshold",    "Value": 5,    "Units": "*0.1V",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 100,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 43,    "Node": 7,    "Genre": "Config",    "Help": "Parameter defines a value by which input voltage must change in order to be reported to the main controller. New value is calculated based on last reported value: Default setting: 5 (0.5V). Range: 1->100 - (0.1V->10V).",    "ValueIDKey": 12103424126222353,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/12384899102933014/,{    "Label": "Power load reporting frequency",    "Value": 30,    "Units": "s",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 44,    "Node": 7,    "Genre": "Config",    "Help": "Sent if last reported value differs from the current value. Reports will also be sent in case of polling. Default setting: 30 (30s). Range: 1->65534 (1s->65534s) - interval between reports. Zero means reports are only sent in the case of polling, or at turning OFF the device",    "ValueIDKey": 12384899102933014,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/12666374079643665/,{    "Label": "Reporting changes in energy consumed by controlled devices",    "Value": 10,    "Units": "*0.01kWh",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 254,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 45,    "Node": 7,    "Genre": "Config",    "Help": "Interval between energy consumption reports (in kWh). New reported energy consumption value is calculated based on last reported value. 1->254 (0.01kWh->2.54kWh). Zero means changes in consumed energy will not be reported, except in case of polling.",    "ValueIDKey": 12666374079643665,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/19984723474120724/,{    "Label": "Response to BRIGHTNESS set to 0%",    "Value": {        "List": [            {                "Value": 0,                "Label": "Illumination colour set to white (all channels controlled together)"            },            {                "Value": 1,                "Label": "Last set colour is memorized"            }        ],        "Selected": "Last set colour is memorized",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 71,    "Node": 7,    "Genre": "Config",    "Help": "Set whether to remember the previous RGB mix after the brightness has fallen to zero (black)",    "ValueIDKey": 19984723474120724,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/20266198450831377/,{    "Label": "Starting predefined program",    "Value": 1,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 72,    "Node": 7,    "Genre": "Config",    "Help": "First predefined program to use when device is set to work in RGB/RGBW mode (parameter 14)",    "ValueIDKey": 20266198450831377,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/20547673427542036/,{    "Label": "Triple Click Action",    "Value": {        "List": [            {                "Value": 0,                "Label": "NODE INFO control frame is sent"            },            {                "Value": 1,                "Label": "Start favourite program"            }        ],        "Selected": "NODE INFO control frame is sent",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 73,    "Node": 7,    "Genre": "Config",    "Help": "Behaviour when an input is triple-clicked",    "ValueIDKey": 20547673427542036,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/38/,{    "Instance": 1,    "CommandClassId": 38,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/122257425/,{    "Label": "Level",    "Value": 99,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "The Current Level of the Device",    "ValueIDKey": 122257425,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597142969}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/281475098968088/,{    "Label": "Bright",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 1,    "Node": 7,    "Genre": "User",    "Help": "Increase the Brightness of the Device",    "ValueIDKey": 281475098968088,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/562950075678744/,{    "Label": "Dim",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 2,    "Node": 7,    "Genre": "User",    "Help": "Decrease the Brightness of the Device",    "ValueIDKey": 562950075678744,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/844425060778000/,{    "Label": "Ignore Start Level",    "Value": true,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Bool",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 3,    "Node": 7,    "Genre": "System",    "Help": "Ignore the Start Level of the Device when increasing/decreasing brightness",    "ValueIDKey": 844425060778000,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/1125900037488657/,{    "Label": "Start Level",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 4,    "Node": 7,    "Genre": "System",    "Help": "Start Level when Changing the Brightness of a Device",    "ValueIDKey": 1125900037488657,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/39/,{    "Instance": 1,    "CommandClassId": 39,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "CommandClassVersion": 1,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/39/value/130662420/,{    "Label": "Switch All",    "Value": {        "List": [            {                "Value": 0,                "Label": "Disabled"            },            {                "Value": 1,                "Label": "Off Enabled"            },            {                "Value": 2,                "Label": "On Enabled"            },            {                "Value": 255,                "Label": "On and Off Enabled"            }        ],        "Selected": "On and Off Enabled",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "Index": 0,    "Node": 7,    "Genre": "System",    "Help": "Switch All Devices On/Off",    "ValueIDKey": 130662420,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597142969}
+OpenZWave/1/node/7/instance/1/commandclass/114/,{    "Instance": 1,    "CommandClassId": 114,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/114/value/131891219/,{    "Label": "Loaded Config Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 0,    "Node": 7,    "Genre": "System",    "Help": "Revision of the Config file currently loaded",    "ValueIDKey": 131891219,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/114/value/281475108601875/,{    "Label": "Config File Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 1,    "Node": 7,    "Genre": "System",    "Help": "Revision of the Config file on the File System",    "ValueIDKey": 281475108601875,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/114/value/562950085312531/,{    "Label": "Latest Available Config File Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 2,    "Node": 7,    "Genre": "System",    "Help": "Latest Revision of the Config file available for download",    "ValueIDKey": 562950085312531,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/association/1/,{    "Name": "Input 1",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
+OpenZWave/1/node/7/association/2/,{    "Name": "Input 2",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
+OpenZWave/1/node/7/association/3/,{    "Name": "Input 3",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
+OpenZWave/1/node/7/association/4/,{    "Name": "Input 4",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
+OpenZWave/1/node/7/association/5/,{    "Name": "Lifeline",    "Help": "",    "MaxAssociations": 1,    "Members": [        "1.0"    ],    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 9,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 8,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597142969,    "lastReceivedTimeStamp": 1597142969,    "lastRequestRTT": 26,    "averageRequestRTT": 42,    "lastResponseRTT": 55,    "averageResponseRTT": 62,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/281475104374804/,{    "Label": "Enable/Disable ALL ON/OFF",    "Value": {        "List": [            {                "Value": 0,                "Label": "ALL ON disabled/ ALL OFF disabled"            },            {                "Value": 1,                "Label": "ALL ON disabled/ ALL OFF active"            },            {                "Value": 2,                "Label": "ALL ON active / ALL OFF disabled"            },            {                "Value": 255,                "Label": "ALL ON active / ALL OFF active"            }        ],        "Selected": "ALL ON active / ALL OFF active",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 1,    "Node": 7,    "Genre": "Config",    "Help": "Enable/Disable ALL ON/OFF",    "ValueIDKey": 281475104374804,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/1688849987928084/,{    "Label": "Associations command class choice",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 1,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET/START/STOP_STATE_CHANGE"            },            {                "Value": 2,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET"            },            {                "Value": 3,                "Label": "Brightness - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 4,                "Label": "Rainbow (RGBW) - COLOR_CONTROL_SET"            }        ],        "Selected": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 6,    "Node": 7,    "Genre": "Config",    "Help": "Choose which command classes are sent to associated devices.",    "ValueIDKey": 1688849987928084,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/2251799941349396/,{    "Label": "Outputs state change mode",    "Value": {        "List": [            {                "Value": 0,                "Label": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)"            },            {                "Value": 1,                "Label": "MODE 2 - Constant Time (RGB/RBGW only. Time is defined by parameter 11)"            }        ],        "Selected": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 8,    "Node": 7,    "Genre": "Config",    "Help": "Choose the behaviour of transitions between different levels.",    "ValueIDKey": 2251799941349396,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/2533274918060049/,{    "Label": "Dimming step value (for MODE 1)",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 9,    "Node": 7,    "Genre": "Config",    "Help": "Size of the step for each change in level during the transition.",    "ValueIDKey": 2533274918060049,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/2814749894770710/,{    "Label": "Time between dimming steps (for MODE 1)",    "Value": 10,    "Units": "ms",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 60000,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 10,    "Node": 7,    "Genre": "Config",    "Help": "Time between each step in a transition between levels. Setting this to zero means an instantaneous change.",    "ValueIDKey": 2814749894770710,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3096224871481361/,{    "Label": "Time to complete the entire transition (for MODE 2)",    "Value": 67,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 11,    "Node": 7,    "Genre": "Config",    "Help": "0 - immediate change; 1->63: 20ms->126ms (value*20ms); 65->127: 1s->63s (value-64)*1s; 129->191: 10s->630s (value-128)*10s; 193->255: 1min->63min (value-192)*1min. Default setting: 67 (3s)",    "ValueIDKey": 3096224871481361,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3377699848192017/,{    "Label": "Maximum dimmer level",    "Value": 255,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 3,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 12,    "Node": 7,    "Genre": "Config",    "Help": "Maximum brightness level for the dimmer",    "ValueIDKey": 3377699848192017,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3659174824902673/,{    "Label": "Minimum dimmer level",    "Value": 2,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 2,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 13,    "Node": 7,    "Genre": "Config",    "Help": "Minimum brightness level for the dimmer",    "ValueIDKey": 3659174824902673,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3940649801613334/,{    "Label": "Inputs / Outputs configuration",    "Value": 4369,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 14,    "Node": 7,    "Genre": "Config",    "Help": "This is too complex to describe here, since this value is built up from 4-bits for each of the 4 channels. Refer to the table in the product manual. Default value is 4369 (1111 in hex).",    "ValueIDKey": 3940649801613334,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/4222124778323988/,{    "Label": "Option double click",    "Value": {        "List": [            {                "Value": 0,                "Label": "Double click disabled"            },            {                "Value": 1,                "Label": "Double click enabled"            }        ],        "Selected": "Double click enabled",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 15,    "Node": 7,    "Genre": "Config",    "Help": "Option double click (lighting set at 100%). 0 - Double click disabled, 1 - Double click enabled. Default setting 1",    "ValueIDKey": 4222124778323988,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/4503599755034644/,{    "Label": "Saving state before power failure",    "Value": {        "List": [            {                "Value": 0,                "Label": "State NOT saved at power failure, all outputs are set to OFF upon power restore"            },            {                "Value": 1,                "Label": "State saved at power failure, all outputs are set to previous state upon power restore"            }        ],        "Selected": "State saved at power failure, all outputs are set to previous state upon power restore",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 16,    "Node": 7,    "Genre": "Config",    "Help": "Saving state before power failure",    "ValueIDKey": 4503599755034644,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/8444249428983828/,{    "Label": "Alarm",    "Value": {        "List": [            {                "Value": 0,                "Label": "INACTIVE - no response to alarm frames"            },            {                "Value": 1,                "Label": "ALARM ON - the device turns on once alarm is detected (all channels set to 99%)"            },            {                "Value": 2,                "Label": "ALARM OFF - the device turns off once alarm is detected (all channels set to 0%)"            },            {                "Value": 3,                "Label": "ALARM PROGRAM - alarm sequence turns on (program selected in parameter 38)"            }        ],        "Selected": "INACTIVE - no response to alarm frames",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 30,    "Node": 7,    "Genre": "Config",    "Help": "Alarm of any type (general alarm, water flooding alarm, smoke alarm: CO, CO2, temperature alarm). Default setting 0 (Inactive)",    "ValueIDKey": 8444249428983828,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/10696049242669073/,{    "Label": "Alarm sequence program",    "Value": 10,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 38,    "Node": 7,    "Genre": "Config",    "Help": "Program number selected from the 10 available.",    "ValueIDKey": 10696049242669073,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/10977524219379734/,{    "Label": "Active PROGRAM alarm time",    "Value": 600,    "Units": "s",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 39,    "Node": 7,    "Genre": "Config",    "Help": "In ALARM PROGRAM mode (see parameter 30), this defines the time in seconds the program lasts (1s->65534s)",    "ValueIDKey": 10977524219379734,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/11821949149511700/,{    "Label": "Command class reporting Outputs status change",    "Value": {        "List": [            {                "Value": 0,                "Label": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)"            },            {                "Value": 1,                "Label": "Reporting as a result inputs actions (SWITCH MULTILEVEL)"            },            {                "Value": 2,                "Label": "Reporting as a result inputs actions (COLOUR_CONTROL)"            }        ],        "Selected": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 42,    "Node": 7,    "Genre": "Config",    "Help": "Specify which command class is used to report output status changes",    "ValueIDKey": 11821949149511700,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/12103424126222353/,{    "Label": "Reporting 0-10v analog inputs change threshold",    "Value": 5,    "Units": "*0.1V",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 100,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 43,    "Node": 7,    "Genre": "Config",    "Help": "Parameter defines a value by which input voltage must change in order to be reported to the main controller. New value is calculated based on last reported value: Default setting: 5 (0.5V). Range: 1->100 - (0.1V->10V).",    "ValueIDKey": 12103424126222353,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/12384899102933014/,{    "Label": "Power load reporting frequency",    "Value": 30,    "Units": "s",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 44,    "Node": 7,    "Genre": "Config",    "Help": "Sent if last reported value differs from the current value. Reports will also be sent in case of polling. Default setting: 30 (30s). Range: 1->65534 (1s->65534s) - interval between reports. Zero means reports are only sent in the case of polling, or at turning OFF the device",    "ValueIDKey": 12384899102933014,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/12666374079643665/,{    "Label": "Reporting changes in energy consumed by controlled devices",    "Value": 10,    "Units": "*0.01kWh",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 254,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 45,    "Node": 7,    "Genre": "Config",    "Help": "Interval between energy consumption reports (in kWh). New reported energy consumption value is calculated based on last reported value. 1->254 (0.01kWh->2.54kWh). Zero means changes in consumed energy will not be reported, except in case of polling.",    "ValueIDKey": 12666374079643665,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/19984723474120724/,{    "Label": "Response to BRIGHTNESS set to 0%",    "Value": {        "List": [            {                "Value": 0,                "Label": "Illumination colour set to white (all channels controlled together)"            },            {                "Value": 1,                "Label": "Last set colour is memorized"            }        ],        "Selected": "Last set colour is memorized",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 71,    "Node": 7,    "Genre": "Config",    "Help": "Set whether to remember the previous RGB mix after the brightness has fallen to zero (black)",    "ValueIDKey": 19984723474120724,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/20266198450831377/,{    "Label": "Starting predefined program",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 72,    "Node": 7,    "Genre": "Config",    "Help": "First predefined program to use when device is set to work in RGB/RGBW mode (parameter 14)",    "ValueIDKey": 20266198450831377,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/20547673427542036/,{    "Label": "Triple Click Action",    "Value": {        "List": [            {                "Value": 0,                "Label": "NODE INFO control frame is sent"            },            {                "Value": 1,                "Label": "Start favourite program"            }        ],        "Selected": "NODE INFO control frame is sent",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 73,    "Node": 7,    "Genre": "Config",    "Help": "Behaviour when an input is triple-clicked",    "ValueIDKey": 20547673427542036,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/,{    "NodeID": 7,    "NodeQueryStage": "Complete",    "isListening": true,    "isFlirs": false,    "isBeaming": true,    "isRouting": true,    "isSecurityv1": false,    "isZWavePlus": false,    "isNIFRecieved": true,    "isAwake": true,    "isFailed": false,    "MetaData": {        "OZWInfoURL": "http://www.openzwave.com/device-database/010F:1000:0900",        "ZWAProductURL": "",        "ProductPic": "images/fibaro/fgrgbwm441.png",        "Description": "RGBW Controller",        "ProductManualURL": "",        "ProductPageURL": "",        "InclusionHelp": "",        "ExclusionHelp": "",        "ResetHelp": "",        "WakeupHelp": "",        "ProductSupportURL": "",        "Frequency": "",        "Name": "FIBARO RGBW Dimmer",        "ProductPicBase64": "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"    },    "Event": "nodeQueriesComplete",    "TimeStamp": 1597143009,    "NodeManufacturerName": "FIBARO System",    "NodeProductName": "FGRGBWM441 RGBW Controller",    "NodeBasicString": "Routing Slave",    "NodeBasic": 4,    "NodeGenericString": "Multilevel Switch",    "NodeGeneric": 17,    "NodeSpecificString": "Multilevel Power Switch",    "NodeSpecific": 1,    "NodeManufacturerID": "0x010f",    "NodeProductType": "0x0900",    "NodeProductID": "0x1000",    "NodeBaudRate": 40000,    "NodeVersion": 4,    "NodeGroups": 5,    "NodeName": "Kitchen RGB Strip",    "NodeLocation": "",    "NodeDeviceTypeString": "Unknown Type (0x0000)",    "NodeDeviceType": 0,    "NodeRole": 0,    "NodeRoleString": "Central Controller",    "NodePlusType": 0,    "NodePlusTypeString": "Z-Wave+ node",    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ],    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ]}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/node/7/,{    "NodeID": 7,    "NodeQueryStage": "Complete",    "isListening": true,    "isFlirs": false,    "isBeaming": true,    "isRouting": true,    "isSecurityv1": false,    "isZWavePlus": false,    "isNIFRecieved": true,    "isAwake": true,    "isFailed": false,    "MetaData": {        "OZWInfoURL": "http://www.openzwave.com/device-database/010F:1000:0900",        "ZWAProductURL": "",        "ProductPic": "images/fibaro/fgrgbwm441.png",        "Description": "RGBW Controller",        "ProductManualURL": "",        "ProductPageURL": "",        "InclusionHelp": "",        "ExclusionHelp": "",        "ResetHelp": "",        "WakeupHelp": "",        "ProductSupportURL": "",        "Frequency": "",        "Name": "FIBARO RGBW Dimmer",        "ProductPicBase64": "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"    },    "Event": "nodeQueriesComplete",    "TimeStamp": 1597143009,    "NodeManufacturerName": "FIBARO System",    "NodeProductName": "FGRGBWM441 RGBW Controller",    "NodeBasicString": "Routing Slave",    "NodeBasic": 4,    "NodeGenericString": "Multilevel Switch",    "NodeGeneric": 17,    "NodeSpecificString": "Multilevel Power Switch",    "NodeSpecific": 1,    "NodeManufacturerID": "0x010f",    "NodeProductType": "0x0900",    "NodeProductID": "0x1000",    "NodeBaudRate": 40000,    "NodeVersion": 4,    "NodeGroups": 5,    "NodeName": "Kitchen RGB Strip",    "NodeLocation": "",    "NodeDeviceTypeString": "Unknown Type (0x0000)",    "NodeDeviceType": 0,    "NodeRole": 0,    "NodeRoleString": "Central Controller",    "NodePlusType": 0,    "NodePlusTypeString": "Z-Wave+ node",    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ],    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ]}
+OpenZWave/1/node/7/instance/1/,{    "Instance": 1,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/51/,{    "Instance": 1,    "CommandClassId": 51,    "CommandClass": "COMMAND_CLASS_COLOR",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/51/value/122470423/,{    "Label": "Color",    "Value": "#FFFFFF00",    "Units": "#RRGGBBWW",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_COLOR",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "Color (in RGB format)",    "ValueIDKey": 122470423,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/51/value/281475099181076/,{    "Label": "Color Index",    "Value": {        "List": [            {                "Value": 0,                "Label": "Off"            },            {                "Value": 1,                "Label": "Cool White"            },            {                "Value": 2,                "Label": "Warm White"            },            {                "Value": 3,                "Label": "Red"            },            {                "Value": 4,                "Label": "Lime"            },            {                "Value": 5,                "Label": "Blue"            },            {                "Value": 6,                "Label": "Yellow"            },            {                "Value": 7,                "Label": "Cyan"            },            {                "Value": 8,                "Label": "Magenta"            },            {                "Value": 9,                "Label": "Silver"            },            {                "Value": 10,                "Label": "Gray"            },            {                "Value": 11,                "Label": "Maroon"            },            {                "Value": 12,                "Label": "Olive"            },            {                "Value": 13,                "Label": "Green"            },            {                "Value": 14,                "Label": "Purple"            },            {                "Value": 15,                "Label": "Teal"            },            {                "Value": 16,                "Label": "Navy"            },            {                "Value": 17,                "Label": "Custom"            }        ],        "Selected": "Cool White",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_COLOR",    "Index": 1,    "Node": 7,    "Genre": "User",    "Help": "Preset Color",    "ValueIDKey": 281475099181076,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/,{    "Instance": 1,    "CommandClassId": 112,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "CommandClassVersion": 1,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/281475104374804/,{    "Label": "Enable/Disable ALL ON/OFF",    "Value": {        "List": [            {                "Value": 0,                "Label": "ALL ON disabled/ ALL OFF disabled"            },            {                "Value": 1,                "Label": "ALL ON disabled/ ALL OFF active"            },            {                "Value": 2,                "Label": "ALL ON active / ALL OFF disabled"            },            {                "Value": 255,                "Label": "ALL ON active / ALL OFF active"            }        ],        "Selected": "ALL ON active / ALL OFF active",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 1,    "Node": 7,    "Genre": "Config",    "Help": "Enable/Disable ALL ON/OFF",    "ValueIDKey": 281475104374804,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/1688849987928084/,{    "Label": "Associations command class choice",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 1,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET/START/STOP_STATE_CHANGE"            },            {                "Value": 2,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET"            },            {                "Value": 3,                "Label": "Brightness - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 4,                "Label": "Rainbow (RGBW) - COLOR_CONTROL_SET"            }        ],        "Selected": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 6,    "Node": 7,    "Genre": "Config",    "Help": "Choose which command classes are sent to associated devices.",    "ValueIDKey": 1688849987928084,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/2251799941349396/,{    "Label": "Outputs state change mode",    "Value": {        "List": [            {                "Value": 0,                "Label": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)"            },            {                "Value": 1,                "Label": "MODE 2 - Constant Time (RGB/RBGW only. Time is defined by parameter 11)"            }        ],        "Selected": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 8,    "Node": 7,    "Genre": "Config",    "Help": "Choose the behaviour of transitions between different levels.",    "ValueIDKey": 2251799941349396,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/2533274918060049/,{    "Label": "Dimming step value (for MODE 1)",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 9,    "Node": 7,    "Genre": "Config",    "Help": "Size of the step for each change in level during the transition.",    "ValueIDKey": 2533274918060049,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/2814749894770710/,{    "Label": "Time between dimming steps (for MODE 1)",    "Value": 10,    "Units": "ms",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 60000,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 10,    "Node": 7,    "Genre": "Config",    "Help": "Time between each step in a transition between levels. Setting this to zero means an instantaneous change.",    "ValueIDKey": 2814749894770710,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3096224871481361/,{    "Label": "Time to complete the entire transition (for MODE 2)",    "Value": 67,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 11,    "Node": 7,    "Genre": "Config",    "Help": "0 - immediate change; 1->63: 20ms->126ms (value*20ms); 65->127: 1s->63s (value-64)*1s; 129->191: 10s->630s (value-128)*10s; 193->255: 1min->63min (value-192)*1min. Default setting: 67 (3s)",    "ValueIDKey": 3096224871481361,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3377699848192017/,{    "Label": "Maximum dimmer level",    "Value": 255,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 3,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 12,    "Node": 7,    "Genre": "Config",    "Help": "Maximum brightness level for the dimmer",    "ValueIDKey": 3377699848192017,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3659174824902673/,{    "Label": "Minimum dimmer level",    "Value": 2,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 2,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 13,    "Node": 7,    "Genre": "Config",    "Help": "Minimum brightness level for the dimmer",    "ValueIDKey": 3659174824902673,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/3940649801613334/,{    "Label": "Inputs / Outputs configuration",    "Value": 4369,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 14,    "Node": 7,    "Genre": "Config",    "Help": "This is too complex to describe here, since this value is built up from 4-bits for each of the 4 channels. Refer to the table in the product manual. Default value is 4369 (1111 in hex).",    "ValueIDKey": 3940649801613334,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/4222124778323988/,{    "Label": "Option double click",    "Value": {        "List": [            {                "Value": 0,                "Label": "Double click disabled"            },            {                "Value": 1,                "Label": "Double click enabled"            }        ],        "Selected": "Double click enabled",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 15,    "Node": 7,    "Genre": "Config",    "Help": "Option double click (lighting set at 100%). 0 - Double click disabled, 1 - Double click enabled. Default setting 1",    "ValueIDKey": 4222124778323988,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/4503599755034644/,{    "Label": "Saving state before power failure",    "Value": {        "List": [            {                "Value": 0,                "Label": "State NOT saved at power failure, all outputs are set to OFF upon power restore"            },            {                "Value": 1,                "Label": "State saved at power failure, all outputs are set to previous state upon power restore"            }        ],        "Selected": "State saved at power failure, all outputs are set to previous state upon power restore",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 16,    "Node": 7,    "Genre": "Config",    "Help": "Saving state before power failure",    "ValueIDKey": 4503599755034644,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/8444249428983828/,{    "Label": "Alarm",    "Value": {        "List": [            {                "Value": 0,                "Label": "INACTIVE - no response to alarm frames"            },            {                "Value": 1,                "Label": "ALARM ON - the device turns on once alarm is detected (all channels set to 99%)"            },            {                "Value": 2,                "Label": "ALARM OFF - the device turns off once alarm is detected (all channels set to 0%)"            },            {                "Value": 3,                "Label": "ALARM PROGRAM - alarm sequence turns on (program selected in parameter 38)"            }        ],        "Selected": "INACTIVE - no response to alarm frames",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 30,    "Node": 7,    "Genre": "Config",    "Help": "Alarm of any type (general alarm, water flooding alarm, smoke alarm: CO, CO2, temperature alarm). Default setting 0 (Inactive)",    "ValueIDKey": 8444249428983828,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/10696049242669073/,{    "Label": "Alarm sequence program",    "Value": 10,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 38,    "Node": 7,    "Genre": "Config",    "Help": "Program number selected from the 10 available.",    "ValueIDKey": 10696049242669073,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/10977524219379734/,{    "Label": "Active PROGRAM alarm time",    "Value": 600,    "Units": "s",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 39,    "Node": 7,    "Genre": "Config",    "Help": "In ALARM PROGRAM mode (see parameter 30), this defines the time in seconds the program lasts (1s->65534s)",    "ValueIDKey": 10977524219379734,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/11821949149511700/,{    "Label": "Command class reporting Outputs status change",    "Value": {        "List": [            {                "Value": 0,                "Label": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)"            },            {                "Value": 1,                "Label": "Reporting as a result inputs actions (SWITCH MULTILEVEL)"            },            {                "Value": 2,                "Label": "Reporting as a result inputs actions (COLOUR_CONTROL)"            }        ],        "Selected": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 42,    "Node": 7,    "Genre": "Config",    "Help": "Specify which command class is used to report output status changes",    "ValueIDKey": 11821949149511700,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/12103424126222353/,{    "Label": "Reporting 0-10v analog inputs change threshold",    "Value": 5,    "Units": "*0.1V",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 100,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 43,    "Node": 7,    "Genre": "Config",    "Help": "Parameter defines a value by which input voltage must change in order to be reported to the main controller. New value is calculated based on last reported value: Default setting: 5 (0.5V). Range: 1->100 - (0.1V->10V).",    "ValueIDKey": 12103424126222353,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/12384899102933014/,{    "Label": "Power load reporting frequency",    "Value": 30,    "Units": "s",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 44,    "Node": 7,    "Genre": "Config",    "Help": "Sent if last reported value differs from the current value. Reports will also be sent in case of polling. Default setting: 30 (30s). Range: 1->65534 (1s->65534s) - interval between reports. Zero means reports are only sent in the case of polling, or at turning OFF the device",    "ValueIDKey": 12384899102933014,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/12666374079643665/,{    "Label": "Reporting changes in energy consumed by controlled devices",    "Value": 10,    "Units": "*0.01kWh",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 254,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 45,    "Node": 7,    "Genre": "Config",    "Help": "Interval between energy consumption reports (in kWh). New reported energy consumption value is calculated based on last reported value. 1->254 (0.01kWh->2.54kWh). Zero means changes in consumed energy will not be reported, except in case of polling.",    "ValueIDKey": 12666374079643665,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/19984723474120724/,{    "Label": "Response to BRIGHTNESS set to 0%",    "Value": {        "List": [            {                "Value": 0,                "Label": "Illumination colour set to white (all channels controlled together)"            },            {                "Value": 1,                "Label": "Last set colour is memorized"            }        ],        "Selected": "Last set colour is memorized",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 71,    "Node": 7,    "Genre": "Config",    "Help": "Set whether to remember the previous RGB mix after the brightness has fallen to zero (black)",    "ValueIDKey": 19984723474120724,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/20266198450831377/,{    "Label": "Starting predefined program",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 72,    "Node": 7,    "Genre": "Config",    "Help": "First predefined program to use when device is set to work in RGB/RGBW mode (parameter 14)",    "ValueIDKey": 20266198450831377,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/112/value/20547673427542036/,{    "Label": "Triple Click Action",    "Value": {        "List": [            {                "Value": 0,                "Label": "NODE INFO control frame is sent"            },            {                "Value": 1,                "Label": "Start favourite program"            }        ],        "Selected": "NODE INFO control frame is sent",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 73,    "Node": 7,    "Genre": "Config",    "Help": "Behaviour when an input is triple-clicked",    "ValueIDKey": 20547673427542036,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
+OpenZWave/1/node/7/instance/1/commandclass/38/,{    "Instance": 1,    "CommandClassId": 38,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/122257425/,{    "Label": "Level",    "Value": 99,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "The Current Level of the Device",    "ValueIDKey": 122257425,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597142969}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/281475098968088/,{    "Label": "Bright",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 1,    "Node": 7,    "Genre": "User",    "Help": "Increase the Brightness of the Device",    "ValueIDKey": 281475098968088,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/562950075678744/,{    "Label": "Dim",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 2,    "Node": 7,    "Genre": "User",    "Help": "Decrease the Brightness of the Device",    "ValueIDKey": 562950075678744,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/844425060778000/,{    "Label": "Ignore Start Level",    "Value": true,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Bool",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 3,    "Node": 7,    "Genre": "System",    "Help": "Ignore the Start Level of the Device when increasing/decreasing brightness",    "ValueIDKey": 844425060778000,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/38/value/1125900037488657/,{    "Label": "Start Level",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 4,    "Node": 7,    "Genre": "System",    "Help": "Start Level when Changing the Brightness of a Device",    "ValueIDKey": 1125900037488657,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/39/,{    "Instance": 1,    "CommandClassId": 39,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "CommandClassVersion": 1,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/39/value/130662420/,{    "Label": "Switch All",    "Value": {        "List": [            {                "Value": 0,                "Label": "Disabled"            },            {                "Value": 1,                "Label": "Off Enabled"            },            {                "Value": 2,                "Label": "On Enabled"            },            {                "Value": 255,                "Label": "On and Off Enabled"            }        ],        "Selected": "On and Off Enabled",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "Index": 0,    "Node": 7,    "Genre": "System",    "Help": "Switch All Devices On/Off",    "ValueIDKey": 130662420,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597142969}
+OpenZWave/1/node/7/instance/1/commandclass/114/,{    "Instance": 1,    "CommandClassId": 114,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/114/value/131891219/,{    "Label": "Loaded Config Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 0,    "Node": 7,    "Genre": "System",    "Help": "Revision of the Config file currently loaded",    "ValueIDKey": 131891219,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/114/value/281475108601875/,{    "Label": "Config File Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 1,    "Node": 7,    "Genre": "System",    "Help": "Revision of the Config file on the File System",    "ValueIDKey": 281475108601875,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/instance/1/commandclass/114/value/562950085312531/,{    "Label": "Latest Available Config File Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 2,    "Node": 7,    "Genre": "System",    "Help": "Latest Revision of the Config file available for download",    "ValueIDKey": 562950085312531,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/association/1/,{    "Name": "Input 1",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
+OpenZWave/1/node/7/association/2/,{    "Name": "Input 2",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
+OpenZWave/1/node/7/association/3/,{    "Name": "Input 3",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
+OpenZWave/1/node/7/association/4/,{    "Name": "Input 4",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
+OpenZWave/1/node/7/association/5/,{    "Name": "Lifeline",    "Help": "",    "MaxAssociations": 1,    "Members": [        "1.0"    ],    "TimeStamp": 1597142799}
+OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
+OpenZWave/1/status/,{    "OpenZWave_Version": "1.6.1008",    "OZWDeamon_Version": "0.1",    "QTOpenZWave_Version": "1.0.0",    "QT_Version": "5.12.5",    "Status": "driverAllNodesQueried",    "TimeStamp": 1579566933,    "ManufacturerSpecificDBReady": true,    "homeID": 3245146787,    "getControllerNodeId": 1,    "getSUCNodeId": 1,    "isPrimaryController": true,    "isBridgeController": false,    "hasExtendedTXStatistics": true,    "getControllerLibraryVersion": "Z-Wave 3.95",    "getControllerLibraryType": "Static Controller",    "getControllerPath": "/dev/zwave"}
+OpenZWave/1/node/2/,{    "NodeID": 2,    "NodeQueryStage": "Complete",    "isListening": true,    "isFlirs": false,    "isBeaming": true,    "isRouting": true,    "isSecurityv1": false,    "isZWavePlus": false,    "isNIFRecieved": true,    "isAwake": true,    "isFailed": false,    "MetaData": {        "OZWInfoURL": "http://www.openzwave.com/device-database/0063:3031:4944",        "ZWAProductURL": "",        "ProductPic": "images/ge/12724-dimmer.png",        "Description": "Transform any home into a smart home with the GE Z-Wave Smart Fan Control. The in-wall fan control easily replaces any standard in-wall switch remotely controls a ceiling fan in your home and features a three-speed control system. Your home will be equipped with ultimate flexibility with the GE Z-Wave Smart Fan Control, capable of being used by itself or with up to four GE add-on switches. Screw terminal installation provides improved space efficiency when replacing existing switches and the integrated LED indicator light allows you to easily locate the switch in a dark room. The GE Z-Wave Smart Fan Control is compatible with any Z-Wave certified gateway, providing access to many popular home automation systems. Take control of your home lighting with GE Z-Wave Smart Lighting Controls!",        "ProductManualURL": "https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&filename=Manuals/2506/Binder2.pdf",        "ProductPageURL": "http://www.ezzwave.com",        "InclusionHelp": "1. Follow the instructions for your Z-Wave certified controller to include a device to the Z-Wave network. 2. Once the controller is ready to include your device, press and release the top or bottom of the smart fan control switch (rocker) to include it in the network. 3. Once your controller has confirmed the device has been included, refresh the Z-Wave network to optimize performance.",        "ExclusionHelp": "1. Follow the instructions for your Z-Wave certified controller to exclude a device from the Z-Wave network. 2. Once the controller is ready to Exclude your device, press and release the top or bottom of the wireless smart switch (rocker) to exclude it from the network.",        "ResetHelp": "1. Quickly press ON (Top) button three (3) times then immediately press the OFF (Bottom) button three (3) times. The LED will flash ON/OFF 5 times when completed successfully. Note: This should only be used in the event your network’s primary controller is missing or otherwise inoperable.",        "WakeupHelp": "",        "ProductSupportURL": "",        "Frequency": "",        "Name": "In-Wall Smart Fan Control",        "ProductPicBase64": "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"    },    "Event": "nodeQueriesComplete",    "TimeStamp": 1594407756,    "NodeManufacturerName": "GE (Jasco Products)",    "NodeProductName": "12724 3-Way Dimmer Switch",    "NodeBasicString": "Routing Slave",    "NodeBasic": 4,    "NodeGenericString": "Multilevel Switch",    "NodeGeneric": 17,    "NodeSpecificString": "Multilevel Power Switch",    "NodeSpecific": 1,    "NodeManufacturerID": "0x0063",    "NodeProductType": "0x4944",    "NodeProductID": "0x3031",    "NodeBaudRate": 40000,    "NodeVersion": 4,    "NodeGroups": 0,    "NodeName": "Master_Bedroom_L",    "NodeLocation": "Master Bedroom",    "NodeDeviceTypeString": "Unknown Type (0x0000)",    "NodeDeviceType": 0,    "NodeRole": 0,    "NodeRoleString": "Central Controller",    "NodePlusType": 0,    "NodePlusTypeString": "Z-Wave+ node",    "Neighbors": [        1,        6,        9,        10,        11,        12,        15,        16,        17,        18,        19,        20,        21,        23,        24,        26,        27,        28,        29,        30,        33    ],    "Neighbors": [        1,        6,        9,        10,        11,        12,        15,        16,        17,        18,        19,        20,        21,        23,        24,        26,        27,        28,        29,        30,        33    ]}
+OpenZWave/1/node/2/instance/1/,{    "Instance": 1,    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/112/,{    "Instance": 1,    "CommandClassId": 112,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/112/value/844424973910036/,{    "Label": "LED Light",    "Value": {        "List": [            {                "Value": 0,                "Label": "LED on when light off"            },            {                "Value": 1,                "Label": "LED on when light on"            },            {                "Value": 2,                "Label": "LED always off"            }        ],        "Selected": "LED on when light on",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 2,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 3,    "Node": 2,    "Genre": "Config",    "Help": "Sets when the LED on the switch is lit.",    "ValueIDKey": 844424973910036,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407754}
+OpenZWave/1/node/2/instance/1/commandclass/112/value/1125899950620692/,{    "Label": "Invert Switch",    "Value": {        "List": [            {                "Value": 0,                "Label": "No"            },            {                "Value": 1,                "Label": "Yes"            }        ],        "Selected": "No",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 1,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 4,    "Node": 2,    "Genre": "Config",    "Help": "Change the top of the switch to OFF and the bottom of the switch to ON, if the switch was installed upside down.",    "ValueIDKey": 1125899950620692,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407754}
+OpenZWave/1/node/2/instance/1/commandclass/112/value/1970324880752657/,{    "Label": "Z-Wave Command Dim Step",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 7,    "Node": 2,    "Genre": "Config",    "Help": "Indicates how many levels the dimmer will change for each dimming step.",    "ValueIDKey": 1970324880752657,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
+OpenZWave/1/node/2/instance/1/commandclass/112/value/2251799857463313/,{    "Label": "Z-Wave Command Dim Rate",    "Value": 1,    "Units": "x 10 milliseconds",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 8,    "Node": 2,    "Genre": "Config",    "Help": "This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.",    "ValueIDKey": 2251799857463313,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
+OpenZWave/1/node/2/instance/1/commandclass/112/value/2533274834173969/,{    "Label": "Local Control Dim Step",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 9,    "Node": 2,    "Genre": "Config",    "Help": "Indicates how many levels the dimmer will change for each dimming step.",    "ValueIDKey": 2533274834173969,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
+OpenZWave/1/node/2/instance/1/commandclass/112/value/2814749810884625/,{    "Label": "Local Control Dim Rate",    "Value": 5,    "Units": "x 10 milliseconds",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 10,    "Node": 2,    "Genre": "Config",    "Help": "This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.",    "ValueIDKey": 2814749810884625,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
+OpenZWave/1/node/2/instance/1/commandclass/112/value/3096224787595281/,{    "Label": "ALL ON/ALL OFF Dim Step",    "Value": 99,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 11,    "Node": 2,    "Genre": "Config",    "Help": "Indicates how many levels the dimmer will change for each dimming step.",    "ValueIDKey": 3096224787595281,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
+OpenZWave/1/node/2/instance/1/commandclass/112/value/3377699764305937/,{    "Label": "ALL ON/ALL OFF Dim Rate",    "Value": 5,    "Units": "x 10 milliseconds",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 12,    "Node": 2,    "Genre": "Config",    "Help": "This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.",    "ValueIDKey": 3377699764305937,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407756}
+OpenZWave/1/node/2/instance/1/commandclass/38/,{    "Instance": 1,    "CommandClassId": 38,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/38/value/38371345/,{    "Label": "Level",    "Value": 0,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 0,    "Node": 2,    "Genre": "User",    "Help": "The Current Level of the Device",    "ValueIDKey": 38371345,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407637}
+OpenZWave/1/node/2/instance/1/commandclass/38/value/281475015082008/,{    "Label": "Bright",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 1,    "Node": 2,    "Genre": "User",    "Help": "Increase the Brightness of the Device",    "ValueIDKey": 281475015082008,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/38/value/562949991792664/,{    "Label": "Dim",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 2,    "Node": 2,    "Genre": "User",    "Help": "Decrease the Brightness of the Device",    "ValueIDKey": 562949991792664,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/38/value/844424976891920/,{    "Label": "Ignore Start Level",    "Value": true,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Bool",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 3,    "Node": 2,    "Genre": "System",    "Help": "Ignore the Start Level of the Device when increasing/decreasing brightness",    "ValueIDKey": 844424976891920,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/38/value/1125899953602577/,{    "Label": "Start Level",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 4,    "Node": 2,    "Genre": "System",    "Help": "Start Level when Changing the Brightness of a Device",    "ValueIDKey": 1125899953602577,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/39/,{    "Instance": 1,    "CommandClassId": 39,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/39/value/46776340/,{    "Label": "Switch All",    "Value": {        "List": [            {                "Value": 0,                "Label": "Disabled"            },            {                "Value": 1,                "Label": "Off Enabled"            },            {                "Value": 2,                "Label": "On Enabled"            },            {                "Value": 255,                "Label": "On and Off Enabled"            }        ],        "Selected": "On and Off Enabled",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "Index": 0,    "Node": 2,    "Genre": "System",    "Help": "Switch All Devices On/Off",    "ValueIDKey": 46776340,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407636}
+OpenZWave/1/node/2/instance/1/commandclass/114/,{    "Instance": 1,    "CommandClassId": 114,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/114/value/48005139/,{    "Label": "Loaded Config Revision",    "Value": 9,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 0,    "Node": 2,    "Genre": "System",    "Help": "Revision of the Config file currently loaded",    "ValueIDKey": 48005139,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/114/value/281475024715795/,{    "Label": "Config File Revision",    "Value": 9,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 1,    "Node": 2,    "Genre": "System",    "Help": "Revision of the Config file on the File System",    "ValueIDKey": 281475024715795,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/114/value/562950001426451/,{    "Label": "Latest Available Config File Revision",    "Value": 9,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 2,    "Node": 2,    "Genre": "System",    "Help": "Latest Revision of the Config file available for download",    "ValueIDKey": 562950001426451,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/114/value/844424978137111/,{    "Label": "Device ID",    "Value": "",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 3,    "Node": 2,    "Genre": "System",    "Help": "Manufacturer Specific Device ID/Model",    "ValueIDKey": 844424978137111,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/114/value/1125899954847767/,{    "Label": "Serial Number",    "Value": "",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 4,    "Node": 2,    "Genre": "System",    "Help": "Device Serial Number",    "ValueIDKey": 1125899954847767,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/115/,{    "Instance": 1,    "CommandClassId": 115,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/48021524/,{    "Label": "Powerlevel",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal"            },            {                "Value": 1,                "Label": "-1dB"            },            {                "Value": 2,                "Label": "-2dB"            },            {                "Value": 3,                "Label": "-3dB"            },            {                "Value": 4,                "Label": "-4dB"            },            {                "Value": 5,                "Label": "-5dB"            },            {                "Value": 6,                "Label": "-6dB"            },            {                "Value": 7,                "Label": "-7dB"            },            {                "Value": 8,                "Label": "-8dB"            },            {                "Value": 9,                "Label": "-9dB"            }        ],        "Selected": "Normal",        "Selected_id": 0    },    "Units": "dB",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 0,    "Node": 2,    "Genre": "System",    "Help": "Output RF PowerLevel",    "ValueIDKey": 48021524,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407636}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/281475024732177/,{    "Label": "Timeout",    "Value": 0,    "Units": "seconds",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 1,    "Node": 2,    "Genre": "System",    "Help": "Timeout till the PowerLevel is reset to Normal",    "ValueIDKey": 281475024732177,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407636}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/562950001442840/,{    "Label": "Set Powerlevel",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 2,    "Node": 2,    "Genre": "System",    "Help": "Apply the Output PowerLevel and Timeout Values",    "ValueIDKey": 562950001442840,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/844424978153489/,{    "Label": "Test Node",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 3,    "Node": 2,    "Genre": "System",    "Help": "Node to Perform a test against",    "ValueIDKey": 844424978153489,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/1125899954864148/,{    "Label": "Test Powerlevel",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal"            },            {                "Value": 1,                "Label": "-1dB"            },            {                "Value": 2,                "Label": "-2dB"            },            {                "Value": 3,                "Label": "-3dB"            },            {                "Value": 4,                "Label": "-4dB"            },            {                "Value": 5,                "Label": "-5dB"            },            {                "Value": 6,                "Label": "-6dB"            },            {                "Value": 7,                "Label": "-7dB"            },            {                "Value": 8,                "Label": "-8dB"            },            {                "Value": 9,                "Label": "-9dB"            }        ],        "Selected": "Normal",        "Selected_id": 0    },    "Units": "dB",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 4,    "Node": 2,    "Genre": "System",    "Help": "PowerLevel to use for the Test",    "ValueIDKey": 1125899954864148,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/1407374931574806/,{    "Label": "Frame Count",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 5,    "Node": 2,    "Genre": "System",    "Help": "How Many Messages to send to the Node for the Test",    "ValueIDKey": 1407374931574806,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/1688849908285464/,{    "Label": "Test",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 6,    "Node": 2,    "Genre": "System",    "Help": "Perform a PowerLevel Test against the a Node",    "ValueIDKey": 1688849908285464,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/1970324884996120/,{    "Label": "Report",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 7,    "Node": 2,    "Genre": "System",    "Help": "Get the results of the latest PowerLevel Test against a Node",    "ValueIDKey": 1970324884996120,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/2251799861706772/,{    "Label": "Test Status",    "Value": {        "List": [            {                "Value": 0,                "Label": "Failed"            },            {                "Value": 1,                "Label": "Success"            },            {                "Value": 2,                "Label": "In Progress"            }        ],        "Selected": "Failed",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 8,    "Node": 2,    "Genre": "System",    "Help": "The Current Status of the last PowerNode Test Executed",    "ValueIDKey": 2251799861706772,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/115/value/2533274838417430/,{    "Label": "Acked Frames",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 9,    "Node": 2,    "Genre": "System",    "Help": "Number of Messages successfully Acked by the Target Node",    "ValueIDKey": 2533274838417430,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/134/,{    "Instance": 1,    "CommandClassId": 134,    "CommandClass": "COMMAND_CLASS_VERSION",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/134/value/48332823/,{    "Label": "Library Version",    "Value": "6",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_VERSION",    "Index": 0,    "Node": 2,    "Genre": "System",    "Help": "Z-Wave Library Version",    "ValueIDKey": 48332823,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/134/value/281475025043479/,{    "Label": "Protocol Version",    "Value": "3.67",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_VERSION",    "Index": 1,    "Node": 2,    "Genre": "System",    "Help": "Z-Wave Protocol Version",    "ValueIDKey": 281475025043479,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
+OpenZWave/1/node/2/instance/1/commandclass/134/value/562950001754135/,{    "Label": "Application Version",    "Value": "3.37",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_VERSION",    "Index": 2,    "Node": 2,    "Genre": "System",    "Help": "Application Version",    "ValueIDKey": 562950001754135,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
diff --git a/tests/fixtures/ozw/light_no_rgb_network_dump.csv b/tests/fixtures/ozw/light_no_rgb_network_dump.csv
deleted file mode 100644
index 6febaab3667..00000000000
--- a/tests/fixtures/ozw/light_no_rgb_network_dump.csv
+++ /dev/null
@@ -1,41 +0,0 @@
-OpenZWave/1/status/,{    "OpenZWave_Version": "1.6.1008",    "OZWDeamon_Version": "0.1",    "QTOpenZWave_Version": "1.0.0",    "QT_Version": "5.12.5",    "Status": "driverAllNodesQueried",    "TimeStamp": 1579566933,    "ManufacturerSpecificDBReady": true,    "homeID": 3245146787,    "getControllerNodeId": 1,    "getSUCNodeId": 1,    "isPrimaryController": true,    "isBridgeController": false,    "hasExtendedTXStatistics": true,    "getControllerLibraryVersion": "Z-Wave 3.95",    "getControllerLibraryType": "Static Controller",    "getControllerPath": "/dev/zwave"}
-OpenZWave/1/node/2/,{    "NodeID": 2,    "NodeQueryStage": "Complete",    "isListening": true,    "isFlirs": false,    "isBeaming": true,    "isRouting": true,    "isSecurityv1": false,    "isZWavePlus": false,    "isNIFRecieved": true,    "isAwake": true,    "isFailed": false,    "MetaData": {        "OZWInfoURL": "http://www.openzwave.com/device-database/0063:3031:4944",        "ZWAProductURL": "",        "ProductPic": "images/ge/12724-dimmer.png",        "Description": "Transform any home into a smart home with the GE Z-Wave Smart Fan Control. The in-wall fan control easily replaces any standard in-wall switch remotely controls a ceiling fan in your home and features a three-speed control system. Your home will be equipped with ultimate flexibility with the GE Z-Wave Smart Fan Control, capable of being used by itself or with up to four GE add-on switches. Screw terminal installation provides improved space efficiency when replacing existing switches and the integrated LED indicator light allows you to easily locate the switch in a dark room. The GE Z-Wave Smart Fan Control is compatible with any Z-Wave certified gateway, providing access to many popular home automation systems. Take control of your home lighting with GE Z-Wave Smart Lighting Controls!",        "ProductManualURL": "https://Products.Z-WaveAlliance.org/ProductManual/File?folder=&filename=Manuals/2506/Binder2.pdf",        "ProductPageURL": "http://www.ezzwave.com",        "InclusionHelp": "1. Follow the instructions for your Z-Wave certified controller to include a device to the Z-Wave network. 2. Once the controller is ready to include your device, press and release the top or bottom of the smart fan control switch (rocker) to include it in the network. 3. Once your controller has confirmed the device has been included, refresh the Z-Wave network to optimize performance.",        "ExclusionHelp": "1. Follow the instructions for your Z-Wave certified controller to exclude a device from the Z-Wave network. 2. Once the controller is ready to Exclude your device, press and release the top or bottom of the wireless smart switch (rocker) to exclude it from the network.",        "ResetHelp": "1. Quickly press ON (Top) button three (3) times then immediately press the OFF (Bottom) button three (3) times. The LED will flash ON/OFF 5 times when completed successfully. Note: This should only be used in the event your network’s primary controller is missing or otherwise inoperable.",        "WakeupHelp": "",        "ProductSupportURL": "",        "Frequency": "",        "Name": "In-Wall Smart Fan Control",        "ProductPicBase64": "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"    },    "Event": "nodeQueriesComplete",    "TimeStamp": 1594407756,    "NodeManufacturerName": "GE (Jasco Products)",    "NodeProductName": "12724 3-Way Dimmer Switch",    "NodeBasicString": "Routing Slave",    "NodeBasic": 4,    "NodeGenericString": "Multilevel Switch",    "NodeGeneric": 17,    "NodeSpecificString": "Multilevel Power Switch",    "NodeSpecific": 1,    "NodeManufacturerID": "0x0063",    "NodeProductType": "0x4944",    "NodeProductID": "0x3031",    "NodeBaudRate": 40000,    "NodeVersion": 4,    "NodeGroups": 0,    "NodeName": "Master_Bedroom_L",    "NodeLocation": "Master Bedroom",    "NodeDeviceTypeString": "Unknown Type (0x0000)",    "NodeDeviceType": 0,    "NodeRole": 0,    "NodeRoleString": "Central Controller",    "NodePlusType": 0,    "NodePlusTypeString": "Z-Wave+ node",    "Neighbors": [        1,        6,        9,        10,        11,        12,        15,        16,        17,        18,        19,        20,        21,        23,        24,        26,        27,        28,        29,        30,        33    ],    "Neighbors": [        1,        6,        9,        10,        11,        12,        15,        16,        17,        18,        19,        20,        21,        23,        24,        26,        27,        28,        29,        30,        33    ]}
-OpenZWave/1/node/2/instance/1/,{    "Instance": 1,    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/112/,{    "Instance": 1,    "CommandClassId": 112,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/112/value/844424973910036/,{    "Label": "LED Light",    "Value": {        "List": [            {                "Value": 0,                "Label": "LED on when light off"            },            {                "Value": 1,                "Label": "LED on when light on"            },            {                "Value": 2,                "Label": "LED always off"            }        ],        "Selected": "LED on when light on",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 2,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 3,    "Node": 2,    "Genre": "Config",    "Help": "Sets when the LED on the switch is lit.",    "ValueIDKey": 844424973910036,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407754}
-OpenZWave/1/node/2/instance/1/commandclass/112/value/1125899950620692/,{    "Label": "Invert Switch",    "Value": {        "List": [            {                "Value": 0,                "Label": "No"            },            {                "Value": 1,                "Label": "Yes"            }        ],        "Selected": "No",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 1,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 4,    "Node": 2,    "Genre": "Config",    "Help": "Change the top of the switch to OFF and the bottom of the switch to ON, if the switch was installed upside down.",    "ValueIDKey": 1125899950620692,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407754}
-OpenZWave/1/node/2/instance/1/commandclass/112/value/1970324880752657/,{    "Label": "Z-Wave Command Dim Step",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 7,    "Node": 2,    "Genre": "Config",    "Help": "Indicates how many levels the dimmer will change for each dimming step.",    "ValueIDKey": 1970324880752657,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
-OpenZWave/1/node/2/instance/1/commandclass/112/value/2251799857463313/,{    "Label": "Z-Wave Command Dim Rate",    "Value": 1,    "Units": "x 10 milliseconds",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 8,    "Node": 2,    "Genre": "Config",    "Help": "This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.",    "ValueIDKey": 2251799857463313,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
-OpenZWave/1/node/2/instance/1/commandclass/112/value/2533274834173969/,{    "Label": "Local Control Dim Step",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 9,    "Node": 2,    "Genre": "Config",    "Help": "Indicates how many levels the dimmer will change for each dimming step.",    "ValueIDKey": 2533274834173969,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
-OpenZWave/1/node/2/instance/1/commandclass/112/value/2814749810884625/,{    "Label": "Local Control Dim Rate",    "Value": 5,    "Units": "x 10 milliseconds",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 10,    "Node": 2,    "Genre": "Config",    "Help": "This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.",    "ValueIDKey": 2814749810884625,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
-OpenZWave/1/node/2/instance/1/commandclass/112/value/3096224787595281/,{    "Label": "ALL ON/ALL OFF Dim Step",    "Value": 99,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 11,    "Node": 2,    "Genre": "Config",    "Help": "Indicates how many levels the dimmer will change for each dimming step.",    "ValueIDKey": 3096224787595281,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407755}
-OpenZWave/1/node/2/instance/1/commandclass/112/value/3377699764305937/,{    "Label": "ALL ON/ALL OFF Dim Rate",    "Value": 5,    "Units": "x 10 milliseconds",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 12,    "Node": 2,    "Genre": "Config",    "Help": "This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.",    "ValueIDKey": 3377699764305937,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407756}
-OpenZWave/1/node/2/instance/1/commandclass/38/,{    "Instance": 1,    "CommandClassId": 38,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/38/value/38371345/,{    "Label": "Level",    "Value": 0,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 0,    "Node": 2,    "Genre": "User",    "Help": "The Current Level of the Device",    "ValueIDKey": 38371345,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407637}
-OpenZWave/1/node/2/instance/1/commandclass/38/value/281475015082008/,{    "Label": "Bright",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 1,    "Node": 2,    "Genre": "User",    "Help": "Increase the Brightness of the Device",    "ValueIDKey": 281475015082008,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/38/value/562949991792664/,{    "Label": "Dim",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 2,    "Node": 2,    "Genre": "User",    "Help": "Decrease the Brightness of the Device",    "ValueIDKey": 562949991792664,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/38/value/844424976891920/,{    "Label": "Ignore Start Level",    "Value": true,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Bool",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 3,    "Node": 2,    "Genre": "System",    "Help": "Ignore the Start Level of the Device when increasing/decreasing brightness",    "ValueIDKey": 844424976891920,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/38/value/1125899953602577/,{    "Label": "Start Level",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 4,    "Node": 2,    "Genre": "System",    "Help": "Start Level when Changing the Brightness of a Device",    "ValueIDKey": 1125899953602577,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/39/,{    "Instance": 1,    "CommandClassId": 39,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/39/value/46776340/,{    "Label": "Switch All",    "Value": {        "List": [            {                "Value": 0,                "Label": "Disabled"            },            {                "Value": 1,                "Label": "Off Enabled"            },            {                "Value": 2,                "Label": "On Enabled"            },            {                "Value": 255,                "Label": "On and Off Enabled"            }        ],        "Selected": "On and Off Enabled",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "Index": 0,    "Node": 2,    "Genre": "System",    "Help": "Switch All Devices On/Off",    "ValueIDKey": 46776340,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407636}
-OpenZWave/1/node/2/instance/1/commandclass/114/,{    "Instance": 1,    "CommandClassId": 114,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/114/value/48005139/,{    "Label": "Loaded Config Revision",    "Value": 9,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 0,    "Node": 2,    "Genre": "System",    "Help": "Revision of the Config file currently loaded",    "ValueIDKey": 48005139,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/114/value/281475024715795/,{    "Label": "Config File Revision",    "Value": 9,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 1,    "Node": 2,    "Genre": "System",    "Help": "Revision of the Config file on the File System",    "ValueIDKey": 281475024715795,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/114/value/562950001426451/,{    "Label": "Latest Available Config File Revision",    "Value": 9,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 2,    "Node": 2,    "Genre": "System",    "Help": "Latest Revision of the Config file available for download",    "ValueIDKey": 562950001426451,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/114/value/844424978137111/,{    "Label": "Device ID",    "Value": "",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 3,    "Node": 2,    "Genre": "System",    "Help": "Manufacturer Specific Device ID/Model",    "ValueIDKey": 844424978137111,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/114/value/1125899954847767/,{    "Label": "Serial Number",    "Value": "",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 4,    "Node": 2,    "Genre": "System",    "Help": "Device Serial Number",    "ValueIDKey": 1125899954847767,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/115/,{    "Instance": 1,    "CommandClassId": 115,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/48021524/,{    "Label": "Powerlevel",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal"            },            {                "Value": 1,                "Label": "-1dB"            },            {                "Value": 2,                "Label": "-2dB"            },            {                "Value": 3,                "Label": "-3dB"            },            {                "Value": 4,                "Label": "-4dB"            },            {                "Value": 5,                "Label": "-5dB"            },            {                "Value": 6,                "Label": "-6dB"            },            {                "Value": 7,                "Label": "-7dB"            },            {                "Value": 8,                "Label": "-8dB"            },            {                "Value": 9,                "Label": "-9dB"            }        ],        "Selected": "Normal",        "Selected_id": 0    },    "Units": "dB",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 0,    "Node": 2,    "Genre": "System",    "Help": "Output RF PowerLevel",    "ValueIDKey": 48021524,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407636}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/281475024732177/,{    "Label": "Timeout",    "Value": 0,    "Units": "seconds",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 1,    "Node": 2,    "Genre": "System",    "Help": "Timeout till the PowerLevel is reset to Normal",    "ValueIDKey": 281475024732177,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1594407636}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/562950001442840/,{    "Label": "Set Powerlevel",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 2,    "Node": 2,    "Genre": "System",    "Help": "Apply the Output PowerLevel and Timeout Values",    "ValueIDKey": 562950001442840,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/844424978153489/,{    "Label": "Test Node",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 3,    "Node": 2,    "Genre": "System",    "Help": "Node to Perform a test against",    "ValueIDKey": 844424978153489,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/1125899954864148/,{    "Label": "Test Powerlevel",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal"            },            {                "Value": 1,                "Label": "-1dB"            },            {                "Value": 2,                "Label": "-2dB"            },            {                "Value": 3,                "Label": "-3dB"            },            {                "Value": 4,                "Label": "-4dB"            },            {                "Value": 5,                "Label": "-5dB"            },            {                "Value": 6,                "Label": "-6dB"            },            {                "Value": 7,                "Label": "-7dB"            },            {                "Value": 8,                "Label": "-8dB"            },            {                "Value": 9,                "Label": "-9dB"            }        ],        "Selected": "Normal",        "Selected_id": 0    },    "Units": "dB",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 4,    "Node": 2,    "Genre": "System",    "Help": "PowerLevel to use for the Test",    "ValueIDKey": 1125899954864148,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/1407374931574806/,{    "Label": "Frame Count",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 5,    "Node": 2,    "Genre": "System",    "Help": "How Many Messages to send to the Node for the Test",    "ValueIDKey": 1407374931574806,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/1688849908285464/,{    "Label": "Test",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 6,    "Node": 2,    "Genre": "System",    "Help": "Perform a PowerLevel Test against the a Node",    "ValueIDKey": 1688849908285464,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/1970324884996120/,{    "Label": "Report",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 7,    "Node": 2,    "Genre": "System",    "Help": "Get the results of the latest PowerLevel Test against a Node",    "ValueIDKey": 1970324884996120,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/2251799861706772/,{    "Label": "Test Status",    "Value": {        "List": [            {                "Value": 0,                "Label": "Failed"            },            {                "Value": 1,                "Label": "Success"            },            {                "Value": 2,                "Label": "In Progress"            }        ],        "Selected": "Failed",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 8,    "Node": 2,    "Genre": "System",    "Help": "The Current Status of the last PowerNode Test Executed",    "ValueIDKey": 2251799861706772,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/115/value/2533274838417430/,{    "Label": "Acked Frames",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_POWERLEVEL",    "Index": 9,    "Node": 2,    "Genre": "System",    "Help": "Number of Messages successfully Acked by the Target Node",    "ValueIDKey": 2533274838417430,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/134/,{    "Instance": 1,    "CommandClassId": 134,    "CommandClass": "COMMAND_CLASS_VERSION",    "CommandClassVersion": 1,    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/134/value/48332823/,{    "Label": "Library Version",    "Value": "6",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_VERSION",    "Index": 0,    "Node": 2,    "Genre": "System",    "Help": "Z-Wave Library Version",    "ValueIDKey": 48332823,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/134/value/281475025043479/,{    "Label": "Protocol Version",    "Value": "3.67",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_VERSION",    "Index": 1,    "Node": 2,    "Genre": "System",    "Help": "Z-Wave Protocol Version",    "ValueIDKey": 281475025043479,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
-OpenZWave/1/node/2/instance/1/commandclass/134/value/562950001754135/,{    "Label": "Application Version",    "Value": "3.37",    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_VERSION",    "Index": 2,    "Node": 2,    "Genre": "System",    "Help": "Application Version",    "ValueIDKey": 562950001754135,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1594407617}
diff --git a/tests/fixtures/ozw/light_pure_rgb_dimmer_dump.csv b/tests/fixtures/ozw/light_pure_rgb_dimmer_dump.csv
deleted file mode 100644
index 68d8a7baab4..00000000000
--- a/tests/fixtures/ozw/light_pure_rgb_dimmer_dump.csv
+++ /dev/null
@@ -1,131 +0,0 @@
-OpenZWave/1/status/,{    "OpenZWave_Version": "1.6.1008",    "OZWDeamon_Version": "0.1",    "QTOpenZWave_Version": "1.0.0",    "QT_Version": "5.12.5",    "Status": "driverAllNodesQueried",    "TimeStamp": 1579566933,    "ManufacturerSpecificDBReady": true,    "homeID": 3245146787,    "getControllerNodeId": 1,    "getSUCNodeId": 1,    "isPrimaryController": true,    "isBridgeController": false,    "hasExtendedTXStatistics": true,    "getControllerLibraryVersion": "Z-Wave 3.95",    "getControllerLibraryType": "Static Controller",    "getControllerPath": "/dev/zwave"}
-OpenZWave/1/node/7/,{    "NodeID": 7,    "NodeQueryStage": "Complete",    "isListening": true,    "isFlirs": false,    "isBeaming": true,    "isRouting": true,    "isSecurityv1": false,    "isZWavePlus": false,    "isNIFRecieved": true,    "isAwake": true,    "isFailed": false,    "MetaData": {        "OZWInfoURL": "http://www.openzwave.com/device-database/010F:1000:0900",        "ZWAProductURL": "",        "ProductPic": "images/fibaro/fgrgbwm441.png",        "Description": "RGBW Controller",        "ProductManualURL": "",        "ProductPageURL": "",        "InclusionHelp": "",        "ExclusionHelp": "",        "ResetHelp": "",        "WakeupHelp": "",        "ProductSupportURL": "",        "Frequency": "",        "Name": "FIBARO RGBW Dimmer",        "ProductPicBase64": "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"    },    "Event": "nodeQueriesComplete",    "TimeStamp": 1597142985,    "NodeManufacturerName": "FIBARO System",    "NodeProductName": "FGRGBWM441 RGBW Controller",    "NodeBasicString": "Routing Slave",    "NodeBasic": 4,    "NodeGenericString": "Multilevel Switch",    "NodeGeneric": 17,    "NodeSpecificString": "Multilevel Power Switch",    "NodeSpecific": 1,    "NodeManufacturerID": "0x010f",    "NodeProductType": "0x0900",    "NodeProductID": "0x1000",    "NodeBaudRate": 40000,    "NodeVersion": 4,    "NodeGroups": 5,    "NodeName": "Kitchen RGB Strip",    "NodeLocation": "",    "NodeDeviceTypeString": "Unknown Type (0x0000)",    "NodeDeviceType": 0,    "NodeRole": 0,    "NodeRoleString": "Central Controller",    "NodePlusType": 0,    "NodePlusTypeString": "Z-Wave+ node",    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ]}
-OpenZWave/1/node/7/instance/1/,{    "Instance": 1,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/51/,{    "Instance": 1,    "CommandClassId": 51,    "CommandClass": "COMMAND_CLASS_COLOR",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/51/value/122470423/,{    "Label": "Color",    "Value": "#FFFFFF00",    "Units": "#RRGGBBWW",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_COLOR",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "Color (in RGB format)",    "ValueIDKey": 122470423,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/51/value/281475099181076/,{    "Label": "Color Index",    "Value": {        "List": [            {                "Value": 0,                "Label": "Off"            },            {                "Value": 1,                "Label": "Cool White"            },            {                "Value": 2,                "Label": "Warm White"            },            {                "Value": 3,                "Label": "Red"            },            {                "Value": 4,                "Label": "Lime"            },            {                "Value": 5,                "Label": "Blue"            },            {                "Value": 6,                "Label": "Yellow"            },            {                "Value": 7,                "Label": "Cyan"            },            {                "Value": 8,                "Label": "Magenta"            },            {                "Value": 9,                "Label": "Silver"            },            {                "Value": 10,                "Label": "Gray"            },            {                "Value": 11,                "Label": "Maroon"            },            {                "Value": 12,                "Label": "Olive"            },            {                "Value": 13,                "Label": "Green"            },            {                "Value": 14,                "Label": "Purple"            },            {                "Value": 15,                "Label": "Teal"            },            {                "Value": 16,                "Label": "Navy"            },            {                "Value": 17,                "Label": "Custom"            }        ],        "Selected": "Cool White",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_COLOR",    "Index": 1,    "Node": 7,    "Genre": "User",    "Help": "Preset Color",    "ValueIDKey": 281475099181076,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/,{    "Instance": 1,    "CommandClassId": 112,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "CommandClassVersion": 1,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/281475104374804/,{    "Label": "Enable/Disable ALL ON/OFF",    "Value": {        "List": [            {                "Value": 0,                "Label": "ALL ON disabled/ ALL OFF disabled"            },            {                "Value": 1,                "Label": "ALL ON disabled/ ALL OFF active"            },            {                "Value": 2,                "Label": "ALL ON active / ALL OFF disabled"            },            {                "Value": 255,                "Label": "ALL ON active / ALL OFF active"            }        ],        "Selected": "ALL ON active / ALL OFF active",        "Selected_id": 255    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 1,    "Node": 7,    "Genre": "Config",    "Help": "Enable/Disable ALL ON/OFF",    "ValueIDKey": 281475104374804,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/1688849987928084/,{    "Label": "Associations command class choice",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 1,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET/START/STOP_STATE_CHANGE"            },            {                "Value": 2,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET"            },            {                "Value": 3,                "Label": "Brightness - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 4,                "Label": "Rainbow (RGBW) - COLOR_CONTROL_SET"            }        ],        "Selected": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 6,    "Node": 7,    "Genre": "Config",    "Help": "Choose which command classes are sent to associated devices.",    "ValueIDKey": 1688849987928084,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/2251799941349396/,{    "Label": "Outputs state change mode",    "Value": {        "List": [            {                "Value": 0,                "Label": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)"            },            {                "Value": 1,                "Label": "MODE 2 - Constant Time (RGB/RBGW only. Time is defined by parameter 11)"            }        ],        "Selected": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 8,    "Node": 7,    "Genre": "Config",    "Help": "Choose the behaviour of transitions between different levels.",    "ValueIDKey": 2251799941349396,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/2533274918060049/,{    "Label": "Dimming step value (for MODE 1)",    "Value": 1,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 9,    "Node": 7,    "Genre": "Config",    "Help": "Size of the step for each change in level during the transition.",    "ValueIDKey": 2533274918060049,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/2814749894770710/,{    "Label": "Time between dimming steps (for MODE 1)",    "Value": 10,    "Units": "ms",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 60000,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 10,    "Node": 7,    "Genre": "Config",    "Help": "Time between each step in a transition between levels. Setting this to zero means an instantaneous change.",    "ValueIDKey": 2814749894770710,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3096224871481361/,{    "Label": "Time to complete the entire transition (for MODE 2)",    "Value": 67,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 11,    "Node": 7,    "Genre": "Config",    "Help": "0 - immediate change; 1->63: 20ms->126ms (value*20ms); 65->127: 1s->63s (value-64)*1s; 129->191: 10s->630s (value-128)*10s; 193->255: 1min->63min (value-192)*1min. Default setting: 67 (3s)",    "ValueIDKey": 3096224871481361,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3377699848192017/,{    "Label": "Maximum dimmer level",    "Value": 255,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 3,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 12,    "Node": 7,    "Genre": "Config",    "Help": "Maximum brightness level for the dimmer",    "ValueIDKey": 3377699848192017,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3659174824902673/,{    "Label": "Minimum dimmer level",    "Value": 2,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 2,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 13,    "Node": 7,    "Genre": "Config",    "Help": "Minimum brightness level for the dimmer",    "ValueIDKey": 3659174824902673,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3940649801613334/,{    "Label": "Inputs / Outputs configuration",    "Value": 4369,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 14,    "Node": 7,    "Genre": "Config",    "Help": "This is too complex to describe here, since this value is built up from 4-bits for each of the 4 channels. Refer to the table in the product manual. Default value is 4369 (1111 in hex).",    "ValueIDKey": 3940649801613334,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/4222124778323988/,{    "Label": "Option double click",    "Value": {        "List": [            {                "Value": 0,                "Label": "Double click disabled"            },            {                "Value": 1,                "Label": "Double click enabled"            }        ],        "Selected": "Double click enabled",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 15,    "Node": 7,    "Genre": "Config",    "Help": "Option double click (lighting set at 100%). 0 - Double click disabled, 1 - Double click enabled. Default setting 1",    "ValueIDKey": 4222124778323988,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/4503599755034644/,{    "Label": "Saving state before power failure",    "Value": {        "List": [            {                "Value": 0,                "Label": "State NOT saved at power failure, all outputs are set to OFF upon power restore"            },            {                "Value": 1,                "Label": "State saved at power failure, all outputs are set to previous state upon power restore"            }        ],        "Selected": "State saved at power failure, all outputs are set to previous state upon power restore",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 16,    "Node": 7,    "Genre": "Config",    "Help": "Saving state before power failure",    "ValueIDKey": 4503599755034644,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/8444249428983828/,{    "Label": "Alarm",    "Value": {        "List": [            {                "Value": 0,                "Label": "INACTIVE - no response to alarm frames"            },            {                "Value": 1,                "Label": "ALARM ON - the device turns on once alarm is detected (all channels set to 99%)"            },            {                "Value": 2,                "Label": "ALARM OFF - the device turns off once alarm is detected (all channels set to 0%)"            },            {                "Value": 3,                "Label": "ALARM PROGRAM - alarm sequence turns on (program selected in parameter 38)"            }        ],        "Selected": "INACTIVE - no response to alarm frames",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 30,    "Node": 7,    "Genre": "Config",    "Help": "Alarm of any type (general alarm, water flooding alarm, smoke alarm: CO, CO2, temperature alarm). Default setting 0 (Inactive)",    "ValueIDKey": 8444249428983828,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/10696049242669073/,{    "Label": "Alarm sequence program",    "Value": 10,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 38,    "Node": 7,    "Genre": "Config",    "Help": "Program number selected from the 10 available.",    "ValueIDKey": 10696049242669073,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/10977524219379734/,{    "Label": "Active PROGRAM alarm time",    "Value": 600,    "Units": "s",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 39,    "Node": 7,    "Genre": "Config",    "Help": "In ALARM PROGRAM mode (see parameter 30), this defines the time in seconds the program lasts (1s->65534s)",    "ValueIDKey": 10977524219379734,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/11821949149511700/,{    "Label": "Command class reporting Outputs status change",    "Value": {        "List": [            {                "Value": 0,                "Label": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)"            },            {                "Value": 1,                "Label": "Reporting as a result inputs actions (SWITCH MULTILEVEL)"            },            {                "Value": 2,                "Label": "Reporting as a result inputs actions (COLOUR_CONTROL)"            }        ],        "Selected": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 42,    "Node": 7,    "Genre": "Config",    "Help": "Specify which command class is used to report output status changes",    "ValueIDKey": 11821949149511700,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/12103424126222353/,{    "Label": "Reporting 0-10v analog inputs change threshold",    "Value": 5,    "Units": "*0.1V",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 100,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 43,    "Node": 7,    "Genre": "Config",    "Help": "Parameter defines a value by which input voltage must change in order to be reported to the main controller. New value is calculated based on last reported value: Default setting: 5 (0.5V). Range: 1->100 - (0.1V->10V).",    "ValueIDKey": 12103424126222353,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/12384899102933014/,{    "Label": "Power load reporting frequency",    "Value": 30,    "Units": "s",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 44,    "Node": 7,    "Genre": "Config",    "Help": "Sent if last reported value differs from the current value. Reports will also be sent in case of polling. Default setting: 30 (30s). Range: 1->65534 (1s->65534s) - interval between reports. Zero means reports are only sent in the case of polling, or at turning OFF the device",    "ValueIDKey": 12384899102933014,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/12666374079643665/,{    "Label": "Reporting changes in energy consumed by controlled devices",    "Value": 10,    "Units": "*0.01kWh",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 254,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 45,    "Node": 7,    "Genre": "Config",    "Help": "Interval between energy consumption reports (in kWh). New reported energy consumption value is calculated based on last reported value. 1->254 (0.01kWh->2.54kWh). Zero means changes in consumed energy will not be reported, except in case of polling.",    "ValueIDKey": 12666374079643665,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/19984723474120724/,{    "Label": "Response to BRIGHTNESS set to 0%",    "Value": {        "List": [            {                "Value": 0,                "Label": "Illumination colour set to white (all channels controlled together)"            },            {                "Value": 1,                "Label": "Last set colour is memorized"            }        ],        "Selected": "Last set colour is memorized",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 71,    "Node": 7,    "Genre": "Config",    "Help": "Set whether to remember the previous RGB mix after the brightness has fallen to zero (black)",    "ValueIDKey": 19984723474120724,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/20266198450831377/,{    "Label": "Starting predefined program",    "Value": 1,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 72,    "Node": 7,    "Genre": "Config",    "Help": "First predefined program to use when device is set to work in RGB/RGBW mode (parameter 14)",    "ValueIDKey": 20266198450831377,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/20547673427542036/,{    "Label": "Triple Click Action",    "Value": {        "List": [            {                "Value": 0,                "Label": "NODE INFO control frame is sent"            },            {                "Value": 1,                "Label": "Start favourite program"            }        ],        "Selected": "NODE INFO control frame is sent",        "Selected_id": 0    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 73,    "Node": 7,    "Genre": "Config",    "Help": "Behaviour when an input is triple-clicked",    "ValueIDKey": 20547673427542036,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/38/,{    "Instance": 1,    "CommandClassId": 38,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/122257425/,{    "Label": "Level",    "Value": 99,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "The Current Level of the Device",    "ValueIDKey": 122257425,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597142969}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/281475098968088/,{    "Label": "Bright",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 1,    "Node": 7,    "Genre": "User",    "Help": "Increase the Brightness of the Device",    "ValueIDKey": 281475098968088,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/562950075678744/,{    "Label": "Dim",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 2,    "Node": 7,    "Genre": "User",    "Help": "Decrease the Brightness of the Device",    "ValueIDKey": 562950075678744,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/844425060778000/,{    "Label": "Ignore Start Level",    "Value": true,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Bool",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 3,    "Node": 7,    "Genre": "System",    "Help": "Ignore the Start Level of the Device when increasing/decreasing brightness",    "ValueIDKey": 844425060778000,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/1125900037488657/,{    "Label": "Start Level",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 4,    "Node": 7,    "Genre": "System",    "Help": "Start Level when Changing the Brightness of a Device",    "ValueIDKey": 1125900037488657,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/39/,{    "Instance": 1,    "CommandClassId": 39,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "CommandClassVersion": 1,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/39/value/130662420/,{    "Label": "Switch All",    "Value": {        "List": [            {                "Value": 0,                "Label": "Disabled"            },            {                "Value": 1,                "Label": "Off Enabled"            },            {                "Value": 2,                "Label": "On Enabled"            },            {                "Value": 255,                "Label": "On and Off Enabled"            }        ],        "Selected": "On and Off Enabled",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "Index": 0,    "Node": 7,    "Genre": "System",    "Help": "Switch All Devices On/Off",    "ValueIDKey": 130662420,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597142969}
-OpenZWave/1/node/7/instance/1/commandclass/114/,{    "Instance": 1,    "CommandClassId": 114,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/114/value/131891219/,{    "Label": "Loaded Config Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 0,    "Node": 7,    "Genre": "System",    "Help": "Revision of the Config file currently loaded",    "ValueIDKey": 131891219,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/114/value/281475108601875/,{    "Label": "Config File Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 1,    "Node": 7,    "Genre": "System",    "Help": "Revision of the Config file on the File System",    "ValueIDKey": 281475108601875,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/114/value/562950085312531/,{    "Label": "Latest Available Config File Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 2,    "Node": 7,    "Genre": "System",    "Help": "Latest Revision of the Config file available for download",    "ValueIDKey": 562950085312531,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/association/1/,{    "Name": "Input 1",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
-OpenZWave/1/node/7/association/2/,{    "Name": "Input 2",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
-OpenZWave/1/node/7/association/3/,{    "Name": "Input 3",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
-OpenZWave/1/node/7/association/4/,{    "Name": "Input 4",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
-OpenZWave/1/node/7/association/5/,{    "Name": "Lifeline",    "Help": "",    "MaxAssociations": 1,    "Members": [        "1.0"    ],    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 9,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 8,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597142969,    "lastReceivedTimeStamp": 1597142969,    "lastRequestRTT": 26,    "averageRequestRTT": 42,    "lastResponseRTT": 55,    "averageResponseRTT": 62,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/281475104374804/,{    "Label": "Enable/Disable ALL ON/OFF",    "Value": {        "List": [            {                "Value": 0,                "Label": "ALL ON disabled/ ALL OFF disabled"            },            {                "Value": 1,                "Label": "ALL ON disabled/ ALL OFF active"            },            {                "Value": 2,                "Label": "ALL ON active / ALL OFF disabled"            },            {                "Value": 255,                "Label": "ALL ON active / ALL OFF active"            }        ],        "Selected": "ALL ON active / ALL OFF active",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 1,    "Node": 7,    "Genre": "Config",    "Help": "Enable/Disable ALL ON/OFF",    "ValueIDKey": 281475104374804,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/1688849987928084/,{    "Label": "Associations command class choice",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 1,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET/START/STOP_STATE_CHANGE"            },            {                "Value": 2,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET"            },            {                "Value": 3,                "Label": "Brightness - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 4,                "Label": "Rainbow (RGBW) - COLOR_CONTROL_SET"            }        ],        "Selected": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 6,    "Node": 7,    "Genre": "Config",    "Help": "Choose which command classes are sent to associated devices.",    "ValueIDKey": 1688849987928084,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/2251799941349396/,{    "Label": "Outputs state change mode",    "Value": {        "List": [            {                "Value": 0,                "Label": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)"            },            {                "Value": 1,                "Label": "MODE 2 - Constant Time (RGB/RBGW only. Time is defined by parameter 11)"            }        ],        "Selected": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 8,    "Node": 7,    "Genre": "Config",    "Help": "Choose the behaviour of transitions between different levels.",    "ValueIDKey": 2251799941349396,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/2533274918060049/,{    "Label": "Dimming step value (for MODE 1)",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 9,    "Node": 7,    "Genre": "Config",    "Help": "Size of the step for each change in level during the transition.",    "ValueIDKey": 2533274918060049,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/2814749894770710/,{    "Label": "Time between dimming steps (for MODE 1)",    "Value": 10,    "Units": "ms",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 60000,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 10,    "Node": 7,    "Genre": "Config",    "Help": "Time between each step in a transition between levels. Setting this to zero means an instantaneous change.",    "ValueIDKey": 2814749894770710,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3096224871481361/,{    "Label": "Time to complete the entire transition (for MODE 2)",    "Value": 67,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 11,    "Node": 7,    "Genre": "Config",    "Help": "0 - immediate change; 1->63: 20ms->126ms (value*20ms); 65->127: 1s->63s (value-64)*1s; 129->191: 10s->630s (value-128)*10s; 193->255: 1min->63min (value-192)*1min. Default setting: 67 (3s)",    "ValueIDKey": 3096224871481361,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3377699848192017/,{    "Label": "Maximum dimmer level",    "Value": 255,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 3,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 12,    "Node": 7,    "Genre": "Config",    "Help": "Maximum brightness level for the dimmer",    "ValueIDKey": 3377699848192017,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3659174824902673/,{    "Label": "Minimum dimmer level",    "Value": 2,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 2,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 13,    "Node": 7,    "Genre": "Config",    "Help": "Minimum brightness level for the dimmer",    "ValueIDKey": 3659174824902673,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3940649801613334/,{    "Label": "Inputs / Outputs configuration",    "Value": 4369,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 14,    "Node": 7,    "Genre": "Config",    "Help": "This is too complex to describe here, since this value is built up from 4-bits for each of the 4 channels. Refer to the table in the product manual. Default value is 4369 (1111 in hex).",    "ValueIDKey": 3940649801613334,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/4222124778323988/,{    "Label": "Option double click",    "Value": {        "List": [            {                "Value": 0,                "Label": "Double click disabled"            },            {                "Value": 1,                "Label": "Double click enabled"            }        ],        "Selected": "Double click enabled",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 15,    "Node": 7,    "Genre": "Config",    "Help": "Option double click (lighting set at 100%). 0 - Double click disabled, 1 - Double click enabled. Default setting 1",    "ValueIDKey": 4222124778323988,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/4503599755034644/,{    "Label": "Saving state before power failure",    "Value": {        "List": [            {                "Value": 0,                "Label": "State NOT saved at power failure, all outputs are set to OFF upon power restore"            },            {                "Value": 1,                "Label": "State saved at power failure, all outputs are set to previous state upon power restore"            }        ],        "Selected": "State saved at power failure, all outputs are set to previous state upon power restore",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 16,    "Node": 7,    "Genre": "Config",    "Help": "Saving state before power failure",    "ValueIDKey": 4503599755034644,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/8444249428983828/,{    "Label": "Alarm",    "Value": {        "List": [            {                "Value": 0,                "Label": "INACTIVE - no response to alarm frames"            },            {                "Value": 1,                "Label": "ALARM ON - the device turns on once alarm is detected (all channels set to 99%)"            },            {                "Value": 2,                "Label": "ALARM OFF - the device turns off once alarm is detected (all channels set to 0%)"            },            {                "Value": 3,                "Label": "ALARM PROGRAM - alarm sequence turns on (program selected in parameter 38)"            }        ],        "Selected": "INACTIVE - no response to alarm frames",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 30,    "Node": 7,    "Genre": "Config",    "Help": "Alarm of any type (general alarm, water flooding alarm, smoke alarm: CO, CO2, temperature alarm). Default setting 0 (Inactive)",    "ValueIDKey": 8444249428983828,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/10696049242669073/,{    "Label": "Alarm sequence program",    "Value": 10,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 38,    "Node": 7,    "Genre": "Config",    "Help": "Program number selected from the 10 available.",    "ValueIDKey": 10696049242669073,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/10977524219379734/,{    "Label": "Active PROGRAM alarm time",    "Value": 600,    "Units": "s",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 39,    "Node": 7,    "Genre": "Config",    "Help": "In ALARM PROGRAM mode (see parameter 30), this defines the time in seconds the program lasts (1s->65534s)",    "ValueIDKey": 10977524219379734,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/11821949149511700/,{    "Label": "Command class reporting Outputs status change",    "Value": {        "List": [            {                "Value": 0,                "Label": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)"            },            {                "Value": 1,                "Label": "Reporting as a result inputs actions (SWITCH MULTILEVEL)"            },            {                "Value": 2,                "Label": "Reporting as a result inputs actions (COLOUR_CONTROL)"            }        ],        "Selected": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 42,    "Node": 7,    "Genre": "Config",    "Help": "Specify which command class is used to report output status changes",    "ValueIDKey": 11821949149511700,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/12103424126222353/,{    "Label": "Reporting 0-10v analog inputs change threshold",    "Value": 5,    "Units": "*0.1V",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 100,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 43,    "Node": 7,    "Genre": "Config",    "Help": "Parameter defines a value by which input voltage must change in order to be reported to the main controller. New value is calculated based on last reported value: Default setting: 5 (0.5V). Range: 1->100 - (0.1V->10V).",    "ValueIDKey": 12103424126222353,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/12384899102933014/,{    "Label": "Power load reporting frequency",    "Value": 30,    "Units": "s",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 44,    "Node": 7,    "Genre": "Config",    "Help": "Sent if last reported value differs from the current value. Reports will also be sent in case of polling. Default setting: 30 (30s). Range: 1->65534 (1s->65534s) - interval between reports. Zero means reports are only sent in the case of polling, or at turning OFF the device",    "ValueIDKey": 12384899102933014,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/12666374079643665/,{    "Label": "Reporting changes in energy consumed by controlled devices",    "Value": 10,    "Units": "*0.01kWh",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 254,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 45,    "Node": 7,    "Genre": "Config",    "Help": "Interval between energy consumption reports (in kWh). New reported energy consumption value is calculated based on last reported value. 1->254 (0.01kWh->2.54kWh). Zero means changes in consumed energy will not be reported, except in case of polling.",    "ValueIDKey": 12666374079643665,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/19984723474120724/,{    "Label": "Response to BRIGHTNESS set to 0%",    "Value": {        "List": [            {                "Value": 0,                "Label": "Illumination colour set to white (all channels controlled together)"            },            {                "Value": 1,                "Label": "Last set colour is memorized"            }        ],        "Selected": "Last set colour is memorized",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 71,    "Node": 7,    "Genre": "Config",    "Help": "Set whether to remember the previous RGB mix after the brightness has fallen to zero (black)",    "ValueIDKey": 19984723474120724,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/20266198450831377/,{    "Label": "Starting predefined program",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 72,    "Node": 7,    "Genre": "Config",    "Help": "First predefined program to use when device is set to work in RGB/RGBW mode (parameter 14)",    "ValueIDKey": 20266198450831377,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/20547673427542036/,{    "Label": "Triple Click Action",    "Value": {        "List": [            {                "Value": 0,                "Label": "NODE INFO control frame is sent"            },            {                "Value": 1,                "Label": "Start favourite program"            }        ],        "Selected": "NODE INFO control frame is sent",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 73,    "Node": 7,    "Genre": "Config",    "Help": "Behaviour when an input is triple-clicked",    "ValueIDKey": 20547673427542036,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/,{    "NodeID": 7,    "NodeQueryStage": "Complete",    "isListening": true,    "isFlirs": false,    "isBeaming": true,    "isRouting": true,    "isSecurityv1": false,    "isZWavePlus": false,    "isNIFRecieved": true,    "isAwake": true,    "isFailed": false,    "MetaData": {        "OZWInfoURL": "http://www.openzwave.com/device-database/010F:1000:0900",        "ZWAProductURL": "",        "ProductPic": "images/fibaro/fgrgbwm441.png",        "Description": "RGBW Controller",        "ProductManualURL": "",        "ProductPageURL": "",        "InclusionHelp": "",        "ExclusionHelp": "",        "ResetHelp": "",        "WakeupHelp": "",        "ProductSupportURL": "",        "Frequency": "",        "Name": "FIBARO RGBW Dimmer",        "ProductPicBase64": "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"    },    "Event": "nodeQueriesComplete",    "TimeStamp": 1597143009,    "NodeManufacturerName": "FIBARO System",    "NodeProductName": "FGRGBWM441 RGBW Controller",    "NodeBasicString": "Routing Slave",    "NodeBasic": 4,    "NodeGenericString": "Multilevel Switch",    "NodeGeneric": 17,    "NodeSpecificString": "Multilevel Power Switch",    "NodeSpecific": 1,    "NodeManufacturerID": "0x010f",    "NodeProductType": "0x0900",    "NodeProductID": "0x1000",    "NodeBaudRate": 40000,    "NodeVersion": 4,    "NodeGroups": 5,    "NodeName": "Kitchen RGB Strip",    "NodeLocation": "",    "NodeDeviceTypeString": "Unknown Type (0x0000)",    "NodeDeviceType": 0,    "NodeRole": 0,    "NodeRoleString": "Central Controller",    "NodePlusType": 0,    "NodePlusTypeString": "Z-Wave+ node",    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ],    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ]}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
-OpenZWave/1/node/7/,{    "NodeID": 7,    "NodeQueryStage": "Complete",    "isListening": true,    "isFlirs": false,    "isBeaming": true,    "isRouting": true,    "isSecurityv1": false,    "isZWavePlus": false,    "isNIFRecieved": true,    "isAwake": true,    "isFailed": false,    "MetaData": {        "OZWInfoURL": "http://www.openzwave.com/device-database/010F:1000:0900",        "ZWAProductURL": "",        "ProductPic": "images/fibaro/fgrgbwm441.png",        "Description": "RGBW Controller",        "ProductManualURL": "",        "ProductPageURL": "",        "InclusionHelp": "",        "ExclusionHelp": "",        "ResetHelp": "",        "WakeupHelp": "",        "ProductSupportURL": "",        "Frequency": "",        "Name": "FIBARO RGBW Dimmer",        "ProductPicBase64": "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"    },    "Event": "nodeQueriesComplete",    "TimeStamp": 1597143009,    "NodeManufacturerName": "FIBARO System",    "NodeProductName": "FGRGBWM441 RGBW Controller",    "NodeBasicString": "Routing Slave",    "NodeBasic": 4,    "NodeGenericString": "Multilevel Switch",    "NodeGeneric": 17,    "NodeSpecificString": "Multilevel Power Switch",    "NodeSpecific": 1,    "NodeManufacturerID": "0x010f",    "NodeProductType": "0x0900",    "NodeProductID": "0x1000",    "NodeBaudRate": 40000,    "NodeVersion": 4,    "NodeGroups": 5,    "NodeName": "Kitchen RGB Strip",    "NodeLocation": "",    "NodeDeviceTypeString": "Unknown Type (0x0000)",    "NodeDeviceType": 0,    "NodeRole": 0,    "NodeRoleString": "Central Controller",    "NodePlusType": 0,    "NodePlusTypeString": "Z-Wave+ node",    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ],    "Neighbors": [        1,        3,        6,        8,        12,        13,        14,        18,        22,        26,        27,        28    ]}
-OpenZWave/1/node/7/instance/1/,{    "Instance": 1,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/51/,{    "Instance": 1,    "CommandClassId": 51,    "CommandClass": "COMMAND_CLASS_COLOR",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/51/value/122470423/,{    "Label": "Color",    "Value": "#FFFFFF00",    "Units": "#RRGGBBWW",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "String",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_COLOR",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "Color (in RGB format)",    "ValueIDKey": 122470423,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/51/value/281475099181076/,{    "Label": "Color Index",    "Value": {        "List": [            {                "Value": 0,                "Label": "Off"            },            {                "Value": 1,                "Label": "Cool White"            },            {                "Value": 2,                "Label": "Warm White"            },            {                "Value": 3,                "Label": "Red"            },            {                "Value": 4,                "Label": "Lime"            },            {                "Value": 5,                "Label": "Blue"            },            {                "Value": 6,                "Label": "Yellow"            },            {                "Value": 7,                "Label": "Cyan"            },            {                "Value": 8,                "Label": "Magenta"            },            {                "Value": 9,                "Label": "Silver"            },            {                "Value": 10,                "Label": "Gray"            },            {                "Value": 11,                "Label": "Maroon"            },            {                "Value": 12,                "Label": "Olive"            },            {                "Value": 13,                "Label": "Green"            },            {                "Value": 14,                "Label": "Purple"            },            {                "Value": 15,                "Label": "Teal"            },            {                "Value": 16,                "Label": "Navy"            },            {                "Value": 17,                "Label": "Custom"            }        ],        "Selected": "Cool White",        "Selected_id": 1    },    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_COLOR",    "Index": 1,    "Node": 7,    "Genre": "User",    "Help": "Preset Color",    "ValueIDKey": 281475099181076,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/,{    "Instance": 1,    "CommandClassId": 112,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "CommandClassVersion": 1,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/281475104374804/,{    "Label": "Enable/Disable ALL ON/OFF",    "Value": {        "List": [            {                "Value": 0,                "Label": "ALL ON disabled/ ALL OFF disabled"            },            {                "Value": 1,                "Label": "ALL ON disabled/ ALL OFF active"            },            {                "Value": 2,                "Label": "ALL ON active / ALL OFF disabled"            },            {                "Value": 255,                "Label": "ALL ON active / ALL OFF active"            }        ],        "Selected": "ALL ON active / ALL OFF active",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 1,    "Node": 7,    "Genre": "Config",    "Help": "Enable/Disable ALL ON/OFF",    "ValueIDKey": 281475104374804,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/1688849987928084/,{    "Label": "Associations command class choice",    "Value": {        "List": [            {                "Value": 0,                "Label": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 1,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET/START/STOP_STATE_CHANGE"            },            {                "Value": 2,                "Label": "Normal (RGBW) - COLOR_CONTROL_SET"            },            {                "Value": 3,                "Label": "Brightness - BASIC SET/SWITCH_MULTILEVEL_START/STOP"            },            {                "Value": 4,                "Label": "Rainbow (RGBW) - COLOR_CONTROL_SET"            }        ],        "Selected": "Normal (Dimmer) - BASIC SET/SWITCH_MULTILEVEL_START/STOP",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 6,    "Node": 7,    "Genre": "Config",    "Help": "Choose which command classes are sent to associated devices.",    "ValueIDKey": 1688849987928084,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/2251799941349396/,{    "Label": "Outputs state change mode",    "Value": {        "List": [            {                "Value": 0,                "Label": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)"            },            {                "Value": 1,                "Label": "MODE 2 - Constant Time (RGB/RBGW only. Time is defined by parameter 11)"            }        ],        "Selected": "MODE 1 - Constant Speed (speed is defined by parameters 9 and 10)",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 8,    "Node": 7,    "Genre": "Config",    "Help": "Choose the behaviour of transitions between different levels.",    "ValueIDKey": 2251799941349396,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143008}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/2533274918060049/,{    "Label": "Dimming step value (for MODE 1)",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 99,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 9,    "Node": 7,    "Genre": "Config",    "Help": "Size of the step for each change in level during the transition.",    "ValueIDKey": 2533274918060049,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/2814749894770710/,{    "Label": "Time between dimming steps (for MODE 1)",    "Value": 10,    "Units": "ms",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 60000,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 10,    "Node": 7,    "Genre": "Config",    "Help": "Time between each step in a transition between levels. Setting this to zero means an instantaneous change.",    "ValueIDKey": 2814749894770710,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3096224871481361/,{    "Label": "Time to complete the entire transition (for MODE 2)",    "Value": 67,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 11,    "Node": 7,    "Genre": "Config",    "Help": "0 - immediate change; 1->63: 20ms->126ms (value*20ms); 65->127: 1s->63s (value-64)*1s; 129->191: 10s->630s (value-128)*10s; 193->255: 1min->63min (value-192)*1min. Default setting: 67 (3s)",    "ValueIDKey": 3096224871481361,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3377699848192017/,{    "Label": "Maximum dimmer level",    "Value": 255,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 3,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 12,    "Node": 7,    "Genre": "Config",    "Help": "Maximum brightness level for the dimmer",    "ValueIDKey": 3377699848192017,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3659174824902673/,{    "Label": "Minimum dimmer level",    "Value": 2,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 2,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 13,    "Node": 7,    "Genre": "Config",    "Help": "Minimum brightness level for the dimmer",    "ValueIDKey": 3659174824902673,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/3940649801613334/,{    "Label": "Inputs / Outputs configuration",    "Value": 4369,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -32768,    "Max": 32767,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 14,    "Node": 7,    "Genre": "Config",    "Help": "This is too complex to describe here, since this value is built up from 4-bits for each of the 4 channels. Refer to the table in the product manual. Default value is 4369 (1111 in hex).",    "ValueIDKey": 3940649801613334,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/4222124778323988/,{    "Label": "Option double click",    "Value": {        "List": [            {                "Value": 0,                "Label": "Double click disabled"            },            {                "Value": 1,                "Label": "Double click enabled"            }        ],        "Selected": "Double click enabled",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 15,    "Node": 7,    "Genre": "Config",    "Help": "Option double click (lighting set at 100%). 0 - Double click disabled, 1 - Double click enabled. Default setting 1",    "ValueIDKey": 4222124778323988,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/4503599755034644/,{    "Label": "Saving state before power failure",    "Value": {        "List": [            {                "Value": 0,                "Label": "State NOT saved at power failure, all outputs are set to OFF upon power restore"            },            {                "Value": 1,                "Label": "State saved at power failure, all outputs are set to previous state upon power restore"            }        ],        "Selected": "State saved at power failure, all outputs are set to previous state upon power restore",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 16,    "Node": 7,    "Genre": "Config",    "Help": "Saving state before power failure",    "ValueIDKey": 4503599755034644,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/8444249428983828/,{    "Label": "Alarm",    "Value": {        "List": [            {                "Value": 0,                "Label": "INACTIVE - no response to alarm frames"            },            {                "Value": 1,                "Label": "ALARM ON - the device turns on once alarm is detected (all channels set to 99%)"            },            {                "Value": 2,                "Label": "ALARM OFF - the device turns off once alarm is detected (all channels set to 0%)"            },            {                "Value": 3,                "Label": "ALARM PROGRAM - alarm sequence turns on (program selected in parameter 38)"            }        ],        "Selected": "INACTIVE - no response to alarm frames",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 30,    "Node": 7,    "Genre": "Config",    "Help": "Alarm of any type (general alarm, water flooding alarm, smoke alarm: CO, CO2, temperature alarm). Default setting 0 (Inactive)",    "ValueIDKey": 8444249428983828,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/10696049242669073/,{    "Label": "Alarm sequence program",    "Value": 10,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 38,    "Node": 7,    "Genre": "Config",    "Help": "Program number selected from the 10 available.",    "ValueIDKey": 10696049242669073,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/10977524219379734/,{    "Label": "Active PROGRAM alarm time",    "Value": 600,    "Units": "s",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 39,    "Node": 7,    "Genre": "Config",    "Help": "In ALARM PROGRAM mode (see parameter 30), this defines the time in seconds the program lasts (1s->65534s)",    "ValueIDKey": 10977524219379734,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/11821949149511700/,{    "Label": "Command class reporting Outputs status change",    "Value": {        "List": [            {                "Value": 0,                "Label": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)"            },            {                "Value": 1,                "Label": "Reporting as a result inputs actions (SWITCH MULTILEVEL)"            },            {                "Value": 2,                "Label": "Reporting as a result inputs actions (COLOUR_CONTROL)"            }        ],        "Selected": "Reporting as a result of inputs and controllers actions (SWITCH MULTILEVEL)",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 42,    "Node": 7,    "Genre": "Config",    "Help": "Specify which command class is used to report output status changes",    "ValueIDKey": 11821949149511700,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/12103424126222353/,{    "Label": "Reporting 0-10v analog inputs change threshold",    "Value": 5,    "Units": "*0.1V",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 100,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 43,    "Node": 7,    "Genre": "Config",    "Help": "Parameter defines a value by which input voltage must change in order to be reported to the main controller. New value is calculated based on last reported value: Default setting: 5 (0.5V). Range: 1->100 - (0.1V->10V).",    "ValueIDKey": 12103424126222353,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/12384899102933014/,{    "Label": "Power load reporting frequency",    "Value": 30,    "Units": "s",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 65534,    "Type": "Short",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 44,    "Node": 7,    "Genre": "Config",    "Help": "Sent if last reported value differs from the current value. Reports will also be sent in case of polling. Default setting: 30 (30s). Range: 1->65534 (1s->65534s) - interval between reports. Zero means reports are only sent in the case of polling, or at turning OFF the device",    "ValueIDKey": 12384899102933014,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/12666374079643665/,{    "Label": "Reporting changes in energy consumed by controlled devices",    "Value": 10,    "Units": "*0.01kWh",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 254,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 45,    "Node": 7,    "Genre": "Config",    "Help": "Interval between energy consumption reports (in kWh). New reported energy consumption value is calculated based on last reported value. 1->254 (0.01kWh->2.54kWh). Zero means changes in consumed energy will not be reported, except in case of polling.",    "ValueIDKey": 12666374079643665,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/19984723474120724/,{    "Label": "Response to BRIGHTNESS set to 0%",    "Value": {        "List": [            {                "Value": 0,                "Label": "Illumination colour set to white (all channels controlled together)"            },            {                "Value": 1,                "Label": "Last set colour is memorized"            }        ],        "Selected": "Last set colour is memorized",        "Selected_id": 1    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 71,    "Node": 7,    "Genre": "Config",    "Help": "Set whether to remember the previous RGB mix after the brightness has fallen to zero (black)",    "ValueIDKey": 19984723474120724,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/20266198450831377/,{    "Label": "Starting predefined program",    "Value": 1,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 1,    "Max": 10,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 72,    "Node": 7,    "Genre": "Config",    "Help": "First predefined program to use when device is set to work in RGB/RGBW mode (parameter 14)",    "ValueIDKey": 20266198450831377,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/112/value/20547673427542036/,{    "Label": "Triple Click Action",    "Value": {        "List": [            {                "Value": 0,                "Label": "NODE INFO control frame is sent"            },            {                "Value": 1,                "Label": "Start favourite program"            }        ],        "Selected": "NODE INFO control frame is sent",        "Selected_id": 0    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_CONFIGURATION",    "Index": 73,    "Node": 7,    "Genre": "Config",    "Help": "Behaviour when an input is triple-clicked",    "ValueIDKey": 20547673427542036,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597143009}
-OpenZWave/1/node/7/instance/1/commandclass/38/,{    "Instance": 1,    "CommandClassId": 38,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/122257425/,{    "Label": "Level",    "Value": 99,    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 0,    "Node": 7,    "Genre": "User",    "Help": "The Current Level of the Device",    "ValueIDKey": 122257425,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597142969}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/281475098968088/,{    "Label": "Bright",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 1,    "Node": 7,    "Genre": "User",    "Help": "Increase the Brightness of the Device",    "ValueIDKey": 281475098968088,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/562950075678744/,{    "Label": "Dim",    "Value": false,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Button",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 2,    "Node": 7,    "Genre": "User",    "Help": "Decrease the Brightness of the Device",    "ValueIDKey": 562950075678744,    "ReadOnly": false,    "WriteOnly": true,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/844425060778000/,{    "Label": "Ignore Start Level",    "Value": true,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "Bool",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 3,    "Node": 7,    "Genre": "System",    "Help": "Ignore the Start Level of the Device when increasing/decreasing brightness",    "ValueIDKey": 844425060778000,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/38/value/1125900037488657/,{    "Label": "Start Level",    "Value": 0,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 255,    "Type": "Byte",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_MULTILEVEL",    "Index": 4,    "Node": 7,    "Genre": "System",    "Help": "Start Level when Changing the Brightness of a Device",    "ValueIDKey": 1125900037488657,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/39/,{    "Instance": 1,    "CommandClassId": 39,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "CommandClassVersion": 1,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/39/value/130662420/,{    "Label": "Switch All",    "Value": {        "List": [            {                "Value": 0,                "Label": "Disabled"            },            {                "Value": 1,                "Label": "Off Enabled"            },            {                "Value": 2,                "Label": "On Enabled"            },            {                "Value": 255,                "Label": "On and Off Enabled"            }        ],        "Selected": "On and Off Enabled",        "Selected_id": 255    },    "Units": "",    "ValueSet": true,    "ValuePolled": false,    "ChangeVerified": false,    "Min": 0,    "Max": 0,    "Type": "List",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_SWITCH_ALL",    "Index": 0,    "Node": 7,    "Genre": "System",    "Help": "Switch All Devices On/Off",    "ValueIDKey": 130662420,    "ReadOnly": false,    "WriteOnly": false,    "Event": "valueChanged",    "TimeStamp": 1597142969}
-OpenZWave/1/node/7/instance/1/commandclass/114/,{    "Instance": 1,    "CommandClassId": 114,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "CommandClassVersion": 0,    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/114/value/131891219/,{    "Label": "Loaded Config Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 0,    "Node": 7,    "Genre": "System",    "Help": "Revision of the Config file currently loaded",    "ValueIDKey": 131891219,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/114/value/281475108601875/,{    "Label": "Config File Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 1,    "Node": 7,    "Genre": "System",    "Help": "Revision of the Config file on the File System",    "ValueIDKey": 281475108601875,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/instance/1/commandclass/114/value/562950085312531/,{    "Label": "Latest Available Config File Revision",    "Value": 5,    "Units": "",    "ValueSet": false,    "ValuePolled": false,    "ChangeVerified": false,    "Min": -2147483648,    "Max": 2147483647,    "Type": "Int",    "Instance": 1,    "CommandClass": "COMMAND_CLASS_MANUFACTURER_SPECIFIC",    "Index": 2,    "Node": 7,    "Genre": "System",    "Help": "Latest Revision of the Config file available for download",    "ValueIDKey": 562950085312531,    "ReadOnly": true,    "WriteOnly": false,    "Event": "valueAdded",    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/association/1/,{    "Name": "Input 1",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
-OpenZWave/1/node/7/association/2/,{    "Name": "Input 2",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
-OpenZWave/1/node/7/association/3/,{    "Name": "Input 3",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
-OpenZWave/1/node/7/association/4/,{    "Name": "Input 4",    "Help": "",    "MaxAssociations": 5,    "Members": [],    "TimeStamp": 1597142866}
-OpenZWave/1/node/7/association/5/,{    "Name": "Lifeline",    "Help": "",    "MaxAssociations": 1,    "Members": [        "1.0"    ],    "TimeStamp": 1597142799}
-OpenZWave/1/node/7/statistics/,{    "sendCount": 30,    "sentFailed": 0,    "retries": 0,    "receivedPackets": 29,    "receivedDupPackets": 1,    "receivedUnsolicited": 0,    "lastSentTimeStamp": 1597143009,    "lastReceivedTimeStamp": 1597143009,    "lastRequestRTT": 26,    "averageRequestRTT": 25,    "lastResponseRTT": 37,    "averageResponseRTT": 37,    "quality": 0,    "extendedTXSupported": false,    "txTime": 0,    "hops": 0,    "rssi_1": "",    "rssi_2": "",    "rssi_3": "",    "rssi_4": "",    "rssi_5": "",    "route_1": 0,    "route_2": 0,    "route_3": 0,    "route_4": 0,    "ackChannel": 0,    "lastTXChannel": 0,    "routeScheme": "Idle",    "routeUsed": "",    "routeSpeed": "Auto",    "routeTries": 0,    "lastFailedLinkFrom": 0,    "lastFailedLinkTo": 0}
diff --git a/tests/fixtures/rest/configuration.yaml b/tests/fixtures/rest/configuration.yaml
index 69a4e771ebf..a8a4081fcae 100644
--- a/tests/fixtures/rest/configuration.yaml
+++ b/tests/fixtures/rest/configuration.yaml
@@ -4,6 +4,12 @@ sensor:
     method: GET
     name: rollout
 
+binary_sensor:
+  - platform: rest
+    resource: "http://localhost"
+    method: GET
+    name: rollout
+
 notify:
   - name: rest_reloaded
     platform: rest
diff --git a/tests/fixtures/template/ref_configuration.yaml b/tests/fixtures/template/ref_configuration.yaml
new file mode 100644
index 00000000000..f7731697c71
--- /dev/null
+++ b/tests/fixtures/template/ref_configuration.yaml
@@ -0,0 +1,9 @@
+sensor:
+  - platform: template
+    sensors:
+      test1:
+        value_template: "{{ (states.sensor.test2.state |int) + (states.sensor.test3.state |int)}}"
+      test2:
+        value_template: "{{ 1 }}"
+      test3:
+        value_template: "{{ 2 }}"
diff --git a/tests/helpers/test_collection.py b/tests/helpers/test_collection.py
index f2224858bb5..11f1534defb 100644
--- a/tests/helpers/test_collection.py
+++ b/tests/helpers/test_collection.py
@@ -8,7 +8,7 @@ from homeassistant.helpers import collection, entity, entity_component, storage
 
 from tests.common import flush_store
 
-LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(__name__)
 
 
 def track_changes(coll: collection.ObservableCollection):
@@ -85,7 +85,7 @@ def test_id_manager():
 
 async def test_observable_collection():
     """Test observerable collection."""
-    coll = collection.ObservableCollection(LOGGER)
+    coll = collection.ObservableCollection(_LOGGER)
     assert coll.async_items() == []
     coll.data["bla"] = 1
     assert coll.async_items() == [1]
@@ -99,7 +99,7 @@ async def test_observable_collection():
 async def test_yaml_collection():
     """Test a YAML collection."""
     id_manager = collection.IDManager()
-    coll = collection.YamlCollection(LOGGER, id_manager)
+    coll = collection.YamlCollection(_LOGGER, id_manager)
     changes = track_changes(coll)
     await coll.async_load(
         [{"id": "mock-1", "name": "Mock 1"}, {"id": "mock-2", "name": "Mock 2"}]
@@ -144,7 +144,7 @@ async def test_yaml_collection_skipping_duplicate_ids():
     """Test YAML collection skipping duplicate IDs."""
     id_manager = collection.IDManager()
     id_manager.add_collection({"existing": True})
-    coll = collection.YamlCollection(LOGGER, id_manager)
+    coll = collection.YamlCollection(_LOGGER, id_manager)
     changes = track_changes(coll)
     await coll.async_load(
         [{"id": "mock-1", "name": "Mock 1"}, {"id": "existing", "name": "Mock 2"}]
@@ -169,7 +169,7 @@ async def test_storage_collection(hass):
         }
     )
     id_manager = collection.IDManager()
-    coll = MockStorageCollection(store, LOGGER, id_manager)
+    coll = MockStorageCollection(store, _LOGGER, id_manager)
     changes = track_changes(coll)
 
     await coll.async_load()
@@ -222,8 +222,8 @@ async def test_storage_collection(hass):
 
 async def test_attach_entity_component_collection(hass):
     """Test attaching collection to entity component."""
-    ent_comp = entity_component.EntityComponent(LOGGER, "test", hass)
-    coll = collection.ObservableCollection(LOGGER)
+    ent_comp = entity_component.EntityComponent(_LOGGER, "test", hass)
+    coll = collection.ObservableCollection(_LOGGER)
     collection.attach_entity_component_collection(ent_comp, coll, MockEntity)
 
     await coll.notify_change(
@@ -252,7 +252,7 @@ async def test_attach_entity_component_collection(hass):
 async def test_storage_collection_websocket(hass, hass_ws_client):
     """Test exposing a storage collection via websockets."""
     store = storage.Store(hass, 1, "test-data")
-    coll = MockStorageCollection(store, LOGGER)
+    coll = MockStorageCollection(store, _LOGGER)
     changes = track_changes(coll)
     collection.StorageCollectionWebsocket(
         coll,
diff --git a/tests/helpers/test_condition.py b/tests/helpers/test_condition.py
index 001c59e2f2c..802ad7699e3 100644
--- a/tests/helpers/test_condition.py
+++ b/tests/helpers/test_condition.py
@@ -915,3 +915,26 @@ async def test_condition_template_error(hass, caplog):
     assert caplog.records[0].message.startswith(
         "Error during template condition: UndefinedError:"
     )
+
+
+async def test_condition_template_invalid_results(hass):
+    """Test template condition render false with invalid results."""
+    test = await condition.async_from_config(
+        hass, {"condition": "template", "value_template": "{{ 'string' }}"}
+    )
+    assert not test(hass)
+
+    test = await condition.async_from_config(
+        hass, {"condition": "template", "value_template": "{{ 10.1 }}"}
+    )
+    assert not test(hass)
+
+    test = await condition.async_from_config(
+        hass, {"condition": "template", "value_template": "{{ 42 }}"}
+    )
+    assert not test(hass)
+
+    test = await condition.async_from_config(
+        hass, {"condition": "template", "value_template": "{{ [1, 2, 3] }}"}
+    )
+    assert not test(hass)
diff --git a/tests/helpers/test_config_entry_flow.py b/tests/helpers/test_config_entry_flow.py
index adbcca63990..926aa98e308 100644
--- a/tests/helpers/test_config_entry_flow.py
+++ b/tests/helpers/test_config_entry_flow.py
@@ -81,7 +81,7 @@ async def test_user_has_confirmation(hass, discovery_flow_conf):
     assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
 
 
-@pytest.mark.parametrize("source", ["discovery", "ssdp", "zeroconf"])
+@pytest.mark.parametrize("source", ["discovery", "mqtt", "ssdp", "zeroconf"])
 async def test_discovery_single_instance(hass, discovery_flow_conf, source):
     """Test we not allow duplicates."""
     flow = config_entries.HANDLERS["test"]()
@@ -95,7 +95,7 @@ async def test_discovery_single_instance(hass, discovery_flow_conf, source):
     assert result["reason"] == "single_instance_allowed"
 
 
-@pytest.mark.parametrize("source", ["discovery", "ssdp", "zeroconf"])
+@pytest.mark.parametrize("source", ["discovery", "mqtt", "ssdp", "zeroconf"])
 async def test_discovery_confirmation(hass, discovery_flow_conf, source):
     """Test we ask for confirmation via discovery."""
     flow = config_entries.HANDLERS["test"]()
@@ -238,7 +238,7 @@ async def test_webhook_single_entry_allowed(hass, webhook_flow_conf):
     result = await flow.async_step_user()
 
     assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-    assert result["reason"] == "one_instance_allowed"
+    assert result["reason"] == "single_instance_allowed"
 
 
 async def test_webhook_multiple_entries_allowed(hass, webhook_flow_conf):
diff --git a/tests/helpers/test_config_validation.py b/tests/helpers/test_config_validation.py
index f7d7acbb08e..693785f4ea7 100644
--- a/tests/helpers/test_config_validation.py
+++ b/tests/helpers/test_config_validation.py
@@ -9,7 +9,7 @@ import pytest
 import voluptuous as vol
 
 import homeassistant
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import config_validation as cv, template
 
 from tests.async_mock import Mock, patch
 
@@ -365,7 +365,7 @@ def test_slug():
         schema(value)
 
 
-def test_string():
+def test_string(hass):
     """Test string validation."""
     schema = vol.Schema(cv.string)
 
@@ -381,6 +381,19 @@ def test_string():
     for value in (True, 1, "hello"):
         schema(value)
 
+    # Test template support
+    for text, native in (
+        ("[1, 2]", [1, 2]),
+        ("{1, 2}", {1, 2}),
+        ("(1, 2)", (1, 2)),
+        ('{"hello": True}', {"hello": True}),
+    ):
+        tpl = template.Template(text, hass)
+        result = tpl.async_render()
+        assert isinstance(result, template.ResultWrapper)
+        assert result == native
+        assert schema(result) == text
+
 
 def test_string_with_no_html():
     """Test string with no html validation."""
@@ -571,6 +584,27 @@ def test_multi_select_in_serializer():
     }
 
 
+def test_boolean_in_serializer():
+    """Test boolean with custom_serializer."""
+    assert cv.custom_serializer(cv.boolean) == {
+        "type": "boolean",
+    }
+
+
+def test_string_in_serializer():
+    """Test string with custom_serializer."""
+    assert cv.custom_serializer(cv.string) == {
+        "type": "string",
+    }
+
+
+def test_positive_time_period_dict_in_serializer():
+    """Test positive_time_period_dict with custom_serializer."""
+    assert cv.custom_serializer(cv.positive_time_period_dict) == {
+        "type": "positive_time_period_dict",
+    }
+
+
 @pytest.fixture
 def schema():
     """Create a schema used for testing deprecation."""
diff --git a/tests/helpers/test_debounce.py b/tests/helpers/test_debounce.py
index d84b6fd7da7..e9cb5749eaf 100644
--- a/tests/helpers/test_debounce.py
+++ b/tests/helpers/test_debounce.py
@@ -20,17 +20,22 @@ async def test_immediate_works(hass):
     assert len(calls) == 1
     assert debouncer._timer_task is not None
     assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
 
     # Call when cooldown active setting execute at end to True
     await debouncer.async_call()
     assert len(calls) == 1
     assert debouncer._timer_task is not None
     assert debouncer._execute_at_end_of_timer is True
+    assert debouncer._job.target == debouncer.function
 
     # Canceling debounce in cooldown
     debouncer.async_cancel()
     assert debouncer._timer_task is None
     assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    before_job = debouncer._job
 
     # Call and let timer run out
     await debouncer.async_call()
@@ -39,6 +44,8 @@ async def test_immediate_works(hass):
     assert len(calls) == 2
     assert debouncer._timer_task is None
     assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+    assert debouncer._job == before_job
 
     # Test calling doesn't execute/cooldown if currently executing.
     await debouncer._execute_lock.acquire()
@@ -47,6 +54,7 @@ async def test_immediate_works(hass):
     assert debouncer._timer_task is None
     assert debouncer._execute_at_end_of_timer is False
     debouncer._execute_lock.release()
+    assert debouncer._job.target == debouncer.function
 
 
 async def test_not_immediate_works(hass):
@@ -84,6 +92,7 @@ async def test_not_immediate_works(hass):
     assert len(calls) == 1
     assert debouncer._timer_task is not None
     assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
 
     # Reset debouncer
     debouncer.async_cancel()
@@ -95,3 +104,65 @@ async def test_not_immediate_works(hass):
     assert debouncer._timer_task is None
     assert debouncer._execute_at_end_of_timer is False
     debouncer._execute_lock.release()
+    assert debouncer._job.target == debouncer.function
+
+
+async def test_immediate_works_with_function_swapped(hass):
+    """Test immediate works and we can change out the function."""
+    calls = []
+
+    one_function = AsyncMock(side_effect=lambda: calls.append(1))
+    two_function = AsyncMock(side_effect=lambda: calls.append(2))
+
+    debouncer = debounce.Debouncer(
+        hass,
+        None,
+        cooldown=0.01,
+        immediate=True,
+        function=one_function,
+    )
+
+    # Call when nothing happening
+    await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    # Call when cooldown active setting execute at end to True
+    await debouncer.async_call()
+    assert len(calls) == 1
+    assert debouncer._timer_task is not None
+    assert debouncer._execute_at_end_of_timer is True
+    assert debouncer._job.target == debouncer.function
+
+    # Canceling debounce in cooldown
+    debouncer.async_cancel()
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+
+    before_job = debouncer._job
+    debouncer.function = two_function
+
+    # Call and let timer run out
+    await debouncer.async_call()
+    assert len(calls) == 2
+    assert calls == [1, 2]
+    await debouncer._handle_timer_finish()
+    assert len(calls) == 2
+    assert calls == [1, 2]
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    assert debouncer._job.target == debouncer.function
+    assert debouncer._job != before_job
+
+    # Test calling doesn't execute/cooldown if currently executing.
+    await debouncer._execute_lock.acquire()
+    await debouncer.async_call()
+    assert len(calls) == 2
+    assert calls == [1, 2]
+    assert debouncer._timer_task is None
+    assert debouncer._execute_at_end_of_timer is False
+    debouncer._execute_lock.release()
+    assert debouncer._job.target == debouncer.function
diff --git a/tests/helpers/test_entity.py b/tests/helpers/test_entity.py
index 1513d573b56..15e9bf55aa4 100644
--- a/tests/helpers/test_entity.py
+++ b/tests/helpers/test_entity.py
@@ -114,13 +114,14 @@ class TestHelpersEntity:
         assert state.attributes.get(ATTR_DEVICE_CLASS) == "test_class"
 
 
-async def test_warn_slow_update(hass):
+async def test_warn_slow_update(hass, caplog):
     """Warn we log when entity update takes a long time."""
     update_call = False
 
     async def async_update():
         """Mock async update."""
         nonlocal update_call
+        await asyncio.sleep(0.00001)
         update_call = True
 
     mock_entity = entity.Entity()
@@ -128,22 +129,16 @@ async def test_warn_slow_update(hass):
     mock_entity.entity_id = "comp_test.test_entity"
     mock_entity.async_update = async_update
 
-    with patch.object(hass.loop, "call_later") as mock_call:
+    fast_update_time = 0.0000001
+
+    with patch.object(entity, "SLOW_UPDATE_WARNING", fast_update_time):
         await mock_entity.async_update_ha_state(True)
-        assert mock_call.called
-        assert len(mock_call.mock_calls) == 2
-
-        timeout, logger_method = mock_call.mock_calls[0][1][:2]
-
-        assert timeout == entity.SLOW_UPDATE_WARNING
-        assert logger_method == entity._LOGGER.warning
-
-        assert mock_call().cancel.called
-
+        assert str(fast_update_time) in caplog.text
+        assert mock_entity.entity_id in caplog.text
         assert update_call
 
 
-async def test_warn_slow_update_with_exception(hass):
+async def test_warn_slow_update_with_exception(hass, caplog):
     """Warn we log when entity update takes a long time and trow exception."""
     update_call = False
 
@@ -151,6 +146,7 @@ async def test_warn_slow_update_with_exception(hass):
         """Mock async update."""
         nonlocal update_call
         update_call = True
+        await asyncio.sleep(0.00001)
         raise AssertionError("Fake update error")
 
     mock_entity = entity.Entity()
@@ -158,28 +154,23 @@ async def test_warn_slow_update_with_exception(hass):
     mock_entity.entity_id = "comp_test.test_entity"
     mock_entity.async_update = async_update
 
-    with patch.object(hass.loop, "call_later") as mock_call:
+    fast_update_time = 0.0000001
+
+    with patch.object(entity, "SLOW_UPDATE_WARNING", fast_update_time):
         await mock_entity.async_update_ha_state(True)
-        assert mock_call.called
-        assert len(mock_call.mock_calls) == 2
-
-        timeout, logger_method = mock_call.mock_calls[0][1][:2]
-
-        assert timeout == entity.SLOW_UPDATE_WARNING
-        assert logger_method == entity._LOGGER.warning
-
-        assert mock_call().cancel.called
-
+        assert str(fast_update_time) in caplog.text
+        assert mock_entity.entity_id in caplog.text
         assert update_call
 
 
-async def test_warn_slow_device_update_disabled(hass):
+async def test_warn_slow_device_update_disabled(hass, caplog):
     """Disable slow update warning with async_device_update."""
     update_call = False
 
     async def async_update():
         """Mock async update."""
         nonlocal update_call
+        await asyncio.sleep(0.00001)
         update_call = True
 
     mock_entity = entity.Entity()
@@ -187,10 +178,12 @@ async def test_warn_slow_device_update_disabled(hass):
     mock_entity.entity_id = "comp_test.test_entity"
     mock_entity.async_update = async_update
 
-    with patch.object(hass.loop, "call_later") as mock_call:
-        await mock_entity.async_device_update(warning=False)
+    fast_update_time = 0.0000001
 
-        assert not mock_call.called
+    with patch.object(entity, "SLOW_UPDATE_WARNING", fast_update_time):
+        await mock_entity.async_device_update(warning=False)
+        assert str(fast_update_time) not in caplog.text
+        assert mock_entity.entity_id not in caplog.text
         assert update_call
 
 
@@ -671,7 +664,7 @@ async def test_warn_slow_write_state(hass, caplog):
         "Updating state for comp_test.test_entity "
         "(<class 'homeassistant.helpers.entity.Entity'>) "
         "took 10.000 seconds. Please create a bug report at "
-        "https://github.com/home-assistant/home-assistant/issues?"
+        "https://github.com/home-assistant/core/issues?"
         "q=is%3Aopen+is%3Aissue+label%3A%22integration%3A+hue%22"
     ) in caplog.text
 
diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py
index 7e923e6abc0..d12c574d1a9 100644
--- a/tests/helpers/test_entity_platform.py
+++ b/tests/helpers/test_entity_platform.py
@@ -975,3 +975,49 @@ async def test_setup_entry_with_entities_that_block_forever(hass, caplog):
     assert "test_domain.test1" in caplog.text
     assert "test_domain" in caplog.text
     assert "test" in caplog.text
+
+
+async def test_two_platforms_add_same_entity(hass):
+    """Test two platforms in the same domain adding an entity with the same name."""
+    entity_platform1 = MockEntityPlatform(
+        hass, domain="mock_integration", platform_name="mock_platform", platform=None
+    )
+    entity1 = SlowEntity(name="entity_1")
+
+    entity_platform2 = MockEntityPlatform(
+        hass, domain="mock_integration", platform_name="mock_platform", platform=None
+    )
+    entity2 = SlowEntity(name="entity_1")
+
+    await asyncio.gather(
+        entity_platform1.async_add_entities([entity1]),
+        entity_platform2.async_add_entities([entity2]),
+    )
+
+    entities = []
+
+    @callback
+    def handle_service(entity, *_):
+        entities.append(entity)
+
+    entity_platform1.async_register_entity_service("hello", {}, handle_service)
+    await hass.services.async_call(
+        "mock_platform", "hello", {"entity_id": "all"}, blocking=True
+    )
+
+    assert len(entities) == 2
+    assert {entity1.entity_id, entity2.entity_id} == {
+        "mock_integration.entity_1",
+        "mock_integration.entity_1_2",
+    }
+    assert entity1 in entities
+    assert entity2 in entities
+
+
+class SlowEntity(MockEntity):
+    """An entity that will sleep during add."""
+
+    async def async_added_to_hass(self):
+        """Make sure control is returned to the event loop on add."""
+        await asyncio.sleep(0.1)
+        await super().async_added_to_hass()
diff --git a/tests/helpers/test_event.py b/tests/helpers/test_event.py
index 14b208b68d4..8add5cc1cf3 100644
--- a/tests/helpers/test_event.py
+++ b/tests/helpers/test_event.py
@@ -992,27 +992,34 @@ async def test_track_template_result_complex(hass):
     )
     await hass.async_block_till_done()
 
-    assert info.listeners == {"all": True, "domains": set(), "entities": set()}
+    assert info.listeners == {
+        "all": True,
+        "domains": set(),
+        "entities": set(),
+        "time": False,
+    }
 
     hass.states.async_set("sensor.domain", "light")
     await hass.async_block_till_done()
     assert len(specific_runs) == 1
-    assert specific_runs[0].strip() == "['light.one']"
+    assert specific_runs[0] == ["light.one"]
 
     assert info.listeners == {
         "all": False,
         "domains": {"light"},
         "entities": {"sensor.domain"},
+        "time": False,
     }
 
     hass.states.async_set("sensor.domain", "lock")
     await hass.async_block_till_done()
     assert len(specific_runs) == 2
-    assert specific_runs[1].strip() == "['lock.one']"
+    assert specific_runs[1] == ["lock.one"]
     assert info.listeners == {
         "all": False,
         "domains": {"lock"},
         "entities": {"sensor.domain"},
+        "time": False,
     }
 
     hass.states.async_set("sensor.domain", "all")
@@ -1021,16 +1028,22 @@ async def test_track_template_result_complex(hass):
     assert "light.one" in specific_runs[2]
     assert "lock.one" in specific_runs[2]
     assert "sensor.domain" in specific_runs[2]
-    assert info.listeners == {"all": True, "domains": set(), "entities": set()}
+    assert info.listeners == {
+        "all": True,
+        "domains": set(),
+        "entities": set(),
+        "time": False,
+    }
 
     hass.states.async_set("sensor.domain", "light")
     await hass.async_block_till_done()
     assert len(specific_runs) == 4
-    assert specific_runs[3].strip() == "['light.one']"
+    assert specific_runs[3] == ["light.one"]
     assert info.listeners == {
         "all": False,
         "domains": {"light"},
         "entities": {"sensor.domain"},
+        "time": False,
     }
 
     hass.states.async_set("light.two", "on")
@@ -1043,6 +1056,7 @@ async def test_track_template_result_complex(hass):
         "all": False,
         "domains": {"light"},
         "entities": {"sensor.domain"},
+        "time": False,
     }
 
     hass.states.async_set("light.three", "on")
@@ -1056,46 +1070,51 @@ async def test_track_template_result_complex(hass):
         "all": False,
         "domains": {"light"},
         "entities": {"sensor.domain"},
+        "time": False,
     }
 
     hass.states.async_set("sensor.domain", "lock")
     await hass.async_block_till_done()
     assert len(specific_runs) == 7
-    assert specific_runs[6].strip() == "['lock.one']"
+    assert specific_runs[6] == ["lock.one"]
     assert info.listeners == {
         "all": False,
         "domains": {"lock"},
         "entities": {"sensor.domain"},
+        "time": False,
     }
 
     hass.states.async_set("sensor.domain", "single_binary_sensor")
     await hass.async_block_till_done()
     assert len(specific_runs) == 8
-    assert specific_runs[7].strip() == "unknown"
+    assert specific_runs[7] == "unknown"
     assert info.listeners == {
         "all": False,
         "domains": set(),
         "entities": {"binary_sensor.single", "sensor.domain"},
+        "time": False,
     }
 
     hass.states.async_set("binary_sensor.single", "binary_sensor_on")
     await hass.async_block_till_done()
     assert len(specific_runs) == 9
-    assert specific_runs[8].strip() == "binary_sensor_on"
+    assert specific_runs[8] == "binary_sensor_on"
     assert info.listeners == {
         "all": False,
         "domains": set(),
         "entities": {"binary_sensor.single", "sensor.domain"},
+        "time": False,
     }
 
     hass.states.async_set("sensor.domain", "lock")
     await hass.async_block_till_done()
     assert len(specific_runs) == 10
-    assert specific_runs[9].strip() == "['lock.one']"
+    assert specific_runs[9] == ["lock.one"]
     assert info.listeners == {
         "all": False,
         "domains": {"lock"},
         "entities": {"sensor.domain"},
+        "time": False,
     }
 
 
@@ -1128,7 +1147,12 @@ async def test_track_template_result_with_wildcard(hass):
     hass.states.async_set("cover.office_window", "open")
     await hass.async_block_till_done()
     assert len(specific_runs) == 1
-    assert info.listeners == {"all": True, "domains": set(), "entities": set()}
+    assert info.listeners == {
+        "all": True,
+        "domains": set(),
+        "entities": set(),
+        "time": False,
+    }
 
     assert "cover.office_drapes=closed" in specific_runs[0]
     assert "cover.office_window=open" in specific_runs[0]
@@ -1177,19 +1201,20 @@ async def test_track_template_result_with_group(hass):
             "sensor.power_2",
             "sensor.power_3",
         },
+        "time": False,
     }
 
     hass.states.async_set("sensor.power_1", 100.1)
     await hass.async_block_till_done()
     assert len(specific_runs) == 1
 
-    assert specific_runs[0] == str(100.1 + 200.2 + 400.4)
+    assert specific_runs[0] == 100.1 + 200.2 + 400.4
 
     hass.states.async_set("sensor.power_3", 0)
     await hass.async_block_till_done()
     assert len(specific_runs) == 2
 
-    assert specific_runs[1] == str(100.1 + 200.2 + 0)
+    assert specific_runs[1] == 100.1 + 200.2 + 0
 
     with patch(
         "homeassistant.config.load_yaml_config_file",
@@ -1204,7 +1229,7 @@ async def test_track_template_result_with_group(hass):
 
     info.async_refresh()
     await hass.async_block_till_done()
-    assert specific_runs[-1] == str(100.1 + 200.2 + 0 + 800.8)
+    assert specific_runs[-1] == 100.1 + 200.2 + 0 + 800.8
 
 
 async def test_track_template_result_and_conditional(hass):
@@ -1223,7 +1248,12 @@ async def test_track_template_result_and_conditional(hass):
         hass, [TrackTemplate(template, None)], specific_run_callback
     )
     await hass.async_block_till_done()
-    assert info.listeners == {"all": False, "domains": set(), "entities": {"light.a"}}
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": {"light.a"},
+        "time": False,
+    }
 
     hass.states.async_set("light.b", "on")
     await hass.async_block_till_done()
@@ -1237,6 +1267,7 @@ async def test_track_template_result_and_conditional(hass):
         "all": False,
         "domains": set(),
         "entities": {"light.a", "light.b"},
+        "time": False,
     }
 
     hass.states.async_set("light.b", "off")
@@ -1247,6 +1278,7 @@ async def test_track_template_result_and_conditional(hass):
         "all": False,
         "domains": set(),
         "entities": {"light.a", "light.b"},
+        "time": False,
     }
 
     hass.states.async_set("light.a", "off")
@@ -1324,6 +1356,7 @@ async def test_track_template_result_iterator(hass):
         "all": False,
         "domains": {"sensor"},
         "entities": set(),
+        "time": False,
     }
 
     hass.states.async_set("sensor.test", 6)
@@ -1460,38 +1493,133 @@ async def test_track_template_rate_limit(hass):
     info.async_refresh()
     await hass.async_block_till_done()
 
-    assert refresh_runs == ["0"]
+    assert refresh_runs == [0]
     hass.states.async_set("sensor.one", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["0"]
+    assert refresh_runs == [0]
     info.async_refresh()
-    assert refresh_runs == ["0", "1"]
+    assert refresh_runs == [0, 1]
     hass.states.async_set("sensor.two", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["0", "1"]
+    assert refresh_runs == [0, 1]
     next_time = dt_util.utcnow() + timedelta(seconds=0.125)
     with patch(
         "homeassistant.helpers.ratelimit.dt_util.utcnow", return_value=next_time
     ):
         async_fire_time_changed(hass, next_time)
         await hass.async_block_till_done()
-    assert refresh_runs == ["0", "1", "2"]
+    assert refresh_runs == [0, 1, 2]
     hass.states.async_set("sensor.three", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["0", "1", "2"]
+    assert refresh_runs == [0, 1, 2]
     hass.states.async_set("sensor.four", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["0", "1", "2"]
+    assert refresh_runs == [0, 1, 2]
     next_time = dt_util.utcnow() + timedelta(seconds=0.125 * 2)
     with patch(
         "homeassistant.helpers.ratelimit.dt_util.utcnow", return_value=next_time
     ):
         async_fire_time_changed(hass, next_time)
         await hass.async_block_till_done()
-    assert refresh_runs == ["0", "1", "2", "4"]
+    assert refresh_runs == [0, 1, 2, 4]
     hass.states.async_set("sensor.five", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["0", "1", "2", "4"]
+    assert refresh_runs == [0, 1, 2, 4]
+
+
+async def test_track_template_rate_limit_suppress_listener(hass):
+    """Test template rate limit will suppress the listener during the rate limit."""
+    template_refresh = Template("{{ states | count }}", hass)
+
+    refresh_runs = []
+
+    @ha.callback
+    def refresh_listener(event, updates):
+        refresh_runs.append(updates.pop().result)
+
+    info = async_track_template_result(
+        hass,
+        [TrackTemplate(template_refresh, None, timedelta(seconds=0.1))],
+        refresh_listener,
+    )
+    await hass.async_block_till_done()
+    info.async_refresh()
+
+    assert info.listeners == {
+        "all": True,
+        "domains": set(),
+        "entities": set(),
+        "time": False,
+    }
+    await hass.async_block_till_done()
+
+    assert refresh_runs == [0]
+    hass.states.async_set("sensor.one", "any")
+    await hass.async_block_till_done()
+    assert refresh_runs == [0]
+    info.async_refresh()
+    assert refresh_runs == [0, 1]
+    hass.states.async_set("sensor.two", "any")
+    await hass.async_block_till_done()
+    # Should be suppressed during the rate limit
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": set(),
+        "time": False,
+    }
+    assert refresh_runs == [0, 1]
+    next_time = dt_util.utcnow() + timedelta(seconds=0.125)
+    with patch(
+        "homeassistant.helpers.ratelimit.dt_util.utcnow", return_value=next_time
+    ):
+        async_fire_time_changed(hass, next_time)
+        await hass.async_block_till_done()
+    # Rate limit released and the all listener returns
+    assert info.listeners == {
+        "all": True,
+        "domains": set(),
+        "entities": set(),
+        "time": False,
+    }
+    assert refresh_runs == [0, 1, 2]
+    hass.states.async_set("sensor.three", "any")
+    await hass.async_block_till_done()
+    assert refresh_runs == [0, 1, 2]
+    hass.states.async_set("sensor.four", "any")
+    await hass.async_block_till_done()
+    assert refresh_runs == [0, 1, 2]
+    # Rate limit hit and the all listener is shut off
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": set(),
+        "time": False,
+    }
+    next_time = dt_util.utcnow() + timedelta(seconds=0.125 * 2)
+    with patch(
+        "homeassistant.helpers.ratelimit.dt_util.utcnow", return_value=next_time
+    ):
+        async_fire_time_changed(hass, next_time)
+        await hass.async_block_till_done()
+    # Rate limit released and the all listener returns
+    assert info.listeners == {
+        "all": True,
+        "domains": set(),
+        "entities": set(),
+        "time": False,
+    }
+    assert refresh_runs == [0, 1, 2, 4]
+    hass.states.async_set("sensor.five", "any")
+    await hass.async_block_till_done()
+    # Rate limit hit and the all listener is shut off
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": set(),
+        "time": False,
+    }
+    assert refresh_runs == [0, 1, 2, 4]
 
 
 async def test_track_template_rate_limit_five(hass):
@@ -1513,18 +1641,18 @@ async def test_track_template_rate_limit_five(hass):
     info.async_refresh()
     await hass.async_block_till_done()
 
-    assert refresh_runs == ["0"]
+    assert refresh_runs == [0]
     hass.states.async_set("sensor.one", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["0"]
+    assert refresh_runs == [0]
     info.async_refresh()
-    assert refresh_runs == ["0", "1"]
+    assert refresh_runs == [0, 1]
     hass.states.async_set("sensor.two", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["0", "1"]
+    assert refresh_runs == [0, 1]
     hass.states.async_set("sensor.three", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["0", "1"]
+    assert refresh_runs == [0, 1]
 
 
 async def test_track_template_has_default_rate_limit(hass):
@@ -1547,18 +1675,18 @@ async def test_track_template_has_default_rate_limit(hass):
     info.async_refresh()
     await hass.async_block_till_done()
 
-    assert refresh_runs == ["1"]
+    assert refresh_runs == [1]
     hass.states.async_set("sensor.one", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["1"]
+    assert refresh_runs == [1]
     info.async_refresh()
-    assert refresh_runs == ["1", "2"]
+    assert refresh_runs == [1, 2]
     hass.states.async_set("sensor.two", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["1", "2"]
+    assert refresh_runs == [1, 2]
     hass.states.async_set("sensor.three", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["1", "2"]
+    assert refresh_runs == [1, 2]
 
 
 async def test_track_template_unavailable_sates_has_default_rate_limit(hass):
@@ -1584,21 +1712,22 @@ async def test_track_template_unavailable_sates_has_default_rate_limit(hass):
     info.async_refresh()
     await hass.async_block_till_done()
 
-    assert refresh_runs == ["1"]
+    assert refresh_runs == [1]
     hass.states.async_set("sensor.one", "unknown")
     await hass.async_block_till_done()
-    assert refresh_runs == ["1"]
+    assert refresh_runs == [1]
     info.async_refresh()
-    assert refresh_runs == ["1", "2"]
+    assert refresh_runs == [1, 2]
     hass.states.async_set("sensor.two", "any")
     await hass.async_block_till_done()
-    assert refresh_runs == ["1", "2"]
+    assert refresh_runs == [1, 2]
     hass.states.async_set("sensor.three", "unknown")
     await hass.async_block_till_done()
-    assert refresh_runs == ["1", "2"]
+    assert refresh_runs == [1, 2]
     info.async_refresh()
     await hass.async_block_till_done()
-    assert refresh_runs == ["1", "2", "3"]
+    assert refresh_runs == [1, 2, 3]
+    info.async_remove()
 
 
 async def test_specifically_referenced_entity_is_not_rate_limited(hass):
@@ -1637,11 +1766,12 @@ async def test_specifically_referenced_entity_is_not_rate_limited(hass):
     hass.states.async_set("sensor.one", "none")
     await hass.async_block_till_done()
     assert refresh_runs == ["1_none", "1_any", "3_none"]
+    info.async_remove()
 
 
 async def test_track_two_templates_with_different_rate_limits(hass):
     """Test two templates with different rate limits."""
-    template_one = Template("{{ states | count }} ", hass)
+    template_one = Template("{{ (states | count) + 0 }}", hass)
     template_five = Template("{{ states | count }}", hass)
 
     refresh_runs = {
@@ -1667,19 +1797,19 @@ async def test_track_two_templates_with_different_rate_limits(hass):
     info.async_refresh()
     await hass.async_block_till_done()
 
-    assert refresh_runs[template_one] == ["0"]
-    assert refresh_runs[template_five] == ["0"]
+    assert refresh_runs[template_one] == [0]
+    assert refresh_runs[template_five] == [0]
     hass.states.async_set("sensor.one", "any")
     await hass.async_block_till_done()
-    assert refresh_runs[template_one] == ["0"]
-    assert refresh_runs[template_five] == ["0"]
+    assert refresh_runs[template_one] == [0]
+    assert refresh_runs[template_five] == [0]
     info.async_refresh()
-    assert refresh_runs[template_one] == ["0", "1"]
-    assert refresh_runs[template_five] == ["0", "1"]
+    assert refresh_runs[template_one] == [0, 1]
+    assert refresh_runs[template_five] == [0, 1]
     hass.states.async_set("sensor.two", "any")
     await hass.async_block_till_done()
-    assert refresh_runs[template_one] == ["0", "1"]
-    assert refresh_runs[template_five] == ["0", "1"]
+    assert refresh_runs[template_one] == [0, 1]
+    assert refresh_runs[template_five] == [0, 1]
     next_time = dt_util.utcnow() + timedelta(seconds=0.125 * 1)
     with patch(
         "homeassistant.helpers.ratelimit.dt_util.utcnow", return_value=next_time
@@ -1687,20 +1817,21 @@ async def test_track_two_templates_with_different_rate_limits(hass):
         async_fire_time_changed(hass, next_time)
         await hass.async_block_till_done()
     await hass.async_block_till_done()
-    assert refresh_runs[template_one] == ["0", "1", "2"]
-    assert refresh_runs[template_five] == ["0", "1"]
+    assert refresh_runs[template_one] == [0, 1, 2]
+    assert refresh_runs[template_five] == [0, 1]
     hass.states.async_set("sensor.three", "any")
     await hass.async_block_till_done()
-    assert refresh_runs[template_one] == ["0", "1", "2"]
-    assert refresh_runs[template_five] == ["0", "1"]
+    assert refresh_runs[template_one] == [0, 1, 2]
+    assert refresh_runs[template_five] == [0, 1]
     hass.states.async_set("sensor.four", "any")
     await hass.async_block_till_done()
-    assert refresh_runs[template_one] == ["0", "1", "2"]
-    assert refresh_runs[template_five] == ["0", "1"]
+    assert refresh_runs[template_one] == [0, 1, 2]
+    assert refresh_runs[template_five] == [0, 1]
     hass.states.async_set("sensor.five", "any")
     await hass.async_block_till_done()
-    assert refresh_runs[template_one] == ["0", "1", "2"]
-    assert refresh_runs[template_five] == ["0", "1"]
+    assert refresh_runs[template_one] == [0, 1, 2]
+    assert refresh_runs[template_five] == [0, 1]
+    info.async_remove()
 
 
 async def test_string(hass):
@@ -1741,7 +1872,7 @@ async def test_track_template_result_refresh_cancel(hass):
     hass.states.async_set("switch.test", "off")
     await hass.async_block_till_done()
 
-    assert refresh_runs == ["False"]
+    assert refresh_runs == [False]
 
     assert len(refresh_runs) == 1
 
@@ -1809,9 +1940,9 @@ async def test_async_track_template_result_multiple_templates(hass):
 
     assert refresh_runs == [
         [
-            TrackTemplateResult(template_1, None, "True"),
-            TrackTemplateResult(template_2, None, "True"),
-            TrackTemplateResult(template_3, None, "False"),
+            TrackTemplateResult(template_1, None, True),
+            TrackTemplateResult(template_2, None, True),
+            TrackTemplateResult(template_3, None, False),
         ]
     ]
 
@@ -1821,9 +1952,9 @@ async def test_async_track_template_result_multiple_templates(hass):
 
     assert refresh_runs == [
         [
-            TrackTemplateResult(template_1, "True", "False"),
-            TrackTemplateResult(template_2, "True", "False"),
-            TrackTemplateResult(template_3, "False", "True"),
+            TrackTemplateResult(template_1, True, False),
+            TrackTemplateResult(template_2, True, False),
+            TrackTemplateResult(template_3, False, True),
         ]
     ]
 
@@ -1832,7 +1963,7 @@ async def test_async_track_template_result_multiple_templates(hass):
     await hass.async_block_till_done()
 
     assert refresh_runs == [
-        [TrackTemplateResult(template_4, None, "['binary_sensor.test']")]
+        [TrackTemplateResult(template_4, None, ["binary_sensor.test"])]
     ]
 
 
@@ -1866,10 +1997,10 @@ async def test_async_track_template_result_multiple_templates_mixing_domain(hass
 
     assert refresh_runs == [
         [
-            TrackTemplateResult(template_1, None, "True"),
-            TrackTemplateResult(template_2, None, "True"),
-            TrackTemplateResult(template_3, None, "False"),
-            TrackTemplateResult(template_4, None, "['switch.test']"),
+            TrackTemplateResult(template_1, None, True),
+            TrackTemplateResult(template_2, None, True),
+            TrackTemplateResult(template_3, None, False),
+            TrackTemplateResult(template_4, None, ["switch.test"]),
         ]
     ]
 
@@ -1879,9 +2010,9 @@ async def test_async_track_template_result_multiple_templates_mixing_domain(hass
 
     assert refresh_runs == [
         [
-            TrackTemplateResult(template_1, "True", "False"),
-            TrackTemplateResult(template_2, "True", "False"),
-            TrackTemplateResult(template_3, "False", "True"),
+            TrackTemplateResult(template_1, True, False),
+            TrackTemplateResult(template_2, True, False),
+            TrackTemplateResult(template_3, False, True),
         ]
     ]
 
@@ -1898,7 +2029,7 @@ async def test_async_track_template_result_multiple_templates_mixing_domain(hass
     assert refresh_runs == [
         [
             TrackTemplateResult(
-                template_4, "['switch.test']", "['switch.new', 'switch.test']"
+                template_4, ["switch.test"], ["switch.new", "switch.test"]
             )
         ]
     ]
@@ -1923,6 +2054,209 @@ async def test_async_track_template_result_raise_on_template_error(hass):
         )
 
 
+async def test_track_template_with_time(hass):
+    """Test tracking template with time."""
+
+    hass.states.async_set("switch.test", "on")
+    specific_runs = []
+    template_complex = Template("{{ states.switch.test.state and now() }}", hass)
+
+    def specific_run_callback(event, updates):
+        specific_runs.append(updates.pop().result)
+
+    info = async_track_template_result(
+        hass, [TrackTemplate(template_complex, None)], specific_run_callback
+    )
+    await hass.async_block_till_done()
+
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": {"switch.test"},
+        "time": True,
+    }
+
+    await hass.async_block_till_done()
+    now = dt_util.utcnow()
+    async_fire_time_changed(hass, now + timedelta(seconds=61))
+    async_fire_time_changed(hass, now + timedelta(seconds=61 * 2))
+    await hass.async_block_till_done()
+    assert specific_runs[-1] != specific_runs[0]
+    info.async_remove()
+
+
+async def test_track_template_with_time_default(hass):
+    """Test tracking template with time."""
+
+    specific_runs = []
+    template_complex = Template("{{ now() }}", hass)
+
+    def specific_run_callback(event, updates):
+        specific_runs.append(updates.pop().result)
+
+    info = async_track_template_result(
+        hass, [TrackTemplate(template_complex, None)], specific_run_callback
+    )
+    await hass.async_block_till_done()
+
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": set(),
+        "time": True,
+    }
+
+    await hass.async_block_till_done()
+    now = dt_util.utcnow()
+    async_fire_time_changed(hass, now + timedelta(seconds=2))
+    async_fire_time_changed(hass, now + timedelta(seconds=4))
+    await hass.async_block_till_done()
+    assert len(specific_runs) < 2
+    async_fire_time_changed(hass, now + timedelta(minutes=2))
+    await hass.async_block_till_done()
+    async_fire_time_changed(hass, now + timedelta(minutes=4))
+    await hass.async_block_till_done()
+    assert len(specific_runs) >= 2
+    assert specific_runs[-1] != specific_runs[0]
+    info.async_remove()
+
+
+async def test_track_template_with_time_that_leaves_scope(hass):
+    """Test tracking template with time."""
+
+    hass.states.async_set("binary_sensor.washing_machine", "on")
+    specific_runs = []
+    template_complex = Template(
+        """
+        {% if states.binary_sensor.washing_machine.state == "on" %}
+            {{ now() }}
+        {% else %}
+            {{ states.binary_sensor.washing_machine.last_updated }}
+        {% endif %}
+    """,
+        hass,
+    )
+
+    def specific_run_callback(event, updates):
+        specific_runs.append(updates.pop().result)
+
+    info = async_track_template_result(
+        hass, [TrackTemplate(template_complex, None)], specific_run_callback
+    )
+    await hass.async_block_till_done()
+
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": {"binary_sensor.washing_machine"},
+        "time": True,
+    }
+
+    hass.states.async_set("binary_sensor.washing_machine", "off")
+    await hass.async_block_till_done()
+
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": {"binary_sensor.washing_machine"},
+        "time": False,
+    }
+
+    hass.states.async_set("binary_sensor.washing_machine", "on")
+    await hass.async_block_till_done()
+
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": {"binary_sensor.washing_machine"},
+        "time": True,
+    }
+
+    # Verify we do not update before the minute rolls over
+    callback_count_before_time_change = len(specific_runs)
+    test_time = dt_util.utcnow().replace(second=1)
+    async_fire_time_changed(hass, test_time)
+    await hass.async_block_till_done()
+    async_fire_time_changed(hass, test_time + timedelta(seconds=58))
+    await hass.async_block_till_done()
+    assert len(specific_runs) == callback_count_before_time_change
+
+    # Verify we do update on the next change of minute
+    async_fire_time_changed(hass, test_time + timedelta(seconds=59))
+    await hass.async_block_till_done()
+    assert len(specific_runs) == callback_count_before_time_change + 1
+
+    info.async_remove()
+
+
+async def test_async_track_template_result_multiple_templates_mixing_listeners(hass):
+    """Test tracking multiple templates with mixing listener types."""
+
+    template_1 = Template("{{ states.switch.test.state == 'on' }}")
+    template_2 = Template("{{ now() and True }}")
+
+    refresh_runs = []
+
+    @ha.callback
+    def refresh_listener(event, updates):
+        refresh_runs.append(updates)
+
+    now = dt_util.utcnow()
+
+    time_that_will_not_match_right_away = datetime(
+        now.year + 1, 5, 24, 11, 59, 55, tzinfo=dt_util.UTC
+    )
+
+    with patch(
+        "homeassistant.util.dt.utcnow", return_value=time_that_will_not_match_right_away
+    ):
+        info = async_track_template_result(
+            hass,
+            [
+                TrackTemplate(template_1, None),
+                TrackTemplate(template_2, None),
+            ],
+            refresh_listener,
+        )
+
+    assert info.listeners == {
+        "all": False,
+        "domains": set(),
+        "entities": {"switch.test"},
+        "time": True,
+    }
+    hass.states.async_set("switch.test", "on")
+    await hass.async_block_till_done()
+
+    assert refresh_runs == [
+        [
+            TrackTemplateResult(template_1, None, True),
+        ]
+    ]
+
+    refresh_runs = []
+    hass.states.async_set("switch.test", "off")
+    await hass.async_block_till_done()
+
+    assert refresh_runs == [
+        [
+            TrackTemplateResult(template_1, True, False),
+        ]
+    ]
+
+    refresh_runs = []
+    next_time = time_that_will_not_match_right_away + timedelta(hours=25)
+    with patch("homeassistant.util.dt.utcnow", return_value=next_time):
+        async_fire_time_changed(hass, next_time)
+        await hass.async_block_till_done()
+
+    assert refresh_runs == [
+        [
+            TrackTemplateResult(template_2, None, True),
+        ]
+    ]
+
+
 async def test_track_same_state_simple_no_trigger(hass):
     """Test track_same_change with no trigger."""
     callback_runs = []
diff --git a/tests/helpers/test_reload.py b/tests/helpers/test_reload.py
index 25844151533..3ed8d17b3f4 100644
--- a/tests/helpers/test_reload.py
+++ b/tests/helpers/test_reload.py
@@ -7,8 +7,9 @@ import pytest
 from homeassistant import config
 from homeassistant.const import SERVICE_RELOAD
 from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.entity_platform import async_get_platforms
 from homeassistant.helpers.reload import (
-    async_get_platform,
+    async_get_platform_without_config_entry,
     async_integration_yaml_config,
     async_reload_integration_platforms,
     async_setup_reload_service,
@@ -52,7 +53,7 @@ async def test_reload_platform(hass):
     assert f"{DOMAIN}.{PLATFORM}" in hass.config.components
     assert len(setup_called) == 1
 
-    platform = async_get_platform(hass, PLATFORM, DOMAIN)
+    platform = async_get_platform_without_config_entry(hass, PLATFORM, DOMAIN)
     assert platform.platform_name == PLATFORM
     assert platform.domain == DOMAIN
 
@@ -66,6 +67,11 @@ async def test_reload_platform(hass):
 
     assert len(setup_called) == 2
 
+    existing_platforms = async_get_platforms(hass, PLATFORM)
+    for existing_platform in existing_platforms:
+        existing_platform.config_entry = "abc"
+    assert not async_get_platform_without_config_entry(hass, PLATFORM, DOMAIN)
+
 
 async def test_setup_reload_service(hass):
     """Test setting up a reload service."""
diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py
index 93bb249c485..8f9e3cec36c 100644
--- a/tests/helpers/test_script.py
+++ b/tests/helpers/test_script.py
@@ -39,6 +39,7 @@ def async_watch_for_action(script_obj, message):
             flag.set()
 
     script_obj.change_listener = check_action
+    assert script_obj.change_listener is check_action
     return flag
 
 
@@ -194,8 +195,8 @@ async def test_multiple_runs_no_wait(hass):
 
         calls.append(service)
         logger.debug("simulated service (%s:%s) started", fire, listen)
-        unsub = hass.bus.async_listen(listen, service_done_cb)
-        hass.bus.async_fire(fire)
+        unsub = hass.bus.async_listen(str(listen), service_done_cb)
+        hass.bus.async_fire(str(fire))
         await service_done.wait()
         unsub()
 
@@ -834,14 +835,14 @@ async def test_wait_variables_out(hass, mode, action_type):
         assert not script_obj.is_running
         assert len(events) == 1
         if action_type == "template":
-            assert events[0].data["completed"] == str(mode != "timeout_not_finish")
+            assert events[0].data["completed"] == (mode != "timeout_not_finish")
         elif mode != "timeout_not_finish":
             assert "'to_state': <state switch.test=off" in events[0].data["trigger"]
         else:
-            assert events[0].data["trigger"] == "None"
+            assert events[0].data["trigger"] is None
         remaining = events[0].data["remaining"]
         if mode == "no_timeout":
-            assert remaining == "None"
+            assert remaining is None
         elif mode == "timeout_finish":
             assert 0.0 < float(remaining) < 5
         else:
@@ -977,9 +978,9 @@ async def test_repeat_count(hass):
 
     assert len(events) == count
     for index, event in enumerate(events):
-        assert event.data.get("first") == str(index == 0)
-        assert event.data.get("index") == str(index + 1)
-        assert event.data.get("last") == str(index == count - 1)
+        assert event.data.get("first") == (index == 0)
+        assert event.data.get("index") == index + 1
+        assert event.data.get("last") == (index == count - 1)
 
 
 @pytest.mark.parametrize("condition", ["while", "until"])
@@ -1052,8 +1053,8 @@ async def test_repeat_conditional(hass, condition, direct_template):
 
     assert len(events) == count
     for index, event in enumerate(events):
-        assert event.data.get("first") == str(index == 0)
-        assert event.data.get("index") == str(index + 1)
+        assert event.data.get("first") == (index == 0)
+        assert event.data.get("index") == index + 1
 
 
 @pytest.mark.parametrize("condition", ["while", "until"])
@@ -1089,8 +1090,8 @@ async def test_repeat_var_in_condition(hass, condition):
 @pytest.mark.parametrize(
     "variables,first_last,inside_x",
     [
-        (None, {"repeat": "None", "x": "None"}, "None"),
-        (MappingProxyType({"x": 1}), {"repeat": "None", "x": "1"}, "1"),
+        (None, {"repeat": None, "x": None}, None),
+        (MappingProxyType({"x": 1}), {"repeat": None, "x": 1}, 1),
     ],
 )
 async def test_repeat_nested(hass, variables, first_last, inside_x):
@@ -1168,14 +1169,14 @@ async def test_repeat_nested(hass, variables, first_last, inside_x):
     assert events[-1].data == first_last
     for index, result in enumerate(
         (
-            ("True", "1", "False", inside_x),
-            ("True", "1", "False", inside_x),
-            ("False", "2", "True", inside_x),
-            ("True", "1", "False", inside_x),
-            ("False", "2", "True", inside_x),
-            ("True", "1", "False", inside_x),
-            ("False", "2", "True", inside_x),
-            ("False", "2", "True", inside_x),
+            (True, 1, False, inside_x),
+            (True, 1, False, inside_x),
+            (False, 2, True, inside_x),
+            (True, 1, False, inside_x),
+            (False, 2, True, inside_x),
+            (True, 1, False, inside_x),
+            (False, 2, True, inside_x),
+            (False, 2, True, inside_x),
         ),
         1,
     ):
@@ -1827,8 +1828,8 @@ async def test_set_redefines_variable(hass, caplog):
     await script_obj.async_run(context=Context())
     await hass.async_block_till_done()
 
-    assert mock_calls[0].data["value"] == "1"
-    assert mock_calls[1].data["value"] == "2"
+    assert mock_calls[0].data["value"] == 1
+    assert mock_calls[1].data["value"] == 2
 
 
 async def test_validate_action_config(hass):
diff --git a/tests/helpers/test_script_variables.py b/tests/helpers/test_script_variables.py
index 20a70cb33eb..1c9b270978c 100644
--- a/tests/helpers/test_script_variables.py
+++ b/tests/helpers/test_script_variables.py
@@ -50,7 +50,7 @@ async def test_template_vars(hass):
     """Test template vars."""
     var = cv.SCRIPT_VARIABLES_SCHEMA({"hello": "{{ 1 + 1 }}"})
     rendered = var.async_render(hass, None)
-    assert rendered == {"hello": "2"}
+    assert rendered == {"hello": 2}
 
 
 async def test_template_vars_run_args(hass):
@@ -70,7 +70,7 @@ async def test_template_vars_run_args(hass):
     )
     assert rendered == {
         "run_var_ex": 5,
-        "something": "6",
+        "something": 6,
         "something_2": 1,
     }
 
@@ -79,7 +79,7 @@ async def test_template_vars_no_default(hass):
     """Test template vars."""
     var = cv.SCRIPT_VARIABLES_SCHEMA({"hello": "{{ 1 + 1 }}"})
     rendered = var.async_render(hass, None, render_as_defaults=False)
-    assert rendered == {"hello": "2"}
+    assert rendered == {"hello": 2}
 
 
 async def test_template_vars_run_args_no_default(hass):
@@ -100,8 +100,8 @@ async def test_template_vars_run_args_no_default(hass):
     )
     assert rendered == {
         "run_var_ex": 5,
-        "something": "6",
-        "something_2": "6",
+        "something": 6,
+        "something_2": 6,
     }
 
 
diff --git a/tests/helpers/test_singleton.py b/tests/helpers/test_singleton.py
new file mode 100644
index 00000000000..03230a02ab8
--- /dev/null
+++ b/tests/helpers/test_singleton.py
@@ -0,0 +1,40 @@
+"""Test singleton helper."""
+import pytest
+
+from homeassistant.helpers import singleton
+
+from tests.async_mock import Mock
+
+
+@pytest.fixture
+def mock_hass():
+    """Mock hass fixture."""
+    return Mock(data={})
+
+
+async def test_singleton_async(mock_hass):
+    """Test singleton with async function."""
+
+    @singleton.singleton("test_key")
+    async def something(hass):
+        return object()
+
+    result1 = await something(mock_hass)
+    result2 = await something(mock_hass)
+    assert result1 is result2
+    assert "test_key" in mock_hass.data
+    assert mock_hass.data["test_key"] is result1
+
+
+def test_singleton(mock_hass):
+    """Test singleton with function."""
+
+    @singleton.singleton("test_key")
+    def something(hass):
+        return object()
+
+    result1 = something(mock_hass)
+    result2 = something(mock_hass)
+    assert result1 is result2
+    assert "test_key" in mock_hass.data
+    assert mock_hass.data["test_key"] is result1
diff --git a/tests/helpers/test_template.py b/tests/helpers/test_template.py
index 9a0b7c60ea0..e3eafda52f1 100644
--- a/tests/helpers/test_template.py
+++ b/tests/helpers/test_template.py
@@ -5,8 +5,10 @@ import random
 
 import pytest
 import pytz
+import voluptuous as vol
 
 from homeassistant.components import group
+from homeassistant.config import async_process_ha_core_config
 from homeassistant.const import (
     ATTR_UNIT_OF_MEASUREMENT,
     LENGTH_METERS,
@@ -149,7 +151,7 @@ def test_iterating_all_states(hass):
 
     info = render_to_info(hass, tmpl_str)
     assert_result_info(info, "", all_states=True)
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert info.rate_limit == template.ALL_STATES_RATE_LIMIT
 
     hass.states.async_set("test.object", "happy")
     hass.states.async_set("sensor.temperature", 10)
@@ -167,13 +169,13 @@ def test_iterating_all_states_unavailable(hass):
     info = render_to_info(hass, tmpl_str)
 
     assert info.all_states is True
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert info.rate_limit == template.ALL_STATES_RATE_LIMIT
 
     hass.states.async_set("test.object", "unknown")
     hass.states.async_set("sensor.temperature", 10)
 
     info = render_to_info(hass, tmpl_str)
-    assert_result_info(info, "1", entities=[], all_states=True)
+    assert_result_info(info, 1, entities=[], all_states=True)
 
 
 def test_iterating_domain_states(hass):
@@ -182,7 +184,7 @@ def test_iterating_domain_states(hass):
 
     info = render_to_info(hass, tmpl_str)
     assert_result_info(info, "", domains=["sensor"])
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert info.rate_limit == template.DOMAIN_STATES_RATE_LIMIT
 
     hass.states.async_set("test.object", "happy")
     hass.states.async_set("sensor.back_door", "open")
@@ -205,14 +207,14 @@ def test_float(hass):
         template.Template(
             "{{ float(states.sensor.temperature.state) }}", hass
         ).async_render()
-        == "12.0"
+        == 12.0
     )
 
     assert (
         template.Template(
             "{{ float(states.sensor.temperature.state) > 11 }}", hass
         ).async_render()
-        == "True"
+        is True
     )
 
     assert (
@@ -229,41 +231,41 @@ def test_rounding_value(hass):
         template.Template(
             "{{ states.sensor.temperature.state | round(1) }}", hass
         ).async_render()
-        == "12.8"
+        == 12.8
     )
 
     assert (
         template.Template(
             "{{ states.sensor.temperature.state | multiply(10) | round }}", hass
         ).async_render()
-        == "128"
+        == 128
     )
 
     assert (
         template.Template(
             '{{ states.sensor.temperature.state | round(1, "floor") }}', hass
         ).async_render()
-        == "12.7"
+        == 12.7
     )
 
     assert (
         template.Template(
             '{{ states.sensor.temperature.state | round(1, "ceil") }}', hass
         ).async_render()
-        == "12.8"
+        == 12.8
     )
 
     assert (
         template.Template(
             '{{ states.sensor.temperature.state | round(1, "half") }}', hass
         ).async_render()
-        == "13.0"
+        == 13.0
     )
 
 
 def test_rounding_value_get_original_value_on_error(hass):
     """Test rounding value get original value on error."""
-    assert template.Template("{{ None | round }}", hass).async_render() == "None"
+    assert template.Template("{{ None | round }}", hass).async_render() is None
 
     assert (
         template.Template('{{ "no_number" | round }}', hass).async_render()
@@ -273,7 +275,7 @@ def test_rounding_value_get_original_value_on_error(hass):
 
 def test_multiply(hass):
     """Test multiply."""
-    tests = {None: "None", 10: "100", '"abcd"': "abcd"}
+    tests = {None: None, 10: 100, '"abcd"': "abcd"}
 
     for inp, out in tests.items():
         assert (
@@ -287,11 +289,11 @@ def test_multiply(hass):
 def test_logarithm(hass):
     """Test logarithm."""
     tests = [
-        (4, 2, "2.0"),
-        (1000, 10, "3.0"),
-        (math.e, "", "1.0"),
+        (4, 2, 2.0),
+        (1000, 10, 3.0),
+        (math.e, "", 1.0),
         ('"invalid"', "_", "invalid"),
-        (10, '"invalid"', "10.0"),
+        (10, '"invalid"', 10.0),
     ]
 
     for value, base, expected in tests:
@@ -313,11 +315,11 @@ def test_logarithm(hass):
 def test_sine(hass):
     """Test sine."""
     tests = [
-        (0, "0.0"),
-        (math.pi / 2, "1.0"),
-        (math.pi, "0.0"),
-        (math.pi * 1.5, "-1.0"),
-        (math.pi / 10, "0.309"),
+        (0, 0.0),
+        (math.pi / 2, 1.0),
+        (math.pi, 0.0),
+        (math.pi * 1.5, -1.0),
+        (math.pi / 10, 0.309),
         ('"duck"', "duck"),
     ]
 
@@ -331,11 +333,11 @@ def test_sine(hass):
 def test_cos(hass):
     """Test cosine."""
     tests = [
-        (0, "1.0"),
-        (math.pi / 2, "0.0"),
-        (math.pi, "-1.0"),
-        (math.pi * 1.5, "-0.0"),
-        (math.pi / 10, "0.951"),
+        (0, 1.0),
+        (math.pi / 2, 0.0),
+        (math.pi, -1.0),
+        (math.pi * 1.5, -0.0),
+        (math.pi / 10, 0.951),
         ("'error'", "error"),
     ]
 
@@ -349,11 +351,11 @@ def test_cos(hass):
 def test_tan(hass):
     """Test tangent."""
     tests = [
-        (0, "0.0"),
-        (math.pi, "-0.0"),
-        (math.pi / 180 * 45, "1.0"),
-        (math.pi / 180 * 90, "1.633123935319537e+16"),
-        (math.pi / 180 * 135, "-1.0"),
+        (0, 0.0),
+        (math.pi, -0.0),
+        (math.pi / 180 * 45, 1.0),
+        (math.pi / 180 * 90, 1.633123935319537e16),
+        (math.pi / 180 * 135, -1.0),
         ("'error'", "error"),
     ]
 
@@ -367,11 +369,11 @@ def test_tan(hass):
 def test_sqrt(hass):
     """Test square root."""
     tests = [
-        (0, "0.0"),
-        (1, "1.0"),
-        (2, "1.414"),
-        (10, "3.162"),
-        (100, "10.0"),
+        (0, 0.0),
+        (1, 1.0),
+        (2, 1.414),
+        (10, 3.162),
+        (100, 10.0),
         ("'error'", "error"),
     ]
 
@@ -385,13 +387,13 @@ def test_sqrt(hass):
 def test_arc_sine(hass):
     """Test arcus sine."""
     tests = [
-        (-2.0, "-2.0"),  # value error
-        (-1.0, "-1.571"),
-        (-0.5, "-0.524"),
-        (0.0, "0.0"),
-        (0.5, "0.524"),
-        (1.0, "1.571"),
-        (2.0, "2.0"),  # value error
+        (-2.0, -2.0),  # value error
+        (-1.0, -1.571),
+        (-0.5, -0.524),
+        (0.0, 0.0),
+        (0.5, 0.524),
+        (1.0, 1.571),
+        (2.0, 2.0),  # value error
         ('"error"', "error"),
     ]
 
@@ -405,13 +407,13 @@ def test_arc_sine(hass):
 def test_arc_cos(hass):
     """Test arcus cosine."""
     tests = [
-        (-2.0, "-2.0"),  # value error
-        (-1.0, "3.142"),
-        (-0.5, "2.094"),
-        (0.0, "1.571"),
-        (0.5, "1.047"),
-        (1.0, "0.0"),
-        (2.0, "2.0"),  # value error
+        (-2.0, -2.0),  # value error
+        (-1.0, 3.142),
+        (-0.5, 2.094),
+        (0.0, 1.571),
+        (0.5, 1.047),
+        (1.0, 0.0),
+        (2.0, 2.0),  # value error
         ('"error"', "error"),
     ]
 
@@ -425,15 +427,15 @@ def test_arc_cos(hass):
 def test_arc_tan(hass):
     """Test arcus tangent."""
     tests = [
-        (-10.0, "-1.471"),
-        (-2.0, "-1.107"),
-        (-1.0, "-0.785"),
-        (-0.5, "-0.464"),
-        (0.0, "0.0"),
-        (0.5, "0.464"),
-        (1.0, "0.785"),
-        (2.0, "1.107"),
-        (10.0, "1.471"),
+        (-10.0, -1.471),
+        (-2.0, -1.107),
+        (-1.0, -0.785),
+        (-0.5, -0.464),
+        (0.0, 0.0),
+        (0.5, 0.464),
+        (1.0, 0.785),
+        (2.0, 1.107),
+        (10.0, 1.471),
         ('"error"', "error"),
     ]
 
@@ -447,19 +449,19 @@ def test_arc_tan(hass):
 def test_arc_tan2(hass):
     """Test two parameter version of arcus tangent."""
     tests = [
-        (-10.0, -10.0, "-2.356"),
-        (-10.0, 0.0, "-1.571"),
-        (-10.0, 10.0, "-0.785"),
-        (0.0, -10.0, "3.142"),
-        (0.0, 0.0, "0.0"),
-        (0.0, 10.0, "0.0"),
-        (10.0, -10.0, "2.356"),
-        (10.0, 0.0, "1.571"),
-        (10.0, 10.0, "0.785"),
-        (-4.0, 3.0, "-0.927"),
-        (-1.0, 2.0, "-0.464"),
-        (2.0, 1.0, "1.107"),
-        ('"duck"', '"goose"', "('duck', 'goose')"),
+        (-10.0, -10.0, -2.356),
+        (-10.0, 0.0, -1.571),
+        (-10.0, 10.0, -0.785),
+        (0.0, -10.0, 3.142),
+        (0.0, 0.0, 0.0),
+        (0.0, 10.0, 0.0),
+        (10.0, -10.0, 2.356),
+        (10.0, 0.0, 1.571),
+        (10.0, 10.0, 0.785),
+        (-4.0, 3.0, -0.927),
+        (-1.0, 2.0, -0.464),
+        (2.0, 1.0, 1.107),
+        ('"duck"', '"goose"', ("duck", "goose")),
     ]
 
     for y, x, expected in tests:
@@ -486,26 +488,26 @@ def test_strptime(hass):
         ("2016-10-19", "%Y-%m-%d", None),
         ("2016", "%Y", None),
         ("15:22:05", "%H:%M:%S", None),
-        ("1469119144", "%Y", "1469119144"),
+        ("1469119144", "%Y", 1469119144),
         ("invalid", "%Y", "invalid"),
     ]
 
     for inp, fmt, expected in tests:
         if expected is None:
-            expected = datetime.strptime(inp, fmt)
+            expected = str(datetime.strptime(inp, fmt))
 
         temp = f"{{{{ strptime('{inp}', '{fmt}') }}}}"
 
-        assert template.Template(temp, hass).async_render() == str(expected)
+        assert template.Template(temp, hass).async_render() == expected
 
 
 def test_timestamp_custom(hass):
     """Test the timestamps to custom filter."""
     now = dt_util.utcnow()
     tests = [
-        (None, None, None, "None"),
+        (None, None, None, None),
         (1469119144, None, True, "2016-07-21 16:39:04"),
-        (1469119144, "%Y", True, "2016"),
+        (1469119144, "%Y", True, 2016),
         (1469119144, "invalid", True, "invalid"),
         (dt_util.as_timestamp(now), None, False, now.strftime("%Y-%m-%d %H:%M:%S")),
     ]
@@ -523,7 +525,7 @@ def test_timestamp_custom(hass):
 
 def test_timestamp_local(hass):
     """Test the timestamps to local filter."""
-    tests = {None: "None", 1469119144: "2016-07-21 16:39:04"}
+    tests = {None: None, 1469119144: "2016-07-21 16:39:04"}
 
     for inp, out in tests.items():
         assert (
@@ -550,7 +552,7 @@ def test_to_json(hass):
 
     # Note that we're not testing the actual json.loads and json.dumps methods,
     # only the filters, so we don't need to be exhaustive with our sample JSON.
-    expected_result = '{"Foo": "Bar"}'
+    expected_result = {"Foo": "Bar"}
     actual_result = template.Template(
         "{{ {'Foo': 'Bar'} | to_json }}", hass
     ).async_render()
@@ -571,17 +573,17 @@ def test_from_json(hass):
 
 def test_min(hass):
     """Test the min filter."""
-    assert template.Template("{{ [1, 2, 3] | min }}", hass).async_render() == "1"
+    assert template.Template("{{ [1, 2, 3] | min }}", hass).async_render() == 1
 
 
 def test_max(hass):
     """Test the max filter."""
-    assert template.Template("{{ [1, 2, 3] | max }}", hass).async_render() == "3"
+    assert template.Template("{{ [1, 2, 3] | max }}", hass).async_render() == 3
 
 
 def test_ord(hass):
     """Test the ord filter."""
-    assert template.Template('{{ "d" | ord }}', hass).async_render() == "100"
+    assert template.Template('{{ "d" | ord }}', hass).async_render() == 100
 
 
 def test_base64_encode(hass):
@@ -626,7 +628,7 @@ def test_timestamp_utc(hass):
     """Test the timestamps to local filter."""
     now = dt_util.utcnow()
     tests = {
-        None: "None",
+        None: None,
         1469119144: "2016-07-21 16:39:04",
         dt_util.as_timestamp(now): now.strftime("%Y-%m-%d %H:%M:%S"),
     }
@@ -641,20 +643,19 @@ def test_timestamp_utc(hass):
 def test_as_timestamp(hass):
     """Test the as_timestamp function."""
     assert (
-        template.Template('{{ as_timestamp("invalid") }}', hass).async_render()
-        == "None"
+        template.Template('{{ as_timestamp("invalid") }}', hass).async_render() is None
     )
     hass.mock = None
     assert (
         template.Template("{{ as_timestamp(states.mock) }}", hass).async_render()
-        == "None"
+        is None
     )
 
     tpl = (
         '{{ as_timestamp(strptime("2024-02-03T09:10:24+0000", '
         '"%Y-%m-%dT%H:%M:%S%z")) }}'
     )
-    assert template.Template(tpl, hass).async_render() == "1706951424.0"
+    assert template.Template(tpl, hass).async_render() == 1706951424.0
 
 
 @patch.object(random, "choice")
@@ -669,22 +670,19 @@ def test_random_every_time(test_choice, hass):
 
 def test_passing_vars_as_keywords(hass):
     """Test passing variables as keywords."""
-    assert template.Template("{{ hello }}", hass).async_render(hello=127) == "127"
+    assert template.Template("{{ hello }}", hass).async_render(hello=127) == 127
 
 
 def test_passing_vars_as_vars(hass):
     """Test passing variables as variables."""
-    assert template.Template("{{ hello }}", hass).async_render({"hello": 127}) == "127"
+    assert template.Template("{{ hello }}", hass).async_render({"hello": 127}) == 127
 
 
 def test_passing_vars_as_list(hass):
     """Test passing variables as list."""
-    assert (
-        template.render_complex(
-            template.Template("{{ hello }}", hass), {"hello": ["foo", "bar"]}
-        )
-        == "['foo', 'bar']"
-    )
+    assert template.render_complex(
+        template.Template("{{ hello }}", hass), {"hello": ["foo", "bar"]}
+    ) == ["foo", "bar"]
 
 
 def test_passing_vars_as_list_element(hass):
@@ -709,12 +707,9 @@ def test_passing_vars_as_dict_element(hass):
 
 def test_passing_vars_as_dict(hass):
     """Test passing variables as list."""
-    assert (
-        template.render_complex(
-            template.Template("{{ hello }}", hass), {"hello": {"foo": "bar"}}
-        )
-        == "{'foo': 'bar'}"
-    )
+    assert template.render_complex(
+        template.Template("{{ hello }}", hass), {"hello": {"foo": "bar"}}
+    ) == {"foo": "bar"}
 
 
 def test_render_with_possible_json_value_with_valid_json(hass):
@@ -801,7 +796,7 @@ def test_is_state(hass):
         """,
         hass,
     )
-    assert tpl.async_render() == "False"
+    assert tpl.async_render() is False
 
 
 def test_is_state_attr(hass):
@@ -821,7 +816,7 @@ def test_is_state_attr(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == "False"
+    assert tpl.async_render() is False
 
 
 def test_state_attr(hass):
@@ -841,7 +836,7 @@ def test_state_attr(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == "True"
+    assert tpl.async_render() is True
 
 
 def test_states_function(hass):
@@ -862,10 +857,26 @@ def test_now(mock_is_safe, hass):
     """Test now method."""
     now = dt_util.now()
     with patch("homeassistant.util.dt.now", return_value=now):
-        assert (
-            now.isoformat()
-            == template.Template("{{ now().isoformat() }}", hass).async_render()
-        )
+        info = template.Template("{{ now().isoformat() }}", hass).async_render_to_info()
+        assert now.isoformat() == info.result()
+
+    assert info.has_time is True
+
+
+@patch(
+    "homeassistant.helpers.template.TemplateEnvironment.is_safe_callable",
+    return_value=True,
+)
+def test_utcnow(mock_is_safe, hass):
+    """Test now method."""
+    utcnow = dt_util.utcnow()
+    with patch("homeassistant.util.dt.utcnow", return_value=utcnow):
+        info = template.Template(
+            "{{ utcnow().isoformat() }}", hass
+        ).async_render_to_info()
+        assert utcnow.isoformat() == info.result()
+
+    assert info.has_time is True
 
 
 @patch(
@@ -972,20 +983,6 @@ def test_timedelta(mock_is_safe, hass):
         )
 
 
-@patch(
-    "homeassistant.helpers.template.TemplateEnvironment.is_safe_callable",
-    return_value=True,
-)
-def test_utcnow(mock_is_safe, hass):
-    """Test utcnow method."""
-    now = dt_util.utcnow()
-    with patch("homeassistant.util.dt.utcnow", return_value=now):
-        assert (
-            now.isoformat()
-            == template.Template("{{ utcnow().isoformat() }}", hass).async_render()
-        )
-
-
 def test_regex_match(hass):
     """Test regex_match method."""
     tpl = template.Template(
@@ -994,7 +991,7 @@ def test_regex_match(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == "True"
+    assert tpl.async_render() is True
 
     tpl = template.Template(
         """
@@ -1002,7 +999,7 @@ def test_regex_match(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == "True"
+    assert tpl.async_render() is True
 
     tpl = template.Template(
         """
@@ -1010,7 +1007,7 @@ def test_regex_match(hass):
                     """,
         hass,
     )
-    assert tpl.async_render() == "False"
+    assert tpl.async_render() is False
 
     tpl = template.Template(
         """
@@ -1018,7 +1015,7 @@ def test_regex_match(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == "True"
+    assert tpl.async_render() is True
 
 
 def test_regex_search(hass):
@@ -1029,7 +1026,7 @@ def test_regex_search(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == "True"
+    assert tpl.async_render() is True
 
     tpl = template.Template(
         """
@@ -1037,7 +1034,7 @@ def test_regex_search(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == "True"
+    assert tpl.async_render() is True
 
     tpl = template.Template(
         """
@@ -1045,7 +1042,7 @@ def test_regex_search(hass):
                     """,
         hass,
     )
-    assert tpl.async_render() == "True"
+    assert tpl.async_render() is True
 
     tpl = template.Template(
         """
@@ -1053,7 +1050,7 @@ def test_regex_search(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == "True"
+    assert tpl.async_render() is True
 
 
 def test_regex_replace(hass):
@@ -1072,7 +1069,7 @@ def test_regex_replace(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == "['Home Assistant test']"
+    assert tpl.async_render() == ["Home Assistant test"]
 
 
 def test_regex_findall_index(hass):
@@ -1110,21 +1107,21 @@ def test_bitwise_and(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == str(8 & 8)
+    assert tpl.async_render() == 8 & 8
     tpl = template.Template(
         """
 {{ 10 | bitwise_and(2) }}
             """,
         hass,
     )
-    assert tpl.async_render() == str(10 & 2)
+    assert tpl.async_render() == 10 & 2
     tpl = template.Template(
         """
 {{ 8 | bitwise_and(2) }}
             """,
         hass,
     )
-    assert tpl.async_render() == str(8 & 2)
+    assert tpl.async_render() == 8 & 2
 
 
 def test_bitwise_or(hass):
@@ -1135,21 +1132,21 @@ def test_bitwise_or(hass):
             """,
         hass,
     )
-    assert tpl.async_render() == str(8 | 8)
+    assert tpl.async_render() == 8 | 8
     tpl = template.Template(
         """
 {{ 10 | bitwise_or(2) }}
             """,
         hass,
     )
-    assert tpl.async_render() == str(10 | 2)
+    assert tpl.async_render() == 10 | 2
     tpl = template.Template(
         """
 {{ 8 | bitwise_or(2) }}
             """,
         hass,
     )
-    assert tpl.async_render() == str(8 | 2)
+    assert tpl.async_render() == 8 | 2
 
 
 def test_distance_function_with_1_state(hass):
@@ -1159,7 +1156,7 @@ def test_distance_function_with_1_state(hass):
         "test.object", "happy", {"latitude": 32.87336, "longitude": -117.22943}
     )
     tpl = template.Template("{{ distance(states.test.object) | round }}", hass)
-    assert tpl.async_render() == "187"
+    assert tpl.async_render() == 187
 
 
 def test_distance_function_with_2_states(hass):
@@ -1176,14 +1173,14 @@ def test_distance_function_with_2_states(hass):
     tpl = template.Template(
         "{{ distance(states.test.object, states.test.object_2) | round }}", hass
     )
-    assert tpl.async_render() == "187"
+    assert tpl.async_render() == 187
 
 
 def test_distance_function_with_1_coord(hass):
     """Test distance function with 1 coord."""
     _set_up_units(hass)
     tpl = template.Template('{{ distance("32.87336", "-117.22943") | round }}', hass)
-    assert tpl.async_render() == "187"
+    assert tpl.async_render() == 187
 
 
 def test_distance_function_with_2_coords(hass):
@@ -1195,7 +1192,7 @@ def test_distance_function_with_2_coords(hass):
             % (hass.config.latitude, hass.config.longitude),
             hass,
         ).async_render()
-        == "187"
+        == 187
     )
 
 
@@ -1211,29 +1208,29 @@ def test_distance_function_with_1_state_1_coord(hass):
         '{{ distance("32.87336", "-117.22943", states.test.object_2) ' "| round }}",
         hass,
     )
-    assert tpl.async_render() == "187"
+    assert tpl.async_render() == 187
 
     tpl2 = template.Template(
         '{{ distance(states.test.object_2, "32.87336", "-117.22943") ' "| round }}",
         hass,
     )
-    assert tpl2.async_render() == "187"
+    assert tpl2.async_render() == 187
 
 
 def test_distance_function_return_none_if_invalid_state(hass):
     """Test distance function return None if invalid state."""
     hass.states.async_set("test.object_2", "happy", {"latitude": 10})
     tpl = template.Template("{{ distance(states.test.object_2) | round }}", hass)
-    assert tpl.async_render() == "None"
+    assert tpl.async_render() is None
 
 
 def test_distance_function_return_none_if_invalid_coord(hass):
     """Test distance function return None if invalid coord."""
     assert (
-        template.Template('{{ distance("123", "abc") }}', hass).async_render() == "None"
+        template.Template('{{ distance("123", "abc") }}', hass).async_render() is None
     )
 
-    assert template.Template('{{ distance("123") }}', hass).async_render() == "None"
+    assert template.Template('{{ distance("123") }}', hass).async_render() is None
 
     hass.states.async_set(
         "test.object_2",
@@ -1241,7 +1238,7 @@ def test_distance_function_return_none_if_invalid_coord(hass):
         {"latitude": hass.config.latitude, "longitude": hass.config.longitude},
     )
     tpl = template.Template('{{ distance("123", states.test_object_2) }}', hass)
-    assert tpl.async_render() == "None"
+    assert tpl.async_render() is None
 
 
 def test_distance_function_with_2_entity_ids(hass):
@@ -1258,7 +1255,7 @@ def test_distance_function_with_2_entity_ids(hass):
     tpl = template.Template(
         '{{ distance("test.object", "test.object_2") | round }}', hass
     )
-    assert tpl.async_render() == "187"
+    assert tpl.async_render() == 187
 
 
 def test_distance_function_with_1_entity_1_coord(hass):
@@ -1272,7 +1269,7 @@ def test_distance_function_with_1_entity_1_coord(hass):
     tpl = template.Template(
         '{{ distance("test.object", "32.87336", "-117.22943") | round }}', hass
     )
-    assert tpl.async_render() == "187"
+    assert tpl.async_render() == 187
 
 
 def test_closest_function_home_vs_domain(hass):
@@ -1400,11 +1397,11 @@ async def test_closest_function_home_vs_group_state(hass):
 async def test_expand(hass):
     """Test expand function."""
     info = render_to_info(hass, "{{ expand('test.object') }}")
-    assert_result_info(info, "[]", ["test.object"])
+    assert_result_info(info, [], ["test.object"])
     assert info.rate_limit is None
 
     info = render_to_info(hass, "{{ expand(56) }}")
-    assert_result_info(info, "[]")
+    assert_result_info(info, [])
     assert info.rate_limit is None
 
     hass.states.async_set("test.object", "happy")
@@ -1426,7 +1423,7 @@ async def test_expand(hass):
         hass, "{{ expand(states.group) | map(attribute='entity_id') | join(', ') }}"
     )
     assert_result_info(info, "", [], ["group"])
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert info.rate_limit == template.DOMAIN_STATES_RATE_LIMIT
 
     assert await async_setup_component(hass, "group", {})
     await hass.async_block_till_done()
@@ -1443,7 +1440,7 @@ async def test_expand(hass):
         hass, "{{ expand(states.group) | map(attribute='entity_id') | join(', ') }}"
     )
     assert_result_info(info, "test.object", {"test.object"}, ["group"])
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert info.rate_limit == template.DOMAIN_STATES_RATE_LIMIT
 
     info = render_to_info(
         hass,
@@ -1476,7 +1473,7 @@ async def test_expand(hass):
     )
     assert_result_info(
         info,
-        str(200.2 + 400.4),
+        200.2 + 400.4,
         {"group.power_sensors", "sensor.power_1", "sensor.power_2", "sensor.power_3"},
     )
     assert info.rate_limit is None
@@ -1593,8 +1590,8 @@ def test_async_render_to_info_with_complex_branching(hass):
         {"otherdomain": "sensor"},
     )
 
-    assert_result_info(info, "['sensor.a']", {"light.a", "light.b"}, {"sensor"})
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert_result_info(info, ["sensor.a"], {"light.a", "light.b"}, {"sensor"})
+    assert info.rate_limit == template.DOMAIN_STATES_RATE_LIMIT
 
 
 async def test_async_render_to_info_with_wildcard_matching_entity_id(hass):
@@ -1616,7 +1613,7 @@ async def test_async_render_to_info_with_wildcard_matching_entity_id(hass):
     assert info.domains == {"cover"}
     assert info.entities == set()
     assert info.all_states is False
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert info.rate_limit == template.DOMAIN_STATES_RATE_LIMIT
 
 
 async def test_async_render_to_info_with_wildcard_matching_state(hass):
@@ -1635,13 +1632,14 @@ async def test_async_render_to_info_with_wildcard_matching_state(hass):
     hass.states.async_set("cover.office_skylight", "open")
     hass.states.async_set("cover.x_skylight", "open")
     hass.states.async_set("binary_sensor.door", "open")
+    await hass.async_block_till_done()
 
     info = render_to_info(hass, template_complex_str)
 
     assert not info.domains
     assert info.entities == set()
     assert info.all_states is True
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert info.rate_limit == template.ALL_STATES_RATE_LIMIT
 
     hass.states.async_set("binary_sensor.door", "closed")
     info = render_to_info(hass, template_complex_str)
@@ -1649,7 +1647,7 @@ async def test_async_render_to_info_with_wildcard_matching_state(hass):
     assert not info.domains
     assert info.entities == set()
     assert info.all_states is True
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert info.rate_limit == template.ALL_STATES_RATE_LIMIT
 
     template_cover_str = """
 
@@ -1666,7 +1664,7 @@ async def test_async_render_to_info_with_wildcard_matching_state(hass):
     assert info.domains == {"cover"}
     assert info.entities == set()
     assert info.all_states is False
-    assert info.rate_limit == template.DEFAULT_RATE_LIMIT
+    assert info.rate_limit == template.DOMAIN_STATES_RATE_LIMIT
 
 
 def test_nested_async_render_to_info_case(hass):
@@ -1820,7 +1818,7 @@ def test_closest_function_invalid_state(hass):
     for state in ("states.zone.non_existing", '"zone.non_existing"'):
         assert (
             template.Template("{{ closest(%s, states) }}" % state, hass).async_render()
-            == "None"
+            is None
         )
 
 
@@ -1836,7 +1834,7 @@ def test_closest_function_state_with_invalid_location(hass):
         template.Template(
             "{{ closest(states.test_domain.closest_home, states) }}", hass
         ).async_render()
-        == "None"
+        is None
     )
 
 
@@ -1855,13 +1853,13 @@ def test_closest_function_invalid_coordinates(hass):
         template.Template(
             '{{ closest("invalid", "coord", states) }}', hass
         ).async_render()
-        == "None"
+        is None
     )
     assert (
         template.Template(
             '{{ states | closest("invalid", "coord") }}', hass
         ).async_render()
-        == "None"
+        is None
     )
 
 
@@ -2004,7 +2002,7 @@ async def test_async_render_to_info_in_conditional(hass):
 
     tmp = template.Template(template_str, hass)
     info = tmp.async_render_to_info()
-    assert_result_info(info, "False", ["sensor.xyz"], [])
+    assert_result_info(info, False, ["sensor.xyz"], [])
 
     hass.states.async_set("sensor.xyz", "dog")
     hass.states.async_set("sensor.cow", "True")
@@ -2020,7 +2018,7 @@ async def test_async_render_to_info_in_conditional(hass):
 
     tmp = template.Template(template_str, hass)
     info = tmp.async_render_to_info()
-    assert_result_info(info, "True", ["sensor.xyz", "sensor.cow"], [])
+    assert_result_info(info, True, ["sensor.xyz", "sensor.cow"], [])
 
     hass.states.async_set("sensor.xyz", "sheep")
     hass.states.async_set("sensor.pig", "oink")
@@ -2327,17 +2325,17 @@ def test_length_of_states(hass):
     hass.states.async_set("climate.test2", "cooling")
 
     tpl = template.Template("{{ states | length }}", hass)
-    assert tpl.async_render() == "3"
+    assert tpl.async_render() == 3
 
     tpl = template.Template("{{ states.sensor | length }}", hass)
-    assert tpl.async_render() == "2"
+    assert tpl.async_render() == 2
 
 
 def test_render_complex_handling_non_template_values(hass):
     """Test that we can render non-template fields."""
     assert template.render_complex(
         {True: 1, False: template.Template("{{ hello }}", hass)}, {"hello": 2}
-    ) == {True: 1, False: "2"}
+    ) == {True: 1, False: 2}
 
 
 def test_urlencode(hass):
@@ -2464,6 +2462,18 @@ async def test_lifecycle(hass):
     hass.states.async_set("sun.sun", "above", {"elevation": 50, "next_rising": "later"})
     for i in range(2):
         hass.states.async_set(f"sensor.sensor{i}", "on")
+    hass.states.async_set("sensor.removed", "off")
+
+    await hass.async_block_till_done()
+
+    hass.states.async_set("sun.sun", "below", {"elevation": 60, "next_rising": "later"})
+    for i in range(2):
+        hass.states.async_set(f"sensor.sensor{i}", "off")
+
+    hass.states.async_set("sensor.new", "off")
+    hass.states.async_remove("sensor.removed")
+
+    await hass.async_block_till_done()
 
     tmp = template.Template("{{ states | count }}", hass)
 
@@ -2471,6 +2481,8 @@ async def test_lifecycle(hass):
     assert info.all_states is False
     assert info.all_states_lifecycle is True
     assert info.rate_limit is None
+    assert info.has_time is False
+
     assert info.entities == set()
     assert info.domains == set()
     assert info.domains_lifecycle == set()
@@ -2545,9 +2557,15 @@ async def test_template_errors(hass):
     with pytest.raises(TemplateError):
         template.Template("{{ now() | rando }}", hass).async_render()
 
+    with pytest.raises(TemplateError):
+        template.Template("{{ utcnow() | rando }}", hass).async_render()
+
     with pytest.raises(TemplateError):
         template.Template("{{ now() | random }}", hass).async_render()
 
+    with pytest.raises(TemplateError):
+        template.Template("{{ utcnow() | random }}", hass).async_render()
+
 
 async def test_state_attributes(hass):
     """Test state attributes."""
@@ -2581,7 +2599,7 @@ async def test_state_attributes(hass):
         "{{ states.sensor.test.state_with_unit }}",
         hass,
     )
-    assert tpl.async_render() == "23"
+    assert tpl.async_render() == 23
 
     tpl = template.Template(
         "{{ states.sensor.test.invalid_prop }}",
@@ -2618,3 +2636,81 @@ async def test_unavailable_states(hass):
         hass,
     )
     assert tpl.async_render() == "light.none, light.unavailable, light.unknown"
+
+
+async def test_legacy_templates(hass):
+    """Test if old template behavior works when legacy templates are enabled."""
+    hass.states.async_set("sensor.temperature", "12")
+
+    assert (
+        template.Template("{{ states.sensor.temperature.state }}", hass).async_render()
+        == 12
+    )
+
+    await async_process_ha_core_config(hass, {"legacy_templates": True})
+    assert (
+        template.Template("{{ states.sensor.temperature.state }}", hass).async_render()
+        == "12"
+    )
+
+
+async def test_no_result_parsing(hass):
+    """Test if templates results are not parsed."""
+    hass.states.async_set("sensor.temperature", "12")
+
+    assert (
+        template.Template("{{ states.sensor.temperature.state }}", hass).async_render(
+            parse_result=False
+        )
+        == "12"
+    )
+
+    assert (
+        template.Template("{{ false }}", hass).async_render(parse_result=False)
+        == "False"
+    )
+
+    assert (
+        template.Template("{{ [1, 2, 3] }}", hass).async_render(parse_result=False)
+        == "[1, 2, 3]"
+    )
+
+
+async def test_is_static_still_ast_evals(hass):
+    """Test is_static still convers to native type."""
+    tpl = template.Template("[1, 2]", hass)
+    assert tpl.is_static
+    assert tpl.async_render() == [1, 2]
+
+
+async def test_result_wrappers(hass):
+    """Test result wrappers."""
+    for text, native, orig_type, schema in (
+        ("[1, 2]", [1, 2], list, vol.Schema([int])),
+        ("{1, 2}", {1, 2}, set, vol.Schema({int})),
+        ("(1, 2)", (1, 2), tuple, vol.ExactSequence([int, int])),
+        ('{"hello": True}', {"hello": True}, dict, vol.Schema({"hello": bool})),
+    ):
+        tpl = template.Template(text, hass)
+        result = tpl.async_render()
+        assert isinstance(result, orig_type)
+        assert isinstance(result, template.ResultWrapper)
+        assert result == native
+        assert result.render_result == text
+        schema(result)  # should not raise
+        # Result with render text stringifies to original text
+        assert str(result) == text
+        # Result without render text stringifies same as original type
+        assert str(template.RESULT_WRAPPERS[orig_type](native)) == str(
+            orig_type(native)
+        )
+
+
+async def test_parse_result(hass):
+    """Test parse result."""
+    for tpl, result in (
+        ('{{ "{{}}" }}', "{{}}"),
+        ("not-something", "not-something"),
+        ("2a", "2a"),
+    ):
+        assert template.Template(tpl, hass).async_render() == result
diff --git a/tests/helpers/test_update_coordinator.py b/tests/helpers/test_update_coordinator.py
index ee3c4af6daf..72b9bff60f1 100644
--- a/tests/helpers/test_update_coordinator.py
+++ b/tests/helpers/test_update_coordinator.py
@@ -14,7 +14,7 @@ from homeassistant.util.dt import utcnow
 from tests.async_mock import AsyncMock, Mock, patch
 from tests.common import async_fire_time_changed
 
-LOGGER = logging.getLogger(__name__)
+_LOGGER = logging.getLogger(__name__)
 
 
 def get_crd(hass, update_interval):
@@ -28,7 +28,7 @@ def get_crd(hass, update_interval):
 
     crd = update_coordinator.DataUpdateCoordinator[int](
         hass,
-        LOGGER,
+        _LOGGER,
         name="test",
         update_method=refresh,
         update_interval=update_interval,
diff --git a/tests/ignore_uncaught_exceptions.py b/tests/ignore_uncaught_exceptions.py
index e68131d689b..5f991d15bbf 100644
--- a/tests/ignore_uncaught_exceptions.py
+++ b/tests/ignore_uncaught_exceptions.py
@@ -16,4 +16,6 @@ IGNORE_UNCAUGHT_EXCEPTIONS = [
         "tests.components.unifi.test_controller",
         "test_wireless_client_event_calls_update_wireless_devices",
     ),
+    ("tests.components.iaqualink.test_config_flow", "test_with_invalid_credentials"),
+    ("tests.components.iaqualink.test_config_flow", "test_with_existing_config"),
 ]
diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py
index 59e77dc1388..ed31724b58b 100644
--- a/tests/test_bootstrap.py
+++ b/tests/test_bootstrap.py
@@ -1,7 +1,6 @@
 """Test the bootstrapping."""
 # pylint: disable=protected-access
 import asyncio
-import logging
 import os
 from unittest.mock import Mock
 
@@ -25,8 +24,6 @@ from tests.common import (
 ORIG_TIMEZONE = dt_util.DEFAULT_TIME_ZONE
 VERSION_PATH = os.path.join(get_test_config_dir(), config_util.VERSION_FILE)
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @pytest.fixture(autouse=True)
 def apply_mock_storage(hass_storage):
diff --git a/tests/test_config.py b/tests/test_config.py
index 181e80da30c..bfda156f2b7 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -471,6 +471,7 @@ async def test_loading_configuration(hass):
             "external_url": "https://www.example.com",
             "internal_url": "http://example.local",
             "media_dirs": {"mymedia": "/usr"},
+            "legacy_templates": True,
         },
     )
 
@@ -487,6 +488,7 @@ async def test_loading_configuration(hass):
     assert "/usr" in hass.config.allowlist_external_dirs
     assert hass.config.media_dirs == {"mymedia": "/usr"}
     assert hass.config.config_source == config_util.SOURCE_YAML
+    assert hass.config.legacy_templates is True
 
 
 async def test_loading_configuration_temperature_unit(hass):
@@ -1062,6 +1064,30 @@ async def test_component_config_exceptions(hass, caplog):
             in caplog.text
         )
 
+    # get_platform("config") raising
+    caplog.clear()
+    assert (
+        await config_util.async_process_component_config(
+            hass,
+            {"test_domain": {}},
+            integration=Mock(
+                pkg_path="homeassistant.components.test_domain",
+                domain="test_domain",
+                get_platform=Mock(
+                    side_effect=ImportError(
+                        "ModuleNotFoundError: No module named 'not_installed_something'",
+                        name="not_installed_something",
+                    )
+                ),
+            ),
+        )
+        is None
+    )
+    assert (
+        "Error importing config platform test_domain: ModuleNotFoundError: No module named 'not_installed_something'"
+        in caplog.text
+    )
+
 
 @pytest.mark.parametrize(
     "domain, schema, expected",
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index f13fac02850..6c2df29985c 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -609,7 +609,8 @@ async def test_discovery_notification(hass):
                     title="Test Title", data={"token": "abcd"}
                 )
 
-        result = await hass.config_entries.flow.async_init(
+        # Start first discovery flow to assert that reconfigure notification fires
+        flow1 = await hass.config_entries.flow.async_init(
             "test", context={"source": config_entries.SOURCE_DISCOVERY}
         )
 
@@ -617,11 +618,92 @@ async def test_discovery_notification(hass):
         state = hass.states.get("persistent_notification.config_entry_discovery")
         assert state is not None
 
-        result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
-        assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+        # Start a second discovery flow so we can finish the first and assert that
+        # the discovery notification persists until the second one is complete
+        flow2 = await hass.config_entries.flow.async_init(
+            "test", context={"source": config_entries.SOURCE_DISCOVERY}
+        )
+
+        flow1 = await hass.config_entries.flow.async_configure(flow1["flow_id"], {})
+        assert flow1["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
 
         await hass.async_block_till_done()
         state = hass.states.get("persistent_notification.config_entry_discovery")
+        assert state is not None
+
+        flow2 = await hass.config_entries.flow.async_configure(flow2["flow_id"], {})
+        assert flow2["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+
+        await hass.async_block_till_done()
+        state = hass.states.get("persistent_notification.config_entry_discovery")
+        assert state is None
+
+
+async def test_reauth_notification(hass):
+    """Test that we create/dismiss a notification when source is reauth."""
+    mock_integration(hass, MockModule("test"))
+    mock_entity_platform(hass, "config_flow.test", None)
+    await async_setup_component(hass, "persistent_notification", {})
+
+    with patch.dict(config_entries.HANDLERS):
+
+        class TestFlow(config_entries.ConfigFlow, domain="test"):
+            """Test flow."""
+
+            VERSION = 5
+
+            async def async_step_user(self, user_input):
+                """Test user step."""
+                return self.async_show_form(step_id="user_confirm")
+
+            async def async_step_user_confirm(self, user_input):
+                """Test user confirm step."""
+                return self.async_show_form(step_id="user_confirm")
+
+            async def async_step_reauth(self, user_input):
+                """Test reauth step."""
+                return self.async_show_form(step_id="reauth_confirm")
+
+            async def async_step_reauth_confirm(self, user_input):
+                """Test reauth confirm step."""
+                return self.async_abort(reason="test")
+
+        # Start user flow to assert that reconfigure notification doesn't fire
+        await hass.config_entries.flow.async_init(
+            "test", context={"source": config_entries.SOURCE_USER}
+        )
+
+        await hass.async_block_till_done()
+        state = hass.states.get("persistent_notification.config_entry_reconfigure")
+        assert state is None
+
+        # Start first reauth flow to assert that reconfigure notification fires
+        flow1 = await hass.config_entries.flow.async_init(
+            "test", context={"source": config_entries.SOURCE_REAUTH}
+        )
+
+        await hass.async_block_till_done()
+        state = hass.states.get("persistent_notification.config_entry_reconfigure")
+        assert state is not None
+
+        # Start a second reauth flow so we can finish the first and assert that
+        # the reconfigure notification persists until the second one is complete
+        flow2 = await hass.config_entries.flow.async_init(
+            "test", context={"source": config_entries.SOURCE_REAUTH}
+        )
+
+        flow1 = await hass.config_entries.flow.async_configure(flow1["flow_id"], {})
+        assert flow1["type"] == data_entry_flow.RESULT_TYPE_ABORT
+
+        await hass.async_block_till_done()
+        state = hass.states.get("persistent_notification.config_entry_reconfigure")
+        assert state is not None
+
+        flow2 = await hass.config_entries.flow.async_configure(flow2["flow_id"], {})
+        assert flow2["type"] == data_entry_flow.RESULT_TYPE_ABORT
+
+        await hass.async_block_till_done()
+        state = hass.states.get("persistent_notification.config_entry_reconfigure")
         assert state is None
 
 
diff --git a/tests/test_core.py b/tests/test_core.py
index 33cb0a37e23..119c0269ba7 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -48,43 +48,43 @@ def test_split_entity_id():
     assert ha.split_entity_id("domain.object_id") == ["domain", "object_id"]
 
 
-def test_async_add_job_schedule_callback():
+def test_async_add_hass_job_schedule_callback():
     """Test that we schedule coroutines and add jobs to the job pool."""
     hass = MagicMock()
     job = MagicMock()
 
-    ha.HomeAssistant.async_add_job(hass, ha.callback(job))
+    ha.HomeAssistant.async_add_hass_job(hass, ha.HassJob(ha.callback(job)))
     assert len(hass.loop.call_soon.mock_calls) == 1
     assert len(hass.loop.create_task.mock_calls) == 0
     assert len(hass.add_job.mock_calls) == 0
 
 
-def test_async_add_job_schedule_partial_callback():
+def test_async_add_hass_job_schedule_partial_callback():
     """Test that we schedule partial coros and add jobs to the job pool."""
     hass = MagicMock()
     job = MagicMock()
     partial = functools.partial(ha.callback(job))
 
-    ha.HomeAssistant.async_add_job(hass, partial)
+    ha.HomeAssistant.async_add_hass_job(hass, ha.HassJob(partial))
     assert len(hass.loop.call_soon.mock_calls) == 1
     assert len(hass.loop.create_task.mock_calls) == 0
     assert len(hass.add_job.mock_calls) == 0
 
 
-def test_async_add_job_schedule_coroutinefunction(loop):
+def test_async_add_hass_job_schedule_coroutinefunction(loop):
     """Test that we schedule coroutines and add jobs to the job pool."""
     hass = MagicMock(loop=MagicMock(wraps=loop))
 
     async def job():
         pass
 
-    ha.HomeAssistant.async_add_job(hass, job)
+    ha.HomeAssistant.async_add_hass_job(hass, ha.HassJob(job))
     assert len(hass.loop.call_soon.mock_calls) == 0
     assert len(hass.loop.create_task.mock_calls) == 1
     assert len(hass.add_job.mock_calls) == 0
 
 
-def test_async_add_job_schedule_partial_coroutinefunction(loop):
+def test_async_add_hass_job_schedule_partial_coroutinefunction(loop):
     """Test that we schedule partial coros and add jobs to the job pool."""
     hass = MagicMock(loop=MagicMock(wraps=loop))
 
@@ -93,20 +93,20 @@ def test_async_add_job_schedule_partial_coroutinefunction(loop):
 
     partial = functools.partial(job)
 
-    ha.HomeAssistant.async_add_job(hass, partial)
+    ha.HomeAssistant.async_add_hass_job(hass, ha.HassJob(partial))
     assert len(hass.loop.call_soon.mock_calls) == 0
     assert len(hass.loop.create_task.mock_calls) == 1
     assert len(hass.add_job.mock_calls) == 0
 
 
-def test_async_add_job_add_threaded_job_to_pool():
+def test_async_add_job_add_hass_threaded_job_to_pool():
     """Test that we schedule coroutines and add jobs to the job pool."""
     hass = MagicMock()
 
     def job():
         pass
 
-    ha.HomeAssistant.async_add_job(hass, job)
+    ha.HomeAssistant.async_add_hass_job(hass, ha.HassJob(job))
     assert len(hass.loop.call_soon.mock_calls) == 0
     assert len(hass.loop.create_task.mock_calls) == 0
     assert len(hass.loop.run_in_executor.mock_calls) == 1
@@ -125,7 +125,7 @@ def test_async_create_task_schedule_coroutine(loop):
     assert len(hass.add_job.mock_calls) == 0
 
 
-def test_async_run_job_calls_callback():
+def test_async_run_hass_job_calls_callback():
     """Test that the callback annotation is respected."""
     hass = MagicMock()
     calls = []
@@ -133,12 +133,12 @@ def test_async_run_job_calls_callback():
     def job():
         calls.append(1)
 
-    ha.HomeAssistant.async_run_job(hass, ha.callback(job))
+    ha.HomeAssistant.async_run_hass_job(hass, ha.HassJob(ha.callback(job)))
     assert len(calls) == 1
     assert len(hass.async_add_job.mock_calls) == 0
 
 
-def test_async_run_job_delegates_non_async():
+def test_async_run_hass_job_delegates_non_async():
     """Test that the callback annotation is respected."""
     hass = MagicMock()
     calls = []
@@ -146,9 +146,9 @@ def test_async_run_job_delegates_non_async():
     def job():
         calls.append(1)
 
-    ha.HomeAssistant.async_run_job(hass, job)
+    ha.HomeAssistant.async_run_hass_job(hass, ha.HassJob(job))
     assert len(calls) == 0
-    assert len(hass.async_add_job.mock_calls) == 1
+    assert len(hass.async_add_hass_job.mock_calls) == 1
 
 
 def test_stage_shutdown():
@@ -291,7 +291,7 @@ def test_event_repr():
 
 
 def test_event_as_dict():
-    """Test as Event as dictionary."""
+    """Test an Event as dictionary."""
     event_type = "some_type"
     now = dt_util.utcnow()
     data = {"some": "attr"}
@@ -301,7 +301,7 @@ def test_event_as_dict():
         "event_type": event_type,
         "data": data,
         "origin": "LOCAL",
-        "time_fired": now,
+        "time_fired": now.isoformat(),
         "context": {
             "id": event.context.id,
             "parent_id": None,
@@ -309,6 +309,36 @@ def test_event_as_dict():
         },
     }
     assert event.as_dict() == expected
+    # 2nd time to verify cache
+    assert event.as_dict() == expected
+
+
+def test_state_as_dict():
+    """Test a State as dictionary."""
+    last_time = datetime(1984, 12, 8, 12, 0, 0)
+    state = ha.State(
+        "happy.happy",
+        "on",
+        {"pig": "dog"},
+        last_updated=last_time,
+        last_changed=last_time,
+    )
+    expected = {
+        "context": {
+            "id": state.context.id,
+            "parent_id": None,
+            "user_id": state.context.user_id,
+        },
+        "entity_id": "happy.happy",
+        "attributes": {"pig": "dog"},
+        "last_changed": last_time.isoformat(),
+        "last_updated": last_time.isoformat(),
+        "state": "on",
+    }
+    assert state.as_dict() == expected
+    # 2nd time to verify cache
+    assert state.as_dict() == expected
+    assert state.as_dict() is state.as_dict()
 
 
 class TestEventBus(unittest.TestCase):
@@ -855,108 +885,132 @@ class TestServiceRegistry(unittest.TestCase):
         self.hass.block_till_done()
 
 
-class TestConfig(unittest.TestCase):
-    """Test configuration methods."""
+def test_config_defaults():
+    """Test config defaults."""
+    hass = Mock()
+    config = ha.Config(hass)
+    assert config.hass is hass
+    assert config.latitude == 0
+    assert config.longitude == 0
+    assert config.elevation == 0
+    assert config.location_name == "Home"
+    assert config.time_zone == dt_util.UTC
+    assert config.internal_url is None
+    assert config.external_url is None
+    assert config.config_source == "default"
+    assert config.skip_pip is False
+    assert config.components == set()
+    assert config.api is None
+    assert config.config_dir is None
+    assert config.allowlist_external_dirs == set()
+    assert config.allowlist_external_urls == set()
+    assert config.media_dirs == {}
+    assert config.safe_mode is False
+    assert config.legacy_templates is True
 
-    # pylint: disable=invalid-name
-    def setUp(self):
-        """Set up things to be run when tests are started."""
-        self.config = ha.Config(None)
-        assert self.config.config_dir is None
 
-    def test_path_with_file(self):
-        """Test get_config_path method."""
-        self.config.config_dir = "/test/ha-config"
-        assert self.config.path("test.conf") == "/test/ha-config/test.conf"
+def test_config_path_with_file():
+    """Test get_config_path method."""
+    config = ha.Config(None)
+    config.config_dir = "/test/ha-config"
+    assert config.path("test.conf") == "/test/ha-config/test.conf"
 
-    def test_path_with_dir_and_file(self):
-        """Test get_config_path method."""
-        self.config.config_dir = "/test/ha-config"
-        assert self.config.path("dir", "test.conf") == "/test/ha-config/dir/test.conf"
 
-    def test_as_dict(self):
-        """Test as dict."""
-        self.config.config_dir = "/test/ha-config"
-        self.config.hass = MagicMock()
-        type(self.config.hass.state).value = PropertyMock(return_value="RUNNING")
-        expected = {
-            "latitude": 0,
-            "longitude": 0,
-            "elevation": 0,
-            CONF_UNIT_SYSTEM: METRIC_SYSTEM.as_dict(),
-            "location_name": "Home",
-            "time_zone": "UTC",
-            "components": set(),
-            "config_dir": "/test/ha-config",
-            "whitelist_external_dirs": set(),
-            "allowlist_external_dirs": set(),
-            "allowlist_external_urls": set(),
-            "version": __version__,
-            "config_source": "default",
-            "safe_mode": False,
-            "state": "RUNNING",
-            "external_url": None,
-            "internal_url": None,
-        }
+def test_config_path_with_dir_and_file():
+    """Test get_config_path method."""
+    config = ha.Config(None)
+    config.config_dir = "/test/ha-config"
+    assert config.path("dir", "test.conf") == "/test/ha-config/dir/test.conf"
 
-        assert expected == self.config.as_dict()
 
-    def test_is_allowed_path(self):
-        """Test is_allowed_path method."""
-        with TemporaryDirectory() as tmp_dir:
-            # The created dir is in /tmp. This is a symlink on OS X
-            # causing this test to fail unless we resolve path first.
-            self.config.allowlist_external_dirs = {os.path.realpath(tmp_dir)}
+def test_config_as_dict():
+    """Test as dict."""
+    config = ha.Config(None)
+    config.config_dir = "/test/ha-config"
+    config.hass = MagicMock()
+    type(config.hass.state).value = PropertyMock(return_value="RUNNING")
+    expected = {
+        "latitude": 0,
+        "longitude": 0,
+        "elevation": 0,
+        CONF_UNIT_SYSTEM: METRIC_SYSTEM.as_dict(),
+        "location_name": "Home",
+        "time_zone": "UTC",
+        "components": set(),
+        "config_dir": "/test/ha-config",
+        "whitelist_external_dirs": set(),
+        "allowlist_external_dirs": set(),
+        "allowlist_external_urls": set(),
+        "version": __version__,
+        "config_source": "default",
+        "safe_mode": False,
+        "state": "RUNNING",
+        "external_url": None,
+        "internal_url": None,
+    }
 
-            test_file = os.path.join(tmp_dir, "test.jpg")
-            with open(test_file, "w") as tmp_file:
-                tmp_file.write("test")
+    assert expected == config.as_dict()
 
-            valid = [test_file, tmp_dir, os.path.join(tmp_dir, "notfound321")]
-            for path in valid:
-                assert self.config.is_allowed_path(path)
 
-            self.config.allowlist_external_dirs = {"/home", "/var"}
+def test_config_is_allowed_path():
+    """Test is_allowed_path method."""
+    config = ha.Config(None)
+    with TemporaryDirectory() as tmp_dir:
+        # The created dir is in /tmp. This is a symlink on OS X
+        # causing this test to fail unless we resolve path first.
+        config.allowlist_external_dirs = {os.path.realpath(tmp_dir)}
 
-            invalid = [
-                "/hass/config/secure",
-                "/etc/passwd",
-                "/root/secure_file",
-                "/var/../etc/passwd",
-                test_file,
-            ]
-            for path in invalid:
-                assert not self.config.is_allowed_path(path)
+        test_file = os.path.join(tmp_dir, "test.jpg")
+        with open(test_file, "w") as tmp_file:
+            tmp_file.write("test")
 
-            with pytest.raises(AssertionError):
-                self.config.is_allowed_path(None)
+        valid = [test_file, tmp_dir, os.path.join(tmp_dir, "notfound321")]
+        for path in valid:
+            assert config.is_allowed_path(path)
 
-    def test_is_allowed_external_url(self):
-        """Test is_allowed_external_url method."""
-        self.config.allowlist_external_urls = [
-            "http://x.com/",
-            "https://y.com/bla/",
-            "https://z.com/images/1.jpg/",
-        ]
-
-        valid = [
-            "http://x.com/1.jpg",
-            "http://x.com",
-            "https://y.com/bla/",
-            "https://y.com/bla/2.png",
-            "https://z.com/images/1.jpg",
-        ]
-        for url in valid:
-            assert self.config.is_allowed_external_url(url)
+        config.allowlist_external_dirs = {"/home", "/var"}
 
         invalid = [
-            "https://a.co",
-            "https://y.com/bla_wrong",
-            "https://y.com/bla/../image.jpg",
-            "https://z.com/images",
+            "/hass/config/secure",
+            "/etc/passwd",
+            "/root/secure_file",
+            "/var/../etc/passwd",
+            test_file,
         ]
-        for url in invalid:
-            assert not self.config.is_allowed_external_url(url)
+        for path in invalid:
+            assert not config.is_allowed_path(path)
+
+        with pytest.raises(AssertionError):
+            config.is_allowed_path(None)
+
+
+def test_config_is_allowed_external_url():
+    """Test is_allowed_external_url method."""
+    config = ha.Config(None)
+    config.allowlist_external_urls = [
+        "http://x.com/",
+        "https://y.com/bla/",
+        "https://z.com/images/1.jpg/",
+    ]
+
+    valid = [
+        "http://x.com/1.jpg",
+        "http://x.com",
+        "https://y.com/bla/",
+        "https://y.com/bla/2.png",
+        "https://z.com/images/1.jpg",
+    ]
+    for url in valid:
+        assert config.is_allowed_external_url(url)
+
+    invalid = [
+        "https://a.co",
+        "https://y.com/bla_wrong",
+        "https://y.com/bla/../image.jpg",
+        "https://z.com/images",
+    ]
+    for url in invalid:
+        assert not config.is_allowed_external_url(url)
 
 
 async def test_event_on_update(hass):
@@ -1492,3 +1546,41 @@ async def test_async_entity_ids_count(hass):
 
     assert hass.states.async_entity_ids_count() == 5
     assert hass.states.async_entity_ids_count("light") == 3
+
+
+async def test_hassjob_forbid_coroutine():
+    """Test hassjob forbids coroutines."""
+
+    async def bla():
+        pass
+
+    coro = bla()
+
+    with pytest.raises(ValueError):
+        ha.HassJob(coro)
+
+    # To avoid warning about unawaited coro
+    await coro
+
+
+async def test_reserving_states(hass):
+    """Test we can reserve a state in the state machine."""
+
+    hass.states.async_reserve("light.bedroom")
+    assert hass.states.async_available("light.bedroom") is False
+    hass.states.async_set("light.bedroom", "on")
+    assert hass.states.async_available("light.bedroom") is False
+
+    with pytest.raises(ha.HomeAssistantError):
+        hass.states.async_reserve("light.bedroom")
+
+    hass.states.async_remove("light.bedroom")
+    assert hass.states.async_available("light.bedroom") is True
+    hass.states.async_set("light.bedroom", "on")
+
+    with pytest.raises(ha.HomeAssistantError):
+        hass.states.async_reserve("light.bedroom")
+
+    assert hass.states.async_available("light.bedroom") is False
+    hass.states.async_remove("light.bedroom")
+    assert hass.states.async_available("light.bedroom") is True
diff --git a/tests/test_loader.py b/tests/test_loader.py
index f5ba54ff269..71a373a579d 100644
--- a/tests/test_loader.py
+++ b/tests/test_loader.py
@@ -181,6 +181,7 @@ def test_integration_properties(hass):
                 },
                 {"manufacturer": "Signify", "modelName": "Philips hue bridge 2015"},
             ],
+            "mqtt": ["hue/discovery"],
         },
     )
     assert integration.name == "Philips Hue"
@@ -198,6 +199,7 @@ def test_integration_properties(hass):
         },
         {"manufacturer": "Signify", "modelName": "Philips hue bridge 2015"},
     ]
+    assert integration.mqtt == ["hue/discovery"]
     assert integration.dependencies == ["test-dep"]
     assert integration.requirements == ["test-req==1.0.0"]
     assert integration.is_built_in is True
@@ -217,6 +219,7 @@ def test_integration_properties(hass):
     assert integration.homekit is None
     assert integration.zeroconf is None
     assert integration.ssdp is None
+    assert integration.mqtt is None
 
     integration = loader.Integration(
         hass,
@@ -266,6 +269,7 @@ def _get_test_integration(hass, name, config_flow):
             "zeroconf": [f"_{name}._tcp.local."],
             "homekit": {"models": [name]},
             "ssdp": [{"manufacturer": name, "modelName": name}],
+            "mqtt": [f"{name}/discovery"],
         },
     )
 
@@ -371,6 +375,21 @@ async def test_get_ssdp(hass):
         assert ssdp["test_2"] == [{"manufacturer": "test_2", "modelName": "test_2"}]
 
 
+async def test_get_mqtt(hass):
+    """Verify that custom components with MQTT are found."""
+    test_1_integration = _get_test_integration(hass, "test_1", True)
+    test_2_integration = _get_test_integration(hass, "test_2", True)
+
+    with patch("homeassistant.loader.async_get_custom_components") as mock_get:
+        mock_get.return_value = {
+            "test_1": test_1_integration,
+            "test_2": test_2_integration,
+        }
+        mqtt = await loader.async_get_mqtt(hass)
+        assert mqtt["test_1"] == ["test_1/discovery"]
+        assert mqtt["test_2"] == ["test_2/discovery"]
+
+
 async def test_get_custom_components_safe_mode(hass):
     """Test that we get empty custom components in safe mode."""
     hass.config.safe_mode = True
diff --git a/tests/test_requirements.py b/tests/test_requirements.py
index 6297da0c2d5..c0a1f0723ac 100644
--- a/tests/test_requirements.py
+++ b/tests/test_requirements.py
@@ -187,6 +187,23 @@ async def test_install_on_docker(hass):
         )
 
 
+async def test_discovery_requirements_mqtt(hass):
+    """Test that we load discovery requirements."""
+    hass.config.skip_pip = False
+    mqtt = await loader.async_get_integration(hass, "mqtt")
+
+    mock_integration(
+        hass, MockModule("mqtt_comp", partial_manifest={"mqtt": ["foo/discovery"]})
+    )
+    with patch(
+        "homeassistant.requirements.async_process_requirements",
+    ) as mock_process:
+        await async_get_integration_with_requirements(hass, "mqtt_comp")
+
+    assert len(mock_process.mock_calls) == 2  # mqtt also depends on http
+    assert mock_process.mock_calls[0][1][2] == mqtt.requirements
+
+
 async def test_discovery_requirements_ssdp(hass):
     """Test that we load discovery requirements."""
     hass.config.skip_pip = False
diff --git a/tests/test_setup.py b/tests/test_setup.py
index 3d34d1e1383..ebcb1093779 100644
--- a/tests/test_setup.py
+++ b/tests/test_setup.py
@@ -1,7 +1,6 @@
 """Test component/platform setup."""
 # pylint: disable=protected-access
 import asyncio
-import logging
 import os
 import threading
 
@@ -34,8 +33,6 @@ from tests.common import (
 ORIG_TIMEZONE = dt_util.DEFAULT_TIME_ZONE
 VERSION_PATH = os.path.join(get_test_config_dir(), config_util.VERSION_FILE)
 
-_LOGGER = logging.getLogger(__name__)
-
 
 @pytest.fixture(autouse=True)
 def mock_handlers():
diff --git a/tests/testing_config/custom_components/test/sensor.py b/tests/testing_config/custom_components/test/sensor.py
index d9ed47844af..d467a93fd62 100644
--- a/tests/testing_config/custom_components/test/sensor.py
+++ b/tests/testing_config/custom_components/test/sensor.py
@@ -4,7 +4,7 @@ Provide a mock sensor platform.
 Call init before using it in your tests to ensure clean test data.
 """
 import homeassistant.components.sensor as sensor
-from homeassistant.const import PERCENTAGE, PRESSURE_HPA
+from homeassistant.const import PERCENTAGE, PRESSURE_HPA, SIGNAL_STRENGTH_DECIBELS
 
 from tests.common import MockEntity
 
@@ -15,7 +15,7 @@ UNITS_OF_MEASUREMENT = {
     sensor.DEVICE_CLASS_BATTERY: PERCENTAGE,  # % of battery that is left
     sensor.DEVICE_CLASS_HUMIDITY: PERCENTAGE,  # % of humidity in the air
     sensor.DEVICE_CLASS_ILLUMINANCE: "lm",  # current light level (lx/lm)
-    sensor.DEVICE_CLASS_SIGNAL_STRENGTH: "dB",  # signal strength (dB/dBm)
+    sensor.DEVICE_CLASS_SIGNAL_STRENGTH: SIGNAL_STRENGTH_DECIBELS,  # signal strength (dB/dBm)
     sensor.DEVICE_CLASS_TEMPERATURE: "C",  # temperature (C/F)
     sensor.DEVICE_CLASS_TIMESTAMP: "hh:mm:ss",  # timestamp (ISO8601)
     sensor.DEVICE_CLASS_PRESSURE: PRESSURE_HPA,  # pressure (hPa/mbar)
diff --git a/tests/testing_config/notify/test.jpg b/tests/testing_config/notify/test.jpg
new file mode 100644
index 00000000000..d47caf0066c
Binary files /dev/null and b/tests/testing_config/notify/test.jpg differ
diff --git a/tests/testing_config/notify/test.pdf b/tests/testing_config/notify/test.pdf
new file mode 100755
index 00000000000..50e2b35872f
Binary files /dev/null and b/tests/testing_config/notify/test.pdf differ
diff --git a/tests/util/test_dt.py b/tests/util/test_dt.py
index 03d4ee53cbe..7c4ca77fd79 100644
--- a/tests/util/test_dt.py
+++ b/tests/util/test_dt.py
@@ -187,6 +187,7 @@ def test_parse_time_expression():
     assert [x for x in range(24)] == dt_util.parse_time_expression("*", 0, 23)
 
     assert [42] == dt_util.parse_time_expression(42, 0, 59)
+    assert [42] == dt_util.parse_time_expression("42", 0, 59)
 
     with pytest.raises(ValueError):
         dt_util.parse_time_expression(61, 0, 60)
diff --git a/tests/util/test_uuid.py b/tests/util/test_uuid.py
index 0debb867341..6e85f638d1b 100644
--- a/tests/util/test_uuid.py
+++ b/tests/util/test_uuid.py
@@ -5,7 +5,7 @@ import uuid
 import homeassistant.util.uuid as uuid_util
 
 
-async def test_uuid_v1mc_hex():
-    """Verify we can generate a uuid_v1mc and return hex."""
-    assert len(uuid_util.uuid_v1mc_hex()) == 32
-    assert uuid.UUID(uuid_util.uuid_v1mc_hex())
+async def test_uuid_util_random_uuid_hex():
+    """Verify we can generate a random uuid."""
+    assert len(uuid_util.random_uuid_hex()) == 32
+    assert uuid.UUID(uuid_util.random_uuid_hex())