diff --git a/CODEOWNERS b/CODEOWNERS
index 25a89ba7f2d..83b0b3c047c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -18,6 +18,7 @@ source/_integrations/aemet.markdown @noltari
 source/_integrations/agent_dvr.markdown @ispysoftware
 source/_integrations/airly.markdown @bieniu
 source/_integrations/airnow.markdown @asymworks
+source/_integrations/airthings.markdown @danielhiversen
 source/_integrations/airtouch4.markdown @LonePurpleWolf
 source/_integrations/airvisual.markdown @bachya
 source/_integrations/alarmdecoder.markdown @ajschmidt8
@@ -26,6 +27,7 @@ source/_integrations/alexa.smart_home.markdown @home-assistant/cloud @ochlocracy
 source/_integrations/almond.markdown @gcampax @balloob
 source/_integrations/alpha_vantage.markdown @fabaff
 source/_integrations/ambee.markdown @frenck
+source/_integrations/amberelectric.markdown @madpilot
 source/_integrations/ambiclimate.markdown @danielhiversen
 source/_integrations/ambient_station.markdown @bachya
 source/_integrations/amcrest.markdown @flacjacket
@@ -63,7 +65,7 @@ source/_integrations/blink.markdown @fronzbot
 source/_integrations/blueprint.markdown @home-assistant/core
 source/_integrations/bmp280.markdown @belidzs
 source/_integrations/bmw_connected_drive.markdown @gerard33 @rikroe
-source/_integrations/bond.markdown @prystupa
+source/_integrations/bond.markdown @prystupa @joshs85
 source/_integrations/bosch_shc.markdown @tschamm
 source/_integrations/braviatv.markdown @bieniu @Drafteed
 source/_integrations/broadlink.markdown @danielhiversen @felipediel
@@ -94,6 +96,7 @@ source/_integrations/coronavirus.markdown @home-assistant/core
 source/_integrations/counter.markdown @fabaff
 source/_integrations/cover.markdown @home-assistant/core
 source/_integrations/cpuspeed.markdown @fabaff
+source/_integrations/crownstone.markdown @Crownstone @RicArch97
 source/_integrations/cups.markdown @fabaff
 source/_integrations/daikin.markdown @fredrike
 source/_integrations/darksky.markdown @fabaff
@@ -110,6 +113,7 @@ source/_integrations/dhcp.markdown @bdraco
 source/_integrations/dht.markdown @thegardenmonkey
 source/_integrations/digital_ocean.markdown @fabaff
 source/_integrations/discogs.markdown @thibmaek
+source/_integrations/dlna_dmr.markdown @StevenLooman @chishm
 source/_integrations/doorbird.markdown @oblogic7 @bdraco
 source/_integrations/dsmr.markdown @Robbie1221 @frenck
 source/_integrations/dsmr_reader.markdown @depl0y
@@ -121,6 +125,7 @@ source/_integrations/ecobee.markdown @marthoc
 source/_integrations/econet.markdown @vangorra @w1ll1am23
 source/_integrations/ecovacs.markdown @OverloadUT
 source/_integrations/edl21.markdown @mtdcr
+source/_integrations/efergy.markdown @tkdrob
 source/_integrations/egardia.markdown @jeroenterheerdt
 source/_integrations/eight_sleep.markdown @mezz64
 source/_integrations/elgato.markdown @frenck
@@ -190,7 +195,7 @@ source/_integrations/group.markdown @home-assistant/core
 source/_integrations/growatt_server.markdown @indykoning @muppet3000 @JasperPlant
 source/_integrations/guardian.markdown @bachya
 source/_integrations/habitica.markdown @ASMfreaK @leikoilja
-source/_integrations/harmony.markdown @ehendrix23 @bramkragten @bdraco @mkeesey
+source/_integrations/harmony.markdown @ehendrix23 @bramkragten @bdraco @mkeesey @Aohzan
 source/_integrations/heatmiser.markdown @andylockran
 source/_integrations/heos.markdown @andrewsayre
 source/_integrations/here_travel_time.markdown @eifinger
@@ -234,6 +239,7 @@ source/_integrations/insteon.markdown @teharris1
 source/_integrations/integration.markdown @dgomes
 source/_integrations/intesishome.markdown @jnimmo
 source/_integrations/ios.markdown @robbiet480
+source/_integrations/iotawatt.markdown @gtdiehl @jyavenard
 source/_integrations/iperf3.markdown @rohankapoorcom
 source/_integrations/ipma.markdown @dgomes @abmantis
 source/_integrations/iqvia.markdown @bachya
@@ -247,7 +253,7 @@ source/_integrations/kaiterra.markdown @Michsior14
 source/_integrations/keba.markdown @dannerph
 source/_integrations/keenetic_ndms2.markdown @foxel
 source/_integrations/kef.markdown @basnijholt
-source/_integrations/keyboard_remote.markdown @bendavid
+source/_integrations/keyboard_remote.markdown @bendavid @lanrat
 source/_integrations/kmtronic.markdown @dgomes
 source/_integrations/knx.markdown @Julius2342 @farmio @marvin-w
 source/_integrations/kodi.markdown @OnFreund @cgtobi
@@ -295,6 +301,7 @@ source/_integrations/minecraft_server.markdown @elmurato
 source/_integrations/minio.markdown @tkislan
 source/_integrations/mobile_app.markdown @robbiet480
 source/_integrations/modbus.markdown @adamchengtkc @janiversen @vzahradnik
+source/_integrations/modem_callerid.markdown @tkdrob
 source/_integrations/modern_forms.markdown @wonderslug
 source/_integrations/monoprice.markdown @etsinko @OnFreund
 source/_integrations/moon.markdown @fabaff
@@ -318,6 +325,7 @@ source/_integrations/ness_alarm.markdown @nickw444
 source/_integrations/nest.markdown @allenporter
 source/_integrations/netatmo.markdown @cgtobi
 source/_integrations/netdata.markdown @fabaff
+source/_integrations/netgear.markdown @hacf-fr @Quentame @starkillerOG
 source/_integrations/nexia.markdown @bdraco
 source/_integrations/nextbus.markdown @vividboarder
 source/_integrations/nextcloud.markdown @meichthys
@@ -483,7 +491,7 @@ source/_integrations/supla.markdown @mwegrzynek
 source/_integrations/surepetcare.markdown @benleb @danielhiversen
 source/_integrations/swiss_hydrological_data.markdown @fabaff
 source/_integrations/swiss_public_transport.markdown @fabaff
-source/_integrations/switchbot.markdown @danielhiversen
+source/_integrations/switchbot.markdown @danielhiversen @RenierM26
 source/_integrations/switcher_kis.markdown @tomerfi @thecode
 source/_integrations/switchmate.markdown @danielhiversen
 source/_integrations/syncthing.markdown @zhulik
@@ -501,7 +509,6 @@ source/_integrations/tasmota.markdown @emontnemery
 source/_integrations/tautulli.markdown @ludeeus
 source/_integrations/tellduslive.markdown @fredrike
 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
 source/_integrations/threshold.markdown @fabaff
@@ -520,7 +527,7 @@ source/_integrations/trafikverket_train.markdown @endor-force
 source/_integrations/trafikverket_weatherstation.markdown @endor-force
 source/_integrations/transmission.markdown @engrbm87 @JPHutchins
 source/_integrations/tts.markdown @pvizeli
-source/_integrations/tuya.markdown @ollo69
+source/_integrations/tuya.markdown @Tuya @zlinoliver @METISU
 source/_integrations/twentemilieu.markdown @frenck
 source/_integrations/twinkly.markdown @dr1rrb
 source/_integrations/ubus.markdown @noltari
@@ -535,6 +542,7 @@ source/_integrations/uptimerobot.markdown @ludeeus
 source/_integrations/usb.markdown @bdraco
 source/_integrations/usgs_earthquakes_feed.markdown @exxamalte
 source/_integrations/utility_meter.markdown @dgomes
+source/_integrations/vallox.markdown @andre-richter
 source/_integrations/velbus.markdown @Cereal2nd @brefra
 source/_integrations/velux.markdown @Julius2342
 source/_integrations/vera.markdown @pavoni
@@ -553,10 +561,12 @@ source/_integrations/wake_on_lan.markdown @ntilley905
 source/_integrations/wallbox.markdown @hesselonline
 source/_integrations/waqi.markdown @andrey-git
 source/_integrations/watson_tts.markdown @rutkai
+source/_integrations/watttime.markdown @bachya
 source/_integrations/weather.markdown @fabaff
 source/_integrations/webostv.markdown @bendavid @thecode
 source/_integrations/websocket_api.markdown @home-assistant/core
 source/_integrations/wemo.markdown @esev
+source/_integrations/whirlpool.markdown @abmantis
 source/_integrations/wiffi.markdown @mampfes
 source/_integrations/wilight.markdown @leofig-rj
 source/_integrations/wirelesstag.markdown @sergeymaysak
diff --git a/source/_integrations/airthings.markdown b/source/_integrations/airthings.markdown
index a42adff4bec..dab338c4819 100644
--- a/source/_integrations/airthings.markdown
+++ b/source/_integrations/airthings.markdown
@@ -4,7 +4,7 @@ description: Instructions on how to integrate Airthings into Home Assistant.
 ha_category:
   - Sensor
   - Environment
-ha_release: "2021.10"
+ha_release: '2021.10'
 ha_iot_class: Cloud Polling
 ha_codeowners:
   - '@danielhiversen'
diff --git a/source/_integrations/amberelectric.markdown b/source/_integrations/amberelectric.markdown
index 45b5494da8c..e4686310f3a 100644
--- a/source/_integrations/amberelectric.markdown
+++ b/source/_integrations/amberelectric.markdown
@@ -4,13 +4,14 @@ description: Instructions on how to integrate Amber Electric live prices within
 ha_category:
   - Sensor
   - Energy
-ha_release: "2021.10"
+ha_release: '2021.10'
 ha_iot_class: Cloud Polling
 ha_config_flow: true
 ha_codeowners:
-  - "@madpilot"
+  - '@madpilot'
 ha_domain: amberelectric
 ha_platforms:
+  - binary_sensor
   - sensor
 ---
 
diff --git a/source/_integrations/bond.markdown b/source/_integrations/bond.markdown
index 48b7f6813fb..17ad3701a7d 100644
--- a/source/_integrations/bond.markdown
+++ b/source/_integrations/bond.markdown
@@ -12,6 +12,7 @@ ha_release: 0.113
 ha_domain: bond
 ha_codeowners:
   - '@prystupa'
+  - '@joshs85'
 ha_config_flow: true
 ha_quality_scale: platinum
 ha_zeroconf: true
diff --git a/source/_integrations/crownstone.markdown b/source/_integrations/crownstone.markdown
index fd3274ce4c4..5c10408bb5b 100644
--- a/source/_integrations/crownstone.markdown
+++ b/source/_integrations/crownstone.markdown
@@ -3,14 +3,15 @@ title: Crownstone
 description: Instructions on how to setup the Crownstone integration within Home Assistant.
 ha_category:
   - Light
-ha_iot_class: Cloud Push  
+ha_iot_class: Cloud Push
 ha_release: '2021.10'
 ha_config_flow: true
-ha_quality_scale: silver
 ha_codeowners:
   - '@Crownstone'
   - '@RicArch97'
 ha_domain: crownstone
+ha_platforms:
+  - light
 ---
 
 The Crownstone integration allows you to control your Crownstones either via the cloud or using a [Crownstone USB](#crownstone-usb) dongle.
diff --git a/source/_integrations/deconz.markdown b/source/_integrations/deconz.markdown
index 78f565f1806..7b16f4996e4 100644
--- a/source/_integrations/deconz.markdown
+++ b/source/_integrations/deconz.markdown
@@ -30,6 +30,7 @@ ha_platforms:
   - lock
   - scene
   - sensor
+  - siren
   - switch
 ---
 
diff --git a/source/_integrations/dlna_dmr.markdown b/source/_integrations/dlna_dmr.markdown
index d33df1f2046..e5f61e1c15f 100644
--- a/source/_integrations/dlna_dmr.markdown
+++ b/source/_integrations/dlna_dmr.markdown
@@ -10,7 +10,6 @@ ha_codeowners:
   - '@StevenLooman'
   - '@chishm'
 ha_domain: dlna_dmr
-ha_ssdp: true
 ha_platforms:
   - media_player
 ---
diff --git a/source/_integrations/efergy.markdown b/source/_integrations/efergy.markdown
index ae395a7734b..0c1405b5ce3 100644
--- a/source/_integrations/efergy.markdown
+++ b/source/_integrations/efergy.markdown
@@ -8,6 +8,8 @@ ha_iot_class: Cloud Polling
 ha_domain: efergy
 ha_platforms:
   - sensor
+ha_codeowners:
+  - '@tkdrob'
 ---
 
 Integrate your [Efergy](https://efergy.com) meter information into Home Assistant.
diff --git a/source/_integrations/file.markdown b/source/_integrations/file.markdown
index c9f4c9bc856..c0d4c2466d5 100644
--- a/source/_integrations/file.markdown
+++ b/source/_integrations/file.markdown
@@ -141,4 +141,3 @@ sensor:
 ```
 
 {% endraw %}
-
diff --git a/source/_integrations/flipr.markdown b/source/_integrations/flipr.markdown
index 04147886bfa..de9583c337a 100644
--- a/source/_integrations/flipr.markdown
+++ b/source/_integrations/flipr.markdown
@@ -10,6 +10,7 @@ ha_codeowners:
   - '@cnico'
 ha_domain: flipr
 ha_platforms:
+  - binary_sensor
   - sensor
 ---
 
diff --git a/source/_integrations/group.markdown b/source/_integrations/group.markdown
index b7765ee2d4d..fd59692e83c 100644
--- a/source/_integrations/group.markdown
+++ b/source/_integrations/group.markdown
@@ -10,6 +10,7 @@ ha_codeowners:
   - '@home-assistant/core'
 ha_domain: group
 ha_platforms:
+  - binary_sensor
   - cover
   - light
   - media_player
diff --git a/source/_integrations/harmony.markdown b/source/_integrations/harmony.markdown
index 2ef615d5bbf..ce2a268574b 100644
--- a/source/_integrations/harmony.markdown
+++ b/source/_integrations/harmony.markdown
@@ -11,6 +11,7 @@ ha_codeowners:
   - '@bramkragten'
   - '@bdraco'
   - '@mkeesey'
+  - '@Aohzan'
 ha_domain: harmony
 ha_ssdp: true
 ha_platforms:
diff --git a/source/_integrations/hue.markdown b/source/_integrations/hue.markdown
index 834a272d462..c9ac8556007 100644
--- a/source/_integrations/hue.markdown
+++ b/source/_integrations/hue.markdown
@@ -19,6 +19,7 @@ ha_platforms:
   - binary_sensor
   - light
   - sensor
+ha_zeroconf: true
 ---
 
 The Philips Hue integration allows you to control and monitor the lights and motion sensors connected to your Hue bridge.
diff --git a/source/_integrations/iotawatt.markdown b/source/_integrations/iotawatt.markdown
index ab665f08ab1..0fa8109f50e 100644
--- a/source/_integrations/iotawatt.markdown
+++ b/source/_integrations/iotawatt.markdown
@@ -9,9 +9,11 @@ ha_config_flow: true
 ha_domain: iotawatt
 ha_codeowners:
   - '@gtdiehl'
+  - '@jyavenard'
 ha_platforms:
   - sensor
 ---
+
 Integration for the [IoTaWatt](https://www.iotawatt.com/) Open WiFi Electricity Monitor. It
 will collect data from the Current Transformer Clamps (Input CTs) and any Outputs that are defined on the IoTaWatt
 and create them as sensors in Home Assistant.
diff --git a/source/_integrations/modem_callerid.markdown b/source/_integrations/modem_callerid.markdown
index 0eed0b031f5..df1896eff0b 100644
--- a/source/_integrations/modem_callerid.markdown
+++ b/source/_integrations/modem_callerid.markdown
@@ -1,11 +1,16 @@
 ---
-title: Modem Caller ID
+title: Phone Modem
 description: Instructions on how to integrate the Caller ID sensor into Home Assistant.
 ha_category:
   - Sensor
 ha_release: '0.40'
 ha_iot_class: Local Polling
 ha_domain: modem_callerid
+ha_codeowners:
+  - '@tkdrob'
+ha_platforms:
+  - sensor
+ha_config_flow: true
 ---
 
 The `modem_callerid` integration uses an available modem for collecting caller ID information. It requires a Hayes AT compatible modem that supports caller ID detection (via AT+VCID=1). Usually any modem that uses a CX93001 will support this.
diff --git a/source/_integrations/netgear.markdown b/source/_integrations/netgear.markdown
index f6e0060f7b9..7e89df118e9 100644
--- a/source/_integrations/netgear.markdown
+++ b/source/_integrations/netgear.markdown
@@ -8,7 +8,13 @@ ha_release: pre 0.7
 ha_domain: netgear
 ha_platforms:
   - device_tracker
+  - sensor
 ha_config_flow: true
+ha_codeowners:
+  - '@hacf-fr'
+  - '@Quentame'
+  - '@starkillerOG'
+ha_ssdp: true
 ---
 
 This platform allows you to detect presence by looking at connected devices to a [NETGEAR](https://www.netgear.com/) device.
diff --git a/source/_integrations/opengarage.markdown b/source/_integrations/opengarage.markdown
index 2f0a9d8ac56..dad99333066 100644
--- a/source/_integrations/opengarage.markdown
+++ b/source/_integrations/opengarage.markdown
@@ -18,4 +18,3 @@ The `opengarage` cover platform lets you control the open-source [OpenGarage.io]
 
 
 {% include integrations/config_flow.md %}
-
diff --git a/source/_integrations/renault.markdown b/source/_integrations/renault.markdown
index 99a16670d5d..483a048ae0f 100644
--- a/source/_integrations/renault.markdown
+++ b/source/_integrations/renault.markdown
@@ -16,8 +16,8 @@ ha_domain: renault
 ha_platforms:
   - binary_sensor
   - device_tracker
-  - select
   - sensor
+  - select
 ---
 
 The Renault integration offers integration with the **MyRenault** cloud service and provides sensors such as charger state and temperature.
@@ -98,4 +98,3 @@ Start charge on vehicle.
   | Service data attribute | Required | Description |
   | ---------------------- | -------- | ----------- |
   | `vehicle`| yes | device_id of the vehicle |
-
diff --git a/source/_integrations/surepetcare.markdown b/source/_integrations/surepetcare.markdown
index 51ebbc9b661..2864e8003a6 100644
--- a/source/_integrations/surepetcare.markdown
+++ b/source/_integrations/surepetcare.markdown
@@ -14,8 +14,8 @@ ha_domain: surepetcare
 ha_config_flow: true
 ha_platforms:
   - binary_sensor
-  - sensor
   - lock
+  - sensor
 ---
 
 The `surepetcare` component allows you to get information on your Sure Petcare Connect Pet or Cat Flap.
diff --git a/source/_integrations/switchbot.markdown b/source/_integrations/switchbot.markdown
index 498695669bc..cd8da49b3a0 100644
--- a/source/_integrations/switchbot.markdown
+++ b/source/_integrations/switchbot.markdown
@@ -11,8 +11,11 @@ ha_codeowners:
   - '@RenierM26'
 ha_domain: switchbot
 ha_platforms:
+  - binary_sensor
   - cover
+  - sensor
   - switch
+ha_config_flow: true
 ---
 
 The SwitchBot integration allows you to control SwitchBot [devices](https://www.switch-bot.com/).
diff --git a/source/_integrations/template.markdown b/source/_integrations/template.markdown
index 560db1ec9b8..5781e761fc7 100644
--- a/source/_integrations/template.markdown
+++ b/source/_integrations/template.markdown
@@ -8,9 +8,9 @@ ha_release: 0.12
 ha_iot_class: Local Push
 ha_quality_scale: internal
 ha_codeowners:
-  - '@home-assistant/core'
   - '@PhracturedBlue'
   - '@tetienne'
+  - '@home-assistant/core'
 ha_domain: template
 ha_platforms:
   - alarm_control_panel
@@ -20,7 +20,6 @@ ha_platforms:
   - light
   - lock
   - number
-  - select
   - sensor
   - select
   - switch
diff --git a/source/_integrations/tplink.markdown b/source/_integrations/tplink.markdown
index 2c09ed09082..fc465dfc04f 100644
--- a/source/_integrations/tplink.markdown
+++ b/source/_integrations/tplink.markdown
@@ -18,6 +18,7 @@ ha_platforms:
   - sensor
   - switch
 ha_dhcp: true
+ha_quality_scale: platinum
 ---
 
 The `tplink` integration allows you to control your [TP-Link Smart Home Devices](https://www.tp-link.com/kasa-smart/) such as smart plugs and smart bulbs.
diff --git a/source/_integrations/tuya.markdown b/source/_integrations/tuya.markdown
index f73669ef0a9..4bde7b5cbeb 100644
--- a/source/_integrations/tuya.markdown
+++ b/source/_integrations/tuya.markdown
@@ -8,20 +8,20 @@ ha_category:
   - Light
   - Scene
   - Switch
-ha_iot_class: Cloud Polling
+ha_iot_class: Cloud Push
 ha_release: 0.74
 ha_config_flow: true
 ha_domain: tuya
 ha_codeowners:
+  - '@Tuya'
   - '@zlinoliver'
+  - '@METISU'
 ha_platforms:
   - climate
-  - cover
   - fan
   - light
   - scene
   - switch
-ha_dhcp: true
 ---
 
 The Tuya integration allows integrating all Powered by Tuya devices you have added to the Tuya Smart and Tuya Smart Life apps. This integration is officially maintained by Tuya.
diff --git a/source/_integrations/vallox.markdown b/source/_integrations/vallox.markdown
index d5b56d33921..de93525458d 100644
--- a/source/_integrations/vallox.markdown
+++ b/source/_integrations/vallox.markdown
@@ -10,6 +10,8 @@ ha_domain: vallox
 ha_platforms:
   - fan
   - sensor
+ha_codeowners:
+  - '@andre-richter'
 ---
 
 The `vallox` integration lets you control any Vallox ventilation unit that is supported by the [vallox_websocket_api](https://github.com/yozik04/vallox_websocket_api) (follow the link for a list of supported units).
diff --git a/source/_integrations/watttime.markdown b/source/_integrations/watttime.markdown
index b12543cd7a9..0d5fa0a60d8 100644
--- a/source/_integrations/watttime.markdown
+++ b/source/_integrations/watttime.markdown
@@ -3,7 +3,7 @@ title: WattTime
 description: Instructions on how to set up the WattTime integration within Home Assistant.
 ha_category:
   - Sensor
-ha_release: "2021.10"
+ha_release: '2021.10'
 ha_iot_class: Cloud Polling
 ha_domain: watttime
 ha_codeowners:
diff --git a/source/_integrations/whirlpool.markdown b/source/_integrations/whirlpool.markdown
index ccc90f8e39c..8bd8edba16e 100644
--- a/source/_integrations/whirlpool.markdown
+++ b/source/_integrations/whirlpool.markdown
@@ -1,15 +1,14 @@
 ---
-title: Whirlpool 6th Sense Live
+title: Whirlpool Sixth Sense
 description: Instructions on how to integrate Whirlpool 6th Sense Live appliances with Home Assistant.
 ha_category:
   - Climate
-ha_release: "2021.10"
+ha_release: '2021.10'
 ha_iot_class: Cloud Push
 ha_config_flow: true
 ha_codeowners:
   - '@abmantis'
 ha_domain: whirlpool
-ha_zeroconf: false
 ha_platforms:
   - climate
 ---
@@ -39,4 +38,3 @@ The following services are also available:
 - [**turn on/off**](/integrations/climate#service-climateturn_on)
 - [**fan mode**](/integrations/climate#service-climateset_fan_mode) (`low`, `medium`, `high`)
 - [**swing mode**](/integrations/climate#service-climateset_swing_mode) (`off`, `horizontal`)
-
diff --git a/source/_integrations/yeelight.markdown b/source/_integrations/yeelight.markdown
index 06b20516a20..5838ab4ccba 100644
--- a/source/_integrations/yeelight.markdown
+++ b/source/_integrations/yeelight.markdown
@@ -18,6 +18,7 @@ ha_platforms:
 ha_homekit: true
 ha_dhcp: true
 ha_quality_scale: platinum
+ha_zeroconf: true
 ---
 
 The `yeelight` integration allows you to control your Yeelight Wi-Fi bulbs with Home Assistant.