diff --git a/source/_components/august.markdown b/source/_components/august.markdown
index 818002e14c7..2d079065ec7 100644
--- a/source/_components/august.markdown
+++ b/source/_components/august.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: august.png
-ha_category: Hub
+ha_category: Door bell
 ha_release: "0.64"
 ha_iot_class: "Cloud Polling"
 ---
diff --git a/source/_components/binary_sensor.august.markdown b/source/_components/binary_sensor.august.markdown
index be793af19b8..20d2aec19d0 100644
--- a/source/_components/binary_sensor.august.markdown
+++ b/source/_components/binary_sensor.august.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: august.png
-ha_category: Binary Sensor
+ha_category: Door bell
 ha_release: "0.64"
 ha_iot_class: "Cloud Polling"
 ---
diff --git a/source/_components/binary_sensor.ecobee.markdown b/source/_components/binary_sensor.ecobee.markdown
index 25f58c42cbc..103c818d495 100644
--- a/source/_components/binary_sensor.ecobee.markdown
+++ b/source/_components/binary_sensor.ecobee.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: ecobee.png
-ha_category: Binary Sensor
+ha_category: Environment
 ha_release: 0.9
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/binary_sensor.ring.markdown b/source/_components/binary_sensor.ring.markdown
index e663d6838cc..c2f48c7163c 100644
--- a/source/_components/binary_sensor.ring.markdown
+++ b/source/_components/binary_sensor.ring.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: ring.png
-ha_category: Binary Sensor
+ha_category: Doorbell
 ha_release: 0.42
 ha_iot_class: "Cloud Polling"
 ---
 
 To get your [Ring.com](https://ring.com/) binary sensors working within Home Assistant, please follow the instructions for the general [Ring component](/components/ring).
 
+## {% linkable_title Configuration %}
+
 Once you have enabled the [Ring component](/components/ring), add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/binary_sensor.skybell.markdown b/source/_components/binary_sensor.skybell.markdown
index d16766f316d..25558eb1cd5 100644
--- a/source/_components/binary_sensor.skybell.markdown
+++ b/source/_components/binary_sensor.skybell.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: skybell.png
-ha_category: Binary Sensor
+ha_category: Doorbell
 ha_release: 0.56
 ha_iot_class: "Cloud Polling"
 ---
 
 To get your [Skybell.com](https://skybell.com/) binary sensors working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
 
+## {% linkable_title Configuration %}
+
 Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/binary_sensor.wemo.markdown b/source/_components/binary_sensor.wemo.markdown
index 9b304f5fc61..48fd97bc842 100644
--- a/source/_components/binary_sensor.wemo.markdown
+++ b/source/_components/binary_sensor.wemo.markdown
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "Belkin WeMo Binary Sensors"
+title: "Belkin WeMo Binary Sensor"
 description: "Instructions on how to integrate Belkin WeMo binary sensors into Home Assistant."
 date: 2016-02-20 00:45
 sidebar: true
diff --git a/source/_components/camera.ring.markdown b/source/_components/camera.ring.markdown
index cd4844ae4b0..7499d2a14a5 100644
--- a/source/_components/camera.ring.markdown
+++ b/source/_components/camera.ring.markdown
@@ -15,6 +15,8 @@ ha_iot_class: "Cloud Polling"
 
 To get your [Ring.com](https://ring.com/) cameras working within Home Assistant, please follow the instructions for the general [Ring component](/components/ring). Please note that downloading and playing Ring video will require a Ring Protect plan.
 
+## {% linkable_title Configuration %}
+
 Once you have enabled the [Ring component](/components/ring), add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/camera.skybell.markdown b/source/_components/camera.skybell.markdown
index a6b1155d173..61df1aeeaba 100644
--- a/source/_components/camera.skybell.markdown
+++ b/source/_components/camera.skybell.markdown
@@ -15,6 +15,8 @@ ha_iot_class: "Cloud Polling"
 
 To get your [Skybell.com](https://www.skybell.com/) cameras working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
 
+## {% linkable_title Configuration %}
+
 Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/light.skybell.markdown b/source/_components/light.skybell.markdown
index 15723eaf076..889dbaf4caa 100644
--- a/source/_components/light.skybell.markdown
+++ b/source/_components/light.skybell.markdown
@@ -15,6 +15,8 @@ ha_iot_class: "Cloud Polling"
 
 To get your [Skybell.com](https://skybell.com/) LED light working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
 
+## {% linkable_title Configuration %}
+
 Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/ring.markdown b/source/_components/ring.markdown
index 4daf012653f..e600e3e140a 100644
--- a/source/_components/ring.markdown
+++ b/source/_components/ring.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: ring.png
-ha_category: Hub
+ha_category: Doorbell
 ha_release: 0.42
 ---
 
@@ -16,6 +16,8 @@ The `ring` implementation allows you to integrate your [Ring.com](https://ring.c
 
 Currently only doorbells are supported by this sensor.
 
+## {% linkable_title Configuration %}
+
 To enable device linked in your [Ring.com](https://ring.com/) account, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.bbox.markdown b/source/_components/sensor.bbox.markdown
index ec3be264acc..a45e4bdb5ed 100644
--- a/source/_components/sensor.bbox.markdown
+++ b/source/_components/sensor.bbox.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: bbox.png
-ha_category: Sensor
+ha_category: Network
 ha_release: 0.31
 ha_iot_class: "Local Push"
 ---
@@ -19,6 +19,8 @@ The `bbox` platform uses the [Bbox Modem Router](https://fr.wikipedia.org/wiki/B
 Due to third party limitation, the sensors will only be available if Home Assistant and the Bbox are on the same local area network. You can check this by going to 192.168.1.254 with your web browser.
 </p>
 
+## {% linkable_title Configuration %}
+
 To add Bbox sensors to your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.canary.markdown b/source/_components/sensor.canary.markdown
index 25efd713e39..79239f075bc 100644
--- a/source/_components/sensor.canary.markdown
+++ b/source/_components/sensor.canary.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: canary.png
-ha_category: Sensor
+ha_category: Environment
 ha_release: "0.60"
 ha_iot_class: "Cloud Polling"
 ---
diff --git a/source/_components/sensor.ecobee.markdown b/source/_components/sensor.ecobee.markdown
index 19491a566eb..e05a714d371 100644
--- a/source/_components/sensor.ecobee.markdown
+++ b/source/_components/sensor.ecobee.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: ecobee.png
-ha_category: Binary Sensor
+ha_category: Environment
 ha_release: 0.9
 ha_iot_class: "Local Push"
 ---
diff --git a/source/_components/sensor.moon.markdown b/source/_components/sensor.moon.markdown
index d80c1068988..6a292040da2 100644
--- a/source/_components/sensor.moon.markdown
+++ b/source/_components/sensor.moon.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: home-assistant.png
-ha_category: Weather
+ha_category: Environment
 ha_iot_class: "Local Polling"
 ha_release: 0.38
 ---
@@ -16,6 +16,8 @@ ha_release: 0.38
 
 The `moon` sensor platform is tracking the moon phases.
 
+## {% linkable_title Configuration %}
+
 To enable the moon sensor, add the following lines to your `configuration.yaml`:
 
 ```yaml
@@ -23,5 +25,6 @@ To enable the moon sensor, add the following lines to your `configuration.yaml`:
 sensor:
   - platform: moon
 ```
+
 This sensor will return one of the following values: 
 `new_moon`, `waxing_crescent`, `first_quarter`, `waxing_gibbous`, `full_moon`, `waning_gibbous`, `last_quarter` or `waning_crescent` .
diff --git a/source/_components/sensor.ring.markdown b/source/_components/sensor.ring.markdown
index 898a76ffa4c..e8059abc990 100644
--- a/source/_components/sensor.ring.markdown
+++ b/source/_components/sensor.ring.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: ring.png
-ha_category: Sensor
+ha_category: Doorbell
 ha_release: "0.40"
 ha_iot_class: "Cloud Polling"
 ---
 
 To get your [Ring.com](https://ring.com/) binary sensors working within Home Assistant, please follow the instructions for the general [Ring component](/components/ring).
 
+## {% linkable_title Configuration %}
+
 Once you have enabled the [Ring component](/components/ring), add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.skybell.markdown b/source/_components/sensor.skybell.markdown
index 4c9f3b5434c..023ee75738f 100644
--- a/source/_components/sensor.skybell.markdown
+++ b/source/_components/sensor.skybell.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: skybell.png
-ha_category: Sensor
+ha_category: Doorbell
 ha_release: 0.56
 ha_iot_class: "Cloud Polling"
 ---
 
 To get your [Skybell.com](https://skybell.com/) sensors working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
 
+## {% linkable_title Configuration %}
+
 Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/sensor.teksavvy.markdown b/source/_components/sensor.teksavvy.markdown
index 9f7a8e70faa..c55d05f3f39 100644
--- a/source/_components/sensor.teksavvy.markdown
+++ b/source/_components/sensor.teksavvy.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: teksavvy.png
-ha_category: Sensor
+ha_category: Network
 ha_release: 0.62
 ha_iot_class: "Cloud Polling"
 ---
@@ -17,6 +17,8 @@ Integrate your [TekSavvy](https://myaccount.teksavvy.com/) account information i
 
 You can get your API key from [TekSavvy My Account](https://myaccount.teksavvy.com/ApiKey/ApiKeyManagement).
 
+## {% linkable_title Configuration %}
+
 To use your TekSavvy sensor in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/skybell.markdown b/source/_components/skybell.markdown
index 189f3a1b999..379cf3248a0 100644
--- a/source/_components/skybell.markdown
+++ b/source/_components/skybell.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: skybell.png
-ha_category: Hub
+ha_category: Doorbell
 ha_release: 0.56
 ha_iot_class: "Cloud Polling"
 ---
diff --git a/source/_components/sun.markdown b/source/_components/sun.markdown
index 91d1f7903eb..2b8cf1e3313 100644
--- a/source/_components/sun.markdown
+++ b/source/_components/sun.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: home-assistant.png
-ha_category: Weather
+ha_category: Environment
 ---
 
 The sun component will use your current location to track if the sun is above or below the horizon. The sun can be used within automation as [a trigger with an optional offset to simulate dawn/dusk][automation-trigger].
diff --git a/source/_components/switch.skybell.markdown b/source/_components/switch.skybell.markdown
index 511aa39c1aa..632f5d770c9 100644
--- a/source/_components/switch.skybell.markdown
+++ b/source/_components/switch.skybell.markdown
@@ -15,6 +15,8 @@ ha_iot_class: "Cloud Polling"
 
 To get your [Skybell.com](https://skybell.com/) switches working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
 
+## {% linkable_title Configuration %}
+
 Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
 
 ```yaml