diff --git a/docs/configuration/moonraker.md b/docs/configuration/moonraker.md
index a44bdc16a4..d13e5e7152 100644
--- a/docs/configuration/moonraker.md
+++ b/docs/configuration/moonraker.md
@@ -30,18 +30,21 @@ and
 This configures the general configuration of your moonraker instance. In most
 cases, you shouldn't need to touch anything here.
 
+## [file_manager] block
+
 If you have a FluiddPI installation of `1.14` or below, it may be worth adding a
 logs path, which will expose all logs inside of Fluidd. [KIUAH](/installation/kiauh) can
 provide a gracefull upgrade path in order to re-arrange all of your logs into
 the same place for this to be most benifical.
 
-```sh
+```yaml
+[file_manager]
 log_path: ~/klipper_logs
 ```
 
 See the [configuration example](/configuration/moonraker_conf) where this belongs.
 
-### Temperature & GCODE store size
+## [data_store] block
 
 Temperature and gcode store sizes can be configured in moonraker.
 This is especially useful for temperature store data, as it
@@ -52,6 +55,7 @@ Temperature store size is in seconds, while the gcode store size is defined
 in an entry count.
 
 ```yaml
+[data_store]
 temperature_store_size: 600
 gcode_store_size: 1000
 ```
diff --git a/docs/configuration/moonraker_conf.md b/docs/configuration/moonraker_conf.md
index b1abd66f4f..be45bed1d0 100644
--- a/docs/configuration/moonraker_conf.md
+++ b/docs/configuration/moonraker_conf.md
@@ -19,10 +19,14 @@ Your moonraker configuration can usually be found here: `~/klipper_config/moonra
 host: 0.0.0.0
 port: 7125
 enable_debug_logging: False
+
+[file_manager]
 config_path: ~/klipper_config
+log_path: ~/klipper_logs
+
+[data_store]
 temperature_store_size: 600
 gcode_store_size: 1000
-log_path: ~/klipper_logs
 
 [authorization]
 force_logins: true
diff --git a/package-lock.json b/package-lock.json
index 255ea1592d..c66b6a7df9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,9 +19,8 @@
         "core-js": "^3.14.0",
         "dayjs": "^1.10.5",
         "deepmerge": "^4.2.2",
-        "echarts": "^5.1.2",
-        "echarts-for-vue": "^1.4.1",
-        "echarts-gl": "^2.0.6",
+        "echarts": "^5.3.0",
+        "echarts-gl": "^2.0.9",
         "jwt-decode": "^3.1.2",
         "lodash": "^4.17.21",
         "md5": "^2.3.0",
@@ -38,6 +37,7 @@
         "vue": "^2.6.14",
         "vue-class-component": "^7.2.3",
         "vue-debounce-decorator": "^1.0.1",
+        "vue-echarts": "^6.0.2",
         "vue-headful": "^2.1.0",
         "vue-i18n": "^8.24.5",
         "vue-inline-svg": "^2.0.0",
@@ -69,6 +69,7 @@
         "@vue/cli-plugin-unit-jest": "^4.5.13",
         "@vue/cli-plugin-vuex": "^4.5.13",
         "@vue/cli-service": "^4.5.13",
+        "@vue/composition-api": "^1.4.9",
         "@vue/eslint-config-standard": "^5.1.2",
         "@vue/eslint-config-typescript": "^5.0.2",
         "@vue/test-utils": "^1.2.1",
@@ -4509,14 +4510,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/echarts": {
-      "version": "4.9.7",
-      "resolved": "https://registry.npmjs.org/@types/echarts/-/echarts-4.9.7.tgz",
-      "integrity": "sha512-+klqEur0+bh1UjR6EpGE023vxpqzPSk58X5JwVEIBu0NOYMaMPKeM/TMnbL43BlDUZv4xttZFdeDdOtFk/YwzQ==",
-      "dependencies": {
-        "@types/zrender": "*"
-      }
-    },
     "node_modules/@types/eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -4838,11 +4831,6 @@
       "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
       "dev": true
     },
-    "node_modules/@types/zrender": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/zrender/-/zrender-4.0.0.tgz",
-      "integrity": "sha512-s89GOIeKFiod2KSqHkfd2rzx+T2DVu7ihZCBEBnhFrzvQPUmzvDSBot9Fi1DfMQm9Odg+rTqoMGC38RvrwJK2w=="
-    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "2.34.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz",
@@ -6777,6 +6765,15 @@
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
       "dev": true
     },
+    "node_modules/@vue/composition-api": {
+      "version": "1.4.9",
+      "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.4.9.tgz",
+      "integrity": "sha512-l6YOeg5LEXmfPqyxAnBaCv1FMRw0OGKJ4m6nOWRm6ngt5TuHcj5ZoBRN+LXh3J0u6Ur3C4VA+RiKT+M0eItr/g==",
+      "devOptional": true,
+      "peerDependencies": {
+        "vue": ">= 2.5 < 3"
+      }
+    },
     "node_modules/@vue/eslint-config-standard": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@vue/eslint-config-standard/-/eslint-config-standard-5.1.2.tgz",
@@ -12431,22 +12428,10 @@
         "zrender": "5.3.0"
       }
     },
-    "node_modules/echarts-for-vue": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/echarts-for-vue/-/echarts-for-vue-1.4.1.tgz",
-      "integrity": "sha512-o1VKvX5lCo5Nb8B5EEr6ztt+hRi4W9RnKn7wIk+l3fZ0S2yVXanqZckgBfO7v8vSS+xOJq/Df5flrNUQIRhn/Q==",
-      "dependencies": {
-        "@types/echarts": "^4.9.7"
-      },
-      "peerDependencies": {
-        "echarts": ">=3",
-        "vue": ">=2"
-      }
-    },
     "node_modules/echarts-gl": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-2.0.6.tgz",
-      "integrity": "sha512-yRntZUlDJDqWTZ0owaKGZYK8G/pjr/BlsWjGspub0sWN5wIRvV6oaiqdRhmSJU27dINExXmoEsEq67Mo0omhaQ==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-2.0.9.tgz",
+      "integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==",
       "dependencies": {
         "claygl": "^1.2.1",
         "zrender": "^5.1.1"
@@ -27608,6 +27593,11 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "node_modules/resize-detector": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.3.0.tgz",
+      "integrity": "sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ=="
+    },
     "node_modules/resolve": {
       "version": "1.22.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
@@ -31361,6 +31351,51 @@
       "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.3.2.tgz",
       "integrity": "sha512-cH208IoM+jgZyEf/g7mnFyofwPDJTM/QvBNhYMjqGB8fCsRyTf68rH2ISw/G20tJv+5mIThQ3upKwoL4jLTr1A=="
     },
+    "node_modules/vue-demi": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.1.tgz",
+      "integrity": "sha512-QL3ny+wX8c6Xm1/EZylbgzdoDolye+VpCXRhI2hug9dJTP3OUJ3lmiKN3CsVV3mOJKwFi0nsstbgob0vG7aoIw==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vue-echarts": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.0.2.tgz",
+      "integrity": "sha512-9xDokauJtAc389MNKbwi1I0VDmp4Y6ndAJTQ8T9K7H0ffosTe1OJSJbUtkT7/fVLDFzlCcmg2TfAKaMzbpg5yQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "resize-detector": "^0.3.0",
+        "vue-demi": "^0.12.1"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.5",
+        "echarts": "^5.1.2",
+        "vue": "^2.6.12 || ^3.1.1"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/vue-eslint-parser": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz",
@@ -36616,14 +36651,6 @@
         "@types/node": "*"
       }
     },
-    "@types/echarts": {
-      "version": "4.9.7",
-      "resolved": "https://registry.npmjs.org/@types/echarts/-/echarts-4.9.7.tgz",
-      "integrity": "sha512-+klqEur0+bh1UjR6EpGE023vxpqzPSk58X5JwVEIBu0NOYMaMPKeM/TMnbL43BlDUZv4xttZFdeDdOtFk/YwzQ==",
-      "requires": {
-        "@types/zrender": "*"
-      }
-    },
     "@types/eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -36944,11 +36971,6 @@
       "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
       "dev": true
     },
-    "@types/zrender": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/zrender/-/zrender-4.0.0.tgz",
-      "integrity": "sha512-s89GOIeKFiod2KSqHkfd2rzx+T2DVu7ihZCBEBnhFrzvQPUmzvDSBot9Fi1DfMQm9Odg+rTqoMGC38RvrwJK2w=="
-    },
     "@typescript-eslint/eslint-plugin": {
       "version": "2.34.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz",
@@ -38486,6 +38508,13 @@
         }
       }
     },
+    "@vue/composition-api": {
+      "version": "1.4.9",
+      "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.4.9.tgz",
+      "integrity": "sha512-l6YOeg5LEXmfPqyxAnBaCv1FMRw0OGKJ4m6nOWRm6ngt5TuHcj5ZoBRN+LXh3J0u6Ur3C4VA+RiKT+M0eItr/g==",
+      "devOptional": true,
+      "requires": {}
+    },
     "@vue/eslint-config-standard": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@vue/eslint-config-standard/-/eslint-config-standard-5.1.2.tgz",
@@ -43134,18 +43163,10 @@
         }
       }
     },
-    "echarts-for-vue": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/echarts-for-vue/-/echarts-for-vue-1.4.1.tgz",
-      "integrity": "sha512-o1VKvX5lCo5Nb8B5EEr6ztt+hRi4W9RnKn7wIk+l3fZ0S2yVXanqZckgBfO7v8vSS+xOJq/Df5flrNUQIRhn/Q==",
-      "requires": {
-        "@types/echarts": "^4.9.7"
-      }
-    },
     "echarts-gl": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-2.0.6.tgz",
-      "integrity": "sha512-yRntZUlDJDqWTZ0owaKGZYK8G/pjr/BlsWjGspub0sWN5wIRvV6oaiqdRhmSJU27dINExXmoEsEq67Mo0omhaQ==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-2.0.9.tgz",
+      "integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==",
       "requires": {
         "claygl": "^1.2.1",
         "zrender": "^5.1.1"
@@ -55150,6 +55171,11 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
+    "resize-detector": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.3.0.tgz",
+      "integrity": "sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ=="
+    },
     "resolve": {
       "version": "1.22.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
@@ -58168,6 +58194,21 @@
         }
       }
     },
+    "vue-demi": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.1.tgz",
+      "integrity": "sha512-QL3ny+wX8c6Xm1/EZylbgzdoDolye+VpCXRhI2hug9dJTP3OUJ3lmiKN3CsVV3mOJKwFi0nsstbgob0vG7aoIw==",
+      "requires": {}
+    },
+    "vue-echarts": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.0.2.tgz",
+      "integrity": "sha512-9xDokauJtAc389MNKbwi1I0VDmp4Y6ndAJTQ8T9K7H0ffosTe1OJSJbUtkT7/fVLDFzlCcmg2TfAKaMzbpg5yQ==",
+      "requires": {
+        "resize-detector": "^0.3.0",
+        "vue-demi": "^0.12.1"
+      }
+    },
     "vue-eslint-parser": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz",
diff --git a/package.json b/package.json
index 6719d629fa..70d39e6ee6 100644
--- a/package.json
+++ b/package.json
@@ -41,9 +41,8 @@
     "core-js": "^3.14.0",
     "dayjs": "^1.10.5",
     "deepmerge": "^4.2.2",
-    "echarts": "^5.1.2",
-    "echarts-for-vue": "^1.4.1",
-    "echarts-gl": "^2.0.6",
+    "echarts": "^5.3.0",
+    "echarts-gl": "^2.0.9",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
@@ -60,6 +59,7 @@
     "vue": "^2.6.14",
     "vue-class-component": "^7.2.3",
     "vue-debounce-decorator": "^1.0.1",
+    "vue-echarts": "^6.0.2",
     "vue-headful": "^2.1.0",
     "vue-i18n": "^8.24.5",
     "vue-inline-svg": "^2.0.0",
@@ -91,6 +91,7 @@
     "@vue/cli-plugin-unit-jest": "^4.5.13",
     "@vue/cli-plugin-vuex": "^4.5.13",
     "@vue/cli-service": "^4.5.13",
+    "@vue/composition-api": "^1.4.9",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^5.0.2",
     "@vue/test-utils": "^1.2.1",
diff --git a/src/App.vue b/src/App.vue
index 7a27417831..1266948535 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,6 +29,7 @@
       fab
       fixed
       bottom left
+      class="ml-2 mb-2"
       color="error"
       @click="emergencyStop()"
     >
diff --git a/src/components/settings/cameras/CameraConfigDialog.vue b/src/components/settings/cameras/CameraConfigDialog.vue
index 35e3033bef..db32068f0b 100644
--- a/src/components/settings/cameras/CameraConfigDialog.vue
+++ b/src/components/settings/cameras/CameraConfigDialog.vue
@@ -129,7 +129,6 @@
             single-line
             hide-details="auto"
             v-model.number="camera.fpsidletarget"
-            :rules="[rules.required]"
           ></v-text-field>
         </app-setting>
 
diff --git a/src/components/settings/cameras/Cameras.vue b/src/components/settings/cameras/Cameras.vue
index 910969ebd0..9acfc2bbd1 100644
--- a/src/components/settings/cameras/Cameras.vue
+++ b/src/components/settings/cameras/Cameras.vue
@@ -90,6 +90,7 @@ export default class CameraSettings extends Vue {
       name: '',
       type: 'mjpgadaptive',
       fpstarget: 15,
+      fpsidletarget: 5,
       url: Globals.DEFAULTS.CAMERA_URL
     }
 
diff --git a/src/components/ui/AppChart.vue b/src/components/ui/AppChart.vue
index bd28aea266..9d58a20afd 100644
--- a/src/components/ui/AppChart.vue
+++ b/src/components/ui/AppChart.vue
@@ -4,22 +4,23 @@
       class="chart"
       :style="{ 'height': height }"
     >
-      <ECharts
+      <v-chart
         v-if="ready"
         style="overflow: initial;"
         ref="chart"
         :option="opts"
-        :setOptionOps="{ notMerge: true }"
-        :initOpts="{ renderer: 'svg' }"
+        :update-options="{ notMerge: true }"
+        :init-options="{ renderer: 'svg' }"
         :events="events"
       >
-      </ECharts>
+      </v-chart>
     </div>
   </div>
 </template>
 
 <script lang='ts'>
 import { Vue, Component, Prop, Watch, Ref } from 'vue-property-decorator'
+import { ECharts } from 'echarts'
 import { merge } from 'lodash'
 
 @Component({})
@@ -37,7 +38,7 @@ export default class AppChart extends Vue {
   events!: any;
 
   @Ref('chart')
-  chart!: any
+  chart!: ECharts
 
   ready = false
 
@@ -52,7 +53,7 @@ export default class AppChart extends Vue {
   @Watch('data')
   onData (data: any) {
     if (this.chart && data && data.length) {
-      this.chart.inst.setOption({
+      this.chart.setOption({
         dataset: {
           source: data
         }
@@ -81,7 +82,7 @@ export default class AppChart extends Vue {
   beforeDestroy () {
     if (typeof window === 'undefined') return
     if (this.chart) {
-      this.chart.inst.dispose()
+      this.chart.dispose()
     }
   }
 }
diff --git a/src/components/widgets/bedmesh/BedMeshChart.vue b/src/components/widgets/bedmesh/BedMeshChart.vue
index 8e6f3e72cb..5307bb3383 100644
--- a/src/components/widgets/bedmesh/BedMeshChart.vue
+++ b/src/components/widgets/bedmesh/BedMeshChart.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="chart" :style="{ 'height': height }">
-    <ECharts
+    <v-chart
       ref="chart"
       :option="opts"
-      :setOptionOps="{ notMerge: false }"
-      :initOpts="{ renderer: 'canvas' }"
+      :update-options="{ notMerge: false }"
+      :init-options="{ renderer: 'canvas' }"
     >
-    </ECharts>
+    </v-chart>
 
     <!-- <pre>legends: {{ opts.legend }}</pre> -->
 
@@ -15,7 +15,7 @@
 </template>
 
 <script lang='ts'>
-import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
+import { Vue, Component, Prop, Watch, Ref } from 'vue-property-decorator'
 import { ECharts } from 'echarts'
 import { merge } from 'lodash'
 
@@ -30,10 +30,8 @@ export default class EChartsBedMesh extends Vue {
   @Prop({ type: String, default: '100%' })
   height!: string;
 
-  get chart () {
-    const ref = this.$refs.chart as any
-    if (ref) return ref.inst as ECharts
-  }
+  @Ref('chart')
+  chart!: ECharts
 
   get flatSurface () {
     return this.$store.state.mesh.flatSurface
diff --git a/src/components/widgets/camera/CameraItem.vue b/src/components/widgets/camera/CameraItem.vue
index ffebdf42e5..3684dd380e 100644
--- a/src/components/widgets/camera/CameraItem.vue
+++ b/src/components/widgets/camera/CameraItem.vue
@@ -166,7 +166,7 @@ export default class CameraItem extends Vue {
       this.camera &&
       this.camera.type === 'mjpgadaptive'
     ) {
-      const fpsTarget = document.hasFocus() ? (this.camera.fpstarget || 10) : (this.camera.fpsidletarget || 1)
+      const fpsTarget = (!document.hasFocus() && this.camera.fpsidletarget) || this.camera.fpstarget || 10
       const end_time = performance.now()
       const current_time = end_time - this.start_time
       this.time = (this.time * this.time_smoothing) + (current_time * (1.0 - this.time_smoothing))
diff --git a/src/components/widgets/macros/Macros.vue b/src/components/widgets/macros/Macros.vue
index b21f9664d5..858874b366 100644
--- a/src/components/widgets/macros/Macros.vue
+++ b/src/components/widgets/macros/Macros.vue
@@ -82,7 +82,7 @@
               :elevation="2"
               enable-params
               class="me-2 mb-2 float-left">
-              {{ macro.name }}
+              {{ macro.alias || macro.name }}
             </app-macro-btn>
           </template>
         </v-expansion-panel-content>
diff --git a/src/components/widgets/status/StatusLabel.vue b/src/components/widgets/status/StatusLabel.vue
index b6de20d8a1..d437b4ed42 100644
--- a/src/components/widgets/status/StatusLabel.vue
+++ b/src/components/widgets/status/StatusLabel.vue
@@ -30,12 +30,8 @@ export default class AppSwitch extends Mixins(StateMixin) {
   }
 
   span.value {
-    // flex: 0 0 auto;
-    // min-width: 0;
     > span {
       display: block;
-      // white-space: nowrap;
-      text-overflow: ellipsis;
       overflow: hidden;
       text-overflow: ellipsis;
     }
diff --git a/src/components/widgets/status/StatusTab.vue b/src/components/widgets/status/StatusTab.vue
index 1d2aa9f0ac..06dd0c0f2f 100644
--- a/src/components/widgets/status/StatusTab.vue
+++ b/src/components/widgets/status/StatusTab.vue
@@ -54,7 +54,7 @@
               </status-label>
 
               <status-label :label="$t('app.general.label.file')" v-if="filename !== ''">
-                <span>{{ filename }}</span>
+                <span style="word-break: break-all">{{ filename }}</span>
               </status-label>
             </v-col>
           </v-row>
diff --git a/src/components/widgets/thermals/ThermalChart.vue b/src/components/widgets/thermals/ThermalChart.vue
index 193867f833..03cf495759 100644
--- a/src/components/widgets/thermals/ThermalChart.vue
+++ b/src/components/widgets/thermals/ThermalChart.vue
@@ -1,21 +1,21 @@
 <template>
   <div class="chart" :style="{ 'height': height }">
-    <ECharts
+    <v-chart
       ref="chart"
       style="overflow: initial;"
       :option="options"
-      :setOptionOps="{ notMerge: true }"
-      :initOpts="{ renderer: 'svg' }"
+      :update-options="{ notMerge: true }"
+      :init-options="{ renderer: 'svg' }"
       :events="[
         ['legendselectchanged', handleLegendSelectChange ]
       ]"
     >
-    </ECharts>
+    </v-chart>
   </div>
 </template>
 
 <script lang='ts'>
-import { Vue, Component, Watch, Prop } from 'vue-property-decorator'
+import { Vue, Component, Watch, Prop, Ref } from 'vue-property-decorator'
 import { ECharts } from 'echarts'
 import getKlipperType from '@/util/get-klipper-type'
 
@@ -24,6 +24,9 @@ export default class ThermalChart extends Vue {
   @Prop({ type: String, default: '100%' })
   height!: string;
 
+  @Ref('chart')
+  chart!: ECharts
+
   loading = false
   series: any[] = []
   initialSelected: any = {}
@@ -50,11 +53,6 @@ export default class ThermalChart extends Vue {
     }
   }
 
-  get chart () {
-    const ref = this.$refs.chart as any
-    if (ref) return ref.inst as ECharts
-  }
-
   get chartData () {
     return this.$store.getters['charts/getChartData']
   }
@@ -206,8 +204,8 @@ export default class ThermalChart extends Vue {
         boundaryGap: false,
         max: 'dataMax',
         min: (value: any) => {
-          const serverConfig = this.$store.getters['server/getConfig']
-          return value.max - (serverConfig.server.temperature_store_size * 1000)
+          const temperature_store_size = this.$store.getters['charts/getChartRetention']
+          return value.max - (temperature_store_size * 1000)
         },
         axisTick: {
           show: false
diff --git a/src/components/widgets/toolhead/ZHeightAdjust.vue b/src/components/widgets/toolhead/ZHeightAdjust.vue
index 3959688862..4d326c96d9 100644
--- a/src/components/widgets/toolhead/ZHeightAdjust.vue
+++ b/src/components/widgets/toolhead/ZHeightAdjust.vue
@@ -102,19 +102,15 @@ export default class ZHeightAdjust extends Mixins(StateMixin) {
     this.sendGcode(gcode, wait)
   }
 
-  get printerSettings () {
-    return this.$store.getters['printer/getPrinterSettings']()
-  }
-
-  get printerHasProbe (): boolean {
-    return 'probe' in this.printerSettings || 'bltouch' in this.printerSettings
+  get printerUsesProbeAsEndstop (): boolean {
+    return this.$store.getters['printer/getPrinterSettings']('stepper_z.endstop_pin') === 'probe:z_virtual_endstop'
   }
 
   handleZApplyDialog () {
     let msg = this.$tc('app.general.simple_form.msg.apply_z_offset_endstop')
     let gcode = 'Z_OFFSET_APPLY_ENDSTOP'
 
-    if (this.printerHasProbe) {
+    if (this.printerUsesProbeAsEndstop) {
       msg = this.$tc('app.general.simple_form.msg.apply_z_offset_probe')
       gcode = 'Z_OFFSET_APPLY_PROBE'
     }
diff --git a/src/echarts-for-vue.d.ts b/src/echarts-for-vue.d.ts
deleted file mode 100644
index 3c819d7397..0000000000
--- a/src/echarts-for-vue.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'echarts-for-vue';
diff --git a/src/main.ts b/src/main.ts
index d70baede06..424b6d0c41 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -33,11 +33,10 @@ import { FiltersPlugin } from './plugins/filters'
 import { SocketPlugin } from './plugins/socketClient'
 import { ColorSetPlugin } from './plugins/colorSet'
 import { DayJSPlugin } from './plugins/dayjs'
-import { plugin } from 'echarts-for-vue'
 
 // Import ECharts
-// import * as echarts from 'echarts'
-import * as echarts from 'echarts/core'
+import ECharts from 'vue-echarts'
+import { use as echartsUse } from 'echarts/core'
 import { LineChart } from 'echarts/charts'
 import { Grid3DComponent } from 'echarts-gl/components'
 import { SurfaceChart } from 'echarts-gl/charts'
@@ -49,7 +48,6 @@ import {
   LegendComponent,
   VisualMapComponent
 } from 'echarts/components'
-
 import { SVGRenderer, CanvasRenderer } from 'echarts/renderers'
 
 // Main App component
@@ -70,7 +68,7 @@ Vue.component('vue-headful', vueHeadful)
 // Use any Plugins
 
 // Configure echarts
-echarts.use([
+echartsUse([
   DatasetComponent,
   TooltipComponent,
   GridComponent,
@@ -83,8 +81,8 @@ echarts.use([
   SVGRenderer,
   CanvasRenderer
 ])
+Vue.component('v-chart', ECharts)
 
-Vue.use(plugin, { echarts })
 Vue.use(VueVirtualScroller)
 Vue.use(DayJSPlugin)
 Vue.use(FiltersPlugin)
diff --git a/src/store/cameras/index.ts b/src/store/cameras/index.ts
index 427da39b53..d818ec230b 100644
--- a/src/store/cameras/index.ts
+++ b/src/store/cameras/index.ts
@@ -16,6 +16,7 @@ export const defaultState = (): CamerasState => {
         name: 'Default',
         type: 'mjpgadaptive',
         fpstarget: 15,
+        fpsidletarget: 5,
         url: '/webcam/?action=stream',
         flipX: false,
         flipY: false,
diff --git a/src/store/charts/getters.ts b/src/store/charts/getters.ts
index 96599c387c..fc16991a99 100644
--- a/src/store/charts/getters.ts
+++ b/src/store/charts/getters.ts
@@ -25,12 +25,9 @@ export const getters: GetterTree<ChartState, RootState> = {
    */
   getChartRetention: (state, getters, rootState, rootGetters) => {
     const config = rootGetters['server/getConfig']
-    return (
-      'server' in config &&
-      'temperature_store_size' in config.server
-    )
-      ? config.server.temperature_store_size
-      : Globals.CHART_HISTORY_RETENTION
+    return config.data_store?.temperature_store_size ??
+      config.server?.temperature_store_size ??
+      Globals.CHART_HISTORY_RETENTION
   },
 
   /**
diff --git a/src/store/printer/actions.ts b/src/store/printer/actions.ts
index 49dd1dbfe4..0e0d09043f 100644
--- a/src/store/printer/actions.ts
+++ b/src/store/printer/actions.ts
@@ -145,9 +145,11 @@ export const actions: ActionTree<PrinterState, RootState> = {
       }
 
       // Add a temp chart entry
-      const retention = (rootState.server)
-        ? rootState.server.config.server.temperature_store_size
-        : Globals.CHART_HISTORY_RETENTION
+      const rootStateServerConfig = rootState.server?.config
+      const retention =
+        rootStateServerConfig?.data_store?.temperature_store_size ??
+        rootStateServerConfig?.server?.temperature_store_size ??
+        Globals.CHART_HISTORY_RETENTION
       handleAddChartEntry(retention, getters.getChartableSensors)
     }
   }
diff --git a/src/store/server/index.ts b/src/store/server/index.ts
index 2e1380455f..a37d041704 100644
--- a/src/store/server/index.ts
+++ b/src/store/server/index.ts
@@ -21,10 +21,7 @@ export const defaultState = (): ServerState => {
       authorization: {
         enabled: true
       },
-      server: {
-        gcode_store_size: 1000,
-        temperature_store_size: 1200
-      }
+      server: {}
     },
     moonraker_stats: [],
     throttled_state: {
diff --git a/src/store/server/types.ts b/src/store/server/types.ts
index 4feb498ac3..77ddc12ec9 100644
--- a/src/store/server/types.ts
+++ b/src/store/server/types.ts
@@ -100,6 +100,7 @@ export interface DistroVersionParts {
 export interface ServerConfig {
   authorization: ServerAuthorization;
   server: ServerConfiguration;
+  data_store?: DataStoreConfiguration;
 }
 
 export interface ServerAuthorization {
@@ -107,6 +108,11 @@ export interface ServerAuthorization {
 }
 
 export interface ServerConfiguration {
-  gcode_store_size: number;
-  temperature_store_size: number;
+  gcode_store_size?: number;
+  temperature_store_size?: number;
+}
+
+export interface DataStoreConfiguration {
+  gcode_store_size?: number;
+  temperature_store_size?: number;
 }
diff --git a/src/workers/parseGcode.worker.ts b/src/workers/parseGcode.worker.ts
index 2b6262a9ba..2f781494e7 100644
--- a/src/workers/parseGcode.worker.ts
+++ b/src/workers/parseGcode.worker.ts
@@ -1,6 +1,6 @@
-import { expose } from 'threads/worker'
+import { expose } from 'threads/dist/worker'
 import parseGcode from './parseGcode'
-import { Subject, Observable } from 'threads/observable'
+import { Subject, Observable } from 'threads/dist/observable'
 
 let progress = new Subject<number>()
 
diff --git a/vue.config.js b/vue.config.js
index b1704f532c..6fe9925253 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -44,7 +44,9 @@ module.exports = {
         file: '.version',
         content: 'v' + v + '\n'
       }),
-      new ThreadsPlugin()
+      new ThreadsPlugin({
+        globalObject: "(typeof self!='undefined'?self:this)"
+      })
       // new BundleAnalyzerPlugin({
       //   analyzerMode:
       //     (process.env.NODE_ENV === 'production') ? 'server' : 'disabled'