diff --git a/source/_components/alarm_control_panel.alarmdotcom.markdown b/source/_components/alarm_control_panel.alarmdotcom.markdown
index aa97617023..2d81393f77 100644
--- a/source/_components/alarm_control_panel.alarmdotcom.markdown
+++ b/source/_components/alarm_control_panel.alarmdotcom.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Alarm.com Alarm Control Panel"
 description: "Instructions how to integrate Alarm.com into Home Assistant."
 date: 2016-01-14 22:00
diff --git a/source/_components/alarm_control_panel.manual.markdown b/source/_components/alarm_control_panel.manual.markdown
index 36b49399a7..c5ce1ff835 100644
--- a/source/_components/alarm_control_panel.manual.markdown
+++ b/source/_components/alarm_control_panel.manual.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Manual Alarm Control Panel"
 description: "Instructions how to integrate manual alarms into Home Assistant."
 date: 2015-10-13 19:10
diff --git a/source/_components/alarm_control_panel.markdown b/source/_components/alarm_control_panel.markdown
index f3fc25736d..ba5f469915 100644
--- a/source/_components/alarm_control_panel.markdown
+++ b/source/_components/alarm_control_panel.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Alarm Control Panels"
 description: "Instructions how to integrate Alarm Control Panels into Home Assistant."
 date: 2015-10-13 19:10
diff --git a/source/_components/alarm_control_panel.mqtt.markdown b/source/_components/alarm_control_panel.mqtt.markdown
index 440d8209e4..2d97a23faf 100644
--- a/source/_components/alarm_control_panel.mqtt.markdown
+++ b/source/_components/alarm_control_panel.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Alarm Control Panel"
 description: "Instructions how to integrate MQTT capable Alarm Panels into Home Assistant."
 date: 2015-09-14 19:10
diff --git a/source/_components/alexa.markdown b/source/_components/alexa.markdown
index d66913e751..9922762b63 100644
--- a/source/_components/alexa.markdown
+++ b/source/_components/alexa.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Alexa / Amazon Echo"
 description: "Instructions how to connect Alexa/Amazon Echo to Home Assistant."
 date: 2015-12-13 13:02
diff --git a/source/_components/arduino.markdown b/source/_components/arduino.markdown
index 19c482136f..e961ab1514 100644
--- a/source/_components/arduino.markdown
+++ b/source/_components/arduino.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Arduino"
 description: "Instructions how to setup an Arduino boards within Home Assistant."
 date: 2015-06-27 10:28
diff --git a/source/_components/automation.markdown b/source/_components/automation.markdown
index 50ddd5f4ba..3dcfbc47e6 100644
--- a/source/_components/automation.markdown
+++ b/source/_components/automation.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Automation"
 description: "Instructions how to setup automation within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/binary_sensor.arest.markdown b/source/_components/binary_sensor.arest.markdown
index b14f1f8ecc..92ff60e49d 100644
--- a/source/_components/binary_sensor.arest.markdown
+++ b/source/_components/binary_sensor.arest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "aREST Binary Sensor"
 description: "Instructions how to integrate aREST binary sensors within Home Assistant."
 date: 2015-11-20 18:15
diff --git a/source/_components/binary_sensor.command.markdown b/source/_components/binary_sensor.command.markdown
index d7305fd5d8..332a4df75a 100644
--- a/source/_components/binary_sensor.command.markdown
+++ b/source/_components/binary_sensor.command.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Command line Binary Sensor"
 description: "Instructions how to integrate Command binary sensors within Home Assistant."
 date: 2016-01-13 12:15
diff --git a/source/_components/binary_sensor.http.markdown b/source/_components/binary_sensor.http.markdown
index 8b7d19b096..7e7dfe1e9a 100644
--- a/source/_components/binary_sensor.http.markdown
+++ b/source/_components/binary_sensor.http.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "HTTP Binary Sensor"
 description: "Instructions how to integrate HTTP binary sensors within Home Assistant."
 date: 2016-02-05 12:15
diff --git a/source/_components/binary_sensor.markdown b/source/_components/binary_sensor.markdown
index 477642ec95..f3bbd43019 100644
--- a/source/_components/binary_sensor.markdown
+++ b/source/_components/binary_sensor.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Binary Sensor"
 description: "Instructions how to setup your binary sensors with Home Assistant."
 date: 2015-11-20 14:00
diff --git a/source/_components/binary_sensor.mqtt.markdown b/source/_components/binary_sensor.mqtt.markdown
index 9b39734689..43a3ab06a5 100644
--- a/source/_components/binary_sensor.mqtt.markdown
+++ b/source/_components/binary_sensor.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Binary Sensor"
 description: "Instructions how to integrate MQTT binary sensors within Home Assistant."
 date: 2015-05-30 23:21
diff --git a/source/_components/binary_sensor.nest.markdown b/source/_components/binary_sensor.nest.markdown
index 5479653842..06ed382f46 100644
--- a/source/_components/binary_sensor.nest.markdown
+++ b/source/_components/binary_sensor.nest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nest Binary Sensor"
 description: "Instructions how to integrate Nest binary sensors within Home Assistant."
 date: 2016-01-26 08:00
diff --git a/source/_components/binary_sensor.rest.markdown b/source/_components/binary_sensor.rest.markdown
index b3b64ae91a..474a1565d4 100644
--- a/source/_components/binary_sensor.rest.markdown
+++ b/source/_components/binary_sensor.rest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RESTful Binary Sensor"
 description: "Instructions how to integrate REST binary sensors into Home Assistant."
 date: 2015-12-17 19:10
diff --git a/source/_components/binary_sensor.rpi_gpio.markdown b/source/_components/binary_sensor.rpi_gpio.markdown
index a94c65bc23..dc2c0b8888 100644
--- a/source/_components/binary_sensor.rpi_gpio.markdown
+++ b/source/_components/binary_sensor.rpi_gpio.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 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
diff --git a/source/_components/binary_sensor.zigbee.markdown b/source/_components/binary_sensor.zigbee.markdown
index df2cff5a4b..d8731ac102 100644
--- a/source/_components/binary_sensor.zigbee.markdown
+++ b/source/_components/binary_sensor.zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ZigBee Binary Sensor"
 description: "Instructions on how to set up ZigBee binary sensors within Home Assistant."
 date: 2016-01-28 12:38
diff --git a/source/_components/browser.markdown b/source/_components/browser.markdown
index 273c3ae7e4..c7ce25dc61 100644
--- a/source/_components/browser.markdown
+++ b/source/_components/browser.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Browser"
 description: "Instructions how to setup the browser component with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/camera.foscam.markdown b/source/_components/camera.foscam.markdown
index a911ca8b53..ed4b4106d7 100644
--- a/source/_components/camera.foscam.markdown
+++ b/source/_components/camera.foscam.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Foscam IP Camera"
 description: "Instructions how to integrate Foscam IP cameras within Home Assistant."
 date: 2015-09-17 08:01
diff --git a/source/_components/camera.generic.markdown b/source/_components/camera.generic.markdown
index 065207f37b..3d88569b68 100644
--- a/source/_components/camera.generic.markdown
+++ b/source/_components/camera.generic.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Generic IP Camera"
 description: "Instructions how to integrate IP cameras within Home Assistant."
 date: 2015-07-11 0:36
diff --git a/source/_components/camera.markdown b/source/_components/camera.markdown
index cfcc0393b2..e56503400c 100644
--- a/source/_components/camera.markdown
+++ b/source/_components/camera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Camera"
 description: "Instructions how to integrate cameras within Home Assistant."
 date: 2015-11-09 08:36
diff --git a/source/_components/camera.mjpeg.markdown b/source/_components/camera.mjpeg.markdown
index f646b39e38..4f166f044c 100644
--- a/source/_components/camera.mjpeg.markdown
+++ b/source/_components/camera.mjpeg.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Generic MJPEG IP Camera"
 description: "Instructions how to integrate IP cameras within Home Assistant."
 date: 2015-11-09 08:36
diff --git a/source/_components/configurator.markdown b/source/_components/configurator.markdown
index d564089bc2..44c594c9ed 100644
--- a/source/_components/configurator.markdown
+++ b/source/_components/configurator.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Configurator"
 description: "Instructions how to integrate the configurator in your components."
 date: 2015-03-15 00:51
diff --git a/source/_components/conversation.markdown b/source/_components/conversation.markdown
index 7851621520..7ff3b348b7 100644
--- a/source/_components/conversation.markdown
+++ b/source/_components/conversation.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Conversation"
 description: "Instructions how to have conversations with your Home Assistant."
 date: 2015-03-15 00:39
diff --git a/source/_components/device_sun_light_trigger.markdown b/source/_components/device_sun_light_trigger.markdown
index 1b8cbc1865..dd2b298b2e 100644
--- a/source/_components/device_sun_light_trigger.markdown
+++ b/source/_components/device_sun_light_trigger.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Presence based lights"
 description: "Instructions how to automate your lights with Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/device_tracker.actiontec.markdown b/source/_components/device_tracker.actiontec.markdown
index d3d5f19874..774b7ec282 100644
--- a/source/_components/device_tracker.actiontec.markdown
+++ b/source/_components/device_tracker.actiontec.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Actiontec"
 description: "Instructions how to integrate Actiontec routers into Home Assistant."
 date: 2015-08-30 19:00
diff --git a/source/_components/device_tracker.aruba.markdown b/source/_components/device_tracker.aruba.markdown
index 8a65953e5f..4d76b30dd5 100644
--- a/source/_components/device_tracker.aruba.markdown
+++ b/source/_components/device_tracker.aruba.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Aruba"
 description: "Instructions how to integrate Aruba routers into Home Assistant."
 date: 2015-08-31 08:45
diff --git a/source/_components/device_tracker.asuswrt.markdown b/source/_components/device_tracker.asuswrt.markdown
index 4ca50a9ef3..e1590a59c9 100644
--- a/source/_components/device_tracker.asuswrt.markdown
+++ b/source/_components/device_tracker.asuswrt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ASUSWRT"
 description: "Instructions how to integrate ASUSWRT based routers into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/device_tracker.ddwrt.markdown b/source/_components/device_tracker.ddwrt.markdown
index 741959d19e..5eee59d85f 100644
--- a/source/_components/device_tracker.ddwrt.markdown
+++ b/source/_components/device_tracker.ddwrt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "DD-WRT"
 description: "Instructions how to integrate DD-WRT based routers into Home Assistant."
 date: 2015-05-11 09:00
diff --git a/source/_components/device_tracker.fritz.markdown b/source/_components/device_tracker.fritz.markdown
index 5d8acb12e5..75d48a75b9 100644
--- a/source/_components/device_tracker.fritz.markdown
+++ b/source/_components/device_tracker.fritz.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "FRITZ!Box"
 description: "Instructions how to integrate AVM FRITZ!Box based routers into Home Assistant."
 date: 2015-12-13 19:00
diff --git a/source/_components/device_tracker.icloud.markdown b/source/_components/device_tracker.icloud.markdown
index 39299c4630..169ba7974c 100644
--- a/source/_components/device_tracker.icloud.markdown
+++ b/source/_components/device_tracker.icloud.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "iCloud"
 description: "Instructions how to use iCloud to track devices in Home Assistant."
 date: 2015-12-15 1000
diff --git a/source/_components/device_tracker.locative.markdown b/source/_components/device_tracker.locative.markdown
index 17df285ccf..dd1d40fc16 100644
--- a/source/_components/device_tracker.locative.markdown
+++ b/source/_components/device_tracker.locative.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Locative"
 description: "Instructions how to use Locative to track devices in Home Assistant."
 date: 2015-10-13 19:00
diff --git a/source/_components/device_tracker.luci.markdown b/source/_components/device_tracker.luci.markdown
index 3db44706c8..81e60df206 100644
--- a/source/_components/device_tracker.luci.markdown
+++ b/source/_components/device_tracker.luci.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "OpenWRT (luci)"
 description: "Instructions how to integrate OpenWRT routers into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/device_tracker.markdown b/source/_components/device_tracker.markdown
index bb36d19013..f65447717d 100644
--- a/source/_components/device_tracker.markdown
+++ b/source/_components/device_tracker.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Device Tracker"
 description: "Instructions how to setup device tracking within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/device_tracker.mqtt.markdown b/source/_components/device_tracker.mqtt.markdown
index f7ed2156f5..7c0eed7d1d 100644
--- a/source/_components/device_tracker.mqtt.markdown
+++ b/source/_components/device_tracker.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Device Tracker"
 description: "Instructions how to use MQTT to track devices in Home Assistant."
 date: 2015-09-19 20:41
diff --git a/source/_components/device_tracker.netgear.markdown b/source/_components/device_tracker.netgear.markdown
index a5a508ba4d..67a37008ec 100644
--- a/source/_components/device_tracker.netgear.markdown
+++ b/source/_components/device_tracker.netgear.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Netgear"
 description: "Instructions how to integrate Netgear routers into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/device_tracker.nmap_scanner.markdown b/source/_components/device_tracker.nmap_scanner.markdown
index f5fb0f4268..e2fad493ea 100644
--- a/source/_components/device_tracker.nmap_scanner.markdown
+++ b/source/_components/device_tracker.nmap_scanner.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nmap"
 description: "Instructions how to integrate Nmap into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/device_tracker.owntracks.markdown b/source/_components/device_tracker.owntracks.markdown
index 2160821844..10a04326a4 100644
--- a/source/_components/device_tracker.owntracks.markdown
+++ b/source/_components/device_tracker.owntracks.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Owntracks"
 description: "Instructions how to use Owntracks to track devices in Home Assistant."
 date: 2015-09-22 07:00
diff --git a/source/_components/device_tracker.snmp.markdown b/source/_components/device_tracker.snmp.markdown
index d5ef35f20f..c33e605c69 100644
--- a/source/_components/device_tracker.snmp.markdown
+++ b/source/_components/device_tracker.snmp.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "SNMP"
 description: "Instructions how to integrate SNMP into Home Assistant."
 date: 2015-10-08 12:00
diff --git a/source/_components/device_tracker.thomson.markdown b/source/_components/device_tracker.thomson.markdown
index bb85bd340d..8a81c40ad9 100644
--- a/source/_components/device_tracker.thomson.markdown
+++ b/source/_components/device_tracker.thomson.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Thomson"
 description: "Instructions how to integrate Thomson routers into Home Assistant."
 date: 2015-08-30 19:00
diff --git a/source/_components/device_tracker.tomato.markdown b/source/_components/device_tracker.tomato.markdown
index ad55ca2938..db77f18863 100644
--- a/source/_components/device_tracker.tomato.markdown
+++ b/source/_components/device_tracker.tomato.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Tomato"
 description: "Instructions how to integrate Tomato routers into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/device_tracker.tplink.markdown b/source/_components/device_tracker.tplink.markdown
index a95022d65a..50dbf15802 100644
--- a/source/_components/device_tracker.tplink.markdown
+++ b/source/_components/device_tracker.tplink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TP-Link"
 description: "Instructions how to integrate TP-Link routers into Home Assistant."
 date: 2015-06-22 10:30
diff --git a/source/_components/device_tracker.ubus.markdown b/source/_components/device_tracker.ubus.markdown
index 9ad16682b5..71a8c26db3 100644
--- a/source/_components/device_tracker.ubus.markdown
+++ b/source/_components/device_tracker.ubus.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "OpenWRT (ubus)"
 description: "Instructions how to integrate OpenWRT routers into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/discovery.markdown b/source/_components/discovery.markdown
index 9f31629806..8633fba2c2 100644
--- a/source/_components/discovery.markdown
+++ b/source/_components/discovery.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Discovery"
 description: "Instructions how to setup Home Assistant to discover new devices."
 date: 2015-01-24 14:39
diff --git a/source/_components/downloader.markdown b/source/_components/downloader.markdown
index 928d1b0da9..b347ad9ca7 100644
--- a/source/_components/downloader.markdown
+++ b/source/_components/downloader.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Downloader"
 description: "Instructions how to setup the downloader component with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/ecobee.markdown b/source/_components/ecobee.markdown
index fc21f7042e..69879ddab9 100644
--- a/source/_components/ecobee.markdown
+++ b/source/_components/ecobee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Ecobee"
 description: "Instructions for how to integrate Ecobee thermostats and sensors within Home Assistant."
 date: 2015-11-30 17:54
diff --git a/source/_components/group.markdown b/source/_components/group.markdown
index e28ac57bbd..a33a3afd88 100644
--- a/source/_components/group.markdown
+++ b/source/_components/group.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Group"
 description: "Instructions how to setup groups within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/history.markdown b/source/_components/history.markdown
index 0fb6eb1fed..90e5df451a 100644
--- a/source/_components/history.markdown
+++ b/source/_components/history.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "History"
 description: "Instructions how to enable history support for Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/http.markdown b/source/_components/http.markdown
index f0a7f0d6e4..a05b058d1f 100644
--- a/source/_components/http.markdown
+++ b/source/_components/http.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "HTTP"
 description: "Offers a web framework to serve files."
 date: 2015-12-06 21:35
diff --git a/source/_components/ifttt.manything.markdown b/source/_components/ifttt.manything.markdown
index dd9b53751f..c5535ef28c 100644
--- a/source/_components/ifttt.manything.markdown
+++ b/source/_components/ifttt.manything.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ManyThing"
 description: "Instructions how to setup ManyThing support with IFTTT."
 date: 2015-09-07 18:00
diff --git a/source/_components/ifttt.markdown b/source/_components/ifttt.markdown
index 67d3dcb42e..c5adde1b46 100644
--- a/source/_components/ifttt.markdown
+++ b/source/_components/ifttt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "IFTTT"
 description: "Instructions how to setup IFTTT within Home Assistant."
 date: 2015-09-07 18:00
diff --git a/source/_components/influxdb.markdown b/source/_components/influxdb.markdown
index 7f1973087e..be64cc58dc 100644
--- a/source/_components/influxdb.markdown
+++ b/source/_components/influxdb.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "InfluxDB"
 description: "Record events in InfluxDB."
 date: 2015-12-06 13:08
diff --git a/source/_components/input_boolean.markdown b/source/_components/input_boolean.markdown
index 4b874a236d..2fcdedc64b 100644
--- a/source/_components/input_boolean.markdown
+++ b/source/_components/input_boolean.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Input Boolean"
 description: "Instructions how to integrate the Input Boolean component into Home Assistant."
 date: 2016-01-17 16:58
diff --git a/source/_components/insteon_hub.markdown b/source/_components/insteon_hub.markdown
index 9a4750d59f..7e6aa5f098 100644
--- a/source/_components/insteon_hub.markdown
+++ b/source/_components/insteon_hub.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Insteon Hub"
 description: "Instructions how to setup the Insteon Hub within Home Assistant."
 date: 2016-01-27 08:00
diff --git a/source/_components/introduction.markdown b/source/_components/introduction.markdown
index dabfd1b455..243e3b2c25 100644
--- a/source/_components/introduction.markdown
+++ b/source/_components/introduction.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Introduction"
 description: "Details about the introduction within Home Assistant."
 date: 2015-10-25 15:15
diff --git a/source/_components/isy994.markdown b/source/_components/isy994.markdown
index 0bb77c922a..eac00a8cc4 100644
--- a/source/_components/isy994.markdown
+++ b/source/_components/isy994.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ISY994 Controller"
 description: "Instructions how to setup the ISY994 controller within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/keyboard.markdown b/source/_components/keyboard.markdown
index 4bf2672e14..40f15421e0 100644
--- a/source/_components/keyboard.markdown
+++ b/source/_components/keyboard.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Keyboard"
 description: "Instructions how to simulate key presses with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/light.blinksticklight.markdown b/source/_components/light.blinksticklight.markdown
index 459676cf0b..0d80ee2086 100644
--- a/source/_components/light.blinksticklight.markdown
+++ b/source/_components/light.blinksticklight.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Blinkstick"
 description: "Instructions how to setup Blinkstick lights within Home Assistant."
 date: 2015-10-08 10:00
diff --git a/source/_components/light.hue.markdown b/source/_components/light.hue.markdown
index 8789a5d332..501005a7f2 100644
--- a/source/_components/light.hue.markdown
+++ b/source/_components/light.hue.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Philips Hue"
 description: "Instructions how to setup Philips Hue within Home Assistant."
 date: 2015-03-23 20:09
diff --git a/source/_components/light.hyperion.markdown b/source/_components/light.hyperion.markdown
index 1260dbc2c3..48889a36e8 100644
--- a/source/_components/light.hyperion.markdown
+++ b/source/_components/light.hyperion.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Hyperion"
 description: "Instructions how to integrate Hyperion into Home Assistant."
 date: 2015-10-25 22:43
diff --git a/source/_components/light.lifx.markdown b/source/_components/light.lifx.markdown
index f6456c0456..b164bb2f4d 100644
--- a/source/_components/light.lifx.markdown
+++ b/source/_components/light.lifx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "LIFX"
 description: "Instructions how to integrate LIFX into Home Assistant."
 date: 2016-01-27 08:00
diff --git a/source/_components/light.limitlessled.markdown b/source/_components/light.limitlessled.markdown
index 892313be9f..3a8ad99a4b 100644
--- a/source/_components/light.limitlessled.markdown
+++ b/source/_components/light.limitlessled.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "LimitlessLED"
 description: "Instructions on how to setup LimitlessLED within Home Assistant."
 date: 2015-12-03 13:00
diff --git a/source/_components/light.markdown b/source/_components/light.markdown
index 51bf811111..9cf467f247 100644
--- a/source/_components/light.markdown
+++ b/source/_components/light.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Lights"
 description: "Instructions how to setup your lights with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/light.mqtt.markdown b/source/_components/light.mqtt.markdown
index a3712391b6..f0d4680a8a 100644
--- a/source/_components/light.mqtt.markdown
+++ b/source/_components/light.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Light"
 description: "Instructions how to setup MQTT lights within Home Assistant."
 date: 2015-11-13 08:30
diff --git a/source/_components/light.rfxtrx.markdown b/source/_components/light.rfxtrx.markdown
index ee2f5813eb..374df8887b 100644
--- a/source/_components/light.rfxtrx.markdown
+++ b/source/_components/light.rfxtrx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RFXtrx Light"
 description: "Instructions how to integrate RFXtrx lights into Home Assistant."
 date: 2015-10-08 10:15
diff --git a/source/_components/light.tellstick.markdown b/source/_components/light.tellstick.markdown
index 8ebf9e8cb6..7326dc4934 100644
--- a/source/_components/light.tellstick.markdown
+++ b/source/_components/light.tellstick.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TellStick Light"
 description: "Instructions how to integrate TellStick lights into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/light.vera.markdown b/source/_components/light.vera.markdown
index 3c4c08be05..3ed552548a 100644
--- a/source/_components/light.vera.markdown
+++ b/source/_components/light.vera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Vera Light"
 description: "Instructions how to integrate Vera lights into Home Assistant."
 date: 2015-10-20 21:00
diff --git a/source/_components/light.wink.markdown b/source/_components/light.wink.markdown
index 62bdc4753d..3f019b5ca9 100644
--- a/source/_components/light.wink.markdown
+++ b/source/_components/light.wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink Light"
 description: "Instructions how to setup the Wink lights within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/light.zigbee.markdown b/source/_components/light.zigbee.markdown
index 0c71f8e4bf..25832fedbd 100644
--- a/source/_components/light.zigbee.markdown
+++ b/source/_components/light.zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: ZigBee Light
 description: "Instructions on how to set up ZigBee lights within Home Assistant."
 date: 2016-01-28 12:38
diff --git a/source/_components/light.zwave.markdown b/source/_components/light.zwave.markdown
index 5c5d573a56..00b3c7b64d 100644
--- a/source/_components/light.zwave.markdown
+++ b/source/_components/light.zwave.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Z-Wave Light"
 description: "Instructions how to setup the Z-Wave lights within Home Assistant."
 date: 2015-11-11 13:00
diff --git a/source/_components/lock.markdown b/source/_components/lock.markdown
index a905a990b9..dcad2d3056 100644
--- a/source/_components/lock.markdown
+++ b/source/_components/lock.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Locks"
 description: "Instructions how to setup your locks with Home Assistant."
 date: 2015-11-21 08:10
diff --git a/source/_components/lock.wink.markdown b/source/_components/lock.wink.markdown
index 6e25951dd1..d9abf003f8 100644
--- a/source/_components/lock.wink.markdown
+++ b/source/_components/lock.wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink Lock"
 description: "Instructions how to setup the Wink locks within Home Assistant."
 date: 2015-11-20 12:00
diff --git a/source/_components/logbook.markdown b/source/_components/logbook.markdown
index 7e3581788c..f7b3c42be7 100644
--- a/source/_components/logbook.markdown
+++ b/source/_components/logbook.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Logbook"
 description: "Instructions how to enable the logbook component for Home Assistant."
 date: 2015-04-25 9:23
diff --git a/source/_components/logger.markdown b/source/_components/logger.markdown
index e7a9935c9b..66c521e09e 100644
--- a/source/_components/logger.markdown
+++ b/source/_components/logger.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Logger"
 description: "Instructions how to enable the logger component for Home Assistant."
 date: 2015-11-12 17:00
diff --git a/source/_components/media_player.cast.markdown b/source/_components/media_player.cast.markdown
index ad8048f487..0ce3920e4e 100644
--- a/source/_components/media_player.cast.markdown
+++ b/source/_components/media_player.cast.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Google Cast"
 description: "Instructions how to integrate Google Cast into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/media_player.denon.markdown b/source/_components/media_player.denon.markdown
index 382f154a63..6d53b6c761 100644
--- a/source/_components/media_player.denon.markdown
+++ b/source/_components/media_player.denon.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Denon Network Receivers"
 description: "Instructions how to integrate Denon Network Receivers into Home Assistant."
 date: 2015-09-08 09:00
diff --git a/source/_components/media_player.firetv.markdown b/source/_components/media_player.firetv.markdown
index 0d1aefa7dc..7561b7bbe8 100644
--- a/source/_components/media_player.firetv.markdown
+++ b/source/_components/media_player.firetv.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "FireTV"
 description: "Instructions how to integrate Music Player Daemon into Home Assistant."
 date: 2015-10-23 18:00
diff --git a/source/_components/media_player.itunes.markdown b/source/_components/media_player.itunes.markdown
index 5e5c890353..3e77b6f862 100644
--- a/source/_components/media_player.itunes.markdown
+++ b/source/_components/media_player.itunes.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "iTunes"
 description: "Instructions how to integrate iTunes into Home Assistant."
 date: 2015-06-22 11:00
diff --git a/source/_components/media_player.kodi.markdown b/source/_components/media_player.kodi.markdown
index 905d108b08..b2e95c22e7 100644
--- a/source/_components/media_player.kodi.markdown
+++ b/source/_components/media_player.kodi.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Kodi"
 description: "Instructions how to integrate Kodi into Home Assistant."
 date: 2015-06-22 11:00
diff --git a/source/_components/media_player.markdown b/source/_components/media_player.markdown
index 5a22778183..24d81c3b2e 100644
--- a/source/_components/media_player.markdown
+++ b/source/_components/media_player.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Media Player"
 description: "Instructions how to setup your media players with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/media_player.mpd.markdown b/source/_components/media_player.mpd.markdown
index cd2a8e3f8a..b600a2e415 100644
--- a/source/_components/media_player.mpd.markdown
+++ b/source/_components/media_player.mpd.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Music Player Daemon (MPD)"
 description: "Instructions how to integrate Music Player Daemon into Home Assistant."
 date: 2015-06-02 08:00
diff --git a/source/_components/media_player.plex.markdown b/source/_components/media_player.plex.markdown
index 4488e68fb8..72b4787d81 100644
--- a/source/_components/media_player.plex.markdown
+++ b/source/_components/media_player.plex.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Plex"
 description: "Instructions how to integrate Plex into Home Assistant."
 date: 2015-10-05 21:21
diff --git a/source/_components/media_player.sonos.markdown b/source/_components/media_player.sonos.markdown
index a080ae0f4b..8b7dcc4e69 100644
--- a/source/_components/media_player.sonos.markdown
+++ b/source/_components/media_player.sonos.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Sonos"
 description: "Instructions how to integrateSonos devices into Home Assistant."
 date: 2015-09-12 13:00
diff --git a/source/_components/media_player.squeezebox.markdown b/source/_components/media_player.squeezebox.markdown
index 5d1a11ce52..ba31bd2550 100644
--- a/source/_components/media_player.squeezebox.markdown
+++ b/source/_components/media_player.squeezebox.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Logitech Squeezebox"
 description: "Instructions on how to integrate a Logitech Squeezebox player into Home Assistant."
 date: 2015-08-09 11:00
diff --git a/source/_components/media_player.universal.markdown b/source/_components/media_player.universal.markdown
index f634f7bdb8..fd0267ffb5 100644
--- a/source/_components/media_player.universal.markdown
+++ b/source/_components/media_player.universal.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Universal"
 description: "Instructions how to create a universal media player in Home Assistant."
 date: 2016-01-12 22:00
diff --git a/source/_components/modbus.markdown b/source/_components/modbus.markdown
index f33ca58ca3..d8e4a36daa 100644
--- a/source/_components/modbus.markdown
+++ b/source/_components/modbus.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Modbus"
 description: "Instructions how to integrate Modbus within Home Assistant."
 date: 2015-04-25 9:16
diff --git a/source/_components/mqtt.markdown b/source/_components/mqtt.markdown
index 2c0684ac9f..cac78c4405 100644
--- a/source/_components/mqtt.markdown
+++ b/source/_components/mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT"
 description: "Instructions how to setup MQTT within Home Assistant."
 date: 2015-08-07 18:00
diff --git a/source/_components/mqtt_eventstream.markdown b/source/_components/mqtt_eventstream.markdown
index a208bdae3e..75f0ab1106 100644
--- a/source/_components/mqtt_eventstream.markdown
+++ b/source/_components/mqtt_eventstream.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Eventstream"
 description: "Instructions how to setup MQTT eventstream within Home Assistant."
 date: 2016-01-13 08:00
diff --git a/source/_components/mysensors.markdown b/source/_components/mysensors.markdown
index 26214db8b5..e5a6c9a84e 100644
--- a/source/_components/mysensors.markdown
+++ b/source/_components/mysensors.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MySensors"
 description: "Instructions how to integrate MySensors sensors into Home Assistant."
 date: 2015-05-14 21:57
diff --git a/source/_components/nest.markdown b/source/_components/nest.markdown
index b04bfb93c2..f8a4723fe8 100644
--- a/source/_components/nest.markdown
+++ b/source/_components/nest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nest"
 description: "Instructions how to integrate Nest into Home Assistant."
 date: 2016-01-29 21:57
diff --git a/source/_components/notify.file.markdown b/source/_components/notify.file.markdown
index 042c088e80..afb14df7b8 100644
--- a/source/_components/notify.file.markdown
+++ b/source/_components/notify.file.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "File"
 description: "Instructions how to add file notifications to Home Assistant."
 date: 2015-06-22 10:00
diff --git a/source/_components/notify.free_mobile.markdown b/source/_components/notify.free_mobile.markdown
index a3d6c53f57..43ae84c090 100644
--- a/source/_components/notify.free_mobile.markdown
+++ b/source/_components/notify.free_mobile.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Free Mobile"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2016-01-12 08:36
diff --git a/source/_components/notify.google_voice.markdown b/source/_components/notify.google_voice.markdown
index 677f8749d9..61044ffc40 100644
--- a/source/_components/notify.google_voice.markdown
+++ b/source/_components/notify.google_voice.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Google Voice SMS"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2016-01-29
diff --git a/source/_components/notify.instapush.markdown b/source/_components/notify.instapush.markdown
index 77bd22b884..5fc49341bf 100644
--- a/source/_components/notify.instapush.markdown
+++ b/source/_components/notify.instapush.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Instapush"
 description: "Instructions how to add Instapush notifications to Home Assistant."
 date: 2015-05-01 18:00
diff --git a/source/_components/notify.markdown b/source/_components/notify.markdown
index ed8f64c4d7..f6d4f7b535 100644
--- a/source/_components/notify.markdown
+++ b/source/_components/notify.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Notifications"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/notify.mqtt.markdown b/source/_components/notify.mqtt.markdown
index e87485a0b5..1f42e72e43 100644
--- a/source/_components/notify.mqtt.markdown
+++ b/source/_components/notify.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Notifications"
 description: "Instructions how to add MQTT notifications to Home Assistant."
 date: 2016-02-01 08:00
diff --git a/source/_components/notify.nma.markdown b/source/_components/notify.nma.markdown
index ccd634f28c..4545d619e5 100644
--- a/source/_components/notify.nma.markdown
+++ b/source/_components/notify.nma.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Notify My Android"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2015-05-01 18:00
diff --git a/source/_components/notify.pushbullet.markdown b/source/_components/notify.pushbullet.markdown
index c887743734..5860998a15 100644
--- a/source/_components/notify.pushbullet.markdown
+++ b/source/_components/notify.pushbullet.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "PushBullet"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/notify.pushetta.markdown b/source/_components/notify.pushetta.markdown
index 2690df8133..e3a6f049d9 100644
--- a/source/_components/notify.pushetta.markdown
+++ b/source/_components/notify.pushetta.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Pushetta"
 description: "Instructions how to add Pushetta notifications to Home Assistant."
 date: 2015-11-10 18:00
diff --git a/source/_components/notify.pushover.markdown b/source/_components/notify.pushover.markdown
index 02aa891990..9e7161e361 100644
--- a/source/_components/notify.pushover.markdown
+++ b/source/_components/notify.pushover.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "PushOver"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/notify.slack.markdown b/source/_components/notify.slack.markdown
index d3639631ce..5f3c21735e 100644
--- a/source/_components/notify.slack.markdown
+++ b/source/_components/notify.slack.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Slack"
 description: "Instructions how to add Slack notifications to Home Assistant."
 date: 2015-08-06 18:00
diff --git a/source/_components/notify.smtp.markdown b/source/_components/notify.smtp.markdown
index d56dcc00c0..e76d3af83d 100644
--- a/source/_components/notify.smtp.markdown
+++ b/source/_components/notify.smtp.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "SMTP"
 description: "Instructions how to add e-mail notifications to Home Assistant."
 date: 2015-06-03 18:00
diff --git a/source/_components/notify.syslog.markdown b/source/_components/notify.syslog.markdown
index b5e72bf4a4..e556f6d108 100644
--- a/source/_components/notify.syslog.markdown
+++ b/source/_components/notify.syslog.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Syslog"
 description: "Instructions how to add syslog notifications to Home Assistant."
 date: 2015-06-09 16:00
diff --git a/source/_components/notify.telegram.markdown b/source/_components/notify.telegram.markdown
index b804aa5bff..b1d27f759f 100644
--- a/source/_components/notify.telegram.markdown
+++ b/source/_components/notify.telegram.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Telegram"
 description: "Instructions how to add Telegram notifications to Home Assistant."
 date: 2015-10-09 18:00
diff --git a/source/_components/notify.twitter.markdown b/source/_components/notify.twitter.markdown
index 97ea742ce1..49247e4cc5 100644
--- a/source/_components/notify.twitter.markdown
+++ b/source/_components/notify.twitter.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Twitter"
 description: "Instructions how to add Twitter notifications to Home Assistant."
 date: 2016-01-27 07:00
diff --git a/source/_components/notify.xmpp.markdown b/source/_components/notify.xmpp.markdown
index 4f9996c236..f410411d00 100644
--- a/source/_components/notify.xmpp.markdown
+++ b/source/_components/notify.xmpp.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Jabber (XMPP)"
 description: "Instructions how to add Jabber (XMPP) notifications to Home Assistant."
 date: 2015-05-08 18:00
diff --git a/source/_components/rfxtrx.markdown b/source/_components/rfxtrx.markdown
index 8dccdf26c9..18e44c582a 100644
--- a/source/_components/rfxtrx.markdown
+++ b/source/_components/rfxtrx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RFXtrx"
 description: "Instructions how to integrate RFXtrx into Home Assistant."
 date: 2015-10-08 10:15
diff --git a/source/_components/rollershutter.markdown b/source/_components/rollershutter.markdown
index 34f479fae5..1fe740d433 100644
--- a/source/_components/rollershutter.markdown
+++ b/source/_components/rollershutter.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Rollershutters"
 description: "Instructions how to integrate rollershutters into Home Assistant."
 date: 2015-12-01 12:00
diff --git a/source/_components/rollershutter.mqtt.markdown b/source/_components/rollershutter.mqtt.markdown
index a9b92398d6..7ed69de408 100644
--- a/source/_components/rollershutter.mqtt.markdown
+++ b/source/_components/rollershutter.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Rollershutter"
 description: "Instructions how to integrate MQTT motorized devices into Home Assistant."
 date: 2015-12-01 12:00
diff --git a/source/_components/scene.markdown b/source/_components/scene.markdown
index 083bd0c0a3..3ba280133d 100644
--- a/source/_components/scene.markdown
+++ b/source/_components/scene.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Scenes"
 description: "Instructions how to setup scenes within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/script.markdown b/source/_components/script.markdown
index 5a9f6d285f..119ec62933 100644
--- a/source/_components/script.markdown
+++ b/source/_components/script.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Scripts"
 description: "Instructions how to setup scripts within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/sensor.arduino.markdown b/source/_components/sensor.arduino.markdown
index 0db1320573..f893a4ada0 100644
--- a/source/_components/sensor.arduino.markdown
+++ b/source/_components/sensor.arduino.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Arduino Sensor"
 description: "Instructions how to integrate Arduino boards pins as sensors within Home Assistant."
 date: 2015-09-14 18:28
diff --git a/source/_components/sensor.arest.markdown b/source/_components/sensor.arest.markdown
index c75bc22b60..ea63c52bae 100644
--- a/source/_components/sensor.arest.markdown
+++ b/source/_components/sensor.arest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "aREST Sensor"
 description: "Instructions how to integrate aREST sensors within Home Assistant."
 date: 2015-09-07 18:15
diff --git a/source/_components/sensor.bitcoin.markdown b/source/_components/sensor.bitcoin.markdown
index da6cd72b01..56145a9d81 100644
--- a/source/_components/sensor.bitcoin.markdown
+++ b/source/_components/sensor.bitcoin.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Bitcoin"
 description: "Instructions how to integrate Bitcoin data within Home Assistant."
 date: 2015-05-08 17:15
diff --git a/source/_components/sensor.command_sensor.markdown b/source/_components/sensor.command_sensor.markdown
index 06dc43d64b..9c0c8adfac 100644
--- a/source/_components/sensor.command_sensor.markdown
+++ b/source/_components/sensor.command_sensor.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Command line Sensor"
 description: "Instructions how to integrate command line sensors into Home Assistant."
 date: 2015-09-13 10:10
diff --git a/source/_components/sensor.cpuspeed.markdown b/source/_components/sensor.cpuspeed.markdown
index a8b43142bb..ec2c229d7b 100644
--- a/source/_components/sensor.cpuspeed.markdown
+++ b/source/_components/sensor.cpuspeed.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "CPU speed"
 description: "Instructions how to integrate CPU speed within Home Assistant."
 date: 2015-10-15 11:00
diff --git a/source/_components/sensor.dht.markdown b/source/_components/sensor.dht.markdown
index 6718cab67f..6b535d2cf6 100644
--- a/source/_components/sensor.dht.markdown
+++ b/source/_components/sensor.dht.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "DHT Sensor"
 description: "Instructions how to integrate DHTxx sensors within Home Assistant."
 date: 2015-08-30 19:15
diff --git a/source/_components/sensor.dweet.markdown b/source/_components/sensor.dweet.markdown
index eec0d5d6f8..304fcffa28 100644
--- a/source/_components/sensor.dweet.markdown
+++ b/source/_components/sensor.dweet.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Dweet.io"
 description: "Instructions how to integrate Dweet.io sensors within Home Assistant."
 date: 2015-12-10 10:15
diff --git a/source/_components/sensor.ecobee.markdown b/source/_components/sensor.ecobee.markdown
index e729c46619..ebd63bb6ac 100644
--- a/source/_components/sensor.ecobee.markdown
+++ b/source/_components/sensor.ecobee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Ecobee Sensor"
 description: "Instructions how to setup the Ecobee sensors within Home Assistant."
 date: 2015-11-30 18:00
diff --git a/source/_components/sensor.efergy.markdown b/source/_components/sensor.efergy.markdown
index 8a61b44a3f..15dc7f7fb7 100644
--- a/source/_components/sensor.efergy.markdown
+++ b/source/_components/sensor.efergy.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Efergy"
 description: "Instructions how to integrate Efergy devices within Home Assistant."
 date: 2015-07-11 0:15
diff --git a/source/_components/sensor.eliqonline.markdown b/source/_components/sensor.eliqonline.markdown
index e8e767b3b1..44f3214b2d 100644
--- a/source/_components/sensor.eliqonline.markdown
+++ b/source/_components/sensor.eliqonline.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Eliqonline"
 description: "Instructions how to integrate Eliqonline devices within Home Assistant."
 date: 2015-07-11 0:15
diff --git a/source/_components/sensor.forecast.markdown b/source/_components/sensor.forecast.markdown
index a28b142893..47ce6814d5 100644
--- a/source/_components/sensor.forecast.markdown
+++ b/source/_components/sensor.forecast.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Forecast.io"
 description: "Instructions how to integrate Forecast.io within Home Assistant."
 date: 2015-04-25 9:06
diff --git a/source/_components/sensor.glances.markdown b/source/_components/sensor.glances.markdown
index 700320445c..485c94a303 100644
--- a/source/_components/sensor.glances.markdown
+++ b/source/_components/sensor.glances.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Glances"
 description: "Instructions how to integrate Glances sensors into Home Assistant."
 date: 2015-09-14 19:10
diff --git a/source/_components/sensor.http.markdown b/source/_components/sensor.http.markdown
index 8681aca6d2..7d7bcb63eb 100644
--- a/source/_components/sensor.http.markdown
+++ b/source/_components/sensor.http.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "HTTP Sensor"
 description: "Instructions how to integrate HTTP sensors within Home Assistant."
 date: 2016-02-05 12:15
diff --git a/source/_components/sensor.markdown b/source/_components/sensor.markdown
index 215246234e..fc8a35d926 100644
--- a/source/_components/sensor.markdown
+++ b/source/_components/sensor.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Sensor"
 description: "Instructions how to setup your sensors with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/sensor.modbus.markdown b/source/_components/sensor.modbus.markdown
index e4f331eb60..99f85d03cc 100644
--- a/source/_components/sensor.modbus.markdown
+++ b/source/_components/sensor.modbus.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Modbus Sensor"
 description: "Instructions how to integrate Modbus sensors into Home Assistant."
 date: 2015-08-30 23:38
diff --git a/source/_components/sensor.mqtt.markdown b/source/_components/sensor.mqtt.markdown
index 11bb2a1098..770ff862e1 100644
--- a/source/_components/sensor.mqtt.markdown
+++ b/source/_components/sensor.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Sensor"
 description: "Instructions how to integrate MQTT sensors within Home Assistant."
 date: 2015-05-30 23:21
diff --git a/source/_components/sensor.mysensors.markdown b/source/_components/sensor.mysensors.markdown
index 5c2125230b..4fce211719 100644
--- a/source/_components/sensor.mysensors.markdown
+++ b/source/_components/sensor.mysensors.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MySensors Sensor"
 description: "Instructions how to integrate MySensors sensors into Home Assistant."
 date: 2016-01-17 15:49
diff --git a/source/_components/sensor.nest.markdown b/source/_components/sensor.nest.markdown
index 75342dd472..b85a2344e0 100644
--- a/source/_components/sensor.nest.markdown
+++ b/source/_components/sensor.nest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nest Sensor"
 description: "Instructions how to integrate Nest sensors within Home Assistant."
 date: 2016-01-13 19:59
diff --git a/source/_components/sensor.netatmo.markdown b/source/_components/sensor.netatmo.markdown
index 119cfad3f9..ad196eda24 100644
--- a/source/_components/sensor.netatmo.markdown
+++ b/source/_components/sensor.netatmo.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Netatmo Sensor"
 description: "Instructions how to integrate Netatmo sensors into Home Assistant."
 date: 2016-01-14 08:10
diff --git a/source/_components/sensor.onewire.markdown b/source/_components/sensor.onewire.markdown
index e6652b4b84..15fb06ec85 100644
--- a/source/_components/sensor.onewire.markdown
+++ b/source/_components/sensor.onewire.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "One wire Sensor"
 description: "Instructions how to integrate One wire (1-wire) sensors into Home Assistant."
 date: 2016-01-17 07:15
diff --git a/source/_components/sensor.openweathermap.markdown b/source/_components/sensor.openweathermap.markdown
index df7e0b8c2a..66e5e4f3d8 100644
--- a/source/_components/sensor.openweathermap.markdown
+++ b/source/_components/sensor.openweathermap.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "OpenWeatherMap"
 description: "Instructions how to integrate OpenWeatherMap within Home Assistant."
 date: 2015-04-25 9:06
diff --git a/source/_components/sensor.rest.markdown b/source/_components/sensor.rest.markdown
index 6cdf092461..c75a216dac 100644
--- a/source/_components/sensor.rest.markdown
+++ b/source/_components/sensor.rest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RESTful Sensor"
 description: "Instructions how to integrate REST sensors into Home Assistant."
 date: 2015-09-14 19:10
diff --git a/source/_components/sensor.rfxtrx.markdown b/source/_components/sensor.rfxtrx.markdown
index 0c0f9a4f30..1f9ce224c8 100644
--- a/source/_components/sensor.rfxtrx.markdown
+++ b/source/_components/sensor.rfxtrx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RFXtrx Sensor"
 description: "Instructions how to integrate RFXtrx sensors into Home Assistant."
 date: 2015-08-06 17:15
diff --git a/source/_components/sensor.sabnzbd.markdown b/source/_components/sensor.sabnzbd.markdown
index a86d2ce4e8..984143da7f 100644
--- a/source/_components/sensor.sabnzbd.markdown
+++ b/source/_components/sensor.sabnzbd.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "SABnzbd"
 description: "Instructions how to integrate SABnzbd within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/sensor.swiss_public_transport.markdown b/source/_components/sensor.swiss_public_transport.markdown
index 8f17ad5a48..4723974292 100644
--- a/source/_components/sensor.swiss_public_transport.markdown
+++ b/source/_components/sensor.swiss_public_transport.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Swiss Public Transport"
 description: "Instructions how to integrate timetable data for travelling in Switzerland within Home Assistant."
 date: 2015-06-02 21:45
diff --git a/source/_components/sensor.systemmonitor.markdown b/source/_components/sensor.systemmonitor.markdown
index 5915533cd4..e1fb58cd46 100644
--- a/source/_components/sensor.systemmonitor.markdown
+++ b/source/_components/sensor.systemmonitor.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "System Monitor"
 description: "Instructions how to monitor the Home Assistant host."
 date: 2015-03-23 19:59
diff --git a/source/_components/sensor.tellduslive.markdown b/source/_components/sensor.tellduslive.markdown
index d7e3ae398b..43fffd4024 100644
--- a/source/_components/sensor.tellduslive.markdown
+++ b/source/_components/sensor.tellduslive.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Telldus Live sensor"
 description: "Instructions how to integrate Telldus Live sensors into Home Assistant."
 date: 2016-01-17 15:49
diff --git a/source/_components/sensor.tellstick.markdown b/source/_components/sensor.tellstick.markdown
index 1051222cdc..8c7a244ebe 100644
--- a/source/_components/sensor.tellstick.markdown
+++ b/source/_components/sensor.tellstick.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TellStick Sensor"
 description: "Instructions how to integrate TellStick sensors into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/sensor.temper.markdown b/source/_components/sensor.temper.markdown
index b1533e21d0..d204cf7fd4 100644
--- a/source/_components/sensor.temper.markdown
+++ b/source/_components/sensor.temper.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TEMPer Sensor"
 description: "Instructions how to integrate TEMPer sensors into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/sensor.template.markdown b/source/_components/sensor.template.markdown
index 533221a100..da6ec606d6 100644
--- a/source/_components/sensor.template.markdown
+++ b/source/_components/sensor.template.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Template Sensor"
 description: "Instructions how to integrate Template sensors into Home Assistant."
 date: 2016-01-27 07:00
diff --git a/source/_components/sensor.time_date.markdown b/source/_components/sensor.time_date.markdown
index 82f287e0ca..2a945fb8b5 100644
--- a/source/_components/sensor.time_date.markdown
+++ b/source/_components/sensor.time_date.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Time & Date"
 description: "Instructions how to integrate the time and the date within Home Assistant."
 date: 2015-05-08 17:15
diff --git a/source/_components/sensor.torque.markdown b/source/_components/sensor.torque.markdown
index f7287899d9..f8911e5fad 100644
--- a/source/_components/sensor.torque.markdown
+++ b/source/_components/sensor.torque.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Torque (OBD2)"
 description: "Instructions how to integrate Torque sensors into Home Assistant."
 date: 2015-12-20 18:00
diff --git a/source/_components/sensor.transmission.markdown b/source/_components/sensor.transmission.markdown
index cc7952fa5e..e484da70f1 100644
--- a/source/_components/sensor.transmission.markdown
+++ b/source/_components/sensor.transmission.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Transmission Sensor"
 description: "Instructions how to integrate Transmission sensors within Home Assistant."
 date: 2015-04-25 9:06
diff --git a/source/_components/sensor.twitch.markdown b/source/_components/sensor.twitch.markdown
index 56c5dff933..b1b81299ca 100644
--- a/source/_components/sensor.twitch.markdown
+++ b/source/_components/sensor.twitch.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Twitch"
 description: "Instructions how to integrate Twitch sensors into Home Assistant."
 date: 2015-12-19 09:00
diff --git a/source/_components/sensor.vera.markdown b/source/_components/sensor.vera.markdown
index 93fd9fbe8f..eb634bf280 100644
--- a/source/_components/sensor.vera.markdown
+++ b/source/_components/sensor.vera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Vera Sensor"
 description: "Instructions how to integrate Vera sensors into Home Assistant."
 date: 2015-10-20 21:00
diff --git a/source/_components/sensor.wink.markdown b/source/_components/sensor.wink.markdown
index ab4f49f758..f8aa03fa56 100644
--- a/source/_components/sensor.wink.markdown
+++ b/source/_components/sensor.wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink Sensor"
 description: "Instructions how to setup the Wink sensors within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/sensor.worldclock.markdown b/source/_components/sensor.worldclock.markdown
index 77989ab332..a438ea034b 100644
--- a/source/_components/sensor.worldclock.markdown
+++ b/source/_components/sensor.worldclock.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Worldclock"
 description: "Instructions how to integrate a Worldclock within Home Assistant."
 date: 2015-10-02 11:15
diff --git a/source/_components/sensor.yr.markdown b/source/_components/sensor.yr.markdown
index b64d200594..3c0072da25 100644
--- a/source/_components/sensor.yr.markdown
+++ b/source/_components/sensor.yr.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "YR"
 description: "Instructions how to integrate Yr.no within Home Assistant."
 date: 2016-01-04 14:00
diff --git a/source/_components/sensor.zigbee.markdown b/source/_components/sensor.zigbee.markdown
index db03ea55bc..45a58641ac 100644
--- a/source/_components/sensor.zigbee.markdown
+++ b/source/_components/sensor.zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: ZigBee Sensor
 description: "Instructions on how to set up ZigBee sensors within Home Assistant."
 date: 2016-01-28 10:08
diff --git a/source/_components/sensor.zwave.markdown b/source/_components/sensor.zwave.markdown
index f26050bd78..0b4641935a 100644
--- a/source/_components/sensor.zwave.markdown
+++ b/source/_components/sensor.zwave.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Z-Wave Sensor"
 description: "Instructions how to setup the Z-Wave sensors within Home Assistant."
 date: 2015-11-15 13:00
diff --git a/source/_components/shell_command.markdown b/source/_components/shell_command.markdown
index 5e99dc7385..00551f9b65 100644
--- a/source/_components/shell_command.markdown
+++ b/source/_components/shell_command.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Shell command"
 description: "Instructions how to integrate Shell commands into Home Assistant."
 date: 2015-10-13 19:10
diff --git a/source/_components/simple_alarm.markdown b/source/_components/simple_alarm.markdown
index f158203cec..d0e8f14a98 100644
--- a/source/_components/simple_alarm.markdown
+++ b/source/_components/simple_alarm.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Intruder Alerts"
 description: "Instructions how to receive intruder alerts from Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/statsd.markdown b/source/_components/statsd.markdown
index fbaa914b3e..80a473c445 100644
--- a/source/_components/statsd.markdown
+++ b/source/_components/statsd.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "StatsD"
 description: "Record events in StatsD."
 date: 2016-01-25 08:00
diff --git a/source/_components/sun.markdown b/source/_components/sun.markdown
index 3d5c3268b9..81fac12dc5 100644
--- a/source/_components/sun.markdown
+++ b/source/_components/sun.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Sun"
 description: "Instructions how to track the sun within Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/switch.arduino.markdown b/source/_components/switch.arduino.markdown
index 27d25a6194..b2a1b7ef5c 100644
--- a/source/_components/switch.arduino.markdown
+++ b/source/_components/switch.arduino.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Arduino Switch"
 description: "Instructions how to integrate Arduino boards pins as switches within Home Assistant."
 date: 2015-09-14 18:28
diff --git a/source/_components/switch.arest.markdown b/source/_components/switch.arest.markdown
index e9e815fdb3..a68fa5e5cc 100644
--- a/source/_components/switch.arest.markdown
+++ b/source/_components/switch.arest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "aREST Switch"
 description: "Instructions how to integrate aREST switches within Home Assistant."
 date: 2015-09-11 23:15
diff --git a/source/_components/switch.command_switch.markdown b/source/_components/switch.command_switch.markdown
index 5850ad1ded..ea1dc0b711 100644
--- a/source/_components/switch.command_switch.markdown
+++ b/source/_components/switch.command_switch.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Command line Switch"
 description: "Instructions how to have switches call command line commands."
 date: 2015-06-10 22:41
diff --git a/source/_components/switch.edimax.markdown b/source/_components/switch.edimax.markdown
index 70220e148a..b0078775a0 100644
--- a/source/_components/switch.edimax.markdown
+++ b/source/_components/switch.edimax.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Edimax Switch"
 description: "Instructions how to integrate Edimax switches into Home Assistant."
 date: 2015-06-10 22:54
diff --git a/source/_components/switch.hikvision.markdown b/source/_components/switch.hikvision.markdown
index 5dd60b4679..1887dd389f 100644
--- a/source/_components/switch.hikvision.markdown
+++ b/source/_components/switch.hikvision.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Hikvision Camera Switch"
 description: "Instructions how to integrate Hikvision camera's into Home Assistant."
 date: 2015-06-10 22:54
diff --git a/source/_components/switch.markdown b/source/_components/switch.markdown
index c42f476040..162d9c8c79 100644
--- a/source/_components/switch.markdown
+++ b/source/_components/switch.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Switches"
 description: "Instructions how to setup your switches with Home Assistant."
 date: 2015-01-24 14:39
diff --git a/source/_components/switch.modbus.markdown b/source/_components/switch.modbus.markdown
index fe3f8e7c90..667b5a3dc7 100644
--- a/source/_components/switch.modbus.markdown
+++ b/source/_components/switch.modbus.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Modbus Switch"
 description: "Instructions how to integrate Modbus switches into Home Assistant."
 date: 2015-08-30 23:38
diff --git a/source/_components/switch.mqtt.markdown b/source/_components/switch.mqtt.markdown
index 6dd0904fb1..6c60999111 100644
--- a/source/_components/switch.mqtt.markdown
+++ b/source/_components/switch.mqtt.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MQTT Switch"
 description: "Instructions how to integrate MQTT switches into Home Assistant."
 date: 2015-08-30 23:38
diff --git a/source/_components/switch.mysensors.markdown b/source/_components/switch.mysensors.markdown
index 314418a1bf..7b3fb6f1a3 100644
--- a/source/_components/switch.mysensors.markdown
+++ b/source/_components/switch.mysensors.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "MySensors Switch"
 description: "Instructions how to integrate MySensors switches into Home Assistant."
 date: 2016-01-17 15:49
diff --git a/source/_components/switch.mystrom.markdown b/source/_components/switch.mystrom.markdown
index 3a58690082..e5bdac5b17 100644
--- a/source/_components/switch.mystrom.markdown
+++ b/source/_components/switch.mystrom.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "myStrom Switch"
 description: "Instructions how to integrate myStrom switches into Home Assistant."
 date: 2015-11-25 22:00
diff --git a/source/_components/switch.orvibo.markdown b/source/_components/switch.orvibo.markdown
index 37af0826e4..b365802102 100644
--- a/source/_components/switch.orvibo.markdown
+++ b/source/_components/switch.orvibo.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Orvibo Switch"
 description: "Instructions how to integrate Orvibo switches within Home Assistant."
 date: 2015-11-15 18:15
diff --git a/source/_components/switch.rest.markdown b/source/_components/switch.rest.markdown
index a33edb2e16..3d56ca231b 100644
--- a/source/_components/switch.rest.markdown
+++ b/source/_components/switch.rest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RESTful Switch"
 description: "Instructions how to integrate REST switches into Home Assistant."
 date: 2015-09-14 19:10
diff --git a/source/_components/switch.rfxtrx.markdown b/source/_components/switch.rfxtrx.markdown
index e8d0d9654e..215eb43af3 100644
--- a/source/_components/switch.rfxtrx.markdown
+++ b/source/_components/switch.rfxtrx.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "RFXtrx Switch"
 description: "Instructions how to integrate RFXtrx switches into Home Assistant."
 date: 2015-10-08 10:15
diff --git a/source/_components/switch.rpi_gpio.markdown b/source/_components/switch.rpi_gpio.markdown
index cc4f86a3e6..608ca7aa1a 100644
--- a/source/_components/switch.rpi_gpio.markdown
+++ b/source/_components/switch.rpi_gpio.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 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
diff --git a/source/_components/switch.tellduslive.markdown b/source/_components/switch.tellduslive.markdown
index 18252be830..eb2002814a 100644
--- a/source/_components/switch.tellduslive.markdown
+++ b/source/_components/switch.tellduslive.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Telldus Live Switch"
 description: "Instructions how to integrate Telldus Live switches into Home Assistant."
 date: 2016-01-17 15:49
diff --git a/source/_components/switch.tellstick.markdown b/source/_components/switch.tellstick.markdown
index 62495288f9..e9f3baf21e 100644
--- a/source/_components/switch.tellstick.markdown
+++ b/source/_components/switch.tellstick.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TellStick Switch"
 description: "Instructions how to integrate TellStick switches into Home Assistant."
 date: 2015-08-06 19:00
diff --git a/source/_components/switch.transmission.markdown b/source/_components/switch.transmission.markdown
index b7120d44c0..e5a1e43512 100644
--- a/source/_components/switch.transmission.markdown
+++ b/source/_components/switch.transmission.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Transmission Switch"
 description: "Instructions how to integrate Transmission within Home Assistant."
 date: 2015-06-02 09:00
diff --git a/source/_components/switch.vera.markdown b/source/_components/switch.vera.markdown
index 25e9b439fe..07bad9bea2 100644
--- a/source/_components/switch.vera.markdown
+++ b/source/_components/switch.vera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Vera Switch"
 description: "Instructions how to integrate Vera switches into Home Assistant."
 date: 2015-10-20 21:00
diff --git a/source/_components/switch.wemo.markdown b/source/_components/switch.wemo.markdown
index 2528d8cbc1..1e9560f77e 100644
--- a/source/_components/switch.wemo.markdown
+++ b/source/_components/switch.wemo.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Belkin WeMo Switch"
 description: "Instructions how to integrate Belkin WeMo switches into Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/switch.wink.markdown b/source/_components/switch.wink.markdown
index a3067d4593..6dda470f28 100644
--- a/source/_components/switch.wink.markdown
+++ b/source/_components/switch.wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink Switch"
 description: "Instructions how to setup the Wink switches within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/switch.zigbee.markdown b/source/_components/switch.zigbee.markdown
index 83f8b26728..41097f32e6 100644
--- a/source/_components/switch.zigbee.markdown
+++ b/source/_components/switch.zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ZigBee Switch"
 description: "Instructions on how to set up ZigBee switches within Home Assistant."
 date: 2016-01-28 11:52
diff --git a/source/_components/switch.zwave.markdown b/source/_components/switch.zwave.markdown
index 270690b276..3b9f072fa1 100644
--- a/source/_components/switch.zwave.markdown
+++ b/source/_components/switch.zwave.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Z-Wave Switch"
 description: "Instructions how to setup the Z-Wave switches within Home Assistant."
 date: 2015-11-15 13:00
diff --git a/source/_components/tellduslive.markdown b/source/_components/tellduslive.markdown
index ad514f3f87..3898d4d89b 100644
--- a/source/_components/tellduslive.markdown
+++ b/source/_components/tellduslive.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Telldus Live"
 description: "Instructions how to integrate Telldus Live into Home Assistant."
 date: 2016-01-17 16:00
diff --git a/source/_components/tellstick.markdown b/source/_components/tellstick.markdown
index 3b50d202bd..13124b1104 100644
--- a/source/_components/tellstick.markdown
+++ b/source/_components/tellstick.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "TellStick"
 description: "Instructions how to integrate your TellStick into Home Assistant."
 date: 2015-03-28 13:06
diff --git a/source/_components/thermostat.ecobee.markdown b/source/_components/thermostat.ecobee.markdown
index 35cf51563c..d209c458a0 100644
--- a/source/_components/thermostat.ecobee.markdown
+++ b/source/_components/thermostat.ecobee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Ecobee Thermostat"
 description: "Instructions how to setup the Ecobee thermostats within Home Assistant."
 date: 2015-11-30 18:00
diff --git a/source/_components/thermostat.heat_control.markdown b/source/_components/thermostat.heat_control.markdown
index d27bb3993b..5f75433426 100644
--- a/source/_components/thermostat.heat_control.markdown
+++ b/source/_components/thermostat.heat_control.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Heat control"
 description: "Turn Home Assistant into a thermostat"
 date: 2015-03-23 19:59
diff --git a/source/_components/thermostat.heatmiser.markdown b/source/_components/thermostat.heatmiser.markdown
index c98b78d78b..49529fb0eb 100644
--- a/source/_components/thermostat.heatmiser.markdown
+++ b/source/_components/thermostat.heatmiser.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Heatmiser Thermostat"
 description: "Instructions how to integrate Heatmiser thermostats within Home Assistant."
 date: 2015-12-11 12:35
diff --git a/source/_components/thermostat.homematic.markdown b/source/_components/thermostat.homematic.markdown
index a887fd5146..dc206f5a7a 100644
--- a/source/_components/thermostat.homematic.markdown
+++ b/source/_components/thermostat.homematic.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Homematic Thermostat"
 description: "Instructions how to integrate Homematic thermostats within Home Assistant."
 date: 2015-11-25 08:00
diff --git a/source/_components/thermostat.honeywell.markdown b/source/_components/thermostat.honeywell.markdown
index 3c2e5bf717..554b224734 100644
--- a/source/_components/thermostat.honeywell.markdown
+++ b/source/_components/thermostat.honeywell.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Honeywell Thermostat"
 description: "Instructions how to integrate Honeywell thermostats within Home Assistant."
 date: 2015-11-09 17:15
diff --git a/source/_components/thermostat.markdown b/source/_components/thermostat.markdown
index d47b2728c4..d003e41cfa 100644
--- a/source/_components/thermostat.markdown
+++ b/source/_components/thermostat.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Thermostats"
 description: "Instructions how to setup thermostats tracking within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/thermostat.nest.markdown b/source/_components/thermostat.nest.markdown
index b139e671eb..30c1b8c900 100644
--- a/source/_components/thermostat.nest.markdown
+++ b/source/_components/thermostat.nest.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Nest Thermostat"
 description: "Instructions how to integrate Nest thermostats within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_components/thermostat.proliphix.markdown b/source/_components/thermostat.proliphix.markdown
index 3efb55e43e..c9c13f91d1 100644
--- a/source/_components/thermostat.proliphix.markdown
+++ b/source/_components/thermostat.proliphix.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Proliphix Thermostat"
 description: "Instructions how to integrate Proliphix thermostats within Home Assistant."
 date: 2016-01-15 08:00
diff --git a/source/_components/thermostat.radiotherm.markdown b/source/_components/thermostat.radiotherm.markdown
index 0c93089cb4..fc40993303 100644
--- a/source/_components/thermostat.radiotherm.markdown
+++ b/source/_components/thermostat.radiotherm.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Radiotherm Thermostat"
 description: "Instructions how to integrate Radiotherm thermostats within Home Assistant."
 date: 2015-10-18 17:15
diff --git a/source/_components/updater.markdown b/source/_components/updater.markdown
index 44d270b7b1..8f857c7808 100644
--- a/source/_components/updater.markdown
+++ b/source/_components/updater.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Updater"
 description: "Detecting when Home Assistant updates are available."
 date: 2015-11-15 20:40
diff --git a/source/_components/vera.markdown b/source/_components/vera.markdown
index 4ceee75d40..782ca02cb7 100644
--- a/source/_components/vera.markdown
+++ b/source/_components/vera.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Vera"
 description: "Instructions how to setup Vera hubs within Home Assistant."
 date: 2015-03-23 20:04
diff --git a/source/_components/verisure.markdown b/source/_components/verisure.markdown
index 06c635ecb3..8730ec8382 100644
--- a/source/_components/verisure.markdown
+++ b/source/_components/verisure.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Verisure"
 description: "Instructions how to setup Verisure devices within Home Assistant."
 date: 2015-08-17 20:28
diff --git a/source/_components/wink.markdown b/source/_components/wink.markdown
index bebe9368ac..4cd2283687 100644
--- a/source/_components/wink.markdown
+++ b/source/_components/wink.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Wink"
 description: "Instructions how to setup the Wink hub within Home Assistant."
 date: 2015-01-20 22:36
diff --git a/source/_components/zigbee.markdown b/source/_components/zigbee.markdown
index 51ae3f4fae..01770a49e1 100644
--- a/source/_components/zigbee.markdown
+++ b/source/_components/zigbee.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "ZigBee"
 description: "Instructions on how to integrate a ZigBee network with Home Assistant."
 date: 2016-01-27 17:10
diff --git a/source/_components/zone.markdown b/source/_components/zone.markdown
index a0bd59ad1a..bcb5980a1c 100644
--- a/source/_components/zone.markdown
+++ b/source/_components/zone.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Zone"
 description: "Instructions how to setup zones within Home Assistant."
 date: 2015-10-04 09:23
diff --git a/source/_components/zwave.markdown b/source/_components/zwave.markdown
index 1ec9fad3d4..88a54ac9b7 100644
--- a/source/_components/zwave.markdown
+++ b/source/_components/zwave.markdown
@@ -1,5 +1,5 @@
 ---
-layout: component
+layout: page
 title: "Z-Wave"
 description: "Instructions how to integrate your existing Z-Wave within Home Assistant."
 date: 2015-03-23 19:59
diff --git a/source/_layouts/component.html b/source/_layouts/component.html
deleted file mode 100644
index 3f387fde49..0000000000
--- a/source/_layouts/component.html
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: default
----
-
-<article class="page">
-  <header>
-    <h1 class="title indent">
-      {{ page.title }}
-    </h1>
-  </header>
-  <hr class="divider">
-
-  {{ content }}
-</article>
diff --git a/source/_layouts/page.html b/source/_layouts/page.html
index c4f667776a..9701938066 100644
--- a/source/_layouts/page.html
+++ b/source/_layouts/page.html
@@ -3,8 +3,10 @@ layout: default
 ---
 
 <article class="page">
-
-  {% include edit_github.html %}
+  {% assign url_parts = page.url | split: '/' %}
+  {% if url_parts[1] != 'components' and url_parts[1] != 'cookbook' %}
+    {% include edit_github.html %}
+  {% endif %}
 
   {% if page.title and page.show_title != false %}
   <header>