diff --git a/source/_components/binary_sensor.arest.markdown b/source/_components/binary_sensor.arest.markdown
index d18a2d321a7..1cf17934b7f 100644
--- a/source/_components/binary_sensor.arest.markdown
+++ b/source/_components/binary_sensor.arest.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: arest.png
-ha_category: Binary Sensor
+ha_category: DIY
 ha_iot_class: "Local Polling"
 ha_release: 0.9
 ---
@@ -16,6 +16,8 @@ ha_release: 0.9
 
 The `arest` binary sensor platform allows you to get all data from your devices (like Arduinos with an ethernet/wifi connection, the ESP8266, and the Raspberry Pi) running the [aREST](http://arest.io/) RESTful framework.
 
+## {% linkable_title Configuration %}
+
 To use your aREST binary sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/binary_sensor.bbb_gpio.markdown b/source/_components/binary_sensor.bbb_gpio.markdown
index be2a9bd9fb3..f35f488a7ea 100644
--- a/source/_components/binary_sensor.bbb_gpio.markdown
+++ b/source/_components/binary_sensor.bbb_gpio.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: beaglebone-black.png
-ha_category: Binary Sensor
+ha_category: DIY
 ha_release: 0.37
 ha_iot_class: "Local Push"
 ---
 
 The `bbb_gpio` binary sensor platform allows you to read sensor values of the GPIOs of your [BeagleBone Black](https://beagleboard.org/black).
 
+## {% linkable_title Configuration %}
+
 To use your BeagleBone Black's GPIO in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.arest.markdown b/source/_components/sensor.arest.markdown
index 4f7c68732fc..4bb0a11ad78 100644
--- a/source/_components/sensor.arest.markdown
+++ b/source/_components/sensor.arest.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: arest.png
-ha_category: Sensor
+ha_category: DIY
 ha_iot_class: "Local Polling"
 ha_release: pre 0.7
 ---
@@ -16,6 +16,8 @@ ha_release: pre 0.7
 
 The `arest` sensor platform allows you to get all data from your devices (like Arduinos with a Ethernet/Wifi connection, the ESP8266, and the Raspberry Pi) running the [aREST](http://arest.io/) RESTful framework.
 
+## {% linkable_title Configuration %}
+
 To use your aREST enabled device in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.bme280.markdown b/source/_components/sensor.bme280.markdown
index 7dd524405a3..7887aff3dde 100644
--- a/source/_components/sensor.bme280.markdown
+++ b/source/_components/sensor.bme280.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: raspberry-pi.png
-ha_category: Sensor
+ha_category: DIY
 ha_release: 0.48
 ha_iot_class: "Local Push"
 ---
@@ -20,6 +20,8 @@ Tested devices:
 
 - [Raspberry Pi](https://www.raspberrypi.org/)
 
+## {% linkable_title Configuration %}
+
 To use your BME280 sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.bme680.markdown b/source/_components/sensor.bme680.markdown
index d2496dd8a33..b32f23ab5d7 100644
--- a/source/_components/sensor.bme680.markdown
+++ b/source/_components/sensor.bme680.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: raspberry-pi.png
-ha_category: Sensor
+ha_category: DIY
 ha_release: 0.62
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/switch.arest.markdown b/source/_components/switch.arest.markdown
index e0b63695371..a6a61d7ae98 100644
--- a/source/_components/switch.arest.markdown
+++ b/source/_components/switch.arest.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: arest.png
-ha_category: Switch
+ha_category: DIY
 ha_iot_class: "Local Polling"
 ha_release: 0.16
 ---
 
 The `arest` switch platform allows you to toggle pins of your devices (like Arduino boards with an Ethernet/Wifi connection, ESP8266 based devices, and the Raspberry Pi) running the [aREST](http://arest.io/) RESTful framework.
 
+## {% linkable_title Configuration %}
+
 To use your aREST enabled device with pins in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/switch.bbb_gpio.markdown b/source/_components/switch.bbb_gpio.markdown
index 7b02e6a927b..fc41a25db14 100644
--- a/source/_components/switch.bbb_gpio.markdown
+++ b/source/_components/switch.bbb_gpio.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: beaglebone-black.png
-ha_category: Switch
+ha_category: DIY
 ha_release: 0.36
 ha_iot_class: "Local Push"
 ---
 
 The `bbb_gpio` switch platform allows you to control the GPIOs of your [BeagleBone Black](https://beagleboard.org/black).
 
+## {% linkable_title Configuration %}
+
 To use yourBeagleBone Black's GPIO in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/zabbix.markdown b/source/_components/zabbix.markdown
index e4630839993..bda90be47f7 100644
--- a/source/_components/zabbix.markdown
+++ b/source/_components/zabbix.markdown
@@ -16,6 +16,8 @@ ha_iot_class: "Local Polling"
 
 The `zabbix` component is the main component to connect to a [Zabbix](http://www.zabbix.com/) monitoring instance via the Zabbix API.
 
+## {% linkable_title Configuration %}
+
 To set the Zabbix component up, add the following information to your `configuration.yaml` file:
 
 ```yaml