diff --git a/README.md b/README.md
index 44f3f34..7fb04cd 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Automad for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/automad.svg)](https://dash.yunohost.org/appci/app/automad) ![](https://ci-apps.yunohost.org/ci/badges/automad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/automad.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/automad.svg)](https://dash.yunohost.org/appci/app/automad) ![Working status](https://ci-apps.yunohost.org/ci/badges/automad.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/automad.maintain.svg)  
 [![Install Automad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=automad)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -23,29 +23,30 @@ A flat-file content management system and template engine
 
 ## Screenshots
 
-![](./doc/screenshots/readme.png)
+![Screenshot of Automad](./doc/screenshots/readme.png)
 
 ## Disclaimers / important information
 
 Create an user account in order to use the browser-based user interface called the Dashboard. Therefore navigate to `https://yoursite.com/dashboard` and follow the instructions.
 ## Documentation and resources
 
-* Official app website: https://automad.org/
-* Official user documentation: https://automad.org/user-guide
-* Official admin documentation: https://automad.org/getting-started
-* Upstream app code repository: https://github.com/marcantondahmen/automad
-* YunoHost documentation for this app: https://yunohost.org/app_automad
-* Report a bug: https://github.com/YunoHost-Apps/automad_ynh/issues
+* Official app website: <https://automad.org/>
+* Official user documentation: <https://automad.org/user-guide>
+* Official admin documentation: <https://automad.org/getting-started>
+* Upstream app code repository: <https://github.com/marcantondahmen/automad>
+* YunoHost documentation for this app: <https://yunohost.org/app_automad>
+* Report a bug: <https://github.com/YunoHost-Apps/automad_ynh/issues>
 
 ## Developer info
 
 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/automad_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/automad_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade automad -u https://github.com/YunoHost-Apps/automad_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 5e603f1..dfe4e9d 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.
+-->
+
 # Automad pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/automad.svg)](https://dash.yunohost.org/appci/app/automad) ![](https://ci-apps.yunohost.org/ci/badges/automad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/automad.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/automad.svg)](https://dash.yunohost.org/appci/app/automad) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/automad.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/automad.maintain.svg)  
 [![Installer Automad avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=automad)
 
 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
 
 > *Ce package vous permet d'installer Automad 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.*
@@ -19,29 +23,30 @@ A flat-file content management system and template engine
 
 ## Captures d'écran
 
-![](./doc/screenshots/readme.png)
+![Capture d'écran de Automad](./doc/screenshots/readme.png)
 
 ## Avertissements / informations importantes
 
 Create an user account in order to use the browser-based user interface called the Dashboard. Therefore navigate to `https://yoursite.com/dashboard` and follow the instructions.
 ## Documentations et ressources
 
-* Site officiel de l'app : https://automad.org/
-* Documentation officielle utilisateur : https://automad.org/user-guide
-* Documentation officielle de l'admin : https://automad.org/getting-started
-* Dépôt de code officiel de l'app : https://github.com/marcantondahmen/automad
-* Documentation YunoHost pour cette app : https://yunohost.org/app_automad
-* Signaler un bug : https://github.com/YunoHost-Apps/automad_ynh/issues
+* Site officiel de l'app : <https://automad.org/>
+* Documentation officielle utilisateur : <https://automad.org/user-guide>
+* Documentation officielle de l'admin : <https://automad.org/getting-started>
+* Dépôt de code officiel de l'app : <https://github.com/marcantondahmen/automad>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_automad>
+* Signaler un bug : <https://github.com/YunoHost-Apps/automad_ynh/issues>
 
 ## Informations pour les développeurs
 
 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/automad_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/automad_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade automad -u https://github.com/YunoHost-Apps/automad_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>