diff --git a/CODEOWNERS b/CODEOWNERS
index 833629b9fc4..8cf36ded999 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -11,6 +11,7 @@
 source/_integrations/abode.markdown @shred86
 source/_integrations/accuweather.markdown @bieniu
 source/_integrations/acmeda.markdown @atmurray
+source/_integrations/adax.markdown @danielhiversen
 source/_integrations/adguard.markdown @frenck
 source/_integrations/advantage_air.markdown @Bre77
 source/_integrations/aemet.markdown @noltari
@@ -45,6 +46,7 @@ source/_integrations/august.markdown @bdraco
 source/_integrations/aurora.markdown @djtimca
 source/_integrations/aurora_abb_powerone.markdown @davet2001
 source/_integrations/auth.markdown @home-assistant/core
+source/_integrations/automate.markdown @sillyfrog
 source/_integrations/automation.markdown @home-assistant/core
 source/_integrations/avea.markdown @pattyland
 source/_integrations/awair.markdown @ahayworth @danielsjf
@@ -87,7 +89,7 @@ source/_integrations/configurator.markdown @home-assistant/core
 source/_integrations/control4.markdown @lawtancool
 source/_integrations/conversation.markdown @home-assistant/core
 source/_integrations/coolmaster.markdown @OnFreund
-source/_integrations/coronavirus.markdown @home_assistant/core
+source/_integrations/coronavirus.markdown @home-assistant/core
 source/_integrations/counter.markdown @fabaff
 source/_integrations/cover.markdown @home-assistant/core
 source/_integrations/cpuspeed.markdown @fabaff
@@ -149,6 +151,7 @@ source/_integrations/fireservicerota.markdown @cyberjunky
 source/_integrations/firmata.markdown @DaAwesomeP
 source/_integrations/fixer.markdown @fabaff
 source/_integrations/flick_electric.markdown @ZephireNZ
+source/_integrations/flipr.markdown @cnico
 source/_integrations/flo.markdown @dmulcahey
 source/_integrations/flock.markdown @fabaff
 source/_integrations/flume.markdown @ChrisMandich @bdraco
@@ -165,6 +168,7 @@ source/_integrations/fronius.markdown @nielstron
 source/_integrations/frontend.markdown @home-assistant/frontend
 source/_integrations/garages_amsterdam.markdown @klaasnicolaas
 source/_integrations/gdacs.markdown @exxamalte
+source/_integrations/generic_hygrostat.markdown @Shulyaka
 source/_integrations/geniushub.markdown @zxdavb
 source/_integrations/geo_json_events.markdown @exxamalte
 source/_integrations/geo_rss_events.markdown @exxamalte
@@ -200,6 +204,7 @@ source/_integrations/homeassistant.markdown @home-assistant/core
 source/_integrations/homekit.markdown @bdraco
 source/_integrations/homekit_controller.markdown @Jc2k @bdraco
 source/_integrations/homematic.markdown @pvizeli @danielperna84
+source/_integrations/honeywell.markdown @rdfurman
 source/_integrations/http.markdown @home-assistant/core
 source/_integrations/huawei_lte.markdown @scop @fphammerle
 source/_integrations/huawei_router.markdown @abmantis
@@ -313,6 +318,7 @@ source/_integrations/netdata.markdown @fabaff
 source/_integrations/nexia.markdown @bdraco
 source/_integrations/nextbus.markdown @vividboarder
 source/_integrations/nextcloud.markdown @meichthys
+source/_integrations/nfandroidtv.markdown @tkdrob
 source/_integrations/nightscout.markdown @marciogranzotto
 source/_integrations/nilu.markdown @hfurubotten
 source/_integrations/nissan_leaf.markdown @filcole
@@ -368,6 +374,7 @@ source/_integrations/powerwall.markdown @bdraco @jrester
 source/_integrations/profiler.markdown @bdraco
 source/_integrations/progettihwsw.markdown @ardaseremet
 source/_integrations/prometheus.markdown @knyar
+source/_integrations/prosegur.markdown @dgomes
 source/_integrations/proxmoxve.markdown @k4ds3 @jhollowe @Corbeno
 source/_integrations/ps4.markdown @ktnrg45
 source/_integrations/push.markdown @dgomes
@@ -426,6 +433,7 @@ source/_integrations/sighthound.markdown @robmarkcole
 source/_integrations/signal_messenger.markdown @bbernhard
 source/_integrations/simplisafe.markdown @bachya
 source/_integrations/sinch.markdown @bendikrb
+source/_integrations/siren.markdown @home-assistant/core @raman325
 source/_integrations/sisyphus.markdown @jkeljo
 source/_integrations/sky_hub.markdown @rogerselwyn
 source/_integrations/slack.markdown @bachya
@@ -486,7 +494,7 @@ source/_integrations/tapsaff.markdown @bazwilliams
 source/_integrations/tasmota.markdown @emontnemery
 source/_integrations/tautulli.markdown @ludeeus
 source/_integrations/tellduslive.markdown @fredrike
-source/_integrations/template.markdown @PhracturedBlue @tetienne
+source/_integrations/template.markdown @PhracturedBlue @tetienne @home-assistant/core
 source/_integrations/tesla.markdown @zabuldon @alandtse
 source/_integrations/tfiac.markdown @fredrike @mellado
 source/_integrations/thethingsnetwork.markdown @fabaff
@@ -537,11 +545,12 @@ source/_integrations/wallbox.markdown @hesselonline
 source/_integrations/waqi.markdown @andrey-git
 source/_integrations/watson_tts.markdown @rutkai
 source/_integrations/weather.markdown @fabaff
-source/_integrations/webostv.markdown @bendavid
+source/_integrations/webostv.markdown @bendavid @thecode
 source/_integrations/websocket_api.markdown @home-assistant/core
 source/_integrations/wemo.markdown @esev
 source/_integrations/wiffi.markdown @mampfes
 source/_integrations/wilight.markdown @leofig-rj
+source/_integrations/wirelesstag.markdown @sergeymaysak
 source/_integrations/withings.markdown @vangorra
 source/_integrations/wled.markdown @frenck
 source/_integrations/wolflink.markdown @adamkrol93
@@ -559,6 +568,7 @@ source/_integrations/yandex_transport.markdown @rishatik92 @devbis
 source/_integrations/yeelight.markdown @rytilahti @zewelor @shenxn
 source/_integrations/yeelightsunflower.markdown @lindsaymarkward
 source/_integrations/yi.markdown @bachya
+source/_integrations/youless.markdown @gjong
 source/_integrations/zeroconf.markdown @bdraco
 source/_integrations/zerproc.markdown @emlove
 source/_integrations/zha.markdown @dmulcahey @adminiuga
diff --git a/source/_integrations/automate.markdown b/source/_integrations/automate.markdown
index 61e25b7f93f..009edbaf33d 100644
--- a/source/_integrations/automate.markdown
+++ b/source/_integrations/automate.markdown
@@ -1,5 +1,5 @@
 ---
-title: Automate Pulse 2 Hub by Rollease Acmeda
+title: Automate Pulse Hub v2
 description: Instructions on setting up  the Automate Pulse Hub v2 by Rollease Acmeda within Home Assistant.
 ha_category:
   - Cover
@@ -9,6 +9,8 @@ ha_config_flow: true
 ha_codeowners:
   - '@sillyfrog'
 ha_domain: automate
+ha_platforms:
+  - cover
 ---
 
 The Automate Pulse 2 Hub by Rollease Acmeda integration allows you to control and monitor covers via your Automate Pulse v2 Hub (see the [acmeda](/integrations/acmeda) integration for the v1 hub). The integration uses an [API](https://pypi.org/project/aiopulse2/) to directly communicate with hubs on the local network, rather than connecting via the cloud.
diff --git a/source/_integrations/coronavirus.markdown b/source/_integrations/coronavirus.markdown
index 34b4a87273e..c0b18691ee1 100644
--- a/source/_integrations/coronavirus.markdown
+++ b/source/_integrations/coronavirus.markdown
@@ -7,7 +7,7 @@ ha_release: 0.106
 ha_iot_class: Cloud Polling
 ha_config_flow: true
 ha_codeowners:
-  - '@home_assistant/core'
+  - '@home-assistant/core'
 ha_domain: coronavirus
 ha_platforms:
   - sensor
diff --git a/source/_integrations/demo.markdown b/source/_integrations/demo.markdown
index 658cc652644..dbad6e5433f 100644
--- a/source/_integrations/demo.markdown
+++ b/source/_integrations/demo.markdown
@@ -27,6 +27,8 @@ ha_platforms:
   - number
   - remote
   - sensor
+  - select
+  - siren
   - stt
   - switch
   - tts
diff --git a/source/_integrations/esphome.markdown b/source/_integrations/esphome.markdown
index aeef0935d96..fd42361fc94 100644
--- a/source/_integrations/esphome.markdown
+++ b/source/_integrations/esphome.markdown
@@ -21,6 +21,7 @@ ha_platforms:
   - light
   - number
   - sensor
+  - select
   - switch
 ---
 
diff --git a/source/_integrations/flipr.markdown b/source/_integrations/flipr.markdown
index 173d9acd013..d6580dfdaf7 100644
--- a/source/_integrations/flipr.markdown
+++ b/source/_integrations/flipr.markdown
@@ -9,6 +9,8 @@ ha_config_flow: true
 ha_codeowners:
   - '@cnico'
 ha_domain: flipr
+ha_platforms:
+  - sensor
 ---
 
 [Flipr](https://www.goflipr.com) is a smart pool monitor that publishes data to the cloud via SigFox.
diff --git a/source/_integrations/freedompro.markdown b/source/_integrations/freedompro.markdown
index 98d038d3042..3d45f6bffc6 100644
--- a/source/_integrations/freedompro.markdown
+++ b/source/_integrations/freedompro.markdown
@@ -17,7 +17,7 @@ ha_codeowners:
   - '@stefano055415'
 ha_domain: freedompro
 ha_platforms:
-  - binary sensor
+  - binary_sensor
   - climate
   - cover
   - fan
diff --git a/source/_integrations/generic.markdown b/source/_integrations/generic.markdown
index 9aed29877e3..1fe49cdbd89 100644
--- a/source/_integrations/generic.markdown
+++ b/source/_integrations/generic.markdown
@@ -1,5 +1,5 @@
 ---
-title: Generic
+title: Generic Camera
 description: Instructions on how to integrate IP cameras within Home Assistant.
 ha_category:
   - Camera
diff --git a/source/_integrations/generic_hygrostat.markdown b/source/_integrations/generic_hygrostat.markdown
index f2f68afc6bc..39e2270fd8d 100644
--- a/source/_integrations/generic_hygrostat.markdown
+++ b/source/_integrations/generic_hygrostat.markdown
@@ -1,11 +1,16 @@
 ---
-title: Generic Hygrostat
+title: Generic hygrostat
 description: Virtual hygrostat device
 ha_category:
   - Humidifier
 ha_release: 2021.8
 ha_domain: generic_hygrostat
 ha_quality_scale: internal
+ha_codeowners:
+  - '@Shulyaka'
+ha_iot_class: Local Polling
+ha_platforms:
+  - humidifier
 ---
 
 The `generic_hygrostat` humidifier integration is a virtual hygrostat implemented in Home Assistant. It uses a sensor and a switch connected to a humidifier or dehumidifier under the hood. When in humidifier mode, if the measured humidity is less than the target humidity, the humidifier will be turned on and turned off when the required humidity is reached. When in dehumidifier mode, if the measured humidity is greater than the target humidity, the dehumidifier will be turned on and turned off when required humidity is reached. One Generic Hygrostat entity can only control one switch. If you need to activate two switches, one for a humidifier and one for a dehumidifier, you will need two Generic Hygrostat entities.
diff --git a/source/_integrations/homekit_controller.markdown b/source/_integrations/homekit_controller.markdown
index a34be7397e4..377079d4080 100644
--- a/source/_integrations/homekit_controller.markdown
+++ b/source/_integrations/homekit_controller.markdown
@@ -34,6 +34,7 @@ ha_platforms:
   - light
   - lock
   - media_player
+  - number
   - sensor
   - switch
 ---
diff --git a/source/_integrations/honeywell.markdown b/source/_integrations/honeywell.markdown
index 393b08dd9ca..c15ae822535 100644
--- a/source/_integrations/honeywell.markdown
+++ b/source/_integrations/honeywell.markdown
@@ -19,4 +19,4 @@ It uses the [somecomfort](https://github.com/kk7ds/somecomfort) client library.
 
 If your system is compatible with this integration, then you will be able access it via [https://mytotalconnectcomfort.com/portal/](https://mytotalconnectcomfort.com/portal/) (note the `/portal/`).
 
-{% include integrations/config_flow.md %}
\ No newline at end of file
+{% include integrations/config_flow.md %}
diff --git a/source/_integrations/knx.markdown b/source/_integrations/knx.markdown
index aa1a27133ed..16416c0d4b3 100644
--- a/source/_integrations/knx.markdown
+++ b/source/_integrations/knx.markdown
@@ -33,6 +33,7 @@ ha_platforms:
   - number
   - scene
   - sensor
+  - select
   - switch
   - weather
 ---
diff --git a/source/_integrations/mill.markdown b/source/_integrations/mill.markdown
index 018ffa48c48..f5dd09fdd2a 100644
--- a/source/_integrations/mill.markdown
+++ b/source/_integrations/mill.markdown
@@ -11,6 +11,7 @@ ha_domain: mill
 ha_config_flow: true
 ha_platforms:
   - climate
+  - sensor
 ---
 
 Integrates Mill heater into Home Assistant.
diff --git a/source/_integrations/modbus.markdown b/source/_integrations/modbus.markdown
index 4f3c1093da6..a779c6d0efe 100644
--- a/source/_integrations/modbus.markdown
+++ b/source/_integrations/modbus.markdown
@@ -18,6 +18,7 @@ ha_platforms:
   - light
   - sensor
   - switch
+ha_quality_scale: silver
 ---
 
 [Modbus](http://www.modbus.org/) is a serial communication protocol to control PLCs (Programmable Logic Controller) and RTUs (Remote Terminal Unit). The integration adheres strictly to the [protocol specification](https://modbus.org/docs/Modbus_Application_Protocol_V1_1b3.pdf).
diff --git a/source/_integrations/motioneye.markdown b/source/_integrations/motioneye.markdown
index 067ed4b9289..c9056afdf49 100644
--- a/source/_integrations/motioneye.markdown
+++ b/source/_integrations/motioneye.markdown
@@ -11,6 +11,7 @@ ha_codeowners:
 ha_config_flow: true
 ha_platforms:
   - camera
+  - switch
 ---
 
 The motionEye integration allows you to integrate your
diff --git a/source/_integrations/mqtt.markdown b/source/_integrations/mqtt.markdown
index 41de0c79af2..007bccc1948 100644
--- a/source/_integrations/mqtt.markdown
+++ b/source/_integrations/mqtt.markdown
@@ -17,10 +17,12 @@ ha_platforms:
   - climate
   - cover
   - fan
+  - humidifier
   - lock
   - number
   - scene
   - sensor
+  - select
   - switch
 ---
 
diff --git a/source/_integrations/netatmo.markdown b/source/_integrations/netatmo.markdown
index 90e11d9b7cc..6f5da99d714 100644
--- a/source/_integrations/netatmo.markdown
+++ b/source/_integrations/netatmo.markdown
@@ -21,6 +21,7 @@ ha_platforms:
   - climate
   - light
   - sensor
+  - select
 ---
 
 The Netatmo integration platform is the main integration to integrate all Netatmo related platforms.
diff --git a/source/_integrations/nexia.markdown b/source/_integrations/nexia.markdown
index 20f3d2ffe10..c8a035f1531 100644
--- a/source/_integrations/nexia.markdown
+++ b/source/_integrations/nexia.markdown
@@ -1,5 +1,5 @@
 ---
-title: Nexia/American Standard
+title: Nexia/American Standard/Trane
 description: Instructions on how to integrate Trane and American Standard thermostats into Home Assistant.
 ha_category:
   - Binary Sensor
diff --git a/source/_integrations/prosegur.markdown b/source/_integrations/prosegur.markdown
index 5fb60c6dc32..6def25326c8 100644
--- a/source/_integrations/prosegur.markdown
+++ b/source/_integrations/prosegur.markdown
@@ -1,5 +1,5 @@
 ---
-title: Prosegur
+title: Prosegur Alarm
 description: Instructions on how to integrate Prosegur Smart Alarms into Home Assistant.
 ha_category:
   - Alarm
diff --git a/source/_integrations/rituals_perfume_genie.markdown b/source/_integrations/rituals_perfume_genie.markdown
index 694a3c786bd..ed4c7e323a1 100644
--- a/source/_integrations/rituals_perfume_genie.markdown
+++ b/source/_integrations/rituals_perfume_genie.markdown
@@ -16,8 +16,8 @@ ha_domain: rituals_perfume_genie
 ha_platforms:
   - binary_sensor
   - number
-  - select
   - sensor
+  - select
   - switch
 ha_quality_scale: silver
 ---
diff --git a/source/_integrations/siren.markdown b/source/_integrations/siren.markdown
index 8f4b668f868..7f9333f7b1f 100644
--- a/source/_integrations/siren.markdown
+++ b/source/_integrations/siren.markdown
@@ -9,7 +9,6 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
   - '@raman325'
-ha_iot_class:
 ---
 
 The Siren integration is built for the controlling and monitoring of siren/chime devices.
diff --git a/source/_integrations/sonos.markdown b/source/_integrations/sonos.markdown
index ea66f950e4b..7e6561ebebe 100644
--- a/source/_integrations/sonos.markdown
+++ b/source/_integrations/sonos.markdown
@@ -18,6 +18,7 @@ ha_platforms:
   - media_player
   - sensor
   - switch
+ha_zeroconf: true
 ---
 
 The `sonos` integration allows you to control your [Sonos](https://www.sonos.com) wireless speakers from Home Assistant. It also works with IKEA Symfonisk speakers.
diff --git a/source/_integrations/spider.markdown b/source/_integrations/spider.markdown
index 9506d1a5c27..d2eee712234 100644
--- a/source/_integrations/spider.markdown
+++ b/source/_integrations/spider.markdown
@@ -13,6 +13,7 @@ ha_domain: spider
 ha_config_flow: true
 ha_platforms:
   - climate
+  - sensor
   - switch
 ---
 
diff --git a/source/_integrations/switcher_kis.markdown b/source/_integrations/switcher_kis.markdown
index 3e8c608689c..b4484e6e793 100644
--- a/source/_integrations/switcher_kis.markdown
+++ b/source/_integrations/switcher_kis.markdown
@@ -12,6 +12,7 @@ ha_domain: switcher_kis
 ha_platforms:
   - sensor
   - switch
+ha_config_flow: true
 ---
 
 This `Switcher` integration allows you to control your [Switcher Devices](https://www.switcher.co.il/).
diff --git a/source/_integrations/template.markdown b/source/_integrations/template.markdown
index 6904ba4337a..7be37c2682e 100644
--- a/source/_integrations/template.markdown
+++ b/source/_integrations/template.markdown
@@ -9,6 +9,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@PhracturedBlue'
   - '@tetienne'
+  - '@home-assistant/core'
 ha_domain: template
 ha_platforms:
   - alarm_control_panel
diff --git a/source/_integrations/velux.markdown b/source/_integrations/velux.markdown
index a0e896633c9..d494dba3d9b 100644
--- a/source/_integrations/velux.markdown
+++ b/source/_integrations/velux.markdown
@@ -11,6 +11,7 @@ ha_codeowners:
 ha_domain: velux
 ha_platforms:
   - cover
+  - light
   - scene
 ---
 
diff --git a/source/_integrations/webostv.markdown b/source/_integrations/webostv.markdown
index 6c0b075d355..d145f6217d7 100644
--- a/source/_integrations/webostv.markdown
+++ b/source/_integrations/webostv.markdown
@@ -8,6 +8,7 @@ ha_iot_class: Local Polling
 ha_release: 0.18
 ha_codeowners:
   - '@bendavid'
+  - '@thecode'
 ha_domain: webostv
 ha_platforms:
   - media_player
diff --git a/source/_integrations/wemo.markdown b/source/_integrations/wemo.markdown
index 78d457a1816..8fde46d4522 100644
--- a/source/_integrations/wemo.markdown
+++ b/source/_integrations/wemo.markdown
@@ -17,6 +17,7 @@ ha_platforms:
   - binary_sensor
   - fan
   - light
+  - sensor
   - switch
 ha_codeowners:
   - '@esev'
diff --git a/source/_integrations/wirelesstag.markdown b/source/_integrations/wirelesstag.markdown
index 7ea450c5633..ae5c89e7edd 100644
--- a/source/_integrations/wirelesstag.markdown
+++ b/source/_integrations/wirelesstag.markdown
@@ -13,6 +13,8 @@ ha_platforms:
   - binary_sensor
   - sensor
   - switch
+ha_codeowners:
+  - '@sergeymaysak'
 ---
 
 The `wirelesstag` implementation allows you to integrate your [wirelesstag.net](https://wirelesstag.net/) sensors tags in Home Assistant.
diff --git a/source/_integrations/wled.markdown b/source/_integrations/wled.markdown
index e1b5f9d5397..108ec900173 100644
--- a/source/_integrations/wled.markdown
+++ b/source/_integrations/wled.markdown
@@ -16,6 +16,7 @@ ha_zeroconf: true
 ha_platforms:
   - light
   - sensor
+  - select
   - switch
 ---
 
diff --git a/source/_integrations/xiaomi_miio.markdown b/source/_integrations/xiaomi_miio.markdown
index fde7c6ad63b..8993d1e7640 100644
--- a/source/_integrations/xiaomi_miio.markdown
+++ b/source/_integrations/xiaomi_miio.markdown
@@ -24,9 +24,12 @@ ha_platforms:
   - alarm_control_panel
   - device_tracker
   - fan
+  - humidifier
   - light
+  - number
   - remote
   - sensor
+  - select
   - switch
   - vacuum
 ---
diff --git a/source/_integrations/yale_smart_alarm.markdown b/source/_integrations/yale_smart_alarm.markdown
index d8e46872f40..d0a174a0164 100644
--- a/source/_integrations/yale_smart_alarm.markdown
+++ b/source/_integrations/yale_smart_alarm.markdown
@@ -7,12 +7,10 @@ ha_release: 0.78
 ha_iot_class: Cloud Polling
 ha_config_flow: true
 ha_codeowners:
-  - '@gjohanssson-ST'
+  - '@gjohansson-ST'
 ha_domain: yale_smart_alarm
 ha_platforms:
   - alarm_control_panel
-ha_codeowners:
-  - '@gjohansson-ST'
 ---
 
 The Yale Smart Living integration provides connectivity with the Yale Smart Alarm systems and Smart Hub through Yale's API.
diff --git a/source/_integrations/youless.markdown b/source/_integrations/youless.markdown
index 1624f242eb8..885df87f888 100644
--- a/source/_integrations/youless.markdown
+++ b/source/_integrations/youless.markdown
@@ -3,10 +3,14 @@ title: YouLess
 description: Instructions on how to integrate your YouLess device into Home Assistant.
 ha_category:
   - Sensor
-ha_iot_class: Local Pull
+ha_iot_class: Local Polling
 ha_config_flow: true
 ha_release: 2021.8
 ha_domain: youless
+ha_codeowners:
+  - '@gjong'
+ha_platforms:
+  - sensor
 ---
 
 The YouLess integration for Home Assistant allows you to read the meter values from sensors created by [YouLess](https://www.youless.nl/home.html).
diff --git a/source/_integrations/zwave_js.markdown b/source/_integrations/zwave_js.markdown
index fde2654e49f..d37561b2566 100644
--- a/source/_integrations/zwave_js.markdown
+++ b/source/_integrations/zwave_js.markdown
@@ -27,6 +27,7 @@ ha_platforms:
   - lock
   - number
   - sensor
+  - siren
   - switch
 ---