diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json
index 4cc53ba3..96508e85 100644
--- a/thermal/thermal_info_config_caiman.json
+++ b/thermal/thermal_info_config_caiman.json
@@ -125,9 +125,10 @@
             "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.28, 0.14, 0.0, 0.01, 0.0, 0.0, 0.09, 0.03, 0.49],
-            "Offset": -830.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.108, 0.031, 0.064, 0.027, 0.091, 0.013, 0.238, 0.171, 0.143, 3.9],
+            "Offset": 2783.0,
             "Multiplier": 0.001
         },
         {
@@ -136,9 +137,10 @@
             "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.22, 0.0, 0.04, 0.0, 0.02, 0.0, 0.05, 0.15, 0.6],
-            "Offset": -3060.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.304, 0.042, 0.095, 0.042, 0.115, 0.073, 0.1, 0.018, 0.175, 0.72],
+            "Offset": 365.0,
             "Multiplier": 0.001
         },
         {
@@ -147,9 +149,10 @@
             "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.26, 0.13, 0.03, 0.0, 0.0, 0.0, 0.1, 0.06, 0.39],
-            "Offset": 1060.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.103, 0.036, 0.048, 0.189, 0.01, 0.113, 0.217, 0.012, 0.268, 0.1],
+            "Offset": -239.0,
             "Multiplier": 0.001
         },
         {
@@ -158,9 +161,10 @@
             "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.27, 0.04, 0.05, 0.0, 0.0, 0.02, 0.1, 0.03, 0.63],
-            "Offset": -4280.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.164, 0.13, 0.029, 0.113, 0.187, 0.204, 0.053, 0.059, 0.045, 0.32],
+            "Offset": -1925.0,
             "Multiplier": 0.001
         },
         {
@@ -169,19 +173,32 @@
             "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.26, 0.14, 0.12, 0.06, 0.0, 0.0, 0.28, 0.0, 0.16],
-            "Offset": -700.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.17, 0.012, 0.007, 0.101, 0.106, 0.067, 0.151, 0.189, 0.191, 0.14],
+            "Offset": -393.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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.077, 0.004, 0.032, 0.185, 0.286, 0.104, 0.292, 0.019, 0.019, 0.2],
+            "Offset": -750.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LEGACY",
             "Type": "UNKNOWN",
-            "Version":"3.0",
+            "Version":"3.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"],
-            "Coefficient": [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
         },
         {
@@ -262,11 +279,12 @@
             "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.19, 0.04, 0.0, 0.06, 0.0, 0.0, 0.07, 0.03, 0.16,
-                            0.01, 0.05, 0.07, 0.05, 0.0, 0.01, 0.0, 0.0, 0.02,
-                            0.05, 0.01, 0.0, 0.01, 0.0, 0.0, 0.06, 0.0, 0.05],
-            "Offset": 2390.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.032, 0.014, 0.033, 0.083, 0.049, 0.051, 0.073, 0.037, 0.026, 0.1,
+                            0.001, 0.014, 0.081, 0.001, 0.052, 0, 0.001, 0, 0.012, 0.2,
+                            0.047, 0.019, 0.078, 0.006, 0.011, 0.052, 0.076, 0.046, 0.084, 0.12],
+            "Offset": 676.0,
             "Multiplier": 0.001
         },
         {
@@ -275,11 +293,12 @@
             "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.17, 0.06, 0.0, 0.03, 0.0, 0.02, 0.05, 0.03, 0.28,
-                            0.02, 0.04, 0.0, 0.0, 0.0, 0.0, 0.05, 0.03, 0.05,
-                            0.06, 0.0, 0.0, 0.01, 0.0, 0.0, 0.04, 0.02, 0.03],
-            "Offset": 840.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.035, 0.01, 0.056, 0.081, 0.043, 0.069, 0.039, 0.078, 0.046, 1.42,
+                            0.013, 0.022, 0.011, 0.006, 0.03, 0.016, 0.018, 0.014, 0.01, 1.06,
+                            0.016, 0.004, 0.062, 0.05, 0.016, 0.065, 0.013, 0.043, 0.048, 0.9],
+            "Offset": 1939.0,
             "Multiplier": 0.001
         },
         {
@@ -288,11 +307,12 @@
             "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.04, 0.0, 0.0, 0.0, 0.0, 0.08, 0.03, 0.4,
-                            0.02, 0.0, 0.0, 0.0, 0.0, 0.06, 0.04, 0.0, 0.06,
-                            0.12, 0.0, 0.0, 0.0, 0.0, 0.01, 0.06, 0.0, 0.0],
-            "Offset": 370.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.034, 0.032, 0.032, 0.034, 0.032, 0.032, 0.034, 0.032, 0.032, 0,
+                            0.036, 0.033, 0.035, 0.036, 0.033, 0.035, 0.036, 0.033, 0.035, 0,
+                            0.037, 0.036, 0.032, 0.037, 0.036, 0.032, 0.037, 0.035, 0.032, 0],
+            "Offset": 1484.0,
             "Multiplier": 0.001
         },
         {
@@ -301,48 +321,23 @@
             "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.23, 0.04, 0.0, 0.01, 0.0, 0.0, 0.12, 0.04, 0.41,
-                            0.05, 0.02, 0.0, 0.0, 0.0, 0.0, 0.02, 0.05, 0.02,
-                            0.01, 0.0, 0.0, 0.0, 0.0, 0.0, 0.05, 0.02, 0.06],
-            "Offset": -5250.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-4",
-            "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.0, 0.01, 0.0, 0.0, 0.0, 0.0, 0.07, 0.0, 0.26,
-                            0.04, 0.0, 0.0, 0.0, 0.0, 0.0, 0.01, 0.0, 0.06,
-                            0.26, 0.1, 0.0, 0.0, 0.0, 0.0, 0.01, 0.03, 0.15],
-            "Offset": 530.0,
-            "Multiplier": 0.001
-        },
-        {
-            "Name": "VIRTUAL-SKIN-LINEAR-SUB-5",
-            "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.19, 0.09, 0.03, 0.01, 0.0, 0.04, 0.08, 0.04, 0.02,
-                            0.02, 0.02, 0.06, 0.07, 0.0, 0.01, 0.05, 0.01, 0.04,
-                            0.03, 0.04, 0.01, 0.03, 0.0, 0.0, 0.04, 0.0, 0.08],
-            "Offset": -1070.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.073, 0.004, 0.016, 0.033, 0.063, 0.014, 0.065, 0.058, 0.03, 0.02,
+                            0.071, 0.062, 0.035, 0.001, 0.063, 0.071, 0.027, 0.024, 0.069, 0.04,
+                            0.006, 0.003, 0.055, 0.029, 0.038, 0.027, 0, 0.008, 0.026, 0.48],
+            "Offset": -319.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LINEAR",
             "Type": "UNKNOWN",
-            "Version": "Patch_1.0",
+            "Version": "Patch_1.1",
             "VirtualSensor": true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "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", "VIRTUAL-SKIN-LINEAR-SUB-4", "VIRTUAL-SKIN-LINEAR-SUB-5"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+            "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],
             "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,
@@ -1023,6 +1018,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_komodo.json b/thermal/thermal_info_config_komodo.json
index 92245e4f..f8f43687 100644
--- a/thermal/thermal_info_config_komodo.json
+++ b/thermal/thermal_info_config_komodo.json
@@ -125,9 +125,10 @@
             "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.26, 0.01, 0.0, 0.48, 0.0, 0.0, 0.0, 0.23, 0.0],
-            "Offset": 980.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.109, 0.058, 0.25, 0.032, 0.195, 0.073, 0.06, 0.064, 0.013, 4.62],
+            "Offset": -1355.0,
             "Multiplier": 0.001
         },
         {
@@ -136,9 +137,10 @@
             "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.32, 0.06, 0.03, 0.08, 0.05, 0.0, 0.03, 0.21, 0.1],
-            "Offset": 3820.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.012, 0.023, 0.148, 0.19, 0.185, 0.052, 0.196, 0.001, 0.174, 0.4],
+            "Offset": 225.0,
             "Multiplier": 0.001
         },
         {
@@ -147,9 +149,10 @@
             "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.34, 0.05, 0.0, 0.04, 0.0, 0.0, 0.22, 0.25, 0.04],
-            "Offset": 1920.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.188, 0.028, 0.019, 0.05, 0.129, 0.047, 0.123, 0.287, 0.124, 0.08],
+            "Offset": -995.0,
             "Multiplier": 0.001
         },
         {
@@ -158,19 +161,68 @@
             "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.35, 0.04, 0.01, 0.11, 0.09, 0.0, 0.01, 0.2, 0.15],
-            "Offset": 1150.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.137, 0.046, 0.013, 0.13, 0.045, 0.023, 0.227, 0.044, 0.125, 4.18],
+            "Offset": 5208.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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.118, 0.077, 0.031, 0.01, 0.171, 0.198, 0.059, 0.212, 0.12, 0.08],
+            "Offset": -2219.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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.079, 0.055, 0.007, 0.035, 0.046, 0.184, 0.028, 0.258, 0.267, 0.82],
+            "Offset": 209.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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.297, 0.025, 0.0, 0.012, 0.033, 0.091, 0.088, 0.226, 0.209, 0.4],
+            "Offset": -53.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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.014, 0.089, 0.019, 0.283, 0.016, 0.11, 0.357, 0.02, 0.127, 0.36],
+            "Offset": -1273.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LEGACY",
             "Type": "UNKNOWN",
-            "Version":"7.0",
+            "Version":"7.1",
             "VirtualSensor": true,
             "Formula": "MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3"],
-            "Coefficient": [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", "VIRTUAL-SKIN-SUB-7"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier": 0.001
         },
         {
@@ -252,11 +304,12 @@
             "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.02, 0.0, 0.0, 0.05, 0.0, 0.0, 0.05, 0.01, 0.04,
-                            0.0, 0.0, 0.01, 0.01, 0.0, 0.0, 0.01, 0.0, 0.0,
-                            0.31, 0.03, 0.0, 0.05, 0.0, 0.0, 0.0, 0.25, 0.08],
-            "Offset": 2660.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.028, 0.04, 0.081, 0.008, 0.011, 0.043, 0.035, 0.023, 0.008, 1.46,
+                            0.066, 0.087, 0.013, 0.026, 0.008, 0.048, 0.037, 0.016, 0.016, 1.64,
+                            0.079, 0.066, 0.009, 0.036, 0.04, 0.023, 0.047, 0.008, 0.032, 1.22],
+            "Offset": -3701.0,
             "Multiplier": 0.001
         },
         {
@@ -265,11 +318,12 @@
             "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.19, 0.06, 0.0, 0.01, 0.0, 0.0, 0.07, 0.1, 0.09,
-                            0.02, 0.03, 0.0, 0.0, 0.05, 0.0, 0.04, 0.03, 0.01,
-                            0.05, 0.01, 0.0, 0.0, 0.01, 0.0, 0.03, 0.07, 0.04],
-            "Offset": 2860.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.048, 0.031, 0.044, 0.046, 0.024, 0.054, 0.052, 0.03, 0.038, 0.28,
+                            0.03, 0.02, 0.028, 0.027, 0.048, 0.046, 0.059, 0.027, 0.025, 0.12,
+                            0.031, 0.054, 0.044, 0.021, 0.044, 0.022, 0.003, 0.034, 0.014, 0.7],
+            "Offset": 532.0,
             "Multiplier": 0.001
         },
         {
@@ -278,11 +332,12 @@
             "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.21, 0.02, 0.0, 0.44, 0.0, 0.0, 0.0, 0.12, 0.0,
-                            0.04, 0.0, 0.0, 0.03, 0.0, 0.0, 0.0, 0.04, 0.0,
-                            0.01, 0.0, 0.0, 0.01, 0.0, 0.0, 0.0, 0.05, 0.0],
-            "Offset": 1330.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.047, 0.062, 0.036, 0.009, 0.023, 0.051, 0.038, 0.065, 0.053, 0.12,
+                            0.014, 0.023, 0.052, 0.027, 0.016, 0.064, 0.008, 0.005, 0.046, 0.2,
+                            0.041, 0.015, 0.065, 0.014, 0.021, 0.064, 0.023, 0.023, 0.056, 0.42],
+            "Offset": 1154.0,
             "Multiplier": 0.001
         },
         {
@@ -291,11 +346,12 @@
             "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.07, 0.03, 0.0, 0.05, 0.0, 0.0, 0.07, 0.1, 0.03,
-                            0.11, 0.0, 0.0, 0.06, 0.0, 0.02, 0.05, 0.07, 0.05,
-                            0.07, 0.0, 0.0, 0.04, 0.0, 0.02, 0.05, 0.03, 0.03],
-            "Offset": 2070.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.071, 0.057, 0.02, 0.073, 0.013, 0.042, 0.069, 0.01, 0.017, 0.6,
+                            0.002, 0.076, 0.065, 0.001, 0.055, 0.055, 0.009, 0.027, 0.075, 0.3,
+                            0.006, 0.011, 0.003, 0.007, 0.065, 0.028, 0.034, 0.025, 0.018, 0.42],
+            "Offset": 1248.0,
             "Multiplier": 0.001
         },
         {
@@ -304,22 +360,37 @@
             "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.18, 0.0, 0.0, 0.03, 0.1, 0.04, 0.09, 0.13, 0.05,
-                            0.07, 0.0, 0.0, 0.0, 0.06, 0.0, 0.02, 0.05, 0.07,
-                            0.01, 0.0, 0.0, 0.0, 0.01, 0.0, 0.0, 0.02, 0.07],
-            "Offset": 10.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.009, 0.034, 0.048, 0.013, 0.029, 0.058, 0.009, 0.039, 0.062, 0.02,
+                            0.012, 0.077, 0.028, 0.015, 0.061, 0.084, 0.006, 0.024, 0.012, 1.38,
+                            0.006, 0.015, 0.015, 0.008, 0.034, 0.041, 0.012, 0.025, 0.081, 1.48],
+            "Offset": 3509.0,
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "VIRTUAL-SKIN-LINEAR-SUB-5",
+            "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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.071, 0.033, 0.03, 0.05, 0.05, 0.018, 0.059, 0.008, 0.028, 0.02,
+                            0.019, 0.026, 0.078, 0.008, 0.016, 0.061, 0.001, 0.06, 0.07, 0.44,
+                            0.007, 0, 0.062, 0.027, 0.077, 0.068, 0.008, 0.034, 0.005, 0.02],
+            "Offset": -68.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LINEAR",
             "Type": "UNKNOWN",
-            "Version": "Patch_1.0",
+            "Version": "Patch_1.1",
             "VirtualSensor": true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "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", "VIRTUAL-SKIN-LINEAR-SUB-4"],
-            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0],
+            "Combination": ["VIRTUAL-SKIN-LINEAR-SUB-0", "VIRTUAL-SKIN-LINEAR-SUB-1", "VIRTUAL-SKIN-LINEAR-SUB-2", "VIRTUAL-SKIN-LINEAR-SUB-3", "VIRTUAL-SKIN-LINEAR-SUB-4", "VIRTUAL-SKIN-LINEAR-SUB-5"],
+            "Coefficient": [1.0, 1.0, 1.0, 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,
@@ -996,6 +1067,22 @@
                     "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-SUB-7",
+                    "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 6ebd76bf..11f7beac 100644
--- a/thermal/thermal_info_config_tokay.json
+++ b/thermal/thermal_info_config_tokay.json
@@ -115,9 +115,10 @@
             "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.12, 0.08, 0.0, 0.03, 0.0, 0.08, 0.11, 0.0, 0.64],
-            "Offset": -270.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.244, 0.074, 0.016, 0.097, 0.192, 0.228, 0.012, 0.02, 0.074, 0.9],
+            "Offset": -911.0,
             "Multiplier": 0.001
         },
         {
@@ -126,9 +127,10 @@
             "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.08, 0.0, 0.53, 0.0, 0.09, 0.01, 0.0, 0.09],
-            "Offset": -1200.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.065, 0.078, 0.025, 0.198, 0.09, 0.212, 0.239, 0.032, 0.107, 0.9],
+            "Offset": -1549.0,
             "Multiplier": 0.001
         },
         {
@@ -137,9 +139,10 @@
             "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.17, 0.01, 0.0, 0.05, 0.0, 0.21, 0.45, 0.0, 0.16],
-            "Offset": -360.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.148, 0.063, 0.005, 0.187, 0.169, 0.181, 0.116, 0.02, 0.079, 1.02],
+            "Offset": 567.0,
             "Multiplier": 0.001
         },
         {
@@ -148,19 +151,68 @@
             "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.22, 0.04, 0.0, 0.54, 0.0, 0.09, 0.0, 0.0, 0.16],
-            "Offset": -840.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.042, 0.062, 0.053, 0.236, 0.048, 0.232, 0.203, 0.017, 0.208, 0.18],
+            "Offset": -3032.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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.096, 0.007, 0.069, 0.188, 0.033, 0.13, 0.174, 0.001, 0.16, 2.86],
+            "Offset": 4026.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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.185, 0.126, 0.076, 0.048, 0.087, 0.283, 0.016, 0.015, 0.159, 0.12],
+            "Offset": -2468.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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.031, 0.081, 0.002, 0.164, 0.016, 0.079, 0.179, 0.218, 0.218, 0.38],
+            "Offset": 83.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", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.072, 0.022, 0.028, 0.305, 0.016, 0.124, 0.172, 0.068, 0.189, 0.04],
+            "Offset": 154.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LEGACY",
             "Type": "UNKNOWN",
-            "Version":"7.0",
+            "Version":"7.1",
             "VirtualSensor": true,
             "Formula": "MAXIMUM",
-            "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3"],
-            "Coefficient": [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", "VIRTUAL-SKIN-SUB-7"],
+            "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
             "Multiplier": 0.001
         },
         {
@@ -241,11 +293,12 @@
             "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.08, 0.0, 0.0, 0.01, 0.0, 0.16, 0.17, 0.0, 0.22,
-                            0.0, 0.0, 0.0, 0.0, 0.0, 0.07, 0.04, 0.0, 0.13,
-                            0.02, 0.0, 0.0, 0.01, 0.0, 0.0, 0.03, 0.0, 0.09],
-            "Offset": 1020.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.022, 0.027, 0.004, 0.004, 0.017, 0.069, 0.026, 0.022, 0.013, 0.06,
+                            0.034, 0.061, 0.019, 0.014, 0.066, 0.043, 0.018, 0.056, 0.014, 0.4,
+                            0.03, 0.068, 0.068, 0.01, 0.066, 0.064, 0.062, 0.06, 0.064, 0.56],
+            "Offset": -1939.0,
             "Multiplier": 0.001
         },
         {
@@ -254,11 +307,12 @@
             "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.03, 0.03, 0.0, 0.18, 0.02, 0.07, 0.08, 0.0, 0.12,
-                            0.01, 0.05, 0.0, 0.09, 0.04, 0.04, 0.0, 0.0, 0.07,
-                            0.01, 0.06, 0.0, 0.04, 0.01, 0.0, 0.05, 0.0, 0.04],
-            "Offset": -80.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.025, 0.015, 0.057, 0.025, 0.013, 0.006, 0.054, 0.062, 0.072, 0.24,
+                            0.059, 0.054, 0.043, 0.072, 0.013, 0.02, 0.016, 0.062, 0.042, 0.2,
+                            0.002, 0.052, 0.005, 0.001, 0.016, 0.06, 0.051, 0.069, 0.028, 0.22],
+            "Offset": -1527.0,
             "Multiplier": 0.001
         },
         {
@@ -267,11 +321,12 @@
             "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.01, 0.0, 0.0, 0.09, 0.0, 0.08, 0.02, 0.0, 0.04,
-                            0.02, 0.0, 0.0, 0.06, 0.0, 0.06, 0.02, 0.0, 0.02,
-                            0.1, 0.0, 0.0, 0.28, 0.0, 0.11, 0.03, 0.0, 0.04],
-            "Offset": 2230.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.06, 0.068, 0.002, 0.043, 0.024, 0.052, 0.069, 0.006, 0.057, 0.3,
+                            0.008, 0.047, 0.001, 0.045, 0.07, 0.006, 0.003, 0.05, 0.031, 0.1,
+                            0.008, 0.072, 0.041, 0.016, 0.048, 0.023, 0.072, 0.035, 0.009, 0.22],
+            "Offset": 33.0,
             "Multiplier": 0.001
         },
         {
@@ -280,17 +335,18 @@
             "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.0, 0.0, 0.06, 0.0, 0.03, 0.31, 0.0, 0.1,
-                            0.05, 0.0, 0.0, 0.05, 0.0, 0.06, 0.0, 0.0, 0.01,
-                            0.06, 0.01, 0.0, 0.02, 0.0, 0.07, 0.03, 0.0, 0.09],
-            "Offset": -390.0,
+            "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm", "VSYS_PWR_CAMERA"],
+            "CombinationType":["SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "SENSOR", "ODPM"],
+            "Coefficient": [0.018, 0.07, 0.048, 0.055, 0.081, 0.077, 0.051, 0.008, 0.03, 0.3,
+                            0.02, 0.052, 0.021, 0.028, 0.006, 0.012, 0.028, 0.048, 0.045, 0.12,
+                            0.023, 0.029, 0.083, 0.012, 0.085, 0.018, 0.03, 0.004, 0.064, 0.02],
+            "Offset": -2210.0,
             "Multiplier": 0.001
         },
         {
             "Name": "VIRTUAL-SKIN-LINEAR",
             "Type": "UNKNOWN",
-            "Version": "Patch_1.0",
+            "Version": "Patch_1.1",
             "VirtualSensor": true,
             "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
             "Formula": "MAXIMUM",
@@ -968,6 +1024,22 @@
                     "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-SUB-7",
+                    "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]