diff --git a/CODEOWNERS b/CODEOWNERS
index 6ff2eb9edcc..07590e06753 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -15,6 +15,7 @@ source/_integrations/adguard.markdown @frenck
 source/_integrations/advantage_air.markdown @Bre77
 source/_integrations/agent_dvr.markdown @ispysoftware
 source/_integrations/airly.markdown @bieniu
+source/_integrations/airnow.markdown @asymworks
 source/_integrations/airvisual.markdown @bachya
 source/_integrations/alarmdecoder.markdown @ajschmidt8
 source/_integrations/alexa.markdown @home-assistant/cloud @ochlocracy
@@ -45,7 +46,6 @@ source/_integrations/auth.markdown @home-assistant/core
 source/_integrations/automation.markdown @home-assistant/core
 source/_integrations/avea.markdown @pattyland
 source/_integrations/awair.markdown @ahayworth @danielsjf
-source/_integrations/aws.markdown @awarecan
 source/_integrations/axis.markdown @Kane610
 source/_integrations/azure_devops.markdown @timmo001
 source/_integrations/azure_event_hub.markdown @eavanvalkenburg
@@ -97,6 +97,7 @@ source/_integrations/derivative.markdown @afaucogney
 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/digital_ocean.markdown @fabaff
 source/_integrations/directv.markdown @ctalkington
 source/_integrations/discogs.markdown @thibmaek
@@ -108,6 +109,7 @@ source/_integrations/dwd_weather_warnings.markdown @runningman84 @stephan192 @Hu
 source/_integrations/dweet.markdown @fabaff
 source/_integrations/dynalite.markdown @ziv1234
 source/_integrations/ecobee.markdown @marthoc
+source/_integrations/econet.markdown @vangorra @w1ll1am23
 source/_integrations/ecovacs.markdown @OverloadUT
 source/_integrations/edl21.markdown @mtdcr
 source/_integrations/egardia.markdown @jeroenterheerdt
@@ -168,7 +170,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/harmony.markdown @ehendrix23 @bramkragten @bdraco
+source/_integrations/harmony.markdown @ehendrix23 @bramkragten @bdraco @mkeesey
 source/_integrations/hdmi_cec.markdown @newAM
 source/_integrations/heatmiser.markdown @andylockran
 source/_integrations/heos.markdown @andrewsayre
@@ -189,6 +191,7 @@ source/_integrations/http.markdown @home-assistant/core
 source/_integrations/huawei_lte.markdown @scop @fphammerle
 source/_integrations/huawei_router.markdown @abmantis
 source/_integrations/hue.markdown @balloob @frenck
+source/_integrations/huisbaasje.markdown @denniss17
 source/_integrations/humidifier.markdown @home-assistant/core @Shulyaka
 source/_integrations/hunterdouglas_powerview.markdown @bdraco
 source/_integrations/hvv_departures.markdown @vigonotion
@@ -241,7 +244,7 @@ source/_integrations/luci.markdown @mzdrale
 source/_integrations/luftdaten.markdown @fabaff
 source/_integrations/lupusec.markdown @majuss
 source/_integrations/lutron.markdown @JonGilmore
-source/_integrations/lutron_caseta.markdown @swails
+source/_integrations/lutron_caseta.markdown @swails @bdraco
 source/_integrations/mastodon.markdown @fabaff
 source/_integrations/matrix.markdown @tinloaf
 source/_integrations/mcp23017.markdown @jardiamj
@@ -274,10 +277,10 @@ source/_integrations/neato.markdown @dshokouhi @Santobert
 source/_integrations/nederlandse_spoorwegen.markdown @YarmoM
 source/_integrations/nello.markdown @pschmitt
 source/_integrations/ness_alarm.markdown @nickw444
-source/_integrations/nest.markdown @awarecan @allenporter
+source/_integrations/nest.markdown @allenporter
 source/_integrations/netatmo.markdown @cgtobi
 source/_integrations/netdata.markdown @fabaff
-source/_integrations/nexia.markdown @ryannazaretian @bdraco
+source/_integrations/nexia.markdown @bdraco
 source/_integrations/nextbus.markdown @vividboarder
 source/_integrations/nextcloud.markdown @meichthys
 source/_integrations/nightscout.markdown @marciogranzotto
@@ -303,6 +306,7 @@ source/_integrations/ohmconnect.markdown @robbiet480
 source/_integrations/ombi.markdown @larssont
 source/_integrations/omnilogic.markdown @oliver84 @djtimca @gentoosu
 source/_integrations/onboarding.markdown @home-assistant/core
+source/_integrations/ondilo_ico.markdown @JeromeHXP
 source/_integrations/onewire.markdown @garbled1 @epenet
 source/_integrations/onvif.markdown @hunterjm
 source/_integrations/openerz.markdown @misialq
@@ -336,7 +340,6 @@ source/_integrations/progettihwsw.markdown @ardaseremet
 source/_integrations/prometheus.markdown @knyar
 source/_integrations/proxmoxve.markdown @k4ds3 @jhollowe
 source/_integrations/ps4.markdown @ktnrg45
-source/_integrations/ptvsd.markdown @swamp-ig
 source/_integrations/push.markdown @dgomes
 source/_integrations/pvoutput.markdown @fabaff
 source/_integrations/pvpc_hourly_pricing.markdown @azogue
@@ -347,6 +350,7 @@ source/_integrations/quantum_gateway.markdown @cisasteelersfan
 source/_integrations/qvr_pro.markdown @oblogic7
 source/_integrations/qwikswitch.markdown @kellerza
 source/_integrations/rachio.markdown @bdraco
+source/_integrations/radiotherm.markdown @vinnyfuria
 source/_integrations/rainbird.markdown @konikvranik
 source/_integrations/raincloud.markdown @vanstinator
 source/_integrations/rainforest_eagle.markdown @gtdiehl @jcalbert
@@ -381,7 +385,7 @@ source/_integrations/seven_segments.markdown @fabaff
 source/_integrations/seventeentrack.markdown @bachya
 source/_integrations/sharkiq.markdown @ajmarks
 source/_integrations/shell_command.markdown @home-assistant/core
-source/_integrations/shelly.markdown @balloob @bieniu @thecode
+source/_integrations/shelly.markdown @balloob @bieniu @thecode @chemelli74
 source/_integrations/shiftr.markdown @fabaff
 source/_integrations/shodan.markdown @fabaff
 source/_integrations/sighthound.markdown @robmarkcole
@@ -405,6 +409,7 @@ source/_integrations/solarlog.markdown @Ernst79
 source/_integrations/solax.markdown @squishykid
 source/_integrations/soma.markdown @ratsept
 source/_integrations/somfy.markdown @tetienne
+source/_integrations/somfy_mylink.markdown @bdraco
 source/_integrations/sonarr.markdown @ctalkington
 source/_integrations/songpal.markdown @rytilahti @shenxn
 source/_integrations/sonos.markdown @cgtobi
@@ -519,3 +524,4 @@ source/_integrations/zodiac.markdown @JulienTant
 source/_integrations/zone.markdown @home-assistant/core
 source/_integrations/zoneminder.markdown @rohankapoorcom
 source/_integrations/zwave.markdown @home-assistant/z-wave
+source/_integrations/zwave_js.markdown @home-assistant/z-wave
diff --git a/source/_integrations/aws.markdown b/source/_integrations/aws.markdown
index f640b0c9211..90008c4e915 100644
--- a/source/_integrations/aws.markdown
+++ b/source/_integrations/aws.markdown
@@ -5,8 +5,6 @@ ha_category:
   - Notifications
 ha_iot_class: Cloud Push
 ha_release: '0.91'
-ha_codeowners:
-  - '@awarecan'
 ha_domain: aws
 ---
 
diff --git a/source/_integrations/axis.markdown b/source/_integrations/axis.markdown
index 3299a7d7ec6..7aab10383cc 100644
--- a/source/_integrations/axis.markdown
+++ b/source/_integrations/axis.markdown
@@ -13,6 +13,7 @@ ha_codeowners:
   - '@Kane610'
 ha_domain: axis
 ha_qa_scale: platinum
+ha_quality_scale: platinum
 ---
 
 [Axis Communications](https://www.axis.com/) devices are surveillance cameras, speakers, access control and other security-related network connected hardware. Event API works with firmware 5.50 and newer.
diff --git a/source/_integrations/blueprint.markdown b/source/_integrations/blueprint.markdown
index a895a5d25b7..2f0dc00cce9 100644
--- a/source/_integrations/blueprint.markdown
+++ b/source/_integrations/blueprint.markdown
@@ -1,5 +1,5 @@
 ---
-title: Blueprints
+title: Blueprint
 description: Instructions on how to use Automation Blueprints with Home Assistant.
 ha_category:
   - Automation
diff --git a/source/_integrations/dhcp.markdown b/source/_integrations/dhcp.markdown
index 87230d9e991..e3dd783a549 100644
--- a/source/_integrations/dhcp.markdown
+++ b/source/_integrations/dhcp.markdown
@@ -3,10 +3,11 @@ title: DHCP Discovery
 description: Discover integrations on the network using DHCP protocol.
 ha_category:
   - Network
-ha_quality_scale: internal
 ha_iot_class: Local Push
 ha_release: 2021.2
 ha_domain: dhcp
+ha_codeowners:
+  - '@bdraco'
 ---
 
 The `dhcp` "DHCP Discovery" integration will watch the network for DHCP requests for supported devices and services. Discovered integrations will show up in the discovered section on the integrations page in the configuration panel.
diff --git a/source/_integrations/econet.markdown b/source/_integrations/econet.markdown
index 9e234436238..0748fad3942 100644
--- a/source/_integrations/econet.markdown
+++ b/source/_integrations/econet.markdown
@@ -1,5 +1,5 @@
 ---
-title: Rheem EcoNET Water Products
+title: Rheem EcoNet Products
 description: Instructions on how to integrate Rheem EcoNet water heaters into Home Assistant.
 ha_category:
   - Water Heater
@@ -7,8 +7,8 @@ ha_release: 0.61
 ha_iot_class: Cloud Push
 ha_domain: econet
 ha_codeowners:
-  - '@w1ll1am23'
   - '@vangorra'
+  - '@w1ll1am23'
 ha_config_flow: true
 ---
 
diff --git a/source/_integrations/flux_led.markdown b/source/_integrations/flux_led.markdown
index d36690aab74..1d23964e219 100644
--- a/source/_integrations/flux_led.markdown
+++ b/source/_integrations/flux_led.markdown
@@ -1,5 +1,5 @@
 ---
-title: Flux LED/MagicHome/MagicLight
+title: Flux LED/MagicLight
 description: Instructions on how to setup Flux led/MagicHome/MagicLight within Home Assistant.
 ha_category:
   - Light
diff --git a/source/_integrations/foscam.markdown b/source/_integrations/foscam.markdown
index 08e200b0879..465b1d339d5 100644
--- a/source/_integrations/foscam.markdown
+++ b/source/_integrations/foscam.markdown
@@ -8,6 +8,7 @@ ha_release: 0.7.3
 ha_codeowners:
   - '@skgsergio'
 ha_domain: foscam
+ha_config_flow: true
 ---
 
 The `foscam` platform allows you to watch the live stream of your [Foscam](https://www.foscam.com) IP camera in Home Assistant.
diff --git a/source/_integrations/fritzbox_callmonitor.markdown b/source/_integrations/fritzbox_callmonitor.markdown
index a4303d50556..2df19c1dcad 100644
--- a/source/_integrations/fritzbox_callmonitor.markdown
+++ b/source/_integrations/fritzbox_callmonitor.markdown
@@ -6,6 +6,7 @@ ha_category:
 ha_release: 0.27
 ha_iot_class: Local Polling
 ha_domain: fritzbox_callmonitor
+ha_config_flow: true
 ---
 
 The `fritzbox_callmonitor` sensor monitors the call monitor exposed by [AVM FRITZ!Box](https://avm.de/produkte/fritzbox/) routers on TCP port 1012. It will assume the values `idle`, `ringing`, `dialing` or `talking` with the phone numbers involved contained in the state attributes.
diff --git a/source/_integrations/harmony.markdown b/source/_integrations/harmony.markdown
index df5c4a2ea45..4447a492cad 100644
--- a/source/_integrations/harmony.markdown
+++ b/source/_integrations/harmony.markdown
@@ -10,6 +10,7 @@ ha_codeowners:
   - '@ehendrix23'
   - '@bramkragten'
   - '@bdraco'
+  - '@mkeesey'
 ha_domain: harmony
 ---
 
diff --git a/source/_integrations/lutron_caseta.markdown b/source/_integrations/lutron_caseta.markdown
index ac6a4f24284..3b5e058c46f 100644
--- a/source/_integrations/lutron_caseta.markdown
+++ b/source/_integrations/lutron_caseta.markdown
@@ -16,6 +16,7 @@ ha_domain: lutron_caseta
 ha_config_flow: true
 ha_codeowners:
   - '@swails'
+  - '@bdraco'
 ---
 
 [Lutron](http://www.lutron.com/) is an American lighting control company. They have several lines of home automation devices that manage light switches, dimmers, occupancy sensors, HVAC controls, etc. The `lutron_caseta` integration in Home Assistant is responsible for communicating with the Lutron Caseta Smart Bridge for the [Caseta](https://www.casetawireless.com/) product line of dimmers, switches, shades, and sensors. It will also communicate with the Lutron Radio RA2 Main Repeater for the [RA2 Select](http://www.lutron.com/en-US/Products/Pages/WholeHomeSystems/RA2Select/Overview.aspx) product line of dimmers, switches, shades, and sensors.
diff --git a/source/_integrations/nest.markdown b/source/_integrations/nest.markdown
index 3857525a5c1..232a222804b 100644
--- a/source/_integrations/nest.markdown
+++ b/source/_integrations/nest.markdown
@@ -12,9 +12,9 @@ ha_iot_class: Cloud Push
 ha_release: 0.7
 ha_config_flow: true
 ha_codeowners:
-  - '@awarecan'
   - '@allenporter'
 ha_domain: nest
+ha_quality_scale: platinum
 ---
 
 The `nest` integration allows you to integrate your [Google Nest](https://store.google.com/us/category/connected_home?) devices in Home Assistant. This integration uses the [Smart Device Management](https://developers.google.com/nest/device-access/api) API and Google's Cloud Pubsub to efficiently listen for changes in device state or other events.
diff --git a/source/_integrations/nexia.markdown b/source/_integrations/nexia.markdown
index d13024b510f..a3de24aa1c3 100644
--- a/source/_integrations/nexia.markdown
+++ b/source/_integrations/nexia.markdown
@@ -10,7 +10,6 @@ ha_release: 0.108
 ha_iot_class: Cloud Polling
 ha_config_flow: true
 ha_codeowners:
-  - '@ryannazaretian'
   - '@bdraco'
 ha_domain: nexia
 ---
diff --git a/source/_integrations/radiotherm.markdown b/source/_integrations/radiotherm.markdown
index c1421d5fb02..b8493c24ed5 100644
--- a/source/_integrations/radiotherm.markdown
+++ b/source/_integrations/radiotherm.markdown
@@ -6,6 +6,8 @@ ha_category:
 ha_iot_class: Local Polling
 ha_release: 0.7.6
 ha_domain: radiotherm
+ha_codeowners:
+  - '@vinnyfuria'
 ---
 
 The `radiotherm` climate platform let you control a thermostat from [Radio Thermostat](https://www.radiothermostat.com/) or [3M Filtrete](https://www.filtrete.com/). Your thermostat must have the Wi-Fi module installed and connected to your network.
diff --git a/source/_integrations/roomba.markdown b/source/_integrations/roomba.markdown
index 64d2f2d84c4..f2565e15d92 100644
--- a/source/_integrations/roomba.markdown
+++ b/source/_integrations/roomba.markdown
@@ -1,5 +1,5 @@
 ---
-title: iRobot Roomba
+title: iRobot Roomba and Braava
 description: Instructions on how to integrate your Wi-Fi enabled Roomba and Braava within Home Assistant.
 ha_category:
   - Vacuum
diff --git a/source/_integrations/shelly.markdown b/source/_integrations/shelly.markdown
index 5ef0dfd1897..dcee914fc95 100644
--- a/source/_integrations/shelly.markdown
+++ b/source/_integrations/shelly.markdown
@@ -12,6 +12,7 @@ ha_codeowners:
   - '@balloob'
   - '@bieniu'
   - '@thecode'
+  - '@chemelli74'
 ha_iot_class: Local Push
 ha_domain: shelly
 featured: true
@@ -109,4 +110,3 @@ Not all devices support all input events. You can check on [Shelly API Reference
 
 - Only supports firmware 1.8 and later
 - Support for battery-powered devices is limited (also applies to USB powered Shelly H&T)
-
diff --git a/source/_integrations/zwave.markdown b/source/_integrations/zwave.markdown
index ab7e07ed8d1..9129079c2f3 100644
--- a/source/_integrations/zwave.markdown
+++ b/source/_integrations/zwave.markdown
@@ -1,5 +1,5 @@
 ---
-title: Z-Wave
+title: Z-Wave (deprecated)
 description: Instructions on how to integrate your existing Z-Wave within Home Assistant.
 ha_category:
   - Hub