diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/task_app.png b/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/task_app.png
deleted file mode 100644
index fc97bb4e..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/task_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/docs.en.md
deleted file mode 100644
index f3db5933..00000000
--- a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/docs.en.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: Calendar: Desktop
-published: true
-visible: false
-updated:
-        last_modified: "July 2019"
-taxonomy:
-    category:
-        - docs
-page-toc:
-    active: false
----
-
-# Calendar desktop integration
-
-You can read the tutorials below in order to get your **Calendars** synchronized using a multiplatform desktop client.
-
-- [Thunderbird: Calendar / Contacts / Tasks sync](/tutorials/cloud/clients/desktop/multiplatform/thunderbird-calendar-contacts)
-- [calcurse: Calendar sync](/tutorials/cloud/clients/desktop/multiplatform/calcurse-caldav)
-
-Alternatively, you can use and set up the desktop integration.
-
-- [GNOME: Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/gnome-desktop-integration)
-- [KDE: Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/kde-desktop-integration)
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/calendar_app.png b/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/calendar_app.png
deleted file mode 100644
index 0aa478f3..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/calendar_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/docs.en.md
deleted file mode 100644
index a099fae8..00000000
--- a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/docs.en.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: "Cloud Apps: Calendar"
-published: true
-visible: false
-indexed: true
-updated:
-taxonomy:
-    category:
-        - docs
-    tags:
-        - cloud
-        - calendar
-page-toc:
-    active: false
----
-
-## Calendar
-
-### [Web interface](web)
-- Creating and configuring calendars
-
-### [Desktop clients](desktop)
-- Desktop clients and integration settings for organizing and synchronizing calendars
-
-### [Mobile clients](/tutorials/cloud/clients/mobile)
-- Mobile clients and settings for organizing and synchronizing calendars
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/contacts_app.png b/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/contacts_app.png
deleted file mode 100644
index 2edda7a5..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/contacts_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/docs.en.md
deleted file mode 100644
index fcf52e87..00000000
--- a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/docs.en.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: Cloud Apps: Notes
-published: true
-visible: false
-updated:
-indexed: true
-taxonomy:
-    category:
-        - docs
-    tags:
-        - cloud
-        - notes
-visible: true
-page-toc:
-    active: false
----
-## Notes
-
-### [Web interface](web)
-- Creating and editing notes
-
-### [Desktop clients](desktop)
-- Notes app desktop clients
-
-### [Mobile clients](mobile)
-- Notes App, DAVx⁵, device settings
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/notes_app.png b/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/notes_app.png
deleted file mode 100644
index 23b012e3..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/notes_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/05.News/docs.en.md
deleted file mode 100644
index 9c09e365..00000000
--- a/pages/02.tutorials/02.Cloud/04.Apps/05.News/docs.en.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: Cloud Apps: News
-published: true
-visible: false
-updated:
-indexed: true
-taxonomy:
-    category:
-        - docs
-    tags:
-        - cloud
-        - news
-visible: true
-page-toc:
-    active: false
----
-
-## News
-
-### [Web interface](web)
-- Managing and configuring news feeds
-
-### Desktop clients (coming soon)
-- News feeds desktop clients
-
-### Mobile clients (coming soon)
-- News Apps, device settings
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/news_app.png b/pages/02.tutorials/02.Cloud/04.Apps/05.News/news_app.png
deleted file mode 100644
index 073cea32..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/05.News/news_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/bookmarks_app.png b/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/bookmarks_app.png
deleted file mode 100644
index a07c9920..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/bookmarks_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/docs.en.md
deleted file mode 100644
index 477be1ca..00000000
--- a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/docs.en.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: Cloud Apps: Bookmarks
-published: true
-visible: false
-indexed: true
-updated:
-taxonomy:
-    category:
-        - docs
-    tags:
-        - cloud
-        - bookmarks
-visible: true
-page-toc:
-    active: false
----
-
-## Bookmarks (coming soon)
-
-### Web interface
-- Creating, editing and exporting Bookmarks
-
-### Desktop clients
-- Desktop clients to manage your Bookmarks
-
-### Mobile clients
-- Bookmarks Apps, device settings
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/docs.en.md
deleted file mode 100644
index 33110ad6..00000000
--- a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/docs.en.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: Cloud apps: Talk
-published: true
-visible: false
-indexed: true
-updated:
-taxonomy:
-    category:
-        - docs
-    tags:
-        - cloud
-        - talk
-        - call
-visible: true
-page-toc:
-    active: false
----
-
-## Talk
-
-### [Web interface](web)
-- Audio/video calls, settings
-
-### Desktop clients (coming soon)
-- Talk App desktop clients
-
-### Mobile clients (coming soon)
-- Talk App, device settings
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/talk_app.png b/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/talk_app.png
deleted file mode 100644
index fd247501..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/talk_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/08.Keep_sweep/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/08.Keep_sweep/docs.en.md
deleted file mode 100644
index db0239c8..00000000
--- a/pages/02.tutorials/02.Cloud/04.Apps/08.Keep_sweep/docs.en.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: Cloud Apps: Keep or Sweep
-published: true
-visible: false
-indexed: true
-updated:
-        last_modified: "July 2019"
-        app: Nextcloud
-        app_version: 15
-taxonomy:
-    category:
-        - docs
-    tags:
-        - cloud
-        - delete
-visible: true
-page-toc:
-    active: false
----
-
-## Keep or Sweep
-The purpose of this app is to help you clean wasted or unused files from your data. It ramdomly displays elements of your data at a time and you decide whether to ✅ keep or ❌ sweep it.
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/08.Keep_sweep/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/08.Keep_sweep/docs.es.md
deleted file mode 100644
index 35efa3f6..00000000
--- a/pages/02.tutorials/02.Cloud/04.Apps/08.Keep_sweep/docs.es.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Aplicaciones en la Nube: Keep or Sweep (Mantener o limpiar)
-published: true
-visible: false
-taxonomy:
-    category:
-        - docs
-page-toc:
-    active: false
----
-
-## Keep or Sweep
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/08.Keep_sweep/sweep_app.png b/pages/02.tutorials/02.Cloud/04.Apps/08.Keep_sweep/sweep_app.png
deleted file mode 100644
index d1126c27..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/08.Keep_sweep/sweep_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/appointments/appointments_app.png b/pages/02.tutorials/02.Cloud/04.Apps/appointments/appointments_app.png
new file mode 100644
index 00000000..344e95ed
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/appointments/appointments_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/appointments/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/appointments/docs.en.md
new file mode 100644
index 00000000..601d69b8
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/appointments/docs.en.md
@@ -0,0 +1,24 @@
+---
+title: Appointments
+published: true
+visible: false
+indexed: true
+updated:
+        last_modified: " 2021"
+        app: Appointments
+        app_version: 1.7.15
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - appointments
+visible: true
+page-toc:
+    active: false
+---
+
+# Appointments (coming soon)
+
+Book appointments into your **Disroot Calendar** via secure online form. Attendees can confirm or cancel their appointments via an email link.
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/01.Web/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/01.Web/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/01.Web/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/bookmarks/01.Web/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/01.Web/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/01.Web/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/01.Web/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/bookmarks/01.Web/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/02.Desktop/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/02.Desktop/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/02.Desktop/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/bookmarks/02.Desktop/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/02.Desktop/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/02.Desktop/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/02.Desktop/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/bookmarks/02.Desktop/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/03.Mobile/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/03.Mobile/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/03.Mobile/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/bookmarks/03.Mobile/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/03.Mobile/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/03.Mobile/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/03.Mobile/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/bookmarks/03.Mobile/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/bookmarks_app.png b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/bookmarks_app.png
new file mode 100644
index 00000000..5dae9e2f
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/bookmarks_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/docs.en.md
new file mode 100644
index 00000000..e829035d
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/docs.en.md
@@ -0,0 +1,34 @@
+---
+title: Bookmarks
+published: true
+visible: false
+indexed: true
+updated:
+        last_modified: " 2021"
+        app: Bookmarks
+        app_version: 4.0.5
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - bookmarks
+visible: true
+page-toc:
+    active: false
+---
+
+# Bookmarks (coming soon)
+**Bookmarks** provides you with a web interface for collecting, organizing and sharing bookmarks to the sites on the web that are important or interesting to you. You can browse and filter your bookmarks via tags, folders and by using the built-in search feature and you can share folders with other users and groups as well as create public links for them.
+
+---
+
+## Web interface
+- Creating, editing and exporting Bookmarks
+
+## Desktop clients
+- Desktop clients to manage your Bookmarks
+
+## Mobile clients
+- Bookmarks Apps, device settings
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/bookmarks/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/06.Bookmarks/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/bookmarks/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.en.md
similarity index 99%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.en.md
index e4d75123..58de1764 100755
--- a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: "Calendar: Web"
+title: "Web interface"
 published: true
 indexed: true
 visible: false
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.fr.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.fr.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.fr.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.pt.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/docs.pt.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/docs.pt.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_add_new.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_add_new.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_add_new.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_add_new.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_colorpick_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_colorpick_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_colorpick_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_colorpick_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu3.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu4.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu4.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu4.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu4.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu5.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu5.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu5.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu5.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu6.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu6.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu6.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu6.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu7.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu7.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu7.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu7.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu8.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu8.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_edit_menu8.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_edit_menu8.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_import_menu1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_import_menu1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_import_menu1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_import_menu1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_import_menu2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_import_menu2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_import_menu2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_import_menu2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_list.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_list.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_list.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_list.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_main.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_main.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_main.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_main.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_share_menu1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_share_menu1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_share_menu1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_share_menu1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_share_menu2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_share_menu2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_share_menu2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_share_menu2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_top_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_top_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/en/calendar_top_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/en/calendar_top_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_add_new.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_add_new.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_add_new.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_add_new.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_colorpick_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_colorpick_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_colorpick_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_colorpick_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu3.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu4.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu4.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu4.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu4.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu5.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu5.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu5.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu5.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu5.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu5.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu5.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu5.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu6.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu6.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu6.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu6.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu7.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu7.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu7.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu7.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu8.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu8.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu8.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu8.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu8.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu8.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_edit_menu8.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_edit_menu8.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_import_menu1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_import_menu1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_import_menu1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_import_menu1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_import_menu2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_import_menu2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_import_menu2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_import_menu2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_list.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_list.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_list.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_list.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_main.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_main.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_main.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_main.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_share_menu1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_share_menu1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_share_menu1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_share_menu1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_share_menu2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_share_menu2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_share_menu2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_share_menu2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_top_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_top_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/01.Web/pt/calendar_top_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/01.Web/pt/calendar_top_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/Screenshot from 2017-08-23 23-35-52.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/Screenshot from 2017-08-23 23-35-52.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/Screenshot from 2017-08-23 23-35-52.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/Screenshot from 2017-08-23 23-35-52.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/note.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/note.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/note.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/note.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_10.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_10.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_10.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_10.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_11.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_11.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_11.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_11.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_12.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_12.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_12.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_12.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_13.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_13.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_13.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_13.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_3.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_4.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_4.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_4.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_4.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_5.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_5.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_5.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_5.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_6.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_6.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_6.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_6.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_7.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_7.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_7.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_7.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_8.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_8.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_8.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_8.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_9.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_9.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_9.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_9.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-3.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-4.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-4.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-4.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-4.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-5.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-5.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-5.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts-5.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts6.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts6.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts6.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/en/thunderbird_contacts6.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/Screenshot from 2017-08-23 23-35-52.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/Screenshot from 2017-08-23 23-35-52.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/Screenshot from 2017-08-23 23-35-52.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/Screenshot from 2017-08-23 23-35-52.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_1.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_1.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_1.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_1.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_10.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_10.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_10.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_10.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_11.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_11.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_11.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_11.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_12.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_12.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_12.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_12.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_13.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_13.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_13.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_13.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_2.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_2.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_2.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_2.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_3.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_3.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_3.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_3.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_3.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_4.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_4.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_4.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_4.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_4.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_4.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_4.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_4.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_5.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_5.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_5.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_5.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_5.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_5.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_5.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_5.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_6.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_6.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_6.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_6.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_7.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_7.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_7.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_7.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_8.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_8.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_8.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_8.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_9.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_9.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_9.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_9.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-1.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-2.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-3.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-4.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-4.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-4.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-4.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-5.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-5.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-5.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts-5.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts6.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts6.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts6.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts6.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_1.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_1.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_1.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_1.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_2.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_2.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_2.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_2.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_3.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_3.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_3.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/01.thunderbird-calendar-contacts/pt/thunderbird_contacts_3.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/en/calcurse.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/en/calcurse.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/en/calcurse.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/en/calcurse.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/en/nextcloud-cal-link.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/en/nextcloud-cal-link.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/en/nextcloud-cal-link.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/en/nextcloud-cal-link.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/en/note.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/en/note.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/en/note.png
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/02.calcurse-caldav/en/note.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/docs.en.md
new file mode 100644
index 00000000..1e69369a
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/docs.en.md
@@ -0,0 +1,26 @@
+---
+title: Desktop
+published: true
+visible: false
+updated:
+taxonomy:
+    category:
+        - docs
+page-toc:
+    active: false
+---
+
+# Calendar desktop clients
+
+## [Thunderbird](/tutorials/cloud/clients/desktop/multiplatform/thunderbird-calendar-contacts)
+- Manage your calendars, contacts and tasks
+
+## [calcurse](/tutorials/cloud/clients/desktop/multiplatform/calcurse-caldav)
+- Manage your calendars from the command line
+
+---
+
+Related Howtos:
+
+- [GNOME Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/gnome-desktop-integration)
+- [KDE Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/kde-desktop-integration)
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/02.Desktop/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/02.Desktop/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/nextcloud_davdroid1.jpeg b/pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/nextcloud_davdroid1.jpeg
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/nextcloud_davdroid1.jpeg
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/nextcloud_davdroid1.jpeg
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/nextcloud_davdroid2.jpeg b/pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/nextcloud_davdroid2.jpeg
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/nextcloud_davdroid2.jpeg
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/nextcloud_davdroid2.jpeg
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/nextcloud_davdroid3.jpeg b/pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/nextcloud_davdroid3.jpeg
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/nextcloud_davdroid3.jpeg
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/nextcloud_davdroid3.jpeg
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/nextcloud_davdroid4.jpeg b/pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/nextcloud_davdroid4.jpeg
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/nextcloud_davdroid4.jpeg
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/nextcloud_davdroid4.jpeg
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/select-calendar1.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/select-calendar1.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/select-calendar1.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/select-calendar1.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/select-calendar2.gif b/pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/select-calendar2.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/03.Mobile/en/select-calendar2.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/03.Mobile/en/select-calendar2.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/calendar/calendar_app.png b/pages/02.tutorials/02.Cloud/04.Apps/calendar/calendar_app.png
new file mode 100644
index 00000000..66daeca2
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/calendar/calendar_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/calendar/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/docs.en.md
new file mode 100644
index 00000000..0039b72f
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/calendar/docs.en.md
@@ -0,0 +1,33 @@
+---
+title: Calendar
+published: true
+visible: false
+indexed: true
+updated:
+        last_modified: "December 2020"
+        app: Calendar
+        app_version: 2.1.3
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - app
+        - calendar
+page-toc:
+    active: false
+---
+
+# Calendar
+The **Calendar** app is the user interface for **Disroot**'s CalDAV server. It allows you to sync events from various devices with your **Disroot Cloud** and edit them online.
+
+---
+
+## [Web interface](web)
+- Creating and configuring calendars
+
+## [Desktop clients](desktop)
+- Desktop clients and integration settings for organizing and synchronizing calendars
+
+## [Mobile clients](/tutorials/cloud/clients/mobile)
+- Mobile clients and settings for organizing and synchronizing calendars
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/calendar/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/02.Calendar/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/calendar/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/circles/circles_app.png b/pages/02.tutorials/02.Cloud/04.Apps/circles/circles_app.png
new file mode 100644
index 00000000..4d67858c
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/circles/circles_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/circles/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/circles/docs.en.md
new file mode 100644
index 00000000..7f8eeba9
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/circles/docs.en.md
@@ -0,0 +1,24 @@
+---
+title: Circles
+published: true
+visible: false
+indexed: true
+updated:
+        last_modified: " 2021"
+        app: Circles
+        app_version: 0.20.6
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - circles
+visible: true
+page-toc:
+    active: false
+---
+
+# Circles (coming soon)
+
+**Circles** allows you to create your own groups of users/colleagues/friends. Those groups (or 'circles') can then be used by any other app for sharing purpose (files, social feed, status update, messaging, etc).
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/docs.fr.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/docs.fr.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/docs.fr.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/docs.pt.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/docs.pt.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/docs.pt.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_add1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_add1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_add1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_add1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_add2.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_add2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_add2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_add2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_add3.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_add3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_add3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_add3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_create1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_create1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_create1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_create1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_delete.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_delete.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_delete.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_delete.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_groups1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_groups1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_groups1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_groups1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_groups2.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_groups2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_groups2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_groups2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_import1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_import1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_import1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_import1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_share1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_share1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_share1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_share1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_share2.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_share2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_share2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_share2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_share3.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_share3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_share3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_share3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_top_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_top_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/contacts_top_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/contacts_top_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/webmail_contact_export.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/webmail_contact_export.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/webmail_contact_export.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/webmail_contact_export.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/webmail_contact_export_2.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/webmail_contact_export_2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/webmail_contact_export_2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/webmail_contact_export_2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/webmail_contact_export_3.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/webmail_contact_export_3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/en/webmail_contact_export_3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/en/webmail_contact_export_3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_add1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_add1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_add1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_add1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_add2.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_add2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_add2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_add2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_add3.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_add3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_add3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_add3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_create1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_create1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_create1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_create1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_delete.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_delete.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_delete.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_delete.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_groups1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_groups1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_groups1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_groups1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_groups2.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_groups2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_groups2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_groups2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_import1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_import1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_import1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_import1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_share1.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_share1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_share1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_share1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_share2.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_share2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_share2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_share2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_share3.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_share3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_share3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_share3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_top_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_top_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/01.Web/pt/contacts_top_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/01.Web/pt/contacts_top_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/02.Desktop/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/02.Desktop/docs.en.md
similarity index 92%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/02.Desktop/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/02.Desktop/docs.en.md
index 51b32449..b1ed28e8 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/02.Desktop/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/contacts/02.Desktop/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Contacts: Desktop
+title: Desktop
 published: true
 visible: false
 updated:
@@ -13,7 +13,7 @@ page-toc:
     active: false
 ---
 
-# Contact integration on desktop
+# Contact desktop integration
 
 You can read the tutorials below in order to get your **Contacts** syncronized through a multiplatform desktop client.
 
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/02.Desktop/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/02.Desktop/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/02.Desktop/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/02.Desktop/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/docs.en.md
similarity index 94%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/docs.en.md
index 0c7e2556..15a91293 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Contacts: Mobile
+title: Mobile
 published: true
 visible: false
 updated:
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/contacts_to_display.gif b/pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/contacts_to_display.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/contacts_to_display.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/contacts_to_display.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/nextcloud_davdroid1.jpeg b/pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/nextcloud_davdroid1.jpeg
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/nextcloud_davdroid1.jpeg
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/nextcloud_davdroid1.jpeg
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/nextcloud_davdroid2.jpeg b/pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/nextcloud_davdroid2.jpeg
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/nextcloud_davdroid2.jpeg
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/nextcloud_davdroid2.jpeg
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/nextcloud_davdroid3.jpeg b/pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/nextcloud_davdroid3.jpeg
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/nextcloud_davdroid3.jpeg
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/nextcloud_davdroid3.jpeg
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/nextcloud_davdroid4.jpeg b/pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/nextcloud_davdroid4.jpeg
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/nextcloud_davdroid4.jpeg
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/nextcloud_davdroid4.jpeg
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/note.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/note.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/03.Mobile/en/note.png
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/03.Mobile/en/note.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/contacts/contacts_app.png b/pages/02.tutorials/02.Cloud/04.Apps/contacts/contacts_app.png
new file mode 100644
index 00000000..74592253
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/contacts/contacts_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/docs.en.md
similarity index 75%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/docs.en.md
index 0b5f9368..209ed3bb 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/contacts/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Cloud Apps: Contacts
+title: Contacts
 published: true
 visible: false
 indexed: true
@@ -9,13 +9,17 @@ taxonomy:
         - docs
     tags:
         - cloud
+        - apps
         - contacts
 visible: true
 page-toc:
     active: false
 ---
 
-## Contacts
+# Contacts
+The **Contacts** app allows you to sync contacts from various devices with your **Disroot Cloud** and edit them online.
+
+---
 
 ### [Web interface](web)
 - Creating, editing and syncing contacts
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/contacts/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/03.Contacts/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/contacts/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/cospend/cospend_app.png b/pages/02.tutorials/02.Cloud/04.Apps/cospend/cospend_app.png
new file mode 100644
index 00000000..0f603238
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/cospend/cospend_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/cospend/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/cospend/docs.en.md
new file mode 100644
index 00000000..7f589ac1
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/cospend/docs.en.md
@@ -0,0 +1,24 @@
+---
+title: Cospend
+published: true
+visible: false
+indexed: true
+updated:
+        last_modified: " 2021"
+        app: Cospend
+        app_version: 1.2.7
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - cospend
+visible: true
+page-toc:
+    active: false
+---
+
+# Cospend (coming soon)
+
+**Cospend** app is a group/shared budget manager. You can use it when you share a house, when you go on vacation with friends or whenever you share money with others.
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/dashboard/dashboard.png b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/dashboard.png
new file mode 100644
index 00000000..eec4f7db
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/dashboard.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/dashboard/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/docs.en.md
new file mode 100644
index 00000000..55d847d1
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/docs.en.md
@@ -0,0 +1,27 @@
+---
+title: Dashboard
+published: true
+visible: false
+indexed: true
+updated:
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - dashboard
+visible: true
+page-toc:
+    active: false
+---
+
+# Dashboard (coming soon)
+
+The **Dashboard** gives you an overview of your upcoming appointments, emails, chat messages, incoming tickets, latest toots and much more.
+
+## [Mastodon integration](mastodon)
+- **Dashboard** widgets that displays important notifications and the **Mastodon** home timeline.
+
+## [Zammad integration](zammad)
+- A **Dashboard** widget that displays notifications, a search provider for tickets and notifications for new open tickets on **Zammad**.
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/dashboard/mastodon/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/mastodon/docs.en.md
new file mode 100644
index 00000000..7c5251c0
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/mastodon/docs.en.md
@@ -0,0 +1,26 @@
+---
+title: Mastodon Integration
+published: true
+visible: false
+indexed: true
+updated:
+        last_modified: " 2021"
+        app: Mastodon integration
+        app_version: 0.0.11
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - mastodon
+        - integration
+        - dashboard
+visible: true
+page-toc:
+    active: false
+---
+
+# Mastodon integration (coming soon)
+
+**Mastodon integration** provides **Dashboard** widgets displaying your important notifications and your home timeline.
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/dashboard/mastodon/mastodon_app.png b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/mastodon/mastodon_app.png
new file mode 100644
index 00000000..78563eba
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/mastodon/mastodon_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/dashboard/zammad/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/zammad/docs.en.md
new file mode 100644
index 00000000..b04d2e6d
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/zammad/docs.en.md
@@ -0,0 +1,26 @@
+---
+title: Zammad Integration
+published: true
+visible: false
+indexed: true
+updated:
+        last_modified: " 2021"
+        app: Zammad integration
+        app_version: 0.0.14
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - zammad
+        - integration
+        - dashboard
+visible: true
+page-toc:
+    active: false
+---
+
+# Zammad integration (coming soon)
+
+**Zammad integration** provides a **Dashboard** widget displaying your important notifications, a search provider for tickets and notifications for new open tickets.
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/dashboard/zammad/zammad_app.png b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/zammad/zammad_app.png
new file mode 100644
index 00000000..2b6fd408
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/dashboard/zammad/zammad_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/deck/deck_app.png b/pages/02.tutorials/02.Cloud/04.Apps/deck/deck_app.png
new file mode 100644
index 00000000..2d4c91e1
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/deck/deck_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/deck/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/deck/docs.en.md
new file mode 100644
index 00000000..44df31c5
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/deck/docs.en.md
@@ -0,0 +1,24 @@
+---
+title: Deck
+published: true
+visible: false
+indexed: true
+updated:
+        last_modified: " 2021"
+        app: Deck
+        app_version: 1.2.3
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - deck
+visible: true
+page-toc:
+    active: false
+---
+
+# Deck (coming soon)
+
+**Deck** is a kanban style organization tool aimed at personal planning and project organization for teams integrated with your **Disroot Cloud**.
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/docsparent.en.md b/pages/02.tutorials/02.Cloud/04.Apps/docsparent.en.md
index 2cc0bc0a..bb16c55e 100755
--- a/pages/02.tutorials/02.Cloud/04.Apps/docsparent.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/docsparent.en.md
@@ -1,5 +1,5 @@
 ---
-title: "Cloud: Apps"
+title: "Apps"
 published: true
 visible: true
 indexed: true
@@ -10,7 +10,10 @@ page-toc:
     active: false
 ---
 
-<br>
-<br>
-<br>
-<br>
+# Cloud Apps
+
+One of the most powerful features of **Nextcloud** is the ability to expand its functionality through **applications**. These are essentially plugins or extensions that allow to add extra functions to the **Cloud** environment.
+
+Below you will find guides and tutorials about of those that are currently available in the **Disroot Cloud** to learn how to use or configure them on different devices.
+
+---
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/en/activity_app.png b/pages/02.tutorials/02.Cloud/04.Apps/en/activity_app.png
deleted file mode 100644
index fa9e78be..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/en/activity_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/en/bookmarks_app.png b/pages/02.tutorials/02.Cloud/04.Apps/en/bookmarks_app.png
deleted file mode 100644
index a07c9920..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/en/bookmarks_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/en/calendar_app.png b/pages/02.tutorials/02.Cloud/04.Apps/en/calendar_app.png
deleted file mode 100644
index 0aa478f3..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/en/calendar_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/en/contacts_app.png b/pages/02.tutorials/02.Cloud/04.Apps/en/contacts_app.png
deleted file mode 100644
index 2edda7a5..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/en/contacts_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/en/news_app.png b/pages/02.tutorials/02.Cloud/04.Apps/en/news_app.png
deleted file mode 100644
index 073cea32..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/en/news_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/en/notes_app.png b/pages/02.tutorials/02.Cloud/04.Apps/en/notes_app.png
deleted file mode 100644
index 23b012e3..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/en/notes_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/en/sweep_app.png b/pages/02.tutorials/02.Cloud/04.Apps/en/sweep_app.png
deleted file mode 100644
index d1126c27..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/en/sweep_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/en/talk_app.png b/pages/02.tutorials/02.Cloud/04.Apps/en/talk_app.png
deleted file mode 100644
index fd247501..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/en/talk_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/en/task_app.png b/pages/02.tutorials/02.Cloud/04.Apps/en/task_app.png
deleted file mode 100644
index fc97bb4e..00000000
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/en/task_app.png and /dev/null differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/forms/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/forms/docs.en.md
new file mode 100644
index 00000000..6b899bd6
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/forms/docs.en.md
@@ -0,0 +1,24 @@
+---
+title: Forms
+published: true
+visible: false
+indexed: true
+updated:
+        last_modified: " 2021"
+        app: Forms
+        app_version: 2.1.0
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - forms
+visible: true
+page-toc:
+    active: false
+---
+
+# Forms (coming soon)
+
+**Forms** provides simple surveys and questionnaires.
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/forms/forms_app.png b/pages/02.tutorials/02.Cloud/04.Apps/forms/forms_app.png
new file mode 100644
index 00000000..ab85b979
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/forms/forms_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/docs.fr.md b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/docs.fr.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/docs.fr.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/docs.pt.md b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/docs.pt.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/docs.pt.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/news_add1.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/news_add1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/news_add1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/news_add1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/news_options.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/news_options.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/news_options.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/news_options.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/news_threedot.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/news_threedot.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/news_threedot.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/news_threedot.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/news_top_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/news_top_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/news_top_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/news_top_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/rss_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/rss_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/en/rss_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/en/rss_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/news_add1.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/news_add1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/news_add1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/news_add1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/news_options.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/news_options.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/news_options.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/news_options.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/news_threedot.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/news_threedot.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/news_threedot.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/news_threedot.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/news_top_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/news_top_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/news_top_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/news_top_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/rss_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/rss_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/01.Web/pt/rss_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/news/01.Web/pt/rss_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/02.Desktop/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/news/02.Desktop/docs.en.md
similarity index 85%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/02.Desktop/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/02.Desktop/docs.en.md
index ef7f4dbc..6358aadf 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/05.News/02.Desktop/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/news/02.Desktop/docs.en.md
@@ -3,9 +3,6 @@ title: News: Desktop clients
 published: true
 visible: false
 updated:
-        last_modified: "July 2019"
-        app:
-        app_version:
 taxonomy:
     category:
         - docs
@@ -25,6 +22,6 @@ page-toc:
 
 ----
 
-#### Related How-tos
+### Related How-tos
 #### [GNOME: Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/gnome-desktop-integration)
 #### [KDE: Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/kde-desktop-integration)
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/02.Desktop/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/news/02.Desktop/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/02.Desktop/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/02.Desktop/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/03.Mobile/01.android/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/news/03.Mobile/01.android/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/03.Mobile/01.android/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/03.Mobile/01.android/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/03.Mobile/01.android/nc_news/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/news/03.Mobile/01.android/nc_news/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/03.Mobile/01.android/nc_news/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/03.Mobile/01.android/nc_news/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/03.Mobile/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/news/03.Mobile/docs.en.md
similarity index 86%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/03.Mobile/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/03.Mobile/docs.en.md
index aef07e75..863321b0 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/05.News/03.Mobile/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/news/03.Mobile/docs.en.md
@@ -3,7 +3,6 @@ title: News: Mobile
 published: true
 visible: false
 updated:
-        last_modified: "July 2019"
 taxonomy:
     category:
         - docs
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/03.Mobile/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/news/03.Mobile/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/03.Mobile/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/03.Mobile/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/news/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/news/docs.en.md
new file mode 100644
index 00000000..fb8983e3
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/news/docs.en.md
@@ -0,0 +1,32 @@
+---
+title: News
+published: true
+visible: false
+indexed: true
+updated:
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - news
+visible: true
+page-toc:
+    active: false
+---
+
+# News
+
+A **RSS/Atom** feed reader which can be synced with many mobile devices.
+
+---
+
+## [Web interface](web)
+- Manage your news feeds from the web
+
+## [Desktop clients](desktop)
+- Desktop clients and integration for reading, organizing and synchronizing your news feeds
+
+## [Mobile clients](/tutorials/cloud/clients/mobile)
+- Mobile clients for reading, organizing and synchronizing your news feeds
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/05.News/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/news/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/05.News/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/news/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/news/news_app.png b/pages/02.tutorials/02.Cloud/04.Apps/news/news_app.png
new file mode 100644
index 00000000..89f1c751
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/news/news_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/note.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/note.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/note.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/note.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_app.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_app.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_app.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_app.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_categories1.gif b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_categories1.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_categories1.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_categories1.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_categories2.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_categories2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_categories2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_categories2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_creation.gif b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_creation.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_creation.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_creation.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_favourite.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_favourite.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_favourite.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_favourite.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_settings.gif b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_settings.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_settings.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_settings.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_top_icon.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_top_icon.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/01.Web/en/notes_top_icon.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/01.Web/en/notes_top_icon.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/docs.en.md
similarity index 79%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/docs.en.md
index ba50e76e..c7f57d66 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Notes: Desktop clients
+title: Desktop
 published: true
 visible: false
 updated:
@@ -13,17 +13,17 @@ taxonomy:
 page-toc:
     active: false
 ---
-## Desktop clients
+# Notes Desktop clients
 
 To use **Notes** (create, edit and share them), please, check the following tutorials:
 
 
-#### [Nextcloud app](/tutorials/cloud/clients/desktop/multiplatform/desktop-sync-client)
+## [Nextcloud app](/tutorials/cloud/clients/desktop/multiplatform/desktop-sync-client)
 
 #### [Tasks sync from Thunderbird](/tutorials/cloud/clients/desktop/multiplatform/thunderbird-calendar-contacts#tasks-integration-with-with-thunderbird)
 
 ----
-### Related How-Tos
+## Related How-Tos
 
 - [GNOME: Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/gnome-desktop-integration)
 - [KDE: Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/kde-desktop-integration)
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/en/gnome-notes.gif b/pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/en/gnome-notes.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/en/gnome-notes.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/en/gnome-notes.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/en/gnome-notes1.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/en/gnome-notes1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/en/gnome-notes1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/en/gnome-notes1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/en/note.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/en/note.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/02.Desktop/en/note.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/02.Desktop/en/note.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes1.gif b/pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes1.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes1.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes1.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes1.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes2.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes2.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes2.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes2.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes3.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes3.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes3.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes3.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes4.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes4.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes4.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes4.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes5.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes5.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/01.android/en/nextcloud_notes5.png
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/01.android/en/nextcloud_notes5.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/03.Mobile/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/03.Mobile/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/notes/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/notes/docs.en.md
new file mode 100644
index 00000000..4ba6cce8
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/notes/docs.en.md
@@ -0,0 +1,32 @@
+---
+title: Notes
+published: true
+visible: false
+indexed: true
+updated:
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - notes
+visible: true
+page-toc:
+    active: false
+---
+
+# Notes
+
+**Notes** is a distraction free notes taking app. It provides categories for better organization and supports formatting using **Markdown** syntax. Notes are saved as files in your **Disroot Cloud**, so you can view and edit them with every Nextcloud client.
+
+---
+
+## [Web interface](web)
+- Creating and editing Notes
+
+## [Desktop clients](desktop)
+- Desktop clients and taking notes apps to create and sync notes
+
+## [Mobile clients](/tutorials/cloud/clients/mobile)
+- Mobile clients and taking notes apps to create and sync notes
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/04.Notes/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/notes/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/04.Notes/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/notes/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/notes/notes_app.png b/pages/02.tutorials/02.Cloud/04.Apps/notes/notes_app.png
new file mode 100644
index 00000000..a6992ec2
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/notes/notes_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/docs.fr.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/docs.fr.md
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/docs.fr.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/docs.pt.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/docs.pt.md
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/docs.pt.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/en/spreed_bottom.png b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/en/spreed_bottom.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/en/spreed_bottom.png
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/en/spreed_bottom.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/en/spreed_create_call.gif b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/en/spreed_create_call.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/en/spreed_create_call.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/en/spreed_create_call.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/en/spreed_create_calls1.png b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/en/spreed_create_calls1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/en/spreed_create_calls1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/en/spreed_create_calls1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/en/spreed_main.png b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/en/spreed_main.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/en/spreed_main.png
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/en/spreed_main.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/pt/spreed_bottom.png b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/pt/spreed_bottom.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/pt/spreed_bottom.png
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/pt/spreed_bottom.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/pt/spreed_create_call.gif b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/pt/spreed_create_call.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/pt/spreed_create_call.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/pt/spreed_create_call.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/pt/spreed_create_calls1.png b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/pt/spreed_create_calls1.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/pt/spreed_create_calls1.png
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/pt/spreed_create_calls1.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/pt/spreed_main.png b/pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/pt/spreed_main.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/01.Web/pt/spreed_main.png
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/01.Web/pt/spreed_main.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/02.Desktop/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/02.Desktop/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/02.Desktop/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/02.Desktop/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/02.Desktop/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/02.Desktop/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/02.Desktop/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/02.Desktop/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/03.Mobile/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/03.Mobile/docs.en.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/03.Mobile/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/03.Mobile/docs.en.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/03.Mobile/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/03.Mobile/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/03.Mobile/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/03.Mobile/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/talk/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/docs.en.md
new file mode 100644
index 00000000..3c7f3dbb
--- /dev/null
+++ b/pages/02.tutorials/02.Cloud/04.Apps/talk/docs.en.md
@@ -0,0 +1,25 @@
+---
+title: Talk
+published: true
+visible: false
+indexed: true
+updated:
+taxonomy:
+    category:
+        - docs
+    tags:
+        - cloud
+        - apps
+        - talk
+visible: true
+page-toc:
+    active: false
+---
+
+# Talk
+
+Chat, video & audio-conferencing using WebRTC
+
+---
+
+## [Web interface](web)
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/07.Talk/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/talk/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/07.Talk/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/talk/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/talk/talk_app.png b/pages/02.tutorials/02.Cloud/04.Apps/talk/talk_app.png
new file mode 100644
index 00000000..50d80c30
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/talk/talk_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/docs.en.md
similarity index 96%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/docs.en.md
index ae06f722..30fb2622 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/docs.en.md
@@ -1,11 +1,11 @@
 ---
-title: 'Tasks: Web'
+title: Web interface
 published: true
 visible: false
 updated:
-        last_modified: "October 2020"
-        app: Nextcloud
-        app_version: 18
+        last_modified: "January 2021"
+        app: Tasks
+        app_version: 0.13.6
 taxonomy:
     category:
         - docs
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/add_task.gif b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/add_task.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/add_task.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/add_task.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/add_tasks.gif b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/add_tasks.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/add_tasks.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/add_tasks.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/add_tasks_window.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/add_tasks_window.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/add_tasks_window.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/add_tasks_window.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/all_day.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/all_day.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/all_day.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/all_day.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/assign_list.gif b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/assign_list.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/assign_list.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/assign_list.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/calendar.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/calendar.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/calendar.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/calendar.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/categories_comments.gif b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/categories_comments.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/categories_comments.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/categories_comments.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/categories_comments.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/categories_comments.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/categories_comments.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/categories_comments.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/info.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/info.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/info.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/info.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/list_options.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/list_options.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/list_options.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/list_options.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/main.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/main.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/main.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/main.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/priority.gif b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/priority.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/priority.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/priority.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/progress.gif b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/progress.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/progress.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/progress.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/show.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/show.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/show.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/show.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/start_due_date.gif b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/start_due_date.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/start_due_date.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/start_due_date.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/status.gif b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/status.gif
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/status.gif
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/status.gif
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/status.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/status.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/status.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/status.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/tasks_options.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/tasks_options.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/01.Web/en/tasks_options.png
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/01.Web/en/tasks_options.png
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/02.Desktop/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/02.Desktop/docs.en.md
similarity index 82%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/02.Desktop/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/02.Desktop/docs.en.md
index 816a6fcf..4ebfdf98 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/02.Desktop/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/tasks/02.Desktop/docs.en.md
@@ -1,9 +1,8 @@
 ---
-title: 'Tasks: Desktop'
+title: Desktop
 published: true
 visible: false
 updated:
-        last_modified: "October 2020"
 taxonomy:
     category:
         - docs
@@ -15,13 +14,13 @@ page-toc:
     active: false
 ---
 
-## Tasks on the desktop
+# Tasks on the desktop
 
 There are several ways you can sync and work with **Nextcloud Tasks** from your desktop. Below you will find some tutorials to get it.
 
-### Multi-platform desktop clients
+## Multi-platform desktop clients
  - [Thunderbird: Calendar / Contacts / Tasks sync](/tutorials/cloud/clients/desktop/multiplatform/thunderbird-calendar-contacts)
 
-### GNU/Linux
+## GNU/Linux
  - [GNOME Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/gnome-desktop-integration)
  - [KDE Desktop Integration](/tutorials/cloud/clients/desktop/gnu-linux/kde-desktop-integration)
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/02.Desktop/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/02.Desktop/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/02.Desktop/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/02.Desktop/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/02.Desktop/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/02.Desktop/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/02.Desktop/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/02.Desktop/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/03.Mobile/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/03.Mobile/docs.en.md
similarity index 86%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/03.Mobile/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/03.Mobile/docs.en.md
index 89cdffc7..41fb3e55 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/03.Mobile/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/tasks/03.Mobile/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Tasks: Mobile
+title: Mobile
 published: true
 visible: false
 updated:
@@ -15,10 +15,10 @@ page-toc:
     active: false
 ---
 
-## Tasks integration on mobile devices
+# Tasks mobile integration
 
 To set up and sync your **Tasks** throught a mobile client see the tutorial below:
 
-### Android
+## Android
 - [DAVx⁵ / OpenTasks](/tutorials/cloud/clients/mobile/android/calendars-contacts-and-tasks)
 - [Nextcloud mobile app](/tutorials/cloud/clients/mobile/android/nextcloud-app)
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/03.Mobile/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/03.Mobile/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/03.Mobile/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/03.Mobile/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/03.Mobile/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/03.Mobile/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/03.Mobile/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/03.Mobile/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/docs.en.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/docs.en.md
similarity index 50%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/docs.en.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/docs.en.md
index fcb1f00c..ca2f92f0 100644
--- a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/04.Apps/tasks/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: "Cloud Apps: Tasks"
+title: Tasks
 published: true
 visible: false
 indexed: true
@@ -17,12 +17,15 @@ page-toc:
 ---
 
 # Tasks
+**Tasks** app allows you to add, edit and delete tasks in your **Cloud**. They can be shared between users, synchronized using [**CalDav**](https://en.wikipedia.org/wiki/CalDAV) to sync them to your local client and even downloaded as [ICS](https://en.wikipedia.org/wiki/ICalendar) files.
 
-### [Web interface](web)
+---
+
+## [Web interface](web)
 - Creating and configuring tasks
 
-### [Desktop clients](desktop)
+## [Desktop clients](desktop)
 - Desktop clients and applications for organizing and synchronizing tasks
 
-### [Mobile clients](mobile)
+## [Mobile clients](mobile)
 - Mobile clients and settings for organizing and synchronizing tasks
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/docs.es.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/docs.es.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/docs.es.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/docs.es.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/docs.it.md b/pages/02.tutorials/02.Cloud/04.Apps/tasks/docs.it.md
similarity index 100%
rename from pages/02.tutorials/02.Cloud/04.Apps/01.Tasks/docs.it.md
rename to pages/02.tutorials/02.Cloud/04.Apps/tasks/docs.it.md
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/tasks/tasks_app.png b/pages/02.tutorials/02.Cloud/04.Apps/tasks/tasks_app.png
new file mode 100644
index 00000000..ddd6f0a2
Binary files /dev/null and b/pages/02.tutorials/02.Cloud/04.Apps/tasks/tasks_app.png differ
diff --git a/pages/02.tutorials/02.Cloud/04.Apps/thumb.png b/pages/02.tutorials/02.Cloud/04.Apps/thumb.png
index bef8d824..01406014 100644
Binary files a/pages/02.tutorials/02.Cloud/04.Apps/thumb.png and b/pages/02.tutorials/02.Cloud/04.Apps/thumb.png differ
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/01.thunderbird-calendar-contacts/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/01.thunderbird-calendar-contacts/docs.en.md
index 3e5d0538..ce21907e 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/01.thunderbird-calendar-contacts/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/01.thunderbird-calendar-contacts/docs.en.md
@@ -1,9 +1,9 @@
 ---
-title: 'Thunderbird: Syncing Contacts, Calendars and Tasks'
+title: 'Thunderbird'
 visible: false
 updated:
         last_modified: "October 2020"
-        app: Thunderbird
+        app: Mozilla Thunderbird
         app_version: 68.12.0 on Manjaro Linux
 page-toc:
   active: true
@@ -19,7 +19,7 @@ taxonomy:
         - contacts
 ---
 
-# Thunderbird...
+# Mozilla Thunderbird...
 ... is a free and open-source multi-platform email client and personal information manager with news, RSS and chat client integrated.<br>
 We will learn how to connect your **Cloud** contacts, calendars and tasks to **Thunderbird** in order to manage them from one place in your desktop.
 
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/02.calcurse-caldav/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/02.calcurse-caldav/docs.en.md
index abfd6fea..44424998 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/02.calcurse-caldav/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/02.calcurse-caldav/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: 'calcurse: Calendar sync'
+title: 'calcurse'
 visible: false
 updated:
         last_modified: "July 2019"
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/docs.en.md
index e698ddea..24d24a5d 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/01.Multiplatform/docs.en.md
@@ -1,14 +1,16 @@
 ---
-title: Desktop Clients: Multiplatform
+title: Multiplatform
 published: true
-visible: false
+indexed:
 updated:
 taxonomy:
     category:
         - docs
     tags:
         - cloud
-        - sync
+        - clients
+        - multiplatform
+visible: true
 page-toc:
     active: false
 ---
@@ -16,11 +18,11 @@ page-toc:
 # Multiplatform Clients
 
 
-### [Nextcloud client](desktop-sync-client)
+## [Nextcloud client](desktop-sync-client)
 - Desktop sync client
 
-### [Thunderbird](thunderbird-calendar-contacts)
+## [Thunderbird](thunderbird-calendar-contacts)
 - Calendar, Contacts & Tasks sync
 
-### [calcurse](calcurse-caldav)
+## [calcurse](calcurse-caldav)
 - Calendar sync for the command line
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/01.gnome-desktop-integration/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/01.gnome-desktop-integration/docs.en.md
index 8fc22d89..24e6fabd 100644
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/01.gnome-desktop-integration/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/01.gnome-desktop-integration/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: 'Cloud: GNOME Integration'
+title: 'GNOME Integration'
 visible: false
 updated:
         last_modified: "January 2021"
@@ -13,6 +13,8 @@ taxonomy:
         - docs
     tags:
         - cloud
+        - desktop
+        - gnu-linux
         - gnome
         - integration
 ---
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/02.kde-desktop-integration/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/02.kde-desktop-integration/docs.en.md
index 028f29a1..c5d9c5b5 100644
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/02.kde-desktop-integration/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/02.kde-desktop-integration/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: GNU/Linux: KDE Desktop Integration
+title: 'KDE Desktop Integration'
 visible: false
 updated:
         last_modified: "8 April 2019"
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/03.terminal-integration/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/03.terminal-integration/docs.en.md
index d56dee33..83d87e0e 100644
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/03.terminal-integration/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/03.terminal-integration/docs.en.md
@@ -1,10 +1,10 @@
 ---
-title: "GNU/Linux: Terminal Integration"
+title: "Terminal Integration"
 visible: false
 updated:
         last_modified: "July 2019"
-        app: Command line
-        app_version: vdirsyncer - version 0.16.7-2 / Khard - version 0.13.0-1 / Khal - version 1:0.9.10-1.1 on DEBIAN 10
+        app: Vdirsyncer / Khard / Khal
+        app_version: Vdirsyncer, version 0.16.7-2 / Khard, version 0.13.0-1 / Khal, version 1:0.9.10-1.1 on DEBIAN 10
 page-toc:
   active: true
 published: true
@@ -13,13 +13,15 @@ taxonomy:
         - docs
     tags:
         - terminal
-        - linux
+        - gnu-linux
+        - desktop
         - integration
 ---
 
 # General information
 
 The goal of this tutorial is to explain how to synchronize calendar and contacts between the Nextcloud server and your client using the command line.
+
 For this operation the software that will be used are:
 
 - **Vdirsyncer**: a command-line tool for synchronizing calendars and addressbooks between a variety of servers and the local filesystem. More info [here](https://vdirsyncer.pimutils.org/en/stable/)
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/03.terminal-integration/docs.en.md.orig b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/03.terminal-integration/docs.en.md.orig
deleted file mode 100644
index 8529149f..00000000
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/03.terminal-integration/docs.en.md.orig
+++ /dev/null
@@ -1,204 +0,0 @@
----
-title: GNU/Linux: Terminal integration
-visible: false
-page-toc:
-  active: false
-published: true
-taxonomy:
-    category:
-        - docs
----
----
-
-# Meta information
-This howto was last updated on 14-07-2019 and it refers to:
-
-- vdirsyncer: version - 0.16.7-2 For Debian 10
-- Khard: version - 0.13.0-1 For Debian 10
-- Khal: version - 1:0.9.10-1.1 For Debian 10
-
-NOTE: If the howto refers to an older software version than the provided by Disroot, or it is even possible that the one you're using in your device, there could be missing features or small parts of the information that may have changed.
-
-Disroot's how-to documentation is a community driven process. We try to keep it as updated as we can.
-
-
-# General information
-
-The goal of this tutorial is to explain how to synchronize calendar and contacts between the Nextcloud server and your client using the command line.
-For this operation the software that will be used are:
-
-- Vdirsyncer: is a command-line tool for synchronizing calendars and addressbooks between a variety of servers and the local filesystem. More info [here](https://vdirsyncer.pimutils.org/en/stable/)
-
-- Khard: is an address book for the Linux console. It creates, reads, modifies and removes carddav address book entries at your local machine. Khard is also compatible to the email clients like Mutt. More info [here](https://github.com/scheibler/khard) 
-
-- Khal: is a standards based CLI and terminal calendar program, able to synchronize with CalDAV servers through vdirsyncer. More info [here](https://github.com/pimutils/khal)
-
-
-# Vdirsyncer
-Install vdirsyncer for your GNU/Linux distribution.
-If there is no suitable package for your distribution, you’ll need to install [vdirsyncer manually](https://vdirsyncer.pimutils.org/en/stable/installation.html#manual-installation)
-
-## Configuration
-Path of the configuration file: *"~/.config/vdirsyncer/config"*  
-Contents of the *config* file:
-
-```
-[general]
-# A folder where vdirsyncer can store some metadata about each pair.
-status_path = "~/.vdirsyncer/status/"
-
-# CARDDAV
-[pair YOUR-USERNAME]
-# A `[pair <name>]` block defines two storages `a` and `b` that should be
-# synchronized. The definition of these storages follows in `[storage <name>]`
-# blocks. This is similar to accounts in OfflineIMAP.
-a = "Local"
-b = "Remote"
-
-# Synchronize all collections available on "side B" (in this case the server).
-# You need to run `vdirsyncer discover` if new calendars/addressbooks are added
-# on the server.
-
-# Omitting this parameter implies that the given path and URL in the
-# corresponding `[storage <name>]` blocks are already directly pointing to a
-# collection each.
-collections = ["from b"]
-
-# Synchronize the "display name" property into a local file (~/.contacts/displayname).
-metadata = ["YOUR-USERNAME"]
- 
-# To resolve a conflict the following values are possible:
-#   `null` - abort when collisions occur (default)
-#   `"a wins"` - assume a's items to be more up-to-date
-#   `"b wins"` - assume b's items to be more up-to-date
-conflict_resolution = "a wins"
-
-[storage Local]
-# A storage references actual data on a remote server or on the local disk.
-# Similar to repositories in OfflineIMAP.
-type = "filesystem"
-path = "~/.contacts/"
-fileext = ".vcf"
-
-[storage Remote]
-type = "carddav"
-url = "https://cloud.disroot.org/remote.php/dav/addressbooks/users/YOUR-USERNAME/contatti/"
-username = "YOUR-USERNAME"
-# The password can also be fetched from the system password storage, netrc or a
-# custom command. See http://vdirsyncer.readthedocs.org/en/stable/keyring.html
-password = "YOUR-PASSWORD"
-
-# CALDAV
-#[pair Calendar]
-a = "CalendarLocal"
-b = "CalendarRemote"
-## collections = ["private", "work"]
-collections = ["from b"]
-
-## Calendars also have a color property
-metadata = ["YOUR-USERNAME"]
-
-## To resolve a conflict the following values are possible:
-## `null` - abort when collisions occur (default)
-## `"a wins"` - assume a's items to be more up-to-date
-## `"b wins"` - assume b's items to be more up-to-date
-conflict_resolution = "a wins"
-
-[storage CalendarLocal]
-type = "filesystem"
-path = "~/.calendars/"
-fileext = ".ics"
-
-[storage CalendarRemote]
-type = "caldav"
-url = "https://cloud.disroot.org/remote.php/dav/"
-username = "YOUR-USERNAME"
-password = "YOUR-PASSWORD"
-```
-
-After having completed the configuration file, run this commands:
-
-*vdirsyncer discover*
-
-*You will be asked if you want to create the missing directories. Answer yes*
-
-*vdirsyncer sync*
-
-To synchronize the contacts and calendars just give the following command:
-
-*vdirsyncer sync*
-
-This command can be automated using [cron](https://en.wikipedia.org/wiki/Cron)
-
-
-Now you have synchronized your calendars and your contacts. 
-In your local machine contacts are stored in *"~/.contacts/"* with the *.vcf* format.  
-Calendars are stored in *"~/.calendars/"* with the *.ics* format.
-
-# Khard
-
-![](en/khard.png)
-
-Install khal for your GNU/Linux distribution. 
-If there is no suitable package for your distribution, you’ll need to install [Khard manually](https://github.com/scheibler/khard/)
-
-## Configuration
-Path of the configuration file: *"~/.config/khard/khard.conf"*  
-Contents of the *khard.conf* file:
-
-```
-[addressbooks]
-[[YOUR-USERNAMENE]]
-path = ~/.contacts/contatti/
-
-[general]
-editor = vim
-merge_editor = vimdiff
-default_action = list
-show_nicknames = no
-```
-
-* Show contacts: *khard list*
-* Show details: * khard details*
-* Search contacts: *khard details [-- strict-search] name of contact*
-* For more information: **khard -h**
-
-# Khal
-
-![](en/khal.png)
-
-Install khal for your GNU/Linux distribution.  
-If there is no suitable package for your distribution, you’ll need to install [Khal manually](https://lostpackets.de/khal/install.html)
-
-## Configuration
-Path of the configuration file: *"~/.config/khal/config"* 
-Contents of the *config* file:
-
-```
-[calendars]
-[[CALENDAR1]]
-   path = ~/.calendars/CALENDAR1/
-   color = dark cyan
-
-[[CALENDAR2]]
-   path = ~/.calendars/CALENDAR2/
-   color = dark magenta
-
-
-[locale]
-timeformat = %H:%M
-dateformat = %Y-%m-%d
-longdateformat = %Y-%m-%d
-datetimeformat = %Y-%m-%d %H:%M
-longdatetimeformat = %Y-%m-%d %H:%M
-
-local_timezone = Europe/Berlin
-default_timezone = Europe/Berlin
-
-firstweekday = 0
-```
-*CALENDAR1 AND CALENDAR2 are the name of your calendars in Nextcloud"*.
-
-* Show calendar: *khal*
-* Interactive khal (let's browse and edit calendars and events): *ikhal*
-* For more information: **khal -h**
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/docs.en.md
index c497b5d0..f7a81104 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/02.GNU-Linux/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Desktop integration: GNU/Linux
+title: GNU/Linux
 published: true
 updated:
 taxonomy:
@@ -7,21 +7,19 @@ taxonomy:
             - docs
     tags:
             - cloud
-            - integration
-            - sync
-            - linux
             - desktop
-visible: false
+            - integration
+            - clients
+            - gnu-linux
+visible: true
 page-toc:
      active: false
 ---
 
-<br>
+# GNU/Linux Desktop clients
 
-![](gnu_linux.png)
+## [GNOME Desktop Integration](gnome-desktop-integration)
 
-**Nextcloud** integrates exceedingly well with **GNU/Linux**. The how-tos below contains the information to set up the desktop integration.
+## [KDE Desktop Integration](kde-desktop-integration)
 
-### [GNOME](gnome-desktop-integration) Desktop Integration
-
-### [KDE](kde-desktop-integration) Desktop Integration
+## [Terminal Integration](terminal-integration)
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/03.Mac-OS/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/03.Mac-OS/docs.en.md
index e5503e25..fc5251b3 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/03.Mac-OS/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/03.Mac-OS/docs.en.md
@@ -1,6 +1,6 @@
 ---
 title: MacOS
-visible: false
+visible: true
 published: true
 updated:
 taxonomy:
@@ -8,16 +8,14 @@ taxonomy:
         - docs
     tags:
         - cloud
+        - desktop
         - integration
         - macos
 page-toc:
      active: false
 ---
 
-# Syncing your data with MacOS
+# macOS Desktop clients
 
-Below you can learn how to integrate Nextcloud with your MacOS device
-### [Syncing Calendars](calendar-syncing)
-### [Syncing Contacts](contact-syncing)
-
-![](macos.jpg)
+## [Syncing Calendars](calendar-syncing)
+## [Syncing Contacts](contact-syncing)
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/docs.en.md
index e2c483fa..ac3a842b 100644
--- a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/docs.en.md
@@ -1,20 +1,24 @@
 ---
-title: Cloud: Desktop Clients
+title: Desktop
 published: true
-indexed: true
+indexed:
 updated:
 taxonomy:
     category:
         - docs
     tags:
         - cloud
+        - desktop
+        - clients
         - integration
 visible: true
 page-toc:
     active: false
 ---
 
-## Multiplatform Desktop Clients
+# Desktop clients
+
+## Multiplatform
 - [**Nextcloud** client](multiplatform/desktop-sync-client)
 - [**Thunderbird**](multiplatform/thunderbird-calendar-contacts)
 - [**calcurse** command line client](multiplatform/calcurse-caldav)
@@ -22,6 +26,7 @@ page-toc:
 ## GNU/Linux
 - [**GNOME** desktop integration](gnu-linux/gnome-desktop-integration)
 - [**KDE** desktop integration](gnu-linux/kde-desktop-integration)
+- [Terminal Integration](gnu-linux/terminal-integration)
 
 ## MacOS
 - [**MacOS** device integration](mac-os)
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/01.Nextcloud-app/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/01.Nextcloud-app/docs.en.md
index fe0e3c4b..190c6137 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/01.Nextcloud-app/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/01.Nextcloud-app/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Mobile clients: Nextcloud App
+title: Nextcloud App
 visible: false
 updated:
 page-toc:
@@ -10,6 +10,7 @@ taxonomy:
         - docs
     tags:
         - nextcloud
+        - mobile
         - android
 ---
 
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/02.calendars-contacts-and-tasks/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/02.calendars-contacts-and-tasks/docs.en.md
index 63979df2..4ba401ab 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/02.calendars-contacts-and-tasks/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/02.calendars-contacts-and-tasks/docs.en.md
@@ -1,6 +1,6 @@
 ---
-title: Mobile clients: DAVx⁵ / OpenTasks
-visible: true
+title: DAVx⁵ / OpenTasks
+visible: false
 updated:
 page-toc:
   active: true
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/03.migrating-contacts-from-google/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/03.migrating-contacts-from-google/docs.en.md
index f966661f..06bfa8cf 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/03.migrating-contacts-from-google/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/03.migrating-contacts-from-google/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Mobile clients: Migrating Contacts
+title: Migrating Contacts
 visible: false
 published: true
 updated:
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/04.using-news/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/04.using-news/docs.en.md
index 73f144f1..c18ab085 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/04.using-news/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/04.using-news/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Mobile clients: News App
+title: News App
 visible: false
 updated:
 page-toc:
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/05.using-notes/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/05.using-notes/docs.en.md
index bcafb1f1..7ace62ab 100644
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/05.using-notes/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/05.using-notes/docs.en.md
@@ -1,7 +1,7 @@
 ---
-title: Mobile clients: Notes App
+title: Notes App
 visible: false
-updated: 
+updated:
 page-toc:
   active: true
 published: true
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/docs.en.md
index cfac9829..856385a8 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/01.Android/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: Mobile clients: Android
+title: Android
 published: true
 updated:
 taxonomy:
@@ -14,14 +14,10 @@ page-toc:
      active: false
 ---
 
-# Android Nextcloud Integration
+# Android: Nextcloud clients and integration
 
-The following How-tos will help you integrate **Nextcloud** with your **Android** device.
-
-### [Nextcloud app](nextcloud-app)
-### [Syncing Calendars, Contacts and Tasks](calendars-contacts-and-tasks)
-### [Migrating contacts from Google into Nextcloud](migrating-contacts-from-google)
-### [Syncing News](using-news)
-### [Syncing Notes](using-notes)
-
-![](android.jpg)
+## [Nextcloud app](nextcloud-app)
+## [Syncing Calendars, Contacts and Tasks](calendars-contacts-and-tasks)
+## [Migrating contacts from Google into Nextcloud](migrating-contacts-from-google)
+## [Syncing News](using-news)
+## [Syncing Notes](using-notes)
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/calendar-syncing/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/calendar-syncing/docs.en.md
index e5afd7b8..1b43a174 100644
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/calendar-syncing/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/calendar-syncing/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: 'iOS - Syncing Calendars & Reminders'
+title: 'Syncing Calendars & Reminders'
 updated:
         last_modified: "19 August 2018"
         app: iOS
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/contact-syncing/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/contact-syncing/docs.en.md
index 71150989..4c17da8b 100644
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/contact-syncing/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/contact-syncing/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: 'iOS - Syncing Contacts'
+title: 'Syncing Contacts'
 updated:
         last_modified: "21 august 2018"
         app: iOS
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/docs.en.md
index 177c85a2..56673807 100644
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/02.iOS/docs.en.md
@@ -9,15 +9,12 @@ taxonomy:
         - cloud
         - sync
         - iOS
-visible: false
+visible: true
 page-toc:
      active: false
 ---
 
-# iOS Nextcloud Integration
+# iOS: Nextcloud Integration
 
-Below you can learn how to integrate Nextcloud with your iOS device
-### [Syncing Calendars](calendar-syncing)
-### [Syncing Contacts](contact-syncing)
-
-![](ios.png)
+## [Syncing Calendars](calendar-syncing)
+## [Syncing Contacts](contact-syncing)
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/docs.en.md
index 2cb1ea1a..1d2247c9 100755
--- a/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/02.Mobile/docs.en.md
@@ -1,5 +1,5 @@
 ---
-title: 'Cloud: Mobile Clients'
+title: Mobile
 published: true
 updated:
 taxonomy:
@@ -7,18 +7,18 @@ taxonomy:
         - docs
     tags:
         - cloud
+        - mobile
         - nextcloud
-indexed: true
+indexed: 
 visible: true
 page-toc:
      active: false
 ---
-## Syncing your devices
 
-**Nextcloud** integrates with your device very easily, providing native experience for most devices and operating systems.
+# Mobile Clients
 
-### [Android](android)
+## [Android](android)
 - Nextcloud apps
 
-### [iOS](ios)
+## [iOS](ios)
 - iOS app
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/docs.en.md b/pages/02.tutorials/02.Cloud/05.Clients/docs.en.md
index ae836ebc..8c1834df 100644
--- a/pages/02.tutorials/02.Cloud/05.Clients/docs.en.md
+++ b/pages/02.tutorials/02.Cloud/05.Clients/docs.en.md
@@ -1,12 +1,9 @@
 ---
-title: 'Cloud: Clients'
+title: 'Clients'
 published: true
 visible: true
 indexed: true
 updated:
-        last_modified: "December 2020"
-        app: Nextcloud
-        app_version: 20
 taxonomy:
     category:
         - docs
@@ -18,6 +15,22 @@ page-toc:
   active: false
 ---
 
+# What is a client?
+
+In the context of computing and Information Technologies (IT), a "**client**" is a software program or a computer that interacts with and uses resources of another computer that is called "**server**".
+
+In the guides on this site, we will use the term to refer to the first one, the software.
+
+With a client, you can access some of the **Disroot Cloud** main features (such as email, calendars, contacts, files, tasks, etc) directly from your computer or mobile device.
+
+Since there are many, we will try to cover mainly those that are **Free and Open Source software** and, in our opinion, are the most complete.
+
+Of course, if you use one that is not in these **Howtos** and you consider that it should be, you can collaborate with the community by writting one yourself (see the [How to Contribute](/contribute) section).
+
+---
+
+# Nextcloud Clients
+
 ## [Desktop clients and Integration](desktop)
 - How to setup **Nextcloud** and others sync clients
 - Desktop environments integration on GNU/Linux
diff --git a/pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/thumb.png b/pages/02.tutorials/02.Cloud/05.Clients/thumb.png
similarity index 100%
rename from pages/02.tutorials/02.Cloud/05.Clients/01.Desktop/thumb.png
rename to pages/02.tutorials/02.Cloud/05.Clients/thumb.png
diff --git a/pages/02.tutorials/02.Cloud/docsparent.en.md b/pages/02.tutorials/02.Cloud/docsparent.en.md
index 45b9c34d..fadf3f01 100755
--- a/pages/02.tutorials/02.Cloud/docsparent.en.md
+++ b/pages/02.tutorials/02.Cloud/docsparent.en.md
@@ -3,9 +3,6 @@ title: Cloud
 subtitle: "Basics, settings, syncing, clients"
 icon: fa-cloud
 updated:
-        last_modified: "June 2020"
-        app: Nextcloud
-        app_version: 18
 published: true
 taxonomy:
     category: