diff --git a/README.md b/README.md
index a029ecc..5fc6631 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Jappix for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/jappix.svg)](https://dash.yunohost.org/appci/app/jappix) ![](https://ci-apps.yunohost.org/ci/badges/jappix.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jappix.maintain.svg)  
-[![Install Jappix with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=jappix)
+[![Install Jappix with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jappix)
 
 > *This package allows you to install Jappix 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.*
@@ -13,8 +13,8 @@ Jappix is a fully-featured XMPP web-client with an open social platform which en
 
 #### Supported architectures
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/jappix%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jappix/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/jappix%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jappix/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/jappix.svg)](https://ci-apps.yunohost.org/ci/apps/jappix/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/jappix.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jappix/)
 
 ## Links
 
diff --git a/check_process b/check_process
index 01aec69..2033705 100644
--- a/check_process
+++ b/check_process
@@ -17,8 +17,6 @@
 		incorrect_path=0
 		port_already_use=0
 		change_url=0
-;;; Levels
-	Level 5=auto
 ;;; Options
 Email=
 Notification=none
diff --git a/manifest.json b/manifest.json
index 7c7ed2b..d01b7c1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,7 @@
         "email": "titoko@titoko.fr"
     },
     "requirements": {
-        "yunohost": ">> 3.8.1"
+        "yunohost": ">> 4.1.7"
     },
     "multi_instance": false,
     "services": [
@@ -26,19 +26,11 @@
     {
         "name": "domain",
         "type": "domain",
-        "ask": {
-            "en": "Choose a domain for Jappix",
-            "fr": "Choisissez un domaine pour Jappix"
-        },
         "example": "domain.org"
     },
     {
         "name": "path",
         "type": "path",
-        "ask": {
-            "en": "Choose a path for Jappix",
-            "fr": "Choisissez un chemin pour Jappix"
-    },
         "example": "/jappix",
         "default": "/jappix"
     },
diff --git a/scripts/_common.sh b/scripts/_common.sh
index e2ccd11..e065396 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+
+
 #=================================================
 # SETUP
 #=================================================
diff --git a/scripts/install b/scripts/install
index 181884a..dc2f2d9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -77,15 +77,8 @@ ynh_add_nginx_config
 # Set Jappix configuration
 #=================================================
 
-cp ../conf/hosts.xml $final_path/store/conf/hosts.xml
-
-ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$final_path/store/conf/hosts.xml"
-ynh_replace_string --match_string="__FINALPATH__" --replace_string=$final_path --target_file="$final_path/store/conf/hosts.xml"
-
-cp ../conf/main.xml $final_path/store/conf/main.xml
-
-ynh_replace_string --match_string="__LANGUAGE__" --replace_string=$language --target_file="$final_path/store/conf/main.xml"
-ynh_replace_string --match_string="__NAME__" --replace_string=$name --target_file="$final_path/store/conf/main.xml"
+ynh_add_config --template="../conf/hosts.xml" --destination="$final_path/store/conf/hosts.xml"
+ynh_add_config --template="../conf/main.xml" --destination="$final_path/store/conf/main.xml"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/remove b/scripts/remove
index 9aaf8e0..d75fc80 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -30,7 +30,7 @@ ynh_secure_remove --file=$final_path
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing nginx web server configuration..." --weight=1
+ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
 
 # Remove the dedicated nginx config
 ynh_remove_nginx_config
diff --git a/scripts/restore b/scripts/restore
index df9bac5..359d7a9 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -56,7 +56,7 @@ ynh_restore_file --origin_path=$final_path
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --weight=1
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index fd72886..b6aa826 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -81,7 +81,7 @@ chown -R www-data: $final_path
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=1
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
 
 # Create a dedicated nginx config
 ynh_add_nginx_config
@@ -90,15 +90,8 @@ ynh_add_nginx_config
 # Set Jappix configuration
 #=================================================
 
-cp ../conf/hosts.xml $final_path/store/conf/hosts.xml
-
-ynh_replace_string --match_string="__DOMAIN__" --replace_string=$domain --target_file="$final_path/store/conf/hosts.xml"
-ynh_replace_string --match_string="__FINALPATH__" --replace_string=$final_path --target_file="$final_path/store/conf/hosts.xml"
-
-cp ../conf/main.xml $final_path/store/conf/main.xml
-
-ynh_replace_string --match_string="__LANGUAGE__" --replace_string=$language --target_file="$final_path/store/conf/main.xml"
-ynh_replace_string --match_string="__NAME__" --replace_string=$name --target_file="$final_path/store/conf/main.xml"
+ynh_add_config --template="../conf/hosts.xml" --destination="$final_path/store/conf/hosts.xml"
+ynh_add_config --template="../conf/main.xml" --destination="$final_path/store/conf/main.xml"
 
 #=================================================
 # RELOAD NGINX