diff --git a/source/_components/light.lightwave.markdown b/source/_components/light.lightwave.markdown
deleted file mode 100644
index 234a04d8273..00000000000
--- a/source/_components/light.lightwave.markdown
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: page
-title: "Lightwave Light"
-description: "Instructions on how to integrate Lightwave lights with Home Assistant."
-date: 2018-12-05 18:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: lightwave.png
-ha_category: Light
-ha_release: 0.84
-ha_iot_class: "Assumed State"
----
-The `lightwave` light platform integrates your Lightwave lights into Home Assistant.
-<p class='note'>
-Configuration details for the Lightwave platform can be found on the main [Lightwave component](/components/lightwave/) page.
-</p>
\ No newline at end of file
diff --git a/source/_components/lightwave.markdown b/source/_components/lightwave.markdown
index 84c10c35a41..72b38afdaf4 100644
--- a/source/_components/lightwave.markdown
+++ b/source/_components/lightwave.markdown
@@ -8,13 +8,22 @@ comments: false
 sharing: true
 footer: true
 logo: lightwave.png
-ha_category: Hub
+ha_category:
+  - Hub
+  - Light
+  - Switch
 ha_release: 0.84
 ha_iot_class: "Assumed State"
+redirect_from:
+  - /components/light.lightwave/
+  - /components/switch.lightwave/
 ---
-The `lightwave` component links Home Assistant with your Lightwave WiFi link for controlling Lightwave lights and switches. 
+
+The `lightwave` component links Home Assistant with your Lightwave WiFi link for controlling Lightwave lights and switches.
+
 This component uses the official API published by Lightwave on their website [https://api.lightwaverf.com/](https://api.lightwaverf.com/).
 To add your Lightwave devices into your Home Assistant installation, add the following to your `configuration.yaml` file:
+
 ```yaml
 # Example configuration.yaml entry
 lightwave:
@@ -45,5 +54,6 @@ Each `switch` or `light` requires an `id` and a `name`. The `id` takes the form
 The first use of a light or switch will try to register with your Lightwave WiFi Link hub. If the hub has not been registered a message on your hub will be displayed asking you to pair the device. You have 12 seconds to push the button on your hub to accept this. Once done, you should be able to control your lights and switches via Home Assistant. This only needs to be done if the hub has not been registered.
 
 The Lightwave Home Assistant component currently supports the following Lightwave devices:
+
 - Lightwave lights
 - Lightwave switches
\ No newline at end of file
diff --git a/source/_components/switch.lightwave.markdown b/source/_components/switch.lightwave.markdown
deleted file mode 100644
index 0734a9a8370..00000000000
--- a/source/_components/switch.lightwave.markdown
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: page
-title: "Lightwave Switch"
-description: "Instructions on how to integrate Lightwave Switches with Home Assistant."
-date: 2018-12-05 18:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: lightwave.png
-ha_category: Switch
-ha_release: 0.84
-ha_iot_class: "Assumed State"
----
-The `lightwave` switch platform integrates your Lightwave switches into Home Assistant.
-<p class='note'>
-Configuration details for the Lightwave platform can be found on the main [Lightwave component](/components/lightwave/) page.
-</p>
\ No newline at end of file