diff --git a/README.md b/README.md
index 7d99cf1..ef90118 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 
 The Lounge is a self-hosted IRC client.
 
-**Shipped version:** 4.1.0
+**Shipped version:** 4.2.0
 
 ## Screenshots
 
@@ -42,7 +42,6 @@ How to configure this app: by an admin panel.
 
 * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/thelounge%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/thelounge/)
 * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/thelounge%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/thelounge/)
-* Buster x86-64 - [![](https://ci-buster.nohost.me/ci/logs/thelounge%20%28Apps%29.svg)](https://ci-buster.nohost.me/ci/apps/thelounge/)
 
 ## Links
 
@@ -53,8 +52,7 @@ How to configure this app: by an admin panel.
 
 ---
 
-Developers info
-----------------
+## Developers info
 
 Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/thelounge_ynh/tree/testing).
 
diff --git a/README_fr.md b/README_fr.md
index b2d9ba3..a615e49 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 ## Vue d’ensemble
 The Lounge est un client Web IRC auto-hébergé.
 
-**Version incluse :** 4.1.0
+**Version incluse :** 4.2.0
 
 ## Captures d’écran
 
@@ -41,7 +41,6 @@ Comment configurer cette application : via le panneau d’administration.
 
 * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/thelounge%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/thelounge/)
 * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/thelounge%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/thelounge/)
-* Buster x86-64 - [![](https://ci-buster.nohost.me/ci/logs/thelounge%20%28Apps%29.svg)](https://ci-buster.nohost.me/ci/apps/thelounge/)
 
 ## Liens
 
diff --git a/check_process b/check_process
index 8f8325f..473a837 100644
--- a/check_process
+++ b/check_process
@@ -6,10 +6,10 @@
 ;; Test complet
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
-		path="/path"	(PATH)
-		is_public=1	(PUBLIC|public=1|private=0)
+		path="/path"	    (PATH)
+		is_public=1	        (PUBLIC|public=1|private=0)
 		password="pass"
-		port="9000"	(PORT)
+		port="9000"	        (PORT)
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -18,6 +18,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		upgrade=1	from_commit=bd00c8e3ce43563f33fde073cf36b997c348d05c
 		backup_restore=1
 		multi_instance=0
 		incorrect_path=0
@@ -29,3 +30,7 @@
 ;;; Options
 Email=
 Notification=none
+;;; Upgrade options
+	; commit=bd00c8e3ce43563f33fde073cf36b997c348d05c
+		name=Merge pull request #25
+		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
diff --git a/conf/app.src b/conf/app.src
index 71b28a4..c7ebf8b 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/thelounge/thelounge/archive/v4.1.0.tar.gz
-SOURCE_SUM=f1761b134b10699ccc13d31258c41745681ccd620e0a1a91247d54910229db71
+SOURCE_URL=https://github.com/thelounge/thelounge/archive/v4.2.0.tar.gz
+SOURCE_SUM=6119c0692f03678940848ec19a8095ba67f8fdba42bb12481205314eabc0672d
 SOURCE_SUM_PRG=sha256sum
 ARCH_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/config.js b/conf/config.js
index ceb4664..0f5b1fb 100644
--- a/conf/config.js
+++ b/conf/config.js
@@ -97,16 +97,6 @@ module.exports = {
 	//
 	prefetchMaxImageSize: 2048,
 
-	//
-	// Display network
-	//
-	// If set to false network settings will not be shown in the login form.
-	//
-	// @type     boolean
-	// @default  true
-	//
-	displayNetwork: true,
-
 	//
 	// Lock network
 	//
@@ -161,33 +151,6 @@ module.exports = {
 	//
 	messageStorage: ["sqlite"],
 
-	//
-	// Log settings
-	//
-	// Logging has to be enabled per user. If enabled, logs will be stored in
-	// the 'logs/<user>/<network>/' folder.
-	//
-	// @type     object
-	// @default  {}
-	//
-	logs: {
-		//
-		// Timestamp format
-		//
-		// @type     string
-		// @default  "YYYY-MM-DD HH:mm:ss"
-		//
-		format: "YYYY-MM-DD HH:mm:ss",
-
-		//
-		// Timezone
-		//
-		// @type     string
-		// @default  "UTC+00:00"
-		//
-		timezone: "UTC+00:00",
-	},
-
 	//
 	// Maximum number of history lines per channel
 	//
@@ -266,7 +229,7 @@ module.exports = {
 		// @type     string
 		// @default  "thelounge%%"
 		//
-		nick: "thelounge%%",
+		nick: "ynhuser|%%%%%",
 
 		//
 		// Username
@@ -291,7 +254,7 @@ module.exports = {
 		// @type     string
 		// @default  "#thelounge"
 		//
-		join: "#thelounge",
+		join: "#yunohost",
 	},
 
 	//
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 68e1227..f8b2429 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,4 +1,6 @@
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location ^~ __PATH__/ {
+
 	proxy_pass http://127.0.0.1:__PORT__/;
 	proxy_http_version 1.1;
 	proxy_set_header Connection "upgrade";
diff --git a/manifest.json b/manifest.json
index 21ab2c4..6817174 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,10 +3,10 @@
     "id": "thelounge",
     "packaging_format": 1,
     "description": {
-        "en": "Web IRC client.",
-        "fr": "Client Web IRC."
+        "en": "Web IRC client",
+        "fr": "Client Web IRC"
     },
-    "version": "4.1.0~ynh2",
+    "version": "4.2.0~ynh1",
     "url": "https://thelounge.chat/",
     "license": "MIT",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index ff33779..b3656bc 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # nodejs version
-nodejs_version=12
+nodejs_version=14
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/backup b/scripts/backup
index b3a8400..8640103 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -6,7 +6,6 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
@@ -14,7 +13,6 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-# Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
 #=================================================
diff --git a/scripts/change_url b/scripts/change_url
index fd495ad..6375a95 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -58,23 +58,23 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating nginx web server configuration..."
+ynh_script_progression --message="Updating NGINX web server configuration..."
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
-# Change the path in the nginx config file
+# Change the path in the NGINX config file
 if [ $change_path -eq 1 ]
 then
-	# Make a backup of the original nginx config file if modified
+	# Make a backup of the original NGINX config file if modified
 	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for nginx helper
+	# Set global variables for NGINX helper
 	domain="$old_domain"
 	path_url="$new_path"
-	# Create a dedicated nginx config
+	# Create a dedicated NGINX config
 	ynh_add_nginx_config
 fi
 
-# Change the domain for nginx
+# Change the domain for NGINX
 if [ $change_domain -eq 1 ]
 then
 	# Delete file checksum for the old conf file location
@@ -97,7 +97,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/install b/scripts/install
index 225b1e0..4e0b664 100644
--- a/scripts/install
+++ b/scripts/install
@@ -77,16 +77,16 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st
 #=================================================
 ynh_script_progression --message="Setting up source files..."
 
-ynh_app_setting_set --app=$app --key=final_path  --value=$final_path
+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
 
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring nginx web server..."
+ynh_script_progression --message="Configuring NGINX web server..."
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
@@ -152,7 +152,7 @@ chown -R $app: $config_path
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $app --description "Client Web IRC auto-hébergé" --log_type "systemd"
+yunohost service add $app --description "Client Web IRC" --log_type "systemd"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -173,7 +173,7 @@ ynh_script_progression --message="Configuring SSOwat..."
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/remove b/scripts/remove
index 75eb175..a09d08f 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -53,7 +53,7 @@ ynh_remove_nodejs
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Removing app main directory..."
+ynh_script_progression --message="Removing $app main directory..."
 
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
@@ -61,9 +61,9 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing nginx web server configuration..."
+ynh_script_progression --message="Removing NGINX web server configuration..."
 
-# Remove the dedicated nginx config
+# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 848d85b..9fd5125 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,7 +6,6 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
@@ -47,14 +46,14 @@ test ! -d $final_path \
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the nginx configuration..."
+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_script_progression --message="Restoring $app main directory..."
 
 ynh_restore_file --origin_path="$final_path"
 
@@ -108,7 +107,7 @@ systemctl enable $app.service
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $app --description "Client Web IRC auto-hébergé" --log_type "systemd"
+yunohost service add $app --description "Client Web IRC" --log_type "systemd"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -122,7 +121,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index ea6f882..01bcc8d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -59,7 +59,7 @@ fi
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
+ynh_script_progression --message="Backing up $app before upgrading (may take a while)..."
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -104,9 +104,9 @@ fi
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading nginx web server configuration..."
+ynh_script_progression --message="Upgrading NGINX web server configuration..."
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
@@ -186,15 +186,7 @@ chown -R $app: $config_path
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $app --description "Client Web IRC auto-hébergé" --log_type "systemd"
-
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Upgrading SSOwat configuration..."
-
-# Make app public if necessary
-[ $is_public -eq 0 ] || ynh_permission_update --permission "main" --add "visitors"
+yunohost service add $app --description "Client Web IRC" --log_type "systemd"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -206,7 +198,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload