diff --git a/source/_components/switch.thinkingcleaner.markdown b/source/_components/switch.thinkingcleaner.markdown
deleted file mode 100644
index a16f6041c1c..00000000000
--- a/source/_components/switch.thinkingcleaner.markdown
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: page
-title: "Thinking Cleaner Switch"
-description: "Instructions on how to integrate a ThinkingCleaner switches within Home Assistant."
-date: 2016-04-10 17:24
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: thinkingcleaner.png
-ha_category: Switch
-ha_iot_class: Local Polling
-ha_release: 0.18
----
-
-The `thinkingcleaner` switch platform allows you to control your [Thinking Cleaner](http://www.thinkingcleaner.com) add-on.
-
-To enable this switch in your installation, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: thinkingcleaner
-```
-
-This will automatically add switches for each Thinking Cleaner in your network.
diff --git a/source/_components/thinkingcleaner.markdown b/source/_components/thinkingcleaner.markdown
index c422a00011d..0cd6c0f6e91 100644
--- a/source/_components/thinkingcleaner.markdown
+++ b/source/_components/thinkingcleaner.markdown
@@ -1,20 +1,30 @@
 ---
 layout: page
-title: "Thinking Cleaner sensor"
-description: "Instructions on how to integrate a ThinkingCleaner sensor within Home Assistant."
+title: "Thinking Cleaner"
+description: "Instructions on how to integrate a ThinkingCleaner within Home Assistant."
 date: 2016-04-10 17:24
 sidebar: true
 comments: false
 sharing: true
 footer: true
 logo: thinkingcleaner.png
-ha_category: Sensor
+ha_category:
+  - Sensor
+  - Switch
 ha_iot_class: Local Polling
 ha_release: 0.18
 redirect_from:
  - /components/sensor.thinkingcleaner/
+ - /components/switch.thinkingcleaner/
 ---
 
+There is currently support for the following device types within Home Assistant:
+
+- [Sensor](#sensor)
+- [Switch](#switch)
+
+## {% linkable_title Sensor %}
+
 The `thinkingcleaner` sensor platform simple displays information about your [Thinking Cleaner](http://www.thinkingcleaner.com) add-on.
 
 To enable this sensor in your installation, add the following to your `configuration.yaml` file:
@@ -26,3 +36,17 @@ sensor:
 ```
 
 This will automatically add sensors for each Thinking Cleaner in your network.
+
+## {% linkable_title switch %}
+
+The `thinkingcleaner` switch platform allows you to control your [Thinking Cleaner](http://www.thinkingcleaner.com) add-on.
+
+To enable this switch in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: thinkingcleaner
+```
+
+This will automatically add switches for each Thinking Cleaner in your network.