diff --git a/README.md b/README.md
index a4c2413..f2b2251 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Emoncms for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![Working status](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg)  
 [![Install Emoncms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -21,28 +21,28 @@ Emoncms is an open-source web application for processing, logging and visualisin
 **Shipped version:** 10.8.5~ynh1
 
 
-
 ## Screenshots
 
-![](./doc/screenshots/emoncms_graphic.png)
+![Screenshot of Emoncms](./doc/screenshots/emoncms_graphic.png)
 
 ## Documentation and resources
 
-* Official app website: https://emoncms.org/
-* Official admin documentation: https://guide.openenergymonitor.org/
-* Upstream app code repository: https://github.com/emoncms/emoncms
-* YunoHost documentation for this app: https://yunohost.org/app_emoncms
-* Report a bug: https://github.com/YunoHost-Apps/emoncms_ynh/issues
+* Official app website: <https://emoncms.org/>
+* Official admin documentation: <https://guide.openenergymonitor.org/>
+* Upstream app code repository: <https://github.com/emoncms/emoncms>
+* YunoHost documentation for this app: <https://yunohost.org/app_emoncms>
+* Report a bug: <https://github.com/YunoHost-Apps/emoncms_ynh/issues>
 
 ## Developer info
 
 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade emoncms -u https://github.com/YunoHost-Apps/emoncms_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 bd36d46..0004f22 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.
+-->
+
 # Emoncms pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/emoncms.svg)](https://dash.yunohost.org/appci/app/emoncms) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/emoncms.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/emoncms.maintain.svg)  
 [![Installer Emoncms avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=emoncms)
 
 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
 
 > *Ce package vous permet d'installer Emoncms 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.*
@@ -14,31 +18,31 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 Emoncms is an open-source web application for processing, logging and visualising energy, temperature and other environmental data and is part of the OpenEnergyMonitor project.
 
 
-**Version incluse :** 10.8.5~ynh1
-
+**Version incluse :** 10.8.5~ynh1
 
 
 ## Captures d'écran
 
-![](./doc/screenshots/emoncms_graphic.png)
+![Capture d'écran de Emoncms](./doc/screenshots/emoncms_graphic.png)
 
 ## Documentations et ressources
 
-* Site officiel de l'app : https://emoncms.org/
-* Documentation officielle de l'admin : https://guide.openenergymonitor.org/
-* Dépôt de code officiel de l'app : https://github.com/emoncms/emoncms
-* Documentation YunoHost pour cette app : https://yunohost.org/app_emoncms
-* Signaler un bug : https://github.com/YunoHost-Apps/emoncms_ynh/issues
+* Site officiel de l'app : <https://emoncms.org/>
+* Documentation officielle de l'admin : <https://guide.openenergymonitor.org/>
+* Dépôt de code officiel de l'app : <https://github.com/emoncms/emoncms>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_emoncms>
+* Signaler un bug : <https://github.com/YunoHost-Apps/emoncms_ynh/issues>
 
 ## Informations pour les développeurs
 
 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/emoncms_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade emoncms -u https://github.com/YunoHost-Apps/emoncms_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>