diff --git a/conf/config.yml.template b/conf/config.yml.template
index 9f50398..ecd9fad 100644
--- a/conf/config.yml.template
+++ b/conf/config.yml.template
@@ -7,13 +7,13 @@ base_url: ~                         # Pico will try to guess its base URL, if th
 rewrite_url: ~                      # A boolean (true or false) indicating whether URL rewriting is forced
 debug: ~                            # Set this to true to enable Pico's debug mode
 timezone: ~                         # Your PHP installation might require you to manually specify a timezone
-locale: ~                           # Your PHP installation might require you to manually specify a locale to use
+locale:                             # Your PHP installation might require you to manually specify a locale to use
 
 ##
 # Theme
 #
 theme: default                      # The name of your custom theme
-themes_url: ~                       # Pico will try to guess the URL to the themes dir of your installation;
+themes_url: __DATADIR__/themes      # Pico will try to guess the URL to the themes dir of your installation;
                                     #     If this fails, override it here. Example: https://example.com/pico/themes/
 theme_config:                       # Additional theme-specific config
     widescreen: false               # Default theme: Use more horizontal space (i.e. make the site container wider)
@@ -33,7 +33,7 @@ date_format: %D %T                  # Pico's default date format;
 pages_order_by_meta: author         # Sort pages by meta value "author" (set "pages_order_by" to "meta")
 pages_order_by: alpha               # Change how Pico sorts pages ("alpha" for alphabetical order, "date", or "meta")
 pages_order: asc                    # Sort pages in ascending ("asc") or descending ("desc") order
-content_dir: ~                      # The path to Pico's content directory
+content_dir: __DATADIR__            # The path to Pico's content directory
 content_ext: .md                    # The file extension of your Markdown files
 content_config:                     # Parsedown Markdown parser config
     extra: true                     # Use the Parsedown Extra parser to support extended markup;
@@ -43,14 +43,14 @@ content_config:                     # Parsedown Markdown parser config
     escape: false                   # Escape HTML markup in your content files; don't confuse this with some sort of
                                     #     safe mode, enabling this doesn't allow you to process untrusted user input!
     auto_urls: true                 # Automatically link URLs found in your markup
-assets_dir: __DATADIR__             # The path to Pico's assets directory
+assets_dir: __DATADIR__/assets      # The path to Pico's assets directory
 assets_url: ~                       # Pico will try to guess the URL to the assets dir of your installation;
                                     #     If this fails, override it here. Example: https://example.com/pico/assets/
 
 ##
 # Plugins
 #
-plugins_url: ~                      # Pico will try to guess the URL to the plugins dir of your installation;
+plugins_url: __DATADIR__/plugins     # Pico will try to guess the URL to the plugins dir of your installation;
                                     #     If this fails, override it here. Example: https://example.com/pico/plugins/
 DummyPlugin.enabled: false          # Force the plugin "DummyPlugin" to be disabled
 
diff --git a/scripts/install b/scripts/install
index 1810a27..a8fdc48 100755
--- a/scripts/install
+++ b/scripts/install
@@ -82,8 +82,6 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..." --weight=2
 
-### `ynh_add_nginx_config` will use the file conf/nginx.conf
-
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
@@ -104,6 +102,9 @@ datadir=/home/yunohost.app/$app
 ynh_app_setting_set --app=$app --key=datadir --value=$datadir
 
 mkdir -p $datadir
+mkdir -p $datadir/assets 
+mkdir -p $datadir/plugins
+mkdir -p $datadir/themes 
 
 chmod 750 "$datadir"
 chmod -R o-rwx "$datadir"