diff --git a/source/_components/sensor.thinkingcleaner.markdown b/source/_components/sensor.thinkingcleaner.markdown
new file mode 100644
index 00000000000..6d885939c2a
--- /dev/null
+++ b/source/_components/sensor.thinkingcleaner.markdown
@@ -0,0 +1,26 @@
+---
+layout: page
+title: "ThinkingCleaner"
+description: "Instructions 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_iot_class: "Local Poll"
+--------------------------
+
+
+The `ThinkingCleaner` sensor platform simple displays information about your [ThinkingCleaner](http://www.thinkingcleaner.com) addon.
+
+To enable this sensor in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: thinkingcleaner
+```
+
+This will automatically add sensors for each Thinking Cleaner in your network.
\ No newline at end of file
diff --git a/source/_components/switch.thinkingcleaner.markdown b/source/_components/switch.thinkingcleaner.markdown
new file mode 100644
index 00000000000..8c559269e02
--- /dev/null
+++ b/source/_components/switch.thinkingcleaner.markdown
@@ -0,0 +1,26 @@
+---
+layout: page
+title: "ThinkingCleaner"
+description: "Instructions 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: Switch
+ha_iot_class: "Local Poll"
+--------------------------
+
+
+The `ThinkingCleaner` switch platform simple displays information about your [ThinkingCleaner](http://www.thinkingcleaner.com) addon.
+
+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.
\ No newline at end of file
diff --git a/source/images/supported_brands/thninkingcleaner.png b/source/images/supported_brands/thninkingcleaner.png
new file mode 100644
index 00000000000..f6ff527d970
Binary files /dev/null and b/source/images/supported_brands/thninkingcleaner.png differ