diff --git a/README.md b/README.md
index 62d26ad54d8b4d3bba3bc02c4bed7bcf0efe80ed..1ae54a9322c593260bf80564e9618ddd24a3ca81 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,54 @@
-#Disroot app
-
-This app is a webapp for the site Diroot.org.
+[![Chat - xmpp](https://img.shields.io/badge/chat-on%20xmpp-blue.svg)](xmpp:disroot@chat.disroot.org?join)
+[![Donate](https://img.shields.io/badge/donate-appreciation-orange.svg)](https://disroot.org/en/donate)
+[![Donate LiberaPay](https://img.shields.io/badge/donate-liberapay-orange.svg)](https://liberapay.com/Disroot)
 
-*Link to source:*
-...
+---
+#Disroot app
+Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.  
+This app is like your Swiss Army knife to the Disroot platform, made by the community for the community.  
+If you don't have a Disroot account you can still use this  app to access all the Disroot services that do not require an account:  
+* Etherpad
+* Ethercalc
+* Private bin
+* Upload
+* Poll
+* Searx
+* Diaspora* (requires a Diaspora only account)   
 
-*Link to APK:*
-...
+The app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google's Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it [here](https://f-droid.org/FDroid.apk).
 
+---
+### Licensing
 Licence GPLv3-only (see licence on source above)
 
-Requiriments:
+#### Device Requirements
 Android 4.1 or +
-4 MB free on Smartphone
+6 MB free on Smartphone
+
+---
+### Privacy & Permissions<a name="privacy"></a>
+This app requires access to the Internet and to external storage to be able to upload and download files.
+
+---
+###contributors
+The project is always open for contributions and accepts pull requests.
+* Massimiliano
+* muppeth
+* antilopa
+* Fede
+* Maryjane
+* meaz
+
+---
+#### Resources
+* Project: [Issues level/beginner](https://git.fosscommunity.in/disroot/disapp/issues) | [License](https://git.fosscommunity.in/disroot/disapp/blob/master/LICENCE.txt)
+* Disroot: [Web](https://disroot.org) | [git](https://git.fosscommunity.in/disroot) | [Hubzilla Channel](https://hub.disroot.org/channel/disroot)
+* F-droid: Not there yet.
 
-###Developed by:
+---
+### Screenshots
+![Screenshot1](app/src/main/assets/screen1.png)![Screenshot2](app/src/main/assets/screen2.png)![Screenshot3](app/src/main/assets/screen3.png)
 
-* Massimiliano:
+---
+### Maintainers
+- Disroot ([git](https://git.fosscommunity.in/disroot), [Web](https://disroot.org), [Hubzilla](https://hub.disroot.org/channel/disroot))
diff --git a/app/src/main/assets/screen1.png b/app/src/main/assets/screen1.png
new file mode 100644
index 0000000000000000000000000000000000000000..76876e5308c7df9d298f00f91681c34152c11ead
Binary files /dev/null and b/app/src/main/assets/screen1.png differ
diff --git a/app/src/main/assets/screen2.png b/app/src/main/assets/screen2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d121b3fb2e6b91f7627666d711bdc16c9fa63f0
Binary files /dev/null and b/app/src/main/assets/screen2.png differ
diff --git a/app/src/main/assets/screen3.png b/app/src/main/assets/screen3.png
new file mode 100644
index 0000000000000000000000000000000000000000..437c04c01fe9711ea98c406ea2700bcec5517353
Binary files /dev/null and b/app/src/main/assets/screen3.png differ
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1c9369f67995d81203519a691dd04ff46216c115..e59ceac056ef73afa98026d66461930c332e5b4b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -34,7 +34,7 @@
     <string name="MailInfoTitle">Configuración de Correo:</string>
     <string name="MailInfo">IMAP: disroot.org\nSSL Puerto: 993\nAutenticación: Contraseña normal\nSMTP: disroot.org\nSTARTTLS Puerto: 587\nAuthentication: Contraseña normal\nPOP: disroot.org\nSSL Puerto: 995\nAutenticación: Contraseña normal</string>
     <string name="CloudInfoTitle">Configuración de Nextcloud:</string>
-    <string name="CloudInfo">Sincroniza y comparte tus archivos, calendarios, contactos y más.\nUsuario: tu_usuario@disroot.org\nContraseña:tu_contraseña_de_Disroot.</string>
+    <string name="CloudInfo">Sincroniza y comparte tus archivos, calendarios, contactos y más.\nUsuario: tu_usuario_de_disroot@disroot.org\nContraseña:tu_contraseña_de_Disroot.</string>
     <string name="WelcomeTitle">Bienvenid@</string>
     <string name="WelcomeInfo">Disroot es una plataforma que provee servicios en línea basados en los principios de libertad, privacidad, federación y descentralización.\nEsta aplicación es como la navaja suiza de la plataforma, hecha por la comunidad, para la comunidad.\nSi no tienes una cuenta de Disroot, igual puedes usarla para acceder a todos los servicios de Disroot que no requieran de una:\nEtherpad, Ethercalc, Private bin, Upload, Encuentas, Searx y Diaspora* (requiere tener cuenta solo de Diaspora*)\nLa aplicación podría solicitarte la instalación de otras adicionales, y no todas pueden encontrarse en la Tienda de Aplicaciones. Nosotros recomendamos instalar la tienda F-Droid. Si no la tienes, puedes descargarla tocando el logo de F-Droid.\n</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 376b69b0a81a15e9cefed56b152df8057e066b8f..0b2cfbf29f8f9f801f837ce5e97bfaa692227775 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -35,7 +35,7 @@
     <string name="MailInfoTitle">Mail Settings</string>
     <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal Password\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal Password\n\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal Password</string>
     <string name="CloudInfoTitle">Nextcloud Settings</string>
-    <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nUsername:\n your_username@disroot.org\n\nPassword:\n your_disroot_password.</string>
+    <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nUsername:\n your_disroot_username@disroot.org\n\nPassword:\n your_disroot_password.</string>
     <string name="WelcomeTitle">Welcome</string>
     <string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your Swiss Army knife to the Disroot platform, made by the community for the community.\nIf you don\'t have a Disroot account you can still use this  app to access all the Disroot services that do not require an account:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (requires a Diaspora only account)\n\nThe app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google\'s Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it by tapping on the F-droid icon.\n</string>
 
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 376b69b0a81a15e9cefed56b152df8057e066b8f..0b2cfbf29f8f9f801f837ce5e97bfaa692227775 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -35,7 +35,7 @@
     <string name="MailInfoTitle">Mail Settings</string>
     <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal Password\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal Password\n\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal Password</string>
     <string name="CloudInfoTitle">Nextcloud Settings</string>
-    <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nUsername:\n your_username@disroot.org\n\nPassword:\n your_disroot_password.</string>
+    <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nUsername:\n your_disroot_username@disroot.org\n\nPassword:\n your_disroot_password.</string>
     <string name="WelcomeTitle">Welcome</string>
     <string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your Swiss Army knife to the Disroot platform, made by the community for the community.\nIf you don\'t have a Disroot account you can still use this  app to access all the Disroot services that do not require an account:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (requires a Diaspora only account)\n\nThe app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google\'s Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it by tapping on the F-droid icon.\n</string>