diff --git a/conf/mopidy.conf b/conf/mopidy.conf
index 6f823b4..619248e 100644
--- a/conf/mopidy.conf
+++ b/conf/mopidy.conf
@@ -16,80 +16,56 @@
 # `mopidy --version` to check the current version.
 
 [core]
-cache_dir = $XDG_CACHE_DIR/mopidy
+cache_dir  = $XDG_CACHE_DIR/mopidy
 config_dir = $XDG_CONFIG_DIR/mopidy
-data_dir = $XDG_DATA_DIR/mopidy
-#max_tracklist_length = 10000
+data_dir   = $XDG_DATA_DIR/mopidy
 
 [logging]
-color = true
+color          = true
 console_format = %(levelname)-8s %(message)s
-#debug_format = %(levelname)-8s %(asctime)s [%(process)d:%(threadName)s] %(name)s\n  %(message)s
-#debug_file = mopidy.log
-#config_file =
 
 [audio]
-#mixer = software
-#mixer_volume = 
 output = autoaudiosink
-#output = tee name=t t. ! queue ! pulsesink server=127.0.0.1 t. ! queue ! audioresample ! audioconvert ! audio/x-raw,rate=44100,channels=2,format=S16LE ! wavenc ! filesink location=/tmp/mpd.fifo
-#output = pulsesink server=127.0.0.1
-#buffer_time = 
-
-[proxy]
-#scheme = 
-#hostname = 
-#port = 
-#username = 
-#password = 
 
 [mpd]
-enabled = true
-hostname = ::
-port = 6700
-#password = 
-max_connections = 20
-connection_timeout = 60
-zeroconf = Mopidy MPD server on $hostname
-#command_blacklist = 
-#  listall
-#  listallinfo
+enabled                 = true
+hostname                = ::
+port                    = 6700
+max_connections         = 20
+connection_timeout      = 60
+zeroconf                = Mopidy MPD server on $hostname
 default_playlist_scheme = m3u
 
 [http]
-enabled = true 
-#hostname = 127.0.0.1
-#port = 6680
-#static_dir =
-#zeroconf = Mopidy HTTP server on $hostname
+enabled = false 
 
 [stream]
-enabled = false
-#protocols = 
-#  http
-#  https
-#  mms
-#  rtmp
-#  rtmps
-#  rtsp
-#metadata_blacklist = 
-#timeout = 5000
+enabled = true
+protocols =
+    http
+    https
+    mms
+    rtmp
+    rtmps
+    rtsp
+timeout = 5000
+metadata_blacklist =
 
 [m3u]
 enabled = true
-#base_dir = /mnt/music/diskstation1/playlists 
+base_dir = $XDG_MUSIC_DIR 
 default_encoding = latin-1
 default_extension = .m3u8
-playlists_dir = /mnt/diskstation1/music/playlists
+playlists_dir = $XDG_MUSIC_DIR/playlists
 
 [softwaremixer]
 enabled = true
 
 [file]
-enabled = false
+enabled = true
 media_dirs = 
-  /mnt/diskstation1/music|Musique
-  #$XDG_MUSIC_DIR|Home
+  $XDG_MUSIC_DIR|Musique
+  $HOME|Home
 show_dotfiles = false
 follow_symlinks = false
 metadata_timeout = 1000
@@ -106,35 +82,6 @@ excluded_file_extensions =
   .lyrics
   .cue
 
-[local]
-enabled = true
-media_dir = /mnt/diskstation1/music
-scan_timeout = 1000
-scan_flush_threshold = 100
-scan_follow_symlinks = false
-included_file_extensions =
-  .flac 
-excluded_file_extensions =
-  .directory
-  .html
-  .jpeg
-  .jpg
-  .log
-  .nfo
-  .png
-  .txt
-  .m3u
-  .lyrics
-  .cue
-
-[deezer]
-enabled = true
-user_id = 9528727
-
-[iris]
-country = fr
-locale = fr_FR
-
-[beets]
-hostname = 127.0.0.1
-port = 8337
+# [beets]
+# hostname = 127.0.0.1
+# port = 8337
diff --git a/meta/tasks/mopidy.yaml b/meta/tasks/mopidy.yaml
index d4296cf..e2269a8 100644
--- a/meta/tasks/mopidy.yaml
+++ b/meta/tasks/mopidy.yaml
@@ -1,3 +1,8 @@
+# File              : mopidy.yaml
+# Author            : Jeff LANCE <email@jefflance.me>
+# Date              : 04.03.2021
+# Last Modified Date: 04.03.2021
+# Last Modified By  : Jeff LANCE <email@jefflance.me>
 - link:
-    ~/.config/mopidy/mopidy.conf:
+    ${HOME}/.config/mopidy/mopidy.conf:
       path: conf/mopidy.conf