diff --git a/CODEOWNERS b/CODEOWNERS
index b7fcf5dd75b2..979c8f57e93a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -60,6 +60,7 @@ source/_integrations/assist_pipeline.markdown @balloob @synesthesiam
 source/_integrations/asuswrt.markdown @kennedyshead @ollo69
 source/_integrations/atag.markdown @MatsNL
 source/_integrations/aten_pe.markdown @mtdcr
+source/_integrations/atlanticcityelectric.markdown @tronikos
 source/_integrations/atome.markdown @baqs
 source/_integrations/august.markdown @bdraco
 source/_integrations/august_ble.markdown @bdraco
@@ -79,6 +80,7 @@ source/_integrations/baf.markdown @bdraco @jfroy
 source/_integrations/balboa.markdown @garbled1 @natekspencer
 source/_integrations/bayesian.markdown @HarvsG
 source/_integrations/beewi_smartclim.markdown @alemuro
+source/_integrations/bge.markdown @tronikos
 source/_integrations/binary_sensor.markdown @home-assistant/core
 source/_integrations/bizkaibus.markdown @UgaitzEtxebarria
 source/_integrations/blebox.markdown @bbx-a @riokuu
@@ -111,7 +113,7 @@ source/_integrations/button.markdown @home-assistant/core
 source/_integrations/calendar.markdown @home-assistant/core
 source/_integrations/camera.markdown @home-assistant/core
 source/_integrations/cast.markdown @emontnemery
-source/_integrations/cert_expiry.markdown @Cereal2nd @jjlawren
+source/_integrations/cert_expiry.markdown @jjlawren
 source/_integrations/circuit.markdown @braam
 source/_integrations/cisco_ios.markdown @fbradyirl
 source/_integrations/cisco_mobility_express.markdown @fbradyirl
@@ -121,6 +123,7 @@ source/_integrations/cloud.markdown @home-assistant/cloud
 source/_integrations/cloudflare.markdown @ludeeus @ctalkington
 source/_integrations/coinbase.markdown @tombrien
 source/_integrations/color_extractor.markdown @GenericStudent
+source/_integrations/comed.markdown @tronikos
 source/_integrations/comfoconnect.markdown @michaelarnauts
 source/_integrations/command_line.markdown @gjohansson-ST
 source/_integrations/compensation.markdown @Petro31
@@ -143,6 +146,7 @@ source/_integrations/debugpy.markdown @frenck
 source/_integrations/deconz.markdown @Kane610
 source/_integrations/default_config.markdown @home-assistant/core
 source/_integrations/delijn.markdown @bollewolle @Emilv2
+source/_integrations/delmarva.markdown @tronikos
 source/_integrations/deluge.markdown @tkdrob
 source/_integrations/demo.markdown @home-assistant/core
 source/_integrations/denonavr.markdown @ol-iver @starkillerOG
@@ -172,6 +176,7 @@ source/_integrations/dremel_3d_printer.markdown @tkdrob
 source/_integrations/dsmr.markdown @Robbie1221 @frenck
 source/_integrations/dsmr_reader.markdown @depl0y @glodenox
 source/_integrations/dunehd.markdown @bieniu
+source/_integrations/duotecno.markdown @cereal2nd
 source/_integrations/dwd_weather_warnings.markdown @runningman84 @stephan192 @Hummel95 @andarotajo
 source/_integrations/dynalite.markdown @ziv1234
 source/_integrations/easyenergy.markdown @klaasnicolaas
@@ -183,6 +188,7 @@ source/_integrations/efergy.markdown @tkdrob
 source/_integrations/egardia.markdown @jeroenterheerdt
 source/_integrations/eight_sleep.markdown @mezz64 @raman325
 source/_integrations/electrasmart.markdown @jafar-atili
+source/_integrations/electric_kiwi.markdown @mikey0000
 source/_integrations/elgato.markdown @frenck
 source/_integrations/elkm1.markdown @gwww @bdraco
 source/_integrations/elmax.markdown @albertogeniola
@@ -209,6 +215,8 @@ source/_integrations/escea.markdown @lazdavila
 source/_integrations/esera_onewire.markdown @garbled1 @epenet
 source/_integrations/esphome.markdown @OttoWinter @jesserockz @bdraco
 source/_integrations/eufylife_ble.markdown @bdr99
+source/_integrations/event.markdown @home-assistant/core
+source/_integrations/evergy.markdown @tronikos
 source/_integrations/evil_genius_labs.markdown @balloob
 source/_integrations/evohome.markdown @zxdavb
 source/_integrations/ezviz.markdown @RenierM26 @baqs
@@ -245,6 +253,7 @@ source/_integrations/frontend.markdown @home-assistant/frontend
 source/_integrations/frontier_silicon.markdown @wlcrs
 source/_integrations/fully_kiosk.markdown @cgarwood
 source/_integrations/garages_amsterdam.markdown @klaasnicolaas
+source/_integrations/gardena_bluetooth.markdown @elupus
 source/_integrations/gaviota.markdown @starkillerOG
 source/_integrations/gdacs.markdown @exxamalte
 source/_integrations/generic.markdown @davet2001
@@ -509,6 +518,7 @@ source/_integrations/opentherm_gw.markdown @mvn23
 source/_integrations/openuv.markdown @bachya
 source/_integrations/openweathermap.markdown @fabaff @freekode @nzapponi
 source/_integrations/opnsense.markdown @mtreinish
+source/_integrations/opower.markdown @tronikos
 source/_integrations/oralb.markdown @bdraco @Lash-L
 source/_integrations/oru.markdown @bvlaicu
 source/_integrations/otbr.markdown @home-assistant/core
@@ -519,7 +529,11 @@ source/_integrations/panel_custom.markdown @home-assistant/frontend
 source/_integrations/panel_iframe.markdown @home-assistant/frontend
 source/_integrations/pcs_lighting.markdown @gwww
 source/_integrations/peco.markdown @IceBotYT
+source/_integrations/peco_opower.markdown @tronikos
+source/_integrations/pegel_online.markdown @mib1185
+source/_integrations/pepco.markdown @tronikos
 source/_integrations/persistent_notification.markdown @home-assistant/core
+source/_integrations/pge.markdown @tronikos
 source/_integrations/philips_js.markdown @elupus
 source/_integrations/pi_hole.markdown @johnluetke @shenxn
 source/_integrations/picnic.markdown @corneyl
@@ -539,6 +553,7 @@ source/_integrations/prosegur.markdown @dgomes
 source/_integrations/proxmoxve.markdown @jhollowe @Corbeno
 source/_integrations/prusalink.markdown @balloob
 source/_integrations/ps4.markdown @ktnrg45
+source/_integrations/pse.markdown @tronikos
 source/_integrations/pure_energie.markdown @klaasnicolaas
 source/_integrations/purpleair.markdown @bachya
 source/_integrations/push.markdown @dgomes
@@ -566,7 +581,7 @@ source/_integrations/rainmachine.markdown @bachya
 source/_integrations/random.markdown @fabaff
 source/_integrations/rapt_ble.markdown @sairon
 source/_integrations/raven_rock_mfg.markdown @starkillerOG
-source/_integrations/rdw.markdown @frenck
+source/_integrations/rdw.markdown @frenck @joostlek
 source/_integrations/recollect_waste.markdown @bachya
 source/_integrations/recorder.markdown @home-assistant/core
 source/_integrations/rejseplanen.markdown @DarkFox
diff --git a/source/_integrations/atlanticcityelectric.markdown b/source/_integrations/atlanticcityelectric.markdown
index 426aec04d1cd..4194f0de3391 100644
--- a/source/_integrations/atlanticcityelectric.markdown
+++ b/source/_integrations/atlanticcityelectric.markdown
@@ -5,16 +5,16 @@ ha_category:
   - Energy
   - Sensor
 ha_release: 2023.8
-ha_iot_class: Cloud Polling
+ha_domain: atlanticcityelectric
+ha_integration_type: virtual
+ha_supporting_domain: opower
+ha_supporting_integration: Opower
 ha_codeowners:
   - '@tronikos'
-ha_domain: atlanticcityelectric
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: virtual
-ha_supporting_domain: opower
-ha_supporting_integration: Opower
+ha_iot_class: Cloud Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/bge.markdown b/source/_integrations/bge.markdown
index 2a8a4c188d77..b85e7ab39168 100644
--- a/source/_integrations/bge.markdown
+++ b/source/_integrations/bge.markdown
@@ -5,16 +5,16 @@ ha_category:
   - Energy
   - Sensor
 ha_release: 2023.8
-ha_iot_class: Cloud Polling
+ha_domain: bge
+ha_integration_type: virtual
+ha_supporting_domain: opower
+ha_supporting_integration: Opower
 ha_codeowners:
   - '@tronikos'
-ha_domain: bge
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: virtual
-ha_supporting_domain: opower
-ha_supporting_integration: Opower
+ha_iot_class: Cloud Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/bsblan.markdown b/source/_integrations/bsblan.markdown
index 4c48d39de3dc..550be726637e 100644
--- a/source/_integrations/bsblan.markdown
+++ b/source/_integrations/bsblan.markdown
@@ -13,7 +13,7 @@ ha_domain: bsblan
 ha_platforms:
   - climate
   - diagnostics
-ha_integration_type: integration
+ha_integration_type: device
 ---
 
 This integration integrates [BSBLan](https://github.com/fredlcore/BSB-LAN) devices into Home Assistant.
diff --git a/source/_integrations/cert_expiry.markdown b/source/_integrations/cert_expiry.markdown
index 18c084ee83bc..726395db2f9e 100644
--- a/source/_integrations/cert_expiry.markdown
+++ b/source/_integrations/cert_expiry.markdown
@@ -7,7 +7,6 @@ ha_release: 0.44
 ha_iot_class: Cloud Polling
 ha_config_flow: true
 ha_codeowners:
-  - '@Cereal2nd'
   - '@jjlawren'
 ha_domain: cert_expiry
 ha_platforms:
diff --git a/source/_integrations/co2signal.markdown b/source/_integrations/co2signal.markdown
index 3c5cbb3e530a..3cb1f8adcac3 100644
--- a/source/_integrations/co2signal.markdown
+++ b/source/_integrations/co2signal.markdown
@@ -2,15 +2,15 @@
 title: Electricity Maps
 description: Instructions on how to use the Electricity Maps (formerly known as CO2Signal) data within Home Assistant
 ha_category:
-    - Climate
-    - Energy
-    - Environment
+  - Climate
+  - Energy
+  - Environment
 ha_release: 0.87
 ha_iot_class: Cloud Polling
 ha_domain: co2signal
 ha_platforms:
-    - diagnostics
-    - sensor
+  - diagnostics
+  - sensor
 ha_config_flow: true
 ha_integration_type: integration
 ---
diff --git a/source/_integrations/comed.markdown b/source/_integrations/comed.markdown
index 109a02d6e54f..57ac61a3bd21 100644
--- a/source/_integrations/comed.markdown
+++ b/source/_integrations/comed.markdown
@@ -5,16 +5,16 @@ ha_category:
   - Energy
   - Sensor
 ha_release: 2023.8
-ha_iot_class: Cloud Polling
+ha_domain: comed
+ha_integration_type: virtual
+ha_supporting_domain: opower
+ha_supporting_integration: Opower
 ha_codeowners:
   - '@tronikos'
-ha_domain: comed
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: virtual
-ha_supporting_domain: opower
-ha_supporting_integration: Opower
+ha_iot_class: Cloud Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/delmarva.markdown b/source/_integrations/delmarva.markdown
index 8852d1149144..24dbc94df0c8 100644
--- a/source/_integrations/delmarva.markdown
+++ b/source/_integrations/delmarva.markdown
@@ -5,16 +5,16 @@ ha_category:
   - Energy
   - Sensor
 ha_release: 2023.8
-ha_iot_class: Cloud Polling
+ha_domain: delmarva
+ha_integration_type: virtual
+ha_supporting_domain: opower
+ha_supporting_integration: Opower
 ha_codeowners:
   - '@tronikos'
-ha_domain: delmarva
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: virtual
-ha_supporting_domain: opower
-ha_supporting_integration: Opower
+ha_iot_class: Cloud Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/demo.markdown b/source/_integrations/demo.markdown
index 54354a081c07..dba41764e169 100644
--- a/source/_integrations/demo.markdown
+++ b/source/_integrations/demo.markdown
@@ -19,7 +19,9 @@ ha_platforms:
   - camera
   - climate
   - cover
+  - date
   - device_tracker
+  - event
   - fan
   - geo_location
   - humidifier
@@ -35,13 +37,12 @@ ha_platforms:
   - stt
   - switch
   - text
+  - time
   - tts
   - update
   - vacuum
   - water_heater
   - weather
-  - date
-  - time
 ha_integration_type: integration
 ---
 
diff --git a/source/_integrations/duotecno.markdown b/source/_integrations/duotecno.markdown
index 9c6583489d81..6625edbc9641 100644
--- a/source/_integrations/duotecno.markdown
+++ b/source/_integrations/duotecno.markdown
@@ -7,12 +7,12 @@ ha_iot_class: Local Push
 ha_release: '2023.8'
 ha_config_flow: true
 ha_codeowners:
-  - '@Cereal2nd'
+  - '@cereal2nd'
 ha_domain: duotecno
 ha_platforms:
-  - switch
   - cover
-ha_integration_type: hub
+  - switch
+ha_integration_type: integration
 ---
 
 The Duotecno integration can be used to control [Duotecno](https://www.duotecno.be/) nodes in Home Assistant.
diff --git a/source/_integrations/electric_kiwi.markdown b/source/_integrations/electric_kiwi.markdown
index b232d75bafe4..950901edeb65 100644
--- a/source/_integrations/electric_kiwi.markdown
+++ b/source/_integrations/electric_kiwi.markdown
@@ -3,7 +3,7 @@ title: Electric Kiwi
 description: Instructions on how to set up the Electric Kiwi service in Home Assistant.
 ha_category:
   - Energy
-ha_release: "2023.8"
+ha_release: '2023.8'
 ha_iot_class: Cloud Polling
 ha_codeowners:
   - '@mikey0000'
@@ -11,7 +11,7 @@ ha_domain: electric_kiwi
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: service
+ha_integration_type: hub
 ---
 
 [Electric Kiwi](https://www.electrickiwi.co.nz/) is an independent power and broadband company in New Zealand, offering variable rates for peak, shoulder, and off-peak pricing with a selectable hour of free power. This integration uses the official [Electric Kiwi API](https://developer.electrickiwi.co.nz) to get your account balance and show and select the hour of free power. 
diff --git a/source/_integrations/evergy.markdown b/source/_integrations/evergy.markdown
index e0e5e54e9b64..c4dc457a9ad1 100644
--- a/source/_integrations/evergy.markdown
+++ b/source/_integrations/evergy.markdown
@@ -5,16 +5,16 @@ ha_category:
   - Energy
   - Sensor
 ha_release: 2023.8
-ha_iot_class: Cloud Polling
+ha_domain: evergy
+ha_integration_type: virtual
+ha_supporting_domain: opower
+ha_supporting_integration: Opower
 ha_codeowners:
   - '@tronikos'
-ha_domain: evergy
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: virtual
-ha_supporting_domain: opower
-ha_supporting_integration: Opower
+ha_iot_class: Cloud Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/ezviz.markdown b/source/_integrations/ezviz.markdown
index 4e74f136c1e0..1e3475387ee6 100644
--- a/source/_integrations/ezviz.markdown
+++ b/source/_integrations/ezviz.markdown
@@ -12,9 +12,11 @@ ha_codeowners:
   - '@baqs'
 ha_config_flow: true
 ha_platforms:
+  - alarm_control_panel
   - binary_sensor
   - button
   - camera
+  - image
   - light
   - number
   - select
diff --git a/source/_integrations/freebox.markdown b/source/_integrations/freebox.markdown
index 95e52209093b..dc866de85f68 100644
--- a/source/_integrations/freebox.markdown
+++ b/source/_integrations/freebox.markdown
@@ -15,11 +15,11 @@ ha_codeowners:
 ha_config_flow: true
 ha_domain: freebox
 ha_platforms:
+  - binary_sensor
   - button
   - camera
   - device_tracker
   - sensor
-  - binary_sensor
   - switch
 ha_zeroconf: true
 ha_integration_type: integration
diff --git a/source/_integrations/fritz.markdown b/source/_integrations/fritz.markdown
index e00bd9fbc868..d57609c4b641 100644
--- a/source/_integrations/fritz.markdown
+++ b/source/_integrations/fritz.markdown
@@ -21,10 +21,10 @@ ha_platforms:
   - button
   - device_tracker
   - diagnostics
+  - image
   - sensor
   - switch
   - update
-  - image
 ha_ssdp: true
 ha_integration_type: integration
 ---
diff --git a/source/_integrations/gardena_bluetooth.markdown b/source/_integrations/gardena_bluetooth.markdown
index acb99231dd11..1cf7dcd2a934 100644
--- a/source/_integrations/gardena_bluetooth.markdown
+++ b/source/_integrations/gardena_bluetooth.markdown
@@ -14,9 +14,11 @@ ha_domain: gardena_bluetooth
 ha_config_flow: true
 ha_platforms:
   - binary_sensor
+  - button
   - number
   - sensor
   - switch
+ha_integration_type: integration
 ---
 
 The Gardena Bluetooth integration allows users to integrate their [Gardena Smart](https://www.gardena.com/int/products/smart/) devices using Bluetooth into Home Assistant.
diff --git a/source/_integrations/homekit_controller.markdown b/source/_integrations/homekit_controller.markdown
index 27b32f6e10d3..f07e67057a02 100644
--- a/source/_integrations/homekit_controller.markdown
+++ b/source/_integrations/homekit_controller.markdown
@@ -31,6 +31,7 @@ ha_platforms:
   - climate
   - cover
   - diagnostics
+  - event
   - fan
   - humidifier
   - light
diff --git a/source/_integrations/hue.markdown b/source/_integrations/hue.markdown
index 33709ad478ee..a613469f8458 100644
--- a/source/_integrations/hue.markdown
+++ b/source/_integrations/hue.markdown
@@ -17,6 +17,7 @@ ha_homekit: true
 ha_platforms:
   - binary_sensor
   - diagnostics
+  - event
   - light
   - scene
   - sensor
diff --git a/source/_integrations/kitchen_sink.markdown b/source/_integrations/kitchen_sink.markdown
index 7179786c104d..de63ff726bc5 100644
--- a/source/_integrations/kitchen_sink.markdown
+++ b/source/_integrations/kitchen_sink.markdown
@@ -10,9 +10,10 @@ ha_codeowners:
 ha_domain: kitchen_sink
 ha_iot_class: Calculated
 ha_platforms:
+  - image
   - lock
   - sensor
-  - image
+  - weather
 ha_integration_type: integration
 ---
 
diff --git a/source/_integrations/knx.markdown b/source/_integrations/knx.markdown
index 46f514055a6d..0dd9ec1d6dbb 100644
--- a/source/_integrations/knx.markdown
+++ b/source/_integrations/knx.markdown
@@ -44,8 +44,8 @@ ha_platforms:
   - sensor
   - switch
   - text
-  - weather
   - time
+  - weather
 ha_config_flow: true
 ha_integration_type: hub
 ---
diff --git a/source/_integrations/litterrobot.markdown b/source/_integrations/litterrobot.markdown
index 1a45ea99844f..6b14cf35c694 100644
--- a/source/_integrations/litterrobot.markdown
+++ b/source/_integrations/litterrobot.markdown
@@ -22,9 +22,9 @@ ha_platforms:
   - select
   - sensor
   - switch
+  - time
   - update
   - vacuum
-  - time
 ha_integration_type: hub
 ---
 
diff --git a/source/_integrations/loqed.markdown b/source/_integrations/loqed.markdown
index 15928810cbd2..1243fc9354b8 100644
--- a/source/_integrations/loqed.markdown
+++ b/source/_integrations/loqed.markdown
@@ -10,6 +10,7 @@ ha_codeowners:
 ha_domain: loqed
 ha_platforms:
   - lock
+  - sensor
 ha_config_flow: true
 ha_integration_type: integration
 ha_zeroconf: true
diff --git a/source/_integrations/matter.markdown b/source/_integrations/matter.markdown
index 6e5656e22dbf..67a461257d6b 100644
--- a/source/_integrations/matter.markdown
+++ b/source/_integrations/matter.markdown
@@ -20,6 +20,7 @@ ha_platforms:
   - climate
   - cover
   - diagnostics
+  - event
   - light
   - lock
   - sensor
diff --git a/source/_integrations/microsoft.markdown b/source/_integrations/microsoft.markdown
index 8c7e70d641e7..886fd07f78b3 100644
--- a/source/_integrations/microsoft.markdown
+++ b/source/_integrations/microsoft.markdown
@@ -1,5 +1,5 @@
 ---
-title: Microsoft text-to-speech (TTS)
+title: Microsoft Text-to-Speech (TTS)
 description: Instructions on how to set up Microsoft text-to-speech with Home Assistant.
 ha_category:
   - Text-to-speech
diff --git a/source/_integrations/mqtt.markdown b/source/_integrations/mqtt.markdown
index 9694733f63b1..be33b26a0fc6 100644
--- a/source/_integrations/mqtt.markdown
+++ b/source/_integrations/mqtt.markdown
@@ -21,8 +21,10 @@ ha_platforms:
   - cover
   - device_tracker
   - diagnostics
+  - event
   - fan
   - humidifier
+  - image
   - light
   - lock
   - number
@@ -31,12 +33,11 @@ ha_platforms:
   - sensor
   - siren
   - switch
-  - text
   - tag
+  - text
   - update
   - vacuum
   - water_heater
-  - image
 ha_integration_type: integration
 ha_quality_scale: gold
 ---
diff --git a/source/_integrations/onvif.markdown b/source/_integrations/onvif.markdown
index 971b257ee5fa..909c7fdca627 100644
--- a/source/_integrations/onvif.markdown
+++ b/source/_integrations/onvif.markdown
@@ -14,6 +14,7 @@ ha_platforms:
   - button
   - camera
   - diagnostics
+  - event
   - sensor
   - switch
 ha_integration_type: integration
diff --git a/source/_integrations/opensky.markdown b/source/_integrations/opensky.markdown
index f8d535e2bcf0..fa741967db3f 100644
--- a/source/_integrations/opensky.markdown
+++ b/source/_integrations/opensky.markdown
@@ -11,6 +11,7 @@ ha_platforms:
 ha_integration_type: integration
 ha_codeowners:
   - '@joostlek'
+ha_config_flow: true
 ---
 
 The OpenSky integration allows one to track overhead flights in a given region. It uses crowd-sourced data from the [OpenSky Network](https://opensky-network.org/) public API. It will also fire Home Assistant events when flights enter and exit the defined region.
diff --git a/source/_integrations/peco_opower.markdown b/source/_integrations/peco_opower.markdown
index 69944fb942b6..9472c35d118e 100644
--- a/source/_integrations/peco_opower.markdown
+++ b/source/_integrations/peco_opower.markdown
@@ -5,16 +5,16 @@ ha_category:
   - Energy
   - Sensor
 ha_release: 2023.8
-ha_iot_class: Cloud Polling
+ha_domain: peco_opower
+ha_integration_type: virtual
+ha_supporting_domain: opower
+ha_supporting_integration: Opower
 ha_codeowners:
   - '@tronikos'
-ha_domain: peco_opower
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: virtual
-ha_supporting_domain: opower
-ha_supporting_integration: Opower
+ha_iot_class: Cloud Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/pegel_online.markdown b/source/_integrations/pegel_online.markdown
index ceac72393c9d..5668943799a0 100644
--- a/source/_integrations/pegel_online.markdown
+++ b/source/_integrations/pegel_online.markdown
@@ -7,7 +7,7 @@ ha_category:
 ha_release: 2023.8
 ha_config_flow: true
 ha_iot_class: Cloud Polling
-ha_domain: 'pegel_online'
+ha_domain: pegel_online
 ha_platforms:
   - sensor
 ha_codeowners:
diff --git a/source/_integrations/pepco.markdown b/source/_integrations/pepco.markdown
index e2fdaaab7eb7..b9a7eb60405a 100644
--- a/source/_integrations/pepco.markdown
+++ b/source/_integrations/pepco.markdown
@@ -5,16 +5,16 @@ ha_category:
   - Energy
   - Sensor
 ha_release: 2023.8
-ha_iot_class: Cloud Polling
+ha_domain: pepco
+ha_integration_type: virtual
+ha_supporting_domain: opower
+ha_supporting_integration: Opower
 ha_codeowners:
   - '@tronikos'
-ha_domain: pepco
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: virtual
-ha_supporting_domain: opower
-ha_supporting_integration: Opower
+ha_iot_class: Cloud Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/pge.markdown b/source/_integrations/pge.markdown
index 66ca0cc78d4c..ef0f38c5ad28 100644
--- a/source/_integrations/pge.markdown
+++ b/source/_integrations/pge.markdown
@@ -5,16 +5,16 @@ ha_category:
   - Energy
   - Sensor
 ha_release: 2023.8
-ha_iot_class: Cloud Polling
+ha_domain: pge
+ha_integration_type: virtual
+ha_supporting_domain: opower
+ha_supporting_integration: Opower
 ha_codeowners:
   - '@tronikos'
-ha_domain: pge
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: virtual
-ha_supporting_domain: opower
-ha_supporting_integration: Opower
+ha_iot_class: Cloud Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/pse.markdown b/source/_integrations/pse.markdown
index 9cc2b50f8b00..76d844c8899c 100644
--- a/source/_integrations/pse.markdown
+++ b/source/_integrations/pse.markdown
@@ -5,16 +5,16 @@ ha_category:
   - Energy
   - Sensor
 ha_release: 2023.8
-ha_iot_class: Cloud Polling
+ha_domain: pse
+ha_integration_type: virtual
+ha_supporting_domain: opower
+ha_supporting_integration: Opower
 ha_codeowners:
   - '@tronikos'
-ha_domain: pse
 ha_config_flow: true
 ha_platforms:
   - sensor
-ha_integration_type: virtual
-ha_supporting_domain: opower
-ha_supporting_integration: Opower
+ha_iot_class: Cloud Polling
 ---
 
 {% include integrations/supported_brand.md %}
diff --git a/source/_integrations/rdw.markdown b/source/_integrations/rdw.markdown
index a1db085ece0b..20883675d878 100644
--- a/source/_integrations/rdw.markdown
+++ b/source/_integrations/rdw.markdown
@@ -11,6 +11,7 @@ ha_config_flow: true
 ha_quality_scale: platinum
 ha_codeowners:
   - '@frenck'
+  - '@joostlek'
 ha_domain: rdw
 ha_platforms:
   - binary_sensor
diff --git a/source/_integrations/reolink.markdown b/source/_integrations/reolink.markdown
index 5ff44ec28951..fbae3feaf0f3 100644
--- a/source/_integrations/reolink.markdown
+++ b/source/_integrations/reolink.markdown
@@ -17,6 +17,7 @@ ha_platforms:
   - light
   - number
   - select
+  - sensor
   - siren
   - switch
   - update
diff --git a/source/_integrations/roborock.markdown b/source/_integrations/roborock.markdown
index e703983e6078..d6075b5d2a5c 100644
--- a/source/_integrations/roborock.markdown
+++ b/source/_integrations/roborock.markdown
@@ -17,9 +17,11 @@ ha_codeowners:
 ha_domain: roborock
 ha_platforms:
   - diagnostics
+  - number
   - select
   - sensor
   - switch
+  - time
   - vacuum
 ha_integration_type: integration
 ---
diff --git a/source/_integrations/scene.markdown b/source/_integrations/scene.markdown
index 30959148f41a..2d334127b132 100644
--- a/source/_integrations/scene.markdown
+++ b/source/_integrations/scene.markdown
@@ -1,5 +1,5 @@
 ---
-title: Scene
+title: Scenes
 description: Instructions on how to setup scenes within Home Assistant.
 ha_category:
   - Organization
diff --git a/source/_integrations/scrape.markdown b/source/_integrations/scrape.markdown
index 99d38e722578..b7c9c545abb7 100644
--- a/source/_integrations/scrape.markdown
+++ b/source/_integrations/scrape.markdown
@@ -283,4 +283,3 @@ scrape:
         select: "div.nk-tb-item:nth-child(3) > div:nth-child(3) > span:nth-child(1) > span:nth-child(1)"
 
 ```
-
diff --git a/source/_integrations/template.markdown b/source/_integrations/template.markdown
index fe03cc64ed0e..caab7a606b2e 100644
--- a/source/_integrations/template.markdown
+++ b/source/_integrations/template.markdown
@@ -22,6 +22,7 @@ ha_platforms:
   - button
   - cover
   - fan
+  - image
   - light
   - lock
   - number
@@ -30,7 +31,6 @@ ha_platforms:
   - switch
   - vacuum
   - weather
-  - image
 ha_integration_type: integration
 ---
 
diff --git a/source/_integrations/unifi.markdown b/source/_integrations/unifi.markdown
index 4ee76bcd89e6..d27816c34e7e 100644
--- a/source/_integrations/unifi.markdown
+++ b/source/_integrations/unifi.markdown
@@ -19,6 +19,7 @@ ha_ssdp: true
 ha_platforms:
   - device_tracker
   - diagnostics
+  - image
   - sensor
   - switch
   - update
diff --git a/source/_integrations/unifiprotect.markdown b/source/_integrations/unifiprotect.markdown
index 0fe07adaa13d..1f768506ed6e 100644
--- a/source/_integrations/unifiprotect.markdown
+++ b/source/_integrations/unifiprotect.markdown
@@ -22,8 +22,8 @@ ha_iot_class: Local Push
 ha_config_flow: true
 ha_quality_scale: platinum
 ha_codeowners:
-  - "@AngellusMortis"
-  - "@bdraco"
+  - '@AngellusMortis'
+  - '@bdraco'
 ha_domain: unifiprotect
 ha_platforms:
   - binary_sensor
diff --git a/source/_integrations/youtube.markdown b/source/_integrations/youtube.markdown
index 4709f3f022e0..b60d23f9d43d 100644
--- a/source/_integrations/youtube.markdown
+++ b/source/_integrations/youtube.markdown
@@ -10,6 +10,7 @@ ha_codeowners:
   - '@joostlek'
 ha_domain: youtube
 ha_platforms:
+  - diagnostics
   - sensor
 ha_integration_type: service
 ---
diff --git a/source/_integrations/zodiac.markdown b/source/_integrations/zodiac.markdown
index 4bb4b935fa58..b5c3ae6a3b6f 100644
--- a/source/_integrations/zodiac.markdown
+++ b/source/_integrations/zodiac.markdown
@@ -12,6 +12,7 @@ ha_domain: zodiac
 ha_platforms:
   - sensor
 ha_integration_type: integration
+ha_config_flow: true
 ---
 
 The Zodiac integration tracks the current zodiac sign.