diff --git a/audio/comet/aidl_config/audio_platform_configuration.xml b/audio/comet/aidl_config/audio_platform_configuration.xml
index 3604324..71e7a13 100644
--- a/audio/comet/aidl_config/audio_platform_configuration.xml
+++ b/audio/comet/aidl_config/audio_platform_configuration.xml
@@ -88,8 +88,8 @@
     <latency source="primary-playback" sink="speaker" milliseconds="20" />
     <latency source="primary-playback" sink="usb-device" milliseconds="10" />
     <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
 
     <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
     <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -103,9 +103,11 @@
 
     <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
 
-    <latency source="microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
-    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
+    <latency source="microphones" sink="primary-capture" milliseconds="300" />
+    <latency source="back-microphones" sink="primary-capture" milliseconds="300" />
+    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
+    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
+    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
   </latencies>
 
   <spatialCapture>
diff --git a/audio/comet/aidl_config/audio_policy_volumes.xml b/audio/comet/aidl_config/audio_policy_volumes.xml
index 9986a92..046a3a1 100644
--- a/audio/comet/aidl_config/audio_policy_volumes.xml
+++ b/audio/comet/aidl_config/audio_policy_volumes.xml
@@ -52,10 +52,9 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4960</point>
-        <point>33,-3650</point>
-        <point>66,-2650</point>
-        <point>100,-1250</point>
+        <point>1,-4000</point>
+        <point>71,-1800</point>
+        <point>100,-1000</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -66,7 +65,8 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4735</point>
+        <point>1,-2800</point>
+        <point>71,-700</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -78,9 +78,10 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5800</point>
+        <point>1,-5750</point>
         <point>32,-3200</point>
-        <point>80,-900</point>
+        <point>60,-1700</point>
+        <point>80,-1000</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -92,7 +93,9 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-5900</point>
+        <point>0,-3500</point>
+        <point>1,-3000</point>
+        <point>71,-600</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -104,7 +107,9 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4920</point>
+        <point>1,-3300</point>
+        <point>57,-1700</point>
+        <point>71,-1100</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -158,8 +163,9 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6460</point>
-        <point>100,-1200</point>
+        <point>1,-4900</point>
+        <point>57,-2200</point>
+        <point>100,-550</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/comet/config/audio_policy_volumes.xml b/audio/comet/config/audio_policy_volumes.xml
index 9986a92..046a3a1 100644
--- a/audio/comet/config/audio_policy_volumes.xml
+++ b/audio/comet/config/audio_policy_volumes.xml
@@ -52,10 +52,9 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4960</point>
-        <point>33,-3650</point>
-        <point>66,-2650</point>
-        <point>100,-1250</point>
+        <point>1,-4000</point>
+        <point>71,-1800</point>
+        <point>100,-1000</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -66,7 +65,8 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4735</point>
+        <point>1,-2800</point>
+        <point>71,-700</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -78,9 +78,10 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5800</point>
+        <point>1,-5750</point>
         <point>32,-3200</point>
-        <point>80,-900</point>
+        <point>60,-1700</point>
+        <point>80,-1000</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -92,7 +93,9 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-5900</point>
+        <point>0,-3500</point>
+        <point>1,-3000</point>
+        <point>71,-600</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -104,7 +107,9 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4920</point>
+        <point>1,-3300</point>
+        <point>57,-1700</point>
+        <point>71,-1100</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -158,8 +163,9 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6460</point>
-        <point>100,-1200</point>
+        <point>1,-4900</point>
+        <point>57,-2200</point>
+        <point>100,-550</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/comet/tuning/waves/waves_preset.mps b/audio/comet/tuning/waves/waves_preset.mps
index 8cc39c7..7019f65 100644
Binary files a/audio/comet/tuning/waves/waves_preset.mps and b/audio/comet/tuning/waves/waves_preset.mps differ
diff --git a/comet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/comet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 0d66cda..4d9d213 100644
--- a/comet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/comet/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -29,7 +29,7 @@
                to brightness values; -1 means keeping the current brightness. -->
     <integer-array name="config_doze_brightness_sensor_to_brightness">
         <item>-1</item> <!-- 0: OFF -->
-        <item>2</item> <!-- 1: NIGHT -->
+        <item>1</item> <!-- 1: NIGHT -->
         <item>2</item> <!-- 2: LOW -->
         <item>9</item> <!-- 3: HIGH -->
         <item>9</item> <!-- 4: SUN -->
@@ -41,7 +41,7 @@
                -1 means keeping the current opacity. -->
     <integer-array name="config_doze_brightness_sensor_to_scrim_opacity">
         <item>-1</item> <!-- 0: OFF -->
-        <item>133</item> <!-- 1: NIGHT -->
+        <item>0</item> <!-- 1: NIGHT -->
         <item>0</item> <!-- 2: LOW -->
         <item>0</item> <!-- 3: HIGH -->
         <item>0</item> <!-- 4: SUN -->
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index ea20559..0942852 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -43,7 +43,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x17
+Chip_Configuration_mems_data_Configuration=0x37
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 074837c..859803f 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -166,7 +166,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1
 GlueLayer_isReqUBPFromPressureSensor=1
 GlueLayer_IsMemsEnable=1
 GlueLayer_MeasCorrCap=7
-Chip_Configuration_mems_data_Configuration=0x17
+Chip_Configuration_mems_data_Configuration=0x37
 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
 CP_LocTech_PrimaryConst=0
 CP_LocTech_Constraints=1
diff --git a/powerhint-comet.json b/powerhint-comet.json
index 669e27c..5a4b655 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -753,6 +753,17 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "VIRTUAL-SKIN-CPU-LIGHT-ODPM",
+      "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-LIGHT-ODPM.profile",
+      "Values": [
+        "",
+        "game"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true,
+      "Type": "Property"
+    },
     {
       "Name": "VIRTUAL-SKIN-CPU-MID",
       "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile",
@@ -2453,6 +2464,12 @@
       "Duration": 0,
       "Value": "419000"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "VIRTUAL-SKIN-CPU-LIGHT-ODPM",
+      "Duration": 0,
+      "Value": "game"
+    },
     {
       "PowerHint": "GAME",
       "Node": "VIRTUAL-SKIN-CPU-MID",
diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json
index 7906120..9dd09d1 100644
--- a/thermal/thermal_info_config_comet.json
+++ b/thermal/thermal_info_config_comet.json
@@ -225,6 +225,31 @@
                     "BindedPowerRail": "S3M_VDD_CPUCL2",
                     "CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
                 }
+            ],
+            "Profile": [
+                {
+                    "Mode": "game",
+                    "BindedCdevInfo": [
+                        {
+                           "CdevRequest": "thermal-cpufreq-0",
+                           "BindedPowerRail": "S4M_VDD_CPUCL0",
+                           "MaxReleaseStep": 1,
+                           "Disabled":true
+                        },
+                        {
+                           "CdevRequest": "thermal-cpufreq-1",
+                           "BindedPowerRail": "S2M_VDD_CPUCL1",
+                           "MaxReleaseStep": 1,
+                           "Disabled":true
+                        },
+                        {
+                           "CdevRequest": "thermal-cpufreq-2",
+                           "BindedPowerRail": "S3M_VDD_CPUCL2",
+                           "MaxReleaseStep": 1,
+                           "Disabled":true
+                        }
+                    ]
+                }
             ]
         },
         {
@@ -349,7 +374,7 @@
                     "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
-                    "CdevCeiling": [0, 10, 10, 10, 10, 10, 10]
+                    "CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",
@@ -453,8 +478,8 @@
                     "MaxReleaseStep": 1,
                     "MaxThrottleStep": 1,
                     "BindedPowerRail": "S4M_VDD_CPUCL0",
-                    "CdevCeiling": [0, 10, 10, 10, 10, 11, 11],
-                    "LimitInfo": [0, 0, 0, 0, 0, 11, 11]
+                    "CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
+                    "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
                 },
                 {
                     "CdevRequest": "thermal-cpufreq-1",