diff --git a/README.md b/README.md
index 6c12100..c348900 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ The idea of [æneria](https://aeneria.com) is to display energy consumption and
  * Analyse energy consumption throw weather data
 
 
-**Shipped version:** 1.1.6~ynh4
+**Shipped version:** 1.1.6~ynh5
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index bdfe782..4277f4f 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -16,13 +16,12 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-The idea of [æneria](https://aeneria.com) is to display energy consumption and weather data on a little dashboard that allow the user to:
+L'idée de [æneria](https://aeneria.com) est d'afficher la consommation d'énergie et les données météorologiques sur un petit tableau de bord qui permet à l'utilisateur de :
 
- * Better understand our own energy consumption
- * Analyse energy consumption throw weather data
+  * Mieux comprendre sa propre consommation d'énergie
+  * Analyser la consommation d'énergie et les données météorologiques
 
-
-**Version incluse :** 1.1.6~ynh4
+**Version incluse :** 1.1.6~ynh5
 
 ## Captures d’écran
 
diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index 5e41c6b..83bfb0f 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -2,13 +2,5 @@
 
 * First of all, you'll need a Linky and an [Enedis account](https://mon-compte-client.enedis.fr/)
 * In your Enedis space, go to ["Gérer l'accès à mes données"](https://mon-compte-particulier.enedis.fr/donnees/) tab, and allow Enedis to collect and store your hourly consumption
-* After that, install æneria to your Yunohost instance, visit it and just follow instructions
-* That's it, now wait a bit to see data appear !
-
-## Comming from Pilea
-
-æneria is the new name of Pilea. This new name came whith a brand new version.
-
-This new version introduced some breaking changes in data structure: migration from Pilea can't be done automaticly.
-
-But don't worry, you can easilly transfer your data from Pilea to æneria following [this documentation](https://docs.aeneria.com/fr/latest/administrateur/pilea_migration.html).
+* After that, install æneria to your YunoHost instance, visit it and just follow instructions
+* That's it, now wait a bit to see data appear!
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
new file mode 100644
index 0000000..4164af3
--- /dev/null
+++ b/doc/ADMIN_fr.md
@@ -0,0 +1,6 @@
+## Configuration
+
+* Tout d'abord, vous aurez besoin d'un Linky et d'un [compte Enedis](https://mon-compte-client.enedis.fr/)
+* Dans votre espace Enedis, rendez-vous dans l'onglet ["Gérer l'accès à mes données"](https://mon-compte-particulier.enedis.fr/donnees/), et permettez à Enedis de collecter et stocker votre consommation horaire
+* Après cela, installez æneria sur votre instance YunoHost, visitez-la et suivez simplement les instructions
+* Ça y est, attendez maintenant un peu pour voir les données apparaître !
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..b370097
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1,4 @@
+L'idée de [æneria](https://aeneria.com) est d'afficher la consommation d'énergie et les données météorologiques sur un petit tableau de bord qui permet à l'utilisateur de :
+
+  * Mieux comprendre sa propre consommation d'énergie
+  * Analyser la consommation d'énergie et les données météorologiques
\ No newline at end of file
diff --git a/hooks/post_app_addaccess b/hooks/post_app_addaccess
index 19d6a19..cc14389 100644
--- a/hooks/post_app_addaccess
+++ b/hooks/post_app_addaccess
@@ -12,7 +12,7 @@ source /etc/yunohost/apps/$app/scripts/_common.sh
 usernames=$2
 permission=$3
 groups=$4
-final_path=$(ynh_app_setting_get "$app" final_path)
+install_dir=$(ynh_app_setting_get "$app" install_dir)
 phpversion=$(ynh_app_setting_get "$app" phpversion)
 
 IFS=',' read -r -a user_list <<< "$usernames"
@@ -25,7 +25,7 @@ do
     user_list+=("${group_array[@]}")
 done
 
-pushd $final_path
+pushd $install_dir
     for user in "${user_list[@]}"
     do
         mail=$(ynh_user_get_info --username="$user" --key=mail)
diff --git a/hooks/post_app_removeaccess b/hooks/post_app_removeaccess
index 9fdd591..af784b5 100644
--- a/hooks/post_app_removeaccess
+++ b/hooks/post_app_removeaccess
@@ -12,7 +12,7 @@ source /etc/yunohost/apps/$app/scripts/_common.sh
 usernames=$2
 permission=$3
 groups=$4
-final_path=$(ynh_app_setting_get "$app" final_path)
+install_dir=$(ynh_app_setting_get "$app" install_dir)
 phpversion=$(ynh_app_setting_get "$app" phpversion)
 
 IFS=',' read -r -a user_list <<< "$usernames"
@@ -28,5 +28,5 @@ done
 for user in "${user_list[@]}"
 do
     mail=$(ynh_user_get_info --username="$user" --key=mail)
-    cd "$final_path" && ynh_exec_as $app php$phpversion bin/console aeneria:user:deactivate "$mail" -n
+    cd "$install_dir" && ynh_exec_as $app php$phpversion bin/console aeneria:user:deactivate "$mail" -n
 done
diff --git a/manifest.toml b/manifest.toml
index 8b43c6e..d69b9d7 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "æneria"
 description.en = "Dashboard to analyse your energy consumption data from Linky & weather"
 description.fr = "Tableau de bord pour analyser votre consomation d'énergie à partir des données d'un Linky et de la météo"
 
-version = "1.1.6~ynh4"
+version = "1.1.6~ynh5"
 
 maintainers = ["Simon Mellerin"]
 
@@ -19,8 +19,11 @@ code = "https://gitlab.com/aeneria/aeneria-app"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index 984ab85..1fa354e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -28,9 +28,9 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
-# NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
@@ -43,9 +43,9 @@ ynh_add_fpm_config
 #=================================================
 # CONFIGURE AENERIA
 #=================================================
-ynh_script_progression --message="Configuring aeneria..." --weight=1
+ynh_script_progression --message="Configuring $app..." --weight=1
 
-ynh_add_config --template="../conf/.env" --destination="$install_dir/.env"
+ynh_add_config --template=".env" --destination="$install_dir/.env"
 
 # Restrict rights to aeneria user only
 chmod 600 "$install_dir/.env"
diff --git a/scripts/remove b/scripts/remove
index a18a484..b88f6a3 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,9 +10,9 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# REMOVE NGINX CONFIGURATION
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
diff --git a/scripts/restore b/scripts/restore
index a3a07d4..3c6e57d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -27,10 +27,12 @@ ynh_script_progression --message="Restoring the PSQL database..." --weight=1
 
 ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
+#=================================================
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
 # Restore the file first, so it can have a backup if different
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
diff --git a/scripts/upgrade b/scripts/upgrade
index 03fac98..bea1232 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -58,9 +58,9 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
-# NGINX CONFIGURATION
+# REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config