From 7750a897e29d89eeb8804cfddf1c4467d6f3d6b1 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Mon, 8 Mar 2021 00:08:29 +0100
Subject: [PATCH] finish to move from mainsail.json to moonraker db

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 package-lock.json                             | 278 +++++++++++++-----
 package.json                                  |   2 +-
 src/components/charts/TempChart.vue           |  15 +-
 .../panels/Settings/DashboardPanel.vue        |   4 +-
 .../panels/Settings/GeneralPanel.vue          |  84 ++++--
 .../panels/Settings/MacrosPanel.vue           |   5 +
 .../panels/Settings/PresetsPanel.vue          |   7 +-
 .../panels/Settings/RemotePrintersPanel.vue   |   2 +-
 .../panels/Settings/WebcamPanel.vue           |   8 +-
 src/components/panels/StatusPanel.vue         |  95 +++---
 src/components/panels/ToolsPanel.vue          |   4 +-
 src/components/panels/ZOffsetPanel.vue        |   2 +-
 src/inputs/SettingsMacroSwitch.vue            |  12 +-
 src/store/farm/index.js                       |   4 +-
 src/store/gui/actions.js                      | 154 ++++++----
 src/store/gui/index.js                        |   8 +-
 src/store/gui/mutations.js                    |  22 +-
 src/store/server/actions.js                   |  30 +-
 src/store/socket/actions.js                   |   1 -
 19 files changed, 476 insertions(+), 261 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e535e8c0..9ba0df74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
         "object-assign-deep": "^0.4.0",
         "plotly.js": "^1.58.4",
         "prismjs": "^1.23.0",
-        "semver": "^5.7.1",
+        "semver": "^7.3.4",
         "vue": "^2.6.12",
         "vue-context": "^6.0.0",
         "vue-github-api": "^0.1.7",
@@ -95,6 +95,15 @@
         "url": "https://opencollective.com/babel"
       }
     },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/@babel/generator": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
@@ -140,6 +149,15 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/@babel/helper-create-class-features-plugin": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz",
@@ -1070,6 +1088,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
       "version": "7.12.1",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz",
@@ -1233,6 +1260,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/@babel/preset-modules": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
@@ -5301,6 +5337,15 @@
         "which": "^1.2.9"
       }
     },
+    "node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -5546,12 +5591,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "dev": true
-    },
     "node_modules/css-loader/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6795,18 +6834,6 @@
         "eslint": "^6.2.0 || ^7.0.0"
       }
     },
-    "node_modules/eslint-plugin-vue/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/eslint-scope": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
@@ -6985,12 +7012,6 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "node_modules/eslint/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "dev": true
-    },
     "node_modules/eslint/node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -11305,6 +11326,15 @@
         "semver": "^5.6.0"
       }
     },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -12072,6 +12102,15 @@
         "validate-npm-package-license": "^3.0.1"
       }
     },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -12504,6 +12543,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/package-json/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/package-json/node_modules/url-parse-lax": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
@@ -14734,12 +14782,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/sass-loader/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "dev": true
-    },
     "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -14778,9 +14820,18 @@
       }
     },
     "node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/semver-diff": {
       "version": "2.1.0",
@@ -14794,6 +14845,31 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/semver-diff/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/send": {
       "version": "0.17.1",
       "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
@@ -17226,12 +17302,6 @@
         }
       }
     },
-    "node_modules/vue-cli-plugin-vuetify/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "dev": true
-    },
     "node_modules/vue-clickaway": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/vue-clickaway/-/vue-clickaway-2.2.2.tgz",
@@ -18651,6 +18721,14 @@
         "lodash": "^4.17.19",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "@babel/generator": {
@@ -18693,6 +18771,14 @@
         "@babel/helper-validator-option": "^7.12.1",
         "browserslist": "^4.14.5",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-create-class-features-plugin": {
@@ -19446,6 +19532,14 @@
         "@babel/helper-module-imports": "^7.12.5",
         "@babel/helper-plugin-utils": "^7.10.4",
         "semver": "^5.5.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
@@ -19585,6 +19679,14 @@
         "@babel/types": "^7.12.11",
         "core-js-compat": "^3.8.0",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "@babel/preset-modules": {
@@ -23493,6 +23595,14 @@
         "semver": "^5.5.0",
         "shebang-command": "^1.2.0",
         "which": "^1.2.9"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "crypto-browserify": {
@@ -23685,12 +23795,6 @@
             "ajv-keywords": "^3.5.2"
           }
         },
-        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -25042,12 +25146,6 @@
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         },
-        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-          "dev": true
-        },
         "shebang-command": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -25130,14 +25228,6 @@
         "natural-compare": "^1.4.0",
         "semver": "^7.3.2",
         "vue-eslint-parser": "^7.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-          "dev": true
-        }
       }
     },
     "eslint-scope": {
@@ -29184,6 +29274,14 @@
       "requires": {
         "pify": "^4.0.1",
         "semver": "^5.6.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "map-cache": {
@@ -29949,6 +30047,14 @@
         "resolve": "^1.10.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "normalize-path": {
@@ -30378,6 +30484,12 @@
             "url-parse-lax": "^1.0.0"
           }
         },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        },
         "url-parse-lax": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
@@ -32568,12 +32680,6 @@
             "ajv": "^6.12.5",
             "ajv-keywords": "^3.5.2"
           }
-        },
-        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-          "dev": true
         }
       }
     },
@@ -32615,9 +32721,27 @@
       }
     },
     "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+      "version": "7.3.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
+      "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        }
+      }
     },
     "semver-diff": {
       "version": "2.1.0",
@@ -32626,6 +32750,14 @@
       "dev": true,
       "requires": {
         "semver": "^5.0.3"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
       }
     },
     "send": {
@@ -35017,14 +35149,6 @@
         "null-loader": "^3.0.0",
         "semver": "^7.1.2",
         "shelljs": "^0.8.3"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-          "dev": true
-        }
       }
     },
     "vue-clickaway": {
diff --git a/package.json b/package.json
index ad48d1d7..e8928db4 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "object-assign-deep": "^0.4.0",
     "plotly.js": "^1.58.4",
     "prismjs": "^1.23.0",
-    "semver": "^5.7.1",
+    "semver": "^7.3.4",
     "vue": "^2.6.12",
     "vue-context": "^6.0.0",
     "vue-github-api": "^0.1.7",
diff --git a/src/components/charts/TempChart.vue b/src/components/charts/TempChart.vue
index 4c62e113..5c0b3820 100644
--- a/src/components/charts/TempChart.vue
+++ b/src/components/charts/TempChart.vue
@@ -1,5 +1,5 @@
 <template>
-    <div id="tempchart" style="height: 250px; width: 100%;"></div>
+    <div id="tempchart" style="height: 250px; width: 100%;" v-observe-visibility="visibilityChanged"></div>
 </template>
 
 <script>
@@ -16,7 +16,7 @@ export default {
             chart : null,
             timerChart: '',
             timerDataset: '',
-            chartFocus: false,
+            isVisable: true,
             chartOptions: {
                 darkMode: true,
                 animation: false,
@@ -93,7 +93,7 @@ export default {
                 grid: {
                     top: 35,
                     right: 25,
-                    bottom: 25,
+                    bottom: 30,
                     left: 25,
                 },
                 dataZoom: [{
@@ -234,14 +234,17 @@ export default {
                 this.createChart()
             }, 500)
         },
+        visibilityChanged (isVisible) {
+            this.isVisible = isVisible
+            if(isVisible) this.chart.resize()
+        },
     },
     created() {
         this.timerChart = setInterval(() => {
             if (
                 this.chart &&
                 this.boolTempchart &&
-                document.visibilityState === "visible" &&
-                this.$route.path === "/"
+                this.isVisable
             ) {
                 this.chart.setOption({
                     series: this.series,
@@ -310,6 +313,6 @@ export default {
     },
     mounted: function() {
         this.createChart()
-    }
+    },
 }
 </script>
\ No newline at end of file
diff --git a/src/components/panels/Settings/DashboardPanel.vue b/src/components/panels/Settings/DashboardPanel.vue
index 36a2be52..c130fbf0 100644
--- a/src/components/panels/Settings/DashboardPanel.vue
+++ b/src/components/panels/Settings/DashboardPanel.vue
@@ -99,7 +99,7 @@
                     return this.$store.state.gui.tempchart.intervalChartUpdate
                 },
                 set(newVal) {
-                    if (newVal >= 500) return this.$store.dispatch('gui/setSettings', { gui: { tempchart: { intervalChartUpdate: newVal } } })
+                    if (newVal >= 500) return this.$store.dispatch('gui/setSettings', { tempchart: { intervalChartUpdate: newVal } })
                 }
             },
             intervalDatasetUpdate: {
@@ -107,7 +107,7 @@
                     return this.$store.state.gui.tempchart.intervalDatasetUpdate
                 },
                 set(newVal) {
-                    if (newVal >= 500) return this.$store.dispatch('gui/setSettings', { gui: { tempchart: { intervalDatasetUpdate: newVal } } })
+                    if (newVal >= 500) return this.$store.dispatch('gui/setSettings', { tempchart: { intervalDatasetUpdate: newVal } })
                 }
             },
         },
diff --git a/src/components/panels/Settings/GeneralPanel.vue b/src/components/panels/Settings/GeneralPanel.vue
index b6ea45b5..8bb36d0d 100644
--- a/src/components/panels/Settings/GeneralPanel.vue
+++ b/src/components/panels/Settings/GeneralPanel.vue
@@ -1,23 +1,58 @@
-<style>
-    .webcamImage {
-        width: 100%;
-    }
-</style>
-
 <template>
-    <v-card>
-        <v-toolbar flat dense >
-            <v-toolbar-title>
-                <span class="subheading"><v-icon left>mdi-cog</v-icon>General</span>
-            </v-toolbar-title>
-        </v-toolbar>
-        <v-card-text class="pt-2 pb-0">
-            <v-text-field
-                v-model="printerName"
-                label="Printer Name"
-            ></v-text-field>
-        </v-card-text>
-    </v-card>
+    <div>
+        <v-card>
+            <v-toolbar flat dense >
+                <v-toolbar-title>
+                    <span class="subheading"><v-icon left>mdi-cog</v-icon>General</span>
+                </v-toolbar-title>
+            </v-toolbar>
+            <v-card-text class="pt-2 pb-0">
+                <v-text-field
+                    v-model="printerName"
+                    label="Printer Name"
+                ></v-text-field>
+                <v-row>
+                    <v-col class="text-center mt-0">
+                        <v-btn @click="dialogResetMainsail=true" >reset mainsail</v-btn>
+                    </v-col>
+                </v-row>
+            </v-card-text>
+        </v-card>
+        <v-dialog v-model="dialogResetMainsail" persistent :width="300">
+            <v-card dark>
+                <v-toolbar flat dense color="primary">
+                    <v-toolbar-title>
+                    <span class="subheading">
+                        <v-icon class="mdi mdi-help-circle" left></v-icon> Reset Mainsail
+                    </span>
+                    </v-toolbar-title>
+                    <v-spacer></v-spacer>
+                    <v-btn small class="minwidth-0" @click="dialogResetMainsail = false"><v-icon small>mdi-close-thick</v-icon></v-btn>
+                </v-toolbar>
+                <v-card-text class="pt-3">
+                    <v-container class="pb-0">
+
+                        <v-row>
+                            <v-col>
+                                <p class="text-center mb-0">Do you really want to reset mainsail to factory settings?</p>
+                            </v-col>
+                        </v-row>
+
+                        <v-row>
+                            <v-col class="text-center">
+                                <v-btn
+                                    color="red"
+                                    @click="resetMainsail"
+                                >
+                                    reset mainsail
+                                </v-btn>
+                            </v-col>
+                        </v-row>
+                    </v-container>
+                </v-card-text>
+            </v-card>
+        </v-dialog>
+    </div>
 </template>
 
 <script>
@@ -27,21 +62,24 @@
         },
         data: function() {
             return {
-
+                dialogResetMainsail: false,
             }
         },
         computed: {
             printerName: {
                 get() {
-                    return this.$store.state.gui.general.printername;
+                    return this.$store.state.gui.general.printername
                 },
                 set(newName) {
-                    return this.$store.dispatch('gui/setSettings', { general: { printername: newName } });
+                    return this.$store.dispatch('gui/setSettings', { general: { printername: newName } })
                 }
             },
         },
         methods: {
-
+            resetMainsail() {
+                this.$store.dispatch('gui/resetMoonrakerDB')
+                this.dialogResetMainsail = false
+            }
         }
     }
 </script>
\ No newline at end of file
diff --git a/src/components/panels/Settings/MacrosPanel.vue b/src/components/panels/Settings/MacrosPanel.vue
index 3a5f12be..7f0afc2a 100644
--- a/src/components/panels/Settings/MacrosPanel.vue
+++ b/src/components/panels/Settings/MacrosPanel.vue
@@ -13,6 +13,11 @@
                         <settings-macro-switch :name="macro.name"></settings-macro-switch>
                     </v-col>
                 </v-row>
+                <v-row v-if="this['printer/getAllMacros'].length === 0">
+                    <v-col>
+                        <p class="mb-0 text-center font-italic">No macros found...</p>
+                    </v-col>
+                </v-row>
             </v-container>
         </v-card-text>
     </v-card>
diff --git a/src/components/panels/Settings/PresetsPanel.vue b/src/components/panels/Settings/PresetsPanel.vue
index ee21fdf3..1c7423bc 100644
--- a/src/components/panels/Settings/PresetsPanel.vue
+++ b/src/components/panels/Settings/PresetsPanel.vue
@@ -10,7 +10,7 @@
             <v-card-text class="py-3">
                 <v-container>
                     <v-row v-for="(preset, index) in this['gui/getPreheatPresets']" v-bind:key="index">
-                        <v-col class="rounded transition-swing secondary py-2 px-2 mb-6" style="cursor: pointer;">
+                        <v-col class="rounded transition-swing secondary py-2 px-2 mb-3" style="cursor: pointer;">
                             <v-row align="center">
                                 <v-col class="pl-6">
                                     <strong>{{ preset.name }}</strong>
@@ -25,7 +25,7 @@
                         </v-col>
                     </v-row>
                     <v-row>
-                        <v-col class="rounded transition-swing secondary py-2 px-2 mb-6" style="cursor: pointer;">
+                        <v-col class="rounded transition-swing secondary py-2 px-2 mb-2" style="cursor: pointer;">
                             <v-row align="center">
                                 <v-col class="pl-6">
                                     <strong>Cooldown</strong>
@@ -170,6 +170,7 @@
                                         label="Custom G-Code"
                                         v-model="cooldownDialog.gcode"
                                         :rules="[rules.required]"
+                                        hide-details="auto"
                                     ></v-textarea>
                                 </v-col>
                             </v-row>
@@ -225,7 +226,7 @@
         computed: {
             ...mapState({
                 orgState: state => state.gui.presets,
-                cooldownGcode: state => state.gui.cooldownGcode,
+                cooldownGcode: state => state.gui.cooldown_gcode,
             }),
             ...mapGetters([
                 'printer/getHeaters',
diff --git a/src/components/panels/Settings/RemotePrintersPanel.vue b/src/components/panels/Settings/RemotePrintersPanel.vue
index 09a517cc..29bea570 100644
--- a/src/components/panels/Settings/RemotePrintersPanel.vue
+++ b/src/components/panels/Settings/RemotePrintersPanel.vue
@@ -10,7 +10,7 @@
             <v-card-text class="py-3">
                 <v-container>
                     <v-row v-for="(printer, index) in this['farm/getPrinters']" v-bind:key="index">
-                        <v-col class="rounded transition-swing secondary py-2 px-2 mb-6" style="cursor: pointer;">
+                        <v-col class="rounded transition-swing secondary py-2 px-2 mb-3" style="cursor: pointer;">
                             <v-row align="center">
                                 <v-col class="col-auto pr-0">
                                     <v-progress-circular
diff --git a/src/components/panels/Settings/WebcamPanel.vue b/src/components/panels/Settings/WebcamPanel.vue
index f33ce99f..3c49e6af 100644
--- a/src/components/panels/Settings/WebcamPanel.vue
+++ b/src/components/panels/Settings/WebcamPanel.vue
@@ -78,7 +78,7 @@
                     return this.$store.state.gui.webcam.url;
                 },
                 set(url) {
-                    return this.$store.dispatch('gui/setSettings', { webcam: { url } });
+                    return this.$store.dispatch('gui/setSettings', { webcam: { url: url } })
                 }
             },
             flipX: {
@@ -86,7 +86,7 @@
                     return this.$store.state.gui.webcam.flipX;
                 },
                 set(flipX) {
-                    return this.$store.dispatch('gui/setSettings', { webcam: { flipX } });
+                    return this.$store.dispatch('gui/setSettings', { webcam: { flipX: flipX } });
                 }
             },
             flipY: {
@@ -94,7 +94,7 @@
                     return this.$store.state.gui.webcam.flipY;
                 },
                 set(flipY) {
-                    return this.$store.dispatch('gui/setSettings', { webcam: { flipY } });
+                    return this.$store.dispatch('gui/setSettings', { webcam: { flipY: flipY } });
                 }
             },
             rotate: {
@@ -110,7 +110,7 @@
                     return this.$store.state.gui.webcam.rotateDegrees;
                 },
                 set(rotateDegrees) {
-                    return this.$store.dispatch('gui/setSettings', { webcam: { rotateDegrees } });
+                    return this.$store.dispatch('gui/setSettings', { webcam: { rotateDegrees: rotateDegrees } });
                 }
             },
             boolNavi: {
diff --git a/src/components/panels/StatusPanel.vue b/src/components/panels/StatusPanel.vue
index 10d354e8..5cc895b9 100644
--- a/src/components/panels/StatusPanel.vue
+++ b/src/components/panels/StatusPanel.vue
@@ -108,22 +108,22 @@
                             current_file.thumbnails.length &&
                             current_file.thumbnails.find(element => element.width >= 300 && element.width <= 400))  ? 'col-12 col-sm-8' : 'col-12'
                         ">
-                        <v-row class="text-center" align="center">
-                            <v-col class="flex-grow-0 py-2">
+                        <v-row class="text-center py-4" align="center">
+                            <v-col class="flex-grow-0 py-0">
                                 <v-icon>mdi-axis-arrow</v-icon>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>X</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1">{{ position.length ? position[0].toFixed(2) : "--" }}</v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>X</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0">{{ position.length ? position[0].toFixed(2) : "--" }}</v-col></v-row>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>Y</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1">{{ position.length ? position[1].toFixed(2) : "--" }}</v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>Y</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0">{{ position.length ? position[1].toFixed(2) : "--" }}</v-col></v-row>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>Z</strong></v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>Z</strong></v-col></v-row>
                                 <v-row>
-                                    <v-col class="px-0 pt-1">
+                                    <v-col class="pa-0">
 
                                         <v-tooltip top>
                                             <template v-slot:activator="{ on, attrs }">
@@ -136,18 +136,18 @@
                             </v-col>
                         </v-row>
                         <v-row v-if="['printing', 'paused', 'complete', 'error'].includes(printer_state) ">
-                            <v-col class="px-0">
+                            <v-col class="pa-0">
                                 <v-divider></v-divider>
                             </v-col>
                         </v-row>
-                        <v-row class="text-center" align="center" v-if="['printing', 'paused', 'complete', 'error'].includes(printer_state) ">
-                            <v-col class="flex-grow-0 py-2">
+                        <v-row class="text-center py-4" align="center" v-if="['printing', 'paused', 'complete', 'error'].includes(printer_state) ">
+                            <v-col class="flex-grow-0 py-0">
                                 <v-icon>mdi-poll</v-icon>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>Filament</strong></v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>Filament</strong></v-col></v-row>
                                 <v-row>
-                                    <v-col class="px-0 pt-1">
+                                    <v-col class="pa-0">
                                         <v-tooltip top>
                                             <template v-slot:activator="{ on, attrs }">
                                                 <span v-bind="attrs" v-on="on" v-if="filament_used >= 1000" class=" text-no-wrap">{{ (filament_used / 1000).toFixed(2) }} m</span>
@@ -158,57 +158,58 @@
                                     </v-col>
                                 </v-row>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>Print</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1">{{ formatTime(print_time) }}</v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>Print</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0">{{ formatTime(print_time) }}</v-col></v-row>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>Total</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1">{{ formatTime(print_time_total) }}</v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>Total</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0">{{ formatTime(print_time_total) }}</v-col></v-row>
                             </v-col>
                         </v-row>
                         <v-row v-if="['printing', 'paused', 'error'].includes(printer_state) ">
-                            <v-col class="px-0">
+                            <v-col class="pa-0">
                                 <v-divider></v-divider>
                             </v-col>
                         </v-row>
-                        <v-row class="text-center" align="center" v-if="['printing', 'paused', 'error'].includes(printer_state)">
-                            <v-col class="flex-grow-0 py-2">
+                        <v-row class="text-center py-4" align="center" v-if="['printing', 'paused', 'error'].includes(printer_state)">
+                            <v-col class="flex-grow-0 py-0">
                                 <v-icon>mdi-printer-3d</v-icon>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>Speed</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1 text-no-wrap">{{ (requested_speed / 60 * speed_factor).toFixed(0) }} mm/s</v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>Speed</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0 text-no-wrap">{{ (requested_speed / 60 * speed_factor).toFixed(0) }} mm/s</v-col></v-row>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>Layer</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1 text-no-wrap">{{ current_layer }} of {{ max_layers }}</v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>Layer</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0 text-no-wrap">{{ current_layer }} of {{ max_layers }}</v-col></v-row>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>ETA</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1">{{ eta ? formatDateTime(eta) : '--' }}</v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>ETA</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0">{{ eta ? formatDateTime(eta) : '--' }}</v-col></v-row>
                             </v-col>
                         </v-row>
                         <v-row v-if="['printing', 'paused', 'error'].includes(printer_state) ">
-                            <v-col class="px-0">
+                            <v-col class="pa-0">
                                 <v-divider></v-divider>
                             </v-col>
                         </v-row>
-                        <v-row class="text-center" align="center" v-if="['printing', 'paused', 'error'].includes(printer_state) ">
-                            <v-col class="flex-grow-0 py-2">
+                        <v-row class="text-center py-4" align="center" v-if="['printing', 'paused', 'error'].includes(printer_state) ">
+                            <v-col class="flex-grow-0 py-0">
                                 <v-icon>mdi-clock-outline</v-icon>
                             </v-col>
-                            <v-col class="equal-width py-2 ">
-                                <v-row><v-col class="px-0 pb-1"><strong>File</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1">{{ estimated_time_file ? formatTime(estimated_time_file) : '--' }}</v-col></v-row>
+                            <v-col class="equal-width py-0 ">
+                                <v-row><v-col class="pa-0"><strong>File</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0">{{ estimated_time_file ? formatTime(estimated_time_file) : '--' }}</v-col></v-row>
+
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>Filament</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1">{{ estimated_time_filament ? formatTime(estimated_time_filament) : '--' }}</v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>Filament</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0">{{ estimated_time_filament ? formatTime(estimated_time_filament) : '--' }}</v-col></v-row>
                             </v-col>
-                            <v-col class="equal-width py-2">
-                                <v-row><v-col class="px-0 pb-1"><strong>Slicer</strong></v-col></v-row>
-                                <v-row><v-col class="px-0 pt-1">{{ estimated_time_slicer ? formatTime(estimated_time_slicer) : '--' }}</v-col></v-row>
+                            <v-col class="equal-width py-0">
+                                <v-row><v-col class="pa-0"><strong>Slicer</strong></v-col></v-row>
+                                <v-row><v-col class="pa-0">{{ estimated_time_slicer ? formatTime(estimated_time_slicer) : '--' }}</v-col></v-row>
                             </v-col>
                         </v-row>
                     </v-col>
diff --git a/src/components/panels/ToolsPanel.vue b/src/components/panels/ToolsPanel.vue
index c785b605..8b15a895 100644
--- a/src/components/panels/ToolsPanel.vue
+++ b/src/components/panels/ToolsPanel.vue
@@ -73,7 +73,7 @@
                     </v-menu>
                 </v-item-group>
             </v-toolbar>
-            <v-card-text class="px-0 py-2 content">
+            <v-card-text class="pa-0 content">
                 <v-container class="px-0">
                     <v-row align="center">
                         <v-col class="py-2 font-weight-bold" style="padding-left: 68px;">Name</v-col>
@@ -282,7 +282,7 @@
                 datasets: state => state.printer.tempHistory.datasets,
                 boolTempchart: state => state.gui.dashboard.boolTempchart,
                 printer: state => state.printer,
-                cooldownGcode: state => state.gui.cooldownGcode,
+                cooldownGcode: state => state.gui.cooldown_gcode,
                 printer_state: state => state.printer.print_stats.state,
             }),
             ...mapGetters([
diff --git a/src/components/panels/ZOffsetPanel.vue b/src/components/panels/ZOffsetPanel.vue
index 2f3fe043..665dad42 100644
--- a/src/components/panels/ZOffsetPanel.vue
+++ b/src/components/panels/ZOffsetPanel.vue
@@ -13,7 +13,7 @@
         <v-card-text class="px-0 py-0">
             <v-container>
                 <v-row class="py-0">
-                    <v-col class="col text-center">
+                    <v-col class="pb-0 text-center">
                         <p class="mb-0">Current Offset: {{ homing_origin.length > 1 ? homing_origin[2].toFixed(2) : 0.00 }}mm</p>
                     </v-col>
                 </v-row>
diff --git a/src/inputs/SettingsMacroSwitch.vue b/src/inputs/SettingsMacroSwitch.vue
index 20ca0c4e..9ecf7331 100644
--- a/src/inputs/SettingsMacroSwitch.vue
+++ b/src/inputs/SettingsMacroSwitch.vue
@@ -26,12 +26,14 @@
         },
         methods: {
             setValue() {
-                if (this.value) {
-                    let index = this.hiddenMacros.indexOf(this.name.toUpperCase());
-                    if (index > -1) this.hiddenMacros.splice(index, 1)
-                } else this.hiddenMacros.push(this.name.toUpperCase())
+                let hiddenMacros = this.hiddenMacros
 
-                this.$store.dispatch("gui/upload")
+                if (this.value) {
+                    let index = hiddenMacros.indexOf(this.name.toUpperCase());
+                    if (index > -1) hiddenMacros.splice(index, 1)
+                } else hiddenMacros.push(this.name.toUpperCase())
+
+                this.$store.dispatch("gui/setSettings", { dashboard: { hiddenMacros: hiddenMacros }})
             }
         },
         watch: {
diff --git a/src/store/farm/index.js b/src/store/farm/index.js
index c0fe8013..97824d10 100644
--- a/src/store/farm/index.js
+++ b/src/store/farm/index.js
@@ -34,7 +34,7 @@ export default {
 					}
 				}
 			} else {
-				rootState.gui.remotePrinters.forEach((printer) => {
+				rootState.gui.remote_printers.forEach((printer) => {
 					commit('addPrinter',{
 						hostname: printer.hostname,
 						port: printer.port,
@@ -65,7 +65,7 @@ export default {
 					})
 				}
 
-				dispatch("gui/setSettings", { remotePrinters: printers }, { root: true })
+				dispatch("gui/setSettings", { remote_printers: printers }, { root: true })
 			}
 		}
 	},
diff --git a/src/store/gui/actions.js b/src/store/gui/actions.js
index ca0dc458..56a2cf28 100644
--- a/src/store/gui/actions.js
+++ b/src/store/gui/actions.js
@@ -1,27 +1,20 @@
-import axios from "axios";
 import Vue from "vue";
+import objectAssignDeep from "object-assign-deep"
 
 export default {
 	reset({ commit }) {
 		commit('reset')
 	},
 
-	getData({ commit, dispatch }, payload) {
+	getData({ commit, dispatch, rootState }, payload) {
 		commit('setData', payload.value)
-		window.console.log(payload.value)
 
-		if (
-			'tempchart' in payload.value &&
-			'datasetSettings' in payload.value.tempchart
-		) {
-			for (const key of Object.keys(payload.value.tempchart.datasetSettings)) {
-				if (
-					'color' in payload.value.tempchart.datasetSettings[key] &&
-					typeof payload.value.tempchart.datasetSettings[key].color === "object"
-				) {
-					dispatch('setTempchartDatasetSetting', { name: key, type: 'color', value: payload.value.tempchart.datasetSettings[key].color.hex })
-				}
-			}
+		if ('tempchart' in payload.value && 'datasetSettings' in payload.value.tempchart) {
+			commit('setTempchartDatasetSettings', payload.value.tempchart.datasetSettings)
+		}
+
+		if (!rootState.socket.remoteMode) {
+			dispatch('farm/readStoredPrinters', {}, { root: true })
 		}
 
 		dispatch('printer/init', null, { root: true })
@@ -30,80 +23,121 @@ export default {
 	setSettings({ commit }, payload) {
 		commit('setSettings', payload)
 
-		if ('tempchart' in payload && 'boolPowerDatasets' in payload.tempchart) {
-			if (payload.tempchart.boolPowerDatasets) commit('printer/tempHistory/showPowerDatasets', {}, { root: true })
-			else commit('printer/tempHistory/hidePowerDatasets', {}, { root: true })
-		}
-
 		Object.keys(payload).forEach(key => {
-			Vue.prototype.$socket.sendObj('server.database.get_item', { namespace: 'mainsail' }, 'gui/updateSettings', { newVal: payload[key], keyName: key }) //, 'server/getMainsailConfig'
+			Vue.prototype.$socket.sendObj('server.database.get_item', { namespace: 'mainsail' }, 'gui/updateSettings', { newVal: payload[key], keyName: key })
 		})
-
-		//dispatch('upload')
 	},
 
 	updateSettings({ commit }, payload) {
 		const keyName = payload.keyName
-		const newState = keyName in payload.value ? Object.assign(payload.value[keyName], payload.newVal) : payload.newVal
+		let newState = payload.newVal
+		if ('value' in payload && keyName in payload.value) {
+			newState = objectAssignDeep(payload.value[keyName], newState)
+		}
 
 		Vue.prototype.$socket.sendObj('server.database.post_item', { namespace: 'mainsail', key: keyName, value: newState })
 
 		commit('void', {}, { root: true })
 	},
 
-	upload({ state, rootState }) {
-		let file = new File([JSON.stringify({ state })], '.mainsail.json')
-
-		let formData = new FormData();
-		formData.append('file', file);
-		formData.append('root', 'config');
-
-		axios.post('//' + rootState.socket.hostname + ':' + rootState.socket.port + '/server/files/upload',
-			formData, {
-				headers: { 'Content-Type': 'multipart/form-data' }
-			}
-		).then(() => {
-
-		}).catch(() => {
-			window.console.error("Error save .mainsail.json!")
-		});
-	},
-
-	setGcodefilesMetadata({ commit, dispatch }, data) {
+	setGcodefilesMetadata({ commit, dispatch, state }, data) {
 		commit('setGcodefilesMetadata', data)
-		dispatch('upload')
+		dispatch('updateSettings', {
+			keyName: 'gcodefiles',
+			newVal: state.gcodefiles
+		})
 	},
 
-	setGcodefilesShowHiddenFiles({ commit, dispatch }, data) {
+	setGcodefilesShowHiddenFiles({ commit, dispatch, state }, data) {
 		commit('setGcodefilesShowHiddenFiles', data)
-		dispatch('upload')
+		dispatch('updateSettings', {
+			keyName: 'gcodefiles',
+			newVal: state.gcodefiles
+		})
 	},
 
-	addPreset({ commit }, payload) {
-		//commit("addPreset", payload)
-		//dispatch("upload")
-		window.console.log(payload)
-
-		commit("void", {}, { root: true })
+	addPreset({ commit, dispatch, state }, payload) {
+		commit("addPreset", payload)
+		dispatch('updateSettings', {
+			keyName: 'presets',
+			newVal: state.presets
+		})
 	},
 
-	updatePreset({ commit, dispatch }, payload) {
+	updatePreset({ commit, dispatch, state }, payload) {
 		commit("updatePreset", payload)
-		dispatch("upload")
+		dispatch('updateSettings', {
+			keyName: 'presets',
+			newVal: state.presets
+		})
 	},
 
-	deletePreset({ commit, dispatch }, payload) {
+	deletePreset({ commit, dispatch, state }, payload) {
 		commit("deletePreset", payload)
-		dispatch("upload")
+		dispatch('updateSettings', {
+			keyName: 'presets',
+			newVal: state.presets
+		})
 	},
 
-	setTempchartDatasetSetting({ commit, dispatch }, payload) {
+	setTempchartDatasetSetting({ commit, dispatch, state }, payload) {
 		commit("setTempchartDatasetSetting", payload)
-		dispatch("upload")
+		dispatch('updateSettings', {
+			keyName: 'tempchart',
+			newVal: state.tempchart
+		})
 	},
 
-	setTempchartDatasetAdditionalSensorSetting({ commit, dispatch }, payload) {
+	setTempchartDatasetAdditionalSensorSetting({ commit, dispatch, state }, payload) {
 		commit("setTempchartDatasetAdditionalSensorSetting", payload)
-		dispatch("upload")
+		dispatch('updateSettings', {
+			keyName: 'tempchart',
+			newVal: state.tempchart
+		})
+	},
+
+	resetMoonrakerDB() {
+		Vue.prototype.$socket.sendObj('server.database.list', { }, 'gui/resetMoonrakerDB2')
+	},
+
+	resetMoonrakerDB2({ commit }, payload) {
+		if ('namespaces' in payload && payload.namespaces.includes('mainsail')) {
+			Vue.prototype.$socket.sendObj('server.database.get_item', { namespace: 'mainsail' }, 'gui/resetMoonrakerDB3')
+		}
+
+		commit('void', {}, { root: true })
+	},
+
+	resetMoonrakerDB3({ commit }, payload) {
+		if ('value' in payload && Object.keys(payload.value).length) {
+			Object.keys(payload.value).forEach(key => {
+				Vue.prototype.$socket.sendObj('server.database.delete_item', { namespace: 'mainsail', key: key })
+			})
+
+			window.location.reload()
+		}
+
+		commit('void', {}, { root: true })
+	},
+
+	//TODO: remove it after a short time of migration. maybe april release
+	migrateMainsailJson({ state, dispatch }, payload) {
+		const settings = {}
+
+		Object.keys(payload.state).forEach(key => {
+			if (key in state) {
+				settings[key] = {...payload.state[key]}
+			}
+
+			if (key === "cooldownGcode") settings["cooldown_gcode"] = payload.state[key]
+			if (key === "remotePrinters") settings["remote_printers"] = {...payload.state[key]}
+		})
+
+		if (Object.keys(settings).length) {
+			dispatch('setSettings', settings)
+		}
+
+		Vue.prototype.$socket.sendObj('server.files.delete_file', { path: 'config/.mainsail.json' })
+		dispatch('printer/init', null, { root: true })
 	}
 }
\ No newline at end of file
diff --git a/src/store/gui/index.js b/src/store/gui/index.js
index 8487a10e..bec80b98 100644
--- a/src/store/gui/index.js
+++ b/src/store/gui/index.js
@@ -33,7 +33,7 @@ export function getDefaultState() {
 		webcam: {
 			service: 'mjpegstreamer',
 			targetFps: 25,
-			url: "",
+			url: "/webcam/?action=stream",
 			rotate: false,
 			rotateDegrees: 90,
 			flipX: false,
@@ -64,9 +64,11 @@ export function getDefaultState() {
 				showHiddenFiles: false,
 			}
 		},
-		remotePrinters: [],
+		//moonraker DB api dont accept camel case key names
+		remote_printers: [],
 		presets: [],
-		cooldownGcode: "TURN_OFF_HEATERS"
+		//moonraker DB api dont accept camel case key names
+		cooldown_gcode: "TURN_OFF_HEATERS"
 	}
 }
 
diff --git a/src/store/gui/mutations.js b/src/store/gui/mutations.js
index 3ae02a63..a1036e6c 100644
--- a/src/store/gui/mutations.js
+++ b/src/store/gui/mutations.js
@@ -9,17 +9,15 @@ export default {
 	},
 
 	setData(state, payload) {
-		if ("state" in payload) payload = payload.state
-		if ("gui" in payload) payload = payload.gui
+		let setDataDeep = function(currentState, payload) {
+			Object.entries(payload).forEach(([key, value]) => {
+				if (typeof value === 'object' && !Array.isArray(value) && key in currentState) {
+					setDataDeep(currentState[key], value)
+				} else if (key in currentState) Vue.set(currentState, key, value)
+			})
+		}
 
-		Object.entries(payload).forEach(([key, value]) => {
-			if (typeof value === 'object' && !Array.isArray(value) && key in state) {
-				Object.entries(value).forEach(([key2, value2]) => {
-					window.console.log(value2)
-					if (key2 in state[key]) Vue.set(state[key], key2, value2)
-				})
-			} else if (key in state) Vue.set(state, key, value)
-		})
+		setDataDeep(state, payload)
 	},
 
 	// override special setting
@@ -68,6 +66,10 @@ export default {
 		}
 	},
 
+	setTempchartDatasetSettings(state, payload) {
+		Vue.set(state.tempchart, 'datasetSettings', payload)
+	},
+
 	setTempchartDatasetSetting(state, payload) {
 		if (!(payload.name in state.tempchart.datasetSettings))
 			Vue.set(state.tempchart.datasetSettings, payload.name, {})
diff --git a/src/store/server/actions.js b/src/store/server/actions.js
index df0b0917..9a6b7442 100644
--- a/src/store/server/actions.js
+++ b/src/store/server/actions.js
@@ -10,10 +10,25 @@ export default {
 	init() {
 		Vue.prototype.$socket.sendObj('server.info', {}, 'server/getInfo')
 		Vue.prototype.$socket.sendObj('server.config', {}, 'server/getConfig')
-		//Vue.prototype.$socket.sendObj('server.files.list', { root: 'config' }, 'server/checkMainsailJson')
 		Vue.prototype.$socket.sendObj('server.database.list', { root: 'config' }, 'server/checkDatabases')
 	},
 
+	checkDatabases({ commit }, payload) {
+		if (
+			'namespaces' in payload &&
+			payload.namespaces.includes('mainsail')
+		) {
+			Vue.prototype.$socket.sendObj('server.database.get_item', { namespace: 'mainsail' }, 'gui/getData')
+		} else {
+			//fallback for a short time...
+			Vue.prototype.$socket.sendObj('server.files.list', { root: 'config' }, 'server/checkMainsailJson')
+
+			//after this short migration time...
+			//dispatch('printer/init', null, { root: true })
+			commit('void', { }, { root: true })
+		}
+	},
+
 	checkMainsailJson({ dispatch, rootState }, payload) {
 		let boolFallback = true
 
@@ -23,9 +38,7 @@ export default {
 
 				fetch('//'+rootState.socket.hostname+':'+rootState.socket.port+'/server/files/config/.mainsail.json?time='+Date.now())
 					.then(res => res.json()).then(file => {
-					dispatch('gui/getData', file, { root: true })
-					if (!rootState.socket.remoteMode) dispatch('farm/readStoredPrinters', {}, { root: true })
-					dispatch('printer/init', null, { root: true })
+					dispatch('gui/migrateMainsailJson', file, { root: true })
 				})
 			}
 		})
@@ -33,15 +46,6 @@ export default {
 		if (boolFallback) dispatch('printer/init', null, { root: true })
 	},
 
-	checkDatabases({ dispatch }, payload) {
-		if (
-			'namespaces' in payload &&
-			payload.namespaces.includes('mainsail')
-		) {
-			Vue.prototype.$socket.sendObj('server.database.get_item', { namespace: 'mainsail' }, 'gui/getData')
-		} else dispatch('printer/init', null, { root: true })
-	},
-
 	getInfo({ commit, state, rootState }, payload) {
 		if (state.plugins.length === 0) {
 			if (payload.plugins.includes("power") !== false)
diff --git a/src/store/socket/actions.js b/src/store/socket/actions.js
index 12e11276..a8f9b7e8 100644
--- a/src/store/socket/actions.js
+++ b/src/store/socket/actions.js
@@ -106,7 +106,6 @@ export default {
 						payload.error.message !== "Klippy Request Timed Out" &&
 						payload.error.message !== "Klippy Disconnected"
 					) window.console.error("JSON-RPC: " + payload.error.message)
-					else if (!payload.error) window.console.log(payload)
 				}
 		}
 	},