diff --git a/README.md b/README.md
index 5f6a8f7..ee89a61 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Commento for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/commento.svg)](https://dash.yunohost.org/appci/app/commento) ![](https://ci-apps.yunohost.org/ci/badges/commento.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/commento.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/commento.svg)](https://dash.yunohost.org/appci/app/commento) ![Working status](https://ci-apps.yunohost.org/ci/badges/commento.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/commento.maintain.svg)  
 [![Install Commento with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=commento)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -33,29 +33,31 @@ Commento++ allows you to foster discussion on your website – if you have a blo
 
 **Shipped version:** 1.8.7~ynh1
 
+
 **Demo:** https://demo.souradip.com/chat.html
 
 ## Screenshots
 
-![](./doc/screenshots/Screenshot.png)
+![Screenshot of Commento](./doc/screenshots/Screenshot.png)
 
 ## Documentation and resources
 
-* Official app website: https://commento.io/
-* Official admin documentation: https://docs.commento.io/
-* Upstream app code repository: https://github.com/souramoo/commentoplusplus
-* YunoHost documentation for this app: https://yunohost.org/app_commento
-* Report a bug: https://github.com/YunoHost-Apps/commento_ynh/issues
+* Official app website: <https://commento.io/>
+* Official admin documentation: <https://docs.commento.io/>
+* Upstream app code repository: <https://github.com/souramoo/commentoplusplus>
+* YunoHost documentation for this app: <https://yunohost.org/app_commento>
+* Report a bug: <https://github.com/YunoHost-Apps/commento_ynh/issues>
 
 ## Developer info
 
 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/commento_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/commento_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade commento -u https://github.com/YunoHost-Apps/commento_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 19372ed..4776197 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.
+-->
+
 # Commento pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/commento.svg)](https://dash.yunohost.org/appci/app/commento) ![](https://ci-apps.yunohost.org/ci/badges/commento.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/commento.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/commento.svg)](https://dash.yunohost.org/appci/app/commento) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/commento.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/commento.maintain.svg)  
 [![Installer Commento avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=commento)
 
 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
 
 > *Ce package vous permet d'installer Commento 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.*
@@ -27,31 +31,33 @@ Commento++ allows you to foster discussion on your website – if you have a blo
 - Email notifications.
 
 
-**Version incluse :** 1.8.7~ynh1
+**Version incluse :** 1.8.7~ynh1
+
 
 **Démo :** https://demo.souradip.com/chat.html
 
 ## Captures d'écran
 
-![](./doc/screenshots/Screenshot.png)
+![Capture d'écran de Commento](./doc/screenshots/Screenshot.png)
 
 ## Documentations et ressources
 
-* Site officiel de l'app : https://commento.io/
-* Documentation officielle de l'admin : https://docs.commento.io/
-* Dépôt de code officiel de l'app : https://github.com/souramoo/commentoplusplus
-* Documentation YunoHost pour cette app : https://yunohost.org/app_commento
-* Signaler un bug : https://github.com/YunoHost-Apps/commento_ynh/issues
+* Site officiel de l'app : <https://commento.io/>
+* Documentation officielle de l'admin : <https://docs.commento.io/>
+* Dépôt de code officiel de l'app : <https://github.com/souramoo/commentoplusplus>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_commento>
+* Signaler un bug : <https://github.com/YunoHost-Apps/commento_ynh/issues>
 
 ## Informations pour les développeurs
 
 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/commento_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/commento_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade commento -u https://github.com/YunoHost-Apps/commento_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>