diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 4075524..c97d5e2 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -178,6 +178,9 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_COPY_FILES += \
         device/google/tangorpro/cast_auth/tangor_ica.crt:$(TARGET_COPY_OUT_VENDOR)/etc/cert-chain.crt
 
+PRODUCT_PACKAGES += \
+        libcast_auth
+
 PRODUCT_PACKAGES_DEBUG += \
         test_cast_auth
 
diff --git a/powerhint.json b/powerhint.json
index a7d1306..b129090 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -728,42 +728,6 @@
       "Duration": 2000,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "984000"
-    },
-    {
-      "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "1024000"
-    },
-    {
-      "PowerHint": "CAMERA_THERMAL_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "1098000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "1426000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "1197000"
-    },
-    {
-      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 1000,
-      "Value": "1401000"
-    },
     {
       "PowerHint": "CAMERA_SHOT",
       "Node": "MemFreq",
@@ -1064,24 +1028,6 @@
       "Duration": 0,
       "Value": "0"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1826000"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUMidClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1491000"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPULittleClusterMaxFreq",
-      "Duration": 0,
-      "Value": "1401000"
-    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "MemFreq",
diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index 837e9a2..e708c65 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -96,7 +96,6 @@
          The same as config_displayWhiteBalanceAmbientColorTemperatures, but with a stronger
          visual adjustment. -->
     <array name="config_displayWhiteBalanceStrongAmbientColorTemperatures">
-        <item>2500</item>
         <item>3000</item>
         <item>3500</item>
         <item>4000</item>
@@ -114,7 +113,6 @@
          The same as config_displayWhiteBalanceDisplayColorTemperatures, but with a stronger
          visual adjustment. -->
     <array name="config_displayWhiteBalanceStrongDisplayColorTemperatures">
-        <item>3500</item>
         <item>4000</item>
         <item>4600</item>
         <item>5400</item>
@@ -243,7 +241,7 @@
          The ambient color temperature (in cct) to which we interpolates towards to when the
          ambient brightness is within the low light range, see
          config_displayWhiteBalanceLowLightAmbientBrightnesses. -->
-    <item name="config_displayWhiteBalanceLowLightAmbientColorTemperature" format="float" type="dimen">3500.0</item>
+    <item name="config_displayWhiteBalanceLowLightAmbientColorTemperature" format="float" type="dimen">4000.0</item>
 
     <!-- See DisplayWhiteBalanceController.
          A float array containing a list of ambient brightnesses, in Lux. This array,
diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json
index 6dd33f0..300cc43 100644
--- a/thermal_info_config_tangorpro.json
+++ b/thermal_info_config_tangorpro.json
@@ -3,17 +3,17 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", "50.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", "35.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
-            "Multiplier":0.001,
-            "PollingDelay":60000,
-            "PassiveDelay":7000
+            "Multiplier":0.001
         },
         {
             "Name":"charger_skin_therm",
@@ -27,8 +27,11 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"battery",
@@ -106,11 +109,11 @@
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
             "VirtualSensor":true,
-            "TriggerSensor":"quiet_therm",
+            "TriggerSensor":["disp_therm", "neutral_therm"],
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
-            "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.0", "140.0"],
+            "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.5", "56.0"],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -122,11 +125,11 @@
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
-            "TriggerSensor":"quiet_therm",
+            "TriggerSensor":["disp_therm", "neutral_therm"],
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
-            "HotThreshold":["NAN", "37.0", "43.0", "45.0", "47.0", "51.0", "140.0"],
+            "HotThreshold":["NAN", "37.0", "43.0", "45.0", "47.0", "51.5", "56.0"],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -138,11 +141,11 @@
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
-            "TriggerSensor":"quiet_therm",
+            "TriggerSensor":["disp_therm", "neutral_therm"],
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
-            "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.0", "140.0"],
+            "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.5", "56.0"],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -207,7 +210,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "138.0", "NAN"],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "54.0", "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
             "Multiplier":0.001,
             "Monitor":true,