diff --git a/README.md b/README.md
index 7aa1e31..6c08452 100644
--- a/README.md
+++ b/README.md
@@ -23,11 +23,19 @@ Navidrome is an open source web-based music collection server and streamer. It g
 
 ## Configuration
 
+<<<<<<< Updated upstream
 You can configure Navidrome by editing this file `/var/lib/navidrome/navidrome.toml` using the [documentation](https://www.navidrome.org/docs/usage/configuration-options/).
 
 The music is to be stored in the folder `/home/yunohost.navidrome/Music`.
+=======
+#### Where are stored your music files
 
-You must activate public site if you want to connect a client player to Navidrome.
+Your music files are stored in your shared [multimedia folder](https://github.com/YunoHost-Apps/yunohost.multimedia) `/home/yunohost.multimedia/share/Music`. This folder is accessible from Nextcloud with *External Storages* enabled. This will allow you to easily upload your music files to the server.
+
+You can configure an alternative path to you music tracks by editing `MusicFolder` in this file `/var/lib/navidrome/navidrome.toml` using the [documentation](https://www.navidrome.org/docs/usage/configuration-options/).
+>>>>>>> Stashed changes
+
+You must activate *public site* if you want to connect a client player to Navidrome.
 
 ## Documentation
 
diff --git a/README_fr.md b/README_fr.md
index 0879950..b18bedd 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -23,11 +23,13 @@ Navidrome est un serveur et un streamer de collection de musique en ligne open s
 
 ## Configuration
 
-Vous pouvez configurer Navidrome en modifiant le fichier `/var/lib/navidrome/navidrome.toml` et en vous aidant de la [documentation](https://www.navidrome.org/docs/usage/configuration-options/).
+#### Où est stockée votre musique
 
-La musique est à stocker dans le dossier `/home/yunohost.navidrome/Music`.
+Votre musique est stockée par default dans le dossier multimédia partagé `/home/yunohost.multimedia/share/Music`. Ce dossier est facilement accessible depuis Nextcloud avec *Stockages externes* activée. Cela vous permettra d'envoyer facilement vos fichiers musicaux sur votre server.
 
-Vous devez activer site public si vous souhaitez connecter un lecteur client à Navidrome.
+Vous pouvez configurer un chemin alternatif vers vos morceaux de musique en éditant `MusicFolder` dans ce fichier`/var/lib/navidrome/navidrome.toml` en utilisant la [documentation](https://www.navidrome.org/docs/usage/configuration-options/).
+
+Vous devez activer *site public* si vous souhaitez connecter un lecteur client à Navidrome.
 
 ## Documentation
 
diff --git a/conf/navidrome.toml b/conf/navidrome.toml
index fce04bf..9db3dfb 100644
--- a/conf/navidrome.toml
+++ b/conf/navidrome.toml
@@ -5,4 +5,21 @@ BaseURL = "__PATH_URL__"
 ScanInterval = "90s"
 TranscodingCacheSize = "150MiB"
 DataFolder = "__CONFIG_PATH__"
+<<<<<<< Updated upstream
 MusicFolder = "/home/yunohost.navidrome/Music"
+=======
+# Folder where your music library is stored. Can be read-only
+MusicFolder = "/home/yunohost.multimedia/share/Music"
+# How long Navidrome will wait before closing web ui idle sessions
+SessionTimeout = "24h"
+# Set JPEG quality percentage for resized cover art images
+CoverJpegQuality = "75"
+#Configure the order to look for cover art images. Use special embedded value to get embedded images from the audio files
+CoverArtPriority = "embedded, cover.*, folder.*, front.*"
+# Match query strings anywhere in searchable fields, not only in word boundaries. Useful for languages where words are not space separated
+SearchFullString = "false"
+# List of ignored articles when sorting/indexing artists
+IgnoredArticles = "The El La Los Las Le Les Os As O A"
+# Enable/disable .m3u playlist auto-import
+AutoImportPlaylists = "true"
+>>>>>>> Stashed changes
diff --git a/scripts/install b/scripts/install
index b86da5e..46e9eb7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -94,17 +94,12 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=3
 # Create a dedicated nginx config
 ynh_add_nginx_config
 
-#=================================================
-# SPECIFIC SETUP
 #=================================================
 # YUNOHOST MULTIMEDIA INTEGRATION
 #=================================================
-ynh_script_progression --message="Adding multimedia directories..." --weight=5
-
-mkdir -p /home/yunohost.$app/Music
+ynh_script_progression --message="Adding multimedia directories..." --weight=2
 
 ynh_multimedia_build_main_dir
-ynh_multimedia_addfolder --source_dir="/home/yunohost.$app/Music" --dest_dir="share/Music"
 
 #=================================================
 # MODIFY A CONFIG FILE
@@ -145,10 +140,6 @@ ynh_script_progression --message="Securing files and directories..." --weight=1
 chown -R $app:$app "$final_path"
 chown -R $app:$app "$config_path"
 
-# Set permissions to media files
-chown -R $app:www-data /home/yunohost.$app/
-chmod -R 764 /home/yunohost.$app
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 9d2faec..c9db310 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -77,8 +77,8 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Restoring user rights..."
 
 # Restore permissions on app files
-chown -R $app:$app "$final_path"
-chown -R $app:$app "/var/lib/$app"
+chown -R $app: "$final_path"
+chown -R $app: "/var/lib/$app"
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index fe9d1aa..ec3181c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -62,7 +62,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=5
 
 	# # Create a temporary directory
-	# tmpdir="$(mktemp -d)"
+	#tmpdir="$(mktemp -d)"
 	# # Backup the config file in the temp dir
 	# cp -a "/var/lib/$app/navidrome.toml" "$tmpdir/navidrome.toml"
 	
@@ -102,22 +102,12 @@ ynh_script_progression --message="Making sure dedicated system user exists..." -
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app
 
-#=================================================
-# YUNOHOST MULTIMEDIA INTEGRATION
-#=================================================
-ynh_script_progression --message="Adding multimedia directories..." --weight=5
-
-mkdir -p /home/yunohost.$app/Music
-
-ynh_multimedia_build_main_dir
-ynh_multimedia_addfolder --source_dir="/home/yunohost.$app/Music" --dest_dir="share/Music"
-
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
 # ynh_script_progression --message="Modifying a config file..."
 
-config_path="/var/lib/$app"
+#config_path="/var/lib/$app"
 # mkdir -p "$config_path"
 
 # ynh_backup_if_checksum_is_different --file="$config_path/navidrome.toml"
@@ -151,12 +141,8 @@ ynh_add_systemd_config
 ynh_script_progression --message="Securing files and directories..."
 
 # Set permissions on app files
-chown -R $app:$app $final_path
-chown -R $app:$app $config_path
-
-# Set permissions on media files
-chown -R $app:www-data /home/yunohost.$app/
-chmod -R 764 /home/yunohost.$app
+chown -R $app: $final_path
+chown -R $app: $config_path
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST