diff --git a/locale/de/freedombone-backup-remote.json b/locale/de/freedombone-backup-remote.json
index f00c71f6..be7872a3 100644
--- a/locale/de/freedombone-backup-remote.json
+++ b/locale/de/freedombone-backup-remote.json
@@ -16,6 +16,7 @@
     "Creating an email archive": "",
     "Backing up emails for $USERNAME": "",
     "Backing up Lets Encrypt settings": "",
+    "Backing up Tor settings": "",
     "Backing up GNU social installation": "",
     "GNU Social domain specified but not found in /var/www/${MICROBLOG_DOMAIN_NAME}": "",
     "Hubzilla domain specified but not found in /var/www/${HUBZILLA_DOMAIN_NAME}": "",
diff --git a/locale/de/freedombone-config.json b/locale/de/freedombone-config.json
index 3437f8d3..7dfbe565 100644
--- a/locale/de/freedombone-config.json
+++ b/locale/de/freedombone-config.json
@@ -17,8 +17,9 @@
     "German": "",
     "Spanish": "",
     "Please enter the FreeDNS code for this domain.\\n\\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters.": "",
-    "Freedombone": "",
     "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nEnsure that you have your domain and dynamic DNS settings ready.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE": "",
+    "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nWeb sites created will only be viewable within a Tor browser.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE": "",
+    "Freedombone": "",
     "Type of Installation:": "",
     "Full": "",
     "Writer": "",
diff --git a/locale/de/freedombone-controlpanel.json b/locale/de/freedombone-controlpanel.json
index 6a94b66f..f1e26866 100644
--- a/locale/de/freedombone-controlpanel.json
+++ b/locale/de/freedombone-controlpanel.json
@@ -12,7 +12,6 @@
     "The username should not contain any spaces": "",
     "ssh public key": "",
     "This does not look like an ssh public key": "",
-    "SIP phone extensions:": "",
     "User directory check": "",
     "This does not look like a user directory": "",
     "Administrator user": "",
@@ -168,7 +167,7 @@
     "IRC Menu": "",
     "Set a password for all IRC users": "",
     "Control Panel": "",
-    "Show SIP Phone Extensions": "",
+    "About this system": "",
     "Reset Tripwire": "",
     "Logging on/off": "",
     "Ping enable/disable": "",
diff --git a/locale/de/freedombone-renew-cert.json b/locale/de/freedombone-renew-cert.json
index 87d8faf0..05340eed 100644
--- a/locale/de/freedombone-renew-cert.json
+++ b/locale/de/freedombone-renew-cert.json
@@ -1,9 +1,8 @@
 {
     "${PROJECT_NAME}-renew-cert -h [hostname] -p [provider]": "",
     "Adding Let's Encrypt certificate": "",
-    "Unable to add Let's encrypt certificate": "",
     "Renewing Let's Encrypt certificate": "",
-    "Unable to renew Let's encrypt certificate": "",
+    "Unable to add Let's encrypt certificate": "",
     "Save the requested public key to /etc/ssl/certs/$HOSTNAME.new.crt": "",
     "/etc/ssl/certs/$HOSTNAME.new.crt then run this command again.": "",
     "$0: openssl is not installed, exiting": "",
diff --git a/locale/de/freedombone-restore-local.json b/locale/de/freedombone-restore-local.json
index 7b0c4389..e88d8b7d 100644
--- a/locale/de/freedombone-restore-local.json
+++ b/locale/de/freedombone-restore-local.json
@@ -21,6 +21,7 @@
     "Restarting database": "",
     "Change the MariaDB password to the backup version": "",
     "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
     "Restoring Mutt settings for $USERNAME": "",
     "Restoring gnupg settings for $USERNAME": "",
     "Restoring procmail settings for $USERNAME": "",
diff --git a/locale/de/freedombone-restore-remote.json b/locale/de/freedombone-restore-remote.json
index 4fb7c5f9..8a2e3de8 100644
--- a/locale/de/freedombone-restore-remote.json
+++ b/locale/de/freedombone-restore-remote.json
@@ -14,6 +14,7 @@
     "Restarting database": "",
     "Change the MariaDB password to the backup version": "",
     "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
     "Restoring Mutt settings for $USERNAME": "",
     "Restoring gnupg settings for $USERNAME": "",
     "Restoring procmail settings for $USERNAME": "",
diff --git a/locale/de/freedombone.json b/locale/de/freedombone.json
index df7d16bf..1dd829c3 100644
--- a/locale/de/freedombone.json
+++ b/locale/de/freedombone.json
@@ -1,4 +1,5 @@
 {
+    "${PROJECT_NAME} -c [configuration file]": "",
     "or for more specialised variants you can specify '$VARIANT_MAILBOX', '$VARIANT_CLOUD',": "",
     "'$VARIANT_CHAT', '$VARIANT_SOCIAL', '$VARIANT_MEDIA', '$VARIANT_WRITER', '$VARIANT_DEVELOPER'": "",
     "or '$VARIANT_MESH'.": "",
@@ -10,10 +11,10 @@
     "The command ${PROJECT_NAME}-config was not found": "",
     "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
     "Encrypted backup to other servers": "",
-    "Freedombone Configuration": "",
+    "${PROJECT_NAME} Configuration": "",
     "\\nDo you wish to configure some remote backup locations?": "",
     "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user.": "",
-    "'$SYSTEM_TYPE' is an unrecognised Freedombone variant.": "",
+    "'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant.": "",
     "The configuration file $CONFIGURATION_FILE was not found": "",
     "Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list.": "",
     "Private certificate for $CHECK_HOSTNAME was not created": "",
@@ -25,7 +26,7 @@
     "cjdns private key: $CJDNS_PRIVATE_KEY": "",
     "cjdns password: $CJDNS_PASSWORD": "",
     "cjdns port: $CJDNS_PORT": "",
-    "Forward port $CJDNS_PORT from your internet router to the Freedombone": "",
+    "Forward port $CJDNS_PORT from your internet router to the ${PROJECT_NAME}": "",
     "Address:    $ZERONET_BLOG_ADDRESS": "",
     "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
@@ -73,12 +74,13 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
+    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
     "Email import directory $IMPORT_MAILDIR not found": "",
     "ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": "",
     "Your MariaDB password is: $MARIADB_PASSWORD": "",
     "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE": "",
     "Music player in Owncloud": "",
-    " *** Freedombone $SYSTEM_TYPE is now installed ***": "",
+    " *** ${PROJECT_NAME} $SYSTEM_TYPE is now installed ***": "",
     "Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
     "Owncloud install did not recognise the system type $SYSTEM_TYPE": "",
     "Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD": "",
@@ -98,10 +100,12 @@
     "Your Tox node public key is": "",
     "Your Tox node public key is: $TOX_PUBLIC_KEY": "",
     "ERROR: prosody does not appear to have installed. $CHECK_MESSAGE": "",
+    "XMPP onion domain: ${XMPP_ONION_HOSTNAME}": "",
     "Your XMPP password is: $XMPP_PASSWORD": "",
     "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
     "IRC Server": "",
     "Wiki password": "",
+    "Wiki onion domain: ${WIKI_ONION_HOSTNAME}": "",
     "Wiki username: $MY_USERNAME": "",
     "Wiki password: $WIKI_ADMIN_PASSWORD": "",
     "Your blog username: $MY_USERNAME": "",
@@ -115,11 +119,6 @@
     " - Administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
     "https://$MICROBLOG_DOMAIN_NAME and you can then ": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
-    "To set up your Hubzilla site go to": "",
-    "to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt": "",
-    "and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key.": "",
-    "Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt": "",
-    "within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME": "",
     "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
     "VoIP Server": "",
     "VoIP server password: $VOIP_SERVER_PASSWORD": "",
@@ -127,5 +126,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
+    "\n  *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n                     HTTP     80\n                     HTTPS    443\n                     SSH      2222\n                     DLNA     1900\n                     DLNA     8200\n                     XMPP     5222-5223\n                     XMPP     5269\n                     XMPP     5280-5281\n                     IRC      6697\n                     IRC      9999\n                     Git      9418\n                     Email    25\n                     Email    587\n                     Email    465\n                     Email    993\n                     VoIP     64738\n                     VoIP     5060\n                     Tox      33445\n                     IPFS     4001\n": "",
     "See /home/$MY_USERNAME/README for post-installation instructions.": ""
 }
\ No newline at end of file
diff --git a/locale/es/freedombone-backup-remote.json b/locale/es/freedombone-backup-remote.json
index f00c71f6..be7872a3 100644
--- a/locale/es/freedombone-backup-remote.json
+++ b/locale/es/freedombone-backup-remote.json
@@ -16,6 +16,7 @@
     "Creating an email archive": "",
     "Backing up emails for $USERNAME": "",
     "Backing up Lets Encrypt settings": "",
+    "Backing up Tor settings": "",
     "Backing up GNU social installation": "",
     "GNU Social domain specified but not found in /var/www/${MICROBLOG_DOMAIN_NAME}": "",
     "Hubzilla domain specified but not found in /var/www/${HUBZILLA_DOMAIN_NAME}": "",
diff --git a/locale/es/freedombone-config.json b/locale/es/freedombone-config.json
index 3437f8d3..7dfbe565 100644
--- a/locale/es/freedombone-config.json
+++ b/locale/es/freedombone-config.json
@@ -17,8 +17,9 @@
     "German": "",
     "Spanish": "",
     "Please enter the FreeDNS code for this domain.\\n\\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters.": "",
-    "Freedombone": "",
     "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nEnsure that you have your domain and dynamic DNS settings ready.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE": "",
+    "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nWeb sites created will only be viewable within a Tor browser.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE": "",
+    "Freedombone": "",
     "Type of Installation:": "",
     "Full": "",
     "Writer": "",
diff --git a/locale/es/freedombone-controlpanel.json b/locale/es/freedombone-controlpanel.json
index 6a94b66f..f1e26866 100644
--- a/locale/es/freedombone-controlpanel.json
+++ b/locale/es/freedombone-controlpanel.json
@@ -12,7 +12,6 @@
     "The username should not contain any spaces": "",
     "ssh public key": "",
     "This does not look like an ssh public key": "",
-    "SIP phone extensions:": "",
     "User directory check": "",
     "This does not look like a user directory": "",
     "Administrator user": "",
@@ -168,7 +167,7 @@
     "IRC Menu": "",
     "Set a password for all IRC users": "",
     "Control Panel": "",
-    "Show SIP Phone Extensions": "",
+    "About this system": "",
     "Reset Tripwire": "",
     "Logging on/off": "",
     "Ping enable/disable": "",
diff --git a/locale/es/freedombone-renew-cert.json b/locale/es/freedombone-renew-cert.json
index 87d8faf0..05340eed 100644
--- a/locale/es/freedombone-renew-cert.json
+++ b/locale/es/freedombone-renew-cert.json
@@ -1,9 +1,8 @@
 {
     "${PROJECT_NAME}-renew-cert -h [hostname] -p [provider]": "",
     "Adding Let's Encrypt certificate": "",
-    "Unable to add Let's encrypt certificate": "",
     "Renewing Let's Encrypt certificate": "",
-    "Unable to renew Let's encrypt certificate": "",
+    "Unable to add Let's encrypt certificate": "",
     "Save the requested public key to /etc/ssl/certs/$HOSTNAME.new.crt": "",
     "/etc/ssl/certs/$HOSTNAME.new.crt then run this command again.": "",
     "$0: openssl is not installed, exiting": "",
diff --git a/locale/es/freedombone-restore-local.json b/locale/es/freedombone-restore-local.json
index 7b0c4389..e88d8b7d 100644
--- a/locale/es/freedombone-restore-local.json
+++ b/locale/es/freedombone-restore-local.json
@@ -21,6 +21,7 @@
     "Restarting database": "",
     "Change the MariaDB password to the backup version": "",
     "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
     "Restoring Mutt settings for $USERNAME": "",
     "Restoring gnupg settings for $USERNAME": "",
     "Restoring procmail settings for $USERNAME": "",
diff --git a/locale/es/freedombone-restore-remote.json b/locale/es/freedombone-restore-remote.json
index 4fb7c5f9..8a2e3de8 100644
--- a/locale/es/freedombone-restore-remote.json
+++ b/locale/es/freedombone-restore-remote.json
@@ -14,6 +14,7 @@
     "Restarting database": "",
     "Change the MariaDB password to the backup version": "",
     "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
     "Restoring Mutt settings for $USERNAME": "",
     "Restoring gnupg settings for $USERNAME": "",
     "Restoring procmail settings for $USERNAME": "",
diff --git a/locale/es/freedombone.json b/locale/es/freedombone.json
index df7d16bf..1dd829c3 100644
--- a/locale/es/freedombone.json
+++ b/locale/es/freedombone.json
@@ -1,4 +1,5 @@
 {
+    "${PROJECT_NAME} -c [configuration file]": "",
     "or for more specialised variants you can specify '$VARIANT_MAILBOX', '$VARIANT_CLOUD',": "",
     "'$VARIANT_CHAT', '$VARIANT_SOCIAL', '$VARIANT_MEDIA', '$VARIANT_WRITER', '$VARIANT_DEVELOPER'": "",
     "or '$VARIANT_MESH'.": "",
@@ -10,10 +11,10 @@
     "The command ${PROJECT_NAME}-config was not found": "",
     "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
     "Encrypted backup to other servers": "",
-    "Freedombone Configuration": "",
+    "${PROJECT_NAME} Configuration": "",
     "\\nDo you wish to configure some remote backup locations?": "",
     "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user.": "",
-    "'$SYSTEM_TYPE' is an unrecognised Freedombone variant.": "",
+    "'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant.": "",
     "The configuration file $CONFIGURATION_FILE was not found": "",
     "Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list.": "",
     "Private certificate for $CHECK_HOSTNAME was not created": "",
@@ -25,7 +26,7 @@
     "cjdns private key: $CJDNS_PRIVATE_KEY": "",
     "cjdns password: $CJDNS_PASSWORD": "",
     "cjdns port: $CJDNS_PORT": "",
-    "Forward port $CJDNS_PORT from your internet router to the Freedombone": "",
+    "Forward port $CJDNS_PORT from your internet router to the ${PROJECT_NAME}": "",
     "Address:    $ZERONET_BLOG_ADDRESS": "",
     "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
@@ -73,12 +74,13 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
+    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
     "Email import directory $IMPORT_MAILDIR not found": "",
     "ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": "",
     "Your MariaDB password is: $MARIADB_PASSWORD": "",
     "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE": "",
     "Music player in Owncloud": "",
-    " *** Freedombone $SYSTEM_TYPE is now installed ***": "",
+    " *** ${PROJECT_NAME} $SYSTEM_TYPE is now installed ***": "",
     "Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
     "Owncloud install did not recognise the system type $SYSTEM_TYPE": "",
     "Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD": "",
@@ -98,10 +100,12 @@
     "Your Tox node public key is": "",
     "Your Tox node public key is: $TOX_PUBLIC_KEY": "",
     "ERROR: prosody does not appear to have installed. $CHECK_MESSAGE": "",
+    "XMPP onion domain: ${XMPP_ONION_HOSTNAME}": "",
     "Your XMPP password is: $XMPP_PASSWORD": "",
     "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
     "IRC Server": "",
     "Wiki password": "",
+    "Wiki onion domain: ${WIKI_ONION_HOSTNAME}": "",
     "Wiki username: $MY_USERNAME": "",
     "Wiki password: $WIKI_ADMIN_PASSWORD": "",
     "Your blog username: $MY_USERNAME": "",
@@ -115,11 +119,6 @@
     " - Administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
     "https://$MICROBLOG_DOMAIN_NAME and you can then ": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
-    "To set up your Hubzilla site go to": "",
-    "to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt": "",
-    "and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key.": "",
-    "Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt": "",
-    "within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME": "",
     "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
     "VoIP Server": "",
     "VoIP server password: $VOIP_SERVER_PASSWORD": "",
@@ -127,5 +126,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
+    "\n  *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n                     HTTP     80\n                     HTTPS    443\n                     SSH      2222\n                     DLNA     1900\n                     DLNA     8200\n                     XMPP     5222-5223\n                     XMPP     5269\n                     XMPP     5280-5281\n                     IRC      6697\n                     IRC      9999\n                     Git      9418\n                     Email    25\n                     Email    587\n                     Email    465\n                     Email    993\n                     VoIP     64738\n                     VoIP     5060\n                     Tox      33445\n                     IPFS     4001\n": "",
     "See /home/$MY_USERNAME/README for post-installation instructions.": ""
 }
\ No newline at end of file
diff --git a/locale/fr/freedombone-backup-remote.json b/locale/fr/freedombone-backup-remote.json
index f00c71f6..be7872a3 100644
--- a/locale/fr/freedombone-backup-remote.json
+++ b/locale/fr/freedombone-backup-remote.json
@@ -16,6 +16,7 @@
     "Creating an email archive": "",
     "Backing up emails for $USERNAME": "",
     "Backing up Lets Encrypt settings": "",
+    "Backing up Tor settings": "",
     "Backing up GNU social installation": "",
     "GNU Social domain specified but not found in /var/www/${MICROBLOG_DOMAIN_NAME}": "",
     "Hubzilla domain specified but not found in /var/www/${HUBZILLA_DOMAIN_NAME}": "",
diff --git a/locale/fr/freedombone-config.json b/locale/fr/freedombone-config.json
index 3437f8d3..7dfbe565 100644
--- a/locale/fr/freedombone-config.json
+++ b/locale/fr/freedombone-config.json
@@ -17,8 +17,9 @@
     "German": "",
     "Spanish": "",
     "Please enter the FreeDNS code for this domain.\\n\\nThe code can be found by going to https://freedns.afraid.org, selecting 'Dynamic DNS' and then opening 'Wget example'. The code will consist of letters and numbers and be between the ? and = characters.": "",
-    "Freedombone": "",
     "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nEnsure that you have your domain and dynamic DNS settings ready.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE": "",
+    "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\\n\\nWeb sites created will only be viewable within a Tor browser.\\n\\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE": "",
+    "Freedombone": "",
     "Type of Installation:": "",
     "Full": "",
     "Writer": "",
diff --git a/locale/fr/freedombone-controlpanel.json b/locale/fr/freedombone-controlpanel.json
index 6a94b66f..f1e26866 100644
--- a/locale/fr/freedombone-controlpanel.json
+++ b/locale/fr/freedombone-controlpanel.json
@@ -12,7 +12,6 @@
     "The username should not contain any spaces": "",
     "ssh public key": "",
     "This does not look like an ssh public key": "",
-    "SIP phone extensions:": "",
     "User directory check": "",
     "This does not look like a user directory": "",
     "Administrator user": "",
@@ -168,7 +167,7 @@
     "IRC Menu": "",
     "Set a password for all IRC users": "",
     "Control Panel": "",
-    "Show SIP Phone Extensions": "",
+    "About this system": "",
     "Reset Tripwire": "",
     "Logging on/off": "",
     "Ping enable/disable": "",
diff --git a/locale/fr/freedombone-renew-cert.json b/locale/fr/freedombone-renew-cert.json
index 87d8faf0..05340eed 100644
--- a/locale/fr/freedombone-renew-cert.json
+++ b/locale/fr/freedombone-renew-cert.json
@@ -1,9 +1,8 @@
 {
     "${PROJECT_NAME}-renew-cert -h [hostname] -p [provider]": "",
     "Adding Let's Encrypt certificate": "",
-    "Unable to add Let's encrypt certificate": "",
     "Renewing Let's Encrypt certificate": "",
-    "Unable to renew Let's encrypt certificate": "",
+    "Unable to add Let's encrypt certificate": "",
     "Save the requested public key to /etc/ssl/certs/$HOSTNAME.new.crt": "",
     "/etc/ssl/certs/$HOSTNAME.new.crt then run this command again.": "",
     "$0: openssl is not installed, exiting": "",
diff --git a/locale/fr/freedombone-restore-local.json b/locale/fr/freedombone-restore-local.json
index 7b0c4389..e88d8b7d 100644
--- a/locale/fr/freedombone-restore-local.json
+++ b/locale/fr/freedombone-restore-local.json
@@ -21,6 +21,7 @@
     "Restarting database": "",
     "Change the MariaDB password to the backup version": "",
     "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
     "Restoring Mutt settings for $USERNAME": "",
     "Restoring gnupg settings for $USERNAME": "",
     "Restoring procmail settings for $USERNAME": "",
diff --git a/locale/fr/freedombone-restore-remote.json b/locale/fr/freedombone-restore-remote.json
index 4fb7c5f9..8a2e3de8 100644
--- a/locale/fr/freedombone-restore-remote.json
+++ b/locale/fr/freedombone-restore-remote.json
@@ -14,6 +14,7 @@
     "Restarting database": "",
     "Change the MariaDB password to the backup version": "",
     "Restoring Lets Encrypt settings": "",
+    "Restoring Tor settings": "",
     "Restoring Mutt settings for $USERNAME": "",
     "Restoring gnupg settings for $USERNAME": "",
     "Restoring procmail settings for $USERNAME": "",
diff --git a/locale/fr/freedombone.json b/locale/fr/freedombone.json
index df7d16bf..1dd829c3 100644
--- a/locale/fr/freedombone.json
+++ b/locale/fr/freedombone.json
@@ -1,4 +1,5 @@
 {
+    "${PROJECT_NAME} -c [configuration file]": "",
     "or for more specialised variants you can specify '$VARIANT_MAILBOX', '$VARIANT_CLOUD',": "",
     "'$VARIANT_CHAT', '$VARIANT_SOCIAL', '$VARIANT_MEDIA', '$VARIANT_WRITER', '$VARIANT_DEVELOPER'": "",
     "or '$VARIANT_MESH'.": "",
@@ -10,10 +11,10 @@
     "The command ${PROJECT_NAME}-config was not found": "",
     "  ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
     "Encrypted backup to other servers": "",
-    "Freedombone Configuration": "",
+    "${PROJECT_NAME} Configuration": "",
     "\\nDo you wish to configure some remote backup locations?": "",
     "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user.": "",
-    "'$SYSTEM_TYPE' is an unrecognised Freedombone variant.": "",
+    "'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant.": "",
     "The configuration file $CONFIGURATION_FILE was not found": "",
     "Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list.": "",
     "Private certificate for $CHECK_HOSTNAME was not created": "",
@@ -25,7 +26,7 @@
     "cjdns private key: $CJDNS_PRIVATE_KEY": "",
     "cjdns password: $CJDNS_PASSWORD": "",
     "cjdns port: $CJDNS_PORT": "",
-    "Forward port $CJDNS_PORT from your internet router to the Freedombone": "",
+    "Forward port $CJDNS_PORT from your internet router to the ${PROJECT_NAME}": "",
     "Address:    $ZERONET_BLOG_ADDRESS": "",
     "Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
     "Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
@@ -73,12 +74,13 @@
     "$PUBLIC_MAILING_LIST mailing list": "",
     "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
     "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
+    "\n  *** ${PROJECT_NAME} mailbox installation is complete ***\n\n      Now on your internet router forward ports\n     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}\n": "",
     "Email import directory $IMPORT_MAILDIR not found": "",
     "ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": "",
     "Your MariaDB password is: $MARIADB_PASSWORD": "",
     "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE": "",
     "Music player in Owncloud": "",
-    " *** Freedombone $SYSTEM_TYPE is now installed ***": "",
+    " *** ${PROJECT_NAME} $SYSTEM_TYPE is now installed ***": "",
     "Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
     "Owncloud install did not recognise the system type $SYSTEM_TYPE": "",
     "Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD": "",
@@ -98,10 +100,12 @@
     "Your Tox node public key is": "",
     "Your Tox node public key is: $TOX_PUBLIC_KEY": "",
     "ERROR: prosody does not appear to have installed. $CHECK_MESSAGE": "",
+    "XMPP onion domain: ${XMPP_ONION_HOSTNAME}": "",
     "Your XMPP password is: $XMPP_PASSWORD": "",
     "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
     "IRC Server": "",
     "Wiki password": "",
+    "Wiki onion domain: ${WIKI_ONION_HOSTNAME}": "",
     "Wiki username: $MY_USERNAME": "",
     "Wiki password: $WIKI_ADMIN_PASSWORD": "",
     "Your blog username: $MY_USERNAME": "",
@@ -115,11 +119,6 @@
     " - Administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
     "https://$MICROBLOG_DOMAIN_NAME and you can then ": "",
     "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
-    "To set up your Hubzilla site go to": "",
-    "to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt": "",
-    "and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key.": "",
-    "Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt": "",
-    "within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME": "",
     "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
     "VoIP Server": "",
     "VoIP server password: $VOIP_SERVER_PASSWORD": "",
@@ -127,5 +126,6 @@
     "SIP server username: $MY_USERNAME": "",
     "SIP server extension: 201": "",
     "SIP server password: $SIP_SERVER_PASSWORD": "",
+    "\n  *** ${PROJECT_NAME} installation is complete. Rebooting... ***\n\n    Now forward these ports from your internet router\n\n                     HTTP     80\n                     HTTPS    443\n                     SSH      2222\n                     DLNA     1900\n                     DLNA     8200\n                     XMPP     5222-5223\n                     XMPP     5269\n                     XMPP     5280-5281\n                     IRC      6697\n                     IRC      9999\n                     Git      9418\n                     Email    25\n                     Email    587\n                     Email    465\n                     Email    993\n                     VoIP     64738\n                     VoIP     5060\n                     Tox      33445\n                     IPFS     4001\n": "",
     "See /home/$MY_USERNAME/README for post-installation instructions.": ""
 }
\ No newline at end of file