From cd05918a06fc9208e7cfef31b3616e40b66585ea Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Tue, 12 Aug 2025 01:51:46 -0400
Subject: [PATCH] optimize wtv-setup

---
 .../ServiceVault/wtv-setup/accounts.js        |   8 +-
 .../ServiceVault/wtv-setup/add-user-name.js   |   4 +-
 .../wtv-setup/add-user-password.js            |   4 +-
 .../ServiceVault/wtv-setup/add-user.js        |   4 +-
 .../wtv-setup/adjust-brightness.js            |   2 +-
 .../ServiceVault/wtv-setup/adjust-contrast.js |   2 +-
 .../wtv-setup/adjust-display-intro.js         |   2 +-
 .../wtv-setup/adjust-sharpness.js             |   2 +-
 .../ServiceVault/wtv-setup/center-display.js  |   2 +-
 .../ServiceVault/wtv-setup/choose-bg-songs.js |   8 +-
 .../ServiceVault/wtv-setup/edit-password.js   |  10 +-
 .../ServiceVault/wtv-setup/edit-user-begin.js |  10 +-
 .../ServiceVault/wtv-setup/edit-user-name.js  |  11 +-
 .../ServiceVault/wtv-setup/get-playlist.js    |   6 +-
 .../includes/ServiceVault/wtv-setup/get.js    |   4 +-
 .../ServiceVault/wtv-setup/keyboard.js        |   4 +-
 .../ServiceVault/wtv-setup/mail-signature.js  |   6 +-
 .../includes/ServiceVault/wtv-setup/mail.js   |   2 +-
 .../wtv-setup/messenger-account.js            |   2 +-
 .../wtv-setup/messenger-edit-list.js          |   2 +-
 .../wtv-setup/messenger-enable.js             |  11 +-
 .../ServiceVault/wtv-setup/messenger-info.js  |   2 +-
 .../ServiceVault/wtv-setup/messenger-mode.js  |   2 +-
 .../ServiceVault/wtv-setup/messenger.js       |   2 +-
 .../ServiceVault/wtv-setup/phone-advanced.js  |   2 +-
 .../ServiceVault/wtv-setup/phone-basic.js     |   2 +-
 .../wtv-setup/phone-call-wait-thresh.js       |   2 +-
 .../wtv-setup/phone-call-waiting.js           |   2 +-
 .../ServiceVault/wtv-setup/phone-reset.js     |   2 +-
 .../includes/ServiceVault/wtv-setup/phone.js  |   2 +-
 .../includes/ServiceVault/wtv-setup/region.js |   4 +-
 .../ServiceVault/wtv-setup/remove-users.js    |  12 +-
 .../ServiceVault/wtv-setup/reset-musicobj.js  |   4 +-
 .../ServiceVault/wtv-setup/screen-border.js   |   2 +-
 .../includes/ServiceVault/wtv-setup/screen.js |   2 +-
 .../wtv-setup/serve-billing-overview.js       |   2 +-
 .../includes/ServiceVault/wtv-setup/set-bg.js |  14 +-
 .../includes/ServiceVault/wtv-setup/set.js    |  10 +-
 .../includes/ServiceVault/wtv-setup/setup.js  |   8 +-
 .../includes/ServiceVault/wtv-setup/sound.js  |   4 +-
 .../includes/ServiceVault/wtv-setup/text.js   |   2 +-
 .../ServiceVault/wtv-setup/timezone.js        | 124 ------------------
 .../wtv-setup/transfer-account.js             |   8 +-
 .../includes/ServiceVault/wtv-setup/tweaks.js |   2 +-
 .../wtv-setup/validate-add-user-done.js       |  16 +--
 .../wtv-setup/validate-add-user.js            |   4 +-
 .../wtv-setup/validate-bg-song-category.js    |  25 ++--
 .../wtv-setup/validate-change-name.js         |  14 +-
 .../wtv-setup/validate-change-password.js     |  16 +--
 .../wtv-setup/validate-mail-signature.js      |   6 +-
 .../wtv-setup/validate-messenger-account.js   |   6 +-
 .../wtv-setup/validate-remove-users.js        |  18 +--
 .../wtv-setup/validate-screen-border.js       |   6 +-
 .../wtv-setup/validate-transfer-account.js    |  24 ++--
 .../ServiceVault/wtv-setup/validate-tweaks.js |   2 +-
 55 files changed, 167 insertions(+), 292 deletions(-)
 delete mode 100644 zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/timezone.js

diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/accounts.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/accounts.js
index f6dd7b8e..535728b9 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/accounts.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/accounts.js
@@ -1,8 +1,8 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 session_data.loadSessionData();
 
 if (session_data.user_id != 0) {
-    var errpage = doErrorPage(400, "You are not authorized to edit the primary account.");
+    const errpage = doErrorPage(400, "You are not authorized to edit the primary account.");
     headers = errpage[0];
     data = errpage[1];
 } else {
@@ -66,9 +66,9 @@ ${minisrv_config.config.service_name} users
 <FONT COLOR="44cc55"><B>
 Subscriber:
 <P>`;
-    var accounts = session_data.listPrimaryAccountUsers();
+    const accounts = session_data.listPrimaryAccountUsers();
 
-    var num_accounts = session_data.getNumberOfUserAccounts();
+    const num_accounts = session_data.getNumberOfUserAccounts();
     if (num_accounts > 1) data += "Additional users:</B></FONT>";
 
     data += "<TD WIDTH=20><TD WIDTH=198 VALIGN=top ALIGN=left>";
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-name.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-name.js
index 94e9611f..fdc86424 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-name.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-name.js
@@ -1,5 +1,5 @@
-var minisrv_service_file = true;
-var errpage;
+const minisrv_service_file = true;
+let errpage;
 
 
 if (session_data.user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-password.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-password.js
index 668c5018..a490f14a 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-password.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user-password.js
@@ -1,5 +1,5 @@
-var minisrv_service_file = true;
-var errpage = null;
+const minisrv_service_file = true;
+let errpage = null;
 
 const wtvr = new WTVRegister(minisrv_config, SessionStore);
 
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user.js
index 6e800b3b..956fc8b1 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/add-user.js
@@ -1,5 +1,5 @@
-var minisrv_service_file = true;
-var errpage;
+const minisrv_service_file = true;
+let errpage;
 
 if (Object.keys(session_data.listPrimaryAccountUsers()).length >= minisrv_config.config.user_accounts.max_users_per_account) {
     errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-brightness.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-brightness.js
index 938e8f52..9674e14a 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-brightness.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-brightness.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-contrast.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-contrast.js
index 33f3faef..a4fb777c 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-contrast.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-contrast.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-display-intro.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-display-intro.js
index c42dbed4..e42c801e 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-display-intro.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-display-intro.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-sharpness.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-sharpness.js
index 2a92d23a..02d70d3e 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-sharpness.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/adjust-sharpness.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/center-display.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/center-display.js
index 75f506b0..9a50bc6b 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/center-display.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/center-display.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/choose-bg-songs.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/choose-bg-songs.js
index 8be43e7e..e90dd28b 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/choose-bg-songs.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/choose-bg-songs.js
@@ -1,10 +1,10 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 const wtvbgm = new WTVBGMusic(minisrv_config, session_data);
 
-var catsListed = 0;
-var categories = wtvbgm.getCategoryList();
-var divide = Math.round(categories.length / 2, 0);
+let catsListed = 0;
+const categories = wtvbgm.getCategoryList();
+const divide = Math.round(categories.length / 2, 0);
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-password.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-password.js
index 0df924c1..2b9c44a9 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-password.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-password.js
@@ -1,19 +1,19 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
+let userSession = null;
 
 session_data.loadSessionData();
 
-var user_id = (request_headers.query.user_id) ? request_headers.query.user_id : session_data.user_id;
+let user_id = (request_headers.query.user_id) ? request_headers.query.user_id : session_data.user_id;
 
 // security
 if (session_data.user_id != 0 && session_data.user_id != user_id) {
     user_id = null; // force unset
-    var errpage = wtvshared.doErrorPage(400, "You are not authorized to change the selected user's password.");
+    const errpage = wtvshared.doErrorPage(400, "You are not authorized to change the selected user's password.");
     headers = errpage[0];
     data = errpage[1];
 }
 
 if (user_id != null) {
-    var userSession = null;
     if (session_data.user_id == request_headers.query.user_id) userSession = session_data;
     else {
         userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
@@ -21,7 +21,7 @@ if (user_id != null) {
     }
 
     if (!userSession.loadSessionData()) {
-        var errpage = wtvshared.doErrorPage(400, "Invalid user ID.");
+        const errpage = wtvshared.doErrorPage(400, "Invalid user ID.");
         headers = errpage[0];
         data = errpage[1];
     }
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-user-begin.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-user-begin.js
index 7c0ad68d..42884b35 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-user-begin.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-user-begin.js
@@ -1,7 +1,7 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 session_data.loadSessionData();
+let userSession, user_id;
 
-var user_id = null;
 if (request_headers.query.user_id) {
     user_id = request_headers.query.user_id;
 } else {
@@ -11,7 +11,7 @@ if (request_headers.query.user_id) {
 // security
 if (session_data.user_id != 0 && session_data.user_id != request_headers.query.user_id) {
     user_id = null; // force unset
-    var errpage = wtvshared.doErrorPage(400, "You are not authorized to edit the selected user.");
+    const errpage = wtvshared.doErrorPage(400, "You are not authorized to edit the selected user.");
     headers = errpage[0];
     data = errpage[1];
 }
@@ -22,7 +22,7 @@ Connection: Keep-Alive
 Content-Type: text/html
 wtv-expire-all: wtv-setup:/edit-user
 wtv-noback-all: wtv-setup:/edit-user`
-    var userSession = null;
+    
     if (session_data.user_id == request_headers.query.user_id) userSession = session_data;
     else {
         userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
@@ -30,7 +30,7 @@ wtv-noback-all: wtv-setup:/edit-user`
     }
 
     if (!userSession.loadSessionData()) {
-        var errpage = wtvshared.doErrorPage(400, "Invalid user ID.");
+        const errpage = wtvshared.doErrorPage(400, "Invalid user ID.");
         headers = errpage[0];
         data = errpage[1];
     } else {
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-user-name.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-user-name.js
index 8549067d..52ab18bd 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-user-name.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/edit-user-name.js
@@ -1,19 +1,18 @@
-var minisrv_service_file = true;
-
+const minisrv_service_file = true;
+let userSession = null;
 session_data.loadSessionData();
 
-var user_id = (request_headers.query.user_id) ? request_headers.query.user_id : session_data.user_id;
+let user_id = (request_headers.query.user_id) ? request_headers.query.user_id : session_data.user_id;
 
 // security
 if (session_data.user_id != 0 && session_data.user_id != request_headers.query.user_id) {
     user_id = null; // force unset
-    var errpage = wtvshared.doErrorPage(400, "You are not authorized to change the selected user's password.");
+    const errpage = wtvshared.doErrorPage(400, "You are not authorized to change the selected user's password.");
     headers = errpage[0];
     data = errpage[1];
 }
 
 if (user_id != null) {
-    var userSession = null;
     if (session_data.user_id == request_headers.query.user_id) userSession = session_data;
     else {
         userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
@@ -21,7 +20,7 @@ if (user_id != null) {
     }
 
     if (!userSession.loadSessionData()) {
-        var errpage = wtvshared.doErrorPage(400, "Invalid user ID.");
+        const errpage = wtvshared.doErrorPage(400, "Invalid user ID.");
         headers = errpage[0];
         data = errpage[1];
     }
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get-playlist.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get-playlist.js
index a754e438..7e6ae076 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get-playlist.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get-playlist.js
@@ -1,7 +1,7 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 const wtvbgm = new WTVBGMusic(minisrv_config, session_data);
-var music_obj = wtvbgm.getMusicObj();
+const music_obj = wtvbgm.getMusicObj();
 
 headers = `
 200 OK
@@ -11,7 +11,7 @@ wtv-backgroundmusic-clear: no_zits
 
 Object.keys(music_obj.enableSongs).forEach(function (k) {
     if (!wtvbgm.isCategoryEnabled(wtvbgm.getSongCategory(music_obj.enableSongs[k]))) return;
-    var song = wtvbgm.getSong(music_obj.enableSongs[k]);
+    const song = wtvbgm.getSong(music_obj.enableSongs[k]);
     if (song) headers += "wtv-backgroundmusic-add: "+song['url']+"\n";
 });
 
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get.js
index 9ca342d2..9a5e349d 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/get.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 if (session_data.lockdown) {
     headers = `200 OK
@@ -10,7 +10,7 @@ Content-Type: text/html`;
     data = "";
 } else {
 
-    var settings_obj = session_data.getSessionData("wtv-setup");
+    let settings_obj = session_data.getSessionData("wtv-setup");
     if (settings_obj === null) settings_obj = {};
 
     settings_obj["from-server"] = 1;
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/keyboard.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/keyboard.js
index 81c7493a..14873152 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/keyboard.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/keyboard.js
@@ -1,6 +1,6 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
-var settings_obj = session_data.getSessionData("wtv-setup");
+let settings_obj = session_data.getSessionData("wtv-setup");
 if (settings_obj === null) settings_obj = {};
 
 headers = `200 OK
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/mail-signature.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/mail-signature.js
index e5826494..9d5c1a95 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/mail-signature.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/mail-signature.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
@@ -9,7 +9,7 @@ wtv-expire-all: wtv-mail:/sendmail
 wtv-expire-all: http
 Content-Type: text/html`
 
-var signature = session_data.getSessionData("subscriber_signature");
+let signature = session_data.getSessionData("subscriber_signature");
 
 if (request_headers.query.mail_signature) {
     if (signature != request_headers.query.mail_signature) {
@@ -18,7 +18,7 @@ if (request_headers.query.mail_signature) {
         signature = request_headers.query.mail_signature;
     }
 } 
-var message_colors = session_data.mailstore.getSignatureColors(signature)
+const message_colors = session_data.mailstore.getSignatureColors(signature)
 
 data = `<HTML>
 <HEAD>
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/mail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/mail.js
index 0d06ae61..28ba3996 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/mail.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/mail.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-account.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-account.js
index e90bdf46..e538c7fe 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-account.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-account.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-edit-list.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-edit-list.js
index dacfe7d1..4628531c 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-edit-list.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-edit-list.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-enable.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-enable.js
index 1767b8dd..b79a9147 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-enable.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-enable.js
@@ -1,15 +1,16 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
+let justenabled, enablestatus;
 
 if (!session_data.getSessionData("messenger_enabled") == 1) {
 	session_data.setSessionData("messenger_enabled", 1);
 	session_data.saveSessionData;
-	var justenabled = "true"
-	var enablestatus = "1"
+	justenabled = "true";
+	enablestatus = "1";
 } else {
 	session_data.setSessionData("messenger_enabled", 0);
 	session_data.saveSessionData;
-	var justenabled = "false"
-	var enablestatus = "0"
+	justenabled = "false"
+	enablestatus = "0"
 }
 
 headers = `300 OK
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-info.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-info.js
index ea9dbbee..39752e00 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-info.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-info.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 
 headers = `200 OK`
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-mode.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-mode.js
index e097c7f2..a02c664d 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-mode.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger-mode.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger.js
index 6114f350..e83953a8 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/messenger.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-advanced.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-advanced.js
index 0319df38..5df55d53 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-advanced.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-advanced.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-basic.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-basic.js
index 6c728952..8cb95424 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-basic.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-basic.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-call-wait-thresh.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-call-wait-thresh.js
index 1850df05..9effa0fa 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-call-wait-thresh.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-call-wait-thresh.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-call-waiting.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-call-waiting.js
index 5f9781af..246d445a 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-call-waiting.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-call-waiting.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-reset.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-reset.js
index 7db6e743..776d8e39 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-reset.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone-reset.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone.js
index 66d64754..f1b0bf12 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/phone.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/region.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/region.js
index 15984be5..0de17437 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/region.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/region.js
@@ -1,7 +1,7 @@
 var minisrv_service_file = true;
 
-var timezone = "-0000";
-var zip = "";
+let timezone = "-0000";
+let zip = "";
 if (session_data.isRegistered()) {
     timezone = session_data.getSessionData("timezone") || timezone;
     zip = session_data.getSessionData("zipcode") || zip;
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/remove-users.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/remove-users.js
index e3f25a49..3ef3fe6e 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/remove-users.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/remove-users.js
@@ -1,5 +1,5 @@
-var minisrv_service_file = true;
-var errpage;
+const minisrv_service_file = true;
+let errpage;
 
 if (Object.keys(session_data.listPrimaryAccountUsers()).length == 1) {
 	errpage = wtvshared.doErrorPage(400, "There are no more users to remove.");
@@ -95,16 +95,16 @@ noscroll>
 <P><FORM ACTION="wtv-setup:/validate-remove-users" METHOD="POST">
 `;
 
-	var accounts = session_data.listPrimaryAccountUsers();
+	const accounts = session_data.listPrimaryAccountUsers();
 
-	var num_accounts = session_data.getNumberOfUserAccounts();
+	const num_accounts = session_data.getNumberOfUserAccounts();
 	if (num_accounts > 1) {
 		delete accounts.subscriber;
 		for (const [key, value] of Object.entries(accounts)) {
-			var userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
+			const userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
 			userSession.user_id = parseInt(key.replace("user", ''));
 
-			var mailcount = 0;
+			let mailcount = 0;
 			if (userSession.mailstore.mailstoreExists()) {
 				if (userSession.mailstore.mailboxExists(0)) {
 					mailcount = userSession.mailstore.countUnreadMessages(0);
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/reset-musicobj.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/reset-musicobj.js
index 6603ca78..e0fa5684 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/reset-musicobj.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/reset-musicobj.js
@@ -1,6 +1,6 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
-var music_obj = {};
+const music_obj = {};
 session_data.setSessionData("wtv-bgmusic", music_obj);
 session_data.saveSessionData();
 headers = `300 OK
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/screen-border.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/screen-border.js
index 54455f33..5ec978ab 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/screen-border.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/screen-border.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/screen.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/screen.js
index 3fdd3eaa..c9f3896f 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/screen.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/screen.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/serve-billing-overview.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/serve-billing-overview.js
index 5f117a24..2183f2b4 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/serve-billing-overview.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/serve-billing-overview.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set-bg.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set-bg.js
index 57c9c871..e4d06d13 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set-bg.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set-bg.js
@@ -2,8 +2,8 @@ var minisrv_service_file = true;
 
 if (request_headers.query.category) {
 	const wtvbgm = new WTVBGMusic(minisrv_config, session_data);
-	var musicList = wtvbgm.getCategorySongList(request_headers.query.category);
-	var categoryName = wtvbgm.getCategoryName(request_headers.query.category);
+	const musicList = wtvbgm.getCategorySongList(request_headers.query.category);
+	const categoryName = wtvbgm.getCategoryName(request_headers.query.category);
 
 	headers = `200 OK
 Connection: Keep-Alive
@@ -93,8 +93,8 @@ Choose the songs that you'd like to include.
 <input type="hidden" name="category" value="${request_headers.query.category}">
 <input type="hidden" autosubmit="onLeave">
 `;
-	var songsListed = 0;
-	var divide = Math.round(musicList.length / 2, 0);
+	let songsListed = 0;
+	const divide = Math.round(musicList.length / 2, 0);
 	Object.keys(musicList).forEach(function (k) {
 		if (songsListed == divide) {
 			data += `</td ><td width="20">
@@ -105,9 +105,9 @@ Choose the songs that you'd like to include.
 <td valign="top">
 <input type="checkbox" name="enableSong" value=${musicList[k]['id']}${(wtvbgm.isSongEnabled(musicList[k]['id'])) ? ' checked="checked"' : ''}>
 </td><td valign="bottom">`;
-		var strLenLimit = 16;
+		const strLenLimit = 16;
 		if (musicList.length > 14) strLenLimit = 20;
-		var songTitle = musicList[k]['title'];
+		let songTitle = musicList[k]['title'];
 		if (songTitle.length > strLenLimit) songTitle = musicList[k]['title'].substr(0, strLenLimit - 3) + "...";
 		if (musicList.length > 14) data += '<font size="-2">';
 		data += `<a href="${musicList[k]['url']}?wtv-title=${encodeURIComponent(musicList[k]['title'])}" onmouseout="clearTitle()" onmouseover="showTitle('${musicList[k]['title'].replace(/\'/g, "\\'")}')">${songTitle}</a>
@@ -150,7 +150,7 @@ Choose the songs that you'd like to include.
 </display></display></body></html>`;
 
 } else {
-	var errPage = doErrorPage("400", "Category ID is required.");
+	const errPage = doErrorPage("400", "Category ID is required.");
 	headers = errPage[0];
 	data = errPage[1];
 }
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set.js
index bdd31820..541635f4 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/set.js
@@ -1,7 +1,7 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 if (request_headers.query && session_data) {
-    var settings_obj = session_data.getSessionData("wtv-setup");
+    const settings_obj = session_data.getSessionData("wtv-setup");
     if (settings_obj === null) settings_obj = {};
 
     Object.keys(request_headers.query).forEach(function (k) {
@@ -12,7 +12,7 @@ if (request_headers.query && session_data) {
     headers = `200 OK
 Content-type: text/html`;
 } else {
-    var outdata = doErrorPage();
-    headers = outdata[0];
-    data = outdata[1];
+    const errpage = doErrorPage();
+    headers = errpage[0];
+    data = errpage[1];
 }
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/setup.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/setup.js
index 079e04db..e7255c31 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/setup.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/setup.js
@@ -1,6 +1,6 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
-var notImplementedAlert = new clientShowAlert({
+const notImplementedAlert = new clientShowAlert({
 	'image': minisrv_config.config.service_logo,
 	'message': "This feature is not available.",
 	'buttonlabel1': "Okay",
@@ -9,7 +9,7 @@ var notImplementedAlert = new clientShowAlert({
 }).getURL();
 
 
-var settings = [
+const settings = [
   ["wtv-setup:/mail", "Mail Signature"],
   ["wtv-setup:/edit-password", "Edit Password"],
   ["wtv-setup:/accounts", "Account & Users"],
@@ -101,7 +101,7 @@ for ${session_data.getSessionData("subscriber_username") || "You"}
 <table cellspacing=0 cellpadding=0><tr><td abswidth=10>&nbsp;<td colspan=3>
 <table><tc><td>&nbsp;</td></tc><tc><td><table>`;
 
-for (i = 0; i < settings.length; i += 2) {
+for (let i = 0; i < settings.length; i += 2) {
 	data += `<tr>
 <td colspan=3 height=6>
 <tr>
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/sound.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/sound.js
index 70319276..32028a6e 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/sound.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/sound.js
@@ -1,5 +1,5 @@
-var minisrv_service_file = true;
-var canDoMuzac = session_data.hasCap('client-can-do-muzac');
+const minisrv_service_file = true;
+const canDoMuzac = session_data.hasCap('client-can-do-muzac');
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/text.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/text.js
index dc19d59b..2910270c 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/text.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/text.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 headers = `200 OK
 Connection: Keep-Alive
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/timezone.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/timezone.js
deleted file mode 100644
index 0d8dda2b..00000000
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/timezone.js
+++ /dev/null
@@ -1,124 +0,0 @@
-var minisrv_service_file = true;
-
-var timezone = "-0000";
-if (session_data.isRegistered()) {
-    timezone = session_data.getSessionData("timezone") || timezone;
-    if (request_headers.query.timezone) {
-        timezone = request_headers.query.timezone;
-        session_data.setSessionData("timezone", timezone);
-    }
-}
-
-strf = strftime.timezone(timezone)
-
-headers = `200 OK
-Connection: Keep-Alive
-wtv-expire-all: wtv-
-wtv-expire-all: http
-wtv-client-time-zone: GMT -0000
-wtv-client-time-dst-rule: false
-wtv-client-date: ${strf("%a, %d %b %Y %H:%M:%S", new Date(new Date().setUTCSeconds(new Date().getUTCSeconds())))}
-Content-Type: text/html`
-
-
-
-html = `<HTML>
-<HEAD>
-<TITLE>
-Set Timezone
-</TITLE>
-<DISPLAY nosave skipback noscroll>
-</HEAD>
-<sidebar width=110> <table cellspacing=0 cellpadding=0 BGCOLOR="30364D">
-<tr>
-<td colspan=3 abswidth=104 absheight=4>
-<td rowspan=99 width=6 absheight=420 valign=top align=left>
-<img src="wtv-home:/ROMCache/Shadow.gif" width=6 height=420>
-<tr>
-<td abswidth=6>
-<td abswidth=92 absheight=76>
-<table href="wtv-home:/home" absheight=76 cellspacing=0 cellpadding=0>
-<tr>
-<td align=right>
-<img src="${minisrv_config.config.service_logo}" width=87 height=67>
-</table>
-<td abswidth=6>
-<tr><td absheight=5 colspan=3>
-<table cellspacing=0 cellpadding=0>
-<tr><td abswidth=104 absheight=2 valign=middle align=center bgcolor="1C1E28">
-<img src="wtv-home:/ROMCache/Spacer.gif" width=1 height=1>
-<tr><td abswidth=104 absheight=1 valign=top align=left>
-<tr><td abswidth=104 absheight=2 valign=top align=left bgcolor="4D5573">
-<img src="wtv-home:/ROMCache/Spacer.gif" width=1 height=1>
-</table>
-<tr><td absheight=37>
-<tr><td absheight=263 align=right colspan=3>
-<img src="ROMCache/AccountBanner.gif" width=53 height=263>
-<tr><td absheight=41>
-</table>
-</sidebar>
-<BODY BGCOLOR="#191919" TEXT="#44cc55" LINK="189CD6" VLINK="189CD6" HSPACE=0 VSPACE=0 FONTSIZE="large"
->
-<table cellspacing=0 cellpadding=0>
-<tr>
-<td abswidth=14>
-<td abswidth=416 absheight=80 valign=center>
-<font size="+2" color="E7CE4A"><blackface><shadow>
-Set Timezone
-<td abswidth=20>
-<tr>
-<td>
-<td absheight=244 valign=top align=left>
-<form action="wtv-setup:/timezone" method="post">
-Current system time: <clock></clock><br><br>
-Your current timezone is set to: <b>${timezone}</b><br><br>`;
-
-
-const timezones = [
-    ["UTC-12:00", "-1200"], ["UTC-11:00", "-1100"], ["UTC-10:00", "-1000"], ["UTC-09:00", "-0900"], ["UTC-08:00", "-0800"],
-    ["UTC-07:00", "-0700"], ["UTC-06:00", "-0600"], ["UTC-05:00", "-0500"], ["UTC-04:00", "-0400"], ["UTC-03:00", "-0300"],
-    ["UTC-02:00", "-0200"], ["UTC-01:00", "-0100"], ["UTC&#177;00:00", "-0000"], ["UTC+01:00", "+0100"], ["UTC+02:00", "+0200"],
-    ["UTC+03:00", "+0300"], ["UTC+04:00", "+0400"], ["UTC+05:00", "+0500"], ["UTC+06:00", "+0600"], ["UTC+07:00", "+0700"],
-    ["UTC+08:00", "+0800"], ["UTC+09:00", "+0900"], ["UTC+10:00", "+1000"], ["UTC+11:00", "+1100"], ["UTC+12:00", "+1200"]
-];
-
-html += `<select name="timezone" onchange="this.form.submit()">\n`;
-for (const tz of timezones) {
-    html += `  <option value="${tz[1]}" ${tz[1] === timezone ? 'selected' : ''}>${tz[0]}</option>\n`;
-}
-html += `</select>`;
-
-html += `</form>
-<TR>
-<TD>
-<TD COLSPAN=4 HEIGHT=0 VALIGN=top ALIGN=left>
-<tr>
-<TD>
-<td colspan=3 height=2 valign=middle align=center bgcolor="2B2B2B">
-<spacer type=block width=436 height=1>
-<tr>
-<TD>
-<td colspan=4 height=1 valign=top align=left>
-<tr>
-<TD>
-<td colspan=3 height=2 valign=top align=left bgcolor="0D0D0D">
-<spacer type=block width=436 height=1>
-<TR>
-<TD>
-<TD COLSPAN=4 HEIGHT=4 VALIGN=top ALIGN=left>
-<TR>
-<TD>
-<TD COLSPAN=2 VALIGN=top ALIGN=left>
-<tr>
-<TD COLSPAN=2 VALIGN=top ALIGN=right>
-<FORM action="wtv-setup:/setup">
-<FONT COLOR="#E7CE4A" SIZE=-1><SHADOW>
-<INPUT TYPE=SUBMIT BORDERIMAGE="file://ROM/Borders/ButtonBorder2.bif" Value=Done NAME="Done" USESTYLE WIDTH=103>
-</SHADOW></FONT></FORM>
-<TD>
-</TABLE>
-</BODY>
-</HTML>
-`;
-
-data = html;
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/transfer-account.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/transfer-account.js
index e19c8328..b1f8b7d4 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/transfer-account.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/transfer-account.js
@@ -1,14 +1,14 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 // security
 if (session_data.user_id != 0 && session_data.user_id != request_headers.query.user_id) {
-    var errpage = wtvshared.doErrorPage(400, "You are not authorized to transfer this account. Please log in as the primary user.");
+    const errpage = wtvshared.doErrorPage(400, "You are not authorized to transfer this account. Please log in as the primary user.");
     headers = errpage[0];
     data = errpage[1];
 }
 
 if (!session_data.getUserPasswordEnabled()) {
-    var passwordRequired = new clientShowAlert({
+    const passwordRequired = new clientShowAlert({
         'image': minisrv_config.config.service_logo,
         'message': "For security, you must first set a password on your account before you can transfer it.",
         'buttonlabel1': "Set Password",
@@ -18,7 +18,7 @@ if (!session_data.getUserPasswordEnabled()) {
         'noback': true,
     }).getURL();
 
-    var errpage = wtvshared.doRedirect(passwordRequired);
+    const errpage = wtvshared.doRedirect(passwordRequired);
     headers = errpage[0];
     data = errpage[1];
 } else if (session_data.getUserPasswordEnabled() && session_data.user_id === 0) {
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/tweaks.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/tweaks.js
index b0ba6538..d217a096 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/tweaks.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/tweaks.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 
 headers = `200 OK
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user-done.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user-done.js
index f112a5e3..eb6bcda4 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user-done.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user-done.js
@@ -1,6 +1,6 @@
-var minisrv_service_file = true;
-var userSession = null;
-var errpage = null;
+const minisrv_service_file = true;
+let userSession = null;
+let errpage = null;
 
 if (session_data.user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
 
@@ -16,7 +16,7 @@ if (!errpage) {
 }
 
 if (!errpage) {
-    var wtvr = new WTVRegister(minisrv_config, SessionStore);
+    const wtvr = new WTVRegister(minisrv_config, SessionStore);
 
     if (session_data.getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
 
@@ -34,15 +34,15 @@ if (errpage) {
 } else {
     if (!request_headers.query.display_name) request_headers.query.display_name = request_headers.query.username;
     userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
-    var freeUserId = session_data.findFreeUserSlot();
+    const freeUserId = session_data.findFreeUserSlot();
     if (freeUserId) {
         userSession.user_id = freeUserId;
         userSession.setSessionData("subscriber_userid", freeUserId);
         userSession.setSessionData("subscriber_name", request_headers.query.display_name);
         userSession.setSessionData("subscriber_username", request_headers.query.user_name);
         userSession.setSessionData("registered", true);
-        var mailstore_exists = userSession.mailstore.mailstoreExists();
-        var mailbox_exists = false;
+        let mailstore_exists = userSession.mailstore.mailstoreExists();
+        let mailbox_exists = false;
         if (!mailstore_exists) mailstore_exists = userSession.mailstore.createMailstore();
         if (mailstore_exists) {
             if (!userSession.mailstore.mailboxExists(0)) {
@@ -55,7 +55,7 @@ if (errpage) {
             }
         }
         if (!userSession.saveSessionData(true, true)) {
-            var errpage = wtvshared.doErrorPage(400);
+            errpage = wtvshared.doErrorPage(400);
             headers = errpage[0];
             data = errpage[1];
         } else {
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user.js
index 328f001e..f2ae465a 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-add-user.js
@@ -1,5 +1,5 @@
-var minisrv_service_file = true;
-var errpage = null;
+const minisrv_service_file = true;
+let errpage = null;
 
 if (session_data.user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
 
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-bg-song-category.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-bg-song-category.js
index adfb834e..d54ab0a0 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-bg-song-category.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-bg-song-category.js
@@ -1,36 +1,35 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 const wtvbgm = new WTVBGMusic(minisrv_config, session_data);
 
 if (request_headers.query && session_data) {
 
     if (request_headers.request_url.indexOf('?') >= 0) {
-        var category = (request_headers.query.category) ? request_headers.query.category : null;
-        var music_obj = wtvbgm.getMusicObj();
-        var old_music_obj = Object.assign({}, music_obj);
+        const category = (request_headers.query.category) ? request_headers.query.category : null;
+        const music_obj = wtvbgm.getMusicObj();
 
         if (category == null) music_obj.enableCategories = [];
         else {
-            var cat = wtvbgm.categories[parseInt(category) - 1];
+            const cat = wtvbgm.categories[parseInt(category) - 1];
             if (cat) {
-                var toRemove = [];
+                const toRemove = [];
                 Object.keys(music_obj.enableSongs).forEach(function (k) {
                     if (wtvbgm.getSongCategory(parseInt(music_obj.enableSongs[k])) == parseInt(category)) toRemove.push(k);
                 });
                 toRemove.forEach(function (v) {
                     music_obj.enableSongs.splice(v, 1, "");
                 });
-                var newEnableSongs = music_obj.enableSongs.filter(value => Object.keys(value).length !== 0);
+                const newEnableSongs = music_obj.enableSongs.filter(value => Object.keys(value).length !== 0);
                 music_obj.enableSongs = newEnableSongs;
             }
         }
-        var qraw = request_headers.request_url.split('?')[1];
-        if (qraw.length > 0) {
-            qraw = qraw.split("&");
+        const _qraw = request_headers.request_url.split('?')[1];
+        if (_qraw.length > 0) {
+            const qraw = _qraw.split("&");
             for (let i = 0; i < qraw.length; i++) {
-                var qraw_split = qraw[i].split("=");
+                const qraw_split = qraw[i].split("=");
                 if (qraw_split.length == 2) {
-                    var k = qraw_split[0];
+                    const k = qraw_split[0];
                     if (k == "enableCategory") music_obj['enableCategories'].push(decodeURIComponent(qraw[i].split("=")[1].replace(/\+/g, "%20")));
                     if (k == "enableSong") music_obj['enableSongs'].push(decodeURIComponent(qraw[i].split("=")[1].replace(/\+/g, "%20")));
                 }
@@ -53,7 +52,7 @@ wtv-backgroundmusic-load-playlist: wtv-setup:/get-playlist`;
 Content-type: text/html`;
     }
 } else {
-    var outdata = doErrorPage();
+    const outdata = doErrorPage();
     headers = outdata[0];
     data = outdata[1];
 }
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-change-name.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-change-name.js
index 501f850f..9a8fe410 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-change-name.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-change-name.js
@@ -1,19 +1,19 @@
-var minisrv_service_file = true;
-
+const minisrv_service_file = true;
+let userSession;
 session_data.loadSessionData();
 
-var user_id = (request_headers.query.user_id) ? request_headers.query.user_id : session_data.user_id;
+let user_id = (request_headers.query.user_id) ? request_headers.query.user_id : session_data.user_id;
 
 // security
 if (session_data.user_id != 0 && session_data.user_id != request_headers.query.user_id) {
     user_id = null; // force unset
-    var errpage = wtvshared.doErrorPage(400, "You are not authorized to change the selected user's password.");
+    const errpage = wtvshared.doErrorPage(400, "You are not authorized to change the selected user's password.");
     headers = errpage[0];
     data = errpage[1];
 }
 
 if (user_id != null) {
-    var userSession;
+    
     if (session_data.user_id == request_headers.query.user_id) userSession = session_data;
     else {
         userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
@@ -21,12 +21,12 @@ if (user_id != null) {
     }
 
     if (!userSession.loadSessionData()) {
-        var errpage = wtvshared.doErrorPage(400, "Invalid user ID.");
+        const errpage = wtvshared.doErrorPage(400, "Invalid user ID.");
         headers = errpage[0];
         data = errpage[1];
     }
     else {
-        var user_name = userSession.getSessionData('subscriber_username');
+        const user_name = userSession.getSessionData('subscriber_username');
         userSession.setSessionData('subscriber_name', (request_headers.query.display_name) ? request_headers.query.display_name : user_name);
         userSession.saveSessionData();
         headers = `300 OK
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-change-password.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-change-password.js
index ba9c45bf..49a07ae7 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-change-password.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-change-password.js
@@ -1,20 +1,20 @@
-var minisrv_service_file = true;
-var userSession = null;
+const minisrv_service_file = true;
+let userSession, errpage;
 
 session_data.loadSessionData();
 
-var user_id = null;
+let user_id = null;
 if (request_headers.query.user_id) {
     user_id = request_headers.query.user_id;
 } else {
-    var errpage = doErrorPage(400, "User was not specified.");
+    errpage = doErrorPage(400, "User was not specified.");
     headers = errpage[0];
     data = errpage[1];
 }
 
 if (session_data.user_id != 0 && session_data.user_id != request_headers.query.user_id) {
     user_id = null; // force unset
-    var errpage = doErrorPage(400, "You are not authorized to edit the selected user.");
+    errpage = doErrorPage(400, "You are not authorized to edit the selected user.");
     headers = errpage[0];
     data = errpage[1];
 }
@@ -23,15 +23,15 @@ if (user_id && !errpage) {
     headers = `200 OK
 Connection: Keep-Alive
 Content-Type: text/html`
-    var userSession = null;
+    userSession = null;
     if (session_data.user_id == request_headers.query.user_id) userSession = session_data;
     else {
         userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
-        userSession.user_id = user_id;
+        userSession.user_id = user_id;``
     }
 
     if (!userSession.loadSessionData()) {
-        var errpage = doErrorPage(400, "Invalid user ID.");
+        errpage = doErrorPage(400, "Invalid user ID.");
         headers = errpage[0];
         data = errpage[1];
     }
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-mail-signature.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-mail-signature.js
index 5e2660f8..880ad8d1 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-mail-signature.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-mail-signature.js
@@ -1,7 +1,7 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 if (request_headers.query && session_data) {
-    var signature = session_data.getSessionData("subscriber_signature");
+    const signature = session_data.getSessionData("subscriber_signature");
     if (request_headers.query.mail_signature != signature) {
         session_data.setSessionData("subscriber_signature", (request_headers.query.mail_signature) ? request_headers.query.mail_signature : "");
         session_data.saveSessionData();
@@ -9,7 +9,7 @@ if (request_headers.query && session_data) {
     headers = `200 OK
 Content-type: text/html`
 } else {
-    var outdata = doErrorPage();
+    const outdata = doErrorPage();
     headers = outdata[0];
     data = outdata[1];
 }
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-messenger-account.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-messenger-account.js
index 6bca912f..0111f79e 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-messenger-account.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-messenger-account.js
@@ -1,5 +1,5 @@
-var minisrv_service_file = true;
-var errpage;
+const minisrv_service_file = true;
+let errpage;
 if (request_headers.query.email.length < 2) errpage = wtvshared.doErrorPage(400, "Your User Name includes at least 2 characters.");
 else if (request_headers.query.email.length > 16) errpage = wtvshared.doErrorPage(400, "Your User Name includes less than 17 characters.");
 else if (request_headers.query.password.length < 8) errpage = wtvshared.doErrorPage(400, "Your password includes at least 8 characters.");
@@ -10,7 +10,7 @@ if (errpage) {
     headers = errpage[0];
     data = errpage[1];
 } else {
-    var encryptedpass = session_data.encryptPassword(request_headers.query.password);
+    const encryptedpass = session_data.encryptPassword(request_headers.query.password);
 
     session_data.setSessionData("messenger_password", encryptedpass);
     session_data.setSessionData("messenger_email", request_headers.query.email);
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-remove-users.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-remove-users.js
index d5fcae74..42f40f3c 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-remove-users.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-remove-users.js
@@ -1,5 +1,5 @@
-var minisrv_service_file = true;
-var errpage;
+const minisrv_service_file = true;
+let errpage;
 
 if (Object.keys(session_data.listPrimaryAccountUsers()).length == 1) {
 	errpage = wtvshared.doErrorPage(400, "There are no more users to remove.");
@@ -20,16 +20,16 @@ if (errpage) {
 	data = errpage[1];
 } else {
 	if (!request_headers.query.confirm_remove) {
-		var message = '';
+		let message = '';
 		if (usersToRemove.length == 1) {
-			var userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
+			const userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
 			userSession.switchUserID(usersToRemove[0]);
-			var userName = userSession.getSessionData("subscriber_username");
+			const userName = userSession.getSessionData("subscriber_username");
 			message = `Removing <b>${userName}</b> will permanently remove all of <b>${userName}</b>'s e-mail and favorites as well. You will not be able to restore <b>${userName}</b>.`;
 		} else {
 			message = "Removing the selected users will permanently remove their e-mail and favorites as well. You will not be able to restore the users.";
 		}
-		var removeurl = request_headers.request_url;
+		let removeurl = request_headers.request_url;
 		if (removeurl.indexOf('?') >= 0) {
 			removeurl = removeurl.substring(0, removeurl.indexOf('?'));
 		}
@@ -40,7 +40,7 @@ if (errpage) {
 		});
 		removeurl += "confirm_remove=true";
 
-		var confirmAlert = new clientShowAlert({
+		const confirmAlert = new clientShowAlert({
 			'image': minisrv_config.config.service_logo,
 			'message': message,
 			'buttonlabel1': "Don't Remove",
@@ -59,8 +59,8 @@ Location: ${confirmAlert}`
 		Object.keys(usersToRemove).forEach(function (k) {
 			session_data.removeUser(usersToRemove[k]);
 		})
-		var num_accounts = session_data.getNumberOfUserAccounts();
-		var gourl = "wtv-setup:/remove-users?";
+		const num_accounts = session_data.getNumberOfUserAccounts();
+		let gourl = "wtv-setup:/remove-users?";
 		if (num_accounts == 1) gourl = "wtv-setup:/accounts?";
 
 		headers = `300 OK
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-screen-border.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-screen-border.js
index c15c7b3c..2544a766 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-screen-border.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-screen-border.js
@@ -1,4 +1,4 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
 if (request_headers.query) {
     if (request_headers.query.shade) {
@@ -6,12 +6,12 @@ if (request_headers.query) {
 Location: wtv-setup:/screen
 wtv-visit: client:setscreenborder?shade=${request_headers.query.shade}`;
     } else {
-        var errpage = wtvshared.doErrorPage(400);
+        const errpage = wtvshared.doErrorPage(400);
         headers = errpage[0];
         data = errpage[1];
     }
 } else {
-    var errpage = wtvshared.doErrorPage(400);
+    const errpage = wtvshared.doErrorPage(400);
     headers = errpage[0];
     data = errpage[1];
 }
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-transfer-account.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-transfer-account.js
index 8cb9bafe..b025fbf7 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-transfer-account.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-transfer-account.js
@@ -1,22 +1,22 @@
-var minisrv_service_file = true;
+const minisrv_service_file = true;
 
-var wtvr = new WTVRegister(minisrv_config);
+const wtvr = new WTVRegister(minisrv_config);
 
 // security
 if (session_data.user_id != 0 && session_data.user_id != request_headers.query.user_id) {
-    var errpage = wtvshared.doErrorPage(400, "You are not authorized to transfer this account. Please log in as the primary user.");
+    const errpage = wtvshared.doErrorPage(400, "You are not authorized to transfer this account. Please log in as the primary user.");
     headers = errpage[0];
     data = errpage[1];
 }
 
 if (!request_headers.query.ssid || !request_headers.query.password) {
-    var errpage = wtvshared.doErrorPage(400, "Invalid Parameter");
+    const errpage = wtvshared.doErrorPage(400, "Invalid Parameter");
     headers = errpage[0];
     data = errpage[1];
 }
 
 if (!session_data.getUserPasswordEnabled()) {
-    var passwordRequired = new clientShowAlert({
+    const passwordRequired = new clientShowAlert({
         'image': minisrv_config.config.service_logo,
         'message': "For security, you must first set a password on your account before you can transfer it.",
         'buttonlabel1': "Set Password",
@@ -26,27 +26,27 @@ if (!session_data.getUserPasswordEnabled()) {
         'noback': true,
     }).getURL();
 
-    var errpage = wtvshared.doRedirect(passwordRequired);
+    const errpage = wtvshared.doRedirect(passwordRequired);
     headers = errpage[0];
     data = errpage[1];
 } else if (session_data.getUserPasswordEnabled() && session_data.user_id === 0 && request_headers.query.ssid && request_headers.query.password) {
     validPassword = session_data.validateUserPassword(request_headers.query.password);
     if (!validPassword) {
-        var errpage = wtvshared.doErrorPage(400, "Incorrect Password");
+        const errpage = wtvshared.doErrorPage(400, "Incorrect Password");
         headers = errpage[0];
         data = errpage[1];
     }
     else if (!wtvshared.checkSSID(request_headers.query.ssid)) {
-        var errpage = wtvshared.doErrorPage(400, "The provided SSID is not valid. Only valid CRC validated SSIDs are available as a destination. Please check your input and try again.");
+        const errpage = wtvshared.doErrorPage(400, "The provided SSID is not valid. Only valid CRC validated SSIDs are available as a destination. Please check your input and try again.");
         headers = errpage[0];
         data = errpage[1];
     }
     else if (!wtvr.checkSSIDAvailable(request_headers.query.ssid)) {
-        var errpage = wtvshared.doErrorPage(400, "The destination already has an account registered, or a transfer is already in progress. Please delete the account associated with the target SSID, or cancel the pending transfer, then try again.");
+        const errpage = wtvshared.doErrorPage(400, "The destination already has an account registered, or a transfer is already in progress. Please delete the account associated with the target SSID, or cancel the pending transfer, then try again.");
         headers = errpage[0];
         data = errpage[1];
     } else {
-        var transferInitiated = new clientShowAlert({
+        const transferInitiated = new clientShowAlert({
             'image': minisrv_config.config.service_logo,
             'message': "Your account transfer is pending. Please connect to this server with the destination box. A prompt should appear instead of registration. To cancel the transfer, select <b>Cancel Transfer</b>, or simply reconnect with this box.",
             'buttonlabel1': "Cancel Transfer",
@@ -58,12 +58,12 @@ if (!session_data.getUserPasswordEnabled()) {
 
         session_data.setPendingTransfer(request_headers.query.ssid);
         session_data.setUserLoggedIn(false);
-        var errpage = wtvshared.doRedirect(transferInitiated);
+        const errpage = wtvshared.doRedirect(transferInitiated);
         headers = errpage[0];
         data = errpage[1];
     }
 } else {
-    var errpage = wtvshared.doErrorPage(400, "Invalid Parameter");
+    const errpage = wtvshared.doErrorPage(400, "Invalid Parameter");
     headers = errpage[0];
     data = errpage[1];
 }
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-tweaks.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-tweaks.js
index 4bf000ca..9b257edd 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-tweaks.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/validate-tweaks.js
@@ -1,7 +1,7 @@
 var minisrv_service_file = true;
 
 
-var fast_splash = wtvshared.parseBool(request_headers.query.fast_splash);
+const fast_splash = wtvshared.parseBool(request_headers.query.fast_splash);
 session_data.setSessionData("fast_splash", fast_splash);
 session_data.saveSessionData();