diff --git a/src/components/data-flash/DataFlash.vue b/src/components/data-flash/DataFlash.vue
index c6fbf3b277..80ae984f5e 100644
--- a/src/components/data-flash/DataFlash.vue
+++ b/src/components/data-flash/DataFlash.vue
@@ -20,58 +20,42 @@
 </template>
 
 <script>
-import { defineComponent } from 'vue';
+import { defineComponent } from "vue";
 export default defineComponent({
-  props: {
-    fcTotalSize: { type: Number, default: 100000 },
-    fcUsedSize: { type: Number, default: 82000 },
-  },
-  computed: {
-    supportDataflash() {
-      if (this.fcTotalSize > 0) return true;
-      else return false;
+    props: {
+        fcTotalSize: { type: Number, default: 100000 },
+        fcUsedSize: { type: Number, default: 82000 },
     },
     computed: {
-      supportDataflash() {
-        if (this.fcTotalSize > 0) return true;
-          else return false;
+        supportDataflash() {
+            return this.fcTotalSize > 0;
         },
         freeSpace() {
-          if (!this.supportDataflash) return;
-          const bytes = this.fcTotalSize - this.fcUsedSize;
-          if (this.fcUsedSize >= this.fcTotalSize) {
-              return "0B";
-          }
-          if (bytes < 1024) {
-              return `${bytes}B`;
-          }
-          const kilobytes = bytes / 1024;
-          if (kilobytes < 1024) {
-              return `${Math.round(kilobytes)}KB`;
-          }
-          const megabytes = kilobytes / 1024;
-          if (megabytes < 1024) {
-              return `${megabytes.toFixed(1)}MB`;
-          }
-          const gigabytes = megabytes / 1024;
-          return `${gigabytes.toFixed(1)}GB`;
+            if (!this.supportDataflash) {
+                return;
+            }
+            const bytes = this.fcTotalSize - this.fcUsedSize;
+            if (this.fcUsedSize >= this.fcTotalSize) {
+                return "0B";
+            }
+            if (bytes < 1024) {
+                return `${bytes}B`;
+            }
+            const kilobytes = bytes / 1024;
+            if (kilobytes < 1024) {
+                return `${Math.round(kilobytes)}KB`;
+            }
+            const megabytes = kilobytes / 1024;
+            if (megabytes < 1024) {
+                return `${megabytes.toFixed(1)}MB`;
+            }
+            const gigabytes = megabytes / 1024;
+            return `${gigabytes.toFixed(1)}GB`;
         },
         indicatorWidth() {
-          if (!this.supportDataflash) return;
-          return `${Math.min(
-            (this.fcUsedSize / this.fcTotalSize) * 100,
-            100,
-          )}%`;
-      },
-    },
-    indicatorWidth() {
-      if (!this.supportDataflash) return;
-      return `${Math.min(
-        (this.fcUsedSize / this.fcTotalSize) * 100,
-        100,
-      )}%`;
+            return this.supportDataflash ? `${Math.min((this.fcUsedSize / this.fcTotalSize) * 100, 100)}%` : "0%";
+        },
     },
-  },
 });
 </script>
 
diff --git a/src/components/init.js b/src/components/init.js
index 69ec962c2c..062ec8841d 100644
--- a/src/components/init.js
+++ b/src/components/init.js
@@ -48,7 +48,7 @@ i18next.on('initialized', function() {
 
     if (process.env.NODE_ENV === 'development') {
         console.log("Development mode enabled, installing Vue tools");
-        // Vue.config.devtools = true;
+        // TODO Vue.config.devtools = true;
         app.config.performance = true;
     }
 });
diff --git a/src/components/port-picker/PortPicker.vue b/src/components/port-picker/PortPicker.vue
index 30fc08a053..f973d5cd67 100644
--- a/src/components/port-picker/PortPicker.vue
+++ b/src/components/port-picker/PortPicker.vue
@@ -1,123 +1,96 @@
 <template>
-<<<<<<< HEAD
     <div class="web-port-picker">
         <PortOverrideOption
-            v-if="value.selectedPort === 'manual'"
-            :value="value.portOverride"
-            @input="updateValue('portOverride', $event)"
+            v-if="modelValue.selectedPort === 'manual'"
+            :model-value="modelValue.portOverride"
+            @update:modelValue="updateValue('portOverride', $event)"
         />
         <FirmwareVirtualOption
-            v-if="value.selectedPort === 'virtual' && !isConnected"
-            :value="value.virtualMspVersion"
-            @input="updateValue('virtualMspVersion', $event)"
+            v-if="modelValue.selectedPort === 'virtual' && !isConnected"
+            :model-value="modelValue.virtualMspVersion"
+            @update:modelValue="updateValue('virtualMspVersion', $event)"
         />
         <PortsInput
-            :value="value"
+            :model-value="modelValue.selectedPort"
             :connected-bluetooth-devices="connectedBluetoothDevices"
             :connected-serial-devices="connectedSerialDevices"
             :connected-usb-devices="connectedUsbDevices"
             :disabled="disabled"
             :show-virtual-option="showVirtualOption"
             :show-manual-option="showManualOption"
-            @input="updateValue(null, $event)"
+            @update:modelValue="updateValue(null, $event)"
         />
     </div>
-=======
-  <div class="web-port-picker">
-    <PortOverrideOption
-      v-if="modelValue.selectedPort === 'manual'"
-      :model-value="modelValue.portOverride"
-      @update:modelValue="updateValue('portOverride', $event)"
-    />
-    <FirmwareVirtualOption
-      v-if="modelValue.selectedPort === 'virtual' && !isConnected"
-      :model-value="modelValue.virtualMspVersion"
-      @update:modelValue="updateValue('virtualMspVersion', $event)"
-    />
-    <PortsInput
-      :model-value="modelValue.selectedPort"
-      :connected-bluetooth-devices="connectedBluetoothDevices"
-      :connected-serial-devices="connectedSerialDevices"
-      :connected-usb-devices="connectedUsbDevices"
-      :disabled="disabled"
-      :show-virtual-option="showVirtualOption"
-      :show-manual-option="showManualOption"
-      @update:modelValue="updateValue(null, $event)"
-    />
-  </div>
->>>>>>> c85044e6 (Update Vue)
 </template>
 
 <script>
-import { defineComponent } from 'vue';
-import PortOverrideOption from './PortOverrideOption.vue';
-import FirmwareVirtualOption from './FirmwareVirtualOption.vue';
-import PortsInput from './PortsInput.vue';
-import CONFIGURATOR from '../../js/data_storage';
+import { defineComponent } from "vue";
+import PortOverrideOption from "./PortOverrideOption.vue";
+import FirmwareVirtualOption from "./FirmwareVirtualOption.vue";
+import PortsInput from "./PortsInput.vue";
+import CONFIGURATOR from "../../js/data_storage";
 
 export default defineComponent({
-  components: {
-    PortOverrideOption,
-    FirmwareVirtualOption,
-    PortsInput,
-  },
-
-  props: {
-    modelValue: {
-      type: Object,
-      default: () => ({
-        selectedPort: 'noselection',
-        selectedBaud: 115200,
-        portOverride: '/dev/rfcomm0',
-        virtualMspVersion: '1.46.0',
-        autoConnect: true,
-      }),
-    },
-    connectedBluetoothDevices: {
-      type: Array,
-      default: () => [],
-    },
-    connectedSerialDevices: {
-      type: Array,
-      default: () => [],
-    },
-    connectedUsbDevices: {
-      type: Array,
-      default: () => [],
+    components: {
+        PortOverrideOption,
+        FirmwareVirtualOption,
+        PortsInput,
     },
-    showVirtualOption: {
-      type: Boolean,
-      default: true,
-    },
-    showManualOption: {
-      type: Boolean,
-      default: true,
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
+
+    props: {
+        modelValue: {
+            type: Object,
+            default: () => ({
+                selectedPort: "noselection",
+                selectedBaud: 115200,
+                portOverride: "/dev/rfcomm0",
+                virtualMspVersion: "1.46.0",
+                autoConnect: true,
+            }),
+        },
+        connectedBluetoothDevices: {
+            type: Array,
+            default: () => [],
+        },
+        connectedSerialDevices: {
+            type: Array,
+            default: () => [],
+        },
+        connectedUsbDevices: {
+            type: Array,
+            default: () => [],
+        },
+        showVirtualOption: {
+            type: Boolean,
+            default: true,
+        },
+        showManualOption: {
+            type: Boolean,
+            default: true,
+        },
+        disabled: {
+            type: Boolean,
+            default: false,
+        },
     },
-  },
 
-  emits: [
-    'update:modelValue',
-  ],
+    emits: ["update:modelValue"],
 
-  computed: {
-    isConnected() {
-      return CONFIGURATOR.connectionValid;
+    computed: {
+        isConnected() {
+            return CONFIGURATOR.connectionValid;
+        },
     },
-  },
 
-  methods: {
-    updateValue(key, value) {
-      if (key != null) {
-        this.$emit('update:modelValue', { ...this.modelValue, [key]: value });
-      } else {
-        this.$emit('update:modelValue', { ...this.modelValue, ...value});
-      }
+    methods: {
+        updateValue(key, value) {
+            if (key != null) {
+                this.$emit("update:modelValue", { ...this.modelValue, [key]: value });
+            } else {
+                this.$emit("update:modelValue", { ...this.modelValue, ...value });
+            }
+        },
     },
-  },
 });
 </script>
 
diff --git a/src/components/port-picker/PortsInput.vue b/src/components/port-picker/PortsInput.vue
index 9899a75456..d671449b82 100644
--- a/src/components/port-picker/PortsInput.vue
+++ b/src/components/port-picker/PortsInput.vue
@@ -1,95 +1,14 @@
 <template>
-  <div id="portsinput">
-    <div class="dropdown dropdown-dark">
-      <select
-        id="port"
-        :key="modelValue.selectedPort"
-        :model-value="modelValue.selectedPort"
-        :title="$t('firmwareFlasherManualPort')"
-        :disabled="disabled"
-        class="dropdown-select"
-        @change="onChangePort"
-      >
-        <option
-          value="noselection"
-          disabled
-        >
-          {{ $t("portsSelectNoSelection") }}
-        </option>
-        <option
-          v-show="showManualOption"
-          value="manual"
-        >
-          {{ $t("portsSelectManual") }}
-        </option>
-        <option
-          v-show="showVirtualOption"
-          value="virtual"
-        >
-          {{ $t("portsSelectVirtual") }}
-        </option>
-        <option
-          v-for="connectedBluetoothDevice in connectedBluetoothDevices"
-          :key="connectedBluetoothDevice.path"
-          :value="connectedBluetoothDevice.path"
-        >
-          {{ connectedBluetoothDevice.displayName }}
-        </option>
-        <option
-          v-for="connectedSerialDevice in connectedSerialDevices"
-          :key="connectedSerialDevice.path"
-          :value="connectedSerialDevice.path"
-        >
-          {{ connectedSerialDevice.displayName }}
-        </option>
-        <option
-          v-for="connectedUsbDevice in connectedUsbDevices"
-          :key="connectedUsbDevice.path"
-          :value="connectedUsbDevice.path"
-        >
-          {{ connectedUsbDevice.displayName }}
-        </option>
-        <option value="requestpermission">
-          {{ $t("portsSelectPermission") }}
-        </option>
-        <option value="requestpermissionbluetooth">
-          {{ $t("portsSelectPermissionBluetooth") }}
-        </option>
-      </select>
-    </div>
-    <div id="auto-connect-and-baud">
-      <div
-        id="auto-connect-switch"
-        :title="modelValue.autoConnect ? $t('autoConnectEnabled') : $t('autoConnectDisabled')"
-      >
-        <input
-          id="auto-connect"
-          class="auto_connect togglesmall"
-          type="checkbox"
-          :checked="modelValue.autoConnect"
-          @change="onChangeAutoConnect"
-        >
-        <span class="auto_connect">
-          {{ $t("autoConnect") }}
-        </span>
-      </div>
-      <div
-        v-if="modelValue.selectedPort !== 'virtual' && modelValue.selectedPort !== 'noselection'"
-        id="baudselect"
-      >
+    <div id="portsinput">
         <div class="dropdown dropdown-dark">
-          <select
-            id="baud"
-            class="dropdown-select"
-            :model-value="modelValue.selectedBauds"
-            :title="$t('firmwareFlasherBaudRate')"
-            :disabled="disabled"
-            @update:modelValue="updateValue('selectedBauds', $event.target.value)"
-          >
-            <option
-              v-for="baudRate in baudRates"
-              :key="baudRate.value"
-              :value="baudRate.value"
+            <select
+                id="port"
+                :key="modelValue.selectedPort"
+                :model-value="modelValue.selectedPort"
+                :title="$t('firmwareFlasherManualPort')"
+                :disabled="disabled"
+                class="dropdown-select"
+                @change="onChangePort"
             >
                 <option value="noselection" disabled>
                     {{ $t("portsSelectNoSelection") }}
@@ -132,78 +51,161 @@
         <div id="auto-connect-and-baud">
             <div
                 id="auto-connect-switch"
-                :title="value.autoConnect ? $t('autoConnectEnabled') : $t('autoConnectDisabled')"
+                :title="modelValue.autoConnect ? $t('autoConnectEnabled') : $t('autoConnectDisabled')"
             >
                 <input
                     id="auto-connect"
                     class="auto_connect togglesmall"
                     type="checkbox"
-                    :checked="value.autoConnect"
+                    :checked="modelValue.autoConnect"
                     @change="onChangeAutoConnect"
                 />
                 <span class="auto_connect">
                     {{ $t("autoConnect") }}
                 </span>
             </div>
-            <div v-if="value.selectedPort !== 'virtual' && value.selectedPort !== 'noselection'" id="baudselect">
+            <div
+                v-if="modelValue.selectedPort !== 'virtual' && modelValue.selectedPort !== 'noselection'"
+                id="baudselect"
+            >
                 <div class="dropdown dropdown-dark">
                     <select
                         id="baud"
-                        :value="value.selectedBauds"
                         class="dropdown-select"
+                        :model-value="modelValue.selectedBauds"
                         :title="$t('firmwareFlasherBaudRate')"
                         :disabled="disabled"
-                        @input="updateValue('selectedBauds', $event.target.value)"
+                        @change="updateValue('selectedBauds', $event.target.value)"
                     >
                         <option v-for="baudRate in baudRates" :key="baudRate.value" :value="baudRate.value">
                             {{ baudRate.label }}
                         </option>
+                        <option value="noselection" disabled>
+                            {{ $t("portsSelectNoSelection") }}
+                        </option>
+                        <option v-show="showManualOption" value="manual">
+                            {{ $t("portsSelectManual") }}
+                        </option>
+                        <option v-show="showVirtualOption" value="virtual">
+                            {{ $t("portsSelectVirtual") }}
+                        </option>
+                        <option
+                            v-for="connectedBluetoothDevice in connectedBluetoothDevices"
+                            :key="connectedBluetoothDevice.path"
+                            :value="connectedBluetoothDevice.path"
+                        >
+                            {{ connectedBluetoothDevice.displayName }}
+                        </option>
+                        <option
+                            v-for="connectedSerialDevice in connectedSerialDevices"
+                            :key="connectedSerialDevice.path"
+                            :value="connectedSerialDevice.path"
+                        >
+                            {{ connectedSerialDevice.displayName }}
+                        </option>
+                        <option
+                            v-for="connectedUsbDevice in connectedUsbDevices"
+                            :key="connectedUsbDevice.path"
+                            :value="connectedUsbDevice.path"
+                        >
+                            {{ connectedUsbDevice.displayName }}
+                        </option>
+                        <option value="requestpermission">
+                            {{ $t("portsSelectPermission") }}
+                        </option>
+                        <option value="requestpermissionbluetooth">
+                            {{ $t("portsSelectPermissionBluetooth") }}
+                        </option>
                     </select>
                 </div>
             </div>
         </div>
     </div>
-  </div>
 </template>
 
 <script>
-import { defineComponent } from 'vue';
-import { set as setConfig } from '../../js/ConfigStorage';
-import { EventBus } from '../eventBus';
+import { defineComponent } from "vue";
+import { set as setConfig } from "../../js/ConfigStorage";
+import { EventBus } from "../eventBus";
 
 export default defineComponent({
-  props: {
-    modelValue: {
-      type: Object,
-      default: () => ({
-        selectedPort: 'noselection',
-        selectedBauds: 115200,
-        autoConnect: true,
-      }),
-    },
-    data() {
-        return {
-            showVirtual: false,
-            baudRates: [
-                { value: "1000000", label: "1000000" },
-                { value: "500000", label: "500000" },
-                { value: "250000", label: "250000" },
-                { value: "115200", label: "115200" },
-                { value: "57600", label: "57600" },
-                { value: "38400", label: "38400" },
-                { value: "28800", label: "28800" },
-                { value: "19200", label: "19200" },
-                { value: "14400", label: "14400" },
-                { value: "9600", label: "9600" },
-                { value: "4800", label: "4800" },
-                { value: "2400", label: "2400" },
-                { value: "1200", label: "1200" },
-            ],
-        };
+    props: {
+        modelValue: {
+            type: Object,
+            default: () => ({
+                selectedPort: "noselection",
+                selectedBauds: 115200,
+                autoConnect: true,
+            }),
+        },
+        data() {
+            return {
+                showVirtual: false,
+                baudRates: [
+                    { value: "1000000", label: "1000000" },
+                    { value: "500000", label: "500000" },
+                    { value: "250000", label: "250000" },
+                    { value: "115200", label: "115200" },
+                    { value: "57600", label: "57600" },
+                    { value: "38400", label: "38400" },
+                    { value: "28800", label: "28800" },
+                    { value: "19200", label: "19200" },
+                    { value: "14400", label: "14400" },
+                    { value: "9600", label: "9600" },
+                    { value: "4800", label: "4800" },
+                    { value: "2400", label: "2400" },
+                    { value: "1200", label: "1200" },
+                ],
+            };
+        },
+        methods: {
+            updateValue(key, value) {
+                this.$emit("input", { ...this.value, [key]: value });
+            },
+            onChangePort(event) {
+                if (event.target.value === "requestpermission") {
+                    EventBus.$emit("ports-input:request-permission");
+                } else if (event.target.value === "requestpermissionbluetooth") {
+                    EventBus.$emit("ports-input:request-permission-bluetooth");
+                } else {
+                    EventBus.$emit("ports-input:change", event.target.value);
+                }
+                this.updateValue("selectedPort", event.target.value);
+            },
+            onChangeAutoConnect(event) {
+                setConfig({ autoConnect: event.target.checked });
+                this.updateValue("autoConnect", event.target.checked);
+                return event;
+            },
+        },
+        connectedBluetoothDevices: {
+            type: Array,
+            default: () => [],
+        },
+        disabled: {
+            type: Boolean,
+            default: false,
+        },
+        showVirtualOption: {
+            type: Boolean,
+            default: true,
+        },
+        showManualOption: {
+            type: Boolean,
+            default: true,
+        },
     },
+
+    emits: [
+        "update:modelValue",
+        "ports-input:request-permission",
+        "ports-input:request-permission-bluetooth",
+        "ports-input:change",
+    ],
+
     methods: {
         updateValue(key, value) {
-            this.$emit("input", { ...this.value, [key]: value });
+            this.$emit("update:modelValue", { ...this.modelValue, [key]: value });
         },
         onChangePort(event) {
             if (event.target.value === "requestpermission") {
@@ -221,72 +223,5 @@ export default defineComponent({
             return event;
         },
     },
-    connectedBluetoothDevices: {
-      type: Array,
-      default: () => [],
-    },
-    disabled: {
-        type: Boolean,
-        default: false,
-    },
-    showVirtualOption: {
-      type: Boolean,
-      default: true,
-    },
-    showManualOption: {
-      type: Boolean,
-      default: true,
-    },
-  },
-
-  emits: [
-    'update:modelValue',
-    'ports-input:request-permission',
-    'ports-input:request-permission-bluetooth',
-    'ports-input:change',
-  ],
-
-  data() {
-    return {
-      showVirtual: false,
-      baudRates: [
-        { value: '1000000', label: '1000000' },
-        { value: '500000', label: '500000' },
-        { value: '250000', label: '250000' },
-        { value: '115200', label: '115200' },
-        { value: '57600', label: '57600' },
-        { value: '38400', label: '38400' },
-        { value: '28800', label: '28800' },
-        { value: '19200', label: '19200' },
-        { value: '14400', label: '14400' },
-        { value: '9600', label: '9600' },
-        { value: '4800', label: '4800' },
-        { value: '2400', label: '2400' },
-        { value: '1200', label: '1200' },
-      ],
-    };
-  },
-
-  methods: {
-    updateValue(key, value) {
-      this.$emit('update:modelValue', { ...this.modelValue, [key]: value });
-    },
-    onChangePort(event) {
-      if (event.target.value === 'requestpermission') {
-        EventBus.$emit('ports-input:request-permission');
-      } else if (event.target.value === 'requestpermissionbluetooth') {
-        EventBus.$emit('ports-input:request-permission-bluetooth');
-      } else {
-        EventBus.$emit('ports-input:change', event.target.value);
-      }
-      this.updateValue('selectedPort', event.target.value);
-    },
-    onChangeAutoConnect(event) {
-      setConfig({'autoConnect': event.target.checked});
-      this.updateValue('autoConnect', event.target.checked);
-      return event;
-    },
-  },
 });
-
 </script>
diff --git a/src/components/status-bar/StatusBar.vue b/src/components/status-bar/StatusBar.vue
index 3943d6e893..a5a202591c 100644
--- a/src/components/status-bar/StatusBar.vue
+++ b/src/components/status-bar/StatusBar.vue
@@ -1,11 +1,10 @@
 <template>
-<<<<<<< HEAD
     <div id="status-bar">
         <PortUtilization :usage-down="portUsageDown" :usage-up="portUsageUp" />
-        <ReadingStat message="statusbar_packet_error" :value="packetError" />
-        <ReadingStat message="statusbar_i2c_error" :value="i2cError" />
-        <ReadingStat message="statusbar_cycle_time" :value="cycleTime" />
-        <ReadingStat message="statusbar_cpu_load" :value="cpuLoad" unit="%" />
+        <ReadingStat message="statusbar_packet_error" :model-value="packetError" />
+        <ReadingStat message="statusbar_i2c_error" :model-value="i2cError" />
+        <ReadingStat message="statusbar_cycle_time" :model-value="cycleTime" />
+        <ReadingStat message="statusbar_cpu_load" :model-value="cpuLoad" unit="%" />
         <StatusBarVersion
             :configurator-version="configuratorVersion"
             :firmware-version="firmwareVersion"
@@ -13,105 +12,62 @@
             :hardware-id="hardwareId"
         />
     </div>
-=======
-  <div id="status-bar">
-    <PortUtilization
-      :usage-down="portUsageDown"
-      :usage-up="portUsageUp"
-    />
-    <ReadingStat
-      message="statusbar_packet_error"
-      :model-value="packetError"
-    />
-    <ReadingStat
-      message="statusbar_i2c_error"
-      :model-value="i2cError"
-    />
-    <ReadingStat
-      message="statusbar_cycle_time"
-      :model-value="cycleTime"
-    />
-    <ReadingStat
-      message="statusbar_cpu_load"
-      :model-value="cpuLoad"
-      unit="%"
-    />
-    <StatusBarVersion
-      :configurator-version="configuratorVersion"
-      :firmware-version="firmwareVersion"
-      :firmware-id="firmwareId"
-      :hardware-id="hardwareId"
-    />
-  </div>
->>>>>>> c85044e6 (Update Vue)
 </template>
 
 <script>
-import { defineComponent } from 'vue';
+import { defineComponent } from "vue";
 import StatusBarVersion from "./StatusBarVersion.vue";
 import ReadingStat from "./ReadingStat.vue";
 import PortUtilization from "./PortUtilization.vue";
 
 export default defineComponent({
-  components: {
-    PortUtilization,
-    ReadingStat,
-    StatusBarVersion,
-  },
-  props: {
-    portUsageDown: {
-      type: Number,
-      default: 0,
+    components: {
+        PortUtilization,
+        ReadingStat,
+        StatusBarVersion,
     },
-    portUsageUp: {
-      type: Number,
-      default: 0,
+    props: {
+        portUsageDown: {
+            type: Number,
+            default: 0,
+        },
+        portUsageUp: {
+            type: Number,
+            default: 0,
+        },
+        packetError: {
+            type: Number,
+            default: 0,
+        },
+        i2cError: {
+            type: Number,
+            default: 0,
+        },
+        cycleTime: {
+            type: Number,
+            default: 0,
+        },
+        cpuLoad: {
+            type: Number,
+            default: 0,
+        },
+        configuratorVersion: {
+            type: String,
+            default: "",
+        },
+        firmwareVersion: {
+            type: String,
+            default: "",
+        },
+        firmwareId: {
+            type: String,
+            default: "",
+        },
+        hardwareId: {
+            type: String,
+            default: "",
+        },
     },
-    packetError: {
-      type: Number,
-      default: 0,
-    },
-    i2cError: {
-      type: Number,
-      default: 0,
-    },
-    cycleTime: {
-      type: Number,
-      default: 0,
-    },
-    cpuLoad: {
-      type: Number,
-      default: 0,
-    },
-    configuratorVersion: {
-        type: String,
-        default: "",
-    },
-    firmwareVersion: {
-        type: String,
-        default: "",
-    },
-    firmwareId: {
-        type: String,
-        default: "",
-    },
-    hardwareId: {
-        type: String,
-        default: "",
-    },
-    firmwareVersion: {
-      type: String,
-      default: "",
-    },
-    firmwareId: {
-      type: String,
-      default: "",
-    },
-    hardwareId: {
-      type: String,
-      default: "",
-    },
-  },
 });
 </script>
 
diff --git a/yarn.lock b/yarn.lock
index 8dcff7f4ce..296b80b499 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4370,9 +4370,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 bare-events@^2.2.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.1.tgz#052a96e3fc0e87cd9f226199d7f8a80cd87b6d21"
-  integrity sha512-Bw2PgKSrZ3uCuSV9WQ998c/GTJTd+9bWj97n7aDQMP8dP/exAZQlJeswPty0ISy+HZD+9Ex+C7CCnc9Q5QJFmQ==
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.5.3.tgz#899d7e4b2598a7978ef7ca315ce67eff0a16a727"
+  integrity sha512-pCO3aoRJ0MBiRMu8B7vUga0qL3L7gO1+SW7ku6qlSsMLwuhaawnuvZDyzJY/kyC63Un0XAB0OPUcfF1eTO/V+Q==
 
 base64-js@^1.0.2, base64-js@^1.3.1, base64-js@^1.5.1:
   version "1.5.1"
@@ -6692,9 +6692,9 @@ ejs@^3.1.6:
     jake "^10.8.5"
 
 electron-to-chromium@^1.5.73:
-  version "1.5.76"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz#db20295c5061b68f07c8ea4dfcbd701485d94a3d"
-  integrity sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==
+  version "1.5.78"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.78.tgz#223cdc76a5d15ac731136e68430e92cb8d612d13"
+  integrity sha512-UmwIt7HRKN1rsJfddG5UG7rCTCTAKoS9JeOy/R0zSenAyaZ8SU3RuXlwcratxhdxGRNpk03iq8O7BA3W7ibLVw==
 
 elementtree@^0.1.7:
   version "0.1.7"
@@ -7525,15 +7525,15 @@ fast-glob@^2.2.6:
     micromatch "^3.1.10"
 
 fast-glob@^3.0.3, fast-glob@^3.2.2, fast-glob@^3.2.9, fast-glob@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
-  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
+  integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
     glob-parent "^5.1.2"
     merge2 "^1.3.0"
-    micromatch "^4.0.4"
+    micromatch "^4.0.8"
 
 fast-json-parse@^1.0.3:
   version "1.0.3"
@@ -7556,9 +7556,9 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fast-uri@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.3.tgz#892a1c91802d5d7860de728f18608a0573142241"
-  integrity sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.5.tgz#19f5f9691d0dab9b85861a7bb5d98fca961da9cd"
+  integrity sha512-5JnBCWpFlMo0a3ciDy/JckMzzv1U9coZrIhedq+HXxxUfDTAiS0LA8OKVao4G9BxmCVck/jtA5r3KAtRWEyD8Q==
 
 fastparse@^1.1.2:
   version "1.1.2"
@@ -11162,7 +11162,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.5, micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -13392,9 +13392,9 @@ read@1, read@~1.0.1:
     util-deprecate "^1.0.1"
 
 readable-stream@^4.0.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.6.0.tgz#ce412dfb19c04efde1c5936d99c27f37a1ff94c9"
-  integrity sha512-cbAdYt0VcnpN2Bekq7PU+k363ZRsPwJoEEJOEtSJQlJXzwaxt3FIo/uL+KeDSGIjJqtkwyge4KQgD2S2kd+CQw==
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.7.0.tgz#cedbd8a1146c13dfff8dab14068028d58c15ac91"
+  integrity sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==
   dependencies:
     abort-controller "^3.0.0"
     buffer "^6.0.3"
@@ -14099,9 +14099,9 @@ sane@^4.0.3:
     walker "~1.0.5"
 
 sass@^1.18.0:
-  version "1.83.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.0.tgz#e36842c0b88a94ed336fd16249b878a0541d536f"
-  integrity sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==
+  version "1.83.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.1.tgz#dee1ab94b47a6f9993d3195d36f556bcbda64846"
+  integrity sha512-EVJbDaEs4Rr3F0glJzFSOvtg2/oy2V/YrGFPqPY24UqcLDWcI9ZY5sN+qyO3c/QCZwzgfirvhXvINiJCE/OLcA==
   dependencies:
     chokidar "^4.0.0"
     immutable "^5.0.2"
@@ -17210,11 +17210,6 @@ yargs@^7.1.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.1"
 
-yarn.lock@^0.0.1-security:
-  version "0.0.1-security"
-  resolved "https://registry.yarnpkg.com/yarn.lock/-/yarn.lock-0.0.1-security.tgz#8e7117924bfe916671b21f14212ba1bb49dfe0c7"
-  integrity sha512-ZRX6v5zGCJMI1T2aO+BQxJggy1vvorXEwonQhWXIC+brO7lkDB3zWelVNAti183ddH6FmJP8z4UDCJnJlioK4Q==
-
 yarn@^1.22.22:
   version "1.22.22"
   resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.22.tgz#ac34549e6aa8e7ead463a7407e1c7390f61a6610"