diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/docs.en.md
new file mode 100644
index 00000000..f8e77ad2
--- /dev/null
+++ b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/docs.en.md
@@ -0,0 +1,53 @@
+---
+title: "Configuring your Disroot account"
+visible: false
+published: true
+updated:
+ last_modified: "April, 2021"
+ app: Mozilla Thunderbird
+ app_version: 78.9.0 on Manjaro Linux
+taxonomy:
+ category:
+ - docs
+ tags:
+ - email
+page-toc:
+ active: true
+---
+
+# Configuring your Disroot account
+The first time you run **Thunderbird**, you will be greeted by the account setup. Select **Skip this and use my existing email** to configure your Disroot account.
+If you are already using **Thunderbird** then you can select "**Email**" in the root view.
+
+![](en/tb_setup_01.png)
+
+## Fill in your account information
+
+![](en/tb_setup_02.png)
+
+ - **Your name:** *Name that will be displayed in the* "From" *field*
+ ![](en/tb_setup_name.png)
+
+ - **Email address:** *your_username @ disroot.org*
+ ![](en/tb_setup_email.png)
+
+ - **Password:** *your_super_secret_password*
+ - **Remember Password:** If you want **Thunderbird** to remember your password and not prompt you for it every time you start the client, then check this option.
+
+ ![](en/tb_setup_pass.png)
+
+ - Click on the "**Continue**" button once you are done and verified everything is correct.
+
+ ![](en/tb_setup_03.png)
+
+**Thunderbird** now should auto-detect the needed settings like this:
+
+![](en/tb_setup_04.png)
+
+You can click on "**Configure manually**" to check the settings details.
+
+![](en/tb_setup_details.png)
+
+Click on **Done** once you are finished and... **\O/** Now you can manage your emails and interact with your calendars or tasks in a more fluid and efficient way through **Thunderbird**.
+
+![](en/tb_setup_05.png)
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_01.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_01.png
new file mode 100644
index 00000000..dd052821
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_01.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_02.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_02.png
new file mode 100644
index 00000000..6549f510
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_02.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_03.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_03.png
new file mode 100644
index 00000000..efd9af7d
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_03.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_04.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_04.png
new file mode 100644
index 00000000..24830542
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_04.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_05.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_05.png
new file mode 100644
index 00000000..72addf49
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_05.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_details.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_details.png
new file mode 100644
index 00000000..bc2b42f0
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_details.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_email.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_email.png
new file mode 100644
index 00000000..866e88a7
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_email.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_name.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_name.png
new file mode 100644
index 00000000..250e1707
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_name.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_pass.png b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_pass.png
new file mode 100644
index 00000000..798537a2
Binary files /dev/null and b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/01.setup/en/tb_setup_pass.png differ
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/02.exporting/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/02.exporting/docs.en.md
new file mode 100644
index 00000000..8cb5040c
--- /dev/null
+++ b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/02.exporting/docs.en.md
@@ -0,0 +1,21 @@
+---
+title: Exporting / Importing emails
+visible: false
+published: true
+updated:
+ last_modified: "April, 2021"
+ app: Mozilla Thunderbird
+ app_version: 78.9.0 on Manjaro Linux
+taxonomy:
+ category:
+ - docs
+ tags:
+ - email
+page-toc:
+ active: true
+---
+
+# Exporting / Importing emails
+**Thunderbird** does not offer native backup tools so you have to do it manually or through an add-on.
+
+## Manual procedure
diff --git a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/docs.en.md
index bc4005ff..44ab4fd1 100755
--- a/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/docs.en.md
+++ b/pages/02.tutorials/03.Email/04.Clients/01.Desktop/01.thunderbird/docs.en.md
@@ -3,9 +3,6 @@ title: Thunderbird
visible: false
published: true
updated:
- last_modified: "April, 2021"
- app: Mozilla Thunderbird
- app_version: 78.9.0 on Manjaro Linux
taxonomy:
category:
- docs
@@ -26,43 +23,9 @@ If you don't have it installed yet, go to [Thunderbird page](https://www.thunder
!! **NOTE**
!! Most **GNU/Linux** distributions usually have the latest and updatable version of **Thunderbird**. We recommend using your distribution package manager to install it.
-# Configuring your Disroot account
-If this is the first time you are using **Thunderbird**, you will be greeted by the account setup when you run it and you can skip directly to the third step which is **Set Up Another Account**.
-If you are already using **Thunderbird** then select "**Email**" in the root view.
+----
-![](en/tb_setup_01.png)
+# Table of Contents
+[Setup](setup)
-## Fill in your account information
-
-![](en/tb_setup_02.png)
-
- - **Your name:** *Name that will be displayed in the* "From" *field*
- ![](en/tb_setup_name.png)
-
- - **Email address:** *your_username @ disroot.org*
- ![](en/tb_setup_email.png)
-
- - **Password:** *your_super_secret_password*
- - **Remember Password?:** If you want **Thunderbird** to remember your password and not prompt you for it every time you start the client, then select it.
- ![](en/tb_setup_pass.png)
-
- - Click "**Continue**" button once you are done and verified everything is correct.
-
- ![](en/tb_setup_03.png)
-
-**Thunderbird** now should auto-detect the needed settings like this:
-
-![](en/tb_setup_04.png)
-
-You can click on "**Configure manually**" to check the settings details.
-
-![](en/tb_setup_details.png)
-
-Click on **Done** once you are finished and that's it.
-
-![](en/tb_setup_05.png)
-
-# Exporting / Importing emails and contacts
-**Thunderbird** does not offer native backup tools so you have to do it manually or through an add-on.
-
-## Manual procedure
+[Exporting](exporting)