diff --git a/README-generator/templates/README.md.j2 b/README-generator/templates/README.md.j2
index f368039..11a1f7f 100644
--- a/README-generator/templates/README.md.j2
+++ b/README-generator/templates/README.md.j2
@@ -1,4 +1,4 @@
-{% if manifest.id == "example" %}
+{% if manifest.id == "example" -%}
 # Packaging your an app, starting from this example
 
 - Copy this app before working on it, using the ['Use this template'](https://github.com/YunoHost/example_ynh/generate) button on the Github repo.
@@ -8,9 +8,9 @@
 - Add a `LICENSE` file for the package.
 - Edit `doc/DISCLAIMER*.md`
 - The `README.md` files are to be automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
-{% endif %}
 
 ---
+{% endif -%}
 
 <!--
 N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
@@ -19,42 +19,46 @@ It shall NOT be edited by hand.
 
 # {{manifest.name}} for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/{{manifest.id}}.svg)](https://dash.yunohost.org/appci/app/{{manifest.id}}) ![](https://ci-apps.yunohost.org/ci/badges/{{manifest.id}}.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/{{manifest.id}}.maintain.svg)
-[![Install {{manifest.id}} with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app={{manifest.id}})
+[![Integration level](https://dash.yunohost.org/integration/{{manifest.id}}.svg)](https://dash.yunohost.org/appci/app/{{manifest.id}}) ![](https://ci-apps.yunohost.org/ci/badges/{{manifest.id}}.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/{{manifest.id}}.maintain.svg)  
+[![Install {{manifest.name}} with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app={{manifest.id}})
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install {{manifest.id}} quickly and simply on a YunoHost server.
+> *This package allows you to install {{manifest.name}} quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
 
 {{manifest.description[lang]}}
 
-**Shipped version:** {{manifest.version}}
+**Shipped version:** {% if upstream.version %}{{upstream.version}}{% else %}{{manifest.version}}{% endif %}
 
 {% if upstream.demo %}**Demo:** {{upstream.demo}}{% endif %}
 
-{% if screenshots %}
+{% if screenshots -%}
 ## Screenshots
 
-{% for screenshot in screenshots %}
-   ![](./doc/screenshots/{{screenshot}})
+{% for screenshot in screenshots -%}
+    ![](./doc/screenshots/{{screenshot}})
 {% endfor %}
-{% endif %}
+{% endif -%}
 
-{% if disclaimer %}
+{% if disclaimer -%}
 ## Disclaimers / important information
 
 {{ disclaimer }}
-{% endif %}
+{% endif -%}
 
 ## Documentation and resources
 
-{% if upstream.website %}* Official app website: {{ upstream.website }}{% endif %}
-{% if upstream.userdoc %}* Official user documentation: {{ upstream.userdoc }}{% endif %}
-{% if upstream.admindoc %}* Official admin documentation: {{ upstream.admindoc }}{% endif %}
-{% if upstream.code %}* Upstream app code repository:  {{ upstream.code }}{% endif %}
+{% if upstream.website -%}* Official app website: {{ upstream.website }}
+{% endif -%}
+{% if upstream.userdoc -%}* Official user documentation: {{ upstream.userdoc }}
+{% endif -%}
+{% if upstream.admindoc -%}* Official admin documentation: {{ upstream.admindoc }}
+{% endif -%}
+{% if upstream.code -%}* Upstream app code repository:  {{ upstream.code }}
+{% endif -%}
 * YunoHost documentation for this app: https://yunohost.org/app_{{manifest.id}}
 * Report a bug: https://github.com/YunoHost-Apps/{{manifest.id}}_ynh/issues
 
diff --git a/README-generator/templates/README_fr.md.j2 b/README-generator/templates/README_fr.md.j2
index 5ad17c2..fc137ac 100644
--- a/README-generator/templates/README_fr.md.j2
+++ b/README-generator/templates/README_fr.md.j2
@@ -1,43 +1,47 @@
 # {{manifest.name}} pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/{{manifest.id}}.svg)](https://dash.yunohost.org/appci/app/{{manifest.id}}) ![](https://ci-apps.yunohost.org/ci/badges/{{manifest.id}}.status.svg)  ![](https://ci-apps.yunohost.org/ci/badges/{{manifest.id}}.maintain.svg)
-[![Installer {{manifest.id}} avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app={{manifest.id}})
+[![Niveau d'intégration](https://dash.yunohost.org/integration/{{manifest.id}}.svg)](https://dash.yunohost.org/appci/app/{{manifest.id}}) ![](https://ci-apps.yunohost.org/ci/badges/{{manifest.id}}.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/{{manifest.id}}.maintain.svg)  
+[![Installer {{manifest.name}} avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app={{manifest.id}})
 
 *[Read this readme in english.](./README.md)*
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install {{manifest.id}} quickly and simply on a YunoHost server.
+> *This package allows you to install {{manifest.name}} quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Vue d'ensemble
 
 {{manifest.description[lang]}}
 
-**Version incluse:** {{manifest.version}}
+**Version incluse:** {% if upstream.version %}{{upstream.version}}{% else %}{{manifest.version}}{% endif %}
 
-{% if upstream.demo %}**Démo:** {{upstream.demo}}{% endif %}
+{% if upstream.demo %}**Démo :** {{upstream.demo}}{% endif %}
 
-{% if screenshots %}
+{% if screenshots -%}
 ## Captures d'écran
 
-{% for screenshot in screenshots %}
-   ![](./doc/screenshots/{{screenshot}})
+{% for screenshot in screenshots -%}
+    ![](./doc/screenshots/{{screenshot}})
 {% endfor %}
-{% endif %}
+{% endif -%}
 
-{% if disclaimer %}
+{% if disclaimer -%}
 ## Avertissements / informations importantes
 
 {{ disclaimer }}
-{% endif %}
+{% endif -%}
 
 ## Documentations et ressources
 
-{% if upstream.website %}* Site official de l'app : {{ upstream.website }}{% endif %}
-{% if upstream.userdoc %}* Documentation officielle utilisateur: {{ upstream.userdoc }}{% endif %}
-{% if upstream.admindoc %}* Documentation officielle de l'admin: {{ upstream.admindoc }}{% endif %}
-{% if upstream.code %}* Dépôt de code officiel de l'app:  {{ upstream.code }}{% endif %}
-* Documentation YunoHost pour cette app: https://yunohost.org/app_{{manifest.id}}
+{% if upstream.website -%}* Site officiel de l'app : {{ upstream.website }}
+{% endif -%}
+{% if upstream.userdoc -%}* Documentation officielle utilisateur : {{ upstream.userdoc }}
+{% endif -%}
+{% if upstream.admindoc -%}* Documentation officielle de l'admin : {{ upstream.admindoc }}
+{% endif -%}
+{% if upstream.code -%}* Dépôt de code officiel de l'app :  {{ upstream.code }}
+{% endif -%}
+* Documentation YunoHost pour cette app : https://yunohost.org/app_{{manifest.id}}
 * Signaler un bug: https://github.com/YunoHost-Apps/{{manifest.id}}_ynh/issues
 
 ## Informations pour les développeurs