diff --git a/agents/meshcore.js b/agents/meshcore.js
index 5903cefb..9d3cd688 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -708,7 +708,6 @@ db = require('SimpleDataStore').Shared();
 sha = require('SHA256Stream');
 mesh = require('MeshAgent');
 childProcess = require('child_process');
-try { scriptTask = require('script-task').CreateScriptTask(mesh); } catch (ex) { }
 
 if (mesh.hasKVM == 1) {   // if the agent is compiled with KVM support
     // Check if this computer supports a desktop
@@ -1556,10 +1555,6 @@ function handleServerCommand(data) {
                 try { require(data.plugin).consoleaction(data, data.rights, data.sessionid, this); } catch (ex) { throw ex; }
                 break;
             }
-            case 'task': {
-                if (scriptTask) { scriptTask.consoleAction(data, data.rights, data.sessionid, false); }
-                break;
-            }
             case 'coredump':
                 // Set the current agent coredump situation.s
                 if (data.value === true) {
@@ -4565,11 +4560,6 @@ function processConsoleCommand(cmd, args, rights, sessionid) {
                 }
                 break;
             }
-            case 'task': {
-                if (!scriptTask) { response = "Tasks are not supported on this agent"; }
-                else { response = scriptTask.consoleAction(args, rights, sessionid, true); }
-                break;
-            }
             case 'plugin': {
                 if (typeof args['_'][0] == 'string') {
                     try {
diff --git a/agents/modules_meshcore/script-task.js b/agents/modules_meshcore/script-task.js
deleted file mode 100644
index d8b8febb..00000000
--- a/agents/modules_meshcore/script-task.js
+++ /dev/null
@@ -1,416 +0,0 @@
-/** 
-* @description MeshCentral Script-Task
-* @author Ryan Blenis
-* @copyright 
-* @license Apache-2.0
-*/
-
-'use strict';
-function CreateScriptTask(parent) {
-    var obj = {};
-    var db = require('SimpleDataStore').Shared();
-    var pendingDownload = [];
-    var debugFlag = false;
-    var runningJobs = [];
-    var runningJobPIDs = {};
-    
-    function dbg(str) {
-        if (debugFlag !== true) return;
-        var fs = require('fs');
-        var logStream = fs.createWriteStream('scripttask.txt', { 'flags': 'a' });
-        // use {'flags': 'a'} to append and {'flags': 'w'} to erase and write a new file
-        logStream.write('\n' + new Date().toLocaleString() + ': ' + str);
-        logStream.end('\n');
-    }
-
-    function removeFromArray(arr, from, to) {
-        var rest = arr.slice((to || from) + 1 || arr.length);
-        arr.length = from < 0 ? arr.length + from : from;
-        return arr.push.apply(arr, rest);
-    };
-
-    obj.consoleAction = function(args, rights, sessionid, interactive) {
-        //sendConsoleText('task: ' + JSON.stringify(args), sessionid); // Debug
-
-        /*
-        if (typeof args['_'] == 'undefined') {
-          args['_'] = [];
-          args['_'][1] = args.pluginaction; // TODO
-          args['_'][2] = null;
-          args['_'][3] = null;
-          args['_'][4] = null;
-        }
-        */
-
-        var fnname = args['_'][0];
-        if (fnname == null) { return "Valid task commands are: trigger, cache, clear, clearCache, debug, list"; }
-
-        switch (fnname.toLowerCase()) {
-            case 'trigger': {
-                var jObj = {
-                    jobId: args.jobId,
-                    scriptId: args.scriptId,
-                    replaceVars: args.replaceVars,
-                    scriptHash: args.scriptHash,
-                    dispatchTime: args.dispatchTime
-                };
-                //dbg('jObj args is ' + JSON.stringify(jObj));
-                var sObj = getScriptFromCache(jObj.scriptId);
-                //dbg('sobj = ' + JSON.stringify(sObj) + ', shash = ' + jObj.scriptHash);
-                if ((sObj == null) || (sObj.contentHash != jObj.scriptHash)) {
-                    // get from the server, then run
-                    //dbg('Getting and caching script '+ jObj.scriptId);
-                    parent.SendCommand({ action: 'script-task', subaction: 'getScript', scriptId: jObj.scriptId, sessionid: sessionid, tag: 'console' });
-                    pendingDownload.push(jObj);
-                } else {
-                    // ready to run
-                    runScript(sObj, jObj, sessionid);
-                }
-                break;
-            }
-            case 'cache': {
-                var sObj = args.script;
-                cacheScript(sObj);
-                var setRun = [];
-                if (pendingDownload.length) {
-                    pendingDownload.forEach(function (pd, k) {
-                        if ((pd.scriptId == sObj._id) && (pd.scriptHash == sObj.contentHash)) {
-                            if (setRun.indexOf(pd) === -1) { runScript(sObj, pd, sessionid); setRun.push(pd); }
-                            removeFromArray(pendingDownload, k);
-                        }
-                    });
-                }
-                break;
-            }
-            case 'clear': {
-                clearCache();
-                parent.SendCommand({ action: 'script-task', subaction: 'clearAllPendingTasks', sessionid: sessionid, tag: 'console' });
-                return "Cache cleared. All pending tasks cleared.";
-            }
-            case 'clearcache': {
-                clearCache();
-                return "The script cache has been cleared";
-            }
-            case 'debug': {
-                debugFlag = (debugFlag) ? false : true;
-                var str = (debugFlag) ? 'on' : 'off';
-                return 'Debugging is now ' + str;
-            }
-            case 'list': {
-                var ret = '';
-                if (pendingDownload.length == 0) return "No tasks pending script download";
-                pendingDownload.forEach(function (pd, k) { ret += 'Task ' + k + ': ' + 'TaskID: ' + pd.jobId + ' ScriptID: ' + pd.scriptId + '\r\n'; });
-                return ret;
-            }
-            default: {
-                dbg('Unknown action: ' + fnname + ' with data ' + JSON.stringify(args));
-                break;
-            }
-        }
-    }
-
-    function finalizeJob(job, retVal, errVal, sessionid) {
-        if (errVal != null && errVal.stack != null) errVal = errVal.stack;
-        removeFromArray(runningJobs, runningJobs.indexOf(job.jobId));
-        if (typeof runningJobPIDs[job.jobId] != 'undefined') delete runningJobPIDs[job.jobId];
-        parent.SendCommand({
-            action: 'script-task',
-            subaction: 'taskComplete',
-            jobId: job.jobId,
-            scriptId: job.scriptId,
-            retVal: retVal,
-            errVal: errVal,
-            dispatchTime: job.dispatchTime, // include original run time (long running tasks could have tried a re-send)
-            sessionid: sessionid,
-            tag: 'console'
-        });
-    }
-
-    //@TODO Test powershell on *nix devices with and without powershell installed
-    function runPowerShell(sObj, jObj, sessionid) {
-        if (process.platform != 'win32') return runPowerShellNonWin(sObj, jObj);
-        const fs = require('fs');
-        var rand = Math.random().toString(32).replace('0.', '');
-
-        var oName = 'st' + rand + '.txt';
-        var pName = 'st' + rand + '.ps1';
-        var pwshout = '', pwsherr = '', cancontinue = false;
-        try {
-            fs.writeFileSync(pName, sObj.content);
-            var outstr = '', errstr = '';
-            var child = require('child_process').execFile(process.env['windir'] + '\\system32\\WindowsPowerShell\\v1.0\\powershell.exe', ['-NoLogo']);
-            child.stderr.on('data', function (chunk) { errstr += chunk; });
-            child.stdout.on('data', function (chunk) { });
-            runningJobPIDs[jObj.jobId] = child.pid;
-            child.stdin.write('.\\' + pName + ' | Out-File ' + oName + ' -Encoding UTF8\r\n');
-            child.on('exit', function (procRetVal, procRetSignal) {
-                dbg('Exiting with ' + procRetVal + ', Signal: ' + procRetSignal);
-                if (errstr != '') {
-                    finalizeJob(jObj, null, errstr, sessionid);
-                    try { fs.unlinkSync(oName); fs.unlinkSync(pName); } catch (ex) { dbg('Could not unlink files, error was: ' + ex); }
-                    return;
-                }
-                if (procRetVal == 1) {
-                    finalizeJob(jObj, null, 'Process terminated unexpectedly.', sessionid);
-                    try { fs.unlinkSync(oName); fs.unlinkSync(pName); } catch (ex) { dbg('Could not unlink files, error was: ' + ex); }
-                    return;
-                }
-                try { outstr = fs.readFileSync(oName, 'utf8').toString(); } catch (ex) { outstr = (procRetVal) ? 'Failure' : 'Success'; }
-                if (outstr) {
-                    //outstr = outstr.replace(/[^\x20-\x7E]/g, ''); 
-                    try { outstr = outstr.trim(); } catch (ex) { }
-                } else {
-                    outstr = (procRetVal) ? 'Failure' : 'Success';
-                }
-                dbg('Output is: ' + outstr);
-                finalizeJob(jObj, outstr, null, sessionid);
-                try { fs.unlinkSync(oName); fs.unlinkSync(pName); } catch (ex) { }
-            });
-            child.stdin.write('exit\r\n');
-            //child.waitExit(); // this was causing the event loop to stall on long-running scripts, switched to '.on exit'
-
-        } catch (ex) {
-            dbg('Error block was (PowerShell): ' + ex);
-            finalizeJob(jObj, null, ex, sessionid);
-        }
-    }
-
-    function runPowerShellNonWin(sObj, jObj, sessionid) {
-        const fs = require('fs');
-        var rand = Math.random().toString(32).replace('0.', '');
-
-        var path = '';
-        var pathTests = ['/usr/local/mesh', '/tmp', '/usr/local/mesh_services/meshagent', '/var/tmp'];
-        pathTests.forEach(function (p) { if (path == '' && fs.existsSync(p)) { path = p; } });
-        dbg('Path chosen is: ' + path);
-        path = path + '/';
-
-        var oName = 'st' + rand + '.txt';
-        var pName = 'st' + rand + '.ps1';
-        var pwshout = '', pwsherr = '', cancontinue = false;
-        try {
-            var childp = require('child_process').execFile('/bin/sh', ['sh']);
-            childp.stderr.on('data', function (chunk) { pwsherr += chunk; });
-            childp.stdout.on('data', function (chunk) { pwshout += chunk; });
-            childp.stdin.write('which pwsh' + '\n');
-            childp.stdin.write('exit\n');
-            childp.waitExit();
-        } catch (ex) { finalizeJob(jObj, null, "Couldn't determine pwsh in env: " + ex, sessionid); }
-        if (pwsherr != '') { finalizeJob(jObj, null, "PowerShell env determination error: " + pwsherr, sessionid); return; }
-        if (pwshout.trim() != '') { cancontinue = true; }
-        if (cancontinue === false) { finalizeJob(jObj, null, "PowerShell is not installed", sessionid); return; }
-        try {
-            fs.writeFileSync(path + pName, '#!' + pwshout + '\n' + sObj.content.split('\r\n').join('\n').split('\r').join('\n'));
-            var outstr = '', errstr = '';
-            var child = require('child_process').execFile('/bin/sh', ['sh']);
-            child.stderr.on('data', function (chunk) { errstr += chunk; });
-            child.stdout.on('data', function (chunk) { });
-            runningJobPIDs[jObj.jobId] = child.pid;
-
-            child.stdin.write('cd ' + path + '\n');
-            child.stdin.write('chmod a+x ' + pName + '\n');
-            child.stdin.write('./' + pName + ' > ' + oName + '\n');
-            child.on('exit', function (procRetVal, procRetSignal) {
-                if (errstr != '') {
-                    finalizeJob(jObj, null, errstr, sessionid);
-                    try {
-                        fs.unlinkSync(path + oName);
-                        fs.unlinkSync(path + pName);
-                    } catch (ex) { dbg('Could not unlink files, error was: ' + ex + ' for path ' + path); }
-                    return;
-                }
-                if (procRetVal == 1) {
-                    finalizeJob(jObj, null, 'Process terminated unexpectedly.', sessionid);
-                    try {
-                        fs.unlinkSync(path + oName);
-                        fs.unlinkSync(path + pName);
-                    } catch (ex) { dbg('Could not unlink files1, error was: ' + ex + ' for path ' + path); }
-                    return;
-                }
-                try { outstr = fs.readFileSync(path + oName, 'utf8').toString(); } catch (es) { outstr = (procRetVal) ? 'Failure' : 'Success'; }
-                if (outstr) {
-                    //outstr = outstr.replace(/[^\x20-\x7E]/g, ''); 
-                    try { outstr = outstr.trim(); } catch (ex) { }
-                } else {
-                    outstr = (procRetVal) ? 'Failure' : 'Success';
-                }
-                dbg('Output is: ' + outstr);
-                finalizeJob(jObj, outstr, null, sessionid);
-                try { fs.unlinkSync(path + oName); fs.unlinkSync(path + pName); } catch (ex) { dbg('Could not unlink files2, error was: ' + ex + ' for path ' + path); }
-            });
-            child.stdin.write('exit\n');
-        } catch (ex) {
-            dbg('Error block was (PowerShellNonWin): ' + ex);
-            finalizeJob(jObj, null, ex, sessionid);
-        }
-    }
-
-    function runBat(sObj, jObj, sessionid) {
-        if (process.platform != 'win32') { finalizeJob(jObj, null, "Platform not supported.", sessionid); return; }
-        const fs = require('fs');
-        var rand = Math.random().toString(32).replace('0.', '');
-        var oName = 'st' + rand + '.txt';
-        var pName = 'st' + rand + '.bat';
-        try {
-            fs.writeFileSync(pName, sObj.content);
-            var outstr = '', errstr = '';
-            var child = require('child_process').execFile(process.env['windir'] + '\\system32\\cmd.exe');
-            child.stderr.on('data', function (chunk) { errstr += chunk; });
-            child.stdout.on('data', function (chunk) { });
-            runningJobPIDs[jObj.jobId] = child.pid;
-            child.stdin.write(pName + ' > ' + oName + '\r\n');
-            child.stdin.write('exit\r\n');
-
-            child.on('exit', function (procRetVal, procRetSignal) {
-                if (errstr != '') {
-                    try { fs.unlinkSync(oName); fs.unlinkSync(pName); } catch (ex) { dbg('Could not unlink files, error was: ' + ex); }
-                    finalizeJob(jObj, null, errstr, sessionid);
-                    return;
-                }
-                if (procRetVal == 1) {
-                    try { fs.unlinkSync(oName); fs.unlinkSync(pName); } catch (ex) { dbg('Could not unlink files, error was: ' + ex); }
-                    finalizeJob(jObj, null, 'Process terminated unexpectedly.', sessionid);
-                    return;
-                }
-                try { outstr = fs.readFileSync(oName, 'utf8').toString(); } catch (ex) { outstr = (procRetVal) ? 'Failure' : 'Success'; }
-                if (outstr) {
-                    //outstr = outstr.replace(/[^\x20-\x7E]/g, ''); 
-                    try { outstr = outstr.trim(); } catch (ex) { }
-                } else {
-                    outstr = (procRetVal) ? 'Failure' : 'Success';
-                }
-                dbg('Output is: ' + outstr);
-                try { fs.unlinkSync(oName); fs.unlinkSync(pName); } catch (ex) { dbg('Could not unlink files, error was: ' + ex); }
-                finalizeJob(jObj, outstr, null, sessionid);
-            });
-        } catch (ex) {
-            dbg('Error block was (BAT): ' + ex);
-            finalizeJob(jObj, null, ex, sessionid);
-        }
-    }
-
-    function runBash(sObj, jObj, sessionid) {
-        if (process.platform == 'win32') { finalizeJob(jObj, null, "Platform not supported.", sessionid); return; }
-        //dbg('proc is ' + JSON.stringify(process));
-        const fs = require('fs');
-        var path = '';
-        var pathTests = ['/usr/local/mesh', '/tmp', '/usr/local/mesh_services/meshagent', '/var/tmp'];
-        pathTests.forEach(function (p) {
-            if (path == '' && fs.existsSync(p)) { path = p; }
-        });
-        dbg('Path chosen is: ' + path);
-        path = path + '/';
-        //var child = require('child_process');
-        //child.execFile(process.env['windir'] + '\\system32\\cmd.exe', ['/c', 'RunDll32.exe user32.dll,LockWorkStation'], { type: 1 });
-
-        var rand = Math.random().toString(32).replace('0.', '');
-        var oName = 'st' + rand + '.txt';
-        var pName = 'st' + rand + '.sh';
-        try {
-            fs.writeFileSync(path + pName, sObj.content);
-            var outstr = '', errstr = '';
-            var child = require('child_process').execFile('/bin/sh', ['sh']);
-            child.stderr.on('data', function (chunk) { errstr += chunk; });
-            child.stdout.on('data', function (chunk) { });
-            runningJobPIDs[jObj.jobId] = child.pid;
-            child.stdin.write('cd ' + path + '\n');
-            child.stdin.write('chmod a+x ' + pName + '\n');
-            child.stdin.write('./' + pName + ' > ' + oName + '\n');
-            child.stdin.write('exit\n');
-
-            child.on('exit', function (procRetVal, procRetSignal) {
-                if (errstr != '') {
-                    try { fs.unlinkSync(path + oName); fs.unlinkSync(path + pName); } catch (ex) { dbg('Could not unlink files, error was: ' + ex + ' for path ' + path); }
-                    finalizeJob(jObj, null, errstr, sessionid);
-                    return;
-                }
-                if (procRetVal == 1) {
-                    try { fs.unlinkSync(path + oName); fs.unlinkSync(path + pName); } catch (ex) { dbg('Could not unlink files1, error was: ' + ex + ' for path ' + path); }
-                    finalizeJob(jObj, null, "Process terminated unexpectedly.", sessionid);
-                    return;
-                }
-                try { outstr = fs.readFileSync(path + oName, 'utf8').toString(); } catch (ex) { outstr = (procRetVal) ? 'Failure' : 'Success'; }
-                if (outstr) {
-                    //outstr = outstr.replace(/[^\x20-\x7E]/g, ''); 
-                    try { outstr = outstr.trim(); } catch (ex) { }
-                } else {
-                    outstr = (procRetVal) ? 'Failure' : 'Success';
-                }
-                dbg('Output is: ' + outstr);
-                try { fs.unlinkSync(path + oName); fs.unlinkSync(path + pName); } catch (ex) { dbg('Could not unlink files2, error was: ' + ex + ' for path ' + path); }
-                finalizeJob(jObj, outstr, null, sessionid);
-            });
-        } catch (ex) {
-            dbg('Error block was (bash): ' + ex);
-            finalizeJob(jObj, null, ex, sessionid);
-        }
-    }
-
-    function jobIsRunning(jObj) {
-        if (runningJobs.indexOf(jObj.jobId) === -1) return false;
-        return true;
-    }
-
-    function runScript(sObj, jObj, sessionid) {
-        // get current processes and clean running jobs if they are no longer running (computer fell asleep, user caused process to stop, etc.)
-        if (process.platform != 'linux' && runningJobs.length) { // linux throws errors here in the meshagent for some reason
-            require('process-manager').getProcesses(function (plist) {
-                dbg('Got process list');
-                dbg('There are currently ' + runningJobs.length + ' running jobs.');
-                if (runningJobs.length) {
-                    runningJobs.forEach(function (jobId, idx) {
-                        dbg('Checking for running job: ' + jobId + ' with PID ' + runningJobPIDs[jobId]);
-                        if (typeof plist[runningJobPIDs[jobId]] == 'undefined' || typeof plist[runningJobPIDs[jobId]].cmd != 'string') {
-                            dbg('Found job with no process. Removing running status.');
-                            delete runningJobPIDs[jobId];
-                            removeFromArray(runningJobs, runningJobs.indexOf(idx));
-                            //dbg('RunningJobs: ' + JSON.stringify(runningJobs));
-                            //dbg('RunningJobsPIDs: ' + JSON.stringify(runningJobPIDs));
-                        }
-                    });
-                }
-            });
-        }
-        if (jobIsRunning(jObj)) { dbg('Job already running job id [' + jObj.jobId + ']. Skipping.'); return; }
-        if (jObj.replaceVars != null) {
-            Object.getOwnPropertyNames(jObj.replaceVars).forEach(function (key) {
-                var val = jObj.replaceVars[key];
-                sObj.content = sObj.content.replace(new RegExp('#' + key + '#', 'g'), val);
-                dbg('replacing var ' + key + ' with ' + val);
-            });
-            sObj.content = sObj.content.replace(new RegExp('#(.*?)#', 'g'), 'VAR_NOT_FOUND');
-        }
-        runningJobs.push(jObj.jobId);
-        dbg('Running Script ' + sObj._id);
-        switch (sObj.filetype) {
-            case 'ps1': runPowerShell(sObj, jObj, sessionid); break;
-            case 'bat': runBat(sObj, jObj, sessionid); break;
-            case 'bash': runBash(sObj, jObj, sessionid); break;
-            default: dbg('Unknown filetype: ' + sObj.filetype); break;
-        }
-    }
-
-    function getScriptFromCache(id) {
-        var script = db.Get('scriptTask_script_' + id);
-        if (script == '' || script == null) return null;
-        try { script = JSON.parse(script); } catch (ex) { return null; }
-        return script;
-    }
-
-    function cacheScript(sObj) {
-        db.Put('scriptTask_script_' + sObj._id, sObj);
-    }
-
-    function clearCache() {
-        db.Keys.forEach(function (k) { if (k.indexOf('scriptTask_script_') === 0) { db.Put(k, null); db.Delete(k); } });
-    }
-
-    function sendConsoleText(text, sessionid) {
-        if (typeof text == 'object') { text = JSON.stringify(text); }
-        parent.SendCommand({ action: 'msg', type: 'console', value: 'XXX: ' + text, sessionid: sessionid });
-    }
-    
-    return obj;
-}
-
-module.exports = { CreateScriptTask: CreateScriptTask };
\ No newline at end of file
diff --git a/public/tail.datetime/tail.datetime-default-blue.min.css b/public/tail.datetime/tail.datetime-default-blue.min.css
deleted file mode 100644
index 941a5aea..00000000
--- a/public/tail.datetime/tail.datetime-default-blue.min.css
+++ /dev/null
@@ -1,3 +0,0 @@
-@charset "UTF-8"; /* pytesNET/tail.DateTime v.0.4.14 */
-/* @author SamBrishes, pytesNET <sam@pytes.net> | @license MIT */
-.tail-datetime-calendar,.tail-datetime-calendar *,.tail-datetime-calendar :after,.tail-datetime-calendar :before{box-sizing:border-box;-webkit-box-sizing:border-box}.tail-datetime-calendar{top:0;left:0;width:275px;height:auto;margin:15px;padding:0;z-index:3000;display:block;position:absolute;visibility:hidden;direction:ltr;border-collapse:separate;font-family:"Open Sans",Calibri,Arial,sans-serif;background-color:#fff;border-width:0;border-style:solid;border-color:transparent;border-radius:3px;box-shadow:0 1px 3px rgba(0,0,0,.3125);-webkit-box-shadow:0 1px 3px rgba(0,0,0,.3125)}.tail-datetime-calendar:after{clear:both;content:"";display:block;font-size:0;visibility:hidden}.tail-datetime-calendar.calendar-static{top:auto;left:auto;margin-left:auto;margin-right:auto;position:static;visibility:visible}.tail-datetime-calendar button.calendar-close{top:100%;right:15px;color:#303438;width:35px;height:25px;margin:1px 0 0 0;padding:5px 10px;opacity:.5;outline:0;display:inline-block;position:absolute;font-size:14px;line-height:1.125em;text-shadow:none;background-color:#fff;background-image:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDEyIDE2Ij48cGF0aCBmaWxsPSIjMzAzNDM4IiBkPSJNNy40OCA4bDMuNzUgMy43NS0xLjQ4IDEuNDhMNiA5LjQ4bC0zLjc1IDMuNzUtMS40OC0xLjQ4TDQuNTIgOCAuNzcgNC4yNWwxLjQ4LTEuNDhMNiA2LjUybDMuNzUtMy43NSAxLjQ4IDEuNDhMNy40OCA4eiIvPjwvc3ZnPg==");background-repeat:no-repeat;background-position:center center;border-width:0;border-style:solid;border-color:transparent;border-radius:0 0 3px 3px;box-shadow:0 1px 3px rgba(0,0,0,.3125);-webkit-box-shadow:0 1px 3px rgba(0,0,0,.3125);transition:opacity 142ms linear;-webkit-transition:opacity 142ms linear}.tail-datetime-calendar button.calendar-close:hover{opacity:1}.tail-datetime-calendar .calendar-tooltip{color:#fff;width:auto;margin:0;padding:0;display:block;position:absolute;background-color:#202428;border-radius:3px}.tail-datetime-calendar .calendar-tooltip:before{top:-7px;left:50%;width:0;height:0;margin:0 0 0 -6px;content:"";display:block;position:absolute;border-width:0 7px 7px 7px;border-style:solid;border-color:transparent transparent #202428 transparent}.tail-datetime-calendar .calendar-tooltip .tooltip-inner{width:auto;margin:0;padding:4px 7px;display:block;font-size:12px;line-height:14px}.tail-datetime-calendar .calendar-actions{color:#fff;width:100%;height:36px;margin:0;padding:0;display:table;overflow:hidden;border-spacing:0;border-collapse:separate;background-color:#149be6;border-width:0;border-style:solid;border-color:transparent;border-radius:3px 3px 0 0}.tail-datetime-calendar .calendar-actions span{margin:0;padding:0;display:table-cell;position:relative;text-align:center;line-height:36px;text-shadow:-1px -1px 0 #0e6ca0;background-repeat:no-repeat;background-position:center center}.tail-datetime-calendar .calendar-actions span[data-action]{cursor:pointer}.tail-datetime-calendar .calendar-actions span.action{width:36px;font-size:22px}.tail-datetime-calendar .calendar-actions span.label{width:auto}.tail-datetime-calendar .calendar-actions span:first-child:before,.tail-datetime-calendar .calendar-actions span:last-child:before{top:5px;bottom:5px;width:1px;height:auto;margin:0;padding:0;content:"";display:inline-block;position:absolute;background-color:#107bb7}.tail-datetime-calendar .calendar-actions span:first-child:before{right:-1px}.tail-datetime-calendar .calendar-actions span:last-child:before{left:-1px}.tail-datetime-calendar .calendar-actions span:first-child:hover:before,.tail-datetime-calendar .calendar-actions span:last-child:hover:before{display:none}.tail-datetime-calendar .calendar-actions span[data-action]:hover{background-color:#107bb7}.tail-datetime-calendar .calendar-actions span.action-prev{background-image:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2IiBoZWlnaHQ9IjE2IiB2aWV3Qm94PSIwIDAgNiAxNiI+PHBhdGggZmlsbD0iI2ZmZmZmZiIgZD0iTTYgMkwwIDhsNiA2VjJ6Ii8+PC9zdmc+")}.tail-datetime-calendar .calendar-actions span.action-next{background-image:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2IiBoZWlnaHQ9IjE2IiB2aWV3Qm94PSIwIDAgNiAxNiI+PHBhdGggZmlsbD0iI2ZmZmZmZiIgZD0iTTAgMTRsNi02LTYtNnYxMnoiLz48L3N2Zz4=")}.tail-datetime-calendar .calendar-actions span.action-submit{background-image:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDEyIDE2Ij48cGF0aCBmaWxsPSIjZmZmZmZmIiBkPSJNMTIgNWwtOCA4LTQtNCAxLjUtMS41TDQgMTBsNi41LTYuNUwxMiA1eiIvPjwvc3ZnPg==")}.tail-datetime-calendar .calendar-actions span.action-cancel{background-image:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDEyIDE2Ij48cGF0aCBmaWxsPSIjZmZmZmZmIiBkPSJNNy40OCA4bDMuNzUgMy43NS0xLjQ4IDEuNDhMNiA5LjQ4bC0zLjc1IDMuNzUtMS40OC0xLjQ4TDQuNTIgOCAuNzcgNC4yNWwxLjQ4LTEuNDhMNiA2LjUybDMuNzUtMy43NSAxLjQ4IDEuNDhMNy40OCA4eiIvPjwvc3ZnPg==")}.tail-datetime-calendar .calendar-datepicker{width:100%;margin:0;padding:0;display:block;position:relative}.tail-datetime-calendar .calendar-datepicker table{width:100%;margin:0;padding:0;border-spacing:0;border-collapse:separate}.tail-datetime-calendar .calendar-datepicker table tr td,.tail-datetime-calendar .calendar-datepicker table tr th{color:#303438;height:30px;padding:0;position:relative;font-size:13px;text-align:center;font-weight:400;text-shadow:none;line-height:30px;background-color:transparent;border-width:0;border-style:solid;border-color:transparent;border-radius:0}.tail-datetime-calendar .calendar-datepicker table tr th{color:#fff;background-color:#303438}.tail-datetime-calendar .calendar-datepicker table tr td{cursor:pointer}.tail-datetime-calendar .calendar-datepicker table tr td span.inner{margin:0;padding:0;display:inline-block}.tail-datetime-calendar .calendar-datepicker table tr td.date-disabled{cursor:not-allowed;color:#909498;background-color:#f0f0f0}.tail-datetime-calendar .calendar-datepicker table tr td.date-disabled:after{left:3px;bottom:3px;width:35px;height:1px;margin:0;padding:0;content:"";display:inline-block;position:absolute;background-color:#bfbfbf;transform-origin:2px -5px;transform:rotate(-45deg);-moz-transform:rotate(-45deg);-webkit-transform:rotate(-45deg)}.tail-datetime-calendar .calendar-datepicker table tr td.date-next,.tail-datetime-calendar .calendar-datepicker table tr td.date-previous{color:#909498;background-color:#f0f0f0}.tail-datetime-calendar .calendar-datepicker table tr td .tooltip-tick,.tail-datetime-calendar .calendar-datepicker table tr td.date-today:before{top:5px;width:5px;height:5px;margin:0;padding:0;z-index:20;content:"";display:inline-block;position:absolute;border-width:0;border-style:solid;border-color:transparent;border-radius:50%}.tail-datetime-calendar .calendar-datepicker table tr td.date-today:before{left:5px;background-color:#32b93c}.tail-datetime-calendar .calendar-datepicker table tr td .tooltip-tick{right:5px;background-color:#202428}.tail-datetime-calendar .calendar-datepicker table tr td .tooltip-tick:after,.tail-datetime-calendar .calendar-datepicker table tr td .tooltip-tick:before{display:none}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-day,.tail-datetime-calendar .calendar-datepicker table tr th.calendar-week{width:14.28571429%;height:35px}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-day span.inner,.tail-datetime-calendar .calendar-datepicker table tr th.calendar-week span.inner{width:31px;height:31px;line-height:29px;border-width:1px;border-style:solid;border-color:transparent;border-radius:50%}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-day:hover span.inner,.tail-datetime-calendar .calendar-datepicker table tr th.calendar-week:hover span.inner{border-color:#ccc}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-day.date-disabled span.inner,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-day.date-disabled:hover span.inner,.tail-datetime-calendar .calendar-datepicker table tr th.calendar-week.date-disabled span.inner,.tail-datetime-calendar .calendar-datepicker table tr th.calendar-week.date-disabled:hover span.inner{border-color:transparent}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-day.date-select span.inner,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-day.date-select:hover span.inner,.tail-datetime-calendar .calendar-datepicker table tr th.calendar-week.date-select span.inner,.tail-datetime-calendar .calendar-datepicker table tr th.calendar-week.date-select:hover span.inner{color:#32b93c;border-color:#32b93c}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-month,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year{width:33.33333333%;height:40px;transition:color 142ms linear;-webkit-transition:color 142ms linear}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade.date-today:before,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-month.date-today:before,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year.date-today:before{left:50%;margin-left:-2.5px}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade span.inner,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-month span.inner,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year span.inner{width:auto;height:31px;line-height:29px}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade span.inner:after,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade span.inner:before,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-month span.inner:after,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-month span.inner:before,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year span.inner:after,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year span.inner:before{width:20px;height:20px;content:"";z-index:15;display:inline-block;position:absolute;border-width:1px;border-style:solid;border-color:transparent;transition:all 142ms linear;-webkit-transition:all 142ms linear}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade span.inner:before,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-month span.inner:before,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year span.inner:before{top:0;left:0}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade:hover span.inner:before,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-month:hover span.inner:before,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year:hover span.inner:before{top:6px;left:6px;border-top-color:#ccc;border-left-color:#ccc}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade span.inner:after,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-month span.inner:after,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year span.inner:after{right:0;bottom:0}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade:hover span.inner:after,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-month:hover span.inner:after,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year:hover span.inner:after{right:6px;bottom:6px;border-right-color:#ccc;border-bottom-color:#ccc}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade,.tail-datetime-calendar .calendar-datepicker table tr td.calendar-year{width:25%}.tail-datetime-calendar .calendar-datepicker table tr td.calendar-decade span.inner{height:54px;padding:7px 15px;text-align:left;line-height:20px}.tail-datetime-calendar .calendar-timepicker{width:100%;margin:0;padding:0;display:block;text-align:center;border-width:1px 0 0 0;border-style:solid;border-color:#d9d9d9}.tail-datetime-calendar .calendar-timepicker .timepicker-field{width:28%;margin:0;padding:15px 0 7px 0;display:inline-block;position:relative;text-align:center}.tail-datetime-calendar .calendar-timepicker .timepicker-field:first-of-type{text-align:right}.tail-datetime-calendar .calendar-timepicker .timepicker-field:last-of-type{text-align:left}.tail-datetime-calendar .calendar-timepicker .timepicker-field input[type=text]{color:#303438;width:100%;height:29px;margin:0;z-index:4;padding:3px 20px 3px 5px;outline:0;display:inline-block;position:relative;font-size:12px;text-align:center;line-height:23px;appearance:textfield;-moz-appearance:textfield;-webkit-appearance:textfield;background-color:#f0f0f0;border-width:0;border-style:solid;border-color:transparent;border-radius:3px;box-shadow:none;-webkit-box-shadow:none;transition:color 142ms linear,border 142ms linear,background 142ms linear;-webkit-transition:color 142ms linear,border 142ms linear,background 142ms linear}.tail-datetime-calendar .calendar-timepicker .timepicker-field input[type=text]:hover{color:#303438;background-color:#e0e0e0}.tail-datetime-calendar .calendar-timepicker .timepicker-field input[type=text]:focus{color:#fff;background-color:#32b93c}.tail-datetime-calendar .calendar-timepicker .timepicker-field input[type=text]:disabled{cursor:not-allowed;color:#a0a4a8;background-color:#f6f6f6}.tail-datetime-calendar .calendar-timepicker .timepicker-field button.picker-step{width:20px;height:15px;right:0;margin:0;padding:0;z-index:15;display:inline-block;position:absolute;background-color:#f0f0f0;box-shadow:none;-webkit-box-shadow:none;transition:border 142ms linear,background 142ms linear;-webkit-transition:border 142ms linear,background 142ms linear}.tail-datetime-calendar .calendar-timepicker .timepicker-field button.picker-step:before{top:4px;left:50%;width:0;height:0;margin:0 0 0 -4px;padding:0;content:"";display:inline-block;position:absolute;transition:border 142ms linear;-webkit-transition:border 142ms linear}.tail-datetime-calendar .calendar-timepicker .timepicker-field button.picker-step.step-up{top:15px;border-width:0 0 1px 1px;border-style:solid;border-color:#fff;border-radius:0 2px 0 0}.tail-datetime-calendar .calendar-timepicker .timepicker-field button.picker-step.step-up:hover{background-color:#e0e0e0}.tail-datetime-calendar .calendar-timepicker .timepicker-field button.picker-step.step-up:before{border-width:0 4px 5px 4px;border-style:solid;border-color:transparent transparent #303438 transparent}.tail-datetime-calendar .calendar-timepicker .timepicker-field button.picker-step.step-down{top:29px;border-width:1px 0 0 1px;border-style:solid;border-color:#fff;border-radius:0 0 2px 0}.tail-datetime-calendar .calendar-timepicker .timepicker-field button.picker-step.step-down:hover{background-color:#e0e0e0}.tail-datetime-calendar .calendar-timepicker .timepicker-field button.picker-step.step-down:before{border-width:5px 4px 0 4px;border-style:solid;border-color:#303438 transparent transparent transparent}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:focus+button.step-up{border-color:rgba(255,255,255,.8);background-color:#32b93c}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:focus+button.step-up:hover{background-color:#27912f}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:focus+button.step-up:before{border-bottom-color:#fff}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:focus+button+button.step-down{border-color:rgba(255,255,255,.8);background-color:#32b93c}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:focus+button+button.step-down:hover{background-color:#27912f}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:focus+button+button.step-down:before{border-top-color:#fff}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:disabled+button.step-up{cursor:not-allowed;border-color:rgba(255,255,255,.8);background-color:#f6f6f6}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:disabled+button.step-up:hover{background-color:#f6f6f6}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:disabled+button.step-up:before{border-bottom-color:#a0a4a8}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:disabled+button+button.step-down{cursor:not-allowed;border-color:rgba(255,255,255,.8);background-color:#f6f6f6}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:disabled+button+button.step-down:hover{background-color:#f6f6f6}.tail-datetime-calendar .calendar-timepicker .timepicker-field input:disabled+button+button.step-down:before{border-top-color:#a0a4a8}.tail-datetime-calendar .calendar-timepicker .timepicker-field label{color:#303438;margin:0;padding:0;display:block;font-size:12px;text-align:center}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch{cursor:pointer;margin:15px 0 -5px 0;display:block;text-align:center;vertical-align:top}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch:after,.tail-datetime-calendar .calendar-timepicker label.timepicker-switch:before{width:auto;margin:0;padding:0 5px;font-size:12px;line-height:16px;vertical-align:top}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch:before{content:attr(data-am)}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch:after{content:attr(data-pm)}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch input[type=checkbox]{display:none}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch input[type=checkbox]+span{display:inline-block;position:relative;vertical-align:top}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch input[type=checkbox]+span:before{width:50px;height:16px;content:"";display:inline-block;vertical-align:top;border-width:1px;border-style:solid;border-color:#149be6;border-radius:14px;transition:border 284ms linear;-webkit-transition:border 284ms linear}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch input[type=checkbox]+span:after{top:3px;left:4px;right:30px;width:auto;height:10px;margin:0;padding:0;content:"";display:inline-block;position:absolute;background-color:#149be6;border-radius:15px;vertical-align:top;transition:left 284ms linear,right 284ms linear 284ms,background 284ms linear;-webkit-transition:left 284ms linear,right 284ms linear 284ms,background 284ms linear}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch input[type=checkbox]:checked+span:before{border-color:#32b93c}.tail-datetime-calendar .calendar-timepicker label.timepicker-switch input[type=checkbox]:checked+span:after{left:30px;right:4px;background-color:#32b93c;transition:right 284ms linear,left 284ms linear 284ms,background 284ms linear;-webkit-transition:right 284ms linear,left 284ms linear 284ms,background 284ms linear}.tail-datetime-calendar .calendar-actions+.calendar-timepicker{border-width:0}.tail-datetime-calendar.rtl{direction:rtl}.tail-datetime-calendar.rtl .calendar-actions span.action-next,.tail-datetime-calendar.rtl .calendar-actions span.action-prev{transform:rotate(180deg);-moz-transform:rotate(180deg);-webkit-transform:rotate(180deg)}.tail-datetime-calendar.rtl .calendar-datepicker table tr td.date-disabled:after{right:3px;transform:rotate(45deg);-moz-transform:rotate(45deg);-webkit-transform:rotate(45deg)}.tail-datetime-calendar.rtl .calendar-datepicker table tr td.date-today:before{right:5px}.tail-datetime-calendar.rtl .calendar-datepicker table tr td .tooltip-tick{left:5px}.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-decade.date-today:before,.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-month.date-today:before,.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-year.date-today:before{right:50%;margin-right:-2.5px}.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-decade:hover span.inner:before,.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-month:hover span.inner:before,.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-year:hover span.inner:before{right:6px;border-right-color:#ccc}.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-decade span.inner:after,.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-month span.inner:after,.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-year span.inner:after{left:0}.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-decade:hover span.inner:after,.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-month:hover span.inner:after,.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-year:hover span.inner:after{left:6px;border-left-color:#ccc}.tail-datetime-calendar.rtl .calendar-datepicker table tr td.calendar-decade span.inner{text-align:right}.tail-datetime-calendar.rtl .calendar-timepicker .timepicker-field:first-child{text-align:left;padding-left:0;padding-right:25px}.tail-datetime-calendar.rtl .calendar-timepicker .timepicker-field:last-child{text-align:right;padding-left:25px;padding-right:0}.tail-datetime-calendar.rtl .calendar-timepicker .timepicker-field:first-child input[type=text]{margin-left:-1px;margin-right:0;border-radius:0 3px 3px 0}.tail-datetime-calendar.rtl .calendar-timepicker .timepicker-field:last-child input[type=text]{margin-left:0;margin-right:-1px;border-radius:3px 0 0 3px}
\ No newline at end of file
diff --git a/public/tail.datetime/tail.datetime-default-blue.min.map b/public/tail.datetime/tail.datetime-default-blue.min.map
deleted file mode 100644
index aa615d22..00000000
--- a/public/tail.datetime/tail.datetime-default-blue.min.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["$stdin"],"names":[],"mappings":"AACA,wBACA,0BAEA,+BADA,gCAEE,WAAY,WACZ,mBAAoB,WAEtB,wBACE,IAAK,EACL,KAAM,EACN,MAAO,MACP,OAAQ,KACR,OAAQ,KACR,QAAS,EACT,QAAS,KACT,QAAS,MACT,SAAU,SACV,WAAY,OACZ,UAAW,IACX,gBAAiB,SACjB,YAAa,WAAW,CAAE,OAAO,CAAE,KAAK,CAAE,WAC1C,iBAAkB,KAClB,aAAc,EACd,aAAc,MACd,aAAc,YACd,cAAe,IACf,WAAY,EAAE,IAAI,IAAI,kBACtB,mBAAoB,EAAE,IAAI,IAAI,kBAEhC,8BACE,MAAO,KACP,QAAS,GACT,QAAS,MACT,UAAW,EACX,WAAY,OAEd,wCACE,IAAK,KACL,KAAM,KACN,YAAa,KACb,aAAc,KACd,SAAU,OACV,WAAY,QAEd,8CACE,IAAK,KACL,MAAO,KACP,MAAO,QACP,MAAO,KACP,OAAQ,KACR,OAAQ,IAAI,EAAE,EAAE,EAChB,QAAS,IAAI,KACb,QAAS,GACT,QAAS,EACT,QAAS,aACT,SAAU,SACV,UAAW,KACX,YAAa,QACb,YAAa,KACb,iBAAkB,KAClB,iBAAkB,kXAIlB,kBAAmB,UACnB,oBAAqB,OAAO,OAC5B,aAAc,EACd,aAAc,MACd,aAAc,YACd,cAAe,EAAE,EAAE,IAAI,IACvB,WAAY,EAAE,IAAI,IAAI,kBACtB,mBAAoB,EAAE,IAAI,IAAI,kBAC9B,WAAY,QAAQ,MAAM,OAC1B,mBAAoB,QAAQ,MAAM,OAEpC,oDACE,QAAS,EAIX,0CACE,MAAO,KACP,MAAO,KACP,OAAQ,EACR,QAAS,EACT,QAAS,MACT,SAAU,SACV,iBAAkB,QAClB,cAAe,IAEjB,iDACE,IAAK,KACL,KAAM,IACN,MAAO,EACP,OAAQ,EACR,OAAQ,EAAE,EAAE,EAAE,KACd,QAAS,GACT,QAAS,MACT,SAAU,SACV,aAAc,EAAE,IAAI,IAAI,IACxB,aAAc,MACd,aAAc,YAAY,YAAY,QAAQ,YAEhD,yDACE,MAAO,KACP,OAAQ,EACR,QAAS,IAAI,IACb,QAAS,MACT,UAAW,KACX,YAAa,KAIf,0CACE,MAAO,KACP,MAAO,KACP,OAAQ,KACR,OAAQ,EACR,QAAS,EACT,QAAS,MACT,SAAU,OACV,eAAgB,EAChB,gBAAiB,SACjB,iBAAkB,QAClB,aAAc,EACd,aAAc,MACd,aAAc,YACd,cAAe,IAAI,IAAI,EAAE,EAE3B,+CACE,OAAQ,EACR,QAAS,EACT,QAAS,WACT,SAAU,SACV,WAAY,OACZ,YAAa,KACb,YAAa,KAAK,KAAK,EAAE,QACzB,kBAAmB,UACnB,oBAAqB,OAAO,OAE9B,4DACE,OAAQ,QAEV,sDACE,MAAO,KACP,UAAW,KAEb,qDACE,MAAO,KAET,kEACA,iEACE,IAAK,IACL,OAAQ,IACR,MAAO,IACP,OAAQ,KACR,OAAQ,EACR,QAAS,EACT,QAAS,GACT,QAAS,aACT,SAAU,SACV,iBAAkB,QAEpB,kEACE,MAAO,KAET,iEACE,KAAM,KAER,wEACA,uEACE,QAAS,KAEX,kEACE,iBAAkB,QAEpB,2DACE,iBAAkB,8NAIpB,2DACE,iBAAkB,kOAIpB,6DACE,iBAAkB,sQAIpB,6DACE,iBAAkB,kXAOpB,6CACE,MAAO,KACP,OAAQ,EACR,QAAS,EACT,QAAS,MACT,SAAU,SAEZ,mDACE,MAAO,KACP,OAAQ,EACR,QAAS,EACT,eAAgB,EAChB,gBAAiB,SAGnB,yDADA,yDAEE,MAAO,QACP,OAAQ,KACR,QAAS,EACT,SAAU,SACV,UAAW,KACX,WAAY,OACZ,YAAa,IACb,YAAa,KACb,YAAa,KACb,iBAAkB,YAClB,aAAc,EACd,aAAc,MACd,aAAc,YACd,cAAe,EAEjB,yDACE,MAAO,KACP,iBAAkB,QAEpB,yDACE,OAAQ,QAEV,oEACE,OAAQ,EACR,QAAS,EACT,QAAS,aAEX,uEACE,OAAQ,YACR,MAAO,QACP,iBAAkB,QAEpB,6EACE,KAAM,IACN,OAAQ,IACR,MAAO,KACP,OAAQ,IACR,OAAQ,EACR,QAAS,EACT,QAAS,GACT,QAAS,aACT,SAAU,SACV,iBAAkB,QAClB,iBAAkB,IAAI,KACtB,UAAW,eACX,eAAgB,eAChB,kBAAmB,eAGrB,mEADA,uEAEE,MAAO,QACP,iBAAkB,QAGpB,uEADA,2EAEE,IAAK,IACL,MAAO,IACP,OAAQ,IACR,OAAQ,EACR,QAAS,EACT,QAAS,GACT,QAAS,GACT,QAAS,aACT,SAAU,SACV,aAAc,EACd,aAAc,MACd,aAAc,YACd,cAAe,IAEjB,2EACE,KAAM,IACN,iBAAkB,QAEpB,uEACE,MAAO,IACP,iBAAkB,QAGpB,6EADA,8EAEE,QAAS,KAGX,sEADA,uEAEE,MAAO,aACP,OAAQ,KAGV,iFADA,kFAEE,MAAO,KACP,OAAQ,KACR,YAAa,KACb,aAAc,IACd,aAAc,MACd,aAAc,YACd,cAAe,IAGjB,uFADA,wFAEE,aAAc,KAGhB,+FAEA,qGAHA,gGAEA,sGAEE,aAAc,YAGhB,6FAEA,mGAHA,8FAEA,oGAEE,MAAO,QACP,aAAc,QAIhB,yEAFA,wEACA,uEAEE,MAAO,aACP,OAAQ,KACR,WAAY,MAAM,MAAM,OACxB,mBAAoB,MAAM,MAAM,OAIlC,2FAFA,0FACA,yFAEE,KAAM,IACN,YAAa,OAIf,oFAFA,mFACA,kFAEE,MAAO,KACP,OAAQ,KACR,YAAa,KAOf,0FAHA,2FACA,yFAHA,0FAIA,wFAHA,yFAKE,MAAO,KACP,OAAQ,KACR,QAAS,GACT,QAAS,GACT,QAAS,aACT,SAAU,SACV,aAAc,IACd,aAAc,MACd,aAAc,YACd,WAAY,IAAI,MAAM,OACtB,mBAAoB,IAAI,MAAM,OAIhC,2FAFA,0FACA,yFAEE,IAAK,EACL,KAAM,EAIR,iGAFA,gGACA,+FAEE,IAAK,IACL,KAAM,IACN,iBAAkB,KAClB,kBAAmB,KAIrB,0FAFA,yFACA,wFAEE,MAAO,EACP,OAAQ,EAIV,gGAFA,+FACA,8FAEE,MAAO,IACP,OAAQ,IACR,mBAAoB,KACpB,oBAAqB,KAGvB,yEADA,uEAEE,MAAO,IAET,oFACE,OAAQ,KACR,QAAS,IAAI,KACb,WAAY,KACZ,YAAa,KAIf,6CACE,MAAO,KACP,OAAQ,EACR,QAAS,EACT,QAAS,MACT,WAAY,OACZ,aAAc,IAAI,EAAE,EAAE,EACtB,aAAc,MACd,aAAc,QAEhB,+DACE,MAAO,IACP,OAAQ,EACR,QAAS,KAAK,EAAE,IAAI,EACpB,QAAS,aACT,SAAU,SACV,WAAY,OAEd,6EACE,WAAY,MAEd,4EACE,WAAY,KAEd,gFACE,MAAO,QACP,MAAO,KACP,OAAQ,KACR,OAAQ,EACR,QAAS,EACT,QAAS,IAAI,KAAK,IAAI,IACtB,QAAS,EACT,QAAS,aACT,SAAU,SACV,UAAW,KACX,WAAY,OACZ,YAAa,KACb,WAAY,UACZ,gBAAiB,UACjB,mBAAoB,UACpB,iBAAkB,QAClB,aAAc,EACd,aAAc,MACd,aAAc,YACd,cAAe,IACf,WAAY,KACZ,mBAAoB,KACpB,WAAY,MAAM,MAAM,MAAM,CAAE,OAAO,MAAM,MAAM,CAAE,WAAW,MAAM,OACtE,mBAAoB,MAAM,MAAM,MAAM,CAAE,OAAO,MAAM,MAAM,CAAE,WAAW,MAAM,OAEhF,sFACE,MAAO,QACP,iBAAkB,QAEpB,sFACE,MAAO,KACP,iBAAkB,QAEpB,yFACE,OAAQ,YACR,MAAO,QACP,iBAAkB,QAEpB,kFACE,MAAO,KACP,OAAQ,KACR,MAAO,EACP,OAAQ,EACR,QAAS,EACT,QAAS,GACT,QAAS,aACT,SAAU,SACV,iBAAkB,QAClB,WAAY,KACZ,mBAAoB,KACpB,WAAY,OAAO,MAAM,MAAM,CAAE,WAAW,MAAM,OAClD,mBAAoB,OAAO,MAAM,MAAM,CAAE,WAAW,MAAM,OAE5D,yFACE,IAAK,IACL,KAAM,IACN,MAAO,EACP,OAAQ,EACR,OAAQ,EAAE,EAAE,EAAE,KACd,QAAS,EACT,QAAS,GACT,QAAS,aACT,SAAU,SACV,WAAY,OAAO,MAAM,OACzB,mBAAoB,OAAO,MAAM,OAEnC,0FACE,IAAK,KACL,aAAc,EAAE,EAAE,IAAI,IACtB,aAAc,MACd,aAAc,KACd,cAAe,EAAE,IAAI,EAAE,EAEzB,gGACE,iBAAkB,QAEpB,iGACE,aAAc,EAAE,IAAI,IAAI,IACxB,aAAc,MACd,aAAc,YAAY,YAAY,QAAQ,YAEhD,4FACE,IAAK,KACL,aAAc,IAAI,EAAE,EAAE,IACtB,aAAc,MACd,aAAc,KACd,cAAe,EAAE,EAAE,IAAI,EAEzB,kGACE,iBAAkB,QAEpB,mGACE,aAAc,IAAI,IAAI,EAAE,IACxB,aAAc,MACd,aAAc,QAAQ,YAAY,YAAY,YAEhD,0FACE,aAAc,qBACd,iBAAkB,QAEpB,gGACE,iBAAkB,QAEpB,iGACE,oBAAqB,KAEvB,mGACE,aAAc,qBACd,iBAAkB,QAEpB,yGACE,iBAAkB,QAEpB,0GACE,iBAAkB,KAEpB,6FACE,OAAQ,YACR,aAAc,qBACd,iBAAkB,QAEpB,mGACE,iBAAkB,QAEpB,oGACE,oBAAqB,QAEvB,sGACE,OAAQ,YACR,aAAc,qBACd,iBAAkB,QAEpB,4GACE,iBAAkB,QAEpB,6GACE,iBAAkB,QAEpB,qEACE,MAAO,QACP,OAAQ,EACR,QAAS,EACT,QAAS,MACT,UAAW,KACX,WAAY,OAEd,qEACE,OAAQ,QACR,OAAQ,KAAK,EAAE,KAAK,EACpB,QAAS,MACT,WAAY,OACZ,eAAgB,IAGlB,2EADA,4EAEE,MAAO,KACP,OAAQ,EACR,QAAS,EAAE,IACX,UAAW,KACX,YAAa,KACb,eAAgB,IAElB,4EACE,QAAS,cAEX,2EACE,QAAS,cAEX,0FACE,QAAS,KAEX,+FACE,QAAS,aACT,SAAU,SACV,eAAgB,IAElB,sGACE,MAAO,KACP,OAAQ,KACR,QAAS,GACT,QAAS,aACT,eAAgB,IAChB,aAAc,IACd,aAAc,MACd,aAAc,QACd,cAAe,KACf,WAAY,OAAO,MAAM,OACzB,mBAAoB,OAAO,MAAM,OAEnC,qGACE,IAAK,IACL,KAAM,IACN,MAAO,KACP,MAAO,KACP,OAAQ,KACR,OAAQ,EACR,QAAS,EACT,QAAS,GACT,QAAS,aACT,SAAU,SACV,iBAAkB,QAClB,cAAe,KACf,eAAgB,IAChB,WAAY,KAAK,MAAM,MAAM,CAAE,MAAM,MAAM,OAAO,KAAK,CAAE,WAAW,MAAM,OAC1E,mBAAoB,KAAK,MAAM,MAAM,CAAE,MAAM,MAAM,OAAO,KAAK,CAAE,WAAW,MAAM,OAEpF,8GACE,aAAc,QAEhB,6GACE,KAAM,KACN,MAAO,IACP,iBAAkB,QAClB,WAAY,MAAM,MAAM,MAAM,CAAE,KAAK,MAAM,OAAO,KAAK,CAAE,WAAW,MAAM,OAC1E,mBAAoB,MAAM,MAAM,MAAM,CAAE,KAAK,MAAM,OAAO,KAAK,CAAE,WAAW,MAAM,OAEpF,+DACE,aAAc,EAIhB,4BACE,UAAW,IAEb,+DACA,+DACE,UAAW,eACX,eAAgB,eAChB,kBAAmB,eAErB,iFACE,MAAO,IACP,UAAW,cACX,eAAgB,cAChB,kBAAmB,cAErB,+EACE,MAAO,IAET,2EACE,KAAM,IAIR,+FAFA,8FACA,6FAEE,MAAO,IACP,aAAc,OAIhB,qGAFA,oGACA,mGAEE,MAAO,IACP,mBAAoB,KAItB,8FAFA,6FACA,4FAEE,KAAM,EAIR,oGAFA,mGACA,kGAEE,KAAM,IACN,kBAAmB,KAErB,wFACE,WAAY,MAEd,+EACE,WAAY,KACZ,aAAc,EACd,cAAe,KAEjB,8EACE,WAAY,MACZ,aAAc,KACd,cAAe,EAEjB,gGACE,YAAa,KACb,aAAc,EACd,cAAe,EAAE,IAAI,IAAI,EAE3B,+FACE,YAAa,EACb,aAAc,KACd,cAAe,IAAI,EAAE,EAAE"}
\ No newline at end of file
diff --git a/public/tail.datetime/tail.datetime.min.js b/public/tail.datetime/tail.datetime.min.js
deleted file mode 100644
index 5225baa5..00000000
--- a/public/tail.datetime/tail.datetime.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* pytesNET/tail.DateTime v.0.4.14 | Basic Version | @author SamBrishes, pytesNET <sam@pytes.net> | @license MIT */
-!function(t,e){"function"==typeof define&&define.amd?define(function(){return e(t,t.document)}):"object"==typeof module&&module.exports?module.exports=e(t,t.document):(void 0===t.tail&&(t.tail={}),t.tail.DateTime=t.tail.datetime=e(t,t.document),"undefined"!=typeof jQuery&&(jQuery.fn.DateTime=jQuery.fn.datetime=function(t){var e,i=[];return this.each(function(){!1!==(e=tail.DateTime(this,t))&&i.push(e)}),1===i.length?i[0]:0!==i.length&&i}),"undefined"!=typeof MooTools&&(Element.implement({DateTime:function(t){return new tail.DateTime(this,t)}}),Element.implement({datetime:function(t){return new tail.DateTime(this,t)}})))}(window,function(h,d){"use strict";function u(t,e){return!!(t&&"classList"in t)&&t.classList.contains(e)}function a(t,e){return t&&"classList"in t?t.classList.add(e):void 0}function n(t,e){return t&&"classList"in t?t.classList.remove(e):void 0}function s(t,e,i){if(CustomEvent&&CustomEvent.name)var a=new CustomEvent(e,i);else(a=d.createEvent("CustomEvent")).initCustomEvent(e,!!i.bubbles,!!i.cancelable,i.detail);return t.dispatchEvent(a)}function o(t,e){if("function"==typeof Object.assign)return Object.assign({},t,e||{});var i=Object.constructor();for(var a in t)i[a]=a in e?e[a]:t[a];return i}function p(t,e){var i=d.createElement(t);return i.className=e&&e.join?e.join(" "):e||"",i}function r(t){return t.charAt(0).toUpperCase()+t.slice(1)}function c(t,e,i){var a=t instanceof Date?t:!!t&&new Date(t);return a instanceof Date&&!isNaN(a.getDate())&&(i&&a.setHours(0,0,0,0),!0===e?a.getTime():a)}d.forms.inputmode=!0;var l=function(t,e){if((t="string"==typeof t?d.querySelectorAll(t):t)instanceof NodeList||t instanceof HTMLCollection||t instanceof Array){for(var i=[],a=t.length,n=0;n<a;n++)i.push(new l(t[n],e));return 1===i.length?i[0]:0!==i.length&&i}if(!(t instanceof Element))return!1;if(!(this instanceof l))return new l(t,e);if(l.inst[t.getAttribute("data-tail-datetime")])return l.inst[t.getAttribute("data-tail-datetime")];if(t.getAttribute("data-datetime")){var s=JSON.parse(t.getAttribute("data-datetime").replace(/\'/g,'"'));s instanceof Object&&(e=o(e,s))}return this.e=t,this.id=++l.count,this.con=o(l.defaults,e),(l.inst["tail-"+this.id]=this).e.setAttribute("data-tail-datetime","tail-"+this.id),this.init()};return l.version="0.4.14",l.status="beta",l.count=0,l.inst={},l.defaults={animate:!0,classNames:!1,closeButton:!0,dateFormat:"YYYY-mm-dd",dateStart:!1,dateRanges:[],dateBlacklist:!0,dateEnd:!1,locale:"en",position:"bottom",rtl:"auto",startOpen:!1,stayOpen:!1,time12h:!1,timeFormat:"HH:ii:ss",timeHours:!0,timeMinutes:!0,timeSeconds:0,timeIncrement:!0,timeStepHours:1,timeStepMinutes:5,timeStepSeconds:5,today:!0,tooltips:[],viewDefault:"days",viewDecades:!0,viewYears:!0,viewMonths:!0,viewDays:!0,weekStart:0},l.strings={en:{months:["January","February","March","April","May","June","July","August","September","October","November","December"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shorts:["SUN","MON","TUE","WED","THU","FRI","SAT"],time:["Hours","Minutes","Seconds"],header:["Select a Month","Select a Year","Select a Decade","Select a Time"]},modify:function(t,e,i){if(!(t in this))return!1;if(e instanceof Object)for(var a in e)this.modify(t,a,e[a]);else this[t][e]="string"==typeof i?i:this[t][e];return!0},register:function(t,e){return"string"==typeof t&&e instanceof Object&&(this[t]=e,!0)}},l.prototype={init:function(){this.prepare();var t=this.__.shorts.slice(this.con.weekStart).concat(this.__.shorts.slice(0,this.con.weekStart));this.weekdays="<thead>\n<tr>\n";for(var e=0;e<7;e++)this.weekdays+='<th class="calendar-week">'+t[e]+"</th>";this.weekdays+="\n</tr>\n</thead>",this.select=c(this.e.getAttribute("data-value")||this.e.value),(!this.select||this.select<this.con.dateStart||this.select>this.con.dateEnd)&&(this.select=null),null==this.view&&(this.view={type:this.con.viewDefault,date:this.select||new Date});var i=["Hours","Minutes","Seconds"];for(e=0;e<3;e++)if("number"==typeof this.con["time"+i[e]])this.view.date["set"+i[e]](this.con["time"+i[e]]);else for(;this.view.date["get"+i[e]]()%this.con["timeStep"+i[e]]!=0;)this.view.date["set"+i[e]](this.view.date["get"+i[e]]()+1);return this.ampm=!!this.con.time12h&&12<this.view.date.getHours(),this.events={},this.dt=this.renderCalendar(),this.con.startOpen&&this.open(),this.select&&this.selectDate(this.select),this.bind()},prepare:function(){if(this.__=o(l.strings.en,l.strings[this.con.locale]||{}),this.con.dateStart=c(this.con.dateStart,!0,!0)||-9999999999999,this.con.dateEnd=c(this.con.dateEnd,!0,!0)||9999999999999,this.con.viewDefault=this.con.dateFormat?this.con.viewDefault:"time","string"==typeof this.con.weekStart&&(this.con.weekStart=l.strings.en.shorts.indexOf(this.con.weekStart)),this.con.weekStart<0&&6<this.con.weekStart&&(this.con.weekStart=0),0<this.con.dateRanges.length){for(var t=[],e=(n=this.con.dateRanges).length,i=0;i<e;i++)n[i]instanceof Object&&(n[i].start||n[i].days)&&(!1===(n[i].start=c(n[i].start||!1,!0,!0))?n[i].start=n[i].end=1/0:(!1===(n[i].end=c(n[i].end||!1,!0,!0))&&(n[i].end=n[i].start),n[i].start=n[i].start>n[i].end?[n[i].end,n[i].end=n[i].start][0]:n[i].start),n[i].days=!("days"in n[i])||n[i].days,n[i].days="boolean"!=typeof n[i].days?function(t){for(var e=[],i=t.length,a=0;a<i;a++)"string"==typeof t[a]&&(t[a]=l.strings.en.shorts.indexOf(t[a])),0<=t[a]&&t[a]<=6&&e.push(t[a]);return e}(n[i].days instanceof Array?n[i].days:[n[i].days]):[0,1,2,3,4,5,6],t.push({start:n[i].start,end:n[i].end,days:n[i].days}));this.con.dateRanges=t}if(0<this.con.tooltips.length){t=[];var a,n,s=this.con.tooltips;for(e=s.length,i=0;i<e;i++)s[i]instanceof Object&&s[i].date&&(s[i].date instanceof Array?(a=c(s[i].date[0]||!1,!0,!0),n=c(s[i].date[1]||!1,!0,!0)||a):a=n=c(s[i].date||!1,!0,!0),a&&t.push({date:a!==n?[a,n]:a,text:s[i].text||"Tooltip",color:s[i].color||"inherit",element:s[i].element||(r=d.createElement("DIV"),r.className="calendar-tooltip",r.innerHTML='<div class="tooltip-inner">'+s[i].text||"Tooltip</div>",r)}));this.con.tooltips=t}var r;return this},bind:function(){var e=this;return void 0===this._bind&&(this.e.addEventListener("focusin",function(t){e.open.call(e)}),this.e.addEventListener("keyup",function(t){e.callback.call(e,t)}),d.addEventListener("keyup",function(t){e.dt.contains(t.target)&&e.callback.call(e,t)}),d.addEventListener("click",function(t){e.dt.contains(t.target)?e.callback.call(e,t):!e.e.contains(t.target)&&u(e.dt,"calendar-open")&&(t.target==e.dt||t.target==e.e||e.con.stayOpen||e.close.call(e))}),d.addEventListener("mouseover",function(t){e.dt.contains(t.target)&&e.callback.call(e,t)}),this._bind=!0),this},callback:function(t){var e,i=t.target,a="getAttribute",n="data-action",s=i[a](n)?i:i.parentElement[a](n)?i.parentElement:i,r="data-tooltip";if("mouseover"==t.type&&(!1!==(e=i[a](r)?i:!!s[a](r)&&s)?this.dt.querySelector("#tooltip-"+e[a](r)+"-"+e[a](r+"-time"))||this.showTooltip(e[a](r),e,e[a](r+"-time")):this.dt.querySelector(".calendar-tooltip:not(.remove)")&&this.hideTooltip(this.dt.querySelector(".calendar-tooltip").id.slice(8))),"click"==t.type){if(!s||1!=t.buttons&&1!=(t.which||t.button))return;if(s.hasAttribute("data-disabled"))return;switch(s[a](n)){case"prev":case"next":return this.browseView(s[a](n));case"cancel":this.con.stayOpen||this.close();break;case"submit":return this.con.stayOpen||this.close(),this.selectDate(this.fetchDate(parseInt(s[a]("data-date"))));case"view":return this.switchDate(s[a]("data-year")||null,s[a]("data-month")||null,s[a]("data-day")||null),this.switchView(s[a]("data-view"))}}if("keyup"==t.type){if("INPUT"!=t.target.tagName&&t.target!==this.e&&/calendar-(static|close)/i.test(this.dt.className))return!1;13==(t.keyCode||t.which)&&(this.selectDate(this.fetchDate(this.select)),t.stopPropagation(),this.con.stayOpen||this.close()),27==(t.keyCode||t.which)&&(this.con.stayOpen||this.close())}},trigger:function(t){var e={bubbles:!1,cancelable:!0,detail:{args:arguments,self:this}};"change"==t&&(s(this.e,"input",e),s(this.e,"change",e)),s(this.dt,"tail::"+t,e);for(var i=(this.events[t]||[]).length,a=0;a<i;a++)this.events[t][a].cb.apply(this,function(t,e,i){for(var a=e.length,n=0;n<a;++n)t[n-1]=e[n];return t[n]=i,t}(new Array(arguments.length),arguments,this.events[t][a].args));return!0},calcPosition:function(){var t=this.dt.style,e=h.getComputedStyle(this.dt),i=parseInt(e.marginLeft)+parseInt(e.marginRight),a=parseInt(e.marginTop)+parseInt(e.marginBottom),n=this.e.getBoundingClientRect().top+h.scrollY,s=this.e.getBoundingClientRect().left-h.scrollX,r=this.e.offsetWidth||0,o=this.e.offsetHeight||0;switch(t.visibility="hidden",this.con.position){case"top":var c=n-(this.dt.offsetHeight+a),l=s+r/2-(this.dt.offsetWidth/2+i/2);break;case"left":c=n+o/2-(this.dt.offsetHeight/2+a),l=s-(this.dt.offsetWidth+i);break;case"right":c=n+o/2-(this.dt.offsetHeight/2+a),l=s+r;break;default:c=n+o,l=s+r/2-(this.dt.offsetWidth/2+i/2)}return t.top=(0<=c?c:this.e.offsetTop)+"px",t.left=(0<=l?l:0)+"px",t.visibility="visible",this},convertDate:function(t,e){var i,a={H:String("00"+t.getHours()).toString().slice(-2),G:(i=t.getHours(),i%12?i%12:12),A:12<=t.getHours()?"PM":"AM",a:12<=t.getHours()?"pm":"am",i:String("00"+t.getMinutes()).toString().slice(-2),s:String("00"+t.getSeconds()).toString().slice(-2),Y:t.getFullYear(),y:parseInt(t.getFullYear().toString().slice(2)),m:String("00"+(t.getMonth()+1)).toString().slice(-2),M:this.__.months[t.getMonth()].slice(0,3),F:this.__.months[t.getMonth()],d:String("00"+t.getDate()).toString().slice(-2),D:this.__.days[t.getDay()],l:this.__.shorts[t.getDay()].toLowerCase()};return e.replace(/([HGismd]{1,2}|[Y]{2,4}|y{2})/g,function(t){return 4==t.length||2==t.length?a[t.slice(-1)].toString().slice(-Math.abs(t.length)):1==t.length&&"0"==t[0]?a[t.slice(-1)].toString().slice(-1):a[t.slice(-1)].toString()}).replace(/(A|a|M|F|D|l)/g,function(t){return a[t]})},renderCalendar:function(){var t=["tail-datetime-calendar","calendar-close"],e=!0===this.con.classNames?this.e.className.split(" "):this.con.classNames;if(["top","left","right","bottom"].indexOf(this.con.position)<0){var i=d.querySelector(this.con.position);t.push("calendar-static")}(!0===this.con.rtl||0<=["ar","he","mdr","sam","syr"].indexOf(this.con.rtl))&&t.push("rtl"),this.con.stayOpen&&t.push("calendar-stay"),(e="function"==typeof e.split?e.split(" "):e)instanceof Array&&(t=t.concat(e));var a=p("DIV",t),n=!1;if(a.id="tail-datetime-"+this.id,this.con.dateFormat?n='<span class="action action-prev" data-action="prev"></span><span class="label" data-action="view" data-view="up"></span><span class="action action-next" data-action="next"></span>':this.con.timeFormat&&(n='<span class="action action-submit" data-action="submit"></span><span class="label"></span><span class="action action-cancel" data-action="cancel"></span>'),a.innerHTML=n?'<div class="calendar-actions">'+n+"</div>":"",this.con.dateFormat&&this.renderDatePicker(a,this.con.viewDefault),this.con.timeFormat&&this.renderTimePicker(a),this.con.closeButton&&!i){var s=p("BUTTON","calendar-close"),r=this;s.addEventListener("click",function(t){t.preventDefault(),r.close()}),a.appendChild(s)}return(i||d.body).appendChild(a),a},renderDatePicker:function(t,e){if((!e||["decades","years","months","days"].indexOf(e)<0)&&(e=this.con.viewDays?"days":this.con.viewMonths?"months":this.con.viewYears?"years":!!this.con.viewDecades&&"decades"),!e||!this.con["view"+r(e)]||!this.con.dateFormat)return!1;var i=d.createElement("DIV");return i.className="calendar-datepicker calendar-view-"+e,i.innerHTML=this["view"+r(e)](),t.querySelector(".calendar-datepicker")?t.replaceChild(i,t.querySelector(".calendar-datepicker")):t.appendChild(i),this.view.type=e,this.handleLabel(t)},renderTimePicker:function(t){if(!this.con.timeFormat)return!1;var e,i,a=[],n=0;if(this.con.time12h){var s=12<this.view.date.getHours()?'checked="checked" ':"";a.push('<label class="timepicker-switch" data-am="AM" data-pm="PM"><input type="checkbox" value="1" data-input="PM" '+s+"/><span></span></label>")}for(var r in{Hours:0,Minutes:0,Seconds:0})!1!==this.con["time"+r]?((e=d.createElement("INPUT")).type="text",e.disabled=null===this.con["time"+r],e.setAttribute("min","Hours"===r&&this.con.time12h?"01":"00"),e.setAttribute("max","Hours"!==r?"60":this.con.time12h?"13":"24"),e.setAttribute("step",this.con["timeStep"+r]),e.setAttribute("value",(i=this.view.date["get"+r]())<10?"0"+i:i),e.setAttribute("pattern","d*"),e.setAttribute("inputmode","numeric"),e.setAttribute("data-input",r.toLowerCase()),a.push('<div class="timepicker-field timepicker-'+r.toLowerCase()+'">'+e.outerHTML+'<button class="picker-step step-up"></button><button class="picker-step step-down"></button><label>'+this.__.time[n++]+"</label></div>")):a.push((n++,null));var o=p("DIV","calendar-timepicker"),c=this;o.innerHTML=a.join("\n");var l=o.querySelectorAll("input");for(n=0;n<l.length;n++)"checkbox"!==l[n].type?(l[n].addEventListener("input",function(t){c.handleTime.call(c,this)}),l[n].addEventListener("keydown",function(t){var e=event.keyCode||event.which||0;if(38===e||40===e)return t.preventDefault(),c.handleStep.call(c,this,38===e?"up":"down"),!1})):l[n].addEventListener("change",function(t){c.handleTime.call(c,this)});for(l=o.querySelectorAll("button"),n=0;n<l.length;n++)l[n].addEventListener("mousedown",function(t){t.preventDefault();var e=this.parentElement.querySelector("input");return c.handleStep.call(c,e,u(this,"step-up")?"up":"down"),!1});var h=t.querySelector(".calendar-timepicker");return t[h?"replaceChild":"appendChild"](o,h),this.handleLabel(t)},handleTime:function(t){this.con.time12h&&"checkbox"===t.type&&(this.ampm=t.checked);var e=t.parentElement.parentElement;e=[e.querySelector("input[data-input=hours]")||{value:0},e.querySelector("input[data-input=minutes]")||{value:0},e.querySelector("input[data-input=seconds]")||{value:0}],this.selectTime(parseInt(e[0].value)+(this.ampm?12:0),parseInt(e[1].value),parseInt(e[2].value)),e[2].value=this.view.date.getSeconds(),e[1].value=this.view.date.getMinutes(),this.con.time12h?e[0].value=12<this.view.date.getHours()?this.view.date.getHours()-12:this.view.date.getHours():e[0].value=this.view.date.getHours()},handleStep:function(t,e,i){var a=null,n=parseInt(t.value),s=parseInt(t.getAttribute("min")),r=parseInt(t.getAttribute("max")),o=t.getAttribute("data-input"),c=parseInt(t.getAttribute("step"));if("up"===e?(a=r<=n+c||null,t.value=r<=n+c?13===r?1:0:n+c,this.ampm=!!this.con.time12h&&12<=this.view.date.getHours()+1):"down"===e&&(a=!(n-c<s)&&null,t.value=n-c<s?r-c:n-c,this.ampm=!!this.con.time12h&&this.view.date.getHours()-1<=0),t.value<10&&(t.value="0"+t.value),this.con.timeIncrement&&null!==a){var l=t.parentElement.previousElementSibling;l&&!1===l.disabled?this.handleStep(l.querySelector("input"),a?"up":"down",!0):"hours"==o&&this.view.date.setDate(this.view.date.getDate()+(a?1:-1))}if(void 0!==i&&!0===i)return!1;var h=t.parentElement.parentElement;if(this.selectTime(parseInt((h.querySelector("input[data-input=hours]")||{value:0}).value)+(this.ampm?12:0),parseInt((h.querySelector("input[data-input=minutes]")||{value:0}).value),parseInt((h.querySelector("input[data-input=seconds]")||{value:0}).value)),this.con.time12h){var d=t.parentElement.parentElement.querySelector("input[type=checkbox]");d&&d.checked!==12<this.view.date.getHours()&&(d.checked=12<this.view.date.getHours())}return!0},handleLabel:function(t){var e,i,a=t.querySelector(".label");switch(this.view.type){case"days":e=this.__.months[this.view.date.getMonth()]+", "+this.view.date.getFullYear();break;case"months":e=this.view.date.getFullYear();break;case"years":e=(i=parseInt(this.view.date.getFullYear().toString().slice(0,3)+"0"))+" - "+(i+10);break;case"decades":e=(i=parseInt(this.view.date.getFullYear().toString().slice(0,2)+"00"))+" - "+(i+100);break;case"time":e=this.__.header[3]}return a.innerText=e,t},viewDecades:function(){var t=this.view.date.getFullYear(),e=new Date(this.view.date.getTime()),i=this.con.today?(new Date).getYear():0;e.setFullYear(t-parseInt(t.toString()[3])-30);for(var a,n,s=[],r=[],o=1;o<=16;o++)a="calendar-decade"+(i>=e.getYear()&&i<=e.getYear()+10?" date-today":""),n='data-action="view" data-view="down" data-year="'+e.getFullYear()+'"',s.push('<td class="'+a+'" '+n+'><span class="inner">'+e.getFullYear()+" - "+(e.getFullYear()+10)+"</span></td>"),4<=o&&o%4==0&&(r.push("<tr>\n"+s.join("\n")+"\n</tr>"),s=[]),e.setFullYear(e.getFullYear()+10);return'<table class="calendar-decades"><thead><tr><th colspan="4">'+this.__.header[2]+"</th></tr></thead><tbody>"+r.join("\n")+"</tbody></table>"},viewYears:function(){var t=this.view.date.getFullYear(),e=new Date(this.view.date.getTime()),i=this.con.today?(new Date).getYear():0;e.setFullYear(t-parseInt(t.toString()[3])-2);for(var a,n,s=[],r=[],o=1;o<=16;o++)a="calendar-year"+(e.getYear()==i?" date-today":""),n='data-action="view" data-view="down" data-year="'+e.getFullYear()+'"',s.push('<td class="'+a+'" '+n+'><span class="inner">'+e.getFullYear()+"</span></td>"),4<=o&&o%4==0&&(r.push("<tr>\n"+s.join("\n")+"\n</tr>"),s=[]),e.setFullYear(e.getFullYear()+1);return'<table class="calendar-years"><thead><tr><th colspan="4">'+this.__.header[1]+"</th></tr></thead><tbody>"+r.join("\n")+"</tbody></table>"},viewMonths:function(){var t=this.__.months,e=this.con.today?(new Date).getMonth():-1;e=this.view.date.getYear()==(new Date).getYear()?e:-1;for(var i,a,n=[],s=[],r=0;r<12;r++)i="calendar-month"+(e==r?" date-today":""),a='data-action="view" data-view="down" data-month="'+r+'"',n.push('<td class="'+i+'" '+a+'><span class="inner">'+t[r]+"</span></td>"),3==n.length&&(s.push("<tr>\n"+n.join("\n")+"\n</tr>"),n=[]);return'<table class="calendar-months"><thead><tr><th colspan="3">'+this.__.header[0]+"</th></tr></thead><tbody>"+s.join("\n")+"</tbody></table>"},viewDays:function(){var i,t,e,a,n,s,r=new Date(this.view.date.getTime()),o=(new Date).toDateString(),c=r.getMonth(),l=[],h=[],d=[0,[]],u=([].concat(this.con.tooltips),[0,0]);for(r.setHours(0,0,0,0),r.setDate(1),r.setDate(1-(r.getDay()-this.con.weekStart));h.length<6;)i=r.getTime(),s=[].concat(this.con.dateRanges),e='data-action="submit" data-date="'+r.getTime()+'"',t="calendar-day date-"+(r.getMonth()>c?"next":r.getMonth()<c?"previous":"current"),this.con.today&&o==r.toDateString()&&(t+=" date-today"),this.con.dateBlacklist&&(i<this.con.dateStart||i>this.con.dateEnd)?d=[i<this.con.dateStart?this.con.dateStart:1/0,[0,1,2,3,4,5,6],!0]:0<this.con.dateRanges.length?s.filter(function(t){return t.start==1/0||i>=t.start&&i<=t.end?!(d=[t.end,t.days]):t.start>i},this):3==d.length&&(d=[0,[0,1,2,3,4,5,6]]),0<this.con.tooltips.length&&this.con.tooltips.filter(function(t,e){t.date instanceof Array?t.date[0]<=i&&t.date[1]>=i&&(u=[t.date[1],e,t.color]):t.date==i&&(u=[t.date,e,t.color])},this),u[0]<i&&(u=[0,0]),(n=d[0]>=i&&0<=d[1].indexOf(r.getDay()))&&this.con.dateBlacklist||!n&&!this.con.dateBlacklist?(t+=" date-disabled",e+=' data-disabled="true"'):0!==d[0]&&d[0]<=i&&(d=[0,[]]),this.select&&this.select.toDateString()==r.toDateString()&&(t+=" date-select"),a='<span class="inner">'+r.getDate()+"</span>",0<u[0]&&(t+=" date-tooltip",e+=' data-tooltip="'+u[1]+'" data-tooltip-time="'+i+'"',"inherit"!==u[2]?a+='<span class="tooltip-tick" style="background:'+u[2]+';"></span>':a+='<span class="tooltip-tick"></span>'),l.push('<td class="'+t+'" '+e+">"+a+"</td>"),7==l.length&&(h.push("<tr>\n"+l.join("\n")+"\n</tr>"),l=[]),r.setDate(r.getDate()+1);return h="<tbody>"+h.join("\n")+"</tbody>",'<table class="calendar-days">'+this.weekdays+h+"</table>"},showTooltip:function(t,e,i){var a,n=this.con.tooltips[t].element,s=n.style,r=this.dt.querySelector(".calendar-datepicker");s.cssText="opacity:0;visibility:hidden;",n.id="tooltip-"+t+"-"+i,r.appendChild(n),a=n.offsetWidth,n.offsetHeight,s.top=e.offsetTop+e.offsetHeight+"px",s.left=e.offsetLeft+e.offsetWidth/2-a/2+"px",s.visibility="visible",this.con.animate?(n.setAttribute("data-top",parseInt(s.top)),s.top=parseInt(s.top)+5+"px",function t(){parseFloat(s.top)>n.getAttribute("data-top")&&(s.top=parseFloat(s.top)-.5+"px"),(s.opacity=parseFloat(s.opacity)+.125)<1&&setTimeout(t,20)}()):s.opacity=1},hideTooltip:function(t){var e=this.dt.querySelector("#tooltip-"+t),i=e.style;this.con.animate?(e.className+=" remove",function t(){if(parseFloat(i.top)<parseInt(e.getAttribute("data-top"))+5&&(i.top=parseFloat(i.top)+.5+"px"),(i.opacity-=.125)<0)return(e.className="calendar-tooltip")?e.parentElement.removeChild(e):"";setTimeout(t,20)}()):e.parentElement.removeChild(e)},switchView:function(t){var e=[null,"days","months","years","decades",null];return-1==e.indexOf(t)&&("up"==t?t=e[(e.indexOf(this.view.type)||5)+1]||null:"down"==t&&(t=e[(e.indexOf(this.view.type)||1)-1]||null),t&&this.con["view"+r(t)]||(t=!1)),!!t&&(this.renderDatePicker(this.dt,t),this.trigger("view",t))},switchDate:function(t,e,i,a){return"auto"===i&&(i=this.view.date.getDate(),(1===this.view.date.getMonth()&&28<=i||30<=i)&&(i=(i=new Date(t,e+1,0)).getDate())),this.view.date.setFullYear(null==t?this.view.date.getFullYear():t,null==e?this.view.date.getMonth():e,i||this.view.date.getDate()),!0===a||this.switchView(this.view.type)},switchMonth:function(t,e){return"string"==typeof t&&(t=0<=["previous","prev"].indexOf(t)?-1:1,t=this.view.date.getMonth()+type),this.switchDate(e||this.getFullYear(),t)},switchYear:function(t){return"string"==typeof t&&(t=0<=["previous","prev"].indexOf(t)?-1:1,t=this.view.date.getFullYear()+type),this.switchDate(t)},browseView:function(t){switch(t=0<=["previous","prev"].indexOf(t)?-1:1,this.view.type){case"days":return this.switchDate(null,this.view.date.getMonth()+t,"auto");case"months":return this.switchDate(this.view.date.getFullYear()+t,null,"auto");case"years":return this.switchDate(this.view.date.getFullYear()+10*t,null,"auto");case"decades":return this.switchDate(this.view.date.getFullYear()+100*t,null,"auto")}return!1},fetchDate:function(t){t=c(t||!1)||this.view.date;var e=this.dt.querySelectorAll("input[type=number]");return e&&3==e.length&&t.setHours(e[0].value||0,e[1].value||0,e[2].value||0,0),t},selectDate:function(t,e,i,a,n,s){var r=new Date,o=[];return this.con.dateFormat&&o.push(this.con.dateFormat),this.con.timeFormat&&o.push(this.con.timeFormat),this.select=t instanceof Date?t:new Date(t||(null==t?this.view.date.getFullYear():r.getFullYear()),e||(null==e?this.view.date.getMonth():r.getMonth()),i||(null==i?this.view.date.getDate():r.getDate()),a||(null==a?this.view.date.getHours():0),n||(null==n?this.view.date.getMinutes():0),s||(null==s?this.view.date.getSeconds():0)),this.view.date=new Date(this.select.getTime()),this.e.value=this.convertDate(this.select,o.join(" ")),this.e.setAttribute("data-value",this.select.getTime()),this.switchView("days"),this.trigger("change")},selectTime:function(t,e,i){return this.selectDate(void 0,void 0,void 0,t,e,i)},open:function(){if(!u(this.dt,"calendar-close"))return this;var e=this,i=this.dt.style;return i.display="block",i.opacity=this.con.animate?0:1,n(this.dt,"calendar-close"),a(this.dt,"calendar-idle"),u(this.dt,"calendar-static")||e.calcPosition(),function t(){if(1<=(i.opacity=parseFloat(i.opacity)+.125))return n(e.dt,"calendar-idle"),a(e.dt,"calendar-open"),e.trigger("open");setTimeout(t,20)}(),this},close:function(){if(!u(this.dt,"calendar-open"))return this;var e=this,i=this.dt.style;return i.display="block",i.opacity=this.con.animate?1:0,n(this.dt,"calendar-open"),a(this.dt,"calendar-idle"),function t(){if((i.opacity-=.125)<=0)return n(e.dt,"calendar-idle"),a(e.dt,"calendar-close"),i.display="none",e.trigger("close");setTimeout(t,20)}(),this},toggle:function(){return u(this.dt,"calendar-open")?this.close():u(this.dt,"calendar-close")?this.open():this},on:function(t,e,i){return!(["open","close","change","view"].indexOf(t)<0||"function"!=typeof e)&&(t in this.events||(this.events[t]=[]),this.events[t].push({cb:e,args:i instanceof Array?i:[]}),this)},remove:function(){return this.e.removeAttribute("data-tail-datetime"),this.e.removeAttribute("data-value"),this.dt.parentElement.removeChild(this.dt),this},reload:function(){return this.remove(),this.init()},config:function(t,e,i){if(t instanceof Object){for(var a in t)this.config(a,t[a],!1);return this.reload(),this.con}return void 0===t?this.con:t in this.con&&(void 0===e?this.con[t]:(this.con[t]=e,!1!==this.rebuild&&this.reload(),this))}},l});
diff --git a/taskmanager.js b/taskmanager.js
index 071ebb4e..0ce610e1 100644
--- a/taskmanager.js
+++ b/taskmanager.js
@@ -1,714 +1,20 @@
-/** 
-* @description MeshCentral ScriptTask
-* @author Ryan Blenis
-* @copyright 
+/**
+* @description MeshCentral task manager
+* @author Ylian Saint-Hilaire
+* @copyright Intel Corporation 2018-2022
 * @license Apache-2.0
+* @version v0.0.1
 */
 
+/*jslint node: true */
+/*jshint node: true */
+/*jshint strict:false */
+/*jshint -W097 */
+/*jshint esversion: 6 */
 'use strict';
 
 module.exports.createTaskManager = function (parent) {
     var obj = {};
-    obj.parent = parent.webserver;
-    obj.meshServer = parent;
-    obj.db = null;
-    obj.intervalTimer = null;
-    obj.debug = obj.meshServer.debug;
-    obj.VIEWS = __dirname + '/views/';
-    obj.exports = [      
-        'onDeviceRefreshEnd',
-        'resizeContent',
-        'historyData',
-        'variableData',
-        'malix_triggerOption'
-    ];
-    
-    obj.malix_triggerOption = function(selectElem) {
-        selectElem.options.add(new Option("ScriptTask - Run Script", "scripttask_runscript"));
-    }
-    obj.malix_triggerFields_scripttask_runscript = function() {
-        
-    }
-    obj.resetQueueTimer = function() {
-        clearTimeout(obj.intervalTimer);
-        obj.intervalTimer = setInterval(obj.queueRun, 1 * 60 * 1000); // every minute
-    };
-
-    // Start the task manager
-    obj.server_startup = function() {
-        obj.meshServer.pluginHandler.scripttask_db = require (__dirname + '/db.js').CreateDB(obj.meshServer);
-        obj.db = obj.meshServer.pluginHandler.scripttask_db;
-        obj.resetQueueTimer();
-    };
-    
-    obj.onDeviceRefreshEnd = function() {
-        pluginHandler.registerPluginTab({ tabTitle: 'ScriptTask', tabId: 'pluginScriptTask' });
-        QA('pluginScriptTask', '<iframe id="pluginIframeScriptTask" style="width: 100%; height: 800px;" scrolling="no" frameBorder=0 src="/pluginadmin.ashx?pin=scripttask&user=1" />');
-    };
-
-    /*
-    // may not be needed, saving for later. Can be called to resize iFrame
-    obj.resizeContent = function() {
-        var iFrame = document.getElementById('pluginIframeScriptTask');
-        var newHeight = 800;
-        var sHeight = iFrame.contentWindow.document.body.scrollHeight;
-        if (sHeight > newHeight) newHeight = sHeight;
-        if (newHeight > 1600) newHeight = 1600;
-        iFrame.style.height = newHeight + 'px';
-    };
-    */
-
-    obj.queueRun = async function() {
-        var onlineAgents = Object.keys(obj.meshServer.webserver.wsagents);
-        //obj.debug('ScriptTask', 'Queue Running', Date().toLocaleString(), 'Online agents: ', onlineAgents);
-
-        obj.db.getPendingJobs(onlineAgents)
-        .then(function(jobs) {
-            if (jobs.length == 0) return;
-            //@TODO check for a large number and use taskLimiter to queue the jobs
-            jobs.forEach(function(job) {
-                obj.db.get(job.scriptId)
-                .then(async function(script) {
-                    script = script[0];
-                    var foundVars = script.content.match(/#(.*?)#/g);
-                    var replaceVars = {};
-                    if (foundVars != null && foundVars.length > 0) {
-                        var foundVarNames = [];
-                        foundVars.forEach(function(fv) { foundVarNames.push(fv.replace(/^#+|#+$/g, '')); });
-                        
-                        var limiters = { 
-                            scriptId: job.scriptId,
-                            nodeId: job.node,
-                            meshId: obj.meshServer.webserver.wsagents[job.node]['dbMeshKey'],
-                            names: foundVarNames
-                        };
-                        var finvals = await obj.db.getVariables(limiters);
-                        var ordering = { 'global': 0, 'script': 1, 'mesh': 2, 'node': 3 }
-                        finvals.sort(function(a, b) { return (ordering[a.scope] - ordering[b.scope]) || a.name.localeCompare(b.name); });
-                        finvals.forEach(function(fv) { replaceVars[fv.name] = fv.value; });
-                        replaceVars['GBL:meshId'] = obj.meshServer.webserver.wsagents[job.node]['dbMeshKey'];
-                        replaceVars['GBL:nodeId'] = job.node;
-                        //console.log('FV IS', finvals);
-                        //console.log('RV IS', replaceVars);
-                    }
-                    var dispatchTime = Math.floor(new Date() / 1000);
-                    var jObj = { 
-                        action: 'task', 
-                        subaction: 'triggerJob',
-                        jobId: job._id,
-                        scriptId: job.scriptId,
-                        replaceVars: replaceVars,
-                        scriptHash: script.contentHash,
-                        dispatchTime: dispatchTime
-                    };
-                    //obj.debug('ScriptTask', 'Sending job to agent');
-                    try { 
-                        obj.meshServer.webserver.wsagents[job.node].send(JSON.stringify(jObj));
-                        obj.db.update(job._id, { dispatchTime: dispatchTime });
-                    } catch (ex) { }
-                })
-                .catch(function (ex) { console.log('task: Could not dispatch job.', ex) });
-            });
-        })
-        .then(function() {
-            obj.makeJobsFromSchedules();
-            obj.cleanHistory();
-        })
-        .catch(function(ex) { console.log('task: Queue Run Error: ', ex); });
-    };
-    
-    obj.cleanHistory = function() {
-        if (Math.round(Math.random() * 100) == 99) {
-            //obj.debug('Task', 'Running history cleanup');
-            obj.db.deleteOldHistory();
-        }
-    };
-    
-    obj.downloadFile = function(req, res, user) {
-        var id = req.query.dl;
-        obj.db.get(id)
-        .then(function(found) {
-          if (found.length != 1) { res.sendStatus(401); return; }
-          var file = found[0];
-          res.setHeader('Content-disposition', 'attachment; filename=' + file.name);
-          res.setHeader('Content-type', 'text/plain');
-          //var fs = require('fs');
-          res.send(file.content);
-        });
-    };
-    
-    obj.updateFrontEnd = async function(ids){
-        if (ids.scriptId != null) {
-            var scriptHistory = null;
-            obj.db.getJobScriptHistory(ids.scriptId)
-            .then(function(sh) {
-                scriptHistory = sh;
-                return obj.db.getJobSchedulesForScript(ids.scriptId);
-            })
-            .then(function(scriptSchedule) {
-                var targets = ['*', 'server-users'];
-                obj.meshServer.DispatchEvent(targets, obj, { nolog: true, action: 'task', subaction: 'historyData', scriptId: ids.scriptId, nodeId: null, scriptHistory: scriptHistory, nodeHistory: null, scriptSchedule: scriptSchedule });
-            });
-        }
-        if (ids.nodeId != null) {
-            var nodeHistory = null;
-            obj.db.getJobNodeHistory(ids.nodeId)
-            .then(function(nh) {
-                nodeHistory = nh;
-                return obj.db.getJobSchedulesForNode(ids.nodeId);
-            })
-            .then(function(nodeSchedule) {
-                var targets = ['*', 'server-users'];
-                obj.meshServer.DispatchEvent(targets, obj, { nolog: true, action: 'task', subaction: 'historyData', scriptId: null, nodeId: ids.nodeId, scriptHistory: null, nodeHistory: nodeHistory, nodeSchedule: nodeSchedule });
-            });
-        }
-        if (ids.tree === true) {
-            obj.db.getScriptTree()
-            .then(function(tree) {
-                var targets = ['*', 'server-users'];
-                obj.meshServer.DispatchEvent(targets, obj, { nolog: true, action: 'task', subaction: 'newScriptTree', tree: tree });
-            });
-        }
-        if (ids.variables === true) {
-            obj.db.getVariables()
-            .then(function(vars) {
-                var targets = ['*', 'server-users'];
-                obj.meshServer.DispatchEvent(targets, obj, { nolog: true, action: 'task', subaction: 'variableData', vars: vars });
-            });
-        }
-    };
-    
-    obj.handleAdminReq = function(req, res, user) {
-        if ((user.siteadmin & 0xFFFFFFFF) == 1 && req.query.admin == 1) 
-        {
-            // admin wants admin, grant
-            var vars = {};
-            res.render(obj.VIEWS + 'admin', vars);
-            return;
-        } else if (req.query.admin == 1 && (user.siteadmin & 0xFFFFFFFF) == 0) {
-            // regular user wants admin
-            res.sendStatus(401); 
-            return;
-        } else if (req.query.user == 1) { 
-            // regular user wants regular access, grant
-            if (req.query.dl != null) return obj.downloadFile(req, res, user);
-            var vars = {};
-            
-            if (req.query.edit == 1) { // edit script
-                if (req.query.id == null) return res.sendStatus(401); 
-                obj.db.get(req.query.id)
-                .then(function(scripts) {
-                    if (scripts[0].filetype == 'proc') {
-                        vars.procData = JSON.stringify(scripts[0]);
-                        res.render(obj.VIEWS + 'procedit', vars);
-                    } else {
-                        vars.scriptData = JSON.stringify(scripts[0]);
-                        res.render(obj.VIEWS + 'scriptedit', vars);
-                    }
-                });
-                return;
-            } else if (req.query.schedule == 1) {
-                var vars = {};
-                res.render(obj.VIEWS + 'schedule', vars);
-                return;
-            }
-            // default user view (tree)
-            vars.scriptTree = 'null';
-            obj.db.getScriptTree()
-            .then(function(tree) {
-              vars.scriptTree = JSON.stringify(tree);
-              res.render(obj.VIEWS + 'user', vars);
-            });
-            return;
-        } else if (req.query.include == 1) {
-            switch (req.query.path.split('/').pop().split('.').pop()) {
-                case 'css':     res.contentType('text/css'); break;
-                case 'js':      res.contentType('text/javascript'); break;
-            }
-            res.sendFile(__dirname + '/includes/' + req.query.path); // don't freak out. Express covers any path issues.
-            return;
-        }
-        res.sendStatus(401); 
-        return;
-    };
-    
-    obj.historyData = function (message) {
-        if (typeof pluginHandler.scripttask.loadHistory == 'function') pluginHandler.scripttask.loadHistory(message);
-        if (typeof pluginHandler.scripttask.loadSchedule == 'function') pluginHandler.scripttask.loadSchedule(message);
-    };
-    
-    obj.variableData = function (message) {
-        if (typeof pluginHandler.scripttask.loadVariables == 'function') pluginHandler.scripttask.loadVariables(message);
-    };
-    
-    obj.determineNextJobTime = function(s) {
-        var nextTime = null;
-        var nowTime = Math.floor(new Date() / 1000);
-        
-        // special case: we've reached the end of our run
-        if (s.endAt !== null && s.endAt <= nowTime) {
-            return nextTime;
-        }
-
-        switch (s.recur) {
-            case 'once':
-                if (s.nextRun == null) nextTime = s.startAt;
-                else nextTime = null;
-            break;
-            case 'minutes':
-                /*var lRun = s.nextRun || nowTime;
-                if (lRun == null) lRun = nowTime;
-                nextTime = lRun + (s.interval * 60);
-                if (s.startAt > nextTime) nextTime = s.startAt;*/
-                if (s.nextRun == null) { // hasn't run yet, set to start time
-                    nextTime = s.startAt;
-                    break;
-                }
-                nextTime = s.nextRun + (s.interval * 60);
-                // this prevents "catch-up" tasks being scheduled if an endpoint is offline for a long period of time
-                // e.g. always make sure the next scheduled time is relevant to the scheduled interval, but in the future
-                if (nextTime < nowTime) {
-                    // initially I was worried about this causing event loop lockups
-                    // if there was a long enough time gap. Testing over 50 years of backlog for a 3 min interval
-                    // still ran under a fraction of a second. Safe to say this approach is safe! (~8.5 million times)
-                    while (nextTime < nowTime) {
-                        nextTime = nextTime + (s.interval * 60);
-                    }
-                }
-                if (s.startAt > nextTime) nextTime = s.startAt;
-            break;
-            case 'hourly':
-                if (s.nextRun == null) { // hasn't run yet, set to start time
-                    nextTime = s.startAt;
-                    break;
-                }
-                nextTime = s.nextRun + (s.interval * 60 * 60);
-                if (nextTime < nowTime) {
-                    while (nextTime < nowTime) {
-                        nextTime = nextTime + (s.interval * 60 * 60);
-                    }
-                }
-                if (s.startAt > nextTime) nextTime = s.startAt;
-            break;
-            case 'daily':
-                if (s.nextRun == null) { // hasn't run yet, set to start time
-                    nextTime = s.startAt;
-                    break;
-                }
-                nextTime = s.nextRun + (s.interval * 60 * 60 * 24);
-                if (nextTime < nowTime) {
-                    while (nextTime < nowTime) {
-                        nextTime = nextTime + (s.interval * 60 * 60 * 24);
-                    }
-                }
-                if (s.startAt > nextTime) nextTime = s.startAt;
-            break;
-            case 'weekly':
-                var tempDate = new Date();
-                var nowDate = new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate());
-                
-                if (s.daysOfWeek.length == 0) {
-                    nextTime = null;
-                    break;
-                }
-                s.daysOfWeek = s.daysOfWeek.map(function (el) { Number(el) });
-                var baseTime = s.startAt;
-                //console.log('dow is ', s.daysOfWeek);
-                var lastDayOfWeek = Math.max(...s.daysOfWeek);
-                var startX = 0;
-                //console.log('ldow is ', lastDayOfWeek);
-                if (s.nextRun != null) {
-                    baseTime = s.nextRun;
-                    //console.log('basetime 2: ', baseTime);
-                    if (nowDate.getDay() == lastDayOfWeek) {
-                        baseTime = baseTime + ( s.interval * 604800 ) - (lastDayOfWeek * 86400);
-                        //console.log('basetime 3: ', baseTime);
-                    }
-                    startX = 0;
-                } else if (s.startAt < nowTime) {
-                    baseTime = Math.floor(nowDate.getTime() / 1000);
-                    //console.log('basetime 4: ', baseTime);
-                }
-                //console.log('startX is: ', startX);
-                //var secondsFromMidnight = nowTimeDate.getSeconds() + (nowTimeDate.getMinutes() * 60) + (nowTimeDate.getHours() * 60 * 60);
-                //console.log('seconds from midnight: ', secondsFromMidnight);
-                //var dBaseTime = new Date(0); dBaseTime.setUTCSeconds(baseTime);
-                //var dMidnight = new Date(dBaseTime.getFullYear(), dBaseTime.getMonth(), dBaseTime.getDate());
-                //baseTime = Math.floor(dMidnight.getTime() / 1000);
-                for (var x = startX; x <= 7; x++){
-                    var checkDate = baseTime + (86400 * x);
-                    var d = new Date(0); d.setUTCSeconds(checkDate);
-                    var dm = new Date(d.getFullYear(), d.getMonth(), d.getDate());
-                    
-                    console.log('testing date: ', dm.toLocaleString()); // dMidnight.toLocaleString());
-                    //console.log('if break check :', (s.daysOfWeek.indexOf(d.getDay()) !== -1 && checkDate >= nowTime));
-                    //console.log('checkDate vs nowTime: ', (checkDate - nowTime), ' if positive, nowTime is less than checkDate');
-                    if (s.nextRun == null && s.daysOfWeek.indexOf(dm.getDay()) !== -1 && dm.getTime() >= nowDate.getTime()) break;
-                    if (s.daysOfWeek.indexOf(dm.getDay()) !== -1 && dm.getTime() > nowDate.getTime()) break;
-                    //if (s.daysOfWeek.indexOf(d.getDay()) !== -1 && Math.floor(d.getTime() / 1000) >= nowTime) break;
-                }
-                var sa = new Date(0); sa.setUTCSeconds(s.startAt);
-                var sad = new Date(sa.getFullYear(), sa.getMonth(), sa.getDate());
-                var diff = (sa.getTime() - sad.getTime()) / 1000;
-                nextTime = Math.floor(dm.getTime() / 1000) + diff;
-                //console.log('next schedule is ' + d.toLocaleString());
-            break;
-            default:
-                nextTime = null;
-            break;
-        }
-        
-        if (s.endAt != null && nextTime > s.endAt) nextTime = null; // if the next time reaches the bound of the endAt time, nullify
-        
-        return nextTime;
-    };
-
-    obj.makeJobsFromSchedules = function(scheduleId) {
-        //obj.debug('ScriptTask', 'makeJobsFromSchedules starting');
-        return obj.db.getSchedulesDueForJob(scheduleId)
-        .then(function(schedules) {
-            //obj.debug('ScriptTask', 'Found ' + schedules.length + ' schedules to process. Current time is: ' + Math.floor(new Date() / 1000));
-            if (schedules.length) {
-                schedules.forEach(function(s) {
-                    var nextJobTime = obj.determineNextJobTime(s);
-                    var nextJobScheduled = false;
-                    if (nextJobTime === null) {
-                        //obj.debug('ScriptTask', 'Removing Job Schedule for', JSON.stringify(s));
-                        obj.db.removeJobSchedule(s._id);
-                    } else {
-                        //obj.debug('ScriptTask', 'Scheduling Job for', JSON.stringify(s));
-                        obj.db.get(s.scriptId)
-                        .then(function(scripts) {
-                            // if a script is scheduled to run, but a previous run hasn't completed, 
-                            // don't schedule another job for the same (device probably offline).
-                            // results in the minimum jobs running once an agent comes back online.
-                            return obj.db.getIncompleteJobsForSchedule(s._id)
-                            .then(function(jobs) {
-                                if (jobs.length > 0) { /* obj.debug('Task', 'Skipping job creation'); */ return Promise.resolve(); }
-                                else { /* obj.debug('Task', 'Creating new job'); */ nextJobScheduled = true; return obj.db.addJob( { scriptId: s.scriptId, scriptName: scripts[0].name, node: s.node, runBy: s.scheduledBy, dontQueueUntil: nextJobTime, jobSchedule: s._id } ); }
-                            });
-                        })
-                        .then(function() {
-                            if (nextJobScheduled) { /* obj.debug('Plugin', 'ScriptTask', 'Updating nextRun time'); */ return obj.db.update(s._id, { nextRun: nextJobTime }); }
-                            else { /* obj.debug('Plugin', 'ScriptTask', 'NOT updating nextRun time'); */ return Promise.resolve(); }
-                        })
-                        .then(function() {
-                            obj.updateFrontEnd( { scriptId: s.scriptId, nodeId: s.node } );
-                        })
-                        .catch(function(ex) { console.log('Task: Error managing job schedules: ', ex); });
-                    }
-                });
-            }
-        });
-    };
-    
-    obj.deleteElement = function (command) {
-        var delObj = null;
-        obj.db.get(command.id)
-        .then(function(found) {
-          var file = found[0];
-          delObj = {...{}, ...found[0]};
-          return file;
-        })
-        .then(function(file) {
-          if (file.type == 'folder') return obj.db.deleteByPath(file.path); //@TODO delete schedules for scripts within folders
-          if (file.type == 'script') return obj.db.deleteSchedulesForScript(file._id);
-          if (file.type == 'jobSchedule') return obj.db.deletePendingJobsForSchedule(file._id);
-        })
-        .then(function() {
-          return obj.db.delete(command.id)
-        })
-        .then(function() {
-          var updateObj = { tree: true };
-          if (delObj.type == 'jobSchedule') {
-              updateObj.scriptId = delObj.scriptId;
-              updateObj.nodeId = delObj.node;
-          }
-          return obj.updateFrontEnd( updateObj );
-        })
-        .catch(function(ex) { console.log('Task: Error deleting ', ex.stack); });
-    };
-
-    // Process 'task' commands received by an agent
-    obj.agentAction = function (command, agent) {
-        console.log('task-agentAction', command);
-        switch (command.subaction) {
-            case 'getScript':
-                // TODO
-                break;
-            case 'clearAllPendingTasks':
-                // TODO
-                break;
-            case 'taskComplete':
-                // TODO
-                break;
-        }
-    }
-
-    obj.serveraction = function(command, myparent, grandparent) {
-        switch (command.subaction) {
-            case 'addScript':
-                obj.db.addScript(command.name, command.content, command.path, command.filetype)
-                .then(function() { obj.updateFrontEnd( { tree: true } ); });            
-            break;
-            case 'new':
-                var parent_path = '', new_path = '';
-                obj.db.get(command.parent_id)
-                .then(function(found) { if (found.length > 0) { var file = found[0]; parent_path = file.path; } else { parent_path = 'Shared'; } })
-                .then(function () { obj.db.addScript(command.name, '', parent_path, command.filetype); })
-                .then(function() { obj.updateFrontEnd( { tree: true } ); });
-            break;
-            case 'rename':
-              obj.db.get(command.id)
-              .then(function(docs) {
-                  var doc = docs[0];
-                  if (doc.type == 'folder') {
-                      console.log('old', doc.path, 'new', doc.path.replace(doc.path, command.name));
-                      return obj.db.update(command.id, { path: doc.path.replace(doc.name, command.name) })
-                      .then(function() { // update sub-items
-                          return obj.db.getByPath(doc.path)
-                      })
-                      .then(function(found) {
-                          if (found.length > 0) {
-                            var proms = [];
-                            found.forEach(function(f) { proms.push(obj.db.update(f._id, { path: doc.path.replace(doc.name, command.name) } )); })
-                            return Promise.all(proms);
-                          }
-                      })
-                  } else {
-                      return Promise.resolve();
-                  }
-              })
-              .then(function() {
-                  obj.db.update(command.id, { name: command.name })
-              })
-              .then(function() {
-                  return obj.db.updateScriptJobName(command.id, command.name);
-              })
-              .then(function() {
-                  obj.updateFrontEnd( { scriptId: command.id, nodeId: command.currentNodeId, tree: true } );
-              });
-            break;
-            case 'move':
-              var toPath = null, fromPath = null, parentType = null;
-              obj.db.get(command.to)
-              .then(function(found) { // get target data
-                  if (found.length > 0) {
-                    var file = found[0];
-                    toPath = file.path;
-                  } else throw Error('Target destination not found');
-              })
-              .then(function() { // get item to be moved
-                return obj.db.get(command.id);
-              })
-              .then(function(found) { // set item to new location
-                  var file = found[0];
-                  if (file.type == 'folder') {
-                    fromPath = file.path;
-                    toPath += '/' + file.name;
-                    parentType = 'folder';
-                    if (file.name == 'Shared' && file.path == 'Shared') throw Error('Cannot move top level directory: Shared');
-                  }
-                  return obj.db.update(command.id, { path: toPath } );
-              })
-              .then(function() { // update sub-items
-                  return obj.db.getByPath(fromPath)
-              })
-              .then(function(found) {
-                  if (found.length > 0) {
-                    var proms = [];
-                    found.forEach(function(f) {
-                      proms.push(obj.db.update(f._id, { path: toPath } ));
-                    })
-                    return Promise.all(proms);
-                  }
-              })
-              .then(function() {
-                return obj.updateFrontEnd( { tree: true } );
-              })
-              .catch(function(ex) { console.log('Task: Error moving ', ex.stack); });
-            break;
-            case 'newFolder':
-              var parent_path = '';
-              var new_path = '';
-              
-              obj.db.get(command.parent_id)
-              .then(function(found) {
-                if (found.length > 0) {
-                    var file = found[0];
-                    parent_path = file.path;
-                } else {
-                    parent_path = 'Shared';
-                }
-              })
-              .then(function() {
-                new_path = parent_path + '/' + command.name;
-              })
-              .then(function() {
-                  return obj.db.addFolder(command.name, new_path);
-              })
-              .then(function () {
-                return obj.updateFrontEnd( { tree: true } );
-              })
-              .catch(function(ex) { console.log('Task: Error creating new folder ', ex.stack); });
-            break;
-            case 'delete':
-              obj.deleteElement(command);
-            break;
-            case 'addScheduledJob':
-                /* { 
-                    scriptId: scriptId, 
-                    node: s, 
-                    scheduledBy: myparent.user.name,
-                    recur: command.recur, // [once, minutes, hourly, daily, weekly, monthly]
-                    interval: x,
-                    daysOfWeek: x, // only used for weekly recur val
-                    // onTheXDay: x, // only used for monthly
-                    startAt: x,
-                    endAt: x,
-                    runCountLimit: x,
-                    lastRun: x,
-                    nextRun: x,
-                    type: "scheduledJob"
-                } */
-                var sj = command.schedule;
-                
-                var sched = {
-                    scriptId: command.scriptId, 
-                    node: null, 
-                    scheduledBy: myparent.user.name,
-                    recur: sj.recur,
-                    interval: sj.interval,
-                    daysOfWeek: sj.dayVals,
-                    startAt: sj.startAt,
-                    endAt: sj.endAt,
-                    lastRun: null,
-                    nextRun: null,
-                    type: "jobSchedule"
-                };
-                var sel = command.nodes;
-                var proms = [];
-                if (Array.isArray(sel)) {
-                  sel.forEach(function(s) {
-                    var sObj = {...sched, ...{ node: s }};
-                    proms.push(obj.db.addJobSchedule( sObj ));
-                  });
-              } else { test.push(sObj);
-                  proms.push(obj.db.addJobSchedule( sObj ));
-                }
-                Promise.all(proms)
-                .then(function() {
-                    obj.makeJobsFromSchedules();
-                    return Promise.resolve();
-                })
-                .catch(function(ex) { console.log('Task: Error adding schedules. The error was: ', ex); });
-            break;
-            case 'runScript':
-              var scriptId = command.scriptId;
-              var sel = command.nodes;
-              var proms = [];
-              if (Array.isArray(sel)) {
-                sel.forEach(function(s) {
-                  proms.push(obj.db.addJob( { scriptId: scriptId, node: s, runBy: myparent.user.name } ));
-                });
-              } else {
-                proms.push(obj.db.addJob( { scriptId: scriptId, node: sel, runBy: myparent.user.name } ));
-              }
-              Promise.all(proms)
-              .then(function() {
-                  return obj.db.get(scriptId);
-              })
-              .then(function(scripts) {
-                  return obj.db.updateScriptJobName(scriptId, scripts[0].name);
-              })
-              .then(function() {
-                  obj.resetQueueTimer();
-                  obj.queueRun();
-                  obj.updateFrontEnd( { scriptId: scriptId, nodeId: command.currentNodeId } );
-              });
-            break;
-            case 'getScript':
-                //obj.debug('ScriptTask', 'getScript Triggered', JSON.stringify(command));
-                obj.db.get(command.scriptId)
-                .then(function(script) {
-                    myparent.send(JSON.stringify({ 
-                        action: 'task',
-                        subaction: 'cacheScript',
-                        nodeid: myparent.dbNodeKey,
-                        rights: true,
-                        sessionid: true,
-                        script: script[0]
-                    }));
-                });
-            break;
-            case 'jobComplete':
-                //obj.debug('ScriptTask', 'jobComplete Triggered', JSON.stringify(command));
-                var jobNodeHistory = null, scriptHistory = null;
-                var jobId = command.jobId, retVal = command.retVal, errVal = command.errVal, dispatchTime = command.dispatchTime;
-                var completeTime = Math.floor(new Date() / 1000);
-                obj.db.update(jobId, {
-                    completeTime: completeTime,
-                    returnVal: retVal,
-                    errorVal: errVal,
-                    dispatchTime: dispatchTime
-                })
-                .then(function() {
-                    return obj.db.get(jobId)
-                    .then(function(jobs) {
-                        return Promise.resolve(jobs[0].jobSchedule);
-                    })
-                    .then(function(sId) {
-                        if (sId == null) return Promise.resolve();
-                        return obj.db.update(sId, { lastRun: completeTime } )
-                        .then(function() {
-                            obj.makeJobsFromSchedules(sId);
-                        });
-                    });
-                })
-                .then(function() {
-                    obj.updateFrontEnd( { scriptId: command.scriptId, nodeId: myparent.dbNodeKey } );
-                })
-                .catch(function(ex) { console.log('Task: Failed to complete job. ', ex); });
-                // update front end by eventing
-            break;
-            case 'loadNodeHistory':
-                obj.updateFrontEnd( { nodeId: command.nodeId } );
-            break;
-            case 'loadScriptHistory':
-                obj.updateFrontEnd( { scriptId: command.scriptId } );
-            break;
-            case 'editScript':
-                obj.db.update(command.scriptId, { type: command.scriptType, name: command.scriptName, content: command.scriptContent })
-                .then(function() { obj.updateFrontEnd( { scriptId: command.scriptId, tree: true } ); });
-            break;
-            case 'clearAllPendingJobs':
-                obj.db.deletePendingJobsForNode(myparent.dbNodeKey);
-            break;
-            case 'loadVariables':
-                obj.updateFrontEnd( { variables: true } );
-            break;
-            case 'newVar':
-                obj.db.addVariable(command.name, command.scope, command.scopeTarget, command.value)
-                .then(function() { obj.updateFrontEnd( { variables: true } ); })
-            break;
-            case 'editVar':
-                obj.db.update(command.id, { 
-                    name: command.name, 
-                    scope: command.scope, 
-                    scopeTarget: command.scopeTarget,
-                    value: command.value
-                })
-                .then(function() { obj.updateFrontEnd( { variables: true } ); })
-            break;
-            case 'deleteVar':
-                obj.db.delete(command.id)
-                .then(function() { obj.updateFrontEnd( { variables: true } ); })
-            break;
-            default:
-                console.log('Task: unknown action');
-            break;
-        }
-    };
     
     return obj;
 }
\ No newline at end of file
diff --git a/views/default.handlebars b/views/default.handlebars
index e0ce4e73..7f9f9869 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -5537,25 +5537,7 @@
                 p2downloadDeviceInfo();
             } else if (op == 106) {
                 // Run commands
-                var wintype = false, linuxtype = false, agenttype = false, chkNodeIds = getCheckedDevices();
-                for (var i in chkNodeIds) {
-                    var n = getNodeFromId(chkNodeIds[i]);
-                    if (n.agent) { if ((GetNodeRights(n) & 24) == 24) { agenttype = true; } if ((n.agent.id > 0) && (n.agent.id < 5)) { wintype = true; } else { linuxtype = true; } }
-                }
-                if ((wintype == true) || (linuxtype == true) || (agenttype == true)) {
-                    var x = "Run commands on selected devices." + '<br />';
-                    x += '<select id=d2cmdtype onclick=d2runCommandValidate() style=width:100%;margin-bottom:4px;margin-top:4px>';
-                    if (wintype == true) { x += '<option value=1>' + "Windows Command Prompt" + '</option><option value=2>' + "Windows PowerShell" + '</option>'; }
-                    if (linuxtype == true) { x += '<option value=3>' + "Linux/BSD/macOS Command Shell" + '</option>'; }
-                    if (agenttype == true) { x += '<option value=4>' + "Agent Console" + '</option>'; } // MESHRIGHT_REMOTECONTROL & MESHRIGHT_AGENTCONSOLE are needed
-                    x += '</select>';
-                    x += '<select id=d2cmduser style=width:100%;margin-bottom:4px><option value=0>' + "Run as agent" + '</option><option value=1>' + "Run as user, agent if no user" + '</option><option value=2>' + "Must run as user" + '</option></select>';
-                    x += '<textarea id=d2runcmd style=background-color:#fcf3cf;width:100%;height:200px;resize:none;overflow-y:scroll></textarea>';
-                    setDialogMode(2, "Run Commands", 3, d2groupActionFunctionRunCommands, x);
-                    Q('d2runcmd').focus();
-                    //QE('idx_dlgOkButton', true);
-                    d2runCommandValidate();
-                }
+                d2runCommandDialog({ nodeids: getCheckedDevices(), title: "Run commands on selected devices.", func: uncheckAllDevices });
             } else if (op == 107) {
                 // Edit tags
                 var x = "Perform batch device tag operation" + '<br /><br />';
@@ -5611,7 +5593,6 @@
             }
         }
 
-        function d2runCommandValidate() { QV('d2cmduser', Q('d2cmdtype').value < 4); }
         function d2batchUploadValidate() { QE('idx_dlgOkButton', (Q('d2uploadinput').files.length != 0) && ((Q('d2winuploadpath') == null) || (Q('d2winuploadpath').value != '')) && ((Q('d2linuxuploadpath') == null) || (Q('d2linuxuploadpath').value != ''))); }
         function d2batchUploadValidateOk() { Q('d2batchUploadSubmit').click(); }
         function d2groupActionFunctionAgentUpdateExec() { meshserver.send({ action: 'updateAgents', nodeids: getCheckedDevices() }); }
@@ -5728,10 +5709,34 @@
 
         function d2groupActionFunctionDelCheck() { QE('idx_dlgOkButton', Q('d2check').checked); }
         function d2groupActionFunctionDelExec() { meshserver.send({ action: 'removedevices', nodeids: getCheckedDevices() }); uncheckAllDevices(); }
-        function d2groupActionFunctionRunCommands() {
+
+        function d2runCommandDialog(options) {
+            var wintype = false, linuxtype = false, agenttype = false;
+            for (var i in options.nodeids) {
+                var n = getNodeFromId(options.nodeids[i]);
+                if (n.agent) { if ((GetNodeRights(n) & 24) == 24) { agenttype = true; } if ((n.agent.id > 0) && (n.agent.id < 5)) { wintype = true; } else { linuxtype = true; } }
+            }
+            if ((wintype == true) || (linuxtype == true) || (agenttype == true)) {
+                var x = options.title + '<br />';
+                x += '<select id=d2cmdtype onclick=d2runCommandValidate() style=width:100%;margin-bottom:4px;margin-top:4px>';
+                if (wintype == true) { x += '<option value=1>' + "Windows Command Prompt" + '</option><option value=2>' + "Windows PowerShell" + '</option>'; }
+                if (linuxtype == true) { x += '<option value=3>' + "Linux/BSD/macOS Command Shell" + '</option>'; }
+                if (agenttype == true) { x += '<option value=4>' + "Agent Console" + '</option>'; } // MESHRIGHT_REMOTECONTROL & MESHRIGHT_AGENTCONSOLE are needed
+                x += '</select>';
+                x += '<select id=d2cmduser style=width:100%;margin-bottom:4px><option value=0>' + "Run as agent" + '</option><option value=1>' + "Run as user, agent if no user" + '</option><option value=2>' + "Must run as user" + '</option></select>';
+                x += '<textarea id=d2runcmd style=background-color:#fcf3cf;width:100%;height:200px;resize:none;overflow-y:scroll></textarea>';
+                setDialogMode(2, "Run Commands", 3, d2groupActionFunctionRunCommands, x, options);
+                Q('d2runcmd').focus();
+                //QE('idx_dlgOkButton', true);
+                d2runCommandValidate();
+            }
+        }
+        function d2runCommandValidate() { QV('d2cmduser', Q('d2cmdtype').value < 4); }
+        function d2groupActionFunctionRunCommands(b, options) {
             var type = 3;
             try { type = parseInt(Q('d2cmdtype').value); } catch (ex) { }
-            meshserver.send({ action: 'runcommands', nodeids: getCheckedDevices(), type: type, cmds: Q('d2runcmd').value, runAsUser: parseInt(Q('d2cmduser').value) }); uncheckAllDevices();
+            meshserver.send({ action: 'runcommands', nodeids: options.nodeids, type: type, cmds: Q('d2runcmd').value, runAsUser: parseInt(Q('d2cmduser').value) });
+            if (options.func) { options.func(); }
         }
 
         function onSortSelectChange(skipsave) {
@@ -7174,6 +7179,7 @@
                 if (((meshrights & (4 + 8 + 64 + 262144)) != 0) && (node.mtype < 3) && ((node.agent == null) || (node.agent.id != 34))) { x += '<input type=button value="' + "Actions" + '" title="' + "Perform power actions on the device" + '" onclick=deviceActionFunction() />'; }
                 x += '<input type=button value="' + "Notes" + '" title="' + "View notes about this device" + '" onclick=showNotes(' + ((meshrights & 128) == 0) + ',"' + encodeURIComponentEx(node._id) + '") />';
                 x += '<input type=button value="' + "Log Event" + '" title="' + "Write an event for this device" + '" onclick=writeDeviceEvent("' + encodeURIComponentEx(node._id) + '") />';
+                if ((node.mtype == 2) && (connectivity & 1) && (meshrights == 0xFFFFFFFF)) { x += '<input type=button value="' + "Run" + '" title="' + "Run commands on this device" + '" onclick=runDeviceCmd("' + encodeURIComponentEx(node._id) + '") />'; }
                 if (node.mtype != 4) {
                     if ((meshrights & 8) && ((connectivity & 1) || ((node.pmt == 1) && ((features2 & 2) != 0)))) { x += '<input type=button value="' + "Message" + '" title="' + "Display a text message on the remote device" + '" onclick=deviceMessageFunction() />';  }
                     //if ((connectivity & 1) && (meshrights & 8) && (node.agent.id < 5)) { x += '<input type=button value=Toast title="' + "Display a text message of the remote device" + '" onclick=deviceToastFunction() />';  }
@@ -7632,6 +7638,12 @@
             return str.join(', ');
         }
 
+        // Run commands on current device
+        function runDeviceCmd(nodeid) {
+            if (xxdialogMode) return;
+            d2runCommandDialog({ nodeids: [ decodeURIComponent(nodeid) ], title: "Run commands on this device." });
+        }
+
         function writeDeviceEvent(nodeid) {
             if (xxdialogMode) return;
             setDialogMode(2, "Add Device Event", 3, writeDeviceEventEx, '<textarea id=d2devEvent style=background-color:#fcf3cf;width:100%;height:200px;resize:none;overflow-y:scroll></textarea><span style=font-size:10px>' + "This will add an entry to this device's event log." + '<span>', nodeid);
diff --git a/views/task-schedule.handlebars b/views/task-schedule.handlebars
deleted file mode 100644
index 228d8a96..00000000
--- a/views/task-schedule.handlebars
+++ /dev/null
@@ -1,249 +0,0 @@
-<html>
-<head>
-    <script type="text/javascript" src="scripts/common-0.0.1.js"></script>
-    <link rel="stylesheet" type="text/css" href="/public/tail.DateTime/tail.datetime-default-blue.min.css" />
-    <style>
-        body {
-            font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-            color: white;
-        }
-
-        #scriptContent {
-            width: 80%;
-            height: 80%;
-        }
-
-        #schedContentC {
-            padding: 20px;
-        }
-
-        #controlBar button {
-            cursor: pointer;
-        }
-
-        #scriptNameC {
-            padding: 20px;
-        }
-
-        #scriptName {
-            width: 300px;
-        }
-
-        #controlBar {
-            padding: 5px;
-            padding-left: 20px;
-        }
-
-        #left {
-            height: 100%;
-            width: 25%;
-            float: left;
-        }
-
-        #right {
-            height: 100%;
-            width: 75%;
-            float: right;
-        }
-
-        body {
-            background-color: #036;
-        }
-
-        #intervalListC {
-            list-style-type: none;
-        }
-
-        #daysListC {
-            list-style-type: none;
-        }
-
-        .rOpt {
-            height: 40px;
-        }
-
-        #daysListC {
-            display: inline-grid;
-        }
-
-        li {
-            padding: 2px;
-        }
-    </style>
-</head>
-<body onload="doOnLoad();">
-    <script type="text/javascript" src="/public/tail.DateTime/tail.datetime.min.js"></script>
-    <div id="scriptTaskSchedule">
-        <div id="controlBar">
-            <button onclick="goSave();">Schedule</button>
-            <button onclick="goCancel();">Cancel</button>
-        </div>
-        <div id="schedContentC">
-            <div id="left">
-                <span class="oTitle">Recurrence</span>
-                <ul id="intervalListC">
-                    <li><label><input onclick="intervalSelected(this);" type="radio" checked name="recur" value="once">Once</label></li>
-                    <li><label><input onclick="intervalSelected(this);" type="radio" name="recur" value="minutes">Minutes</label></li>
-                    <li><label><input onclick="intervalSelected(this);" type="radio" name="recur" value="hourly">Hourly</label></li>
-                    <li><label><input onclick="intervalSelected(this);" type="radio" name="recur" value="daily">Daily</label></li>
-                    <li><label><input onclick="intervalSelected(this);" type="radio" name="recur" value="weekly">Weekly</label></li>
-                    <!-- li><label><input type="radio" name="recur" value="monthly">Monthly</label></li -->
-                </ul>
-            </div>
-            <div id="right">
-                <div class="rOpt">
-                    <span class="oTitle">Start: </span>
-                    <input type="text" class="datePick" id="startDate" value="" />
-                    <input type="text" class="timePick" id="startTime" value="" />
-                </div>
-                <div class="rOpt" id="intervalC" style="display: none;">
-                    <span class="oTitle">Every: </span>
-                    <input type="text" id="interval" value="1" />&nbsp;<span id="hintText"></span>
-                </div>
-                <div class="rOpt" id="endC" style="display: none;">
-                    <span class="oTitle">End: </span>
-                    <input type="text" class="datePick" id="endDate" value="" />
-                    <input type="text" class="timePick" id="endTime" value="" />
-                    <label><input type="checkbox" id="endNever" checked onclick="checkEndNever(this);" /> Never</label>
-                </div>
-                <div class="rOpt" id="daysC" style="display: none;">
-                    <span class="oTitle">Days: </span>
-                    <ul id="daysListC">
-                        <li><label><input type="checkbox" name="days[]" value="0"> Sunday</label></li>
-                        <li><label><input type="checkbox" name="days[]" value="1"> Monday</label></li>
-                        <li><label><input type="checkbox" name="days[]" value="2"> Tuesday</label></li>
-                        <li><label><input type="checkbox" name="days[]" value="3"> Wednesday</label></li>
-                        <li><label><input type="checkbox" name="days[]" value="4"> Thursday</label></li>
-                        <li><label><input type="checkbox" name="days[]" value="5"> Friday</label></li>
-                        <li><label><input type="checkbox" name="days[]" value="6"> Saturday</label></li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script type="text/javascript">
-
-        function checkEndNever(el) {
-            if (el.checked) {
-                Q('endDate').value = '';
-                Q('endTime').value = '';
-            }
-        }
-        function setTimePick() {
-            var d = new Date();
-            document.getElementById("startDate").value = d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate();
-            document.getElementById("startTime").value = d.getHours() + ':' + d.getMinutes();
-            tail.DateTime(".datePick", { position: "bottom", dateStart: Date(), timeFormat: false });
-            tail.DateTime(".timePick", { position: "bottom", dateFormat: false, timeFormat: "HH:ii", timeStepMinutes: 15 });
-            tail.datetime.inst[document.getElementById('endDate').getAttribute('data-tail-datetime')].on('change', function () {
-                document.getElementById('endNever').checked = false;
-            });
-            tail.datetime.inst[document.getElementById('endTime').getAttribute('data-tail-datetime')].on('change', function () {
-                document.getElementById('endNever').checked = false;
-            });
-        }
-
-        function doOnLoad() {
-            try {
-                if (scriptId == null) {
-                    alert('Page reloaded and data lost. Please re-run scheduler from the main window.');
-                    goCancel();
-                    return;
-                }
-            } catch (e) {
-                alert('Page reloaded and data lost. Please re-run scheduler from the main window.');
-                goCancel();
-                return;
-            }
-            setTimePick();
-        }
-
-        function intervalSelected(el) {
-            var v = el.value;
-            switch (v) {
-                case 'once':
-                    QV('intervalC', false);
-                    QV('endC', false);
-                    QV('daysC', false);
-                    break;
-                case 'minutes':
-                    QV('intervalC', true);
-                    QV('endC', true);
-                    QV('daysC', false);
-                    QH('hintText', 'minute(s)');
-                    break;
-                case 'hourly':
-                    QV('intervalC', true);
-                    QV('endC', true);
-                    QV('daysC', false);
-                    QH('hintText', 'hour(s)');
-                    break;
-                case 'daily':
-                    QV('intervalC', true);
-                    QV('endC', true);
-                    QV('daysC', false);
-                    QH('hintText', 'day(s)');
-                    break;
-                case 'weekly':
-                    QV('intervalC', true);
-                    QV('endC', true);
-                    QV('daysC', true);
-                    QH('hintText', 'week(s)');
-                    break;
-            }
-        }
-        function goSave() {
-            var o = {};
-            var recurEls = document.getElementsByName("recur");
-            recurEls.forEach(function (el) {
-                if (el.checked) o.recur = el.value;
-            });
-            switch (o.recur) {
-                case 'once':
-                    o.startAt = Date.parse(Q('startDate').value + ' ' + Q('startTime').value);
-                    o.startAt = Math.floor(o.startAt / 1000);
-                    break;
-                case 'minutes':
-                case 'hourly':
-                case 'daily':
-                    o.startAt = Date.parse(Q('startDate').value + ' ' + Q('startTime').value);
-                    o.startAt = Math.floor(o.startAt / 1000);
-                    o.interval = Number(Q('interval').value);
-                    if (Q('endNever').checked) o.endAt = null;
-                    else {
-                        o.endAt = Date.parse(Q('endDate').value + ' ' + Q('endTime').value);
-                        o.endAt = Math.floor(o.endAt / 1000);
-                    }
-                    break;
-                case 'weekly':
-                    o.startAt = Date.parse(Q('startDate').value + ' ' + Q('startTime').value);
-                    o.startAt = Math.floor(o.startAt / 1000);
-                    o.interval = Number(Q('interval').value);
-                    if (Q('endNever').checked) o.endAt = null;
-                    else {
-                        o.endAt = Date.parse(Q('endDate').value + ' ' + Q('endTime').value);
-                        o.endAt = Math.floor(o.endAt / 1000);
-                    }
-                    var dayEls = document.getElementsByName("days[]");
-                    o.dayVals = [];
-                    if (dayEls.length) {
-                        dayEls.forEach(function (de) {
-                            if (de.checked) o.dayVals.push(de.value);
-                        });
-                    }
-                    break;
-            }
-            o.scriptId = scriptId;
-            o.nodes = nodes;
-
-            window.opener.schedCallback(o);
-            window.close();
-        }
-
-        function goCancel() {
-            window.close();
-        }
-
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/views/task-scriptedit.handlebars b/views/task-scriptedit.handlebars
deleted file mode 100644
index 0e79eaaf..00000000
--- a/views/task-scriptedit.handlebars
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-    <script type="text/javascript" src="scripts/common-0.0.1.js"></script>
-    <style>
-        body {
-            font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-            color: white;
-        }
-
-        #scriptContent {
-            width: 80%;
-            height: 80%;
-        }
-
-        #scriptContentC {
-            padding: 20px;
-        }
-
-        #controlBar button {
-            cursor: pointer;
-        }
-
-        #scriptNameC {
-            padding: 20px;
-        }
-
-        #scriptName {
-            width: 300px;
-        }
-
-        #controlBar {
-            padding: 5px;
-            padding-left: 20px;
-        }
-
-        body {
-            background-color: #036;
-        }
-    </style>
-</head>
-<body onload="doOnLoad();">
-    <div id="scriptTaskScriptEdit">
-        <div id="scriptNameC">Script Name: <input type="text" value="" id="scriptName" /></div>
-        <div id="controlBar">
-            <button onclick="goSave();">Save</button>
-            <button onclick="goClose();">Close</button>
-        </div>
-        <div id="scriptContentC">
-            <textarea id="scriptContent"></textarea>
-        </div>
-    </div>
-    <script type="text/javascript">
-        var scriptData = {{{scriptData}}};
-
-        function doOnLoad() {
-            //QH('scriptContent', scriptData.content);
-            Q('scriptContent').value = scriptData.content;
-            Q('scriptName').value = scriptData.name;
-        }
-
-        function goSave() {
-            scriptData.content = Q('scriptContent').value;
-            scriptData.name = Q('scriptName').value;
-            window.opener.callback(scriptData);
-            //goClose();
-        }
-
-        function goClose() {
-            window.close();
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/views/task-user.handlebars b/views/task-user.handlebars
deleted file mode 100644
index b1c70b30..00000000
--- a/views/task-user.handlebars
+++ /dev/null
@@ -1,1070 +0,0 @@
-<html>
-<head>
-    <script type="text/javascript" src="scripts/common-0.0.1.js"></script>
-    <style>
-        body {
-            font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-        }
-
-        #dropBlock {
-            /*background-color: gray;
-        text-align: center;
-        height: 100%;
-        width: 100%;
-        position: absolute;
-        float:left;*/
-            width: 100%;
-            overflow: hidden;
-            position: absolute;
-            right: 437px;
-            padding-top: 100px;
-            text-align: center;
-            font-size: 1600%;
-            color: #AAA;
-        }
-
-        #scripts_endpoints {
-            width: 100%;
-            height: 100%;
-        }
-
-        #scriptContainer {
-            width: 35%;
-            height: 100%;
-            float: left;
-        }
-
-        #infoContainer {
-            width: 65%;
-            height: 100%;
-            float: right;
-            border-left: 1px;
-        }
-
-        .lifolder {
-            background: url(data:image/gif;base64,R0lGODlhEAAQAJEDAM2xV/Xur+XPgP///yH5BAEAAAMALAAAAAAQABAAAAJD3ISZIGHWUGihznesYDYATFVM+D2hJ4lgN1olxALAtAlmPCJvuMmJd6PJckDYwicrHhTD5o7plJmg0Uc0asNMkphHAQA7) no-repeat 16px;
-            padding-left: 35px;
-            cursor: pointer;
-            border: none;
-            margin-top: 1px;
-        }
-
-        .liscript {
-            background: url(data:image/gif;base64,R0lGODlhEAAQAJEDAPb19IGBgbq6uv///yH5BAEAAAMALAAAAAAQABAAAAIy3ISpxgcPH2ouQgFEw1YmxnUXKEaaEZZnVWZk66JwzKpvuwZzwOgwb/C1gIOA8Yg8DgoAOw==) no-repeat 16px;
-            padding-left: 35px;
-            cursor: pointer;
-            border: none;
-            margin-top: 1px;
-        }
-
-        .liselected {
-            background-color: lightgray;
-        }
-
-        #controlBar {
-            width: 100%;
-            height: 20px;
-            border-bottom: 1px solid black;
-            font-size: smaller;
-            margin-bottom: 7px;
-        }
-
-            #controlBar span {
-                cursor: pointer;
-                padding-left: 4px;
-                padding-right: 4px;
-            }
-
-            #controlBar > span:nth-child(n+2) {
-                border-left: 1px solid black;
-            }
-
-        .infoBar {
-            background-color: #777;
-            color: white;
-            cursor: pointer;
-            padding: 10px;
-            width: 100%;
-            border: none;
-            text-align: left;
-            outline: none;
-            font-size: 15px;
-        }
-
-            .infoBar.active, .infoBar:hover {
-                background-color: #555;
-            }
-
-        .infoContent {
-            display: none;
-        }
-
-        #nHistTbl, #sHistTbl, #nSchTbl, #sSchTbl, #varTbl {
-            font-size: smaller;
-            width: 100%;
-        }
-
-            #nHistTbl td, #sHistTbl td, #nSchTbl td, #sSchTbl td, #varTbl td {
-                padding-left: 5px;
-                padding-right: 5px;
-            }
-
-        .stNHRow, .stSHRow, .stNSRow, .stSSRow {
-            height: 36px;
-            max-height: 40px;
-            width: 100%;
-        }
-
-            .stNHRow:nth-child(odd) {
-                background-color: #CCC;
-            }
-
-            .stSHRow:nth-child(odd) {
-                background-color: #CCC;
-            }
-
-            .stNSRow:nth-child(odd) {
-                background-color: #CCC;
-            }
-
-            .stSSRow:nth-child(odd) {
-                background-color: #CCC;
-            }
-
-        .stVRow:nth-child(odd) {
-            background-color: #CCC;
-        }
-
-        .delSched {
-            cursor: pointer;
-        }
-
-        .nIcon {
-            width: 16px;
-            margin-top: 1px;
-            margin-left: 2px;
-            height: 16px;
-            display: inline-block;
-            margin-right: 10px;
-        }
-
-        .j1 {
-            background: url(../images/icons16.png) 0px 0px;
-            height: 16px;
-            width: 16px;
-            border: none;
-        }
-
-        .j2 {
-            background: url(../images/icons16.png) -16px 0px;
-            height: 16px;
-            width: 16px;
-            border: none;
-        }
-
-        .j3 {
-            background: url(../images/icons16.png) -32px 0px;
-            height: 16px;
-            width: 16px;
-            border: none;
-        }
-
-        .j4 {
-            background: url(../images/icons16.png) -48px 0px;
-            height: 16px;
-            width: 16px;
-            border: none;
-        }
-
-        .j5 {
-            background: url(../images/icons16.png) -64px 0px;
-            height: 16px;
-            width: 16px;
-            border: none;
-        }
-
-        .j6 {
-            background: url(../images/icons16.png) -80px 0px;
-            height: 16px;
-            width: 16px;
-            border: none;
-        }
-
-        .ftype {
-            font-size: small;
-        }
-
-        .tblFloat {
-            float: left;
-            width: 33%;
-        }
-
-        .flink {
-            cursor: pointer;
-        }
-    </style>
-</head>
-<body onload="doOnLoad();">
-    <div id="scriptTaskUser">
-        <div id="dropBlock" style="display:none;"><b>&checkmark;</b></div>
-        Upload: <input type="file" id="files" name="files[]" multiple onchange="fileUpload();" />
-        <hr />
-        <div id="controlBar">
-            <span onclick="goNew();">New</span>
-            <span onclick="goRename();">Rename</span>
-            <span onclick="goEdit();">Edit</span>
-            <span onclick="goDelete();">Delete</span>
-            <span onclick="goNewFolder();">New Folder</span>
-            <span onclick="goDownload();">Download</span>
-            <span onclick="goRun();">Run</span>
-        </div>
-        <div id="scripts_endpoints">
-            <div id="scriptContainer">
-            </div>
-            <div id="infoContainer">
-                <div id="history">
-                    <div class="infoBar">Advanced Run</div>
-                    <div id="multiRun" class="infoContent">
-                        <div style="padding-top: 15px;"><button onclick="goAdvancedRun();">Schedule on Selected</button></div>
-                        <div class="tblFloat">
-                            <table id="mRunTbl" cellspacing="0" cellpadding="0">
-                                <tr><td><label><input type="checkbox" onclick="selAllNodes(this);"> Select All</label></td></tr>
-                            </table>
-                        </div>
-                        <div class="tblFloat">
-                            <table id="mRunTblMesh" cellspacing="0" cellpadding="0">
-                                <tr><td>Meshes</td></tr>
-                            </table>
-                        </div>
-                        <div class="tblFloat">
-                            <table id="mRunTblTag" cellspacing="0" cellpadding="0">
-                                <tr><td>Tags</td></tr>
-                            </table>
-                        </div>
-                    </div>
-                    <div class="infoBar">Node Schedules</div>
-                    <div id="nSch" class="infoContent">
-                        <table id="nSchTbl" cellspacing="0" cellpadding="0">
-                            <th>Script</th>
-                            <th>Author</th>
-                            <th>Every</th>
-                            <th>Starting</th>
-                            <th>Ending</th>
-                            <th>Last Run</th>
-                            <th>Next Run</th>
-                            <th>Action</th>
-                        </table>
-                    </div>
-                    <div class="infoBar">Script Schedules</div>
-                    <div id="sSch" class="infoContent">
-                        <table id="sSchTbl" cellspacing="0" cellpadding="0">
-                            <th>Node</th>
-                            <th>Author</th>
-                            <th>Every</th>
-                            <th>Starting</th>
-                            <th>Ending</th>
-                            <th>Last Run</th>
-                            <th>Next Run</th>
-                            <th>Action</th>
-                        </table>
-                    </div>
-                    <div class="infoBar">Node History</div>
-                    <div id="nodeHistory" class="infoContent">
-                        <table id="nHistTbl" cellspacing="0" cellpadding="0">
-                            <th>Time</th>
-                            <th>Run By</th>
-                            <th>Script</th>
-                            <th>Status</th>
-                            <th>Return Value</th>
-                        </table>
-                    </div>
-                    <div class="infoBar">Script History</div>
-                    <div id="scriptHistory" class="infoContent">
-                        <table id="sHistTbl" cellspacing="0" cellpadding="0">
-                            <th>Time</th>
-                            <th>Run By</th>
-                            <th>Node</th>
-                            <th>Status</th>
-                            <th>Return Value</th>
-                        </table>
-                    </div>
-                    <div class="infoBar">Variables</div>
-                    <div id="variables" class="infoContent">
-                        <table id="varTbl" cellspacing="0" cellpadding="0">
-                            <th>Variable Name</th>
-                            <th>Value</th>
-                            <th>Scope</th>
-                            <th>Scope Target</th>
-                            <th>Action</th>
-                        </table>
-                        <br />
-                        <span class="flink" onclick="newVar();return false;">[+]</span>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </div>
-    <script type="text/javascript">
-        var scriptTree = {{{scriptTree}}};
-        var elementDragged = false;
-        var dragCounter = 0;
-        var draggedId = null;
-        var nodesObj = {};
-        var variables = [];
-        var varScopes = { global: 'Global', script: 'Script', mesh: 'Mesh', node: 'Node' };
-
-        function onlyUnique(value, index, self) {
-            return self.indexOf(value) === index;
-        }
-        function resizeIframe() {
-            document.body.style.height = 0;
-            parent.pluginHandler.scripttask.resizeContent();
-        }
-        function updateNodesTable() {
-            let dRows = document.querySelectorAll('.stNodeRow');
-            dRows.forEach((r) => {
-                r.parentNode.removeChild(r);
-            });
-            var tagList = [];
-            var nodeRowIns = document.querySelector('#mRunTbl');
-            parent.nodes.forEach(function(i) {
-                var item = {...i, ...{}};
-                if (item.mtype == 2) {
-                    item.meshName = parent.meshes[item['meshid']].name;
-                    if (item._id == parent.currentNode._id) item.checked = 'checked '; else item.checked = '';
-                    let tpl = `<tr class="stNodeRow"><td><label><input type="checkbox" ${item.checked} name="runOn[]" value="${item._id}"> <div class="nIcon j${item.icon}"></div>${item.name}</label></td></tr>`;
-                    nodeRowIns.insertAdjacentHTML('beforeend', tpl);
-                    if (i.tags && i.tags.length) item.tags.forEach(function(t) { tagList.push(t) });
-                    nodesObj[i._id] = i;
-                }
-            });
-            tagList = tagList.filter(onlyUnique); tagList = tagList.sort();
-            var nodeRowIns = document.querySelector('#mRunTblMesh');
-            for (const i in parent.meshes) { // parent.meshes.forEach(function(i) {
-                var item = {...parent.meshes[i], ...{}};
-                if (item.mtype == 2) {
-                    let tpl = `<tr class="stNodeRow"><td><label><input type="checkbox" onclick="selNodesByMesh(this);" value="${item._id}"> ${item.name}</label></td></tr>`;
-                    nodeRowIns.insertAdjacentHTML('beforeend', tpl);
-                }
-            }
-            var nodeRowIns = document.querySelector('#mRunTblTag');
-            tagList.forEach(function(i) {
-                let tpl = `<tr class="stNodeRow"><td><label><input type="checkbox" onclick="selNodesByTag(this)" value="${i}"> ${i}</label></td></tr>`;
-                nodeRowIns.insertAdjacentHTML('beforeend', tpl);
-            });
-        }
-
-        function selNodesByTag(el) {
-            var t = el.value;
-            var allNodes = Q('mRunTbl').querySelectorAll('input[type="checkbox"][name="runOn[]"]');
-            var checked = false;
-            if (el.checked) checked = true;
-            allNodes.forEach(function(n) {
-                if (nodesObj[n.value].tags && nodesObj[n.value].tags.indexOf(t) > -1) n.checked = checked;
-            });
-            return true;
-        }
-        function selNodesByMesh(el) {
-            var mid = el.value;
-            var allNodes = Q('mRunTbl').querySelectorAll('input[type="checkbox"][name="runOn[]"]');
-            var checked = false;
-            if (el.checked) checked = true;
-            allNodes.forEach(function(n) {
-                if (nodesObj[n.value].meshid == mid) n.checked = checked;
-            });
-            return true;
-        }
-        function selAllNodes(el) {
-            var allNodes = Q('mRunTbl').querySelectorAll('input[type="checkbox"][name="runOn[]"]');
-            var checked = false;
-            if (el.checked) checked = true;
-            allNodes.forEach(function(n) {
-                n.checked = checked;
-            });
-            return true;
-        }
-
-        function doOnLoad() {
-            redrawScriptTree();
-            selectPreviouslySelectedScript();
-            updateNodesTable();
-            parent.meshserver.send({ 'action': 'plugin', 'plugin': 'scripttask', 'pluginaction': 'loadNodeHistory', 'nodeId': parent.currentNode._id });
-            parent.meshserver.send({ 'action': 'plugin', 'plugin': 'scripttask', 'pluginaction': 'loadVariables', 'nodeId': parent.currentNode._id });
-        }
-
-        function selectPreviouslySelectedScript() {
-            var sel_item = parent.getstore('_scripttask_sel_item', null)
-            if (sel_item != null) {
-                var s = document.getElementById(sel_item);
-                if (s != null) {
-                    s.classList.toggle('liselected');
-                    goScript(s);
-                }
-            }
-            if (sel_item != null)   parent.meshserver.send({ 'action': 'plugin', 'plugin': 'scripttask', 'pluginaction': 'loadScriptHistory', 'scriptId': sel_item });
-        }
-
-        function goRun() {
-            var selScript = document.querySelectorAll('.liselected');
-            if (selScript.length) {
-                var scriptId = selScript[0].getAttribute('x-data-id');
-                if (scriptId == selScript[0].getAttribute('x-folder-id'))
-                {
-                    parent.setDialogMode(2, "Oops!", 1, null, 'Please select a script. A folder is currently selected.');
-                }
-                else {
-                    parent.meshserver.send({ 'action': 'plugin', 'plugin': 'scripttask', 'pluginaction': 'runScript', 'scriptId': scriptId, 'nodes': [ parent.currentNode._id ], 'currentNodeId': parent.currentNode._id });
-                }
-            } else {
-                parent.setDialogMode(2, "Oops!", 1, null, 'No script has been selected to run on the machines.');
-            }
-        }
-
-        function goEdit() {
-            var selScript = document.querySelectorAll('.liselected');
-            if (selScript.length && (selScript[0].getAttribute('x-data-id') != selScript[0].getAttribute('x-data-folder'))) {
-                var scriptId = selScript[0].getAttribute('x-data-id');
-                window.open('/pluginadmin.ashx?pin=scripttask&user=1&edit=1&id=' + scriptId, '_blank');
-                window.callback = function(sd) {
-                    parent.meshserver.send({ 'action': 'plugin', 'plugin': 'scripttask', 'pluginaction': 'editScript', 'scriptId': sd._id, 'scriptType': sd.type, 'scriptName': sd.name, 'scriptContent': sd.content, 'currentNodeId': parent.currentNode._id });
-                };
-            } else {
-                parent.setDialogMode(2, "Oops!", 1, null, 'No script has been selected to edit.');
-            }
-        }
-
-        function goAdvancedRun() {
-            var cboxes = document.getElementsByName("runOn[]");
-            var sel = [];
-
-            cboxes.forEach((n) => {
-                if (n.checked) sel.push(n.value);
-            });
-            if (sel.length == 0) {
-                parent.setDialogMode(2, "Oops!", 1, null, 'No machines have been selected.');
-                return;
-            }
-            var selScript = document.querySelectorAll('.liselected');
-            if (selScript.length) {
-                var scriptId = selScript[0].getAttribute('x-data-id');
-                var sWin = window.open('/pluginadmin.ashx?pin=scripttask&user=1&schedule=1', 'schedule', "width=800,height=600");
-                sWin.scriptId = scriptId;
-                sWin.nodes = sel;
-                window.schedCallback = function(opts) {
-                    parent.meshserver.send({
-                        'action': 'plugin',
-                        'plugin': 'scripttask',
-                        'pluginaction': 'addScheduledJob',
-                        'scriptId': opts.scriptId,
-                        'nodes': opts.nodes,
-                        'currentNodeId': parent.currentNode._id,
-                        'schedule': opts
-                    });
-                };
-            } else {
-                parent.setDialogMode(2, "Oops!", 1, null, 'No script has been selected to run on the machines.');
-            }
-        }
-
-        var coll = document.getElementsByClassName("infoBar");
-        for (var i = 0; i < coll.length; i++) {
-            coll[i].addEventListener("click", function() {
-                this.classList.toggle("active");
-                var content = this.nextElementSibling;
-                if (content.style.display === "block") {
-                    content.style.display = "none";
-                } else {
-                    content.style.display = "block";
-                }
-                content.style.maxHeight = '300px';
-                content.style.overflowY = 'scroll';
-                resizeIframe();
-            });
-        }
-
-        function goDownload() {
-            var isSelected = document.querySelectorAll('.liselected');
-            if (isSelected.length == 0) return;
-            var sel = isSelected[0];
-            var id = sel.getAttribute('x-data-id');
-            if (id == sel.getAttribute('x-data-folder')) return;
-            window.location = '/pluginadmin.ashx?pin=scripttask&user=1&dl='+id;
-        }
-        function addScript(name, content, path) {
-            // file type testing
-            var n = name.split('.').pop().toLowerCase();
-            if (content.split('\n')[0][0] == '#' && content.split('\n')[0][1] == '!') n = 'bash';
-            if (['ps1', 'bat', 'bash'].indexOf(n) !== -1) {
-                parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'addScript', name: name, content: content, path: path, filetype: n });
-            }
-            else {
-                parent.setDialogMode(2, "Oops!", 1, null, 'Currently accepted filetypes are .ps1, .bat, and bash scripts.');
-            }
-        }
-        function redrawScriptTree() {
-            var lastpath = null;
-            var str = '';
-            var indent = 0;
-            var folder_id = null;
-            scriptTree.forEach(function(f) {
-                if (f.path != lastpath && f.type == 'folder') {
-                    indent = (f.path.match(/\//g) || []).length + 1;
-                    var name = f.path.match(/[^\/]+$/);
-                    folder_id = f._id;
-                    str += '<div draggable="true" x-data-path="' + f.path + '" x-data-id="' + f._id + '" x-data-folder="' + folder_id + '" style="margin-left: ' + indent + 'em;" class="lifolder" onclick="toggleCollapse(this);"><span class="fname">' + name + '</span></div>';
-                    lastpath = f.path;
-                    indent += 1;
-                }
-                if (f.type != 'folder') {
-                    str += '<div id="' + f._id + '" draggable="true"  x-data-path="' + f.path + '" x-data-id="' + f._id + '" x-data-folder="' + folder_id + '" style="margin-left: ' + indent + 'em;" class="liscript" onclick="goScript(this);"><span class="fname">' + f.name + '</span> [<span class="ftype">' + f.filetype + '</span>]</div>';
-                }
-                document.getElementById('scriptContainer').innerHTML = str;
-            });
-
-            var liScripts = document.querySelectorAll('.liscript');
-            var liFolders = document.querySelectorAll('.lifolder');
-            liScripts.forEach(function(el) {
-                el.addEventListener('mousedown', function() { elementDragged = true; });
-                el.addEventListener('mouseup', function() { elementDragged = false; });
-                el.addEventListener('dragstart', function(evt) { evt.dataTransfer.setData('text/plain', evt.target.getAttribute('x-data-id')); });
-            });
-            liFolders.forEach(function(el) {
-                el.addEventListener('drop', dropMove);
-                el.addEventListener('dragover', function(e) { e.preventDefault(); });
-                el.addEventListener('mousedown', function() { elementDragged = true; });
-                el.addEventListener('mouseup', function() { elementDragged = false; });
-                el.addEventListener('dragstart', function(evt) { evt.dataTransfer.setData('text/plain', evt.target.getAttribute('x-data-id')); });
-            });
-            resizeIframe();
-            selectPreviouslySelectedScript();
-        }
-        parent.pluginHandler.scripttask.newScriptTree = function(message) {
-            scriptTree = message.event.tree;
-            redrawScriptTree();
-        }
-        parent.pluginHandler.scripttask.loadHistory = function(message) {
-            // cache script names
-            var nNames = {};
-            parent.nodes.forEach(function(n){
-                nNames[n._id] = n.name;
-            });
-            if (message.event.nodeHistory != null && message.event.nodeId == parent.currentNode._id) {
-                var nHistTbl = document.getElementById('nHistTbl');
-                var rows = nHistTbl.querySelectorAll('.stNHRow');
-                if (rows.length) {
-                    rows.forEach(function(r) {
-                        r.parentNode.removeChild(r);
-                    });
-                }
-                if (message.event.nodeHistory.length) {
-                    message.event.nodeHistory.forEach(function(nh) {
-                        nh.latestTime = Math.max(nh.completeTime, nh.queueTime, nh.dispatchTime, nh.dontQueueUntil);
-                    });
-                    message.event.nodeHistory.sort((a, b) => (a.latestTime < b.latestTime) ? 1 : -1);
-                    message.event.nodeHistory.forEach(function(nh) {
-                        nh = prepHistory(nh);
-                        let tpl = '<td>' + nh.timeStr + '</td> \
-                    <td>' + nh.runBy + '</td> \
-                    <td>' + nh.scriptName + '</td> \
-                    <td>' + nh.statusTxt + '</td> \
-                    <td>' + nh.returnTxt + '</td>';
-                        let tr = nHistTbl.insertRow(-1);
-                        tr.innerHTML = tpl;
-                        tr.classList.add('stNHRow');
-                    });
-                }
-            }
-            var currentScript = document.getElementById('scriptHistory');
-            var currentScriptId = currentScript.getAttribute('x-data-id');
-            if (message.event.scriptHistory != null && message.event.scriptId == currentScriptId) {
-                var sHistTbl = document.getElementById('sHistTbl');
-                var rows = sHistTbl.querySelectorAll('.stSHRow');
-                if (rows.length) {
-                    rows.forEach(function(r) {
-                        r.parentNode.removeChild(r);
-                    });
-                }
-                if (message.event.scriptHistory.length) {
-                    message.event.scriptHistory.forEach(function(nh) {
-                        nh.latestTime = Math.max(nh.completeTime, nh.queueTime, nh.dispatchTime, nh.dontQueueUntil);
-                    });
-                    message.event.scriptHistory.sort((a, b) => (a.latestTime < b.latestTime) ? 1 : -1);
-                    message.event.scriptHistory.forEach(function(nh) {
-                        nh = prepHistory(nh);
-                        let tpl = '<td>' + nh.timeStr + '</td> \
-                    <td>' + nh.runBy + '</td> \
-                    <td>' + nNames[nh.node] + '</td> \
-                    <td>' + nh.statusTxt + '</td> \
-                    <td>' + nh.returnTxt + '</td>';
-                        let tr = sHistTbl.insertRow(-1);
-                        tr.innerHTML = tpl;
-                        tr.classList.add('stSHRow');
-                    });
-                }
-            }
-            resizeIframe();
-        }
-        function prepHistory(nh) {
-            var nowTime = Math.floor(new Date() / 1000);
-            var d = new Date(0);
-            d.setUTCSeconds(nh.latestTime);
-            nh.timeStr = d.toLocaleString();
-            if (nh.errorVal != null) { nh.returnTxt = nh.errorVal; } else { nh.returnTxt = nh.returnVal; }
-            nh.statusTxt = 'Queued';
-            if (nh.dispatchTime != null) nh.statusTxt = 'Running';
-            if (nh.errorVal != null) nh.statusTxt = 'Error';
-            if (nh.returnVal != null) nh.statusTxt = 'Completed';
-            if (nh.dontQueueUntil > nowTime) nh.statusTxt = 'Scheduled';
-            if (nh.returnTxt == null) nh.returnTxt = '&nbsp;';
-            if (nh.statusTxt == 'Completed') {
-                nh.statusTxt = '<span title="Completed ' + secondsToHms((nh.completeTime - nh.dispatchTime)) + '">' + nh.statusTxt + '</span>';
-            }
-            if (isJsonString(nh.returnTxt)) {
-                try {
-                    nh.returnObj = JSON.parse(nh.returnTxt);
-                    nh.returnTxt = 'Object: ';
-                    nh.returnTxt += '' + JSON.stringify(nh.returnObj, null, 2);
-                    nh.returnTxt = nh.returnTxt.replace(/\n\s*\n/g, '\n');
-                    nh.returnTxt = nh.returnTxt.replace(/(?:\r\n|\r|\n)/g, '<br />');
-                } catch(e) { }
-            } else {
-                if (typeof nh.returnTxt == 'string') {
-                    nh.returnTxt = nh.returnTxt.replace(/\n\s*\n/g, '\n');
-                    nh.returnTxt = nh.returnTxt.replace(/(?:\r\n|\r|\n)/g, '<br />');
-                }
-            }
-            return nh;
-        }
-        parent.pluginHandler.scripttask.loadVariables = function(message) {
-            if (message.event.vars.length) {
-                var vars = message.event.vars;
-                vars.forEach(function(vd) {
-                    switch (vd.scope) {
-                        case 'global':
-                            vd.scopeTargetTxt = vd.scopeTargetHtml = 'N/A';
-                            break;
-                        case 'script':
-                            var s = scriptTree.filter(obj => { return obj._id === vd.scopeTarget })[0]
-                            vd.scopeTargetHtml = '<span title="' + s.path + '">' + s.name + '</span>';
-                            vd.scopeTargetTxt = s.name;
-                            break;
-                        case 'mesh':
-                            vd.scopeTargetTxt = vd.scopeTargetHtml = parent.meshes[vd.scopeTarget].name;
-                            break;
-                        case 'node':
-                            var n = parent.nodes.filter(obj => { return obj._id === vd.scopeTarget })[0]
-                            vd.scopeTargetHtml = '<span title="' + n.meshnamel + '">' + n.name + '</span>';
-                            vd.scopeTargetTxt = n.name;
-                            break;
-                        default:
-                            vd.scopeTargetTxt = vd.scopeTargetHtml = 'N/A';
-                            break;
-                    }
-                    vd.scopeTxt = varScopes[vd.scope];
-                })
-                var ordering = { 'global': 0, 'script': 1, 'mesh': 2, 'node': 3 }
-                vars.sort((a, b) => {
-                    return (ordering[a.scope] - ordering[b.scope])
-                      || a.name.localeCompare(b.name)
-                      || a.scopeTargetTxt.localeCompare(b.scopeTargetTxt);
-                });
-                variables = vars;
-                parseVariables();
-            }
-        }
-        function parseVariables() {
-            var vTbl = document.getElementById('varTbl');
-            var rows = vTbl.querySelectorAll('.stVRow');
-
-            if (rows.length) {
-                rows.forEach(function(r) {
-                    r.parentNode.removeChild(r);
-                });
-            }
-            var scriptEl = document.querySelectorAll('.liselected');
-            if (scriptEl.length != 1) return;
-            var el = scriptEl[0];
-            scopeTargetScriptId = el.getAttribute('x-data-id');
-            variables.forEach(function(vd) {
-                if (vd.scope == 'script' && vd.scopeTarget != scopeTargetScriptId) return;
-                if (vd.scope == 'mesh' && vd.scopeTarget != parent.currentNode.meshid) return;
-                if (vd.scope == 'node' && vd.scopeTarget != parent.currentNode._id) return;
-                let actionHtml = '<span class="flink" onclick="editVar(this);">Edit</span> <span class="flink" onclick="delVar(this);">Delete</span>';
-                let tpl = '<td>' + vd.name + '</td> \
-            <td>' + vd.value + '</td> \
-            <td>' + vd.scopeTxt + '</td> \
-            <td>' + vd.scopeTargetHtml + '</td> \
-            <td>' + actionHtml + '</td>';
-                let tr = vTbl.insertRow(-1);
-                tr.innerHTML = tpl;
-                tr.classList.add('stVRow');
-                tr.setAttribute('x-data-id', vd._id);
-            })
-        }
-        parent.pluginHandler.scripttask.loadSchedule = function(message) {
-            // cache script names
-            var nNames = {}, sNames = {};
-            parent.nodes.forEach(function(n){
-                nNames[n._id] = n.name;
-            });
-            scriptTree.forEach(function(s) {
-                if (s.type == 'script') sNames[s._id] = s.name;
-            });
-            if (message.event.nodeSchedule != null && message.event.nodeId == parent.currentNode._id) {
-                var nTbl = document.getElementById('nSchTbl');
-                var rows = nTbl.querySelectorAll('.stNSRow');
-                if (rows.length) {
-                    rows.forEach(function(r) {
-                        r.parentNode.removeChild(r);
-                    });
-                }
-                if (message.event.nodeSchedule.length) {
-                    message.event.nodeSchedule.forEach(function(nh) {
-                        nh = prepSchedule(nh);
-                        let tpl = '<td>' + sNames[nh.scriptId] + '</td> \
-                    <td>' + nh.scheduledBy + '</td> \
-                    <td>' + nh.everyTxt + '</td> \
-                    <td>' + nh.startedTxt + '</td> \
-                    <td>' + nh.endingTxt + '</td> \
-                    <td>' + nh.lastRunTxt + '</td> \
-                    <td>' + nh.nextRunTxt + '</td> \
-                    <td>' + nh.actionTxt + '</td>';
-                        let tr = nTbl.insertRow(-1);
-                        tr.innerHTML = tpl;
-                        tr.classList.add('stNSRow');
-                        tr.setAttribute('x-data-id', nh._id);
-                    });
-                }
-            }
-            var currentScript = document.getElementById('scriptHistory');
-            var currentScriptId = currentScript.getAttribute('x-data-id');
-            if (message.event.scriptSchedule != null && message.event.scriptId == currentScriptId) {
-                var sTbl = document.getElementById('sSchTbl');
-                var rows = sTbl.querySelectorAll('.stSSRow');
-                if (rows.length) {
-                    rows.forEach(function(r) {
-                        r.parentNode.removeChild(r);
-                    });
-                }
-                if (message.event.scriptSchedule.length) {
-                    message.event.scriptSchedule.forEach(function(nh) {
-                        nh = prepSchedule(nh);
-                        let tpl = '<td>' + nNames[nh.node] + '</td> \
-                    <td>' + nh.scheduledBy + '</td> \
-                    <td>' + nh.everyTxt + '</td> \
-                    <td>' + nh.startedTxt + '</td> \
-                    <td>' + nh.endingTxt + '</td> \
-                    <td>' + nh.lastRunTxt + '</td> \
-                    <td>' + nh.nextRunTxt + '</td> \
-                    <td>' + nh.actionTxt + '</td>';
-                        let tr = sTbl.insertRow(-1);
-                        tr.innerHTML = tpl;
-                        tr.classList.add('stSSRow');
-                        tr.setAttribute('x-data-id', nh._id);
-                    });
-                }
-            }
-            resizeIframe();
-        }
-        function prepSchedule(nh) {
-            nh.everyTxt = nh.interval + ' ';
-            switch (nh.recur) {
-                case 'once':
-                    nh.everyTxt = 'Once';
-                    break;
-                case 'minutes':
-                    nh.everyTxt += 'minute';
-                    break;
-                case 'hourly':
-                    nh.everyTxt += 'hour';
-                    break;
-                case 'daily':
-                    nh.everyTxt += 'day';
-                    break;
-                case 'weekly':
-                    nh.everyTxt += 'week';
-                    break;
-                case 'monthly':
-                    nh.everyTxt += 'month';
-                    break;
-            }
-            if (nh.interval > 1) nh.everyTxt += 's';
-
-            if (nh.recur == 'weekly') {
-                nh.daysOfWeek = nh.daysOfWeek.map(el => Number(el));
-                nh.everyTxt += ' (';
-                nh.daysOfWeek.forEach(function(num) {
-                    switch(num) {
-                        case 0: nh.everyTxt += 'S'; break;
-                        case 1: nh.everyTxt += 'M'; break;
-                        case 2: nh.everyTxt += 'T'; break;
-                        case 3: nh.everyTxt += 'W'; break;
-                        case 4: nh.everyTxt += 'R'; break;
-                        case 5: nh.everyTxt += 'F'; break;
-                        case 6: nh.everyTxt += 'S'; break;
-                    }
-                });
-                nh.everyTxt += ')';
-            }
-
-            var d = new Date(0); d.setUTCSeconds(nh.startAt);
-            nh.startedTxt = d.toLocaleString();
-            d = new Date(0); d.setUTCSeconds(nh.endAt);
-            nh.endingTxt = d.toLocaleString();
-            if (nh.endAt == null) nh.endingTxt = 'Never';
-            if (nh.recur == 'once') nh.endingTxt = 'After first run';
-            d = new Date(0); d.setUTCSeconds(nh.lastRun);
-            nh.lastRunTxt = d.toLocaleString();
-            if (nh.lastRun == null) nh.lastRunTxt = 'Never';
-            d = new Date(0); d.setUTCSeconds(nh.nextRun);
-            nh.nextRunTxt = d.toLocaleString();
-            if (nh.nextRun == null) nh.nextRunTxt = 'Never';
-            if (nh.nextRun < nh.lastRun) nh.nextRunTxt = 'Running now';
-
-            nh.actionTxt = '<span class="delSched" onclick="deleteSchedule(this);">Delete</span>';
-            return nh;
-        }
-        function secondsToHms(d) {
-            d = Number(d);
-            if (d == 0) return "immediately";
-            var h = Math.floor(d / 3600);
-            var m = Math.floor(d % 3600 / 60);
-            var s = Math.floor(d % 3600 % 60);
-
-            var hDisplay = h > 0 ? h + (h == 1 ? " hour, " : " hours, ") : "";
-            var mDisplay = m > 0 ? m + (m == 1 ? " minute, " : " minutes, ") : "";
-            var sDisplay = s > 0 ? s + (s == 1 ? " second" : " seconds") : "";
-            return "in " + hDisplay + mDisplay + sDisplay;
-        }
-        function isJsonString(str) {
-            try {
-                JSON.parse(str);
-            } catch (e) {
-                return false;
-            }
-            return true;
-        }
-        function newVarEx() {
-            var name = parent.document.getElementById('stvarname').value;
-            var scope = parent.document.getElementById('stvarscope').value;
-            var value = parent.document.getElementById('stvarvalue').value;
-            var scopeTarget = null;
-            if (scope == 'script') {
-                var scriptEl = document.querySelectorAll('.liselected');
-                if (scriptEl.length != 1) return;
-                var el = scriptEl[0];
-                scopeTarget = el.getAttribute('x-data-id');
-            } else if (scope == 'mesh') {
-                scopeTarget = parent.currentNode.meshid;
-            } else if (scope == 'node') {
-                scopeTarget = parent.currentNode._id;
-            }
-            parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'newVar', name: name, scope: scope, scopeTarget: scopeTarget, value: value, currentNodeId: parent.currentNode._id });
-
-        }
-        function newVar() {
-            parent.setDialogMode(2, "New Variable", 3, newVarEx, 'Variable Name: <input type="text" id=stvarname /><br />Scope: <select id=stvarscope><option value="global">Global</option><option value="script">Script</option><option value="mesh">Mesh</option><option value="node">Node</option></select><br />Value: <input id="stvarvalue" type="text" />');
-            parent.focusTextBox('stvarname');
-        }
-        function editVarEx() {
-            var varid = parent.document.getElementById('stvarid').value;
-            var name = parent.document.getElementById('stvarname').value;
-            var scope = parent.document.getElementById('stvarscope').value;
-            var value = parent.document.getElementById('stvarvalue').value;
-            var scopeTarget = null;
-            if (scope == 'script') {
-                var scriptEl = document.querySelectorAll('.liselected');
-                if (scriptEl.length != 1) return;
-                var el = scriptEl[0];
-                scopeTarget = el.getAttribute('x-data-id');
-            } else if (scope == 'mesh') {
-                scopeTarget = parent.currentNode.meshid;
-            } else if (scope == 'node') {
-                scopeTarget = parent.currentNode._id;
-            }
-            parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'editVar', id: varid, name: name, scope: scope, scopeTarget: scopeTarget, value: value, currentNodeId: parent.currentNode._id });
-        }
-        function editVar(el) {
-            var vid = el.parentNode.parentNode.getAttribute('x-data-id');
-            var v = variables.filter(obj => { return obj._id === vid })[0];
-            var soptHtml = '';
-            for (const [k, t] of Object.entries(varScopes)) {
-                soptHtml += '<option value="' + k + '"';
-                if (v.scope == k) soptHtml += ' selected';
-                soptHtml += '>' + t + '</option>';
-            }
-            parent.setDialogMode(2, "Edit Variable", 3, editVarEx, 'Variable Name: <input type="text" id=stvarname value="' + v.name + '" /><br />Scope: <select id=stvarscope>' + soptHtml + '</select><br />Value: <input id="stvarvalue" type="text" value="' + v.value + '" /><input type="hidden" id="stvarid" value="' + vid + '" />');
-            parent.focusTextBox('stvarname');
-        }
-        function delVarEx() {
-            var varid = parent.document.getElementById('stvarid').value;
-            parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'deleteVar', id: varid, currentNodeId: parent.currentNode._id });
-
-        }
-        function delVar(el) {
-            var vid = el.parentNode.parentNode.getAttribute('x-data-id');
-            var v = variables.filter(obj => { return obj._id === vid })[0];
-            parent.setDialogMode(2, "Delete Variable", 3, delVarEx, 'Are you sure you want to delete this?<input type="hidden" id="stvarid" value="' + vid + '" /><br />Name: '+ v.name +'<br />Scope: '+ varScopes[v.scope] +'<br />Value: '+ v.value);
-        }
-        function renameEx() {
-            var name = parent.document.getElementById('stfilename').value;
-            var id = parent.document.getElementById('stid').value;
-            parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'rename', name: name, id: id, currentNodeId: parent.currentNode._id });
-        }
-        function goRename() {
-            var scriptEl = document.querySelectorAll('.liselected');
-            if (scriptEl.length != 1) return;
-            var el = scriptEl[0];
-            var name = el.querySelector('.fname').innerHTML;
-            var id = el.getAttribute('x-data-id');
-            parent.setDialogMode(2, "Rename " + name, 3, renameEx, '<input type="text"  value="' + name + '" id=stfilename style=width:100% /><input type="hidden" id="stid" value="' + id + '" />');
-            parent.focusTextBox('stfilename');
-        }
-        function newEx() {
-            var name = parent.document.getElementById('stfilename').value;
-            var parent_id = parent.document.getElementById('stfolderid').value;
-            var fileType = parent.document.getElementById('stfiletype').value;
-            parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'new', name: name, parent_id: parent_id, filetype: fileType, currentNodeId: parent.currentNode._id });
-        }
-        function goNew() {
-            var scriptEl = document.querySelectorAll('.liselected');
-            var folder_id = null;
-            if (scriptEl.length > 0) {
-                var el = scriptEl[0];
-                folder_id = el.getAttribute('x-data-folder');
-            }
-            parent.setDialogMode(2, "New Script", 3, newEx, 'Name: <input type="text"  value="' + name + '" id=stfilename style=width:100% /><br />Type:<select id="stfiletype"><option value="bash">Bash</option><option value="bat">BAT</option><option value="ps1">PS1</option></select><input type="hidden" id="stfolderid" value="' + folder_id + '" />');
-            parent.focusTextBox('stfilename');
-        }
-        function newFolderEx() {
-            var name = parent.document.getElementById('stfoldername').value;
-            var parent_id = parent.document.getElementById('stfolderid').value;
-            parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'newFolder', name: name, parent_id: parent_id });
-        }
-        function goNewFolder() {
-            var scriptEl = document.querySelectorAll('.liselected');
-            var folder_id = null;
-            if (scriptEl.length > 0) {
-                var el = scriptEl[0];
-                folder_id = el.getAttribute('x-data-folder');
-            }
-            parent.setDialogMode(2, "New Folder", 3, newFolderEx, '<input type="text"  value="" id=stfoldername style=width:100% /><input type="hidden" id="stfolderid" value="' + folder_id + '" />');
-            parent.focusTextBox('stfoldername');
-        }
-        function goScript(el) {
-            var xdi = el.getAttribute('x-data-id');
-            var scriptEls = document.querySelectorAll('.liselected');
-            parent.putstore('_scripttask_sel_item', xdi);
-            scriptEls.forEach(function(e) {
-                e.classList.remove('liselected');
-            })
-            el.classList.add('liselected');
-            Q('scriptHistory').setAttribute('x-data-id', el.getAttribute('x-data-id'));
-            if (xdi != el.getAttribute('x-data-folder')) {
-                parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'loadScriptHistory', scriptId: xdi });
-            }
-            parseVariables();
-        }
-        function deleteEx() {
-            var id = parent.document.getElementById('stdelid').value;
-            parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'delete', id: id });
-        }
-        function goDelete() {
-            var els = document.querySelectorAll('.liselected');
-            if (els.length == 0) return;
-            var el = els[0];
-            var name = el.innerHTML;
-            var id = el.getAttribute('x-data-id');
-            parent.setDialogMode(2, "Delete " + name, 3, deleteEx, 'Are you sure? <input type="hidden" id="stdelid" value="' + id + '" />');
-        }
-        function deleteScheduleEx() {
-            var id = parent.document.getElementById('stdelid').value;
-            parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'delete', id: id });
-        }
-        function deleteSchedule(el) {
-            var id = el.parentNode.parentNode.getAttribute('x-data-id');
-            parent.setDialogMode(2, "Delete Schedule", 3, deleteScheduleEx, 'Are you sure you want to delete this schedule? <input type="hidden" id="stdelid" value="' + id + '" />');
-        }
-        function toggleCollapse(el) {
-            var xdf = el.getAttribute('x-data-path');
-            var folderEls = document.querySelectorAll('.lifolder, .liscript');
-            var showHide = null;
-            folderEls.forEach(function(e){
-                if (e === el) return;
-                if (e.getAttribute('x-data-path').indexOf(xdf) !== -1) {
-                    if (e.style.display == 'none') {
-                        if (showHide === null) showHide = '';
-                    } else {
-                        if (showHide === null) showHide = 'none';
-                    }
-                    e.style.display = showHide;
-                }
-            });
-            goScript(el);
-        }
-        function handleFileSelect(evt) {
-            evt.preventDefault();
-            var files = evt.dataTransfer.files; // FileList object
-            // files is a FileList of File objects. List some properties.
-            QV('dropBlock', false);
-            var output = [];
-            fileUpload(files);
-            elementDragged = false;
-            if (dragTimer != null) dragTimer = null;
-            //document.getElementById('list').innerHTML = '<ul>' + output.join('') + '</ul>';
-        }
-
-        function fileUpload(files) {
-            if (files == null) files = document.getElementById('files').files;
-            var path = null;
-            var isSelected = document.querySelectorAll('.liselected');
-            if (isSelected.length) {
-                var sel = isSelected[0];
-                path = sel.getAttribute('x-data-path');
-            }
-            for (var i = 0, f; f = files[i]; i++) {
-                var reader = new FileReader();
-                reader.fileName = f.name;
-                reader.readAsBinaryString(f);
-                reader.addEventListener('loadend', function(e, file){
-                    addScript(e.currentTarget.fileName, e.currentTarget.result, path);
-                });
-            }
-        }
-
-        var dropZone = document.getElementById('scriptTaskUser');
-        var dropBlock = document.getElementById('dropBlock');
-        var dragTimer = null;
-        function allowDrag(e) {
-            if (!elementDragged) {  // Test that the item being dragged is a valid one
-                e.dataTransfer.dropEffect = 'copy';
-                QV('dropBlock', true);
-                e.preventDefault();
-                clearTimeout(dragTimer);
-                dragTimer = setTimeout(function(){ dragCounter = 0; QV('dropBlock', false); }, 100);
-            }
-        }
-
-        function dropMove(evt) {
-            const move_id = evt.dataTransfer.getData('text');
-            const container_id = evt.target.parentNode.getAttribute('x-data-id');
-            parent.meshserver.send({ action: 'plugin', plugin: 'scripttask', pluginaction: 'move', id: move_id, to: container_id });
-        }
-        // file upload events
-        window.addEventListener('dragenter', function(e) {
-            dragCounter++;
-        });
-        dropZone.addEventListener('dragenter', allowDrag);
-        dropZone.addEventListener('dragover', allowDrag);
-        dropZone.addEventListener('dragleave', function(e) {
-            dragCounter--;
-            if (dragCounter == 0) {
-                QV('dropBlock', false);
-                elementDragged = false;
-            }
-        });
-        dropZone.addEventListener('drop', handleFileSelect);
-    </script>
-</body>
-</html>
\ No newline at end of file