diff --git a/CODEOWNERS b/CODEOWNERS
index a5c84b2f2db..adca0b69a83 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -60,13 +60,14 @@ 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/bosch_shc.markdown @tschamm
 source/_integrations/braviatv.markdown @bieniu
 source/_integrations/broadlink.markdown @danielhiversen @felipediel
 source/_integrations/brother.markdown @bieniu
 source/_integrations/brunt.markdown @eavanvalkenburg
 source/_integrations/bsblan.markdown @liudger
 source/_integrations/bt_smarthub.markdown @jxwolstenholme
-source/_integrations/buienradar.markdown @mjj4791 @ties
+source/_integrations/buienradar.markdown @mjj4791 @ties @Robbie1221
 source/_integrations/cast.markdown @emontnemery
 source/_integrations/cert_expiry.markdown @Cereal2nd @jjlawren
 source/_integrations/circuit.markdown @braam
@@ -101,6 +102,7 @@ source/_integrations/device_automation.markdown @home-assistant/core
 source/_integrations/devolo_home_control.markdown @2Fake @Shutgun
 source/_integrations/dexcom.markdown @gagebenne
 source/_integrations/dhcp.markdown @bdraco
+source/_integrations/dht.markdown @thegardenmonkey
 source/_integrations/digital_ocean.markdown @fabaff
 source/_integrations/directv.markdown @ctalkington
 source/_integrations/discogs.markdown @thibmaek
@@ -157,9 +159,11 @@ source/_integrations/fritz.markdown @mammuth @AaronDavidSchneider @chemelli74
 source/_integrations/fritzbox.markdown @mib1185
 source/_integrations/fronius.markdown @nielstron
 source/_integrations/frontend.markdown @home-assistant/frontend
+source/_integrations/garages_amsterdam.markdown @klaasnicolaas
 source/_integrations/garmin_connect.markdown @cyberjunky
 source/_integrations/gdacs.markdown @exxamalte
 source/_integrations/geniushub.markdown @zxdavb
+source/_integrations/geo_json_events.markdown @exxamalte
 source/_integrations/geo_rss_events.markdown @exxamalte
 source/_integrations/geonetnz_quakes.markdown @exxamalte
 source/_integrations/geonetnz_volcano.markdown @exxamalte
@@ -167,7 +171,7 @@ source/_integrations/gios.markdown @bieniu
 source/_integrations/gitter.markdown @fabaff
 source/_integrations/glances.markdown @fabaff @engrbm87
 source/_integrations/goalzero.markdown @tkdrob
-source/_integrations/gogogate2.markdown @vangorra
+source/_integrations/gogogate2.markdown @vangorra @bdraco
 source/_integrations/google_assistant.markdown @home-assistant/cloud
 source/_integrations/google_cloud.markdown @lufton
 source/_integrations/gpsd.markdown @fabaff
@@ -191,7 +195,7 @@ source/_integrations/home_connect.markdown @DavidMStraub
 source/_integrations/home_plus_control.markdown @chemaaa
 source/_integrations/homeassistant.markdown @home-assistant/core
 source/_integrations/homekit.markdown @bdraco
-source/_integrations/homekit_controller.markdown @Jc2k
+source/_integrations/homekit_controller.markdown @Jc2k @bdraco
 source/_integrations/homematic.markdown @pvizeli @danielperna84
 source/_integrations/http.markdown @home-assistant/core
 source/_integrations/huawei_lte.markdown @scop @fphammerle
@@ -239,10 +243,12 @@ source/_integrations/knx.markdown @Julius2342 @farmio @marvin-w
 source/_integrations/kodi.markdown @OnFreund @cgtobi
 source/_integrations/konnected.markdown @heythisisnate @kit-klein
 source/_integrations/kostal_plenticore.markdown @stegm
+source/_integrations/kraken.markdown @eifinger
 source/_integrations/kulersky.markdown @emlove
 source/_integrations/lametric.markdown @robbiet480
 source/_integrations/launch_library.markdown @ludeeus
 source/_integrations/lcn.markdown @alengwenus
+source/_integrations/lg_netcast.markdown @Drafteed
 source/_integrations/life360.markdown @pnbruckner
 source/_integrations/linux_battery.markdown @fabaff
 source/_integrations/litejet.markdown @joncar
@@ -287,10 +293,12 @@ source/_integrations/mpd.markdown @fabaff
 source/_integrations/mqtt.markdown @emontnemery
 source/_integrations/msteams.markdown @peroyvind
 source/_integrations/mullvad.markdown @meichthys
+source/_integrations/mutesync.markdown @currentoor
 source/_integrations/my.markdown @home-assistant/core
 source/_integrations/myq.markdown @bdraco
 source/_integrations/mysensors.markdown @MartinHjelmare @functionpointer
 source/_integrations/mystrom.markdown @fabaff
+source/_integrations/nam.markdown @bieniu
 source/_integrations/neato.markdown @dshokouhi @Santobert
 source/_integrations/nederlandse_spoorwegen.markdown @YarmoM
 source/_integrations/nello.markdown @pschmitt
@@ -312,7 +320,6 @@ source/_integrations/notify_events.markdown @matrozov @papajojo
 source/_integrations/notion.markdown @bachya
 source/_integrations/nsw_fuel_station.markdown @nickw444
 source/_integrations/nsw_rural_fire_service_feed.markdown @exxamalte
-source/_integrations/nuheat.markdown @bdraco
 source/_integrations/nuki.markdown @pschmitt @pvizeli @pree
 source/_integrations/numato.markdown @clssn
 source/_integrations/number.markdown @home-assistant/core @Shulyaka
@@ -392,7 +399,7 @@ source/_integrations/rpi_power.markdown @shenxn @swetoast
 source/_integrations/ruckus_unleashed.markdown @gabe565
 source/_integrations/safe_mode.markdown @home-assistant/core
 source/_integrations/saj.markdown @fredericvl
-source/_integrations/samsungtv.markdown @escoand
+source/_integrations/samsungtv.markdown @escoand @chemelli74
 source/_integrations/scene.markdown @home-assistant/core
 source/_integrations/schluter.markdown @prairieapps
 source/_integrations/scrape.markdown @fabaff
@@ -410,6 +417,7 @@ source/_integrations/shell_command.markdown @home-assistant/core
 source/_integrations/shelly.markdown @balloob @bieniu @thecode @chemelli74
 source/_integrations/shiftr.markdown @fabaff
 source/_integrations/shodan.markdown @fabaff
+source/_integrations/sia.markdown @eavanvalkenburg
 source/_integrations/sighthound.markdown @robmarkcole
 source/_integrations/signal_messenger.markdown @bbernhard
 source/_integrations/simplisafe.markdown @bachya
@@ -435,7 +443,7 @@ source/_integrations/soma.markdown @ratsept
 source/_integrations/somfy.markdown @tetienne
 source/_integrations/sonarr.markdown @ctalkington
 source/_integrations/songpal.markdown @rytilahti @shenxn
-source/_integrations/sonos.markdown @cgtobi
+source/_integrations/sonos.markdown @cgtobi @jjlawren
 source/_integrations/spaceapi.markdown @fabaff
 source/_integrations/speedtestdotnet.markdown @rohankapoorcom @engrbm87
 source/_integrations/spider.markdown @peternijssen
@@ -460,11 +468,12 @@ source/_integrations/swiss_public_transport.markdown @fabaff
 source/_integrations/switchbot.markdown @danielhiversen
 source/_integrations/switcher_kis.markdown @tomerfi
 source/_integrations/switchmate.markdown @danielhiversen
-source/_integrations/syncthru.markdown @nielstron
 source/_integrations/syncthing.markdown @zhulik
+source/_integrations/syncthru.markdown @nielstron
 source/_integrations/synology_dsm.markdown @hacf-fr @Quentame @mib1185
 source/_integrations/synology_srm.markdown @aerialls
 source/_integrations/syslog.markdown @fabaff
+source/_integrations/system_bridge.markdown @timmo001
 source/_integrations/tado.markdown @michaelarnauts @bdraco @noltari
 source/_integrations/tag.markdown @balloob @dmulcahey
 source/_integrations/tahoma.markdown @philklei
@@ -520,6 +529,7 @@ source/_integrations/vlc_telnet.markdown @rodripf @dmcc
 source/_integrations/volkszaehler.markdown @fabaff
 source/_integrations/volumio.markdown @OnFreund
 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/weather.markdown @fabaff
@@ -539,6 +549,7 @@ source/_integrations/xiaomi_aqara.markdown @danielhiversen @syssi
 source/_integrations/xiaomi_miio.markdown @rytilahti @syssi @starkillerOG
 source/_integrations/xiaomi_tv.markdown @simse
 source/_integrations/xmpp.markdown @fabaff @flowolf
+source/_integrations/yale_smart_alarm.markdown @gjohansson-ST
 source/_integrations/yamaha_musiccast.markdown @jalmeroth
 source/_integrations/yandex_transport.markdown @rishatik92 @devbis
 source/_integrations/yeelight.markdown @rytilahti @zewelor @shenxn
diff --git a/source/_integrations/bosch_shc.markdown b/source/_integrations/bosch_shc.markdown
index 24ecb5851f1..a9845d8e72a 100644
--- a/source/_integrations/bosch_shc.markdown
+++ b/source/_integrations/bosch_shc.markdown
@@ -4,12 +4,14 @@ description: Integrate Bosch SHC.
 ha_category:
   - Binary Sensor
 ha_release: 2021.6
-ha_iot_class: Local Polling
+ha_iot_class: Local Push
 ha_config_flow: true
 ha_codeowners:
   - '@tschamm'
 ha_domain: bosch_shc
-ha_config_flow: true
+ha_platforms:
+  - binary_sensor
+ha_zeroconf: true
 ---
 
 The Bosch SHC integration allows you to integrate your [Bosch SHC](https://www.bosch-smarthome.com) into Home Assistant.
diff --git a/source/_integrations/dht.markdown b/source/_integrations/dht.markdown
index 264aa3e3212..aad155414ee 100644
--- a/source/_integrations/dht.markdown
+++ b/source/_integrations/dht.markdown
@@ -9,6 +9,8 @@ ha_iot_class: Local Polling
 ha_domain: dht
 ha_platforms:
   - sensor
+ha_codeowners:
+  - '@thegardenmonkey'
 ---
 
 The `dht` sensor platform allows you to get the current temperature and humidity from a DHT11, DHT22 or AM2302 device.
diff --git a/source/_integrations/fritz.markdown b/source/_integrations/fritz.markdown
index b89b29de118..1a85e5eee60 100644
--- a/source/_integrations/fritz.markdown
+++ b/source/_integrations/fritz.markdown
@@ -14,8 +14,8 @@ ha_codeowners:
   - '@chemelli74'
 ha_iot_class: Local Polling
 ha_platforms:
-  - device_tracker
   - binary_sensor
+  - device_tracker
   - sensor
 ha_ssdp: true
 ---
diff --git a/source/_integrations/garages_amsterdam.markdown b/source/_integrations/garages_amsterdam.markdown
index 61526227254..26050def58d 100644
--- a/source/_integrations/garages_amsterdam.markdown
+++ b/source/_integrations/garages_amsterdam.markdown
@@ -10,6 +10,9 @@ ha_codeowners:
 ha_config_flow: true
 ha_iot_class: Cloud Polling
 ha_domain: garages_amsterdam
+ha_platforms:
+  - binary_sensor
+  - sensor
 ---
 
 The Garages Amsterdam integration uses an API provided by the municipality of Amsterdam, to measure the occupancy of Amsterdam parking garages in the Netherlands. You can track multiple garages by adding the integration multiple times.
diff --git a/source/_integrations/geo_json_events.markdown b/source/_integrations/geo_json_events.markdown
index f1714768254..c15b1e884f5 100644
--- a/source/_integrations/geo_json_events.markdown
+++ b/source/_integrations/geo_json_events.markdown
@@ -7,6 +7,8 @@ ha_category:
 ha_iot_class: Cloud Polling
 ha_release: 0.79
 ha_domain: geo_json_events
+ha_codeowners:
+  - '@exxamalte'
 ---
 
 The `geo_json_events` platform lets you integrate GeoJSON feeds. It retrieves events from a feed and shows information of those events filtered by distance to Home Assistant's location.
diff --git a/source/_integrations/gogogate2.markdown b/source/_integrations/gogogate2.markdown
index 075a929c094..6a324a0ab03 100644
--- a/source/_integrations/gogogate2.markdown
+++ b/source/_integrations/gogogate2.markdown
@@ -1,5 +1,5 @@
 ---
-title: Gogogate2 and iSmartGate
+title: Gogogate2 and ismartgate
 description: Instructions on how to integrate Gogogate2 and iSmartGate enabled garage door covers into Home Assistant.
 logo: gogogate2.png
 ha_category:
@@ -9,11 +9,13 @@ ha_iot_class: Local Polling
 ha_domain: gogogate2
 ha_codeowners:
   - '@vangorra'
+  - '@bdraco'
 ha_config_flow: true
 ha_homekit: true
 ha_platforms:
   - cover
   - sensor
+ha_dhcp: true
 ---
 
 The `gogogate2` cover platform lets you control Gogogate2 and iSmartGate enabled garage doors and gates through Home Assistant. Device names in Home Assistant are generated based on the names defined in the GogoGate2 or iSmartGate mobile app.
diff --git a/source/_integrations/growatt_server.markdown b/source/_integrations/growatt_server.markdown
index 6e78d19cad2..4537613080d 100644
--- a/source/_integrations/growatt_server.markdown
+++ b/source/_integrations/growatt_server.markdown
@@ -12,6 +12,7 @@ ha_codeowners:
 ha_domain: growatt_server
 ha_platforms:
   - sensor
+ha_config_flow: true
 ---
 
 This is a sensor to collect information from your Growatt inverters using [Growatt server](https://server.growatt.com/).
diff --git a/source/_integrations/guardian.markdown b/source/_integrations/guardian.markdown
index 16927e31ac6..16caa94415d 100644
--- a/source/_integrations/guardian.markdown
+++ b/source/_integrations/guardian.markdown
@@ -16,6 +16,7 @@ ha_platforms:
   - binary_sensor
   - sensor
   - switch
+ha_dhcp: true
 ---
 
 The `guardian` integration integrates
diff --git a/source/_integrations/homekit_controller.markdown b/source/_integrations/homekit_controller.markdown
index ef9e114aa22..a34be7397e4 100644
--- a/source/_integrations/homekit_controller.markdown
+++ b/source/_integrations/homekit_controller.markdown
@@ -19,6 +19,7 @@ ha_iot_class: Local Push
 ha_config_flow: true
 ha_codeowners:
   - '@Jc2k'
+  - '@bdraco'
 ha_domain: homekit_controller
 ha_zeroconf: true
 ha_platforms:
diff --git a/source/_integrations/hue.markdown b/source/_integrations/hue.markdown
index d90deb031ff..315368f5bce 100644
--- a/source/_integrations/hue.markdown
+++ b/source/_integrations/hue.markdown
@@ -4,7 +4,7 @@ description: Instructions on setting up Philips Hue within Home Assistant.
 ha_category:
   - Hub
   - Light
-ha_iot_class: Local Polling
+ha_iot_class: Local Push
 featured: true
 ha_release: '0.60'
 ha_config_flow: true
diff --git a/source/_integrations/hunterdouglas_powerview.markdown b/source/_integrations/hunterdouglas_powerview.markdown
index 9d17c97cf5e..1ba5a0b9e21 100644
--- a/source/_integrations/hunterdouglas_powerview.markdown
+++ b/source/_integrations/hunterdouglas_powerview.markdown
@@ -16,6 +16,8 @@ ha_platforms:
   - cover
   - scene
   - sensor
+ha_zeroconf: true
+ha_dhcp: true
 ---
 
 The `hunterdouglas_powerview` integration allows you to integrate your [Hunter Douglas PowerView](https://www.hunterdouglas.com/operating-systems/powerview-motorization/support) devices in Home Assistant.
diff --git a/source/_integrations/isy994.markdown b/source/_integrations/isy994.markdown
index a8dc28894f3..cd329855a39 100644
--- a/source/_integrations/isy994.markdown
+++ b/source/_integrations/isy994.markdown
@@ -28,6 +28,7 @@ ha_platforms:
   - lock
   - sensor
   - switch
+ha_dhcp: true
 ---
 
 The ISY994 is a home automation controller that is capable of controlling Insteon and X10 devices. Some models of the ISY994 can even control Z-Wave devices.
diff --git a/source/_integrations/keenetic_ndms2.markdown b/source/_integrations/keenetic_ndms2.markdown
index a51c2778d34..70e64e5453f 100644
--- a/source/_integrations/keenetic_ndms2.markdown
+++ b/source/_integrations/keenetic_ndms2.markdown
@@ -12,6 +12,7 @@ ha_platforms:
   - binary_sensor
   - device_tracker
 ha_config_flow: true
+ha_ssdp: true
 ---
 
 This platform offers presence detection by examining devices connected to a [Keenetic](https://keenetic.net/)
diff --git a/source/_integrations/kraken.markdown b/source/_integrations/kraken.markdown
index 712a732579e..87af338e922 100644
--- a/source/_integrations/kraken.markdown
+++ b/source/_integrations/kraken.markdown
@@ -7,7 +7,6 @@ ha_category:
 ha_iot_class: Cloud Polling
 ha_release: 2021.6
 ha_config_flow: true
-ha_quality_scale: gold
 ha_codeowners:
   - '@eifinger'
 ha_domain: kraken
diff --git a/source/_integrations/lg_netcast.markdown b/source/_integrations/lg_netcast.markdown
index f23d0855f52..4f9f25440dc 100644
--- a/source/_integrations/lg_netcast.markdown
+++ b/source/_integrations/lg_netcast.markdown
@@ -8,6 +8,8 @@ ha_release: '0.20'
 ha_domain: lg_netcast
 ha_platforms:
   - media_player
+ha_codeowners:
+  - '@Drafteed'
 ---
 
 The `lg_netcast` platform allows you to control a LG Smart TV running NetCast 3.0 (LG Smart TV models released in 2012) and NetCast 4.0 (LG Smart TV models released in 2013). For the new LG WebOS TV's use the [webostv](/integrations/webostv#media-player) platform.
diff --git a/source/_integrations/mazda.markdown b/source/_integrations/mazda.markdown
index a2a66f5f6e9..358d72aa841 100644
--- a/source/_integrations/mazda.markdown
+++ b/source/_integrations/mazda.markdown
@@ -15,6 +15,7 @@ ha_codeowners:
 ha_domain: mazda
 ha_platforms:
   - device_tracker
+  - lock
   - sensor
 ---
 
@@ -120,4 +121,4 @@ Temporarily turn off the vehicle hazard lights if they have been manually turned
 
 ## Disclaimer
 
-This integration is not affiliated with or endorsed by Mazda.
\ No newline at end of file
+This integration is not affiliated with or endorsed by Mazda.
diff --git a/source/_integrations/meteoclimatic.markdown b/source/_integrations/meteoclimatic.markdown
index 8b82f74362d..1564dfefa84 100644
--- a/source/_integrations/meteoclimatic.markdown
+++ b/source/_integrations/meteoclimatic.markdown
@@ -9,6 +9,8 @@ ha_codeowners:
   - '@adrianmo'
 ha_config_flow: true
 ha_domain: meteoclimatic
+ha_platforms:
+  - weather
 ---
 
 The Meteoclimatic integration uses the [Meteoclimatic](https://www.meteoclimatic.net/) web service as a source for meteorological data for your location. The location is based on the Meteoclimatic station code (e.g., `ESCAT4300000043206B`) and the weather data reported is based on the capabilities of each station.
diff --git a/source/_integrations/modbus.markdown b/source/_integrations/modbus.markdown
index abf40bdea51..06f9f77bf3f 100644
--- a/source/_integrations/modbus.markdown
+++ b/source/_integrations/modbus.markdown
@@ -14,6 +14,8 @@ ha_platforms:
   - binary_sensor
   - climate
   - cover
+  - fan
+  - light
   - sensor
   - switch
 ---
diff --git a/source/_integrations/mutesync.markdown b/source/_integrations/mutesync.markdown
index 495f6a980a9..6d9f4a95c15 100644
--- a/source/_integrations/mutesync.markdown
+++ b/source/_integrations/mutesync.markdown
@@ -1,5 +1,5 @@
 ---
-title: Mutesync
+title: mutesync
 description: Instructions on how to integrate Mutesync button with Home Assistant.
 ha_category:
   - Presence Detection
diff --git a/source/_integrations/nam.markdown b/source/_integrations/nam.markdown
index 6eb73d1e401..64b8d1614a2 100644
--- a/source/_integrations/nam.markdown
+++ b/source/_integrations/nam.markdown
@@ -13,6 +13,7 @@ ha_platforms:
   - air_quality
   - sensor
 ha_quality_scale: platinum
+ha_zeroconf: true
 ---
 
 The Nettigo Air Monitor integration allows you to read temperature, humidity, pressure and air quality data from Nettigo Air Monitor devices. [Nettigo Air Monitor](https://air.nettigo.pl/?setlang=en) is a DIY air quality monitoring system with open source firmware, based on an open hardware project.
diff --git a/source/_integrations/network.markdown b/source/_integrations/network.markdown
index f81c5899f00..8733a51ea4a 100644
--- a/source/_integrations/network.markdown
+++ b/source/_integrations/network.markdown
@@ -5,9 +5,8 @@ ha_category:
   - Other
 ha_release: 2021.6
 ha_domain: network
-ha_iot_class:
-ha_codeowners:
-  - '@home-assistant/core'
+ha_iot_class: Local Push
+ha_quality_scale: internal
 ---
 
 This integration provides network configuration for integrations such as [Zeroconf](/integrations/zeroconf/). It is managed by going to **{% my general title="Configuration >> General" %}** and is only available to users that have "Advanced Mode" enabled on their {% my profile title="user profile" %}.
diff --git a/source/_integrations/nuheat.markdown b/source/_integrations/nuheat.markdown
index 1d96031379d..4012ee98d7c 100644
--- a/source/_integrations/nuheat.markdown
+++ b/source/_integrations/nuheat.markdown
@@ -7,8 +7,6 @@ ha_release: 0.61
 ha_iot_class: Cloud Polling
 ha_domain: nuheat
 ha_config_flow: true
-ha_codeowners:
-  - '@bdraco'
 ha_dhcp: true
 ha_platforms:
   - climate
diff --git a/source/_integrations/omnilogic.markdown b/source/_integrations/omnilogic.markdown
index e77e46a5b47..ae5a0615ab6 100644
--- a/source/_integrations/omnilogic.markdown
+++ b/source/_integrations/omnilogic.markdown
@@ -14,6 +14,7 @@ ha_codeowners:
 ha_domain: omnilogic
 ha_platforms:
   - sensor
+  - switch
 ---
 
 [Hayward OmniLogic](https://www.hayward-pool.com/shop/en/pools/omnilogic-i-auomni--1) smart pool and spa technology control.
diff --git a/source/_integrations/rachio.markdown b/source/_integrations/rachio.markdown
index dd6353fa070..3b784c033a2 100644
--- a/source/_integrations/rachio.markdown
+++ b/source/_integrations/rachio.markdown
@@ -16,6 +16,7 @@ ha_dhcp: true
 ha_platforms:
   - binary_sensor
   - switch
+ha_zeroconf: true
 ---
 
 The `rachio` platform allows you to control your [Rachio irrigation system](https://rachio.com/).
diff --git a/source/_integrations/rainmachine.markdown b/source/_integrations/rainmachine.markdown
index d213b70f4ad..2ae524d8809 100644
--- a/source/_integrations/rainmachine.markdown
+++ b/source/_integrations/rainmachine.markdown
@@ -16,6 +16,8 @@ ha_platforms:
   - binary_sensor
   - sensor
   - switch
+ha_zeroconf: true
+ha_homekit: true
 ---
 
 The RainMachine integration is the main integration to integrate all platforms related to [RainMachine smart Wi-Fi sprinkler controllers](https://www.rainmachine.com/).
diff --git a/source/_integrations/samsungtv.markdown b/source/_integrations/samsungtv.markdown
index ae48b77b0c9..26a36ca4fbd 100644
--- a/source/_integrations/samsungtv.markdown
+++ b/source/_integrations/samsungtv.markdown
@@ -8,10 +8,13 @@ ha_iot_class: Local Polling
 ha_config_flow: true
 ha_codeowners:
   - '@escoand'
+  - '@chemelli74'
 ha_domain: samsungtv
 ha_ssdp: true
 ha_platforms:
   - media_player
+ha_zeroconf: true
+ha_dhcp: true
 ---
 
 The `samsungtv` platform allows you to control a [Samsung Smart TV](https://www.samsung.com/uk/tvs/all-tvs/).
diff --git a/source/_integrations/sia.markdown b/source/_integrations/sia.markdown
index 134156a5242..6a4947db996 100644
--- a/source/_integrations/sia.markdown
+++ b/source/_integrations/sia.markdown
@@ -4,12 +4,13 @@ description: Instructions on how to integrate SIA Based Alarm systems.
 ha_category:
   - Alarm
 ha_release: 2021.6
-ha_iot_class: "Local Push"
-ha_quality_scale: platinum
+ha_iot_class: Local Push
 ha_config_flow: true
 ha_codeowners:
   - '@eavanvalkenburg'
 ha_domain: sia
+ha_platforms:
+  - alarm_control_panel
 ---
 
 The SIA Alarm Systems integration provides integration with several alarm systems that implement the SIA Protocol, including [Ajax Systems](https://ajax.systems/). This protocol is listen-only, so does not allow you to turn on/off your alarm system, it just updates the state to reflect your alarm and allows you to act on that state, for instance turning on all lights and opening the curtains when the alarm triggers. The underlying package has support for different variants of SIA, including DC-09, DC-04 and a limited set of ADM-CID. If your alarm system uses the ADM-CID standard and it isn't working, please log an issue [here](https://github.com/eavanvalkenburg/pysiaalarm/issues/new).
diff --git a/source/_integrations/smartthings.markdown b/source/_integrations/smartthings.markdown
index ecf717f10b3..1022079254c 100644
--- a/source/_integrations/smartthings.markdown
+++ b/source/_integrations/smartthings.markdown
@@ -29,6 +29,7 @@ ha_platforms:
   - scene
   - sensor
   - switch
+ha_dhcp: true
 ---
 
 SmartThings is integrated into Home Assistant through the SmartThings Cloud API. The features of this integration include:
diff --git a/source/_integrations/sonos.markdown b/source/_integrations/sonos.markdown
index 39eb5849526..e05946d9185 100644
--- a/source/_integrations/sonos.markdown
+++ b/source/_integrations/sonos.markdown
@@ -11,11 +11,13 @@ ha_config_flow: true
 ha_domain: sonos
 ha_codeowners:
   - '@cgtobi'
+  - '@jjlawren'
 ha_ssdp: true
 ha_platforms:
   - binary_sensor
   - media_player
   - sensor
+  - switch
 ---
 
 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/syncthing.markdown b/source/_integrations/syncthing.markdown
index 53026d015ed..f144698d411 100644
--- a/source/_integrations/syncthing.markdown
+++ b/source/_integrations/syncthing.markdown
@@ -11,6 +11,8 @@ ha_config_flow: true
 ha_codeowners:
   - '@zhulik'
 ha_domain: syncthing
+ha_platforms:
+  - sensor
 ---
 
 [Syncthing](https://syncthing.net/) is a continuous file synchronization program. It synchronizes files between two or more computers 
diff --git a/source/_integrations/syncthru.markdown b/source/_integrations/syncthru.markdown
index 6377c7c0797..d7d3ab9615d 100644
--- a/source/_integrations/syncthru.markdown
+++ b/source/_integrations/syncthru.markdown
@@ -11,8 +11,8 @@ ha_codeowners:
 ha_domain: syncthru
 ha_ssdp: true
 ha_platforms:
-  - sensor
   - binary_sensor
+  - sensor
 ---
 
 The Samsung SyncThru Printer platform allows you to read current data from your local Samsung printer.
diff --git a/source/_integrations/system_bridge.markdown b/source/_integrations/system_bridge.markdown
index bc39a8e8a2a..d8dec84fcef 100644
--- a/source/_integrations/system_bridge.markdown
+++ b/source/_integrations/system_bridge.markdown
@@ -14,6 +14,7 @@ ha_quality_scale: silver
 ha_platforms:
   - binary_sensor
   - sensor
+ha_zeroconf: true
 ---
 
 [System Bridge](https://system-bridge.timmo.dev) is an application that runs on your local machine to share system information via its API as well as allowing commands to be sent to the device.
diff --git a/source/_integrations/tado.markdown b/source/_integrations/tado.markdown
index 4fc47a21c6d..169f076aebf 100644
--- a/source/_integrations/tado.markdown
+++ b/source/_integrations/tado.markdown
@@ -24,6 +24,7 @@ ha_platforms:
   - device_tracker
   - sensor
   - water_heater
+ha_dhcp: true
 ---
 
 The Tado integration platform is used as an interface to the [my.tado.com](https://my.tado.com/) website.
diff --git a/source/_integrations/tplink.markdown b/source/_integrations/tplink.markdown
index 2270bf08b27..413919d05d8 100644
--- a/source/_integrations/tplink.markdown
+++ b/source/_integrations/tplink.markdown
@@ -15,6 +15,7 @@ ha_domain: tplink
 ha_platforms:
   - light
   - switch
+ha_dhcp: true
 ---
 
 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/upnp.markdown b/source/_integrations/upnp.markdown
index 9f038c5687d..713062a7189 100644
--- a/source/_integrations/upnp.markdown
+++ b/source/_integrations/upnp.markdown
@@ -1,5 +1,5 @@
 ---
-title: UPnP
+title: UPnP/IGD
 description: Internet Gateway Device (IGD) Protocol for Home Assistant.
 ha_category:
   - Network
diff --git a/source/_integrations/vesync.markdown b/source/_integrations/vesync.markdown
index e0220507fa2..5d724d535dc 100644
--- a/source/_integrations/vesync.markdown
+++ b/source/_integrations/vesync.markdown
@@ -14,9 +14,9 @@ ha_codeowners:
   - '@thegardenmonkey'
 ha_domain: vesync
 ha_platforms:
+  - fan
   - light
   - switch
-  - fan
 ---
 
 The `vesync` integration enables you to control smart switches and outlets connected to the VeSync App.
diff --git a/source/_integrations/wallbox.markdown b/source/_integrations/wallbox.markdown
index 3a77fac3987..f5d8092d282 100644
--- a/source/_integrations/wallbox.markdown
+++ b/source/_integrations/wallbox.markdown
@@ -9,6 +9,8 @@ ha_domain: wallbox
 ha_platforms:
   - sensor
 ha_config_flow: true
+ha_codeowners:
+  - '@hesselonline'
 ---
 
 The Wallbox integration pulls data from the [MyWallbox Portal](https://my.wallbox.com) for your Wallbox charging station.
diff --git a/source/_integrations/yale_smart_alarm.markdown b/source/_integrations/yale_smart_alarm.markdown
index 208a66b8dc2..54898dd0ddd 100644
--- a/source/_integrations/yale_smart_alarm.markdown
+++ b/source/_integrations/yale_smart_alarm.markdown
@@ -8,6 +8,8 @@ ha_iot_class: Cloud Polling
 ha_domain: yale_smart_alarm
 ha_platforms:
   - alarm_control_panel
+ha_codeowners:
+  - '@gjohansson-ST'
 ---
 
 The `yale_smart_alarm` platform provides connectivity with the Yale Smart Alarm systems and Smart Hub through Yale's API.
diff --git a/source/_integrations/yeelight.markdown b/source/_integrations/yeelight.markdown
index dfec10e1104..4b96ebea7eb 100644
--- a/source/_integrations/yeelight.markdown
+++ b/source/_integrations/yeelight.markdown
@@ -14,6 +14,8 @@ ha_domain: yeelight
 ha_platforms:
   - binary_sensor
   - light
+ha_homekit: true
+ha_dhcp: true
 ---
 
 The `yeelight` integration allows you to control your Yeelight Wi-Fi bulbs with Home Assistant.