diff --git a/pages/01.home/_services1/services.en.md b/pages/01.home/_services1/services.en.md
index 7e140356..7339e903 100644
--- a/pages/01.home/_services1/services.en.md
+++ b/pages/01.home/_services1/services.en.md
@@ -3,7 +3,7 @@ title: Services
section_id: services
bgcolor: '#FFF'
bg_img: tent.jpg
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
services:
-
diff --git a/pages/01.home/_services1/services.es.md b/pages/01.home/_services1/services.es.md
index 6df42c84..522782ba 100644
--- a/pages/01.home/_services1/services.es.md
+++ b/pages/01.home/_services1/services.es.md
@@ -3,7 +3,7 @@ title: Servicios
section_id: services
bgcolor: '#FFF'
bg_img: tent.jpg
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
services:
-
diff --git a/pages/01.home/_services1/services.fr.md b/pages/01.home/_services1/services.fr.md
index 2fcabeee..ae29464b 100644
--- a/pages/01.home/_services1/services.fr.md
+++ b/pages/01.home/_services1/services.fr.md
@@ -3,7 +3,7 @@ title: Services
section_id: services
bgcolor: '#FFF'
bg_img: tent.jpg
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
services:
-
diff --git a/pages/01.home/_services1/services.it.md b/pages/01.home/_services1/services.it.md
index 12ecf4da..3e43749f 100644
--- a/pages/01.home/_services1/services.it.md
+++ b/pages/01.home/_services1/services.it.md
@@ -3,7 +3,7 @@ title: Services
section_id: services
bgcolor: '#FFF'
bg_img: tent.jpg
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
services:
-
diff --git a/pages/02.about/_federation/2col-right.en.md b/pages/02.about/_federation/2col-right.en.md
index fe3e8a5c..aa73098f 100644
--- a/pages/02.about/_federation/2col-right.en.md
+++ b/pages/02.about/_federation/2col-right.en.md
@@ -1,14 +1,18 @@
---
title: Federation and Decentralization
-fontcolor: '#000000'
+fontcolor: '#555'
---
# Federation and Decentralization
+
+
![](about-organize.jpg)
---
+
+
Most internet services are run from centralized point owned and run by corporations. These store private data of their users and analyze it using advanced algorithms in order to create accurate profiles of their 'users'. This information is often used to exploit the people for the sake of advertisers. Information can also be obtained by governmental institutions or by malicious hackers. Data can be removed without warning due to dubious reasons or regional censorship policies.
A decentralized service can reside on multiple machines, owned by different individuals, companies or organization. With federation protocols those instances can interact and form one network of many nodes (= servers hosting similar services). One might be able to shut down one node but never the entire network. In such a setup censorship is practically impossible.
diff --git a/pages/02.about/_federation/2col-right.es.md b/pages/02.about/_federation/2col-right.es.md
index 4352c70a..a66a596f 100644
--- a/pages/02.about/_federation/2col-right.es.md
+++ b/pages/02.about/_federation/2col-right.es.md
@@ -1,14 +1,18 @@
---
title: Federation and Decentralization
-fontcolor: '#000000'
+fontcolor: '#555'
---
# Federación y Descentralización
+
+
![](about-organize_es.jpg)
---
+
+
La mayoría de los servicios de internet funcionan desde un punto centralizado, controlado y operado por corporaciones. Éstas almacenan información privada de sus usuarios y la analizan utilizando algoritmos avanzados con el fin de crear perfiles precisos de sus 'usuarios'. Esta información es usada habitualmente para aprovecharse de la gente en beneficio de los anunciantes. Son datos que también pueden obtener instituciones gubernamentales o hackers malintencionados. La información incluso puede ser quitada sin aviso, por razones dudosas o políticas regionales de censura.
Un servicio descentralizado puede residir en varias máquinas, propiedad de diferentes individuos, compañías u organizaciones. Con protocolos de federación, esas instancias pueden interactuar y formar una red de muchos nodos (servidores que hospedan servicios similares). Uno podría dar de baja un nodo pero nunca la red entera. Con este tipo de organización, la censura es prácticamente imposible.
diff --git a/pages/02.about/_federation/2col-right.fr.md b/pages/02.about/_federation/2col-right.fr.md
index fe2e1bfc..3ace6326 100644
--- a/pages/02.about/_federation/2col-right.fr.md
+++ b/pages/02.about/_federation/2col-right.fr.md
@@ -1,14 +1,18 @@
---
title: Federation and Decentralization
-fontcolor: '#000000'
+fontcolor: '#555'
---
# Fédération et décentralisation
+
+
![](about-organize.jpg)
---
+
+
La plupart des services Internet sont gérés à partir de points centralisés appartenant à des entreprises et gérés par celles-ci. Ces derniers stockent les données privées de leurs utilisateurs et les analysent à l'aide d'algorithmes avancés afin de créer des profils précis de leurs "utilisateurs". Ces informations sont souvent utilisées pour exploiter les personnes dans l'intérêt des annonceurs. Les informations peuvent également être obtenues par des institutions gouvernementales ou par des pirates informatiques malveillants. Les données peuvent être supprimées sans avertissement pour des raisons douteuses ou en raison de politiques régionales de censure.
Un service décentralisé peut résider sur plusieurs machines, appartenant à différentes personnes, entreprises ou organisations. Avec les protocoles de fédération, ces instances peuvent interagir et former un réseau de plusieurs nœuds (= serveurs hébergeant des services similaires). On peut être capable d'arrêter un nœud mais jamais tout le réseau. Dans une telle installation, la censure est pratiquement impossible.
diff --git a/pages/02.about/_federation/2col-right.it.md b/pages/02.about/_federation/2col-right.it.md
index 5ec831ea..5d619ced 100644
--- a/pages/02.about/_federation/2col-right.it.md
+++ b/pages/02.about/_federation/2col-right.it.md
@@ -1,12 +1,18 @@
---
title: Federation and Decentralization
-fontcolor: '#000000'
+fontcolor: '#555'
---
# Federazione e decentralizzazione
+
+
+![](about-organize.jpg)
+
---
+
+
La maggior parte dei servizi internet sono gestiti da un punto centralizzato di proprietà e gestiti da società. Questi memorizzano i dati privati dei loro utenti e li analizzano utilizzando algoritmi avanzati per creare profili accurati dei loro "utenti". Queste informazioni sono spesso utilizzate per sfruttare le persone per il bene degli inserzionisti. Le informazioni possono anche essere ottenute da istituzioni governative o da malintenzionati. I dati possono essere rimossi senza preavviso a causa di dubbi motivi o politiche regionali di censura.
Un servizio decentralizzato può risiedere su più macchine, di proprietà di persone, aziende o organizzazioni diverse. Con i protocolli di federazione queste istanze possono interagire e formare una rete di molti nodi (= server che ospitano servizi simili). Si potrebbe essere in grado di spegnere un nodo ma mai l'intera rete. In una tale configurazione la censura è praticamente impossibile.
diff --git a/pages/02.about/_privacy/2col-left.en.md b/pages/02.about/_privacy/2col-left.en.md
index ce77d075..5bd0354f 100644
--- a/pages/02.about/_privacy/2col-left.en.md
+++ b/pages/02.about/_privacy/2col-left.en.md
@@ -1,7 +1,10 @@
---
title: privacy
+fontcolor: '#555'
---
+
+
Software can be created and shaped into anything. Every button, every color and every link that we see and use on the web was put there by someone. When we use the applications provided for us, we mostly don't see - and sometimes don't care about - much of what happens behind the interface we use. We connect with other people, we store our files, organize meetings and festivals, send emails or chat for hours and it all happens magically.
In the last few decades information has become very valuable and more and more easy to collect and process. We are accustomed to being analyzed, blindly accepting terms and conditions for "our own good", trusting authorities and multi-billion dollar companies to protect our interest, while all along we are the product in their 'people farms'.
diff --git a/pages/02.about/_privacy/2col-left.es.md b/pages/02.about/_privacy/2col-left.es.md
index 023b0a85..a5285888 100644
--- a/pages/02.about/_privacy/2col-left.es.md
+++ b/pages/02.about/_privacy/2col-left.es.md
@@ -1,7 +1,10 @@
---
title: privacy
+fontcolor: '#555'
---
+
+
El software puede ser creado y darle cualquier forma. Cada botón, cada color y cada enlace que vemos y utilizamos en la web fue puesto ahí por alguien. Cuando hacemos uso de las aplicaciones que nos ofrecen, generalmente no vemos - y a veces no nos interesa - mucho de lo que ocurre detrás de la interfaz que utilizamos. Nos conectamos con otra gente, almacenamos nuestros archivos, organizamos reuniones y festivales, enviamos correos o chateamos durante horas y todo sucede mágicamente.
En las últimas décadas la información se ha vuelto muy valiosa y más y más sencilla de recopilar y procesar. Estamos acostumbrados a ser analizados, aceptando ciegamente términos y condiciones por "nuestro propio bien", confiando en autoridades y compañías multimillonarias para que protejan nuestros intereses, mientras todo el tiempo somos el producto en sus 'granjas de personas'.
diff --git a/pages/02.about/_privacy/2col-left.fr.md b/pages/02.about/_privacy/2col-left.fr.md
index c3b69d3b..442bba2b 100644
--- a/pages/02.about/_privacy/2col-left.fr.md
+++ b/pages/02.about/_privacy/2col-left.fr.md
@@ -1,7 +1,10 @@
---
title: privacy
+fontcolor: '#555'
---
+
+
Les logiciels peuvent être créés et transformés en n'importe quoi. Tous les boutons, toutes les couleurs et tous les liens que nous voyons et utilisons sur le web y ont été placés par quelqu'un. Lorsque nous utilisons les applications qui nous sont fournies, nous ne voyons généralement pas - et parfois nous nous en fichons - beaucoup ce qui se passe derrière l'interface que nous utilisons. Nous communiquons avec d'autres personnes, nous stockons nos dossiers, organisons des réunions et des festivals, envoyons des courriels ou discutons pendant des heures et tout cela se passe comme par magie.
Au cours des dernières décennies, l'information est devenue très précieuse et de plus en plus facile à recueillir et à traiter. Nous avons l'habitude d'être analysés, acceptant aveuglément les termes et conditions pour "notre propre bien", faisant confiance aux autorités et à des entreprises de plusieurs milliards de dollars pour protéger nos intérêts, alors que nous sommes toujours le produit dans leurs "fermes de gens".
diff --git a/pages/02.about/_privacy/2col-left.it.md b/pages/02.about/_privacy/2col-left.it.md
index 7a66d643..75782a64 100644
--- a/pages/02.about/_privacy/2col-left.it.md
+++ b/pages/02.about/_privacy/2col-left.it.md
@@ -1,7 +1,10 @@
---
title: privacy
+fontcolor: '#555'
---
+
+
Il software può essere creato e modellato in qualsiasi cosa. Ogni pulsante, ogni colore e ogni link che vediamo e usiamo sul web è stato messo lì da qualcuno. Quando usiamo le applicazioni che ci vengono fornite, in genere non vediamo - e a volte non ci interessa - molto di ciò che accade dietro l'interfaccia che usiamo. Ci mettiamo in contatto con altre persone, conserviamo i nostri file, organizziamo incontri e festival, mandiamo e-mail o chiacchieriamo per ore e tutto questo accade per magia.
Negli ultimi decenni le informazioni sono diventate molto preziose e sempre più facili da raccogliere ed elaborare. Siamo abituati ad essere analizzati, accettando ciecamente termini e condizioni per "il nostro bene", confidando nelle autorità e nelle aziende multimiliardarie per proteggere i nostri interessi, mentre noi siamo sempre il prodotto nelle loro " fattorie della gente".
diff --git a/pages/02.about/_transparency/2col-right.en.md b/pages/02.about/_transparency/2col-right.en.md
index 08084ae9..959962b9 100644
--- a/pages/02.about/_transparency/2col-right.en.md
+++ b/pages/02.about/_transparency/2col-right.en.md
@@ -1,6 +1,6 @@
---
title: Transparency
-fontcolor: '#000000'
+fontcolor: '#555'
---
# Transparency and openness
diff --git a/pages/02.about/_transparency/2col-right.es.md b/pages/02.about/_transparency/2col-right.es.md
index 370a97c1..c0cec9ca 100644
--- a/pages/02.about/_transparency/2col-right.es.md
+++ b/pages/02.about/_transparency/2col-right.es.md
@@ -1,6 +1,6 @@
---
title: Transparency
-fontcolor: '#000000'
+fontcolor: '#555'
---
# Transparencia y sinceridad
diff --git a/pages/02.about/_transparency/2col-right.fr.md b/pages/02.about/_transparency/2col-right.fr.md
index 53e05f96..4b4d0693 100644
--- a/pages/02.about/_transparency/2col-right.fr.md
+++ b/pages/02.about/_transparency/2col-right.fr.md
@@ -1,6 +1,6 @@
---
title: Transparency
-fontcolor: '#000000'
+fontcolor: '#555'
---
# Transparence et ouverture
diff --git a/pages/02.about/_transparency/2col-right.it.md b/pages/02.about/_transparency/2col-right.it.md
index c05380d5..96471446 100644
--- a/pages/02.about/_transparency/2col-right.it.md
+++ b/pages/02.about/_transparency/2col-right.it.md
@@ -1,6 +1,6 @@
---
title: Transparency
-fontcolor: '#000000'
+fontcolor: '#555'
---
# Trasparenza e apertura
diff --git a/pages/03.services/02.email/_email-alias/2col-right.en.md b/pages/03.services/02.email/_email-alias/2col-right.en.md
index 7d7c6df3..4817dd18 100644
--- a/pages/03.services/02.email/_email-alias/2col-right.en.md
+++ b/pages/03.services/02.email/_email-alias/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Email Alias'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Email Aliases and Domain Linking
@@ -11,6 +11,8 @@ fontcolor: '#7A7A7A'
---
+
+
Aliases are now available for our regular supporters. By regular supporters we think of those who contribute the equivalent of at least one cup of coffee a month.
It is not that we are promoting coffee, on the contrary - coffee is actually quite the symbol for [exploitation](http://thesourcefilm.com/) and [inequality](http://www.foodispower.org/coffee/) so we thought that it is a good way to let people measure themselves how much they can give.
We found this [list](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) of coffee cup prices around the world, it might not be very accurate, but it gives a good indication of the different fares.
diff --git a/pages/03.services/02.email/_email-alias/2col-right.es.md b/pages/03.services/02.email/_email-alias/2col-right.es.md
index 3a10181b..5ddd71cd 100644
--- a/pages/03.services/02.email/_email-alias/2col-right.es.md
+++ b/pages/03.services/02.email/_email-alias/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Email Alias'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Alias de correo y Vinculación de Dominios
@@ -11,6 +11,8 @@ fontcolor: '#7A7A7A'
---
+
+
Los Alias están ahora disponibles para nuestros aportantes habituales. Con "aportantes habituales" pensamos en aquellos que contribuyen con el equivalente a, por lo menos, una taza de café al mes.
No es que estemos promoviendo el café, al contrario, el café es en realidad un símbolo de la [explotación](http://thesourcefilm.com/) y la [inequidad](http://www.foodispower.org/coffee/), pero pensamos que lo mejor es dejar a la gente mensurar por sí mismos cuánto pueden dar.
Encontramos esta [lista](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) de precios de tazas de café alrededor del mundo, podría no ser muy precisa, pero da un buen indicio de los direfentes costos.
diff --git a/pages/03.services/02.email/_email-alias/2col-right.fr.md b/pages/03.services/02.email/_email-alias/2col-right.fr.md
index 303c2902..4b457663 100644
--- a/pages/03.services/02.email/_email-alias/2col-right.fr.md
+++ b/pages/03.services/02.email/_email-alias/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: "Alias d'email"
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Alias d'email et liaison de domaine
@@ -11,6 +11,8 @@ fontcolor: '#7A7A7A'
---
+
+
Des alias sont maintenant disponibles pour nos contributeurs réguliers. Par contributeurs réguliers, nous pensons à ceux qui contribuent l'équivalent d'au moins une tasse de café par mois.
Ce n'est pas que nous faisons la promotion du café, bien au contraire - le café est en fait tout à fait le symbole de [l'exploitation](http://thesourcefilm.com/) et de [l'inégalité](http://www.foodispower.org/coffee/) donc nous avons pensé que c'était une bonne façon de laisser les gens mesurer eux-mêmes combien ils peuvent donner.
Nous avons trouvé cette [liste](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) des prix des tasses de café à travers le monde, elle n'est peut-être pas très précise, mais cela donne une bonne indication des différents tarifs.
diff --git a/pages/03.services/02.email/_email-alias/2col-right.it.md b/pages/03.services/02.email/_email-alias/2col-right.it.md
index 1db7e69c..471e5748 100644
--- a/pages/03.services/02.email/_email-alias/2col-right.it.md
+++ b/pages/03.services/02.email/_email-alias/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Email Alias'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Email Alias e collegamento a domini
@@ -11,6 +11,8 @@ fontcolor: '#7A7A7A'
---
+
+
Gli alias sono disponbili per gli utenti regolari. Con regolari si intende coloro che contribuiscono l'equivalente di almeno una tazza di caffé al mese.
Non stiamo promuovendo il caffé, al contrario, il caffé simbolizza [lo sfruttamento](http://thesourcefilm.com/) e l'[inuguaglianza](http://www.foodispower.org/coffee/), crediamo però che sia un buon modo di permettere agli utenti di regolarsi nel contributo a **Disroot**.
diff --git a/pages/03.services/02.email/_email-clients/2col-left.en.md b/pages/03.services/02.email/_email-clients/2col-left.en.md
index 1f87d985..b94cf078 100644
--- a/pages/03.services/02.email/_email-clients/2col-left.en.md
+++ b/pages/03.services/02.email/_email-clients/2col-left.en.md
@@ -1,7 +1,7 @@
---
title: 'Email Clients'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/02.email/_email-clients/2col-left.es.md b/pages/03.services/02.email/_email-clients/2col-left.es.md
index 67d7ce02..7fda7484 100644
--- a/pages/03.services/02.email/_email-clients/2col-left.es.md
+++ b/pages/03.services/02.email/_email-clients/2col-left.es.md
@@ -1,10 +1,12 @@
---
title: 'Clientes de Correo'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
+
+
La mejor experiencia con el correo electrónico es a través de los, en cierta manera, olvidados clientes de correo nativos. Hay un montón de clientes de Correo para el escritorio y dispositivos móviles, y utilizarlos es, habitualmente, mucho más práctico que iniciar sesión cada vez en el cliente web.
Debajo sólo mencionamos algunos, pero la misma configuración aplica para la mayoría de los clientes de correo que hay:
diff --git a/pages/03.services/02.email/_email-clients/2col-left.fr.md b/pages/03.services/02.email/_email-clients/2col-left.fr.md
index e2be3bdd..7263b75d 100644
--- a/pages/03.services/02.email/_email-clients/2col-left.fr.md
+++ b/pages/03.services/02.email/_email-clients/2col-left.fr.md
@@ -1,10 +1,12 @@
---
title: "Clients d'email"
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
+
+
La meilleure expérience email est par le biais de clients de messagerie natifs quelque peu oubliés. Il y a beaucoup de clients e-mail pour les PC ou les appareils mobiles, l'utilisation de ceux-ci est généralement beaucoup plus pratique que de se connecter au client Web à chaque fois.
Ci-dessous, nous n'en mentionnons que quelques-uns, mais une configuration similaire s'applique à la plupart des clients de messagerie:
diff --git a/pages/03.services/02.email/_email-clients/2col-left.it.md b/pages/03.services/02.email/_email-clients/2col-left.it.md
index c184e45e..d96a1b5e 100644
--- a/pages/03.services/02.email/_email-clients/2col-left.it.md
+++ b/pages/03.services/02.email/_email-clients/2col-left.it.md
@@ -1,10 +1,12 @@
---
title: 'Client di posta elettronica'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
+
+
Il miglior modo per utilizzare il servizio di posta elettronica è attraverso un client. Esistono svariati client di posta elettronica sia per dispositivi desktop sia per dispositivi mobili.
Di seguito menzioniamo quelli più comuni, ma ne esistono molti altri la cui configurazione è solitamente simile:
diff --git a/pages/03.services/02.email/_email-settings/fullbar.en.md b/pages/03.services/02.email/_email-settings/fullbar.en.md
index 1702a23e..ad2e630f 100644
--- a/pages/03.services/02.email/_email-settings/fullbar.en.md
+++ b/pages/03.services/02.email/_email-settings/fullbar.en.md
@@ -5,10 +5,12 @@ fontcolor: '#FFF'
text_align: center
---
-### IMAP: disroot.org | SSL Port 993 | Authentication: Normal Password
-### SMTP: disroot.org | STARTTLS Port 587 | Authentication: Normal Password
-### SMTPS: disroot.org | TLS Port 465 | Authentication: Normal Password
-### POP: disroot.org | SSL Port 995 | Authentication: Normal Password
+##### IMAP: disroot.org | SSL Port 993 | Authentication: Normal Password
+##### SMTP: disroot.org | STARTTLS Port 587 | Authentication: Normal Password
+##### SMTPS: disroot.org | TLS Port 465 | Authentication: Normal Password
+##### POP: disroot.org | SSL Port 995 | Authentication: Normal Password
+
+---
**Mailbox size limit:** 1GB
diff --git a/pages/03.services/02.email/_email-settings/fullbar.es.md b/pages/03.services/02.email/_email-settings/fullbar.es.md
index f40b5b16..74d56ef3 100644
--- a/pages/03.services/02.email/_email-settings/fullbar.es.md
+++ b/pages/03.services/02.email/_email-settings/fullbar.es.md
@@ -5,10 +5,12 @@ fontcolor: '#FFF'
text_align: center
---
-### IMAP: disroot.org | SSL Puerto 993 | Autenticación: Contraseña normal
-### SMTP: disroot.org | STARTTLS Puerto 587 | Autenticación: Contraseña normal
-### SMTPS: disroot.org | TLS Puerto 465 | Autenticación: Contraseña normal
-### POP: disroot.org | SSL Puerto 995 | Autenticación: Contraseña normal
+##### IMAP: disroot.org | SSL Puerto 993 | Autenticación: Contraseña normal
+##### SMTP: disroot.org | STARTTLS Puerto 587 | Autenticación: Contraseña normal
+##### SMTPS: disroot.org | TLS Puerto 465 | Autenticación: Contraseña normal
+##### POP: disroot.org | SSL Puerto 995 | Autenticación: Contraseña normal
+
+---
**Tamaño máximo de la casilla de correo:** 1GB
diff --git a/pages/03.services/02.email/_email-settings/fullbar.fr.md b/pages/03.services/02.email/_email-settings/fullbar.fr.md
index 07b1e614..0aed04e8 100644
--- a/pages/03.services/02.email/_email-settings/fullbar.fr.md
+++ b/pages/03.services/02.email/_email-settings/fullbar.fr.md
@@ -5,10 +5,12 @@ fontcolor: '#FFF'
text_align: center
---
-### IMAP: disroot.org | SSL Port 993 | Authentication: Mot de passe normal
-### SMTP: disroot.org | STARTTLS Port 587 | Authentication: Mot de passe normal
-### SMTPS: disroot.org | TLS Port 465 | Authentication: Mot de passe normal
-### POP: disroot.org | SSL Port 995 | Authentication: Mot de passe normal
+##### IMAP: disroot.org | SSL Port 993 | Authentication: Mot de passe normal
+##### SMTP: disroot.org | STARTTLS Port 587 | Authentication: Mot de passe normal
+####3 SMTPS: disroot.org | TLS Port 465 | Authentication: Mot de passe normal
+##### POP: disroot.org | SSL Port 995 | Authentication: Mot de passe normal
+
+---
**Taille de la boîte mail:** 1GB
diff --git a/pages/03.services/02.email/_email-settings/fullbar.it.md b/pages/03.services/02.email/_email-settings/fullbar.it.md
index b104cced..67a9bf0d 100644
--- a/pages/03.services/02.email/_email-settings/fullbar.it.md
+++ b/pages/03.services/02.email/_email-settings/fullbar.it.md
@@ -5,10 +5,12 @@ fontcolor: '#FFF'
text_align: center
---
-### IMAP: disroot.org | SSL Porta 993 | Autentificazione: Normal Password
-### SMTP: disroot.org | STARTTLS Porta 587 | Autentificazione: Normal Password
-### SMTPS: disroot.org | TLS Porta 465 | Autentificazione: Normal Password
-### POP: disroot.org | SSL Porta 995 | Autentificazione: Normal Password
+##### IMAP: disroot.org | SSL Porta 993 | Autentificazione: Normal Password
+##### SMTP: disroot.org | STARTTLS Porta 587 | Autentificazione: Normal Password
+##### SMTPS: disroot.org | TLS Porta 465 | Autentificazione: Normal Password
+##### POP: disroot.org | SSL Porta 995 | Autentificazione: Normal Password
+
+---
**Limite Mailbox:** 2GB
diff --git a/pages/03.services/02.email/_email-webmail/2col-right.en.md b/pages/03.services/02.email/_email-webmail/2col-right.en.md
index cc88ecac..c8df27d4 100644
--- a/pages/03.services/02.email/_email-webmail/2col-right.en.md
+++ b/pages/03.services/02.email/_email-webmail/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Email Webmail'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Webmail
@@ -10,6 +10,8 @@ fontcolor: '#7A7A7A'
---
+
+
RainLoop is a modern approach to web-mail. Looking fresh and simple, yet provides you with most of the features one could expect from web-mail:
Themes: Select your background picture.
diff --git a/pages/03.services/02.email/_email-webmail/2col-right.es.md b/pages/03.services/02.email/_email-webmail/2col-right.es.md
index 97f70020..96019eb8 100644
--- a/pages/03.services/02.email/_email-webmail/2col-right.es.md
+++ b/pages/03.services/02.email/_email-webmail/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Webmail'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Webmail
@@ -10,6 +10,8 @@ fontcolor: '#7A7A7A'
---
+
+
RainLoop es una moderna aproximación al webmail. De aspecto actual y sencillo, te proporciona la mayoría de las características que uno podría esperar del correo web:
Temas: Selecciona tu imagen de fondo.
diff --git a/pages/03.services/02.email/_email-webmail/2col-right.fr.md b/pages/03.services/02.email/_email-webmail/2col-right.fr.md
index 88a978b1..2f4812a4 100644
--- a/pages/03.services/02.email/_email-webmail/2col-right.fr.md
+++ b/pages/03.services/02.email/_email-webmail/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'Messagerie Web'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## messagerie Web:
@@ -10,6 +10,8 @@ fontcolor: '#7A7A7A'
---
+
+
RainLoop est une approche moderne de la messagerie Web. Cela a l'air nouveau et simple, mais cela vous offre la plupart des fonctionnalités que l'on peut attendre de la messagerie Web:
Thèmes: Sélectionnez votre photo de fond.
diff --git a/pages/03.services/02.email/_email-webmail/2col-right.it.md b/pages/03.services/02.email/_email-webmail/2col-right.it.md
index b766f92d..3c406ba6 100644
--- a/pages/03.services/02.email/_email-webmail/2col-right.it.md
+++ b/pages/03.services/02.email/_email-webmail/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Webmail'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Webmail
@@ -10,6 +10,8 @@ fontcolor: '#7A7A7A'
---
+
+
RainLoop è una webmail moderna dall'aspetto semplice ma che offre tutte le impostazioni e le configurazioni che ci si può aspettare da un servizio di posta moderno:
Temi: Possibilità di scegliere tra vari sfondi.
diff --git a/pages/03.services/02.email/_email/2col-right.en.md b/pages/03.services/02.email/_email/2col-right.en.md
index 8fb320f8..0701aa04 100644
--- a/pages/03.services/02.email/_email/2col-right.en.md
+++ b/pages/03.services/02.email/_email/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: Email
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/02.email/_email/2col-right.es.md b/pages/03.services/02.email/_email/2col-right.es.md
index be353fae..3bf0aff9 100644
--- a/pages/03.services/02.email/_email/2col-right.es.md
+++ b/pages/03.services/02.email/_email/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: Correo
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/02.email/_email/2col-right.fr.md b/pages/03.services/02.email/_email/2col-right.fr.md
index c4f6fdb0..9303e6f4 100644
--- a/pages/03.services/02.email/_email/2col-right.fr.md
+++ b/pages/03.services/02.email/_email/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: Email
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/02.email/_email/2col-right.it.md b/pages/03.services/02.email/_email/2col-right.it.md
index 736b71e2..90c0e5f8 100644
--- a/pages/03.services/02.email/_email/2col-right.it.md
+++ b/pages/03.services/02.email/_email/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: Email
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.en.md b/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.en.md
index 616f5a18..7bc53ef0 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Nextcloud bookmarks'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/Bookmarks.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.es.md b/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.es.md
index 8d89eb8f..dca6ea81 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Marcadores Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/Bookmarks.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.fr.md b/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.fr.md
index 4ecf8c3f..657c6a31 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'Signets Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/Bookmarks.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.it.md b/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.it.md
index daf6adae..c0ab8694 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-bookmarks/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'I segnalibri di Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/Bookmarks.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.en.md b/pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.en.md
index ad653943..ed47dd80 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Calendars and Contacts'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/nextcloud-cal.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.it.md b/pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.it.md
index 53b4ff37..a19dc4cc 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Calendari e contatti'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/nextcloud-cal.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.en.md b/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.en.md
index 8228dcd8..fcf11119 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Nextcloud Checksum'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/checksum.gif)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.es.md b/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.es.md
index 598ad53a..670bd2dd 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Suma de verificación Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/checksum.gif)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.fr.md b/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.fr.md
index 3f87a4e0..eb3e4832 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'Somme de contrôle Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/checksum.gif)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.it.md b/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.it.md
index 1e8291ba..563b6079 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-checksum/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Nextcloud Checksum'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/checksum.gif)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.en.md b/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.en.md
index 0fefdfb6..f4349bcc 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'End to End'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/endtoend-android-nw.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.es.md b/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.es.md
index d6613d66..e95f7783 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Extremo a Extremo'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/endtoend-android-nw.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.fr.md b/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.fr.md
index 2d9a434d..a0840585 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'De bout en bout'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/endtoend-android-nw.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.it.md b/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.it.md
index c1e2a83e..04fe18e0 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-e2e/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'End to End'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/endtoend-android-nw.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.en.md b/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.en.md
index 17786e31..4a1243d5 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Nextcloud Encryption'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.es.md b/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.es.md
index bec0a96e..8031de7a 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Cifrado Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.fr.md b/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.fr.md
index dd5abba1..3c70dd56 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'Chiffrement Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.it.md b/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.it.md
index 07e56141..30bf9d19 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-encryption/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Crittografia su Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.en.md b/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.en.md
index aa2d2c5a..0da9afef 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.en.md
@@ -1,7 +1,7 @@
---
title: 'Nextcloud Federation'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Federation
diff --git a/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.es.md b/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.es.md
index b225db1d..bbdb00ba 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.es.md
@@ -1,7 +1,7 @@
---
title: 'Federación Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Federación
diff --git a/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.fr.md b/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.fr.md
index 8b4ab401..467d732c 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.fr.md
@@ -1,7 +1,7 @@
---
title: 'Fédération Nextcloud '
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Fédération
diff --git a/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.it.md b/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.it.md
index 973e25ad..fc608d18 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-federation/2col-left.it.md
@@ -1,7 +1,7 @@
---
title: 'Federazione di Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Federazione
diff --git a/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.en.md b/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.en.md
index 7e82f8e6..7256130a 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.en.md
@@ -1,7 +1,7 @@
---
title: 'Nextcloud Notes'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Notes
diff --git a/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.es.md b/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.es.md
index fcd7e080..d8f003ba 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.es.md
@@ -1,7 +1,7 @@
---
title: 'Notas Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Notas
diff --git a/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.fr.md b/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.fr.md
index bcb16a33..1aa8919b 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.fr.md
@@ -1,7 +1,7 @@
---
title: 'Notes Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Notes
diff --git a/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.it.md b/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.it.md
index 39e7fb36..815635d5 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-notes/2col-left.it.md
@@ -1,7 +1,7 @@
---
title: 'Le note di Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Note
diff --git a/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.en.md b/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.en.md
index 13abb575..cc772fa2 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Nextcloud Sync'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/nextcloud-files.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.es.md b/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.es.md
index e8134599..ed865016 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Sincronización Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/nextcloud-files.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.fr.md b/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.fr.md
index 7f6847b4..45798cb3 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'Synchronisation Nextcloud'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/nextcloud-files.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.it.md b/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.it.md
index 13c2971d..6c3c71cc 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-sync/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Nextcloud Sync'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/nextcloud-files.png?lightbox=1024)
diff --git a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.en.md b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.en.md
index e40eed67..967136a1 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.en.md
@@ -1,7 +1,7 @@
---
title: 'Extra Cloud Storage'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Extra Cloud Storage Space
diff --git a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.es.md b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.es.md
index 424d32c5..eda1931a 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.es.md
@@ -1,7 +1,7 @@
---
title: 'Almacenamiento Extra en la Nube'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Espacio Extra de Almacenamiento en la Nube
diff --git a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.fr.md b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.fr.md
index 986ce991..a5edb03d 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.fr.md
@@ -1,7 +1,7 @@
---
title: 'Espace de stockage supplémentaire'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Espace de stockage supplémentaire
diff --git a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.it.md b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.it.md
index 4343925d..0d1c5552 100644
--- a/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud-x-storage/2col-left.it.md
@@ -1,7 +1,7 @@
---
title: 'Spazio di archiviazione extra'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Spazio di archiviazione extra
diff --git a/pages/03.services/03.nextcloud/_nextcloud/2col-right.en.md b/pages/03.services/03.nextcloud/_nextcloud/2col-right.en.md
index f5a64d11..931ef053 100644
--- a/pages/03.services/03.nextcloud/_nextcloud/2col-right.en.md
+++ b/pages/03.services/03.nextcloud/_nextcloud/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: Nextcloud
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/03.nextcloud/_nextcloud/2col-right.es.md b/pages/03.services/03.nextcloud/_nextcloud/2col-right.es.md
index 8ac4a59e..99eebe3f 100644
--- a/pages/03.services/03.nextcloud/_nextcloud/2col-right.es.md
+++ b/pages/03.services/03.nextcloud/_nextcloud/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: Nextcloud
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/03.nextcloud/_nextcloud/2col-right.fr.md b/pages/03.services/03.nextcloud/_nextcloud/2col-right.fr.md
index 022ec80a..e202878d 100644
--- a/pages/03.services/03.nextcloud/_nextcloud/2col-right.fr.md
+++ b/pages/03.services/03.nextcloud/_nextcloud/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: Nextcloud
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/03.nextcloud/_nextcloud/2col-right.it.md b/pages/03.services/03.nextcloud/_nextcloud/2col-right.it.md
index d4c39593..1bbbad86 100644
--- a/pages/03.services/03.nextcloud/_nextcloud/2col-right.it.md
+++ b/pages/03.services/03.nextcloud/_nextcloud/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: Nextcloud
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/04.diaspora/_diaspora-love/2col-right.en.md b/pages/03.services/04.diaspora/_diaspora-love/2col-right.en.md
index 84b7a4da..9fc17508 100644
--- a/pages/03.services/04.diaspora/_diaspora-love/2col-right.en.md
+++ b/pages/03.services/04.diaspora/_diaspora-love/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Diaspora Love'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/love.png?lightbox=1024)
diff --git a/pages/03.services/04.diaspora/_diaspora-love/2col-right.es.md b/pages/03.services/04.diaspora/_diaspora-love/2col-right.es.md
index 66d6c8cc..3e2dbbd0 100644
--- a/pages/03.services/04.diaspora/_diaspora-love/2col-right.es.md
+++ b/pages/03.services/04.diaspora/_diaspora-love/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Diaspora* - Amor'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/love.png?lightbox=1024)
diff --git a/pages/03.services/04.diaspora/_diaspora-love/2col-right.fr.md b/pages/03.services/04.diaspora/_diaspora-love/2col-right.fr.md
index 8977473f..08a2819b 100644
--- a/pages/03.services/04.diaspora/_diaspora-love/2col-right.fr.md
+++ b/pages/03.services/04.diaspora/_diaspora-love/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'Aimé Diaspora'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/love.png?lightbox=1024)
diff --git a/pages/03.services/04.diaspora/_diaspora-love/2col-right.it.md b/pages/03.services/04.diaspora/_diaspora-love/2col-right.it.md
index 0b16cf46..7437b43a 100644
--- a/pages/03.services/04.diaspora/_diaspora-love/2col-right.it.md
+++ b/pages/03.services/04.diaspora/_diaspora-love/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Diaspora* - Amore'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/love.png?lightbox=1024)
diff --git a/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.en.md b/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.en.md
index df2543a7..a193e183 100644
--- a/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.en.md
+++ b/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Diaspora Reshare'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/reshare.png?lightbox=1024)
diff --git a/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.es.md b/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.es.md
index 6ec24c2a..8b8187ea 100644
--- a/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.es.md
+++ b/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Diaspora* - Compartir'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/reshare.png?lightbox=1024)
diff --git a/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.fr.md b/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.fr.md
index e6df3e3a..13265596 100644
--- a/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.fr.md
+++ b/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'Repartage Diaspora'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/reshare.png?lightbox=1024)
diff --git a/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.it.md b/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.it.md
index 7f04c4b4..40318272 100644
--- a/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.it.md
+++ b/pages/03.services/04.diaspora/_diaspora-reshare/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Diaspora* - Condivisione'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
![](en/reshare.png?lightbox=1024)
diff --git a/pages/03.services/04.diaspora/_diaspora/2col-right.en.md b/pages/03.services/04.diaspora/_diaspora/2col-right.en.md
index e194ea88..296c8ac2 100644
--- a/pages/03.services/04.diaspora/_diaspora/2col-right.en.md
+++ b/pages/03.services/04.diaspora/_diaspora/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: Diaspora*
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/04.diaspora/_diaspora/2col-right.es.md b/pages/03.services/04.diaspora/_diaspora/2col-right.es.md
index 64485583..0e0eccfe 100644
--- a/pages/03.services/04.diaspora/_diaspora/2col-right.es.md
+++ b/pages/03.services/04.diaspora/_diaspora/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: Diaspora*
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/04.diaspora/_diaspora/2col-right.fr.md b/pages/03.services/04.diaspora/_diaspora/2col-right.fr.md
index 6293dcf2..88f176a8 100644
--- a/pages/03.services/04.diaspora/_diaspora/2col-right.fr.md
+++ b/pages/03.services/04.diaspora/_diaspora/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: Diaspora*
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/04.diaspora/_diaspora/2col-right.it.md b/pages/03.services/04.diaspora/_diaspora/2col-right.it.md
index dbf08d75..af0bfa1b 100644
--- a/pages/03.services/04.diaspora/_diaspora/2col-right.it.md
+++ b/pages/03.services/04.diaspora/_diaspora/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: Diaspora*
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/05.forum/_forum/2col-right.en.md b/pages/03.services/05.forum/_forum/2col-right.en.md
index 06236dbb..0951d26d 100644
--- a/pages/03.services/05.forum/_forum/2col-right.en.md
+++ b/pages/03.services/05.forum/_forum/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: Discourse
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/05.forum/_forum/2col-right.es.md b/pages/03.services/05.forum/_forum/2col-right.es.md
index c2c4ab37..da934264 100644
--- a/pages/03.services/05.forum/_forum/2col-right.es.md
+++ b/pages/03.services/05.forum/_forum/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: Discourse
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/05.forum/_forum/2col-right.fr.md b/pages/03.services/05.forum/_forum/2col-right.fr.md
index 9db95a69..0591dadd 100644
--- a/pages/03.services/05.forum/_forum/2col-right.fr.md
+++ b/pages/03.services/05.forum/_forum/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: Discourse
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/05.forum/_forum/2col-right.it.md b/pages/03.services/05.forum/_forum/2col-right.it.md
index fb7bea59..0f204b23 100644
--- a/pages/03.services/05.forum/_forum/2col-right.it.md
+++ b/pages/03.services/05.forum/_forum/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: Discourse
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/07.xmpp/_empty-bar/fullbar.md b/pages/03.services/07.xmpp/_empty-bar/fullbar.md
deleted file mode 100644
index e75d7bc3..00000000
--- a/pages/03.services/07.xmpp/_empty-bar/fullbar.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: 'Empty Bar'
-bgcolor: '#8EB726'
-fontcolor: '#FFF'
-text_align: center
----
-
diff --git a/pages/03.services/07.xmpp/_modules-list/fullbar.en.md b/pages/03.services/07.xmpp/_modules-list/fullbar.en.md
deleted file mode 100644
index 10f753c5..00000000
--- a/pages/03.services/07.xmpp/_modules-list/fullbar.en.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 'Modules List'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-## List of supported server modules:
\ No newline at end of file
diff --git a/pages/03.services/07.xmpp/_modules-list/fullbar.es.md b/pages/03.services/07.xmpp/_modules-list/fullbar.es.md
deleted file mode 100644
index 63f62a4e..00000000
--- a/pages/03.services/07.xmpp/_modules-list/fullbar.es.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 'Lista de Módulos'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-## Lista de módulos soportados por el servidor:
diff --git a/pages/03.services/07.xmpp/_modules-list/fullbar.fr.md b/pages/03.services/07.xmpp/_modules-list/fullbar.fr.md
deleted file mode 100644
index 0719dc33..00000000
--- a/pages/03.services/07.xmpp/_modules-list/fullbar.fr.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 'Liste de modules'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-## Liste des modules de serveur pris en charge:
diff --git a/pages/03.services/07.xmpp/_modules-list/fullbar.it.md b/pages/03.services/07.xmpp/_modules-list/fullbar.it.md
deleted file mode 100644
index 63fd8287..00000000
--- a/pages/03.services/07.xmpp/_modules-list/fullbar.it.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 'Lista dei moduli'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-## Lista dei moduli:
\ No newline at end of file
diff --git a/pages/03.services/07.xmpp/_xmpp-1on1/2col-right.en.md b/pages/03.services/07.xmpp/_xmpp-1on1/2col-right.en.md
new file mode 100644
index 00000000..c8532bb6
--- /dev/null
+++ b/pages/03.services/07.xmpp/_xmpp-1on1/2col-right.en.md
@@ -0,0 +1,14 @@
+---
+title: 'Xmpp Direct Messaging'
+bgcolor: '#FFF'
+fontcolor: '#555'
+text_align: left
+---
+
+![](monal.jpg)
+
+---
+
+## One-on-one chats
+
+Talk freely with any other disrooter or anyone out there using any xmpp/jabber compatible server in the internet. You decide to store or not any history of the chat on the server or enable encryption. Username's on XMPP resembles an email address corresponding with the XMPP server (username@example.com).
diff --git a/pages/03.services/07.xmpp/_xmpp-1on1/conversations.jpg b/pages/03.services/07.xmpp/_xmpp-1on1/conversations.jpg
new file mode 100644
index 00000000..7c3524a7
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-1on1/conversations.jpg differ
diff --git a/pages/03.services/07.xmpp/_xmpp-1on1/monal.jpg b/pages/03.services/07.xmpp/_xmpp-1on1/monal.jpg
new file mode 100644
index 00000000..2355c54b
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-1on1/monal.jpg differ
diff --git a/pages/03.services/07.xmpp/_xmpp-bots/2col-left.en.md b/pages/03.services/07.xmpp/_xmpp-bots/2col-left.en.md
new file mode 100644
index 00000000..aaf1d607
--- /dev/null
+++ b/pages/03.services/07.xmpp/_xmpp-bots/2col-left.en.md
@@ -0,0 +1,15 @@
+---
+title: 'Xmpp Bots'
+bgcolor: '#FFF'
+fontcolor: '#555'
+text_align: left
+---
+
+## Bots
+
+Bots are chat accounts that will do things for you. From checking the weather, greeting new commers, remembering things for you or even making web searches or supplying you with RSS feeds and ton of other useful and those more useless things. We offer number of multipurpose bots based on hubot as well as a dedicated bot server called bot.disroot.org. If you have a bot and you're looking for a home for it, get in touch with us.
+Our bot server does not keep any history on the server.
+
+---
+
+![](hubot_logo.png)
diff --git a/pages/03.services/07.xmpp/_xmpp-bots/hubot_logo.png b/pages/03.services/07.xmpp/_xmpp-bots/hubot_logo.png
new file mode 100644
index 00000000..1919f9bb
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-bots/hubot_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-bridges/2col-right.en.md b/pages/03.services/07.xmpp/_xmpp-bridges/2col-right.en.md
new file mode 100644
index 00000000..e9593264
--- /dev/null
+++ b/pages/03.services/07.xmpp/_xmpp-bridges/2col-right.en.md
@@ -0,0 +1,14 @@
+---
+title: 'Xmpp Bridges'
+bgcolor: '#FFF'
+fontcolor: '#555'
+text_align: left
+---
+
+![](conversations.jpg)
+
+---
+
+## Gateways, Bridges and Transports
+
+Jabber/XMPP allows for various ways to connect to different chat protocols. You can connect to any IRC room via our biboumi IRC gateway. In the future we are planning to run a Matrix bridge (currently available via bau-haus.net, our internet friends), telegram bridge and a number of other bridges and transports we are currently preparing.
diff --git a/pages/03.services/07.xmpp/_xmpp-bridges/conversations.jpg b/pages/03.services/07.xmpp/_xmpp-bridges/conversations.jpg
new file mode 100644
index 00000000..0417584f
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-bridges/conversations.jpg differ
diff --git a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-left.en.md b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-left.en.md
new file mode 100644
index 00000000..9cfe01b5
--- /dev/null
+++ b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-left.en.md
@@ -0,0 +1,18 @@
+---
+title: 'Xmpp Chatrooms'
+bgcolor: '#FFF'
+fontcolor: '#555'
+text_align: left
+---
+
+## Chat-rooms
+
+With Jabber/XMPP your can create and join private or public rooms in the network. Rooms address are simple to remember and resemble email mailinglists like: *your_room*@chat.disroot.org. Additionally you can set various privacy settings per room such as: Whether the room history should be stored on the server, whether the room is publicly searchable and open for anyone to join, you can set admins and moderators for the room and room encryption.
+
+Check the [global room list](https://search.jabbercat.org/rooms/1) of all the servers that voluntarily submit their public rooms to global directory.
+
+
+---
+
+## ##
+![](chatrooms.png)
diff --git a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.en.md b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.en.md
deleted file mode 100644
index 274806f1..00000000
--- a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.en.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: 'Xmpp Chatrooms'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
----
-
-## Explore chat-rooms
-
----
-
-XMPP gives you possibility to create private and public chat-rooms. Created rooms address is *your_roomname*@chat.disroot.org
diff --git a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.es.md b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.es.md
index 9b153777..850d740c 100644
--- a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.es.md
+++ b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Salas de chat XMPP'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Explora salas de chat
diff --git a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.fr.md b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.fr.md
index 51ffa408..edef224e 100644
--- a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.fr.md
+++ b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'Salles de chat Xmpp'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Explorez les salons de discussion
diff --git a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.it.md b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.it.md
index 259e7df8..798c15ab 100644
--- a/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.it.md
+++ b/pages/03.services/07.xmpp/_xmpp-chatrooms/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Xmpp stanze di chat'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
---
## Esplora le stanze di chat
diff --git a/pages/03.services/07.xmpp/_xmpp-chatrooms/chatrooms.png b/pages/03.services/07.xmpp/_xmpp-chatrooms/chatrooms.png
new file mode 100644
index 00000000..763efb4a
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-chatrooms/chatrooms.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/android_logo.png b/pages/03.services/07.xmpp/_xmpp-clients/android_logo.png
new file mode 100644
index 00000000..5e0165d3
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/android_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/apple_logo.png b/pages/03.services/07.xmpp/_xmpp-clients/apple_logo.png
new file mode 100644
index 00000000..c5a17774
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/apple_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/beagle.png b/pages/03.services/07.xmpp/_xmpp-clients/beagle.png
new file mode 100644
index 00000000..26f917a5
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/beagle.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/chatsecure.jpg b/pages/03.services/07.xmpp/_xmpp-clients/chatsecure.jpg
new file mode 100644
index 00000000..dded04b2
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/chatsecure.jpg differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/chatsecure.png b/pages/03.services/07.xmpp/_xmpp-clients/chatsecure.png
new file mode 100644
index 00000000..a1348cab
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/chatsecure.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/clients.en.md b/pages/03.services/07.xmpp/_xmpp-clients/clients.en.md
new file mode 100644
index 00000000..d18ad9ca
--- /dev/null
+++ b/pages/03.services/07.xmpp/_xmpp-clients/clients.en.md
@@ -0,0 +1,66 @@
+---
+title: 'Xmpp Clients'
+bgcolor: '#FFF'
+fontcolor: '#327E82'
+text_align: left
+clients:
+ -
+ title: Dino
+ logo: dino.png
+ link: https://dino.im
+ text:
+ platforms: [fa-linux]
+ -
+ title: Gajim
+ logo: gajim.png
+ link: https://gajim.org/
+ text:
+ platforms: [fa-linux]
+
+ -
+ title: BeagleIM
+ logo: beagle.png
+ link: https://beagle.im/
+ text:
+ platforms: [fa-apple]
+
+ -
+ title: Monal IM
+ logo: monal.png
+ link: https://monal.im/
+ text:
+ platforms: [fa-apple]
+
+ -
+ title: Conversations
+ logo: conversations.png
+ link: https://conversations.im/
+ text:
+ platforms: [fa-android]
+
+ -
+ title: ChatSecure
+ logo: chatsecure.png
+ link: https://chatsecure.org
+ text:
+ platforms: [fa-apple]
+
+ -
+ title: Profanity
+ logo: profanity.png
+ link: http://profanity.im/
+ text: "Console based XMPP client"
+ platforms: [fa-linux, fa-windows, fa-apple, fa-android]
+
+ -
+ title: converse.js
+ logo: conversejs.svg
+ link: https://webchat.disroot.org.org
+ text: "XMPP client in your browser"
+ platforms: [fa-linux, fa-windows, fa-apple, fa-android]
+
+---
+
+
+
+
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/conversations.png b/pages/03.services/07.xmpp/_xmpp-clients/conversations.png
new file mode 100644
index 00000000..7437c618
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/conversations.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/conversejs.svg b/pages/03.services/07.xmpp/_xmpp-clients/conversejs.svg
new file mode 100644
index 00000000..68d1ac18
--- /dev/null
+++ b/pages/03.services/07.xmpp/_xmpp-clients/conversejs.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/dino.png b/pages/03.services/07.xmpp/_xmpp-clients/dino.png
new file mode 100644
index 00000000..37db8594
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/dino.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/dino.svg b/pages/03.services/07.xmpp/_xmpp-clients/dino.svg
new file mode 100644
index 00000000..b62f8c32
--- /dev/null
+++ b/pages/03.services/07.xmpp/_xmpp-clients/dino.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/gajim.png b/pages/03.services/07.xmpp/_xmpp-clients/gajim.png
new file mode 100644
index 00000000..29f3549f
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/gajim.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/gajim_logo.jpg b/pages/03.services/07.xmpp/_xmpp-clients/gajim_logo.jpg
new file mode 100644
index 00000000..562d6643
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/gajim_logo.jpg differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/linux_logo.png b/pages/03.services/07.xmpp/_xmpp-clients/linux_logo.png
new file mode 100644
index 00000000..fd28b5ef
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/linux_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/monal.png b/pages/03.services/07.xmpp/_xmpp-clients/monal.png
new file mode 100644
index 00000000..dc6c32af
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/monal.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.en.md b/pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.en.md
similarity index 96%
rename from pages/03.services/07.xmpp/_xmpp-clients/2col-right.en.md
rename to pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.en.md
index 53d370b0..23580885 100644
--- a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.en.md
+++ b/pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: 'Xmpp Clients'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.es.md b/pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.es.md
similarity index 96%
rename from pages/03.services/07.xmpp/_xmpp-clients/2col-right.es.md
rename to pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.es.md
index 0d6d2efd..5aada79f 100644
--- a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.es.md
+++ b/pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: 'Clientes XMPP'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.fr.md b/pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.fr.md
similarity index 96%
rename from pages/03.services/07.xmpp/_xmpp-clients/2col-right.fr.md
rename to pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.fr.md
index c824836d..8531a1fb 100644
--- a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.fr.md
+++ b/pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: 'Clients Xmpp'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.it.md b/pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.it.md
similarity index 96%
rename from pages/03.services/07.xmpp/_xmpp-clients/2col-right.it.md
rename to pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.it.md
index f2663911..92787300 100644
--- a/pages/03.services/07.xmpp/_xmpp-clients/2col-right.it.md
+++ b/pages/03.services/07.xmpp/_xmpp-clients/old/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: 'Client Xmpp'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/profanity.png b/pages/03.services/07.xmpp/_xmpp-clients/profanity.png
new file mode 100644
index 00000000..9f123ae9
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/profanity.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/terminal_logo.png b/pages/03.services/07.xmpp/_xmpp-clients/terminal_logo.png
new file mode 100644
index 00000000..568ff97a
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/terminal_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/web.png b/pages/03.services/07.xmpp/_xmpp-clients/web.png
new file mode 100644
index 00000000..3d5c36aa
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/web.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/windows.png b/pages/03.services/07.xmpp/_xmpp-clients/windows.png
new file mode 100644
index 00000000..3f03ad4f
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/windows.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/windows_logo.png b/pages/03.services/07.xmpp/_xmpp-clients/windows_logo.png
new file mode 100644
index 00000000..bf5284ad
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/windows_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients/xmpp_logo.png b/pages/03.services/07.xmpp/_xmpp-clients/xmpp_logo.png
new file mode 100644
index 00000000..ecf0497a
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-clients/xmpp_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-clients_header/fullbar.en.md b/pages/03.services/07.xmpp/_xmpp-clients_header/fullbar.en.md
new file mode 100644
index 00000000..dd3586f1
--- /dev/null
+++ b/pages/03.services/07.xmpp/_xmpp-clients_header/fullbar.en.md
@@ -0,0 +1,9 @@
+---
+title: 'Jabber Clients'
+bgcolor: '#FFFFFF'
+fontcolor: '#327E82'
+text_align: center
+---
+
+# Use your favorite chat-client
+There is a lot of desktop/web/mobile clients to choose from. Pick the one you like the best. [https://xmpp.org/software/clients.html](https://xmpp.org/software/clients.html)
diff --git a/pages/03.services/07.xmpp/_xmpp-encrypt/2col-left.en.md b/pages/03.services/07.xmpp/_xmpp-encrypt/2col-left.en.md
new file mode 100644
index 00000000..ea53edb6
--- /dev/null
+++ b/pages/03.services/07.xmpp/_xmpp-encrypt/2col-left.en.md
@@ -0,0 +1,14 @@
+---
+title: 'Xmpp Encrypt'
+bgcolor: '#FFF'
+fontcolor: '#555'
+text_align: left
+---
+
+## Encrypt everything!
+
+By using OMEMO (GPG or OTR) End-to-End encryption methods on the client side (on your end), your conversations will reach the recipient of the message without being intercepted by anyone (not even administrators).
+
+---
+
+![](omemo_logo.png)
diff --git a/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.en.md b/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.en.md
deleted file mode 100644
index d91a4fa3..00000000
--- a/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.en.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: 'Xmpp Encrypt'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-## Encrypt everything!
-
----
-
-By using **OMEMO** encryption methods on the client side (your side), your conversation cannot be intercepted by anyone but the recipient.
diff --git a/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.es.md b/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.es.md
deleted file mode 100644
index 53ac63d1..00000000
--- a/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.es.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: 'Cifrado XMPP'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-## ¡Cifra todo!
-
----
-
-Usando el método de cifrado **OMEMO** del lado del cliente (tu lado), tu conversación no puede ser interceptada por nadie excepto el receptor.
diff --git a/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.fr.md b/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.fr.md
deleted file mode 100644
index 2906c50a..00000000
--- a/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.fr.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: 'Chiffrer Xmpp'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-## Chiffrez tout!
-
----
-
-En utilisant les méthodes de chiffrement **OMEMO** du côté client (votre côté), votre conversation ne peut être interceptée que par le destinataire.
diff --git a/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.it.md b/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.it.md
deleted file mode 100644
index 4e0a737d..00000000
--- a/pages/03.services/07.xmpp/_xmpp-encrypt/2col-right.it.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: 'Xmpp e cifratura'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-## Cifra tutto!
-
----
-
-Utilizzando il metodo di crittazione **OMEMO** lato client, le tue conversazioni non potranno essere lette da nessuno tranne che dal destinatario.
diff --git a/pages/03.services/07.xmpp/_xmpp-encrypt/cover_omemo.png b/pages/03.services/07.xmpp/_xmpp-encrypt/cover_omemo.png
new file mode 100644
index 00000000..b651127b
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-encrypt/cover_omemo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-encrypt/omemo_logo.png b/pages/03.services/07.xmpp/_xmpp-encrypt/omemo_logo.png
new file mode 100644
index 00000000..7647b4df
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp-encrypt/omemo_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp-modules/3col.en.md b/pages/03.services/07.xmpp/_xmpp-modules/3col.en.md
deleted file mode 100644
index dac40b1a..00000000
--- a/pages/03.services/07.xmpp/_xmpp-modules/3col.en.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: 'Xmpp Modules'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-* **admin_adhoc** -- Allows administration via an XMPP client that supports ad-hoc commands
-* **announce** -- Send announcement to all online users
-* **blocklist** -- ability to block users
-* **bosh** -- xmpp over http
-* **carbons** -- Allow sending messages to multiple devices
-* **carbons_adhoc** -- carbons for legacy clients
-* **carbons_copies** -- carbons for legacy clients
-* **checkcerts** -- Inform admins 7 before certificate expires
-* **compat_dialback** -- This module provides a workaround for servers that do not set the to attribute on stream headers, which is required per RFC6120
-* **csi** -- Implements Client State Indication
-* **dialback** -- s2s dialback support
-* **disco** -- Service discovery
-* **filter_chatstates** -- https://modules.prosody.im/mod_filter_chatstates.html
-* **http_upload** -- upload files via http (file will be deleted after 7 days)
-
----
-
-* **legacyauth** -- Legacy authentication. Only used by some old clients and bots
-* **log_auth** -- Log failed authentication attempts with their IP address
-* **mam** -- Implementation of XEP-0313: Message Archive Management https://modules.prosody.im/mod_mam.html
-* **motd** -- Send a message to users when they log in
-* **muc** -- Multi user Chat (chatrooms)
-* **muc_mam** -- Message Archive Management for MUC
-* **muc_lang** -- This module adds support for advertising the language used in a room.
-* **offline** -- Store offline messages
-* **omemo_all_access** -- https://modules.prosody.im/mod_omemo_all_access.html
-* **pep** -- Enables users to publish their mood, activity, playing music and more
-* **pep_vcard_avatar** -- This module pushes the users nickname and avatar from vCards into PEP, or into vCards from PEP
-* **ping** -- Replies to XMPP pings with pongs
-* **posix** -- POSIX functionality, sends server to background, enables syslog, etc.
-* **privacy_lists** -- Privacy lists are a flexible method for blocking communications
-
----
-
-* **private** -- Private XML storage (for room bookmarks, etc.)
-* **register_redirect** -- Registration Redirect
-* **roster** -- Allow users to have a roster. Recommended 😉
-* **saslauth** -- Authentication for clients and servers.
-* **smacks** -- Stream Management
-* **throttle_presence** -- Automatically cuts down on presence traffic when clients indicate they are inactive (using the CSI protocol)
-* **time** -- Let others know the time here on this server
-* **tls** -- Add support for secure TLS on c2s/s2s connections
-* **uptime** -- Report how long server has been running
-* **uptime_presence** -- responds to a presence probe with timestamp from when the server was started
-* **vcard** -- Allow users to set vCards
-* **vcard_muc** -- This module adds the ability to set vCard for MUC rooms
-* **version** -- Replies to server version requests
-* **welcome** -- Welcome users who register accounts
\ No newline at end of file
diff --git a/pages/03.services/07.xmpp/_xmpp-modules/3col.es.md b/pages/03.services/07.xmpp/_xmpp-modules/3col.es.md
deleted file mode 100644
index c120549a..00000000
--- a/pages/03.services/07.xmpp/_xmpp-modules/3col.es.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-title: 'Módulos XMPP'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-
-
"**roster**"; -- Permite a los usuarios tener un listado. Recomendado 😉
-
"**saslauth**"; -- Autenticación para clientes y servidores.
-
"**tls**"; -- Añade soporte para TLS segura en conecciones c2s/s2s
-
"**dialback**"; -- Soporte de rellamada s2s
-
"**disco**"; -- Servicio discovery
-
"**bosh**"; -- xmpp sobre http
-
"**muc**"; -- Chat Multi-usuario (salas de chat)
-
"**http_upload**"; -- Subida de archivos vía http (el archivo será borrado 7 días después)
-
-
----
-
-
"**private**"; -- Almacenamiento XML privado XML (para marcadores de salas, etc.)
-
"**vcard**"; -- Permite a los usuarios configurar vCards
-
"**privacy**"; -- Soporta listas de privacidad
-
"**compression**"; -- Compresión de transmisión
-
"**offline**"; -- Almacena mensajes fuera de línea
-
"**version**"; -- Responde a solicitud de versión del servidor
-
"**uptime**"; -- Reporta cuánto tiempo ha estado funcionando el servidor
-
"**time**"; -- Permite a otros saber la hora aquí en este servidor
-
"**ping**"; -- Responde a pings XMPP con pongs
-
"**pep**"; -- Habilita a los usuarios a publicar sus estados, actividades, la música que están escuchando y más
-
----
-
-
"**carbons**"; -- Permite enviar mensajes a múltiples dispositivos
-
"**carbons_adhoc**";
-
"**carbons_copies**";
-
"**smacks**"; -- Gestión de transmisión
-
"**csi**"; -- Implementa Indicio de Estado del Cliente (Client State Indication)
-
"**throttle_presence**"; -- mira https://modules.prosody.im/mod_throttle_presence.html
-
"**announce**"; -- Envía un anuncio a todos los usuarios conectados
-
"**motd**"; -- Envía un mensaje a los usuarios cuando inicias sesión
-
diff --git a/pages/03.services/07.xmpp/_xmpp-modules/3col.fr.md b/pages/03.services/07.xmpp/_xmpp-modules/3col.fr.md
deleted file mode 100644
index 47ca9ca0..00000000
--- a/pages/03.services/07.xmpp/_xmpp-modules/3col.fr.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-title: 'Modules Xmpp'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-* **admin_adhoc** -- Permet l'administration via un client XMPP qui supporte les commandes ad-hoc.
-* **announce** -- Envoyer des annonces à tous les utilisateurs en ligne
-* **blocklist** -- possibilité de bloquer les utilisateurs
-* **bosh** -- xmpp sur http
-* **carbons** -- Autoriser l'envoi de messages vers plusieurs appareils
-* **carbons_adhoc** -- carbones pour les clients historiques
-* **carbons_copies** -- carbones pour les clients historiques
-* **checkcerts** -- Informer les administrateurs 7 jours avant l'expiration du certificat.
-* **compat_dialback** -- Ce module fournit une solution de contournement pour les serveurs qui ne définissent pas l'attribut sur les en-têtes de flux, ce qui est requis par RFC6120
-* **csi** -- Mise en œuvre de l' Indication de l'Etat Client
-* **dialback** -- S2s support de numérotation s2s
-* **disco** -- Découverte de services
-* **filter_chatstates** -- https://modules.prosody.im/mod_filter_chatstates.html
-* **http_upload** -- envoyer des fichiers via http (le fichier sera supprimé après 7 jours)
-
----
-
-* **legacyauth** -- Authentification historique. Uniquement utilisé par certains anciens clients et bots.
-* **log_auth** -- Enregistrer les tentatives d'authentification échouées avec leur adresse IP.
-* **mam** -- Mise en place de XEP-0313: Message Archive Management https://modules.prosody.im/mod_mam.html
-* **motd** -- Envoyer un message aux utilisateurs lorsqu'ils se connectent
-* **muc** -- Chat multi-utilisateurs (chatrooms)
-* **muc_mam** -- Message Archive Management pour les MUC
-* **muc_lang** -- Ce module ajoute la prise en charge de l'information sur la langue utilisée dans une salle.
-* **offline** -- Stocker les messages hors ligne.
-* **omemo_all_access** -- https://modules.prosody.im/mod_omemo_all_access.html
-* **pep** -- Permet aux utilisateurs de publier leur humeur, leur activité, leur musique, etc.
-* **pep_vcard_avatar** -- Ce module pousse le surnom et l'avatar des utilisateurs de vCards dans PEP, ou dans vCards depuis PEP.
-* **ping** -- Réponses aux pings XMPP avec pongs
-* **posix** -- Fonctionnalité POSIX, envoie le serveur en arrière-plan, active les syslog, etc.
-* **privacy_lists** -- Les listes de confidentialité sont une méthode souple pour bloquer les communications.
-
----
-
-* **private** -- Stockage XML privé (pour les signets de salle, etc.)
-* **register_redirect** -- Redirection de l'inscription
-* **roster** -- Permettre aux utilisateurs d'avoir une liste. Recommandé😉
-* **saslauth** -- Authentification pour les clients et les serveurs.
-* **smacks** -- Gestion de flux
-* **throttle_presence** -- Réduit automatiquement le trafic de présence lorsque les clients indiquent qu'ils sont inactifs (en utilisant le protocole CSI).
-* **time** -- Informez les autres de l'heure sur ce serveur
-* **tls** -- Ajout de la prise en charge des TLS sécurisés sur les connexions c2s/s2s
-* **uptime** -- Signaler depuis combien de temps le serveur fonctionne
-* **uptime_presence** -- répond à une sonde de présence avec horodatage à partir du démarrage du serveur.
-* **vcard** -- Autoriser les utilisateurs à définir des vCards
-* **vcard_muc** -- Ce module ajoute la possibilité de configurer des vCard pour les salles MUC.
-* **version** -- Réponses aux demandes de version serveur
-* **welcome** -- Souhaiter la bienvenue aux utilisateurs qui enregistrent des comptes
-
----
diff --git a/pages/03.services/07.xmpp/_xmpp-modules/3col.it.md b/pages/03.services/07.xmpp/_xmpp-modules/3col.it.md
deleted file mode 100644
index dac40b1a..00000000
--- a/pages/03.services/07.xmpp/_xmpp-modules/3col.it.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: 'Xmpp Modules'
-bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
-text_align: left
----
-
-* **admin_adhoc** -- Allows administration via an XMPP client that supports ad-hoc commands
-* **announce** -- Send announcement to all online users
-* **blocklist** -- ability to block users
-* **bosh** -- xmpp over http
-* **carbons** -- Allow sending messages to multiple devices
-* **carbons_adhoc** -- carbons for legacy clients
-* **carbons_copies** -- carbons for legacy clients
-* **checkcerts** -- Inform admins 7 before certificate expires
-* **compat_dialback** -- This module provides a workaround for servers that do not set the to attribute on stream headers, which is required per RFC6120
-* **csi** -- Implements Client State Indication
-* **dialback** -- s2s dialback support
-* **disco** -- Service discovery
-* **filter_chatstates** -- https://modules.prosody.im/mod_filter_chatstates.html
-* **http_upload** -- upload files via http (file will be deleted after 7 days)
-
----
-
-* **legacyauth** -- Legacy authentication. Only used by some old clients and bots
-* **log_auth** -- Log failed authentication attempts with their IP address
-* **mam** -- Implementation of XEP-0313: Message Archive Management https://modules.prosody.im/mod_mam.html
-* **motd** -- Send a message to users when they log in
-* **muc** -- Multi user Chat (chatrooms)
-* **muc_mam** -- Message Archive Management for MUC
-* **muc_lang** -- This module adds support for advertising the language used in a room.
-* **offline** -- Store offline messages
-* **omemo_all_access** -- https://modules.prosody.im/mod_omemo_all_access.html
-* **pep** -- Enables users to publish their mood, activity, playing music and more
-* **pep_vcard_avatar** -- This module pushes the users nickname and avatar from vCards into PEP, or into vCards from PEP
-* **ping** -- Replies to XMPP pings with pongs
-* **posix** -- POSIX functionality, sends server to background, enables syslog, etc.
-* **privacy_lists** -- Privacy lists are a flexible method for blocking communications
-
----
-
-* **private** -- Private XML storage (for room bookmarks, etc.)
-* **register_redirect** -- Registration Redirect
-* **roster** -- Allow users to have a roster. Recommended 😉
-* **saslauth** -- Authentication for clients and servers.
-* **smacks** -- Stream Management
-* **throttle_presence** -- Automatically cuts down on presence traffic when clients indicate they are inactive (using the CSI protocol)
-* **time** -- Let others know the time here on this server
-* **tls** -- Add support for secure TLS on c2s/s2s connections
-* **uptime** -- Report how long server has been running
-* **uptime_presence** -- responds to a presence probe with timestamp from when the server was started
-* **vcard** -- Allow users to set vCards
-* **vcard_muc** -- This module adds the ability to set vCard for MUC rooms
-* **version** -- Replies to server version requests
-* **welcome** -- Welcome users who register accounts
\ No newline at end of file
diff --git a/pages/03.services/07.xmpp/_xmpp-settings/fullbar.en.md b/pages/03.services/07.xmpp/_xmpp-settings/fullbar.en.md
index 104cd606..2c17737f 100644
--- a/pages/03.services/07.xmpp/_xmpp-settings/fullbar.en.md
+++ b/pages/03.services/07.xmpp/_xmpp-settings/fullbar.en.md
@@ -1,7 +1,7 @@
---
title: 'XMPP Settings'
bgcolor: '#1F5C60'
-font-color: '#FFFFFF'
+fontcolor: '#FFF'
text_align: center
---
@@ -12,5 +12,7 @@ text_align: center
If you are using a XMPP client (e.g. pidgin, conversations, gajim, dino), you will need the above mentioned settings.
+---
+
#### Upload file size limit: 10MB
#### Archived messages expire after 6 month
diff --git a/pages/03.services/07.xmpp/_xmpp/2col-right.en.md b/pages/03.services/07.xmpp/_xmpp/2col-right.en.md
index b88a3a0b..8c5e302e 100644
--- a/pages/03.services/07.xmpp/_xmpp/2col-right.en.md
+++ b/pages/03.services/07.xmpp/_xmpp/2col-right.en.md
@@ -1,7 +1,7 @@
---
-title: XMPP
+title: Jabber
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
@@ -9,10 +9,13 @@ body_classes: modular
Log in
---
+![](xmpp_logo.png?resize=128,128)
+# Jabber (xmpp)
+### Decentralized and federated instant messaging
-## XMPP - Decentralized and federated instant messaging
-
-Communicate with your friends using a standardized, open and federated chat protocol, with the ability to encrypt your communication with OMEMO protocol (based on encryption method also used by services such as Signal and Matrix). With XMPP you are not bound to one service provider (e.g. Disroot XMPP server) but can freely communicate with contacts from other XMPP servers, just like you would communicate between different email servers.
+Communicate using a standardized, open and federated chat protocol, with the ability to encrypt your communication with OMEMO protocol (based on encryption method also used by services such as Signal and Matrix). With Jabber you are not bound to one service provider (e.g. Disroot server) but can freely communicate with contacts from other Jabber [servers](https://compliance.conversations.im/), just like you would communicate between different email servers.
Project homepage: [https://prosody.im](https://prosody.im) / [Source code](http://hg.prosody.im/)
+
+
diff --git a/pages/03.services/07.xmpp/_xmpp/2col-right.es.md b/pages/03.services/07.xmpp/_xmpp/2col-right.es.md
index 30ad8fd8..be6027f6 100644
--- a/pages/03.services/07.xmpp/_xmpp/2col-right.es.md
+++ b/pages/03.services/07.xmpp/_xmpp/2col-right.es.md
@@ -1,13 +1,15 @@
---
title: XMPP
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
Inscribirse en DisrootIniciar sesión
+|**TABLE**|**SECOND**|THIRD|
+
---
## [XMPP](https://es.wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol) - Mensajería instantánea descentralizada y federada
diff --git a/pages/03.services/07.xmpp/_xmpp/2col-right.fr.md b/pages/03.services/07.xmpp/_xmpp/2col-right.fr.md
index 91b79d07..5ca2f6fe 100644
--- a/pages/03.services/07.xmpp/_xmpp/2col-right.fr.md
+++ b/pages/03.services/07.xmpp/_xmpp/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: XMPP
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/07.xmpp/_xmpp/2col-right.it.md b/pages/03.services/07.xmpp/_xmpp/2col-right.it.md
index f5e442a3..2f18e293 100644
--- a/pages/03.services/07.xmpp/_xmpp/2col-right.it.md
+++ b/pages/03.services/07.xmpp/_xmpp/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: XMPP
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/07.xmpp/_xmpp/android_logo.png b/pages/03.services/07.xmpp/_xmpp/android_logo.png
new file mode 100644
index 00000000..5e0165d3
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp/android_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp/apple_logo.png b/pages/03.services/07.xmpp/_xmpp/apple_logo.png
new file mode 100644
index 00000000..c5a17774
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp/apple_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp/linux_logo.png b/pages/03.services/07.xmpp/_xmpp/linux_logo.png
new file mode 100644
index 00000000..fd28b5ef
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp/linux_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp/terminal_logo.png b/pages/03.services/07.xmpp/_xmpp/terminal_logo.png
new file mode 100644
index 00000000..568ff97a
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp/terminal_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp/web.png b/pages/03.services/07.xmpp/_xmpp/web.png
new file mode 100644
index 00000000..3d5c36aa
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp/web.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp/windows.png b/pages/03.services/07.xmpp/_xmpp/windows.png
new file mode 100644
index 00000000..3f03ad4f
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp/windows.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp/windows_logo.png b/pages/03.services/07.xmpp/_xmpp/windows_logo.png
new file mode 100644
index 00000000..bf5284ad
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp/windows_logo.png differ
diff --git a/pages/03.services/07.xmpp/_xmpp/xmpp_logo.png b/pages/03.services/07.xmpp/_xmpp/xmpp_logo.png
new file mode 100644
index 00000000..ecf0497a
Binary files /dev/null and b/pages/03.services/07.xmpp/_xmpp/xmpp_logo.png differ
diff --git a/pages/03.services/07.xmpp/everyones-welcome.jpg b/pages/03.services/07.xmpp/everyones-welcome.jpg
new file mode 100644
index 00000000..cfb5a6c1
Binary files /dev/null and b/pages/03.services/07.xmpp/everyones-welcome.jpg differ
diff --git a/pages/03.services/07.xmpp/listen.jpg b/pages/03.services/07.xmpp/listen.jpg
new file mode 100644
index 00000000..80550daa
Binary files /dev/null and b/pages/03.services/07.xmpp/listen.jpg differ
diff --git a/pages/03.services/07.xmpp/modular.en.md b/pages/03.services/07.xmpp/modular.en.md
index 1c559623..911afbb1 100644
--- a/pages/03.services/07.xmpp/modular.en.md
+++ b/pages/03.services/07.xmpp/modular.en.md
@@ -9,12 +9,13 @@ content:
- _xmpp
- _xmpp-settings
- _xmpp-highlights
+ - _xmpp-clients_header
- _xmpp-clients
- _xmpp-encrypt
+ - _xmpp-1on1
- _xmpp-chatrooms
- - _empty-bar
- - _modules-list
- - _xmpp-modules
+ - _xmpp-bridges
+ - _xmpp-bots
body_classes: modular
-header_image: pussy-riot.jpeg
+header_image: everyones-welcome.jpg
---
diff --git a/pages/03.services/08.pads/_etherpad-features/2col-left.en.md b/pages/03.services/08.pads/_etherpad-features/2col-left.en.md
index 58fc9f7a..c61655f8 100644
--- a/pages/03.services/08.pads/_etherpad-features/2col-left.en.md
+++ b/pages/03.services/08.pads/_etherpad-features/2col-left.en.md
@@ -1,7 +1,7 @@
---
title: 'Etherpad Features'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/08.pads/_etherpad-features/2col-left.es.md b/pages/03.services/08.pads/_etherpad-features/2col-left.es.md
index a242dcb1..75e19fef 100644
--- a/pages/03.services/08.pads/_etherpad-features/2col-left.es.md
+++ b/pages/03.services/08.pads/_etherpad-features/2col-left.es.md
@@ -1,7 +1,7 @@
---
title: 'Características de Ethepad'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/08.pads/_etherpad-features/2col-left.fr.md b/pages/03.services/08.pads/_etherpad-features/2col-left.fr.md
index 28946b5a..556d2ec9 100644
--- a/pages/03.services/08.pads/_etherpad-features/2col-left.fr.md
+++ b/pages/03.services/08.pads/_etherpad-features/2col-left.fr.md
@@ -1,7 +1,7 @@
---
title: "Caractéristiques d'Etherpad"
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/08.pads/_etherpad-features/2col-left.it.md b/pages/03.services/08.pads/_etherpad-features/2col-left.it.md
index 565bae13..ddc96cf2 100644
--- a/pages/03.services/08.pads/_etherpad-features/2col-left.it.md
+++ b/pages/03.services/08.pads/_etherpad-features/2col-left.it.md
@@ -1,7 +1,7 @@
---
title: 'Caratteristiche di Etherpad'
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#555'
text_align: left
---
diff --git a/pages/03.services/08.pads/_pads/2col-right.en.md b/pages/03.services/08.pads/_pads/2col-right.en.md
index 8910b73a..afa0b0a7 100644
--- a/pages/03.services/08.pads/_pads/2col-right.en.md
+++ b/pages/03.services/08.pads/_pads/2col-right.en.md
@@ -1,7 +1,7 @@
---
title: Pads
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/08.pads/_pads/2col-right.es.md b/pages/03.services/08.pads/_pads/2col-right.es.md
index 955d955e..c851a1ac 100644
--- a/pages/03.services/08.pads/_pads/2col-right.es.md
+++ b/pages/03.services/08.pads/_pads/2col-right.es.md
@@ -1,7 +1,7 @@
---
title: Blocks de notas
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/08.pads/_pads/2col-right.fr.md b/pages/03.services/08.pads/_pads/2col-right.fr.md
index 83679b73..7a3a85cb 100644
--- a/pages/03.services/08.pads/_pads/2col-right.fr.md
+++ b/pages/03.services/08.pads/_pads/2col-right.fr.md
@@ -1,7 +1,7 @@
---
title: Pads
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/08.pads/_pads/2col-right.it.md b/pages/03.services/08.pads/_pads/2col-right.it.md
index a127274a..feef316e 100644
--- a/pages/03.services/08.pads/_pads/2col-right.it.md
+++ b/pages/03.services/08.pads/_pads/2col-right.it.md
@@ -1,7 +1,7 @@
---
title: Pads
bgcolor: '#FFF'
-fontcolor: '#7A7A7A'
+fontcolor: '#1F5C60'
body_classes: modular
---
diff --git a/pages/03.services/08.pads/_pads/navigation.html.twig b/pages/03.services/08.pads/_pads/navigation.html.twig
new file mode 100644
index 00000000..b4cf900c
--- /dev/null
+++ b/pages/03.services/08.pads/_pads/navigation.html.twig
@@ -0,0 +1,49 @@
+
+{% macro loop(page) %}
+ {% for p in page.children.visible %}
+ {% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
+