diff --git a/source/_components/thingspeak.markdown b/source/_components/thingspeak.markdown
index 386b0931404..e0409dc36d3 100644
--- a/source/_components/thingspeak.markdown
+++ b/source/_components/thingspeak.markdown
@@ -1,7 +1,7 @@
 ---
 layout: page
-title: "Thingspeak"
-description: "Record one entity in Thingspeak"
+title: "ThingSpeak"
+description: "Record one entity in ThingSpeak"
 date: 2016-10-24 15:45
 sidebar: true
 comments: false
@@ -15,25 +15,21 @@ The `thingspeak` components makes Home Assistant communicate with the [ThingSpea
 For now, it records exactly one entity at once, which is great for testing purposes. For long-time storage you should rely
 on the [InfluxDB component](https://home-assistant.io/components/influxdb/).
 
-```yaml
-# Example configuration.yaml entry
-thingspeak:
-```
-
 You will have to create a [new channel](https://thingspeak.com/channels/new) on ThingSpeak and grab your API key from your [account page](https://thingspeak.com/account). 
 
-Configuration variables:
-- **api_key**: Yout ThingSpeak API key
-- **id**: The ID of your desired ThingSpeak channel
-- **whitelist**: The name of the entity whose states should be sent to the channel.
-
-## {% linkable_title Examples %}
-
-### {% linkable_title Full configuration %}
+To setup the ThinkSpeak component in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
+# Example configuration.yaml entry
 thingspeak:
   api_key: MY_API_KEY
   id: 1337
   whitelist: sensor.yr_temperature
-```
\ No newline at end of file
+```
+
+Configuration variables:
+
+- **api_key** (*Required*): Yout ThingSpeak API key.
+- **id** (*Required*): The ID of your desired ThingSpeak channel.
+- **whitelist** (*Required*): The name of the entity whose states should be sent to the channel.
+