From 6c2702a7b84e9d8141b20e5b8f252f8fd734139e Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Wed, 8 Feb 2023 20:10:18 +0100
Subject: [PATCH] Sort manifests 11 (#87032)

---
 homeassistant/components/velux/manifest.json  |  6 ++--
 .../components/venstar/manifest.json          |  6 ++--
 homeassistant/components/vera/manifest.json   |  6 ++--
 .../components/verisure/manifest.json         |  8 ++---
 .../components/versasense/manifest.json       |  6 ++--
 .../components/version/manifest.json          | 10 +++---
 homeassistant/components/vesync/manifest.json |  6 ++--
 .../components/viaggiatreno/manifest.json     |  2 +-
 homeassistant/components/vicare/manifest.json |  8 ++---
 homeassistant/components/vilfo/manifest.json  |  6 ++--
 .../components/vivotek/manifest.json          |  6 ++--
 homeassistant/components/vizio/manifest.json  | 10 +++---
 homeassistant/components/vlc/manifest.json    |  6 ++--
 .../components/vlc_telnet/manifest.json       |  6 ++--
 .../components/voicerss/manifest.json         |  2 +-
 .../components/volkszaehler/manifest.json     |  6 ++--
 .../components/volumio/manifest.json          |  8 ++---
 .../components/volvooncall/manifest.json      |  6 ++--
 homeassistant/components/vulcan/manifest.json |  6 ++--
 homeassistant/components/vultr/manifest.json  |  6 ++--
 .../components/w800rf32/manifest.json         |  6 ++--
 .../components/wake_on_lan/manifest.json      |  6 ++--
 .../components/wallbox/manifest.json          |  6 ++--
 homeassistant/components/waqi/manifest.json   |  6 ++--
 .../components/water_heater/manifest.json     |  6 ++--
 .../components/waterfurnace/manifest.json     |  6 ++--
 .../components/watson_iot/manifest.json       |  6 ++--
 .../components/watson_tts/manifest.json       |  6 ++--
 .../components/watttime/manifest.json         |  6 ++--
 .../components/waze_travel_time/manifest.json |  6 ++--
 .../components/weather/manifest.json          |  6 ++--
 .../components/webhook/manifest.json          |  4 +--
 .../components/webostv/manifest.json          | 14 +++++---
 .../components/websocket_api/manifest.json    |  8 ++---
 homeassistant/components/wemo/manifest.json   | 14 ++++----
 .../components/whirlpool/manifest.json        |  6 ++--
 homeassistant/components/whois/manifest.json  | 10 +++---
 homeassistant/components/wiffi/manifest.json  |  6 ++--
 .../components/wilight/manifest.json          | 10 +++---
 .../components/wirelesstag/manifest.json      |  6 ++--
 .../components/withings/manifest.json         | 10 +++---
 homeassistant/components/wiz/manifest.json    | 34 +++++++++++++------
 homeassistant/components/wled/manifest.json   | 10 +++---
 .../components/wolflink/manifest.json         |  6 ++--
 .../components/workday/manifest.json          |  8 ++---
 .../components/worldclock/manifest.json       |  6 ++--
 .../components/worldtidesinfo/manifest.json   |  2 +-
 .../components/worxlandroid/manifest.json     |  2 +-
 homeassistant/components/ws66i/manifest.json  |  6 ++--
 homeassistant/components/wsdot/manifest.json  |  2 +-
 homeassistant/components/x10/manifest.json    |  2 +-
 homeassistant/components/xbox/manifest.json   | 10 +++---
 .../components/xbox_live/manifest.json        |  6 ++--
 homeassistant/components/xeoma/manifest.json  |  6 ++--
 homeassistant/components/xiaomi/manifest.json |  4 +--
 .../components/xiaomi_aqara/manifest.json     | 10 +++---
 .../components/xiaomi_ble/manifest.json       | 10 +++---
 .../components/xiaomi_miio/manifest.json      |  8 ++---
 .../components/xiaomi_tv/manifest.json        |  6 ++--
 homeassistant/components/xmpp/manifest.json   |  6 ++--
 homeassistant/components/xs1/manifest.json    |  6 ++--
 .../components/yale_smart_alarm/manifest.json |  6 ++--
 .../components/yalexs_ble/manifest.json       | 12 +++----
 homeassistant/components/yamaha/manifest.json |  6 ++--
 .../components/yamaha_musiccast/manifest.json | 10 +++---
 .../components/yandex_transport/manifest.json |  6 ++--
 .../components/yandextts/manifest.json        |  2 +-
 .../components/yeelight/manifest.json         | 19 +++++++----
 .../yeelightsunflower/manifest.json           |  6 ++--
 homeassistant/components/yi/manifest.json     |  8 ++---
 homeassistant/components/yolink/manifest.json | 10 +++---
 .../components/youless/manifest.json          |  6 ++--
 homeassistant/components/zabbix/manifest.json |  6 ++--
 homeassistant/components/zamg/manifest.json   |  6 ++--
 homeassistant/components/zengge/manifest.json |  6 ++--
 .../components/zeroconf/manifest.json         | 10 +++---
 .../components/zerproc/manifest.json          |  6 ++--
 .../components/zestimate/manifest.json        |  6 ++--
 .../components/zeversolar/manifest.json       |  6 ++--
 homeassistant/components/zha/manifest.json    | 32 ++++++++---------
 .../components/zhong_hong/manifest.json       |  6 ++--
 .../ziggo_mediabox_xl/manifest.json           |  6 ++--
 homeassistant/components/zodiac/manifest.json |  6 ++--
 homeassistant/components/zone/manifest.json   |  6 ++--
 .../components/zoneminder/manifest.json       |  6 ++--
 .../components/zwave_js/manifest.json         | 12 +++----
 .../components/zwave_me/manifest.json         | 13 ++++---
 87 files changed, 340 insertions(+), 314 deletions(-)

diff --git a/homeassistant/components/velux/manifest.json b/homeassistant/components/velux/manifest.json
index d86b607cdc..0495ff80a4 100644
--- a/homeassistant/components/velux/manifest.json
+++ b/homeassistant/components/velux/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "velux",
   "name": "Velux",
-  "documentation": "https://www.home-assistant.io/integrations/velux",
-  "requirements": ["pyvlx==0.2.20"],
   "codeowners": ["@Julius2342"],
+  "documentation": "https://www.home-assistant.io/integrations/velux",
   "iot_class": "local_polling",
-  "loggers": ["pyvlx"]
+  "loggers": ["pyvlx"],
+  "requirements": ["pyvlx==0.2.20"]
 }
diff --git a/homeassistant/components/venstar/manifest.json b/homeassistant/components/venstar/manifest.json
index ce40e53105..39cbe0d352 100644
--- a/homeassistant/components/venstar/manifest.json
+++ b/homeassistant/components/venstar/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "venstar",
   "name": "Venstar",
+  "codeowners": ["@garbled1"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/venstar",
-  "requirements": ["venstarcolortouch==0.19"],
-  "codeowners": ["@garbled1"],
   "iot_class": "local_polling",
-  "loggers": ["venstarcolortouch"]
+  "loggers": ["venstarcolortouch"],
+  "requirements": ["venstarcolortouch==0.19"]
 }
diff --git a/homeassistant/components/vera/manifest.json b/homeassistant/components/vera/manifest.json
index 517d19a89d..17b7144fc3 100644
--- a/homeassistant/components/vera/manifest.json
+++ b/homeassistant/components/vera/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "vera",
   "name": "Vera",
+  "codeowners": [],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/vera",
-  "requirements": ["pyvera==0.3.13"],
-  "codeowners": [],
   "iot_class": "local_polling",
-  "loggers": ["pyvera"]
+  "loggers": ["pyvera"],
+  "requirements": ["pyvera==0.3.13"]
 }
diff --git a/homeassistant/components/verisure/manifest.json b/homeassistant/components/verisure/manifest.json
index cc4f90bb92..9e177a514a 100644
--- a/homeassistant/components/verisure/manifest.json
+++ b/homeassistant/components/verisure/manifest.json
@@ -1,8 +1,6 @@
 {
   "domain": "verisure",
   "name": "Verisure",
-  "documentation": "https://www.home-assistant.io/integrations/verisure",
-  "requirements": ["vsure==1.8.1"],
   "codeowners": ["@frenck"],
   "config_flow": true,
   "dhcp": [
@@ -10,7 +8,9 @@
       "macaddress": "0023C1*"
     }
   ],
-  "iot_class": "cloud_polling",
+  "documentation": "https://www.home-assistant.io/integrations/verisure",
   "integration_type": "hub",
-  "loggers": ["verisure"]
+  "iot_class": "cloud_polling",
+  "loggers": ["verisure"],
+  "requirements": ["vsure==1.8.1"]
 }
diff --git a/homeassistant/components/versasense/manifest.json b/homeassistant/components/versasense/manifest.json
index fee8faeab8..0dd6321893 100644
--- a/homeassistant/components/versasense/manifest.json
+++ b/homeassistant/components/versasense/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "versasense",
   "name": "VersaSense",
-  "documentation": "https://www.home-assistant.io/integrations/versasense",
   "codeowners": ["@flamm3blemuff1n"],
-  "requirements": ["pyversasense==0.0.6"],
+  "documentation": "https://www.home-assistant.io/integrations/versasense",
   "iot_class": "local_polling",
-  "loggers": ["pyversasense"]
+  "loggers": ["pyversasense"],
+  "requirements": ["pyversasense==0.0.6"]
 }
diff --git a/homeassistant/components/version/manifest.json b/homeassistant/components/version/manifest.json
index 52ca1ca74f..984d3ada8d 100644
--- a/homeassistant/components/version/manifest.json
+++ b/homeassistant/components/version/manifest.json
@@ -1,11 +1,11 @@
 {
   "domain": "version",
   "name": "Version",
-  "documentation": "https://www.home-assistant.io/integrations/version",
-  "requirements": ["pyhaversion==22.8.0"],
   "codeowners": ["@ludeeus"],
-  "quality_scale": "internal",
-  "iot_class": "local_push",
   "config_flow": true,
-  "loggers": ["pyhaversion"]
+  "documentation": "https://www.home-assistant.io/integrations/version",
+  "iot_class": "local_push",
+  "loggers": ["pyhaversion"],
+  "quality_scale": "internal",
+  "requirements": ["pyhaversion==22.8.0"]
 }
diff --git a/homeassistant/components/vesync/manifest.json b/homeassistant/components/vesync/manifest.json
index 730da2d586..dcf8e7d286 100644
--- a/homeassistant/components/vesync/manifest.json
+++ b/homeassistant/components/vesync/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "vesync",
   "name": "VeSync",
-  "documentation": "https://www.home-assistant.io/integrations/vesync",
   "codeowners": ["@markperdue", "@webdjoe", "@thegardenmonkey"],
-  "requirements": ["pyvesync==2.1.1"],
   "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/vesync",
   "iot_class": "cloud_polling",
-  "loggers": ["pyvesync"]
+  "loggers": ["pyvesync"],
+  "requirements": ["pyvesync==2.1.1"]
 }
diff --git a/homeassistant/components/viaggiatreno/manifest.json b/homeassistant/components/viaggiatreno/manifest.json
index 40059770af..904f9c0beb 100644
--- a/homeassistant/components/viaggiatreno/manifest.json
+++ b/homeassistant/components/viaggiatreno/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "viaggiatreno",
   "name": "Trenitalia ViaggiaTreno",
-  "documentation": "https://www.home-assistant.io/integrations/viaggiatreno",
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/viaggiatreno",
   "iot_class": "cloud_polling"
 }
diff --git a/homeassistant/components/vicare/manifest.json b/homeassistant/components/vicare/manifest.json
index 0105bc72df..f031e7a131 100644
--- a/homeassistant/components/vicare/manifest.json
+++ b/homeassistant/components/vicare/manifest.json
@@ -1,15 +1,15 @@
 {
   "domain": "vicare",
   "name": "Viessmann ViCare",
-  "documentation": "https://www.home-assistant.io/integrations/vicare",
   "codeowners": ["@oischinger"],
-  "requirements": ["PyViCare==2.21.0"],
-  "iot_class": "cloud_polling",
   "config_flow": true,
   "dhcp": [
     {
       "macaddress": "B87424*"
     }
   ],
-  "loggers": ["PyViCare"]
+  "documentation": "https://www.home-assistant.io/integrations/vicare",
+  "iot_class": "cloud_polling",
+  "loggers": ["PyViCare"],
+  "requirements": ["PyViCare==2.21.0"]
 }
diff --git a/homeassistant/components/vilfo/manifest.json b/homeassistant/components/vilfo/manifest.json
index e14dc58cf2..4b82bba83c 100644
--- a/homeassistant/components/vilfo/manifest.json
+++ b/homeassistant/components/vilfo/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "vilfo",
   "name": "Vilfo Router",
+  "codeowners": ["@ManneW"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/vilfo",
-  "requirements": ["vilfo-api-client==0.3.2"],
-  "codeowners": ["@ManneW"],
   "iot_class": "local_polling",
-  "loggers": ["vilfo"]
+  "loggers": ["vilfo"],
+  "requirements": ["vilfo-api-client==0.3.2"]
 }
diff --git a/homeassistant/components/vivotek/manifest.json b/homeassistant/components/vivotek/manifest.json
index ba44a69478..5a33ca0990 100644
--- a/homeassistant/components/vivotek/manifest.json
+++ b/homeassistant/components/vivotek/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "vivotek",
   "name": "VIVOTEK",
-  "documentation": "https://www.home-assistant.io/integrations/vivotek",
-  "requirements": ["libpyvivotek==0.4.0"],
   "codeowners": ["@HarlemSquirrel"],
+  "documentation": "https://www.home-assistant.io/integrations/vivotek",
   "iot_class": "local_polling",
-  "loggers": ["libpyvivotek"]
+  "loggers": ["libpyvivotek"],
+  "requirements": ["libpyvivotek==0.4.0"]
 }
diff --git a/homeassistant/components/vizio/manifest.json b/homeassistant/components/vizio/manifest.json
index 3fe0ac4588..572aba0829 100644
--- a/homeassistant/components/vizio/manifest.json
+++ b/homeassistant/components/vizio/manifest.json
@@ -1,13 +1,13 @@
 {
   "domain": "vizio",
   "name": "VIZIO SmartCast",
-  "documentation": "https://www.home-assistant.io/integrations/vizio",
-  "requirements": ["pyvizio==0.1.57"],
   "codeowners": ["@raman325"],
   "config_flow": true,
-  "zeroconf": ["_viziocast._tcp.local."],
-  "quality_scale": "platinum",
+  "documentation": "https://www.home-assistant.io/integrations/vizio",
+  "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["pyvizio"],
-  "integration_type": "hub"
+  "quality_scale": "platinum",
+  "requirements": ["pyvizio==0.1.57"],
+  "zeroconf": ["_viziocast._tcp.local."]
 }
diff --git a/homeassistant/components/vlc/manifest.json b/homeassistant/components/vlc/manifest.json
index a228bb2353..971367763f 100644
--- a/homeassistant/components/vlc/manifest.json
+++ b/homeassistant/components/vlc/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "vlc",
   "name": "VLC media player",
-  "documentation": "https://www.home-assistant.io/integrations/vlc",
-  "requirements": ["python-vlc==1.1.2"],
   "codeowners": [],
-  "iot_class": "local_polling"
+  "documentation": "https://www.home-assistant.io/integrations/vlc",
+  "iot_class": "local_polling",
+  "requirements": ["python-vlc==1.1.2"]
 }
diff --git a/homeassistant/components/vlc_telnet/manifest.json b/homeassistant/components/vlc_telnet/manifest.json
index 2d2b01cb04..cdb5595d69 100644
--- a/homeassistant/components/vlc_telnet/manifest.json
+++ b/homeassistant/components/vlc_telnet/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "vlc_telnet",
   "name": "VLC media player via Telnet",
+  "codeowners": ["@rodripf", "@MartinHjelmare"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/vlc_telnet",
-  "requirements": ["aiovlc==0.1.0"],
-  "codeowners": ["@rodripf", "@MartinHjelmare"],
   "iot_class": "local_polling",
-  "loggers": ["aiovlc"]
+  "loggers": ["aiovlc"],
+  "requirements": ["aiovlc==0.1.0"]
 }
diff --git a/homeassistant/components/voicerss/manifest.json b/homeassistant/components/voicerss/manifest.json
index d2772f2aac..bfc61365dc 100644
--- a/homeassistant/components/voicerss/manifest.json
+++ b/homeassistant/components/voicerss/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "voicerss",
   "name": "VoiceRSS",
-  "documentation": "https://www.home-assistant.io/integrations/voicerss",
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/voicerss",
   "iot_class": "cloud_push"
 }
diff --git a/homeassistant/components/volkszaehler/manifest.json b/homeassistant/components/volkszaehler/manifest.json
index 6c422271a4..e9070d0fa8 100644
--- a/homeassistant/components/volkszaehler/manifest.json
+++ b/homeassistant/components/volkszaehler/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "volkszaehler",
   "name": "Volkszaehler",
-  "documentation": "https://www.home-assistant.io/integrations/volkszaehler",
-  "requirements": ["volkszaehler==0.4.0"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/volkszaehler",
   "iot_class": "local_polling",
-  "loggers": ["volkszaehler"]
+  "loggers": ["volkszaehler"],
+  "requirements": ["volkszaehler==0.4.0"]
 }
diff --git a/homeassistant/components/volumio/manifest.json b/homeassistant/components/volumio/manifest.json
index 3785ed0ecc..aa4e1d22e2 100644
--- a/homeassistant/components/volumio/manifest.json
+++ b/homeassistant/components/volumio/manifest.json
@@ -1,11 +1,11 @@
 {
   "domain": "volumio",
   "name": "Volumio",
-  "documentation": "https://www.home-assistant.io/integrations/volumio",
   "codeowners": ["@OnFreund"],
   "config_flow": true,
-  "zeroconf": ["_Volumio._tcp.local."],
-  "requirements": ["pyvolumio==0.1.5"],
+  "documentation": "https://www.home-assistant.io/integrations/volumio",
   "iot_class": "local_polling",
-  "loggers": ["pyvolumio"]
+  "loggers": ["pyvolumio"],
+  "requirements": ["pyvolumio==0.1.5"],
+  "zeroconf": ["_Volumio._tcp.local."]
 }
diff --git a/homeassistant/components/volvooncall/manifest.json b/homeassistant/components/volvooncall/manifest.json
index b9da3657ae..0c50cb4463 100644
--- a/homeassistant/components/volvooncall/manifest.json
+++ b/homeassistant/components/volvooncall/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "volvooncall",
   "name": "Volvo On Call",
-  "documentation": "https://www.home-assistant.io/integrations/volvooncall",
-  "requirements": ["volvooncall==0.10.1"],
   "codeowners": ["@molobrakos"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/volvooncall",
   "iot_class": "cloud_polling",
   "loggers": ["geopy", "hbmqtt", "volvooncall"],
-  "config_flow": true
+  "requirements": ["volvooncall==0.10.1"]
 }
diff --git a/homeassistant/components/vulcan/manifest.json b/homeassistant/components/vulcan/manifest.json
index b7f1f5fe4d..74426fe6f9 100644
--- a/homeassistant/components/vulcan/manifest.json
+++ b/homeassistant/components/vulcan/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "vulcan",
   "name": "Uonet+ Vulcan",
+  "codeowners": ["@Antoni-Czaplicki"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/vulcan",
-  "requirements": ["vulcan-api==2.1.1"],
-  "codeowners": ["@Antoni-Czaplicki"],
   "iot_class": "cloud_polling",
-  "quality_scale": "silver"
+  "quality_scale": "silver",
+  "requirements": ["vulcan-api==2.1.1"]
 }
diff --git a/homeassistant/components/vultr/manifest.json b/homeassistant/components/vultr/manifest.json
index 449b9a33e3..dc3cd3571e 100644
--- a/homeassistant/components/vultr/manifest.json
+++ b/homeassistant/components/vultr/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "vultr",
   "name": "Vultr",
-  "documentation": "https://www.home-assistant.io/integrations/vultr",
-  "requirements": ["vultr==0.1.2"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/vultr",
   "iot_class": "cloud_polling",
-  "loggers": ["vultr"]
+  "loggers": ["vultr"],
+  "requirements": ["vultr==0.1.2"]
 }
diff --git a/homeassistant/components/w800rf32/manifest.json b/homeassistant/components/w800rf32/manifest.json
index 1a754351e7..e76835abcb 100644
--- a/homeassistant/components/w800rf32/manifest.json
+++ b/homeassistant/components/w800rf32/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "w800rf32",
   "name": "WGL Designs W800RF32",
-  "documentation": "https://www.home-assistant.io/integrations/w800rf32",
-  "requirements": ["pyW800rf32==0.1"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/w800rf32",
   "iot_class": "local_push",
-  "loggers": ["W800rf32"]
+  "loggers": ["W800rf32"],
+  "requirements": ["pyW800rf32==0.1"]
 }
diff --git a/homeassistant/components/wake_on_lan/manifest.json b/homeassistant/components/wake_on_lan/manifest.json
index fc2c36eed8..a62980b301 100644
--- a/homeassistant/components/wake_on_lan/manifest.json
+++ b/homeassistant/components/wake_on_lan/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "wake_on_lan",
   "name": "Wake on LAN",
-  "documentation": "https://www.home-assistant.io/integrations/wake_on_lan",
-  "requirements": ["wakeonlan==2.1.0"],
   "codeowners": ["@ntilley905"],
-  "iot_class": "local_push"
+  "documentation": "https://www.home-assistant.io/integrations/wake_on_lan",
+  "iot_class": "local_push",
+  "requirements": ["wakeonlan==2.1.0"]
 }
diff --git a/homeassistant/components/wallbox/manifest.json b/homeassistant/components/wallbox/manifest.json
index e1d64ab947..fc63e0ca25 100644
--- a/homeassistant/components/wallbox/manifest.json
+++ b/homeassistant/components/wallbox/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "wallbox",
   "name": "Wallbox",
+  "codeowners": ["@hesselonline"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/wallbox",
-  "requirements": ["wallbox==0.4.12"],
-  "codeowners": ["@hesselonline"],
   "iot_class": "cloud_polling",
-  "loggers": ["wallbox"]
+  "loggers": ["wallbox"],
+  "requirements": ["wallbox==0.4.12"]
 }
diff --git a/homeassistant/components/waqi/manifest.json b/homeassistant/components/waqi/manifest.json
index d4818d4462..d1c7521783 100644
--- a/homeassistant/components/waqi/manifest.json
+++ b/homeassistant/components/waqi/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "waqi",
   "name": "World Air Quality Index (WAQI)",
-  "documentation": "https://www.home-assistant.io/integrations/waqi",
-  "requirements": ["waqiasync==1.0.0"],
   "codeowners": ["@andrey-git"],
+  "documentation": "https://www.home-assistant.io/integrations/waqi",
   "iot_class": "cloud_polling",
-  "loggers": ["waqiasync"]
+  "loggers": ["waqiasync"],
+  "requirements": ["waqiasync==1.0.0"]
 }
diff --git a/homeassistant/components/water_heater/manifest.json b/homeassistant/components/water_heater/manifest.json
index 63f9f51384..96629906cc 100644
--- a/homeassistant/components/water_heater/manifest.json
+++ b/homeassistant/components/water_heater/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "water_heater",
   "name": "Water Heater",
-  "documentation": "https://www.home-assistant.io/integrations/water_heater",
   "codeowners": ["@home-assistant/core"],
-  "quality_scale": "internal",
-  "integration_type": "entity"
+  "documentation": "https://www.home-assistant.io/integrations/water_heater",
+  "integration_type": "entity",
+  "quality_scale": "internal"
 }
diff --git a/homeassistant/components/waterfurnace/manifest.json b/homeassistant/components/waterfurnace/manifest.json
index 8699df289d..9e01f7e6a0 100644
--- a/homeassistant/components/waterfurnace/manifest.json
+++ b/homeassistant/components/waterfurnace/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "waterfurnace",
   "name": "WaterFurnace",
-  "documentation": "https://www.home-assistant.io/integrations/waterfurnace",
-  "requirements": ["waterfurnace==1.1.0"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/waterfurnace",
   "iot_class": "cloud_polling",
-  "loggers": ["waterfurnace"]
+  "loggers": ["waterfurnace"],
+  "requirements": ["waterfurnace==1.1.0"]
 }
diff --git a/homeassistant/components/watson_iot/manifest.json b/homeassistant/components/watson_iot/manifest.json
index 7b65b5d0fa..702c549224 100644
--- a/homeassistant/components/watson_iot/manifest.json
+++ b/homeassistant/components/watson_iot/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "watson_iot",
   "name": "IBM Watson IoT Platform",
-  "documentation": "https://www.home-assistant.io/integrations/watson_iot",
-  "requirements": ["ibmiotf==0.3.4"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/watson_iot",
   "iot_class": "cloud_push",
-  "loggers": ["ibmiotf", "paho_mqtt"]
+  "loggers": ["ibmiotf", "paho_mqtt"],
+  "requirements": ["ibmiotf==0.3.4"]
 }
diff --git a/homeassistant/components/watson_tts/manifest.json b/homeassistant/components/watson_tts/manifest.json
index f225ac25ae..2f9404bf14 100644
--- a/homeassistant/components/watson_tts/manifest.json
+++ b/homeassistant/components/watson_tts/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "watson_tts",
   "name": "IBM Watson TTS",
-  "documentation": "https://www.home-assistant.io/integrations/watson_tts",
-  "requirements": ["ibm-watson==5.2.2"],
   "codeowners": ["@rutkai"],
+  "documentation": "https://www.home-assistant.io/integrations/watson_tts",
   "iot_class": "cloud_push",
-  "loggers": ["ibm_cloud_sdk_core", "ibm_watson"]
+  "loggers": ["ibm_cloud_sdk_core", "ibm_watson"],
+  "requirements": ["ibm-watson==5.2.2"]
 }
diff --git a/homeassistant/components/watttime/manifest.json b/homeassistant/components/watttime/manifest.json
index b661b96837..3abe910b9b 100644
--- a/homeassistant/components/watttime/manifest.json
+++ b/homeassistant/components/watttime/manifest.json
@@ -1,11 +1,11 @@
 {
   "domain": "watttime",
   "name": "WattTime",
+  "codeowners": ["@bachya"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/watttime",
-  "requirements": ["aiowatttime==0.1.1"],
-  "codeowners": ["@bachya"],
+  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aiowatttime"],
-  "integration_type": "service"
+  "requirements": ["aiowatttime==0.1.1"]
 }
diff --git a/homeassistant/components/waze_travel_time/manifest.json b/homeassistant/components/waze_travel_time/manifest.json
index 05180c649d..5e19ee6949 100644
--- a/homeassistant/components/waze_travel_time/manifest.json
+++ b/homeassistant/components/waze_travel_time/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "waze_travel_time",
   "name": "Waze Travel Time",
-  "documentation": "https://www.home-assistant.io/integrations/waze_travel_time",
-  "requirements": ["WazeRouteCalculator==0.14"],
   "codeowners": ["@eifinger"],
   "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/waze_travel_time",
   "iot_class": "cloud_polling",
-  "loggers": ["WazeRouteCalculator", "homeassistant.helpers.location"]
+  "loggers": ["WazeRouteCalculator", "homeassistant.helpers.location"],
+  "requirements": ["WazeRouteCalculator==0.14"]
 }
diff --git a/homeassistant/components/weather/manifest.json b/homeassistant/components/weather/manifest.json
index 6d1d166512..59218fef5f 100644
--- a/homeassistant/components/weather/manifest.json
+++ b/homeassistant/components/weather/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "weather",
   "name": "Weather",
-  "documentation": "https://www.home-assistant.io/integrations/weather",
   "codeowners": ["@home-assistant/core"],
-  "quality_scale": "internal",
-  "integration_type": "entity"
+  "documentation": "https://www.home-assistant.io/integrations/weather",
+  "integration_type": "entity",
+  "quality_scale": "internal"
 }
diff --git a/homeassistant/components/webhook/manifest.json b/homeassistant/components/webhook/manifest.json
index 4ca247ed72..c2795e8ac1 100644
--- a/homeassistant/components/webhook/manifest.json
+++ b/homeassistant/components/webhook/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "webhook",
   "name": "Webhook",
-  "documentation": "https://www.home-assistant.io/integrations/webhook",
-  "dependencies": ["http"],
   "codeowners": ["@home-assistant/core"],
+  "dependencies": ["http"],
+  "documentation": "https://www.home-assistant.io/integrations/webhook",
   "quality_scale": "internal"
 }
diff --git a/homeassistant/components/webostv/manifest.json b/homeassistant/components/webostv/manifest.json
index 26fca61efe..1eac959c16 100644
--- a/homeassistant/components/webostv/manifest.json
+++ b/homeassistant/components/webostv/manifest.json
@@ -1,12 +1,16 @@
 {
   "domain": "webostv",
   "name": "LG webOS Smart TV",
+  "codeowners": ["@thecode"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/webostv",
-  "requirements": ["aiowebostv==0.3.2"],
-  "codeowners": ["@thecode"],
-  "ssdp": [{ "st": "urn:lge-com:service:webos-second-screen:1" }],
-  "quality_scale": "platinum",
   "iot_class": "local_push",
-  "loggers": ["aiowebostv"]
+  "loggers": ["aiowebostv"],
+  "quality_scale": "platinum",
+  "requirements": ["aiowebostv==0.3.2"],
+  "ssdp": [
+    {
+      "st": "urn:lge-com:service:webos-second-screen:1"
+    }
+  ]
 }
diff --git a/homeassistant/components/websocket_api/manifest.json b/homeassistant/components/websocket_api/manifest.json
index 73b05594bd..116bd0ccee 100644
--- a/homeassistant/components/websocket_api/manifest.json
+++ b/homeassistant/components/websocket_api/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "websocket_api",
   "name": "Home Assistant WebSocket API",
-  "documentation": "https://www.home-assistant.io/integrations/websocket_api",
-  "dependencies": ["http"],
+  "after_dependencies": ["recorder"],
   "codeowners": ["@home-assistant/core"],
-  "quality_scale": "internal",
+  "dependencies": ["http"],
+  "documentation": "https://www.home-assistant.io/integrations/websocket_api",
   "integration_type": "system",
-  "after_dependencies": ["recorder"]
+  "quality_scale": "internal"
 }
diff --git a/homeassistant/components/wemo/manifest.json b/homeassistant/components/wemo/manifest.json
index b324ba060e..3a562296a5 100644
--- a/homeassistant/components/wemo/manifest.json
+++ b/homeassistant/components/wemo/manifest.json
@@ -1,18 +1,18 @@
 {
   "domain": "wemo",
   "name": "Belkin WeMo",
+  "codeowners": ["@esev"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/wemo",
+  "homekit": {
+    "models": ["Socket", "Wemo"]
+  },
+  "iot_class": "local_push",
+  "loggers": ["pywemo"],
   "requirements": ["pywemo==0.9.1"],
   "ssdp": [
     {
       "manufacturer": "Belkin International Inc."
     }
-  ],
-  "homekit": {
-    "models": ["Socket", "Wemo"]
-  },
-  "codeowners": ["@esev"],
-  "iot_class": "local_push",
-  "loggers": ["pywemo"]
+  ]
 }
diff --git a/homeassistant/components/whirlpool/manifest.json b/homeassistant/components/whirlpool/manifest.json
index ddee3ec459..d744bc9efc 100644
--- a/homeassistant/components/whirlpool/manifest.json
+++ b/homeassistant/components/whirlpool/manifest.json
@@ -1,11 +1,11 @@
 {
   "domain": "whirlpool",
   "name": "Whirlpool Appliances",
+  "codeowners": ["@abmantis", "@mkmer"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/whirlpool",
-  "requirements": ["whirlpool-sixth-sense==0.18.2"],
-  "codeowners": ["@abmantis", "@mkmer"],
+  "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["whirlpool"],
-  "integration_type": "hub"
+  "requirements": ["whirlpool-sixth-sense==0.18.2"]
 }
diff --git a/homeassistant/components/whois/manifest.json b/homeassistant/components/whois/manifest.json
index a15d4e955d..75cfd6d83f 100644
--- a/homeassistant/components/whois/manifest.json
+++ b/homeassistant/components/whois/manifest.json
@@ -1,11 +1,11 @@
 {
   "domain": "whois",
   "name": "Whois",
-  "documentation": "https://www.home-assistant.io/integrations/whois",
-  "requirements": ["whois==0.9.27"],
-  "config_flow": true,
   "codeowners": ["@frenck"],
-  "iot_class": "cloud_polling",
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/whois",
   "integration_type": "service",
-  "loggers": ["whois"]
+  "iot_class": "cloud_polling",
+  "loggers": ["whois"],
+  "requirements": ["whois==0.9.27"]
 }
diff --git a/homeassistant/components/wiffi/manifest.json b/homeassistant/components/wiffi/manifest.json
index e28062c74c..09da5f4be8 100644
--- a/homeassistant/components/wiffi/manifest.json
+++ b/homeassistant/components/wiffi/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "wiffi",
   "name": "Wiffi",
+  "codeowners": ["@mampfes"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/wiffi",
-  "requirements": ["wiffi==1.1.0"],
-  "codeowners": ["@mampfes"],
   "iot_class": "local_push",
-  "loggers": ["wiffi"]
+  "loggers": ["wiffi"],
+  "requirements": ["wiffi==1.1.0"]
 }
diff --git a/homeassistant/components/wilight/manifest.json b/homeassistant/components/wilight/manifest.json
index b1be0c8012..8da0ffd924 100644
--- a/homeassistant/components/wilight/manifest.json
+++ b/homeassistant/components/wilight/manifest.json
@@ -1,16 +1,16 @@
 {
   "domain": "wilight",
   "name": "WiLight",
+  "codeowners": ["@leofig-rj"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/wilight",
+  "iot_class": "local_polling",
+  "loggers": ["pywilight"],
+  "quality_scale": "silver",
   "requirements": ["pywilight==0.0.74"],
   "ssdp": [
     {
       "manufacturer": "All Automacao Ltda"
     }
-  ],
-  "codeowners": ["@leofig-rj"],
-  "quality_scale": "silver",
-  "iot_class": "local_polling",
-  "loggers": ["pywilight"]
+  ]
 }
diff --git a/homeassistant/components/wirelesstag/manifest.json b/homeassistant/components/wirelesstag/manifest.json
index 881ac34c93..9735c83345 100644
--- a/homeassistant/components/wirelesstag/manifest.json
+++ b/homeassistant/components/wirelesstag/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "wirelesstag",
   "name": "Wireless Sensor Tags",
-  "documentation": "https://www.home-assistant.io/integrations/wirelesstag",
-  "requirements": ["wirelesstagpy==0.8.1"],
   "codeowners": ["@sergeymaysak"],
+  "documentation": "https://www.home-assistant.io/integrations/wirelesstag",
   "iot_class": "cloud_push",
-  "loggers": ["wirelesstagpy"]
+  "loggers": ["wirelesstagpy"],
+  "requirements": ["wirelesstagpy==0.8.1"]
 }
diff --git a/homeassistant/components/withings/manifest.json b/homeassistant/components/withings/manifest.json
index 1437b7f219..29201c7e66 100644
--- a/homeassistant/components/withings/manifest.json
+++ b/homeassistant/components/withings/manifest.json
@@ -1,11 +1,11 @@
 {
   "domain": "withings",
   "name": "Withings",
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/withings",
-  "requirements": ["withings-api==2.4.0"],
-  "dependencies": ["application_credentials", "http", "webhook"],
   "codeowners": ["@vangorra"],
+  "config_flow": true,
+  "dependencies": ["application_credentials", "http", "webhook"],
+  "documentation": "https://www.home-assistant.io/integrations/withings",
   "iot_class": "cloud_polling",
-  "loggers": ["withings_api"]
+  "loggers": ["withings_api"],
+  "requirements": ["withings-api==2.4.0"]
 }
diff --git a/homeassistant/components/wiz/manifest.json b/homeassistant/components/wiz/manifest.json
index c2eb6fe1b5..bb5527bc46 100644
--- a/homeassistant/components/wiz/manifest.json
+++ b/homeassistant/components/wiz/manifest.json
@@ -1,19 +1,31 @@
 {
   "domain": "wiz",
   "name": "WiZ",
+  "codeowners": ["@sbidy"],
   "config_flow": true,
-  "dhcp": [
-    { "registered_devices": true },
-    { "macaddress": "A8BB50*" },
-    { "macaddress": "D8A011*" },
-    { "macaddress": "444F8E*" },
-    { "macaddress": "6C2990*" },
-    { "hostname": "wiz_*" }
-  ],
   "dependencies": ["network"],
-  "quality_scale": "platinum",
+  "dhcp": [
+    {
+      "registered_devices": true
+    },
+    {
+      "macaddress": "A8BB50*"
+    },
+    {
+      "macaddress": "D8A011*"
+    },
+    {
+      "macaddress": "444F8E*"
+    },
+    {
+      "macaddress": "6C2990*"
+    },
+    {
+      "hostname": "wiz_*"
+    }
+  ],
   "documentation": "https://www.home-assistant.io/integrations/wiz",
-  "requirements": ["pywizlight==0.5.14"],
   "iot_class": "local_push",
-  "codeowners": ["@sbidy"]
+  "quality_scale": "platinum",
+  "requirements": ["pywizlight==0.5.14"]
 }
diff --git a/homeassistant/components/wled/manifest.json b/homeassistant/components/wled/manifest.json
index 0e1e364b5c..99309b9f00 100644
--- a/homeassistant/components/wled/manifest.json
+++ b/homeassistant/components/wled/manifest.json
@@ -1,12 +1,12 @@
 {
   "domain": "wled",
   "name": "WLED",
+  "codeowners": ["@frenck"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/wled",
-  "requirements": ["wled==0.15.0"],
-  "zeroconf": ["_wled._tcp.local."],
-  "codeowners": ["@frenck"],
-  "quality_scale": "platinum",
   "integration_type": "device",
-  "iot_class": "local_push"
+  "iot_class": "local_push",
+  "quality_scale": "platinum",
+  "requirements": ["wled==0.15.0"],
+  "zeroconf": ["_wled._tcp.local."]
 }
diff --git a/homeassistant/components/wolflink/manifest.json b/homeassistant/components/wolflink/manifest.json
index f597093382..d01ca12678 100644
--- a/homeassistant/components/wolflink/manifest.json
+++ b/homeassistant/components/wolflink/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "wolflink",
   "name": "Wolf SmartSet Service",
+  "codeowners": ["@adamkrol93"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/wolflink",
-  "requirements": ["wolf_smartset==0.1.11"],
-  "codeowners": ["@adamkrol93"],
   "iot_class": "cloud_polling",
-  "loggers": ["wolf_smartset"]
+  "loggers": ["wolf_smartset"],
+  "requirements": ["wolf_smartset==0.1.11"]
 }
diff --git a/homeassistant/components/workday/manifest.json b/homeassistant/components/workday/manifest.json
index 8cd59d36ae..442456066c 100644
--- a/homeassistant/components/workday/manifest.json
+++ b/homeassistant/components/workday/manifest.json
@@ -1,15 +1,15 @@
 {
   "domain": "workday",
   "name": "Workday",
-  "documentation": "https://www.home-assistant.io/integrations/workday",
-  "requirements": ["holidays==0.18.0"],
   "codeowners": ["@fabaff"],
-  "quality_scale": "internal",
+  "documentation": "https://www.home-assistant.io/integrations/workday",
   "iot_class": "local_polling",
   "loggers": [
     "convertdate",
     "hijri_converter",
     "holidays",
     "korean_lunar_calendar"
-  ]
+  ],
+  "quality_scale": "internal",
+  "requirements": ["holidays==0.18.0"]
 }
diff --git a/homeassistant/components/worldclock/manifest.json b/homeassistant/components/worldclock/manifest.json
index cc58003dad..61600e4f92 100644
--- a/homeassistant/components/worldclock/manifest.json
+++ b/homeassistant/components/worldclock/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "worldclock",
   "name": "Worldclock",
-  "documentation": "https://www.home-assistant.io/integrations/worldclock",
   "codeowners": ["@fabaff"],
-  "quality_scale": "internal",
-  "iot_class": "local_push"
+  "documentation": "https://www.home-assistant.io/integrations/worldclock",
+  "iot_class": "local_push",
+  "quality_scale": "internal"
 }
diff --git a/homeassistant/components/worldtidesinfo/manifest.json b/homeassistant/components/worldtidesinfo/manifest.json
index b2b95af105..962e63617f 100644
--- a/homeassistant/components/worldtidesinfo/manifest.json
+++ b/homeassistant/components/worldtidesinfo/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "worldtidesinfo",
   "name": "World Tides",
-  "documentation": "https://www.home-assistant.io/integrations/worldtidesinfo",
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/worldtidesinfo",
   "iot_class": "cloud_polling"
 }
diff --git a/homeassistant/components/worxlandroid/manifest.json b/homeassistant/components/worxlandroid/manifest.json
index 82a16fd92c..a74228295c 100644
--- a/homeassistant/components/worxlandroid/manifest.json
+++ b/homeassistant/components/worxlandroid/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "worxlandroid",
   "name": "Worx Landroid",
-  "documentation": "https://www.home-assistant.io/integrations/worxlandroid",
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/worxlandroid",
   "iot_class": "local_polling"
 }
diff --git a/homeassistant/components/ws66i/manifest.json b/homeassistant/components/ws66i/manifest.json
index abd943eb26..d259823d5a 100644
--- a/homeassistant/components/ws66i/manifest.json
+++ b/homeassistant/components/ws66i/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "ws66i",
   "name": "Soundavo WS66i 6-Zone Amplifier",
-  "documentation": "https://www.home-assistant.io/integrations/ws66i",
-  "requirements": ["pyws66i==1.1"],
   "codeowners": ["@ssaenger"],
   "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/ws66i",
+  "iot_class": "local_polling",
   "quality_scale": "silver",
-  "iot_class": "local_polling"
+  "requirements": ["pyws66i==1.1"]
 }
diff --git a/homeassistant/components/wsdot/manifest.json b/homeassistant/components/wsdot/manifest.json
index f731c3a7d5..4444cfbac4 100644
--- a/homeassistant/components/wsdot/manifest.json
+++ b/homeassistant/components/wsdot/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "wsdot",
   "name": "Washington State Department of Transportation (WSDOT)",
-  "documentation": "https://www.home-assistant.io/integrations/wsdot",
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/wsdot",
   "iot_class": "cloud_polling"
 }
diff --git a/homeassistant/components/x10/manifest.json b/homeassistant/components/x10/manifest.json
index 249d42e4d8..258080dc37 100644
--- a/homeassistant/components/x10/manifest.json
+++ b/homeassistant/components/x10/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "x10",
   "name": "Heyu X10",
-  "documentation": "https://www.home-assistant.io/integrations/x10",
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/x10",
   "iot_class": "local_polling"
 }
diff --git a/homeassistant/components/xbox/manifest.json b/homeassistant/components/xbox/manifest.json
index 5adfa54a90..30a6c3bc70 100644
--- a/homeassistant/components/xbox/manifest.json
+++ b/homeassistant/components/xbox/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "xbox",
   "name": "Xbox",
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/xbox",
-  "requirements": ["xbox-webapi==2.0.11"],
-  "dependencies": ["auth", "application_credentials"],
   "codeowners": ["@hunterjm"],
-  "iot_class": "cloud_polling"
+  "config_flow": true,
+  "dependencies": ["auth", "application_credentials"],
+  "documentation": "https://www.home-assistant.io/integrations/xbox",
+  "iot_class": "cloud_polling",
+  "requirements": ["xbox-webapi==2.0.11"]
 }
diff --git a/homeassistant/components/xbox_live/manifest.json b/homeassistant/components/xbox_live/manifest.json
index f2dacccb7c..bf3e798da0 100644
--- a/homeassistant/components/xbox_live/manifest.json
+++ b/homeassistant/components/xbox_live/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "xbox_live",
   "name": "Xbox Live",
-  "documentation": "https://www.home-assistant.io/integrations/xbox_live",
-  "requirements": ["xboxapi==2.0.1"],
   "codeowners": ["@MartinHjelmare"],
+  "documentation": "https://www.home-assistant.io/integrations/xbox_live",
   "iot_class": "cloud_polling",
-  "loggers": ["xboxapi"]
+  "loggers": ["xboxapi"],
+  "requirements": ["xboxapi==2.0.1"]
 }
diff --git a/homeassistant/components/xeoma/manifest.json b/homeassistant/components/xeoma/manifest.json
index 12958a9382..a73b4bb867 100644
--- a/homeassistant/components/xeoma/manifest.json
+++ b/homeassistant/components/xeoma/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "xeoma",
   "name": "Xeoma",
-  "documentation": "https://www.home-assistant.io/integrations/xeoma",
-  "requirements": ["pyxeoma==1.4.1"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/xeoma",
   "iot_class": "local_polling",
-  "loggers": ["pyxeoma"]
+  "loggers": ["pyxeoma"],
+  "requirements": ["pyxeoma==1.4.1"]
 }
diff --git a/homeassistant/components/xiaomi/manifest.json b/homeassistant/components/xiaomi/manifest.json
index 37f9488d5c..ef7085f2aa 100644
--- a/homeassistant/components/xiaomi/manifest.json
+++ b/homeassistant/components/xiaomi/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "xiaomi",
   "name": "Xiaomi",
-  "documentation": "https://www.home-assistant.io/integrations/xiaomi",
-  "dependencies": ["ffmpeg"],
   "codeowners": [],
+  "dependencies": ["ffmpeg"],
+  "documentation": "https://www.home-assistant.io/integrations/xiaomi",
   "iot_class": "local_polling"
 }
diff --git a/homeassistant/components/xiaomi_aqara/manifest.json b/homeassistant/components/xiaomi_aqara/manifest.json
index 8152a77a73..6d84a5ffd0 100644
--- a/homeassistant/components/xiaomi_aqara/manifest.json
+++ b/homeassistant/components/xiaomi_aqara/manifest.json
@@ -1,12 +1,12 @@
 {
   "domain": "xiaomi_aqara",
   "name": "Xiaomi Gateway (Aqara)",
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/xiaomi_aqara",
-  "requirements": ["PyXiaomiGateway==0.14.3"],
   "after_dependencies": ["discovery"],
   "codeowners": ["@danielhiversen", "@syssi"],
-  "zeroconf": ["_miio._udp.local."],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/xiaomi_aqara",
   "iot_class": "local_push",
-  "loggers": ["xiaomi_gateway"]
+  "loggers": ["xiaomi_gateway"],
+  "requirements": ["PyXiaomiGateway==0.14.3"],
+  "zeroconf": ["_miio._udp.local."]
 }
diff --git a/homeassistant/components/xiaomi_ble/manifest.json b/homeassistant/components/xiaomi_ble/manifest.json
index f390400341..fce0eb735c 100644
--- a/homeassistant/components/xiaomi_ble/manifest.json
+++ b/homeassistant/components/xiaomi_ble/manifest.json
@@ -1,8 +1,6 @@
 {
   "domain": "xiaomi_ble",
   "name": "Xiaomi BLE",
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/xiaomi_ble",
   "bluetooth": [
     {
       "connectable": false,
@@ -13,8 +11,10 @@
       "service_data_uuid": "0000fe95-0000-1000-8000-00805f9b34fb"
     }
   ],
-  "dependencies": ["bluetooth_adapters"],
-  "requirements": ["xiaomi-ble==0.16.1"],
   "codeowners": ["@Jc2k", "@Ernst79"],
-  "iot_class": "local_push"
+  "config_flow": true,
+  "dependencies": ["bluetooth_adapters"],
+  "documentation": "https://www.home-assistant.io/integrations/xiaomi_ble",
+  "iot_class": "local_push",
+  "requirements": ["xiaomi-ble==0.16.1"]
 }
diff --git a/homeassistant/components/xiaomi_miio/manifest.json b/homeassistant/components/xiaomi_miio/manifest.json
index 4f806c3ed5..d1d703f987 100644
--- a/homeassistant/components/xiaomi_miio/manifest.json
+++ b/homeassistant/components/xiaomi_miio/manifest.json
@@ -1,11 +1,11 @@
 {
   "domain": "xiaomi_miio",
   "name": "Xiaomi Miio",
+  "codeowners": ["@rytilahti", "@syssi", "@starkillerOG"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/xiaomi_miio",
-  "requirements": ["construct==2.10.56", "micloud==0.5", "python-miio==0.5.12"],
-  "codeowners": ["@rytilahti", "@syssi", "@starkillerOG"],
-  "zeroconf": ["_miio._udp.local."],
   "iot_class": "local_polling",
-  "loggers": ["micloud", "miio"]
+  "loggers": ["micloud", "miio"],
+  "requirements": ["construct==2.10.56", "micloud==0.5", "python-miio==0.5.12"],
+  "zeroconf": ["_miio._udp.local."]
 }
diff --git a/homeassistant/components/xiaomi_tv/manifest.json b/homeassistant/components/xiaomi_tv/manifest.json
index 303480c2e7..2e913e80fd 100644
--- a/homeassistant/components/xiaomi_tv/manifest.json
+++ b/homeassistant/components/xiaomi_tv/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "xiaomi_tv",
   "name": "Xiaomi TV",
-  "documentation": "https://www.home-assistant.io/integrations/xiaomi_tv",
-  "requirements": ["pymitv==1.4.3"],
   "codeowners": ["@simse"],
+  "documentation": "https://www.home-assistant.io/integrations/xiaomi_tv",
   "iot_class": "assumed_state",
-  "loggers": ["pymitv"]
+  "loggers": ["pymitv"],
+  "requirements": ["pymitv==1.4.3"]
 }
diff --git a/homeassistant/components/xmpp/manifest.json b/homeassistant/components/xmpp/manifest.json
index 4f11b83a55..dd7df91223 100644
--- a/homeassistant/components/xmpp/manifest.json
+++ b/homeassistant/components/xmpp/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "xmpp",
   "name": "Jabber (XMPP)",
-  "documentation": "https://www.home-assistant.io/integrations/xmpp",
-  "requirements": ["slixmpp==1.8.3"],
   "codeowners": ["@fabaff", "@flowolf"],
+  "documentation": "https://www.home-assistant.io/integrations/xmpp",
   "iot_class": "cloud_push",
-  "loggers": ["pyasn1", "slixmpp"]
+  "loggers": ["pyasn1", "slixmpp"],
+  "requirements": ["slixmpp==1.8.3"]
 }
diff --git a/homeassistant/components/xs1/manifest.json b/homeassistant/components/xs1/manifest.json
index cbc0e147f5..9f4c921642 100644
--- a/homeassistant/components/xs1/manifest.json
+++ b/homeassistant/components/xs1/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "xs1",
   "name": "EZcontrol XS1",
-  "documentation": "https://www.home-assistant.io/integrations/xs1",
-  "requirements": ["xs1-api-client==3.0.0"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/xs1",
   "iot_class": "local_polling",
-  "loggers": ["xs1_api_client"]
+  "loggers": ["xs1_api_client"],
+  "requirements": ["xs1-api-client==3.0.0"]
 }
diff --git a/homeassistant/components/yale_smart_alarm/manifest.json b/homeassistant/components/yale_smart_alarm/manifest.json
index 865751d18e..ed494505ba 100644
--- a/homeassistant/components/yale_smart_alarm/manifest.json
+++ b/homeassistant/components/yale_smart_alarm/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "yale_smart_alarm",
   "name": "Yale Smart Living",
-  "documentation": "https://www.home-assistant.io/integrations/yale_smart_alarm",
-  "requirements": ["yalesmartalarmclient==0.3.9"],
   "codeowners": ["@gjohansson-ST"],
   "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/yale_smart_alarm",
   "iot_class": "cloud_polling",
-  "loggers": ["yalesmartalarmclient"]
+  "loggers": ["yalesmartalarmclient"],
+  "requirements": ["yalesmartalarmclient==0.3.9"]
 }
diff --git a/homeassistant/components/yalexs_ble/manifest.json b/homeassistant/components/yalexs_ble/manifest.json
index 866f5eca6b..23826d060a 100644
--- a/homeassistant/components/yalexs_ble/manifest.json
+++ b/homeassistant/components/yalexs_ble/manifest.json
@@ -1,16 +1,16 @@
 {
   "domain": "yalexs_ble",
   "name": "Yale Access Bluetooth",
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/yalexs_ble",
-  "requirements": ["yalexs-ble==1.12.8"],
-  "dependencies": ["bluetooth_adapters"],
-  "codeowners": ["@bdraco"],
   "bluetooth": [
     {
       "manufacturer_id": 465,
       "service_uuid": "0000fe24-0000-1000-8000-00805f9b34fb"
     }
   ],
-  "iot_class": "local_push"
+  "codeowners": ["@bdraco"],
+  "config_flow": true,
+  "dependencies": ["bluetooth_adapters"],
+  "documentation": "https://www.home-assistant.io/integrations/yalexs_ble",
+  "iot_class": "local_push",
+  "requirements": ["yalexs-ble==1.12.8"]
 }
diff --git a/homeassistant/components/yamaha/manifest.json b/homeassistant/components/yamaha/manifest.json
index 7fc86f707b..8e6ba0b885 100644
--- a/homeassistant/components/yamaha/manifest.json
+++ b/homeassistant/components/yamaha/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "yamaha",
   "name": "Yamaha Network Receivers",
-  "documentation": "https://www.home-assistant.io/integrations/yamaha",
-  "requirements": ["rxv==0.7.0"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/yamaha",
   "iot_class": "local_polling",
-  "loggers": ["rxv"]
+  "loggers": ["rxv"],
+  "requirements": ["rxv==0.7.0"]
 }
diff --git a/homeassistant/components/yamaha_musiccast/manifest.json b/homeassistant/components/yamaha_musiccast/manifest.json
index afcc64985d..9a19f61eb4 100644
--- a/homeassistant/components/yamaha_musiccast/manifest.json
+++ b/homeassistant/components/yamaha_musiccast/manifest.json
@@ -1,16 +1,16 @@
 {
   "domain": "yamaha_musiccast",
   "name": "MusicCast",
+  "codeowners": ["@vigonotion", "@micha91"],
   "config_flow": true,
+  "dependencies": ["ssdp"],
   "documentation": "https://www.home-assistant.io/integrations/yamaha_musiccast",
+  "iot_class": "local_push",
+  "loggers": ["aiomusiccast"],
   "requirements": ["aiomusiccast==0.14.7"],
   "ssdp": [
     {
       "manufacturer": "Yamaha Corporation"
     }
-  ],
-  "dependencies": ["ssdp"],
-  "iot_class": "local_push",
-  "codeowners": ["@vigonotion", "@micha91"],
-  "loggers": ["aiomusiccast"]
+  ]
 }
diff --git a/homeassistant/components/yandex_transport/manifest.json b/homeassistant/components/yandex_transport/manifest.json
index 22872259a6..703f81d282 100644
--- a/homeassistant/components/yandex_transport/manifest.json
+++ b/homeassistant/components/yandex_transport/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "yandex_transport",
   "name": "Yandex Transport",
-  "documentation": "https://www.home-assistant.io/integrations/yandex_transport",
-  "requirements": ["aioymaps==1.2.2"],
   "codeowners": ["@rishatik92", "@devbis"],
-  "iot_class": "cloud_polling"
+  "documentation": "https://www.home-assistant.io/integrations/yandex_transport",
+  "iot_class": "cloud_polling",
+  "requirements": ["aioymaps==1.2.2"]
 }
diff --git a/homeassistant/components/yandextts/manifest.json b/homeassistant/components/yandextts/manifest.json
index d6e3cb60b3..e1ab27272e 100644
--- a/homeassistant/components/yandextts/manifest.json
+++ b/homeassistant/components/yandextts/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "yandextts",
   "name": "Yandex TTS",
-  "documentation": "https://www.home-assistant.io/integrations/yandextts",
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/yandextts",
   "iot_class": "cloud_push"
 }
diff --git a/homeassistant/components/yeelight/manifest.json b/homeassistant/components/yeelight/manifest.json
index 62106f99d0..a3d4e900c5 100644
--- a/homeassistant/components/yeelight/manifest.json
+++ b/homeassistant/components/yeelight/manifest.json
@@ -1,22 +1,27 @@
 {
   "domain": "yeelight",
   "name": "Yeelight",
-  "documentation": "https://www.home-assistant.io/integrations/yeelight",
-  "requirements": ["yeelight==0.7.10", "async-upnp-client==0.33.1"],
+  "after_dependencies": ["ssdp"],
   "codeowners": ["@zewelor", "@shenxn", "@starkillerOG", "@alexyao2015"],
   "config_flow": true,
   "dependencies": ["network"],
-  "quality_scale": "platinum",
-  "iot_class": "local_push",
   "dhcp": [
     {
       "hostname": "yeelink-*"
     }
   ],
-  "zeroconf": [{ "type": "_miio._udp.local.", "name": "yeelink-*" }],
+  "documentation": "https://www.home-assistant.io/integrations/yeelight",
   "homekit": {
     "models": ["YL*"]
   },
-  "after_dependencies": ["ssdp"],
-  "loggers": ["async_upnp_client", "yeelight"]
+  "iot_class": "local_push",
+  "loggers": ["async_upnp_client", "yeelight"],
+  "quality_scale": "platinum",
+  "requirements": ["yeelight==0.7.10", "async-upnp-client==0.33.1"],
+  "zeroconf": [
+    {
+      "type": "_miio._udp.local.",
+      "name": "yeelink-*"
+    }
+  ]
 }
diff --git a/homeassistant/components/yeelightsunflower/manifest.json b/homeassistant/components/yeelightsunflower/manifest.json
index edae33b75a..67746e122c 100644
--- a/homeassistant/components/yeelightsunflower/manifest.json
+++ b/homeassistant/components/yeelightsunflower/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "yeelightsunflower",
   "name": "Yeelight Sunflower",
-  "documentation": "https://www.home-assistant.io/integrations/yeelightsunflower",
-  "requirements": ["yeelightsunflower==0.0.10"],
   "codeowners": ["@lindsaymarkward"],
+  "documentation": "https://www.home-assistant.io/integrations/yeelightsunflower",
   "iot_class": "local_polling",
-  "loggers": ["yeelightsunflower"]
+  "loggers": ["yeelightsunflower"],
+  "requirements": ["yeelightsunflower==0.0.10"]
 }
diff --git a/homeassistant/components/yi/manifest.json b/homeassistant/components/yi/manifest.json
index 10f2e4e3d9..d8514b251c 100644
--- a/homeassistant/components/yi/manifest.json
+++ b/homeassistant/components/yi/manifest.json
@@ -1,11 +1,11 @@
 {
   "domain": "yi",
   "name": "Yi Home Cameras",
-  "documentation": "https://www.home-assistant.io/integrations/yi",
-  "requirements": ["aioftp==0.21.3"],
-  "dependencies": ["ffmpeg"],
   "codeowners": ["@bachya"],
+  "dependencies": ["ffmpeg"],
+  "documentation": "https://www.home-assistant.io/integrations/yi",
+  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["aioftp"],
-  "integration_type": "device"
+  "requirements": ["aioftp==0.21.3"]
 }
diff --git a/homeassistant/components/yolink/manifest.json b/homeassistant/components/yolink/manifest.json
index 0e0b4f5916..2353afe5f6 100644
--- a/homeassistant/components/yolink/manifest.json
+++ b/homeassistant/components/yolink/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "yolink",
   "name": "YoLink",
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/yolink",
-  "requirements": ["yolink-api==0.2.8"],
-  "dependencies": ["auth", "application_credentials"],
   "codeowners": ["@matrixd2"],
-  "iot_class": "cloud_push"
+  "config_flow": true,
+  "dependencies": ["auth", "application_credentials"],
+  "documentation": "https://www.home-assistant.io/integrations/yolink",
+  "iot_class": "cloud_push",
+  "requirements": ["yolink-api==0.2.8"]
 }
diff --git a/homeassistant/components/youless/manifest.json b/homeassistant/components/youless/manifest.json
index 1e952452f4..02cca76c4a 100644
--- a/homeassistant/components/youless/manifest.json
+++ b/homeassistant/components/youless/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "youless",
   "name": "YouLess",
+  "codeowners": ["@gjong"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/youless",
-  "requirements": ["youless-api==0.16"],
-  "codeowners": ["@gjong"],
   "iot_class": "local_polling",
-  "loggers": ["youless_api"]
+  "loggers": ["youless_api"],
+  "requirements": ["youless-api==0.16"]
 }
diff --git a/homeassistant/components/zabbix/manifest.json b/homeassistant/components/zabbix/manifest.json
index 8101fd6bf7..d182305163 100644
--- a/homeassistant/components/zabbix/manifest.json
+++ b/homeassistant/components/zabbix/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "zabbix",
   "name": "Zabbix",
-  "documentation": "https://www.home-assistant.io/integrations/zabbix",
-  "requirements": ["py-zabbix==1.1.7"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/zabbix",
   "iot_class": "local_polling",
-  "loggers": ["pyzabbix"]
+  "loggers": ["pyzabbix"],
+  "requirements": ["py-zabbix==1.1.7"]
 }
diff --git a/homeassistant/components/zamg/manifest.json b/homeassistant/components/zamg/manifest.json
index c920ca328f..72a7f8de94 100644
--- a/homeassistant/components/zamg/manifest.json
+++ b/homeassistant/components/zamg/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "zamg",
   "name": "Zentralanstalt f\u00fcr Meteorologie und Geodynamik (ZAMG)",
-  "documentation": "https://www.home-assistant.io/integrations/zamg",
-  "requirements": ["zamg==0.2.2"],
   "codeowners": ["@killer0071234"],
   "config_flow": true,
-  "iot_class": "cloud_polling"
+  "documentation": "https://www.home-assistant.io/integrations/zamg",
+  "iot_class": "cloud_polling",
+  "requirements": ["zamg==0.2.2"]
 }
diff --git a/homeassistant/components/zengge/manifest.json b/homeassistant/components/zengge/manifest.json
index 79ae849dd3..5a4525079d 100644
--- a/homeassistant/components/zengge/manifest.json
+++ b/homeassistant/components/zengge/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "zengge",
   "name": "Zengge",
-  "documentation": "https://www.home-assistant.io/integrations/zengge",
-  "requirements": ["bluepy==1.3.0", "zengge==0.2"],
   "codeowners": ["@emontnemery"],
+  "documentation": "https://www.home-assistant.io/integrations/zengge",
   "iot_class": "local_polling",
-  "loggers": ["zengge"]
+  "loggers": ["zengge"],
+  "requirements": ["bluepy==1.3.0", "zengge==0.2"]
 }
diff --git a/homeassistant/components/zeroconf/manifest.json b/homeassistant/components/zeroconf/manifest.json
index cd00e0b05e..f2860df56c 100644
--- a/homeassistant/components/zeroconf/manifest.json
+++ b/homeassistant/components/zeroconf/manifest.json
@@ -1,12 +1,12 @@
 {
   "domain": "zeroconf",
   "name": "Zero-configuration networking (zeroconf)",
-  "documentation": "https://www.home-assistant.io/integrations/zeroconf",
-  "requirements": ["zeroconf==0.47.1"],
-  "dependencies": ["network", "api"],
   "codeowners": ["@bdraco"],
-  "quality_scale": "internal",
+  "dependencies": ["network", "api"],
+  "documentation": "https://www.home-assistant.io/integrations/zeroconf",
+  "integration_type": "system",
   "iot_class": "local_push",
   "loggers": ["zeroconf"],
-  "integration_type": "system"
+  "quality_scale": "internal",
+  "requirements": ["zeroconf==0.47.1"]
 }
diff --git a/homeassistant/components/zerproc/manifest.json b/homeassistant/components/zerproc/manifest.json
index eb43edc7fe..a40a1b00b8 100644
--- a/homeassistant/components/zerproc/manifest.json
+++ b/homeassistant/components/zerproc/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "zerproc",
   "name": "Zerproc",
+  "codeowners": ["@emlove"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zerproc",
-  "requirements": ["pyzerproc==0.4.8"],
-  "codeowners": ["@emlove"],
   "iot_class": "local_polling",
-  "loggers": ["bleak", "pyzerproc"]
+  "loggers": ["bleak", "pyzerproc"],
+  "requirements": ["pyzerproc==0.4.8"]
 }
diff --git a/homeassistant/components/zestimate/manifest.json b/homeassistant/components/zestimate/manifest.json
index d382fc26ab..a881adf503 100644
--- a/homeassistant/components/zestimate/manifest.json
+++ b/homeassistant/components/zestimate/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "zestimate",
   "name": "Zestimate",
-  "documentation": "https://www.home-assistant.io/integrations/zestimate",
-  "requirements": ["xmltodict==0.13.0"],
   "codeowners": [],
-  "iot_class": "cloud_polling"
+  "documentation": "https://www.home-assistant.io/integrations/zestimate",
+  "iot_class": "cloud_polling",
+  "requirements": ["xmltodict==0.13.0"]
 }
diff --git a/homeassistant/components/zeversolar/manifest.json b/homeassistant/components/zeversolar/manifest.json
index 62682709b0..eceba0ddeb 100644
--- a/homeassistant/components/zeversolar/manifest.json
+++ b/homeassistant/components/zeversolar/manifest.json
@@ -1,10 +1,10 @@
 {
   "domain": "zeversolar",
   "name": "Zeversolar",
+  "codeowners": ["@kvanzuijlen"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zeversolar",
-  "requirements": ["zeversolar==0.3.0"],
-  "codeowners": ["@kvanzuijlen"],
+  "integration_type": "device",
   "iot_class": "local_polling",
-  "integration_type": "device"
+  "requirements": ["zeversolar==0.3.0"]
 }
diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index 065f4aaf8a..f0049a79fa 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -1,8 +1,24 @@
 {
   "domain": "zha",
   "name": "Zigbee Home Automation",
+  "after_dependencies": ["onboarding", "usb", "zeroconf"],
+  "codeowners": ["@dmulcahey", "@adminiuga", "@puddly"],
   "config_flow": true,
+  "dependencies": ["file_upload"],
   "documentation": "https://www.home-assistant.io/integrations/zha",
+  "iot_class": "local_polling",
+  "loggers": [
+    "aiosqlite",
+    "bellows",
+    "crccheck",
+    "pure_pcapy3",
+    "zhaquirks",
+    "zigpy",
+    "zigpy_deconz",
+    "zigpy_xbee",
+    "zigpy_zigate",
+    "zigpy_znp"
+  ],
   "requirements": [
     "bellows==0.34.7",
     "pyserial==3.5",
@@ -82,7 +98,6 @@
       "known_devices": ["Bitron Video AV2010/10"]
     }
   ],
-  "codeowners": ["@dmulcahey", "@adminiuga", "@puddly"],
   "zeroconf": [
     {
       "type": "_esphomelib._tcp.local.",
@@ -100,20 +115,5 @@
       "type": "_slzb-06._tcp.local.",
       "name": "slzb-06*"
     }
-  ],
-  "dependencies": ["file_upload"],
-  "after_dependencies": ["onboarding", "usb", "zeroconf"],
-  "iot_class": "local_polling",
-  "loggers": [
-    "aiosqlite",
-    "bellows",
-    "crccheck",
-    "pure_pcapy3",
-    "zhaquirks",
-    "zigpy",
-    "zigpy_deconz",
-    "zigpy_xbee",
-    "zigpy_zigate",
-    "zigpy_znp"
   ]
 }
diff --git a/homeassistant/components/zhong_hong/manifest.json b/homeassistant/components/zhong_hong/manifest.json
index d953675965..637f468b89 100644
--- a/homeassistant/components/zhong_hong/manifest.json
+++ b/homeassistant/components/zhong_hong/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "zhong_hong",
   "name": "ZhongHong",
-  "documentation": "https://www.home-assistant.io/integrations/zhong_hong",
-  "requirements": ["zhong_hong_hvac==1.0.9"],
   "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/zhong_hong",
   "iot_class": "local_push",
-  "loggers": ["zhong_hong_hvac"]
+  "loggers": ["zhong_hong_hvac"],
+  "requirements": ["zhong_hong_hvac==1.0.9"]
 }
diff --git a/homeassistant/components/ziggo_mediabox_xl/manifest.json b/homeassistant/components/ziggo_mediabox_xl/manifest.json
index e2a0dc94d5..81aac99e58 100644
--- a/homeassistant/components/ziggo_mediabox_xl/manifest.json
+++ b/homeassistant/components/ziggo_mediabox_xl/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "ziggo_mediabox_xl",
   "name": "Ziggo Mediabox XL",
-  "documentation": "https://www.home-assistant.io/integrations/ziggo_mediabox_xl",
-  "requirements": ["ziggo-mediabox-xl==1.1.0"],
   "codeowners": [],
-  "iot_class": "local_polling"
+  "documentation": "https://www.home-assistant.io/integrations/ziggo_mediabox_xl",
+  "iot_class": "local_polling",
+  "requirements": ["ziggo-mediabox-xl==1.1.0"]
 }
diff --git a/homeassistant/components/zodiac/manifest.json b/homeassistant/components/zodiac/manifest.json
index 45fcb762ed..ceacbf1645 100644
--- a/homeassistant/components/zodiac/manifest.json
+++ b/homeassistant/components/zodiac/manifest.json
@@ -1,8 +1,8 @@
 {
   "domain": "zodiac",
   "name": "Zodiac",
-  "documentation": "https://www.home-assistant.io/integrations/zodiac",
   "codeowners": ["@JulienTant"],
-  "quality_scale": "silver",
-  "iot_class": "local_polling"
+  "documentation": "https://www.home-assistant.io/integrations/zodiac",
+  "iot_class": "local_polling",
+  "quality_scale": "silver"
 }
diff --git a/homeassistant/components/zone/manifest.json b/homeassistant/components/zone/manifest.json
index fe039817c6..e0c6607c90 100644
--- a/homeassistant/components/zone/manifest.json
+++ b/homeassistant/components/zone/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "zone",
   "name": "Zone",
+  "codeowners": ["@home-assistant/core"],
   "config_flow": false,
   "documentation": "https://www.home-assistant.io/integrations/zone",
-  "codeowners": ["@home-assistant/core"],
-  "quality_scale": "internal",
-  "integration_type": "system"
+  "integration_type": "system",
+  "quality_scale": "internal"
 }
diff --git a/homeassistant/components/zoneminder/manifest.json b/homeassistant/components/zoneminder/manifest.json
index 699e2e5b7a..80ecbe5331 100644
--- a/homeassistant/components/zoneminder/manifest.json
+++ b/homeassistant/components/zoneminder/manifest.json
@@ -1,9 +1,9 @@
 {
   "domain": "zoneminder",
   "name": "ZoneMinder",
-  "documentation": "https://www.home-assistant.io/integrations/zoneminder",
-  "requirements": ["zm-py==0.5.2"],
   "codeowners": ["@rohankapoorcom"],
+  "documentation": "https://www.home-assistant.io/integrations/zoneminder",
   "iot_class": "local_polling",
-  "loggers": ["zoneminder"]
+  "loggers": ["zoneminder"],
+  "requirements": ["zm-py==0.5.2"]
 }
diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json
index 16553ce325..a96837f1f0 100644
--- a/homeassistant/components/zwave_js/manifest.json
+++ b/homeassistant/components/zwave_js/manifest.json
@@ -1,12 +1,14 @@
 {
   "domain": "zwave_js",
   "name": "Z-Wave",
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/zwave_js",
-  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.45.1"],
   "codeowners": ["@home-assistant/z-wave"],
+  "config_flow": true,
   "dependencies": ["usb", "http", "websocket_api"],
+  "documentation": "https://www.home-assistant.io/integrations/zwave_js",
+  "integration_type": "hub",
   "iot_class": "local_push",
+  "loggers": ["zwave_js_server"],
+  "requirements": ["pyserial==3.5", "zwave-js-server-python==0.45.1"],
   "usb": [
     {
       "vid": "0658",
@@ -20,7 +22,5 @@
       "known_devices": ["Nortek HUSBZB-1"]
     }
   ],
-  "zeroconf": ["_zwave-js-server._tcp.local."],
-  "loggers": ["zwave_js_server"],
-  "integration_type": "hub"
+  "zeroconf": ["_zwave-js-server._tcp.local."]
 }
diff --git a/homeassistant/components/zwave_me/manifest.json b/homeassistant/components/zwave_me/manifest.json
index a4942132bf..6339015968 100644
--- a/homeassistant/components/zwave_me/manifest.json
+++ b/homeassistant/components/zwave_me/manifest.json
@@ -1,11 +1,16 @@
 {
   "domain": "zwave_me",
   "name": "Z-Wave.Me",
+  "after_dependencies": ["zeroconf"],
+  "codeowners": ["@lawfulchaos", "@Z-Wave-Me", "@PoltoS"],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/zwave_me",
   "iot_class": "local_push",
   "requirements": ["zwave_me_ws==0.3.1", "url-normalize==1.4.3"],
-  "after_dependencies": ["zeroconf"],
-  "zeroconf": [{ "type": "_hap._tcp.local.", "name": "*z.wave-me*" }],
-  "config_flow": true,
-  "codeowners": ["@lawfulchaos", "@Z-Wave-Me", "@PoltoS"]
+  "zeroconf": [
+    {
+      "type": "_hap._tcp.local.",
+      "name": "*z.wave-me*"
+    }
+  ]
 }