diff --git a/README.md b/README.md
index 8bfc6f4..b235348 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Apache Guacamole for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Working status](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg)  
 [![Install Apache Guacamole with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -19,11 +19,9 @@ Clientless remote desktop gateway. It supports standard protocols like VNC, RDP,
 
 **Shipped version:** 1.4.0~ynh1
 
-
-
 ## Screenshots
 
-![](./doc/screenshots/screenshot1.jpg)
+![Screenshot of Apache Guacamole](./doc/screenshots/screenshot1.jpg)
 
 ## Disclaimers / important information
 
@@ -33,21 +31,22 @@ The user that is configured as admin during install will have access to admin se
 
 ## Documentation and resources
 
-* Official app website: https://guacamole.apache.org/
-* Official admin documentation: https://guacamole.apache.org/doc/gug/
-* Upstream app code repository: https://github.com/search?utf8=%E2%9C%93&q=repo%3Aapache%2Fguacamole-server+repo%3Aapache%2Fguacamole-client+repo%3Aapache%2Fguacamole-website&type=Repositories&ref=searchresults
-* YunoHost documentation for this app: https://yunohost.org/app_guacamole
-* Report a bug: https://github.com/YunoHost-Apps/guacamole_ynh/issues
+* Official app website: <https://guacamole.apache.org/>
+* Official admin documentation: <https://guacamole.apache.org/doc/gug/>
+* Upstream app code repository: <https://github.com/search?utf8=%E2%9C%93&q=repo%3Aapache%2Fguacamole-server+repo%3Aapache%2Fguacamole-client+repo%3Aapache%2Fguacamole-website&type=Repositories&ref=searchresults>
+* YunoHost documentation for this app: <https://yunohost.org/app_guacamole>
+* Report a bug: <https://github.com/YunoHost-Apps/guacamole_ynh/issues>
 
 ## Developer info
 
 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade guacamole -u https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug
 ```
 
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
diff --git a/README_fr.md b/README_fr.md
index 50b7da1..2d326b1 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,10 +1,14 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Apache Guacamole pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/guacamole.svg)](https://dash.yunohost.org/appci/app/guacamole) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/guacamole.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/guacamole.maintain.svg)  
 [![Installer Apache Guacamole avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=guacamole)
 
 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
 
 > *Ce package vous permet d'installer Apache Guacamole rapidement et simplement sur un serveur YunoHost.
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@@ -15,11 +19,9 @@ Service de bureau à distance sans client. Fonctionne avec des protocoles standa
 
 **Version incluse :** 1.4.0~ynh1
 
-
-
 ## Captures d'écran
 
-![](./doc/screenshots/screenshot1.jpg)
+![Capture d'écran de Apache Guacamole](./doc/screenshots/screenshot1.jpg)
 
 ## Avertissements / informations importantes
 
@@ -29,21 +31,22 @@ L'utilisateur choisi comme admin durant le processus d'installation aura accès
 
 ## Documentations et ressources
 
-* Site officiel de l'app : https://guacamole.apache.org/
-* Documentation officielle de l'admin : https://guacamole.apache.org/doc/gug/
-* Dépôt de code officiel de l'app : https://github.com/search?utf8=%E2%9C%93&q=repo%3Aapache%2Fguacamole-server+repo%3Aapache%2Fguacamole-client+repo%3Aapache%2Fguacamole-website&type=Repositories&ref=searchresults
-* Documentation YunoHost pour cette app : https://yunohost.org/app_guacamole
-* Signaler un bug : https://github.com/YunoHost-Apps/guacamole_ynh/issues
+* Site officiel de l'app : <https://guacamole.apache.org/>
+* Documentation officielle de l'admin : <https://guacamole.apache.org/doc/gug/>
+* Dépôt de code officiel de l'app : <https://github.com/search?utf8=%E2%9C%93&q=repo%3Aapache%2Fguacamole-server+repo%3Aapache%2Fguacamole-client+repo%3Aapache%2Fguacamole-website&type=Repositories&ref=searchresults>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_guacamole>
+* Signaler un bug : <https://github.com/YunoHost-Apps/guacamole_ynh/issues>
 
 ## Informations pour les développeurs
 
 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade guacamole -u https://github.com/YunoHost-Apps/guacamole_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>