diff --git a/config.toml b/config.toml
index d345245..9263214 100644
--- a/config.toml
+++ b/config.toml
@@ -1180,27 +1180,6 @@ theme = "doc-theme"
parent = "pybytes@connect"
weight = 10
-[[menu.main]]
- name = "Sigfox"
- url = "/pybytes/sigfox/"
- identifier = "pybytes@sigfox"
- parent = "pybytes"
- weight = 30
-
-[[menu.main]]
- name = "DevKit contract"
- url = "/pybytes/sigfox/devkit/"
- identifier = "pybytes@sigfox@devkit"
- parent = "pybytes@sigfox"
- weight = 10
-
-[[menu.main]]
- name = "Custom contract"
- url = "/pybytes/sigfox/custom/"
- identifier = "pybytes@sigfox@custom"
- parent = "pybytes@sigfox"
- weight = 20
-
[[menu.main]]
name = "Project Releases"
url = "/pybytes/releases/"
@@ -1229,6 +1208,48 @@ theme = "doc-theme"
parent = "pybytes@releases"
weight = 20
+[[menu.main]]
+ name = "Networks"
+ url = "/pybytes/networks/"
+ identifier = "pybytes@networks"
+ parent = "pybytes"
+ weight = 20
+
+[[menu.main]]
+ name = "Sigfox"
+ url = "/pybytes/networks/sigfox/"
+ identifier = "pybytes@networks@sigfox"
+ parent = "pybytes@networks"
+ weight = 20
+
+[[menu.main]]
+ name = "DevKit contract"
+ url = "/pybytes/networks/sigfox/devkit/"
+ identifier = "pybytes@networks@sigfox@devkit"
+ parent = "pybytes@networks@sigfox"
+ weight = 20
+
+[[menu.main]]
+ name = "Custom contract"
+ url = "/pybytes/networks/sigfox/custom/"
+ identifier = "pybytes@networks@sigfox@custom"
+ parent = "pybytes@networks@sigfox"
+ weight = 20
+
+[[menu.main]]
+ name = "LoRa"
+ url = "/pybytes/networks/lora/"
+ identifier = "pybytes@networks@lora"
+ parent = "pybytes@networks"
+ weight = 20
+
+[[menu.main]]
+ name = "Chirpstack LoRa Server"
+ url = "/pybytes/networks/lora/chirpstack/"
+ identifier = "pybytes@networks@lora@chirpstack"
+ parent = "pybytes@networks@lora"
+ weight = 20
+
[[menu.main]]
name = "Visualise data"
url = "/pybytes/dashboard/"
diff --git a/content/.DS_Store b/content/.DS_Store
deleted file mode 100644
index 4454822..0000000
Binary files a/content/.DS_Store and /dev/null differ
diff --git a/content/pybytes/_index.md b/content/pybytes/_index.md
index 0af4078..6b3fe10 100644
--- a/content/pybytes/_index.md
+++ b/content/pybytes/_index.md
@@ -31,4 +31,5 @@ In a nutshell, Pybytes is an environment designed to optimise your IoT applicati
* [Getting started with Pybytes](/pybytes/getstarted)
* [Connect your Pycom module to Pybytes](/pybytes/connect)
* [Visualise data from your device](/pybytes/dashboard)
+* [LoRa Servers](/pybytes/lora)
* [Integrations with external services](/pybytes/integrations/index.html)
diff --git a/content/pybytes/networks/_index.md b/content/pybytes/networks/_index.md
new file mode 100644
index 0000000..70b0de3
--- /dev/null
+++ b/content/pybytes/networks/_index.md
@@ -0,0 +1,10 @@
+---
+title: "Networks"
+aliases:
+---
+
+Pybytes supports four network types, which you can configure for each device or for a group of devices within a project. The compatible networks are WiFi, LoRa, Sigfox, and LTE CAT M1 / NB1. In this section, a detailed list of the settings for each network has been compiled.
+
+[**Sigfox**](/pybytes/networks/sigfox)
+
+[**LoRa**](/pybytes/networks/lora)
diff --git a/content/pybytes/networks/lora/_index.md b/content/pybytes/networks/lora/_index.md
new file mode 100644
index 0000000..1326ff1
--- /dev/null
+++ b/content/pybytes/networks/lora/_index.md
@@ -0,0 +1,20 @@
+---
+title: "LoRa"
+aliases:
+---
+
+## Overview
+
+Pybytes supports LoRa servers from [The Things Network](https://www.thethingsnetwork.org/) and from [ChirpStack](https://www.chirpstack.io/). During the set-up of the LoRa connection to your device, whether with TTN or with ChirpStack, Pybytes will automatically create a user profile on those servers.
+
+Follow the links below for more information about the different LoRa servers.
+
+
+
+Once a device is created in Pybytes with LoRa network, and the TTN Server is selected, the device is automatically created in TTN server.
+
+For more information check out [The Things Network](https://www.thethingsnetwork.org/docs/)
+
+
+
+Pybytes has its own LoRa Server based on [ChirpStack](https://www.chirpstack.io/). Check out [how to use it](chirpstack).
diff --git a/content/pybytes/networks/lora/chirpstack.md b/content/pybytes/networks/lora/chirpstack.md
new file mode 100644
index 0000000..90c8f11
--- /dev/null
+++ b/content/pybytes/networks/lora/chirpstack.md
@@ -0,0 +1,95 @@
+---
+title: "ChirpStack Setup"
+aliases:
+ - chapter/pybytes/networks/lora/chirpstack
+---
+
+## Overview
+
+When a LoRa device is added or the LoRa network is configured in Pybytes → Settings -> LoRa, a user profile is automatically created on [ChirpStack](https://loraserver.pycom.io/). This will only happen if there is no pre-existing user profile.
+
+## User profile
+
+After creating a LoRa device or configuring Pybytes to use ChirpStack, you should receive an email with the ChirpStack username and password. Use this for accessing the data on loraserver.pycom.io.
+
+The basic configurations are made by Pybytes. If you want to overwrite the LoRa settings, use the ChirpStack username and password to do so.
+
+### Basic ChirpStack Settings in Pybytes
+
+**Network-server** - Pycom
+
+You can add your own server in the section Network-servers
+
+
+
+**User** - Value
+
+The User will be created based on the same credentials that are used in Pybytes. This, as well as the Admin status of the user, can be managed in the Org > Users section.
+
+**Organization** - Value (by default)
+
+The Organization Value will be created, based on the same credentials used in Pybytes. This can be changed in the section Org > Settings.
+
+**Service Profile** - Value (by default)
+
+The Service Profile Name is connected to the Organization’s name.
+
+**Device Profiles** - OTAA or ABP
+
+There are two different devices profiles, OTAA or ABP. Select which one you prefer.
+
+**Applications** - Value (by default)
+
+All LoRa devices that have been created in Pybytes and linked to the ChirpStack server will be connected to the ChirpStack app.
+
+**Devices**
+
+All LoRa devices that have been created in Pybytes.
+
+## Gateway
+
+The user should set up their own Gateway in order to communicate with ChirpStack.
+
+
+
+### How to set up a gateway
+
+1 - Login in ChirpStack (https://loraserver.pycom.io/)
+
+2 - Click on the **Gateway** on the main sidebar
+
+3 - Click on the **Create** button
+
+4 - Fill the form with the information below
+
+**Gateway name**
+
+The name may only contain words, numbers, and dashes.
+
+**Gateway description**
+
+The description of the gateway.
+
+**Gateway ID**
+
+The gateway ID.
+
+**Network-server**
+
+Select the network server that the gateway will connect to. When no network servers are available in the dropdown, make sure a service-profile exists for the organization.
+
+**Gateway-profile**
+
+This is an optional gateway profile that can be assigned to a gateway. This can be used to automatically re-configure the gateway when the LoRa Gateway Bridge is set up so that it manages the packet-forwarder settings.
+
+**Gateway discovery enabled**
+
+When enabled (and LoRa Server is configured with the 'gateway discover' feature enabled), the gateway will send out periodical pings to test its coverage by other gateways in the same network.
+
+**Gateway altitude** (meters)
+
+When the gateway has an on-board GPS, this value will be set automatically when the network has received statistics from the gateway.
+
+**Gateway location** (set to current location)
+
+For more information check out [ChirpStack official guide](https://www.chirpstack.io/guides/first-gateway-device/#add-a-lora-sup-reg-sup-gateway).
diff --git a/content/pybytes/networks/lora/lora.md b/content/pybytes/networks/lora/lora.md
new file mode 100644
index 0000000..7ca704f
--- /dev/null
+++ b/content/pybytes/networks/lora/lora.md
@@ -0,0 +1,7 @@
+---
+title: "LoRa"
+aliases:
+ - pybytes/lora.html
+ - pybytes/lora.md
+ - chapter/pybytes/lora
+---
diff --git a/content/pybytes/sigfox/_index.md b/content/pybytes/networks/sigfox/_index.md
similarity index 100%
rename from content/pybytes/sigfox/_index.md
rename to content/pybytes/networks/sigfox/_index.md
diff --git a/content/pybytes/sigfox/custom.md b/content/pybytes/networks/sigfox/custom.md
similarity index 100%
rename from content/pybytes/sigfox/custom.md
rename to content/pybytes/networks/sigfox/custom.md
diff --git a/content/pybytes/sigfox/devkit.md b/content/pybytes/networks/sigfox/devkit.md
similarity index 100%
rename from content/pybytes/sigfox/devkit.md
rename to content/pybytes/networks/sigfox/devkit.md
diff --git a/static/gitbook/assets/pybytes/lora/chirpstack_logo.png b/static/gitbook/assets/pybytes/lora/chirpstack_logo.png
new file mode 100644
index 0000000..b84e845
Binary files /dev/null and b/static/gitbook/assets/pybytes/lora/chirpstack_logo.png differ
diff --git a/static/gitbook/assets/pybytes/lora/screenshots/gateway.png b/static/gitbook/assets/pybytes/lora/screenshots/gateway.png
new file mode 100644
index 0000000..531855b
Binary files /dev/null and b/static/gitbook/assets/pybytes/lora/screenshots/gateway.png differ
diff --git a/static/gitbook/assets/pybytes/lora/screenshots/network_servers.png b/static/gitbook/assets/pybytes/lora/screenshots/network_servers.png
new file mode 100644
index 0000000..cb8691e
Binary files /dev/null and b/static/gitbook/assets/pybytes/lora/screenshots/network_servers.png differ
diff --git a/static/gitbook/assets/pybytes/lora/ttn_logo.svg b/static/gitbook/assets/pybytes/lora/ttn_logo.svg
new file mode 100644
index 0000000..99f0b9a
--- /dev/null
+++ b/static/gitbook/assets/pybytes/lora/ttn_logo.svg
@@ -0,0 +1,35 @@
+
+
+
diff --git a/themes/doc-theme/static/css/doc-theme.css b/themes/doc-theme/static/css/doc-theme.css
index 05ede54..8880149 100644
--- a/themes/doc-theme/static/css/doc-theme.css
+++ b/themes/doc-theme/static/css/doc-theme.css
@@ -341,3 +341,17 @@ p {
html {
scroll-padding-top: 70px; /* height of sticky header */
}
+
+img[src*="/gitbook/assets/pybytes/lora/screenshots"]{
+ margin-top: 20px;
+ margin-left: 15px;
+ box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.3);
+}
+
+img[src="/gitbook/assets/pybytes/lora/chirpstack_logo.png"]{
+ width: 200px;
+}
+
+img[src="/gitbook/assets/pybytes/lora/ttn_logo.svg"]{
+ width: 130px;
+}