diff --git a/thermal_info_config_akita.json b/thermal_info_config_akita.json
index 54b9a3f..9d2ed36 100644
--- a/thermal_info_config_akita.json
+++ b/thermal_info_config_akita.json
@@ -8,8 +8,11 @@
         {
             "Name":"modem_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", 35.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"gnss_tcxo_therm",
@@ -35,7 +38,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 27.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 36.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -45,8 +48,12 @@
         {
             "Name":"charger_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", 39.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"display_therm",
@@ -60,59 +67,70 @@
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
             "Multiplier":0.001
         },
-        {
-            "Name":"VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-1",
+	{
+            "Name":"VIRTUAL-SKIN-SUB-1",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["modem_therm", "quiet_therm", "soc_therm", "charger_therm", "usb_conn_therm", "rffe_therm", "gnss_tcxo_therm"],
-            "Coefficient":[0.05, 0.05, 0.7, 0.05, 0.05, 0.05, 0.05],
-            "Offset":-1500,
+            "Combination":["quiet_therm", "soc_therm", "gnss_tcxo_therm"],
+            "Coefficient":[0.05, 0.7, 0.25],
+            "Offset":-220,
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-QUT-CHARGER-USB-RFFE-2",
+            "Name":"VIRTUAL-SKIN-SUB-2",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["quiet_therm", "charger_therm", "usb_conn_therm", "rffe_therm"],
-            "Coefficient":[0.15, 0.15, 0.15, 0.55],
+            "Combination":["modem_therm", "rffe_therm", "soc_therm"],
+            "Coefficient":[0.626, 0.203, 0.052],
+            "Offset": 0,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-SKIN-SUB-3",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["quiet_therm", "rffe_therm", "usb_conn_therm", "charger_therm"],
+            "Coefficient":[0.15, 0.55, 0.15, 0.15],
             "Offset":-1000,
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-QUT-CHARGER-USB-GNSS-3",
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-1",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["quiet_therm", "charger_therm", "usb_conn_therm", "gnss_tcxo_therm"],
-            "Coefficient":[0.166, 0.45, 0.217, 0.167],
-            "Offset":-1950,
+            "Combination":["modem_therm", "rffe_therm", "charger_therm"],
+            "Coefficient":[0.482, 0.206, 0.208],
+            "Offset":-120,
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-4",
+            "Name":"VIRTUAL-SKIN-CHARGE-WLC-SUB-1",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["modem_therm", "quiet_therm", "soc_therm", "charger_therm", "usb_conn_therm", "rffe_therm", "gnss_tcxo_therm"],
-            "Coefficient":[-0.05, -0.05, 1.3, -0.05, -0.05, -0.05, -0.05],
-            "Offset":-1950,
+            "Combination":["modem_therm", "rffe_therm", "charger_therm"],
+            "Coefficient":[0.362, 0.244, 0.317],
+            "Offset":125,
             "Multiplier":0.001
         },
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.7",
+            "Version":"0.2",
             "VirtualSensor":true,
             "TriggerSensor":"soc_therm",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-1", "VIRTUAL-QUT-CHARGER-USB-RFFE-2", "VIRTUAL-QUT-CHARGER-USB-GNSS-3", "VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-4"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0],
+            "Combination":["VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3"],
+            "Coefficient":[1.0, 1.0, 1.0],
             "HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 125.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
@@ -307,9 +325,9 @@
             "Name":"VIRTUAL-SKIN-CHARGE",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
-            "TriggerSensor":"soc_therm",
+            "TriggerSensor":"charger_therm",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-SKIN"],
+            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-1"],
             "Coefficient":[1.0],
             "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
@@ -348,10 +366,10 @@
             "Name":"VIRTUAL-SKIN-CHARGE-WLC",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
-            "TriggerSensor":"soc_therm",
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["charger_therm", "rffe_therm", "display_therm"],
-            "Coefficient":[0.51, 0.25, 0.24],
+            "TriggerSensor":"modem_therm",
+            "Formula":"MAXIMUM",
+            "Combination":["VIRTUAL-SKIN-CHARGE-WLC-SUB-1"],
+            "Coefficient":[1.0],
             "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
diff --git a/thermal_info_config_charge_akita.json b/thermal_info_config_charge_akita.json
index 52ed2e3..63ef34b 100644
--- a/thermal_info_config_charge_akita.json
+++ b/thermal_info_config_charge_akita.json
@@ -5,11 +5,15 @@
             "Type":"BATTERY",
             "Multiplier":0.001
         },
-        {
+	{
             "Name":"modem_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", 35.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"gnss_tcxo_therm",
@@ -20,11 +24,7 @@
         {
             "Name":"usb_conn_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 46.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
-            "TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
-            "Multiplier":0.001,
-            "PollingDelay":60000,
-            "PassiveDelay":7000
+            "Multiplier":0.001
         },
         {
             "Name":"rffe_therm",
@@ -35,7 +35,7 @@
         {
             "Name":"soc_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotThreshold":["NAN", 36.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
             "Multiplier":0.001,
@@ -45,8 +45,12 @@
         {
             "Name":"charger_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", 35.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
+            "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
             "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"display_therm",
@@ -61,47 +65,25 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-1",
+            "Name":"VIRTUAL-SKIN-CHARGE-SUB-1",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["modem_therm", "quiet_therm", "soc_therm", "charger_therm", "usb_conn_therm", "rffe_therm", "gnss_tcxo_therm"],
-            "Coefficient":[0.05, 0.05, 0.7, 0.05, 0.05, 0.05, 0.05],
-            "Offset":-1500,
+            "Combination":["modem_therm", "rffe_therm", "charger_therm"],
+            "Coefficient":[0.482, 0.206, 0.208],
+            "Offset":-120,
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-QUT-CHARGER-USB-RFFE-2",
+            "Name":"VIRTUAL-SKIN-CHARGE-WLC-SUB-1",
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["quiet_therm", "charger_therm", "usb_conn_therm", "rffe_therm"],
-            "Coefficient":[0.15, 0.15, 0.15, 0.55],
-            "Offset":-1000,
-            "Multiplier":0.001
-        },
-        {
-            "Name":"VIRTUAL-QUT-CHARGER-USB-GNSS-3",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["quiet_therm", "charger_therm", "usb_conn_therm", "gnss_tcxo_therm"],
-            "Coefficient":[0.166, 0.45, 0.217, 0.167],
-            "Offset":-1950,
-            "Multiplier":0.001
-        },
-        {
-            "Name":"VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-4",
-            "Type":"UNKNOWN",
-            "Hidden":true,
-            "VirtualSensor":true,
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["modem_therm", "quiet_therm", "soc_therm", "charger_therm", "usb_conn_therm", "rffe_therm", "gnss_tcxo_therm"],
-            "Coefficient":[-0.05, -0.05, 1.3, -0.05, -0.05, -0.05, -0.05],
-            "Offset":-1950,
+            "Combination":["modem_therm", "rffe_therm", "charger_therm"],
+            "Coefficient":[0.362, 0.244, 0.317],
+            "Offset":125,
             "Multiplier":0.001
         },
         {
@@ -109,10 +91,10 @@
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
-            "TriggerSensor":"soc_therm",
+            "TriggerSensor":"charger_therm",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-1", "VIRTUAL-QUT-CHARGER-USB-RFFE-2", "VIRTUAL-QUT-CHARGER-USB-GNSS-3", "VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-4"],
-            "Coefficient":[1.0, 1.0, 1.0, 1.0],
+            "Combination":["VIRTUAL-SKIN-CHARGE-SUB-1"],
+            "Coefficient":[1.0],
             "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
@@ -151,11 +133,11 @@
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
-            "TriggerSensor":"soc_therm",
-            "Formula":"WEIGHTED_AVG",
-            "Combination":["charger_therm", "rffe_therm", "display_therm"],
-            "Coefficient":[0.51, 0.25, 0.24],
-            "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
+            "TriggerSensor":"modem_therm",
+            "Formula":"MAXIMUM",
+            "Combination":["VIRTUAL-SKIN-CHARGE-WLC-SUB-1"],
+            "Coefficient":[1.0],
+	    "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,