diff --git a/conf/hibernate.cfg.xml b/conf/hibernate.cfg.xml
index 7913339..d04fa8b 100644
--- a/conf/hibernate.cfg.xml
+++ b/conf/hibernate.cfg.xml
@@ -17,6 +17,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
+<!-- WARNING: Don't edit this file. All change will be removed after each app upgrade -->
 <hibernate-configuration>
     <session-factory>
         <!--  Please refer to the installation guide on
diff --git a/conf/xwiki.cfg b/conf/xwiki.cfg
index 0113768..53bc1d0 100644
--- a/conf/xwiki.cfg
+++ b/conf/xwiki.cfg
@@ -18,6 +18,8 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+# WARNING: Don't edit this file. All change will be removed after each app upgrade
+
 #---------------------------------------
 # Preamble
 #
diff --git a/conf/xwiki.properties b/conf/xwiki.properties
index cabd93d..fb0071d 100644
--- a/conf/xwiki.properties
+++ b/conf/xwiki.properties
@@ -18,6 +18,8 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
 
+# WARNING: Don't edit this file. All change will be removed after each app upgrade
+
 # This is the new XWiki configuration file. In the future it'll replace the old
 # xwiki.cfg file. However right now it's only used by some XWiki components.
 # As time progresses more and more component will get their configurations from
diff --git a/config_panel.toml.example b/config_panel.toml.example
deleted file mode 100644
index 3b89740..0000000
--- a/config_panel.toml.example
+++ /dev/null
@@ -1,295 +0,0 @@
-
-## Config panel are available from webadmin > Apps > YOUR_APP > Config Panel Button
-## Those panels let user configure some params on their apps using a friendly interface,
-## and remove the need to manually edit files from the command line.
- 
-## From a packager perspective, this .toml is coupled to the scripts/config script,
-## which may be used to define custom getters/setters. However, most use cases
-## should be covered automagically by the core, thus it may not be necessary
-## to define a scripts/config at all!
- 
-## -----------------------------------------------------------------------------
-## IMPORTANT: In accordance with YunoHost's spirit, please keep things simple and 
-## do not overwhelm the admin with tons of misunderstandable or advanced settings.
-## -----------------------------------------------------------------------------
-
-## The top level describe the entire config panels screen.
-
-## The version is a required property. 
-## Here a small reminder to associate config panel version with YunoHost version
-## | Config | YNH    | Config panel small change log                           |
-## | ------ | ---    | ------------------------------------------------------- |
-## | 0.1    | 3.x    | 0.1 config script not compatible with YNH >= 4.3        |
-## | 1.0    | 4.3.x  | The new config panel system with 'bind' property        |
-version = "1.0"
-
-## (optional) i18n property let you internationalize questions, however this feature 
-## is only available in core configuration panel (like yunohost domain config).
-## So in app config panel this key is ignored for now, but you can internationalize
-## by using a lang dictionary (see property name bellow)
-# i18n = "prefix_translation_key"
-
-################################################################################
-#### ABOUT PANELS
-################################################################################
-
-## The next level describes web admin panels
-## You have to choose an ID for each panel, in this example the ID is "main"
-## Keep in mind this ID will be used in CLI to refer to your question, so choose
-## something short and meaningfull.
-## In the webadmin, each panel corresponds to a distinct tab / form
-[main]
-
-## Define the label for your panel
-## Internationalization works similarly to the 'description' and 'ask' questions in the manifest
-# name.en = "Main configuration"
-# name.fr = "Configuration principale"
-
-## (optional) If you need to trigger a service reload-or-restart after the user
-## change a question in this panel, you can add your service in the list.
-services = ["__APP__"]
-# or services = ["nginx", "__APP__"] to also reload-or-restart nginx
-
-## (optional) This help properties is a short help displayed on the same line
-## than the panel title but not displayed in the tab.
-# help = ""
-    
-    ############################################################################
-    #### ABOUT SECTIONS
-    ############################################################################
-
-    ## A panel is composed of one or several sections.
-    ##
-    ## Sections are meant to group questions together when they correspond to
-    ## a same subtopic. This impacts the rendering in terms of CLI prompts
-    ## and HTML forms
-    ##
-    ## You should choose an ID for your section, and prefix it with the panel ID
-    ## (Be sure to not make a typo in the panel ID, which would implicitly create
-    ## an other entire panel)
-    ##
-    ## We use the context of pepettes_ynh as an example,
-    ## which is a simple donation form app written in python,
-    ## and for which the admin will want to edit the configuration
-    [main.customization]
-
-    ## (optional) Defining a proper title for sections is not mandatory
-    ## and depends on the exact rendering you're aiming for the CLI / webadmin
-    name = ""
-
-    ## (optional) This help properties is a short help displayed on the same line
-    ## than the section title, meant to provide additional details
-    # help = ""
-    
-    ## (optional) As for panel, you can specify to trigger a service 
-    ## reload-or-restart after the user change a question in this section.
-    ## This property is added to the panel property, it doesn't deactivate it.
-    ## So no need to replicate, the service list from panel services property.
-    # services = []
-    
-    ## (optional) By default all questions are optionals, but you can specify a
-    ## default behaviour for question in the section
-    optional = false
-        
-    ## (optional) It's also possible with the 'visible' property to only
-    ## display the section depending on the user's answers to previous questions.
-    ##
-    ## Be careful that the 'visible' property should only refer to **previous** questions
-    ## Hence, it should not make sense to have a "visible" property on the very first section.
-    ##
-    ## Also, keep in mind that this feature only works in the webadmin and not in CLI
-    ## (therefore a user could be prompted in CLI for a question that may not be relevant)
-    # visible = true
-
-        ########################################################################
-        #### ABOUT QUESTIONS
-        ########################################################################
-
-        ## A section is compound of one or several questions.
-
-        ## ---------------------------------------------------------------------
-        ## IMPORTANT: as for panel and section you have to choose an ID, but this
-        ## one should be unique in all this document, even if the question is in
-        ## an other panel.
-        ## ---------------------------------------------------------------------
-        
-        ## You can use same questions types and properties than in manifest.yml 
-        ## install part. However, in YNH 4.3, a lot of change has been made to
-        ## extend availables questions types list.
-        ## See: TODO DOC LINK
-        
-        [main.customization.project_name]
-        
-        ## (required) The ask property is equivalent to the ask property in 
-        ## the manifest. However, in config panels, questions are displayed on the
-        ## left side and therefore have less space to be rendered. Therefore, 
-        ## it is better to use a short question, and use the "help" property to
-        ## provide additional details if necessary.
-        ask.en = "Name of the project"
-
-        ## (required) The type property indicates how the question should be 
-        ## displayed, validated and managed. Some types have specific properties.
-        ## 
-        ## Types available: string, boolean, number, range, text, password, path
-        ## email, url, date, time, color, select, domain, user, tags, file.
-        ##
-        ## For a complete list with specific properties, see: TODO DOC LINK
-        type = "string"
-        
-        ########################################################################
-        #### ABOUT THE BIND PROPERTY
-        ########################################################################
-
-        ## (recommended) 'bind' property is a powerful feature that let you 
-        ## configure how and where the data will be read, validated and written. 
-
-        ## By default, 'bind property is in "settings" mode, it means it will 
-        ## **only** read and write the value in application settings file.
-        ## bind = "settings"
-
-        ## However, settings usually correspond to key/values in actual app configurations
-        ## Hence, a more useful mode is to have bind = ":FILENAME". In that case, YunoHost
-        ## will automagically find a line with "KEY=VALUE" in FILENAME
-        ## (with the adequate separator between KEY and VALUE)
-        ##
-        ## YunoHost will then use this value for the read/get operation.
-        ## During write/set operations, YunoHost will overwrite the value
-        ## in **both** FILENAME and in the app's settings.yml
-
-        ## Configuration file format supported: yaml, toml, json, ini, env, php,
-        ## python. The feature probably works with others formats, but should be tested carefully.
-
-        ## Note that this feature only works with relatively simple cases
-        ## such as `KEY: VALUE`, but won't properly work with
-        ## complex data structures like multilin array/lists or dictionnaries.
-        ## It also doesn't work with XML format, custom config function call, php define(), ...
-
-        ## More info on TODO
-        # bind = ":/var/www/__APP__/settings.py"
-
-
-        ## By default, bind = ":FILENAME" will use the question ID as KEY
-        ## ... but the question ID may sometime not be the exact KEY name in the configuration file.
-        ## 
-        ## In particular, in pepettes, the python variable is 'name' and not 'project_name'
-        ## (c.f. https://github.com/YunoHost-Apps/pepettes_ynh/blob/5cc2d3ffd6529cc7356ff93af92dbb6785c3ab9a/conf/settings.py##L11 )
-        ##
-        ## In that case, the key name can be specified before the column ':'
-        
-        bind = "name:/var/www/__APP__/settings.py"
-
-        ## ---------------------------------------------------------------------
-        ## IMPORTANT: other 'bind' mode exists:
-        ## 
-        ## bind = "FILENAME" (with no column character before FILENAME)
-        ## may be used to bind to the **entire file content** (instead of a single KEY/VALUE)
-        ## This could be used to expose an entire configuration file, or binary files such as images
-        ## For example:
-        ## bind = "/var/www/__APP__/img/logo.png"
-        ##
-        ## bind = "null" can be used to disable reading / writing in settings.
-        ## This creates sort of a "virtual" or "ephemeral" question which is not related to any actual setting
-        ## In this mode, you are expected to define custom getter/setters/validators in scripts/config:
-        ##
-        ## getter: get__QUESTIONID()
-        ## setter: set__QUESTIONID()
-        ## validator: validate__QUESTIONID()
-        ##
-        ## You can also specify a common getter / setter / validator, with the 
-        ## function 'bind' mode, for example here it will try to run 
-        ## get__array_settings() first.
-        #  bind = "array_settings()"
-        ## ---------------------------------------------------------------------
-        
-        ## ---------------------------------------------------------------------
-        ## IMPORTANT: with the exception of bind=null questions,
-        ## question IDs should almost **always** correspond to an app setting
-        ## initialized / reused during install/upgrade.
-        ## Not doing so may result in inconsistencies between the config panel mechanism
-        ## and the use of ynh_add_config
-        ## ---------------------------------------------------------------------
-
-        ########################################################################
-        #### OTHER GENERIC PROPERTY FOR QUESTIONS
-        ########################################################################
-        
-        ## (optional) An help text for the question
-        help = "Fill the name of the project which will received donation"
-
-        ## (optional) An example display as placeholder in web form
-        # example = "YunoHost"
-
-        ## (optional) set to true in order to redact the value in operation logs
-        # redact = false
-
-        ## (optional) A validation pattern
-        ## ---------------------------------------------------------------------
-        ## IMPORTANT: your pattern should be between simple quote, not double.
-        ## ---------------------------------------------------------------------
-        pattern.regexp = '^\w{3,30}$'
-        pattern.error = "The name should be at least 3 chars and less than 30 chars. Alphanumeric chars are accepted"
-
-        ## Note: visible and optional properties are also available for questions
-
-
-        [main.customization.contact_url]
-        ask = "Contact url"
-        type = "url"
-        example = "mailto: contact@example.org"
-        help = "mailto: accepted"
-        pattern.regexp = '^mailto:[^@]+@[^@]+|https://$'
-        pattern.error = "Should be https or mailto:"
-        bind = ":/var/www/__APP__/settings.py"
-
-        [main.customization.logo]
-        ask = "Logo"
-        type = "file"
-        accept = ".png"
-        help = "Fill with an already resized logo"
-        bind = "__INSTALL_DIR__/img/logo.png"
-        
-        [main.customization.favicon]
-        ask = "Favicon"
-        type = "file"
-        accept = ".png"
-        help = "Fill with an already sized favicon"
-        bind = "__INSTALL_DIR__/img/favicon.png"
-
-        
-    [main.stripe]
-    name = "Stripe general info"
-    optional = false
-
-        # The next alert is overwrited with a getter from the config script
-        [main.stripe.amount]
-        ask = "Donation in the month : XX €
-        type = "alert"
-        style = "success"
-
-        [main.stripe.publishable_key]
-        ask = "Publishable key"
-        type = "string"
-        redact = true
-        help = "Indicate here the stripe publishable key"
-        bind = ":/var/www/__APP__/settings.py"
-
-        [main.stripe.secret_key]
-        ask = "Secret key"
-        type = "string"
-        redact = true
-        help = "Indicate here the stripe secret key"
-        bind = ":/var/www/__APP__/settings.py"
-        
-        [main.stripe.prices]
-        ask = "Prices ID"
-        type = "tags"
-        help = """\
-        Indicates here the prices ID of donation products you created in stripe interfaces. \
-        Go on [Stripe products](https://dashboard.stripe.com/products) to create those donation products. \
-        Fill it tag with 'FREQUENCY/CURRENCY/PRICE_ID' \
-        FREQUENCY: 'one_time' or 'recuring' \
-        CURRENCY: 'EUR' or 'USD' \
-        PRICE_ID: ID from stripe interfaces starting with 'price_' \
-        """
-        pattern.regexp = '^(one_time|recuring)/(EUR|USD)/price_.*$'
-        pattern.error = "Please respect the format describe in help text for each price ID"
diff --git a/manifest.toml b/manifest.toml
index afaa05c..006855b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -18,7 +18,8 @@ userdoc = "https://www.xwiki.org/xwiki/bin/view/Documentation/UserGuide/"
 code = "https://github.com/xwiki/xwiki-platform"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.30"
+helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
 
@@ -98,7 +99,6 @@ ram.runtime = "1G"
     allow_email = true
 
     [resources.install_dir]
-    dir = "/opt/yunohost/__APP__"
 
     [resources.data_dir]
     dir = "/home/yunohost.app/__APP__"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 3a91061..cb44bb6 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #=================================================
-# COMMON VARIABLES
+# COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
 
 super_admin_config='#'
@@ -9,13 +9,13 @@ systemd_match_start_line='oxtjl.NotifyListener:main: ---------------------------
 flavor_version='16.3.1'
 ldap_version='9.15.2'
 
-if [ $install_standard_flavor -eq 1 ]; then
+if [ "$install_standard_flavor" -eq 1 ]; then
     distribution_default_ui="distribution.defaultUI=org.xwiki.platform:xwiki-platform-distribution-flavor-mainwiki/$flavor_version"
 else
     distribution_default_ui='#'
 fi
 
-if [ $path == '/' ]; then
+if [ "$path" == '/' ]; then
     install_on_root=true
     path2=''
     path3=''
@@ -27,14 +27,10 @@ else
     web_inf_path="$install_dir/webapps$path/WEB-INF"
 fi
 
-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
 enable_super_admin() {
     super_admin_pwd=$(ynh_string_random)
     super_admin_config="xwiki.superadminpassword=$super_admin_pwd"
-    ynh_add_config --template=xwiki.cfg --destination=/etc/"$app"/xwiki_conf.cfg
+    ynh_config_add --template=xwiki.cfg --destination=/etc/"$app"/xwiki_conf.cfg
     ln -f /etc/"$app"/xwiki_conf.cfg "$web_inf_path"/xwiki.cfg
     chmod 400 /etc/"$app"/xwiki_conf.cfg
     chown "$app:$app" /etc/"$app"/xwiki_conf.cfg
@@ -42,7 +38,7 @@ enable_super_admin() {
 
 disable_super_admin() {
     super_admin_config='#'
-    ynh_add_config --template=xwiki.cfg --destination=/etc/"$app"/xwiki_conf.cfg
+    ynh_config_add --template=xwiki.cfg --destination=/etc/"$app"/xwiki_conf.cfg
     ln -f /etc/"$app"/xwiki_conf.cfg "$web_inf_path"/xwiki.cfg
     chmod 400 /etc/"$app"/xwiki_conf.cfg
     chown "$app:$app" /etc/"$app"/xwiki_conf.cfg
@@ -69,7 +65,7 @@ install_exension() {
     chmod 700 "$temp_dir"
     chown root:root "$temp_dir"
 
-    ynh_add_config --template=install_extensions.xml --destination="$temp_dir"/install_extensions.xml
+    ynh_config_add --template=install_extensions.xml --destination="$temp_dir"/install_extensions.xml
     status_raw=$($curl -i --user "superadmin:$super_admin_pwd" -X PUT -H 'Content-Type: text/xml' "http://127.0.0.1:$port/${path2}rest/jobs?jobType=install&async=true" --upload-file $temp_dir/install_extensions.xml)
     state_request=$(echo "$status_raw" | $xq -x '//jobStatus/ns2:state')
 
@@ -80,17 +76,17 @@ install_exension() {
         state_request=$(echo "$status_raw" | $xq -x '//jobStatus/state')
 
         if [ -z "$state_request" ]; then
-            ynh_die --message="Invalid answer: '$status_raw'"
+            ynh_die "Invalid answer: '$status_raw'"
         elif [ "$state_request" == FINISHED ]; then
             # Check if error happen
             error_msg=$(echo "$status_raw" | $xq -x '//jobStatus/errorMessage')
             if [ -z "$error_msg" ]; then
                 break
             else
-                ynh_die --message="Error while installing extension '$extension_id'. Error: $error_msg"
+                ynh_die "Error while installing extension '$extension_id'. Error: $error_msg"
             fi
         elif [ "$state_request" != RUNNING ]; then
-            ynh_die --message="Invalid status '$state_request'"
+            ynh_die "Invalid status '$state_request'"
         fi
     done
 }
@@ -121,58 +117,50 @@ wait_for_flavor_install() {
 }
 
 install_source() {
-    ynh_setup_source --dest_dir="$install_dir" --full_replace=1
+    ynh_setup_source --dest_dir="$install_dir" --full_replace
     ynh_setup_source --dest_dir="$install_dir"/webapps/xwiki/WEB-INF/lib/ --source_id=jdbc
     ynh_setup_source --dest_dir="$install_dir"/xq_tool --source_id=xq_tool
 
-    ynh_secure_remove --file="$install_dir"/webapps/xwiki/WEB-INF/xwiki.cfg
-    ynh_secure_remove --file="$install_dir"/webapps/xwiki/WEB-INF/xwiki.properties
-    ynh_secure_remove --file="$install_dir"/webapps/root
+    ynh_safe_rm "$install_dir"/webapps/xwiki/WEB-INF/xwiki.cfg
+    ynh_safe_rm "$install_dir"/webapps/xwiki/WEB-INF/xwiki.properties
+    ynh_safe_rm "$install_dir"/webapps/root
 
     ln -s /var/log/"$app" "$install_dir"/logs
 
     if $install_on_root; then
         mv "$install_dir"/webapps/xwiki "$install_dir"/webapps/root
     elif [ "$path" == /root ]; then
-        ynh_die --message='Path "/root" not supported'
+        ynh_die 'Path "/root" not supported'
     elif [ "$path" != /xwiki ]; then
         mv "$install_dir"/webapps/xwiki "$install_dir/webapps$path"
     fi
 }
 
 add_config() {
-    ynh_add_config --template=hibernate.cfg.xml --destination=/etc/"$app"/hibernate.cfg.xml
-    ynh_add_config --template=xwiki.cfg --destination=/etc/"$app"/xwiki_conf.cfg
-    ynh_add_config --template=xwiki.properties --destination=/etc/"$app"/xwiki_conf.properties
+    ynh_config_add --template=hibernate.cfg.xml --destination=/etc/"$app"/hibernate.cfg.xml
+    ynh_config_add --template=xwiki.cfg --destination=/etc/"$app"/xwiki_conf.cfg
+    ynh_config_add --template=xwiki.properties --destination=/etc/"$app"/xwiki_conf.properties
 
     # Note that using /etc/xwiki/xwiki.cfg or /etc/xwiki/xwiki.properties is hard coded on the application
     # And using this break multi instance feature so we must use an other path
     # Note that symlink don't work. So use hard link instead.
-    ln -f /etc/$app/xwiki_conf.cfg "$web_inf_path"/xwiki.cfg
-    ln -f /etc/$app/xwiki_conf.properties "$web_inf_path"/xwiki.properties
+    ln -f /etc/"$app"/xwiki_conf.cfg "$web_inf_path"/xwiki.cfg
+    ln -f /etc/"$app"/xwiki_conf.properties "$web_inf_path"/xwiki.properties
 }
 
 set_permissions() {
-    chmod -R u+rwX,o-rwx "$install_dir"
+    chmod -R u+rwX,g+rX-w,o= "$install_dir"
     chown -R "$app:$app" "$install_dir"
-
     chmod -R u=rwX,g=rX,o= /etc/"$app"
     chown -R "$app:$app" /etc/"$app"
 
     chown "$app:$app" -R /var/log/"$app"
     chmod u=rwX,g=rX,o= -R /var/log/"$app"
 
+    chmod u=rwx,g=rx,o= "$data_dir"
     find "$data_dir" \(   \! -perm -o= \
                     -o \! -user "$app" \
                     -o \! -group "$app" \) \
                 -exec chown "$app:$app" {} \; \
                 -exec chmod u=rwX,g=rX,o= {} \;
 }
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#=================================================
diff --git a/scripts/backup b/scripts/backup
index 7d7515d..65df531 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -1,58 +1,49 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# DECLARE DATA AND CONF FILES TO BACKUP
-#=================================================
-ynh_print_info --message="Declaring files to be backed up..."
+ynh_print_info "Declaring files to be backed up..."
 
 if systemctl is-active "$app" --quiet; then
-    ynh_print_warn --message="It's hightly recommended to make your backup when the service is stopped. Please stop $app service with this command before to run the backup 'systemctl stop $app.service'"
+    ynh_print_warn "It's hightly recommended to make your backup when the service is stopped. Please stop $app service with this command before to run the backup 'systemctl stop $app.service'"
 fi
 
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup --src_path="$install_dir"
-ynh_backup --src_path="/etc/$app"
+ynh_backup "$install_dir"
+ynh_backup "/etc/$app"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
 
-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # BACKUP SYSTEMD
 #=================================================
 
-ynh_backup --src_path="/etc/systemd/system/$app.service"
+ynh_backup "/etc/systemd/system/$app.service"
 
 #=================================================
 # BACKUP DATA
 #=================================================
 
-ynh_backup --src_path="$data_dir" --is_big=1
+ynh_backup "$data_dir"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================
-ynh_print_info --message="Backing up the MySQL database..."
+ynh_print_info "Backing up the MySQL database..."
 
-ynh_psql_dump_db --database="$db_name" > db.sql
+ynh_psql_dump_db > db.sql
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
diff --git a/scripts/change_url b/scripts/change_url
index 1fd1da4..a29a5bc 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -1,37 +1,29 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD MODIFICATIONS
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --weight=1
+ynh_script_progression "Stopping $app's systemd service..."
 
-ynh_systemd_action --service_name="$app" --action=stop
+ynh_systemctl --service="$app" --action=stop
 
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
+ynh_script_progression "Updating NGINX web server configuration..."
 
-ynh_change_url_nginx_config
+ynh_config_change_url_nginx
 
-ynh_script_progression --message="Updating xwiki configuration..." --weight=1
+ynh_script_progression "Updating xwiki configuration..."
 
 if [ "$new_path" != "$old_path" ]; then
     if "$install_on_root"; then
         mv "$install_dir/webapps$old_path" "$install_dir"/webapps/root
     elif [ "$path" == /root ]; then
-        ynh_die --message='Path "/root" not supported'
+        ynh_die 'Path "/root" not supported'
     elif [ $old_path == / ]; then
         mv "$install_dir"/webapps/root "$install_dir/webapps$new_path"
     else
@@ -41,18 +33,16 @@ fi
 add_config
 set_permissions
 
-#=================================================
-# GENERIC FINALISATION
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression "Starting $app's systemd service..."
 
-ynh_systemd_action --service_name="$app" --action=start --log_path=systemd --line_match="$systemd_match_start_line"
+ynh_systemctl --service="$app" --action=start --log_path=systemd --wait_until="$systemd_match_start_line"
 wait_xwiki_started
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for $app" --last
+ynh_script_progression "Change of URL completed for $app"
diff --git a/scripts/config b/scripts/config
deleted file mode 100644
index dca69fb..0000000
--- a/scripts/config
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-# In simple cases, you don't need a config script. 
-
-# With a simple config_panel.toml, you can write in the app settings, in the 
-# upstream config file or replace complete files (logo ...) and restart services.
-
-# The config scripts allows you to go further, to handle specific cases 
-# (validation of several interdependent fields, specific getter/setter for a value,
-# display dynamic informations or choices, pre-loading of config type .cube... ).
-
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-source /usr/share/yunohost/helpers
-
-ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
-
-#=================================================
-# SPECIFIC GETTERS FOR TOML SHORT KEY
-#=================================================
-
-get__amount() {
-    # Here we can imagine to have an API call to stripe to know the amount of donation during a month
-    local amount = 200
-
-    # It's possible to change some properties of the question by overriding it:
-    if [ $amount -gt 100 ]
-    then
-    cat << EOF
-style: success
-value: $amount
-ask:
-  en: A lot of donation this month: **$amount €**
-EOF
-    else
-    cat << EOF
-style: danger
-value: $amount
-ask:
-  en: Not so much donation this month: $amount €
-EOF
-    fi
-}
-
-get__prices() {
-    local prices = "$(grep "DONATION\['" "$install_dir/settings.py" | sed -r "s@^DONATION\['([^']*)'\]\['([^']*)'\] = '([^']*)'@\1/\2/\3@g" | sed -z 's/\n/,/g;s/,$/\n/')"
-    if [ "$prices" == "," ];
-    then
-        # Return YNH_NULL if you prefer to not return a value at all.
-        echo YNH_NULL
-    else
-        echo $prices
-    fi
-}
-
-
-#=================================================
-# SPECIFIC VALIDATORS FOR TOML SHORT KEYS
-#=================================================
-validate__publishable_key() {
-
-    # We can imagine here we test if the key is really a publisheable key
-    (is_secret_key $publishable_key) &&
-        echo 'This key seems to be a secret key'
-}
-
-#=================================================
-# SPECIFIC SETTERS FOR TOML SHORT KEYS
-#=================================================
-set__prices() {
-
-    #---------------------------------------------
-    # IMPORTANT: setter are trigger only if a change is detected
-    #---------------------------------------------
-    for price in $(echo $prices | sed "s/,/ /"); do
-        frequency=$(echo $price | cut -d/ -f1)
-        currency=$(echo $price | cut -d/ -f2)
-        price_id=$(echo $price | cut -d/ -f3)
-        sed "d/DONATION\['$frequency'\]\['$currency'\]" "$install_dir/settings.py"
-
-        echo "DONATION['$frequency']['$currency'] = '$price_id'" >> "$install_dir/settings.py"
-    done
-    
-    #---------------------------------------------
-    # IMPORTANT: to be able to upgrade properly, you have to saved the value in settings too
-    #---------------------------------------------
-    ynh_app_setting_set $app prices $prices
-}
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-ynh_app_config_run $1
diff --git a/scripts/install b/scripts/install
index 287e813..c3b5748 100755
--- a/scripts/install
+++ b/scripts/install
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
@@ -27,14 +21,14 @@ mkdir -p /etc/"$app"
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
-ynh_script_progression --message='Setting up source files...' --weight=1
+ynh_script_progression 'Setting up source files...'
 
 install_source
 
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-ynh_script_progression --message='Adding configuration files...' --weight=1
+ynh_script_progression 'Adding configuration files...'
 
 add_config
 set_permissions
@@ -42,17 +36,17 @@ set_permissions
 #=================================================
 # SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
+ynh_script_progression "Adding system configurations related to $app..."
 
 # Create a dedicated NGINX config using the conf/nginx.conf template
-ynh_add_nginx_config
+ynh_config_add_nginx
 
 # Create a dedicated systemd config
-ynh_add_systemd_config
+ynh_config_add_systemd
 
 yunohost service add "$app" --description=XWiki --log="/var/log/$app/$app.log"
 
-ynh_use_logrotate --logfile="/var/log/$app"
+ynh_config_add_logrotate "/var/log/$app"
 
 #=================================================
 # INSTALL EXTENSIONS
@@ -61,31 +55,29 @@ ynh_use_logrotate --logfile="/var/log/$app"
 enable_super_admin
 
 # Start a systemd service
-ynh_systemd_action --service_name="$app" --action=start --log_path=systemd --line_match="$systemd_match_start_line"
+ynh_systemctl --service="$app" --action=start --log_path=systemd --wait_until="$systemd_match_start_line"
 
 if [ "$install_standard_flavor" -eq 1 ]; then
-    ynh_script_progression --message='Installing flavor...'
+    ynh_script_progression 'Installing flavor...'
     wait_for_flavor_install
 fi
 
-ynh_script_progression --message='Installing LDAP extension...' --weight=1
+ynh_script_progression 'Installing LDAP extension...'
 install_exension 'org.xwiki.contrib.ldap:ldap-authenticator' "$ldap_version"
 
 # Disable super admin
-ynh_systemd_action --service_name="$app" --action=stop
+ynh_systemctl --service="$app" --action=stop
 disable_super_admin
 
-#=================================================
-# GENERIC FINALIZATION
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 
-ynh_script_progression --message='Starting a systemd service...' --weight=1
-ynh_systemd_action --service_name="$app" --action=start --log_path=systemd --line_match="$systemd_match_start_line"
+ynh_script_progression "Starting $app's systemd service..."
+ynh_systemctl --service="$app" --action=start --log_path=systemd --wait_until="$systemd_match_start_line"
 wait_xwiki_started
 
 #=================================================
 # END OF SCRIPT
 #=================================================
-ynh_script_progression --message="Installation of $app completed" --last
+ynh_script_progression "Installation of $app completed"
diff --git a/scripts/remove b/scripts/remove
index d0fad6f..0a470ea 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
@@ -14,23 +8,23 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
+ynh_script_progression "Removing system configurations related to $app..."
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
-if ynh_exec_warn_less yunohost service status "$app" >/dev/null
+if ynh_hide_warnings yunohost service status "$app" >/dev/null
 then
-	ynh_script_progression --message="Removing $app service integration..." --weight=1
+	ynh_script_progression "Removing $app service integration..."
 	yunohost service remove "$app"
 fi
 
-ynh_secure_remove --file="/etc/$app"
+ynh_safe_rm "/etc/$app"
 
-ynh_remove_systemd_config
+ynh_config_remove_systemd
 
-ynh_remove_nginx_config
+ynh_config_remove_nginx
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of $app completed" --last
+ynh_script_progression "Removal of $app completed"
diff --git a/scripts/restore b/scripts/restore
index 4737f23..7cff1ca 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
@@ -13,21 +7,20 @@ source /usr/share/yunohost/helpers
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring files..." --weight=10
-
-ynh_restore
+ynh_script_progression "Restoring files..."
 
+ynh_restore_everything
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Restoring the database..." --weight=1
+ynh_script_progression "Restoring the database..."
 
-ynh_psql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql
+ynh_psql_db_shell < ./db.sql
 
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
+ynh_script_progression "Restoring system configurations related to $app..."
 
 mkdir -p /var/log/"$app"
 set_permissions
@@ -35,22 +28,20 @@ set_permissions
 systemctl enable "$app".service --quiet
 yunohost service add "$app" --description=XWiki --log="/var/log/$app/$app.log"
 
-ynh_use_logrotate --logfile="/var/log/$app"
+ynh_config_add_logrotate "/var/log/$app"
 
-#=================================================
-# GENERIC FINALIZATION
 #=================================================
 # RELOAD NGINX AND THE APP SERVICE
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
+ynh_script_progression "Reloading NGINX web server and $app's service..."
 
-ynh_systemd_action --service_name="$app" --action=start --log_path=systemd --line_match="$systemd_match_start_line"
+ynh_systemctl --service="$app" --action=start --log_path=systemd --wait_until="$systemd_match_start_line"
 wait_xwiki_started
 
-ynh_systemd_action --service_name=nginx --action=reload
+ynh_systemctl --service=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for $app" --last
+ynh_script_progression "Restoration completed for $app"
diff --git a/scripts/upgrade b/scripts/upgrade
index 92eb21d..374fc07 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,26 +1,18 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
-upgrade_type="$(ynh_check_app_version_changed)"
-
-if ynh_compare_current_package_version --comparison=le --version='14.10.8~ynh1'; then
-    ynh_die --mesage='Upgrade from this version is not supported. Please backup and restore manually the data after a clean new install'
+if ynh_app_upgrading_from_version_before_or_equal_to '14.10.8~ynh1'; then
+    ynh_die 'Upgrade from this version is not supported. Please backup and restore manually the data after a clean new install'
 fi
 
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message='Stopping a systemd service..' --weight=1
+ynh_script_progression 'Stopping $app's systemd service...
 
-ynh_systemd_action --service_name="$app" --action=stop --log_path="/var/log/$app/$app.log"
+ynh_systemctl --service="$app" --action=stop
 
 #=================================================
 # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...)
@@ -28,31 +20,32 @@ ynh_systemd_action --service_name="$app" --action=stop --log_path="/var/log/$app
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
-if [ "$upgrade_type" == UPGRADE_APP ]
+# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed
+if ynh_app_upstream_version_changed
 then
-    ynh_script_progression --message='Setting up source files...'
+    ynh_script_progression 'Setting up source files...'
     install_source
 fi
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
+ynh_script_progression "Adding system configurations related to $app..."
 
 # Create a dedicated NGINX config using the conf/nginx.conf template
-ynh_add_nginx_config
+ynh_config_add_nginx
 
 # Create a dedicated systemd config
-ynh_add_systemd_config
+ynh_config_add_systemd
 
 yunohost service add "$app" --description=XWiki --log="/var/log/$app/$app.log"
 
-ynh_use_logrotate --logfile="/var/log/$app"
+ynh_config_add_logrotate "/var/log/$app"
 
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-ynh_script_progression --message='Adding configuration files...' --weight=1
+ynh_script_progression 'Adding configuration files...'
 
 add_config
 set_permissions
@@ -63,32 +56,30 @@ set_permissions
 enable_super_admin
 
 # Start a systemd service
-ynh_systemd_action --service_name="$app" --action=start --log_path=systemd --line_match="$systemd_match_start_line"
+ynh_systemctl --service="$app" --action=start --log_path=systemd --wait_until="$systemd_match_start_line"
 
 if [ "$install_standard_flavor" -eq 1 ]; then
-    ynh_script_progression --message='Upgrading flavor...'
+    ynh_script_progression 'Upgrading flavor...'
     wait_for_flavor_install
 fi
 
-ynh_script_progression --message='Upgrading LDAP extension...' --weight=1
+ynh_script_progression 'Upgrading LDAP extension...'
 install_exension 'org.xwiki.contrib.ldap:ldap-authenticator' "$ldap_version"
 
 # Disable super admin
-ynh_systemd_action --service_name="$app" --action=stop
+ynh_systemctl --service="$app" --action=stop
 disable_super_admin
 
-#=================================================
-# GENERIC FINALIZATION
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 
-ynh_script_progression --message='Starting a systemd service...' --weight=1
-ynh_systemd_action --service_name="$app" --action=start --log_path=systemd --line_match="$systemd_match_start_line"
+ynh_script_progression "Starting $app's systemd service..."
+ynh_systemctl --service="$app" --action=start --log_path=systemd --wait_until="$systemd_match_start_line"
 wait_xwiki_started
 
 #=================================================
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of $app completed" --last
+ynh_script_progression "Upgrade of $app completed"
diff --git a/sources/extra_files/app/.gitignore b/sources/extra_files/app/.gitignore
deleted file mode 100644
index 783a4ae..0000000
--- a/sources/extra_files/app/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-*.sw[op]
diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore
deleted file mode 100644
index 783a4ae..0000000
--- a/sources/patches/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-*.sw[op]
diff --git a/tests.toml b/tests.toml
index d64ef3c..71f6bd6 100644
--- a/tests.toml
+++ b/tests.toml
@@ -5,3 +5,4 @@ test_format = 1.0
     # ------------
     # Tests to run
     # ------------
+    test_upgrade_from.0bfd0bdfeed0696c71fd79727a28fccc8822e123.name = "Before helper 2.1"