diff --git a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 7a655ac..c808e5b 100644
--- a/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/bluejay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -65,8 +65,6 @@
      -->
     <string name="config_rounded_mask" translatable="false">M 71,0 C 33,0 22,-1 10,10 -1,22 0,33 0,71</string>
 
-    <bool name="config_roundedCornerMultipleRadius">true</bool>
-
     <!-- Configure 13px of extra protection around the front-facing camera -->
     <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
         M 494,66
diff --git a/device-bluejay.mk b/device-bluejay.mk
index 9e41bc5..cf052b5 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -119,7 +119,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=2
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/powerhint.json b/powerhint.json
index dfbc459..2dc1abc 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -143,9 +143,9 @@
       "Path": "/proc/vendor_sched/ta_uclamp_min",
       "Values": [
         "553",
-        "108",
+        "126",
         "1",
-        "42"
+        "55"
       ],
       "ResetOnInit": true
     },
@@ -153,9 +153,9 @@
       "Name": "SFUClampBoost",
       "Path": "/proc/vendor_sched/sf_uclamp_min",
       "Values": [
-        "125",
-        "65",
-        "30"
+        "160",
+        "85",
+        "39"
       ],
       "ResetOnInit": true
     },
@@ -163,7 +163,7 @@
       "Name": "MLUclampBoost",
       "Path": "/proc/vendor_sched/nnapi_uclamp_min",
       "Values": [
-          "154",
+          "180",
           "512"
       ],
       "DefaultIndex": 0,
@@ -250,6 +250,15 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "FGPreferIdle",
+      "Path": "/proc/vendor_sched/fg_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDPreferHighCap",
       "Path": "/proc/vendor_sched/cam_prefer_high_cap",
@@ -411,6 +420,15 @@
         "1"
       ],
       "DefaultIndex": 0
+    },
+    {
+      "Name": "PMU_POLL",
+      "Path": "/proc/vendor_sched/pmu_poll_enable",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "DefaultIndex": 0
     }
   ],
   "Actions": [
@@ -418,7 +436,7 @@
       "PowerHint": "INTERACTION",
       "Node": "SFUClampBoost",
       "Duration": 5000,
-      "Value": "65"
+      "Value": "85"
     },
     {
       "PowerHint": "DEVICE_IDLE",
@@ -430,7 +448,7 @@
       "PowerHint": "LAUNCH",
       "Node": "SFUClampBoost",
       "Duration": 5000,
-      "Value": "65"
+      "Value": "85"
     },
     {
       "PowerHint": "LAUNCH",
@@ -1134,11 +1152,17 @@
       "Duration": 3600000,
       "Value": "2401000"
     },
+    {
+      "PowerHint": "LOW_POWER",
+      "Node": "PMU_POLL",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "REFRESH_60FPS",
       "Node": "TAUClampBoost",
       "Duration": 0,
-      "Value": "42"
+      "Value": "55"
     },
     {
       "PowerHint": "ADPF_DISABLE_TA_BOOST",
@@ -1170,7 +1194,13 @@
       "PowerHint": "BOOST_60HZ",
       "Node": "TAUClampBoost",
       "Duration": 200,
-      "Value": "108"
+      "Value": "126"
+    },
+    {
+      "PowerHint": "DISPLAY_IDLE",
+      "Node": "FGPreferIdle",
+      "Duration": 0,
+      "Value": "0"
     },
     {
       "PowerHint": "DISPLAY_IDLE",
@@ -1223,6 +1253,12 @@
       "Duration": 0,
       "Value": "400000"
     },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
+      "Node": "PMU_POLL",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE",
       "Node": "BigControlTempSet",
@@ -1331,6 +1367,12 @@
       "Duration": 1000,
       "Value": "1"
     },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
+      "Node": "PMU_POLL",
+      "Duration": 0,
+      "Value": "1"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY",
       "Node": "BigControlTempSet",
@@ -1414,6 +1456,12 @@
       "Node": "RestrictedCpuset",
       "Duration": 0,
       "Value": "0-3"
+    },
+    {
+      "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT",
+      "Node": "PMU_POLL",
+      "Duration": 0,
+      "Value": "1"
     }
   ],
   "AdpfConfig": [