diff --git a/README.md b/README.md
index ccec91e..46da2a6 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Shaarli for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/shaarli.svg)](https://dash.yunohost.org/appci/app/shaarli) ![](https://ci-apps.yunohost.org/ci/badges/shaarli.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/shaarli.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/shaarli.svg)](https://dash.yunohost.org/appci/app/shaarli) ![Working status](https://ci-apps.yunohost.org/ci/badges/shaarli.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/shaarli.maintain.svg)  
 [![Install Shaarli with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=shaarli)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -30,13 +30,13 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i
 - feed other blogs, aggregators, social networks...
 
 
-**Shipped version:** 0.12.1~ynh3
+**Shipped version:** 0.12.1~ynh4
 
 **Demo:** https://demo.shaarli.org/
 
 ## Screenshots
 
-![](./doc/screenshots/27wYsbC.png)
+![Screenshot of Shaarli](./doc/screenshots/27wYsbC.png)
 
 ## Disclaimers / important information
 
@@ -47,20 +47,21 @@ During the installation app will prompt you to install itself as public or priva
 After the installation is complete, go to the domain where the Shaarli is installed and create your account. After the creation of the account the registration will be locked.
 ## Documentation and resources
 
-* Official admin documentation: https://shaarli.readthedocs.io/en/master/
-* Upstream app code repository: https://github.com/shaarli/Shaarli
-* YunoHost documentation for this app: https://yunohost.org/app_shaarli
-* Report a bug: https://github.com/YunoHost-Apps/shaarli_ynh/issues
+* Official admin documentation: <https://shaarli.readthedocs.io/en/master/>
+* Upstream app code repository: <https://github.com/shaarli/Shaarli>
+* YunoHost documentation for this app: <https://yunohost.org/app_shaarli>
+* Report a bug: <https://github.com/YunoHost-Apps/shaarli_ynh/issues>
 
 ## Developer info
 
 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/shaarli_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/shaarli_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade shaarli -u https://github.com/YunoHost-Apps/shaarli_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 b2a4c84..795a922 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.
+-->
+
 # Shaarli pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/shaarli.svg)](https://dash.yunohost.org/appci/app/shaarli) ![](https://ci-apps.yunohost.org/ci/badges/shaarli.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/shaarli.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/shaarli.svg)](https://dash.yunohost.org/appci/app/shaarli) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/shaarli.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/shaarli.maintain.svg)  
 [![Installer Shaarli avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=shaarli)
 
 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
 
 > *Ce package vous permet d'installer Shaarli 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.*
@@ -26,13 +30,13 @@ Shaarli is a minimalist bookmark manager and link sharing service that you can i
 - feed other blogs, aggregators, social networks...
 
 
-**Version incluse :** 0.12.1~ynh3
+**Version incluse :** 0.12.1~ynh4
 
 **Démo :** https://demo.shaarli.org/
 
 ## Captures d'écran
 
-![](./doc/screenshots/27wYsbC.png)
+![Capture d'écran de Shaarli](./doc/screenshots/27wYsbC.png)
 
 ## Avertissements / informations importantes
 
@@ -43,20 +47,21 @@ During the installation app will prompt you to install itself as public or priva
 After the installation is complete, go to the domain where the Shaarli is installed and create your account. After the creation of the account the registration will be locked.
 ## Documentations et ressources
 
-* Documentation officielle de l'admin : https://shaarli.readthedocs.io/en/master/
-* Dépôt de code officiel de l'app : https://github.com/shaarli/Shaarli
-* Documentation YunoHost pour cette app : https://yunohost.org/app_shaarli
-* Signaler un bug : https://github.com/YunoHost-Apps/shaarli_ynh/issues
+* Documentation officielle de l'admin : <https://shaarli.readthedocs.io/en/master/>
+* Dépôt de code officiel de l'app : <https://github.com/shaarli/Shaarli>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_shaarli>
+* Signaler un bug : <https://github.com/YunoHost-Apps/shaarli_ynh/issues>
 
 ## Informations pour les développeurs
 
 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/shaarli_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/shaarli_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade shaarli -u https://github.com/YunoHost-Apps/shaarli_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>