diff --git a/web-old/aqualink-black.png b/web-old/aqualink-black.png
deleted file mode 100644
index 53c5971..0000000
Binary files a/web-old/aqualink-black.png and /dev/null differ
diff --git a/web-old/aqualink-transparent.png b/web-old/aqualink-transparent.png
deleted file mode 100644
index 63235f6..0000000
Binary files a/web-old/aqualink-transparent.png and /dev/null differ
diff --git a/web-old/aqualinkd-new.png b/web-old/aqualinkd-new.png
deleted file mode 100644
index 9ffcfd0..0000000
Binary files a/web-old/aqualinkd-new.png and /dev/null differ
diff --git a/web-old/aqualinkd-white.png b/web-old/aqualinkd-white.png
deleted file mode 100644
index 876ab02..0000000
Binary files a/web-old/aqualinkd-white.png and /dev/null differ
diff --git a/web-old/aqualinkd.png b/web-old/aqualinkd.png
deleted file mode 100644
index 7cec6b4..0000000
Binary files a/web-old/aqualinkd.png and /dev/null differ
diff --git a/web-old/aqualinkd_62.png b/web-old/aqualinkd_62.png
deleted file mode 100644
index 5a498d9..0000000
Binary files a/web-old/aqualinkd_62.png and /dev/null differ
diff --git a/web-old/config.js b/web-old/config.js
deleted file mode 100644
index f80ce14..0000000
--- a/web-old/config.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// Display order of devices.  Tiles will be displayed in the order below,
-    // any devices you don't want to see you can comment the ID. (with // e.g. `//"Solar_Heater",` )
-    // If the device isn't listed below is will NOT be shown.
-    // For a complete list returned from your particular aqualinkd instance
-    // use the below URL and look at the ID value for each device.
-    // http://aqualink.ip.address/?command=devices
-    var devices = [
-        "Filter_Pump",
-        "Spa_Mode",
-        "Aux_1",
-        "Aux_2",
-        "Aux_3",
-        "Aux_4",
-        "Aux_5",
-        "Aux_6",
-        "Aux_7",
-        "Aux_B1",
-        "Aux_B2",
-        "Aux_B3",
-        "Aux_B4",
-        "Aux_B5",
-        "Aux_B6",
-        "Aux_B7",
-        "Aux_B8",
-        "Pool_Heater",
-        "Spa_Heater",
-        "SWG",
-        //"SWG/Percent",
-        "SWG/PPM", 
-        //"SWG/Boost",
-        "Temperature/Air",
-        "Temperature/Pool",
-        "Temperature/Spa",
-        "Pool_Water",
-        "Spa_Water",
-        "Freeze_Protect",
-        "CHEM/pH",
-        "CHEM/ORP"
-        //"Solar_Heater",
-      ];
-  
-      // This get's picked up by dynamic_config.js and used as mode 0
-      var light_program = [
-        "Voodoo Lounge - Show",
-        "Blue Sea",
-        "Royal Blue",
-        "Afternoon Skies",
-        "Aqua Green",
-        "Emerald",
-        "Cloud White",
-        "Warm Red",
-        "Flamingo",
-        "Vivid Violet",
-        "Sangria",
-        "Twilight - Show",
-        "Tranquility - Show",
-        "Gemstone - Show",
-        "USA - Show",
-        "Mardi Gras - Show",
-        "Cool Cabaret - Show"
-      ];
-
-      /*
-      *  BELOW IS NOT RELIVENT FOR simple.html or simple inteface
-      *
-      */
-      // Background image, delete or leave blank for solid color
-      //var background_url = "http://192.168.144.224/snap.jpeg";
-      var background_url='hk/background.jpg';
-      //var background_url='';
-      // Reload background image every X seconds.(useful if camera snapshot)
-      // 0 means only load once when page loads.
-      //var background_reload = 10;
-
-      // By default all Variable Speed Pumps will show RPM.
-      // this will show GPM on VSP's that you can only set GPM (ie Jandy VF pumps)
-      //var show_vsp_gpm=false;
-
-      // By default all Temperatures & Value tiles are off.
-      // this will turn them on
-      var turn_on_sensortiles = true;
-
-      // This will turn on/off the Spa Heater when you turn on/off Spa Mode.
-      //var link_spa_and_spa_heater = true;
-
-      // Change the slider for timers
-      var timer_slider_min = 0;
-      //var timer_slider_max = 360;
-      //var timer_slider_step = 10;
-      var timer_slider_max = 120;
-      var timer_slider_step = 1;
-
-      // Colors 
-      var body_background = "#EBEBEA";
-      var body_text = "#000000";
-      
-      var options_pane_background = "#F5F5F5";
-      var options_pane_bordercolor = "#7C7C7C";
-      var options_slider_highlight = "#2196F3";
-      var options_slider_lowlight = "#D3D3D3";
-
-      var head_background = "#2B6A8F";
-      var head_text = "#FFFFFF)";
-      var error_background = "#8F2B2B";
-
-      var tile_background = "#DCDCDC";
-      var tile_text = "#6E6E6E";
-      var tile_on_background = "#FFFFFF";
-      var tile_on_text = "#000000";
-      var tile_status_text = "#575757";
-
-     // Dark colors
-     // var body_background = "#000000";
-     // var tile_background = "#646464";
-     // var tile_text = "#B9B9B9";
-     // var tile_status_text = "#B2B2B2";
-     // var head_background = "#000D53";
-
-     // REMOVE THIS.
-     //document.writeln("<script type='text/javascript' src='extra/extra.js'></script>");
\ No newline at end of file
diff --git a/web-old/config/index.html b/web-old/config/index.html
deleted file mode 100644
index e1c6107..0000000
--- a/web-old/config/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html>
-  Hello
-</html>
\ No newline at end of file
diff --git a/web-old/controller.html b/web-old/controller.html
deleted file mode 100644
index e4bf832..0000000
--- a/web-old/controller.html
+++ /dev/null
@@ -1,2029 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-
-<head>
-  <meta http-equiv='Content-Type' content='text/html; charset=windows-1252'>
-  <title>AqualinkD</title>
-  <meta name='viewport' content='width=device-width'>
-  <meta name='mobile-web-app-capable' content='yes'>
-  <meta name='apple-mobile-web-app-capable' content='yes'>
-  <meta name='apple-mobile-web-app-status-bar-style' content='black'>
-  <link href='aqualinkd.png' rel='apple-touch-icon'>
-  <link href='aqualinkd.png' rel='icon'>
-  <script src='config.js'></script>
-  <!--<script src='?command=dynamic_config'></script>-->
-  <script src='/api/dynamicconfig'></script>
-  <style>
-    :root {
-      --fonts: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
-      --tile-width: 100px;
-      --tile_icon-height: 35px;
-      --tile_name-height: 32px;
-      --tile_status-height: 15px;
-      --tile_grid-gap: 10px;
-      --tile_name-lineheight: 1.2;
-      /*
-      // Large display will use the below values, just here for testing.
-      --tile-width: 125px;
-      --tile_icon-height: 45px;
-      --tile_name-height: 42px;
-      --tile_status-height: 15px;
-      --tile_grid-gap: 20px;
-      --tile_name-lineheight: 1.4;
-      */
-      /* These get overiden from config.js, don't edit */
-      --body_background: rgb(235, 235, 235);
-      --body_text: black;
-      --options_pane_background: rgb(245, 245, 245);
-      --options_pane_bordercolor: rgb(124, 124, 124);
-      --options_slider_ball: 30;
-      --options_slider_highlight: #2196F3;
-      --options_slider_lowlight: #d3d3d3;
-      --options_slider_height: 20px;
-      --head_background: rgb(43, 106, 143);
-      --head_text: #fff;
-      --error_background: rgb(143, 43, 43);
-      --tile_background: rgb(220, 220, 220);
-      --tile_text: rgb(110, 110, 110);
-      --tile_on_background: #fff;
-      --tile_on_text: #000;
-      --tile_status_text: rgb(87, 87, 87);
-
-      --options_radio_ball: 20px;
-      --options_radio_highlight: #2196F3;
-      --options_radio_lowlight: #d3d3d3;
-    }
-
-    div {
-      -webkit-touch-callout: none;
-      -webkit-user-select: none;
-      -khtml-user-select: none;
-      -moz-user-select: none;
-      -ms-user-select: none;
-      user-select: none;
-    }
-
-    div::-moz-selection {
-      background: transparent;
-    }
-
-    div::selection {
-      background: transparent;
-    }
-
-    html {}
-
-    body {
-      background-color: var(--body_background);
-      font-family: var(--fonts);
-      font-weight: 600;
-      font-size: 14px;
-      color: var(--body_text);
-      /*margin: 0 !important;*/
-      /*padding: 0 !important;*/
-      /*margin: 10px !important;*/
-      /* Font rendering (mainly for firefox) */
-      text-rendering: optimizeLegibility;
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
-    }
-
-    .body_wrap {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      top: 0px;
-      left: 0px;
-      background-repeat: no-repeat;
-      background-position: center;
-      background-size: cover;
-      height: 100%;
-    }
-
-    .opaque {
-      top: 0px;
-      left: 0px;
-      filter: alpha(opacity=60);
-      opacity: 0.6;
-    }
-
-    .vopaque {
-      top: 0px;
-      left: 0px;
-      filter: alpha(opacity=40);
-      opacity: 0.4;
-    }
-
-    .options_pane {
-      background-color: var(--options_pane_background);
-      border: 2px solid var(--options_pane_bordercolor);
-      border-radius: 20px;
-      justify-content: center;
-      align-items: center;
-      width: 345px;
-      /*height:245px;*/
-    }
-
-    .options {
-      top: 10px;
-      /*left: 10px;*/
-      position: fixed;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      width: 100vw;
-      /*
-      height: 100%;
-      */
-    }
-
-    /*
-    .show {
-      top: 0px;
-      left: 0px;
-    }
-*/
-
-    .wrapper {
-      display: grid;
-      /*grid-template-columns: repeat(auto-fill, minmax(var(--tile-width), var(--tile-width)));
-      grid-auto-rows: 1fr, repeat(auto-fill, minmax(var(--tile-width), var(--tile-width)));*/
-      grid-template-columns: repeat(auto-fit, minmax(var(--tile-width), auto));
-      grid-auto-rows: 1fr, repeat(auto-fit, minmax(var(--tile-width), auto));
-      grid-gap: var(--tile_grid-gap);
-      padding: 0 !important;
-      margin: 10px !important;
-    }
-
-    .head {
-      /*background-color: rgb(124, 124, 124);*/
-      background-color: var(--head_background);
-      color: var(--head_text);
-      border-radius: 5px;
-      padding: 5px;
-      grid-column: 1 / -1;
-    }
-
-    .error {
-      background-color: var(--error_background) !important;
-    }
-
-    .hide {
-      display: none;
-      filter: alpha(opacity=0);
-      opacity: 0.0;
-    }
-
-    .tile {
-      background-color: var(--tile_background);
-      color: var(--tile_text);
-      border-radius: 10px;
-      padding: 0px;
-      /*font-size: 100%;*/
-      box-sizing: border-box;
-      padding: 5px;
-      height: var(--tile-width);
-      width: var(--tile-width);
-      filter: alpha(opacity=90);
-      opacity: 0.9;
-    }
-
-    .on {
-      background-color: var(--tile_on_background);
-      color: var(--tile_on_text);
-      filter: alpha(opacity=100);
-      opacity: 1.0;
-    }
-
-    .flash {
-      color: var(--tile_on_text);
-      filter: alpha(opacity=100);
-      opacity: 0.9;
-      -webkit-animation-name: tile-flash;
-      /* Safari 4.0 - 8.0 */
-      -webkit-animation-duration: 2s;
-      /* Safari 4.0 - 8.0 */
-      animation-name: tile-flash;
-      animation-duration: 2s;
-      animation-iteration-count: infinite;
-    }
-
-    /* Safari 4.0 - 8.0 */
-
-    @-webkit-keyframes tile-flash {
-      0% {
-        background-color: var(--tile_on_background);
-        opacity: 1.0;
-      }
-      50% {
-        background-color: var(--tile_background);
-        opacity: 0.9;
-      }
-      100% {
-        background-color: var(--tile_on_background);
-        opacity: 1.0;
-      }
-    }
-
-    /* Standard syntax */
-
-    @keyframes tile-flash {
-      0% {
-        background-color: var(--tile_on_background);
-        opacity: 1.0;
-      }
-      50% {
-        background-color: var(--tile_background);
-        opacity: 0.9;
-      }
-      100% {
-        background-color: var(--tile_on_background);
-        opacity: 1.0;
-      }
-    }
-
-    /*
-    .off {
-      background-color: #ccc;
-      color: rgb(133, 133, 133);
-    }
-*/
-
-    .tile_icon {
-      height: var(--tile_icon-height);
-      display: table;
-      margin: 0 auto;
-      /*background-color: red;*/
-    }
-
-    .tile_name {
-      height: var(--tile_name-height);
-      /*background-color: green;*/
-      line-height: var(--tile_name-lineheight);
-    }
-
-    .tile_status {
-      color: var(--tile_status_text);
-      height: var(--tile_status-height);
-      /*background-color: blue;*/
-    }
-
-    .tile_icon_value {
-      border-radius: calc(var(--tile_icon-height) / 2);
-      font-weight: 600;
-      /*border-radius: 27px;*/
-      height: var(--tile_icon-height);
-      min-width: var(--tile_icon-height);
-      text-align: center;
-      vertical-align: middle;
-      line-height: var(--tile_icon-height);
-      filter: alpha(opacity=100);
-      opacity: 1.0;
-    }
-
-    .heat {
-      background-color: rgb(255, 123, 0);
-      color: rgb(255, 255, 255);
-    }
-
-    .cool {
-      background-color: rgb(4, 159, 248);
-      color: rgb(255, 255, 255);
-    }
-
-    .enabled {
-      background-color: rgb(78, 196, 0);
-      color: rgb(255, 255, 255);
-    }
-
-    .disabled {
-      background-color: rgb(110, 110, 110);
-      color: rgb(220, 220, 220);
-    }
-
-    /* All for options panel */
-
-    .option_switch {
-      position: relative;
-      display: inline-block;
-      width: 60px;
-      height: 34px
-    }
-
-    .option_switch input {
-      display: none;
-    }
-
-    .option_switch_slide {
-      position: absolute;
-      cursor: pointer;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      background-color: var(--options_slider_lowlight);
-      -webkit-transition: .4s;
-      transition: .4s;
-      border-radius: 34px;
-    }
-
-    .option_switch_slide:before {
-      position: absolute;
-      content: "";
-      height: calc(var(--options_slider_ball)*1px);
-      width: calc(var(--options_slider_ball)*1px);
-      left: 2px;
-      bottom: 2px;
-      background-color: white;
-      -webkit-transition: .4s;
-      transition: .4s;
-      border-radius: 50%;
-    }
-
-    input:checked+.option_switch_slide {
-      background-color: var(--options_slider_highlight);
-    }
-
-    input:focus+.option_switch_slide {
-      box-shadow: 0 0 1px var(--options_slider_highlight);
-    }
-
-    input:checked+.option_switch_slide:before {
-      -webkit-transform: translateX(26px);
-      -ms-transform: translateX(26px);
-      transform: translateX(26px);
-    }
-
-    .option_slider {
-      -webkit-appearance: none;
-      width: 300px;
-      height: var(--options_slider_height);
-      background: var(--options_slider_lowlight);
-      outline: none;
-      -webkit-transition: .2s;
-      transition: opacity .2s;
-      border-radius: var(--options_slider_height);
-    }
-
-    .option_slider::-webkit-slider-thumb {
-      -webkit-appearance: none;
-      appearance: none;
-      width: calc(var(--options_slider_ball)*1px);
-      height: calc(var(--options_slider_ball)*1px);
-      background: var(--options_slider_highlight);
-      cursor: pointer;
-      border-radius: calc(var(--options_slider_ball)*1px);
-    }
-
-    .option_slider::-moz-range-thumb {
-      width: calc(var(--options_slider_ball)*1px);
-      height: calc(var(--options_slider_ball)*1px);
-      background: var(--options_slider_highlight);
-      cursor: pointer;
-      border-radius: var(--options_slider_height);
-    }
-
-    .options_title {
-      /*background-color: rgb(124, 124, 124);
-      color: #fff;
-      font-weight: 200;*/
-      font-size: 18px;
-      overflow: hidden;
-    }
-
-    .options_selector {
-      font-family: var(--fonts);
-      font-weight: 600;
-      font-size: 16px;
-    }
-
-    .options_button {
-      font-family: var(--fonts);
-      font-weight: 600;
-      font-size: 16px;
-    }
-
-    .option_text {
-      font-family: var(--fonts);
-      font-weight: 600;
-      font-size: 16px;
-    }
-
-    .option_radiocontainer {
-      padding: 0.2em 0;
-      /*font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;*/
-      font-weight: 500;
-      font-size: 14px;
-    }
-
-    /* hide the "real" radios visually */
-
-    .radio input {
-      border: 0;
-      clip: rect(0 0 0 0);
-      height: 1px;
-      margin: -1px;
-      overflow: hidden;
-      padding: 0;
-      position: absolute;
-      width: 1px;
-    }
-
-    /* style the "fake" radios */
-
-    .option_radio-value {
-      background-color: var(--options_radio_lowlight);
-      background-repeat: no-repeat;
-      background-position: center;
-      background-size: 95% auto;
-      border-radius: 50%;
-      display: inline-block;
-      height: var(--options_radio_ball);
-      width: var(--options_radio_ball);
-      margin-right: 0.2em;
-      margin-left: 0.5em;
-      position: relative;
-      vertical-align: -0.3em;
-      /*  Beautify
-  border: 0.0625em solid #bbb;
-  box-shadow: inset 0 0.0625em 0 0.0625em rgba(0,0,0,0.075);*/
-    }
-
-    input:checked+.option_radio-value {
-      background-color: var(--options_radio_highlight);
-      /* Beautify
-  border-color: #169a9a;
-  box-shadow: 0 0.0625em 0 0.0625em rgba(0,0,0,0.075);*/
-    }
-
-    /*
-    .timedate {
-      font-size: 10px;
-    }*/
-  </style>
-
-  <script type='text/javascript'>
-    //'use strict';
-    var _lightProgramDropdown = false;
-    var _pressEvent;
-    var _ignoreMouseEvent = false;
-    var _temperature_units;
-    var _aqualink_data;
-    var _landscape = false;
-    var _displayNames = [];
-
-    if (typeof show_vsp_gpm !== 'undefined' && show_vsp_gpm == false)
-      var _show_vsp_gpm=false;
-    else
-      var _show_vsp_gpm=true;
-
-    if (typeof link_spa_and_spa_heater !== 'undefined' && link_spa_and_spa_heater == true)
-      var _link_spa_and_heater=true;
-    else
-      var _link_spa_and_heater=false;
-
-    //init();
-    function init() {
-      setSizeSpecifics();
-      populateLightProgram(-1);
-      //populateLightProgram(0);
-      document.getElementById('thermostat_options').classList.remove("hide");
-      document.getElementById('swg_options').classList.remove("hide");
-      document.getElementById('pswitch_options').classList.remove("hide");
-      document.getElementById('vspswitch_options').classList.remove("hide");
-      document.getElementById('timer_options').classList.remove("hide");
-      setColors();
-      load_background();
-      showTileOptions(false);
-      startWebsockets();
-      resetBackgroundSize();
-    }
-
-    function populateLightProgram(type=0) {
-      var light_program = _light_program[type];
-      
-      if (_lightProgramDropdown) {
-        option = document.getElementById('pswitch_option_list');
-        try {
-          fLen = light_program.length;
-          for (i = 0; i < fLen; i++) {
-            var opt = document.createElement('option');
-            opt.value = i + 1;
-            opt.innerHTML = light_program[i];
-            option.appendChild(opt);
-          }
-        } catch (e) {}
-      } else {
-        var tbody = document.getElementById('pswitch_table').getElementsByTagName('tbody')[0];
-        if (type == -1) {
-          // -1 is Just init, so create another row, just to delete later.
-          row = tbody.insertRow(2);
-          row.innerHTML = "<td align='center'>Solid Color</td><td align='center'>Light Show</td>";
-          light_program = _light_program[0]; // Use aqualinkd light modes to set size below
-        }
-        var html1 = '';
-        var html2 = '';
-        var fLen = light_program.length;
-        var i;
-        for (i = 0; i < fLen; i++) {
-          if (light_program[i].endsWith(" - Show"))
-            html2 = html2 + "<div class='option_radiocontainer'><label><span class='radio'><input type='radio' name='light_program' value='" + (i+1) + "' onchange='updatePwsitchOptions(this, "+type+");'><span class='option_radio-value' aria-hidden='true'></span></span>" + light_program[i].substr(0, (light_program[i].length - 7)) + "</label></div>";
-          else
-            html1 = html1 + "<div class='option_radiocontainer'><label><span class='radio'><input type='radio' name='light_program' value='" + (i+1) + "' onchange='updatePwsitchOptions(this, "+type+");'><span class='option_radio-value' aria-hidden='true'></span></span>" + light_program[i] + "</label></div>";
-        }
-        var row;
-        row = tbody.deleteRow(2);
-        row = tbody.insertRow(2);
-        row.innerHTML = "<td align='center'>Solid Color</td><td align='center'>Light Show</td>";
-        tbody.deleteRow(3);
-        row = tbody.insertRow(3);
-        row.innerHTML = "<td align='left' valign='top'>" + html1 + "</td><td align='left' valign='top'>" + html2 + "</td>";
-      }
-    }
-
-    function setProp(name) {
-      if (typeof window[name] !== 'undefined')
-        document.documentElement.style.setProperty('--' + name, window[name]);
-    }
-
-    function setColors() {
-      setProp("tile_on_background");
-      setProp("tile_on_background-crap");
-      setProp("body_background");
-      setProp("body_text");
-      setProp("options_pane_background");
-      setProp("options_pane_bordercolor");
-      setProp("options_slider_highlight");
-      setProp("options_slider_lowlight");
-      setProp("head_background");
-      setProp("head_text");
-      setProp("error_background");
-      setProp("tile_background");
-      setProp("tile_text");
-      setProp("tile_on_background");
-      setProp("tile_on_text");
-      setProp("tile_status_text");
-    }
-
-    function setSizeSpecifics() {
-      var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-      var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-      //alert(w+"x"+h+" = "+(w*h));
-      // 375x724 = 271500
-      if ((w * h) > 370000) { // 370000 is kind-a just guess
-        document.documentElement.style.setProperty('--tile-width', '125px');
-        document.documentElement.style.setProperty('--tile_icon-height', '45px');
-        document.documentElement.style.setProperty('--tile_name-height', '42px');
-        document.documentElement.style.setProperty('--tile_status-height', '15px');
-        document.documentElement.style.setProperty('--tile_grid-gap', '20px');
-        document.documentElement.style.setProperty('--tile_name-lineheight', '1.4');
-      }
-      if (w > h)
-        _landscape = true;
-      else
-        _landscape = false;
-      setOrientation(_landscape);
-      /*
-        Future change element sizes here if needed
-      */
-      window.addEventListener("orientationchange", function() {
-        var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-        var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-        // Have no idea why this is reversed, but w is less then h in landscape when captured here.
-        if (w < h)
-          _landscape = true;
-        else
-          _landscape = false;
-        setOrientation(_landscape);
-        // Need to finish rendering before calling this, so wait a small time
-        setTimeout(resetBackgroundSize, 100);
-      }, false);
-    }
-
-    function setOrientation(isLandscape) {
-      if (isLandscape) {
-        //alert('lll')
-        document.getElementById("td_name").width = '72px';
-        document.getElementById("td_timedate").width = '72px';
-      } else {
-        document.getElementById("td_name").width = '72px';
-        document.getElementById("td_timedate").width = '102px';
-      }
-    }
-
-    function load_background() {
-      // check for undevined AND defined but empty
-      if (typeof background_url === 'undefined' || background_url === undefined)
-        return;
-      //alert("load");
-      // call the notify_complete function when the image has loaded
-      var image = new Image();
-      image.onload = function() {
-        document.getElementById("body_wrap").style.backgroundImage = "url('" + this.src + "')";
-      };
-      image.onerror = function() {
-        image.src = "hk/background.jpg"; // Use default if image fails.
-      };
-      if (typeof background_reload !== 'undefined' && background_reload > 0) {
-        if (background_url.indexOf('?') > 0 )
-          image.src = background_url + '&aqrnd=' + new Date().getTime();
-        else
-          image.src = background_url + '?' + new Date().getTime();
-
-        setTimeout(load_background, (background_reload * 1000));
-      } else {
-        image.src = background_url;
-      }
-    }
-    // If the grid continer is larger than the page container, increase page so background looks nice
-    // also reduce size if needed on page rotate.
-    function resetBackgroundSize() {
-      if (typeof background_url === 'undefined' || background_url === undefined)
-        return;
-      try {
-        //inside = document.getElementById('wrapper');
-        outside = document.getElementById('body_wrap');
-        insideH = parseInt(window.getComputedStyle(document.getElementById('wrapper')).height);
-        outsideH = parseInt(window.getComputedStyle(outside).height);
-        var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-        var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-        if (insideH > outsideH || outsideH > h) {
-          //outside.style.height = ((insideH > h)?(insideH + 40)+'px':(h + 40)+'px');
-          outside.style.height = ((insideH > h) ? (insideH + 40) + 'px' : h + 'px');
-          //alert("w:"+w+" h:"+h+" inH:"+insideH+" outH:"+outsideH+"\nUsed:"+outside.style.height);
-        }
-      } catch (e) {}
-    }
-
-    function endPress(id) {
-      //pressEvent = 0;
-      //alert ("Long press "+id);
-      //switchTileState(id, true);
-      showTileOptions(true, id);
-    }
-
-    function add_clickEvent(tile, id) {
-      tile.addEventListener('touchstart', function() {
-        _ignoreMouseEvent = true;
-        _pressEvent = window.setTimeout(function() {
-          _pressEvent = 0;
-          endPress(id);
-        }, 1000);
-      });
-      tile.addEventListener('touchend', function() {
-        if (_pressEvent != 0) {
-          clearTimeout(_pressEvent);
-          switchTileState(id, false);
-        }
-      });
-      tile.addEventListener("mousedown", function() {
-        if (_ignoreMouseEvent == false) {
-          _pressEvent = window.setTimeout(function() {
-            _pressEvent = 0;
-            endPress(id);
-          }, 1000);
-        }
-      });
-      tile.addEventListener("mouseup", function() {
-        if (_pressEvent != 0 && _ignoreMouseEvent == false) {
-          clearTimeout(_pressEvent);
-          switchTileState(id, false);
-        }
-      });
-    }
-
-    function add_tile(id, name, status, type, subtype, off_imgurl, on_imgurl) {
-      var height = getComputedStyle(document.documentElement).getPropertyValue('--tile_icon-height');
-      var div = document.createElement('div');
-      div.setAttribute('class', 'tile');
-      div.setAttribute('id', id);
-      div.setAttribute('type', subtype);
-      //div.setAttribute('onclick', "switchTileState('" + id + "')");
-      var subdiv = document.createElement('div');
-      subdiv.setAttribute('class', 'tile_icon');
-      subdiv.setAttribute('id', id + '_icon');
-      if (off_imgurl != null) {
-        var imgdiv = document.createElement('img');
-        imgdiv.setAttribute('height', height + 'px');
-        imgdiv.setAttribute('src', off_imgurl);
-        subdiv.appendChild(imgdiv);
-        div.appendChild(subdiv);
-        if (on_imgurl != null) {
-          subdiv = document.createElement('div');
-          subdiv.setAttribute('class', 'tile_icon');
-          subdiv.setAttribute('id', id + '_icon_on');
-          imgdiv = document.createElement('img');
-          imgdiv.setAttribute('height', height + 'px');
-          imgdiv.setAttribute('src', on_imgurl);
-          subdiv.style.display = 'none';
-          subdiv.appendChild(imgdiv);
-          div.appendChild(subdiv);
-        }
-      } else if (type == "value" || type == "thermostat") {
-        var valdiv = document.createElement('div');
-        valdiv.setAttribute('class', 'tile_icon_value disabled');
-        valdiv.setAttribute('id', id + '_tile_icon_value');
-        valdiv.textContent = '--';
-        subdiv.appendChild(valdiv);
-        div.appendChild(subdiv);
-      }
-      /*else if (type == "thermostat") {
-             valdiv = document.createElement('div');
-             valdiv.setAttribute('class', 'tile_icon_value disabled');
-             valdiv.setAttribute('id', id + '_tile_icon_value');
-             valdiv.textContent = '--';
-             subdiv.appendChild(valdiv);
-           } */
-      subdiv = document.createElement('div');
-      subdiv.setAttribute('class', 'tile_name');
-      subdiv.setAttribute('id', id + '_name');
-      subdiv.textContent = name;
-      div.appendChild(subdiv);
-      // Value and Thermostat are the same, but value is read only and no state
-      if (type != "value") {
-        subdiv = document.createElement('div');
-        subdiv.setAttribute('class', 'tile_status');
-        subdiv.setAttribute('id', id + '_status');
-        subdiv.textContent = formatSatus(status);
-        div.appendChild(subdiv);
-        if (type == "switch" && (subtype != "switch_program" && subtype != "switch_vsp" && subtype != "switch_timer") ) {
-        //if (type == "switch" && subtype != "switch_program" ) {
-          div.setAttribute('onclick', "switchTileState('" + id + "')");
-          //console.log("add onclick switchtilestate to "+id);
-        } else /*if (id != "SWG/Percent")*/ {
-          add_clickEvent(div, id);
-          //console.log("add click Event to "+id);
-        }
-      }
-      document.getElementById('wrapper').appendChild(div);
-    }
-
-    function switchTileState(id, details) {
-      if (details) {
-        console.log("TILE DETAILS WHAY ARE WE HERE??? '" + id + "'");
-      } else {
-        setTileState(id, (document.getElementById(id).getAttribute('status') == 'off'))
-      }
-    }
-
-    function setTileState(id, state) {
-      try {
-        if (state == (document.getElementById(id).getAttribute('status') == 'off')) {
-          send_command(id, (state==true?1:0) );
-          //console.log("Switch state "+id+" to "+(state)?"on":"off");
-        } else {
-          //console.log("state "+id+" to "+(state)?"on":"off")
-        }
-        
-        setTileOn(id, ((state) ? "on" : "off"));
-      } catch(exception) {}
-    }
-
-    function setThermostatSetpoint(id, sp_value) {
-      var tile;
-      if ((tile = document.getElementById(id)) == null) {
-        return;
-      }
-      tile.setAttribute('setpoint', sp_value);
-      send_setpoint(id);
-    }
-
-/*
-    function setTileValue(id, value) {
-      var ext = '';
-      var type;
-      if (value == undefined || value.startsWith("-999") || value.startsWith(" "))
-        value = '--';
-      else {
-        try {
-          if ((type = document.getElementById(id).getAttribute('type')) != null) { 
-            if (type == 'temperature' || type == 'setpoint_thermo' || type == 'setpoint_freeze')
-              ext = '&deg;';
-            else if (type == 'setpoint_swg')
-              ext = '%';
-
-            if ((type == 'temperature' || type == 'value') && turn_on_sensortiles == true) {
-              if (value == 0 || value == '--')
-                setTileOn(id, 'off');
-              else
-                setTileOn(id, 'on');
-            }
-          }
-        } catch (e) {
-          //console.log('ERROR id=' + id + ' Line 764 | element = '+document.getElementById(id));
-        }
-      }
-      //document.getElementById(id + '_tile_icon_value').textContent = value;
-      var tile;
-      if ((tile = document.getElementById(id + '_tile_icon_value')) != null)
-        tile.innerHTML = value + ext;
-    }
-*/
-    function setTileValue(id, value) {
-      var ext = '';
-      var type = null;
-      try {
-        type = document.getElementById(id).getAttribute('type');
-
-        if (value == undefined || value.startsWith("-999") || value.startsWith(" ")) {
-          value = '--';
-        } else {
-          if ((type = document.getElementById(id).getAttribute('type')) != null) { 
-            if (type == 'temperature' || type == 'setpoint_thermo' || type == 'setpoint_freeze')
-              ext = '&deg;';
-            else if (type == 'setpoint_swg')
-              ext = '%';
-          }
-        }
-
-        if ((type == 'temperature' || type == 'value') && turn_on_sensortiles == true) {
-          // Anything specific (SWG PPM should be off if SWG is off)
-          // This needs a try catch, or is above try block good enough?
-          if (id == 'SWG/PPM' && document.getElementById('SWG').getAttribute('status') != 'on' )
-            setTileOn(id, 'off');
-          // Generic for all.
-          else if (value == 0 || value == '--')
-            setTileOn(id, 'off');
-          else
-            setTileOn(id, 'on');
-        }
-      } catch (e) {
-          // NSF Do we need to create the device?
-          console.log('ERROR id=' + id + ' Line 837 | element = '+document.getElementById(id));
-      }
-      //document.getElementById(id + '_tile_icon_value').textContent = value;
-      var tile;
-      if ((tile = document.getElementById(id + '_tile_icon_value')) != null)
-        tile.innerHTML = value + ext;
-    }
-
-    function setTileOnText(id, text) {
-      try {
-        if (document.getElementById(id).getAttribute('status') == 'on') {
-          document.getElementById(id + '_status').innerHTML = text;
-        } else {
-          //console.log("Tile "+id+" status is '"+document.getElementById(id).getAttribute('status')+"' not setting text to '"+text+"'");
-        }
-      } catch(exception) {}
-    }
-
-    function setThermostatTile(id, value, sp_value) {
-      setTileValue(id, value);
-      var tile;
-      if ((tile = document.getElementById(id)) != null) {
-        tile.setAttribute('setpoint', sp_value);
-      }
-    }
-
-    function setTileAttribute(id, attribute, value) {
-      var tile;
-      if ((tile = document.getElementById(id)) != null) {
-    //console.log("Set Attribute "+attribute+ " to "+value+" for "+id);
-        tile.setAttribute(attribute, value);
-      }
-    }
-
-    function getTileAttribute(id, attribute) {
-      var tile;
-      if ((tile = document.getElementById(id)) != null) {
-  //console.log("get Attribute "+attribute+ " to "+tile.getAttribute(attribute)+" for "+id);
-        return tile.getAttribute(attribute);
-      }
-      return null;
-    }
-
-    function formatSatus(status) {
-      var index;
-      if ((index = status.indexOf("AUX")) >= 0) {
-        aux = status.substr(index, 4);
-        status = status.charAt(0).toUpperCase() + status.substr(1).toLowerCase();
-        if ((name = _displayNames[aux]) != undefined) {
-          status = status.substr(0, index) + name + status.substr(index + 4);
-        }
-      } else if ((index = status.indexOf("ERROR")) >= 0) {
-        status = status;
-      } else {
-        status = status.charAt(0).toUpperCase() + status.substr(1).toLowerCase();
-      } 
-      return status;
-    }
-
-    function setTileOn(id, status) {
-      //console.log("setTileOn "+id+ " "+status);
-      var tile;
-      var text;
-      if ((tile = document.getElementById(id)) == null) {
-        //console.log("Error unknown ID '"+id+"' can't set to '"+status+"'");
-        return;
-      }
-      // Display is a special status to "brighten up" sensor values. 
-      if (status != "on" && status != "off" && status != "enabled" && status != "flash") {
-        if (status == "unknown") {
-          status = "off"; // Just set it off for the moment
-        } else {
-          console.log("Error unknown status '" + status + "' for '" + id + "'");
-          return;
-        }
-      }
-      tile.setAttribute('status', status);
-      if (status != 'off') {
-        if (status == 'flash') {
-          tile.classList.add("flash");
-          tile.classList.remove("on");
-          text = "Delay";
-        } else {
-          tile.classList.add("on");
-          tile.classList.remove("flash");
-          text = "On";
-        }
-        var offimg;
-        var onimg;
-        if ((offimg = document.getElementById(id + '_icon')) != null &&
-          (onimg = document.getElementById(id + '_icon_on')) != null) {
-          offimg.style.display = 'none';
-          onimg.style.display = 'table';
-        }
-        var type;
-        if ((type = tile.getAttribute('type')) != null) {
-          if (type == 'setpoint_swg') {
-            if (tile.getAttribute('Boost') == 'on')
-              text = "Boost";
-            else if (status == 'enabled')
-              text = 'Enabled';
-            else
-              text = 'Generating';
-          }
-          else if (type == 'setpoint_thermo')
-            //if (status == 'enabled')
-              text = 'Heat to ' + tile.getAttribute('setpoint');
-            //else
-            //  text = 'Heating to ' + tile.getAttribute('setpoint'); // too large for phone
-          else if (type == 'setpoint_freeze')
-            text = 'Turn on ' + tile.getAttribute('setpoint') + "&deg;";
-          //else
-          //  text = "On";
-        }
-        //document.getElementById(id + '_status').innerHTML = "On";
-      } else {
-        tile.classList.remove("on");
-        tile.classList.remove("flash");
-        if ((offimg = document.getElementById(id + '_icon')) != null &&
-          (onimg = document.getElementById(id + '_icon_on')) != null) {
-          onimg.style.display = 'none';
-          offimg.style.display = 'table';
-        }
-        text = "Off";
-      }
-
-      try {
-        document.getElementById(id + '_status').innerHTML = text;
-      } catch (e) {} 
-      var tile_icon = document.getElementById(id + '_tile_icon_value');
-      type = tile.getAttribute('type');
-      if (status != null && tile_icon != null) {
-        if (status == 'enabled' || status == 'flash') {
-          tile_icon.classList.add("enabled");
-          tile_icon.classList.remove("disabled");
-          tile_icon.classList.remove("cool");
-          tile_icon.classList.remove("heat");
-        } else if (status == 'off') {
-          tile_icon.classList.remove("enabled");
-          tile_icon.classList.add("disabled");
-          tile_icon.classList.remove("cool");
-          tile_icon.classList.remove("heat");
-        //} else if (status == 'on' && type != 'setpoint_swg' && type != 'setpoint_freeze' && type != 'temperature' && type != 'value') {
-        } else if (status == 'on' && type == 'setpoint_thermo') {
-          tile_icon.classList.remove("enabled");
-          tile_icon.classList.remove("disabled");
-          tile_icon.classList.remove("cool");
-          tile_icon.classList.add("heat");
-        } else if (status == 'on') {
-          tile_icon.classList.remove("enabled");
-          tile_icon.classList.remove("disabled");
-          tile_icon.classList.add("cool");
-          tile_icon.classList.remove("heat");
-        }
-      }
-    }
-
-    function createTile(object) {
-      if (object.name == 'NONE') {
-        return;
-      }
-      if (typeof devices !== 'undefined' && devices.indexOf(object.id) < 0) {
-        return;
-      }
-      //if (object.type == 'switch' || object.type == 'switch_program') {
-      if (object.type == 'switch') {
-        var img = object.id.replace('/', '_');
-        var ext_type;
-        if (typeof object.type_ext !== 'undefined')
-          ext_type = object.type_ext;
-        else
-          ext_type = object.type;
-
-        add_tile(object.id, object.name, object.state, 'switch', ext_type, 'hk/' + img + '-off.png', 'hk/' + img + '-on.png');
-        setTileOn(object.id, object.status, null);
-        if (typeof object.type_ext !== 'undefined' && object.type_ext == 'switch_program') {
-          if (typeof object.Light_Type !== 'undefined') {
-            document.getElementById(object.id).setAttribute('lighttype', object.Light_Type);
-          }
-          // Other switch_program types (other than light_type) GO HERE 
-        } else if (typeof object.type_ext !== 'undefined' && object.type_ext == 'switch_timer') {
-          if (typeof object.timer_active !== 'undefined' && object.timer_active) {
-            //console.log("Timer for "+object.name+" = "+object.timer_active);
-            if (object.timer_active == 'on') {
-              setTileOnText(object.id, 'On (timer)');
-            }
-          }
-        } else if (typeof object.type_ext !== 'undefined' && object.type_ext == 'switch_vsp') {
-          if (typeof object.Pump_RPM !== 'undefined' && object.Pump_RPM) {   
-            if (object.Pump_RPM == -3) {
-              setTileOnText(object.id, 'Pump ERROR'); // Small txt
-              document.getElementById(object.id).setAttribute('setpoint', 0);
-            } else if (object.Pump_RPM == -2) {
-              setTileOnText(object.id, 'Pump Offline'); // Small txt
-              document.getElementById(object.id).setAttribute('setpoint', 0);
-            } else if (object.Pump_RPM == -1) {
-              setTileOnText(object.id, 'Pump Priming'); // Small text
-              document.getElementById(object.id).setAttribute('setpoint', 0);
-            } else {
-              if (object.Pump_Type == "vfPump") {
-                if (_show_vsp_gpm == true)
-                  setTileOnText(object.id, 'GPM:'+object.Pump_GPM);
-                else
-                  setTileOnText(object.id, 'RPM:'+object.Pump_RPM);
-
-                document.getElementById(object.id).setAttribute('setpoint', object.Pump_GPM);
-              } else {
-                setTileOnText(object.id, 'RPM:'+object.Pump_RPM);
-                document.getElementById(object.id).setAttribute('setpoint', object.Pump_RPM);
-              }
-            }
-          }
-          if (typeof object.Pump_Type !== 'undefined') {
-            document.getElementById(object.id).setAttribute('pumptype', object.Pump_Type);
-          }
-        }
-      } else if (object.type == 'value' || object.type == 'temperature') {
-        add_tile(object.id, object.name, object.state, 'value', object.type);
-        setTileValue(object.id, object.value);
-      } else if (object.type == 'setpoint_thermo' || object.type == 'setpoint_swg' || object.type == 'setpoint_freeze') {
-        add_tile(object.id, object.name, object.state, 'thermostat', object.type);
-        document.getElementById(object.id).setAttribute('setpoint', object.spvalue);
-        setTileValue(object.id, object.value);
-        setTileOn(object.id, object.status);
-      } else {
-        //console.log("Unknown Device");   
-      }
-    }
-
-    function showTileOptions(show, id, contex) {
-      var active_option;
-      if (show == true) {
-        var wrapH = document.getElementById('wrapper').clientHeight + 'px';
-        if (id != null && document.getElementById(id).getAttribute('type') == 'setpoint_thermo') {
-          active_option = document.getElementById('thermostat_options');
-          document.getElementById('swg_options').style.display = 'none';
-          document.getElementById('pswitch_options').style.display = 'none';
-          document.getElementById('vspswitch_options').style.display = 'none';
-          document.getElementById('timer_options').style.display = 'none';
-        } else if (id != null && document.getElementById(id).getAttribute('type') == 'switch_program') {
-          active_option = document.getElementById('pswitch_options');
-          document.getElementById('thermostat_options').style.display = 'none';
-          document.getElementById('swg_options').style.display = 'none';
-          document.getElementById('vspswitch_options').style.display = 'none';
-          document.getElementById('timer_options').style.display = 'none';
-        } else if (id != null && document.getElementById(id).getAttribute('type') == 'setpoint_swg') {
-          active_option = document.getElementById('swg_options');
-          document.getElementById('thermostat_options').style.display = 'none';
-          document.getElementById('pswitch_options').style.display = 'none';
-          document.getElementById('vspswitch_options').style.display = 'none';
-          document.getElementById('timer_options').style.display = 'none';
-        } else if (id != null && document.getElementById(id).getAttribute('type') == 'setpoint_freeze') {
-          active_option = document.getElementById('swg_options');
-          document.getElementById('thermostat_options').style.display = 'none';
-          document.getElementById('pswitch_options').style.display = 'none';
-          document.getElementById('vspswitch_options').style.display = 'none';
-          document.getElementById('timer_options').style.display = 'none';
-        } else if (id != null && document.getElementById(id).getAttribute('type') == 'switch_vsp') {
-          active_option = document.getElementById('vspswitch_options');
-          document.getElementById('thermostat_options').style.display = 'none';
-          document.getElementById('pswitch_options').style.display = 'none';
-          document.getElementById('swg_options').style.display = 'none';
-          document.getElementById('timer_options').style.display = 'none';
-        } else if (id != null && document.getElementById(id).getAttribute('type') == 'switch_timer') {
-          active_option = document.getElementById('timer_options');
-          document.getElementById('thermostat_options').style.display = 'none';
-          document.getElementById('pswitch_options').style.display = 'none';
-          document.getElementById('swg_options').style.display = 'none';
-          document.getElementById('vspswitch_options').style.display = 'none';
-        }
-        active_option.style.display = 'flex';
-        var optionH = window.getComputedStyle(active_option, null).getPropertyValue("height");
-        if (optionH <= wrapH)
-          active_option.style.height = wrapH;
-        
-        //console.log("Option:"+optionH+" wrapH:"+wrapH);
-        document.getElementById('wrapper').classList.add("opaque");
-      } else {
-        // Fake onclick to close and save any values if open
-        if (contex == null) {
-          if (document.getElementById('thermostat_options').style.display == 'flex')
-            document.getElementById("options_close").click();
-          else if (document.getElementById('swg_options').style.display == 'flex')
-            document.getElementById("swg_options_close").click();
-          else if (document.getElementById('pswitch_options').style.display == 'flex')
-            document.getElementById("pswitch_options_close").click();
-          else if (document.getElementById('vspswitch_options').style.display == 'flex')
-            document.getElementById("vspswitch_options").click();
-          else if (document.getElementById('timer_options').style.display == 'flex')
-            document.getElementById("timer_options").click();
-        }
-        document.getElementById('thermostat_options').style.display = 'none';
-        document.getElementById('swg_options').style.display = 'none';
-        document.getElementById('pswitch_options').style.display = 'none';
-        document.getElementById('vspswitch_options').style.display = 'none';
-        document.getElementById('timer_options').style.display = 'none';
-        document.getElementById('wrapper').classList.remove("opaque");
-        return;
-      }
-      if (show == true) {
-        var tile = document.getElementById(id);
-        var sp_value = tile.getAttribute('setpoint');
-        //tile_state = tile.classList.contains("on");
-        var tile_state = !(tile.getAttribute('status') == 'off');
-        var type = tile.getAttribute('type');
-        var slider;
-        var slider_output;
-        var tm_slider;
-        var tm_slider_output;
-        var title;
-        var close_button;
-        var ext;
-        var tm_ext;
-        var oswitch;
-        var vsp_slider_changed = false;
-        if (type == 'setpoint_swg') {
-          slider = document.getElementById("swg_option_slider_range");
-          slider_output = document.getElementById("swg_option_slider_text_value");
-          title = document.getElementById("swg_option_title");
-          close_button = document.getElementById("swg_options_close");
-          ext = "%";
-        } else if (type == 'setpoint_freeze') {
-          slider = document.getElementById("swg_option_slider_range");
-          slider_output = document.getElementById("swg_option_slider_text_value");
-          title = document.getElementById("swg_option_title");
-          close_button = document.getElementById("swg_options_close");
-          ext = '&deg;' + _temperature_units;
-        } else if (type == 'switch_program') {
-          populateLightProgram(tile.getAttribute('lighttype') );
-          title = document.getElementById("pswitch_option_title");
-          close_button = document.getElementById("pswitch_options_close");
-          tm_slider = document.getElementById("ps_timer_slider_range");
-          tm_slider_output = document.getElementById("ps_timer_slider_text_value");
-        } else if (type == 'switch_vsp') {
-          slider = document.getElementById("vspoption_slider_range");
-          slider_output = document.getElementById("vspoption_slider_text_value");
-          tm_slider = document.getElementById("vsp_timer_slider_range");
-          tm_slider_output = document.getElementById("vsp_timer_slider_text_value");
-          title = document.getElementById("vspswitch_option_title");
-          close_button = document.getElementById("vspswitch_option_close");
-        } else if (type == 'switch_timer') {
-          tm_slider = document.getElementById("timer_slider_range");
-          tm_slider_output = document.getElementById("timer_slider_text_value");
-          title = document.getElementById("timer_option_title");
-          close_button = document.getElementById("timer_options_close");
-          //tm_ext = ' runtime (min)';
-        } else {
-          slider = document.getElementById("option_slider_range");
-          slider_output = document.getElementById("option_slider_text_value");
-          tm_slider = document.getElementById("th_timer_slider_range");
-          tm_slider_output = document.getElementById("th_timer_slider_text_value");
-          title = document.getElementById("option_title");
-          close_button = document.getElementById("options_close");
-          ext = '&deg;' + _temperature_units;
-        }
-
-        if (type == 'setpoint_swg') {
-          slider.min = 0;
-          slider.max = 101;
-          slider.step = 5;
-        } else if (type == 'setpoint_freeze') {
-          if (_temperature_units != 'c') { // Change to DegF
-            slider.min = 34;
-            slider.max = 42;
-            slider.step = 1;
-          } else { // Change to DegF
-            slider.min = 1;
-            slider.max = 5;
-            slider.step = 1;
-          }
-        } else if (type == 'setpoint_thermo') {
-          if (_temperature_units != 'c') { // Change to DegF
-            slider.min = 36;
-            slider.max = 104;
-            slider.step = 1;
-          } else { // Change to DegF
-            slider.min = 0;
-            slider.max = 40;
-            slider.step = 1;
-          }
-        } else if (type == 'switch_vsp') {
-          if ( tile.getAttribute('pumptype') == "vfPump" ) { // RPM vs GPM
-            slider.min = 15;
-            slider.max = 130;
-            slider.step = 5;
-            ext = ' GPM';
-          } else { 
-            slider.min = 600;
-            slider.max = 3450;
-            slider.step = 5;
-            ext = ' RPM';
-          }
-        }
-        
-        title.innerHTML = document.getElementById(id + '_name').innerHTML;
-
-        if (type == 'switch_program') {
-          var pswitch = document.getElementById("pswitch_option_list");
-          oswitch = document.getElementById("pswitch_option_switch");
-          var oswitch_output = document.getElementById("pswitch_option_switch_text_value");
-          oswitch.checked = tile_state;
-          oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-          oswitch.onclick = function() {
-            oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-          }
-        } else if (type == 'setpoint_swg') {
-          slider.value = sp_value;
-          oswitch = document.getElementById("swg_option_switch");
-          var oswitch_output = document.getElementById("swg_option_switch_text_value");
-          document.getElementById("swg_option_switch_row").style.display = "table-row";
-          oswitch.checked = getTileAttribute(id, "Boost")=='on'?true:false ;
-          slider_output.innerHTML = slider.value + ext;
-          oswitch_output.innerHTML = ((oswitch.checked) ? "Boost On" : "Boost Off");
-          slider.oninput = function() {
-            slider_output.innerHTML = this.value + ext;
-          }
-          oswitch.onclick = function() {
-            oswitch_output.innerHTML = ((oswitch.checked) ? "Boost On" : "Boost Off");
-          }
-        } else if (type == 'setpoint_freeze') {
-          slider.value = sp_value;
-          oswitch = document.getElementById("swg_option_switch");
-          document.getElementById("swg_option_switch_row").style.display = "none";
-          slider_output.innerHTML = slider.value + ext;
-          slider.oninput = function() {
-            slider_output.innerHTML = this.value + ext;
-          }
-        } else if (type == 'switch_vsp') {
-          slider.value = sp_value;
-          oswitch = document.getElementById("vspoption_switch");
-          oswitch.checked = tile_state;
-          var oswitch_output = document.getElementById("vspoption_switch_text_value");
-          slider_output.innerHTML = slider.value + ext;
-          oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-          
-          slider.oninput = function() {
-            slider_output.innerHTML = this.value + ext;
-            vsp_slider_changed = true;
-            if (oswitch.checked != true) {
-              oswitch.checked = true;
-              oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-            }
-          }
-          oswitch.onclick = function() {
-            oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-          }
-        } else if (type == 'switch_timer') {
-          oswitch = document.getElementById("timer_switch");
-          oswitch.checked = tile_state;
-          var oswitch_output = document.getElementById("timer_switch_text_value");
-          oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-          // All timer slider options are set below for everyone.
-        } else {
-          slider.value = sp_value;
-          oswitch = document.getElementById("option_switch");
-          oswitch.checked = tile_state;
-          var oswitch_output = document.getElementById("option_switch_text_value");
-          slider_output.innerHTML = slider.value + ext;
-          oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-          slider.oninput = function() {
-            slider_output.innerHTML = this.value + ext;
-            //sp_value = this.value
-          }
-          oswitch.onclick = function() {
-            oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-            //setTileOn(id, ((oswitch.checked)?"on":"off"), null);
-          }
-        }
-
-        if (typeof tm_slider !== 'undefined' && tm_slider != null) {
-          tm_slider.min = ((typeof timer_slider_min !== 'undefined')?timer_slider_min:0);
-          tm_slider.max = ((typeof timer_slider_max !== 'undefined')?timer_slider_max:360);
-          tm_slider.step = ((typeof timer_slider_step !== 'undefined')?timer_slider_step:10);
-          tm_ext = ' runtime (min)';
-
-          tm_slider.value = tm_slider.min;
-
-          tm_slider_output.innerHTML = tm_slider.value + tm_ext;
-          tm_slider.oninput = function() {
-            tm_slider_output.innerHTML = this.value + tm_ext;
-            if (this.value == 0) {
-              oswitch.checked = false;
-              oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-            } else {
-              oswitch.checked = true;
-              oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-            }
-          }
-          oswitch.onclick = function() {
-            oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-            if (oswitch.checked == false) {
-              tm_slider.value = 0;
-              tm_slider_output.innerHTML = "0" + tm_ext;
-            }
-          }
-        }
-
-        var cTime;
-        try {
-          cTime = performance.now();
-        } catch (e) {
-          cTime = Date.now(); // NSF Probably won't test well below, need to check.
-        }
-        var clickHandler = function(e) {
-          // Short time diff means event was the one that launched the options pane, so ignore
-          if ((e.timeStamp - cTime) > 1000)
-            showTileOptions(false);
-        };
-        document.getElementById("body_wrap").addEventListener("click", clickHandler);
-        close_button.onclick = function() {
-          document.getElementById("body_wrap").removeEventListener("click", clickHandler);
-          var state = oswitch.checked;
-          if (type == 'switch_program') {
-            var mode=false;
-            if (_lightProgramDropdown) {
-              if (pswitch.selectedIndex > 0) {
-                send_light_mode(pswitch.selectedIndex, id, pswitch.options[pswitch.selectedIndex].text);
-                mode=true;
-              }
-            } else {
-              var radio = document.getElementsByName("light_program");
-              var x;
-              for (x = 0; x < radio.length; x++) {
-                 if (radio[x].checked == true) {
-                   send_light_mode(radio[x].value, id, document.getElementById('pswitch_option_switch_text_value').innerHTML);
-                   mode=true;
-                   break;
-                 }
-              }
-            }
-            if (mode == false) {
-             // if (state == (tile.getAttribute('status') == 'off')) // Only bother with this if we didn;t set the light mode.
-                setTileState(id, state);
-            }
-          } else if (type == 'setpoint_swg') {
-            //console.log ("Boost attribute = "+tile.getAttribute('boost'));
-            //console.log ("state = "+state);
-            if (state == (tile.getAttribute('Boost') == 'off')) {
-              //console.log ("change boost");
-              send_command( 'SWG/Boost', (state==true?"1":"0") );
-            } else {
-              if (sp_value != slider.value && slider.value != 101) // Don't change setpoint if slider is on boost
-                setThermostatSetpoint(id, slider.value);
-            }
-          } else if (type == 'switch_program') {
-            var value = slider.value;
-            if (state == (tile.getAttribute('status') == 'off'))
-              setTileState(id, state);
-            if (sp_value != slider.value)
-              setThermostatSetpoint(id, slider.value)
-          } else if (type == 'switch_timer') {
-            if (tm_slider.value == 0 && state == (tile.getAttribute('status') == 'off'))
-              setTileState(id, state);
-          } else if (type == 'switch_vsp') {
-            // VSP, first check is slider changed, as startup we have no ide on RPM
-            var value = slider.value;
-            if (state == (tile.getAttribute('status') == 'off'))
-              setTileState(id, state);
-            if (sp_value != slider.value && vsp_slider_changed == true)
-              setThermostatSetpoint(id, slider.value)
-          } else {
-            var value = slider.value;
-            if (state == (tile.getAttribute('status') == 'off'))
-              setTileState(id, state);
-            if (sp_value != slider.value)
-              setThermostatSetpoint(id, slider.value)
-          }
-
-          if (typeof tm_slider !== 'undefined' && tm_slider != null) {
-            if (tm_slider.value > 0)
-              send_switch_timer(id, tm_slider.value);
-          }
-          //showTileOptions(false, null, 'this');
-          active_option.style.display = 'none';
-          document.getElementById('wrapper').classList.remove("opaque");
-        }
-      }
-    }
-
-    function update_status(data) {
-      //console.log("Received Update Satus");
-      _aqualink_data = data;
-      var el = document.getElementById("datetime");
-
-      if (data.time.toString() != "" && data.time.toString() != "xx") 
-        el.innerHTML = data.time.toLowerCase().replace(" ", "&nbsp;") + ((_landscape) ? "&nbsp;" : "<br>") + data.date.toLowerCase().replace(" ", "&nbsp;");
-      
-      if (document.getElementById("name").innerHTML == "AqualinkD") {
-        if (data.status != "Ready") {
-          document.getElementById("message").innerHTML = formatSatus(data.status);
-        } else {
-          document.getElementById("message").innerHTML = '';
-        }
-      }
-     
-      if (data.status.indexOf("ERROR") >= 0)
-        document.getElementById("header").classList.add("error");
-
-      // Hard code value updated as I can't be bothered to update source.
-      // should come back and re-do these values.
-      // The ID's should ultimatly come from json
-      setThermostatTile("Pool_Heater", data.pool_temp, data.pool_htr_set_pnt);
-      setThermostatTile("Spa_Heater", data.spa_temp, data.spa_htr_set_pnt);
-      setThermostatTile("Freeze_Protect", data.air_temp, data.frz_protect_set_pnt);
-      
-      setTileValue("Temperature/Air", data.air_temp);
-      setTileValue("Temperature/Pool", data.pool_temp);
-      setTileValue("Temperature/Spa", data.spa_temp);
-
-      if (typeof(data.swg_percent) !== 'undefined')
-        setThermostatTile("SWG", data.swg_percent, data.swg_percent);
-
-      if (typeof(data.swg_ppm) !== 'undefined')
-        setTileValue("SWG/PPM", data.swg_ppm);
-
-      if (typeof(data.chem_ph) !== 'undefined')
-        setTileValue("CHEM/pH", data.chem_ph);
-      if (typeof(data.chem_orp) !== 'undefined')
-        setTileValue("CHEM/ORP", data.chem_orp);
-      /*
-      setTileValue("Air", data.air_temp);
-      setTileValue("Pool_Water", data.pool_temp);
-      setTileValue("Spa_Water", data.spa_temp);*/
-      for (var obj in data.leds) {
-        setTileOn(obj.toString(), data.leds[obj]);
-
-        if (obj.toString() == 'SWG/Boost') {
-          //console.log("BOOST IS "+data.leds[obj]);
-          setTileAttribute('SWG', "Boost", data.leds[obj]);
-          setTileValue
-        }
-      }
-      for (var obj in data.timers) {
-        setTileOnText(obj.toString(),"On (timer)");
-      }
-
-      if (data.swg_boost_msg != null ) {
-        var tile = document.getElementById('SWG');
-        if (tile != null) {
-          var sp_value = tile.getAttribute('setpoint');
-          if (sp_value == 101)
-            document.getElementById('SWG' + '_status').innerHTML = 'Boost '+data.swg_boost_msg;
-        }
-      }
-
-      //obj.leds.'SWG/Boost' 
-
-      // NSF Really quick hack to show RPM on filter pump. Need to come back and do this correctly.
-      /*
-      if ((typeof data.extra["Pump_1"] !== 'undefined') && (typeof data.extra["Pump_1"].RPM !== 'undefined')) {
-        console.log(data.extra["Pump_1"].RPM);
-        if (document.getElementById('Filter_Pump').getAttribute('status') == 'on') {
-          document.getElementById('Filter_Pump_status').innerHTML = 'RPM:'+data.extra["Pump_1"].RPM;
-        }
-      }*/
-      //console.log(data["Pump_1"].RPM);
-      
-      var i = 1;
-      while (i < 5) {
-        //console.log(data["Pump_"+i].RPM);
-        if ((typeof data["Pump_"+i] !== 'undefined') && (typeof data["Pump_"+i].RPM !== 'undefined')) {
-          if (data["Pump_"+i].RPM == -3) {
-            setTileOnText(data["Pump_"+i].id, 'Pump ERROR');
-          } else if (data["Pump_"+i].RPM == -2) {
-            setTileOnText(data["Pump_"+i].id, 'Pump Offline');
-          } else if (data["Pump_"+i].RPM == -1) {
-            setTileOnText(data["Pump_"+i].id, 'Pump Priming');
-          } else {
-            //setTileOnText(object.id, 'RPM:'+object.Pump_RPM);
-            if (data["Pump_"+i].Pump_Type == "vfPump") {
-              if (_show_vsp_gpm == true)
-                setTileOnText(data["Pump_"+i].id, 'GPM:'+data["Pump_"+i].GPM);
-              else
-                setTileOnText(data["Pump_"+i].id, 'RPM:'+data["Pump_"+i].RPM);
-
-              document.getElementById(data["Pump_"+i].id).setAttribute('setpoint', data["Pump_"+i].GPM);
-            } else {
-              document.getElementById(data["Pump_"+i].id).setAttribute('setpoint', data["Pump_"+i].RPM);
-              setTileOnText(data["Pump_"+i].id, 'RPM:'+data["Pump_"+i].RPM);
-            }
-          }
-          /*
-          if (document.getElementById(data["Pump_"+i].id).getAttribute('status') == 'on')
-            document.getElementById(data["Pump_"+i].id + '_status').innerHTML = 'RPM:'+data["Pump_"+i].RPM;
-          else
-            console.log(data["Pump_"+i].id + ' is off, not displaying RPM ' + data["Pump_"+i].RPM);*/
-        }
-        i++;
-      }
-    }
-
-    function deviceSort(a, b) {
-      var pa;
-      var pb;
-      try {
-        pa = devices.indexOf(a.id);
-        pb = devices.indexOf(b.id);
-        if (pa > pb) 
-          return 1;
-        else if (pa < pb)
-          return -1;
-      } catch (e) {}
-      return 0;
-    }
-
-    function check_devices(data) {
-      _temperature_units = data['temp_units'];
-      data['devices'].sort(deviceSort);
-      for (var obj in data['devices']) {
-        if (document.getElementById(data['devices'][obj].id) == null) {
-          _displayNames[data['devices'][obj].id.replace("Aux_", "AUX")] = data['devices'][obj].name;
-          createTile(data['devices'][obj]);
-        } else {
-          //console.log("CHECK "+document.getElementById(data['devices'][obj].id).getAttribute('type')+" | against "+data['devices'][obj].type+" | and "+data['devices'][obj].type_ext+" | for "+data['devices'][obj].id);
-          //CHECK switch | against setpoint_thermo | and undefined | for Pool_Heater
-
-          var element_type = document.getElementById(data['devices'][obj].id).getAttribute('type');
-          var ext_type;
-          if (typeof data['devices'][obj].type_ext !== 'undefined')
-            ext_type = data['devices'][obj].type_ext;
-          else
-            ext_type = element_type; // Just force next if to match.
-
-          //if ( (element_type != data['devices'][obj].type) &&
-          //     (typeof data['devices'][obj].type_ext !== 'undefined' && (element_type != data['devices'][obj].type_ext) ) ) {
-          if ( (element_type != data['devices'][obj].type) && (ext_type != data['devices'][obj].type_ext) ) {
-            console.log("Remove and create "+data['devices'][obj].id);
-            console.log("Old type "+element_type+" | new type "+data['devices'][obj].type+" sub "+data['devices'][obj].type_ext);
-            var element = document.getElementById(data['devices'][obj].id);
-            element.parentNode.removeChild(element);
-            createTile(data['devices'][obj]);
-          }
-        }
-      }
-    }
-
-    function get_appropriate_ws_url() {
-      var pcol;
-      var u = document.URL;
-      /*
-       * We open the websocket encrypted if this page came on an
-       * https:// url itself, otherwise unencrypted
-       */
-      if (u.substring(0, 5) == "https") {
-        pcol = "wss://";
-        u = u.substr(8);
-      } else {
-        pcol = "ws://";
-        if (u.substring(0, 4) == "http")
-          u = u.substr(7);
-      }
-      u = u.split('/');
-      //alert (pcol + u[0] + ":6500");
-      return pcol + u[0];
-    }
-    /* dumb increment protocol */
-    var socket_di;
-
-    function startWebsockets() {
-      socket_di = new WebSocket(get_appropriate_ws_url());
-      try {
-        socket_di.onopen = function() {
-          // success!
-          get_devices();
-          // Set another load 1 minute from now just incase the server hasn't got all the devices yet
-          window.setTimeout(get_devices, (60 * 1000));
-          // Get Status just incase control panel hasn't connected yet
-          get_status();
-        }
-        socket_di.onmessage = function got_packet(msg) {
-          document.getElementById("header").classList.remove("error");
-          var data = JSON.parse(msg.data);
-          if (data.type == 'status') {
-            update_status(data);
-          } else if (data.type == 'devices') {
-            check_devices(data);
-            resetBackgroundSize();
-            //window.setTimeout(get_devices, (300 * 1000)); // Check for new dvices ever 5 mins.
-            window.setTimeout(get_devices, (60 * 1000)); // Check for new dvices ever 1 mins.
-          }
-        }
-        socket_di.onclose = function() {
-          // something went wrong
-          document.getElementById("message").innerHTML = '  Connection error!  '
-          document.getElementById("header").classList.add("error");
-          // Try to reconnect every 5 seconds.
-          setTimeout(function() {
-            startWebsockets()
-          }, 5000);
-        }
-      } catch (exception) {
-        alert('<p>Error' + exception);
-      }
-    }
-
-    function get_devices() {
-      /*
-      var msg = {
-        command: "GET_DEVICES"
-      };*/
-      var msg = {
-        uri: "devices"
-      };
-      socket_di.send(JSON.stringify(msg));
-    }
-
-    function get_status() {
-      /*
-      var msg = {
-        command: "GET_DEVICES"
-      };*/
-      var msg = {
-        uri: "status"
-      };
-      socket_di.send(JSON.stringify(msg));
-    }
-
-    function send_command(cmd, value=null) {
-      var _cmd = {};
-      _cmd.command = cmd;
-      _cmd.uri = cmd+"/set";
-      if (value != null) {
-        _cmd.value = value;
-      }
-      socket_di.send(JSON.stringify(_cmd));
-
-      if ( _link_spa_and_heater && cmd == "Spa_Mode" ) {
-        var ncmd = {};
-        ncmd.command = "Spa_Heater";
-        ncmd.uri = "Spa_Heater/set";
-        if (value != null) {
-          ncmd.value = value;
-        }
-        socket_di.send(JSON.stringify(ncmd));
-      }
-    }
-
-    function send_setpoint(id) {
-      var message = {};
-      var tile;
-      if ((tile = document.getElementById(id)) == null) {
-        return;
-      }
-      var type = tile.getAttribute('type');
-      message.parameter = tile.getAttribute('id');
-      message.value = tile.getAttribute('setpoint');
-
-      if (type == "setpoint_swg")
-        message.uri = id+"/percent/set";
-      else if (type == "switch_vsp")
-        message.uri = id+"/RPM/set";
-      else
-        message.uri = id+"/setpoint/set";
-//console.log("Send value back "+temperature.parameter+" "+temperature.value);
-      socket_di.send(JSON.stringify(message));
-    }
-
-    function send_light_mode(value, id, textvalue) {
-      console.log("Set light mode to "+value+" id="+id+" text="+textvalue);
-      var mode = {};
-      //mode.parameter = 'POOL_LIGHT_MODE';
-      //mode.parameter = 'LIGHT_MODE';
-      mode.value = value;
-      mode.button = id;
-      mode.uri = id+"/program/set";
-      mode.text_value = textvalue;
-      socket_di.send(JSON.stringify(mode));  
-    }
-
-    function send_switch_timer(id, value) {
-      var message = {};
-      message.uri = id+"/timer/set";
-      message.value = value;
-      socket_di.send(JSON.stringify(message));  
-    }
-
-    function reset() {
-      socket_di.send("reset\n");
-    }
-
-    function showBackground() {
-      wrapper = document.getElementById("wrapper");
-      if (wrapper.classList.contains("vopaque")) {
-        wrapper.classList.remove("vopaque");
-      } else {
-        wrapper.classList.add("vopaque");
-      }
-    }
-
-    function showVersion(source) {
-      if ((message = document.getElementById("message")) != null) {
-        message.innerHTML = "AqualinkD : " + _aqualink_data.aqualinkd_version + " | AqualinkRS : " + _aqualink_data.version;
-      }
-      source.innerHTML = "Version(s)";
-      setTimeout(function() {
-        source.innerHTML = "AqualinkD";
-      }, 5000);
-    }
-
-    function updatePwsitchOptions(source, light_type) {
-      if (source.type == 'radio') {
-        var modename = _light_program[light_type][source.value-1];
-        if (modename.endsWith(" - Show"))
-          modename = modename.substr(0, (modename.length - 7));
-        document.getElementById('pswitch_option_switch_text_value').innerHTML = modename;
-        document.getElementById('pswitch_option_switch').checked = true;
-      } else if (source.type == 'checkbox') {
-        //console.log(source);
-        var x;
-        if (document.getElementById('pswitch_option_switch').checked == false) {
-          var radio = document.getElementsByName("light_program");
-          for (x = 0; x < radio.length; x++) {
-            radio[x].checked = false
-          }
-          document.getElementById('pswitch_option_switch_text_value').innerHTML = 'Off';
-        }
-      }
-    }
-/*
-    function updateTimerOptions(source) {
-      if (source.type == 'range') {
-        if (source.value > 0) {
-          document.getElementById('timer_switch').checked = true;
-        } else {
-          document.getElementById('timer_switch').checked = false;
-        }
-      } else if (source.type == 'checkbox') {
-        if (document.getElementById('timer_switch').checked == false) {
-          //timer_slider_range = 0;
-          document.getElementById("timer_slider_range").value = 0;
-          document.getElementById("timer_slider_text_value").value = 0;
-        }
-      }
-    }
-  */
-  </script>
-</head>
-
-<!--<body onload='showTileOptions(false); test_harness();startWebsockets();'> -->
-
-<body onload='init();'>
-  <div id='body_wrap' class='body_wrap'>
-    <!-- <div id='body_wrap' class='body_wrap' onmousedown='showTileOptions(false);'> -->
-    <div id='wrapper' class="wrapper">
-      <div id="header" class="head" onclick="showBackground();">
-        <table border='0' width='100%' cellpadding='0' cellspacing='0'>
-          <tr>
-            <td width="70px" align='left' id='td_name'><span class='title' id='name'
-                onclick="showVersion(this);event.stopPropagation();">AqualinkD</span>
-            </td>
-            <td align='center'><span class='title' id='message'></span>
-            </td>
-            <td width="70px" align='right' id='td_timedate'><span class='timedate' id='datetime'></class>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div id='thermostat_options' class='options hide'>
-      <div id='thermostat_options_pane' class='options_pane' onclick='event.stopPropagation();'>
-        <table border='0' cellpadding='10px'>
-          <tr class='options_title'>
-            <th colspan='2'><span id="option_title"></span>
-            </th>
-          </tr>
-          <tr>
-            <td align='right' width='50%'><span class="option_text" id='option_switch_text_value'></span>
-            </td>
-            <td align='left' width='50%'>
-              <label class="option_switch">
-                <input type="checkbox" id='option_switch'>
-                <span class="option_switch_slide"></span>
-              </label>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'><span class="option_text" id="option_slider_text_value"></span>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2'>
-              <div class="slidecontainer">
-                <input type="range" class="option_slider" id='option_slider_range'>
-              </div>
-            </td>
-          </tr>
-
-          <tr>
-            <td colspan='2' align='center'><span class="option_text" id="th_timer_slider_text_value"></span>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2'>
-              <div class="slidecontainer">
-                <input type="range" class="option_slider" id='th_timer_slider_range'>
-              </div>
-            </td>
-          </tr>
-
-          <tr>
-            <td colspan='2' align='center'>
-              <input type="button" value="close" id='options_close' class='options_button'>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div id='swg_options' class='options hide'>
-      <div id='swg_options_pane' class='options_pane' onclick='event.stopPropagation();'>
-        <table border='0' cellpadding='10px'>
-          <tr class='options_title'>
-            <th colspan='2'><span id="swg_option_title"></span>
-            </th>
-          </tr>
-          <tr id="swg_option_switch_row">
-            <td align='right' width='50%'><span class="option_text" id='swg_option_switch_text_value'></span>
-            </td>
-            <td align='left' width='50%'>
-              <label class="option_switch">
-                <input type="checkbox" id='swg_option_switch'>
-                <span class="option_switch_slide"></span>
-              </label>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'><span class="option_text" id="swg_option_slider_text_value"></span>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2'>
-              <div class="slidecontainer">
-                <input type="range" class="option_slider" id='swg_option_slider_range'>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'>
-              <input type="button" value="close" id='swg_options_close' class='options_button'>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div id='pswitch_options' class='options hide'>
-      <div id='pswitch_options_pane' class='options_pane' onclick='event.stopPropagation();'>
-        <table id='pswitch_table' border='0' cellpadding='10px' width="100%">
-          <tr class='options_title'>
-            <th colspan='2'><span id="pswitch_option_title"></span>
-            </th>
-          </tr>
-          <tr>
-            <td align='right' width='50%'><span class="option_text" id='pswitch_option_switch_text_value'></span>
-            </td>
-            <td align='left' width='50%'>
-              <label class="option_switch">
-                <input type="checkbox" id='pswitch_option_switch' onchange='updatePwsitchOptions(this);'>
-                <span class="option_switch_slide"></span>
-              </label>
-            </td>
-          </tr>
-
-          <tr>
-            <td colspan='2' align='center'>
-              <select id='pswitch_option_list' class='options_selector'>
-                <option value="0">Pool Light Program</option>
-              </select>
-            </td>
-          </tr>
-
-          <tr>
-            <td colspan='2' align='center'><span class="option_text" id="ps_timer_slider_text_value"></span>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2'>
-              <div class="slidecontainer">
-                <input type="range" class="option_slider" id='ps_timer_slider_range'>
-              </div>
-            </td>
-          </tr>
-
-          <tr>
-            <td colspan='2' align='center'>
-              <input type="button" value="close" id='pswitch_options_close' class='options_button'>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div id='vspswitch_options' class='options hide'>
-      <div id='vspswitch_options_pane' class='options_pane' onclick='event.stopPropagation();'>
-        <table border='0' cellpadding='10px'>
-          <tr class='options_title'>
-            <th colspan='2'><span id="vspswitch_option_title"></span>
-            </th>
-          </tr>
-          <tr>
-            <td align='right' width='50%'><span class="option_text" id='vspoption_switch_text_value'></span>
-            </td>
-            <td align='left' width='50%'>
-              <label class="option_switch">
-                <input type="checkbox" id='vspoption_switch'>
-                <span class="option_switch_slide"></span>
-              </label>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'><span class="option_text" id="vspoption_slider_text_value"></span>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2'>
-              <div class="slidecontainer">
-                <input type="range" class="option_slider" id='vspoption_slider_range'>
-              </div>
-            </td>
-          </tr>
-
-          <tr>
-            <td colspan='2' align='center'><span class="option_text" id="vsp_timer_slider_text_value"></span>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2'>
-              <div class="slidecontainer">
-                <input type="range" class="option_slider" id='vsp_timer_slider_range'>
-              </div>
-            </td>
-          </tr>
-
-          <tr>
-            <td colspan='2' align='center'>
-              <input type="button" value="close" id='vspswitch_option_close' class='options_button'>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div id='timer_options' class='options hide'>
-      <div id='timer_options_pane' class='options_pane' onclick='event.stopPropagation();'>
-        <table border='0' cellpadding='10px'>
-          <tr class='options_title'>
-            <th colspan='2'><span id="timer_option_title"></span>
-            </th>
-          </tr>
-          <tr>
-            <td align='right' width='50%'><span class="option_text" id='timer_switch_text_value'></span>
-            </td>
-            <td align='left' width='50%'>
-              <label class="option_switch">
-                <input type="checkbox" id='timer_switch'>
-                <span class="option_switch_slide"></span>
-              </label>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'><span class="option_text" id="timer_slider_text_value"></span>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2'>
-              <div class="slidecontainer">
-                <input type="range" class="option_slider" id='timer_slider_range'>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'>
-              <input type="button" value="close" id='timer_options_close' class='options_button'>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </div>
-</body>
-
-</html>
diff --git a/web-old/controller.old.html b/web-old/controller.old.html
deleted file mode 100644
index 9b4aaf9..0000000
--- a/web-old/controller.old.html
+++ /dev/null
@@ -1,1212 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-
-<head>
-  <meta http-equiv='Content-Type' content='text/html; charset=windows-1252'>
-  <title>AqualinkD</title>
-  <meta name='viewport' content='width=device-width'>
-  <meta name='mobile-web-app-capable' content='yes'>
-  <meta name='apple-mobile-web-app-capable' content='yes'>
-  <meta name='apple-mobile-web-app-status-bar-style' content='black'>
-  <link href='aqualinkd.png' rel='apple-touch-icon'>
-  <link href='aqualinkd.png' rel='icon'>
-  <script src='config.js'></script>
-  <style>
-    :root {
-      --tile-width: 100px;
-      --tile_icon-height: 35px;
-      --tile_name-height: 32px;
-      --tile_status-height: 15px;
-      --tile_grid-gap: 10px;
-      --tile_name-lineheight: 1.2;
-      /*
-      // Large display will use the below values, just here for testing.
-      --tile-width: 125px;
-      --tile_icon-height: 45px;
-      --tile_name-height: 42px;
-      --tile_status-height: 15px;
-      --tile_grid-gap: 20px;
-      --tile_name-lineheight: 1.4;
-      */
-
-      /* These get overiden from config.js, don't edit */
-      --body_background: rgb(235, 235, 235);
-      --body_text: black;
-
-      --options_pane_background: rgb(245, 245, 245);
-      --options_pane_bordercolor: rgb(124, 124, 124);
-      --options_slider_ball: 30;
-      --options_slider_highlight: #2196F3;
-      --options_slider_lowlight: #d3d3d3;
-      --options_slider_height: 20px;
-
-      --head_background: rgb(43, 106, 143);
-      --head_text: #fff;
-      --error_background: rgb(143, 43, 43);
-
-      --tile_background: rgb(220, 220, 220);
-      --tile_text: rgb(110, 110, 110);
-      --tile_on_background: #fff;
-      --tile_on_text: #000;
-      --tile_status_text: rgb(87, 87, 87);
-    }
-    div {
-      -webkit-touch-callout: none;
-      -webkit-user-select: none;
-      -khtml-user-select: none;
-      -moz-user-select: none;
-      -ms-user-select: none;
-      user-select: none;
-    }
-    div::-moz-selection {
-      background: transparent;
-    }
-    div::selection {
-      background: transparent;
-    }
-    html {} body {
-      background-color: var(--body_background);
-      font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
-      font-weight: 600;
-      font-size: 14px;
-      color: var(--body_text);
-      /*margin: 0 !important;*/
-      /*padding: 0 !important;*/
-      /*margin: 10px !important;*/
-      /* Font rendering (mainly for firefox) */
-      text-rendering: optimizeLegibility;
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
-    }
-    .body_wrap {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      top: 0px;
-      left: 0px;
-      background-repeat: no-repeat;
-      background-position: center;
-      background-size: cover;
-      height: 100%;
-    }
-    .opaque {
-      top: 0px;
-      left: 0px;
-      filter: alpha(opacity=60);
-      opacity: 0.6;
-    }
-    .vopaque {
-      top: 0px;
-      left: 0px;
-      filter: alpha(opacity=40);
-      opacity: 0.4;
-    }
-    .options_pane {
-      background-color: var(--options_pane_background);
-      border: 2px solid var(--options_pane_bordercolor);
-      border-radius: 20px;
-      justify-content: center;
-      align-items: center;
-      width: 345px;
-      /*height:245px;*/
-    }
-    .options {
-      top: 10px;
-      /*left: 10px;*/
-
-      position: fixed;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      width: 100vw;
-      /*
-      height: 100%;
-      */
-    }
-    /*
-    .show {
-      top: 0px;
-      left: 0px;
-    }
-*/
-
-    .wrapper {
-      display: grid;
-      /*grid-template-columns: repeat(auto-fill, minmax(var(--tile-width), var(--tile-width)));
-      grid-auto-rows: 1fr, repeat(auto-fill, minmax(var(--tile-width), var(--tile-width)));*/
-
-      grid-template-columns: repeat(auto-fit, minmax(var(--tile-width), auto));
-      grid-auto-rows: 1fr, repeat(auto-fit, minmax(var(--tile-width), auto));
-      grid-gap: var(--tile_grid-gap);
-      padding: 0 !important;
-      margin: 10px !important;
-    }
-    .head {
-      /*background-color: rgb(124, 124, 124);*/
-
-      background-color: var(--head_background);
-      color: var(--head_text);
-      border-radius: 5px;
-      padding: 5px;
-      grid-column: 1 / -1;
-    }
-    .error {
-      background-color: var(--error_background) !important;
-    }
-    .hide {
-      display: none;
-      filter: alpha(opacity=0);
-      opacity: 0.0;
-    }
-    .tile {
-      background-color: var(--tile_background);
-      color: var(--tile_text);
-      border-radius: 10px;
-      padding: 0px;
-      /*font-size: 100%;*/
-
-      box-sizing: border-box;
-      padding: 5px;
-      height: var(--tile-width);
-      width: var(--tile-width);
-      filter: alpha(opacity=90);
-      opacity: 0.9;
-    }
-    .on {
-      background-color: var(--tile_on_background);
-      color: var(--tile_on_text);
-      filter: alpha(opacity=100);
-      opacity: 1.0;
-    }
-    .flash {
-      color: var(--tile_on_text);
-      filter: alpha(opacity=100);
-      opacity: 0.9;
-      -webkit-animation-name: tile-flash; /* Safari 4.0 - 8.0 */
-      -webkit-animation-duration: 2s; /* Safari 4.0 - 8.0 */
-      animation-name: tile-flash;
-      animation-duration: 2s;
-      animation-iteration-count: infinite;
-    }
-    /* Safari 4.0 - 8.0 */
-    @-webkit-keyframes tile-flash {
-      0% {background-color: var(--tile_on_background); opacity: 1.0;}
-      50% {background-color: var(--tile_background); opacity: 0.9;}
-      100% {background-color: var(--tile_on_background); opacity: 1.0;}
-    }
-
-    /* Standard syntax */
-    @keyframes tile-flash {
-      0% {background-color: var(--tile_on_background); opacity: 1.0;}
-      50% {background-color: var(--tile_background); opacity: 0.9;}
-      100% {background-color: var(--tile_on_background); opacity: 1.0;}
-    }
-    /*
-    .off {
-      background-color: #ccc;
-      color: rgb(133, 133, 133);
-    }
-*/
-
-    .tile_icon {
-      height: var(--tile_icon-height);
-      display: table;
-      margin: 0 auto;
-      /*background-color: red;*/
-    }
-    .tile_name {
-      height: var(--tile_name-height);
-      /*background-color: green;*/
-
-      line-height: var(--tile_name-lineheight);
-    }
-    .tile_status {
-      color: var(--tile_status_text);
-      height: var(--tile_status-height);
-      /*background-color: blue;*/
-    }
-    .tile_icon_value {
-      border-radius: calc(var(--tile_icon-height) / 2);
-      font-weight: 600;
-      /*border-radius: 27px;*/
-
-      height: var(--tile_icon-height);
-      min-width: var(--tile_icon-height);
-      text-align: center;
-      vertical-align: middle;
-      line-height: var(--tile_icon-height);
-      filter: alpha(opacity=100);
-      opacity: 1.0;
-    }
-    .heat {
-      background-color: rgb(255, 123, 0);
-      color: rgb(255, 255, 255);
-    }
-    .cool {
-      background-color: rgb(4, 159, 248);
-      color: rgb(255, 255, 255);
-    }
-    .enabled {
-      background-color: rgb(78, 196, 0);
-      color: rgb(255, 255, 255);
-    }
-    .disabled {
-      background-color: rgb(110, 110, 110);
-      color: rgb(220, 220, 220);
-    }
-    /* All for options panel */
-
-    .option_switch {
-      position: relative;
-      display: inline-block;
-      width: 60px;
-      height: 34px
-    }
-    .option_switch input {
-      display: none;
-    }
-    .option_switch_slide {
-      position: absolute;
-      cursor: pointer;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-      background-color: var(--options_slider_lowlight);
-      -webkit-transition: .4s;
-      transition: .4s;
-      border-radius: 34px;
-    }
-    .option_switch_slide:before {
-      position: absolute;
-      content: "";
-      height: calc(var(--options_slider_ball)*1px);
-      width: calc(var(--options_slider_ball)*1px);
-      left: 2px;
-      bottom: 2px;
-      background-color: white;
-      -webkit-transition: .4s;
-      transition: .4s;
-      border-radius: 50%;
-    }
-    input:checked+.option_switch_slide {
-      background-color: var(--options_slider_highlight);
-    }
-    input:focus+.option_switch_slide {
-      box-shadow: 0 0 1px var(--options_slider_highlight);
-    }
-    input:checked+.option_switch_slide:before {
-      -webkit-transform: translateX(26px);
-      -ms-transform: translateX(26px);
-      transform: translateX(26px);
-    }
-    .option_slider {
-      -webkit-appearance: none;
-      width: 300px;
-      height: var(--options_slider_height);
-      background: var(--options_slider_lowlight);
-      outline: none;
-      -webkit-transition: .2s;
-      transition: opacity .2s;
-      border-radius: var(--options_slider_height);
-    }
-    .option_slider::-webkit-slider-thumb {
-      -webkit-appearance: none;
-      appearance: none;
-      width: calc(var(--options_slider_ball)*1px);
-      height: calc(var(--options_slider_ball)*1px);
-      background: var(--options_slider_highlight);
-      cursor: pointer;
-      border-radius: calc(var(--options_slider_ball)*1px);
-    }
-    .option_slider::-moz-range-thumb {
-      width: calc(var(--options_slider_ball)*1px);
-      height: calc(var(--options_slider_ball)*1px);
-      background: var(--options_slider_highlight);
-      cursor: pointer;
-      border-radius: var(--options_slider_height);
-    }
-    .options_title {
-      /*background-color: rgb(124, 124, 124);
-      color: #fff;
-      font-weight: 200;*/
-
-      font-size: 18px;
-      overflow: hidden;
-    }
-    .options_selector {
-      font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
-      font-weight: 600;
-      font-size: 16px;
-    }
-    .options_button {
-      font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
-      font-weight: 600;
-      font-size: 16px;
-    }
-    .option_text {
-      font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
-      font-weight: 600;
-      font-size: 16px;
-    }
-    .timedate {
-      font-size: 10px;
-    }
-  </style>
-
-  <script type='text/javascript'>
-    var _pressEvent;
-    var _ignoreMouseEvent = false;
-    var _temperature_units;
-    var _aqualink_data;
-    var _landscape = false;
-    var _displayNames = [];
-
-    //init();
-    function init() {
-      setSizeSpecifics();
-      option = document.getElementById('pswitch_option_list');
-      try {
-         fLen = light_program.length;
-        for (i = 0; i < fLen; i++) {
-          var opt = document.createElement('option');
-          opt.value = i + 1;
-          opt.innerHTML = light_program[i];
-          option.appendChild(opt);
-        }
-      } catch (e) {}
-
-      document.getElementById('thermostat_options').classList.remove("hide");
-      document.getElementById('swg_options').classList.remove("hide");
-      document.getElementById('pswitch_options').classList.remove("hide");
-
-      setColors();
-      load_background();
-      showTileOptions(false);
-      startWebsockets();
-      resetBackgroundSize();
-    }
-    
-    function setProp(name) {
-      if (typeof window[name] !== 'undefined')
-        document.documentElement.style.setProperty('--'+name, window[name]);
-    }
-
-    function setColors() {
-      setProp("tile_on_background");
-      setProp("tile_on_background-crap");
-      setProp("body_background");
-      setProp("body_text");
-      setProp("options_pane_background");
-      setProp("options_pane_bordercolor");
-      setProp("options_slider_highlight");
-      setProp("options_slider_lowlight");
-      setProp("head_background");
-      setProp("head_text");
-      setProp("error_background");
-      setProp("tile_background");
-      setProp("tile_text");
-      setProp("tile_on_background");
-      setProp("tile_on_text");
-      setProp("tile_status_text");
-    }
-
-    function setSizeSpecifics() {
-      var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-      var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-      //alert(w+"x"+h+" = "+(w*h));
-      // 375x724 = 271500
-      if ((w * h) > 370000) { // 370000 is kind-a just guess
-        document.documentElement.style.setProperty('--tile-width', '125px');
-        document.documentElement.style.setProperty('--tile_icon-height', '45px');
-        document.documentElement.style.setProperty('--tile_name-height', '42px');
-        document.documentElement.style.setProperty('--tile_status-height', '15px');
-        document.documentElement.style.setProperty('--tile_grid-gap', '20px');
-        document.documentElement.style.setProperty('--tile_name-lineheight', '1.4');
-      }
-
-      if (w > h)
-        _landscape = true;
-      else
-        _landscape = false;
-
-      setOrientation(_landscape);
-      /*
-        Future change element sizes here if needed
-      */
-      window.addEventListener("orientationchange", function() {
-        var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-        var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-        // Have no idea why this is reversed, but w is less then h in landscape when captured here.
-        if (w < h)
-          _landscape = true;
-        else
-          _landscape = false;
-        setOrientation(_landscape);
-         // Need to finish rendering before calling this, so wait a small time
-        setTimeout(resetBackgroundSize, 100);
-      }, false);
-    }
-
-    function setOrientation(isLandscape) {
-      if (isLandscape) {
-        //alert('lll')
-        document.getElementById("td_name").width = '72px';
-        document.getElementById("td_timedate").width = '72px';
-      } else {
-        document.getElementById("td_name").width = '72px';
-        document.getElementById("td_timedate").width = '102px';
-      }
-    }
-
-    function load_background() {
-      // check for undevined AND defined but empty
-      if (typeof background_url === 'undefined' || background_url === undefined)
-        return;
-      //alert("load");
-      // call the notify_complete function when the image has loaded
-      var image = new Image();
-      image.onload = function() {
-        document.getElementById("body_wrap").style.backgroundImage = "url('" + this.src + "')";
-      };
-
-      if (typeof background_reload !== 'undefined' && background_reload > 0) {
-        image.src = background_url + '?' + new Date().getTime();
-        setTimeout(load_background, (background_reload * 1000));
-      } else {
-        image.src = background_url;
-      }
-    }
-
-    // If the grid continer is larger than the page container, increase page so background looks nice
-    // also reduce size if needed on page rotate.
-    function resetBackgroundSize() {
-       if (typeof background_url === 'undefined' || background_url === undefined)
-        return;
-
-      try {
-        //inside = document.getElementById('wrapper');
-        outside = document.getElementById('body_wrap');
-        insideH = parseInt(window.getComputedStyle(document.getElementById('wrapper')).height);
-        outsideH = parseInt(window.getComputedStyle(outside).height);
-
-        var w = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-        var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-
-        if (insideH > outsideH || outsideH > h) {
-          //outside.style.height = ((insideH > h)?(insideH + 40)+'px':(h + 40)+'px');
-          outside.style.height = ((insideH > h)?(insideH + 40)+'px':h+'px');
-          //alert("w:"+w+" h:"+h+" inH:"+insideH+" outH:"+outsideH+"\nUsed:"+outside.style.height);
-        }
-      } catch (e) {}
-    }
-
-    function endPress(id) {
-      //pressEvent = 0;
-      //alert ("Long press "+id);
-      //switchTileState(id, true);
-      showTileOptions(true, id);
-    }
-
-    function add_clickEvent(tile, id) {
-      tile.addEventListener('touchstart', function() {
-        _ignoreMouseEvent = true;
-        _pressEvent = window.setTimeout(function() {
-          _pressEvent = 0;
-          endPress(id);
-        }, 1000);
-      });
-      tile.addEventListener('touchend', function() {
-        if (_pressEvent != 0) {
-          clearTimeout(_pressEvent);
-          switchTileState(id, false);
-        }
-      });
-      tile.addEventListener("mousedown", function() {
-        if (_ignoreMouseEvent == false) {
-          _pressEvent = window.setTimeout(function() {
-            _pressEvent = 0;
-            endPress(id);
-          }, 1000);
-        }
-      });
-      tile.addEventListener("mouseup", function() {
-        if (_pressEvent != 0 && _ignoreMouseEvent == false) {
-          clearTimeout(_pressEvent);
-          switchTileState(id, false);
-        }
-      });
-    }
-
-    function add_tile(id, name, status, type, subtype, off_imgurl, on_imgurl) {
-      height = getComputedStyle(document.documentElement).getPropertyValue('--tile_icon-height');
-      div = document.createElement('div');
-      div.setAttribute('class', 'tile');
-      div.setAttribute('id', id);
-      div.setAttribute('type', subtype);
-      //div.setAttribute('onclick', "switchTileState('" + id + "')");
-      subdiv = document.createElement('div');
-      subdiv.setAttribute('class', 'tile_icon');
-      subdiv.setAttribute('id', id + '_icon');
-      if (off_imgurl != null) {
-        imgdiv = document.createElement('img');
-        imgdiv.setAttribute('height', height + 'px');
-        imgdiv.setAttribute('src', off_imgurl);
-        subdiv.appendChild(imgdiv);
-        div.appendChild(subdiv);
-        if (on_imgurl != null) {
-          subdiv = document.createElement('div');
-          subdiv.setAttribute('class', 'tile_icon');
-          subdiv.setAttribute('id', id + '_icon_on');
-          imgdiv = document.createElement('img');
-          imgdiv.setAttribute('height', height + 'px');
-          imgdiv.setAttribute('src', on_imgurl);
-          subdiv.style.display = 'none';
-          subdiv.appendChild(imgdiv);
-          div.appendChild(subdiv);
-        }
-      } else if (type == "value" || type == "thermostat") {
-        valdiv = document.createElement('div');
-        valdiv.setAttribute('class', 'tile_icon_value disabled');
-        valdiv.setAttribute('id', id + '_tile_icon_value');
-        valdiv.textContent = '--';
-        subdiv.appendChild(valdiv);
-        div.appendChild(subdiv);
-      }
-      /*else if (type == "thermostat") {
-             valdiv = document.createElement('div');
-             valdiv.setAttribute('class', 'tile_icon_value disabled');
-             valdiv.setAttribute('id', id + '_tile_icon_value');
-             valdiv.textContent = '--';
-             subdiv.appendChild(valdiv);
-           } */
-      subdiv = document.createElement('div');
-      subdiv.setAttribute('class', 'tile_name');
-      subdiv.setAttribute('id', id + '_name');
-      subdiv.textContent = name;
-      div.appendChild(subdiv);
-      // Value and Thermostat are the same, but value is read only and no state
-      if (type != "value") {
-        subdiv = document.createElement('div');
-        subdiv.setAttribute('class', 'tile_status');
-        subdiv.setAttribute('id', id + '_status');
-        subdiv.textContent = formatSatus(status);
-        div.appendChild(subdiv);
-        if (type == "switch" && subtype != "switch_program") {
-          div.setAttribute('onclick', "switchTileState('" + id + "')");
-        } else /*if (id != "SWG/Percent")*/ {
-          add_clickEvent(div, id);
-        }
-      }
-      document.getElementById('wrapper').appendChild(div);
-    }
-
-    function switchTileState(id, details) {
-      if (details) {
-        console.log("TILE DETAILS WHAY ARE WE HERE??? '" + id + "'");
-      } else {
-        setTileState(id, (document.getElementById(id).getAttribute('status') == 'off'))
-      }
-    }
-
-    function setTileState(id, state) {
-      if (state == (document.getElementById(id).getAttribute('status') == 'off')) {
-        send_command(id);
-      }
-      setTileOn(id, ((state) ? "on" : "off"));
-    }
-
-    function setThermostatSetpoint(id, sp_value) {
-      if ((tile = document.getElementById(id)) == null) {
-        return;
-      }
-      tile.setAttribute('setpoint', sp_value);
-      send_setpoint(id);
-    }
-
-    function setTileValue(id, value) {
-      var ext = '';
-      if (value == undefined || value.startsWith("-999") || value.startsWith(" "))
-        value = '--';
-      else {
-        
-        try{
-        if ((type = document.getElementById(id).getAttribute('type')) != null) {
-          if (type == 'temperature' || type == 'setpoint_thermo' || type == 'setpoint_freeze')
-            ext = '&deg;';
-          else if (type == 'setpoint_swg')
-            ext = '%';
-        }
-        } catch (e) {
-          console.log('ERROR id='+id+' Line 675');
-        }
-      }
-      //document.getElementById(id + '_tile_icon_value').textContent = value;
-      if ((tile = document.getElementById(id + '_tile_icon_value')) != null)
-        tile.innerHTML = value + ext;
-    }
-
-    function setThermostatTile(id, value, sp_value) {
-      setTileValue(id, value);
-      if ((tile = document.getElementById(id)) != null) {
-        tile.setAttribute('setpoint', sp_value);
-      }
-    }
-
-    function formatSatus(status) {
-      if ((index = status.indexOf("AUX")) >= 0) {
-        aux = status.substr(index, 4);
-        status = status.charAt(0).toUpperCase() + status.substr(1).toLowerCase();
-        if ((name = _displayNames[aux]) != undefined) {
-          status = status.substr(0, index) + name + status.substr(index + 4);
-        }
-      } else {
-        status = status.charAt(0).toUpperCase() + status.substr(1).toLowerCase();
-      }
-      return status;
-    }
-
-    function setTileOn(id, status) {
-
-      //function setTileOn(id, status, text) {
-      var tile;
-      var text;
-      if ((tile = document.getElementById(id)) == null) {
-        //console.log("Error unknown ID '"+id+"' can't set to '"+status+"'");
-        return;
-      }
-      if (status != "on" && status != "off" && status != "enabled" && status != "flash") {
-        console.log("Error unknown status '" + status + "' for '" + id + "'");
-        return;
-      }
-      tile.setAttribute('status', status);
-      if (status != 'off') {
-        if (status == 'flash') {
-          tile.classList.add("flash");
-          tile.classList.remove("on");
-          text = "Delay";
-        } else {
-          tile.classList.add("on");
-          tile.classList.remove("flash");
-          text = "On";
-        }
-        if ((offimg = document.getElementById(id + '_icon')) != null &&
-          (onimg = document.getElementById(id + '_icon_on')) != null) {
-          offimg.style.display = 'none';
-          onimg.style.display = 'table';
-        }
-        if ((type = tile.getAttribute('type')) != null) {
-          if (type == 'setpoint_swg')
-            text = 'Generating';
-          else if (type == 'setpoint_thermo')
-            text = 'Heating to ' + tile.getAttribute('setpoint');
-          else if (type == 'setpoint_freeze')
-            text = 'Turn on ' + tile.getAttribute('setpoint') + "&deg;";
-          //else
-          //  text = "On";
-        
-        }
-        //document.getElementById(id + '_status').innerHTML = "On";
-      } else {
-        tile.classList.remove("on");
-        tile.classList.remove("flash");
-        if ((offimg = document.getElementById(id + '_icon')) != null &&
-          (onimg = document.getElementById(id + '_icon_on')) != null) {
-          onimg.style.display = 'none';
-          offimg.style.display = 'table';
-        }
-        text = "Off";
-      }
-      document.getElementById(id + '_status').innerHTML = text;
-      tile_icon = document.getElementById(id + '_tile_icon_value');
-      type = tile.getAttribute('type');
-      if (status != null && tile_icon != null) {
-        if (status == 'enabled') {
-          tile_icon.classList.add("enabled");
-          tile_icon.classList.remove("disabled");
-          tile_icon.classList.remove("cool");
-          tile_icon.classList.remove("heat");
-        } else if (status == 'off') {
-          tile_icon.classList.remove("enabled");
-          tile_icon.classList.add("disabled");
-          tile_icon.classList.remove("cool");
-          tile_icon.classList.remove("heat");
-        } else if (status == 'on' && type != 'setpoint_swg' && type != 'setpoint_freeze') {
-          tile_icon.classList.remove("enabled");
-          tile_icon.classList.remove("disabled");
-          tile_icon.classList.remove("cool");
-          tile_icon.classList.add("heat");
-        } else if (status == 'on') {
-          tile_icon.classList.remove("enabled");
-          tile_icon.classList.remove("disabled");
-          tile_icon.classList.add("cool");
-          tile_icon.classList.remove("heat");
-        }
-      }
-    }
-
-    function createTile(object) {
-      if (object.name == 'NONE')
-        return;
-      if ( typeof devices !== 'undefined' && devices.indexOf(object.id) < 0)
-        return;
-      if (object.type == 'switch' || object.type == 'switch_program') {
-        add_tile(object.id, object.name, object.state, 'switch', object.type, 'hk/'+object.id + '-off.png', 'hk/'+object.id + '-on.png');
-        setTileOn(object.id, object.status, null);
-      } else if (object.type == 'value' || object.type == 'temperature') {
-        add_tile(object.id, object.name, object.state, 'value', object.type);
-        setTileValue(object.id, object.value);
-      } else if (object.type == 'setpoint_thermo' || object.type == 'setpoint_swg' || object.type == 'setpoint_freeze') {
-        add_tile(object.id, object.name, object.state, 'thermostat', object.type);
-        document.getElementById(object.id).setAttribute('setpoint', object.spvalue);
-        setTileValue(object.id, object.value);
-        setTileOn(object.id, object.status);
-      }
-    }
-
-    function showTileOptions(show, id, contex) {
-      var active_option;
-      if (show == true) {
-        var wrapH = document.getElementById('wrapper').clientHeight + 'px';
-        if (id != null && document.getElementById(id).getAttribute('type') == 'setpoint_thermo') {
-          active_option = document.getElementById('thermostat_options');
-          document.getElementById('thermostat_options').style.height = wrapH;
-          //document.getElementById('thermostat_options').style.display = 'flex';
-          document.getElementById('swg_options').style.display = 'none';
-          document.getElementById('pswitch_options').style.display = 'none';
-        } else if (id != null && document.getElementById(id).getAttribute('type') == 'switch_program') {
-          active_option = document.getElementById('pswitch_options');
-          document.getElementById('pswitch_options').style.height = wrapH;
-          document.getElementById('thermostat_options').style.display = 'none';
-          document.getElementById('swg_options').style.display = 'none';
-          //document.getElementById('pswitch_options').style.display = 'flex';
-        } else /*if (id != null && document.getElementById(id).getAttribute('type') == 'setpoint_swg')*/ {
-          active_option = document.getElementById('swg_options');
-          document.getElementById('swg_options').style.height = wrapH;
-          document.getElementById('thermostat_options').style.display = 'none';
-          //document.getElementById('swg_options').style.display = 'flex';
-          document.getElementById('pswitch_options').style.display = 'none';
-        }
-        active_option.style.display = 'flex';
-        document.getElementById('wrapper').classList.add("opaque");
-      } else {
-        // Fake onclick to close and save any values if open
-        if (contex == null) {
-          if (document.getElementById('thermostat_options').style.display == 'flex')
-            document.getElementById("options_close").click();
-          else if (document.getElementById('swg_options').style.display == 'flex')
-            document.getElementById("swg_options_close").click();
-          else if (document.getElementById('pswitch_options').style.display == 'flex')
-            document.getElementById("pswitch_options_close").click();
-        }
-        document.getElementById('thermostat_options').style.display = 'none';
-        document.getElementById('swg_options').style.display = 'none';
-        document.getElementById('pswitch_options').style.display = 'none';
-        document.getElementById('wrapper').classList.remove("opaque");
-        return;
-      }
-      if (show == true) {
-        var tile = document.getElementById(id);
-        sp_value = tile.getAttribute('setpoint');
-        //tile_state = tile.classList.contains("on");
-        tile_state = !(tile.getAttribute('status') == 'off');
-        var type = tile.getAttribute('type');
-        var slider;
-        var slider_output;
-        var title;
-        var close_button;
-        var ext;
-        var oswitch;
-        if (type == 'setpoint_swg') {
-          slider = document.getElementById("swg_option_slider_range");
-          slider_output = document.getElementById("swg_option_slider_text_value");
-          title = document.getElementById("swg_option_title");
-          close_button = document.getElementById("swg_options_close");
-          ext = "%";
-        } else if (type == 'setpoint_freeze') {
-          slider = document.getElementById("swg_option_slider_range");
-          slider_output = document.getElementById("swg_option_slider_text_value");
-          title = document.getElementById("swg_option_title");
-          close_button = document.getElementById("swg_options_close");
-          ext = '&deg;' + _temperature_units;
-        } else if (type == 'switch_program') {
-          //slider = document.getElementById("pswitch_option_slider_range");
-          //slider_output = document.getElementById("pswitch_option_slider_text_value");
-          title = document.getElementById("pswitch_option_title");
-          close_button = document.getElementById("pswitch_options_close");
-          //ext = '&deg;' + _temperature_units;
-        } else {
-          slider = document.getElementById("option_slider_range");
-          slider_output = document.getElementById("option_slider_text_value");
-          title = document.getElementById("option_title");
-          close_button = document.getElementById("options_close");
-          ext = '&deg;' + _temperature_units;
-        }
-        if (type == 'setpoint_swg') {
-          slider.min = 0;
-          slider.max = 100;
-          slider.step = 5;
-        } else if (type == 'setpoint_freeze') {
-          slider.min = 36;
-          slider.max = 42;
-          slider.step = 1;
-        } else if (type == 'setpoint_thermo') {
-          slider.min = 36;
-          slider.max = 104;
-          slider.step = 1;
-        }
-        title.innerHTML = document.getElementById(id + '_name').innerHTML;
-        if (type == 'switch_program') {
-          var pswitch = document.getElementById("pswitch_option_list");
-          oswitch = document.getElementById("pswitch_option_switch");
-          var oswitch_output = document.getElementById("pswitch_option_switch_text_value");
-          oswitch.checked = tile_state;
-          oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-          oswitch.onclick = function() {
-            oswitch_output.innerHTML = ((oswitch.checked) ? "On" : "Off");
-          }
-        } else {
-          slider.value = sp_value;
-          oswitch = document.getElementById("option_switch");
-          oswitch.checked = tile_state;
-          var oswitch_output = document.getElementById("option_switch_text_value");
-          slider_output.innerHTML = slider.value + ext;
-          oswitch_output.innerHTML = ((oswitch.checked) ? "Heat" : "Off");
-          slider.oninput = function() {
-            slider_output.innerHTML = this.value + ext;
-            //sp_value = this.value
-          }
-          oswitch.onclick = function() {
-            oswitch_output.innerHTML = ((oswitch.checked) ? "Heat" : "Off");
-            //setTileOn(id, ((oswitch.checked)?"on":"off"), null);
-          }
-        }
-
-        var cTime;
-        try {
-          cTime = performance.now();
-        } catch (e) {
-          cTime = Date.now(); // NSF Probably won't test well below, need to check.
-        }
-        var clickHandler = function(e) {
-          // Short time diff means event was the one that launched the options pane, so ignore
-          if ((e.timeStamp - cTime) > 1000)
-            showTileOptions(false);
-        };
-        document.getElementById("body_wrap").addEventListener("click", clickHandler);
-        close_button.onclick = function() {
-          document.getElementById("body_wrap").removeEventListener("click", clickHandler);
-          state = oswitch.checked;
-          if (type == 'switch_program') {
-            if (pswitch.selectedIndex > 0) {
-              //alert("send "+pswitch.selectedIndex);
-              send_light_mode(pswitch.selectedIndex);
-            } else if (state == (tile.getAttribute('status') == 'off')) // Only bother with this if we didn;t set the light mode.
-              setTileState(id, state);
-          } else {
-            value = slider.value;
-            if (state == (tile.getAttribute('status') == 'off'))
-              setTileState(id, state);
-            if (sp_value != slider.value)
-              setThermostatSetpoint(id, slider.value)
-          }
-          //showTileOptions(false, null, 'this');
-          active_option.style.display = 'none';
-          document.getElementById('wrapper').classList.remove("opaque");
-        }
-      }
-    }
-
-    function update_status(data) {
-      //console.log("Received Update Satus");
-      _aqualink_data = data;
-      var el = document.getElementById("datetime");
-      el.innerHTML = data.time.toLowerCase().replace(" ", "&nbsp;") + ((_landscape) ? "&nbsp;" : "<br>") + data.date.toLowerCase().replace(" ", "&nbsp;");
-  
-      if ( document.getElementById("name").innerHTML == "AqualinkD" ) {
-      if (data.status != "Ready") {
-        document.getElementById("message").innerHTML = formatSatus(data.status);
-      } else {
-        document.getElementById("message").innerHTML = '';
-      }
-      }
-      
-      // Hard code value updated as I can't be bothered to update source.
-      // should come back and re-do these values.
-      // The ID's should ultimatly come from json
-      setThermostatTile("Pool_Heater", data.pool_temp, data.pool_htr_set_pnt);
-      setThermostatTile("Spa_Heater", data.spa_temp, data.spa_htr_set_pnt);
-      setThermostatTile("SWG/Percent", data.swg_percent, data.swg_percent);
-      setThermostatTile("Freeze_Protect", data.air_temp, data.frz_protect_set_pnt);
-      setTileValue("SWG/PPM", data.swg_ppm);
-      setTileValue("Air", data.air_temp);
-      setTileValue("Pool_Water", data.pool_temp);
-      setTileValue("Spa_Water", data.spa_temp);
-      for (var obj in data.leds) {
-        setTileOn(obj.toString(), data.leds[obj])
-      }
-    }
-
-    function deviceSort(a, b) {
-      try {
-      pa = devices.indexOf(a.id);
-      pb = devices.indexOf(b.id);
-      
-      if (pa > pb)
-        return 1;
-      else if (pa < pb)
-        return -1;
-      } catch (e){}
-
-      return 0;
-    }
-    
-    function check_devices(data) {
-      _temperature_units = data['temp_units'];
-      
-      data['devices'].sort(deviceSort);
-      for (var obj in data['devices']) {
-        if (document.getElementById(data['devices'][obj].id) == null) {
-          _displayNames[data['devices'][obj].id.replace("Aux_", "AUX")] = data['devices'][obj].name;
-          //console.log("Create "+data['devices'][obj].id);
-          createTile(data['devices'][obj]);
-        } else {
-          //console.log("old type "+document.getElementById(data['devices'][obj].id).getAttribute('type')+" | new "+data['devices'][obj].type);
-          if (document.getElementById(data['devices'][obj].id).getAttribute('type') != data['devices'][obj].type) {
-            //console.log("Remove and create "+data['devices'][obj].id);
-            var element = document.getElementById(data['devices'][obj].id);
-            element.parentNode.removeChild(element);
-            createTile(data['devices'][obj]);
-          }
-        }
-      }
-    }
-
-    function get_appropriate_ws_url() {
-      var pcol;
-      var u = document.URL;
-      /*
-       * We open the websocket encrypted if this page came on an
-       * https:// url itself, otherwise unencrypted
-       */
-      if (u.substring(0, 5) == "https") {
-        pcol = "wss://";
-        u = u.substr(8);
-      } else {
-        pcol = "ws://";
-        if (u.substring(0, 4) == "http")
-          u = u.substr(7);
-      }
-      u = u.split('/');
-      //alert (pcol + u[0] + ":6500");
-      return pcol + u[0];
-    }
-    /* dumb increment protocol */
-    var socket_di;
-
-    function startWebsockets() {
-      socket_di = new WebSocket(get_appropriate_ws_url());
-      try {
-        socket_di.onopen = function() {
-          // success!
-          get_devices();
-          // Set another load 1 minute from now just incase the server hasn't got all the devices yet
-          window.setTimeout(get_devices, (60 * 1000));
-        }
-        socket_di.onmessage = function got_packet(msg) {
-          document.getElementById("header").classList.remove("error");
-          var data = JSON.parse(msg.data);
-          if (data.type == 'status') {
-            update_status(data);
-          } else if (data.type == 'devices') {
-            check_devices(data);
-            resetBackgroundSize();
-            window.setTimeout(get_devices, (300 * 1000)); // Check for new dvices ever 5 mins.
-          }
-        }
-        socket_di.onclose = function() {
-          // something went wrong
-          document.getElementById("message").innerHTML = '  Connection error!  '
-          document.getElementById("header").classList.add("error");
-          // Try to reconnect every 5 seconds.
-          setTimeout(function() {
-            startWebsockets()
-          }, 5000);
-        }
-      } catch (exception) {
-        alert('<p>Error' + exception);
-      }
-    }
-
-    function get_devices() {
-      var msg = {
-        command: "GET_DEVICES"
-      };
-      socket_di.send(JSON.stringify(msg));
-    }
-
-    function send_command(cmd) {
-      var _cmd = {};
-      _cmd.command = cmd;
-      socket_di.send(JSON.stringify(_cmd));
-    }
-
-    function send_setpoint(id) {
-      var temperature = {};
-      if ((tile = document.getElementById(id)) == null) {
-        return;
-      }
-      temperature.parameter = tile.getAttribute('id');
-      temperature.value = tile.getAttribute('setpoint');
-      socket_di.send(JSON.stringify(temperature));
-    }
-
-    function send_light_mode(value) {
-      var mode = {};
-      mode.parameter = 'POOL_LIGHT_MODE';
-      mode.value = value;
-      socket_di.send(JSON.stringify(mode));
-    }
-
-    function reset() {
-      socket_di.send("reset\n");
-    }
-
-    function showBackground() {
-      wrapper = document.getElementById("wrapper");
-      if (wrapper.classList.contains("vopaque")) {
-        wrapper.classList.remove("vopaque");
-      } else {
-        wrapper.classList.add("vopaque");
-      }
-    }
-
-    function showVersion(source) {
-      if ( (message = document.getElementById("message")) != null) {
-        message.innerHTML = "AqualinkD : "+_aqualink_data.aqualinkd_version+" | AqualinkRS : "+_aqualink_data.version;
-      }
-      source.innerHTML = "Version(s)";
-
-      setTimeout(function(){ source.innerHTML = "AqualinkD"; }, 5000);
-    }
-  </script>
-</head>
-
-<!--<body onload='showTileOptions(false); test_harness();startWebsockets();'> -->
-
-<body onload='init();'>
-  <div id='body_wrap' class='body_wrap'>
-    <!-- <div id='body_wrap' class='body_wrap' onmousedown='showTileOptions(false);'> -->
-    <div id='wrapper' class="wrapper">
-      <div id="header" class="head" onclick="showBackground();">
-        <table border='0' width='100%' cellpadding='0' cellspacing='0'>
-          <tr>
-            <td width="70px" align='left' id='td_name'><span class='title' id='name' onclick="showVersion(this);event.stopPropagation();">AqualinkD</span>
-            </td>
-            <td align='center'><span class='title' id='message'></span>
-            </td>
-            <td  width="70px" align='right' id='td_timedate'><span class='timedate' id='datetime'></class>
-          </td>
-        </tr>
-      </table>
-    </div>
-  </div>
-  <div id='thermostat_options' class='options hide'>
-    <div id='thermostat_options_pane' class='options_pane' onclick='event.stopPropagation();'>
-      <table border='0' cellpadding='10px'>
-        <tr class='options_title'>
-          <th colspan='2'><span id="option_title"></span>
-              </th>
-          </tr>
-          <tr>
-            <td align='right' width='50%'><span class="option_text" id='option_switch_text_value'></span>
-            </td>
-            <td align='left' width='50%'>
-              <label class="option_switch">
-                <input type="checkbox" id='option_switch'>
-                <span class="option_switch_slide"></span>
-              </label>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'><span class="option_text" id="option_slider_text_value"></span>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2'>
-              <div class="slidecontainer">
-                <input type="range" class="option_slider" id='option_slider_range'>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'>
-              <input type="button" value="close" id='options_close' class='options_button'>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div id='swg_options' class='options hide'>
-      <div id='swg_options_pane' class='options_pane' onclick='event.stopPropagation();'>
-        <table border='0' cellpadding='10px'>
-          <tr class='options_title'>
-            <th colspan='2'><span id="swg_option_title"></span>
-            </th>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'><span class="option_text" id="swg_option_slider_text_value"></span>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2'>
-              <div class="slidecontainer">
-                <input type="range" class="option_slider" id='swg_option_slider_range'>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'>
-              <input type="button" value="close" id='swg_options_close' class='options_button'>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-    <div id='pswitch_options' class='options hide'>
-      <div id='pswitch_options_pane' class='options_pane' onclick='event.stopPropagation();'>
-        <table border='0' cellpadding='10px' width="100%">
-          <tr class='options_title'>
-            <th colspan='2'><span id="pswitch_option_title"></span>
-            </th>
-          </tr>
-          <tr>
-            <td align='right' width='50%'><span class="option_text" id='pswitch_option_switch_text_value'></span>
-            </td>
-            <td align='left' width='50%'>
-              <label class="option_switch">
-                <input type="checkbox" id='pswitch_option_switch'>
-                <span class="option_switch_slide"></span>
-              </label>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'>
-              <select id='pswitch_option_list' class='options_selector'>
-                <option value="0">Pool Light Program</option>
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td colspan='2' align='center'>
-              <input type="button" value="close" id='pswitch_options_close' class='options_button'>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </div>
-</body>
-
-</html>
-
diff --git a/web-old/debug.html b/web-old/debug.html
deleted file mode 100644
index 7e55ca7..0000000
--- a/web-old/debug.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-
-<head>
-  <meta http-equiv='Content-Type' content='text/html; charset=windows-1252'>
-  <title>AqualinkD DEBUG</title>
-  <meta name='viewport' content='width=device-width'>
-  <meta name='mobile-web-app-capable' content='yes'>
-  <meta name='apple-mobile-web-app-capable' content='yes'>
-  <meta name='apple-mobile-web-app-status-bar-style' content='black'>
-  <link href='aqualinkd.png' rel='apple-touch-icon'>
-  <link href='aqualinkd.png' rel='icon'>
-</head>
-<style>
-/* 
-******************************************************************************
-Button style taken from https://github.com/ubuwaits/css3-buttons */
-  button::-moz-focus-inner {
-    border: 0; 
-  }
-
-  button.blue-pill {
-    background-color: #a5b8da;
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #a5b8da), color-stop(100%, #7089b3));
-    background-image: -webkit-linear-gradient(top, #a5b8da, #7089b3);
-    background-image: -moz-linear-gradient(top, #a5b8da, #7089b3);
-    background-image: -ms-linear-gradient(top, #a5b8da, #7089b3);
-    background-image: -o-linear-gradient(top, #a5b8da, #7089b3);
-    background-image: linear-gradient(top, #a5b8da, #7089b3);
-    border-top: 1px solid #758fba;
-    border-right: 1px solid #6c84ab;
-    border-bottom: 1px solid #5c6f91;
-    border-left: 1px solid #6c84ab;
-    border-radius: 18px;
-    -webkit-box-shadow: inset 0 1px 0 0 #aec3e5;
-    box-shadow: inset 0 1px 0 0 #aec3e5;
-    color: #fff;
-    font: bold 11px/1 "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
-    padding: 8px 0;
-    text-align: center;
-    text-shadow: 0 -1px 1px #64799e;
-    text-transform: uppercase;
-    width: 150px; 
-  }
-
-  button.blue-pill:disabled {
-    opacity: 0.5; 
-  }
-  </style>
-
-<script type='text/javascript'>
-  var _poller;
-
-  function action(element) {
-    var query;
-
-    if (element.id == "start") { 
-      document.getElementById('messages').innerHTML = "Debug Starting!"
-    } else if (element.id == "serialstart") { 
-      document.getElementById('messages').innerHTML = "Serial Debug Starting!"
-    } else if (element.id == "stop") {
-      document.getElementById('messages').innerHTML = "Debug Stopping!"
-    } else if (element.id == "clean") {
-      document.getElementById('messages').innerHTML = "Cleaning Debug File!"
-    } else if (element.id == "download") {
-      //window.location = location.href + '?command=debug&value=download';
-      window.location = '/api/debug/download';
-    } else {
-      return;
-    }
-
-    var http = new XMLHttpRequest();
-    //http.open('GET', location.href + '?command=debug&value='+element.id);
-    http.open('GET', '/api/debug/'+element.id);
-    http.send(null);
-    
-    setTimeout(function () {
-      forceupdate();
-    }, 1000);
-  }
-
-  function forceupdate() {
-    clearTimeout(_poller);
-    update();
-  }
-
-  function update() {
-    var http = new XMLHttpRequest();
-    if (http) {
-      http.onreadystatechange = function () {
-        if (http.readyState === 4) {
-          if (http.status == 200 && http.status < 300) {
-            var data = JSON.parse(http.responseText);
-            //console.log(data.iLevel + " : " + data.sLevel);
-            if ( data.iLevel >= 7 ) {
-              document.getElementById('start').disabled = true;
-              document.getElementById('serialstart').disabled = true;
-              document.getElementById('stop').disabled = false;
-              if ( data.iLevel >= 8 )
-                document.getElementById('messages').innerHTML = "Serial debug Running!"
-              else
-                document.getElementById('messages').innerHTML = "Debug Running!"
-            } else if ( data.iLevel < 7 ) {
-              document.getElementById('start').disabled = false;
-              document.getElementById('serialstart').disabled = false;
-              document.getElementById('stop').disabled = true;
-              document.getElementById('messages').innerHTML = "Not debugging, Log level = "+data.sLevel;
-            }
-            if (data.logReady == "true") {
-              document.getElementById('download').disabled = false;
-              if (document.getElementById('stop').disabled == true) {
-                document.getElementById('clean').disabled = false;
-              } else {
-                document.getElementById('clean').disabled = true;
-              }
-            } else {
-              document.getElementById('download').disabled = true;
-              document.getElementById('clean').disabled = true;
-            }
-          }
-          else if (http.status >= 400 || http.status == 0) {
-            document.getElementById('messages').innerHTML = 'Error connecting to AqualinkD';
-          }
-        }
-      }
-    };
-
-    //http.open('GET', location.href + '?command=debug&value=status');
-    http.open('GET', '/api/debug/status');
-    http.send(null);
-    _poller = setTimeout(update, 5000);
-  }
-
-</script>
-
-<body onload="update();">
-  <table cellpadding="10" border="0" align="center">
-    <tr><td colspan="3" align="center">
-      <div id="messages">&nbsp</div>
-    </td></tr>
-    <tr><td align="center">
-      <button class="blue-pill" id="start" type="button" onclick='action(this);'>Start Debug</button>
-    </td><td align="center">
-      <button class="blue-pill" id="serialstart" type="button" onclick='action(this);'>Start Serial Debug</button>
-    </td><td align="center">
-      <button class="blue-pill" id="stop" type="button" onclick='action(this);'>Stop Debug</button>
-    </td></tr>
-    <tr><td colspan="3" align="center">
-      <table cellpadding="10" border="0" align="center">
-        <tr><td>
-          <button class="blue-pill" id="download" type="button" onclick='action(this);'>Download Debug File</button>
-        </td><td>
-          <button class="blue-pill" id="clean" type="button" onclick='action(this);'>Clean Debug File</button>
-        </td></tr>
-      </table>
-    </td></tr>
-  </table>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/web-old/extra/audio-off.png b/web-old/extra/audio-off.png
deleted file mode 100644
index 0887d48..0000000
Binary files a/web-old/extra/audio-off.png and /dev/null differ
diff --git a/web-old/extra/audio-on.png b/web-old/extra/audio-on.png
deleted file mode 100644
index f1ff093..0000000
Binary files a/web-old/extra/audio-on.png and /dev/null differ
diff --git a/web-old/extra/extra.js b/web-old/extra/extra.js
deleted file mode 100644
index a5efb9e..0000000
--- a/web-old/extra/extra.js
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-/*
- // put in config.js
- if (navigator.userAgent.search('Android') != -1 || navigator.userAgent.search('Nook') != -1 ) {
-   document.writeln("<script type='text/javascript' src='extra/extra.js'></script>");
- }
- */
-
-GroupSwitchType = -99;
-GroupLightType = -98;
-GroupAudioType = -97;
-
-setTimeout(function() {
-  //extra_domoticz('get', 'type=devices&rid=12');  // Absolute radio poller
-  //extra_domoticz('get', 'type=devices&rid=281'); // Audiotron Switch
-  //extra_domoticz('get', 'type=devices&rid=279'); // Audiotron Selector
-  //extra_domoticz('get', 'type=scenes', 8, GroupAudioType);
-  extra_domoticz('get', 'type=devices&rid=332'); // Patio audio virtual switch
-  extra_domoticz('get', 'type=devices&rid=147');
-  extra_domoticz('get', 'type=devices&rid=148');
-  //extra_domoticz('get', 'type=devices&rid=21'); // Patio String Lights
-  //extra_domoticz('get', 'type=devices&rid=55'); // Patio String Lights #2
-  //extra_domoticz('get', 'type=devices&rid=193');
-  extra_domoticz('get', 'type=scenes', 2, GroupLightType);
-  extra_domoticz('get', 'type=scenes', 6, GroupLightType);
-}, 1000);
-
-function switchTileState_extra(id, idx, type) {
-  // console.log("Click "+id+" "+idx);
-  state = (document.getElementById(id).getAttribute('status') == 'off') ? 'on' : 'off';
-  var switchval;
-  // console.log("Status "+state);
-
-  if (type == 19) // Reverse on off for doors
-    switchval = ((state == 'on') ? 'Off' : 'On');
-  else
-    switchval = ((state == 'on') ? 'On' : 'Off');
-
-  if (type == GroupSwitchType || type == GroupLightType || type == GroupAudioType)
-    extra_domoticz('set', 'type=command&param=switchscene&idx=' + idx + '&switchcmd=' + switchval);
-  else if (type == 18) // selectorswitch
-    //http://trident/json.htm?type=command&param=switchlight&idx=279&switchcmd=Set%20Level&level=10
-    extra_domoticz('set', 'type=command&param=switchlight&idx=' + idx + '&switchcmd=Set%20Level&level=' + ((switchval=='On') ? 10 : 0) );
-  else
-    extra_domoticz('set', 'type=command&param=switchlight&idx=' + idx + '&switchcmd=' + switchval);
-
-  setTileOn(id, state);
-}
-
-function getLevelName(levelNames, levelIndex) {
-  var names = decode64(levelNames).split("|");
-  return names[levelIndex / 10];
-}
-
-function extra_updateDevice(data) {
-  //console.log(data);
-
-  var tile
-  // console.log(data.Name+" - hw "+data.HardwareTypeVal+" - sw "+data.SwitchTypeVal);
-  if ((tile = document.getElementById(data.ID)) == null) {
-    // console.log(data.Name+" - create");
-    switch (data.SwitchTypeVal) {
-    case 0:  // switch
-    case GroupSwitchType: // Group switch
-      if ( data.idx == "332" ) // If music switch change icon
-        add_tile(data.ID, data.Name, data.Status, 'switch', 'switch', 'extra/switch_8-off.png', 'extra/switch_8-on.png');
-      else
-        add_tile(data.ID, data.Name, data.Status, 'switch', 'switch', 'extra/switch_0-off.png', 'extra/switch_0-on.png');
-      break;
-    case 21: // light
-    case 7:  // dimmable light
-    case GroupLightType: // Group switch
-      add_tile(data.ID, data.Name, data.Status, 'switch', 'switch', 'extra/switch_7-off.png', 'extra/switch_7-on.png');
-      break;
-    case GroupAudioType:
-      add_tile(data.ID, data.Name, data.Status, 'switch', 'switch', 'extra/switch_8-off.png', 'extra/switch_8-on.png');
-      break;
-    case 19:
-      add_tile(data.ID, data.Name, data.Status, 'switch', 'switch', 'extra/switch_19-off.png', 'extra/switch_19-on.png');
-      break;
-    case 18: // Selector switch
-      add_tile(data.ID, data.Name, data.Status, 'switch', 'switch', 'extra/switch_0-off.png', 'extra/switch_0-on.png');
-      break;
-    case undefined:
-      if (data.HardwareTypeVal == 15) {
-        add_tile(data.ID, data.Name, 'off', 'value', 'temperature');
-      }
-      break;
-    }
-    subdiv = document.getElementById(data.ID);
-    // subdiv.setAttribute('id', id + '_status');
-    subdiv.setAttribute('onclick', "switchTileState_extra('" + data.ID + "', '" + data.idx + "', '" + data.SwitchTypeVal + "')");
-    tile = document.getElementById(data.ID);
-  } else {
-    //console.log("ID exists "+data.ID);
-  }
-
-  status = tile.getAttribute('status');
-  //console.log(data.Name+" status: "+status+" | data.status: "+data.Status);
-  switch (data.SwitchTypeVal) {
-  //case 0:
-  case 7:
-    //console.log(data.Name+" status: "+status+" | data.status: "+data.Status);
-    if (data.Status.search('%') >= 0) // is status is 97% rather than on, don't change tile status. This stops flashing back on once turned off.
-      break;
-  case 0:
-  case 21:
-  case GroupSwitchType: // Group switch
-  case GroupLightType: // Group light
-  case GroupAudioType:
-    if (status != ((data.Status == 'Off') ? 'off' : 'on')) {
-      setTileOn(data.ID, ((data.Status == 'Off') ? 'off' : 'on'), null);
-    }
-    break;
-  case 18: // Selector switch
-    if (status != ((data.Status == 'Off') ? 'off' : 'on')) {
-      setTileOn(data.ID, ((data.Status == 'Off') ? 'off' : 'on'), null);
-    }
-    level = getLevelName(data.LevelNames, data.Level);
-    if (level != document.getElementById(data.ID + '_status').innerHTML) {
-      document.getElementById(data.ID + '_status').innerHTML = level;
-    }
-    break;
-  case 19:
-    if (status != ((data.Status == 'Locked') ? 'off' : 'on')) {
-      setTileOn(data.ID, ((data.Status == 'Locked') ? 'off' : 'on'), null);
-      document.getElementById(data.ID + '_status').innerHTML = ((data.Data == 'Locked') ? 'Closed' : 'Open');
-    }
-    break;
-  case undefined:
-    if (data.HardwareTypeVal == 15) {
-      setTileValue(data.ID, parseFloat(data.Data).toString());
-    }
-    // Check "Type" : "Group" = data.Type = "Group"
-    break;
-  }
-}
-
-function extra_domoticz(type, data, group_idx=0, group_type=0) {
-  var http = new XMLHttpRequest();
-  if (http) {
-    http.onreadystatechange = function() {
-      if (http.readyState === 4) {
-        if (http.status == 200 && http.status < 300) {
-          var data = JSON.parse(http.responseText);
-          if (data.title == 'Devices')
-            extra_updateDevice(data.result[0]);
-          if (data.title == 'Scenes') { // this is Group
-            for(var i = 0; i <= data.result.length; i++) {
-              if(data.result[i].idx == group_idx) {
-                if (group_type == 0)
-                  data.result[i].SwitchTypeVal = GroupSwitchType;
-                else
-                  data.result[i].SwitchTypeVal = group_type;
-
-                data.result[i].ID = "Group_"+group_idx;
-                extra_updateDevice(data.result[i]);
-                break;
-              }
-            }
-          }
-        } else if (http.status >= 400 || http.status == 0) {
-          //document.getElementById('message-text').innerHTML = 'Error connecting to server';
-        }
-      }
-    }
-  };
-
-  http.open('GET', 'http://trident/json.htm?' + data, true);
-  http.send(null);
-  if (type == 'get') {
-    _poller = setTimeout(function() { extra_domoticz('get', data, group_idx, group_type); }, 5000);
-  }
-}
-
-
-
-function decode64(input) {
-     
-  var keyStr = "ABCDEFGHIJKLMNOP" +
-  "QRSTUVWXYZabcdef" +
-  "ghijklmnopqrstuv" +
-  "wxyz0123456789+/" +
-  "=";
-
-  var output = "";
-  var chr1, chr2, chr3 = "";
-  var enc1, enc2, enc3, enc4 = "";
-  var i = 0;
-
-  // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
-  var base64test = /[^A-Za-z0-9\+\/\=]/g;
-  if (base64test.exec(input)) {
-      alert("There were invalid base64 characters in the input text.\n" +
-      "Valid base64 characters are A-Z, a-z, 0-9, '+', '/',and '='\n" +
-      "Expect errors in decoding.");
-  }
-  input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-
-  do {
-      enc1 = keyStr.indexOf(input.charAt(i++));
-      enc2 = keyStr.indexOf(input.charAt(i++));
-      enc3 = keyStr.indexOf(input.charAt(i++));
-      enc4 = keyStr.indexOf(input.charAt(i++));
-      chr1 = (enc1 << 2) | (enc2 >> 4);
-      chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-      chr3 = ((enc3 & 3) << 6) | enc4;
-      output = output + String.fromCharCode(chr1);
-
-      if (enc3 != 64) {
-          output = output + String.fromCharCode(chr2);
-      }
-      if (enc4 != 64) {
-          output = output + String.fromCharCode(chr3);
-      }
-      chr1 = chr2 = chr3 = "";
-      enc1 = enc2 = enc3 = enc4 = "";
-  } while (i < input.length);
-
-  return decodeURI(output);
-}
-
diff --git a/web-old/extra/garage-closed-grey.png b/web-old/extra/garage-closed-grey.png
deleted file mode 100644
index c7faa59..0000000
Binary files a/web-old/extra/garage-closed-grey.png and /dev/null differ
diff --git a/web-old/extra/garage-closed.png b/web-old/extra/garage-closed.png
deleted file mode 100644
index 36791c5..0000000
Binary files a/web-old/extra/garage-closed.png and /dev/null differ
diff --git a/web-old/extra/garage-open.png b/web-old/extra/garage-open.png
deleted file mode 100644
index 95ef32b..0000000
Binary files a/web-old/extra/garage-open.png and /dev/null differ
diff --git a/web-old/extra/light-off-grey.png b/web-old/extra/light-off-grey.png
deleted file mode 100644
index 6ce1961..0000000
Binary files a/web-old/extra/light-off-grey.png and /dev/null differ
diff --git a/web-old/extra/light-off.png b/web-old/extra/light-off.png
deleted file mode 100644
index 4ce8ca4..0000000
Binary files a/web-old/extra/light-off.png and /dev/null differ
diff --git a/web-old/extra/light-on.png b/web-old/extra/light-on.png
deleted file mode 100644
index 79fb6ca..0000000
Binary files a/web-old/extra/light-on.png and /dev/null differ
diff --git a/web-old/extra/old/garage-closed.png b/web-old/extra/old/garage-closed.png
deleted file mode 100644
index 9c87702..0000000
Binary files a/web-old/extra/old/garage-closed.png and /dev/null differ
diff --git a/web-old/extra/old/garage-open.png b/web-old/extra/old/garage-open.png
deleted file mode 100644
index e6bd973..0000000
Binary files a/web-old/extra/old/garage-open.png and /dev/null differ
diff --git a/web-old/extra/old/light-off.png b/web-old/extra/old/light-off.png
deleted file mode 100644
index a01750c..0000000
Binary files a/web-old/extra/old/light-off.png and /dev/null differ
diff --git a/web-old/extra/old/light-on.png b/web-old/extra/old/light-on.png
deleted file mode 100644
index 1a445b0..0000000
Binary files a/web-old/extra/old/light-on.png and /dev/null differ
diff --git a/web-old/extra/sprinkler-off.png b/web-old/extra/sprinkler-off.png
deleted file mode 100644
index 43b485e..0000000
Binary files a/web-old/extra/sprinkler-off.png and /dev/null differ
diff --git a/web-old/extra/sprinkler-on.png b/web-old/extra/sprinkler-on.png
deleted file mode 100644
index 5368a1a..0000000
Binary files a/web-old/extra/sprinkler-on.png and /dev/null differ
diff --git a/web-old/extra/sprinklerd.psd b/web-old/extra/sprinklerd.psd
deleted file mode 100644
index e69de29..0000000
diff --git a/web-old/extra/switch-off.png b/web-old/extra/switch-off.png
deleted file mode 100644
index 2e7afc7..0000000
Binary files a/web-old/extra/switch-off.png and /dev/null differ
diff --git a/web-old/extra/switch-on.png b/web-old/extra/switch-on.png
deleted file mode 100644
index 417c673..0000000
Binary files a/web-old/extra/switch-on.png and /dev/null differ
diff --git a/web-old/hk/Aux_1-off.png b/web-old/hk/Aux_1-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_1-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_1-on.png b/web-old/hk/Aux_1-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_1-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_12-on.png b/web-old/hk/Aux_12-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_12-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_2-off.png b/web-old/hk/Aux_2-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_2-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_2-on.png b/web-old/hk/Aux_2-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_2-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_3-off.png b/web-old/hk/Aux_3-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_3-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_3-on.png b/web-old/hk/Aux_3-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_3-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_4-off.png b/web-old/hk/Aux_4-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_4-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_4-on.png b/web-old/hk/Aux_4-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_4-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_5-off.png b/web-old/hk/Aux_5-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_5-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_5-on.png b/web-old/hk/Aux_5-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_5-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_6-off.png b/web-old/hk/Aux_6-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_6-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_6-on.png b/web-old/hk/Aux_6-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_6-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_7-off.png b/web-old/hk/Aux_7-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_7-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_7-on.png b/web-old/hk/Aux_7-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_7-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_8-off.png b/web-old/hk/Aux_8-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_8-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_8-on.png b/web-old/hk/Aux_8-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_8-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B1-off.png b/web-old/hk/Aux_B1-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_B1-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B1-on.png b/web-old/hk/Aux_B1-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_B1-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B2-off.png b/web-old/hk/Aux_B2-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_B2-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B2-on.png b/web-old/hk/Aux_B2-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_B2-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B3-off.png b/web-old/hk/Aux_B3-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_B3-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B3-on.png b/web-old/hk/Aux_B3-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_B3-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B4-off.png b/web-old/hk/Aux_B4-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_B4-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B4-on.png b/web-old/hk/Aux_B4-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_B4-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B5-off.png b/web-old/hk/Aux_B5-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_B5-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B5-on.png b/web-old/hk/Aux_B5-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_B5-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B6-off.png b/web-old/hk/Aux_B6-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_B6-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B6-on.png b/web-old/hk/Aux_B6-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_B6-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B7-off.png b/web-old/hk/Aux_B7-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_B7-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B7-on.png b/web-old/hk/Aux_B7-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_B7-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B8-off.png b/web-old/hk/Aux_B8-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Aux_B8-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Aux_B8-on.png b/web-old/hk/Aux_B8-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Aux_B8-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Filter_Pump-off.png b/web-old/hk/Filter_Pump-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Filter_Pump-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Filter_Pump-on.png b/web-old/hk/Filter_Pump-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Filter_Pump-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Pool_Heater-off.png b/web-old/hk/Pool_Heater-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Pool_Heater-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Pool_Heater-on.png b/web-old/hk/Pool_Heater-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Pool_Heater-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/SWG_Boost-off.png b/web-old/hk/SWG_Boost-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/SWG_Boost-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/SWG_Boost-on.png b/web-old/hk/SWG_Boost-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/SWG_Boost-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Solar_Heater-off.png b/web-old/hk/Solar_Heater-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Solar_Heater-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Solar_Heater-on.png b/web-old/hk/Solar_Heater-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Solar_Heater-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Spa_Heater-off.png b/web-old/hk/Spa_Heater-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Spa_Heater-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Spa_Heater-on.png b/web-old/hk/Spa_Heater-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Spa_Heater-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/Spa_Mode-off.png b/web-old/hk/Spa_Mode-off.png
deleted file mode 120000
index 6ccd9a9..0000000
--- a/web-old/hk/Spa_Mode-off.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-off.png
\ No newline at end of file
diff --git a/web-old/hk/Spa_Mode-on.png b/web-old/hk/Spa_Mode-on.png
deleted file mode 120000
index 58a1f29..0000000
--- a/web-old/hk/Spa_Mode-on.png
+++ /dev/null
@@ -1 +0,0 @@
-switch-on.png
\ No newline at end of file
diff --git a/web-old/hk/aqualinkd.png b/web-old/hk/aqualinkd.png
deleted file mode 100644
index 9ffcfd0..0000000
Binary files a/web-old/hk/aqualinkd.png and /dev/null differ
diff --git a/web-old/hk/background.jpg b/web-old/hk/background.jpg
deleted file mode 100644
index b67744f..0000000
Binary files a/web-old/hk/background.jpg and /dev/null differ
diff --git a/web-old/hk/switch-off-black.png b/web-old/hk/switch-off-black.png
deleted file mode 100644
index 9aff2aa..0000000
Binary files a/web-old/hk/switch-off-black.png and /dev/null differ
diff --git a/web-old/hk/switch-off.png b/web-old/hk/switch-off.png
deleted file mode 100644
index 2e7afc7..0000000
Binary files a/web-old/hk/switch-off.png and /dev/null differ
diff --git a/web-old/hk/switch-on.png b/web-old/hk/switch-on.png
deleted file mode 100644
index 417c673..0000000
Binary files a/web-old/hk/switch-on.png and /dev/null differ
diff --git a/web-old/index.html b/web-old/index.html
deleted file mode 120000
index 3204260..0000000
--- a/web-old/index.html
+++ /dev/null
@@ -1 +0,0 @@
-controller.html
\ No newline at end of file
diff --git a/web-old/old/controller.html b/web-old/old/controller.html
deleted file mode 100644
index 9bfbf29..0000000
--- a/web-old/old/controller.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-   <meta charset=utf-8 />
-   <title>Feakes Inc, Aqualink RS control daemon</title>
-   <meta name="apple-mobile-web-app-capable" content="yes" />
-   <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
-   <!--<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" />-->
-   <!--<meta name="viewport" content="width=device-width, user-scalable=yes, width=800"/>-->
-   <!--<meta name="viewport" content="width=device-width, user-scalable=yes"/>-->
-   <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0"/>
-   <!--<link href="aqualinkd.png" rel="apple-touch-icon" sizes="180x180" />-->
-   <!--<link href="aqualinkd.png" rel="icon" sizes="128x128" />-->
-   <link href="aqualinkd.png" rel="apple-touch-icon">
-   <link href="aqualinkd.png" rel="icon">
-   <link rel="stylesheet" href="css/small_ff.css" type="text/css">
-</head>
-
-<body ontouchmove="BlockMove(event);"  style="background-color:black;">
-
-<div id="main_div">
-
-    <div id="header_div" class='bgimg'>
-        <div id="line1">
-            <div id="title_div">Aqualink RS8</div>
-            <div id="air_temp_title_div">Air Temp:</div>
-            <div id="air_temp">000 F</div>
-            <div id="battery_ok_div" class="battery_image_div"><img id="battery_ok" src=""  style="visibility:hidden"></div>
-            <div id="battery_low_div" class="battery_image_div"><img id="battery_low" src=""  style="visibility:hidden"></div>
-            <div id="battery_blank_div" class="battery_image_div"><img id="battery_blank" src=""></div>
-        </div>
-        <div id="line2">
-            <div id="net_off_div" class="net_activity_div"><img id="net_off" src="" style="visibility:visible"></div>
-            <div id="net_green_div" class="net_activity_div"><img id="net_green" src="" style="visibility:hidden"></div>
-            <div id="net_yellow_div" class="net_activity_div"><img id="net_yellow" src="" style="visibility:hidden"></div>
-            <div id="net_red_div" class="net_activity_div"><img id="net_red" src="" style="visibility:hidden"></div>
-            <div id="messages_div" align="center"></div>
-            <div id="date_time">00:00 PM 00/00/00 DDD</div>
-        </div>
-    </div>
-    
-    <div id="body_div" class="bgimg_body">
-        <div id="pool_temp_div" class="body_sub_div">
-            <div id="pool_temp_title" class="temp_title_div">Pool:</div>
-            <div id="pool_temp" class="temp_val_div">000 F</div>
-            <div class="control_button_div">
-             <div class="led_button_div" id="filter_pump">
-                <div class="led_div"><img id="Filter_Pump_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Filter_Pump_on_status" src="" style="visibility:hidden"></div>
-                <div class="led_div"><img id="Filter_Pump_en_status" src="" style="visibility:hidden"></div>
-                <div id="Filter_Pump" class='button black button_div' type="button" onclick="queue_command('Filter_Pump')">Filter Pump</div>
-             </div>
-             <div class="led_button_div" id="pool_htr">
-                <div class="led_div"><img id="Pool_Heater_on_status" src="" style="visibility:hidden"></div>
-                <div class="led_div"><img id="Pool_Heater_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Pool_Heater_en_status" src="" style="visibility:hidden"></div>
-                <div id="Pool_Heater" class='button black button_div' type="button" onclick="queue_command('Pool_Heater')">Heater</div>
-             </div>
-            </div>
-            <div id="pool_htr_set_pnt" class="set_pnt_val_div">000 F</div>
-            <div class="set_pnt_button_div">
-                <div class='button medium black set_pnt_button' type="button" onclick="incr_pool_htr('+')">+</div>
-                <div class='button medium black set_pnt_button' type="button" onclick="incr_pool_htr('-')">-</div>
-            </div>
-            <div class="set_button_div"><div class='button black' type="button" onclick="set_temperature('POOL_HTR')">Set</div></div>
-        </div>
-        <div id="spa_temp_div" class="body_sub_div">
-            <div id="spa_temp_title" class="temp_title_div">Spa:</div>
-            <div id="spa_temp" class="temp_val_div">000 F</div>
-            <div class="control_button_div">
-             <div class="led_button_div" id="spa_mode">
-                <div class="led_div"><img id="Spa_Mode_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Spa_Mode_on_status" src="" style="visibility:hidden"></div>
-                <div class="led_div"><img id="Spa_Mode_en_status" src="" style="visibility:hidden"></div>
-                <div id="Spa_Mode" class="button black button_div" type="button" onclick="queue_command('Spa_Mode')">Spa Mode</div>
-             </div>
-			 <!--
-             <div class="led_button_div" id="aux2">
-                <div class="led_div"><img id="aux2_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="aux2_on_status" src="" style="visibility:hidden"></div>
-                <div id="Aux_2" class="button black button_div" type="button" onclick="queue_command('Aux_3')">Aux 2</div>
-             </div>
-			 -->
-             <div class="led_button_div" id="aux3">
-                <div class="led_div"><img id="Aux_3_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Aux_3_on_status" src="" style="visibility:hidden"></div>
-                <div class="led_div"><img id="Aux_3_en_status" src="" style="visibility:hidden"></div>
-                <div id="Aux_3" class="button black button_div" type="button" onclick="queue_command('Aux_3')">Aux 3</div>
-             </div>
-             <div class="led_button_div" id="pool_htr">
-                <div class="led_div"><img id="Spa_Heater_on_status" src="" style="visibility:hidden"></div>
-                <div class="led_div"><img id="Spa_Heater_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Spa_Heater_en_status" src="" style="visibility:hidden"></div>
-               <div id="Spa_Heater" class="button black button_div" type="button" onclick="queue_command('Spa_Heater')">Heater</div>
-             </div>
-            </div>
-            <div id="spa_htr_set_pnt" class="set_pnt_val_div">000 F</div>
-            <div class="set_pnt_button_div">
-                <div class='button medium black set_pnt_button' type="button" onclick="incr_spa_htr('+')">+</div>
-                <div class='button medium black set_pnt_button' type="button" onclick="incr_spa_htr('-')">-</div>
-            </div>
-            <div class="set_button_div"><div class='button black' type="button" onclick="set_temperature('SPA_HTR')">Set</div></div>
-        </div>
-        
-        <div id="solar_htr_div" class="body_sub_div">
-            <!--
-            <div class="solar_led_div"><img id="Solar_Heater_off_status" src="" style="visibility:visible"></div>
-            <div class="solar_led_div"><img id="Solar_Heater_on_status" src="" style="visibility:hidden"></div>
-            <div class="solar_led_div"><img id="Solar_Heater_en_status" src="" style="visibility:hidden"></div>
-            <div id="Solar_Heater" onclick="queue_command('Solar_Heater')" class="button black" type="button">Solar Heater</div>
-            -->
-            <div class="select_pl_div">
-            <select id="Light_Mode" class="select_pl_dd button black" onchange="set_light_mode(this.options[this.selectedIndex].value)">
-                <option value="0">Pool Light Program</option>
-                <option value="1">Voodoo Lounge - Show</option>
-                <option value="2">Blue Sea</option>
-                <option value="3">Royal Blue</option>
-                <option value="4">Afternoon Skies</option>
-                <option value="5">Aqua Green</option>
-                <option value="6">Emerald</option>
-                <option value="7">Cloud White</option>
-                <option value="8">Warm Red</option>
-                <option value="9">Flamingo</option>
-                <option value="10">Vivid Violet</option>
-                <option value="11">Sangria</option>
-                <option value="12">Twilight - Show</option>
-                <option value="13">Tranquility - Show</option>
-                <option value="14">Gemstone - Show</option>
-                <option value="15">USA - Show</option>
-                <option value="16">Mardi Gras - Show</option>
-                <option value="17">Cool Cabaret - Show</option>
-            </select>
-           </div>
-        </div>
-        
-        <div id="frz_protect_div" class="body_sub_div">
-            <div id="frz_protect_title_div">Freeze Protection:</div>
-            <div id="frz_protect_set_pnt">000 F</div>
-            <div id="fp_set_pnt_button_div">
-                <div class='button medium black set_pnt_button' type="button" onclick="incr_frz_protect('+')">+</div>
-                <div class='button medium black set_pnt_button' type="button" onclick="incr_frz_protect('-')">-</div>
-            </div>
-            <div id="fp_set_button_div"><div class='button black' type="button" onclick="set_temperature('FRZ_PROTECT')">Set</div></div>
-        </div>
-        <div id="leds_div" class="body_sub_div">
-            <div id="accessory_title" class="temp_title_div">Accessories:</div>
-            <div class="control_button_div">
-             <div class="led_button_div" id="aux1">
-                <div class="led_div"><img id="Aux_1_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Aux_1_on_status" src="" style="visibility:hidden"></div>
-                <div class="led_div"><img id="Aux_1_en_status" src="" style="visibility:hidden"></div>
-                <div id="Aux_1" class="button black button_div" type="button" onclick="queue_command('Aux_1')">Aux 1</div>
-             </div>
-			       <div class="led_button_div" id="aux2">
-                <div class="led_div"><img id="Aux_2_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Aux_2_on_status" src="" style="visibility:hidden"></div>
-                <div class="led_div"><img id="Aux_2_en_status" src="" style="visibility:hidden"></div>
-                <div id="Aux_2" class="button black button_div" type="button" onclick="queue_command('Aux_2')">Aux 2</div>
-             </div>
-             <div class="led_button_div" id="aux4">
-                <div class="led_div"><img id="Aux_4_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Aux_4_on_status" src="" style="visibility:hidden"></div>
-                <div class="led_div"><img id="Aux_4_en_status" src="" style="visibility:hidden"></div>
-                <div id="Aux_4" class="button black button_div" type="button" onclick="queue_command('Aux_4')">Aux 4</div>
-             </div>
-             <div class="led_button_div" id="aux5">
-                <div class="led_div"><img id="Aux_5_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Aux_5_on_status" src="" style="visibility:hidden"></div>
-                <div class="led_div"><img id="Aux_5_en_status" src="" style="visibility:hidden"></div>
-                <div id="Aux_5" class="button black button_div" type="button" onclick="queue_command('Aux_5')">Aux 5</div>
-             </div>
-			 <!--
-             <div class="led_button_div" id="aux6">
-                <div class="led_div"><img id="Aux_6_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Aux_6_on_status" src="" style="visibility:hidden"></div>
-               <div id="aux6_button" class="button black button_div" type="button" onclick="queue_command('KEY_AUX6')">Aux 6</div>
-             </div>
-             <div class="led_button_div" id="aux7">
-                <div class="led_div"><img id="Aux_7_off_status" src="" style="visibility:visible"></div>
-                <div class="led_div"><img id="Aux_7_on_status" src="" style="visibility:hidden"></div>
-                <div id="aux7_button" class="button black button_div" type="button" onclick="queue_command('KEY_AUX7')">Aux 7</div>
-             </div>
-			 -->
-            </div>
-        </div>
-    </div>
-
-    <div id="footer_div" class="bgimg">
-    </div><!-- /footer -->
-
-</div><!-- /page -->
-
-<script src="js/aqualink.js"></script>
-
-</body>
-</html>
diff --git a/web-old/old/css/small_ff.css b/web-old/old/css/small_ff.css
deleted file mode 100644
index 718f4b7..0000000
--- a/web-old/old/css/small_ff.css
+++ /dev/null
@@ -1,166 +0,0 @@
-            
-/* portrait mode (default) */
-
-@media all and (orientation:portrait) {
-
-  #main_div{width:540px;height:550px;margin-left:0;padding:0px;}
-  #body_div{position:relative;height:450px;}
-  #header_div{position:relative;height:70px;}
-  #footer_div{height:45px;}
-  #title_div{position:absolute;top:0px;left:0px;padding:5px;}
-  #air_temp_title_div{position:absolute;top:0px;right:120px;font-size:150%;}
-  #air_temp{position:absolute;top:0px;right:45px;font-size:150%;}
-  #messages_div{position:absolute;top:30px;left:5px;width:500px;font-size:100%;}
-  #date_time{position:absolute;bottom:2px;right:5px;}
-  
-  #pool_temp_div{position:absolute;top:5px;height:190px;width:250px;left:10px;}
-  #spa_temp_div{position:absolute;top:5px;height:280px;width:250px;left:270px;}
-  #leds_div{position:absolute;top:205px;height:230px;width:250px;left:10px}
-  #frz_protect_div{position:absolute;top:295px;height:85px;width:250px;left:270px;}
-  #solar_htr_div{position:absolute;top:390px;height:45px;width:250px;left:270px;}
-  #Solar_Heater{position:absolute;bottom:5px;right:10px;width:140px;}          
-  #frz_protect_title_div{position:absolute;top:0px;height:50px;left:5px;font-size:125%;}
-  #frz_protect_set_pnt{position:absolute;bottom:10px;height:50px;right:60px;font-size:250%;}
-  #fp_set_pnt_button_div{position:absolute;bottom:20px;height:50px;right:45px;width:10px;}
-  #fp_set_button_div{position:absolute;bottom:3px;left:3px;width:65px;}
-}
-/*@media only screen and (orientation:portrait){*/
-
-/*@media only screen and (orientation:landscape){*/
-@media all and (orientation:landscape){
-
-  #main_div{width:800px;height:420px;margin-left:0;padding:0px;}
-  #header_div{position:relative;height:70px;}
-  #footer_div{height:45px;}
-  #title_div{position:absolute;top:0;left:0;padding:5px;}
-  #air_temp_title_div{position:absolute;top:0;right:215px;font-size:200%;}
-  #air_temp{position:absolute;top:0;right:75px;font-size:250%;}
-  #messages_div{position:absolute;bottom:2px;left:35px;width:570px;}
-  #date_time{position:absolute;bottom:2px;right:5px;}
-  #body_div{position:relative;height:295px;}
-  #leds_div{position:absolute;top:5px;right:10px;height:230px;width:245px;}
-  #pool_temp_div{position:absolute;top:5px;height:190px;width:250px;left:10px;}
-  #spa_temp_div{position:absolute;top:5px;height:280px;width:250px;left:275px;}
-  #solar_htr_div{position:absolute;bottom:3px;height:45px;width:245px;right:10px;}
-           /*#solar_button_div{position:absolute;bottom:5px;right:10px;width:140px;}*/
-  #Solar_Heater{position:absolute;bottom:5px;right:10px;width:140px;}
-  #frz_protect_div{position:absolute;bottom:5px;height:85px;width:250px;left:10px;}
-  #frz_protect_title_div{position:absolute;top:0px;height:50px;left:5px;font-size:125%;}
-  #frz_protect_set_pnt{position:absolute;bottom:10px;height:50px;right:60px;font-size:250%;}
-  #fp_set_pnt_button_div{position:absolute;bottom:20px;height:50px;right:45px;width:10px;}
-  #fp_set_button_div{position:absolute;bottom:3px;left:3px;width:65px;}
-} 
-
-
-.battery_image_div{position:absolute;top:5px;right:5px;width:30px;}
-.net_activity_div{position:absolute;bottom:2px;left:0;}
-.led_button_div{position:relative;height:37px;width:240px}
-.led_div{position:absolute;top:2px;left:15px;padding:0;}
-.button_div{position:absolute;right:0px;width:140px;}
-.control_button_div{position:absolute;top:40px;height:50px;width:245px;right:5px;}
-/*
-.htr_led_div{position:absolute;top:55px;left:15px;padding:0;}
-.htr_button_div{position:absolute;top:55px;height:45px;right:55px;width:110px;padding:0;margin:0px auto;}
-*/
-.body_sub_div{border:2px solid #a1a1a1;border-radius:15px;}
-.temp_title_div{position:absolute;top:0px;height:50px;left:5px;font-size:175%;}
-.temp_val_div{position:absolute;top:0px;height:55px;right:5px;font-size:225%;}
-.set_pnt_val_div{position:absolute;bottom:15px;height:50px;right:60px;font-size:250%;}
-.set_pnt_button_div{position:absolute;bottom:5px;height:65px;right:5px;width:50px;padding:0;}
-.set_pnt_button{position:relative;right:0px;width:5px;}
-.set_button_div{position:absolute;bottom:5px;left:5px;width:65px;}
-.solar_led_div{position:absolute;top:8px;left:10px;}
-
-.select_pl_div{position:absolute;top:8px;left:10px;height:33px;width:227px;}
-.select_pl_dd{width:227px; height:33px;}
-
-.button {
-    display: inline-block;
-    vertical-align: baseline;
-    outline: none;
-    cursor: pointer;
-    text-align: center;
-    text-decoration: none;
-    font: 16px/100% Arial, Helvetica, sans-serif;
-    padding: .50em 1.5em;
-    text-shadow: 0 1px 1px rgba(0, 0, 0, .3);
-    -webkit-border-radius: .5em;
-    -moz-border-radius: .5em;
-    border-radius: .5em;
-    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .2);
-    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, .2);
-    box-shadow: 0 1px 2px rgba(0, 0, 0, .2); 
-}
-.button:hover {
-    text-decoration: none;
-}
-.button:active {
-    top: 1px;
-}
-/*
-.bigrounded {
-    -webkit-border-radius: 2em;
-    -moz-border-radius: 2em;
-    border-radius: 2em;
-}
-*/
-.medium {
-    font-size: 14px;
-    padding: .8em 1.5em .42em;
-}
-/*
-.small {
-    font-size: 11px;
-    padding: .2em 1em .275em;
-}
-*/
-.black {
-    color: #d7d7d7;
-    border: solid 1px #333;
-    background: #333;
-    background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#000));
-    background: -moz-linear-gradient(top, #666, #000);
-}
-.black:hover {
-    background: #000;
-    background: -webkit-gradient(linear, left top, left bottom, from(#444), to(#000));
-    background: -moz-linear-gradient(top, #444, #000);
-}
-.black:active {
-    color: #666;
-    background: -webkit-gradient(linear, left top, left bottom, from(#000), to(#444));
-    background: -moz-linear-gradient(top, #000, #444);
-}
-.bgimg {
-    width: 100%;
-    height: 250px;
-    background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0.15, rgb(50, 50, 50)), color-stop(0.58, rgb(0, 0, 0)), color-stop(0.79, rgb(0, 0, 0)));
-    background-image: -moz-linear-gradient(top, #444, #000);
-}
-.bgimg_body {
-    width: 100%;
-    height: 250px;
-    background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0.15, rgb(75, 75, 75)), color-stop(0.58, rgb(50, 50, 50)), color-stop(0.79, rgb(50, 50, 50)));
-    background-image: -moz-linear-gradient(top, #666, #333);
-}
-/*
-.debug_border {
-    border: 2px solid #a1a1a1;
-    border-radius: 15px;
-}
-*/
-div {
-    border-width: 0px;
-    border-style: solid;
-    padding: 0px;
-}
-body, html {
-    margin: 0;
-    padding: 0;
-    color: #f4f4f4;
-    font-family: Arial, Helvetica, sans-serif;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-}
-
-
diff --git a/web-old/old/images/battery_blank.png b/web-old/old/images/battery_blank.png
deleted file mode 100644
index 70741f9..0000000
Binary files a/web-old/old/images/battery_blank.png and /dev/null differ
diff --git a/web-old/old/images/battery_low.png b/web-old/old/images/battery_low.png
deleted file mode 100644
index 3390fc8..0000000
Binary files a/web-old/old/images/battery_low.png and /dev/null differ
diff --git a/web-old/old/images/battery_ok.png b/web-old/old/images/battery_ok.png
deleted file mode 100644
index 6bfd6a7..0000000
Binary files a/web-old/old/images/battery_ok.png and /dev/null differ
diff --git a/web-old/old/images/led_enabled.png b/web-old/old/images/led_enabled.png
deleted file mode 100755
index 1a1be28..0000000
Binary files a/web-old/old/images/led_enabled.png and /dev/null differ
diff --git a/web-old/old/images/led_off.png b/web-old/old/images/led_off.png
deleted file mode 100755
index a8dced8..0000000
Binary files a/web-old/old/images/led_off.png and /dev/null differ
diff --git a/web-old/old/images/led_on.png b/web-old/old/images/led_on.png
deleted file mode 100755
index 0cc9c2a..0000000
Binary files a/web-old/old/images/led_on.png and /dev/null differ
diff --git a/web-old/old/images/net_green.png b/web-old/old/images/net_green.png
deleted file mode 100644
index 2f8ba30..0000000
Binary files a/web-old/old/images/net_green.png and /dev/null differ
diff --git a/web-old/old/images/net_off.png b/web-old/old/images/net_off.png
deleted file mode 100644
index b078e5d..0000000
Binary files a/web-old/old/images/net_off.png and /dev/null differ
diff --git a/web-old/old/images/net_red.png b/web-old/old/images/net_red.png
deleted file mode 100644
index 6cc8bf5..0000000
Binary files a/web-old/old/images/net_red.png and /dev/null differ
diff --git a/web-old/old/images/net_yellow.png b/web-old/old/images/net_yellow.png
deleted file mode 100644
index 85bfc5f..0000000
Binary files a/web-old/old/images/net_yellow.png and /dev/null differ
diff --git a/web-old/old/index.html b/web-old/old/index.html
deleted file mode 120000
index 3204260..0000000
--- a/web-old/old/index.html
+++ /dev/null
@@ -1 +0,0 @@
-controller.html
\ No newline at end of file
diff --git a/web-old/old/js/aqualink.js b/web-old/old/js/aqualink.js
deleted file mode 100644
index 13c6602..0000000
--- a/web-old/old/js/aqualink.js
+++ /dev/null
@@ -1,535 +0,0 @@
-
-if(window.innerHeight > window.innerWidth){
-  orientation("portrait");
-} else {
-  orientation("landscape");
-}
-
-// Listen for orientation changes
-window.addEventListener("orientationchange", function() {
-  // Announce the new orientation number
-  //alert(window.orientation);
-  if(window.innerHeight > window.innerWidth)
-    orientation("portrait");
-  else
-    orientation("landscape");
-  
-}, false);
-
-function orientation(or){
-  //alert(or);
-  viewport = document.querySelector("meta[name=viewport]");
-  if (or == "landscape") {
-    viewport.setAttribute('content', 'content="width=device-width, user-scalable=yes, width=800"');
-  } else {
-    viewport.setAttribute('content', 'content="width=device-width, user-scalable=yes, width=540"');
-  }
-}
-
-// aqualink.js
-
-function BlockMove(event) {
-  // Tell Safari not to move the window.
-  event.preventDefault();
-}
-
-// Preload the images.
-var delay = 10;
-if (document.images) {
-  //setTimeout(get_batt_ok_img, delay);
-  setTimeout(loadImages, delay);
-}
-
-function loadImages() {
-  document.getElementById('battery_ok').src = "images/battery_ok.png";
-  document.getElementById('battery_low').src = "images/battery_low.png";
-  document.getElementById('battery_blank').src = "images/battery_blank.png";
-  
-  for (var obj in aqualink_data.leds) {
-    setButtonElementImage(obj+'_on_status', "images/led_on.png");
-    setButtonElementImage(obj+'_off_status', "images/led_off.png");
-    setButtonElementImage(obj+'_en_status', "images/led_enabled.png");
-  }
-  
-  document.getElementById('net_off').src = "images/net_off.png";
-  document.getElementById('net_yellow').src = "images/net_yellow.png";
-  document.getElementById('net_green').src = "images/net_green.png";
-  document.getElementById('net_red').src = "images/net_red.png";
-}
-
-
-//function set_button_led_images
-function setButtonElementImage(element, image){
-  el = document.getElementById(element);
-  if (el != null) {
-    el.src = image;
-  }
-}
-
-function LedsData() {
-  this.Filter_Pump = "off";
-  this.Spa_Mode = "off";
-  this.Aux_1 = "off";
-  //this.aux1 = "flash";
-  this.Aux_2 = "off";
-  this.Aux_3 = "off";
-  this.Aux_4 = "off";
-  this.Aux_5 = "off";
-  this.Aux_6 = "off";
-  this.Aux_7 = "off";
-  this.Pool_Heater = "off";
-  this.Spa_Heater = "off";
-  this.Solar_Heater = "off";
-}
-
-function AqualinkData() {
-  this.version = "";
-  this.date = "09/11/12 TUE";
-  this.time = "10:33 AM";
-  this.temp_units = "F";
-  this.air_temp = "75";
-  this.battery = "low";
-  this.leds = new LedsData();
-}
-
-function TemperatureSetPoint() {
-  this.modified = false;
-  this.value = 0;
-}
-
-var pool_htr_set_point = new TemperatureSetPoint();
-var spa_htr_set_point = new TemperatureSetPoint();
-var freeze_protect_set_point = new TemperatureSetPoint();
-
-var aqualink_data = new AqualinkData();
-var net_connection = 'red';
-
-    
-function interval(duration, fn){
-  this.baseline = undefined
-  
-  this.run = function(){
-    if(this.baseline === undefined){
-      this.baseline = new Date().getTime()
-    }
-    fn()
-    var end = new Date().getTime()
-    this.baseline += duration
- 
-    var nextTick = duration - (end - this.baseline)
-    if(nextTick<0){
-      nextTick = 0
-    }
-    (function(i){
-        i.timer = setTimeout(function(){
-        i.run(end)
-      }, nextTick)
-    }(this))
-  }
-
-  this.stop = function(){
-   clearTimeout(this.timer)
- }
-}
-
-var timer = new interval(1000, function(){
-      net_connection_icon();
-      flash_battery_icon();
-      //blink_filter_pump();
-      blink_button_leds();
-})
-timer.run()
-
-
-function net_connection_icon() {
-  if (net_connection == "red") {
-    document.getElementById('messages_div').innerHTML = "Not connected!";
-    document.getElementById('net_green').style.visibility = 'hidden';
-    document.getElementById('net_yellow').style.visibility = 'hidden';
-    if (document.getElementById('net_red').style.visibility == 'visible') {
-      document.getElementById('net_red').style.visibility = 'hidden';
-    } else {
-      document.getElementById('net_red').style.visibility = 'visible';
-    }
-  } else if (net_connection == "green") {
-    document.getElementById('net_green').style.visibility = 'visible';
-    document.getElementById('net_red').style.visibility = 'hidden';
-    document.getElementById('net_yellow').style.visibility = 'hidden';
-  } else if (net_connection == "yellow") {
-    document.getElementById('net_green').style.visibility = 'hidden';
-    document.getElementById('net_red').style.visibility = 'hidden';
-    document.getElementById('net_yellow').style.visibility = 'visible';
-  }
-}
-//setInterval(net_connection_icon, 500);
-
-function net_activity() {
-  // Set the icon yellow.
-  document.getElementById('net_green').style.visibility = 'hidden';
-  document.getElementById('net_red').style.visibility = 'hidden';
-  document.getElementById('net_yellow').style.visibility = 'visible';
-  // Wait 10mS then set to green.
-  setTimeout(function() {
-    document.getElementById('net_green').style.visibility = 'visible';
-    document.getElementById('net_red').style.visibility = 'hidden';
-    document.getElementById('net_yellow').style.visibility = 'hidden';
-  }, 50);
-}
-
-function flash_battery_icon() {
-  if (aqualink_data.battery == "low") {
-    if (document.getElementById('battery_low').style.visibility == 'visible') {
-      document.getElementById('battery_low').style.visibility = 'hidden';
-    } else {
-      document.getElementById('battery_low').style.visibility = 'visible';
-    }
-  }
-}
-//setInterval(flash_battery_icon, 500);
-/*
-function blink_filter_pump() {
-  if (aqualink_data.leds.pump == "enabled") {
-    document.getElementById("pump_status").src = (document.getElementById("pump_status").src.indexOf("images/led_on.png") == -1) ? "images/led_on.png" : "images/led_off.png";
-  }
-}
-*/
-//setInterval(blink_filter_pump, 500);
-
-
-function blink_button_leds() {
-  for (var obj in aqualink_data.leds) {
-    if (aqualink_data.leds[obj] == "flash" && document.getElementById(obj+'_on_status') != null ) {
-      if (document.getElementById(obj+'_on_status').style.visibility == 'hidden') {
-        setElementVisibility(obj+'_on_status', 'visible');
-        setElementVisibility(obj+'_off_status', 'hidden');
-      } else {
-        setElementVisibility(obj+'_on_status', 'hidden');
-        setElementVisibility(obj+'_off_status', 'visible');
-      }
-    }
-  }
-}
-//setInterval(blink_aux_leds, 1500);
-
-// End - Methods to Manage Flashing Images
-
-// Display Update Methods
-
-function update_temp(id) {
-  var el = document.getElementById(id);
-  var temp_string = "";
-
-  if (id == "air_temp") {
-    temp_string = aqualink_data.air_temp;
-  } else if (id == "pool_temp") {
-    temp_string = aqualink_data.pool_temp;
-    if (temp_string == " ") {
-      temp_string = "---"
-    }
-  } else if (id == "spa_temp") {
-    temp_string = aqualink_data.spa_temp;
-    if (temp_string == " ") {
-      temp_string = "---"
-    }
-  } else if (id == "pool_htr_set_pnt") {
-    if (pool_htr_set_point.modified == true) {
-      temp_string = pool_htr_set_point.value.toString();
-      el.style.color = "PowderBlue";
-    } else {
-      temp_string = aqualink_data.pool_htr_set_pnt;
-      pool_htr_set_point.value = parseInt(temp_string);
-      el.style.color = "#f4f4f4";
-    }
-  } else if (id == "spa_htr_set_pnt") {
-    if (spa_htr_set_point.modified == true) {
-      temp_string = spa_htr_set_point.value.toString();
-      el.style.color = "PowderBlue";
-    } else {
-      temp_string = aqualink_data.spa_htr_set_pnt;
-      spa_htr_set_point.value = parseInt(temp_string);
-      el.style.color = "#f4f4f4";
-    }
-  } else if (id == "frz_protect_set_pnt") {
-    if (freeze_protect_set_point.modified == true) {
-      temp_string = freeze_protect_set_point.value.toString();
-      el.style.color = "PowderBlue";
-    } else {
-      temp_string = aqualink_data.frz_protect_set_pnt;
-      freeze_protect_set_point.value = parseInt(temp_string);
-      el.style.color = "#f4f4f4";
-    }
-  }
-
-  el.innerHTML = temp_string + "&deg;" + aqualink_data.temp_units;
-}
-
-// Adjust the Pool Heater set point. Note that its maximum value
-// is 104 and its minimum value is 0.
-function incr_pool_htr(direction) {
-  if (direction == '+') {
-    if (pool_htr_set_point.value < 104) {
-      pool_htr_set_point.value++;
-    }
-  } else {
-    if (pool_htr_set_point.value > 0) {
-      pool_htr_set_point.value--;
-    }
-  }
-
-  if (pool_htr_set_point.value == parseInt(aqualink_data.pool_htr_set_pnt)) {
-    pool_htr_set_point.modified = false;
-  } else {
-    pool_htr_set_point.modified = true;
-  }
-
-  update_temp("pool_htr_set_pnt");
-}
-
-// Adjust the Spa Heater set point. Note that its maximum value
-// is 104 and its minimum value is 0.
-function incr_spa_htr(direction) {
-  if (direction == '+') {
-    if (spa_htr_set_point.value < 104) {
-      spa_htr_set_point.value++;
-    }
-  } else {
-    if (spa_htr_set_point.value > 0) {
-      spa_htr_set_point.value--;
-    }
-  }
-
-  if (spa_htr_set_point.value == parseInt(aqualink_data.spa_htr_set_pnt)) {
-    spa_htr_set_point.modified = false;
-  } else {
-    spa_htr_set_point.modified = true;
-  }
-
-  update_temp("spa_htr_set_pnt");
-}
-
-// Adjust the Freeze Protection set point. Note that its maximum value
-// is 42 and its minimum value is 36.
-function incr_frz_protect(direction) {
-  if (direction == '+') {
-    if (freeze_protect_set_point.value < 42) {
-      freeze_protect_set_point.value++;
-    }
-  } else {
-    if (freeze_protect_set_point.value > 36) {
-      freeze_protect_set_point.value--;
-    }
-  }
-
-  if (freeze_protect_set_point.value == parseInt(aqualink_data.frz_protect_set_pnt)) {
-    freeze_protect_set_point.modified = false;
-  } else {
-    freeze_protect_set_point.modified = true;
-  }
-
-  update_temp("frz_protect_set_pnt");
-}
-
-function update_date_time() {
-  var el = document.getElementById("date_time");
-
-  el.innerHTML = aqualink_data.time + " - " + aqualink_data.date;
-}
-
-function setElementVisibility(element, visibility){
-  //console.log("set "+element+" to "+visibility);
-  el = document.getElementById(element);
-  if (el != null) {
-    el.style.visibility = visibility;
-    //console.log("set "+element+" to "+visibility);
-  }
-}
-
-function update_leds() {
-//console.log("*****UPDATE LED*****");
-  for (var obj in aqualink_data.leds) {
-//console.log("*****setting "+obj+" to "+aqualink_data.leds[obj]);
-    if (aqualink_data.leds[obj] == "on") {
-      setElementVisibility(obj+'_on_status', 'visible');
-      setElementVisibility(obj+'_off_status', 'hidden');
-      setElementVisibility(obj+'_en_status', 'hidden');
-    } else if (aqualink_data.leds[obj] == "enabled") {
-      setElementVisibility(obj+'_on_status', 'hidden');
-      setElementVisibility(obj+'_off_status', 'hidden');
-      setElementVisibility(obj+'_en_status', 'visible');
-    } else if (aqualink_data.leds[obj] == "off") {
-      setElementVisibility(obj+'_on_status', 'hidden');
-      setElementVisibility(obj+'_off_status', 'visible');
-      setElementVisibility(obj+'_en_status', 'hidden');
-    } else if (aqualink_data.leds[obj] == "flash") {
-      // Don't set any other visibility or it'll mess up the flasher timer.
-      setElementVisibility(obj+'_en_status', 'hidden');
-    }
-  }
-}
-  
-
-function update_status(data) {
-  aqualink_data = data;
-  //console.log(aqualink_data.version);
-  //console.log('updating status...');
-  if (aqualink_data.battery == "ok") {
-    document.getElementById('battery_low').style.visibility = 'hidden';
-    document.getElementById('battery_ok').style.visibility = 'visible';
-  } else {
-    document.getElementById('battery_ok').style.visibility = 'hidden';
-  }
-  
-  if (aqualink_data.status == "Ready") {
-    document.getElementById('messages_div').innerHTML = "";
-  } else if (aqualink_data.status == "Programming") {
-    document.getElementById('messages_div').innerHTML = aqualink_data.status+" (please wait!)";
-  } else {
-    document.getElementById('messages_div').innerHTML = aqualink_data.status;
-  }
-  
-  update_temp("air_temp");
-  update_temp("pool_temp");
-  update_temp("spa_temp");
-  update_temp("pool_htr_set_pnt");
-  update_temp("spa_htr_set_pnt");
-  update_temp("frz_protect_set_pnt");
-
-  update_date_time();
-
-  update_leds();
-}
-
-function set_aux_button_labels(data) {
-  //console.log("Aux 1=" + data.Aux_1);
-  for (var obj in data) {
-    //console.log("sent "+obj+" to "+data[obj]);
-    button = document.getElementById(obj);
-    if (button != null) {
-      button.innerHTML = data[obj];
-    }
-  }
-}
-
-//alert(BrowserDetect.browser + ' : ' + BrowserDetect.version);
-
-function get_appropriate_ws_url() {
-  var pcol;
-  var u = document.URL;
-
-  /*
-   * We open the websocket encrypted if this page came on an
-   * https:// url itself, otherwise unencrypted
-   */
-
-  if (u.substring(0, 5) == "https") {
-    pcol = "wss://";
-    u = u.substr(8);
-  } else {
-    pcol = "ws://";
-    if (u.substring(0, 4) == "http")
-      u = u.substr(7);
-  }
-
-  u = u.split('/');
-
-  //alert (pcol + u[0] + ":6500");
-
-  return pcol + u[0];
-}
-
-
-
-/* dumb increment protocol */
-var socket_di;
-
-function startWebsockets() {
-  socket_di = new WebSocket(get_appropriate_ws_url());
-  /*
-  if (BrowserDetect.browser == "Firefox" && BrowserDetect.version < 12) {
-    //socket_di = new MozWebSocket(get_appropriate_ws_url(), "dumb-increment-protocol");
-    socket_di = new MozWebSocket(get_appropriate_ws_url());
-  } else {
-    //socket_di = new WebSocket(get_appropriate_ws_url(), "dumb-increment-protocol");
-    socket_di = new WebSocket(get_appropriate_ws_url());
-  }
-*/
-  try {
-    socket_di.onopen = function() {
-      // success!
-      get_aux_labels();
-      net_connection = 'green';
-    }
-
-    socket_di.onmessage = function got_packet(msg) {
-      net_activity();
-      var data = JSON.parse(msg.data);
-      if (data.type == 'status') {
-        update_status(data);
-      } else if (data.type == 'aux_labels') {
-        set_aux_button_labels(data);
-      }
-    }
-
-    socket_di.onclose = function() {
-      // something went wrong
-      net_connection = 'red';
-      // Try to reconnect every 5 seconds.
-      setTimeout(function() {
-        startWebsockets()
-      }, 5000);
-    }
-  } catch (exception) {
-    alert('<p>Error' + exception);
-  }
-}
-
-function reset() {
-  socket_di.send("reset\n");
-}
-
-function get_aux_labels() {
-  //socket_di.send("GET_AUX_LABELS");
-  var msg = {command: "GET_AUX_LABELS"};
-    // Send the msg object as a JSON-formatted string.
-  socket_di.send(JSON.stringify(msg));
-}
-
-function queue_command(cmd) {
-  var _cmd = {};
-  _cmd.command = cmd;
-
-  socket_di.send(JSON.stringify(_cmd));
-}
-
-function set_temperature(type) {
-  var temperature = {};
-
-  if (type == "POOL_HTR") {
-    temperature.parameter = type;
-    temperature.value = pool_htr_set_point.value;
-    pool_htr_set_point.modified = false;
-  } else if (type == "SPA_HTR") {
-    temperature.parameter = type;
-    temperature.value = spa_htr_set_point.value;
-    spa_htr_set_point.modified = false;
-  } else if (type == "FRZ_PROTECT") {
-    temperature.parameter = type;
-    temperature.value = freeze_protect_set_point.value;
-    freeze_protect_set_point.modified = false;
-  }
-
-  socket_di.send(JSON.stringify(temperature));
-}
-
-function set_light_mode(value) {
-  var mode = {};
-
-  mode.parameter = 'POOL_LIGHT_MODE';
-  mode.value = value;
-  socket_di.send(JSON.stringify(mode));
-}
-
-window.onload = function() {
-  startWebsockets();
-
-}
\ No newline at end of file
diff --git a/web-old/simple.html b/web-old/simple.html
deleted file mode 100644
index 599c8ce..0000000
--- a/web-old/simple.html
+++ /dev/null
@@ -1,620 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-
-<head>
-  <meta http-equiv='Content-Type' content='text/html; charset=windows-1252'>
-  <title>AqualinkD</title>
-  <meta name='viewport' content='width=device-width'>
-  <meta name='mobile-web-app-capable' content='yes'>
-  <meta name='apple-mobile-web-app-capable' content='yes'>
-  <meta name='apple-mobile-web-app-status-bar-style' content='black'>
-  <link href='aqualinkd.png' rel='apple-touch-icon'>
-  <link href='aqualinkd.png' rel='icon'>
-  <script src='config.js'></script>
-  <style>
-    :root {
-      --switch-diameter: 30px;
-      --switch-on-background: #4CAAD9;
-      --switch-off-background: #f1f1f1;
-      --switch-enabled-background: #4cd9aa;
-      --switch-color: #ffffff;
-      --switch-bordercolor: #dddddd;
-
-      --slide-ball-diameter: 30px;
-      --slide-ball-color: #4CAAD9;
-      --slide-background: #f1f1f1;
-      --slide-range-height: 16px;
-      --slide-range-bordercolor: #dddddd;
-
-      --options-background: #f1f1f1;
-
-      --error_background: rgb(143, 43, 43);
-      --error_text: rgb(255, 255, 255);
-    }
-
-    html {}
-
-    body {
-      font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
-      font-weight: 300;
-      background-color: #f1f1f1;
-      color: #000000;
-      margin: 0 !important;
-      padding: 0 !important;
-    }
-
-    .error {
-      background-color: var(--error_background) !important;
-      color: var(--error_text) !important;
-    }
-
-    
-    table,
-    th,
-    td {
-      border-collapse: collapse;
-      padding: 5px;
-      text-align: left;
-      border-bottom: 1px solid rgb(189, 189, 189);
-      /*width: 100%;*/
-    }
-
-    th {
-      /*width: 100vw;*/
-      text-align: center;
-      background-color: #f1f1f1;
-    }
-
-    tr {
-      height: 50px;
-      background-color: white;
-      color: black;
-    }
-
-    .input-text {
-      font-size: 16px;
-    }
-
-   .switch {
-      position: absolute;
-      margin-left: -9999px;
-      visibility: hidden;
-    }
-
-    .switch+label {
-      display: block;
-      position: relative;
-      cursor: pointer;
-      outline: none;
-      user-select: none;
-    }
-
-    input.switch-btn-enabled+label,
-    input.switch-btn-flash+label,
-    input.switch-btn+label {
-      padding: 2px;
-      width: calc(2 * var(--switch-diameter));
-      height: var(--switch-diameter);
-      background-color: var(--switch-bordercolor);
-      border-radius: var(--switch-diameter);
-    }
-
-    input.switch-btn-enabled+label::before,
-    input.switch-btn-enabled+label::after,
-    input.switch-btn-flash+label::before,
-    input.switch-btn-flash+label::after,
-    input.switch-btn+label::before,
-    input.switch-btn+label::after {
-      display: block;
-      position: absolute;
-      top: 1px;
-      left: 1px;
-      bottom: 1px;
-      content: "";
-    }
-
-    input.switch-btn-enabled+label::before,
-    input.switch-btn-flash+label::before,
-    input.switch-btn+label::before {
-      right: 1px;
-      background-color: var(--switch-off-background);
-      border-radius: var(--switch-diameter);
-      transition: background 0.4s;
-    }
-
-    input.switch-btn-enabled+label::after,
-    input.switch-btn-flash+label::after,
-    input.switch-btn+label::after {
-      width: var(--switch-diameter);
-      background-color: var(--switch-color);
-      border-radius: 100%;
-      box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
-      transition: margin 0.4s;
-    }
-
-    input.switch-btn:checked+label::before {
-      background-color: var(--switch-on-background);
-    }
-
-    input.switch-btn-enabled:checked+label::before {
-      background-color: var(--switch-enabled-background);
-    }
-    
-    input.switch-btn-flash:checked+label::before {
-      background-color: var(--switch-on-background);
-      -webkit-animation-name: switch-flash; /* Safari 4.0 - 8.0 */
-      -webkit-animation-duration: 2s; /* Safari 4.0 - 8.0 */
-      animation-name: switch-flash;
-      animation-duration: 2s;
-      animation-iteration-count: infinite;
-    }
-
-    input.switch-btn-enabled:checked+label::after,
-    input.switch-btn-flash:checked+label::after,
-    input.switch-btn:checked+label::after {
-      margin-left: var(--switch-diameter);
-    }
-    
-    /* Safari 4.0 - 8.0 */
-    @-webkit-keyframes switch-flash {
-      0% {background-color: var(--switch-on-background)}
-      50% {background-color: var(--switch-off-background)}
-      100% {background-color: var(--switch-on-background)}
-    }
-
-    /* Standard syntax */
-    @keyframes switch-flash {
-      0% {background-color: var(--switch-on-background)}
-      50% {background-color: var(--switch-off-background)}
-      100% {background-color: var(--switch-on-background)}
-    }
-    
-    .slidecontainer {
-      width: 100%;
-      padding-top: 10px;
-      padding-bottom: 10px;
-      padding-right: 10px;
-    }
-
-    .slider {
-      -webkit-appearance: none;
-      width: 100%;
-      height: var(--slide-range-height);
-      background: var(--slide-background);
-      transition: background 0.4s;
-      -webkit-transition: .2s;
-      transition: opacity .2s;
-      border-radius: var(--slide-range-height);
-      outline: none;
-    }
-    
-    .slider::-webkit-slider-thumb {
-      -webkit-appearance: none;
-      width: var(--slide-ball-diameter);
-      height: var(--slide-ball-diameter);
-      background: var(--slide-ball-color);
-      box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
-      cursor: pointer;
-      border-radius: var(--slide-ball-diameter);
-      border: 0px;
-    }
-
-    .slider::-moz-range-thumb { 
-      width: var(--slide-ball-diameter);
-      height: var(--slide-ball-diameter);
-      background: var(--slide-ball-color);
-      box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
-      border-radius: var(--slide-ball-diameter);
-      cursor: pointer;
-      border: 0px;
-    }
-
-    .slider::-moz-range-track {
-      background-color: var(--slide-background);
-    }
-
-    .options_selector {
-     
-      font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
-      font-size: 16px;
-      /*background: var(--highlight);*/
-      background: var(--options-background);
-      border: 0;
-      padding:5px;
-      -moz-appearance: none;
-      -webkit-appearance: none;
-      border-radius: 20px;
-      text-align:center;
-      text-align-last:center;
-      outline: none;
-/*
-      padding-left: 20px;
-      padding-right: 20px;
-*/
-    }
-  </style>
-  <script type='text/javascript'>
-    
-    var _width;
-    var _height;
-    var _displayNames = [];
-
-    function getSize() {
-      _width = Math.max(document.documentElement.clientWidth, window.innerWidth || 0);
-      _height = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-    }
-
-    function formatSatus(status) {
-      if ((index = status.indexOf("AUX")) >= 0) {
-        aux = status.substr(index, 4);
-        status = status.charAt(0).toUpperCase() + status.substr(1).toLowerCase();
-        if ((name = _displayNames[aux]) != undefined) {
-          status = status.substr(0, index) + name + status.substr(index + 4);
-        }
-      } else {
-        status = status.charAt(0).toUpperCase() + status.substr(1).toLowerCase();
-      }
-      return status;
-    }
-    
-    function deviceSort(a, b) {
-      try {
-        pa = devices.indexOf(a.id);
-        pb = devices.indexOf(b.id);
-        if (pa > pb)
-          return 1;
-        else if (pa < pb)
-          return -1;
-      } catch (e){}
-
-      return 0;
-    }
-
-    function check_devices(data) {
-      _temperature_units = data['temp_units'];
-      //document.getElementById("title").innerHTML = "AqualinkD &nbsp;&nbsp;&nbsp;<font size='-2'>"+formatSatus(data['time']+"&nbsp;"+data['date']+"</font>");
-      setTitle(data['date'], data['time']);
-      data['devices'].sort(deviceSort);
-      for (var obj in data['devices']) {
-        if (document.getElementById(data['devices'][obj].id) == null) {
-          _displayNames[data['devices'][obj].id.replace("Aux_", "AUX")] = data['devices'][obj].name;
-          console.log("Create " + data['devices'][obj].id);
-          createTile(data['devices'][obj]);
-        }
-      }
-    }
-    
-    function setTitle(date, time) {
-      document.getElementById("title").innerHTML = "AqualinkD &nbsp;&nbsp;&nbsp;<font size='-1'>"+formatSatus(date+"&nbsp;"+time)+"</font>";
-    }
-
-    function update_status(data) {
-      //console.log("Received Update Satus");
-      _aqualink_data = data;
-      
-      if (data.status != "Ready") {
-        document.getElementById("title").innerHTML = formatSatus(data.status);
-      } else {
-        //document.getElementById("title").innerHTML = 'AqualinkD';
-        setTitle(data['date'], data['time']);
-      }
-      
-      setSlider("Pool_Heater", data.pool_htr_set_pnt);
-      setSlider("Spa_Heater", data.spa_htr_set_pnt);
-      setSlider("SWG", data.swg_percent);
-      setSlider("Freeze_Protect", data.frz_protect_set_pnt);
-      setLabel("SWG/PPM", data.swg_ppm);
-      setLabel("Temperature/Air", data.air_temp);
-      setLabel("Temperature/Pool", data.pool_temp);
-      setLabel("Temperature/Spa", data.spa_temp);
-      /*
-      setLabel("Air", data.air_temp);
-      setLabel("Pool_Water", data.pool_temp);
-      setLabel("Spa_Water", data.spa_temp);
-      */
-
-      for (var obj in data.leds) {
-        setButton(obj.toString(), data.leds[obj])
-      }
-    }
-
-    function createTile(object) {
-      if (object.name == 'NONE')
-        return;
-      
-      if (typeof devices !== 'undefined' && devices.indexOf(object.id) < 0) {
-        return;
-      }
-      //if (ignore_devices.indexOf(object.id) >= 0)
-      //  return;
-      var table = document.getElementById("deviceList");
-      var row = table.insertRow(-1);
-      var cell1 = row.insertCell(0);
-      var cell2 = row.insertCell(1);
-      var cell3 = row.insertCell(2);
-      var cell4 = row.insertCell(3);
-      cell1.innerHTML = object.name;
-      cell2.innerHTML = "&nbsp;";
-      cell3.innerHTML = "&nbsp;";
-      cell4.innerHTML = "&nbsp;";
-      cell2.setAttribute('width', '100px');
-      cell3.setAttribute('width', '38px');
-      cell4.setAttribute('width', '70px');
-      cell3.setAttribute('align', 'right');
-      //cell3.setAttribute('cellpadding', '0');
-      cell4.setAttribute('align', 'right');
-      if (object.type == 'switch' /*&& object.type_ext != "switch_program"*/) {
-        row.deleteCell(2);
-        row.deleteCell(1);
-        cell1.setAttribute('colspan', '3');
-        cell4.innerHTML = "<div id='"+object.id+"'><input id='switch-"+object.id+"' name='"+object.id+"' class='switch switch-btn' type='checkbox' onclick='update(this);'><label for='switch-"+object.id+"'></label></div>";
-        setButton(object.id, object.state);
-        /* //Removing light program, too much for simple interface
-      } else if (object.type == 'switch' && object.type_ext == 'switch_program') {
-        row.deleteCell(2);
-        cell2.setAttribute('colspan', '2');
-        //cell2.setAttribute('width', '100%');
-        cell2.innerHTML = "<select id='selector_"+object.id+"' onchange='update(this);' class='options_selector'><option value='0'>Program</option></select>";
-        cell4.innerHTML = "<div id='"+object.id+"'><input id='switch-"+object.id+"' name='"+object.id+"' class='switch switch-btn' type='checkbox' onclick='update(this);'><label for='switch-"+object.id+"'></label></div>";
-        //cell4.innerHTML = "<div class='switch'><input id='btn-toggle-"+object.id+"' name='"+object.id+"' class='btn-toggle btn-toggle-round' type='checkbox' onclick='update(this);'><label for='btn-toggle-"+object.id+"'></label></div>";
-        option = document.getElementById('selector_'+object.id);
-
-        try {
-        fLen = light_program.length;
-        for (i = 0; i < fLen; i++) {
-          var opt = document.createElement('option');
-          opt.value = i + 1;
-          opt.innerHTML = light_program[i];
-          option.appendChild(opt);
-        }
-        } catch (e) {}
-        setButton(object.id, object.state);
-        */
-      } else if (object.type == 'value') {
-        row.deleteCell(2);
-        row.deleteCell(1);
-        cell1.setAttribute('colspan', '3');
-        cell4.innerHTML = "<label id='"+object.id+"' output_ext=''></label>";
-        setLabel(object.id, object.value);
-      } else if (object.type == 'temperature') {
-        row.deleteCell(2);
-        row.deleteCell(1);
-        cell1.setAttribute('colspan', '3');
-        cell4.innerHTML = "<label id='"+object.id+"' output_ext='&deg;"+_temperature_units+"'></label>";
-        setLabel(object.id, object.value);
-      } else if (object.type == 'setpoint_thermo') {
-        if (_temperature_units != 'c')
-          cell2.innerHTML = "<div class='slidecontainer'><input type='range' id='slider_"+object.id+"' min='36' max='104' class='slider' output_id='"+object.id+"' oninput='sliderchange(this);' onmousedown='lock(this);' onmouseup='update(this);unlock(this);'></div>";
-        else
-          cell2.innerHTML = "<div class='slidecontainer'><input type='range' id='slider_"+object.id+"' min='0' max='40' class='slider' output_id='"+object.id+"' oninput='sliderchange(this);' onmousedown='lock(this);' onmouseup='update(this);unlock(this);'></div>";
-        
-        cell3.innerHTML = "<label id='"+object.id+"' output_ext='&deg;"+_temperature_units+"'></label>";
-        cell4.innerHTML = "<div><input id='switch-"+object.id+"' name='"+object.id+"' class='switch switch-btn' type='checkbox' onclick='update(this);'><label for='switch-"+object.id+"'></label></div>";
-        //cell4.innerHTML = "<div class='switch'><input id='btn-toggle-"+object.id+"' name='"+object.id+"' class='btn-toggle btn-toggle-round' type='checkbox' onclick='update(this);'><label for='btn-toggle-"+object.id+"'></label></div>";
-        setSlider(object.id, object.spvalue);
-        setButton(object.id, object.status);
-      } else if (object.type == 'setpoint_freeze') {
-        if (_temperature_units != 'c')
-          cell2.innerHTML = "<div class='slidecontainer'><input type='range' id='slider_"+object.id+"' min='36' max='42' class='slider'  output_id='"+object.id+"' oninput='sliderchange(this);' onmousedown='lock(this);' onmouseup='update(this);unlock(this);'></div>";
-        else
-          cell2.innerHTML = "<div class='slidecontainer'><input type='range' id='slider_"+object.id+"' min='1' max='5' class='slider'  output_id='"+object.id+"' oninput='sliderchange(this);' onmousedown='lock(this);' onmouseup='update(this);unlock(this);'></div>";
-
-        cell4.innerHTML = "<label id='"+object.id+"' output_ext='&deg;"+_temperature_units+"'></label>";
-        setSlider(object.id, object.spvalue);
-      } else if (object.type == 'setpoint_swg') {
-        if (_width <= 390)
-          cell1.innerHTML = "SWG";
-        cell2.innerHTML = "<div class='slidecontainer'><input type='range' id='slider_"+object.id+"' min='0' max='100' step='5' class='slider' output_id='"+object.id+"'' oninput='sliderchange(this);' onmousedown='lock(this);' onmouseup='update(this);unlock(this);'></div>";
-        cell3.innerHTML = "<label id='"+object.id+"' output_ext='%'></label>";
-        cell4.innerHTML = "<div><input id='switch-"+object.id+"' name='"+object.id+"' class='switch switch-btn' type='checkbox' onclick='update(this);'><label for='switch-"+object.id+"'></label></div>";
-        //cell4.innerHTML = "<div class='switch'><input id='btn-toggle-"+object.id+"' name='"+object.id+"' class='btn-toggle btn-toggle-round' type='checkbox' onclick='update(this);'><label for='btn-toggle-"+object.id+"'></label></div>";
-        setSlider(object.id, object.value);
-        setButton(object.id, object.state);
-      }
-    }
-    
-    function update(source) {
-      //console.log("Send "+source.id+" to server "+source.getAttribute("type")+" "+source.value);
-      
-      var cmd = {};
-      
-      switch (source.getAttribute("type")) {
-        case "range":
-          if ( source.id.includes("SWG") ) {
-            cmd.uri = source.id.substr(7)+"/percent/set";
-            cmd.value = source.value;
-          } else {
-            cmd.uri = source.id.substr(7)+"/setpoint/set";
-            //cmd.parameter = source.id.substr(7); // remove 'slider_'
-            cmd.value = source.value;
-          }
-        break;
-        case "checkbox":
-          cmd.uri = source.id.substr(7)+"/set";
-          cmd.value = source.checked?"1":"0";
-          //name = source.id.substr(11); //remove 'btn-toggle-''
-          //state = source.checked?"on":"off";
-          //cmd.command = source.id.substr(7);
-        break;
-        default:  // type is null because it's a selector
-          cmd.uri = source.id.substr(9)+"/program/set";
-          cmd.button = source.id.substr(9);
-          //name = source.id.substr(9); //remove 'selector_''
-          //cmd.parameter = 'LIGHT_MODE';
-          cmd.value = source.value;
-          //cmd.button = source.id.substr(9); // remove 'selector_'
-        break;
-      }
-      //console.log(source);
-      //console.log(cmd);
-      //console.log("*** NOT SENDING COMMAND ***");
-      send_command(cmd);    
-    }
-    
-    function sliderchange(source) {
-      setLabel(source.getAttribute('output_id'), source.value);
-    }
-    
-    function setButton(id, isOn) {
-      /*
-      if ( (isOn != true && isOn != false) || Number.isInteger(isOn)){
-        if (isOn != "enabled") {
-          if (Number.isInteger(isOn))
-            isOn = (isOn==1)?true:false;
-          else
-            isOn = (isOn=="on")?true:false;
-        } else {
-          //document.getElementById('btn-toggle-' + id).classList.add("btn-toggle-round_enabled");
-        }
-      }
-      //NSF need to chance the button color if enadled is a sent state.
-      if( (btn = document.getElementById('btn-toggle-' + id)) != null)
-        btn.checked = isOn;
-      */
-     if ( (source = document.getElementById('switch-'+id)) == null)
-       return;
-
-     if (isOn == "on") {
-      source.classList.add('switch-btn-on');
-      source.classList.remove('switch-btn-flash');
-      source.classList.remove('switch-btn-enabled');
-      source.checked = true;
-     } else if (isOn == "enabled") {
-      source.classList.remove('switch-btn-on');
-      source.classList.remove('switch-btn-flash');
-      source.classList.add('switch-btn-enabled');
-      source.checked = true;
-     } else if (isOn == "flash") {
-      source.classList.remove('switch-btn-on');
-      source.classList.add('switch-btn-flash');
-      source.classList.remove('switch-btn-enabled');
-      source.checked = true;
-     } else {  // Off
-      source.classList.remove('switch-btn-on');
-      source.classList.remove('switch-btn-flash');
-      source.classList.remove('switch-btn-enabled');
-      source.checked = false;
-     }
-    }
-
-    function lock(source) {
-      source.setAttribute('lock', 'true');
-    }
-    function unlock(source) {
-      source.setAttribute('lock', 'false');
-    }
-    function setSlider(id, value) {
-      slider = document.getElementById("slider_"+id);
-
-      try{
-      if (slider.getAttribute('lock') == 'true')
-        return;
-      } catch (e) { return; }
-
-      slider.value = value;
-      setLabel(slider.getAttribute('output_id'), value);
-    }
-    
-    function setLabel(id, value) {
-      if ( (label = document.getElementById(id)) != null) {
-        if (value != -999 && value != " ")
-          label.innerHTML = value+label.getAttribute('output_ext');
-        else
-          label.innerHTML = "--";
-      }
-        
-    }
-
-    
-    function get_appropriate_ws_url() {
-      var pcol;
-      var u = document.URL;
-      /*
-       * We open the websocket encrypted if this page came on an
-       * https:// url itself, otherwise unencrypted
-       */
-      if (u.substring(0, 5) == "https") {
-        pcol = "wss://";
-        u = u.substr(8);
-      } else {
-        pcol = "ws://";
-        if (u.substring(0, 4) == "http")
-          u = u.substr(7);
-      }
-      u = u.split('/');
-      //alert (pcol + u[0] + ":6500");
-      return pcol + u[0];
-    }
-    /* dumb increment protocol */
-    var socket_di;
-
-    function startWebsockets() {
-      socket_di = new WebSocket(get_appropriate_ws_url());
-      try {
-        socket_di.onopen = function() {
-          // success!
-          get_devices();
-        }
-        socket_di.onmessage = function got_packet(msg) {
-          document.getElementById("title").classList.remove("error");
-          var data = JSON.parse(msg.data);
-          if (data.type == 'status') {
-            update_status(data);
-          } else if (data.type == 'devices') {
-            check_devices(data);
-          }
-        }
-        socket_di.onclose = function() {
-          // something went wrong
-          document.getElementById("title").innerHTML = '  !!! Connection error !!!  '
-          document.getElementById("title").classList.add("error");
-          // Try to reconnect every 5 seconds.
-          setTimeout(function() {
-            startWebsockets();
-          }, 5000);
-        }
-      } catch (exception) {
-        alert('<p>Error' + exception);
-      }
-    }
-
-    function get_devices() {
-      var msg = {
-        //command: "GET_DEVICES"
-        uri: "devices"
-      };
-      socket_di.send(JSON.stringify(msg));
-    }
-
-    function send_command(cmd) {
-      socket_di.send(JSON.stringify(cmd));
-    }
-
-    function reset() {
-      socket_di.send("reset\n");
-    }
-    
-    function init() {
-      getSize();
-      startWebsockets();
-    }
-/*
-    function sendRaw() {
-      var cmd = {};
-      cmd.raw = "0x02"; // remove 'slider_'
-      send_command(cmd);
-      console.log("Sent command");
-    }
-*/
-  </script>
-
-  <body onload="init();">
-    <div class="wrapper">
-      <table border='0' width="100%" id="deviceList">
-        <tr>
-          <th colspan="4" id="title">AqualinkD</th>
-        </tr>
-      </table>
-    </div>
-  </body>
-</html>
diff --git a/web-old/simulator.html b/web-old/simulator.html
deleted file mode 100644
index ff7c219..0000000
--- a/web-old/simulator.html
+++ /dev/null
@@ -1,373 +0,0 @@
-<!DOCTYPE html>
-<html lang='en'>
-
-<head>
-    <meta http-equiv='Content-Type' content='text/html; charset=windows-1252'>
-    <title>AqualinkD Simulator</title>
-    <meta name='viewport' content='width=device-width'>
-    <meta name='apple-mobile-web-app-capable' content='yes'>
-    <meta name='apple-mobile-web-app-status-bar-style' content='black'>
-    <meta name='apple-mobile-web-app-status-bar-style' content='black'>
-    <link href="aqualinkd.png" rel="apple-touch-icon">
-    <link href="aqualinkd.png" rel="icon">
-    <style>
-        html {}
-
-        body {
-            font-family: 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
-            font-weight: 300;
-            background-color: white;
-            color: #000000;
-            margin: 0 !important;
-            padding: 0 !important;
-        }
-
-        table {
-            background-color: rgb(221, 221, 221);
-            padding: 10px;
-        }
-
-        th {
-            background-color: white;
-        }
-
-        input[type=button],
-        input[type=submit],
-        input[type=reset] {
-            background-color: rgb(165, 165, 165);
-            border: none;
-            color: rgb(0, 0, 0);
-            padding: 2px 2px;
-            text-decoration: none;
-            margin: 0px 0px;
-            min-width: 70px;
-            border-radius: 70px;
-        }
-
-        .led {
-            border-radius: calc(var(--tile_icon-height) / 2);
-            border-radius: 20px;
-            height: 20px;
-            width: 20px;
-            text-align: center;
-            vertical-align: middle;
-            filter: alpha(opacity=100);
-            opacity: 1.0;
-        }
-
-        .on {
-            background-color: rgb(255, 0, 0);
-        }
-
-        .off {
-            background-color: rgb(116, 116, 116);
-        }
-    </style>
-
-    <script type='text/javascript'>
-        function send(source) {
-            console.log("from" + source.id);
-
-            var cmd = {};
-            cmd.uri = "rawcommand"
-            switch (source.id) {
-                case "Filter_Pump_button":
-                    cmd.value = "2"; //"0x02";
-                    break;
-                case "Spa_Mode_button":
-                    cmd.value = "1"; // "0x01";
-                    break;
-                case "Aux_1_button":
-                    cmd.value = "5"; //"0x05";
-                    break;
-                case "Aux_2_button":
-                    cmd.value = "10"; //"0x0a";
-                    break;
-                case "Aux_3_button":
-                    cmd.value = "15"; //"0x0f";
-                    break;
-                case "Aux_4_button":
-                    cmd.value = "6"; //"0x06";
-                    break;
-                case "Aux_5_button":
-                    cmd.value = "11"; //"0x0b";
-                    break;
-                case "Aux_6_button":
-                    cmd.value = "16"; //"0x10";
-                    break;
-                case "Aux_7_button":
-                    cmd.value = "21"; //"0x15";
-                    break;
-                case "Pool_Heater_button":
-                    cmd.value = "18"; //"0x12";
-                    break;
-                case "Spa_Heater_button":
-                    cmd.value = "23"; //"0x17";
-                    break;
-                case "Solar_Heater_button":
-                    cmd.value = "28"; //"0x1c";
-                    break;
-                case "B_menu":
-                    //cmd.value = "0x09";
-                    cmd.value = "9";
-                    break;
-                case "B_cancel":
-                    cmd.value = "14"; //"0x0e";
-                    break;
-                case "B_back":
-                    cmd.value = "19"; //"0x13";
-                    break;
-                case "B_forward":
-                    cmd.value = "24"; //"0x18";
-                    break;
-                case "B_enter":
-                    cmd.value = "29"; //"0x1d";
-                    break;
-                case "B_hold":
-                    cmd.value = "25"; //"0x19";
-                    break;
-                case "B_overide":
-                    cmd.value = "28"; //"0x1c";
-                    break;
-                default:
-                    alert("Unknown button");
-                    return;
-                    break;
-            }
-
-            send_command(cmd);
-        }
-
-
-        function update_status(data) {
-
-            if (document.getElementById("status").getAttribute("raw") != data.panel_message) {
-              document.getElementById("status_three").innerHTML = document.getElementById("status_two").innerHTML;
-              document.getElementById("status_two").innerHTML = document.getElementById("status").innerHTML;
-              document.getElementById("status").innerHTML = data.panel_message;
-              document.getElementById("status").setAttribute("raw", data.panel_message);
-            }
-
-            for (var obj in data.leds) {
-                if ((led = document.getElementById(obj.toString() + "_led")) == null) {
-                    //console.log("Error " + obj.toString() + " LED not found");
-                    return;
-                }
-                if (data.leds[obj] == "on") {
-                    led.classList.add("on");
-                    led.classList.remove("off");
-                } else {
-                    led.classList.add("off");
-                    led.classList.remove("on");
-                }
-            }
-        }
-
-
-        function set_labels(data) {
-            for (var obj in data) {
-                if ((button = document.getElementById(obj + "_button")) != null && data[obj] != "NONE") {
-                    button.value = data[obj];
-                }
-            }
-        }
-
-        function get_appropriate_ws_url() {
-            var pcol;
-            var u = document.URL;
-            /*
-             * We open the websocket encrypted if this page came on an
-             * https:// url itself, otherwise unencrypted
-             */
-            if (u.substring(0, 5) == "https") {
-                pcol = "wss://";
-                u = u.substr(8);
-            } else {
-                pcol = "ws://";
-                if (u.substring(0, 4) == "http")
-                    u = u.substr(7);
-            }
-            u = u.split('/');
-            //alert (pcol + u[0] + ":6500");
-            return pcol + u[0];
-        }
-        /* dumb increment protocol */
-        var socket_di;
-
-        function startWebsockets() {
-            socket_di = new WebSocket(get_appropriate_ws_url());
-            try {
-                socket_di.onopen = function () {
-                    // success!
-                    start_simulator();
-                }
-                socket_di.onmessage = function got_packet(msg) {
-                    document.getElementById("status").classList.remove("error");
-                    var data = JSON.parse(msg.data);
-                    if (data.type == 'status') {
-                        update_status(data);
-                    } else if (data.type == 'devices') {
-                        //update_status(data);
-                    } else if (data.type == 'aux_labels') {
-                        set_labels(data);
-                    }
-                }
-                socket_di.onclose = function () {
-                    // something went wrong
-                    document.getElementById("status").innerHTML = '  !!! Connection error !!!  '
-                    document.getElementById("status").classList.add("error");
-                    // Try to reconnect every 5 seconds.
-                    setTimeout(function () {
-                        startWebsockets();
-                    }, 5000);
-                }
-            } catch (exception) {
-                alert('<p>Error' + exception);
-            }
-        }
-
-        function start_simulator() {
-            var msg = {
-                //command: "simulator"
-                uri: "simulator"
-            };
-            socket_di.send(JSON.stringify(msg));
-
-            /*
-                    var msg = {
-                        command: "simulator"
-                    };
-                    socket_di.send(JSON.stringify(msg));*/
-        }
-
-        function send_command(cmd) {
-            socket_di.send(JSON.stringify(cmd));
-        }
-/*
-        function reset() {
-            socket_di.send("reset\n");
-        }
-*/
-        function init() {
-            startWebsockets();
-        }
-    </script>
-
-
-
-    <body onload="init();">
-        <div class="wrapper">
-
-            <table border='0' id="deviceList">
-                
-                <tr>
-                    <td colspan="12" align="center"><label id="status_three">&nbsp;</label></td>
-                </tr>
-                <tr>
-                    <td colspan="12" align="center"><label id="status_two">&nbsp;</label></td>
-                </tr>
-            
-                <tr>
-                    <th colspan="12"><label id="status">AqualinkD</label></th>
-                </tr>
-                <tr>
-                    <td align="right">
-                        <div id="Filter_Pump_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Filter_Pump_button" type="button" onclick="send(this);" value="Filter Pump">
-                    </td>
-                    <td align="right">
-                        <div id="Spa_Mode_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Spa_Mode_button" type="button" onclick="send(this);" value="Spa Mode">
-                    </td>
-                    <td align="right">
-                        <div id="Aux_1_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Aux_1_button" type="button" onclick="send(this);" value="AUX1">
-                    </td>
-                    <td align="right">
-                        <div id="Aux_2_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Aux_2_button" type="button" onclick="send(this);" value="AUX2">
-                    </td>
-                    <td align="right">
-                        <div id="Aux_3_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Aux_3_button" type="button" onclick="send(this);" value="AUX3">
-                    </td>
-                    <td align="right">
-                        <div id="Aux_4_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Aux_4_button" type="button" onclick="send(this);" value="AUX4">
-                    </td>
-                </tr>
-                <tr>
-                    <td align="right">
-                        <div id="Aux_5_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Aux_5_button" type="button" onclick="send(this);" value="AUX5">
-                    </td>
-                    <td align="right">
-                        <div id="Aux_6_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Aux_6_button" type="button" onclick="send(this);" value="AUX6">
-                    </td>
-                    <td align="right">
-                        <div id="Aux_7_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Aux_7_button" type="button" onclick="send(this);" value="AUX7">
-                    </td>
-                    <td align="right">
-                        <div id="Pool_Heater_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Pool_Heater_button" type="button" onclick="send(this);" value="Pool Heater">
-                    </td>
-                    <td align="right">
-                        <div id="Spa_Heater_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Spa_Heater_button" type="button" onclick="send(this);" value="Spa Heater">
-                    </td>
-                    <td align="right">
-                        <div id="Solar_Heater_led" class="led off"></div>
-                    </td>
-                    <td align="left">
-                        <input id="Solar_Heater_button" type="button" onclick="send(this);" value="Solar Heater">
-                    </td>
-                </tr>
-                <tr>
-                    <TD>&nbsp;</TD>
-                </tr>
-                <tr>
-                    <td align="center" colspan="2">
-                        <input type="button" onclick="send(this);" id="B_menu" value="Menu">
-                    </td>
-                    <td align="center" colspan="2">
-                        <input type="button" onclick="send(this);" id="B_cancel" value="Cancel">
-                    </td>
-                    <td align="center" colspan="2">
-                        <input type="button" onclick="send(this);" id="B_back" value="Back <">
-                    </td>
-                    <td align="center" colspan="2">
-                        <input type="button" onclick="send(this);" id="B_forward" value="Forward >">
-                    </td>
-                    <td align="center" colspan="2">
-                        <input type="button" onclick="send(this);" id="B_enter" value="Enter *">
-                    </td>
-                </tr>
-            </table>
-        </div>
-    </body>
-
-</html>
\ No newline at end of file