diff --git a/audio/panther/tuning/waves/waves_preset.mps b/audio/panther/tuning/waves/waves_preset.mps
index 673f34e..6c8841a 100644
Binary files a/audio/panther/tuning/waves/waves_preset.mps and b/audio/panther/tuning/waves/waves_preset.mps differ
diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index d654dde..511c789 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -67,6 +67,19 @@
         @left
     </string>
 
+    <!-- Not allow to switch to higher refresh rate when display brightness setting is
+         equal or less than this value -->
+    <integer-array name="config_brightnessThresholdsOfPeakRefreshRate">
+        <!-- System brightness for 5 nits: round((5-2)/(1000-2)*(255-1)+1) = 2 -->
+        <item>2</item> <!-- 15% UI brightness -->
+    </integer-array>
+    <integer-array name="config_ambientThresholdsOfPeakRefreshRate">
+        <item>5</item>
+    </integer-array>
+
+    <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
+    <integer name="config_defaultRefreshRateInZone">120</integer>
+
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
       The N entries of this array define N  1 zones as follows:
          Zone 0:        0 <= LUX < array[0]
@@ -240,4 +253,7 @@
     <!-- Boolean indicating if restoring network selection should be skipped -->
     <!-- The restoring is handled by modem if it is true -->
     <bool translatable="false" name="skip_restoring_network_selection">true</bool>
+
+    <!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
+    <bool name="config_faceAuthDismissesKeyguard">false</bool>
 </resources>
diff --git a/conf/init.cheetah.rc b/conf/init.cheetah.rc
index 48454c7..cf1af49 100644
--- a/conf/init.cheetah.rc
+++ b/conf/init.cheetah.rc
@@ -2,7 +2,7 @@
 import /vendor/etc/init/hw/init.gs201.rc
 import /vendor/etc/init/hw/init.pantah.rc
 
-on property:vendor.device.modules.ready=1
+on late-init && property:vendor.device.modules.ready=1
     # Start the twoshay touch service
     start twoshay
 
diff --git a/conf/init.panther.rc b/conf/init.panther.rc
index 4ba6117..b3cc621 100644
--- a/conf/init.panther.rc
+++ b/conf/init.panther.rc
@@ -2,7 +2,7 @@
 import /vendor/etc/init/hw/init.gs201.rc
 import /vendor/etc/init/hw/init.pantah.rc
 
-on property:vendor.device.modules.ready=1
+on late-init && property:vendor.device.modules.ready=1
     # Start the twoshay touch service
     start twoshay
 
diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index 5615368..98c75b4 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -66,6 +66,21 @@
         @left
     </string>
 
+    <!-- Not allow to switch to higher refresh rate when display brightness setting is
+         equal or less than this value -->
+    <integer-array name="config_brightnessThresholdsOfPeakRefreshRate">
+        <!-- System brightness for 20 nits: round((20-2)/(1000-2)*(255-1)+1) = 6 -->
+        <item>6</item> <!-- 34% UI brightness -->
+        <!-- System brightness for 25 nits: round((25-2)/(1000-2)*(255-1)+1) = 7 -->
+        <item>7</item> <!-- 38% UI brightness -->
+    </integer-array>
+    <integer-array name="config_ambientThresholdsOfPeakRefreshRate">
+        <item>-1</item>
+        <item>20</item>
+    </integer-array>
+    <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
+    <integer name="config_defaultRefreshRateInZone">90</integer>
+
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
       The N entries of this array define N  1 zones as follows:
          Zone 0:        0 <= LUX < array[0]
@@ -239,4 +254,7 @@
     <!-- Boolean indicating if restoring network selection should be skipped -->
     <!-- The restoring is handled by modem if it is true -->
     <bool translatable="false" name="skip_restoring_network_selection">true</bool>
+
+    <!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
+    <bool name="config_faceAuthDismissesKeyguard">false</bool>
 </resources>
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index d78af0f..ce39a20 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -126,7 +126,8 @@
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
         "20 5 80",
-        "20 10 80"
+        "20 10 80",
+        "80 10 80"
       ],
       "ResetOnInit": true
     },
@@ -139,7 +140,7 @@
         "108",
         "1",
         "157",
-        "42"
+        "53"
       ],
       "ResetOnInit": true
     },
@@ -148,7 +149,7 @@
       "Path": "/sys/kernel/vendor_sched/sf_uclamp_min",
       "Values": [
         "125",
-        "65",
+        "78",
         "30"
       ],
       "ResetOnInit": true
@@ -402,7 +403,7 @@
       "PowerHint": "INTERACTION",
       "Node": "SFUClampBoost",
       "Duration": 5000,
-      "Value": "65"
+      "Value": "78"
     },
     {
       "PowerHint": "LAUNCH_120FPS",
@@ -419,7 +420,7 @@
       "PowerHint": "LAUNCH",
       "Node": "SFUClampBoost",
       "Duration": 5000,
-      "Value": "65"
+      "Value": "78"
     },
     {
       "PowerHint": "LAUNCH",
@@ -737,7 +738,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -815,7 +816,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1121,7 +1122,7 @@
       "PowerHint": "REFRESH_60FPS",
       "Node": "TAUClampBoost",
       "Duration": 0,
-      "Value": "42"
+      "Value": "53"
     },
     {
       "PowerHint": "REFRESH_60FPS",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index 1adcb3d..d2d2b82 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -126,7 +126,8 @@
       "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
       "Values": [
         "20 5 80",
-        "20 10 80"
+        "20 10 80",
+        "80 10 80"
       ],
       "ResetOnInit": true
     },
@@ -138,7 +139,7 @@
         "108",
         "1",
         "107",
-        "42"
+        "53"
       ],
       "ResetOnInit": true
     },
@@ -147,7 +148,7 @@
       "Path": "/sys/kernel/vendor_sched/sf_uclamp_min",
       "Values": [
         "125",
-        "65",
+        "78",
         "30"
       ],
       "ResetOnInit": true
@@ -401,13 +402,13 @@
       "PowerHint": "INTERACTION",
       "Node": "SFUClampBoost",
       "Duration": 5000,
-      "Value": "65"
+      "Value": "78"
     },
     {
       "PowerHint": "LAUNCH",
       "Node": "SFUClampBoost",
       "Duration": 5000,
-      "Value": "65"
+      "Value": "78"
     },
     {
       "PowerHint": "LAUNCH",
@@ -725,7 +726,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -803,7 +804,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "MIFTargetLoad",
       "Duration": 0,
-      "Value": "20 10 80"
+      "Value": "80 10 80"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1109,7 +1110,7 @@
       "PowerHint": "REFRESH_60FPS",
       "Node": "TAUClampBoost",
       "Duration": 0,
-      "Value": "42"
+      "Value": "53"
     },
     {
       "PowerHint": "ADPF_DISABLE_TA_BOOST",
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index 6fd1487..d0bcdbe 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -159,8 +159,8 @@
                 "disp_therm"
             ],
             "Coefficient":[
-                "0.5",
-                "0.5"
+                "0.6",
+                "0.4"
             ],
             "Offset":-200,
             "HotThreshold":[
@@ -185,10 +185,10 @@
                 "quiet_therm"
             ],
             "Coefficient":[
-                "0.465",
-                "0.535"
+                "0.559",
+                "0.441"
             ],
-            "Offset":-1824,
+            "Offset":-1771,
             "HotThreshold":[
                 "NAN",
                 "NAN",
@@ -237,10 +237,10 @@
                 "quiet_therm"
             ],
             "Coefficient":[
-                "0.650",
-                "0.350"
+                "0.6",
+                "0.4"
             ],
-            "Offset":-1700,
+            "Offset":-500,
             "HotThreshold":[
                 "NAN",
                 "NAN",
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index b9c5991..fb762bb 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -150,19 +150,19 @@
             "PassiveDelay":7000
         },
         {
-            "Name":"VIRTUAL-QI-USB",
+            "Name":"VIRTUAL-QUIET-USB",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
-                "qi_therm",
+                "quiet_therm",
                 "usb_pwr_therm"
             ],
             "Coefficient":[
-                "0.680",
-                "0.320"
+                "0.973",
+                "0.027"
             ],
-            "Offset":-2800,
+            "Offset":-2200,
             "HotThreshold":[
                 "NAN",
                 "NAN",
@@ -185,8 +185,8 @@
                 "quiet_therm"
             ],
             "Coefficient":[
-                "0.52",
-                "0.48"
+                "0.580",
+                "0.420"
             ],
             "Offset":-500,
             "HotThreshold":[
@@ -211,10 +211,10 @@
                 "disp_therm"
             ],
             "Coefficient":[
-                "0.7",
-                "0.3"
+                "0.550",
+                "0.450"
             ],
-            "Offset":-500,
+            "Offset":3000,
             "HotThreshold":[
                 "NAN",
                 "NAN",
@@ -237,10 +237,10 @@
                 "quiet_therm"
             ],
             "Coefficient":[
-                "0.4",
-                "0.6"
+                "0.6",
+                "0.4"
             ],
-            "Offset":-1500,
+            "Offset":-400,
             "HotThreshold":[
                 "NAN",
                 "NAN",
@@ -286,7 +286,7 @@
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
             "Combination":[
-                "VIRTUAL-QI-USB",
+                "VIRTUAL-QUIET-USB",
                 "VIRTUAL-USB-QUIET",
                 "VIRTUAL-GNSS-DISP"
             ],
@@ -420,7 +420,7 @@
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
             "Combination":[
-                "VIRTUAL-QI-USB",
+                "VIRTUAL-QUIET-USB",
                 "VIRTUAL-USB-QUIET",
                 "VIRTUAL-GNSS-DISP"
             ],
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index be287e8..961cc12 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -127,7 +127,7 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 3
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0
 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
-[HAL]minimum_system_offset_uwbtime0=200
+[HAL]minimum_system_offset_uwbtime0=500
 coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500