diff --git a/README.md b/README.md
index 7d0c92e..77c0e28 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
-# Yellow CMS for YunoHost
+# Yellow for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/yellowcms.svg)](https://dash.yunohost.org/appci/app/yellowcms) ![](https://ci-apps.yunohost.org/ci/badges/yellowcms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yellowcms.maintain.svg)  
-[![Install Yellowcms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=yellowcms)
+[![Integration level](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)  
+[![Install Yellow with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=yellow)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install Yellow CMS quickly and simply on a YunoHost server.  
+> *This package allows you to install Yellow 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
-Yellow is a CMS designed to make the creation of a website ultra-simple and easy to use. Yellow CMS does not require a database.
+Yellow is a CMS (Content management system) designed to make the creation of a website ultra-simple and easy to use. Yellow does not require a database.
 
 **Shipped version:** 0.8.16
 
@@ -23,7 +23,7 @@ Yellow is a CMS designed to make the creation of a website ultra-simple and easy
 
 ## Configuration
 
-How to configure this app: From an admin panel, a plain file with SSH, or any other way.
+* How to configure this app: From an admin panel.
 
 ## Documentation
 
@@ -34,13 +34,13 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot
 
 #### Multi-user support
 
-* Are LDAP and HTTP auth supported?
-* Can the app be used by multiple users?
+* Are LDAP and HTTP auth supported? **No**
+* Can the app be used by multiple users? **Yes**
 
 #### Supported architectures
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/yellowcms%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/yellowcms/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/yellowcms%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/yellowcms/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/yellow%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/yellow%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/yellow/)
 
 ## Limitations
 
@@ -52,7 +52,7 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot
 
 ## Links
 
- * Report a bug: https://github.com/YunoHost-Apps/yellowcms_ynh/issues
+ * Report a bug: https://github.com/YunoHost-Apps/yellow_ynh/issues
  * App website: https://datenstrom.se/
  * Upstream app repository: https://github.com/datenstrom/yellow/
  * YunoHost website: https://yunohost.org/
@@ -61,11 +61,11 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot
 
 ## Developer info
 
-Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/yellowcms_ynh/tree/testing).
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/yellow_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
 ```
-sudo yunohost app install https://github.com/YunoHost-Apps/yellowcms_ynh/tree/testing --debug
+sudo yunohost app install https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug
 or
-sudo yunohost app upgrade yellowcms -u https://github.com/YunoHost-Apps/yellowcms_ynh/tree/testing --debug
+sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug
 ```
diff --git a/README_fr.md b/README_fr.md
new file mode 100644
index 0000000..4b8dce6
--- /dev/null
+++ b/README_fr.md
@@ -0,0 +1,71 @@
+# Yellow pour YunoHost
+
+[![Niveau d'intégration](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)  
+[![Installer Yellow avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=yellow)
+
+*[Read this readme in english.](./README.md)* 
+
+> *Ce package vous permet d'installer Yellow rapidement et simplement sur un serveur YunoHost.  
+Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+
+## Vue d'ensemble
+Yellow est un CMS (Système de gestion de contenu) conçu pour rendre la création d'un site internet ultra-simple et facile à utiliser. Le jaune ne nécessite pas de base de données.
+
+**Version incluse :** 0.8.16
+
+## Captures d'écran
+
+![](https://datenstrom.se/media/images/datenstrom-yellow-en.png)
+
+## Démo
+
+* [Démo officielle](https://datenstrom.se/yellow/demo/)
+
+## Configuration
+
+* Comment configurer cette application : via le panneau d'administration.
+
+## Documentation
+
+ * Documentation officielle : https://datenstrom.se/yellow/help/
+ * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer.
+
+## Caractéristiques spécifiques YunoHost
+
+#### Support multi-utilisateur
+
+* L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
+* L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui**
+
+#### Architectures supportées
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/yellow%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/yellow%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/yellow/)
+
+## Limitations
+
+* Limitations connues.
+
+## Informations additionnelles
+
+* Autres informations que vous souhaitez ajouter sur cette application.
+
+## Liens
+
+ * Signaler un bug : https://github.com/YunoHost-Apps/yellow_ynh/issues
+ * Site de l'application : https://datenstrom.se/
+ * Dépôt de l'application principale : https://github.com/datenstrom/yellow/
+ * Site web YunoHost : https://yunohost.org/
+
+---
+
+## Informations pour les développeur
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/yellow_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug
+```
diff --git a/issue_template.md b/issue_template.md
index 9082891..d0f2bbb 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide
 
 - *If you performed a command from the CLI, the command itself is enough. For example:*
     ```sh
-    sudo yunohost app install yellowcsm
+    sudo yunohost app install yellow
     ```
 - *If you used the webadmin, please perform the equivalent command from the CLI first.*
 - *If the error occurs in your browser, explain what you did:*
diff --git a/manifest.json b/manifest.json
index a47d2d2..2440e79 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,18 +1,16 @@
 {
-    "name": "Yellow CMS",
-    "id": "yellowcms",
+    "name": "Yellow",
+    "id": "yellow",
     "packaging_format": 1,
     "description": {
-        "en": "CMS for simple website",
-        "fr": "CMS pour un site simple"
+        "en": "Système de gestion de contenu (CMS) for simple website",
+        "fr": "Content management system (CMS) pour un site simple"
     },
     "version": "0.8.16~ynh1",
     "url": "https://datenstrom.se/yellow/",
     "license": "GPL-2.0-only",
     "maintainer": {
-        "name": "John doe",
-        "email": "john.doe@example.com",
-        "url": "http://example.com"
+        "name": ""
     },
     "requirements": {
         "yunohost": ">> 3.8.1"
@@ -28,8 +26,8 @@
                 "name": "domain",
                 "type": "domain",
                 "ask": {
-                    "en": "Choose a domain name for Yellow CMS",
-                    "fr": "Choisissez un nom de domaine pour Yellow CMS"
+                    "en": "Choose a domain name for Yellow",
+                    "fr": "Choisissez un nom de domaine pour Yellow"
                 },
                 "example": "example.com"
             },
@@ -37,8 +35,8 @@
                 "name": "path",
                 "type": "path",
                 "ask": {
-                    "en": "Choose a path for Yellow CMS",
-                    "fr": "Choisissez un chemin pour Yellow CMS"
+                    "en": "Choose a path for Yellow",
+                    "fr": "Choisissez un chemin pour Yellow"
                 },
                 "example": "/example",
                 "default": "/yellow"
diff --git a/pull_request_template.md b/pull_request_template.md
index 0287f9f..fe5fc0b 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -15,4 +15,4 @@
 ---
 *If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
 
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/REPLACEBYYOURAPP_ynh%20PR-NUM-%20(USERNAME)/)  
+[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/yellow_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/yellow_ynh%20PR-NUM-%20(USERNAME)/)  
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3a32823..a842d34 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 
 YNH_PHP_VERSION="7.3"
 
-extra_php_dependencies="php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-common php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip"
+extra_php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xmlrpc php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-soap php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-zip"
 
 #=================================================
 # PERSONAL HELPERS