diff --git a/README.md b/README.md
index ba1c158..515f6e2 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Beehive for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/beehive.svg)](https://dash.yunohost.org/appci/app/beehive) ![](https://ci-apps.yunohost.org/ci/badges/beehive.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/beehive.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/beehive.svg)](https://dash.yunohost.org/appci/app/beehive) ![Working status](https://ci-apps.yunohost.org/ci/badges/beehive.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/beehive.maintain.svg)  
 [![Install Beehive with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=beehive)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -29,27 +29,29 @@ Beehive is an event and agent system, which allows you to create your own agents
 
 **Shipped version:** 0.4.0~ynh1
 
+
 **Demo:** https://github.com/muesli/beehive/wiki/Available-Hives
 
 ## Screenshots
 
-![](./doc/screenshots/screenshot1.gif)
+![Screenshot of Beehive](./doc/screenshots/screenshot1.gif)
 
 ## Documentation and resources
 
-* Upstream app code repository: https://github.com/muesli/beehive
-* YunoHost documentation for this app: https://yunohost.org/app_beehive
-* Report a bug: https://github.com/YunoHost-Apps/beehive_ynh/issues
+* Upstream app code repository: <https://github.com/muesli/beehive>
+* YunoHost documentation for this app: <https://yunohost.org/app_beehive>
+* Report a bug: <https://github.com/YunoHost-Apps/beehive_ynh/issues>
 
 ## Developer info
 
 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/beehive_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/beehive_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade beehive -u https://github.com/YunoHost-Apps/beehive_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 a3c1dbe..4ed3bb4 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.
+-->
+
 # Beehive pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/beehive.svg)](https://dash.yunohost.org/appci/app/beehive) ![](https://ci-apps.yunohost.org/ci/badges/beehive.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/beehive.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/beehive.svg)](https://dash.yunohost.org/appci/app/beehive) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/beehive.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/beehive.maintain.svg)  
 [![Installer Beehive avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=beehive)
 
 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
 
 > *Ce package vous permet d'installer Beehive 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.*
@@ -23,29 +27,31 @@ Beehive is an event and agent system, which allows you to create your own agents
 - Notify you when a stock's price drops below a certain value
 
 
-**Version incluse :** 0.4.0~ynh1
+**Version incluse :** 0.4.0~ynh1
+
 
 **Démo :** https://github.com/muesli/beehive/wiki/Available-Hives
 
 ## Captures d'écran
 
-![](./doc/screenshots/screenshot1.gif)
+![Capture d'écran de Beehive](./doc/screenshots/screenshot1.gif)
 
 ## Documentations et ressources
 
-* Dépôt de code officiel de l'app : https://github.com/muesli/beehive
-* Documentation YunoHost pour cette app : https://yunohost.org/app_beehive
-* Signaler un bug : https://github.com/YunoHost-Apps/beehive_ynh/issues
+* Dépôt de code officiel de l'app : <https://github.com/muesli/beehive>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_beehive>
+* Signaler un bug : <https://github.com/YunoHost-Apps/beehive_ynh/issues>
 
 ## Informations pour les développeurs
 
 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/beehive_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/beehive_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade beehive -u https://github.com/YunoHost-Apps/beehive_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>