diff --git a/README.md b/README.md
index 880ce95..fe828e9 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,9 @@ NEED TO FIX FOR THIS RELEASE.
 * Try an auto-update
 * Update Mongoose
 -->
+# Updates in 2.6.5
+* Changes to virtual buttons.
+
 # Updates in 2.6.4
 * Fix docker crash where journal not configured correctly.
 * Updates to config editor.
diff --git a/release/aqualinkd-arm64 b/release/aqualinkd-arm64
index 798ba6f..2b83e76 100755
Binary files a/release/aqualinkd-arm64 and b/release/aqualinkd-arm64 differ
diff --git a/release/aqualinkd-armhf b/release/aqualinkd-armhf
index 24d7c61..4a0583d 100755
Binary files a/release/aqualinkd-armhf and b/release/aqualinkd-armhf differ
diff --git a/source/aq_panel.c b/source/aq_panel.c
index 6c7a1c7..7bc6599 100644
--- a/source/aq_panel.c
+++ b/source/aq_panel.c
@@ -599,7 +599,7 @@ void setPanelByName(struct aqualinkdata *aqdata, const char *str)
 }
 
 aqkey *addVirtualButton(struct aqualinkdata *aqdata, char *label, int vindex) {
-  if (aqdata->total_buttons + 1 >= TOTAL_BUTTONS) {
+  if (aqdata->total_buttons /*+ 1*/ >= TOTAL_BUTTONS) {
     return NULL;
   }
 
@@ -616,7 +616,7 @@ aqkey *addVirtualButton(struct aqualinkdata *aqdata, char *label, int vindex) {
     } else {
       index = aqdata->total_buttons - aqdata->virtual_button_start + 1;
     }
-    printf("TOTAL=%d VSTART=%d INDEXNAME=%d\n",aqdata->total_buttons,aqdata->virtual_button_start,index);
+    //printf("TOTAL=%d VSTART=%d INDEXNAME=%d\n",aqdata->total_buttons,aqdata->virtual_button_start,index);
   }
   
 
diff --git a/source/aq_panel.h b/source/aq_panel.h
index 07be90b..300c72c 100644
--- a/source/aq_panel.h
+++ b/source/aq_panel.h
@@ -129,7 +129,7 @@ int PANEL_SIZE();
 // If we need to increase virtual buttons, then increase below.
 
 
-#define VIRTUAL_BUTTONS 5 // This is the only parameter to change if we need more virtual buttons.
+#define VIRTUAL_BUTTONS 8 // This is the only parameter to change if we need more virtual buttons.
 
 #define TOTAL_BUTTONS 20+VIRTUAL_BUTTONS // Biggest jandy panel is 20 buttons (RS16)
 
diff --git a/source/config.c b/source/config.c
index 650dcda..b7b6965 100644
--- a/source/config.c
+++ b/source/config.c
@@ -1210,7 +1210,7 @@ if (strlen(cleanwhitespace(value)) <= 0) {
       if (button != NULL) {
         setVirtualButtonLabel(button, label);
       } else {
-        LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons+1);
+        LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons);
       }
     } else if (strncasecmp(param + 17, "_altLabel", 9) == 0) {
       char *label = cleanalloc(value);
@@ -1218,7 +1218,7 @@ if (strlen(cleanwhitespace(value)) <= 0) {
       if (button != NULL) {
         setVirtualButtonAltLabel(button, label);
       } else {
-        LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons+1);
+        LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons);
       }
     } else if (strncasecmp(param + 17, "_pump", 5) == 0) {
       aqkey *vbutton = getVirtualButton(aqdata, num);
diff --git a/source/version.h b/source/version.h
index baeeb88..47e56d2 100644
--- a/source/version.h
+++ b/source/version.h
@@ -4,4 +4,4 @@
 #define AQUALINKD_SHORT_NAME "AqualinkD"
 
 // Use Magor . Minor . Patch
-#define AQUALINKD_VERSION "2.6.4"
+#define AQUALINKD_VERSION "2.6.5"
diff --git a/web/aqmanager.html b/web/aqmanager.html
index 3a77a1e..e0721f1 100644
--- a/web/aqmanager.html
+++ b/web/aqmanager.html
@@ -118,7 +118,8 @@
         input[type=submit],
         input[type=reset] {
             /*background-color: rgb(165, 165, 165);*/
-            background-color: #4CAAD9;
+            /*background-color: #4CAAD9;*/
+            background-color: #9b9b9b;
             border: none;
             color: rgb(0, 0, 0);
             padding: 2px 2px;
@@ -226,6 +227,7 @@
         .toggle-checkbox:checked+.toggle-switch {
             /*background: #56c080;*/
             background: #4CAAD9;
+            /*background: #8e8e8e;*/
         }
 
         .toggle-checkbox:checked+.toggle-switch:before {