diff --git a/README.md b/README.md
index b15f1e1..faee10b 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Simple, Fast, Secure, Flat-File CMS
 
-**Shipped version:** 3.14.0~ynh1
+**Shipped version:** 4.0.0-rc3~ynh1
 
 
+**Demo:** https://demo.bludit.com
+
 ## Screenshots
 
 ![Screenshot of Bludit](./doc/screenshots/bludit_1_en.png)
diff --git a/README_fr.md b/README_fr.md
index 3ee9f53..567f871 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,9 +17,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 CMS simple, rapide, sécurisé et à fichier plat
 
-**Version incluse :** 3.14.0~ynh1
+**Version incluse :** 4.0.0-rc3~ynh1
 
 
+**Démo :** https://demo.bludit.com
+
 ## Captures d'écran
 
 ![Capture d'écran de Bludit](./doc/screenshots/bludit_1_en.png)
diff --git a/check_process b/check_process
index a6c65c9..cd68fd7 100644
--- a/check_process
+++ b/check_process
@@ -11,6 +11,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		upgrade=1	from_commit=c619ee29991f96e53e5dfb91ad9eb2a6003359f0
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -18,6 +19,6 @@
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=CommitHash
-		name=Name and date of the commit.
+	; commit=c619ee29991f96e53e5dfb91ad9eb2a6003359f0
+		name=Testing (#12)
 		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&
diff --git a/conf/app.src b/conf/app.src
index b3265d2..ac57e2f 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/bludit/bludit/archive/3.14.0.tar.gz
-SOURCE_SUM=4a411cdcd9d3412a87cc89f9f1067bef51533b8c9303f1bc34452e30ad5b586c
+SOURCE_URL=https://github.com/bludit/bludit/archive/refs/tags/4.0.0-rc-3.tar.gz
+SOURCE_SUM=aac59bd694f589d6b914623a67bed663e88f344209ebb2a5c139f77871ab190b
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/doc/DECRIPTION.md b/doc/DECRIPTION.md
new file mode 100644
index 0000000..45ff103
--- /dev/null
+++ b/doc/DECRIPTION.md
@@ -0,0 +1,5 @@
+Bludit is a web application to build your own website or blog in seconds, it's completely free and open source. Bludit uses files in JSON format to store the content, you don't need to install or configure a database. You only need a web server with PHP support.
+
+Bludit is a Flat-File CMS.
+
+Bludit supports Markdown and HTML code for the content.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index fb879d2..d42c8a0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,53 +1,54 @@
 {
-  "name": "Bludit",
-  "id": "bludit",
-  "packaging_format": 1,
-  "description": {
-    "en": "Simple, Fast, Secure, Flat-File CMS",
-    "fr": "CMS simple, rapide, sécurisé et à fichier plat"
-  },
-  "version": "3.14.0~ynh1",
-  "url": "www.bludit.com",
-  "upstream": {
+    "name": "Bludit",
+    "id": "bludit",
+    "packaging_format": 1,
+    "description": {
+        "en": "Simple, Fast, Secure, Flat-File CMS",
+        "fr": "CMS simple, rapide, sécurisé et à fichier plat"
+    },
+    "version": "4.0.0-rc3~ynh1",
+    "url": "www.bludit.com",
+    "upstream": {
         "license": "MIT",
         "website": "www.bludit.com",
+        "demo": "https://demo.bludit.com",
         "admindoc": "https://docs.bludit.com/en/",
         "code": "https://github.com/bludit/bludit"
     },
-  "license": "MIT",
-  "maintainer": {
-    "name": "eric_G",
-    "email": ""
-  },
-  "requirements": {
-    "yunohost": ">= 11.0.9"
-  },
-  "multi_instance": true,
-  "services": [
-      "nginx",
-      "php7.4-fpm"
-  ],
-  "arguments": {
-    "install" : [
-    {
-      "name": "domain",
-      "type": "domain"
+    "license": "MIT",
+    "maintainer": {
+        "name": "eric_G",
+        "email": ""
     },
-    {
-      "name": "path",
-      "type": "path",
-      "example": "/bludit",
-      "default": "/bludit"
-      },
-    {
-      "name": "is_public",
-      "type": "boolean",
-    "help": {
-      "en": "If enabled, Bludit will be accessible by people who do not have an account. This can be changed later via the webadmin.",
-      "fr": "Si cette case est cochée, Bludit sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
-        },
-        "default": true
-      }
-    ]
-  }
+    "requirements": {
+        "yunohost": ">= 11.0.9"
+    },
+    "multi_instance": true,
+    "services": [
+        "nginx",
+        "php8.0-fpm"
+    ],
+    "arguments": {
+        "install": [
+            {
+                "name": "domain",
+                "type": "domain"
+            },
+            {
+                "name": "path",
+                "type": "path",
+                "example": "/bludit",
+                "default": "/bludit"
+            },
+            {
+                "name": "is_public",
+                "type": "boolean",
+                "help": {
+                    "en": "If enabled, Bludit will be accessible by people who do not have an account. This can be changed later via the webadmin.",
+                    "fr": "Si cette case est cochée, Bludit sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+                },
+                "default": true
+            }
+        ]
+    }
 }
diff --git a/scripts/_common.sh b/scripts/_common.sh
index c9c6ad2..b806ab5 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,9 +4,9 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.4"
+YNH_PHP_VERSION="8.0"
 
-pkg_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom"
+pkg_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/backup b/scripts/backup
index 88a8aa0..e4db463 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -51,4 +51,4 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 # END OF SCRIPT
 #=================================================
 
-ynh_print_info --message="Backup script completed for Bludit. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
diff --git a/scripts/change_url b/scripts/change_url
index 61cba03..bfb0460 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -87,4 +87,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Change of URL completed for Bludit" --last
+ynh_script_progression --message="Change of URL completed for $app" --last
diff --git a/scripts/install b/scripts/install
index a32ba47..6339809 100644
--- a/scripts/install
+++ b/scripts/install
@@ -23,6 +23,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
+phpversion=$YNH_PHP_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -112,4 +113,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of Bludit completed" --last
+ynh_script_progression --message="Installation of $app completed" --last
diff --git a/scripts/remove b/scripts/remove
index abd4725..eb4a012 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -64,4 +64,4 @@ ynh_system_user_delete --username=$app
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of Bludit completed" --last
+ynh_script_progression --message="Removal of $app completed" --last
diff --git a/scripts/restore b/scripts/restore
index bcef493..3bbd801 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -56,10 +56,9 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
+#=================================================
 ynh_script_progression --message="Reinstalling dependencies..." --weight=1
 
 # Define and install dependencies
@@ -79,8 +78,6 @@ ynh_script_progression --message="Restoring the NGINX web server configuration..
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# GENERIC FINALIZATION
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
@@ -93,4 +90,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Restoration completed for Bludit" --last
+ynh_script_progression --message="Restoration completed for $app" --last
diff --git a/scripts/upgrade b/scripts/upgrade
index 0f348d7..876924c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -122,4 +122,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of Bludit completed" --last
+ynh_script_progression --message="Upgrade of $app completed" --last