From c39f4886d388ae8742e73ef4b9b927bdab1fd6cf Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 5 Oct 2022 18:25:01 +0200
Subject: [PATCH] 2022.10: Sync with codebase

---
 CODEOWNERS                                    |  6 ++++
 .../alarm_control_panel.markdown              |  2 +-
 source/_integrations/api.markdown             |  2 +-
 .../application_credentials.markdown          |  2 +-
 source/_integrations/auth.markdown            |  2 +-
 source/_integrations/automation.markdown      |  2 +-
 source/_integrations/backup.markdown          |  2 +-
 source/_integrations/binary_sensor.markdown   |  2 +-
 source/_integrations/blueprint.markdown       |  2 +-
 source/_integrations/bswitch.markdown         | 23 ++++++++++++
 source/_integrations/bticino.markdown         | 36 +++++++++++++++++++
 source/_integrations/bubendorff.markdown      | 36 +++++++++++++++++++
 source/_integrations/button.markdown          |  2 +-
 source/_integrations/calendar.markdown        |  2 +-
 source/_integrations/camera.markdown          |  2 +-
 source/_integrations/climate.markdown         |  2 +-
 source/_integrations/config.markdown          |  2 +-
 source/_integrations/configurator.markdown    |  2 +-
 source/_integrations/conversation.markdown    |  2 +-
 source/_integrations/cover.markdown           |  2 +-
 source/_integrations/default_config.markdown  |  2 +-
 .../_integrations/device_automation.markdown  |  2 +-
 source/_integrations/device_tracker.markdown  |  2 +-
 source/_integrations/dhcp.markdown            |  2 +-
 source/_integrations/diagnostics.markdown     |  2 +-
 source/_integrations/discovery.markdown       |  2 +-
 source/_integrations/energy.markdown          |  2 +-
 source/_integrations/fan.markdown             |  2 +-
 source/_integrations/file_upload.markdown     |  3 +-
 source/_integrations/frontend.markdown        |  2 +-
 source/_integrations/geo_location.markdown    |  2 +-
 source/_integrations/hardware.markdown        |  2 +-
 source/_integrations/hassio.markdown          |  2 +-
 source/_integrations/history.markdown         |  2 +-
 source/_integrations/homeassistant.markdown   |  2 +-
 source/_integrations/http.markdown            |  2 +-
 source/_integrations/humidifier.markdown      |  2 +-
 source/_integrations/image.markdown           |  2 +-
 .../_integrations/image_processing.markdown   |  2 +-
 source/_integrations/legrand.markdown         | 36 +++++++++++++++++++
 source/_integrations/light.markdown           |  2 +-
 source/_integrations/lock.markdown            |  2 +-
 source/_integrations/logbook.markdown         |  2 +-
 source/_integrations/logger.markdown          |  2 +-
 source/_integrations/mailbox.markdown         |  2 +-
 source/_integrations/media_player.markdown    |  2 +-
 source/_integrations/media_source.markdown    |  2 +-
 source/_integrations/my.markdown              |  2 +-
 source/_integrations/nest.markdown            |  2 +-
 source/_integrations/network.markdown         |  2 +-
 source/_integrations/nibe_heatpump.markdown   |  7 ++--
 source/_integrations/notify.markdown          |  2 +-
 source/_integrations/number.markdown          |  2 +-
 source/_integrations/onboarding.markdown      |  2 +-
 source/_integrations/person.markdown          |  2 +-
 source/_integrations/recorder.markdown        |  2 +-
 source/_integrations/remote.markdown          |  2 +-
 source/_integrations/repairs.markdown         |  2 +-
 source/_integrations/rest.markdown            |  4 +--
 source/_integrations/safe_mode.markdown       |  2 +-
 source/_integrations/scene.markdown           |  2 +-
 source/_integrations/script.markdown          |  2 +-
 source/_integrations/search.markdown          |  2 +-
 source/_integrations/select.markdown          |  2 +-
 source/_integrations/sensor.markdown          |  2 +-
 source/_integrations/siren.markdown           |  2 +-
 source/_integrations/smarther.markdown        | 36 +++++++++++++++++++
 source/_integrations/ssdp.markdown            |  2 +-
 source/_integrations/stt.markdown             |  2 +-
 source/_integrations/switch.markdown          |  2 +-
 source/_integrations/system_health.markdown   |  2 +-
 source/_integrations/tts.markdown             |  2 +-
 source/_integrations/unifi_direct.markdown    |  2 +-
 source/_integrations/unifiled.markdown        |  2 +-
 source/_integrations/update.markdown          |  2 +-
 source/_integrations/usb.markdown             |  2 +-
 source/_integrations/vacuum.markdown          |  2 +-
 source/_integrations/water_heater.markdown    |  2 +-
 source/_integrations/weather.markdown         |  2 +-
 source/_integrations/websocket_api.markdown   |  2 +-
 source/_integrations/zeroconf.markdown        |  2 +-
 81 files changed, 252 insertions(+), 79 deletions(-)
 create mode 100644 source/_integrations/bswitch.markdown
 create mode 100644 source/_integrations/bticino.markdown
 create mode 100644 source/_integrations/bubendorff.markdown
 create mode 100644 source/_integrations/legrand.markdown
 create mode 100644 source/_integrations/smarther.markdown

diff --git a/CODEOWNERS b/CODEOWNERS
index 00b664f81bd..b8a9da76f02 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -90,8 +90,11 @@ source/_integrations/broadlink.markdown @danielhiversen @felipediel @L-I-Am
 source/_integrations/brother.markdown @bieniu
 source/_integrations/brunt.markdown @eavanvalkenburg
 source/_integrations/bsblan.markdown @liudger
+source/_integrations/bswitch.markdown @jafar-atili
 source/_integrations/bt_smarthub.markdown @jxwolstenholme
 source/_integrations/bthome.markdown @Ernst79
+source/_integrations/bticino.markdown @cgtobi
+source/_integrations/bubendorff.markdown @cgtobi
 source/_integrations/buienradar.markdown @mjj4791 @ties @Robbie1221
 source/_integrations/button.markdown @home-assistant/core
 source/_integrations/calendar.markdown @home-assistant/core
@@ -340,6 +343,7 @@ source/_integrations/launch_library.markdown @ludeeus @DurgNomis-drol
 source/_integrations/laundrify.markdown @xLarry
 source/_integrations/lcn.markdown @alengwenus
 source/_integrations/led_ble.markdown @bdraco
+source/_integrations/legrand.markdown @cgtobi
 source/_integrations/leviton_z_wave.markdown @home-assistant/z-wave
 source/_integrations/lg_netcast.markdown @Drafteed
 source/_integrations/lidarr.markdown @tkdrob
@@ -419,6 +423,7 @@ source/_integrations/nextbus.markdown @vividboarder
 source/_integrations/nextcloud.markdown @meichthys
 source/_integrations/nextdns.markdown @bieniu
 source/_integrations/nfandroidtv.markdown @tkdrob
+source/_integrations/nibe_heatpump.markdown @elupus
 source/_integrations/nightscout.markdown @marciogranzotto
 source/_integrations/nilu.markdown @hfurubotten
 source/_integrations/nina.markdown @DeerMaximum
@@ -576,6 +581,7 @@ source/_integrations/smappee.markdown @bsmappee
 source/_integrations/smart_blinds.markdown @starkillerOG
 source/_integrations/smart_home.markdown @starkillerOG
 source/_integrations/smart_meter_texas.markdown @grahamwetzler
+source/_integrations/smarther.markdown @cgtobi
 source/_integrations/smartthings.markdown @andrewsayre
 source/_integrations/smarttub.markdown @mdz
 source/_integrations/smarty.markdown @z0mbieprocess
diff --git a/source/_integrations/alarm_control_panel.markdown b/source/_integrations/alarm_control_panel.markdown
index 5df97f48acd..97f603c22bd 100644
--- a/source/_integrations/alarm_control_panel.markdown
+++ b/source/_integrations/alarm_control_panel.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: alarm_control_panel
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Home Assistant can give you an interface which is similar to a classic alarm system.
diff --git a/source/_integrations/api.markdown b/source/_integrations/api.markdown
index ad7249b74f3..fdbe918fe26 100644
--- a/source/_integrations/api.markdown
+++ b/source/_integrations/api.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: api
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `api` integration exposes a RESTful API and allows one to interact with a Home Assistant instance that is running headless. This integration depends on the [HTTP integration](/integrations/http/).
diff --git a/source/_integrations/application_credentials.markdown b/source/_integrations/application_credentials.markdown
index 7c6d32d1833..d0e8dd07a75 100644
--- a/source/_integrations/application_credentials.markdown
+++ b/source/_integrations/application_credentials.markdown
@@ -7,7 +7,7 @@ ha_quality_scale: internal
 ha_category: []
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The Application Credentials integration is used by integrations that use OAuth2 to link your account to Home Assistant. The most common and preferred approach is using account linking with Home Assistant Cloud, however not all cloud providers support that and integrations can use Application Credentials instead. Additionally, users may use Application Credentials if preferred instead of Home Assistant Cloud Account Linking.
diff --git a/source/_integrations/auth.markdown b/source/_integrations/auth.markdown
index 0f7d00ed37f..ac8e2e4a122 100644
--- a/source/_integrations/auth.markdown
+++ b/source/_integrations/auth.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: auth
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 This integration creates the endpoints for the [authentication system](/docs/authentication/) that is built into Home Assistant.
diff --git a/source/_integrations/automation.markdown b/source/_integrations/automation.markdown
index 75298852a97..00d0c84e613 100644
--- a/source/_integrations/automation.markdown
+++ b/source/_integrations/automation.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: automation
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 <script>document.location.href = '/docs/automation/';</script>
diff --git a/source/_integrations/backup.markdown b/source/_integrations/backup.markdown
index d88272c2b6f..4500fa674de 100644
--- a/source/_integrations/backup.markdown
+++ b/source/_integrations/backup.markdown
@@ -9,7 +9,7 @@ ha_domain: backup
 ha_codeowners:
   - '@home-assistant/core'
 ha_iot_class: Calculated
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The Backup integration allow you to create and download backups for your Home Assistant Core and Home Assistant Container installations. This backup file can be used if you migrate to Home Assistant Operating System.
diff --git a/source/_integrations/binary_sensor.markdown b/source/_integrations/binary_sensor.markdown
index 014d97cc6c2..6ff50c7b6ef 100644
--- a/source/_integrations/binary_sensor.markdown
+++ b/source/_integrations/binary_sensor.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: binary_sensor
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Binary sensors are similar to other [sensors](/integrations/sensor) in that they
diff --git a/source/_integrations/blueprint.markdown b/source/_integrations/blueprint.markdown
index c6555f766e9..d00536cd540 100644
--- a/source/_integrations/blueprint.markdown
+++ b/source/_integrations/blueprint.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: blueprint
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 <script>document.location.href = '/docs/automation/using_blueprints/';</script>
diff --git a/source/_integrations/bswitch.markdown b/source/_integrations/bswitch.markdown
new file mode 100644
index 00000000000..e1ecd617d48
--- /dev/null
+++ b/source/_integrations/bswitch.markdown
@@ -0,0 +1,23 @@
+---
+title: BSwitch
+description: Connect and control your BSwitch devices using the SwitchBee integration
+ha_category:
+  - Button
+  - Light
+  - Switch
+ha_domain: bswitch
+ha_codeowners:
+  - '@jafar-atili'
+ha_integration_type: integration
+ha_config_flow: true
+ha_platforms:
+  - button
+  - light
+  - switch
+ha_iot_class: Local Polling
+ha_supporting_domain: switchbee
+ha_supporting_integration: SwitchBee
+ha_release: '2022.10'
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/bticino.markdown b/source/_integrations/bticino.markdown
new file mode 100644
index 00000000000..7dfb86efd0e
--- /dev/null
+++ b/source/_integrations/bticino.markdown
@@ -0,0 +1,36 @@
+---
+title: BTicino
+description: Connect and control your BTicino devices using the Netatmo integration
+ha_category:
+  - Camera
+  - Climate
+  - Cover
+  - Environment
+  - Hub
+  - Light
+  - Media Source
+  - Sensor
+  - Switch
+  - Weather
+ha_domain: bticino
+ha_codeowners:
+  - '@cgtobi'
+ha_integration_type: integration
+ha_config_flow: true
+ha_platforms:
+  - camera
+  - climate
+  - cover
+  - diagnostics
+  - light
+  - select
+  - sensor
+  - switch
+ha_iot_class: Cloud Polling
+ha_homekit: true
+ha_supporting_domain: netatmo
+ha_supporting_integration: Netatmo
+ha_release: '0.20'
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/bubendorff.markdown b/source/_integrations/bubendorff.markdown
new file mode 100644
index 00000000000..b4ad3290b67
--- /dev/null
+++ b/source/_integrations/bubendorff.markdown
@@ -0,0 +1,36 @@
+---
+title: Bubendorff
+description: Connect and control your Bubendorff devices using the Netatmo integration
+ha_category:
+  - Camera
+  - Climate
+  - Cover
+  - Environment
+  - Hub
+  - Light
+  - Media Source
+  - Sensor
+  - Switch
+  - Weather
+ha_domain: bubendorff
+ha_codeowners:
+  - '@cgtobi'
+ha_integration_type: integration
+ha_config_flow: true
+ha_platforms:
+  - camera
+  - climate
+  - cover
+  - diagnostics
+  - light
+  - select
+  - sensor
+  - switch
+ha_iot_class: Cloud Polling
+ha_homekit: true
+ha_supporting_domain: netatmo
+ha_supporting_integration: Netatmo
+ha_release: '0.20'
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/button.markdown b/source/_integrations/button.markdown
index 5e4a2138ff4..a31186ab804 100644
--- a/source/_integrations/button.markdown
+++ b/source/_integrations/button.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: button
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 A button entity is an entity that can fire an event / trigger an action towards
diff --git a/source/_integrations/calendar.markdown b/source/_integrations/calendar.markdown
index 413fec848f4..dff15ca5397 100644
--- a/source/_integrations/calendar.markdown
+++ b/source/_integrations/calendar.markdown
@@ -7,7 +7,7 @@ ha_quality_scale: internal
 ha_category: []
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The calendar integration allows you to integrate your calendars into Home Assistant. Calendars are shown on the calendar dashboard, and can be used with automations.
diff --git a/source/_integrations/camera.markdown b/source/_integrations/camera.markdown
index bc701a974f6..04afffb19b1 100644
--- a/source/_integrations/camera.markdown
+++ b/source/_integrations/camera.markdown
@@ -9,7 +9,7 @@ ha_quality_scale: internal
 ha_domain: camera
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ha_platforms:
   - diagnostics
 ---
diff --git a/source/_integrations/climate.markdown b/source/_integrations/climate.markdown
index f9b853c4854..15b1422686a 100644
--- a/source/_integrations/climate.markdown
+++ b/source/_integrations/climate.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: climate
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The Climate integration allows you to control and monitor HVAC (heating, ventilating, and air conditioning) devices and thermostats.
diff --git a/source/_integrations/config.markdown b/source/_integrations/config.markdown
index 237bc4c003a..614fec55893 100644
--- a/source/_integrations/config.markdown
+++ b/source/_integrations/config.markdown
@@ -10,7 +10,7 @@ ha_codeowners:
 ha_domain: config
 ha_platforms:
   - scene
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `config` integration is designed to display panels in the frontend to configure and manage parts of Home Assistant.
diff --git a/source/_integrations/configurator.markdown b/source/_integrations/configurator.markdown
index 866fd97f503..56d4614d4b9 100644
--- a/source/_integrations/configurator.markdown
+++ b/source/_integrations/configurator.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: configurator
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 <div class='note'>
diff --git a/source/_integrations/conversation.markdown b/source/_integrations/conversation.markdown
index e74fd581c75..f1038151e18 100644
--- a/source/_integrations/conversation.markdown
+++ b/source/_integrations/conversation.markdown
@@ -9,7 +9,7 @@ ha_iot_class: Local Push
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: conversation
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The conversation integration allows you to converse with Home Assistant. You can either converse by pressing the microphone in the frontend (supported browsers only (no iOS)) or by calling the `conversation/process` service with the transcribed text.
diff --git a/source/_integrations/cover.markdown b/source/_integrations/cover.markdown
index 553e955ef63..57a5cba4ee1 100644
--- a/source/_integrations/cover.markdown
+++ b/source/_integrations/cover.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: cover
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Home Assistant can give you an interface to control covers such as rollershutters, blinds, and garage doors.
diff --git a/source/_integrations/default_config.markdown b/source/_integrations/default_config.markdown
index 47932673362..128a9e31885 100644
--- a/source/_integrations/default_config.markdown
+++ b/source/_integrations/default_config.markdown
@@ -8,7 +8,7 @@ ha_domain: default_config
 ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 This integration is a meta-component and configures a default set of integrations for Home Assistant to load. The integrations that will be loaded are:
diff --git a/source/_integrations/device_automation.markdown b/source/_integrations/device_automation.markdown
index 1858ed9a418..b0a76975430 100644
--- a/source/_integrations/device_automation.markdown
+++ b/source/_integrations/device_automation.markdown
@@ -7,7 +7,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: device_automation
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 Device Automations is a plugin for the automation integration to allow other integrations to provide device specific triggers, conditions and actions.
diff --git a/source/_integrations/device_tracker.markdown b/source/_integrations/device_tracker.markdown
index 8fa6abe0b7b..50e7d8bee73 100644
--- a/source/_integrations/device_tracker.markdown
+++ b/source/_integrations/device_tracker.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: device_tracker
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The device tracker allows you to track devices in Home Assistant. This can happen by querying your wireless router or by having applications push location info.
diff --git a/source/_integrations/dhcp.markdown b/source/_integrations/dhcp.markdown
index 126dd7a7a15..672b46e183b 100644
--- a/source/_integrations/dhcp.markdown
+++ b/source/_integrations/dhcp.markdown
@@ -9,7 +9,7 @@ ha_domain: dhcp
 ha_quality_scale: internal
 ha_codeowners:
   - '@bdraco'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 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/diagnostics.markdown b/source/_integrations/diagnostics.markdown
index 7923f863f4f..6f66df09c17 100644
--- a/source/_integrations/diagnostics.markdown
+++ b/source/_integrations/diagnostics.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: diagnostics
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The diagnostics integration provides a way to download diagnostic data from
diff --git a/source/_integrations/discovery.markdown b/source/_integrations/discovery.markdown
index d0597f536ab..96330a9ea15 100644
--- a/source/_integrations/discovery.markdown
+++ b/source/_integrations/discovery.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: discovery
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 This is the legacy discovery integration for Home Assistant. It's use is no longer recommended. Use the [SSDP](/integrations/ssdp/), [Zeroconf](/integrations/zeroconf/) and [USB](/integrations/usb/) integrations instead.
diff --git a/source/_integrations/energy.markdown b/source/_integrations/energy.markdown
index 774f3504fc5..110179319dd 100644
--- a/source/_integrations/energy.markdown
+++ b/source/_integrations/energy.markdown
@@ -10,5 +10,5 @@ ha_codeowners:
 ha_domain: energy
 ha_platforms:
   - sensor
-ha_integration_type: integration
+ha_integration_type: system
 ---
diff --git a/source/_integrations/fan.markdown b/source/_integrations/fan.markdown
index 0f6c51f2187..8e0380ca187 100644
--- a/source/_integrations/fan.markdown
+++ b/source/_integrations/fan.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: fan
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The Fan integration allows you to control and monitor Fan devices.
diff --git a/source/_integrations/file_upload.markdown b/source/_integrations/file_upload.markdown
index 1d0773de331..cab53d08fb5 100644
--- a/source/_integrations/file_upload.markdown
+++ b/source/_integrations/file_upload.markdown
@@ -4,9 +4,10 @@ description: File upload integration supports various frontend features within H
 ha_release: 2022.9
 ha_quality_scale: internal
 ha_domain: file_upload
-ha_integration_type: integration
+ha_integration_type: system
 ha_codeowners:
   - '@home-assistant/core'
+ha_category: []
 ---
 
 The file upload integration allows various features in the frontend to upload files.
diff --git a/source/_integrations/frontend.markdown b/source/_integrations/frontend.markdown
index 91d981cb386..14f6138f393 100644
--- a/source/_integrations/frontend.markdown
+++ b/source/_integrations/frontend.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/frontend'
 ha_domain: frontend
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 This offers the official frontend to control Home Assistant. This integration is by default enabled, unless you've disabled or removed the [`default_config:`](/integrations/default_config/) line from your configuration. If that is the case, the following example shows you how to enable this integration manually:
diff --git a/source/_integrations/geo_location.markdown b/source/_integrations/geo_location.markdown
index b67a1fa90ff..dc09f3f06fc 100644
--- a/source/_integrations/geo_location.markdown
+++ b/source/_integrations/geo_location.markdown
@@ -8,7 +8,7 @@ ha_domain: geo_location
 ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Geolocation aware entities are typically related to events in the real world in the vicinity of Home Assistant's location, like for example weather events, bush fires or earthquakes.
diff --git a/source/_integrations/hardware.markdown b/source/_integrations/hardware.markdown
index 4105ed5c5e8..d811411bfa7 100644
--- a/source/_integrations/hardware.markdown
+++ b/source/_integrations/hardware.markdown
@@ -7,7 +7,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: hardware
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The Hardware integration provides an API which offers information about certain board types, USB dongles, and resource usage.
diff --git a/source/_integrations/hassio.markdown b/source/_integrations/hassio.markdown
index 1bc143ec49c..f5624335ae2 100644
--- a/source/_integrations/hassio.markdown
+++ b/source/_integrations/hassio.markdown
@@ -16,7 +16,7 @@ ha_platforms:
   - update
 ha_codeowners:
   - '@home-assistant/supervisor'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 Supervisor integration allows you to monitor and control Supervisor add-ons and operating system from Home Assistant.
diff --git a/source/_integrations/history.markdown b/source/_integrations/history.markdown
index 39093a02cec..6025e7555fb 100644
--- a/source/_integrations/history.markdown
+++ b/source/_integrations/history.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: history
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `history` integration will track everything that is going on within Home
diff --git a/source/_integrations/homeassistant.markdown b/source/_integrations/homeassistant.markdown
index e7210d89153..eb0d1023a0b 100644
--- a/source/_integrations/homeassistant.markdown
+++ b/source/_integrations/homeassistant.markdown
@@ -10,7 +10,7 @@ ha_codeowners:
 ha_domain: homeassistant
 ha_platforms:
   - scene
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The Home Assistant integration provides generic implementations like the generic `homeassistant.turn_on`.
diff --git a/source/_integrations/http.markdown b/source/_integrations/http.markdown
index 0936c6535b4..e7b9b78fdb1 100644
--- a/source/_integrations/http.markdown
+++ b/source/_integrations/http.markdown
@@ -9,7 +9,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: http
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `http` integration serves all files and data required for the Home Assistant frontend. You only need to add this to your configuration file if you want to change any of the default settings.
diff --git a/source/_integrations/humidifier.markdown b/source/_integrations/humidifier.markdown
index 2d3ad9557d3..b191bea12bc 100644
--- a/source/_integrations/humidifier.markdown
+++ b/source/_integrations/humidifier.markdown
@@ -9,7 +9,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
   - '@Shulyaka'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The `humidifier` integration is built for the controlling and monitoring of humidifiers, dehumidifiers, and hygrostat devices.
diff --git a/source/_integrations/image.markdown b/source/_integrations/image.markdown
index 801b8407981..59e1ba847ed 100644
--- a/source/_integrations/image.markdown
+++ b/source/_integrations/image.markdown
@@ -8,7 +8,7 @@ ha_codeowners:
   - '@home-assistant/core'
 ha_domain: image
 ha_quality_scale: internal
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The Image integration allows Home Assistant to handle image assets in Home Assistant, for example,
diff --git a/source/_integrations/image_processing.markdown b/source/_integrations/image_processing.markdown
index 0571186a5ad..bce1b363b72 100644
--- a/source/_integrations/image_processing.markdown
+++ b/source/_integrations/image_processing.markdown
@@ -8,7 +8,7 @@ ha_domain: image_processing
 ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Image processing enables Home Assistant to process images from [cameras](/integrations/#camera). Only camera entities are supported as sources.
diff --git a/source/_integrations/legrand.markdown b/source/_integrations/legrand.markdown
new file mode 100644
index 00000000000..f7bf94dec16
--- /dev/null
+++ b/source/_integrations/legrand.markdown
@@ -0,0 +1,36 @@
+---
+title: Legrand
+description: Connect and control your Legrand devices using the Netatmo integration
+ha_category:
+  - Camera
+  - Climate
+  - Cover
+  - Environment
+  - Hub
+  - Light
+  - Media Source
+  - Sensor
+  - Switch
+  - Weather
+ha_domain: legrand
+ha_codeowners:
+  - '@cgtobi'
+ha_integration_type: integration
+ha_config_flow: true
+ha_platforms:
+  - camera
+  - climate
+  - cover
+  - diagnostics
+  - light
+  - select
+  - sensor
+  - switch
+ha_iot_class: Cloud Polling
+ha_homekit: true
+ha_supporting_domain: netatmo
+ha_supporting_integration: Netatmo
+ha_release: '0.20'
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/light.markdown b/source/_integrations/light.markdown
index f5c5e864f46..c3b8c33141b 100644
--- a/source/_integrations/light.markdown
+++ b/source/_integrations/light.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: light
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 This integration allows you to track and control various light bulbs. Read the integration documentation for your particular light hardware to learn how to enable it.
diff --git a/source/_integrations/lock.markdown b/source/_integrations/lock.markdown
index d784c440932..5db9a2e29ce 100644
--- a/source/_integrations/lock.markdown
+++ b/source/_integrations/lock.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: lock
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Keeps track which locks are in your environment, their state and allows you to control them.
diff --git a/source/_integrations/logbook.markdown b/source/_integrations/logbook.markdown
index 9f205556a78..3d0d711e922 100644
--- a/source/_integrations/logbook.markdown
+++ b/source/_integrations/logbook.markdown
@@ -8,7 +8,7 @@ ha_domain: logbook
 ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 <img src='/images/screenshots/logbook.png' style='margin-left:10px; float: right;' height="100" />
diff --git a/source/_integrations/logger.markdown b/source/_integrations/logger.markdown
index 7c353245c07..6d852e3d606 100644
--- a/source/_integrations/logger.markdown
+++ b/source/_integrations/logger.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: logger
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `logger` integration lets you define the level of logging activities in Home
diff --git a/source/_integrations/mailbox.markdown b/source/_integrations/mailbox.markdown
index fa51c5758cc..2b060fe92c0 100644
--- a/source/_integrations/mailbox.markdown
+++ b/source/_integrations/mailbox.markdown
@@ -5,7 +5,7 @@ ha_release: 0.51
 ha_domain: mailbox
 ha_quality_scale: internal
 ha_category: []
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Mailboxes provide a list of messages with short information about each. Mailbox messages appear on a separate panel in the frontend.
diff --git a/source/_integrations/media_player.markdown b/source/_integrations/media_player.markdown
index e87fbc103f4..4d5381233c4 100644
--- a/source/_integrations/media_player.markdown
+++ b/source/_integrations/media_player.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: media_player
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Interacts with media players on your network.
diff --git a/source/_integrations/media_source.markdown b/source/_integrations/media_source.markdown
index 51629ea0ae3..d4745da15a6 100644
--- a/source/_integrations/media_source.markdown
+++ b/source/_integrations/media_source.markdown
@@ -8,7 +8,7 @@ ha_domain: media_source
 ha_codeowners:
   - '@hunterjm'
 ha_quality_scale: internal
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The Media Source integration platform allows integrations to expose media for
diff --git a/source/_integrations/my.markdown b/source/_integrations/my.markdown
index 3b100eb6cc9..c7d78ac0b86 100644
--- a/source/_integrations/my.markdown
+++ b/source/_integrations/my.markdown
@@ -8,7 +8,7 @@ ha_domain: my
 ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 This integration handles redirects from the [My Home Assistant](https://my.home-assistant.io) service.
diff --git a/source/_integrations/nest.markdown b/source/_integrations/nest.markdown
index ac12be83ece..a2243a0e5d3 100644
--- a/source/_integrations/nest.markdown
+++ b/source/_integrations/nest.markdown
@@ -1,5 +1,5 @@
 ---
-title: Nest
+title: Google Nest
 description: Instructions on how to integrate Nest into Home Assistant.
 ha_category:
   - Binary Sensor
diff --git a/source/_integrations/network.markdown b/source/_integrations/network.markdown
index 4374c32b3a2..2fd4134e2e1 100644
--- a/source/_integrations/network.markdown
+++ b/source/_integrations/network.markdown
@@ -9,7 +9,7 @@ ha_iot_class: Local Push
 ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 This integration provides network configuration for integrations such as [Zeroconf](/integrations/zeroconf/). It is managed by going to **{% my network title="Settings >> System >> Network" %}** and is only available to users that have "Advanced Mode" enabled on their {% my profile title="user profile" %}.
diff --git a/source/_integrations/nibe_heatpump.markdown b/source/_integrations/nibe_heatpump.markdown
index 06a9f3cbbd8..1297a0665b7 100644
--- a/source/_integrations/nibe_heatpump.markdown
+++ b/source/_integrations/nibe_heatpump.markdown
@@ -9,13 +9,12 @@ ha_config_flow: true
 ha_codeowners:
   - '@elupus'
 ha_domain: nibe_heatpump
-ha_ssdp: false
 ha_platforms:
-  - sensor
   - binary_sensor
   - number
-  - switch
   - select
+  - sensor
+  - switch
 ha_integration_type: integration
 ---
 
@@ -75,4 +74,4 @@ An Arduino-based solution has been tested by OpenHAB community with Arduino uno
 A standard Linux application for running the Nibe Gateway software is also available.
 
 - [Documentation from OpenHAB](https://www.openhab.org/addons/bindings/nibeheatpump/#raspberry-pi-or-other-linux-unix-based-boards)
-- [Source code in OpenHAB Contrib](https://github.com/openhab/openhab-addons/tree/main/bundles/org.openhab.binding.nibeheatpump/contrib/NibeGW/RasPi)
\ No newline at end of file
+- [Source code in OpenHAB Contrib](https://github.com/openhab/openhab-addons/tree/main/bundles/org.openhab.binding.nibeheatpump/contrib/NibeGW/RasPi)
diff --git a/source/_integrations/notify.markdown b/source/_integrations/notify.markdown
index cb7a13af816..4fe50b792a7 100644
--- a/source/_integrations/notify.markdown
+++ b/source/_integrations/notify.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: notify
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The `notify` integration makes it possible to send notifications to a wide variety of platforms. To use it you have to setup at least one notification target (notifier), check the [integrations list](/integrations/#notifications) for one that fits your use case.
diff --git a/source/_integrations/number.markdown b/source/_integrations/number.markdown
index 79e5c426f8f..718b8624f74 100644
--- a/source/_integrations/number.markdown
+++ b/source/_integrations/number.markdown
@@ -9,7 +9,7 @@ ha_domain: number
 ha_codeowners:
   - '@home-assistant/core'
   - '@Shulyaka'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Keeps track on `number` entities in your environment, their state, and allows you to control them. This integration allows other integrations to get a value input from user within a range.
diff --git a/source/_integrations/onboarding.markdown b/source/_integrations/onboarding.markdown
index a0cb0e27486..a6db35bcc19 100644
--- a/source/_integrations/onboarding.markdown
+++ b/source/_integrations/onboarding.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: onboarding
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 This integration creates the endpoints for the onboarding that is built into Home Assistant. There are no configuration options for this integration directly.
diff --git a/source/_integrations/person.markdown b/source/_integrations/person.markdown
index 899769b8276..2409e047824 100644
--- a/source/_integrations/person.markdown
+++ b/source/_integrations/person.markdown
@@ -7,7 +7,7 @@ ha_release: 0.88
 ha_quality_scale: internal
 ha_domain: person
 ha_iot_class: Calculated
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `person` integration allows connecting [device tracker](/integrations/device_tracker/) entities to one or more person entities. The state updates of a connected device tracker will set the state of the person. When multiple device trackers are used, the state of person will be determined in this order:
diff --git a/source/_integrations/recorder.markdown b/source/_integrations/recorder.markdown
index 5b162a7be8d..f2342556d76 100644
--- a/source/_integrations/recorder.markdown
+++ b/source/_integrations/recorder.markdown
@@ -9,7 +9,7 @@ ha_domain: recorder
 ha_iot_class: Local Push
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `recorder` integration is responsible for storing details in a database, which then are handled by the [`history`](/integrations/history/) integration.
diff --git a/source/_integrations/remote.markdown b/source/_integrations/remote.markdown
index a47f1880965..a6adec6984a 100644
--- a/source/_integrations/remote.markdown
+++ b/source/_integrations/remote.markdown
@@ -8,7 +8,7 @@ ha_category:
 ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Keeps track which remotes are in your environment, their state and allows you to control them.
diff --git a/source/_integrations/repairs.markdown b/source/_integrations/repairs.markdown
index 133896242c6..31b0111ccff 100644
--- a/source/_integrations/repairs.markdown
+++ b/source/_integrations/repairs.markdown
@@ -7,7 +7,7 @@ ha_category:
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: repairs
-ha_integration_type: integration
+ha_integration_type: system
 ha_quality_scale: internal
 ---
 
diff --git a/source/_integrations/rest.markdown b/source/_integrations/rest.markdown
index 18133c729eb..ff29cdb4bf0 100644
--- a/source/_integrations/rest.markdown
+++ b/source/_integrations/rest.markdown
@@ -1,6 +1,6 @@
 ---
-title: "RESTful"
-description: "Instructions on how to integrate REST sensors and binary sensors into Home Assistant."
+title: RESTful
+description: Instructions on how to integrate REST sensors and binary sensors into Home Assistant.
 ha_category:
   - Binary Sensor
   - Sensor
diff --git a/source/_integrations/safe_mode.markdown b/source/_integrations/safe_mode.markdown
index 17c9a75d0af..3c810ee3d7d 100644
--- a/source/_integrations/safe_mode.markdown
+++ b/source/_integrations/safe_mode.markdown
@@ -7,7 +7,7 @@ ha_codeowners:
   - '@home-assistant/core'
 ha_domain: safe_mode
 ha_quality_scale: internal
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `safe_mode` integration is an internally used integration by the
diff --git a/source/_integrations/scene.markdown b/source/_integrations/scene.markdown
index 1f2f65f6b37..0dd2331ad6d 100644
--- a/source/_integrations/scene.markdown
+++ b/source/_integrations/scene.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: scene
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 You can create scenes that capture the states you want certain entities to be. For example, a scene can specify that light A should be turned on and light B should be bright red.
diff --git a/source/_integrations/script.markdown b/source/_integrations/script.markdown
index 446d3d9cfac..a3d9c46d570 100644
--- a/source/_integrations/script.markdown
+++ b/source/_integrations/script.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: script
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The script integration allows users to specify a sequence of actions to be executed by Home Assistant. These are run when you turn the script on. The script integration will create an entity for each script and allow them to be controlled via services.
diff --git a/source/_integrations/search.markdown b/source/_integrations/search.markdown
index fec43baad91..1389cc60905 100644
--- a/source/_integrations/search.markdown
+++ b/source/_integrations/search.markdown
@@ -8,7 +8,7 @@ ha_codeowners:
   - '@home-assistant/core'
 ha_domain: search
 ha_quality_scale: internal
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `search` integration is an internally used integration by the
diff --git a/source/_integrations/select.markdown b/source/_integrations/select.markdown
index 28aaef459c4..16af11e944e 100644
--- a/source/_integrations/select.markdown
+++ b/source/_integrations/select.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: select
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Keeps track on `select` entities in your environment, their state, and allows
diff --git a/source/_integrations/sensor.markdown b/source/_integrations/sensor.markdown
index 5f7c4077555..3ccbfec0ea5 100644
--- a/source/_integrations/sensor.markdown
+++ b/source/_integrations/sensor.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: sensor
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Sensors are a basic platform component in Home Assistant. They monitor the states and conditions of a variety of entities. An entity can be many things. This can include a physical device like a motion sensor that reports the battery level, a web service that retrieves the weather temperature, a built-in function that calculates the sun's elevation relative to your GPS position, or even a custom sensor you may have created to report the free space on your laptop. These are all *things* reporting different types of information.
diff --git a/source/_integrations/siren.markdown b/source/_integrations/siren.markdown
index 0652ccfa25e..7c74ec7a537 100644
--- a/source/_integrations/siren.markdown
+++ b/source/_integrations/siren.markdown
@@ -9,7 +9,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
   - '@raman325'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The Siren integration is built for the controlling and monitoring of siren/chime devices.
diff --git a/source/_integrations/smarther.markdown b/source/_integrations/smarther.markdown
new file mode 100644
index 00000000000..3bd187365cd
--- /dev/null
+++ b/source/_integrations/smarther.markdown
@@ -0,0 +1,36 @@
+---
+title: Smarther
+description: Connect and control your Smarther devices using the Netatmo integration
+ha_category:
+  - Camera
+  - Climate
+  - Cover
+  - Environment
+  - Hub
+  - Light
+  - Media Source
+  - Sensor
+  - Switch
+  - Weather
+ha_domain: smarther
+ha_codeowners:
+  - '@cgtobi'
+ha_integration_type: integration
+ha_config_flow: true
+ha_platforms:
+  - camera
+  - climate
+  - cover
+  - diagnostics
+  - light
+  - select
+  - sensor
+  - switch
+ha_iot_class: Cloud Polling
+ha_homekit: true
+ha_supporting_domain: netatmo
+ha_supporting_integration: Netatmo
+ha_release: '0.20'
+---
+
+{% include integrations/supported_brand.md %}
diff --git a/source/_integrations/ssdp.markdown b/source/_integrations/ssdp.markdown
index 617bdb089c7..cec31e5f7b0 100644
--- a/source/_integrations/ssdp.markdown
+++ b/source/_integrations/ssdp.markdown
@@ -7,7 +7,7 @@ ha_iot_class: Local Push
 ha_release: 0.94
 ha_domain: ssdp
 ha_quality_scale: internal
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `ssdp` "Simple Service Discovery Protocol" (part of UPnP) integration will scan the network 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/stt.markdown b/source/_integrations/stt.markdown
index d979449fcdc..46ec6c89241 100644
--- a/source/_integrations/stt.markdown
+++ b/source/_integrations/stt.markdown
@@ -7,7 +7,7 @@ ha_codeowners:
 ha_domain: stt
 ha_quality_scale: internal
 ha_category: []
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Speech-to-Text (STT) allows you to stream speech data to the STT API and get text back.
diff --git a/source/_integrations/switch.markdown b/source/_integrations/switch.markdown
index 74b6cc25071..b5a847ddf31 100644
--- a/source/_integrations/switch.markdown
+++ b/source/_integrations/switch.markdown
@@ -10,7 +10,7 @@ ha_platforms:
   - light
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Keeps track which switches are in your environment, their state and allows you to control them.
diff --git a/source/_integrations/system_health.markdown b/source/_integrations/system_health.markdown
index 525a093e5f1..ee4a4ab883c 100644
--- a/source/_integrations/system_health.markdown
+++ b/source/_integrations/system_health.markdown
@@ -6,7 +6,7 @@ ha_category:
 ha_release: 0.87
 ha_quality_scale: internal
 ha_domain: system_health
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The System Health integration provides an API to offer information on the system and its components. It also allows to run diagnostic tools to diagnose problems.
diff --git a/source/_integrations/tts.markdown b/source/_integrations/tts.markdown
index a6d7e659734..ac1f099411a 100644
--- a/source/_integrations/tts.markdown
+++ b/source/_integrations/tts.markdown
@@ -11,7 +11,7 @@ ha_domain: tts
 ha_quality_scale: internal
 ha_platforms:
   - notify
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 Text-to-Speech (TTS) enables Home Assistant to speak to you.
diff --git a/source/_integrations/unifi_direct.markdown b/source/_integrations/unifi_direct.markdown
index 47567766a90..41fd26436a1 100644
--- a/source/_integrations/unifi_direct.markdown
+++ b/source/_integrations/unifi_direct.markdown
@@ -1,5 +1,5 @@
 ---
-title: Ubiquiti UniFi AP
+title: UniFi AP
 description: Instructions on how to use a Unifi WAP as a device tracker.
 ha_category:
   - Presence Detection
diff --git a/source/_integrations/unifiled.markdown b/source/_integrations/unifiled.markdown
index fc1aba6aa77..fb0f18dcb11 100644
--- a/source/_integrations/unifiled.markdown
+++ b/source/_integrations/unifiled.markdown
@@ -1,5 +1,5 @@
 ---
-title: Ubiquiti UniFi LED
+title: UniFi LED
 description: Instructions on how to configure the UniFi LED integration with UniFi LED Controller by Ubiquiti.
 ha_category:
   - Light
diff --git a/source/_integrations/update.markdown b/source/_integrations/update.markdown
index ba4eb95d4e6..ae5bca84818 100644
--- a/source/_integrations/update.markdown
+++ b/source/_integrations/update.markdown
@@ -7,7 +7,7 @@ ha_quality_scale: internal
 ha_domain: update
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 An update entity is an entity that indicates if an update is available for a
diff --git a/source/_integrations/usb.markdown b/source/_integrations/usb.markdown
index 7aa2493fe91..1b1afc1e5c6 100644
--- a/source/_integrations/usb.markdown
+++ b/source/_integrations/usb.markdown
@@ -9,7 +9,7 @@ ha_domain: usb
 ha_quality_scale: internal
 ha_codeowners:
   - '@bdraco'
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The USB Discovery integration will detect newly connected USB devices. Discovered devices will show up in the discovered section on the integrations page in the configuration panel.
diff --git a/source/_integrations/vacuum.markdown b/source/_integrations/vacuum.markdown
index 107385806bd..a493e3625fd 100644
--- a/source/_integrations/vacuum.markdown
+++ b/source/_integrations/vacuum.markdown
@@ -7,7 +7,7 @@ ha_quality_scale: internal
 ha_category: []
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The `vacuum` integration enables the ability to control home cleaning robots within Home Assistant.
diff --git a/source/_integrations/water_heater.markdown b/source/_integrations/water_heater.markdown
index dfad8286c51..14f5a23a6e5 100644
--- a/source/_integrations/water_heater.markdown
+++ b/source/_integrations/water_heater.markdown
@@ -7,7 +7,7 @@ ha_quality_scale: internal
 ha_category: []
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The `water_heater` integration is built for the controlling and monitoring of hot water heaters.
diff --git a/source/_integrations/weather.markdown b/source/_integrations/weather.markdown
index c4417626f5d..827101a59fc 100644
--- a/source/_integrations/weather.markdown
+++ b/source/_integrations/weather.markdown
@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_codeowners:
   - '@home-assistant/core'
 ha_domain: weather
-ha_integration_type: integration
+ha_integration_type: entity
 ---
 
 The `weather` platforms gather meteorological information from web services and display the conditions and other details about the weather at the given location. Read the integration documentation for your particular weather provider to learn how to set it up.
diff --git a/source/_integrations/websocket_api.markdown b/source/_integrations/websocket_api.markdown
index 163236337c3..b204001c40d 100644
--- a/source/_integrations/websocket_api.markdown
+++ b/source/_integrations/websocket_api.markdown
@@ -10,7 +10,7 @@ ha_codeowners:
 ha_domain: websocket_api
 ha_platforms:
   - sensor
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `websocket_api` integration set up a WebSocket API and allows one to interact with a Home Assistant instance that is running headless. This integration depends on the [`http` component](/integrations/http/).
diff --git a/source/_integrations/zeroconf.markdown b/source/_integrations/zeroconf.markdown
index b814fb1bc78..bd269a9d337 100644
--- a/source/_integrations/zeroconf.markdown
+++ b/source/_integrations/zeroconf.markdown
@@ -9,7 +9,7 @@ ha_codeowners:
   - '@bdraco'
 ha_domain: zeroconf
 ha_iot_class: Local Push
-ha_integration_type: integration
+ha_integration_type: system
 ---
 
 The `zeroconf` integration will scan the network for supported devices and services. Discovered integrations will show up in the discovered section on the integrations page in the configuration panel. It will also make Home Assistant discoverable for other services in the network. Zeroconf is also sometimes known as Bonjour, Rendezvous, and Avahi.