diff --git a/komodo/rro_overlays/UwbOverlay/Android.bp b/komodo/rro_overlays/UwbOverlay/Android.bp
new file mode 100644
index 00000000..c0d723f7
--- /dev/null
+++ b/komodo/rro_overlays/UwbOverlay/Android.bp
@@ -0,0 +1,18 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "//device/google/caimito:device_google_caimito_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "//device/google/caimito:device_google_caimito_license",
+    ],
+}
+
+runtime_resource_overlay {
+    name: "UwbOverlayKM4",
+    theme: "UwbOverlayKM4",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/komodo/rro_overlays/UwbOverlay/AndroidManifest.xml b/komodo/rro_overlays/UwbOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..57dfd5b7
--- /dev/null
+++ b/komodo/rro_overlays/UwbOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- Pixel specific uwb overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.uwb.resources.pixel"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.uwb.resources"
+      android:targetName="UwbCustomization"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/komodo/rro_overlays/UwbOverlay/OWNERS b/komodo/rro_overlays/UwbOverlay/OWNERS
new file mode 100644
index 00000000..2395d7f0
--- /dev/null
+++ b/komodo/rro_overlays/UwbOverlay/OWNERS
@@ -0,0 +1,3 @@
+# People who can approve changes for submission
+include platform/packages/modules/Uwb:/OWNERS
+victorliu@google.com
diff --git a/komodo/rro_overlays/UwbOverlay/res/values/config.xml b/komodo/rro_overlays/UwbOverlay/res/values/config.xml
new file mode 100644
index 00000000..bf8d2640
--- /dev/null
+++ b/komodo/rro_overlays/UwbOverlay/res/values/config.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources>
+    <!-- When true, the filter engine will alter UWB values to improve accuracy. -->
+    <bool name="enable_filters">true</bool>
+
+    <!-- Enables the AoA conversion primer. This is needed on hardware that does not convert AoA
+    to spherical coordinates, including hardware that does not support elevation.-->
+    <bool name="enable_primer_aoa">true</bool>
+
+    <!-- Whether background ranging is enabled or not
+     If enabled:
+       * Background 3p apps are allowed to open new ranging sessions
+       * When previously foreground 3p apps moves to background, sessions are not terminated
+    -->
+    <bool name = "background_ranging_enabled">true</bool>
+</resources>
diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json
index 44cde33e..54949e4d 100644
--- a/thermal/thermal_info_config_caiman.json
+++ b/thermal/thermal_info_config_caiman.json
@@ -118,8 +118,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.302, 0.138, 0.034, 0.055, 0.061, 0.028, 0.183, 0.022, 0.183],
-            "Offset": -730.0,
+            "Coefficient": [0.285, 0.066, 0.04, 0.004, 0.21, 0.048, 0.231, 0.094, 0.023],
+            "Offset": -736.0,
             "Multiplier": 0.001
         },
         {
@@ -129,8 +129,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.065, 0.056, 0.02, 0.256, 0.048, 0.084, 0.262, 0.011, 0.265],
-            "Offset": -1713.0,
+            "Coefficient": [0.141, 0.208, 0.002, 0.086, 0.25, 0.024, 0.162, 0.015, 0.112],
+            "Offset": -520.0,
             "Multiplier": 0.001
         },
         {
@@ -140,40 +140,18 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.074, 0.014, 0.005, 0.164, 0.377, 0.059, 0.119, 0.053, 0.135],
-            "Offset": -458.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-SUB-3",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.184, 0.014, 0.01, 0.112, 0.197, 0.012, 0.14, 0.181, 0.15],
-            "Offset": -607.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-SUB-4",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.284, 0.274, 0.064, 0.099, 0.166, 0.045, 0.027, 0.019, 0.023],
-            "Offset": -2856.0,
+            "Coefficient": [0.283, 0.004, 0.01, 0.136, 0.039, 0.091, 0.276, 0.038, 0.123],
+            "Offset": -436.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LEGACY",
             "Type": "UNKNOWN",
-            "Version":"3.1",
+            "Version":"4.0",
             "VirtualSensor": true,
             "Formula": "MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0],
+            "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2"],
+            "Coefficient": [1.0, 1.0, 1.0],
             "Multiplier": 0.001
         },
         {
@@ -256,10 +234,10 @@
             "VirtualSensor": true,
             "Formula": "USE_LINEAR_MODEL",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.076, 0.018, 0.019, 0.006, 0.062, 0.027, 0.029, 0.013, 0.039,
-                            0.087, 0.018, 0.08, 0.037, 0.037, 0.003, 0.056, 0.081, 0.029,
-                            0.081, 0.022, 0.019, 0.067, 0.001, 0.071, 0.004, 0.014, 0.006],
-            "Offset": -636.0,
+            "Coefficient": [0.073, 0.001, 0.029, 0.08, 0.072, 0.034, 0.004, 0.036, 0.04,
+                            0.055, 0.002, 0.029, 0.061, 0.072, 0.011, 0.04, 0.027, 0.072,
+                            0.071, 0.003, 0.026, 0.03, 0.04, 0.015, 0.001, 0.035, 0.042],
+            "Offset": -490.0,
             "Multiplier": 0.001
         },
         {
@@ -269,21 +247,34 @@
             "VirtualSensor": true,
             "Formula": "USE_LINEAR_MODEL",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.008, 0.007, 0.004, 0.065, 0.044, 0.022, 0.092, 0.029, 0.069,
-                            0.035, 0.002, 0.035, 0.02, 0.057, 0.047, 0.09, 0.006, 0.042,
-                            0.072, 0.004, 0.027, 0.071, 0.037, 0.023, 0.077, 0.021, 0.021],
-            "Offset": 244.0,
+            "Coefficient": [0.077, 0.089, 0.003, 0.077, 0.002, 0.021, 0.07, 0.035, 0.044,
+                            0.094, 0.001, 0.001, 0.001, 0.084, 0.034, 0.022, 0.081, 0.026,
+                            0.083, 0.022, 0.012, 0.051, 0.017, 0.021, 0.003, 0.024, 0.009],
+            "Offset": -961.0,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-LINEAR-SUB-2",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "USE_LINEAR_MODEL",
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.094, 0.007, 0.011, 0.032, 0.001, 0.091, 0.085, 0.045, 0.002,
+                            0.054, 0.0, 0.019, 0.01, 0.065, 0.012, 0.03, 0.022, 0.076,
+                            0.062, 0.019, 0.007, 0.025, 0.071, 0.005, 0.081, 0.015, 0.058],
+            "Offset": -440.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LINEAR",
             "Type": "UNKNOWN",
-            "Version": "Patch_1.1",
+            "Version": "Patch_2.0",
             "VirtualSensor": true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula": "MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1"],
-            "Coefficient": [1.0, 1.0],
+            "Combination": ["VIRTUAL-SKIN-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1", "VIRTUAL-SKIN-LINEAR-SUB-2"],
+            "Coefficient": [1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
@@ -666,8 +657,19 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.96],
-            "Offset": 3450.0,
+            "Coefficient": [0.202, 0.003, 0.056, 0.109, 0.069, 0.02, 0.242, 0.051, 0.249],
+            "Offset": -825.0,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-SPEAKER-SUB-1",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.007, 0.001, 0.058, 0.002, 0.13, 0.083, 0.301, 0.04, 0.378],
+            "Offset": -658.0,
             "Multiplier": 0.001
         },
         {
@@ -677,8 +679,8 @@
             "VirtualSensor":true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0"],
-            "Coefficient":[1.0],
+            "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"],
+            "Coefficient":[1.0, 1.0],
             "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "Multiplier":0.001,
@@ -693,30 +695,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.29, 0.17, 0.0, 0.22, 0.0, 0.0, 0.21, 0.05, 0.01],
-            "Offset": 1740.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-FRONT-SUB-1",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.29, 0.21, 0.0, 0.16, 0.0, 0.0, 0.17, 0.05, 0.07],
-            "Offset": 1430.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-FRONT-SUB-2",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.29, 0.19, 0.0, 0.23, 0.0, 0.0, 0.17, 0.05, 0.0],
-            "Offset": 2310.0,
+            "Coefficient": [0.304, 0.093, 0.059, 0.023, 0.005, 0.08, 0.117, 0.005, 0.314],
+            "Offset": -432.0,
             "Multiplier": 0.001
         },
         {
@@ -726,8 +706,8 @@
             "VirtualSensor":true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"],
-            "Coefficient": [1.0, 1.0, 1.0],
+            "Combination": ["VIRTUAL-SKIN-FRONT-SUB-0"],
+            "Coefficient": [1.0],
             "Multiplier":0.001
         },
         {
@@ -737,8 +717,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.134, 0.074, 0.004, 0.003, 0.323, 0.017, 0.355, 0.064, 0.027],
-            "Offset": -490.0,
+            "Coefficient": [0.149, 0.023, 0.113, 0.012, 0.196, 0.052, 0.209, 0.076, 0.169],
+            "Offset": -473.0,
             "Multiplier": 0.001
         },
         {
@@ -748,8 +728,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.229, 0.085, 0.081, 0.31, 0.023, 0.221, 0.048, 0.002, 0.002],
-            "Offset": -2201.0,
+            "Coefficient": [0.237, 0.013, 0.026, 0.038, 0.219, 0.117, 0.03, 0.091, 0.228],
+            "Offset": -493.0,
             "Multiplier": 0.001
         },
         {
@@ -759,8 +739,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.063, 0.005, 0.08, 0.018, 0.232, 0.052, 0.239, 0.069, 0.242],
-            "Offset": -457.0,
+            "Coefficient": [0.139, 0.01, 0.018, 0.252, 0.153, 0.077, 0.281, 0.049, 0.02],
+            "Offset": -353.0,
             "Multiplier": 0.001
         },
         {
@@ -770,10 +750,20 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.074, 0.014, 0.005, 0.164, 0.377, 0.059, 0.119, 0.053, 0.135],
-            "Offset": -458.0,
+            "Coefficient": [0.179, 0.183, 0.041, 0.026, 0.205, 0.068, 0.202, 0.038, 0.058],
+            "Offset": -1651.0,
             "Multiplier": 0.001
         },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE",
+            "Type":"UNKNOWN",
+            "Version":"7.0",
+            "VirtualSensor":true,
+            "Formula":"MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0],
+            "Multiplier":0.001
+        },
         {
             "Name":"thb_hda",
             "Type":"UNKNOWN",
@@ -789,16 +779,6 @@
             "Coefficient":[-1],
             "Multiplier":1
         },
-        {
-            "Name":"VIRTUAL-SKIN-CHARGE",
-            "Type":"UNKNOWN",
-            "Version":"6.0",
-            "VirtualSensor":true,
-            "Formula":"MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0],
-            "Multiplier":0.001
-        },
         {
             "Name":"VIRTUAL-SKIN-CHARGE-WIRED",
             "Type":"UNKNOWN",
@@ -1047,14 +1027,6 @@
                     "Name": "VIRTUAL-SKIN-SUB-2",
                     "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
-                {
-                    "Name": "VIRTUAL-SKIN-SUB-3",
-                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
-                },
-                {
-                    "Name": "VIRTUAL-SKIN-SUB-4",
-                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
-                },
                 {
                     "Name": "VIRTUAL-SKIN",
                     "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json
index 92cb973c..647f240b 100644
--- a/thermal/thermal_info_config_charge_caiman.json
+++ b/thermal/thermal_info_config_charge_caiman.json
@@ -84,8 +84,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.134, 0.074, 0.004, 0.003, 0.323, 0.017, 0.355, 0.064, 0.027],
-            "Offset": -490.0,
+            "Coefficient": [0.149, 0.023, 0.113, 0.012, 0.196, 0.052, 0.209, 0.076, 0.169],
+            "Offset": -473.0,
             "Multiplier": 0.001
         },
         {
@@ -95,8 +95,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.229, 0.085, 0.081, 0.31, 0.023, 0.221, 0.048, 0.002, 0.002],
-            "Offset": -2201.0,
+            "Coefficient": [0.237, 0.013, 0.026, 0.038, 0.219, 0.117, 0.03, 0.091, 0.228],
+            "Offset": -493.0,
             "Multiplier": 0.001
         },
         {
@@ -106,8 +106,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.063, 0.005, 0.08, 0.018, 0.232, 0.052, 0.239, 0.069, 0.242],
-            "Offset": -457.0,
+            "Coefficient": [0.139, 0.01, 0.018, 0.252, 0.153, 0.077, 0.281, 0.049, 0.02],
+            "Offset": -353.0,
             "Multiplier": 0.001
         },
         {
@@ -117,10 +117,20 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.074, 0.014, 0.005, 0.164, 0.377, 0.059, 0.119, 0.053, 0.135],
-            "Offset": -458.0,
+            "Coefficient": [0.179, 0.183, 0.041, 0.026, 0.205, 0.068, 0.202, 0.038, 0.058],
+            "Offset": -1651.0,
             "Multiplier": 0.001
         },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE",
+            "Type":"UNKNOWN",
+            "Version":"7.0",
+            "VirtualSensor":true,
+            "Formula":"MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0],
+            "Multiplier":0.001
+        },
         {
             "Name":"thb_hda",
             "Type":"UNKNOWN",
@@ -136,16 +146,6 @@
             "Coefficient":[-1],
             "Multiplier":1
         },
-        {
-            "Name":"VIRTUAL-SKIN-CHARGE",
-            "Type":"UNKNOWN",
-            "Version":"6.0",
-            "VirtualSensor":true,
-            "Formula":"MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0],
-            "Multiplier":0.001
-        },
         {
             "Name":"VIRTUAL-SKIN-CHARGE-WIRED",
             "Type":"UNKNOWN",
diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json
index 9ceec2d6..43e12c1a 100644
--- a/thermal/thermal_info_config_charge_komodo.json
+++ b/thermal/thermal_info_config_charge_komodo.json
@@ -84,8 +84,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.039, 0.001, 0.02, 0.107, 0.212, 0.2, 0.17, 0.05, 0.2],
-            "Offset": -428.0,
+            "Coefficient": [0.009, 0.008, 0.1, 0.105, 0.07, 0.079, 0.328, 0.032, 0.296],
+            "Offset": -1102.0,
             "Multiplier": 0.001
         },
         {
@@ -95,8 +95,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.196, 0.009, 0.087, 0.046, 0.094, 0.007, 0.082, 0.302, 0.178],
-            "Offset": -2404.0,
+            "Coefficient": [0.08, 0.008, 0.007, 0.225, 0.273, 0.291, 0.084, 0.018, 0.015],
+            "Offset": -577.0,
             "Multiplier": 0.001
         },
         {
@@ -106,8 +106,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.101, 0.005, 0.11, 0.09, 0.239, 0.016, 0.192, 0.024, 0.231],
-            "Offset": -442.0,
+            "Coefficient": [0.151, 0.124, 0.004, 0.053, 0.036, 0.105, 0.222, 0.287, 0.016],
+            "Offset": -1713.0,
             "Multiplier": 0.001
         },
         {
@@ -117,31 +117,19 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.239, 0.019, 0.022, 0.059, 0.139, 0.015, 0.138, 0.203, 0.165],
-            "Offset": -442.0,
+            "Coefficient": [0.327, 0.124, 0.0, 0.164, 0.116, 0.019, 0.026, 0.146, 0.078],
+            "Offset": -740.0,
             "Multiplier": 0.001
         },
         {
-            "Name": "VIRTUAL-SKIN-CHARGE-SUB-4",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.334, 0.096, 0.021, 0.029, 0.028, 0.093, 0.165, 0.117, 0.116],
-            "Offset": -1119.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-CHARGE-SUB-5",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.109, 0.038, 0.016, 0.024, 0.065, 0.028, 0.297, 0.048, 0.438],
-            "Offset": -2069.0,
-            "Multiplier": 0.001
+            "Name":"VIRTUAL-SKIN-CHARGE",
+            "Type":"UNKNOWN",
+            "Version":"8.0",
+            "VirtualSensor":true,
+            "Formula":"MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0],
+            "Multiplier":0.001
         },
         {
             "Name":"thb_hda",
@@ -158,16 +146,6 @@
             "Coefficient":[-1],
             "Multiplier":1
         },
-        {
-            "Name":"VIRTUAL-SKIN-CHARGE",
-            "Type":"UNKNOWN",
-            "Version":"7.0",
-            "VirtualSensor":true,
-            "Formula":"MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
-            "Multiplier":0.001
-        },
         {
             "Name":"VIRTUAL-SKIN-CHARGE-WIRED",
             "Type":"UNKNOWN",
diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json
index 6e7f06fa..ab492166 100644
--- a/thermal/thermal_info_config_charge_tokay.json
+++ b/thermal/thermal_info_config_charge_tokay.json
@@ -84,8 +84,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.118, 0.12, 0.017, 0.36, 0.058, 0.111, 0.065, 0.032, 0.191],
-            "Offset": -2299.0,
+            "Coefficient": [0.091, 0.142, 0.014, 0.199, 0.064, 0.181, 0.156, 0.055, 0.176],
+            "Offset": -3139.0,
             "Multiplier": 0.001
         },
         {
@@ -95,8 +95,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.11, 0.026, 0.137, 0.254, 0.148, 0.246, 0.008, 0.0, 0.071],
-            "Offset": -1249.0,
+            "Coefficient": [0.003, 0.052, 0.032, 0.115, 0.18, 0.198, 0.005, 0.186, 0.229],
+            "Offset": -1664.0,
             "Multiplier": 0.001
         },
         {
@@ -106,8 +106,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.128, 0.0, 0.019, 0.181, 0.069, 0.107, 0.121, 0.027, 0.347],
-            "Offset": -69.0,
+            "Coefficient": [0.01, 0.011, 0.075, 0.252, 0.028, 0.268, 0.133, 0.047, 0.176],
+            "Offset": -36.0,
             "Multiplier": 0.001
         },
         {
@@ -117,8 +117,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.368, 0.012, 0.047, 0.01, 0.011, 0.358, 0.072, 0.034, 0.089],
-            "Offset": -4638.0,
+            "Coefficient": [0.165, 0.137, 0.031, 0.012, 0.228, 0.314, 0.023, 0.015, 0.075],
+            "Offset": -2975.0,
             "Multiplier": 0.001
         },
         {
@@ -128,8 +128,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.003, 0.03, 0.003, 0.262, 0.008, 0.292, 0.041, 0.217, 0.144],
-            "Offset": -1952.0,
+            "Coefficient": [0.069, 0.116, 0.018, 0.166, 0.222, 0.198, 0.061, 0.004, 0.144],
+            "Offset": -183.0,
             "Multiplier": 0.001
         },
         {
@@ -139,10 +139,20 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.196, 0.153, 0.006, 0.166, 0.215, 0.18, 0.023, 0.026, 0.035],
-            "Offset": -2083.0,
+            "Coefficient": [0.073, 0.009, 0.217, 0.239, 0.033, 0.233, 0.01, 0.066, 0.12],
+            "Offset": -1714.0,
             "Multiplier": 0.001
         },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE",
+            "Type":"UNKNOWN",
+            "Version":"8.0",
+            "VirtualSensor":true,
+            "Formula":"MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+            "Multiplier":0.001
+        },
         {
             "Name":"thb_hda",
             "Type":"UNKNOWN",
@@ -158,16 +168,6 @@
             "Coefficient":[-1],
             "Multiplier":1
         },
-        {
-            "Name":"VIRTUAL-SKIN-CHARGE",
-            "Type":"UNKNOWN",
-            "Version":"7.0",
-            "VirtualSensor":true,
-            "Formula":"MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
-            "Multiplier":0.001
-        },
         {
             "Name":"VIRTUAL-SKIN-CHARGE-WIRED",
             "Type":"UNKNOWN",
diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json
index 64b81829..8c1a0cca 100644
--- a/thermal/thermal_info_config_komodo.json
+++ b/thermal/thermal_info_config_komodo.json
@@ -118,8 +118,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.209, 0.077, 0.013, 0.209, 0.108, 0.028, 0.082, 0.238, 0.036],
-            "Offset": -555.0,
+            "Coefficient": [0.004, 0.071, 0.01, 0.088, 0.239, 0.014, 0.252, 0.083, 0.277],
+            "Offset": -1528.0,
             "Multiplier": 0.001
         },
         {
@@ -129,8 +129,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.009, 0.117, 0.052, 0.092, 0.123, 0.127, 0.052, 0.287, 0.139],
-            "Offset": -2505.0,
+            "Coefficient": [0.08, 0.008, 0.007, 0.225, 0.273, 0.291, 0.084, 0.018, 0.015],
+            "Offset": -577.0,
             "Multiplier": 0.001
         },
         {
@@ -140,8 +140,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.099, 0.012, 0.075, 0.354, 0.004, 0.01, 0.195, 0.007, 0.286],
-            "Offset": -1431.0,
+            "Coefficient": [0.334, 0.04, 0.045, 0.014, 0.071, 0.054, 0.048, 0.303, 0.091],
+            "Offset": -2403.0,
             "Multiplier": 0.001
         },
         {
@@ -151,8 +151,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.356, 0.054, 0.061, 0.089, 0.014, 0.074, 0.055, 0.206, 0.089],
-            "Offset": -2142.0,
+            "Coefficient": [0.024, 0.02, 0.013, 0.327, 0.056, 0.005, 0.241, 0.038, 0.277],
+            "Offset": -627.0,
             "Multiplier": 0.001
         },
         {
@@ -162,40 +162,18 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.151, 0.046, 0.014, 0.092, 0.013, 0.019, 0.127, 0.3, 0.238],
-            "Offset": -880.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-SUB-5",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.101, 0.005, 0.11, 0.09, 0.239, 0.016, 0.192, 0.024, 0.231],
-            "Offset": -442.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-SUB-6",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.109, 0.038, 0.016, 0.024, 0.065, 0.028, 0.297, 0.048, 0.438],
-            "Offset": -2069.0,
+            "Coefficient": [0.327, 0.124, 0.0, 0.164, 0.116, 0.019, 0.026, 0.146, 0.078],
+            "Offset": -740.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LEGACY",
             "Type": "UNKNOWN",
-            "Version":"7.1",
+            "Version":"4.0",
             "VirtualSensor": true,
             "Formula": "MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+            "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier": 0.001
         },
         {
@@ -279,10 +257,10 @@
             "VirtualSensor": true,
             "Formula": "USE_LINEAR_MODEL",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.061, 0.055, 0.036, 0.005, 0.01, 0.007, 0.031, 0.068, 0.029,
-                            0.047, 0.028, 0.026, 0.056, 0.076, 0.075, 0.003, 0.071, 0.003,
-                            0.016, 0.007, 0.017, 0.048, 0.049, 0.034, 0.022, 0.076, 0.042],
-            "Offset": -2440.0,
+            "Coefficient": [0.1, 0.055, 0.004, 0.027, 0.062, 0.025, 0.04, 0.05, 0.037,
+                            0.077, 0.001, 0.007, 0.015, 0.025, 0.016, 0.019, 0.09, 0.045,
+                            0.072, 0.044, 0.015, 0.029, 0.043, 0.001, 0.002, 0.059, 0.039],
+            "Offset": -168.0,
             "Multiplier": 0.001
         },
         {
@@ -292,47 +270,21 @@
             "VirtualSensor": true,
             "Formula": "USE_LINEAR_MODEL",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.086, 0.018, 0.022, 0.086, 0.012, 0.02, 0.034, 0.017, 0.016,
-                            0.007, 0.02, 0.008, 0.085, 0.047, 0.045, 0.081, 0.002, 0.044,
-                            0.012, 0.04, 0.01, 0.077, 0.058, 0.011, 0.061, 0.021, 0.086],
-            "Offset": -686.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-2",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "USE_LINEAR_MODEL",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.065, 0.004, 0.017, 0.064, 0.058, 0.005, 0.08, 0.048, 0.032,
-                            0.08, 0.006, 0.002, 0.05, 0.05, 0.045, 0.01, 0.069, 0.006,
-                            0.074, 0.031, 0.002, 0.017, 0.036, 0.004, 0.07, 0.06, 0.016],
+            "Coefficient": [0.046, 0.006, 0.012, 0.033, 0.068, 0.029, 0.033, 0.061, 0.047,
+                            0.039, 0.042, 0.005, 0.031, 0.05, 0.008, 0.024, 0.014, 0.044,
+                            0.054, 0.029, 0.003, 0.068, 0.067, 0.028, 0.066, 0.039, 0.055],
             "Offset": -76.0,
             "Multiplier": 0.001
         },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-3",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "USE_LINEAR_MODEL",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.036, 0.009, 0.005, 0.045, 0.067, 0.044, 0.019, 0.063, 0.015,
-                            0.046, 0.001, 0.009, 0.03, 0.016, 0.004, 0.011, 0.088, 0.017,
-                            0.07, 0.023, 0.008, 0.081, 0.091, 0.046, 0.026, 0.06, 0.071],
-            "Offset": -514.0,
-            "Multiplier": 0.001
-        },
         {
             "Name": "VIRTUAL-SKIN-LINEAR",
             "Type": "UNKNOWN",
-            "Version": "Patch_1.1",
+            "Version": "Patch_2.0",
             "VirtualSensor": true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula": "MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1", "VIRTUAL-SKIN-LINEAR-SUB-2", "VIRTUAL-SKIN-LINEAR-SUB-3"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0],
+            "Combination": ["VIRTUAL-SKIN-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1"],
+            "Coefficient": [1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
@@ -715,14 +667,14 @@
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.17, 0.01, 0.04, 0.0, 0.0, 0.01, 0.22, 0.0, 0.58],
-            "Offset": -1210.0,
+            "Coefficient": [0.218, 0.091, 0.007, 0.24, 0.138, 0.046, 0.052, 0.003, 0.204],
+            "Offset": -1059.0,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN-SPEAKER",
             "Type":"UNKNOWN",
-            "Version":"4.0",
+            "Version":"5.0",
             "VirtualSensor":true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"MAXIMUM",
@@ -742,19 +694,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.19, 0.0, 0.0, 0.38, 0.08, 0.25, 0.0, 0.02, 0.0],
-            "Offset": 3110.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-FRONT-SUB-1",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.2, 0.0, 0.0, 0.4, 0.0, 0.3, 0.0, 0.03, 0.0],
-            "Offset": 2510.0,
+            "Coefficient": [0.214, 0.019, 0.007, 0.005, 0.082, 0.16, 0.279, 0.012, 0.222],
+            "Offset": 560.0,
             "Multiplier": 0.001
         },
         {
@@ -764,8 +705,8 @@
             "VirtualSensor":true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1"],
-            "Coefficient":[1.0, 1.0],
+            "Combination":["VIRTUAL-SKIN-FRONT-SUB-0"],
+            "Coefficient":[1.0],
             "Multiplier":0.001
         },
         {
@@ -775,8 +716,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.039, 0.001, 0.02, 0.107, 0.212, 0.2, 0.17, 0.05, 0.2],
-            "Offset": -428.0,
+            "Coefficient": [0.009, 0.008, 0.1, 0.105, 0.07, 0.079, 0.328, 0.032, 0.296],
+            "Offset": -1102.0,
             "Multiplier": 0.001
         },
         {
@@ -786,8 +727,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.196, 0.009, 0.087, 0.046, 0.094, 0.007, 0.082, 0.302, 0.178],
-            "Offset": -2404.0,
+            "Coefficient": [0.08, 0.008, 0.007, 0.225, 0.273, 0.291, 0.084, 0.018, 0.015],
+            "Offset": -577.0,
             "Multiplier": 0.001
         },
         {
@@ -797,8 +738,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.101, 0.005, 0.11, 0.09, 0.239, 0.016, 0.192, 0.024, 0.231],
-            "Offset": -442.0,
+            "Coefficient": [0.151, 0.124, 0.004, 0.053, 0.036, 0.105, 0.222, 0.287, 0.016],
+            "Offset": -1713.0,
             "Multiplier": 0.001
         },
         {
@@ -808,31 +749,19 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.239, 0.019, 0.022, 0.059, 0.139, 0.015, 0.138, 0.203, 0.165],
-            "Offset": -442.0,
+            "Coefficient": [0.327, 0.124, 0.0, 0.164, 0.116, 0.019, 0.026, 0.146, 0.078],
+            "Offset": -740.0,
             "Multiplier": 0.001
         },
         {
-            "Name": "VIRTUAL-SKIN-CHARGE-SUB-4",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.334, 0.096, 0.021, 0.029, 0.028, 0.093, 0.165, 0.117, 0.116],
-            "Offset": -1119.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-CHARGE-SUB-5",
-            "Type": "UNKNOWN",
-            "Hidden": true,
-            "VirtualSensor": true,
-            "Formula": "WEIGHTED_AVG",
-            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.109, 0.038, 0.016, 0.024, 0.065, 0.028, 0.297, 0.048, 0.438],
-            "Offset": -2069.0,
-            "Multiplier": 0.001
+            "Name":"VIRTUAL-SKIN-CHARGE",
+            "Type":"UNKNOWN",
+            "Version":"8.0",
+            "VirtualSensor":true,
+            "Formula":"MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0],
+            "Multiplier":0.001
         },
         {
             "Name":"thb_hda",
@@ -849,16 +778,6 @@
             "Coefficient":[-1],
             "Multiplier":1
         },
-        {
-            "Name":"VIRTUAL-SKIN-CHARGE",
-            "Type":"UNKNOWN",
-            "Version":"7.0",
-            "VirtualSensor":true,
-            "Formula":"MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
-            "Multiplier":0.001
-        },
         {
             "Name":"VIRTUAL-SKIN-CHARGE-WIRED",
             "Type":"UNKNOWN",
@@ -1115,14 +1034,6 @@
                     "Name": "VIRTUAL-SKIN-SUB-4",
                     "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
                 },
-                {
-                    "Name": "VIRTUAL-SKIN-SUB-5",
-                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
-                },
-                {
-                    "Name": "VIRTUAL-SKIN-SUB-6",
-                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
-                },
                 {
                     "Name": "VIRTUAL-SKIN",
                     "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]
diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json
index e670d745..85304155 100644
--- a/thermal/thermal_info_config_tokay.json
+++ b/thermal/thermal_info_config_tokay.json
@@ -108,8 +108,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.286, 0.142, 0.033, 0.255, 0.012, 0.169, 0.062, 0.021, 0.02],
-            "Offset": -1373.0,
+            "Coefficient": [0.266, 0.146, 0.012, 0.054, 0.016, 0.222, 0.2, 0.006, 0.078],
+            "Offset": -1233.0,
             "Multiplier": 0.001
         },
         {
@@ -119,8 +119,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.118, 0.12, 0.017, 0.36, 0.058, 0.111, 0.065, 0.032, 0.191],
-            "Offset": -2299.0,
+            "Coefficient": [0.181, 0.063, 0.028, 0.171, 0.041, 0.052, 0.317, 0.021, 0.252],
+            "Offset": -3069.0,
             "Multiplier": 0.001
         },
         {
@@ -130,14 +130,14 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.044, 0.041, 0.013, 0.307, 0.074, 0.059, 0.209, 0.062, 0.274],
-            "Offset": -2328.0,
+            "Coefficient": [0.079, 0.105, 0.028, 0.314, 0.036, 0.046, 0.293, 0.057, 0.157],
+            "Offset": -2961.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LEGACY",
             "Type": "UNKNOWN",
-            "Version":"7.1",
+            "Version": "4.0",
             "VirtualSensor": true,
             "Formula": "MAXIMUM",
             "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2"],
@@ -224,10 +224,10 @@
             "VirtualSensor": true,
             "Formula": "USE_LINEAR_MODEL",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.038, 0.015, 0.005, 0.044, 0.04, 0.035, 0.069, 0.007, 0.037,
-                            0.077, 0.016, 0.01, 0.003, 0.033, 0.02, 0.042, 0.002, 0.053,
-                            0.06, 0.088, 0.007, 0.058, 0.062, 0.086, 0.041, 0.011, 0.067],
-            "Offset": -1117.0,
+            "Coefficient": [0.076, 0.087, 0.016, 0.067, 0.01, 0.029, 0.06, 0.023, 0.009,
+                            0.061, 0.034, 0.034, 0.067, 0.046, 0.068, 0.033, 0.001, 0.079,
+                            0.043, 0.006, 0.005, 0.026, 0.033, 0.015, 0.062, 0.009, 0.03],
+            "Offset": -1087.0,
             "Multiplier": 0.001
         },
         {
@@ -237,10 +237,10 @@
             "VirtualSensor": true,
             "Formula": "USE_LINEAR_MODEL",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.003, 0.03, 0.015, 0.087, 0.087, 0.002, 0.01, 0.018, 0.09,
-                            0.071, 0.032, 0.004, 0.078, 0.009, 0.029, 0.064, 0.017, 0.049,
-                            0.068, 0.06, 0.017, 0.073, 0.029, 0.025, 0.057, 0.026, 0.014],
-            "Offset": -2136.0,
+            "Coefficient": [0.077, 0.003, 0.012, 0.085, 0.021, 0.02, 0.004, 0.028, 0.099,
+                            0.023, 0.049, 0.018, 0.082, 0.008, 0.066, 0.065, 0.02, 0.006,
+                            0.048, 0.033, 0.009, 0.085, 0.018, 0.019, 0.05, 0.005, 0.073],
+            "Offset": -127.0,
             "Multiplier": 0.001
         },
         {
@@ -250,16 +250,16 @@
             "VirtualSensor": true,
             "Formula": "USE_LINEAR_MODEL",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.004, 0.033, 0.041, 0.039, 0.003, 0.017, 0.049, 0.02, 0.052,
-                            0.071, 0.007, 0.012, 0.057, 0.064, 0.008, 0.045, 0.0, 0.069,
-                            0.066, 0.052, 0.02, 0.041, 0.047, 0.067, 0.036, 0.011, 0.068],
-            "Offset": -119.0,
+            "Coefficient": [0.067, 0.036, 0.02, 0.001, 0.02, 0.041, 0.011, 0.0, 0.08,
+                            0.054, 0.041, 0.017, 0.019, 0.041, 0.074, 0.069, 0.004, 0.044,
+                            0.077, 0.006, 0.012, 0.077, 0.043, 0.071, 0.055, 0.011, 0.009],
+            "Offset": -333.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LINEAR",
             "Type": "UNKNOWN",
-            "Version": "Patch_1.1",
+            "Version": "Patch_2.0",
             "VirtualSensor": true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula": "MAXIMUM",
@@ -647,8 +647,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.1, 0.01, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.97],
-            "Offset": 70.0,
+            "Coefficient": [0.285, 0.07, 0.012, 0.04, 0.138, 0.097, 0.242, 0.014, 0.103],
+            "Offset": -2525.0,
             "Multiplier": 0.001
         },
         {
@@ -658,14 +658,14 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.17, 0.0, 0.92],
-            "Offset": 910.0,
+            "Coefficient": [0.226, 0.066, 0.0, 0.018, 0.054, 0.244, 0.198, 0.017, 0.176],
+            "Offset": -2889.0,
             "Multiplier": 0.001
         },
         {
             "Name":"VIRTUAL-SKIN-SPEAKER",
             "Type":"UNKNOWN",
-            "Version":"3.0",
+            "Version":"4.0",
             "VirtualSensor":true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"MAXIMUM",
@@ -685,8 +685,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.0, 0.12, 0.0, 0.42, 0.0, 0.29, 0.08, 0.0, 0.01],
-            "Offset": 3760.0,
+            "Coefficient": [0.037, 0.144, 0.017, 0.254, 0.173, 0.191, 0.146, 0.067, 0.066],
+            "Offset": -4318.0,
             "Multiplier": 0.001
         },
         {
@@ -696,8 +696,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.0, 0.15, 0.0, 0.5, 0.0, 0.25, 0.08, 0.0, 0.01],
-            "Offset": 1320.0,
+            "Coefficient": [0.164, 0.052, 0.003, 0.341, 0.037, 0.042, 0.333, 0.024, 0.004],
+            "Offset": 1717.0,
             "Multiplier": 0.001
         },
         {
@@ -707,8 +707,30 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.0, 0.14, 0.0, 0.5, 0.0, 0.26, 0.09, 0.0, 0.0],
-            "Offset": 1370.0,
+            "Coefficient": [0.16, 0.053, 0.191, 0.057, 0.312, 0.124, 0.045, 0.019, 0.039],
+            "Offset": -3022.0,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-FRONT-SUB-3",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.228, 0.144, 0.003, 0.096, 0.002, 0.22, 0.189, 0.002, 0.116],
+            "Offset": -769.0,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-FRONT-SUB-4",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.068, 0.11, 0.007, 0.368, 0.176, 0.142, 0.092, 0.001, 0.035],
+            "Offset": 929.0,
             "Multiplier": 0.001
         },
         {
@@ -718,8 +740,8 @@
             "VirtualSensor":true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"],
-            "Coefficient":[1.0, 1.0, 1.0],
+            "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2", "VIRTUAL-SKIN-FRONT-SUB-3", "VIRTUAL-SKIN-FRONT-SUB-4"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
         {
@@ -729,8 +751,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.118, 0.12, 0.017, 0.36, 0.058, 0.111, 0.065, 0.032, 0.191],
-            "Offset": -2299.0,
+            "Coefficient": [0.091, 0.142, 0.014, 0.199, 0.064, 0.181, 0.156, 0.055, 0.176],
+            "Offset": -3139.0,
             "Multiplier": 0.001
         },
         {
@@ -740,8 +762,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.11, 0.026, 0.137, 0.254, 0.148, 0.246, 0.008, 0.0, 0.071],
-            "Offset": -1249.0,
+            "Coefficient": [0.003, 0.052, 0.032, 0.115, 0.18, 0.198, 0.005, 0.186, 0.229],
+            "Offset": -1664.0,
             "Multiplier": 0.001
         },
         {
@@ -751,8 +773,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.128, 0.0, 0.019, 0.181, 0.069, 0.107, 0.121, 0.027, 0.347],
-            "Offset": -69.0,
+            "Coefficient": [0.01, 0.011, 0.075, 0.252, 0.028, 0.268, 0.133, 0.047, 0.176],
+            "Offset": -36.0,
             "Multiplier": 0.001
         },
         {
@@ -762,8 +784,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.368, 0.012, 0.047, 0.01, 0.011, 0.358, 0.072, 0.034, 0.089],
-            "Offset": -4638.0,
+            "Coefficient": [0.165, 0.137, 0.031, 0.012, 0.228, 0.314, 0.023, 0.015, 0.075],
+            "Offset": -2975.0,
             "Multiplier": 0.001
         },
         {
@@ -773,8 +795,8 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.003, 0.03, 0.003, 0.262, 0.008, 0.292, 0.041, 0.217, 0.144],
-            "Offset": -1952.0,
+            "Coefficient": [0.069, 0.116, 0.018, 0.166, 0.222, 0.198, 0.061, 0.004, 0.144],
+            "Offset": -183.0,
             "Multiplier": 0.001
         },
         {
@@ -784,10 +806,20 @@
             "VirtualSensor": true,
             "Formula": "WEIGHTED_AVG",
             "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
-            "Coefficient": [0.196, 0.153, 0.006, 0.166, 0.215, 0.18, 0.023, 0.026, 0.035],
-            "Offset": -2083.0,
+            "Coefficient": [0.073, 0.009, 0.217, 0.239, 0.033, 0.233, 0.01, 0.066, 0.12],
+            "Offset": -1714.0,
             "Multiplier": 0.001
         },
+        {
+            "Name":"VIRTUAL-SKIN-CHARGE",
+            "Type":"UNKNOWN",
+            "Version":"8.0",
+            "VirtualSensor":true,
+            "Formula":"MAXIMUM",
+            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+            "Multiplier":0.001
+        },
         {
             "Name":"thb_hda",
             "Type":"UNKNOWN",
@@ -803,16 +835,6 @@
             "Coefficient":[-1],
             "Multiplier":1
         },
-        {
-            "Name":"VIRTUAL-SKIN-CHARGE",
-            "Type":"UNKNOWN",
-            "Version":"7.0",
-            "VirtualSensor":true,
-            "Formula":"MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
-            "Multiplier":0.001
-        },
         {
             "Name":"VIRTUAL-SKIN-CHARGE-WIRED",
             "Type":"UNKNOWN",