diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..2729a6b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,55 @@
+---
+name: Bug report
+about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently.
+
+---
+
+**How to post a meaningful bug report**
+1. *Read this whole template first.*
+2. *Determine if you are on the right place:*
+   - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!*
+   - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.*
+   - *When in doubt, post here and we will figure it out together.*
+3. *Delete the italic comments as you write over them below, and remove this guide.*
+--- 
+
+### Describe the bug
+
+*A clear and concise description of what the bug is.*
+
+### Context
+
+- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...*
+- YunoHost version: x.x.x
+- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...*
+- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes*
+  - If yes, please explain:
+- Using, or trying to install package version/branch:
+- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*
+
+### Steps to reproduce
+
+- *If you performed a command from the CLI, the command itself is enough. For example:*
+    ```sh
+    sudo yunohost app install the_app
+    ```
+- *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:*
+   1. *Go to '...'*
+   2. *Click on '...'*
+   3. *Scroll down to '...'*
+   4. *See error*
+
+### Expected behavior
+
+*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.*
+
+### Logs
+
+*When an operation fails, YunoHost provides a simple way to share the logs.*
+- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.*
+- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.*
+
+*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)*
+
+*If applicable and useful, add screenshots to help explain your problem.*
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..ef70e18
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+## Problem
+
+- *Description of why you made this PR*
+
+## Solution
+
+- *And how do you fix that problem*
+
+## PR Status
+
+- [ ] Code finished and ready to be reviewed/tested
+- [ ] The fix/enhancement were manually tested (if applicable)
+
+## Automatic tests
+
+Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)
diff --git a/README.md b/README.md
index 076d4ed..21fb55c 100644
--- a/README.md
+++ b/README.md
@@ -1,51 +1,38 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Ampache for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/ampache.svg)](https://dash.yunohost.org/appci/app/ampache) ![](https://ci-apps.yunohost.org/ci/badges/ampache.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ampache.maintain.svg)  
 [![Install Ampache with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ampache)
 
-> *This package allow you to install Ampache quickly and simply on a YunoHost server.  
-If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.*
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *This package allows you to install Ampache 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
+
 [Ampache](http://ampache.org) for the love of music. A web based audio/video streaming application and file manager allowing you to access your music & videos from anywhere, using almost any internet enabled device.
 
-**Shipped version:** 4.4.2
-
-## Screenshots
-
-![](http://ampache.org/img/previews/visualizer.jpg)
-
-## Demo
-
-* [YunoHost demo](https://demo.yunohost.org/ampache/)
-* [Official demo](http://ampache.org/demo.html)
-
-## Configuration
-
-## Documentation
-
- * Official documentation: https://github.com/ampache/ampache/wiki
- * YunoHost documentation: https://yunohost.org/en/app_ampache
-
-## YunoHost specific features
-
-In addition to Ampache core features, the following are made available with
-this package:
+### Features
 
  * Config for high quality streaming with high bandwith
  * Quick loading for mobile devices with potential low bandwith
  * Integrate with YunoHost users - same username and password
  * Allow one user to be the administrator (set at the installation)
 
-#### Multi-users support
+**Shipped version:** 5.4.0~ynh1
 
- * Ampache is connect to Yunohost LDAP
- * No auto SSO yet
+**Demo:** https://ampache.org/demo.html
 
-#### Supported architectures
+## Screenshots
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ampache.svg)](https://ci-apps.yunohost.org/ci/apps/ampache/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ampache.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ampache/)
+![](./doc/screenshots/visualizer.png)
+
+## Disclaimers / important information
 
 ## Limitations
 
@@ -78,18 +65,17 @@ this package:
 
  * Full list of existings clients : https://github.com/ampache/ampache/wiki/Clients
 
-## Links
+## Documentation and resources
 
- * Report a bug: https://github.com/YunoHost-Apps/ampache_ynh/issues
- * Ampache website: http://ampache.org/
- * Ampache repository: https://github.com/ampache/ampache
- * YunoHost website: https://yunohost.org/
+* Official app website: http://ampache.org
+* Official admin documentation: https://github.com/ampache/ampache/wiki
+* Upstream app code repository: https://github.com/ampache/ampache
+* YunoHost documentation for this app: https://yunohost.org/app_ampache
+* Report a bug: https://github.com/YunoHost-Apps/ampache_ynh/issues
 
----
+## Developer info
 
-## Developers infos
-
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/ampache_ynh/tree/testing).
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/ampache_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
 ```
@@ -97,3 +83,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/ampache_ynh/tree/test
 or
 sudo yunohost app upgrade ampache -u https://github.com/YunoHost-Apps/ampache_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
diff --git a/README_fr.md b/README_fr.md
new file mode 100644
index 0000000..1b5d068
--- /dev/null
+++ b/README_fr.md
@@ -0,0 +1,83 @@
+# Ampache pour YunoHost
+
+[![Niveau d'intégration](https://dash.yunohost.org/integration/ampache.svg)](https://dash.yunohost.org/appci/app/ampache) ![](https://ci-apps.yunohost.org/ci/badges/ampache.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ampache.maintain.svg)  
+[![Installer Ampache avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ampache)
+
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *Ce package vous permet d'installer Ampache rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+
+## Vue d'ensemble
+
+[Ampache](http://ampache.org) for the love of music. A web based audio/video streaming application and file manager allowing you to access your music & videos from anywhere, using almost any internet enabled device.
+
+### Features
+
+ * Config for high quality streaming with high bandwith
+ * Quick loading for mobile devices with potential low bandwith
+ * Integrate with YunoHost users - same username and password
+ * Allow one user to be the administrator (set at the installation)
+
+**Version incluse :** 5.4.0~ynh1
+
+**Démo :** https://ampache.org/demo.html
+
+## Captures d'écran
+
+![](./doc/screenshots/visualizer.png)
+
+## Avertissements / informations importantes
+
+## Limitations
+
+* Also, the SSO authentication not fully working from user panel, we have to work about this. In fact, it can disrupt external Ampache clients like Subsonic.
+
+## Additionnal informations
+
+### Getting started
+
+ * **Add your first catalog to load music files**
+   * Go to *Admin panel* ![](https://raw.githubusercontent.com/ampache/ampache/develop/themes/reborn/images/icons/icon_admin.png)
+   * Click on *Add a Catalog*
+   * Fill up fields and click *Add Calalog*
+   * Next, enjoy :)
+
+ * **Update a catalog for load new music files**
+   * Go to *Admin panel* ![](https://raw.githubusercontent.com/ampache/ampache/develop/themes/reborn/images/icons/icon_admin.png)
+   * Click on *Show Catalogs*
+   * Select *Update* in *Actions* list and click *Go*
+
+ * **Change interface Language**
+   * Go to *Preferences panel* ![](https://raw.githubusercontent.com/ampache/ampache/develop/themes/reborn/images/icons/icon_edit.png)
+   * Click on *Interface*
+   * Change *Language* field
+
+### Ampache on mobile devices
+
+ * [For Android](https://play.google.com/store/apps/details?id=com.antoniotari.reactiveampacheapp)
+ * [For iOS](http://iampache.com/)
+
+ * Full list of existings clients : https://github.com/ampache/ampache/wiki/Clients
+
+## Documentations et ressources
+
+* Site officiel de l'app : http://ampache.org
+* Documentation officielle de l'admin : https://github.com/ampache/ampache/wiki
+* Dépôt de code officiel de l'app : https://github.com/ampache/ampache
+* Documentation YunoHost pour cette app : https://yunohost.org/app_ampache
+* Signaler un bug : https://github.com/YunoHost-Apps/ampache_ynh/issues
+
+## Informations pour les développeurs
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/ampache_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/ampache_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade ampache -u https://github.com/YunoHost-Apps/ampache_ynh/tree/testing --debug
+```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file
diff --git a/check_process b/check_process
index 5990e26..51ee97e 100644
--- a/check_process
+++ b/check_process
@@ -1,9 +1,9 @@
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
-		path="/ampache"	(PATH)
-		admin="john"	(USER)
-		is_public=1	(PUBLIC|public=1|private=0)
+		domain="domain.tld"
+		path="/ampache"
+		admin="john"
+		is_public=1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
diff --git a/conf/ampache.cfg.php b/conf/ampache.cfg.php
index 176d0ed..a10c81b 100644
--- a/conf/ampache.cfg.php
+++ b/conf/ampache.cfg.php
@@ -3,18 +3,31 @@
 ; General Config                                         #
 ;#########################################################
 
-; This value is used to detect quickly
-; if this config file is up to date
-; this is compared against a value hard-coded
-; into the init script
-config_version = 40
+; This value is used to detect if this config file is up to date
+; this is compared against a constant called CONFIG_VERSION
+; that is located in src/Config/Init/InitializationHandlerConfig.php
+config_version = 61
+
+;#########################################################
+; Auto Update                                            #
+;#########################################################
 
 ; Allow you to hard code a default git branch for Ampache
 ; If you set this value the inbuilt updater will use this branch for updates.
 ; POSSIBLE VALUES: master develop
-; DEFAULT: ""
+; DEFAULT: none
 ;github_force_branch = "develop"
 
+; This value allows to override the composer binary path to distinguish between multiple composer versions
+; Either a binary name in $PATH as well as a fully qualified path is possible
+; DEFAULT: composer
+;composer_binary_path = "composer"
+
+; We sometimes need to talk and will show a warning to admin users
+; Enable this setting if you don't want to see warnings (When we enable them)
+; DEFAULT: false
+;hide_ampache_messages = "true"
+
 ;#########################################################
 ; Path Vars                                              #
 ;#########################################################
@@ -22,22 +35,22 @@ config_version = 40
 ; The public http host of your server.
 ; If not set, retrieved automatically from client request.
 ; This setting is required for WebSocket server
-; DEFAULT: ""
+; DEFAULT: none
 http_host = "__DOMAIN__"
 
 ; The public http port of your server.
 ; If not set, retrieved automatically from client request.
-; DEFAULT:
+; DEFAULT: none
 ;http_port = 80
 
-; The public path to your ampache install
+; The public path to your Ampache install
 ; Do not put a trailing / on this path
 ; For example if your site is located at http://localhost
 ; than you do not need to enter anything for the web_path
 ; if it is located at http://localhost/music you need to
 ; set web_path to /music
-; DEFAULT: ""
-web_path 	= "__PATH__"
+; DEFAULT: none
+web_path = "__PATH__"
 
 ; The local http url of your server.
 ; This is used to access the server from within the
@@ -47,10 +60,9 @@ web_path 	= "__PATH__"
 ; proxy, local_web_path would need to be changed
 ; to a localhost URL.
 ; If not set, retrieved automatically from server information.
-; DEFAULT: ""
+; DEFAULT: none
 ;local_web_path = "http://localhost/ampache"
 
-
 ;#########################################################
 ; Database                                               #
 ;#########################################################
@@ -64,20 +76,36 @@ database_hostname = localhost
 ; DEFAULT: none
 ;database_port = 3306
 
-; Name of your ampache database
-; DEFAULT: ampache
+; Name of your Ampache database
+; DEFAULT: none
 database_name = "__DB_NAME__"
 
-; Username for your ampache database
-; DEFAULT: ""
+; Username for your Ampache database
+; DEFAULT: none
 database_username = "__DB_USER__"
 
-; Password for your ampache database, this can not be blank
+; Password for your Ampache database, this can not be blank
 ; this is a 'forced' security precaution, the default value
 ; will not work (except if using socket authentication)
-; DEFAULT: ""
+; DEFAULT: none
 database_password = "__DB_PWD__"
 
+; Set a default charset for your database
+; Don't change this unless you understand how to BACKUP and RESTORE a database!
+;
+; DEFAULT: "utf8mb4"
+;database_charset = "utf8mb4"
+
+; Set a default collation for your database
+; Don't change this unless you understand how to BACKUP and RESTORE a database!
+;
+; There are a ton of options but you'll probably want one of these.
+; "utf8_unicode_ci" = Regular unicode (3 bytes per character)
+; "utf8mb4_unicode_ci" = 4 bytes per character
+; "utf8mb4_unicode_520_ci" = Supports more characters and is based on UCA 5.2.0 weight keys
+;   http://www.unicode.org/Public/UCA/5.2.0/allkeys.txt
+; DEFAULT: "utf8mb4_unicode_ci"
+;database_collation = "utf8mb4_unicode_ci"
 
 ;#########################################################
 ; Session and Security                                   #
@@ -118,7 +146,7 @@ session_cookielife = 0
 ; Is the cookie a "secure" cookie? This should only be set to 1 (true) if you are
 ; running a secure site (HTTPS).
 ; DEFAULT: 0
-session_cookiesecure = 1
+session_cookiesecure = 0
 
 ; Auth Methods
 ; This defines which auth methods Auth will attempt to use and in which order.
@@ -137,44 +165,50 @@ auth_methods = "ldap"
 ; Determines whether successful authentication against an external source
 ; will result in an update to the password stored in the database.
 ; A locally stored password is needed for API access.
-; DEFAULT: false
+; DEFAULT: "false"
 auth_password_save = "true"
 
-; Logout redirection target
+; Log out redirection target
 ; Defaults to our own login.php, but we can override it here if, for instance,
 ; we want to redirect to an SSO provider instead.
-; logout_redirect = "http://sso.example.com/logout"
+;logout_redirect = "http://sso.example.com/logout"
 
 ; Use Access List
-; Toggle this on if you want ampache to pay attention to the access list
+; Toggle this on if you want Ampache to pay attention to the access list
 ; and only allow streaming/downloading/api-rpc from known hosts api-rpc
 ; will not work without this on.
 ; NOTE: Default Behavior is DENY FROM ALL
-; DEFAULT: true
-access_control	= "true"
+; DEFAULT: "true"
+access_control = "true"
 
 ; Require Session
-; If this is set to true ampache will make sure that the URL passed when
+; If this is set to true Ampache will make sure that the URL passed when
 ; attempting to retrieve a song contains a valid Session ID This prevents
 ; others from guessing URL's. This setting is ignored if you have use_auth
 ; disabled.
-; DEFAULT: true
+; DEFAULT: "true"
 require_session = "true"
 
 ; Require LocalNet Session
-; If this is set to true then ampache will require that a valid session
+; If this is set to true then Ampache will require that a valid session
 ; is passed even on hosts defined in the Local Network ACL. This setting
 ; has no effect if access_control is not enabled
-; DEFAULT: true
+; DEFAULT: "true"
 require_localnet_session = "true"
 
 ; Multiple Logins
 ; Added by Vlet 07/25/07
 ; When this setting is enabled a user may only be logged in from a single
 ; IP address at any one time, this is to prevent sharing of accounts
-; DEFAULT: false
-;prevent_multiple_logins = "false"
+; DEFAULT: "false"
+;prevent_multiple_logins = "true"
 
+; Allow Embedding Ampache in Frames
+; Whether a browser should be allowed to render a page in a <frame>, <iframe>, <embed> or <object>.
+; This is used to avoid click-jacking attacks, by ensuring that their content is not embedded into other sites.
+; By default Ampache pages can only be displayed in a frame on the same origin as the page itself.
+; DEFAULT: "false"
+;disable_xframe_sameorigin = "true"
 
 ;#########################################################
 ; Metadata                                               #
@@ -182,32 +216,32 @@ require_localnet_session = "true"
 
 ; This determines the tag order for all cataloged
 ; music. If none of the listed tags are found then
-; ampache will randomly use whatever was found.
+; Ampache will randomly use whatever was found.
 ; POSSIBLE VALUES: ape asf avi id3v1 id3v2 lyrics3 matroska mpeg quicktime riff
 ;     vorbiscomment
-; DEFAULT: id3v2 id3v1 vorbiscomment quicktime matroska ape asf avi mpeg riff
-getid3_tag_order = "id3v2,id3v1,vorbiscomment,quicktime,matroska,ape,asf,avi,mpeg,riff"
+; DEFAULT: vorbiscomment id3v2 id3v1 quicktime matroska ape asf avi mpeg riff
+getid3_tag_order = "vorbiscomment,id3v2,id3v1,quicktime,matroska,ape,asf,avi,mpeg,riff"
 
 ; This determines whether we try to autodetect the encoding for id3v2 tags.
 ; May break valid tags.
-; DEFAULT: false
-;getid3_detect_id3v2_encoding = "false"
+; DEFAULT: "false"
+;getid3_detect_id3v2_encoding = "true"
 
 ; This determines if we write the changes to files (as id3 tags) when modifying metadata, or only keep them in Ampache (the default).
-; DEFAULT: false
-;write_id3 = "false"
+; DEFAULT: "false"
+;write_id3 = "true"
 
 ; This determines if we write the changes to files (as id3 tags) when modifying album art, or only keep them in Ampache (the default)
 ; as id3 metadata when updated.
-; DEFAULT: false
-;write_id3_art = "false"
+; DEFAULT: "false"
+;write_id3_art = "true"
 
 ; This determines the order in which metadata sources are used (and in the
 ; case of plugins, checked)
 ; POSSIBLE VALUES (builtins): filename and getID3
 ; POSSIBLE VALUES (plugins): MusicBrainz,TheAudioDb, plus any others you've installed.
 ; DEFAULT: getID3 filename
-metadata_order = "getID3,filename"
+metadata_order = "getID3,MusicBrainz,TheAudioDb,filename"
 
 ; This determines the order in which metadata sources are used (and in the
 ; case of plugins, checked) for video files
@@ -220,21 +254,28 @@ metadata_order_video = "filename,getID3"
 ; If enabled, extended metadata is retrieved when browsing the library item.
 ; If disabled, extended metadata is retrieved at catalog update.
 ; Today, only Artist information (summary, place formed, ...) can be deferred.
-; DEFAULT: true
+; DEFAULT: "true"
 deferred_ext_metadata = "true"
 
 ; Some taggers use delimiters other than \0 for fields
 ; This list specifies possible delimiters additional to \0
-; This setting takes a regex pattern.
+; This setting takes a regex pattern. TODO: explain that this is not just for genres until we can replace this safely
 ; DEFAULT: // / \ | , ;
-additional_genre_delimiters = "[/]{2}|[/|\\\\|\|,|;]"
+additional_genre_delimiters = "[/]{2}|[/\\\\|,;]"
 
 ; Enable importing custom metadata from files.
 ; This will need a bit of time during the import. So you may want to disable this
 ; if you have troubles with huge databases.
-; DEFAULT: false
-;enable_custom_metadata = "false"
+; DEFAULT: "false"
+;enable_custom_metadata = "true"
 
+;#########################################################
+; File Tags                                             #
+;#########################################################
+
+; This determines if we write metadata to files when modifying metadata, or only keep them in Ampache (the default).
+; DEFAULT: "false"
+;write_tags = "true"
 
 ;#########################################################
 ; Catalog                                                #
@@ -242,22 +283,21 @@ additional_genre_delimiters = "[/]{2}|[/|\\\\|\|,|;]"
 
 ; File Pattern
 ; This defines which file types Ampache will attempt to catalog
-; You can specify any file extension you want in here separating them
-; with a |
+; You can specify any file extension you want in here separating them with a |
 ; DEFAULT: mp3|mpc|m4p|m4a|aac|ogg|oga|wav|aif|aiff|rm|wma|asf|flac|opus|spx|ra|ape|shn|wv
 catalog_file_pattern = "mp3|mpc|m4p|m4a|aac|ogg|oga|wav|aif|aiff|rm|wma|asf|flac|opus|spx|ra|ape|shn|wv"
 
 ; Video Pattern
 ; This defines which video file types Ampache will attempt to catalog
 ; You can specify any file extension you want in here separating them with
-; a | but ampache may not be able to parse them
+; a | but Ampache may not be able to parse them
 ; DEAFULT: avi|mpg|mpeg|flv|m4v|mp4|webm|mkv|wmv|ogv|mov|divx|m2ts
 catalog_video_pattern = "avi|mpg|mpeg|flv|m4v|mp4|webm|mkv|wmv|ogv|mov|divx|m2ts"
 
 ; Playlist Pattern
 ; This defines which playlist types Ampache will attempt to catalog
 ; You can specify any file extension you want in here separating them with
-; a | but ampache may not be able to parse them
+; a | but Ampache may not be able to parse them
 ; DEFAULT: m3u|m3u8|pls|asx|xspf
 catalog_playlist_pattern = "m3u|m3u8|pls|asx|xspf"
 
@@ -267,17 +307,36 @@ catalog_playlist_pattern = "m3u|m3u8|pls|asx|xspf"
 ; DEFAULT: The|An|A|Die|Das|Ein|Eine|Les|Le|La
 catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 
+; Ignore Pattern
+; Ignore files that match this pattern
+; You can specify any file extension you want in here separating them with a |
+; DEFAULT: None
+; catalog_ignore_pattern = "\(HTOA\)"
+
 ; Catalog disable
 ; This defines if catalog can be disabled without removing database entries
 ; WARNING: this increase sensibly sql requests and slow down Ampache a lot
+; DEFAULT: "false"
+;catalog_disable = "true"
+
+; Catalog filter
+; This defines if catalog can be filtered per user.
+; The filters are set in the catalog management pages.
+; WARNING: this increase sensibly sql requests and slow down Ampache a lot
 ; DEFAULT: false
-;catalog_disable = "false"
+;catalog_filter = "true"
 
 ; Delete from disk
 ; This determines if catalog manager users can delete media from disk.
-; DEFAULT: false
-;delete_from_disk = "false"
+; DEFAULT: "false"
+;delete_from_disk = "true"
 
+; Catalog verify by time
+; Only verify the files that have been modified since the last verify.
+; For large catalogs the verify process can be terribly long so this will help
+; speed things up by checking modification date using filemtime() before loading
+; DEFAULT: "false"
+;catalog_verify_by_time = "true"
 
 ;#########################################################
 ; Program Settings                                       #
@@ -287,15 +346,15 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 ; If this is set to true and access control is on any users who are not
 ; coming from a defined 'network' ACL will be automatically downsampled
 ; regardless of their preferences. Requires access_control to be enabled
-; DEFAULT: false
-;downsample_remote = "false"
+; DEFAULT: "false"
+;downsample_remote = "true"
 
 ; Track User IPs
 ; If this is enabled Ampache will log the IP of every completed login
 ; it will store user, ip and time at one row per login. The results are
 ; displayed in Admin --> Users
-; DEFAULT: false
-;track_user_ip = "false"
+; DEFAULT: "false"
+;track_user_ip = "true"
 
 ; User IP Cardinality
 ; This defines how many days worth of IP history Ampache will track
@@ -309,8 +368,8 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 ; playlist/album for download. Even if this is turned on you will
 ; still need to enabled downloading for the specific user you
 ; want to be able to use this function
-; DEFAULT: false
-;allow_zip_download = "false"
+; DEFAULT: "false"
+;allow_zip_download = "true"
 
 ; Allow Zip Types
 ; This setting allows/disallows zip download of specific object types
@@ -320,6 +379,12 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 ; DEFAULT: none
 ;allow_zip_types = "album"
 
+; Art Zip Add
+; This settings allows/disallows to include Album Art to the Zip 
+; If 'album_art_preferred_filename' exists this is included 
+; DEFAULT: false
+;art_zip_add = "true"
+
 ; File Zip Comment
 ; This is an optional configuration option that adds a comment
 ; to your zip files, this only applies if you've got allow_zip_downloads
@@ -330,8 +395,8 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 ; This settings tells Ampache to attempt to generate a waveform
 ; for each song. It requires transcode and encode_args_wav settings.
 ; You must also set tmp_dir_path in order for this to work
-; DEFAULT: false
-;waveform = "false"
+; DEFAULT: "false"
+;waveform = "true"
 
 ; Waveform color
 ; The waveform color.
@@ -352,8 +417,8 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 ; If Waveform is enabled this must be set to tell
 ; Ampache which directory to save the temporary file to. Do not put a
 ; trailing slash or this will not work.
-; DEFAULT: false
-;tmp_dir_path = "false"
+; DEFAULT: "false"
+;tmp_dir_path = "/tmp"
 
 ; This setting throttles a persons downloading to the specified
 ; bytes per second. This is not a 100% guaranteed function, and
@@ -365,20 +430,20 @@ catalog_prefix_pattern = "The|An|A|Die|Das|Ein|Eine|Les|Le|La"
 
 ; This determines if a preview image should be retrieved from video files
 ; It requires encode_get_image transcode settings.
-; DEFAULT: false
+; DEFAULT: "false"
 ;generate_video_preview = "true"
 
-; Un comment if don't want ampache to follow symlinks
-; DEFAULT: false
-;no_symlinks	= "false"
+; Uncomment if don't want Ampache to follow symlinks
+; DEFAULT: "false"
+;no_symlinks = "true"
 
 ; Use auth?
-; If this is set to "Yes" ampache will require a valid
-; Username and password. If this is set to false then ampache
+; If this is set to "true" Ampache will require a valid
+; Username and password. If this is set to false then Ampache
 ; will not ask you for a username and password. false is only
 ; recommended for internal only instances
-; DEFAULT: true
-use_auth	= "true"
+; DEFAULT: "true"
+use_auth = "true"
 
 ; Default Auth Level
 ; If use_auth is set to false then this option is used
@@ -389,17 +454,27 @@ use_auth	= "true"
 ; DEFAULT: guest
 default_auth_level = "guest"
 
+; Skip Timer Threshold
+; This allows custom times to decide when a track is skipped
+; Allows an integer to denote seconds, or a float to denote percentage
+; POSSIBLE VALUES:
+; 20 = 20 seconds.
+; 0.3 = 30%
+; DEFAULT: 20
+;skip_timer = 20
+
 ; 5 Star Ratings
-; This allows ratings for almost any object in ampache
+; This allows ratings for almost any object in Ampache
+: It also allows users to flag objects as a favorite
 ; POSSIBLE VALUES: false true
-; DEFAULT: true
+; DEFAULT: "true"
 ratings = "true"
 
 ; Enable filtering on browse pages for artists and albums.
 ; If you enable this setting the get_random and browse pages
 ; will remove artists and albums that are <= to that rating
-; DEFAULT: false
-;rating_browse_filter = "false"
+; DEFAULT: "false"
+;rating_browse_filter = "true"
 
 ; Set the rating that will be filtered
 ; e.g. 2 will filter 1 and 2 star albums and artists
@@ -407,40 +482,42 @@ ratings = "true"
 ; DEFAULT: null
 ;rating_browse_minimum_stars = 1
 
-; Set the amount of items Album/Video of the Moment will display
-; This was previously hardcoded into the site
-; DEFAULT: 6
-;of_the_moment = 6
-
-; User flags/favorites
-; This allows user flags for almost any object in ampache as favorite
-; POSSIBLE VALUES: false true
-; DEFAULT: true
-userflags = "true"
+; By default Ampache assigns the rating set in files tags to
+; the system user (-1). If you would like ALL file tags to be
+; assigned to a specific user set their user ID here.
+; DEFAULT: -1
+;rating_file_tag_user = 1
 
 ; Direct play
 ; This allows user to play directly a song or album
 ; POSSIBLE VALUES: false true
-; DEFAULT: true
+; DEFAULT: "true"
 directplay = "true"
 
 ; Sociable
-; This turns on / off all of the "social" features of ampache
+; This turns on / off all of the "social" features of Ampache
 ; default is on, but if you don't care and just want music
 ; turn this off to disable all social features.
-; DEFAULT: true
+; DEFAULT: "true"
 sociable = "true"
 
 ; License
 ; This turns on / off all licensing features on Ampache
-; DEFAULT: false
-;licensing = "false"
+; DEFAULT: "false"
+;licensing = "true"
 
 ; This options will turn on/off Demo Mode
 ; If Demo mode is on you can not play songs or update your catalog
 ; in other words.. leave this commented out
-; DEFAULT: false
-;demo_mode = "false"
+; DEFAULT: "false"
+;demo_mode = "true"
+
+; This options will turn on/off Simple User Mode
+; If simple_user_mode is true you can not edit your profile or make
+; changes to your account unless you are an admin
+; This is for shared accounts or simple sites like the ampache demo
+; DEFAULT: "false"
+;simple_user_mode = "true"
 
 ; Caching
 ; This turns the caching mechanisms on or off, due to a large number of
@@ -448,8 +525,8 @@ sociable = "true"
 ; this is off by default as it does significantly increase the memory
 ; requirements on larger catalogs. If you have the memory this can create
 ; a 2-3x speed improvement.
-; DEFAULT: false
-;memory_cache = "false"
+; DEFAULT: "false"
+;memory_cache = "true"
 
 ; Memory Limit
 ; This defines the "Min" memory limit for PHP if your php.ini
@@ -462,14 +539,30 @@ sociable = "true"
 ; Specify a filename to look for if you always give the same filename
 ; i.e. "folder.jpg" Ampache currently only supports jpg/gif and png
 ; Especially useful if you have a front and a back image in a folder
-; comment out if ampache should search for any jpg,gif or png
+; comment out if Ampache should search for any jpg, gif or png
 ; DEFAULT: folder.jpg
 ;album_art_preferred_filename = "folder.jpg"
 
+; Artist Art Preferred Filename
+; Specify a filename to look for artist specific art, either in the
+; same folder as your files or in the parent folder
+; e.g. /mnt/music/Artist/Album/artist.jpg
+;      /mnt/music/Artist/artist.jpg
+; DEFAULT: folder.jpg
+;artist_art_preferred_filename = "folder.jpg"
+
+; Artist Art Dump Folder
+; Specify a local folder to search for art using name/title to identify
+; i.e. "/var/www/art/" is filled with artist images named by artist
+; e.g. "Megadeth.jpg", "Judas Priest.png", "The Smashing Pumpkins.jpg"
+; When enabled; gather_folder will check this folder for artist images
+; DEFAULT: "false"
+;artist_art_folder = "/var/www/art"
+
 ; Album Art Store on Disk
 ; This defines if arts should be stored on disk instead of database.
-; DEFAULT: false
-;album_art_store_disk = "false"
+; DEFAULT: "false"
+;album_art_store_disk = "true"
 
 ; Local Metadata Directory
 ; This define a local metadata directory with write access where to store
@@ -507,15 +600,15 @@ sociable = "true"
 ; art on the fly, this increases load time and CPU usage
 ; and also requires the PHP-GD library. This is very useful
 ; If you have high-quality album art and a small upload cap
-; DEFAULT: false
-;resize_images = "false"
+; DEFAULT: "false"
+;resize_images = "true"
 
 ; Playlist Cover Art
 ; Set this to true if you want Ampache to generate
 ; cover art for playlists automatically based on
 ; the content.
-; DEFAULT: false
-;playlist_art = "false"
+; DEFAULT: "true"
+playlist_art = "true"
 
 ; Statistical Graphs * Requires PHP-GD *
 ; Set this to true if you want Ampache to generate statistical graphs on usages / users.
@@ -524,32 +617,71 @@ sociable = "true"
 ;  http://www.pchart.net/license
 ; REFERENCE: https://github.com/ampache/ampache/wiki/chart-faq
 ; You can enable c-chart with the following command
-;  composer require 'szymach/c-pchart'
-; DEFAULT: false
-;statistical_graphs = "false"
+;  composer require szymach/c-pchart "2.*"
+; DEFAULT: "false"
+;statistical_graphs = "true"
 
 ; Art Gather Order
 ; Simply arrange the following in the order you would like
-; ampache to search. If you want to disable one of the search
+; Ampache to search. If you want to disable one of the search
 ; methods simply leave it out. DB should be left as the first
 ; method unless you want it to overwrite what's already in the
 ; database
 ; POSSIBLE VALUES (builtins): db tags folder lastfm musicbrainz google
 ; POSSIBLE VALUES (plugins): Amazon,TheAudioDb,Tmdb,Omdb,Flickr
-; DEFAULT: db,tags,folder,musicbrainz,lastfm,google
-art_order = "db,tags,folder,musicbrainz,lastfm,google"
+; DEFAULT: db,tags,folder,spotify,musicbrainz,lastfm,google
+art_order = "db,spotify,TheAudioDb,musicbrainz,lastfm,tags,folder"
+
+; Gather song art
+; Gather song art additionally to the album art. This will add each
+; image of a song into the database. If your database contains
+; many songs not related to an album this should possibly be set to true.
+; Otherwise for an environment that contains mainly full albums
+; this should remain false to avoid multiple entries of the same image.
+; You need to set show_song_art to true if you want to make the song images visible.
+; DEFAULT = false
+;gather_song_art = "true"
+
+; Show song art
+; Show song art instead of album art in web UI and Subsonic API.
+; This will only work when gather_song_art is set to true AND when
+; there is song art in the database.
+; DEFAULT: false
+;show_song_art = "true"
+
+; Spotify Album art search filter
+;  Narrow the search.
+;  POSSIBLE VALUES:  artist,(year:1991 or year:1991-2000)
+; POSSIBLE  VALUES: empty string("") or commented out for no filter
+; DEFAULT: none;
+;spotify_art_filter = "artist"
+
+; Art search limit
+;  Limit the total images returned
+;  DEFAULT: 15
+;art_search_limit = 15
 
 ; Recommendations
 ; Set this to true to enable display of similar artists or albums
 ; while browsing. Requires Last.FM.
-; DEFAULT: false
-;show_similar = "false"
+; DEFAULT: "false"
+;show_similar = "true"
 
-; Concerts
-; Set this to true to enable display of artist concerts
-; Requires Last.FM.
-; DEFAULT: false
-;show_concerts = "false"
+; Hide Searches from the API
+; Set this to true and the get_indexes and playlists methods will not automatically include
+; searches/smart lists in the results.
+; Older versions of the Kodi Add-on will require this for playlists to work
+; DEFAULT: "false"
+;hide_search = "true"
+
+; Allow or disallow upload scripts on the server
+; Enable this if you trust your users
+; DEFAULT: "false"
+;allow_upload_scripts = "true"
+
+;#########################################################
+;      API keys                                          #
+;#########################################################
 
 ; Last.FM API Key
 ; Set this to your Last.FM api key to actually use Last.FM for
@@ -559,12 +691,24 @@ lastfm_api_key = "d5df942424c71b754e54ce1832505ae2"
 ; Last.FM API secret
 ; Set this to your Last.FM api secret to actually use Last.FM for
 ; scrobbling.
+; DEFAULT: none
 lastfm_api_secret = ""
 
+; Spotify client id
+; Set this to your Spotify client id to actually use Spotify for
+; accessing their catalog API. (https://developer.spotify.com/dashboard/)
+; DEFAULT: none
+;spotify_client_id = ""
+
+; Spotify client secret
+; Both id and secret are required to access the spotify catalog.
+; DEFAULT: none
+;spotify_client_secret = ""
+
 ; Wanted
 ; Set this to true to enable display missing albums and the
 ; possibility for users to mark it as wanted.
-; DEFAULT: false
+; DEFAULT: "false"
 wanted = "true"
 
 ; Wanted types
@@ -574,41 +718,37 @@ wanted_types = "album,official"
 
 ; Wanted Auto Accept
 ; Mark wanted requests as accepted by default (no content manager agreement required)
-; DEFAULT: false
-;wanted_auto_accept = "false"
-
-; EchoNest API key
-; EchoNest provides several music services. Currently used for missing song 30 seconds preview.
-;echonest_api_key = ""
+; DEFAULT: "false"
+;wanted_auto_accept = "true"
 
 ; Labels
 ; Use labels to browse artists per label membership.
-; DEFAULT: false
-;label = "false"
+; DEFAULT: "false"
+;label = "true"
 
 ; Broadcasts
 ; Allow users to broadcast music.
 ; This feature requires advanced server configuration, please take a look on the wiki for more information.
-; DEFAULT: false
-;broadcast = "false"
+; DEFAULT: "false"
+;broadcast = "true"
 
 ; Channels
 ; Set this to true to enable channels and the
 ; possibility for users to create channels from playlists
-; DEFAULT: true
+; DEFAULT: "false"
 channel = "true"
 
 ; Live Streams
 ; Set this to true to enable live streams (radio) and the
 ; possibility for users to add new live streams.
-; DEFAULT: true
+; DEFAULT: "true"
 live_stream = "true"
 
 ; Podcasts
 ; Set this to true to enable podcasts and the
 ; possibility for admins to subscribe to new podcasts.
-; DEFAULT: false
-;podcast = "false"
+; DEFAULT: "true"
+podcast = "true"
 
 ; Web Socket address
 ; Declare the web socket server address
@@ -617,7 +757,7 @@ live_stream = "true"
 
 ; Refresh Limit
 ; This defines the default refresh limit in seconds for
-; pages with dynamic content, such as now playing
+; pages with dynamic content, such as Now Playing
 ; DEFAULT: 60
 ; Possible Values: Int > 5
 refresh_limit = "60"
@@ -628,8 +768,8 @@ refresh_limit = "60"
 ; or status page. Use with the parameter 'user_id' to filter by a
 ; specific user. This page is like rss in that it doesn't require a
 ; login to view.
-; DEFAULT: false
-;use_now_playing_embedded = "false"
+; DEFAULT: "false"
+;use_now_playing_embedded = "true"
 
 ; Now Playing Refresh Limit
 ; This defines the refresh limit in seconds for the
@@ -654,28 +794,20 @@ refresh_limit = "60"
 ; Footer Statistics
 ; This defines whether statistics (Queries, Cache Hits, Load Time)
 ; are shown in the page footer.
-; DEFAULT: true
-; Possible values: true, false
+; DEFAULT: "true"
 show_footer_statistics = "true"
 
 ; RSS Feeds
 ; Set this to true to enable rss feeds.
 ; (latest albums, shouts, albums of artist, ...)
 ; use_rss = false (values true | false)
-;DEFAULT: use_rss = false
-;use_rss = "false"
+; DEFAULT: "false"
+;use_rss = "true"
 
 ; This setting allows themes to overwrite PHP template files. This can be really
 ; dangerous. Do this only if you trust every theme in your themes/ directory.
-; DEFAULT: false
-;allow_php_themes = "false"
-
-; Subsonic clients all seem to ignore the download method
-; This setting will not scrobble actions from stream actions.
-; (This means you can sync playlists without overloading your server)
-; Make sure you enable scrobbling in your client to keep recording stats!
-; DEFAULT: "true"
-;subsonic_stream_scrobble = "false"
+; DEFAULT: "false"
+;allow_php_themes = "true"
 
 ;#########################################################
 ; Debugging                                              #
@@ -683,13 +815,13 @@ show_footer_statistics = "true"
 
 ; Debug
 ; If this is enabled Ampache will write debugging information to the log file
-; DEFAULT: false
-;debug = "false"
+; DEFAULT: "false"
+;debug = "true"
 
 ; Debug Level
 ; This should always be set in conjunction with the
 ; debug option, it defines how prolific you want the
-; debugging in ampache to be. values are 1-5.
+; debugging in Ampache to be. values are 1-5.
 ; 1 == Basic Errors
 ; 2 == Errors + Failures (login attempts etc.)
 ; 3 == Full Error Information
@@ -699,7 +831,7 @@ show_footer_statistics = "true"
 debug_level = 5
 
 ; Path to Log File
-; This defines where you want ampache to log events to
+; This defines where you want Ampache to log events to
 ; this will only happen if debug is turned on. Do not
 ; include trailing slash. You will need to make sure that
 ; the specified directory exists and your HTTP server has
@@ -713,7 +845,6 @@ log_path = "/var/www/ampache/log"
 ; DEFAULT: %name.%Y%m%d.log
 log_filename = "%name.%Y%m%d.log"
 
-
 ;#########################################################
 ; Encoding Settings                                      #
 ;#########################################################
@@ -738,7 +869,6 @@ site_charset = UTF-8
 ; DEFAULT: auto
 ;mb_detect_order = "ASCII,UTF-8,EUC-JP,ISO-2022-JP,SJIS,JIS"
 
-
 ;#########################################################
 ; Custom actions (optional)                              #
 ;#########################################################
@@ -753,6 +883,7 @@ site_charset = UTF-8
 ;   - %a: the artist name
 ;   - %A: the album name
 ;   - %t: the song title
+; DEFAULT: none
 ;custom_play_action_run_0 = ""
 
 ; Example for Karaoke playing
@@ -760,7 +891,6 @@ site_charset = UTF-8
 ;custom_play_action_icon_0 = "microphone"
 ;custom_play_action_run_0 = "sox \"%f\" -p oops | ffmpeg -i pipe:0 -f %c pipe:1"
 
-
 ;#########################################################
 ; LDAP login info (optional)                             #
 ;#########################################################
@@ -794,12 +924,12 @@ ldap_filter = "(uid=%v)"                   ; OpenLDAP
 ;ldap_require_group = "cn=yourgroup,ou=yourorg,dc=yoursubdomain,dc=yourdomain,dc=yourtld"
 
 ; LDAP name field
-; DEFAULT: = "cn"
+; DEFAULT: cn
 ldap_name_field = "cn"
 ;ldap_name_field = "displayName"
 
 ; LDAP email field
-; DEFAULT: = "mail"
+; DEFAULT: mail
 ;ldap_email_field = "mail"
 
 ; LDAP avatar field
@@ -815,8 +945,8 @@ ldap_name_field = "cn"
 ;ldap_protocol_version = 3
 
 ; LDAP StartTLS
-; DEFAULT: false
-;ldap_start_tls = "false"
+; DEFAULT: "false"
+;ldap_start_tls = "true"
 
 ; LDAP member attribute name.
 ; That's the name of the attribute of the group that will contain
@@ -825,7 +955,6 @@ ldap_name_field = "cn"
 ;ldap_member_attribute = "member"
 ;ldap_member_attribute = "memberuid"
 
-
 ;#########################################################
 ; OpenID login info (optional)                           #
 ;#########################################################
@@ -835,75 +964,74 @@ ldap_name_field = "cn"
 ; VALUES: PAPE_AUTH_MULTI_FACTOR_PHYSICAL,PAPE_AUTH_MULTI_FACTOR,PAPE_AUTH_PHISHING_RESISTANT
 ;openid_required_pape = ""
 
-
 ;#########################################################
 ; Public Registration settings, defaults to disabled     #
 ;#########################################################
 
-; This setting will silently create an ampache account
+; This setting will silently create an Ampache account
 ; for anyone who can login using LDAP (or any other login
 ; extension). The default is to create new users as guests
 ; see auto_user config option if you would like to change this
-; DEFAULT: false
-auto_create = "true"
+; DEFAULT: "false"
+;auto_create = "true"
 
-; This setting will silently update an ampache account's
+; This setting will silently update an Ampache account's
 ; information for anyone who can login using LDAP
 ; (or any other login extension).
-; DEFAULT: false
-;external_auto_update = "false"
+; DEFAULT: "false"
+;external_auto_update = "true"
 
 ; This setting turns on/off public registration. It is
 ; recommended you leave this off, as it will allow anyone to
 ; sign up for an account on your server.
 ; REMEMBER: don't forget to set the mail from address further down in the config.
-; DEFAULT: false
-;allow_public_registration = "false"
+; DEFAULT: "false"
+;allow_public_registration = "true"
 
 ; Require Captcha Text on Image confirmation
 ; Turning this on requires the user to correctly
 ; type in the letters in the image created by Captcha
 ; Default is off because its very hard to detect if it failed
 ; to draw, or they failed to enter it.
-; DEFAULT: false
-;captcha_public_reg = "false"
+; DEFAULT: "false"
+;captcha_public_reg = "true"
 
 ; This setting turns on/off admin notification of registration.
-; DEFAULT: false
-;admin_notify_reg = "false"
+; DEFAULT: "false"
+;admin_notify_reg = "true"
 
 ; This setting determines whether the user will be created as a disabled user.
 ; If this is on, an administrator will need to manually enable the account
 ; before it's usable.
-; DEFAULT: false
-;admin_enable_required = "false"
+; DEFAULT: "false"
+;admin_enable_required = "true"
 
 ; This setting will allow all registrants/ldap/http users
 ; to be auto-approved as a user. By default, they will be
 ; added as a guest and must be promoted by the admin.
 ; POSSIBLE VALUES: guest, user, admin
 ; DEFAULT: guest
-auto_user = "user"
+;auto_user = "guest"
 
 ; This will display the user agreement when registering
 ; For agreement text, edit config/registration_agreement.php
 ; User will need to accept the agreement before they can register
-; DEFAULT: false
-;user_agreement = "false"
+; DEFAULT: "false"
+;user_agreement = "true"
 
 ; This disable email confirmation when registering.
-; DEFAULT: false
-;user_no_email_confirm = "false"
+; DEFAULT: "false"
+;user_no_email_confirm = "true"
 
 ; This will display the cookie disclaimer (EU Cookie Law)
-; DEFAULT: false
-;cookie_disclaimer = "false"
+; DEFAULT: "false"
+;cookie_disclaimer = "true"
 
 ; The fields that will be shown on Registration page
 ; If a user wants to register.
 ; Username and email fields are forced.
 ; POSSIBLE VALUES: fullname,website,state,city
-; DEFAULT: "fullname,website"
+; DEFAULT: fullname,website
 registration_display_fields = "fullname,website"
 
 ; The fields that will be mandatory
@@ -913,12 +1041,11 @@ registration_display_fields = "fullname,website"
 ; DEFAULT: fullname
 registration_mandatory_fields = "fullname"
 
-
-;########################################################
-; These options control the dynamic downsampling based  #
-; on current usage                                      #
-; *Note* Transcoding must be enabled and working        #
-;########################################################
+;#########################################################
+; These options control the dynamic downsampling based   #
+; on current usage                                       #
+; *Note* Transcoding must be enabled and working         #
+;#########################################################
 
 ; Attempt to optimize bandwidth by dynamically lowering the bit rate of new
 ; streams. Since the bit rate is only adjusted at the beginning of a song, the
@@ -933,7 +1060,10 @@ registration_mandatory_fields = "fullname"
 ; DEFAULT: 8
 ;min_bit_rate = 48
 
-;######################################################
+;#########################################################
+; Transcode Settings                                     #
+;#########################################################
+
 ; These are commands used to transcode non-streaming
 ; formats to the target file type for streaming.
 ; This can be useful in re-encoding file types that don't stream
@@ -949,57 +1079,59 @@ registration_mandatory_fields = "fullname"
 ; TYPE is the extension. 'allowed' certifies that transcoding works properly for
 ; this input format. 'required' further forbids the direct streaming of a format
 ; (e.g. if you store everything in FLAC, but don't want to ever stream that.)
-; transcode_TYPE         = {allowed|required|false}
-; DEFAULT: false
+; transcode_TYPE = {allowed|required|false}
+; DEFAULT: "false"
 ;;; Audio
-transcode_m4a      = allowed
-transcode_flac     = required
-transcode_mpc      = required
-transcode_ogg      = allowed
-transcode_oga      = required
-transcode_wav      = required
-transcode_wma      = required
-transcode_aif      = required
-transcode_aiff     = required
-transcode_ape      = required
-transcode_shn      = required
-transcode_mp3      = allowed
+;transcode_m4a = "allowed"
+;transcode_flac = "required"
+;transcode_mpc = "required"
+;transcode_ogg = "required"
+;transcode_oga = "required"
+;transcode_opus = "required"
+;transcode_wav = "required"
+;transcode_wma = "required"
+;transcode_aif = "required"
+;transcode_aiff = "required"
+;transcode_ape = "required"
+;transcode_shn = "required"
+transcode_mp3 = "allowed"
 ;;; Video
-transcode_avi      = allowed
-transcode_mkv      = allowed
-transcode_mpg      = allowed
-transcode_mpeg     = allowed
-transcode_m4v      = allowed
-transcode_mp4      = allowed
-transcode_mov      = allowed
-transcode_wmv      = allowed
-transcode_ogv      = allowed
-transcode_divx     = allowed
-transcode_m2ts     = allowed
-transcode_webm     = allowed
+;transcode_avi = "allowed"
+;transcode_flv = "allowed"
+;transcode_mkv = "allowed"
+;transcode_mpg = "allowed"
+;transcode_mpeg = "allowed"
+;transcode_m4v = "allowed"
+;transcode_mp4 = "allowed"
+;transcode_mov = "allowed"
+;transcode_wmv = "allowed"
+;transcode_ogv = "allowed"
+;transcode_divx = "allowed"
+;transcode_m2ts = "allowed"
+;transcode_webm = "allowed"
 
 ; Default audio output format
 ; DEFAULT: none
-encode_target = mp3
+;encode_target = mp3
 
 ; Default video output format
 ; DEFAULT: none
-encode_video_target = webm
+;encode_video_target = webm
 
 ; Override the default output format on a per-type basis, for example,
 ; to stream lossless encoded files in lossy formats.
 ; encode_target_TYPE = TYPE
 ; DEFAULT: none
-encode_target_flac = opus
+;encode_target_flac = opus
 
 ; Override the default TYPE transcoding behavior on a per-player basis, for example,
 ; to stream lossless using the api and lossy using the web interface.
 ; transcode_player_PLAYER_TYPE = TYPE
 ; Valid PLAYER is: webplayer, api
 ; DEFAULT: none
-transcode_player_webplayer_m4a = required
-transcode_player_webplayer_flac = required
-transcode_player_webplayer_mpc = required
+;transcode_player_webplayer_m4a = "required"
+;transcode_player_webplayer_flac = "required"
+;transcode_player_webplayer_mpc = "required"
 
 ; Override the default output format on a per-player basis
 ; encode_player_PLAYER_target = TYPE
@@ -1009,7 +1141,7 @@ transcode_player_webplayer_mpc = required
 ;encode_player_api_target = mp3
 
 ; Allow clients to override transcode settings (output type, bitrate, codec ...)
-; DEFAULT: true
+; DEFAULT: "true"
 transcode_player_customize = "true"
 
 ; Command configuration. Substitutions will be made as follows:
@@ -1026,7 +1158,7 @@ transcode_player_customize = "true"
 ; clever enough to figure out how on your own.
 ; DEFAULT: none
 ;transcode_cmd = "ffmpeg"
-transcode_cmd = "avconv"
+;transcode_cmd = "avconv"
 ;transcode_cmd = "/usr/bin/neatokeen"
 
 ; Transcode input file argument
@@ -1050,7 +1182,7 @@ encode_args_opus = "-vn -b:a %BITRATE%K -c:a libopus -compression_level 10 -vsyn
 encode_args_m4a = "-vn -b:a %BITRATE%K -c:a libfdk_aac -f adts pipe:1"
 encode_args_wav = "-vn -b:a %BITRATE%K -c:a pcm_s16le -f wav pipe:1"
 encode_args_flv = "-b:a %BITRATE%K -ar 44100 -ac 2 -v 0 -f flv -c:v libx264 -preset superfast -threads 0 pipe:1"
-encode_args_webm = "-q %QUALITY% -f webm -c:v libvpx -maxrate 800k -preset superfast -threads 0 pipe:1"
+encode_args_webm = "-b:a %BITRATE%K -f webm -c:v libvpx -preset superfast -threads 0 pipe:1"
 encode_args_ts = "-q %QUALITY% -s %RESOLUTION% -f mpegts -c:v libx264 -c:a libmp3lame -maxrate %MAXBITRATE%k -preset superfast -threads 0 pipe:1"
 encode_args_ogv = "-codec:v libtheora -qscale:v 7 -codec:a libvorbis -qscale:a 5 -f ogg pipe:1"
 
@@ -1070,26 +1202,66 @@ encode_ss_duration = "-t %DURATION%"
 ; Useful if you are having issues streaming the full track.
 ; You can set it for all streams or a specific player
 ; POSSIBLE VALUES: true webplayer api
-; DEFAULT: = false
-;send_full_stream = "webplayer"
+; DEFAULT: "webplayer"
+send_full_stream = "webplayer"
+
+;#########################################################
+; Transcode Caching                                      #
+;#########################################################
+
+; These are commands used to pre-cache a file format for streaming.
+; This helps avoid waiting for transcodes to finish and makes
+; files immediately available to the client.
+
+; Path to your cache folder.
+; This is where the pre-transcoded files will be stored
+; DEFAULT: none
+;cache_path = "/tmp"
+
+; Default audio output format
+; DEFAULT: none
+;cache_target = "mp3"
+
+; Look in your local catalogs for these file extensions and pre-cache to the
+; 'cache_path'. This could be helpful to reduce space needed on your
+; web server or to make sure that clients get files quickly.
+; Execute "php bin/cli run:cacheProcess" to process these files.
+; DEFAULT: "false"
+;cache_m4a = "true"
+;cache_flac = "true"
+;cache_mpc = "true"
+;cache_ogg = "true"
+;cache_oga = "true"
+;cache_opus = "true"
+;cache_wav = "true"
+;cache_wma = "true"
+;cache_aif = "true"
+;cache_aiff = "true"
+;cache_ape = "true"
+;cache_shn = "true"
+;cache_mp3 = "true"
+
+; REMOTE CATALOGS ONLY
+; Enabling cache_remote on remote catalogs will cache every file on the remote server
+; DEFAULT: "false"
+;cache_remote = "true"
 
 ;#########################################################
 ; Proxy Settings (optional)                              #
 ;#########################################################
 
 ; If Ampache is behind an http proxy, specify the hostname or IP address
-; port, proxyusername, and proxypassword here.
-;DEFAULT: not in use
+; port, proxy username, and proxy password here.
+; DEFAULT: not in use
 ;proxy_host = "192.168.0.1"
 ;proxy_port = "8080"
 ;proxy_user = ""
 ;proxy_pass = ""
 
 ; If Ampache is behind an https reverse proxy, force use HTTPS protocol.
-;Default: false
+; DEFAULT: "false"
 ;force_ssl = "true"
 
-
 ;#########################################################
 ;  Mail Settings                                         #
 ;#########################################################
@@ -1098,75 +1270,76 @@ encode_ss_duration = "-t %DURATION%"
 ; otherwise, you can reset your password
 ; and never receive an email with the new one
 ; Default: false
-;mail_enable = "false"
+;mail_enable = "true"
 
-;Method used to send mail
-;POSSIBLE VALUES: smtp sendmail php
-;DEFAULT: php
+; Method used to send mail
+; POSSIBLE VALUES: smtp sendmail php
+; DEFAULT: php
 ;mail_type = "php"
 
-;Mail domain.
-;DEFAULT: example.com
+; Mail domain.
+; DEFAULT: example.com
 ;mail_domain = "example.com"
 
-;This will be combined with mail_domain and used as the source address for
-;emails generated by Ampache.  For example, setting this to 'me' will set the
-;sender to 'me@example.com'.
-;DEFAULT: info
+; This will be combined with mail_domain and used as the source address for
+; emails generated by Ampache.  For example, setting this to 'me' will set the
+; sender to 'me@example.com'.
+; DEFAULT: info
 ;mail_user = "info"
 
-;A name to go with the email address.
-;DEFAULT: Ampache
+; A name to go with the email address.
+; DEFAULT: Ampache
 ;mail_name = "Ampache"
 
-;How strictly email addresses should be checked.
-;easy does a regex match, strict actually performs some SMTP transactions
-;to see if we can send to this address.
-;POSSIBLE VALUES: strict easy none
+; How strictly email addresses should be checked.
+; easy does a regex match, strict actually performs some SMTP transactions
+; to see if we can send to this address.
+; POSSIBLE VALUES: strict easy none
 ; DEFAULT: strict
 ;mail_check = "strict"
 
-
 ;#########################################################
 ;  sendmail Settings                                     #
 ;#########################################################
 
-;DEFAULT: /usr/sbin/sendmail
+; DEFAULT: /usr/sbin/sendmail
 ;sendmail_path = "/usr/sbin/sendmail"
 
-
 ;#########################################################
 ;  SMTP Settings                                         #
 ;#########################################################
 
-;Mail server (hostname or IP address)
-;DEFAULT: localhost
-;mail_host = "localhost"
+; Mail server (hostname or IP address)
+; DEFAULT: localhost
+mail_host = "localhost"
 
 ; SMTP port
-;DEFAULT: 25
-;mail_port = 25
+; DEFAULT: 25
+mail_port = 25
 
-;Secure SMTP
-;POSSIBLE VALUES: ssl tls
-;DEFAULT: none
+; Secure SMTP
+; POSSIBLE VALUES: ssl tls
+; DEFAULT: none
 ;mail_secure_smtp = tls
 
-;Enable SMTP authentication
-;DEFAULT: false
+; Enable SMTP authentication
+; DEFAULT: "false"
 ;mail_auth = "true"
 
-;SMTP Username
-;your mail auth username.
+; SMTP username
+; your mail auth username.
+; DEFAULT: none
 ;mail_auth_user = ""
 
-; SMTP Password
+; SMTP password
 ; your mail auth password.
+; DEFAULT: none
 ;mail_auth_pass = ""
 
-;#############################
-;   Abbreviation Filter      #
-;#############################
+;#########################################################
+;   Abbreviation Filter                                  #
+;#########################################################
+
 ; For file name parsing. Any unnecessary abbreviations in file names can be removed during parsing
 ; by adding them to the list below so that they will be removed during the parsing process.
 common_abbr = "divx,xvid,dvdrip,hdtv,lol,axxo,repack,xor,pdtv,real,vtv,caph,2hd,proper,fqm,uncut,topaz,tvt,notv,fpn,fov,orenji,0tv,omicron,dsr,ws,sys,crimson,wat,hiqt,internal,brrip,boheme,vost,vostfr,fastsub,addiction,x264,LOL,720p,1080p,YIFY,evolve,fihtv,first,bokutox,bluray,tvboom,info"
diff --git a/conf/app.src b/conf/app.src
index cc9961b..631556b 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,7 @@
-SOURCE_URL=https://github.com/ampache/ampache/archive/4.4.2.tar.gz
-SOURCE_SUM=fadf5c9f9b6d59904979f3e109b7935c48fc2b8c04640a0503723cf31674bc99
+SOURCE_URL=https://github.com/ampache/ampache/releases/download/5.4.0/ampache-5.4.0_all_php8.0.zip
+SOURCE_SUM=d37f9130d2d39d8f936c7ccb2e96711e9e1da53b55d53792f017e5ee5aa12bd1
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
+SOURCE_FORMAT=zip
+SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=
+SOURCE_EXTRACT=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8171468..fde30de 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -2,12 +2,7 @@
 location __PATH__/ {
 
 	# Path to source
-	alias __FINALPATH__/;
-
-	# Force usage of https
-	if ($scheme = http) {
-		rewrite ^ https://$server_name$request_uri? permanent;
-	}
+	alias __FINALPATH__/public/;
 
 	rewrite ^__PATH__/play/ssid/(.*)/type/(.*)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/player/(.*)/name/(.*)$ __PATH__/play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&player=$7&name=$8 last;
 	rewrite ^__PATH__/play/ssid/(.*)/type/(.*)/oid/([0-9]+)/uid/([0-9]+)/client/(.*)/noscrobble/([0-1])/bitrate/([0-9]+)/player/(.*)/name/(.*)$ __PATH__/play/index.php?ssid=$1&type=$2&oid=$3&uid=$4&client=$5&noscrobble=$6&bitrate=$7player=$8&name=$9 last;
diff --git a/doc/.DS_Store b/doc/.DS_Store
new file mode 100644
index 0000000..c90376b
Binary files /dev/null and b/doc/.DS_Store differ
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
new file mode 100644
index 0000000..08b5d1d
--- /dev/null
+++ b/doc/DESCRIPTION.md
@@ -0,0 +1,8 @@
+[Ampache](http://ampache.org) for the love of music. A web based audio/video streaming application and file manager allowing you to access your music & videos from anywhere, using almost any internet enabled device.
+
+### Features
+
+ * Config for high quality streaming with high bandwith
+ * Quick loading for mobile devices with potential low bandwith
+ * Integrate with YunoHost users - same username and password
+ * Allow one user to be the administrator (set at the installation)
\ No newline at end of file
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
new file mode 100644
index 0000000..be1db35
--- /dev/null
+++ b/doc/DISCLAIMER.md
@@ -0,0 +1,30 @@
+## Limitations
+
+* Also, the SSO authentication not fully working from user panel, we have to work about this. In fact, it can disrupt external Ampache clients like Subsonic.
+
+## Additionnal informations
+
+### Getting started
+
+ * **Add your first catalog to load music files**
+   * Go to *Admin panel* ![](https://raw.githubusercontent.com/ampache/ampache/develop/themes/reborn/images/icons/icon_admin.png)
+   * Click on *Add a Catalog*
+   * Fill up fields and click *Add Calalog*
+   * Next, enjoy :)
+
+ * **Update a catalog for load new music files**
+   * Go to *Admin panel* ![](https://raw.githubusercontent.com/ampache/ampache/develop/themes/reborn/images/icons/icon_admin.png)
+   * Click on *Show Catalogs*
+   * Select *Update* in *Actions* list and click *Go*
+
+ * **Change interface Language**
+   * Go to *Preferences panel* ![](https://raw.githubusercontent.com/ampache/ampache/develop/themes/reborn/images/icons/icon_edit.png)
+   * Click on *Interface*
+   * Change *Language* field
+
+### Ampache on mobile devices
+
+ * [For Android](https://play.google.com/store/apps/details?id=com.antoniotari.reactiveampacheapp)
+ * [For iOS](http://iampache.com/)
+
+ * Full list of existings clients : https://github.com/ampache/ampache/wiki/Clients
diff --git a/doc/screenshots/visualizer.png b/doc/screenshots/visualizer.png
new file mode 100644
index 0000000..13f0338
Binary files /dev/null and b/doc/screenshots/visualizer.png differ
diff --git a/manifest.json b/manifest.json
index e72a894..2c12ad4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,28 +6,34 @@
         "en": "Web based audio/video streaming application",
         "fr": "Application de streaming audio et vidéo"
     },
-    "version": "4.4.2~ynh1",
+    "version": "5.4.0~ynh1",
     "url": "http://ampache.org",
+    "upstream": {
+        "license": "AGPL-3.0",
+        "website": "http://ampache.org",
+        "demo": "https://ampache.org/demo.html",
+        "admindoc": "https://github.com/ampache/ampache/wiki",
+        "code": "https://github.com/ampache/ampache"
+    },
     "license": "AGPL-3.0",
     "maintainer": {
         "name": "aymhce",
         "email": "aymhce@gmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.1.7"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services" : [
         "nginx",
-        "php7.3-fpm",
+        "php8.0-fpm",
         "mysql"
     ],
     "arguments": {
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "domain.org"
+                "type": "domain"
             },
             {
                 "name": "path",
@@ -37,8 +43,7 @@
             },
             {
                 "name": "admin",
-                "type": "user",
-                "example": "homer"
+                "type": "user"
             },
             {
                 "name": "is_public",
diff --git a/pull_request_template.md b/pull_request_template.md
deleted file mode 100644
index 6c28fc5..0000000
--- a/pull_request_template.md
+++ /dev/null
@@ -1,16 +0,0 @@
-## Problem
-- *Description of why you made this PR*
-
-## Solution
-- *And how do you fix that problem*
-
-## PR Status
-- [ ] Code finished.
-- [ ] Tested with Package_check.
-- [ ] Fix or enhancement tested.
-- [ ] Upgrade from last version tested.
-- [ ] Can be reviewed and tested.
-
-## Package_check results
----
-* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 981bf56..164e3b2 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,102 +4,18 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app
-pkg_dependencies="libav-tools|ffmpeg"
+YNH_PHP_VERSION="8.0"
 
-YNH_PHP_VERSION="7.3"
+# Composer version
+YNH_COMPOSER_VERSION="2.3.5"
 
-extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-simplexml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-ldap"
+pkg_dependencies="libav-tools|ffmpeg php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-simplexml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-ldap"
 
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
 
-readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17
-# Declare the actual composer version to use.
-# A packager willing to use another version of composer can override the variable into its _common.sh.
-YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION}
-
-# Execute a command with Composer
-#
-# usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands"
-# | arg: -v, --phpversion - PHP version to use with composer
-# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
-# | arg: -c, --commands - Commands to execute.
-ynh_composer_exec () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=vwc
-	declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= )
-	local phpversion
-	local workdir
-	local commands
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	workdir="${workdir:-$final_path}"
-	phpversion="${phpversion:-$YNH_PHP_VERSION}"
-
-	COMPOSER_HOME="$workdir/.composer" \
-		php${phpversion} "$workdir/composer.phar" $commands \
-		-d "$workdir" --quiet --no-interaction
-}
-
-# Install and initialize Composer in the given directory
-#
-# usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion]
-# | arg: -v, --phpversion - PHP version to use with composer
-# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
-# | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include
-# | arg: -c, --composerversion - Composer version to install
-ynh_install_composer () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=vwa
-	declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=)
-	local phpversion
-	local workdir
-	local install_args
-	local composerversion
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	workdir="${workdir:-$final_path}"
-	phpversion="${phpversion:-$YNH_PHP_VERSION}"
-	install_args="${install_args:-}"
-	composerversion="${composerversion:-$YNH_COMPOSER_VERSION}"
-
-	curl -sS https://getcomposer.org/installer \
-		| COMPOSER_HOME="$workdir/.composer" \
-		php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \
-		|| ynh_die "Unable to install Composer."
-
-	# update dependencies to create composer.lock
-	ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \
-		|| ynh_die "Unable to update core dependencies with Composer."
-}
-
 
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
-
-# Install or update the main directory yunohost.multimedia
-#
-# usage: ynh_multimedia_build_main_dir
-ynh_multimedia_build_main_dir () {
-	local ynh_media_release="v1.2"
-	local checksum="806a827ba1902d6911095602a9221181"
-
-	# Download yunohost.multimedia scripts
-	wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz 2>&1
-
-	# Check the control sum
-	echo "${checksum} ${ynh_media_release}.tar.gz" | md5sum -c --status \
-		|| ynh_die "Corrupt source"
-
-	# Check if the package acl is installed. Or install it.
-	ynh_package_is_installed 'acl' \
-		|| ynh_package_install acl
-
-	# Extract
-	mkdir yunohost.multimedia-master
-	tar -xf ${ynh_media_release}.tar.gz -C yunohost.multimedia-master --strip-components 1
-	./yunohost.multimedia-master/script/ynh_media_build.sh
-}
diff --git a/scripts/backup b/scripts/backup
index 59d0489..742dee5 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -27,6 +27,7 @@ app=$YNH_APP_INSTANCE_NAME
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -49,7 +50,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
 
-ynh_backup --src_path="/etc/php/${YNH_PHP_VERSION}/fpm/pool.d/$app.conf"
+ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE
diff --git a/scripts/install b/scripts/install
index edcbbbe..230b808 100644
--- a/scripts/install
+++ b/scripts/install
@@ -22,8 +22,9 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
-admin_ampache=$YNH_APP_ARG_ADMIN
+admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
+secret_key=$(ynh_string_random --length=24)
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -45,7 +46,8 @@ ynh_script_progression --message="Storing installation settings..." --weight=2
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=admin --value=$admin_ampache
+ynh_app_setting_set --app=$app --key=admin --value=$admin
+ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -59,7 +61,7 @@ ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 # CREATE A MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Creating a MySQL database..."
+ynh_script_progression --message="Creating a MySQL database..." --weight=1
 
 db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
@@ -69,10 +71,10 @@ ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Configuring system user..."
+ynh_script_progression --message="Configuring system user..." --weight=1
 
 # Create a system user
-ynh_system_user_create --username=$app
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -83,49 +85,54 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..."
+ynh_script_progression --message="Configuring NGINX web server..." --weight=1
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring PHP-FPM..."
+ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # SPECIFIC SETUP
 #=================================================
 # CONFIGURE AMPACHE
 #=================================================
-ynh_script_progression --message="Preconfiguring Ampache..." --weight=2
-
-secret_key=$(ynh_string_random --length=24)
-ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key
+ynh_script_progression --message="Preconfiguring $app..." --weight=2
 
 ynh_add_config --template="../conf/ampache.cfg.php" --destination="$final_path/config/ampache.cfg.php"
 
+chmod 600 "$final_path/config/ampache.cfg.php"
+chown $app: "$final_path/config/ampache.cfg.php"
+
 #=================================================
 # LOAD DEFAULT DATABASE
 #=================================================
-ynh_script_progression --message="Loading default database..."
+ynh_script_progression --message="Loading default database..." --weight=2
 
 # Load default ampache database
-ynh_mysql_connect_as --user=$app --password="$db_pwd" --database=$app < "$final_path/sql/ampache.sql"
+ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name < "$final_path/resources/sql/ampache.sql"
 
 #=================================================
 # INSTALL AMPACHE WITH COMPOSER
 #=================================================
-ynh_script_progression --message="Installing ampache with Composer..." --weight=45
+ynh_script_progression --message="Installing $app with Composer..." --weight=45
 
 # Install composer
-ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev"
+ynh_install_composer --install_args="--ignore-platform-req=ext-intl"
 
 #=================================================
 # INSTALL MULTIMEDIA DIRECTORIES
@@ -137,7 +144,7 @@ ynh_multimedia_build_main_dir
 #=================================================
 # PRE CONFIGURE AMPACHE
 #=================================================
-ynh_script_progression --message="Configuring Ampache..." --weight=5
+ynh_script_progression --message="Configuring $app..." --weight=5
 
 # Set the app as temporarily public for curl call
 ynh_permission_update --permission="main" --add="visitors"
@@ -151,30 +158,19 @@ sleep 1
 #=================================================
 # LOAD ADMIN DATABASE
 #=================================================
-ynh_script_progression --message="Loading admin database..."
+ynh_script_progression --message="Loading admin database..." --weight=2
 
 cp ../conf/admin.sql /tmp/
-ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin_ampache" --target_file=/tmp/admin.sql
+ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file=/tmp/admin.sql
 
-ynh_mysql_connect_as --user=$app --password="$db_pwd" --database=$app < /tmp/admin.sql
+ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name < /tmp/admin.sql
 
 ynh_secure_remove --file=/tmp/admin.sql
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-ynh_script_progression --message="Securing files and directories..."
-
-# Set permissions to ampache directory
-chown -R $app:$app $final_path
-chmod 600 $final_path/config/ampache.cfg.php
-
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring permissions..."
+ynh_script_progression --message="Configuring permissions..." --weight=1
 
 if [ $is_public -eq 0 ]
 then
@@ -184,7 +180,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..."
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/remove b/scripts/remove
index f2a5098..71e304f 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -52,7 +52,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 ynh_script_progression --message="Removing NGINX web server configuration..."
 
-# Remove the dedicated nginx config
+# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
 #=================================================
@@ -60,7 +60,7 @@ ynh_remove_nginx_config
 #=================================================
 ynh_script_progression --message="Removing PHP-FPM configuration..."
 
-# Remove the dedicated php-fpm config
+# Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index baa17a9..b7993de 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -28,16 +28,14 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS
@@ -48,42 +46,25 @@ ynh_script_progression --message="Restoring the NGINX configuration..."
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RESTORE THE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Restoring the app main directory..."
-
-ynh_restore_file --origin_path="$final_path"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
 ynh_script_progression --message="Recreating the dedicated system user..." --weight=3
 
 # Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
-# RESTORE USER RIGHTS
+# RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring user rights..."
+ynh_script_progression --message="Restoring the app main directory..." --weight=3
 
-# Restore permissions on app files
-chown -R $app:$app $final_path
-chmod 600 $final_path/config/ampache.cfg.php
+ynh_restore_file --origin_path="$final_path"
 
-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring PHP-FPM configuration..."
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
 
-ynh_restore_file --origin_path="/etc/php/${YNH_PHP_VERSION}/fpm/pool.d/$app.conf"
-
-# Recreate a dedicated php-fpm config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
-
-#=================================================
-# SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
@@ -92,6 +73,13 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=30
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
 
+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring PHP-FPM configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
@@ -108,7 +96,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
 #=================================================
 ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..."
 
-ynh_systemd_action --service_name=php${YNH_PHP_VERSION}-fpm --action=reload
+ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index f87d70d..40956bd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -25,14 +25,28 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
+phpversion=$YNH_PHP_VERSION
 
 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..."
 
 upgrade_type=$(ynh_check_app_version_changed)
 
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=20
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+    # restore it if the upgrade fails
+    ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -64,27 +78,13 @@ if ynh_legacy_permissions_exists; then
     ynh_app_setting_delete --app=$app --key=is_public
 fi
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=20
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
 ynh_script_progression --message="Making sure dedicated system user exists..."
 
 # Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -98,6 +98,10 @@ then
 	ynh_setup_source --dest_dir="$final_path"
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -119,7 +123,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -132,6 +136,8 @@ then
     ynh_script_progression --message="Upgrading Ampache configuration..."
 
     ynh_add_config --template="../conf/ampache.cfg.php" --destination="$final_path/config/ampache.cfg.php"
+    chmod 600 "$final_path/config/ampache.cfg.php"
+    chown $app:$app "$final_path/config/ampache.cfg.php"
 
     #=================================================
     # UPDATE AMPACHE WITH COMPOSER
@@ -139,7 +145,7 @@ then
     ynh_script_progression --message="Upgrading ampache with Composer..." --weight=30
 
     # Install composer
-    ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev"
+    ynh_install_composer --install_args="--ignore-platform-req=ext-intl"
     ynh_composer_exec --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --commands="config discard-changes true"
 fi
 
@@ -171,17 +177,6 @@ then
     sleep 1
 fi
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-ynh_script_progression --message="Securing files and directories..."
-
-# Set permissions on app files
-chown -R $app:$app $final_path
-chmod 600 $final_path/config/ampache.cfg.php
-
 #=================================================
 # SETUP SSOWAT
 #=================================================