From 567840e2b87c61297956a1e96dbd3db69d01bf4e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 6 Feb 2016 09:27:20 +0100
Subject: [PATCH] Capitalize titles and other minor update

---
 source/_components/alarm_control_panel.markdown  |  1 +
 source/_components/arduino.markdown              |  2 +-
 source/_components/binary_sensor.arest.markdown  |  4 ++--
 .../_components/binary_sensor.command.markdown   |  2 +-
 source/_components/binary_sensor.mqtt.markdown   |  2 +-
 source/_components/binary_sensor.nest.markdown   | 15 ++++++++++++---
 source/_components/binary_sensor.rest.markdown   |  2 +-
 .../_components/binary_sensor.rpi_gpio.markdown  |  4 ++--
 source/_components/binary_sensor.zigbee.markdown |  2 +-
 source/_components/camera.foscam.markdown        |  4 ++--
 source/_components/camera.mjpeg.markdown         |  2 +-
 source/_components/device_tracker.mqtt.markdown  |  2 +-
 .../_components/light.blinksticklight.markdown   |  2 +-
 source/_components/light.hyperion.markdown       |  2 +-
 source/_components/light.limitlessled.markdown   |  1 -
 source/_components/light.mqtt.markdown           |  2 +-
 source/_components/light.rfxtrx.markdown         |  5 +++--
 source/_components/light.tellstick.markdown      |  4 ++--
 source/_components/light.vera.markdown           |  4 ++--
 source/_components/light.wink.markdown           |  4 ++--
 source/_components/light.zwave.markdown          |  2 +-
 source/_components/lock.wink.markdown            |  4 ++--
 source/_components/media_player.denon.markdown   |  2 +-
 source/_components/media_player.firetv.markdown  |  2 +-
 source/_components/media_player.kodi.markdown    |  2 +-
 source/_components/media_player.mpd.markdown     |  2 +-
 source/_components/media_player.sonos.markdown   |  2 +-
 source/_components/notify.file.markdown          |  2 +-
 source/_components/notify.instapush.markdown     |  2 +-
 source/_components/notify.mqtt.markdown          |  2 +-
 source/_components/notify.slack.markdown         |  2 +-
 source/_components/notify.syslog.markdown        |  2 +-
 source/_components/notify.xmpp.markdown          |  2 +-
 source/_components/sensor.arduino.markdown       |  4 ++--
 source/_components/sensor.arest.markdown         |  4 ++--
 source/_components/sensor.bitcoin.markdown       |  2 +-
 .../_components/sensor.command_sensor.markdown   |  2 +-
 source/_components/sensor.cpuspeed.markdown      |  2 +-
 source/_components/sensor.dht.markdown           |  4 ++--
 source/_components/sensor.ecobee.markdown        |  2 +-
 source/_components/sensor.forecast.markdown      |  2 +-
 source/_components/sensor.glances.markdown       |  2 +-
 source/_components/sensor.modbus.markdown        |  4 ++--
 source/_components/sensor.mqtt.markdown          |  2 +-
 source/_components/sensor.mysensors.markdown     |  2 +-
 source/_components/sensor.nest.markdown          | 16 +++++++++++++---
 source/_components/sensor.netatmo.markdown       |  4 ++--
 source/_components/sensor.onewire.markdown       |  2 +-
 .../_components/sensor.openweathermap.markdown   |  2 +-
 source/_components/sensor.rest.markdown          |  2 +-
 source/_components/sensor.rfxtrx.markdown        |  4 ++--
 source/_components/sensor.sabnzbd.markdown       |  2 +-
 .../sensor.swiss_public_transport.markdown       |  2 +-
 source/_components/sensor.systemmonitor.markdown |  2 +-
 source/_components/sensor.tellduslive.markdown   |  2 +-
 source/_components/sensor.tellstick.markdown     |  4 ++--
 source/_components/sensor.temper.markdown        |  4 ++--
 source/_components/sensor.template.markdown      |  2 +-
 source/_components/sensor.time_date.markdown     |  2 +-
 source/_components/sensor.transmission.markdown  |  6 +++---
 source/_components/sensor.vera.markdown          |  4 ++--
 source/_components/sensor.wink.markdown          |  4 ++--
 source/_components/sensor.worldclock.markdown    |  2 +-
 source/_components/sensor.zwave.markdown         |  2 +-
 source/_components/switch.arduino.markdown       |  4 ++--
 source/_components/switch.arest.markdown         |  4 ++--
 .../_components/switch.command_switch.markdown   |  2 +-
 source/_components/switch.edimax.markdown        |  4 ++--
 source/_components/switch.hikvision.markdown     |  4 ++--
 source/_components/switch.modbus.markdown        |  4 ++--
 source/_components/switch.mqtt.markdown          |  2 +-
 source/_components/switch.mysensors.markdown     |  2 +-
 source/_components/switch.mystrom.markdown       |  2 +-
 source/_components/switch.orvibo.markdown        |  4 ++--
 source/_components/switch.rest.markdown          |  2 +-
 source/_components/switch.rfxtrx.markdown        |  5 +++--
 source/_components/switch.rpi_gpio.markdown      |  4 ++--
 source/_components/switch.tellduslive.markdown   |  2 +-
 source/_components/switch.tellstick.markdown     |  4 ++--
 source/_components/switch.transmission.markdown  |  4 ++--
 source/_components/switch.vera.markdown          |  4 ++--
 source/_components/switch.wemo.markdown          |  4 ++--
 source/_components/switch.wink.markdown          |  4 ++--
 source/_components/switch.zigbee.markdown        |  2 +-
 source/_components/switch.zwave.markdown         |  2 +-
 source/_components/tellstick.markdown            |  2 +-
 source/_components/thermostat.ecobee.markdown    |  2 +-
 source/_components/thermostat.heatmiser.markdown |  6 +++---
 source/_components/thermostat.homematic.markdown |  4 ++--
 source/_components/thermostat.honeywell.markdown |  4 ++--
 source/_components/thermostat.nest.markdown      |  4 ++--
 source/_components/thermostat.proliphix.markdown |  2 +-
 .../_components/thermostat.radiotherm.markdown   |  4 ++--
 93 files changed, 156 insertions(+), 135 deletions(-)

diff --git a/source/_components/alarm_control_panel.markdown b/source/_components/alarm_control_panel.markdown
index ec617fa3e9..f3fc25736d 100644
--- a/source/_components/alarm_control_panel.markdown
+++ b/source/_components/alarm_control_panel.markdown
@@ -12,6 +12,7 @@ footer: true
 
 Home Assistant can give you an interface with is similar to a classic alarm system. There are several panels supported:
 
+- [Alarm.com](/components/alarm_control_panel.alarmdotcom/)
 - [Manual](/components/alarm_control_panel.manual/)
 - [MQTT](/components/alarm_control_panel.mqtt/)
 - [Verisure](/components/verisure/)
diff --git a/source/_components/arduino.markdown b/source/_components/arduino.markdown
index 08f3a7073f..19c482136f 100644
--- a/source/_components/arduino.markdown
+++ b/source/_components/arduino.markdown
@@ -16,7 +16,7 @@ The [Arduino](https://www.arduino.cc/) device family are microcontroller boards
 
 There are a lot of extensions (so called [shields](https://www.arduino.cc/en/Main/ArduinoShields)) available. Those shields can be plugged-in into the existing connectors and stacked on top of each other. This makes it possible to expand the capabilities of the Arduino boards. 
 
-The arduino component is designed to let you use a directly attached board to your Home Assistant host over USB.
+The `arduino` component is designed to let you use a directly attached board to your Home Assistant host over USB.
 
 You need to have the [Firmata firmware](https://github.com/firmata/) on your board. Please upload the `StandardFirmata` sketch to your board, please refer to the [Arduino documentation](https://www.arduino.cc/en/Main/Howto) for further information.
 
diff --git a/source/_components/binary_sensor.arest.markdown b/source/_components/binary_sensor.arest.markdown
index dc383882e9..b14f1f8ecc 100644
--- a/source/_components/binary_sensor.arest.markdown
+++ b/source/_components/binary_sensor.arest.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "aREST binary sensor"
+title: "aREST Binary Sensor"
 description: "Instructions how to integrate aREST binary sensors within Home Assistant."
 date: 2015-11-20 18:15
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Binary Sensor
 ---
 
 
-The arest binary sensor platform allows you to get all data from your devices (like Arduinos with a ethernet/wifi connection, the ESP8266, and the Raspberry Pi) running the [aREST](http://arest.io/) RESTful framework.
+The `arest` binary sensor platform allows you to get all data from your devices (like Arduinos with a ethernet/wifi connection, the ESP8266, and the Raspberry Pi) running the [aREST](http://arest.io/) RESTful framework.
 
 To use your aREST binary sensor in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/binary_sensor.command.markdown b/source/_components/binary_sensor.command.markdown
index 74147e8a3a..d7305fd5d8 100644
--- a/source/_components/binary_sensor.command.markdown
+++ b/source/_components/binary_sensor.command.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Command line binary sensor"
+title: "Command line Binary Sensor"
 description: "Instructions how to integrate Command binary sensors within Home Assistant."
 date: 2016-01-13 12:15
 sidebar: true
diff --git a/source/_components/binary_sensor.mqtt.markdown b/source/_components/binary_sensor.mqtt.markdown
index 6ab07dff65..9b39734689 100644
--- a/source/_components/binary_sensor.mqtt.markdown
+++ b/source/_components/binary_sensor.mqtt.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "MQTT binary sensor"
+title: "MQTT Binary Sensor"
 description: "Instructions how to integrate MQTT binary sensors within Home Assistant."
 date: 2015-05-30 23:21
 sidebar: true
diff --git a/source/_components/binary_sensor.nest.markdown b/source/_components/binary_sensor.nest.markdown
index cc50ba8bfb..5479653842 100644
--- a/source/_components/binary_sensor.nest.markdown
+++ b/source/_components/binary_sensor.nest.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Nest binary sensor"
+title: "Nest Binary Sensor"
 description: "Instructions how to integrate Nest binary sensors within Home Assistant."
 date: 2016-01-26 08:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Binary Sensor
 ---
 
 
-The Nest binary sensor platform let you monitor various states of a thermostat from [Nest](https://nest.com).
+The `nest` binary sensor platform let you monitor various states of a thermostat from [Nest](https://nest.com).
 
 To set it up, add the following information to your `configuration.yaml` file:
 
@@ -34,5 +34,14 @@ sensor:
 Configuration variables:
 
 - **monitored_conditions** array (*Required*): States to monitor.
+  - 'fan'
+  - 'hvac_ac_state'
+  - 'hvac_aux_heater_state'
+  - 'hvac_heat_x2_state'
+  - 'hvac_heat_x3_state'
+  - 'hvac_alt_heat_state'
+  - 'hvac_alt_heat_x2_state'
+  - 'hvac_emer_heat_state'
+  - 'online'
 
-<p class='note'>You must have the [Nest component](https://home-assistant.io/components/nest/) configured to use this sensor.</p>
+<p class='note'>You must have the [Nest component](/components/nest/) configured to use this sensor.</p>
diff --git a/source/_components/binary_sensor.rest.markdown b/source/_components/binary_sensor.rest.markdown
index 6cb56043db..b3b64ae91a 100644
--- a/source/_components/binary_sensor.rest.markdown
+++ b/source/_components/binary_sensor.rest.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "RESTful binary sensor"
+title: "RESTful Binary Sensor"
 description: "Instructions how to integrate REST binary sensors into Home Assistant."
 date: 2015-12-17 19:10
 sidebar: true
diff --git a/source/_components/binary_sensor.rpi_gpio.markdown b/source/_components/binary_sensor.rpi_gpio.markdown
index 4bc2f7581c..a94c65bc23 100644
--- a/source/_components/binary_sensor.rpi_gpio.markdown
+++ b/source/_components/binary_sensor.rpi_gpio.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Raspberry PI GPIO sensor"
+title: "Raspberry PI GPIO Binary Sensor"
 description: "Instructions how to integrate the GPIO sensor capability of a Raspberry PI into Home Assistant."
 date: 2015-08-30 19:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-The rpi_gpio binary sensor platform allows you to read sensor values of the GPIOs of your [Raspberry Pi](https://www.raspberrypi.org/).
+The `rpi_gpio` binary sensor platform allows you to read sensor values of the GPIOs of your [Raspberry Pi](https://www.raspberrypi.org/).
 
 To use your Raspberry Pi's GPIO in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/binary_sensor.zigbee.markdown b/source/_components/binary_sensor.zigbee.markdown
index 7d270316e2..df2cff5a4b 100644
--- a/source/_components/binary_sensor.zigbee.markdown
+++ b/source/_components/binary_sensor.zigbee.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: ZigBee Binary Sensor
+title: "ZigBee Binary Sensor"
 description: "Instructions on how to set up ZigBee binary sensors within Home Assistant."
 date: 2016-01-28 12:38
 sidebar: true
diff --git a/source/_components/camera.foscam.markdown b/source/_components/camera.foscam.markdown
index 9fd47c6a9f..a911ca8b53 100644
--- a/source/_components/camera.foscam.markdown
+++ b/source/_components/camera.foscam.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Foscam IP camera"
+title: "Foscam IP Camera"
 description: "Instructions how to integrate Foscam IP cameras within Home Assistant."
 date: 2015-09-17 08:01
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Camera
 ---
 
 
-The foscam platform allows you to watch the live stream of your [Foscam](http://www.foscam.com/) IP camera in Home Assistant.
+The `foscam` platform allows you to watch the live stream of your [Foscam](http://www.foscam.com/) IP camera in Home Assistant.
 
 To enable your Foscam IP camera in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/camera.mjpeg.markdown b/source/_components/camera.mjpeg.markdown
index 8fd297d0e4..f646b39e38 100644
--- a/source/_components/camera.mjpeg.markdown
+++ b/source/_components/camera.mjpeg.markdown
@@ -11,7 +11,7 @@ ha_category: Camera
 ---
 
 
-The mjpeg component allows you to integrate IP cameras which are capable to  stream their video with MJPEG into Home Assistant.
+The `mjpeg` component allows you to integrate IP cameras which are capable to  stream their video with MJPEG into Home Assistant.
 
 To enable this sensor in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/device_tracker.mqtt.markdown b/source/_components/device_tracker.mqtt.markdown
index 70c71cdebe..f7ed2156f5 100644
--- a/source/_components/device_tracker.mqtt.markdown
+++ b/source/_components/device_tracker.mqtt.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "MQTT device tracker"
+title: "MQTT Device Tracker"
 description: "Instructions how to use MQTT to track devices in Home Assistant."
 date: 2015-09-19 20:41
 sidebar: true
diff --git a/source/_components/light.blinksticklight.markdown b/source/_components/light.blinksticklight.markdown
index e1e1c186c7..459676cf0b 100644
--- a/source/_components/light.blinksticklight.markdown
+++ b/source/_components/light.blinksticklight.markdown
@@ -12,7 +12,7 @@ ha_category: Light
 ---
 
 
-The blinkstick platform let you can control your [Blinkstick](https://www.blinkstick.com/) lights from within Home Assistant.
+The `blinkstick` platform let you can control your [Blinkstick](https://www.blinkstick.com/) lights from within Home Assistant.
 
 To add blinkstick to your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/light.hyperion.markdown b/source/_components/light.hyperion.markdown
index db95cad7a4..1260dbc2c3 100644
--- a/source/_components/light.hyperion.markdown
+++ b/source/_components/light.hyperion.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: Hyperion
+title: "Hyperion"
 description: "Instructions how to integrate Hyperion into Home Assistant."
 date: 2015-10-25 22:43
 sidebar: true
diff --git a/source/_components/light.limitlessled.markdown b/source/_components/light.limitlessled.markdown
index 57b088c9ad..892313be9f 100644
--- a/source/_components/light.limitlessled.markdown
+++ b/source/_components/light.limitlessled.markdown
@@ -5,7 +5,6 @@ description: "Instructions on how to setup LimitlessLED within Home Assistant."
 date: 2015-12-03 13:00
 sidebar: true
 layout: page
-title: "LimitlessLED support"
 sidebar: false
 comments: false
 sharing: true
diff --git a/source/_components/light.mqtt.markdown b/source/_components/light.mqtt.markdown
index 6e8b57ce21..a3712391b6 100644
--- a/source/_components/light.mqtt.markdown
+++ b/source/_components/light.mqtt.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "MQTT light"
+title: "MQTT Light"
 description: "Instructions how to setup MQTT lights within Home Assistant."
 date: 2015-11-13 08:30
 sidebar: true
diff --git a/source/_components/light.rfxtrx.markdown b/source/_components/light.rfxtrx.markdown
index a793421e6a..ee2f5813eb 100644
--- a/source/_components/light.rfxtrx.markdown
+++ b/source/_components/light.rfxtrx.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "RFXtrx light"
+title: "RFXtrx Light"
 description: "Instructions how to integrate RFXtrx lights into Home Assistant."
 date: 2015-10-08 10:15
 sidebar: true
@@ -9,7 +9,8 @@ sharing: true
 footer: true
 ha_category: Light
 ---
-The rfxtrx platform support lights that communicate in the frequency range of 433.92 MHz.
+
+The `rfxtrx` platform support lights that communicate in the frequency range of 433.92 MHz.
 
 To enable RFXtrx lights in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/light.tellstick.markdown b/source/_components/light.tellstick.markdown
index 733ca3ce7b..8ebf9e8cb6 100644
--- a/source/_components/light.tellstick.markdown
+++ b/source/_components/light.tellstick.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "TellStick light"
+title: "TellStick Light"
 description: "Instructions how to integrate TellStick lights into Home Assistant."
 date: 2015-08-06 19:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Light
 ---
 
 
-This tellstick light platform allows you to control your [TellStick](http://www.telldus.se/products/tellstick) dimmers.
+This `tellstick` light platform allows you to control your [TellStick](http://www.telldus.se/products/tellstick) dimmers.
 
 To use your TellStick device in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/light.vera.markdown b/source/_components/light.vera.markdown
index 5ab3de9e3c..3c4c08be05 100644
--- a/source/_components/light.vera.markdown
+++ b/source/_components/light.vera.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Vera light"
+title: "Vera Light"
 description: "Instructions how to integrate Vera lights into Home Assistant."
 date: 2015-10-20 21:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Light
 ---
 
 
-This vera light platform allows you to control your [Vera](http://getvera.com/) lights.
+This `vera` light platform allows you to control your [Vera](http://getvera.com/) lights.
 
 This platform is useful if you wish for switches connected to your Vera controller to appear as lights in Home Assistant. All switches will be added as a light unless you exclude them in the configuration file.
 
diff --git a/source/_components/light.wink.markdown b/source/_components/light.wink.markdown
index d4d86298a7..62bdc4753d 100644
--- a/source/_components/light.wink.markdown
+++ b/source/_components/light.wink.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Wink light"
+title: "Wink Light"
 description: "Instructions how to setup the Wink lights within Home Assistant."
 date: 2015-01-20 22:36
 sidebar: true
@@ -12,6 +12,6 @@ ha_category: Light
 ---
 
 
-The wink sensor platform allows you to use your [Wink](http://www.wink.com/) lights.
+The wink light platform allows you to use your [Wink](http://www.wink.com/) lights.
 
 The requirement is that you have setup your [Wink hub](/components/light.wink/).
diff --git a/source/_components/light.zwave.markdown b/source/_components/light.zwave.markdown
index 4b547ee58d..5c5d573a56 100644
--- a/source/_components/light.zwave.markdown
+++ b/source/_components/light.zwave.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Z-Wave light"
+title: "Z-Wave Light"
 description: "Instructions how to setup the Z-Wave lights within Home Assistant."
 date: 2015-11-11 13:00
 sidebar: true
diff --git a/source/_components/lock.wink.markdown b/source/_components/lock.wink.markdown
index 656c149151..6e25951dd1 100644
--- a/source/_components/lock.wink.markdown
+++ b/source/_components/lock.wink.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Wink lock"
+title: "Wink Lock"
 description: "Instructions how to setup the Wink locks within Home Assistant."
 date: 2015-11-20 12:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Lock
 ---
 
 
-The wink lock platform allows you to control your [Wink](http://www.wink.com/) locks.
+The Wink lock platform allows you to control your [Wink](http://www.wink.com/) locks.
 
 The requirement is that you have setup your [Wink hub](/components/wink/).
 
diff --git a/source/_components/media_player.denon.markdown b/source/_components/media_player.denon.markdown
index 1b7890b98c..382f154a63 100644
--- a/source/_components/media_player.denon.markdown
+++ b/source/_components/media_player.denon.markdown
@@ -12,7 +12,7 @@ ha_category: Media Player
 ---
 
 
-The denon platform allows you to control a [Denon Network Receivers](http://www.denon.co.uk/chg/product/compactsystems/networkmusicsystems/ceolpiccolo) from Home Assistant.
+The `denon` platform allows you to control a [Denon Network Receivers](http://www.denon.co.uk/chg/product/compactsystems/networkmusicsystems/ceolpiccolo) from Home Assistant.
 
 Supported devices:
 
diff --git a/source/_components/media_player.firetv.markdown b/source/_components/media_player.firetv.markdown
index 8f52a5582d..0d1aefa7dc 100644
--- a/source/_components/media_player.firetv.markdown
+++ b/source/_components/media_player.firetv.markdown
@@ -12,7 +12,7 @@ ha_category: Media Player
 ---
 
 
-The firetv platform allows you to control a [Amazon Fire TV/stick](http://www.amazon.com/Amazon-DV83YW-Fire-TV/dp/B00U3FPN4U).
+The `firetv` platform allows you to control a [Amazon Fire TV/stick](http://www.amazon.com/Amazon-DV83YW-Fire-TV/dp/B00U3FPN4U).
 
 The python-firetv Python 2.x module with its helper script that exposes a HTTP server to fetch state and perform actions is used.
 
diff --git a/source/_components/media_player.kodi.markdown b/source/_components/media_player.kodi.markdown
index effa67c954..905d108b08 100644
--- a/source/_components/media_player.kodi.markdown
+++ b/source/_components/media_player.kodi.markdown
@@ -13,7 +13,7 @@ featured: true
 ---
 
 
-The kodi platform allows you to control a [Kodi](http://kodi.tv/) multimedia system from Home Assistant.
+The `kodi` platform allows you to control a [Kodi](http://kodi.tv/) multimedia system from Home Assistant.
 
 To add Kodi to your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/media_player.mpd.markdown b/source/_components/media_player.mpd.markdown
index 49d5b26532..cd2a8e3f8a 100644
--- a/source/_components/media_player.mpd.markdown
+++ b/source/_components/media_player.mpd.markdown
@@ -12,7 +12,7 @@ ha_category: Media Player
 ---
 
 
-The mpd platform allows you to control a [Music Player Daemon](http://www.musicpd.org/) from Home Assistant. Unfortunatly you will not be able to manipulate the playlist (add or delete songs) or add transitions between the songs. 
+The `mpd` platform allows you to control a [Music Player Daemon](http://www.musicpd.org/) from Home Assistant. Unfortunatly you will not be able to manipulate the playlist (add or delete songs) or add transitions between the songs. 
 
 To add MPD to your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/media_player.sonos.markdown b/source/_components/media_player.sonos.markdown
index 22354e8d55..a080ae0f4b 100644
--- a/source/_components/media_player.sonos.markdown
+++ b/source/_components/media_player.sonos.markdown
@@ -13,7 +13,7 @@ featured: true
 ---
 
 
-The sonos platform allows you to control your [Sonos](http://www.sonos.com) HiFi wireless speakers and audio components from Home Assistant.
+The `sonos` platform allows you to control your [Sonos](http://www.sonos.com) HiFi wireless speakers and audio components from Home Assistant.
 
 To add your Sonos components to your installation, add the following to your `configuration.yaml` file.  It will perform auto-discovery of your connected speakers.
 
diff --git a/source/_components/notify.file.markdown b/source/_components/notify.file.markdown
index da02630853..042c088e80 100644
--- a/source/_components/notify.file.markdown
+++ b/source/_components/notify.file.markdown
@@ -11,7 +11,7 @@ ha_category: Notifications
 ---
 
 
-The file platform allows you to store notifications from Home Assistant as a file.
+The `file` platform allows you to store notifications from Home Assistant as a file.
 
 To enable file notifications in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/notify.instapush.markdown b/source/_components/notify.instapush.markdown
index 9160a0ea64..77bd22b884 100644
--- a/source/_components/notify.instapush.markdown
+++ b/source/_components/notify.instapush.markdown
@@ -12,7 +12,7 @@ ha_category: Notifications
 ---
 
 
-The instapush platform uses [Instapush](https://instapush.im) to delivery notifications from Home Assistant to your Android or iOS device.
+The `instapush` platform uses [Instapush](https://instapush.im) to delivery notifications from Home Assistant to your Android or iOS device.
 
 The Instapush [Getting Started page](https://instapush.im/home/start/) will guide through the process of creating the required items.
 
diff --git a/source/_components/notify.mqtt.markdown b/source/_components/notify.mqtt.markdown
index a83e262295..e87485a0b5 100644
--- a/source/_components/notify.mqtt.markdown
+++ b/source/_components/notify.mqtt.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "MQTT notifications"
+title: "MQTT Notifications"
 description: "Instructions how to add MQTT notifications to Home Assistant."
 date: 2016-02-01 08:00
 sidebar: true
diff --git a/source/_components/notify.slack.markdown b/source/_components/notify.slack.markdown
index df0d51888e..d3639631ce 100644
--- a/source/_components/notify.slack.markdown
+++ b/source/_components/notify.slack.markdown
@@ -12,7 +12,7 @@ ha_category: Notifications
 ---
 
 
-The slack platform allows you to deliver notifications from Home Assistant to [Slack](https://slack.com/).
+The `slack` platform allows you to deliver notifications from Home Assistant to [Slack](https://slack.com/).
 
 You need to obtain the [Slack API token](https://api.slack.com/web?sudo=1) to be able to send notifications.
 
diff --git a/source/_components/notify.syslog.markdown b/source/_components/notify.syslog.markdown
index 9ff602d809..b5e72bf4a4 100644
--- a/source/_components/notify.syslog.markdown
+++ b/source/_components/notify.syslog.markdown
@@ -11,7 +11,7 @@ ha_category: Notifications
 ---
 
 
-The syslog platform allows you to deliver notifications from Home Assistant to the local syslog.
+The `syslog` platform allows you to deliver notifications from Home Assistant to the local syslog.
 
 To enable syslog notifications in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/notify.xmpp.markdown b/source/_components/notify.xmpp.markdown
index d381fd0fca..4f9996c236 100644
--- a/source/_components/notify.xmpp.markdown
+++ b/source/_components/notify.xmpp.markdown
@@ -12,7 +12,7 @@ ha_category: Notifications
 ---
 
 
-The xmpp platform allows you to deliver notifications from Home Assistant to a [Jabber (XMPP)](http://xmpp.org) account.
+The `xmpp` platform allows you to deliver notifications from Home Assistant to a [Jabber (XMPP)](http://xmpp.org) account.
 
 ```yaml
 # Example configuration.yaml entry
diff --git a/source/_components/sensor.arduino.markdown b/source/_components/sensor.arduino.markdown
index fa013a9f0d..0db1320573 100644
--- a/source/_components/sensor.arduino.markdown
+++ b/source/_components/sensor.arduino.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Arduino sensor"
+title: "Arduino Sensor"
 description: "Instructions how to integrate Arduino boards pins as sensors within Home Assistant."
 date: 2015-09-14 18:28
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: DIY
 ---
 
 
-The arduino sensor platform allows allow you to get an numerical values from an analog input pin of an [Arduino](https://www.arduino.cc/) board. Usually the value is between 0 and 1024. 
+The `arduino` sensor platform allows allow you to get an numerical values from an analog input pin of an [Arduino](https://www.arduino.cc/) board. Usually the value is between 0 and 1024. 
 
 To enable an Arduino sensor with Home Assistant, add the following section to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.arest.markdown b/source/_components/sensor.arest.markdown
index 89326f3db3..c75bc22b60 100644
--- a/source/_components/sensor.arest.markdown
+++ b/source/_components/sensor.arest.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "aREST sensor"
+title: "aREST Sensor"
 description: "Instructions how to integrate aREST sensors within Home Assistant."
 date: 2015-09-07 18:15
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-The arest sensor platform allows you to get all data from your devices (like Arduinos with a ethernet/wifi connection, the ESP8266, and the Raspberry Pi) running the [aREST](http://arest.io/) RESTful framework.
+The `arest` sensor platform allows you to get all data from your devices (like Arduinos with a ethernet/wifi connection, the ESP8266, and the Raspberry Pi) running the [aREST](http://arest.io/) RESTful framework.
 
 To use your aREST enabled device in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.bitcoin.markdown b/source/_components/sensor.bitcoin.markdown
index efb232c67f..da6cd72b01 100644
--- a/source/_components/sensor.bitcoin.markdown
+++ b/source/_components/sensor.bitcoin.markdown
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-The bitcoin platform displays various details about the [Bitcoin](https://bitcoin.org) network.
+The `bitcoin` platform displays various details about the [Bitcoin](https://bitcoin.org) network.
 
 If you have an online wallet from [Blockchain.info](https://blockchain.info/) the sensor is capable to show your current balance.
 
diff --git a/source/_components/sensor.command_sensor.markdown b/source/_components/sensor.command_sensor.markdown
index 914ce66f8f..06dc43d64b 100644
--- a/source/_components/sensor.command_sensor.markdown
+++ b/source/_components/sensor.command_sensor.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Command line sensor"
+title: "Command line Sensor"
 description: "Instructions how to integrate command line sensors into Home Assistant."
 date: 2015-09-13 10:10
 sidebar: true
diff --git a/source/_components/sensor.cpuspeed.markdown b/source/_components/sensor.cpuspeed.markdown
index 96e04b4c57..a8b43142bb 100644
--- a/source/_components/sensor.cpuspeed.markdown
+++ b/source/_components/sensor.cpuspeed.markdown
@@ -11,7 +11,7 @@ ha_category: Sensor
 ---
 
 
-The cpuspeed sensor platform to allow you to monitor the current CPU speed.
+The `cpuspeed` sensor platform to allow you to monitor the current CPU speed.
 
 To add this platform to your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.dht.markdown b/source/_components/sensor.dht.markdown
index 3f00c01b4d..6718cab67f 100644
--- a/source/_components/sensor.dht.markdown
+++ b/source/_components/sensor.dht.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "DHT sensor"
+title: "DHT Sensor"
 description: "Instructions how to integrate DHTxx sensors within Home Assistant."
 date: 2015-08-30 19:15
 sidebar: true
@@ -11,7 +11,7 @@ ha_category: DIY
 ---
 
 
-The dht sensor platform allows you to get the current temperature and humidity from a DHT11, DHT22, or AM2302 device.
+The `dht` sensor platform allows you to get the current temperature and humidity from a DHT11, DHT22, or AM2302 device.
 
 To use your DHTxx sensor in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.ecobee.markdown b/source/_components/sensor.ecobee.markdown
index ec9fcf8338..e729c46619 100644
--- a/source/_components/sensor.ecobee.markdown
+++ b/source/_components/sensor.ecobee.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Ecobee sensor"
+title: "Ecobee Sensor"
 description: "Instructions how to setup the Ecobee sensors within Home Assistant."
 date: 2015-11-30 18:00
 sidebar: true
diff --git a/source/_components/sensor.forecast.markdown b/source/_components/sensor.forecast.markdown
index e8707d91ec..a28b142893 100644
--- a/source/_components/sensor.forecast.markdown
+++ b/source/_components/sensor.forecast.markdown
@@ -13,7 +13,7 @@ featured: true
 ---
 
 
-The forecast platform uses the [Forecast.io](https://forecast.io/) web service as a source for meteorological data for your location. The location is based on the Longitude and Latitude cooridinates configured in `configuration.yaml`.  The cooridinates are auto detected but to take advantage of the hyper-local weather reported by forecast.io, you can refine them down to your exact home address.  GPS cooridinates can be found by using Google Maps and clicking on your home.
+The `forecast` platform uses the [Forecast.io](https://forecast.io/) web service as a source for meteorological data for your location. The location is based on the Longitude and Latitude cooridinates configured in `configuration.yaml`.  The cooridinates are auto detected but to take advantage of the hyper-local weather reported by forecast.io, you can refine them down to your exact home address.  GPS cooridinates can be found by using Google Maps and clicking on your home.
 
 You need an API key which is free but requires a [registration](https://developer.forecast.io/register). You can make 1000 requests per day. This means that you could create one approximately every 1.4 minutes.
 
diff --git a/source/_components/sensor.glances.markdown b/source/_components/sensor.glances.markdown
index 632427d052..700320445c 100644
--- a/source/_components/sensor.glances.markdown
+++ b/source/_components/sensor.glances.markdown
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-The glances sensor platform is consuming the system information provided by the [Glances](https://github.com/nicolargo/glances) API. This enables one to track remote host and display their stats in Home Assistant.
+The `glances` sensor platform is consuming the system information provided by the [Glances](https://github.com/nicolargo/glances) API. This enables one to track remote host and display their stats in Home Assistant.
 
 This sensors needs a running instance of `glances` on the host. The minimal supported version of `glances` is 2.3:
 
diff --git a/source/_components/sensor.modbus.markdown b/source/_components/sensor.modbus.markdown
index 404868f4fe..e4f331eb60 100644
--- a/source/_components/sensor.modbus.markdown
+++ b/source/_components/sensor.modbus.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Modbus sensor"
+title: "Modbus Sensor"
 description: "Instructions how to integrate Modbus sensors into Home Assistant."
 date: 2015-08-30 23:38
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-The modbus sensor platform allows you to gather data from your [Modbus](http://www.modbus.org/) sensors.
+The `modbus` sensor platform allows you to gather data from your [Modbus](http://www.modbus.org/) sensors.
 
 To use your Modbus sensors in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.mqtt.markdown b/source/_components/sensor.mqtt.markdown
index 71b6355428..11bb2a1098 100644
--- a/source/_components/sensor.mqtt.markdown
+++ b/source/_components/sensor.mqtt.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "MQTT sensor"
+title: "MQTT Sensor"
 description: "Instructions how to integrate MQTT sensors within Home Assistant."
 date: 2015-05-30 23:21
 sidebar: true
diff --git a/source/_components/sensor.mysensors.markdown b/source/_components/sensor.mysensors.markdown
index bc58715d98..5c2125230b 100644
--- a/source/_components/sensor.mysensors.markdown
+++ b/source/_components/sensor.mysensors.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "MySensors sensors"
+title: "MySensors Sensor"
 description: "Instructions how to integrate MySensors sensors into Home Assistant."
 date: 2016-01-17 15:49
 sidebar: true
diff --git a/source/_components/sensor.nest.markdown b/source/_components/sensor.nest.markdown
index e70634ee3f..75342dd472 100644
--- a/source/_components/sensor.nest.markdown
+++ b/source/_components/sensor.nest.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Nest sensor"
+title: "Nest Sensor"
 description: "Instructions how to integrate Nest sensors within Home Assistant."
 date: 2016-01-13 19:59
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-The Nest sensor platform let you monitor sensors connected to your [Nest](https://nest.com) thermostat.
+The `nest` sensor platform let you monitor sensors connected to your [Nest](https://nest.com) thermostat.
 
 To set it up, add the following information to your `configuration.yaml` file:
 
@@ -35,5 +35,15 @@ sensor:
 Configuration variables:
 
 - **monitored_conditions** array (*Required*): States to monitor.
+  - 'temperature'
+  - 'target'
+  - 'away_temperature[0]'
+  - 'away_temperature[1]'
+  - 'humidity'
+  - 'mode'
+  - 'last_ip'
+  - 'local_ip'
+  - 'last_connection'
+  - 'battery_level'
 
-<p class='note'>You must have the [Nest component](https://home-assistant.io/components/nest/) configured to use this sensor.</p>
+<p class='note'>You must have the [Nest component](/components/nest/) configured to use this sensor.</p>
diff --git a/source/_components/sensor.netatmo.markdown b/source/_components/sensor.netatmo.markdown
index 2e7b4d01d2..119cfad3f9 100644
--- a/source/_components/sensor.netatmo.markdown
+++ b/source/_components/sensor.netatmo.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Netatmo"
+title: "Netatmo Sensor"
 description: "Instructions how to integrate Netatmo sensors into Home Assistant."
 date: 2016-01-14 08:10
 sidebar: true
@@ -76,4 +76,4 @@ You have to provide these name in your Home Assistant configuration file.
 
 <p class='note'>
 The Home Assistant NetAtmo platform has only be tested with the classic indoor and outdoor module. There is no support for the rainmeter and windmeter module at this time because developers does not own these modules.
-</p>
\ No newline at end of file
+</p>
diff --git a/source/_components/sensor.onewire.markdown b/source/_components/sensor.onewire.markdown
index 44cb32bea8..e6652b4b84 100644
--- a/source/_components/sensor.onewire.markdown
+++ b/source/_components/sensor.onewire.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "One wire sensor"
+title: "One wire Sensor"
 description: "Instructions how to integrate One wire (1-wire) sensors into Home Assistant."
 date: 2016-01-17 07:15
 sidebar: true
diff --git a/source/_components/sensor.openweathermap.markdown b/source/_components/sensor.openweathermap.markdown
index 11b0dd5b54..df7e0b8c2a 100644
--- a/source/_components/sensor.openweathermap.markdown
+++ b/source/_components/sensor.openweathermap.markdown
@@ -12,7 +12,7 @@ ha_category: Weather
 ---
 
 
-The openweathermap platform uses [OpenWeatherMap](http://openweathermap.org/) as an source for current meteorological data for your location. The `forecast` will show you the condition in 3 h. 
+The `openweathermap` platform uses [OpenWeatherMap](http://openweathermap.org/) as an source for current meteorological data for your location. The `forecast` will show you the condition in 3 h. 
 
 You need an API key which is free but requires a [registration](http://home.openweathermap.org/users/sign_up).
 
diff --git a/source/_components/sensor.rest.markdown b/source/_components/sensor.rest.markdown
index 3914976548..6cdf092461 100644
--- a/source/_components/sensor.rest.markdown
+++ b/source/_components/sensor.rest.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "RESTful sensor"
+title: "RESTful Sensor"
 description: "Instructions how to integrate REST sensors into Home Assistant."
 date: 2015-09-14 19:10
 sidebar: true
diff --git a/source/_components/sensor.rfxtrx.markdown b/source/_components/sensor.rfxtrx.markdown
index 9b8efa6c13..0c0f9a4f30 100644
--- a/source/_components/sensor.rfxtrx.markdown
+++ b/source/_components/sensor.rfxtrx.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "RFXtrx sensor"
+title: "RFXtrx Sensor"
 description: "Instructions how to integrate RFXtrx sensors into Home Assistant."
 date: 2015-08-06 17:15
 sidebar: true
@@ -10,7 +10,7 @@ footer: true
 ha_category: Sensor
 ---
 
-The rfxtrx platform support sensors that communicate in the frequency range of 433.92 MHz.
+The `rfxtrx` platform support sensors that communicate in the frequency range of 433.92 MHz.
 
 To enable RFXtrx sensors in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.sabnzbd.markdown b/source/_components/sensor.sabnzbd.markdown
index fa2718ff74..a86d2ce4e8 100644
--- a/source/_components/sensor.sabnzbd.markdown
+++ b/source/_components/sensor.sabnzbd.markdown
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-The sabnzbd platform will allow you to monitor your downloads with [SABnzbd](http://sabnzbd.org) from within Home Assistant and setup automation based on the information.
+The `sabnzbd` platform will allow you to monitor your downloads with [SABnzbd](http://sabnzbd.org) from within Home Assistant and setup automation based on the information.
 
 To use sabnzbd with your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.swiss_public_transport.markdown b/source/_components/sensor.swiss_public_transport.markdown
index f2ab2840d9..8f17ad5a48 100644
--- a/source/_components/sensor.swiss_public_transport.markdown
+++ b/source/_components/sensor.swiss_public_transport.markdown
@@ -11,7 +11,7 @@ ha_category: Sensor
 ---
 
 
-The swiss public transport sensor will give you the next two departure times from a given location to another one in Switzerland.
+The `swiss_public_transport` sensor will give you the next two departure times from a given location to another one in Switzerland.
 
 The [Stationboard](http://transport.opendata.ch/examples/stationboard.html) website can help to determine the exact name of the start and the end station. With the station names it's necessary to search for the ID of those stations:
 
diff --git a/source/_components/sensor.systemmonitor.markdown b/source/_components/sensor.systemmonitor.markdown
index fd44db9b33..5915533cd4 100644
--- a/source/_components/sensor.systemmonitor.markdown
+++ b/source/_components/sensor.systemmonitor.markdown
@@ -10,7 +10,7 @@ footer: true
 ha_category: Sensor
 ---
 
-The system monitoring sensor platform to allow you to monitor disk usage, memory usage, CPU usage, and running processes. This platform has superseded the process component which is now considered deprecated.
+The `systemmonitor` sensor platform to allow you to monitor disk usage, memory usage, CPU usage, and running processes. This platform has superseded the process component which is now considered deprecated.
 
 To add this platform to your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.tellduslive.markdown b/source/_components/sensor.tellduslive.markdown
index 9874f868a2..d7e3ae398b 100644
--- a/source/_components/sensor.tellduslive.markdown
+++ b/source/_components/sensor.tellduslive.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Telldus Live sensors"
+title: "Telldus Live sensor"
 description: "Instructions how to integrate Telldus Live sensors into Home Assistant."
 date: 2016-01-17 15:49
 sidebar: true
diff --git a/source/_components/sensor.tellstick.markdown b/source/_components/sensor.tellstick.markdown
index cc8b995135..1051222cdc 100644
--- a/source/_components/sensor.tellstick.markdown
+++ b/source/_components/sensor.tellstick.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "TellStick sensor"
+title: "TellStick Sensor"
 description: "Instructions how to integrate TellStick sensors into Home Assistant."
 date: 2015-08-06 19:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-This tellstick sensor platform allows you to get current meteorological data from a [TellStick](http://www.telldus.se/products/tellstick) device.
+The `tellstick` sensor platform allows you to get current meteorological data from a [TellStick](http://www.telldus.se/products/tellstick) device.
 
 To use your TellStick device in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.temper.markdown b/source/_components/sensor.temper.markdown
index 386f8108e9..b1533e21d0 100644
--- a/source/_components/sensor.temper.markdown
+++ b/source/_components/sensor.temper.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "TEMPer sensor"
+title: "TEMPer Sensor"
 description: "Instructions how to integrate TEMPer sensors into Home Assistant."
 date: 2015-08-06 19:00
 sidebar: true
@@ -10,7 +10,7 @@ footer: true
 ha_category: Sensor
 ---
 
-This temper sensor platform allows you to get the current temperature from a TEMPer device.
+This `temper` sensor platform allows you to get the current temperature from a TEMPer device.
 
 To use your TEMPer sensor in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.template.markdown b/source/_components/sensor.template.markdown
index 7be558afb1..7cfdcd83af 100644
--- a/source/_components/sensor.template.markdown
+++ b/source/_components/sensor.template.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Template sensor"
+title: "Template Sensor"
 description: "Instructions how to integrate Template sensors into Home Assistant."
 date: 2016-01-27 07:00
 sidebar: true
diff --git a/source/_components/sensor.time_date.markdown b/source/_components/sensor.time_date.markdown
index 612bce17a1..82f287e0ca 100644
--- a/source/_components/sensor.time_date.markdown
+++ b/source/_components/sensor.time_date.markdown
@@ -11,7 +11,7 @@ ha_category: Sensor
 ---
 
 
-The time and date platform simple displays the time in various formats, the date, or both.
+The time and date (`time_date`) platform simple displays the time in various formats, the date, or both.
 
 To enable this sensor in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.transmission.markdown b/source/_components/sensor.transmission.markdown
index 7714f86718..cc7952fa5e 100644
--- a/source/_components/sensor.transmission.markdown
+++ b/source/_components/sensor.transmission.markdown
@@ -1,7 +1,7 @@
 ---
 layout: component
-title: "Transmission sensor"
-description: "Instructions how to integrate Transmission within Home Assistant."
+title: "Transmission Sensor"
+description: "Instructions how to integrate Transmission sensors within Home Assistant."
 date: 2015-04-25 9:06
 sidebar: true
 comments: false
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-The [Transmission](http://www.transmissionbt.com/) platform allows you to monitor your downloads from within Home Assistant and setup automation based on the information.
+The `trnasmission` platform allows you to monitor your downloads with [Transmission](http://www.transmissionbt.com/) from within Home Assistant and setup automation based on the information.
 
 ```yaml
 # Example configuration.yaml entry
diff --git a/source/_components/sensor.vera.markdown b/source/_components/sensor.vera.markdown
index 6386b2efaa..93fd9fbe8f 100644
--- a/source/_components/sensor.vera.markdown
+++ b/source/_components/sensor.vera.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Vera sensor"
+title: "Vera Sensor"
 description: "Instructions how to integrate Vera sensors into Home Assistant."
 date: 2015-10-20 21:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-This vera sensor platform allows you to get data from your [Vera](http://getvera.com/) sensors.
+This `vera` sensor platform allows you to get data from your [Vera](http://getvera.com/) sensors.
 
 To use your Vera sensor in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.wink.markdown b/source/_components/sensor.wink.markdown
index 5238e0d8cd..ab4f49f758 100644
--- a/source/_components/sensor.wink.markdown
+++ b/source/_components/sensor.wink.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Wink sensor"
+title: "Wink Sensor"
 description: "Instructions how to setup the Wink sensors within Home Assistant."
 date: 2015-01-20 22:36
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Sensor
 ---
 
 
-The wink sensor platform allows you to get data from your [Wink](http://www.wink.com/) sensors.
+The Wink sensor platform allows you to get data from your [Wink](http://www.wink.com/) sensors.
 
 The requirement is that you have setup your [Wink hub](/components/light.wink/).
 
diff --git a/source/_components/sensor.worldclock.markdown b/source/_components/sensor.worldclock.markdown
index ef6c0f7a4e..77989ab332 100644
--- a/source/_components/sensor.worldclock.markdown
+++ b/source/_components/sensor.worldclock.markdown
@@ -11,7 +11,7 @@ ha_category: Sensor
 ---
 
 
-The worldclock platform simple displays the current time in a different time zone
+The `worldclock` sensor platform simple displays the current time in a different time zone
 
 To enable this sensor in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/sensor.zwave.markdown b/source/_components/sensor.zwave.markdown
index 0de9c07750..f26050bd78 100644
--- a/source/_components/sensor.zwave.markdown
+++ b/source/_components/sensor.zwave.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Z-Wave sensor"
+title: "Z-Wave Sensor"
 description: "Instructions how to setup the Z-Wave sensors within Home Assistant."
 date: 2015-11-15 13:00
 sidebar: true
diff --git a/source/_components/switch.arduino.markdown b/source/_components/switch.arduino.markdown
index 7bdd9363e4..27d25a6194 100644
--- a/source/_components/switch.arduino.markdown
+++ b/source/_components/switch.arduino.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Arduino switch"
+title: "Arduino Switch"
 description: "Instructions how to integrate Arduino boards pins as switches within Home Assistant."
 date: 2015-09-14 18:28
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: DIY
 ---
 
 
-The arduino switch platform allows you to control the digital pins of your [Arduino](https://www.arduino.cc/) board. Support for switching pins is limited to high/on and low/off of the digital pins. PWM (pin 3,5,6,9,10, and 11 on an Arduino Uno) is not supported yet.
+The `arduino` switch platform allows you to control the digital pins of your [Arduino](https://www.arduino.cc/) board. Support for switching pins is limited to high/on and low/off of the digital pins. PWM (pin 3,5,6,9,10, and 11 on an Arduino Uno) is not supported yet.
 
 To enable the Arduino pins with Home Assistant, add the following section to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.arest.markdown b/source/_components/switch.arest.markdown
index 8874ec4fd4..e9e815fdb3 100644
--- a/source/_components/switch.arest.markdown
+++ b/source/_components/switch.arest.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "aREST switch"
+title: "aREST Switch"
 description: "Instructions how to integrate aREST switches within Home Assistant."
 date: 2015-09-11 23:15
 sidebar: true
@@ -11,7 +11,7 @@ logo: arest.png
 ha_category: Switch
 ---
 
-The arest switch platform allows you to toggle pins of your devices (like Arduino boards with a ethernet/wifi connection, ESP8266 based devices, and the Raspberry Pi) running the [aREST](http://arest.io/) RESTful framework.
+The `arest` switch platform allows you to toggle pins of your devices (like Arduino boards with a ethernet/wifi connection, ESP8266 based devices, and the Raspberry Pi) running the [aREST](http://arest.io/) RESTful framework.
 
 To use your aREST enabled device with pins in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.command_switch.markdown b/source/_components/switch.command_switch.markdown
index 333f2ba277..5850ad1ded 100644
--- a/source/_components/switch.command_switch.markdown
+++ b/source/_components/switch.command_switch.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Command line switch"
+title: "Command line Switch"
 description: "Instructions how to have switches call command line commands."
 date: 2015-06-10 22:41
 sidebar: true
diff --git a/source/_components/switch.edimax.markdown b/source/_components/switch.edimax.markdown
index 479d6fba0c..70220e148a 100644
--- a/source/_components/switch.edimax.markdown
+++ b/source/_components/switch.edimax.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Edimax switch"
+title: "Edimax Switch"
 description: "Instructions how to integrate Edimax switches into Home Assistant."
 date: 2015-06-10 22:54
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Switch
 ---
 
 
-This edimax switch platform allows you to control the state of your [Edimax](http://www.edimax.com/edimax/merchandise/merchandise_list/data/edimax/global/home_automation_smart_plug/) switches.
+This `edimax` switch platform allows you to control the state of your [Edimax](http://www.edimax.com/edimax/merchandise/merchandise_list/data/edimax/global/home_automation_smart_plug/) switches.
 
 To use your Edimax switch in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.hikvision.markdown b/source/_components/switch.hikvision.markdown
index 05f3d47d00..5dd60b4679 100644
--- a/source/_components/switch.hikvision.markdown
+++ b/source/_components/switch.hikvision.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Hikvision camera"
+title: "Hikvision Camera Switch"
 description: "Instructions how to integrate Hikvision camera's into Home Assistant."
 date: 2015-06-10 22:54
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Camera
 ---
 
 
-This hikvisioncam switch platform allows you to control your motion detection setting on your [Hikvision](http://www.hikvision.com/) camera.
+This `hikvisioncam` switch platform allows you to control your motion detection setting on your [Hikvision](http://www.hikvision.com/) camera.
 
 <p class='note warning'>
 Currently works using default https port only.
diff --git a/source/_components/switch.modbus.markdown b/source/_components/switch.modbus.markdown
index ff8c2d269c..fe3f8e7c90 100644
--- a/source/_components/switch.modbus.markdown
+++ b/source/_components/switch.modbus.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Modbus switch"
+title: "Modbus Switch"
 description: "Instructions how to integrate Modbus switches into Home Assistant."
 date: 2015-08-30 23:38
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Switch
 ---
 
 
-The modbus switch platform allows you to control [Modbus](http://www.modbus.org/) switches.
+The `modbus` switch platform allows you to control [Modbus](http://www.modbus.org/) switches.
 
 To use your Modbus switches in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.mqtt.markdown b/source/_components/switch.mqtt.markdown
index 88f42a36e6..6dd0904fb1 100644
--- a/source/_components/switch.mqtt.markdown
+++ b/source/_components/switch.mqtt.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "MQTT switch"
+title: "MQTT Switch"
 description: "Instructions how to integrate MQTT switches into Home Assistant."
 date: 2015-08-30 23:38
 sidebar: true
diff --git a/source/_components/switch.mysensors.markdown b/source/_components/switch.mysensors.markdown
index 43de645734..314418a1bf 100644
--- a/source/_components/switch.mysensors.markdown
+++ b/source/_components/switch.mysensors.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "MySensors switches"
+title: "MySensors Switch"
 description: "Instructions how to integrate MySensors switches into Home Assistant."
 date: 2016-01-17 15:49
 sidebar: true
diff --git a/source/_components/switch.mystrom.markdown b/source/_components/switch.mystrom.markdown
index eb6f281452..3a58690082 100644
--- a/source/_components/switch.mystrom.markdown
+++ b/source/_components/switch.mystrom.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "myStrom switch"
+title: "myStrom Switch"
 description: "Instructions how to integrate myStrom switches into Home Assistant."
 date: 2015-11-25 22:00
 sidebar: true
diff --git a/source/_components/switch.orvibo.markdown b/source/_components/switch.orvibo.markdown
index 19c464e243..37af0826e4 100644
--- a/source/_components/switch.orvibo.markdown
+++ b/source/_components/switch.orvibo.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Orvibo switch"
+title: "Orvibo Switch"
 description: "Instructions how to integrate Orvibo switches within Home Assistant."
 date: 2015-11-15 18:15
 sidebar: true
@@ -11,7 +11,7 @@ logo: orvibo.png
 ha_category: Switch
 ---
 
-The orvibo switch platform allows you to toggle your Orvibo S20 Wifi Smart Switch.
+The `orvibo` switch platform allows you to toggle your Orvibo S20 Wifi Smart Switch.
 
 To use your Orvibo switch in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.rest.markdown b/source/_components/switch.rest.markdown
index ed7dfdc110..a33edb2e16 100644
--- a/source/_components/switch.rest.markdown
+++ b/source/_components/switch.rest.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "RESTful switch"
+title: "RESTful Switch"
 description: "Instructions how to integrate REST switches into Home Assistant."
 date: 2015-09-14 19:10
 sidebar: true
diff --git a/source/_components/switch.rfxtrx.markdown b/source/_components/switch.rfxtrx.markdown
index 24eea9da28..e8d0d9654e 100644
--- a/source/_components/switch.rfxtrx.markdown
+++ b/source/_components/switch.rfxtrx.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "RFXtrx switch"
+title: "RFXtrx Switch"
 description: "Instructions how to integrate RFXtrx switches into Home Assistant."
 date: 2015-10-08 10:15
 sidebar: true
@@ -9,7 +9,8 @@ sharing: true
 footer: true
 ha_category: Switch
 ---
-The rfxtrx platform support switches that communicate in the frequency range of 433.92 MHz.
+
+The `rfxtrx` platform support switches that communicate in the frequency range of 433.92 MHz.
 
 To enable RFXtrx switches in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.rpi_gpio.markdown b/source/_components/switch.rpi_gpio.markdown
index 284352994b..cc4f86a3e6 100644
--- a/source/_components/switch.rpi_gpio.markdown
+++ b/source/_components/switch.rpi_gpio.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Raspberry PI GPIO switch"
+title: "Raspberry PI GPIO Switch"
 description: "Instructions how to integrate the GPIO of a Raspberry PI into Home Assistant as a switch."
 date: 2015-08-07 14:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Switch
 ---
 
 
-The rpi_gpio switch platform allows you to control the GPIOs of your [Raspberry Pi](https://www.raspberrypi.org/).
+The `rpi_gpio` switch platform allows you to control the GPIOs of your [Raspberry Pi](https://www.raspberrypi.org/).
 
 To use your Raspberry Pi's GPIO in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.tellduslive.markdown b/source/_components/switch.tellduslive.markdown
index ac38ab5f01..18252be830 100644
--- a/source/_components/switch.tellduslive.markdown
+++ b/source/_components/switch.tellduslive.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Telldus Live switches"
+title: "Telldus Live Switch"
 description: "Instructions how to integrate Telldus Live switches into Home Assistant."
 date: 2016-01-17 15:49
 sidebar: true
diff --git a/source/_components/switch.tellstick.markdown b/source/_components/switch.tellstick.markdown
index 21f22f825a..62495288f9 100644
--- a/source/_components/switch.tellstick.markdown
+++ b/source/_components/switch.tellstick.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "TellStick switch"
+title: "TellStick Switch"
 description: "Instructions how to integrate TellStick switches into Home Assistant."
 date: 2015-08-06 19:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Switch
 ---
 
 
-This tellstick switch platform allows you to control [TellStick](http://www.telldus.se/products/tellstick) devices.
+This `tellstick` switch platform allows you to control [TellStick](http://www.telldus.se/products/tellstick) devices.
 
 To use your TellStick device in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.transmission.markdown b/source/_components/switch.transmission.markdown
index c6aa8e84cd..b7120d44c0 100644
--- a/source/_components/switch.transmission.markdown
+++ b/source/_components/switch.transmission.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Transmission switch"
+title: "Transmission Switch"
 description: "Instructions how to integrate Transmission within Home Assistant."
 date: 2015-06-02 09:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Switch
 ---
 
 
-The transmission platform allows you to control your [Transmission](http://www.transmissionbt.com/) client from within Home Assistant. The platform enables you switch to your 'Alternative Speed Limits' (aka 'Turtle mode') setting.
+The `transmission` switch platform allows you to control your [Transmission](http://www.transmissionbt.com/) client from within Home Assistant. The platform enables you switch to your 'Alternative Speed Limits' (aka 'Turtle mode') setting.
 
 To add Transmission to your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.vera.markdown b/source/_components/switch.vera.markdown
index 868d630158..25e9b439fe 100644
--- a/source/_components/switch.vera.markdown
+++ b/source/_components/switch.vera.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Vera switch"
+title: "Vera Switch"
 description: "Instructions how to integrate Vera switches into Home Assistant."
 date: 2015-10-20 21:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Switch
 ---
 
 
-This vera switch platform allows you to control your [Vera](http://getvera.com/) switches.
+This `vera` switch platform allows you to control your [Vera](http://getvera.com/) switches.
 
 To use your Vera switches in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/switch.wemo.markdown b/source/_components/switch.wemo.markdown
index 7692befbb0..2528d8cbc1 100644
--- a/source/_components/switch.wemo.markdown
+++ b/source/_components/switch.wemo.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Belkin WeMo switch"
+title: "Belkin WeMo Switch"
 description: "Instructions how to integrate Belkin WeMo switches into Home Assistant."
 date: 2015-03-23 19:59
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Switch
 ---
 
 
-The wemo platform allows you to control your [Belkin WeMo](http://www.belkin.com/us/p/P-F7C027/) switches from within Home Assistant.
+The `wemo` platform allows you to control your [Belkin WeMo](http://www.belkin.com/us/p/P-F7C027/) switches from within Home Assistant.
 
 They will be automatically discovered if the discovery component is enabled.
 
diff --git a/source/_components/switch.wink.markdown b/source/_components/switch.wink.markdown
index 29ca5b8210..a3067d4593 100644
--- a/source/_components/switch.wink.markdown
+++ b/source/_components/switch.wink.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Wink switch"
+title: "Wink Switch"
 description: "Instructions how to setup the Wink switches within Home Assistant."
 date: 2015-01-20 22:36
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Switch
 ---
 
 
-The wink switch platform allows you to control your [Wink](http://www.wink.com/) switches.
+The Wink switch platform allows you to control your [Wink](http://www.wink.com/) switches.
 
 The requirement is that you have setup your [Wink hub](/components/light.wink/).
 
diff --git a/source/_components/switch.zigbee.markdown b/source/_components/switch.zigbee.markdown
index e75435b018..83f8b26728 100644
--- a/source/_components/switch.zigbee.markdown
+++ b/source/_components/switch.zigbee.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: ZigBee Switch
+title: "ZigBee Switch"
 description: "Instructions on how to set up ZigBee switches within Home Assistant."
 date: 2016-01-28 11:52
 sidebar: true
diff --git a/source/_components/switch.zwave.markdown b/source/_components/switch.zwave.markdown
index 7ae6919567..270690b276 100644
--- a/source/_components/switch.zwave.markdown
+++ b/source/_components/switch.zwave.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Z-Wave switch"
+title: "Z-Wave Switch"
 description: "Instructions how to setup the Z-Wave switches within Home Assistant."
 date: 2015-11-15 13:00
 sidebar: true
diff --git a/source/_components/tellstick.markdown b/source/_components/tellstick.markdown
index 913415ece6..3b50d202bd 100644
--- a/source/_components/tellstick.markdown
+++ b/source/_components/tellstick.markdown
@@ -12,7 +12,7 @@ ha_category: Hub
 ---
 
 
-The tellstick component integrates [TellStick](http://www.telldus.se/products/tellstick) devices into Home Assistant. This integration allows users to add switches, lights, and sensors which are communicating with 433 Mhz. There are couple of vendors (Capidi Elro, Intertechno, Nexa, Proove, Sartano, and Viking) how are selling products which works with TellStick. For more details, please check the TellStick [compatibility list](http://telldus.se/products/compability).
+The `tellstick` component integrates [TellStick](http://www.telldus.se/products/tellstick) devices into Home Assistant. This integration allows users to add switches, lights, and sensors which are communicating with 433 Mhz. There are couple of vendors (Capidi Elro, Intertechno, Nexa, Proove, Sartano, and Viking) how are selling products which works with TellStick. For more details, please check the TellStick [compatibility list](http://telldus.se/products/compability).
 
 To get started, add the devices to your `configuration.yaml` file.
 
diff --git a/source/_components/thermostat.ecobee.markdown b/source/_components/thermostat.ecobee.markdown
index eb25c3f2f2..35cf51563c 100644
--- a/source/_components/thermostat.ecobee.markdown
+++ b/source/_components/thermostat.ecobee.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Ecobee thermostat"
+title: "Ecobee Thermostat"
 description: "Instructions how to setup the Ecobee thermostats within Home Assistant."
 date: 2015-11-30 18:00
 sidebar: true
diff --git a/source/_components/thermostat.heatmiser.markdown b/source/_components/thermostat.heatmiser.markdown
index a3bff2cf42..c98b78d78b 100644
--- a/source/_components/thermostat.heatmiser.markdown
+++ b/source/_components/thermostat.heatmiser.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Heatmiser thermostat"
+title: "Heatmiser Thermostat"
 description: "Instructions how to integrate Heatmiser thermostats within Home Assistant."
 date: 2015-12-11 12:35
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Thermostat
 ---
 
 
-The heatmiser thermostat platform let you control [Heatmiser DT/DT-E/PRT/PRT-E](http://www.heatmisershop.co.uk/heatmiser-slimline-programmable-room-thermostat/) thermostats from Heatmiser.  The module itself is currently setup to work over a RS232 -> RS485 converter, therefore it connects over IP.
+The `heatmiser` thermostat platform let you control [Heatmiser DT/DT-E/PRT/PRT-E](http://www.heatmisershop.co.uk/heatmiser-slimline-programmable-room-thermostat/) thermostats from Heatmiser.  The module itself is currently setup to work over a RS232 -> RS485 converter, therefore it connects over IP.
 
 To set it up, add the following information to your `configuration.yaml` file:
 
@@ -35,4 +35,4 @@ Configuration variables:
 - **port** (*Required*): The port that the interface is listening on.
 - **tstats** (*Required*): A list of thermostats activated on the gateway.
 - **id** (*Required*): The id of the thermostat as configured on the device itself
-- **name** (*Required*): A friendly name for the themostat
\ No newline at end of file
+- **name** (*Required*): A friendly name for the themostat
diff --git a/source/_components/thermostat.homematic.markdown b/source/_components/thermostat.homematic.markdown
index b281ec4184..a887fd5146 100644
--- a/source/_components/thermostat.homematic.markdown
+++ b/source/_components/thermostat.homematic.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Homematic thermostat"
+title: "Homematic Thermostat"
 description: "Instructions how to integrate Homematic thermostats within Home Assistant."
 date: 2015-11-25 08:00
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Thermostat
 ---
 
 
-The homematic thermostat platform let you control [Homematic](http://www.homematic.com/) thermostat from Home Assistant. Currently there is support for Homematic (HM-TC-IT-WM-W-EU, HM-CC-RT-DN) thermostats using Homegear or Homematic central (CCU1/CCU2).
+The `homematic` thermostat platform let you control [Homematic](http://www.homematic.com/) thermostat from Home Assistant. Currently there is support for Homematic (HM-TC-IT-WM-W-EU, HM-CC-RT-DN) thermostats using Homegear or Homematic central (CCU1/CCU2).
 
 To set it up, add the following information to your `configuration.yaml` file:
 
diff --git a/source/_components/thermostat.honeywell.markdown b/source/_components/thermostat.honeywell.markdown
index baaaf7fd14..3c2e5bf717 100644
--- a/source/_components/thermostat.honeywell.markdown
+++ b/source/_components/thermostat.honeywell.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Honeywell thermostat"
+title: "Honeywell Thermostat"
 description: "Instructions how to integrate Honeywell thermostats within Home Assistant."
 date: 2015-11-09 17:15
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Thermostat
 ---
 
 
-The honeywell thermostat platform let you control [Honeywell Connected](http://getconnected.honeywell.com/en/) thermostats from Home Assistant.
+The `honeywell` thermostat platform let you control [Honeywell Connected](http://getconnected.honeywell.com/en/) thermostats from Home Assistant.
 
 To set it up, add the following information to your `configuration.yaml` file:
 
diff --git a/source/_components/thermostat.nest.markdown b/source/_components/thermostat.nest.markdown
index 3164fb8c63..b139e671eb 100644
--- a/source/_components/thermostat.nest.markdown
+++ b/source/_components/thermostat.nest.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Nest thermostat"
+title: "Nest Thermostat"
 description: "Instructions how to integrate Nest thermostats within Home Assistant."
 date: 2015-03-23 19:59
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Thermostat
 ---
 
 
-The Nest thermostat platform let you control a thermostat from [Nest](https://nest.com).
+The `nest` thermostat platform let you control a thermostat from [Nest](https://nest.com).
 
 To set it up, add the following information to your `configuration.yaml` file:
 
diff --git a/source/_components/thermostat.proliphix.markdown b/source/_components/thermostat.proliphix.markdown
index 6f8a4ce9b2..3efb55e43e 100644
--- a/source/_components/thermostat.proliphix.markdown
+++ b/source/_components/thermostat.proliphix.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Proliphix thermostat"
+title: "Proliphix Thermostat"
 description: "Instructions how to integrate Proliphix thermostats within Home Assistant."
 date: 2016-01-15 08:00
 sidebar: true
diff --git a/source/_components/thermostat.radiotherm.markdown b/source/_components/thermostat.radiotherm.markdown
index 37e9ae1999..0c93089cb4 100644
--- a/source/_components/thermostat.radiotherm.markdown
+++ b/source/_components/thermostat.radiotherm.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Radiotherm thermostat"
+title: "Radiotherm Thermostat"
 description: "Instructions how to integrate Radiotherm thermostats within Home Assistant."
 date: 2015-10-18 17:15
 sidebar: true
@@ -12,7 +12,7 @@ ha_category: Thermostat
 ---
 
 
-The nest thermostat platform let you control a thermostat from [Radio Thermostat](http://www.radiothermostat.com/).
+The `radiotherm` thermostat platform let you control a thermostat from [Radio Thermostat](http://www.radiothermostat.com/).
 
 The underlaying library supports:
 - CT50 V1.09