diff --git a/CODEOWNERS b/CODEOWNERS
index 07590e06753..015522cb2cc 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -13,6 +13,7 @@ source/_integrations/accuweather.markdown @bieniu
 source/_integrations/acmeda.markdown @atmurray
 source/_integrations/adguard.markdown @frenck
 source/_integrations/advantage_air.markdown @Bre77
+source/_integrations/aemet.markdown @noltari
 source/_integrations/agent_dvr.markdown @ispysoftware
 source/_integrations/airly.markdown @bieniu
 source/_integrations/airnow.markdown @asymworks
@@ -72,6 +73,7 @@ source/_integrations/circuit.markdown @braam
 source/_integrations/cisco_ios.markdown @fbradyirl
 source/_integrations/cisco_mobility_express.markdown @fbradyirl
 source/_integrations/cisco_webex_teams.markdown @fbradyirl
+source/_integrations/climacell.markdown @raman325
 source/_integrations/cloud.markdown @home-assistant/cloud
 source/_integrations/cloudflare.markdown @ludeeus @ctalkington
 source/_integrations/color_extractor.markdown @GenericStudent
@@ -133,6 +135,7 @@ source/_integrations/esphome.markdown @OttoWinter
 source/_integrations/essent.markdown @TheLastProject
 source/_integrations/evohome.markdown @zxdavb
 source/_integrations/ezviz.markdown @baqs
+source/_integrations/faadelays.markdown @ntilley905
 source/_integrations/fastdotcom.markdown @rohankapoorcom
 source/_integrations/file.markdown @fabaff
 source/_integrations/filter.markdown @dgomes
@@ -147,7 +150,7 @@ source/_integrations/flunearyou.markdown @bachya
 source/_integrations/forked_daapd.markdown @uvjustin
 source/_integrations/fortios.markdown @kimfrellsen
 source/_integrations/foscam.markdown @skgsergio
-source/_integrations/freebox.markdown @snoof85 @Quentame
+source/_integrations/freebox.markdown @hacf-fr @Quentame
 source/_integrations/fronius.markdown @nielstron
 source/_integrations/frontend.markdown @home-assistant/frontend
 source/_integrations/garmin_connect.markdown @cyberjunky
@@ -170,6 +173,7 @@ source/_integrations/griddy.markdown @bdraco
 source/_integrations/group.markdown @home-assistant/core
 source/_integrations/growatt_server.markdown @indykoning
 source/_integrations/guardian.markdown @bachya
+source/_integrations/habitica.markdown @ASMfreaK @leikoilja
 source/_integrations/harmony.markdown @ehendrix23 @bramkragten @bdraco @mkeesey
 source/_integrations/hdmi_cec.markdown @newAM
 source/_integrations/heatmiser.markdown @andylockran
@@ -199,7 +203,7 @@ source/_integrations/hydrawise.markdown @ptcryan
 source/_integrations/hyperion.markdown @dermotduffy
 source/_integrations/iammeter.markdown @lewei50
 source/_integrations/iaqualink.markdown @flz
-source/_integrations/icloud.markdown @Quentame
+source/_integrations/icloud.markdown @Quentame @nzapponi
 source/_integrations/ign_sismologia.markdown @exxamalte
 source/_integrations/image.markdown @home-assistant/core
 source/_integrations/incomfort.markdown @zxdavb
@@ -227,6 +231,7 @@ source/_integrations/keba.markdown @dannerph
 source/_integrations/keenetic_ndms2.markdown @foxel
 source/_integrations/kef.markdown @basnijholt
 source/_integrations/keyboard_remote.markdown @bendavid
+source/_integrations/kmtronic.markdown @dgomes
 source/_integrations/knx.markdown @Julius2342 @farmio @marvin-w
 source/_integrations/kodi.markdown @OnFreund @cgtobi
 source/_integrations/konnected.markdown @heythisisnate @kit-klein
@@ -236,6 +241,8 @@ source/_integrations/launch_library.markdown @ludeeus
 source/_integrations/lcn.markdown @alengwenus
 source/_integrations/life360.markdown @pnbruckner
 source/_integrations/linux_battery.markdown @fabaff
+source/_integrations/litejet.markdown @joncar
+source/_integrations/litterrobot.markdown @natekspencer
 source/_integrations/local_ip.markdown @issacg
 source/_integrations/logger.markdown @home-assistant/core
 source/_integrations/logi_circle.markdown @evanjd
@@ -245,8 +252,10 @@ source/_integrations/luftdaten.markdown @fabaff
 source/_integrations/lupusec.markdown @majuss
 source/_integrations/lutron.markdown @JonGilmore
 source/_integrations/lutron_caseta.markdown @swails @bdraco
+source/_integrations/lyric.markdown @timmo001
 source/_integrations/mastodon.markdown @fabaff
 source/_integrations/matrix.markdown @tinloaf
+source/_integrations/mazda.markdown @bdr99
 source/_integrations/mcp23017.markdown @jardiamj
 source/_integrations/media_source.markdown @hunterjm
 source/_integrations/mediaroom.markdown @dgomes
@@ -268,10 +277,12 @@ source/_integrations/monoprice.markdown @etsinko @OnFreund
 source/_integrations/moon.markdown @fabaff
 source/_integrations/motion_blinds.markdown @starkillerOG
 source/_integrations/mpd.markdown @fabaff
-source/_integrations/mqtt.markdown @home-assistant/core @emontnemery
+source/_integrations/mqtt.markdown @emontnemery
 source/_integrations/msteams.markdown @peroyvind
+source/_integrations/mullvad.markdown @meichthys
+source/_integrations/my.markdown @home-assistant/core
 source/_integrations/myq.markdown @bdraco
-source/_integrations/mysensors.markdown @MartinHjelmare
+source/_integrations/mysensors.markdown @MartinHjelmare @functionpointer
 source/_integrations/mystrom.markdown @fabaff
 source/_integrations/neato.markdown @dshokouhi @Santobert
 source/_integrations/nederlandse_spoorwegen.markdown @YarmoM
@@ -295,7 +306,7 @@ 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
+source/_integrations/nuki.markdown @pschmitt @pvizeli @pree
 source/_integrations/numato.markdown @clssn
 source/_integrations/number.markdown @home-assistant/core @Shulyaka
 source/_integrations/nut.markdown @bdraco
@@ -359,9 +370,11 @@ source/_integrations/random.markdown @fabaff
 source/_integrations/recollect_waste.markdown @bachya
 source/_integrations/rejseplanen.markdown @DarkFox
 source/_integrations/repetier.markdown @MTrab
+source/_integrations/rflink.markdown @javicalle
 source/_integrations/rfxtrx.markdown @danielhiversen @elupus @RobBie1221
 source/_integrations/ring.markdown @balloob
 source/_integrations/risco.markdown @OnFreund
+source/_integrations/rituals_perfume_genie.markdown @milanmeu
 source/_integrations/rmvtransport.markdown @cgtobi
 source/_integrations/roku.markdown @ctalkington
 source/_integrations/roomba.markdown @pschmitt @cyr-ius @shenxn
@@ -401,6 +414,7 @@ source/_integrations/smappee.markdown @bsmappee
 source/_integrations/smart_meter_texas.markdown @grahamwetzler
 source/_integrations/smarthab.markdown @outadoc
 source/_integrations/smartthings.markdown @andrewsayre
+source/_integrations/smarttub.markdown @mdz
 source/_integrations/smarty.markdown @z0mbieprocess
 source/_integrations/sms.markdown @ocalvo
 source/_integrations/smtp.markdown @fabaff
@@ -427,6 +441,7 @@ source/_integrations/stiebel_eltron.markdown @fucm
 source/_integrations/stookalert.markdown @fwestenberg
 source/_integrations/stream.markdown @hunterjm @uvjustin
 source/_integrations/stt.markdown @pvizeli
+source/_integrations/subaru.markdown @G-Two
 source/_integrations/suez_water.markdown @ooii
 source/_integrations/sun.markdown @Swamp-Ig
 source/_integrations/supla.markdown @mwegrzynek
@@ -440,7 +455,7 @@ 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/tado.markdown @michaelarnauts @bdraco
+source/_integrations/tado.markdown @michaelarnauts @bdraco @noltari
 source/_integrations/tag.markdown @balloob @dmulcahey
 source/_integrations/tahoma.markdown @philklei
 source/_integrations/tankerkoenig.markdown @guillempages
@@ -462,7 +477,6 @@ source/_integrations/toon.markdown @frenck
 source/_integrations/totalconnect.markdown @austinmroczek
 source/_integrations/tplink.markdown @rytilahti @thegardenmonkey
 source/_integrations/traccar.markdown @ludeeus
-source/_integrations/tradfri.markdown @ggravlingen
 source/_integrations/trafikverket_train.markdown @endor-force
 source/_integrations/trafikverket_weatherstation.markdown @endor-force
 source/_integrations/transmission.markdown @engrbm87 @JPHutchins
@@ -470,6 +484,7 @@ source/_integrations/tts.markdown @pvizeli
 source/_integrations/tuya.markdown @ollo69
 source/_integrations/twentemilieu.markdown @frenck
 source/_integrations/twinkly.markdown @dr1rrb
+source/_integrations/ubus.markdown @noltari
 source/_integrations/unifi.markdown @Kane610
 source/_integrations/unifiled.markdown @florisvdk
 source/_integrations/upb.markdown @gwww
@@ -491,7 +506,7 @@ source/_integrations/vicare.markdown @oischinger
 source/_integrations/vilfo.markdown @ManneW
 source/_integrations/vivotek.markdown @HarlemSquirrel
 source/_integrations/vizio.markdown @raman325
-source/_integrations/vlc_telnet.markdown @rodripf
+source/_integrations/vlc_telnet.markdown @rodripf @dmcc
 source/_integrations/volkszaehler.markdown @fabaff
 source/_integrations/volumio.markdown @OnFreund
 source/_integrations/waqi.markdown @andrey-git
@@ -499,6 +514,7 @@ source/_integrations/watson_tts.markdown @rutkai
 source/_integrations/weather.markdown @fabaff
 source/_integrations/webostv.markdown @bendavid
 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/withings.markdown @vangorra
diff --git a/source/_integrations/aemet.markdown b/source/_integrations/aemet.markdown
index 23360cc717b..205daa6ba74 100644
--- a/source/_integrations/aemet.markdown
+++ b/source/_integrations/aemet.markdown
@@ -10,6 +10,9 @@ ha_config_flow: true
 ha_codeowners:
   - '@noltari'
 ha_domain: aemet
+ha_platforms:
+  - sensor
+  - weather
 ---
 
 The AEMET weather platform uses [AEMET OpenData](https://opendata.aemet.es/) as a source for current meteorological data for your location. AEMET stands for "Agencia Estatal de Meteorología", which is the Spanish Meteorological Agency.
diff --git a/source/_integrations/apple_tv.markdown b/source/_integrations/apple_tv.markdown
index aa350e296f2..a65ef27ce56 100644
--- a/source/_integrations/apple_tv.markdown
+++ b/source/_integrations/apple_tv.markdown
@@ -10,7 +10,6 @@ ha_release: 0.49
 ha_domain: apple_tv
 ha_codeowners:
   - '@postlund'
-  - '@wizbangcrash'
 ha_config_flow: true
 ha_zeroconf: true
 ha_platforms:
diff --git a/source/_integrations/aurora.markdown b/source/_integrations/aurora.markdown
index 8e8a9d8dd41..5ed8efa5bac 100644
--- a/source/_integrations/aurora.markdown
+++ b/source/_integrations/aurora.markdown
@@ -11,6 +11,7 @@ ha_codeowners:
 ha_config_flow: true
 ha_platforms:
   - binary_sensor
+  - sensor
 ---
 
 The `aurora` platform uses the [NOAA Aurora Forecast](https://www.swpc.noaa.gov/products/aurora-30-minute-forecast) service to let you know if an aurora might be visible at your home location in the next 30 minutes, based off of current solar flare activity.
diff --git a/source/_integrations/climacell.markdown b/source/_integrations/climacell.markdown
index 3424a519c95..bc94e9842bc 100644
--- a/source/_integrations/climacell.markdown
+++ b/source/_integrations/climacell.markdown
@@ -6,10 +6,11 @@ ha_category:
 ha_release: 2021.3
 ha_iot_class: Cloud Polling
 ha_config_flow: true
-ha_quality_scale: silver
 ha_codeowners:
   - '@raman325'
 ha_domain: climacell
+ha_platforms:
+  - weather
 ---
 
 The ClimaCell integration allows you to obtain weather information from the [ClimaCell API](https://www.climacell.co/weather-api/).
diff --git a/source/_integrations/freebox.markdown b/source/_integrations/freebox.markdown
index 25279632a3c..364250df6a1 100644
--- a/source/_integrations/freebox.markdown
+++ b/source/_integrations/freebox.markdown
@@ -9,7 +9,7 @@ ha_category:
 ha_release: 0.85
 ha_iot_class: Local Polling
 ha_codeowners:
-  - '@snoof85'
+  - '@hacf-fr'
   - '@Quentame'
 ha_config_flow: true
 ha_domain: freebox
diff --git a/source/_integrations/habitica.markdown b/source/_integrations/habitica.markdown
index 5556797b08e..314cd71b805 100644
--- a/source/_integrations/habitica.markdown
+++ b/source/_integrations/habitica.markdown
@@ -9,6 +9,10 @@ ha_iot_class: Cloud Polling
 ha_domain: habitica
 ha_platforms:
   - sensor
+ha_codeowners:
+  - '@ASMfreaK'
+  - '@leikoilja'
+ha_config_flow: true
 ---
 
 This integration allows you to monitor and manage your Habitica profile. This integration exposes the [Habitica's API](https://habitica.com/apidoc/) as a Home Assistant service. It supports multiple users and allows you to automate checking out your habits and daily tasks or casting magics using Home Assistant.
diff --git a/source/_integrations/keenetic_ndms2.markdown b/source/_integrations/keenetic_ndms2.markdown
index 75f0fec39f4..a51c2778d34 100644
--- a/source/_integrations/keenetic_ndms2.markdown
+++ b/source/_integrations/keenetic_ndms2.markdown
@@ -1,5 +1,5 @@
 ---
-title: Keenetic NDMS2 Routers
+title: Keenetic NDMS2 Router
 description: Instructions on how to integrate Keenetic NDMS2 Routers into Home Assistant.
 ha_category:
   - Presence Detection
@@ -9,7 +9,9 @@ ha_codeowners:
   - '@foxel'
 ha_domain: keenetic_ndms2
 ha_platforms:
+  - binary_sensor
   - device_tracker
+ha_config_flow: true
 ---
 
 This platform offers presence detection by examining devices connected to a [Keenetic](https://keenetic.net/)
diff --git a/source/_integrations/kmtronic.markdown b/source/_integrations/kmtronic.markdown
index f89a2f4dddf..3b928aaed45 100644
--- a/source/_integrations/kmtronic.markdown
+++ b/source/_integrations/kmtronic.markdown
@@ -1,14 +1,16 @@
 ---
-title: KMTronic
+title: KMtronic
 description: Integrate KMTronic devices
 ha_category:
   - Switch
-ha_release: 2021.3 
+ha_release: 2021.3
 ha_codeowners:
   - '@dgomes'
 ha_iot_class: Local Push
 ha_domain: kmtronic
 ha_config_flow: true
+ha_platforms:
+  - switch
 ---
 
 Integrate [KMtronic devices](https://www.kmtronic.com/) into Home Assistant. KMtronic offers a large range of IP-connected relays that can be controlled over your local area network. This integration maps each of the relays as a separate device, enabling you to control various areas of your home (e.g. using each relay to control different garden sprinkler areas, or controlling the electrical distribution of your house from a central board).
diff --git a/source/_integrations/knx.markdown b/source/_integrations/knx.markdown
index cd4dfa32091..8b0a700733a 100644
--- a/source/_integrations/knx.markdown
+++ b/source/_integrations/knx.markdown
@@ -25,6 +25,7 @@ ha_platforms:
   - binary_sensor
   - climate
   - cover
+  - fan
   - light
   - notify
   - sensor
diff --git a/source/_integrations/litejet.markdown b/source/_integrations/litejet.markdown
index 1491659bccc..440fad44003 100644
--- a/source/_integrations/litejet.markdown
+++ b/source/_integrations/litejet.markdown
@@ -12,6 +12,8 @@ ha_config_flow: true
 ha_platforms:
   - light
   - switch
+ha_codeowners:
+  - '@joncar'
 ---
 
 LiteJet is a centralized lighting system that predates most home automation technology. All lights and wall switches are wired to a central panel. This central panel has a serial port interface that allows a computer to control the system via LiteJet's third party protocol. Home Assistant integrates the LiteJet 3rd party protocol and allows you to get the status and control the connected lights.
diff --git a/source/_integrations/litterrobot.markdown b/source/_integrations/litterrobot.markdown
index 96e769609ae..5f9bbb46e29 100644
--- a/source/_integrations/litterrobot.markdown
+++ b/source/_integrations/litterrobot.markdown
@@ -6,7 +6,6 @@ ha_category:
 ha_iot_class: Cloud Polling
 ha_release: 2021.3
 ha_config_flow: true
-ha_quality_scale: gold
 ha_codeowners:
   - '@natekspencer'
 ha_domain: litterrobot
diff --git a/source/_integrations/lyric.markdown b/source/_integrations/lyric.markdown
index c274d0328c0..04a707564c6 100644
--- a/source/_integrations/lyric.markdown
+++ b/source/_integrations/lyric.markdown
@@ -10,6 +10,11 @@ ha_config_flow: true
 ha_codeowners:
   - '@timmo001'
 ha_domain: lyric
+ha_quality_scale: silver
+ha_platforms:
+  - climate
+  - sensor
+ha_dhcp: true
 ---
 
 The Honeywell Lyric component integrates the Lyric thermostat platform into Home Assistant.
diff --git a/source/_integrations/mazda.markdown b/source/_integrations/mazda.markdown
index df055881afd..5fad5e58f68 100644
--- a/source/_integrations/mazda.markdown
+++ b/source/_integrations/mazda.markdown
@@ -1,16 +1,18 @@
 ---
-title: "Mazda Connected Services"
-description: "Instructions on how to integrate your Connected Services capable Mazda vehicle with Home Assistant."
-ha_release: "2021.3"
+title: Mazda Connected Services
+description: Instructions on how to integrate your Connected Services capable Mazda vehicle with Home Assistant.
+ha_release: '2021.3'
 ha_category:
   - Car
   - Sensor
-ha_iot_class: "Cloud Polling"
+ha_iot_class: Cloud Polling
 ha_quality_scale: platinum
 ha_config_flow: true
 ha_codeowners:
   - '@bdr99'
 ha_domain: mazda
+ha_platforms:
+  - sensor
 ---
 
 The Mazda Connected Services integration allows you to retrieve data from a Mazda vehicle. In order to use this integration, you must first register your vehicle using the MyMazda app ([iOS](https://apps.apple.com/us/app/mymazda/id451886367)/[Android](https://play.google.com/store/apps/details?id=com.interrait.mymazda)).
diff --git a/source/_integrations/mqtt.markdown b/source/_integrations/mqtt.markdown
index 5178442ec7a..8457952586b 100644
--- a/source/_integrations/mqtt.markdown
+++ b/source/_integrations/mqtt.markdown
@@ -8,7 +8,6 @@ ha_release: pre 0.7
 ha_iot_class: Local Push
 ha_config_flow: true
 ha_codeowners:
-  - '@home-assistant/core'
   - '@emontnemery'
 ha_domain: mqtt
 ha_platforms:
diff --git a/source/_integrations/mullvad.markdown b/source/_integrations/mullvad.markdown
index 20c7698d6d4..b6d2bf1ab86 100644
--- a/source/_integrations/mullvad.markdown
+++ b/source/_integrations/mullvad.markdown
@@ -10,6 +10,8 @@ ha_domain: mullvad
 ha_config_flow: true
 ha_codeowners:
   - '@meichthys'
+ha_platforms:
+  - binary_sensor
 ---
 
 The Mullvad VPN integration pulls [Mullvad](https://mullvad.net/) VPN status information into Home Assistant.
diff --git a/source/_integrations/my.markdown b/source/_integrations/my.markdown
index 32cbe8ac529..b9be6492f03 100644
--- a/source/_integrations/my.markdown
+++ b/source/_integrations/my.markdown
@@ -6,6 +6,8 @@ ha_category:
 ha_release: 2021.3
 ha_domain: my
 ha_iot_class:
+ha_codeowners:
+  - '@home-assistant/core'
 ---
 
 This integration handles redirects from the [My Home Assistant](https://my.home-assistant.io) service.
diff --git a/source/_integrations/mysensors.markdown b/source/_integrations/mysensors.markdown
index 7509ca946f0..593bc3a79ff 100644
--- a/source/_integrations/mysensors.markdown
+++ b/source/_integrations/mysensors.markdown
@@ -18,6 +18,7 @@ ha_platforms:
   - notify
   - sensor
   - switch
+ha_config_flow: true
 ---
 
 The [MySensors](https://www.mysensors.org) project combines devices like Arduino, ESP8266, Raspberry Pi, NRF24L01+ and RFM69 to build affordable sensor networks. This integration will automatically add all available devices to Home Assistant, after [presentation](#presentation) is done. That is, you do not need to add anything to your configuration for the devices for them to be added. Go to the **states** section of the developer tools to find the devices that have been identified.
diff --git a/source/_integrations/nuki.markdown b/source/_integrations/nuki.markdown
index 08faf670e8a..067ce8e359a 100644
--- a/source/_integrations/nuki.markdown
+++ b/source/_integrations/nuki.markdown
@@ -12,6 +12,8 @@ ha_codeowners:
 ha_domain: nuki
 ha_platforms:
   - lock
+ha_config_flow: true
+ha_dhcp: true
 ---
 
 The `nuki` platform allows you to control [Nuki Smart Locks](https://nuki.io/en/smart-lock/) via either a [software bridge](https://play.google.com/store/apps/details?id=io.nuki.bridge) or a [physical bridge](https://nuki.io/en/bridge/).
diff --git a/source/_integrations/plaato.markdown b/source/_integrations/plaato.markdown
index ea4e29c410e..8dcdee42423 100644
--- a/source/_integrations/plaato.markdown
+++ b/source/_integrations/plaato.markdown
@@ -10,6 +10,7 @@ ha_codeowners:
   - '@JohNan'
 ha_domain: plaato
 ha_platforms:
+  - binary_sensor
   - sensor
 ---
 
diff --git a/source/_integrations/rest.markdown b/source/_integrations/rest.markdown
index 94913b6be04..0e399f5d6e4 100644
--- a/source/_integrations/rest.markdown
+++ b/source/_integrations/rest.markdown
@@ -6,9 +6,6 @@ ha_category:
   - Binary Sensor
 ha_release: 0.7.4
 ha_iot_class: Local Polling
-ha_quality_scale: internal
-ha_codeowners:
-  - '@home-assistant/core'
 ha_domain: rest
 ha_platforms:
   - binary_sensor
diff --git a/source/_integrations/rflink.markdown b/source/_integrations/rflink.markdown
index 1d5c9ac99a7..dca87302c03 100644
--- a/source/_integrations/rflink.markdown
+++ b/source/_integrations/rflink.markdown
@@ -12,6 +12,8 @@ ha_platforms:
   - light
   - sensor
   - switch
+ha_codeowners:
+  - '@javicalle'
 ---
 
 The `rflink` integration supports devices that use [RFLink gateway firmware](http://www.rflink.nl/blog2/download), for example, the [Nodo RFLink Gateway](https://www.nodo-shop.nl/nl/21-rflink-gateway). RFLink Gateway is an Arduino Mega firmware that allows two-way communication with a multitude of RF wireless devices using cheap hardware (Arduino + transceiver).
diff --git a/source/_integrations/rituals_perfume_genie.markdown b/source/_integrations/rituals_perfume_genie.markdown
index 83eda80ce3a..3498cb20903 100644
--- a/source/_integrations/rituals_perfume_genie.markdown
+++ b/source/_integrations/rituals_perfume_genie.markdown
@@ -9,6 +9,8 @@ ha_category:
 ha_codeowners:
   - '@milanmeu'
 ha_domain: rituals_perfume_genie
+ha_platforms:
+  - switch
 ---
 
 The Rituals Perfume Genie integration allows you to control and monitor your Rituals perfume diffusers connected to your Rituals account. The integration is compatible with the first and second `2.0` versions.
diff --git a/source/_integrations/smarthab.markdown b/source/_integrations/smarthab.markdown
index 18ab895bfba..a915b374f31 100644
--- a/source/_integrations/smarthab.markdown
+++ b/source/_integrations/smarthab.markdown
@@ -29,4 +29,3 @@ Assistant.
   access to your home. You can then configure the integration using this account's
   credentials. This is also more secure, as this user should be less priviledged.
 </div>
-
diff --git a/source/_integrations/smarttub.markdown b/source/_integrations/smarttub.markdown
index 685b833b010..0d2eae3e57e 100644
--- a/source/_integrations/smarttub.markdown
+++ b/source/_integrations/smarttub.markdown
@@ -14,6 +14,12 @@ ha_quality_scale: platinum
 ha_codeowners:
   - '@mdz'
 ha_domain: smarttub
+ha_platforms:
+  - binary_sensor
+  - climate
+  - light
+  - sensor
+  - switch
 ---
 
 The `smarttub` integration allows you to view and control hot tubs which use the [SmartTub](https://www.jacuzzi.com/en-us/hot-tubs/owners/smarttub-system) system, in Home Assistant.
diff --git a/source/_integrations/subaru.markdown b/source/_integrations/subaru.markdown
index 12c22813969..d7ca78bbc09 100644
--- a/source/_integrations/subaru.markdown
+++ b/source/_integrations/subaru.markdown
@@ -1,5 +1,5 @@
 ---
-title: Subaru 
+title: Subaru
 description: Instructions on how to setup your Subaru account with Home Assistant.
 ha_category:
   - Car
@@ -10,6 +10,8 @@ ha_config_flow: true
 ha_codeowners:
   - '@G-Two'
 ha_domain: subaru
+ha_platforms:
+  - sensor
 ---
 
 The Subaru integration retrieves information provided by Subaru connected vehicle services.  Before using this integration, you must first register and have login credentials to [MySubaru](https://www.mysubaru.com).
diff --git a/source/_integrations/tado.markdown b/source/_integrations/tado.markdown
index a66130aea6d..6018b729ee4 100644
--- a/source/_integrations/tado.markdown
+++ b/source/_integrations/tado.markdown
@@ -13,6 +13,7 @@ ha_iot_class: Cloud Polling
 ha_codeowners:
   - '@michaelarnauts'
   - '@bdraco'
+  - '@noltari'
 ha_domain: tado
 ha_config_flow: true
 ha_homekit: true
diff --git a/source/_integrations/template.markdown b/source/_integrations/template.markdown
index f3886fd9574..62337f62370 100644
--- a/source/_integrations/template.markdown
+++ b/source/_integrations/template.markdown
@@ -20,6 +20,7 @@ ha_platforms:
   - sensor
   - switch
   - vacuum
+  - weather
 ---
 
 The `template` platform supports sensors which get their values from other entities.
diff --git a/source/_integrations/totalconnect.markdown b/source/_integrations/totalconnect.markdown
index 216ad3399fc..c5396d8b9c3 100644
--- a/source/_integrations/totalconnect.markdown
+++ b/source/_integrations/totalconnect.markdown
@@ -1,5 +1,5 @@
 ---
-title: Honeywell Total Connect Alarm
+title: Total Connect
 description: Instructions on how to integrate TotalConnect alarms into Home Assistant.
 ha_category:
   - Alarm
diff --git a/source/_integrations/tradfri.markdown b/source/_integrations/tradfri.markdown
index 5968875ec29..70784b52a89 100644
--- a/source/_integrations/tradfri.markdown
+++ b/source/_integrations/tradfri.markdown
@@ -10,8 +10,6 @@ ha_category:
   - Light
   - Sensor
   - Switch
-ha_codeowners:
-  - '@ggravlingen'
 ha_domain: tradfri
 ha_homekit: true
 ha_platforms:
diff --git a/source/_integrations/ubus.markdown b/source/_integrations/ubus.markdown
index 9972649c944..98d47915cb5 100644
--- a/source/_integrations/ubus.markdown
+++ b/source/_integrations/ubus.markdown
@@ -8,6 +8,8 @@ ha_iot_class: Local Polling
 ha_domain: ubus
 ha_platforms:
   - device_tracker
+ha_codeowners:
+  - '@noltari'
 ---
 
 This is a presence detection scanner for [OpenWrt](https://openwrt.org/) using [ubus](https://wiki.openwrt.org/doc/techref/ubus). It scans for changes in `hostapd.*`, which will detect and report changes in devices connected to the access point on the router.
diff --git a/source/_integrations/vesync.markdown b/source/_integrations/vesync.markdown
index b2552ab5153..b44b1ad43a0 100644
--- a/source/_integrations/vesync.markdown
+++ b/source/_integrations/vesync.markdown
@@ -15,8 +15,8 @@ ha_codeowners:
 ha_domain: vesync
 ha_platforms:
   - fan
-  - switch
   - light
+  - switch
 ---
 
 The `vesync` integration enables you to control smart switches and outlets connected to the VeSync App.
diff --git a/source/_integrations/vlc_telnet.markdown b/source/_integrations/vlc_telnet.markdown
index afbac7c32b8..c7844a4f37f 100644
--- a/source/_integrations/vlc_telnet.markdown
+++ b/source/_integrations/vlc_telnet.markdown
@@ -7,6 +7,7 @@ ha_release: 0.95
 ha_iot_class: Local Polling
 ha_codeowners:
   - '@rodripf'
+  - '@dmcc'
 ha_domain: vlc_telnet
 ---
 
diff --git a/source/_integrations/wemo.markdown b/source/_integrations/wemo.markdown
index b270d6e8c93..62c398da3de 100644
--- a/source/_integrations/wemo.markdown
+++ b/source/_integrations/wemo.markdown
@@ -18,6 +18,8 @@ ha_platforms:
   - fan
   - light
   - switch
+ha_codeowners:
+  - '@esev'
 ---
 
 The `wemo` integration is the main integration to integrate various [Belkin WeMo](https://www.belkin.com/us/c/wemo/) devices with Home Assistant.
diff --git a/source/_integrations/wilight.markdown b/source/_integrations/wilight.markdown
index 489cf160c6e..51713dde78a 100644
--- a/source/_integrations/wilight.markdown
+++ b/source/_integrations/wilight.markdown
@@ -14,6 +14,7 @@ ha_domain: wilight
 ha_quality_scale: silver
 ha_ssdp: true
 ha_platforms:
+  - cover
   - fan
   - light
 ---