diff --git a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index bd5eb09e..116b0df5 100644
--- a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -73,4 +73,7 @@
 
     <!--  Whether to use a machine learning model for back gesture falsing. -->
     <bool name="config_useBackGestureML">false</bool>
+
+    <!-- Whether to use deadzone with nav bar -->
+    <bool name="config_useDeadZone">false</bool>
 </resources>
diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc
index c63cfa7d..cc70e3ec 100644
--- a/conf/init.caiman.rc
+++ b/conf/init.caiman.rc
@@ -79,3 +79,7 @@ on property:sys.boot_completed=1
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=GWVK6
     setprop audio.camerasound.force true
+
+# Enable bootstrap when warrarnty is set
+on boot && property:ro.boot.warranty.sku=*
+    setprop setupwizard.feature.provisioning_profile_mode true
\ No newline at end of file
diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc
index 51d7027f..ca74c2b8 100644
--- a/conf/init.komodo.rc
+++ b/conf/init.komodo.rc
@@ -83,3 +83,7 @@ on property:sys.boot_completed=1
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=GQ57S
     setprop audio.camerasound.force true
+
+# Enable bootstrap when warrarnty is set
+on boot && property:ro.boot.warranty.sku=*
+    setprop setupwizard.feature.provisioning_profile_mode true
diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc
index f0626726..b1aeeb19 100644
--- a/conf/init.tokay.rc
+++ b/conf/init.tokay.rc
@@ -81,3 +81,7 @@ on fs
 # it should be written by the system init.
 on property:ro.boot.hardware.sku=G1B60
     setprop audio.camerasound.force true
+
+# Enable bootstrap when warrarnty is set
+on boot && property:ro.boot.warranty.sku=*
+    setprop setupwizard.feature.provisioning_profile_mode true
\ No newline at end of file
diff --git a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 8d5d2460..7b3e4c74 100644
--- a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -73,4 +73,7 @@
 
     <!--  Whether to use a machine learning model for back gesture falsing. -->
     <bool name="config_useBackGestureML">false</bool>
+
+    <!-- Whether to use deadzone with nav bar -->
+    <bool name="config_useDeadZone">false</bool>
 </resources>
diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json
index cf136b77..03f0f21b 100644
--- a/thermal/thermal_info_config_caiman.json
+++ b/thermal/thermal_info_config_caiman.json
@@ -967,7 +967,7 @@
             "PIDInfo": {
                 "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
                 "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
                 "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
@@ -979,7 +979,7 @@
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
+                    "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
                 }
             ],
             "BindedCdevInfo": [
diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json
index d491fadd..f2ad61be 100644
--- a/thermal/thermal_info_config_charge_caiman.json
+++ b/thermal/thermal_info_config_charge_caiman.json
@@ -196,7 +196,7 @@
             "PIDInfo": {
                 "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
                 "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
                 "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
@@ -208,7 +208,7 @@
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
+                    "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
                 }
             ],
             "BindedCdevInfo": [
diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json
index 6ae44ce1..1851ceb4 100644
--- a/thermal/thermal_info_config_charge_komodo.json
+++ b/thermal/thermal_info_config_charge_komodo.json
@@ -207,7 +207,7 @@
             "PIDInfo": {
                 "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
                 "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
                 "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
@@ -219,7 +219,7 @@
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
+                    "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
                 }
             ],
             "BindedCdevInfo": [
diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json
index 64d2197f..740ecfa1 100644
--- a/thermal/thermal_info_config_charge_tokay.json
+++ b/thermal/thermal_info_config_charge_tokay.json
@@ -174,7 +174,7 @@
             "PIDInfo": {
                 "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
                 "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
                 "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
@@ -186,7 +186,7 @@
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
+                    "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
                 }
             ],
             "BindedCdevInfo": [
diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json
index ed4db31f..22db4453 100644
--- a/thermal/thermal_info_config_komodo.json
+++ b/thermal/thermal_info_config_komodo.json
@@ -990,7 +990,7 @@
             "PIDInfo": {
                 "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
                 "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
                 "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
@@ -1002,7 +1002,7 @@
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
+                    "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
                 }
             ],
             "BindedCdevInfo": [
diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json
index e315a9c8..e2c71651 100644
--- a/thermal/thermal_info_config_tokay.json
+++ b/thermal/thermal_info_config_tokay.json
@@ -924,7 +924,7 @@
             "PIDInfo": {
                 "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
                 "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
-                "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
+                "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"],
                 "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
                 "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
                 "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
@@ -936,7 +936,7 @@
             "ExcludedPowerInfo": [
                 {
                     "PowerRail": "PARTIAL_SYSTEM_POWER",
-                    "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
+                    "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0]
                 }
             ],
             "BindedCdevInfo": [
diff --git a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index dbc18d0f..6564d57a 100644
--- a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -73,4 +73,7 @@
 
     <!--  Whether to use a machine learning model for back gesture falsing. -->
     <bool name="config_useBackGestureML">false</bool>
+
+    <!-- Whether to use deadzone with nav bar -->
+    <bool name="config_useDeadZone">false</bool>
 </resources>