diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
index fb5ea14..ee3f9c7 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -29,7 +29,9 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="status_bar_height_default">28dp</dimen>
+    <dimen name="status_bar_height_portrait">130px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>
diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc
index 8827b03..069331f 100644
--- a/conf/init.pantah.rc
+++ b/conf/init.pantah.rc
@@ -50,6 +50,10 @@ on post-fs-data
     # Speaker amp permission
     chmod 644 /mnt/vendor/persist/audio/speaker.cal
 
+    # Allow secure_element group to read / write ST33 SPI state
+    chown secure_element secure_element  /sys/class/st33spi/st33spi/st33spi_state
+    chmod 0660  /sys/class/st33spi/st33spi/st33spi_state
+
 service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     -O/data/vendor/wifi/wpa/sockets -puse_p2p_group_interface=1p2p_device=1 \
     -m/vendor/etc/wifi/p2p_supplicant.conf \
@@ -93,4 +97,4 @@ on property:vendor.device.modules.ready=1
     chown system system /proc/focaltech_touch/selftest/Scap_CB
     chown system system /proc/focaltech_touch/selftest/Scap_Rawdata
     chown system system /proc/focaltech_touch/selftest/Short
-    chown system system /proc/focaltech_touch/selftest/Strength
\ No newline at end of file
+    chown system system /proc/focaltech_touch/selftest/Strength
diff --git a/panther/overlay/frameworks/base/core/res/res/values/dimens.xml b/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
index 82c194e..9051ca3 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -29,7 +29,9 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="status_bar_height_default">28dp</dimen>
+    <dimen name="status_bar_height_portrait">118px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index c2df4a9..6d369fe 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -95,7 +95,7 @@
             "Type":"UNKNOWN",
             "HotThreshold":[
                 "NAN",
-                "NAN",
+                "35.0",
                 "NAN",
                 "NAN",
                 "NAN",
@@ -111,7 +111,7 @@
             "Type":"UNKNOWN",
             "HotThreshold":[
                 "NAN",
-                "35.0",
+                "NAN",
                 "NAN",
                 "NAN",
                 "NAN",
@@ -458,6 +458,123 @@
             "PollingDelay":300000,
             "PassiveDelay":7000
         },
+        {
+            "Name":"USB-MINUS-USB2",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":[
+                "usb_pwr_therm",
+                "usb_pwr_therm2"
+            ],
+            "Coefficient":[
+                "1.0",
+                "-1.0"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
+        {
+            "Name":"USB-MINUS-NEUTRAL",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":[
+                "usb_pwr_therm",
+                "neutral_therm"
+            ],
+            "Coefficient":[
+                "1.0",
+                "-1.0"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-USB-THROTTLING",
+            "Type":"USB_PORT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "usb_pwr_therm",
+            "Combination":[
+                "usb_pwr_therm",
+                "USB-MINUS-USB2",
+                "USB-MINUS-NEUTRAL"
+            ],
+            "Coefficient":[
+                "42000",
+                "4000",
+                "7000"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "3.0",
+                "NAN",
+                "NAN"
+            ],
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "usbc-port",
+                    "LimitInfo": [0, 0, 0, 0, 1, 1, 1]
+                }
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
+        },
+        {
+            "Name":"VIRTUAL-USB-UI",
+            "Type":"USB_PORT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "usb_pwr_therm",
+            "Combination":[
+                "usb_pwr_therm",
+                "USB-MINUS-USB2",
+                "USB-MINUS-NEUTRAL"
+            ],
+            "Coefficient":[
+                "47000",
+                "4500",
+                "8000"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "3.0",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
+        },
         {
             "Name":"LITTLE",
             "Type":"CPU",
@@ -598,7 +715,7 @@
             "Type":"BCL_PERCENTAGE",
             "HotThreshold":[
                 "NAN",
-                20,
+                "NAN",
                 80,
                 "NAN",
                 "NAN",
@@ -607,8 +724,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PollingDelay":60000,
-            "PassiveDelay":7000,
             "Monitor":true
         },
         {
@@ -1251,6 +1366,10 @@
             "Name":"wlc_fcc",
             "Type":"BATTERY"
         },
+        {
+            "Name":"usbc-port",
+            "Type":"BATTERY"
+        },
         {
             "Name":"tpu_cooling",
             "Type":"NPU",
diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json
index c75ce64..cf069aa 100644
--- a/thermal_info_config_cloudripper.json
+++ b/thermal_info_config_cloudripper.json
@@ -142,22 +142,14 @@
                 "NAN",
                 80,
                 "NAN",
-                90,
-                93,
-                96,
+                "NAN",
+                "NAN",
+                "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "Monitor":true,
-            "PollingDelay":300000,
-            "PassiveDelay":5000,
-            "BindedCdevInfo": [
-                {
-                    "CdevRequest": "thermal-cpufreq-2",
-                    "LimitInfo": [0, 0, 0, 7, 7, 10, 10]
-                }
-            ]
+            "Monitor":true
         },
         {
             "Name":"batoilo",
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index b64e11f..65ea98a 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -68,7 +68,7 @@
             "Type":"UNKNOWN",
             "HotThreshold":[
                 "NAN",
-                "NAN",
+                "35.0",
                 "NAN",
                 "NAN",
                 "NAN",
@@ -84,7 +84,7 @@
             "Type":"UNKNOWN",
             "HotThreshold":[
                 "NAN",
-                "35.0",
+                "NAN",
                 "NAN",
                 "NAN",
                 "NAN",
@@ -458,6 +458,123 @@
             "PollingDelay":300000,
             "PassiveDelay":7000
         },
+        {
+            "Name":"USB-MINUS-USB2",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":[
+                "usb_pwr_therm",
+                "usb_pwr_therm2"
+            ],
+            "Coefficient":[
+                "1.0",
+                "-1.0"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
+        {
+            "Name":"USB-MINUS-NEUTRAL",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":[
+                "usb_pwr_therm",
+                "neutral_therm"
+            ],
+            "Coefficient":[
+                "1.0",
+                "-1.0"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
+        {
+            "Name":"VIRTUAL-USB-THROTTLING",
+            "Type":"USB_PORT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "usb_pwr_therm",
+            "Combination":[
+                "usb_pwr_therm",
+                "USB-MINUS-USB2",
+                "USB-MINUS-NEUTRAL"
+            ],
+            "Coefficient":[
+                "40000",
+                "1500",
+                "3000"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "3.0",
+                "NAN",
+                "NAN"
+            ],
+            "BindedCdevInfo": [
+                {
+                    "CdevRequest": "usbc-port",
+                    "LimitInfo": [0, 0, 0, 0, 1, 1, 1]
+                }
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
+        },
+        {
+            "Name":"VIRTUAL-USB-UI",
+            "Type":"USB_PORT",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "usb_pwr_therm",
+            "Combination":[
+                "usb_pwr_therm",
+                "USB-MINUS-USB2",
+                "USB-MINUS-NEUTRAL"
+            ],
+            "Coefficient":[
+                "42000",
+                "2000",
+                "4000"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "3.0",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
+        },
         {
             "Name":"LITTLE",
             "Type":"CPU",
@@ -598,7 +715,7 @@
             "Type":"BCL_PERCENTAGE",
             "HotThreshold":[
                 "NAN",
-                20,
+                "NAN",
                 80,
                 "NAN",
                 "NAN",
@@ -607,8 +724,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PollingDelay":60000,
-            "PassiveDelay":7000,
             "Monitor":true
         },
         {
@@ -1251,6 +1366,10 @@
             "Name":"wlc_fcc",
             "Type":"BATTERY"
         },
+        {
+            "Name":"usbc-port",
+            "Type":"BATTERY"
+        },
         {
             "Name":"tpu_cooling",
             "Type":"NPU",
diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json
index ba85ef8..85d91b7 100644
--- a/thermal_info_config_ravenclaw.json
+++ b/thermal_info_config_ravenclaw.json
@@ -140,7 +140,7 @@
             "Type":"BCL_PERCENTAGE",
             "HotThreshold":[
                 "NAN",
-                20,
+                "NAN",
                 80,
                 "NAN",
                 "NAN",
@@ -149,8 +149,6 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":1,
-            "PollingDelay":60000,
-            "PassiveDelay":7000,
             "Monitor":true
         },
         {