diff --git a/device-shiba.mk b/device-shiba.mk
index 289d5cc..af808a7 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -190,6 +190,9 @@ else
 include device/google/gs101/fingerprint/udfps_factory.mk
 endif
 
+# Display
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500
+
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
index 718db78..a01041e 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -126,6 +126,13 @@
     <integer name="config_autoBrightnessBrighteningLightDebounce">1000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
 
+    <!-- The default refresh rate. We manage this using the peak refresh rate setting. Set this
+         value to 0 so it has no effect. -->
+    <integer name="config_defaultRefreshRate">0</integer>
+
+    <!-- The default peak refresh rate. -->
+    <integer name="config_defaultPeakRefreshRate">120</integer>
+
     <integer-array name="config_ambientThresholdLevels">
         <item>2</item>
         <item>3</item>