diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.en.md
index 5d26f8b7..487a0dfa 100755
--- a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.en.md
+++ b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.en.md
@@ -1,11 +1,11 @@
---
-title: 'Nextcloud: Exporting News'
+title: 'Exporting News feeds'
published: true
indexed: true
updated:
- last_modified: "June 2020"
+ last_modified: "April, 2021"
app: Nextcloud
- app_version: 18
+ app_version: 20
taxonomy:
category:
- docs
@@ -19,16 +19,23 @@ page-toc:
active: false
---
-Exporting your news feeds and your subscriptions is as easy as in case of any **Nextcloud** app.
+# Exporting News feeds
- - Login to the [cloud](https://cloud.disroot.org)
- - Select the **News** app
+Exporting news feeds and subscriptions is a pretty straightforward procedure.
- ![](en/select.gif)
+1. Login to the [cloud](https://cloud.disroot.org)
- - Select Settings on the bottom of the left side-bar.
- - Depending on your needs you can either decided to export:
- - Your subscriptions (OPML) - This is specially useful if you want to change your News feed (RSS reader) provider or if you simply would like to have a backup of current news site list.
- - Unread/Starred articles - If you want to export the article content themselves either for offline use, archive purpose or migration. Note read articles get removed in regular intervals.
+2. Select the **News** app
- ![](en/export.gif)
+![](en/select.gif)
+
+3. Select **Settings** on the bottom of the left side-bar.
+
+![](en/export.gif)
+
+4. Depending on your needs you can either decided to export:
+ - **Your subscriptions (OPML)** - This is specially useful if you want to change your News feed (RSS reader) provider or if you simply would like to have a backup of current news site list.
_[**OPML**](https://en.wikipedia.org/wiki/OPML) is a type of format widely used by existing news feed readers for importing and exporting subscriptions list._
+
+ - **Unread/Starred articles** - This is the option to export the content of the articles themselves, either for offline reading, archiving or migration.
_[**JSON**](https://en.wikipedia.org/wiki/JSON) is a text format for data exchange._
+
+When you click **Export** the browser will ask you where you want to save the file, select a location and finally **Save**.
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.es.md
index dc00a7b1..fa58a4d1 100644
--- a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.es.md
+++ b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.es.md
@@ -1,36 +1,41 @@
---
-title: Nextcloud: Exportando información de Noticias
+title: "Exportar feeds de Noticias"
published: true
indexed: true
updated:
- last_modified: "Julio 2019"
+ last_modified: "Abril, 2021"
app: Nextcloud
- app_version: 15
+ app_version: 20
taxonomy:
category:
- docs
- tags:
- - usuario
- - nube
- - noticias
- - rgdp
+ tags:
+ - usuario
+ - nube
+ - noticias
+ - rgdp
visible: true
page-toc:
active: false
---
-Exportar tus fuentes de noticias y suscripciones es sencillo como en cualquiera de las aplicaciones de **Nextcloud**.
+# Exportar feeds de Noticias
+
+Exportar fuentes de noticias y suscripciones es un procedimiento bastante sencillo.
1. Inicia sesión en la [nube](https://cloud.disroot.org)
2. Selecciona la aplicación **Noticias**
-![](es/select_app.gif)
+![](es/seleccionar_app.gif)
-3. Selecciona Ajustes, abajo a la izquierda, en la barra lateral.
+3. Selecciona **Ajustes**, abajo a la izquierda, en la barra lateral.
-5. Dependiendo de tus necesidades, puedes elegir exportar:
- - Tus suscripciones (OPML): Esto es especialmente útil si quieres cambiar tu proveedor de fuentes de noticias (lector RSS) o simplemente tener un respaldo de la actual lista de sitios de noticias.
- - Artículos Sin leer/Favoritos: Si quieres exportar el contenido mismo del artículo ya sea para leerlo fuera de línea, con el propósito de archivarlo o de migrar. Los artículos leídos son removidos en forma regular.
+![](es/exportar.gif)
-![](es/export.gif)
+4. Dependiendo de tus necesidades, puedes elegir exportar:
+ - **Tus suscripciones (OPML):** Esto es especialmente útil si quieres cambiar tu proveedor de fuentes de noticias (lector RSS) o simplemente tener un respaldo de la actual lista de sitios de noticias.
_[**OPML**](https://es.wikipedia.org/wiki/OPML) es un tipo de formato muy utilizado por los actuales lectores de feeds de noticias para importar y exportar listas de suscripciones._
+
+ - **Artículos Sin leer/Favoritos (JSON):** Esta es la opción para exportar el contenido mismo de los artículos, ya sea para leerlos fuera de línea, para archivarlos o para migrar.
_[**JSON**](https://es.wikipedia.org/wiki/JSON) es un formato de texto para intercambio de datos._
+
+Al hacer click en **Exportar** el navegador te preguntará donde quieres guardar el archivo, selecciona una ubicación y finalmente **Guardar**.
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/export.gif
index caa5c35a..17148cfd 100644
Binary files a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/export.gif and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/export.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/select.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/select.gif
index 50e80ca5..524c09be 100644
Binary files a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/select.gif and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/select.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/export.gif
deleted file mode 100644
index 4aaa21c8..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/export.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/exportar.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/exportar.gif
new file mode 100644
index 00000000..fd08473d
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/exportar.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/seleccionar_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/seleccionar_app.gif
new file mode 100644
index 00000000..1b7950fa
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/seleccionar_app.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/select_app.gif
deleted file mode 100644
index 92aae4a4..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/select_app.gif and /dev/null differ
diff --git a/pages/02.tutorials/04.Chat/04.Gateways/01.IRC/docs.en.md b/pages/02.tutorials/04.Chat/04.Gateways/01.IRC/docs.en.md
new file mode 100644
index 00000000..37359271
--- /dev/null
+++ b/pages/02.tutorials/04.Chat/04.Gateways/01.IRC/docs.en.md
@@ -0,0 +1,83 @@
+---
+title: 'IRC'
+published: true
+visible: true
+indexed: false
+updated:
+ last_modified: March, 2021
+ app: Biboumi
+ app_version: 9.0
+taxonomy:
+ category:
+ - docs
+ tags:
+ - chat
+ - xmpp
+ - irc
+page-toc:
+ active: true
+---
+
+# XMPP to IRC gateway
+
+[**IRC**](https://en.wikipedia.org/wiki/Internet_Relay_Chat) is a real time communication protocol based on text.
+
+**Disroot Chat** allows you to connect to any **IRC** channel, on any server, using your **XMPP** client of choice. This is possible thanks to [**Biboumi**](https://biboumi.louiz.org/), a gateway that connects both protocols and allows access to IRC channels as if they were XMPP rooms. Our gateway is hosted at **irc.disroot.org**
+
+# How does it work?
+## Joining a channel
+To join an **IRC** channel using your **XMPP** client, use the following schema:
+
+`#channelname%irc.network.tld@irc.disroot.org`
+
+For example, to join **#archlinux** channel on the **Freenode IRC** network you need to use the following format:
+
+`#archlinux%irc.freenode.net@irc.disroot.org`
+
+Make sure to provide the correct channel name (**#channel**) and IRC server's address (**irc.network.ltd**).
+**@irc.disroot.org** must remain as it is pointing to our **Biboumi**'s address.
+
+## Private chats (1:1)
+The gateway also allows private chats with IRC users (1 on 1 chat). To start a private chat with a user on IRC, you need to use the following syntax:
+
+`nick%irc.network.tld@irc.disroot.org`
+
+Where **nick** is the username you want to talk to.
+
+## Nicknames
+While on **XMPP** a user can have a different nickname for each room, **IRC** nicknames are server-wide, which means that a user only has one single nickname on all the channels of a server. So, the nickname you choose when joining an IRC channel on a given server will be the same in all other channels that you join on that same server.
+
+Keep in mind that if you change your nickname on an IRC channel, it will be changed on all channels on the same server as well. To have a different nickname in a channel you are about to join, you will need to do it explicitly with the **/nick** command before joining the channel.
+
+For example: `/nick yournickname` (most IRC servers limit the nickname to 9 characters)
+
+# User settings
+IRC settings can be configured at three different levels:
+
+1. Transport Level: `irc.disroot.org`
+2. Network Level: `irc.network.tld@irc.disroot.org`
+3. Channel Level: `#channel%irc.network.tld@irc.disroot.org`
+
+If there are common options across all the levels, priority or over-ride of those settings is set in the following way:
+
+`1. Channel > 2. Network > 3. Transport`
+
+## Short-term / one-shot setup
+
+1. Join chat `#channel%irc.network.tld@irc.disroot.org`, with a chosen nick.
+2. You will get messages from `irc.network.tld@irc.disroot.org`. If your nick is registered, send message `NickServ IDENTIFY password`.
+3. Start chatting in `#channel`.
+
+To setup a **different channel** on the **same network** just repeat steps 1 and 3. To setup a **different channel** but on a **different network** then repeat steps 1 to 3.
+
+## Long-term / recurring setup
+
+1. Add `irc.disroot.org` to your roaster.
+2. Execute ad-hoc command on it, then enable history and persistence.
+3. Add `irc.network.tld@irc.disroot.org` to your roaster.
+4. Execute ad-hoc command on it, then add your username (nick) and password (nick password).
+5. Add `#channel%irc.network.tld@irc.disroot.org` to bookmarks and then join.
+6. Execute ad-hoc command on it, then enable history and persistence.
+7. Start chatting in `#channel`.
+
+To join a **different channel** on the **same network**, repeat steps 5 to 7. But if you want to join a **different channel** on a **different network** then repeat steps 3 to 7.
diff --git a/pages/02.tutorials/04.Chat/04.Gateways/02.Matrix/docs.en.md b/pages/02.tutorials/04.Chat/04.Gateways/02.Matrix/docs.en.md
new file mode 100644
index 00000000..a461f4c7
--- /dev/null
+++ b/pages/02.tutorials/04.Chat/04.Gateways/02.Matrix/docs.en.md
@@ -0,0 +1,32 @@
+---
+title: 'Matrix bridge'
+published: true
+visible: true
+indexed: false
+updated:
+ last_modified: March, 2021
+ app: Bifrost
+ app_version: 0.2.0
+taxonomy:
+ category:
+ - docs
+ tags:
+ - chat
+ - xmpp
+ - matrix
+ - bridge
+page-toc:
+ active: false
+---
+
+# Matrix bridge
+You can connect to any **Matrix** room hosted on any **Matrix** server via **Bifrost Matrix bridge** (_**which is hosted by Matrix.org**_). To join a Matrix room:
+
+`#room#matrix.domain.tld@matrix.org`
+
+Where `#room` is the **Matrix** room you want to join and `matrix.domain.tld` is the **Matrix server address** you want to join. Make sure to leave `@matrix.org` as it is, because it's the **Matrix bridge address**.
+
+!! ### IMPORTANT NOTICE
+!! As it is mentioned in the [**Bifrost**](https://github.com/matrix-org/matrix-bifrost)'s code page:
+!! ###### `This bridge is in very active development currently and intended mainly for experimentation and evaluation purposes`
+!! **So please keep in mind that this "bridge" is unstable and sometimes it can be down**.
diff --git a/pages/02.tutorials/04.Chat/04.Gateways/bridges.png b/pages/02.tutorials/04.Chat/04.Gateways/bridges.png
new file mode 100644
index 00000000..b6181e99
Binary files /dev/null and b/pages/02.tutorials/04.Chat/04.Gateways/bridges.png differ
diff --git a/pages/02.tutorials/04.Chat/04.Gateways/docs.en.md b/pages/02.tutorials/04.Chat/04.Gateways/docs.en.md
new file mode 100644
index 00000000..acdb36b3
--- /dev/null
+++ b/pages/02.tutorials/04.Chat/04.Gateways/docs.en.md
@@ -0,0 +1,29 @@
+---
+title: 'Chat: Gateways and Bridges'
+published: true
+visible: true
+indexed: true
+updated:
+taxonomy:
+ category:
+ - docs
+ tags:
+ - chat
+ - xmpp
+page-toc:
+ active: true
+---
+
+# XMPP: Gateways and bridges
+
+![](bridges.png)
+
+On the internet there are a wide variety of networks co-existing, most of them using different hardware and running different software. One way to enable communication between them is through **gateways** and **bridges**. These allow users on different platforms to communicate with each other regardless of the protocols they use.
+
+Currently, **Disroot Chat** allows interaction with the following protocols:
+
+## [IRC](irc)
+Learn how to use the **IRC** gateway
+
+## [Matrix](matrix)
+Learn how to use the **Matrix** bridge
diff --git a/pages/02.tutorials/04.Chat/04.Gateways/thumb.png b/pages/02.tutorials/04.Chat/04.Gateways/thumb.png
new file mode 100644
index 00000000..e972944f
Binary files /dev/null and b/pages/02.tutorials/04.Chat/04.Gateways/thumb.png differ
diff --git a/pages/02.tutorials/04.Chat/04.Transports/01.IRC/docs.en.md b/pages/02.tutorials/04.Chat/04.Transports/01.IRC/docs.en.md
deleted file mode 100644
index 0d6a4e6b..00000000
--- a/pages/02.tutorials/04.Chat/04.Transports/01.IRC/docs.en.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-title: 'Chat Transports: IRC'
-published: true
-visible: true
-indexed: true
-updated:
- app: Biboumi
- app_version: 9.0
-taxonomy:
- category:
- - docs
- tags:
- - chat
- - xmpp
-page-toc:
- active: true
----
-
-# XMPP <-> IRC
-
-Disroot Chat provides [Biboumi](https://biboumi.louiz.org/), an IRC transport for XMPP, at irc.disroot.org.
-
-## SYNTAX
-
-The syntax for connecting to IRC channel is:
-
-`#channel%irc.network.tld@irc.disroot.org`
-
-The syntax for connecting to IRC user is:
-
-`nick%irc.network.tld@irc.disroot.org`
-
-## SETTINGS
-
-Settings can be configured at three different levels, by executing ad-hoc commands on respective items:
-
-1. IRC-Transport Level: `irc.disroot.org`
-2. IRC-Network Level: `irc.network.tld@irc.disroot.org`
-3. IRC-Channel Level: `#channel%irc.network.tld@irc.disroot.org`
-
-If there are common options across all the levels, priority or over-ride of those settings happens in the order of [3] > [2] > [1].
-
-## STEPS
-
-### For short-term/one-shot
-
-1. Join chat `#channel%irc.network.tld@irc.disroot.org`, with a chosen nick.
-2. You'll get messages from `irc.network.tld@irc.disroot.org`. If your nick is registered, send message `NickServ IDENTIFY password`.
-3. Start chatting in `#channel`.
-
-Repeat 1 and 3, for different channel on same network.
-
-Repeat 1 to 3, for different channel on different network.
-
-### For long-term/recurring
-
-1. Add `irc.disroot.org` to your roster.
-2. Execute ad-hoc command on it, then enable history and persistence.
-3. Add `irc.network.tld@irc.disroot.org` to your roster.
-4. Execute ad-hoc command on it, then add your username (nick) and password (nick password).
-5. Add `#channel%irc.network.tld@irc.disroot.org` to bookmarks and then join.
-6. Execute ad-hoc command on it, then enable history and persistence.
-7. Start chatting in `#channel`.
-
-Repeat 5 to 7, if joining different channel on same network.
-
-Repeat 3 to 7, if joining different channel on different network.
-
-## CLIENTS
-
-Any client can be used, although only following clients are known to support ad-hoc commands.
-
-### Gajim
-
-1. Right-click on the roster element.
-2. Click 'Execute Command'.
-3. Follow the options.
diff --git a/pages/02.tutorials/04.Chat/04.Transports/docs.en.md b/pages/02.tutorials/04.Chat/04.Transports/docs.en.md
deleted file mode 100644
index abfb5430..00000000
--- a/pages/02.tutorials/04.Chat/04.Transports/docs.en.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: 'Chat: Transports'
-published: true
-visible: true
-indexed: true
-updated:
-taxonomy:
- category:
- - docs
- tags:
- - chat
- - xmpp
-page-toc:
- active: true
----
-
-# XMPP Transports
-
-In XMPP realm, transports are the means to connect to different protocols.
-
-Currently, Disroot Chat provides following transports:
-
-1. [IRC](https://howto.disroot.org/en/tutorials/chat/transports/irc)