diff --git a/CODEOWNERS b/CODEOWNERS
index c03eef60b5d..9a873a30c62 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -13,11 +13,13 @@ source/_integrations/adguard.markdown @frenck
 source/_integrations/airly.markdown @bieniu
 source/_integrations/airvisual.markdown @bachya
 source/_integrations/alexa.markdown @home-assistant/cloud @ochlocracy
+source/_integrations/alexa.smart_home.markdown @home-assistant/cloud @ochlocracy
 source/_integrations/almond.markdown @gcampax @balloob
 source/_integrations/alpha_vantage.markdown @fabaff
 source/_integrations/amazon_polly.markdown @robbiet480
 source/_integrations/ambiclimate.markdown @danielhiversen
 source/_integrations/ambient_station.markdown @bachya
+source/_integrations/amcrest.markdown @pnbruckner
 source/_integrations/androidtv.markdown @JeffLIrion
 source/_integrations/apache_kafka.markdown @bachya
 source/_integrations/api.markdown @home-assistant/core
@@ -54,7 +56,6 @@ source/_integrations/cert_expiry.markdown @Cereal2nd @jjlawren
 source/_integrations/cisco_ios.markdown @fbradyirl
 source/_integrations/cisco_mobility_express.markdown @fbradyirl
 source/_integrations/cisco_webex_teams.markdown @fbradyirl
-source/_integrations/ciscospark.markdown @fbradyirl
 source/_integrations/cloud.markdown @home-assistant/cloud
 source/_integrations/cloudflare.markdown @ludeeus
 source/_integrations/comfoconnect.markdown @michaelarnauts
@@ -71,12 +72,14 @@ source/_integrations/darksky.markdown @fabaff
 source/_integrations/deconz.markdown @kane610
 source/_integrations/delijn.markdown @bollewolle
 source/_integrations/demo.markdown @home-assistant/core
+source/_integrations/derivative.markdown @afaucogney
 source/_integrations/device_automation.markdown @home-assistant/core
 source/_integrations/digital_ocean.markdown @fabaff
 source/_integrations/discogs.markdown @thibmaek
 source/_integrations/doorbird.markdown @oblogic7
 source/_integrations/dsmr_reader.markdown @depl0y
 source/_integrations/dweet.markdown @fabaff
+source/_integrations/dyson.markdown @etheralm
 source/_integrations/ecobee.markdown @marthoc
 source/_integrations/ecovacs.markdown @OverloadUT
 source/_integrations/egardia.markdown @jeroenterheerdt
@@ -84,7 +87,6 @@ source/_integrations/eight_sleep.markdown @mezz64
 source/_integrations/elgato.markdown @frenck
 source/_integrations/elv.markdown @majuss
 source/_integrations/emby.markdown @mezz64
-source/_integrations/emulated_hue.markdown @NobleKangaroo
 source/_integrations/enigma2.markdown @fbradyirl
 source/_integrations/enocean.markdown @bdurrer
 source/_integrations/entur_public_transport.markdown @hfurubotten
@@ -110,6 +112,7 @@ source/_integrations/foursquare.markdown @robbiet480
 source/_integrations/freebox.markdown @snoof85
 source/_integrations/fronius.markdown @nielstron
 source/_integrations/frontend.markdown @home-assistant/frontend
+source/_integrations/garmin_connect.markdown @cyberjunky
 source/_integrations/gearbest.markdown @HerrHofrat
 source/_integrations/geniushub.markdown @zxdavb
 source/_integrations/geo_rss_events.markdown @exxamalte
@@ -124,6 +127,7 @@ source/_integrations/google_cloud.markdown @lufton
 source/_integrations/google_translate.markdown @awarecan
 source/_integrations/google_travel_time.markdown @robbiet480
 source/_integrations/gpsd.markdown @fabaff
+source/_integrations/greeneye_monitor.markdown @jkeljo
 source/_integrations/group.markdown @home-assistant/core
 source/_integrations/growatt_server.markdown @indykoning
 source/_integrations/gtfs.markdown @robbiet480
@@ -161,7 +165,7 @@ source/_integrations/integration.markdown @dgomes
 source/_integrations/intesishome.markdown @jnimmo
 source/_integrations/ios.markdown @robbiet480
 source/_integrations/iperf3.markdown @rohankapoorcom
-source/_integrations/ipma.markdown @dgomes
+source/_integrations/ipma.markdown @dgomes @abmantis
 source/_integrations/iqvia.markdown @bachya
 source/_integrations/irish_rail_transport.markdown @ttroy50
 source/_integrations/izone.markdown @Swamp-Ig
@@ -198,6 +202,7 @@ source/_integrations/met.markdown @danielhiversen
 source/_integrations/meteo_france.markdown @victorcerutti @oncleben31
 source/_integrations/meteoalarm.markdown @rolfberkenbosch
 source/_integrations/miflora.markdown @danielhiversen @ChristianKuehnel
+source/_integrations/mikrotik.markdown @engrbm87
 source/_integrations/mill.markdown @danielhiversen
 source/_integrations/min_max.markdown @fabaff
 source/_integrations/minio.markdown @tkislan
@@ -211,9 +216,11 @@ source/_integrations/msteams.markdown @peroyvind
 source/_integrations/mysensors.markdown @MartinHjelmare
 source/_integrations/mystrom.markdown @fabaff
 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
+source/_integrations/netatmo.markdown @cgtobi
 source/_integrations/netdata.markdown @fabaff
 source/_integrations/nextbus.markdown @vividboarder
 source/_integrations/nilu.markdown @hfurubotten
@@ -268,11 +275,13 @@ source/_integrations/rfxtrx.markdown @danielhiversen
 source/_integrations/ring.markdown @balloob
 source/_integrations/rmvtransport.markdown @cgtobi
 source/_integrations/roomba.markdown @pschmitt
+source/_integrations/safe_mode.markdown @home-assistant/core
 source/_integrations/saj.markdown @fredericvl
 source/_integrations/samsungtv.markdown @escoand
 source/_integrations/scene.markdown @home-assistant/core
 source/_integrations/scrape.markdown @fabaff
 source/_integrations/script.markdown @home-assistant/core
+source/_integrations/search.markdown @home-assistant/core
 source/_integrations/sense.markdown @kbickar
 source/_integrations/sensibo.markdown @andrey-git
 source/_integrations/sentry.markdown @dcramer
@@ -281,14 +290,17 @@ source/_integrations/seventeentrack.markdown @bachya
 source/_integrations/shell_command.markdown @home-assistant/core
 source/_integrations/shiftr.markdown @fabaff
 source/_integrations/shodan.markdown @fabaff
+source/_integrations/sighthound.markdown @robmarkcole
 source/_integrations/signal_messenger.markdown @bbernhard
 source/_integrations/simplisafe.markdown @bachya
 source/_integrations/sinch.markdown @bendikrb
+source/_integrations/sisyphus.markdown @jkeljo
 source/_integrations/slide.markdown @ualex73
 source/_integrations/sma.markdown @kellerza
 source/_integrations/smarthab.markdown @outadoc
 source/_integrations/smartthings.markdown @andrewsayre
 source/_integrations/smarty.markdown @z0mbieprocess
+source/_integrations/sms.markdown @ocalvo
 source/_integrations/smtp.markdown @fabaff
 source/_integrations/solaredge_local.markdown @drobtravels @scheric
 source/_integrations/solarlog.markdown @Ernst79
@@ -299,6 +311,7 @@ source/_integrations/songpal.markdown @rytilahti
 source/_integrations/spaceapi.markdown @fabaff
 source/_integrations/speedtestdotnet.markdown @rohankapoorcom
 source/_integrations/spider.markdown @peternijssen
+source/_integrations/spotify.markdown @frenck
 source/_integrations/sql.markdown @dgomes
 source/_integrations/starline.markdown @anonym-tsk
 source/_integrations/statistics.markdown @fabaff
@@ -342,6 +355,7 @@ source/_integrations/tts.markdown @robbiet480
 source/_integrations/twentemilieu.markdown @frenck
 source/_integrations/twilio_call.markdown @robbiet480
 source/_integrations/twilio_sms.markdown @robbiet480
+source/_integrations/ubee.markdown @mzdrale
 source/_integrations/unifi.markdown @kane610
 source/_integrations/unifiled.markdown @florisvdk
 source/_integrations/upc_connect.markdown @pvizeli
@@ -351,7 +365,7 @@ source/_integrations/upnp.markdown @robbiet480
 source/_integrations/uptimerobot.markdown @ludeeus
 source/_integrations/usgs_earthquakes_feed.markdown @exxamalte
 source/_integrations/utility_meter.markdown @dgomes
-source/_integrations/velbus.markdown @cereal2nd
+source/_integrations/velbus.markdown @Cereal2nd @brefra
 source/_integrations/velux.markdown @Julius2342
 source/_integrations/versasense.markdown @flamm3blemuff1n
 source/_integrations/version.markdown @fabaff
diff --git a/source/_integrations/amcrest.markdown b/source/_integrations/amcrest.markdown
index 7abee8ceb65..916d1d4ab20 100644
--- a/source/_integrations/amcrest.markdown
+++ b/source/_integrations/amcrest.markdown
@@ -9,6 +9,8 @@ ha_category:
   - Sensor
 ha_iot_class: Local Polling
 ha_release: 0.49
+ha_codeowners:
+  - '@pnbruckner'
 ---
 
 The `amcrest` camera platform allows you to integrate your [Amcrest](https://amcrest.com/) IP camera in Home Assistant.
diff --git a/source/_integrations/derivative.markdown b/source/_integrations/derivative.markdown
index c8a872fd17d..ab6b78ada2f 100644
--- a/source/_integrations/derivative.markdown
+++ b/source/_integrations/derivative.markdown
@@ -1,6 +1,6 @@
 ---
-title: "Derivative Sensor"
-description: "Instructions on how to integrate Derivative Sensor into Home Assistant."
+title: Derivative
+description: Instructions on how to integrate Derivative Sensor into Home Assistant.
 ha_category:
   - Utility
   - Energy
@@ -8,6 +8,8 @@ ha_release: 0.105
 ha_iot_class: Local Push
 logo: derivative.png
 ha_qa_scale: internal
+ha_codeowners:
+  - '@afaucogney'
 ---
 
 The `derivative` platform creates a sensor that estimates the derivative of the values provided by a source sensor.
diff --git a/source/_integrations/dyson.markdown b/source/_integrations/dyson.markdown
index 0a55078005c..8aacc824fef 100644
--- a/source/_integrations/dyson.markdown
+++ b/source/_integrations/dyson.markdown
@@ -10,6 +10,8 @@ ha_category:
   - Vacuum
 ha_iot_class: Cloud Polling
 ha_release: 0.47
+ha_codeowners:
+  - '@etheralm'
 ---
 
 The `dyson` integration is the main integration to integrate all [Dyson](https://www.dyson.com) related platforms.
diff --git a/source/_integrations/emulated_hue.markdown b/source/_integrations/emulated_hue.markdown
index 9ec775d83dd..9f8635f9942 100644
--- a/source/_integrations/emulated_hue.markdown
+++ b/source/_integrations/emulated_hue.markdown
@@ -7,8 +7,6 @@ ha_category:
 ha_release: 0.27
 ha_iot_class: Local Push
 ha_quality_scale: internal
-ha_codeowners:
-  - '@NobleKangaroo'
 ---
 
 <div class='note warning'>
diff --git a/source/_integrations/evohome.markdown b/source/_integrations/evohome.markdown
index a742a55c30a..a1737e2f35e 100644
--- a/source/_integrations/evohome.markdown
+++ b/source/_integrations/evohome.markdown
@@ -6,7 +6,7 @@ ha_category:
   - Hub
   - Climate
   - Water Heater
-ha_release: 0.80
+ha_release: "0.80"
 ha_iot_class: Cloud Polling
 ha_codeowners:
   - '@zxdavb'
diff --git a/source/_integrations/garmin_connect.markdown b/source/_integrations/garmin_connect.markdown
index 506684efe37..4aa29b62003 100644
--- a/source/_integrations/garmin_connect.markdown
+++ b/source/_integrations/garmin_connect.markdown
@@ -8,6 +8,7 @@ ha_iot_class: Cloud Polling
 ha_release: 0.105
 ha_codeowners:
   - '@cyberjunky'
+ha_config_flow: true
 ---
 
 The Garmin Connect sensor allows you to expose data from [Garmin Connect](https://connect.garmin.com) to Home Assistant.
@@ -107,4 +108,4 @@ Moderate Intensity
 Vigorous Intensity
 Intensity Goal
 Latest Respiration Update
-```
\ No newline at end of file
+```
diff --git a/source/_integrations/greeneye_monitor.markdown b/source/_integrations/greeneye_monitor.markdown
index 43d26d0af41..52eb8186ff0 100644
--- a/source/_integrations/greeneye_monitor.markdown
+++ b/source/_integrations/greeneye_monitor.markdown
@@ -7,6 +7,8 @@ ha_category:
   - Sensor
 ha_release: 0.82
 ha_iot_class: Local Push
+ha_codeowners:
+  - '@jkeljo'
 ---
 
 The [GreenEye Monitor (GEM)](https://www.brultech.com/greeneye/) integration for Home Assistant allows you to create sensors for the various data channels of the GEM. Each current transformer (CT) channel, pulse counter, and temperature sensor appears in Home Assistant as a sensor, and can be used in automations.
diff --git a/source/_integrations/honeywell.markdown b/source/_integrations/honeywell.markdown
index 39180a40a5b..01f2b0b418d 100644
--- a/source/_integrations/honeywell.markdown
+++ b/source/_integrations/honeywell.markdown
@@ -1,5 +1,5 @@
 ---
-title: Honeywell Total Connect Comfort (TCC)
+title: Honeywell Total Connect Comfort (US)
 description: Instructions on how to integrate Honeywell thermostats within Home Assistant.
 logo: honeywell.png
 ha_category:
diff --git a/source/_integrations/hue.markdown b/source/_integrations/hue.markdown
index 4e4c1e79415..cc49fa9fd6b 100644
--- a/source/_integrations/hue.markdown
+++ b/source/_integrations/hue.markdown
@@ -7,11 +7,11 @@ ha_category:
   - Light
 ha_iot_class: Local Polling
 featured: true
-ha_release: "0.60"
+ha_release: '0.60'
 ha_config_flow: true
 ha_quality_scale: platinum
 ha_codeowners:
-  - "@balloob"
+  - '@balloob'
 ---
 
 Philips Hue support is integrated into Home Assistant as a hub that can drive the light and sensor platforms. The preferred way to set up the Philips Hue platform is by enabling the [discovery component](/integrations/discovery/).
diff --git a/source/_integrations/ipma.markdown b/source/_integrations/ipma.markdown
index d067a858a37..abff031040c 100644
--- a/source/_integrations/ipma.markdown
+++ b/source/_integrations/ipma.markdown
@@ -9,6 +9,7 @@ ha_iot_class: Cloud Polling
 ha_config_flow: true
 ha_codeowners:
   - '@dgomes'
+  - '@abmantis'
 ---
 
 The `ipma` weather platform uses the [Instituto Português do Mar e Atmosfera](https://www.ipma.pt/) as a source for current and forecast meteorological data.
diff --git a/source/_integrations/mikrotik.markdown b/source/_integrations/mikrotik.markdown
index c426a3a87d2..4e8cf1e2067 100644
--- a/source/_integrations/mikrotik.markdown
+++ b/source/_integrations/mikrotik.markdown
@@ -1,11 +1,14 @@
 ---
-title: MikroTik
+title: Mikrotik
 description: Instructions on how to integrate MikroTik/RouterOS based devices into Home Assistant.
 logo: mikrotik.png
 ha_category:
   - Hub
   - Presence Detection
 ha_release: 0.44
+ha_codeowners:
+  - '@engrbm87'
+ha_config_flow: true
 ---
 
 The `mikrotik` platform offers presence detection by looking at connected devices to a [MikroTik RouterOS](https://mikrotik.com) based router.
diff --git a/source/_integrations/nederlandse_spoorwegen.markdown b/source/_integrations/nederlandse_spoorwegen.markdown
index 74e5eb9303f..9560709542e 100644
--- a/source/_integrations/nederlandse_spoorwegen.markdown
+++ b/source/_integrations/nederlandse_spoorwegen.markdown
@@ -6,6 +6,8 @@ ha_category:
   - Transport
 ha_iot_class: Cloud Polling
 ha_release: 0.57
+ha_codeowners:
+  - '@YarmoM'
 ---
 
 This sensor will provide you with time table information of the [Nederlandse Spoorwegen](https://www.ns.nl/) train service in the Netherlands.
diff --git a/source/_integrations/netatmo.markdown b/source/_integrations/netatmo.markdown
index 1861efa2775..a8a19210beb 100644
--- a/source/_integrations/netatmo.markdown
+++ b/source/_integrations/netatmo.markdown
@@ -12,6 +12,9 @@ ha_category:
   - Camera
 ha_release: '0.20'
 ha_iot_class: Cloud Polling
+ha_codeowners:
+  - '@cgtobi'
+ha_config_flow: true
 ---
 
 The `netatmo` integration platform is the main integration to integrate all Netatmo related platforms.
diff --git a/source/_integrations/openhome.markdown b/source/_integrations/openhome.markdown
index 28b7db358a9..109534e3826 100644
--- a/source/_integrations/openhome.markdown
+++ b/source/_integrations/openhome.markdown
@@ -40,4 +40,3 @@ action:
       media_content_id: "http://media-ice.musicradio.com:80/ClassicFMMP3"
       media_content_type: music
 ```
-
diff --git a/source/_integrations/safe_mode.markdown b/source/_integrations/safe_mode.markdown
index 5167c3e7e07..8158b2db981 100644
--- a/source/_integrations/safe_mode.markdown
+++ b/source/_integrations/safe_mode.markdown
@@ -4,7 +4,8 @@ description: Allows Home Assistant to start up in safe mode.
 ha_category: []
 ha_release: 0.105
 logo: home-assistant.png
-ha_quality_scale: internal
+ha_codeowners:
+  - '@home-assistant/core'
 ---
 
 The `safe_mode` integration is an internally used integration by the
diff --git a/source/_integrations/search.markdown b/source/_integrations/search.markdown
index 7497aa5a5cd..381382cee5a 100644
--- a/source/_integrations/search.markdown
+++ b/source/_integrations/search.markdown
@@ -4,7 +4,8 @@ description: Internal search module for Home Assistant.
 ha_category: []
 ha_release: 0.105
 logo: home-assistant.png
-ha_quality_scale: internal
+ha_codeowners:
+  - '@home-assistant/core'
 ---
 
 The `search` integration is an internally used integration by the
diff --git a/source/_integrations/sighthound.markdown b/source/_integrations/sighthound.markdown
index c80751ae31b..8b18c50fe7d 100644
--- a/source/_integrations/sighthound.markdown
+++ b/source/_integrations/sighthound.markdown
@@ -1,11 +1,13 @@
 ---
-title: "Sighthound"
-description: "Detect people with Sighthound Cloud."
+title: Sighthound
+description: Detect people with Sighthound Cloud.
 logo: sighthound-logo.png
 ha_category:
   - Image Processing
 ha_release: 0.105
 ha_iot_class: Cloud Polling
+ha_codeowners:
+  - '@robmarkcole'
 ---
 
 Detect people in camera images using [Sighthound Cloud](https://www.sighthound.com/products/cloud). The Sighthound Developer tier (free for non-commercial use) allows 5000 images to be processed per month. If you need more processing per month you will need to sign up for a production account (i.e., a Basic or Pro account).
diff --git a/source/_integrations/sisyphus.markdown b/source/_integrations/sisyphus.markdown
index 3ed5531d490..96cc73ceee1 100644
--- a/source/_integrations/sisyphus.markdown
+++ b/source/_integrations/sisyphus.markdown
@@ -8,6 +8,8 @@ ha_category:
   - Media Player
 ha_release: 0.75
 ha_iot_class: Local Push
+ha_codeowners:
+  - '@jkeljo'
 ---
 
 The [Sisyphus](https://sisyphus-industries.com/) integration for Home Assistant allows you to observe and control your Sisyphus Kinetic Art Table.
diff --git a/source/_integrations/sms.markdown b/source/_integrations/sms.markdown
index 4afa190a095..2f80490e588 100644
--- a/source/_integrations/sms.markdown
+++ b/source/_integrations/sms.markdown
@@ -1,12 +1,11 @@
 ---
-title: "SMS notifications via GSM modem"
-description: "SMS notification via GSM modem."
+title: SMS notifications via GSM-modem
+description: SMS notification via GSM modem.
 icon: gammu.png
 ha_category:
   - Notifications
 ha_release: 0.105
 ha_iot_class: Local Polling
-ha_config_flow: false
 ha_codeowners:
   - '@ocalvo'
 ---
diff --git a/source/_integrations/ubee.markdown b/source/_integrations/ubee.markdown
index 3e6ce633b62..6d6c97def53 100644
--- a/source/_integrations/ubee.markdown
+++ b/source/_integrations/ubee.markdown
@@ -5,6 +5,8 @@ logo: ubee.png
 ha_category:
   - Presence Detection
 ha_release: 0.89
+ha_codeowners:
+  - '@mzdrale'
 ---
 
 This platform offers presence detection by looking at connected devices to a [Ubee Router](https://www.ubeeinteractive.com/).
diff --git a/source/_integrations/velbus.markdown b/source/_integrations/velbus.markdown
index 50f3475d9da..dafd75accf0 100644
--- a/source/_integrations/velbus.markdown
+++ b/source/_integrations/velbus.markdown
@@ -13,7 +13,8 @@ ha_iot_class: Local Push
 ha_release: '0.50'
 ha_config_flow: true
 ha_codeowners:
-  - '@cereal2nd'
+  - '@Cereal2nd'
+  - '@brefra'
 ---
 
 The `velbus` integration is used to control [Velbus](https://www.velbus.eu/?lang=en) modules. It supports the Velbus USB, Velbus serial and a TCP/IP gateway.
diff --git a/source/_integrations/withings.markdown b/source/_integrations/withings.markdown
index 561afaa2349..2dae5335907 100644
--- a/source/_integrations/withings.markdown
+++ b/source/_integrations/withings.markdown
@@ -136,4 +136,4 @@ sensors:
         icon_template: mdi:weight-pound
 ```
 
-{% endraw %}
\ No newline at end of file
+{% endraw %}
diff --git a/source/_integrations/zone.markdown b/source/_integrations/zone.markdown
index 495b5ec7e67..6aae7b693c5 100644
--- a/source/_integrations/zone.markdown
+++ b/source/_integrations/zone.markdown
@@ -5,7 +5,6 @@ logo: home-assistant.png
 ha_category:
   - Organization
 ha_release: 0.69
-ha_config_flow: true
 ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'