diff --git a/README.md b/README.md
index c20fe98..db1fdc9 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Tiki for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/tiki.svg)](https://dash.yunohost.org/appci/app/tiki) ![](https://ci-apps.yunohost.org/ci/badges/tiki.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/tiki.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/tiki.svg)](https://dash.yunohost.org/appci/app/tiki) ![Working status](https://ci-apps.yunohost.org/ci/badges/tiki.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/tiki.maintain.svg)  
 [![Install Tiki with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiki)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -23,7 +23,7 @@ TikiWiki, is a free and open source wiki-based online content management system
 
 ## Screenshots
 
-![](./doc/screenshots/Screenshot.png)
+![Screenshot of Tiki](./doc/screenshots/Screenshot.png)
 
 ## Disclaimers / important information
 
@@ -38,21 +38,22 @@ To ease the install process and first access, Tiki saves your uploaded files (of
 In that case, consider switching from "Store to database" to "Store to directory", which you will find in the Configuration Wizard. Please use this preset path directory: `/home/yunohost.app/tiki`. You will be able to migrate your currently uploaded files from one to the other.
 ## Documentation and resources
 
-* Official app website: https://tiki.org/
-* Official admin documentation: https://doc.tiki.org
-* Upstream app code repository: https://gitlab.com/tikiwiki/tiki/
-* YunoHost documentation for this app: https://yunohost.org/app_tiki
-* Report a bug: https://github.com/YunoHost-Apps/tiki_ynh/issues
+* Official app website: <https://tiki.org/>
+* Official admin documentation: <https://doc.tiki.org>
+* Upstream app code repository: <https://gitlab.com/tikiwiki/tiki/>
+* YunoHost documentation for this app: <https://yunohost.org/app_tiki>
+* Report a bug: <https://github.com/YunoHost-Apps/tiki_ynh/issues>
 
 ## Developer info
 
 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/tiki_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/tiki_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade tiki -u https://github.com/YunoHost-Apps/tiki_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 1b804be..06f4d6a 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.
+-->
+
 # Tiki pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/tiki.svg)](https://dash.yunohost.org/appci/app/tiki) ![](https://ci-apps.yunohost.org/ci/badges/tiki.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/tiki.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/tiki.svg)](https://dash.yunohost.org/appci/app/tiki) ![Status du fonctionnement](https://ci-apps.yunohost.org/ci/badges/tiki.status.svg) ![Status de maintenance](https://ci-apps.yunohost.org/ci/badges/tiki.maintain.svg)  
 [![Installer Tiki avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiki)
 
 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
 
 > *Ce package vous permet d'installer Tiki 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,7 +23,7 @@ TikiWiki, est un système de gestion de contenu et une suite bureautique en lign
 
 ## Captures d'écran
 
-![](./doc/screenshots/Screenshot.png)
+![Capture d'écran de Tiki](./doc/screenshots/Screenshot.png)
 
 ## Avertissements / informations importantes
 
@@ -34,21 +38,22 @@ To ease the install process and first access, Tiki saves your uploaded files (of
 In that case, consider switching from "Store to database" to "Store to directory", which you will find in the Configuration Wizard. Please use this preset path directory: `/home/yunohost.app/tiki`. You will be able to migrate your currently uploaded files from one to the other.
 ## Documentations et ressources
 
-* Site officiel de l'app : https://tiki.org/
-* Documentation officielle de l'admin : https://doc.tiki.org
-* Dépôt de code officiel de l'app : https://gitlab.com/tikiwiki/tiki/
-* Documentation YunoHost pour cette app : https://yunohost.org/app_tiki
-* Signaler un bug : https://github.com/YunoHost-Apps/tiki_ynh/issues
+* Site officiel de l'app : <https://tiki.org/>
+* Documentation officielle de l'admin : <https://doc.tiki.org>
+* Dépôt de code officiel de l'app : <https://gitlab.com/tikiwiki/tiki/>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_tiki>
+* Signaler un bug : <https://github.com/YunoHost-Apps/tiki_ynh/issues>
 
 ## Informations pour les développeurs
 
 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/tiki_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/tiki_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade tiki -u https://github.com/YunoHost-Apps/tiki_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>