diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..6e268bd
Binary files /dev/null and b/.DS_Store differ
diff --git a/doc/.DS_Store b/doc/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/doc/.DS_Store differ
diff --git a/doc/screenshots/.DS_Store b/doc/screenshots/.DS_Store
new file mode 100644
index 0000000..9a8f43d
Binary files /dev/null and b/doc/screenshots/.DS_Store differ
diff --git a/screenshot.png b/doc/screenshots/screenshot.png
similarity index 100%
rename from screenshot.png
rename to doc/screenshots/screenshot.png
diff --git a/manifest.json b/manifest.json
index 4d895a8..0dce7fa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,6 +8,13 @@
     },
     "version": "5.1.23~ynh2",
     "url": "https://tiddlywiki.com/",
+    "upstream": {
+        "license": "BSD-2-Clause",
+        "website": "https://tiddlywiki.com/",
+        "demo": "https://tiddlywiki.com/",
+        "admindoc": "https://tiddlywiki.com/",
+        "code": "https://github.com/Jermolene/TiddlyWiki5"
+    },
     "license": "BSD-2-Clause",
     "maintainer": {
         "name": "eric_G",
diff --git a/scripts/install b/scripts/install
index 0bd0546..e68d12a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -87,6 +87,10 @@ 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
 #=================================================
@@ -116,15 +120,6 @@ ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" --
 
 ynh_add_systemd_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chown -R $app:$app $final_path
-
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 7302e83..9b8d0b5 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -64,12 +64,9 @@ ynh_script_progression --message="Recreating the dedicated system user..." --wei
 # Create the dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir=$final_path
 
-#=================================================
-# RESTORE USER RIGHTS
-#=================================================
-
-# Restore permissions on app files
-chown -R $app:$app $final_path
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index b77a1be..0afd25c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -93,6 +93,10 @@ then
 	popd
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -118,15 +122,6 @@ ynh_replace_string --match_string="__YNH_NODE__" --replace_string="$ynh_node" --
 
 ynh_add_systemd_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions on app files
-chown -R $app:$app $final_path
-
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================