add SCRIPT_NAME to all scripts and standardize whiptail-titles (#1400)

Signed-off-by: enoch85 <github@hanssonit.se>

Co-authored-by: enoch85 <github@hanssonit.se>

73 files changed, 103 insertions, 33 deletions

diff --git a/addons/automatic_updates.sh b/addons/automatic_updates.sh
index 7cb5cf88..6c95127d 100644
--- a/addons/automatic_updates.sh
+++ b/addons/automatic_updates.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Automatic Updates"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/addons/locales.sh b/addons/locales.sh
index 17f0fb10..de1b22a0 100644
--- a/addons/locales.sh
+++ b/addons/locales.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Locales"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/addons/locate_mirror.sh b/addons/locate_mirror.sh
index 0731a785..9b557a35 100644
--- a/addons/locate_mirror.sh
+++ b/addons/locate_mirror.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Locate Mirror"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/addons/redis-server-ubuntu.sh b/addons/redis-server-ubuntu.sh
index dacc7353..1ca36fbf 100644
--- a/addons/redis-server-ubuntu.sh
+++ b/addons/redis-server-ubuntu.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Redis Server Ubuntu"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/addons/security.sh b/addons/security.sh
index 701eaa1b..584a6eb4 100644
--- a/addons/security.sh
+++ b/addons/security.sh
@@ -5,6 +5,7 @@
 # REMOVE disable of SC2154 WHEN PUTTING SPAMHAUS IN PRODUCTION (it's just to fixing travis for now)
 # shellcheck disable=2034,2059,SC2154
 true
+SCRIPT_NAME="Setup Extra Security"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/apps/additional_apps.sh b/apps/additional_apps.sh
index ad351672..c2517055 100644
--- a/apps/additional_apps.sh
+++ b/apps/additional_apps.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Additional Apps"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -17,7 +18,7 @@ debug_mode
 root_check
 
 # Install Apps
-choice=$(whiptail --title "Which apps do you want to install?" --checklist "Automatically configure and install selected apps\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --checklist "Which apps do you want to install?\n\nAutomatically configure and install selected apps\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Fail2ban" "(Extra Bruteforce protection)" OFF \
 "Adminer" "(PostgreSQL GUI)" OFF \
 "Netdata" "(Real-time server monitoring)" OFF \
diff --git a/apps/adminer.sh b/apps/adminer.sh
index a7f8f2f2..1f786e25 100644
--- a/apps/adminer.sh
+++ b/apps/adminer.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Adminer"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -20,7 +21,7 @@ root_check
 print_text_in_color "$ICyan" "Checking if Adminer is already installed..."
 if is_this_installed adminer
 then
-    choice=$(whiptail --radiolist "It seems like 'Adminer' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Adminer' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Adminer" "" OFF \
     "Reinstall Adminer" "" ON 3>&1 1>&2 2>&3)
     
diff --git a/apps/bitwarden-rs.sh b/apps/bitwarden-rs.sh
index a83ad983..854364ff 100644
--- a/apps/bitwarden-rs.sh
+++ b/apps/bitwarden-rs.sh
@@ -4,7 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
-
+SCRIPT_NAME="Bitwarden RS"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/apps/bitwarden-rs_admin-panel.sh b/apps/bitwarden-rs_admin-panel.sh
index 1f0bb096..41427da2 100644
--- a/apps/bitwarden-rs_admin-panel.sh
+++ b/apps/bitwarden-rs_admin-panel.sh
@@ -4,7 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
-
+SCRIPT_NAME="Bitwarden RS Admin"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -28,7 +28,7 @@ then
 fi
 
 # Yes or No?
-choice=$(whiptail --title "Bitwarden_rs admin-panel" --radiolist "Do you want to disable the Bitwarden_rs admin-panel?\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --radiolist "Do you want to disable the Bitwarden_rs admin-panel?\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Yes" "(Disable the admin-panel)" OFF \
 "No" "(Enable the admin-panel and change the password for the admin-panel)" OFF 3>&1 1>&2 2>&3)
 
diff --git a/apps/bitwarden_mailconfig.sh b/apps/bitwarden_mailconfig.sh
index 6bf82464..851069db 100644
--- a/apps/bitwarden_mailconfig.sh
+++ b/apps/bitwarden_mailconfig.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Bitwarden Mail Configuration"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/apps/bitwarden_registration.sh b/apps/bitwarden_registration.sh
index 306f55a1..de7c6824 100644
--- a/apps/bitwarden_registration.sh
+++ b/apps/bitwarden_registration.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Bitwarden Registration"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -37,7 +38,7 @@ else
 fi
 
 # Yes or No?
-choice=$(whiptail --title "Bitwarden Registration" --radiolist "Do you want to disable Bitwarden User Registration?\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --radiolist "Do you want to disable Bitwarden User Registration?\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Yes" "(Disable public user registration)" OFF \
 "No" "(Enable public user registration)" OFF 3>&1 1>&2 2>&3)
 
diff --git a/apps/collabora_docker.sh b/apps/collabora_docker.sh
index 385ea37a..192c0341 100644
--- a/apps/collabora_docker.sh
+++ b/apps/collabora_docker.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Collabora (Docker)"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -30,7 +31,7 @@ check_nextcloud_https "Collabora (Docker)"
 print_text_in_color "$ICyan" "Checking if Collabora is already installed..."
 if does_this_docker_exist 'collabora/code'
 then
-    choice=$(whiptail --radiolist "It seems like 'Collabora' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Collabora' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Collabora" "" OFF \
     "Reinstall Collabora" "" ON 3>&1 1>&2 2>&3)
 
diff --git a/apps/collabora_integrated.sh b/apps/collabora_integrated.sh
index 430dffbc..79dd940c 100644
--- a/apps/collabora_integrated.sh
+++ b/apps/collabora_integrated.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Collabora (Integrated)"
 # shellcheck source=lib.sh
 NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
@@ -78,7 +79,7 @@ fi
 # Check if Collabora is installed using the new method
 if is_app_enabled richdocumentscode
 then
-    choice=$(whiptail --radiolist "It seems like 'Collabora' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Collabora' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Collabora" "" OFF \
     "Reinstall Collabora" "" ON 3>&1 1>&2 2>&3)
 
diff --git a/apps/fail2ban.sh b/apps/fail2ban.sh
index 4a529b53..80364de0 100644
--- a/apps/fail2ban.sh
+++ b/apps/fail2ban.sh
@@ -5,6 +5,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Fail2ban"
 # shellcheck source=lib.sh
 NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
@@ -25,7 +26,7 @@ lowest_compatible_nc 13
 print_text_in_color "$ICyan" "Checking if Fail2Ban is already installed..."
 if is_this_installed fail2ban
 then
-    choice=$(whiptail --radiolist "It seems like 'Fail2Ban' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Fail2Ban' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Fail2Ban" "" OFF \
     "Reinstall Fail2Ban" "" ON 3>&1 1>&2 2>&3)
 
diff --git a/apps/fulltextsearch.sh b/apps/fulltextsearch.sh
index 9c783344..70400d5b 100644
--- a/apps/fulltextsearch.sh
+++ b/apps/fulltextsearch.sh
@@ -5,6 +5,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Full Text Search"
 # shellcheck source=lib.sh
 NCDB=1 && NC_UPDATE=1 && ES_INSTALL=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
@@ -31,7 +32,7 @@ cpu_check 2 FullTextSearch
 print_text_in_color "$ICyan" "Checking if Fulltextsearch is already installed..."
 if does_this_docker_exist "$nc_fts"
 then
-    choice=$(whiptail --radiolist "It seems like 'Fulltextsearch' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Fulltextsearch' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Fulltextsearch" "" OFF \
     "Reinstall Fulltextsearch" "" ON 3>&1 1>&2 2>&3)
 
diff --git a/apps/netdata.sh b/apps/netdata.sh
index e212f00c..ec8e4564 100644
--- a/apps/netdata.sh
+++ b/apps/netdata.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Netdata"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -20,7 +21,7 @@ root_check
 print_text_in_color "$ICyan" "Checking if Netdata is already installed..."
 if [ -d /etc/netdata ]
 then
-    choice=$(whiptail --radiolist "It seems like 'Netdata' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Netdata' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Netdata" "" OFF \
     "Reinstall Netdata" "" ON 3>&1 1>&2 2>&3)
 
diff --git a/apps/onlyoffice_docker.sh b/apps/onlyoffice_docker.sh
index 33d7c5ea..27e90282 100644
--- a/apps/onlyoffice_docker.sh
+++ b/apps/onlyoffice_docker.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="OnlyOffice (Docker)"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -37,7 +38,7 @@ fi
 print_text_in_color "$ICyan" "Checking if Onlyoffice Docker is already installed..."
 if does_this_docker_exist 'onlyoffice/documentserver'
 then
-    choice=$(whiptail --radiolist "It seems like 'Onlyoffice Docker' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Onlyoffice Docker' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Onlyoffice Docker" "" OFF \
     "Reinstall Onlyoffice Docker" "" ON 3>&1 1>&2 2>&3)
 
diff --git a/apps/onlyoffice_integrated.sh b/apps/onlyoffice_integrated.sh
index aca3511d..98402683 100644
--- a/apps/onlyoffice_integrated.sh
+++ b/apps/onlyoffice_integrated.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="OnlyOffice (Integrated)"
 # shellcheck source=lib.sh
 NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
@@ -86,7 +87,7 @@ elif version_gt "$CURRENTVERSION" "18.0.1" && ! does_this_docker_exist 'onlyoffi
 then
     if is_app_enabled documentserver_community
     then
-        choice=$(whiptail --radiolist "It seems like 'OnlyOffice' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+        choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'OnlyOffice' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
         "Uninstall OnlyOffice" "" OFF \
         "Reinstall OnlyOffice" "" ON 3>&1 1>&2 2>&3)
 
diff --git a/apps/previewgenerator.sh b/apps/previewgenerator.sh
index 87003a15..af2c41fe 100644
--- a/apps/previewgenerator.sh
+++ b/apps/previewgenerator.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Preview Generator"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -96,7 +97,7 @@ then
 
     # Choose file formats fo the case when imagick is installed.
     # for additional previews please look at the nextcloud documentation. But these probably won't work.
-    choice=$(whiptail --title "Choose file formats" --checklist "Now you can choose for which file formats you would like to generate previews for\nSelect or unselect by pressing the spacebar" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE - Choose file formats" --checklist "Now you can choose for which file formats you would like to generate previews for\nSelect or unselect by pressing the spacebar" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "PNG" "" ON \
     "JPEG" "" ON \
     "GIF" "" ON \
@@ -159,7 +160,7 @@ else
     fi
     # Choose file formats fo the case when imagick is not installed.
     # for additional previews please look at the nextcloud documentation. But these probably won't work.
-    choice=$(whiptail --title "Choose file formats" --checklist "Now you can choose for which file formats you would like to generate previews for\nSelect or unselect by pressing the spacebar" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE - Choose file formats" --checklist "Now you can choose for which file formats you would like to generate previews for\nSelect or unselect by pressing the spacebar" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "PNG" "" ON \
     "JPEG" "" ON \
     "GIF" "" ON \
diff --git a/apps/smbmount.sh b/apps/smbmount.sh
index 0b08b779..6a28dbc6 100644
--- a/apps/smbmount.sh
+++ b/apps/smbmount.sh
@@ -5,7 +5,7 @@
 
 # shellcheck disable=2034,2059
 true
-SCRIPT_NAME="SMB-mount"
+SCRIPT_NAME="SMB Mount"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/apps/talk.sh b/apps/talk.sh
index 70b608ef..72d5ce29 100644
--- a/apps/talk.sh
+++ b/apps/talk.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Talk"
 # shellcheck source=lib.sh
 NC_UPDATE=1 && TURN_INSTALL=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
@@ -35,7 +36,7 @@ lowest_compatible_nc 13
 print_text_in_color "$ICyan" "Checking if Talk is already installed..."
 if [ -n "$(occ_command_no_check config:app:get spreed turn_servers | sed 's/\[\]//')" ] || is_this_installed coturn
 then
-    choice=$(whiptail --radiolist "It seems like 'Nextcloud Talk' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Nextcloud Talk' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Nextcloud Talk" "" OFF \
     "Reinstall Nextcloud Talk" "" ON 3>&1 1>&2 2>&3)
     
diff --git a/apps/talk_signaling.sh b/apps/talk_signaling.sh
index 09f60516..6efb7bb1 100644
--- a/apps/talk_signaling.sh
+++ b/apps/talk_signaling.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Talk with Signaling Server"
 # shellcheck source=lib.sh
 NC_UPDATE=1 && TURN_INSTALL=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
@@ -40,7 +41,7 @@ check_nextcloud_https "Nextclod Talk"
 print_text_in_color "$ICyan" "Checking if Talk is already installed..."
 if [ -n "$(occ_command_no_check config:app:get spreed turn_servers | sed 's/\[\]//')" ] || is_this_installed coturn
 then
-    choice=$(whiptail --radiolist "It seems like 'Nextcloud Talk' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Nextcloud Talk' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Nextcloud Talk" "" OFF \
     "Reinstall Nextcloud Talk" "" ON 3>&1 1>&2 2>&3)
     
diff --git a/apps/tmbitwarden.sh b/apps/tmbitwarden.sh
index 90dc5488..32822164 100644
--- a/apps/tmbitwarden.sh
+++ b/apps/tmbitwarden.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Bitwarden"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/apps/webmin.sh b/apps/webmin.sh
index 0ccd6f19..2f389185 100644
--- a/apps/webmin.sh
+++ b/apps/webmin.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Webmin"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -20,7 +21,7 @@ root_check
 print_text_in_color "$ICyan" "Checking if Webmin is already installed..."
 if is_this_installed webmin
 then
-    choice=$(whiptail --radiolist "It seems like 'Webmin' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE" --radiolist "It seems like 'Webmin' is already installed.\nChoose what you want to do.\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Uninstall Webmin" "" OFF \
     "Reinstall Webmin" "" ON 3>&1 1>&2 2>&3)
     
diff --git a/disk/change-to-zfs-mount-generator.sh b/disk/change-to-zfs-mount-generator.sh
index a7bcc3a7..e4364c58 100644
--- a/disk/change-to-zfs-mount-generator.sh
+++ b/disk/change-to-zfs-mount-generator.sh
@@ -12,6 +12,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Change to ZFS Mount Generator"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/disk/format-chosen.sh b/disk/format-chosen.sh
index 816ff5a2..e194d797 100644
--- a/disk/format-chosen.sh
+++ b/disk/format-chosen.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Format Chosen Disk"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/disk/format-sdb.sh b/disk/format-sdb.sh
index b8e32df4..4ebf0d7b 100644
--- a/disk/format-sdb.sh
+++ b/disk/format-sdb.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Format sdb"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/disk/prune_zfs_snaphots.sh b/disk/prune_zfs_snaphots.sh
index 037c1e4e..53a8c73f 100644
--- a/disk/prune_zfs_snaphots.sh
+++ b/disk/prune_zfs_snaphots.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Prune ZFS Snapshots"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/disk/smartctl.sh b/disk/smartctl.sh
index b4c7481e..f8b93c9c 100644
--- a/disk/smartctl.sh
+++ b/disk/smartctl.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059,2086
 true
+SCRIPT_NAME="Setup smartctl"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/lets-encrypt/activate-ssl.sh b/lets-encrypt/activate-ssl.sh
index bb9992a9..d8bbf01a 100644
--- a/lets-encrypt/activate-ssl.sh
+++ b/lets-encrypt/activate-ssl.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Activate TLS"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/lets-encrypt/activate-tls.sh b/lets-encrypt/activate-tls.sh
index 18b798d4..8d3dbdfe 100644
--- a/lets-encrypt/activate-tls.sh
+++ b/lets-encrypt/activate-tls.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Activate TLS"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/lets-encrypt/test-new-config.sh b/lets-encrypt/test-new-config.sh
index d52f96c1..34c5bcc1 100644
--- a/lets-encrypt/test-new-config.sh
+++ b/lets-encrypt/test-new-config.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Test New Configuration"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/menu/additional_apps.sh b/menu/additional_apps.sh
index 61824e13..f96ef25b 100644
--- a/menu/additional_apps.sh
+++ b/menu/additional_apps.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Additional Apps Menu"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -17,7 +18,7 @@ debug_mode
 root_check
 
 # Install Apps
-choice=$(whiptail --title "Which apps do you want to install?" --checklist "Automatically configure and install selected apps\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --checklist "Which apps do you want to install?\n\nAutomatically configure and install selected apps\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Documentserver" "(OnlyOffice or Collabora - Docker or Integrated)" OFF \
 "Bitwarden" "(External password manager)" OFF \
 "Fail2ban  " "(Extra Bruteforce protection)" OFF \
diff --git a/menu/bitwarden_menu.sh b/menu/bitwarden_menu.sh
index f5cf2aad..ee87378d 100644
--- a/menu/bitwarden_menu.sh
+++ b/menu/bitwarden_menu.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Bitwarden Menu"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -16,7 +17,7 @@ debug_mode
 # Must be root
 root_check
 
-choice=$(whiptail --title "Bitwarden" --checklist "Automatically configure and install the Bitwarden or configure some aspects of it.\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --checklist "Automatically configure and install the Bitwarden or configure some aspects of it.\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Bitwarden  " "(External password manager [4GB RAM] - subdomain required)" OFF \
 "Bitwarden Registration" "(Enable or disable public user registration for Bitwarden)" OFF \
 "Bitwarden Mail-Configuration" "(Configure the mailserver settings for Bitwarden)" OFF \
diff --git a/menu/configuration.sh b/menu/configuration.sh
index 870add59..9675c6b7 100644
--- a/menu/configuration.sh
+++ b/menu/configuration.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Configuration"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/menu/documentserver.sh b/menu/documentserver.sh
index 6045aee8..e52c03ef 100644
--- a/menu/documentserver.sh
+++ b/menu/documentserver.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Documentserver Menu"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -16,7 +17,7 @@ debug_mode
 # Must be root
 root_check
 
-choice=$(whiptail --title "Which Documentserver do you want to install?" --radiolist "Automatically configure and install the selected Documentserver.\nSelect by pressing the spacebar and ENTER\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --radiolist "Which Documentserver do you want to install?\n\nAutomatically configure and install the selected Documentserver.\nSelect by pressing the spacebar and ENTER\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Collabora (Docker)" "(Online editing - Extra Subdomain required)" OFF \
 "Collabora (Integrated)" "(Online editing - No Subdomain required)" OFF \
 "OnlyOffice (Docker)" "(Online editing - Extra Subdomain required)" OFF \
diff --git a/menu/main_menu.sh b/menu/main_menu.sh
index 964218ca..06291874 100644
--- a/menu/main_menu.sh
+++ b/menu/main_menu.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Main Menu"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -17,7 +18,7 @@ debug_mode
 root_check
 
 # Main menu
-choice=$(whiptail --title "Main Menu" --radiolist "Choose what you want to do.\nSelect by pressing the spacebar and ENTER\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --radiolist "Choose what you want to do.\nSelect by pressing the spacebar and ENTER\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Additional Apps" "(Choose which apps to install)" OFF \
 "Nextcloud Configuration" "(Choose between available Nextcloud configurations)" OFF \
 "Server Configuration" "(Choose between available server configurations)" OFF \
diff --git a/menu/menu.sh b/menu/menu.sh
index af487348..122693f4 100644
--- a/menu/menu.sh
+++ b/menu/menu.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Menu"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/menu/nextcloud_configuration.sh b/menu/nextcloud_configuration.sh
index 3eddd401..372112e3 100644
--- a/menu/nextcloud_configuration.sh
+++ b/menu/nextcloud_configuration.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Nextcloud Configuration Menu"
 # shellcheck source=lib.sh
 NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
@@ -18,7 +19,7 @@ debug_mode
 root_check
 
 # Configure Nextcloud
-choice=$(whiptail --title "Nextcloud Configuration" --checklist "Which settings do you want to configure?\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --checklist "Which settings do you want to configure?\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "CookieLifetime" "(Configure forced logout timeout for users using the web GUI)" OFF \
 "Share-folder" "(Shares from other users will appear in a folder named 'Shared')" OFF \
 "Disable workspaces" "(disable top notes in GUI)" OFF \
diff --git a/menu/server_configuration.sh b/menu/server_configuration.sh
index 3975e86c..9c3229ac 100644
--- a/menu/server_configuration.sh
+++ b/menu/server_configuration.sh
@@ -7,6 +7,7 @@ if printf "Testing internet connection..." && ping github.com -c 2
 then
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Server Configuration Menu"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 # Use local lib file in case there is no internet connection
@@ -32,7 +33,7 @@ debug_mode
 root_check
 
 # Server configurations
-choice=$(whiptail --title "Server configurations" --checklist "Choose what you want to configure\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --checklist "Choose what you want to configure\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Activate TLS" "(Enable HTTPS with Let's Encrypt)" ON \
 "Security" "(Add extra security based on this http://goo.gl/gEJHi7)" OFF \
 "Static IP" "(Set static IP in Ubuntu with netplan.io)" OFF \
diff --git a/network/ddclient-configuration.sh b/network/ddclient-configuration.sh
index 4244058e..d1f9fa40 100644
--- a/network/ddclient-configuration.sh
+++ b/network/ddclient-configuration.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Setup DDclient"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -16,7 +17,7 @@ debug_mode
 # Check if root
 root_check
 
-choice=$(whiptail --radiolist "This script lets you setup DynDNS by using the ddclient application.\nYou have to setup an account before you can start.\n\nPlease choose your DynDNS-Provider.\nSelect by pressing the spacebar and ENTER\n\nIf your DDNS provider isn't already supported, please open a new issue here:\n$ISSUES" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --radiolist "This script lets you setup DynDNS by using the ddclient application.\nYou have to setup an account before you can start.\n\nPlease choose your DynDNS-Provider.\nSelect by pressing the spacebar and ENTER\n\nIf your DDNS provider isn't already supported, please open a new issue here:\n$ISSUES" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Cloudflare" "(cloudflare.com)" OFF \
 "Strato" "(strato.de)" OFF 3>&1 1>&2 2>&3)
 
diff --git a/network/static_ip.sh b/network/static_ip.sh
index 96131b06..c07c4eb2 100644
--- a/network/static_ip.sh
+++ b/network/static_ip.sh
@@ -14,6 +14,7 @@ if [ -f /var/scripts/lib.sh ]
 then
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Static IP"
 # shellcheck source=lib.sh
 FIRST_IFACE=1 source /var/scripts/lib.sh
 unset FIRST_IFACE
diff --git a/network/trusted.sh b/network/trusted.sh
index 7848ac27..9898faf6 100644
--- a/network/trusted.sh
+++ b/network/trusted.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Trusted"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh
index ba97b0db..ad28dbdc 100644
--- a/nextcloud-startup-script.sh
+++ b/nextcloud-startup-script.sh
@@ -41,6 +41,7 @@ if [ -f /var/scripts/lib.sh ]
 then
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Nextcloud First Startup Script (part 2)"
 # shellcheck source=lib.sh
 NCDB=1 && FIRST_IFACE=1 source /var/scripts/lib.sh
 unset NCDB
diff --git a/nextcloud_install_production.sh b/nextcloud_install_production.sh
index a5c000d2..859f7d36 100644
--- a/nextcloud_install_production.sh
+++ b/nextcloud_install_production.sh
@@ -16,6 +16,7 @@ fi
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Nextcloud Install Script (part 1)"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -172,7 +173,7 @@ You could still choose to only run on one disk though, which is not recommended,
 
 You will now get the option to decide which disk you want to use for DATA, or run the automatic script that will choose the available disk automatically."
 
-choice=$(whiptail --title "Choose disk format" --radiolist "How would you like to configure your disks?\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE - Choose disk format" --radiolist "How would you like to configure your disks?\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "2 Disks Auto" "(Automatically configured)" ON \
 "2 Disks Manual" "(Choose by yourself)" OFF \
 "1 Disk" "(Only use one disk /mnt/ncdata - NO ZFS!)" OFF 3>&1 1>&2 2>&3)
@@ -201,7 +202,7 @@ esac
 # https://unix.stackexchange.com/questions/442598/how-to-configure-systemd-resolved-and-systemd-networkd-to-use-local-dns-server-f    
 while :
 do
-    choice=$(whiptail --title "Set DNS Resolver" --radiolist "Which DNS provider should this Nextcloud box use?\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+    choice=$(whiptail --title "$TITLE - Set DNS Resolver" --radiolist "Which DNS provider should this Nextcloud box use?\nSelect by pressing the spacebar and ENTER" "$WT_HEIGHT" "$WT_WIDTH" 4 \
     "Quad9" "(https://www.quad9.net/)" ON \
     "Cloudflare" "(https://www.cloudflare.com/dns/)" OFF \
     "Local" "($GATEWAY) - DNS on gateway" OFF 3>&1 1>&2 2>&3)
@@ -695,7 +696,7 @@ a2ensite "$HTTP_CONF"
 a2dissite default-ssl
 restart_webserver
 
-choice=$(whiptail --title "Install apps or software" --checklist "Automatically configure and install selected apps or software\nDeselect by pressing the spacebar" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE - Install apps or software" --checklist "Automatically configure and install selected apps or software\nDeselect by pressing the spacebar" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Calendar" "" ON \
 "Contacts" "" ON \
 "IssueTemplate" "" ON \
diff --git a/nextcloud_update.sh b/nextcloud_update.sh
index bc861168..2a5a1f41 100644
--- a/nextcloud_update.sh
+++ b/nextcloud_update.sh
@@ -6,6 +6,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Nextcloud Update Script"
 # shellcheck source=lib.sh
 NCDB=1 && NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
diff --git a/disk/format-sda-nuc-server.sh b/old/format-sda-nuc-server.sh
index c8e3fe8a..967f94d3 100644
--- a/disk/format-sda-nuc-server.sh
+++ b/old/format-sda-nuc-server.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Format sda NUC Server"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/old/modsecurity.sh b/old/modsecurity.sh
index f6601aa8..0ff061ff 100644
--- a/old/modsecurity.sh
+++ b/old/modsecurity.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Modsecurity"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/old/ntpdate.sh b/old/ntpdate.sh
index 43645ef3..a5836b80 100644
--- a/old/ntpdate.sh
+++ b/old/ntpdate.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Ntpdate"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/old/spreedme.sh b/old/spreedme.sh
index 2d4ffde2..b1e5f536 100644
--- a/old/spreedme.sh
+++ b/old/spreedme.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Spreedme"
 # shellcheck source=lib.sh
 NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
diff --git a/old/test_connection.sh b/old/test_connection.sh
index dbb590d9..205bfaea 100644
--- a/old/test_connection.sh
+++ b/old/test_connection.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Test connection"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/adduser.sh b/static/adduser.sh
index 39f553d1..294c335e 100644
--- a/static/adduser.sh
+++ b/static/adduser.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Add CLI User"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/change-ncadmin-profile.sh b/static/change-ncadmin-profile.sh
index 03e5f8f3..773b91e1 100644
--- a/static/change-ncadmin-profile.sh
+++ b/static/change-ncadmin-profile.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Change ncadmin Profile"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/change-root-profile.sh b/static/change-root-profile.sh
index d495deba..2d97a88c 100644
--- a/static/change-root-profile.sh
+++ b/static/change-root-profile.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Change root Profile"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/change-to-zfs-mount-generator.sh b/static/change-to-zfs-mount-generator.sh
index a7bcc3a7..e4364c58 100644
--- a/static/change-to-zfs-mount-generator.sh
+++ b/static/change-to-zfs-mount-generator.sh
@@ -12,6 +12,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Change to ZFS Mount Generator"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/change_db_pass.sh b/static/change_db_pass.sh
index c68f66be..6d92bdef 100644
--- a/static/change_db_pass.sh
+++ b/static/change_db_pass.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Change Database Password"
 # shellcheck source=lib.sh
 NCDBPASS=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NCDBPASS
diff --git a/static/configuration.sh b/static/configuration.sh
index 870add59..9675c6b7 100644
--- a/static/configuration.sh
+++ b/static/configuration.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Configuration"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/cookielifetime.sh b/static/cookielifetime.sh
index 4c0c55f1..b4ad7ea8 100644
--- a/static/cookielifetime.sh
+++ b/static/cookielifetime.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Set Cookie Lifetime"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -18,7 +19,7 @@ debug_mode
 # Check if root
 root_check
 
-choice=$(whiptail --radiolist  "Configure the logout time (in seconds) which will forcefully logout the Nextcloud user from the web browser when the timeout is reached.\n\nSelect one with the [ARROW] keys and select with the [SPACE] key. Confirm by pressing [ENTER]" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --radiolist  "Configure the logout time (in seconds) which will forcefully logout the Nextcloud user from the web browser when the timeout is reached.\n\nSelect one with the [ARROW] keys and select with the [SPACE] key. Confirm by pressing [ENTER]" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "1800s" "30 minutes" ON \
 "7200s" "2 hours" OFF \
 "43200s" "12 hours" OFF \
diff --git a/static/docker_overlay2.sh b/static/docker_overlay2.sh
index 0abcd6dd..8fc63e65 100644
--- a/static/docker_overlay2.sh
+++ b/static/docker_overlay2.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Change to Docker overlay2"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/locales.sh b/static/locales.sh
index 17f0fb10..de1b22a0 100644
--- a/static/locales.sh
+++ b/static/locales.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Locales"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/locate_mirror.sh b/static/locate_mirror.sh
index 0731a785..9b557a35 100644
--- a/static/locate_mirror.sh
+++ b/static/locate_mirror.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Locate Mirror"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/main_menu.sh b/static/main_menu.sh
index 8cfd8b7e..9c55f534 100644
--- a/static/main_menu.sh
+++ b/static/main_menu.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Main Menu"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
@@ -17,7 +18,7 @@ debug_mode
 root_check
 
 # Main menu
-choice=$(whiptail --title "Main Menu" --radiolist "Choose what you want to do.\nSelect by pressing the spacebar and ENTER\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --radiolist "Choose what you want to do.\nSelect by pressing the spacebar and ENTER\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Additional Apps" "(Choose which apps to install)" OFF \
 "Nextcloud Configuration" "(Choose between available Nextcloud configurations)" OFF \
 "Server Configuration" "(Choose between available server configurations)" OFF \
diff --git a/static/menu.sh b/static/menu.sh
index af487348..122693f4 100644
--- a/static/menu.sh
+++ b/static/menu.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Menu"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/nextcloud_configuration.sh b/static/nextcloud_configuration.sh
index f56d9520..161a301e 100644
--- a/static/nextcloud_configuration.sh
+++ b/static/nextcloud_configuration.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Nextcloud Configuration (menu)"
 # shellcheck source=lib.sh
 NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
@@ -18,7 +19,7 @@ debug_mode
 root_check
 
 # Configure Nextcloud
-choice=$(whiptail --title "Nextcloud Configuration" --checklist "Which settings do you want to configure?\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --checklist "Which settings do you want to configure?\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "CookieLifetime" "(Configure forced logout timeout for users using the web GUI)" OFF \
 "Share-folder" "(Shares from other users will appear in a folder named 'Shared')" OFF \
 "Disable workspaces" "(disable top notes in GUI)" OFF \
diff --git a/static/server_configuration.sh b/static/server_configuration.sh
index c6442c63..689a79ca 100644
--- a/static/server_configuration.sh
+++ b/static/server_configuration.sh
@@ -7,6 +7,7 @@ if printf "Testing internet connection..." && ping github.com -c 2
 then
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Server configuration"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 # Use local lib file in case there is no internet connection
@@ -32,7 +33,7 @@ debug_mode
 root_check
 
 # Server configurations
-choice=$(whiptail --title "Server configurations" --checklist "Choose what you want to configure\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
+choice=$(whiptail --title "$TITLE" --checklist "Choose what you want to configure\nSelect by pressing the spacebar\nYou can view this menu later by running 'sudo bash $SCRIPTS/menu.sh'" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Activate TLS" "(Enable HTTPS with Let's Encrypt)" ON \
 "Security" "(Add extra security based on this http://goo.gl/gEJHi7)" OFF \
 "Static IP" "(Set static IP in Ubuntu with netplan.io)" OFF \
diff --git a/static/setup_secure_permissions_nextcloud.sh b/static/setup_secure_permissions_nextcloud.sh
index b0ade466..0db38fbd 100644
--- a/static/setup_secure_permissions_nextcloud.sh
+++ b/static/setup_secure_permissions_nextcloud.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059,2012
 true
+SCRIPT_NAME="Setup Secure Permissions for Nextcloud"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/static_ip.sh b/static/static_ip.sh
index 96131b06..c07c4eb2 100644
--- a/static/static_ip.sh
+++ b/static/static_ip.sh
@@ -14,6 +14,7 @@ if [ -f /var/scripts/lib.sh ]
 then
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Static IP"
 # shellcheck source=lib.sh
 FIRST_IFACE=1 source /var/scripts/lib.sh
 unset FIRST_IFACE
diff --git a/static/temporary-fix.sh b/static/temporary-fix.sh
index a84589b7..10c45023 100644
--- a/static/temporary-fix.sh
+++ b/static/temporary-fix.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Temporary Fix"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/test_connection.sh b/static/test_connection.sh
index bb9992a9..34ae9ed5 100644
--- a/static/test_connection.sh
+++ b/static/test_connection.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Test Connection (old)"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/trusted.sh b/static/trusted.sh
index 7848ac27..3e36cb1d 100644
--- a/static/trusted.sh
+++ b/static/trusted.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Trusted Nextcloud Domains"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/update.sh b/static/update.sh
index d14aa8bd..cfa3dc49 100644
--- a/static/update.sh
+++ b/static/update.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Update Server + Nextcloud"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 
diff --git a/static/updatenotification.sh b/static/updatenotification.sh
index f8b4c0b5..4ce7c667 100644
--- a/static/updatenotification.sh
+++ b/static/updatenotification.sh
@@ -4,6 +4,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Update Notification"
 # shellcheck source=lib.sh
 NC_UPDATE=1 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
 unset NC_UPDATE
diff --git a/vagrant/install.sh b/vagrant/install.sh
index 78a83db5..84651f4e 100644
--- a/vagrant/install.sh
+++ b/vagrant/install.sh
@@ -2,6 +2,7 @@
 
 # shellcheck disable=2034,2059
 true
+SCRIPT_NAME="Install NcVM with Vagrant"
 # shellcheck source=lib.sh
 . <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)