diff --git a/source/_components/binary_sensor.skybell.markdown b/source/_components/binary_sensor.skybell.markdown
deleted file mode 100644
index 4f3d63d7c35..00000000000
--- a/source/_components/binary_sensor.skybell.markdown
+++ /dev/null
@@ -1,41 +0,0 @@
----
-layout: page
-title: "Skybell Binary Sensor"
-description: "Instructions on how to integrate your Skybell HD devices within Home Assistant."
-date: 2017-10-03 16:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: skybell.png
-ha_category: Doorbell
-ha_release: 0.56
-ha_iot_class: "Cloud Polling"
----
-
-To get your [Skybell.com](https://skybell.com/) binary sensors working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-binary_sensor:
-  - platform: skybell
-    monitored_conditions:
-      - button
-      - motion
-```
-
-{% configuration %}
-monitored_conditions:
-  description: Conditions to display in the frontend. The following conditions can be monitored.
-  required: true
-  type: list
-  keys:
-    button:
-      description: Returns whether the doorbell button was pressed.
-    motion:
-      description: Returns whether movement was detected by the Skybell doorbell.
-{% endconfiguration %}
diff --git a/source/_components/camera.skybell.markdown b/source/_components/camera.skybell.markdown
deleted file mode 100644
index 4bbc2db934d..00000000000
--- a/source/_components/camera.skybell.markdown
+++ /dev/null
@@ -1,68 +0,0 @@
----
-layout: page
-title: "Skybell Camera"
-description: "Instructions on how to integrate your Skybell HD devices within Home Assistant."
-date: 2017-10-03 16:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: skybell.png
-ha_category: Camera
-ha_release: 0.56
-ha_iot_class: "Cloud Polling"
----
-
-To get your [Skybell.com](https://www.skybell.com/) cameras working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-camera:
-  - platform: skybell
-```
-
-{% configuration %}
-monitored_conditions:
-  description: The camera images to display. Default is `avatar`. The full list is `avatar`, `activity`.
-  required: false
-  type: list
-avatar_name:
-  description: Name to append to the device name for the avatar image. Default is empty string.
-  required: false
-  type: string
-activity_name:
-  description: Name to append to the device name for the last activity image. Default is empty string.
-  required: false
-  type: string
-{% endconfiguration %}
-
-## {% linkable_title Camera Types %}
-
-There are two available camera types "Avatar", which is the default, displays the Skybell avatar image.
-It is periodically updated with a fresh image. The other type is "Activity", which displays a snapshot from
-the latest event (motion, bell, or on demand) captured by the camera. You may show either camera, or both, by
-specifying its name under monitored_condtions. It's recommended, but not required, to set either avatar_name or activity_name
-if you are showing both cameras so you can tell them apart. The name will be appended to the skybell device name.
-
-
-```yaml
-# Example configuration.yaml with both images
-camera:
-  - platform: skybell
-    monitored_conditions:
-    - avatar
-    - activity
-    activity_name: "Last Activity"
-```
-
-```yaml
-# Example configuration.yaml with just last activity image
-camera:
-  - platform: skybell
-    monitored_conditions:
-    - activity
-```
\ No newline at end of file
diff --git a/source/_components/light.skybell.markdown b/source/_components/light.skybell.markdown
deleted file mode 100644
index 889dbaf4caa..00000000000
--- a/source/_components/light.skybell.markdown
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: page
-title: "Skybell Light"
-description: "Instructions on how to integrate your Skybell HD devices within Home Assistant."
-date: 2017-10-03 16:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: skybell.png
-ha_category: Light
-ha_release: 0.56
-ha_iot_class: "Cloud Polling"
----
-
-To get your [Skybell.com](https://skybell.com/) LED light working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-light:
-  - platform: skybell
-```
diff --git a/source/_components/sensor.skybell.markdown b/source/_components/sensor.skybell.markdown
deleted file mode 100644
index 39699978b99..00000000000
--- a/source/_components/sensor.skybell.markdown
+++ /dev/null
@@ -1,38 +0,0 @@
----
-layout: page
-title: "Skybell Sensor"
-description: "Instructions on how to integrate your Skybell HD devices within Home Assistant."
-date: 2017-10-03 16:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: skybell.png
-ha_category: Doorbell
-ha_release: 0.56
-ha_iot_class: "Cloud Polling"
----
-
-To get your [Skybell.com](https://skybell.com/) sensors working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  - platform: skybell
-    monitored_conditions:
-      - chime_level
-```
-
-{% configuration %}
-monitored_conditions:
-  type: list
-  required: true
-  description: Conditions to display in the frontend. The following conditions can be monitored.
-  keys:
-    chime_level:
-      description: Return a value between 0-3, indicating no chime, low, medium, and high respectively.
-{% endconfiguration %}
diff --git a/source/_components/skybell.markdown b/source/_components/skybell.markdown
index 379cf3248a0..0d5f2e02973 100644
--- a/source/_components/skybell.markdown
+++ b/source/_components/skybell.markdown
@@ -8,13 +8,33 @@ comments: false
 sharing: true
 footer: true
 logo: skybell.png
-ha_category: Doorbell
+ha_category:
+  - Doorbell
+  - Binary Sensor
+  - Camera
+  - Light
+  - Sensor
+  - Switch
 ha_release: 0.56
 ha_iot_class: "Cloud Polling"
+redirect_from:
+  - /components/binary_sensor.skybell/
+  - /components/camera.skybell/
+  - /components/light.skybell/
+  - /components/sensor.skybell/
+  - /components/switch.skybell/
 ---
 
 The `skybell` implementation allows you to integrate your [Skybell.com](http://www.skybell.com/) doorbells in Home Assistant.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Binary Sensor](/components/skybell/#binary-sensor)
+- [Camera](/components/skybell/#camera)
+- [Light](/components/skybell/#light)
+- [Sensor](/components/skybell/#sensor)
+- [Switch](/components/skybell/#switch)
+
 Currently only the Skybell HD is supported by this platform.
 
 ## {% linkable_title Configuration %}
@@ -39,4 +59,135 @@ password:
   type: string
 {% endconfiguration %}
 
-Finish your configuration by visiting the [Skybell binary sensor](/components/binary_sensor.skybell/), [Skybell camera](/components/camera.skybell/), [Skybell light](/components/light.skybell/), [Skybell sensor](/components/sensor.skybell/), or [Skybell switch](/components/switch.skybell/) documentation.
+### {% linkable_title Binary Sensor %}
+
+Once you have enabled the Skybell component, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+binary_sensor:
+  - platform: skybell
+    monitored_conditions:
+      - button
+      - motion
+```
+
+{% configuration %}
+monitored_conditions:
+  description: Conditions to display in the frontend. The following conditions can be monitored.
+  required: true
+  type: list
+  keys:
+    button:
+      description: Returns whether the doorbell button was pressed.
+    motion:
+      description: Returns whether movement was detected by the Skybell doorbell.
+{% endconfiguration %}
+
+### {% linkable_title Camera %}
+
+Once you have enabled the Skybell component, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+camera:
+  - platform: skybell
+```
+
+{% configuration %}
+monitored_conditions:
+  description: The camera images to display. Default is `avatar`. The full list is `avatar`, `activity`.
+  required: false
+  type: list
+avatar_name:
+  description: Name to append to the device name for the avatar image. Default is empty string.
+  required: false
+  type: string
+activity_name:
+  description: Name to append to the device name for the last activity image. Default is empty string.
+  required: false
+  type: string
+{% endconfiguration %}
+
+#### {% linkable_title Camera Types %}
+
+There are two available camera types "Avatar", which is the default, displays the Skybell avatar image.
+It is periodically updated with a fresh image. The other type is "Activity", which displays a snapshot from
+the latest event (motion, bell, or on demand) captured by the camera. You may show either camera, or both, by
+specifying its name under monitored_condtions. It's recommended, but not required, to set either avatar_name or activity_name
+if you are showing both cameras so you can tell them apart. The name will be appended to the skybell device name.
+
+```yaml
+# Example configuration.yaml with both images
+camera:
+  - platform: skybell
+    monitored_conditions:
+    - avatar
+    - activity
+    activity_name: "Last Activity"
+```
+
+```yaml
+# Example configuration.yaml with just last activity image
+camera:
+  - platform: skybell
+    monitored_conditions:
+    - activity
+```
+
+### {% linkable_title Light %}
+
+Once you have enabled the Skybell component, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+light:
+  - platform: skybell
+```
+
+### {% linkable_title Sensor %}
+
+Once you have enabled the Skybell component, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: skybell
+    monitored_conditions:
+      - chime_level
+```
+
+{% configuration %}
+monitored_conditions:
+  type: list
+  required: true
+  description: Conditions to display in the frontend. The following conditions can be monitored.
+  keys:
+    chime_level:
+      description: Return a value between 0-3, indicating no chime, low, medium, and high respectively.
+{% endconfiguration %}
+
+### {% linkable_title Switch %}
+
+Once you have enabled the Skybell component, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: skybell
+    monitored_conditions:
+      - do_not_disturb
+      - motion_sensor
+```
+
+{% configuration %}
+monitored_conditions:
+  description: Conditions to display in the frontend.
+  required: true
+  type: list
+  keys:
+    do_not_disturb:
+      description: Control the state of your doorbells indoor chime.
+    motion_sensor:
+      description: Control the state of your doorbells motion sensor.
+{% endconfiguration %}
diff --git a/source/_components/switch.skybell.markdown b/source/_components/switch.skybell.markdown
deleted file mode 100644
index 8bf27738c33..00000000000
--- a/source/_components/switch.skybell.markdown
+++ /dev/null
@@ -1,41 +0,0 @@
----
-layout: page
-title: "Skybell Switch"
-description: "Instructions on how to integrate your Skybell HD devices within Home Assistant."
-date: 2017-10-03 16:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: skybell.png
-ha_category: Switch
-ha_release: 0.56
-ha_iot_class: "Cloud Polling"
----
-
-To get your [Skybell.com](https://skybell.com/) switches working within Home Assistant, please follow the instructions for the general [Skybell component](/components/skybell).
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [Skybell component](/components/skybell), add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: skybell
-    monitored_conditions:
-      - do_not_disturb
-      - motion_sensor
-```
-
-{% configuration %}
-monitored_conditions:
-  description: Conditions to display in the frontend.
-  required: true
-  type: list
-  keys:
-    do_not_disturb:
-      description: Control the state of your doorbells indoor chime.
-    motion_sensor:
-      description: Control the state of your doorbells motion sensor.
-{% endconfiguration %}