diff --git a/source/_components/binary_sensor.digital_ocean.markdown b/source/_components/binary_sensor.digital_ocean.markdown
index e4bc04ac1cb..516abfe6e9a 100644
--- a/source/_components/binary_sensor.digital_ocean.markdown
+++ b/source/_components/binary_sensor.digital_ocean.markdown
@@ -15,6 +15,8 @@ ha_iot_class: "Local Polling"
 
 The `digital_ocean` binary sensor platform allows you to monitor your Digital Ocean droplets.
 
+### {% linkable_title Configuration %}
+
 To use your Digital Ocean droplets, you first have to set up your [Digital Ocean hub](/components/digital_ocean/) and then add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/binary_sensor.linode.markdown b/source/_components/binary_sensor.linode.markdown
index 0ffbddb5817..cf6392993f5 100644
--- a/source/_components/binary_sensor.linode.markdown
+++ b/source/_components/binary_sensor.linode.markdown
@@ -15,6 +15,8 @@ ha_iot_class: "Cloud Polling"
 
 The `linode` binary sensor platform allows you to monitor your Linode nodes.
 
+## {% linkable_title Configuration %}
+
 Add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/digital_ocean.markdown b/source/_components/digital_ocean.markdown
index 4554819ee2a..fd5d744376b 100644
--- a/source/_components/digital_ocean.markdown
+++ b/source/_components/digital_ocean.markdown
@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: Hub
+ha_category: System Monitor
 ha_release: "0.30"
 logo: digital_ocean.png
 ha_iot_class: "Local Polling"
@@ -16,8 +16,12 @@ ha_iot_class: "Local Polling"
 
 The `digital_ocean` component allows you to access the information about your [Digital Ocean](https://www.digitalocean.com/) droplets from Home Assistant.
 
+### {% linkable_title Setup %}
+
 Obtain your API key from your [Digital Ocean dashboard](https://cloud.digitalocean.com/settings/api/tokens).
 
+### {% linkable_title Configuration %}
+
 To integrate your Digital Ocean droplets with Home Assistant, add the following section to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/linode.markdown b/source/_components/linode.markdown
index 623132c0448..5b6dad85214 100644
--- a/source/_components/linode.markdown
+++ b/source/_components/linode.markdown
@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: Hub
+ha_category: Move to System Monitor category
 logo: linode.png
 ha_release: 0.57
 ha_iot_class: "Cloud Polling"
@@ -15,12 +15,17 @@ ha_iot_class: "Cloud Polling"
 
 The `linode` component allows you to access the information about your [Linode](https://linode.com) systems from Home Assistant.
 
+## {% linkable_title sETUP %}
+
 Obtain your oAuth2 Access Token from Linode account.
-*   <http://cloud.linode.com>
-*   Log in
-*   Select API Tokens
-*   Create a Personal Access Token,
-*   Assigned scope (Please choose the least possible access required.)
+
+* <http://cloud.linode.com>
+* Log in
+* Select API Tokens
+* Create a Personal Access Token,
+* Assigned scope (Please choose the least possible access required.)
+
+## {% linkable_title Configuration %}
 
 To integrate Linode with Home Assistant, add the following section to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.digital_ocean.markdown b/source/_components/switch.digital_ocean.markdown
index e17a74ab35c..dc59db6f96e 100644
--- a/source/_components/switch.digital_ocean.markdown
+++ b/source/_components/switch.digital_ocean.markdown
@@ -8,13 +8,15 @@ comments: false
 sharing: true
 footer: true
 logo: digital_ocean.png
-ha_category: Switch
+ha_category: System Monitor
 ha_release: "0.30"
 ha_iot_class: "Local Polling"
 ---
 
 The `digital_ocean` switch platform allows you to control (start/stop) your Digital Ocean droplets.
 
+### {% linkable_title Configuration %}
+
 To use your Digital Ocean droplets, you first have to set up your [Digital Ocean hub](/components/digital_ocean/) and then add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/switch.digitalloggers.markdown b/source/_components/switch.digitalloggers.markdown
index c0c2272d172..01fc3f88190 100755
--- a/source/_components/switch.digitalloggers.markdown
+++ b/source/_components/switch.digitalloggers.markdown
@@ -16,6 +16,8 @@ ha_iot_class: "Local Polling"
 
 The `digitalloggers` switch platform allows you to control the state of your [Digital Loggers](http://www.digital-loggers.com/dinfaqs.html) switches. 
 
+### {% linkable_title Configuration %}
+
 To use your digitalloggers switch in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
diff --git a/source/_components/switch.vultr.markdown b/source/_components/switch.vultr.markdown
index 087be7fe925..c02e5273b1e 100644
--- a/source/_components/switch.vultr.markdown
+++ b/source/_components/switch.vultr.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: vultr.png
-ha_category: Switch
+ha_category: System Monitor
 ha_release: "0.58"
 ha_iot_class: "Cloud Polling"
 ---
diff --git a/source/_components/vultr.markdown b/source/_components/vultr.markdown
index 187ddaab3f3..98051d2038c 100644
--- a/source/_components/vultr.markdown
+++ b/source/_components/vultr.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 featured: false
-ha_category: Hub
+ha_category: System Monitor
 ha_release: "0.58"
 logo: vultr.png
 ha_iot_class: "Cloud Polling"