diff --git a/source/_components/sensor.thethingsnetwork.markdown b/source/_components/sensor.thethingsnetwork.markdown
deleted file mode 100644
index 14c6ba6c585..00000000000
--- a/source/_components/sensor.thethingsnetwork.markdown
+++ /dev/null
@@ -1,82 +0,0 @@
----
-layout: page
-title: "The Things Network Sensor"
-description: "Instructions on how to integrate The Things Network sensors into Home Assistant."
-date: 2017-09-30 08:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: thethingsnetwork.png
-ha_category: Sensor
-ha_iot_class: Local Polling
-ha_release: 0.55
----
-
-The `thethingsnetwork` sensor platform allows you to get data from a [The Things Network Storage Integration](https://www.thethingsnetwork.org/docs/applications/storage/).
-
-This platform requires that the [The Things Network component](/components/thethingsnetwork/) is set up and the [The Things Network Storage Integration](https://www.thethingsnetwork.org/docs/applications/storage/) as well.
-
-## {% linkable_title Prerequisites %}
-
-Visit the [The Things Network Console](https://console.thethingsnetwork.org/) website, log in with your The Things Network credentials, choose your application from **Applications** and go to **Integrations**.
-
-Add a new integration.
-
-
-
-Add a The Things Network integration
-
-
-Select **Data Storage**.
-
-
-
-Choose a The Things Network integration
-
-
-Click **Add integration** to finish the process.
-
-
-
-Add a The Things Network Data Storage integration
-
-
-When done, the status of the integration should be **Running**. You could check the output after clicking on **go to platform** in an interactive web interface.
-
-
-
-Add a The Things Network integration
-
-
-Select **Devices** to get the ID of your device that you want to use.
-
-
-
-Devices overview
-
-
-## {% linkable_title Configuration %}
-
-To enable this platform, add the following lines to your `configuration.yaml`:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
- - platform: thethingsnetwork
- device_id: ha-demo
- values:
- sensor_value: unit of measurement
- voltage: V
-```
-
-{% configuration %}
- device_id:
- description: The ID of the device.
- required: true
- type: string
- values:
- description: The sensor values with their unit of measurement
- required: true
- type: list
-{% endconfiguration %}
diff --git a/source/_components/thethingsnetwork.markdown b/source/_components/thethingsnetwork.markdown
index 835c798cec9..320236003b0 100644
--- a/source/_components/thethingsnetwork.markdown
+++ b/source/_components/thethingsnetwork.markdown
@@ -8,9 +8,13 @@ comments: false
sharing: true
footer: true
logo: thethingsnetwork.png
-ha_category: Hub
+ha_category:
+ - Hub
+ - Sensor
ha_release: 0.55
ha_iot_class: Configurable
+redirect_from:
+ - /components/sensor.thethingsnetwork/
---
The `thethingsnetwork` component allows one to interact with the [The Things Network](https://www.thethingsnetwork.org). This community-driven and open network supports [LoRaWAN](https://www.lora-alliance.org/) for long range (~5 to 15km) communication with a low bandwidth (51 bytes/message). [Gateways](https://www.thethingsnetwork.org/docs/gateways/) transfers the received data from the sensors to the The Things Network.
@@ -20,9 +24,13 @@ The Things network support various integrations to make the data available:
| The Things Network Integration | Home Assistant platform |
|---|---|
| [MQTT](https://www.thethingsnetwork.org/docs/applications/mqtt/) | |
-| [Storage](https://www.thethingsnetwork.org/docs/applications/storage/) | [`thethingsnetwork`](/components/sensor.thethingsnetwork/) |
+| [Storage](https://www.thethingsnetwork.org/docs/applications/storage/) | [`thethingsnetwork`](#sensor) |
| [HTTP](https://www.thethingsnetwork.org/docs/applications/http/) | |
+There is currently support for the following device types within Home Assistant:
+
+- [Sensor](#sensor)
+
## {% linkable_title Setup %}
Visit the [The Things Network Console](https://console.thethingsnetwork.org/) website, log in with your The Things Network credentials, choose your application from **Applications**.
@@ -62,3 +70,73 @@ access_key:
required: true
type: string
{% endconfiguration %}
+
+## {% linkable_title Sensor %}
+
+The `thethingsnetwork` sensor platform allows you to get data from a [The Things Network Storage Integration](https://www.thethingsnetwork.org/docs/applications/storage/).
+
+This platform requires that the [The Things Network component](#configuration) is set up and the [The Things Network Storage Integration](https://www.thethingsnetwork.org/docs/applications/storage/) as well.
+
+### {% linkable_title Prerequisites %}
+
+Visit the [The Things Network Console](https://console.thethingsnetwork.org/) website, log in with your The Things Network credentials, choose your application from **Applications** and go to **Integrations**.
+
+Add a new integration.
+
+
+
+Add a The Things Network integration
+
+
+Select **Data Storage**.
+
+
+
+Choose a The Things Network integration
+
+
+Click **Add integration** to finish the process.
+
+
+
+Add a The Things Network Data Storage integration
+
+
+When done, the status of the integration should be **Running**. You could check the output after clicking on **go to platform** in an interactive web interface.
+
+
+
+Add a The Things Network integration
+
+
+Select **Devices** to get the ID of your device that you want to use.
+
+
+
+Devices overview
+
+
+### {% linkable_title Configuration %}
+
+To enable this platform, add the following lines to your `configuration.yaml`:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+ - platform: thethingsnetwork
+ device_id: ha-demo
+ values:
+ sensor_value: unit of measurement
+ voltage: V
+```
+
+{% configuration %}
+ device_id:
+ description: The ID of the device.
+ required: true
+ type: string
+ values:
+ description: The sensor values with their unit of measurement
+ required: true
+ type: list
+{% endconfiguration %}
\ No newline at end of file