diff --git a/source/_components/notify.tibber.markdown b/source/_components/notify.tibber.markdown
deleted file mode 100644
index 2b903e835f2..00000000000
--- a/source/_components/notify.tibber.markdown
+++ /dev/null
@@ -1,33 +0,0 @@
----
-layout: page
-title: "Tibber Notification"
-description: "Instructions on how to integrate Tibber within Home Assistant."
-date: 2015-10-04 16:34
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: tibber.png
-ha_category: Notifications
-ha_release: 0.80
-ha_qa_scale: silver
-ha_iot_class: "Cloud Polling"
----
-
-The requirement is that you have setup the [`tibber` component](/components/tibber/).
-
-## {% linkable_title Usage %}
-
-Tibber can send a notification by calling the [`notify` service](/components/notify/). It will send a notification to all devices registered in the Tibber account. 
-
-To use notifications, please see the [getting started with automation page](/getting-started/automation/).
-
-### {% linkable_title Send message %}
-
-```yaml
-action:
-  service: notify.tibber
-  data:
-    title: Your title
-    message: This is a message for you!
-```
diff --git a/source/_components/sensor.tibber.markdown b/source/_components/sensor.tibber.markdown
deleted file mode 100644
index 8e7e0e946ea..00000000000
--- a/source/_components/sensor.tibber.markdown
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: page
-title: "Tibber Sensor"
-description: "Instructions on how to integrate Tibber within Home Assistant."
-date: 2017-10-03 17:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: tibber.png
-ha_category: Energy
-ha_release: 0.55
-ha_qa_scale: silver
-ha_iot_class: "Cloud Polling"
----
-
-The `tibber` sensor provides the current electricity price if you are a [Tibber](https://tibber.com/) customer.
-If you have a Tibber Pulse it will also show the electricity consumption in real time.
-
-The requirement is that you have setup the [`tibber` component](/components/tibber/).
-
-## {% linkable_title Examples %}
-
-In this section, you will find some real-life examples of how to use this sensor.
-
-### {% linkable_title Electricity price %}
-
-The electricity price can be used to make automations. The sensor has a `max_price` and `min_price` attribute, with max and min price for the current day. Here is an example to get a notification when the price is above 90% of the maximum price for the day:
-
-{% raw %}
-```yaml
-- alias: "Electricity price"
-  trigger:
-    platform: time_pattern
-  # Matches every hour at 1 minutes past whole
-    minutes: 1
-  condition:
-    condition: template
-    value_template: '{{ float(states.sensor.electricity_price_hamretunet_10.state) > 0.9 * float(states.sensor.electricity_price_hamretunet_10.attributes.max_price) }}'
-  action:
-   - service: notify.pushbullet
-     data:
-       title: "Electricity price"
-       target: "device/daniel_telefon_cat"
-       message: "The electricity price is now {{ states.sensor.electricity_price_hamretunet_10.state }}"
-```
-{% endraw %}
diff --git a/source/_components/tibber.markdown b/source/_components/tibber.markdown
index 7df4e9a7f28..791bc560b02 100644
--- a/source/_components/tibber.markdown
+++ b/source/_components/tibber.markdown
@@ -8,16 +8,25 @@ comments: false
 sharing: true
 footer: true
 logo: tibber.png
-ha_category: Energy
+ha_category:
+  - Energy
+  - Sensor
+  - Notifications
 ha_release: 0.80
 ha_qa_scale: silver
 ha_iot_class: "Cloud Polling"
+redirect_from:
+  - /components/notify.tibber/
+  - /components/sensor.tibber/
 ---
 
 The `tibber` component provides a sensor with the current electricity price if you are a [Tibber](https://tibber.com/) customer.
 If you have a [Tibber Pulse](https://norge.tibber.com/products/pulse/) it will also show the electricity consumption in real time.
 
-It also provides a notification service.
+There is currently support for the following device types within Home Assistant:
+
+- [Notifications](#notifications)
+- [Sensor](#sensor)
 
 ## {% linkable_title Setup %}
 
@@ -38,3 +47,56 @@ access_token:
   required: true
   type: string
 {% endconfiguration %}
+
+## {% linkable_title Notifications %}
+
+Tibber can send a notification by calling the [`notify` service](/components/notify/). It will send a notification to all devices registered in the Tibber account.
+
+The requirement is that you have setup the [`tibber` component](#setup).
+To use notifications, please see the [getting started with automation page](/getting-started/automation/).
+
+### {% linkable_title Send message %}
+
+```yaml
+action:
+  service: notify.tibber
+  data:
+    title: Your title
+    message: This is a message for you!
+```
+
+## {% linkable_title Sensor %}
+
+The `tibber` sensor provides the current electricity price if you are a [Tibber](https://tibber.com/) customer.
+If you have a Tibber Pulse it will also show the electricity consumption in real time.
+
+The requirement is that you have setup the [`tibber` component](#setup).
+
+## {% linkable_title Examples %}
+
+In this section, you will find some real-life examples of how to use this sensor.
+
+### {% linkable_title Electricity price %}
+
+The electricity price can be used to make automations. The sensor has a `max_price` and `min_price` attribute, with max and min price for the current day. Here is an example to get a notification when the price is above 90% of the maximum price for the day:
+
+{% raw %}
+
+```yaml
+- alias: "Electricity price"
+  trigger:
+    platform: time_pattern
+  # Matches every hour at 1 minutes past whole
+    minutes: 1
+  condition:
+    condition: template
+    value_template: '{{ float(states.sensor.electricity_price_hamretunet_10.state) > 0.9 * float(states.sensor.electricity_price_hamretunet_10.attributes.max_price) }}'
+  action:
+   - service: notify.pushbullet
+     data:
+       title: "Electricity price"
+       target: "device/daniel_telefon_cat"
+       message: "The electricity price is now {{ states.sensor.electricity_price_hamretunet_10.state }}"
+```
+
+{% endraw %}
\ No newline at end of file