diff --git a/audio/caiman/tuning/waves/waves_preset.mps b/audio/caiman/tuning/waves/waves_preset.mps
index 8b937baa..94336b1a 100644
Binary files a/audio/caiman/tuning/waves/waves_preset.mps and b/audio/caiman/tuning/waves/waves_preset.mps differ
diff --git a/audio/komodo/tuning/waves/waves_preset.mps b/audio/komodo/tuning/waves/waves_preset.mps
index c335a34d..e17838d8 100644
Binary files a/audio/komodo/tuning/waves/waves_preset.mps and b/audio/komodo/tuning/waves/waves_preset.mps differ
diff --git a/audio/tokay/tuning/waves/waves_preset.mps b/audio/tokay/tuning/waves/waves_preset.mps
index 8b937baa..94336b1a 100644
Binary files a/audio/tokay/tuning/waves/waves_preset.mps and b/audio/tokay/tuning/waves/waves_preset.mps differ
diff --git a/caiman/overlay_packages/SettingsCaimanOverlay/res/drawable/regulatory_info_gec77_cn.png b/caiman/overlay_packages/SettingsCaimanOverlay/res/drawable/regulatory_info_gec77_cn.png
new file mode 100644
index 00000000..a7e41c18
Binary files /dev/null and b/caiman/overlay_packages/SettingsCaimanOverlay/res/drawable/regulatory_info_gec77_cn.png differ
diff --git a/komodo/overlay_packages/SettingsKomodoOverlay/res/drawable/regulatory_info_gzc4k_cn.png b/komodo/overlay_packages/SettingsKomodoOverlay/res/drawable/regulatory_info_gzc4k_cn.png
new file mode 100644
index 00000000..85b62430
Binary files /dev/null and b/komodo/overlay_packages/SettingsKomodoOverlay/res/drawable/regulatory_info_gzc4k_cn.png differ
diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index 07c53e20..b6288c1d 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -3043,9 +3043,9 @@
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CPUDVFSHeadroom",
+      "Node": "AutoPreferIdle",
       "Duration": 0,
-      "Value": "1280"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3063,7 +3063,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "42"
+      "Value": "55"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3075,7 +3075,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3107,6 +3107,18 @@
       "Duration": 0,
       "Value": "cam2"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CDPreferHighCap",
@@ -3115,13 +3127,13 @@
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CDPreferIdle",
+      "Node": "TAPreferHighCap",
       "Duration": 0,
       "Value": "0"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
-      "Node": "TAPreferHighCap",
+      "Node": "TAPreferIdle",
       "Duration": 0,
       "Value": "0"
     },
@@ -3153,7 +3165,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CDCpuset",
       "Duration": 0,
-      "Value": "0-7"
+      "Value": "0-6"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3167,6 +3179,12 @@
       "Duration": 0,
       "Value": "camera"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUSkipMask",
+      "Duration": 0,
+      "Value": "0x80"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "MIFTargetLoad",
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index 349da779..8640dabf 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -3043,9 +3043,9 @@
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CPUDVFSHeadroom",
+      "Node": "AutoPreferIdle",
       "Duration": 0,
-      "Value": "1280"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3063,7 +3063,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "42"
+      "Value": "55"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3075,7 +3075,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3107,6 +3107,18 @@
       "Duration": 0,
       "Value": "cam2"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CDPreferHighCap",
@@ -3115,13 +3127,13 @@
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CDPreferIdle",
+      "Node": "TAPreferHighCap",
       "Duration": 0,
       "Value": "0"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
-      "Node": "TAPreferHighCap",
+      "Node": "TAPreferIdle",
       "Duration": 0,
       "Value": "0"
     },
@@ -3153,7 +3165,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CDCpuset",
       "Duration": 0,
-      "Value": "0-7"
+      "Value": "0-6"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3167,6 +3179,12 @@
       "Duration": 0,
       "Value": "camera"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUSkipMask",
+      "Duration": 0,
+      "Value": "0x80"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "MIFTargetLoad",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 07c53e20..b6288c1d 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -3043,9 +3043,9 @@
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CPUDVFSHeadroom",
+      "Node": "AutoPreferIdle",
       "Duration": 0,
-      "Value": "1280"
+      "Value": "0"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3063,7 +3063,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "42"
+      "Value": "55"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3075,7 +3075,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3107,6 +3107,18 @@
       "Duration": 0,
       "Value": "cam2"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1100 1024 1100"
+    },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1100"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CDPreferHighCap",
@@ -3115,13 +3127,13 @@
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
-      "Node": "CDPreferIdle",
+      "Node": "TAPreferHighCap",
       "Duration": 0,
       "Value": "0"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
-      "Node": "TAPreferHighCap",
+      "Node": "TAPreferIdle",
       "Duration": 0,
       "Value": "0"
     },
@@ -3153,7 +3165,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "CDCpuset",
       "Duration": 0,
-      "Value": "0-7"
+      "Value": "0-6"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3167,6 +3179,12 @@
       "Duration": 0,
       "Value": "camera"
     },
+    {
+      "PowerHint": "CAMERA_PROJECT11",
+      "Node": "CPUSkipMask",
+      "Duration": 0,
+      "Value": "0x80"
+    },
     {
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "MIFTargetLoad",
diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json
index faa729d7..faa6bd2c 100644
--- a/thermal/thermal_info_config_caiman.json
+++ b/thermal/thermal_info_config_caiman.json
@@ -117,9 +117,9 @@
             "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.064, 0.35, 0.045, 0.34, 0.052, 0.174, 0.026, 0.023, 0.058],
-            "Offset": -8712.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.081, 0.271, 0.104, 0.08, 0.227, 0.149, 0.028, 0.213],
+            "Offset": -9479.0,
             "Multiplier": 0.001
         },
         {
@@ -128,9 +128,9 @@
             "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.244, 0.195, 0.043, 0.117, 0.194, 0.095, 0.001, 0.042],
-            "Offset": -3915.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.105, 0.247, 0.047, 0.003, 0.249, 0.173, 0.003, 0.173],
+            "Offset": -2433.0,
             "Multiplier": 0.001
         },
         {
@@ -139,9 +139,9 @@
             "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.004, 0.172, 0.011, 0.211, 0.115, 0.174, 0.167, 0.006, 0.14],
-            "Offset": -793.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.216, 0.027, 0.106, 0.062, 0.028, 0.064, 0.15, 0.356],
+            "Offset": -918.0,
             "Multiplier": 0.001
         },
         {
@@ -150,9 +150,9 @@
             "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.1, 0.103, 0.103, 0.097, 0.096, 0.102, 0.097, 0.1, 0.097],
-            "Offset": 2235.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.075, 0.204, 0.007, 0.134, 0.219, 0.171, 0.001, 0.189],
+            "Offset": -1095.0,
             "Multiplier": 0.001
         },
         {
@@ -161,9 +161,9 @@
             "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.03, 0.101, 0.009, 0.233, 0.047, 0.013, 0.398, 0.021, 0.147],
-            "Offset": -532.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.088, 0.126, 0.218, 0.059, 0.352, 0.14, 0.003, 0.015],
+            "Offset": -3760.0,
             "Multiplier": 0.001
         },
         {
@@ -172,9 +172,9 @@
             "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.022, 0.007, 0.126, 0.078, 0.205, 0.011, 0.232, 0.103, 0.215],
-            "Offset": -470.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.111, 0.115, 0.114, 0.108, 0.113, 0.108, 0.112, 0.108],
+            "Offset": 2290.0,
             "Multiplier": 0.001
         },
         {
@@ -183,30 +183,19 @@
             "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.293, 0.006, 0.001, 0.15, 0.098, 0.013, 0.158, 0.107, 0.183],
-            "Offset": -856.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-SUB-7",
-            "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.032, 0.038, 0.011, 0.219, 0.028, 0.0, 0.207, 0.312, 0.153],
-            "Offset": -2876.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.326, 0.008, 0.002, 0.323, 0.001, 0.309, 0.013, 0.019],
+            "Offset": -645.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LEGACY",
             "Type": "UNKNOWN",
-            "Version":"5.0",
+            "Version":"5.1",
             "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", "VIRTUAL-SKIN-SUB-7"],
-            "Coefficient": [1.0, 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", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier": 0.001
         },
         {
@@ -308,7 +297,8 @@
             "Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
             "CoefficientType": ["SENSOR", "SENSOR"],
             "Multiplier": 1,
-            "StepRatio": 0.4
+            "StepRatio": 0.4,
+            "PassiveDelay": 7000
         },
         {
             "Name": "VIRTUAL-SKIN-LSTM-MODEL",
@@ -363,64 +353,6 @@
                 }
             ]
         },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-0",
-            "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.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],
-            "OffsetThresholds": [0.0],
-            "OffsetValues": [-490.0],
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-1",
-            "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.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],
-            "OffsetThresholds": [0.0],
-            "OffsetValues": [-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],
-            "OffsetThresholds": [0.0],
-            "OffsetValues": [-440.0],
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR",
-            "Type": "UNKNOWN",
-            "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"],
-            "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,
-            "SendPowerHint":true,
-            "PollingDelay":300000,
-            "PassiveDelay":7000
-        },
         {
             "Name":"VIRTUAL-SKIN-HINT",
             "Type":"UNKNOWN",
@@ -829,15 +761,15 @@
             "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.082, 0.09, 0.029, 0.02, 0.048, 0.009, 0.334, 0.044, 0.38],
-            "Offset": 2582.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.025, 0.037, 0.094, 0.207, 0.035, 0.279, 0.059, 0.308],
+            "Offset": 2426.0,
             "Multiplier": 0.001
         },
         {
             "Name":"VIRTUAL-SKIN-SPEAKER",
             "Type":"UNKNOWN",
-            "Version":"5.0",
+            "Version":"5.1",
             "VirtualSensor":true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"MAXIMUM",
@@ -856,9 +788,9 @@
             "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.149, 0.166, 0.226, 0.169, 0.159, 0.284, 0.05, 0.059, 0.068],
-            "Offset": -19933.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.06, 0.194, 0.242, 0.273, 0.276, 0.059, 0.14, 0.052],
+            "Offset": -18406.0,
             "Multiplier": 0.001
         },
         {
@@ -867,9 +799,9 @@
             "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.054, 0.201, 0.012, 0.117, 0.04, 0.276, 0.09, 0.046, 0.163],
-            "Offset": -2948.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.263, 0.154, 0.021, 0.032, 0.197, 0.217, 0.016, 0.1],
+            "Offset": -2192.0,
             "Multiplier": 0.001
         },
         {
@@ -878,20 +810,42 @@
             "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.25, 0.15, 0.001, 0.114, 0.134, 0.046, 0.178, 0.029, 0.099],
-            "Offset": -1010.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.178, 0.128, 0.108, 0.04, 0.287, 0.075, 0.061, 0.122],
+            "Offset": -3934.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", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.308, 0.173, 0.086, 0.097, 0.119, 0.113, 0.079, 0.026],
+            "Offset": -3534.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", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.159, 0.169, 0.009, 0.145, 0.091, 0.164, 0.043, 0.22],
+            "Offset": -775.0,
             "Multiplier": 0.001
         },
         {
             "Name":"VIRTUAL-SKIN-FRONT",
             "Type":"UNKNOWN",
-            "Version":"4.0",
+            "Version":"4.1",
             "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
         },
         {
@@ -900,9 +854,9 @@
             "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.064, 0.35, 0.045, 0.34, 0.052, 0.174, 0.026, 0.023, 0.058],
-            "Offset": -8712.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.081, 0.271, 0.104, 0.08, 0.227, 0.149, 0.028, 0.213],
+            "Offset": -9479.0,
             "Multiplier": 0.001
         },
         {
@@ -911,9 +865,9 @@
             "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.244, 0.195, 0.043, 0.117, 0.194, 0.095, 0.001, 0.042],
-            "Offset": -3915.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.088, 0.126, 0.218, 0.059, 0.352, 0.14, 0.003, 0.015],
+            "Offset": -3760.0,
             "Multiplier": 0.001
         },
         {
@@ -922,9 +876,9 @@
             "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.004, 0.172, 0.011, 0.211, 0.115, 0.174, 0.167, 0.006, 0.14],
-            "Offset": -793.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.111, 0.117, 0.118, 0.106, 0.114, 0.106, 0.113, 0.106],
+            "Offset": 2083.0,
             "Multiplier": 0.001
         },
         {
@@ -933,9 +887,9 @@
             "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.303, 0.008, 0.047, 0.327, 0.019, 0.023, 0.045, 0.101, 0.127],
-            "Offset": -1000.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.201, 0.018, 0.176, 0.014, 0.021, 0.28, 0.02, 0.269],
+            "Offset": -713.0,
             "Multiplier": 0.001
         },
         {
@@ -944,9 +898,9 @@
             "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.022, 0.007, 0.126, 0.078, 0.205, 0.011, 0.232, 0.103, 0.215],
-            "Offset": -470.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.021, 0.001, 0.091, 0.278, 0.189, 0.097, 0.027, 0.295],
+            "Offset": -634.0,
             "Multiplier": 0.001
         },
         {
@@ -955,15 +909,15 @@
             "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.047, 0.123, 0.163, 0.134, 0.023, 0.007, 0.298, 0.025, 0.179],
-            "Offset": -757.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.326, 0.008, 0.002, 0.323, 0.001, 0.309, 0.013, 0.019],
+            "Offset": -645.0,
             "Multiplier": 0.001
         },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
-            "Version":"8.0",
+            "Version":"8.1",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"MAXIMUM",
@@ -1251,6 +1205,22 @@
                     "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-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_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json
index ca4bf5f1..d491fadd 100644
--- a/thermal/thermal_info_config_charge_caiman.json
+++ b/thermal/thermal_info_config_charge_caiman.json
@@ -83,9 +83,9 @@
             "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.064, 0.35, 0.045, 0.34, 0.052, 0.174, 0.026, 0.023, 0.058],
-            "Offset": -8712.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.081, 0.271, 0.104, 0.08, 0.227, 0.149, 0.028, 0.213],
+            "Offset": -9479.0,
             "Multiplier": 0.001
         },
         {
@@ -94,9 +94,9 @@
             "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.244, 0.195, 0.043, 0.117, 0.194, 0.095, 0.001, 0.042],
-            "Offset": -3915.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.088, 0.126, 0.218, 0.059, 0.352, 0.14, 0.003, 0.015],
+            "Offset": -3760.0,
             "Multiplier": 0.001
         },
         {
@@ -105,9 +105,9 @@
             "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.004, 0.172, 0.011, 0.211, 0.115, 0.174, 0.167, 0.006, 0.14],
-            "Offset": -793.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.111, 0.117, 0.118, 0.106, 0.114, 0.106, 0.113, 0.106],
+            "Offset": 2083.0,
             "Multiplier": 0.001
         },
         {
@@ -116,9 +116,9 @@
             "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.303, 0.008, 0.047, 0.327, 0.019, 0.023, 0.045, 0.101, 0.127],
-            "Offset": -1000.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.201, 0.018, 0.176, 0.014, 0.021, 0.28, 0.02, 0.269],
+            "Offset": -713.0,
             "Multiplier": 0.001
         },
         {
@@ -127,9 +127,9 @@
             "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.022, 0.007, 0.126, 0.078, 0.205, 0.011, 0.232, 0.103, 0.215],
-            "Offset": -470.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.021, 0.001, 0.091, 0.278, 0.189, 0.097, 0.027, 0.295],
+            "Offset": -634.0,
             "Multiplier": 0.001
         },
         {
@@ -138,15 +138,15 @@
             "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.047, 0.123, 0.163, 0.134, 0.023, 0.007, 0.298, 0.025, 0.179],
-            "Offset": -757.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.326, 0.008, 0.002, 0.323, 0.001, 0.309, 0.013, 0.019],
+            "Offset": -645.0,
             "Multiplier": 0.001
         },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
-            "Version":"8.0",
+            "Version":"8.1",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"MAXIMUM",
diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json
index 73bb4556..6ae44ce1 100644
--- a/thermal/thermal_info_config_charge_komodo.json
+++ b/thermal/thermal_info_config_charge_komodo.json
@@ -83,9 +83,9 @@
             "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.071, 0.041, 0.016, 0.089, 0.188, 0.301, 0.227, 0.059, 0.008],
-            "Offset": -811.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.221, 0.009, 0.01, 0.032, 0.14, 0.069, 0.192, 0.325],
+            "Offset": -927.0,
             "Multiplier": 0.001
         },
         {
@@ -94,9 +94,9 @@
             "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.017, 0.007, 0.044, 0.35, 0.007, 0.07, 0.308, 0.01, 0.227],
-            "Offset": -1668.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.019, 0.015, 0.225, 0.08, 0.027, 0.281, 0.018, 0.334],
+            "Offset": -713.0,
             "Multiplier": 0.001
         },
         {
@@ -105,9 +105,9 @@
             "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.001, 0.05, 0.001, 0.084, 0.203, 0.023, 0.191, 0.226, 0.22],
-            "Offset": -660.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.127, 0.056, 0.01, 0.019, 0.373, 0.247, 0.013, 0.156],
+            "Offset": -877.0,
             "Multiplier": 0.001
         },
         {
@@ -116,9 +116,9 @@
             "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.181, 0.044, 0.008, 0.066, 0.008, 0.042, 0.213, 0.322, 0.115],
-            "Offset": -2297.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.018, 0.033, 0.043, 0.358, 0.034, 0.287, 0.054, 0.213],
+            "Offset": -1722.0,
             "Multiplier": 0.001
         },
         {
@@ -127,9 +127,9 @@
             "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.394, 0.022, 0.032, 0.136, 0.113, 0.069, 0.131, 0.01, 0.094],
-            "Offset": -2325.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.109, 0.015, 0.003, 0.129, 0.05, 0.282, 0.265, 0.147],
+            "Offset": -995.0,
             "Multiplier": 0.001
         },
         {
@@ -138,20 +138,31 @@
             "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.103, 0.109, 0.108, 0.099, 0.099, 0.104, 0.099, 0.104, 0.099],
-            "Offset": 1237.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.348, 0.025, 0.081, 0.086, 0.062, 0.213, 0.172, 0.013],
+            "Offset": -1998.0,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CHARGE-SUB-6",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.007, 0.038, 0.013, 0.225, 0.103, 0.09, 0.372, 0.154],
+            "Offset": -2627.0,
             "Multiplier": 0.001
         },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
-            "Version":"9.0",
+            "Version":"9.1",
             "Hidden":true,
             "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],
+            "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", "VIRTUAL-SKIN-CHARGE-SUB-6"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
         {
diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json
index 4aa17eb9..64d2197f 100644
--- a/thermal/thermal_info_config_charge_tokay.json
+++ b/thermal/thermal_info_config_charge_tokay.json
@@ -83,9 +83,9 @@
             "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.161, 0.002, 0.184, 0.098, 0.0, 0.002, 0.175, 0.131, 0.247],
-            "Offset": -1191.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.03, 0.08, 0.165, 0.164, 0.104, 0.158, 0.158, 0.14],
+            "Offset": -1068.0,
             "Multiplier": 0.001
         },
         {
@@ -94,9 +94,9 @@
             "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.115, 0.016, 0.058, 0.062, 0.125, 0.319, 0.238, 0.021, 0.045],
-            "Offset": -780.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.004, 0.24, 0.04, 0.354, 0.05, 0.09, 0.032, 0.191],
+            "Offset": -672.0,
             "Multiplier": 0.001
         },
         {
@@ -105,9 +105,9 @@
             "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.065, 0.159, 0.002, 0.179, 0.022, 0.058, 0.209, 0.177, 0.128],
-            "Offset": -643.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.033, 0.019, 0.07, 0.025, 0.396, 0.089, 0.02, 0.347],
+            "Offset": -583.0,
             "Multiplier": 0.001
         },
         {
@@ -116,42 +116,20 @@
             "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.124, 0.002, 0.007, 0.093, 0.219, 0.223, 0.088, 0.009, 0.235],
-            "Offset": 38.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.149, 0.019, 0.012, 0.231, 0.247, 0.092, 0.103, 0.066, 0.082],
-            "Offset": 11.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.011, 0.005, 0.28, 0.093, 0.362, 0.011, 0.14, 0.019, 0.08],
-            "Offset": -1881.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.003, 0.099, 0.245, 0.134, 0.11, 0.169, 0.147, 0.092],
+            "Offset": -1871.0,
             "Multiplier": 0.001
         },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
-            "Version":"9.0",
+            "Version":"9.1",
             "Hidden":true,
             "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],
+            "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
         },
         {
diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json
index bb8b9ec4..2b8915b5 100644
--- a/thermal/thermal_info_config_komodo.json
+++ b/thermal/thermal_info_config_komodo.json
@@ -117,9 +117,9 @@
             "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.071, 0.041, 0.016, 0.089, 0.188, 0.301, 0.227, 0.059, 0.008],
-            "Offset": -811.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.015, 0.039, 0.052, 0.292, 0.272, 0.21, 0.084, 0.036],
+            "Offset": -439.0,
             "Multiplier": 0.001
         },
         {
@@ -128,9 +128,9 @@
             "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.102, 0.108, 0.107, 0.099, 0.098, 0.104, 0.098, 0.103, 0.099],
-            "Offset": 1481.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.031, 0.013, 0.021, 0.073, 0.024, 0.205, 0.295, 0.339],
+            "Offset": -790.0,
             "Multiplier": 0.001
         },
         {
@@ -139,9 +139,9 @@
             "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.336, 0.016, 0.018, 0.168, 0.064, 0.004, 0.293, 0.064, 0.037],
-            "Offset": -736.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.03, 0.021, 0.041, 0.129, 0.125, 0.356, 0.023, 0.352],
+            "Offset": -2588.0,
             "Multiplier": 0.001
         },
         {
@@ -150,9 +150,9 @@
             "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.073, 0.049, 0.02, 0.268, 0.044, 0.085, 0.291, 0.041, 0.212],
-            "Offset": -2755.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.112, 0.12, 0.119, 0.108, 0.115, 0.108, 0.114, 0.108],
+            "Offset": 2059.0,
             "Multiplier": 0.001
         },
         {
@@ -161,9 +161,9 @@
             "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.242, 0.026, 0.015, 0.012, 0.167, 0.211, 0.132, 0.071, 0.125],
-            "Offset": -790.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.011, 0.048, 0.047, 0.551, 0.034, 0.257, 0.025, 0.06],
+            "Offset": -1537.0,
             "Multiplier": 0.001
         },
         {
@@ -172,30 +172,19 @@
             "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.206, 0.0, 0.039, 0.018, 0.113, 0.043, 0.156, 0.251, 0.174],
-            "Offset": -806.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.373, 0.038, 0.121, 0.07, 0.112, 0.065, 0.021, 0.175, 0.024],
-            "Offset": -3129.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.294, 0.006, 0.063, 0.048, 0.006, 0.093, 0.207, 0.282],
+            "Offset": -673.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LEGACY",
             "Type": "UNKNOWN",
-            "Version":"5.0",
+            "Version":"5.1",
             "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", "VIRTUAL-SKIN-SUB-5"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier": 0.001
         },
         {
@@ -298,7 +287,8 @@
             "Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
             "CoefficientType": ["SENSOR", "SENSOR"],
             "Multiplier": 1,
-            "StepRatio": 0.4
+            "StepRatio": 0.4,
+            "PassiveDelay": 7000
         },
         {
             "Name": "VIRTUAL-SKIN-LSTM-MODEL",
@@ -353,50 +343,6 @@
                 }
             ]
         },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-0",
-            "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.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],
-            "OffsetThresholds": [0.0],
-            "OffsetValues": [-168.0],
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-1",
-            "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.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],
-            "OffsetThresholds": [0.0],
-            "OffsetValues": [-76.0],
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR",
-            "Type": "UNKNOWN",
-            "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],
-            "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,
-            "SendPowerHint":true,
-            "PollingDelay":300000,
-            "PassiveDelay":7000
-        },
         {
             "Name":"VIRTUAL-SKIN-HINT",
             "Type":"UNKNOWN",
@@ -805,9 +751,9 @@
             "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.254, 0.037, 0.024, 0.198, 0.037, 0.001, 0.126, 0.153, 0.169],
-            "Offset": -3614.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.092, 0.099, 0.098, 0.087, 0.093, 0.087, 0.095, 0.087],
+            "Offset": 5847.0,
             "Multiplier":0.001
         },
         {
@@ -816,15 +762,15 @@
             "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.084, 0.09, 0.089, 0.079, 0.08, 0.085, 0.079, 0.087, 0.079],
-            "Offset": 5528.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.178, 0.061, 0.002, 0.029, 0.127, 0.249, 0.105, 0.249],
+            "Offset": -3446.0,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN-SPEAKER",
             "Type":"UNKNOWN",
-            "Version":"6.0",
+            "Version":"6.1",
             "VirtualSensor":true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"MAXIMUM",
@@ -843,9 +789,9 @@
             "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.094, 0.109, 0.105, 0.083, 0.089, 0.097, 0.083, 0.099, 0.083],
-            "Offset": 3671.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.176, 0.009, 0.034, 0.199, 0.02, 0.249, 0.08, 0.232],
+            "Offset": -763.0,
             "Multiplier": 0.001
         },
         {
@@ -854,9 +800,9 @@
             "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.281, 0.166, 0.001, 0.309, 0.025, 0.023, 0.021, 0.007, 0.166],
-            "Offset": -1058.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.059, 0.256, 0.002, 0.215, 0.065, 0.078, 0.2, 0.125],
+            "Offset": -3546.0,
             "Multiplier": 0.001
         },
         {
@@ -865,9 +811,42 @@
             "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.011, 0.049, 0.033, 0.281, 0.024, 0.043, 0.268, 0.089, 0.203],
-            "Offset": -469.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.222, 0.186, 0.019, 0.111, 0.076, 0.183, 0.006, 0.196],
+            "Offset": -2401.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", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.278, 0.099, 0.135, 0.004, 0.272, 0.084, 0.124, 0.004],
+            "Offset": -5273.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", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.066, 0.053, 0.016, 0.262, 0.018, 0.322, 0.067, 0.196],
+            "Offset": -169.0,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-FRONT-SUB-5",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.126, 0.113, 0.01, 0.035, 0.154, 0.244, 0.048, 0.269],
+            "Offset": -1066.0,
             "Multiplier": 0.001
         },
         {
@@ -877,8 +856,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", "VIRTUAL-SKIN-FRONT-SUB-5"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
         {
@@ -887,9 +866,9 @@
             "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.071, 0.041, 0.016, 0.089, 0.188, 0.301, 0.227, 0.059, 0.008],
-            "Offset": -811.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.221, 0.009, 0.01, 0.032, 0.14, 0.069, 0.192, 0.325],
+            "Offset": -927.0,
             "Multiplier": 0.001
         },
         {
@@ -898,9 +877,9 @@
             "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.017, 0.007, 0.044, 0.35, 0.007, 0.07, 0.308, 0.01, 0.227],
-            "Offset": -1668.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.019, 0.015, 0.225, 0.08, 0.027, 0.281, 0.018, 0.334],
+            "Offset": -713.0,
             "Multiplier": 0.001
         },
         {
@@ -909,9 +888,9 @@
             "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.001, 0.05, 0.001, 0.084, 0.203, 0.023, 0.191, 0.226, 0.22],
-            "Offset": -660.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.127, 0.056, 0.01, 0.019, 0.373, 0.247, 0.013, 0.156],
+            "Offset": -877.0,
             "Multiplier": 0.001
         },
         {
@@ -920,9 +899,9 @@
             "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.181, 0.044, 0.008, 0.066, 0.008, 0.042, 0.213, 0.322, 0.115],
-            "Offset": -2297.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.018, 0.033, 0.043, 0.358, 0.034, 0.287, 0.054, 0.213],
+            "Offset": -1722.0,
             "Multiplier": 0.001
         },
         {
@@ -931,9 +910,9 @@
             "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.394, 0.022, 0.032, 0.136, 0.113, 0.069, 0.131, 0.01, 0.094],
-            "Offset": -2325.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.109, 0.015, 0.003, 0.129, 0.05, 0.282, 0.265, 0.147],
+            "Offset": -995.0,
             "Multiplier": 0.001
         },
         {
@@ -942,9 +921,20 @@
             "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.103, 0.109, 0.108, 0.099, 0.099, 0.104, 0.099, 0.104, 0.099],
-            "Offset": 1237.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.348, 0.025, 0.081, 0.086, 0.062, 0.213, 0.172, 0.013],
+            "Offset": -1998.0,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-CHARGE-SUB-6",
+            "Type": "UNKNOWN",
+            "Hidden": true,
+            "VirtualSensor": true,
+            "Formula": "WEIGHTED_AVG",
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.007, 0.038, 0.013, 0.225, 0.103, 0.09, 0.372, 0.154],
+            "Offset": -2627.0,
             "Multiplier": 0.001
         },
         {
@@ -954,8 +944,8 @@
             "Hidden":true,
             "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],
+            "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", "VIRTUAL-SKIN-CHARGE-SUB-6"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
         {
@@ -1246,6 +1236,10 @@
                     "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",
                     "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 7392bf6b..80e5b929 100644
--- a/thermal/thermal_info_config_tokay.json
+++ b/thermal/thermal_info_config_tokay.json
@@ -107,9 +107,9 @@
             "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.002, 0.229, 0.015, 0.127, 0.181, 0.09, 0.199, 0.003, 0.155],
-            "Offset": -456.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.054, 0.279, 0.02, 0.136, 0.032, 0.261, 0.03, 0.188],
+            "Offset": -571.0,
             "Multiplier": 0.001
         },
         {
@@ -118,9 +118,9 @@
             "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.049, 0.088, 0.027, 0.067, 0.088, 0.028, 0.181, 0.223, 0.249],
-            "Offset": -463.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.051, 0.032, 0.0, 0.132, 0.0, 0.315, 0.306, 0.164],
+            "Offset": -824.0,
             "Multiplier": 0.001
         },
         {
@@ -129,9 +129,9 @@
             "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.221, 0.012, 0.036, 0.273, 0.015, 0.279, 0.126, 0.003, 0.035],
-            "Offset": -835.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.256, 0.002, 0.027, 0.243, 0.349, 0.046, 0.039, 0.038],
+            "Offset": -2167.0,
             "Multiplier": 0.001
         },
         {
@@ -140,9 +140,9 @@
             "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.131, 0.031, 0.014, 0.248, 0.263, 0.063, 0.016, 0.041, 0.234],
-            "Offset": -985.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.033, 0.176, 0.099, 0.146, 0.107, 0.161, 0.107, 0.171],
+            "Offset": -688.0,
             "Multiplier": 0.001
         },
         {
@@ -151,9 +151,9 @@
             "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.044, 0.105, 0.21, 0.02, 0.28, 0.099, 0.172, 0.07, 0.0],
-            "Offset": -2647.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.003, 0.041, 0.116, 0.351, 0.023, 0.312, 0.014, 0.141],
+            "Offset": -130.0,
             "Multiplier": 0.001
         },
         {
@@ -162,9 +162,9 @@
             "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.169, 0.028, 0.014, 0.096, 0.199, 0.17, 0.114, 0.012, 0.196],
-            "Offset": 54.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.003, 0.099, 0.245, 0.134, 0.11, 0.169, 0.147, 0.092],
+            "Offset": -1871.0,
             "Multiplier": 0.001
         },
         {
@@ -173,15 +173,15 @@
             "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.069, 0.107, 0.005, 0.176, 0.183, 0.212, 0.189, 0.037, 0.022],
-            "Offset": -25.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.11, 0.09, 0.001, 0.018, 0.292, 0.233, 0.018, 0.236],
+            "Offset": -275.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LEGACY",
             "Type": "UNKNOWN",
-            "Version": "5.0",
+            "Version": "5.1",
             "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"],
@@ -287,7 +287,8 @@
             "Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
             "CoefficientType": ["SENSOR", "SENSOR"],
             "Multiplier": 1,
-            "StepRatio": 0.4
+            "StepRatio": 0.4,
+            "PassiveDelay": 7000
         },
         {
             "Name": "VIRTUAL-SKIN-LSTM-MODEL",
@@ -342,66 +343,6 @@
                 }
             ]
         },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-0",
-            "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.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,
-            "OffsetThresholds": [0.0],
-            "OffsetValues": [-1087.0],
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-1",
-            "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.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,
-            "OffsetThresholds": [0.0],
-            "OffsetValues": [-127.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.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],
-            "OffsetThresholds": [0.0],
-            "OffsetValues": [-333.0],
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR",
-            "Type": "UNKNOWN",
-            "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"],
-            "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,
-            "SendPowerHint":true,
-            "PollingDelay":300000,
-            "PassiveDelay":7000
-        },
         {
             "Name":"VIRTUAL-SKIN-HINT",
             "Type":"UNKNOWN",
@@ -810,15 +751,15 @@
             "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.036, 0.143, 0.015, 0.19, 0.03, 0.164, 0.268, 0.008, 0.147],
-            "Offset": -471.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.053, 0.167, 0.006, 0.216, 0.116, 0.219, 0.01, 0.213],
+            "Offset": -369.0,
             "Multiplier": 0.001
         },
         {
             "Name":"VIRTUAL-SKIN-SPEAKER",
             "Type":"UNKNOWN",
-            "Version":"5.0",
+            "Version":"5.1",
             "VirtualSensor":true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula":"MAXIMUM",
@@ -837,9 +778,9 @@
             "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.129, 0.234, 0.014, 0.022, 0.197, 0.017, 0.166, 0.16, 0.061],
-            "Offset": -3073.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.121, 0.157, 0.002, 0.169, 0.07, 0.32, 0.045, 0.116],
+            "Offset": 365.0,
             "Multiplier": 0.001
         },
         {
@@ -848,9 +789,9 @@
             "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.141, 0.11, 0.04, 0.182, 0.169, 0.07, 0.109, 0.006, 0.173],
-            "Offset": -46.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.003, 0.137, 0.311, 0.113, 0.022, 0.079, 0.145, 0.189],
+            "Offset": -3112.0,
             "Multiplier": 0.001
         },
         {
@@ -859,9 +800,9 @@
             "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.24, 0.017, 0.031, 0.23, 0.007, 0.098, 0.21, 0.061, 0.106],
-            "Offset": -514.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.113, 0.026, 0.019, 0.073, 0.31, 0.355, 0.033, 0.07],
+            "Offset": -659.0,
             "Multiplier": 0.001
         },
         {
@@ -870,31 +811,20 @@
             "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.057, 0.158, 0.002, 0.228, 0.216, 0.116, 0.023, 0.047, 0.154],
-            "Offset": -243.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.03, 0.239, 0.013, 0.098, 0.067, 0.244, 0.124, 0.186],
+            "Offset": -555.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.026, 0.136, 0.241, 0.119, 0.243, 0.037, 0.103, 0.083, 0.012],
-            "Offset": -3832.0,
-            "Multiplier": 0.001
-        },
-        {
+       {
             "Name":"VIRTUAL-SKIN-FRONT",
             "Type":"UNKNOWN",
-            "Version":"4.0",
+            "Version":"4.1",
             "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", "VIRTUAL-SKIN-FRONT-SUB-3", "VIRTUAL-SKIN-FRONT-SUB-4"],
-            "Coefficient":[1.0, 1.0, 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"],
+            "Coefficient":[1.0, 1.0, 1.0, 1.0],
             "Multiplier":0.001
         },
         {
@@ -903,9 +833,9 @@
             "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.161, 0.002, 0.184, 0.098, 0.0, 0.002, 0.175, 0.131, 0.247],
-            "Offset": -1191.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.03, 0.08, 0.165, 0.164, 0.104, 0.158, 0.158, 0.14],
+            "Offset": -1068.0,
             "Multiplier": 0.001
         },
         {
@@ -914,9 +844,9 @@
             "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.115, 0.016, 0.058, 0.062, 0.125, 0.319, 0.238, 0.021, 0.045],
-            "Offset": -780.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.004, 0.24, 0.04, 0.354, 0.05, 0.09, 0.032, 0.191],
+            "Offset": -672.0,
             "Multiplier": 0.001
         },
         {
@@ -925,9 +855,9 @@
             "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.065, 0.159, 0.002, 0.179, 0.022, 0.058, 0.209, 0.177, 0.128],
-            "Offset": -643.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.033, 0.019, 0.07, 0.025, 0.396, 0.089, 0.02, 0.347],
+            "Offset": -583.0,
             "Multiplier": 0.001
         },
         {
@@ -936,42 +866,20 @@
             "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.124, 0.002, 0.007, 0.093, 0.219, 0.223, 0.088, 0.009, 0.235],
-            "Offset": 38.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.149, 0.019, 0.012, 0.231, 0.247, 0.092, 0.103, 0.066, 0.082],
-            "Offset": 11.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.011, 0.005, 0.28, 0.093, 0.362, 0.011, 0.14, 0.019, 0.08],
-            "Offset": -1881.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
+            "Coefficient": [0.003, 0.099, 0.245, 0.134, 0.11, 0.169, 0.147, 0.092],
+            "Offset": -1871.0,
             "Multiplier": 0.001
         },
         {
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
-            "Version":"9.0",
+            "Version":"9.1",
             "Hidden":true,
             "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],
+            "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
         },
         {
@@ -1250,6 +1158,22 @@
                     "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-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/tokay/overlay_packages/SettingsTokayOverlay/res/drawable/regulatory_info_gur25_cn.png b/tokay/overlay_packages/SettingsTokayOverlay/res/drawable/regulatory_info_gur25_cn.png
new file mode 100644
index 00000000..6bd439f7
Binary files /dev/null and b/tokay/overlay_packages/SettingsTokayOverlay/res/drawable/regulatory_info_gur25_cn.png differ