diff --git a/caiman/device-lineage.mk b/caiman/device-lineage.mk
index 7a015390..36b93db5 100644
--- a/caiman/device-lineage.mk
+++ b/caiman/device-lineage.mk
@@ -8,4 +8,7 @@ $(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
 
 DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
 
+PRODUCT_PACKAGES += \
+    PixelDisplayServiceOverlayCaiman
+
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/Android.bp b/caiman/rro_overlays/PixelDisplayServiceOverlay/Android.bp
new file mode 100644
index 00000000..8650aa23
--- /dev/null
+++ b/caiman/rro_overlays/PixelDisplayServiceOverlay/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2024 The Android Open Source Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "PixelDisplayServiceOverlayCaiman",
+    product_specific: true,
+}
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml b/caiman/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..6af8efbb
--- /dev/null
+++ b/caiman/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 The Android Open Source Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.pixeldisplayservice.overlay.caiman">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="1"
+        android:targetPackage="com.android.pixeldisplayservice" />
+</manifest>
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_0_ZA9388.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_0_ZA9388.png
new file mode 100644
index 00000000..7d50cc6c
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_0_ZA9388.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_10_ZA8038.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_10_ZA8038.png
new file mode 100644
index 00000000..3aca3c8f
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_10_ZA8038.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_11_ZA7925.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_11_ZA7925.png
new file mode 100644
index 00000000..968a7d4f
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_11_ZA7925.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_12_ZA7812.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_12_ZA7812.png
new file mode 100644
index 00000000..925a8a5e
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_12_ZA7812.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_13_ZA7700.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_13_ZA7700.png
new file mode 100644
index 00000000..734eb39d
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_13_ZA7700.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_14_ZA7588.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_14_ZA7588.png
new file mode 100644
index 00000000..029c3dae
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_14_ZA7588.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_15_ZA7362.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_15_ZA7362.png
new file mode 100644
index 00000000..1685055b
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_15_ZA7362.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_16_ZA7138.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_16_ZA7138.png
new file mode 100644
index 00000000..9fc76a15
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_16_ZA7138.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_17_ZA7025.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_17_ZA7025.png
new file mode 100644
index 00000000..fbdc7fbb
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_17_ZA7025.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_18_ZA6800.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_18_ZA6800.png
new file mode 100644
index 00000000..335f9191
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_18_ZA6800.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_19_ZA6667.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_19_ZA6667.png
new file mode 100644
index 00000000..71f2298f
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_19_ZA6667.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_1_ZA9275.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_1_ZA9275.png
new file mode 100644
index 00000000..806bf026
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_1_ZA9275.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_20_ZA6533_6333_05.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_20_ZA6533_6333_05.png
new file mode 100644
index 00000000..35ed7f9f
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_20_ZA6533_6333_05.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_21_ZA6533_6333_03.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_21_ZA6533_6333_03.png
new file mode 100644
index 00000000..ef76e5d5
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_21_ZA6533_6333_03.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_2_ZA9162.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_2_ZA9162.png
new file mode 100644
index 00000000..951f95f7
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_2_ZA9162.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_3_ZA9050.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_3_ZA9050.png
new file mode 100644
index 00000000..65073f13
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_3_ZA9050.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_4_ZA8938.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_4_ZA8938.png
new file mode 100644
index 00000000..7e7b3ec2
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_4_ZA8938.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_5_ZA8825.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_5_ZA8825.png
new file mode 100644
index 00000000..085d9038
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_5_ZA8825.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_6_ZA8712.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_6_ZA8712.png
new file mode 100644
index 00000000..2910f4a3
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_6_ZA8712.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_7_ZA8488.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_7_ZA8488.png
new file mode 100644
index 00000000..f6dcbc0c
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_7_ZA8488.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_8_ZA8375.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_8_ZA8375.png
new file mode 100644
index 00000000..3788f0ab
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_8_ZA8375.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_9_ZA8150.png b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_9_ZA8150.png
new file mode 100644
index 00000000..85d331e0
Binary files /dev/null and b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_9_ZA8150.png differ
diff --git a/caiman/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
new file mode 100644
index 00000000..48101eeb
--- /dev/null
+++ b/caiman/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 The Android Open Source Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <array name="config_za_compensation_brightness_thresholds_list">
+        <item>@array/config_za_primary_display_brightness_thresholds_list</item>
+    </array>
+    <array name="config_za_compensation_images_list">
+        <item>@array/config_za_primary_display_compensation_images_list</item>
+    </array>
+    <array name="config_za_compensation_opr_thresholds_list">
+        <item>@array/config_za_primary_display_opr_thresholds_list</item>
+    </array>
+    <array name="config_za_primary_display_brightness_thresholds_list">
+        <item>@array/config_za_primary_display_condition1_brightness_thresholds</item>
+        <item>@array/config_za_primary_display_condition2_brightness_thresholds</item>
+    </array>
+    <array name="config_za_primary_display_compensation_images_list">
+        <item>@array/config_za_primary_display_condition1_compensation_images</item>
+        <item>@array/config_za_primary_display_condition2_compensation_images</item>
+    </array>
+    <array name="config_za_primary_display_condition1_brightness_thresholds">
+        <item>0.41463414</item>
+        <item>0.42682928</item>
+        <item>0.4390244</item>
+        <item>0.46341464</item>
+        <item>0.4878049</item>
+        <item>0.5365854</item>
+        <item>0.58536583</item>
+        <item>0.63414633</item>
+        <item>0.68292683</item>
+        <item>0.73170733</item>
+        <item>0.7804878</item>
+        <item>0.9268293</item>
+    </array>
+    <array name="config_za_primary_display_condition1_compensation_images">
+        <item>@drawable/ZACI_0_2_ZA9162</item>
+        <item>@drawable/ZACI_0_4_ZA8938</item>
+        <item>@drawable/ZACI_0_6_ZA8712</item>
+        <item>@drawable/ZACI_0_7_ZA8488</item>
+        <item>@drawable/ZACI_0_9_ZA8150</item>
+        <item>@drawable/ZACI_0_13_ZA7700</item>
+        <item>@drawable/ZACI_0_14_ZA7588</item>
+        <item>@drawable/ZACI_0_15_ZA7362</item>
+        <item>@drawable/ZACI_0_16_ZA7138</item>
+        <item>@drawable/ZACI_0_18_ZA6800</item>
+        <item>@drawable/ZACI_0_20_ZA6533_6333_05</item>
+        <item>@drawable/ZACI_0_21_ZA6533_6333_03</item>
+    </array>
+    <array name="config_za_primary_display_condition1_opr_thresholds_list">
+        <item>0.5</item>
+        <item>0.4</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+    </array>
+    <array name="config_za_primary_display_condition2_brightness_thresholds">
+        <item>0.41463414</item>
+        <item>0.42682928</item>
+        <item>0.4390244</item>
+        <item>0.46341464</item>
+        <item>0.4878049</item>
+        <item>0.5121951</item>
+        <item>0.5365854</item>
+        <item>0.5609756</item>
+        <item>0.58536583</item>
+        <item>0.6097561</item>
+        <item>0.63414633</item>
+        <item>0.6585366</item>
+        <item>0.68292683</item>
+        <item>0.70731705</item>
+        <item>0.73170733</item>
+        <item>0.75609756</item>
+        <item>0.80487806</item>
+        <item>0.85365856</item>
+        <item>0.9268293</item>
+    </array>
+    <array name="config_za_primary_display_condition2_compensation_images">
+        <item>@drawable/ZACI_0_0_ZA9388</item>
+        <item>@drawable/ZACI_0_1_ZA9275</item>
+        <item>@drawable/ZACI_0_2_ZA9162</item>
+        <item>@drawable/ZACI_0_3_ZA9050</item>
+        <item>@drawable/ZACI_0_5_ZA8825</item>
+        <item>@drawable/ZACI_0_6_ZA8712</item>
+        <item>@drawable/ZACI_0_7_ZA8488</item>
+        <item>@drawable/ZACI_0_8_ZA8375</item>
+        <item>@drawable/ZACI_0_9_ZA8150</item>
+        <item>@drawable/ZACI_0_11_ZA7925</item>
+        <item>@drawable/ZACI_0_12_ZA7812</item>
+        <item>@drawable/ZACI_0_14_ZA7588</item>
+        <item>@drawable/ZACI_0_15_ZA7362</item>
+        <item>@drawable/ZACI_0_16_ZA7138</item>
+        <item>@drawable/ZACI_0_17_ZA7025</item>
+        <item>@drawable/ZACI_0_18_ZA6800</item>
+        <item>@drawable/ZACI_0_19_ZA6667</item>
+        <item>@drawable/ZACI_0_20_ZA6533_6333_05</item>
+        <item>@drawable/ZACI_0_21_ZA6533_6333_03</item>
+    </array>
+    <array name="config_za_primary_display_condition2_opr_thresholds_list">
+        <item>0.6</item>
+        <item>0.5</item>
+        <item>0.4</item>
+        <item>0.33</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+    </array>
+    <array name="config_za_primary_display_opr_thresholds_list">
+        <item>@array/config_za_primary_display_condition1_opr_thresholds_list</item>
+        <item>@array/config_za_primary_display_condition2_opr_thresholds_list</item>
+    </array>
+    <bool name="config_compensation_animation_enabled">true</bool>
+    <item type="dimen" name="config_compensation_filter_intercept">10.0</item>
+    <item type="dimen" name="config_lbe_lux_switch_threshold">1.0</item>
+    <item type="dimen" name="config_za_compensation_brightness_enter_threshold">0.4</item>
+    <integer name="config_ambient_brightness_changed_debounce_ms">500</integer>
+    <integer name="config_compensation_filter_horizon">1500</integer>
+</resources>
diff --git a/komodo/device-lineage.mk b/komodo/device-lineage.mk
index 7a015390..0d7c69c8 100644
--- a/komodo/device-lineage.mk
+++ b/komodo/device-lineage.mk
@@ -8,4 +8,7 @@ $(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
 
 DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
 
+PRODUCT_PACKAGES += \
+    PixelDisplayServiceOverlayKomodo
+
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/Android.bp b/komodo/rro_overlays/PixelDisplayServiceOverlay/Android.bp
new file mode 100644
index 00000000..5dd6c427
--- /dev/null
+++ b/komodo/rro_overlays/PixelDisplayServiceOverlay/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2024 The Android Open Source Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "PixelDisplayServiceOverlayKomodo",
+    product_specific: true,
+}
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml b/komodo/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..02078ca1
--- /dev/null
+++ b/komodo/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 The Android Open Source Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.pixeldisplayservice.overlay.komodo">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="1"
+        android:targetPackage="com.android.pixeldisplayservice" />
+</manifest>
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_0_ZA9388.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_0_ZA9388.png
new file mode 100644
index 00000000..ace78604
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_0_ZA9388.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_10_ZA8038.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_10_ZA8038.png
new file mode 100644
index 00000000..d2fcbc27
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_10_ZA8038.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_11_ZA7925.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_11_ZA7925.png
new file mode 100644
index 00000000..ad887ca3
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_11_ZA7925.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_12_ZA7812.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_12_ZA7812.png
new file mode 100644
index 00000000..c506c2f6
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_12_ZA7812.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_13_ZA7700.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_13_ZA7700.png
new file mode 100644
index 00000000..0f01b350
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_13_ZA7700.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_14_ZA7588.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_14_ZA7588.png
new file mode 100644
index 00000000..d23c4b95
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_14_ZA7588.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_15_ZA7362.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_15_ZA7362.png
new file mode 100644
index 00000000..3892a969
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_15_ZA7362.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_16_ZA7138.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_16_ZA7138.png
new file mode 100644
index 00000000..fdf1d4dc
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_16_ZA7138.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_17_ZA7025.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_17_ZA7025.png
new file mode 100644
index 00000000..8bf2583a
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_17_ZA7025.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_18_ZA6800.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_18_ZA6800.png
new file mode 100644
index 00000000..cfcddfcb
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_18_ZA6800.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_19_ZA6667.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_19_ZA6667.png
new file mode 100644
index 00000000..7846929e
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_19_ZA6667.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_1_ZA9275.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_1_ZA9275.png
new file mode 100644
index 00000000..d8b96c39
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_1_ZA9275.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_20_ZA6533.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_20_ZA6533.png
new file mode 100644
index 00000000..a0661e1f
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_20_ZA6533.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_21_ZA64_61_05.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_21_ZA64_61_05.png
new file mode 100644
index 00000000..0fe8adae
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_21_ZA64_61_05.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_22_ZA64_61_03.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_22_ZA64_61_03.png
new file mode 100644
index 00000000..cf62cd63
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_22_ZA64_61_03.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_2_ZA9162.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_2_ZA9162.png
new file mode 100644
index 00000000..002fbd46
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_2_ZA9162.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_3_ZA9050.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_3_ZA9050.png
new file mode 100644
index 00000000..89238781
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_3_ZA9050.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_4_ZA8938.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_4_ZA8938.png
new file mode 100644
index 00000000..5dd75199
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_4_ZA8938.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_5_ZA8825.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_5_ZA8825.png
new file mode 100644
index 00000000..a0151086
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_5_ZA8825.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_6_ZA8712.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_6_ZA8712.png
new file mode 100644
index 00000000..12c4e8b9
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_6_ZA8712.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_7_ZA8488.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_7_ZA8488.png
new file mode 100644
index 00000000..42b6fe69
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_7_ZA8488.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_8_ZA8375.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_8_ZA8375.png
new file mode 100644
index 00000000..f744d1b4
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_8_ZA8375.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_9_ZA8150.png b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_9_ZA8150.png
new file mode 100644
index 00000000..cdc5171c
Binary files /dev/null and b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_9_ZA8150.png differ
diff --git a/komodo/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
new file mode 100644
index 00000000..7819e73d
--- /dev/null
+++ b/komodo/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 The Android Open Source Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <array name="config_za_compensation_brightness_thresholds_list">
+        <item>@array/config_za_primary_display_brightness_thresholds_list</item>
+    </array>
+    <array name="config_za_compensation_images_list">
+        <item>@array/config_za_primary_display_compensation_images_list</item>
+    </array>
+    <array name="config_za_compensation_opr_thresholds_list">
+        <item>@array/config_za_primary_display_opr_thresholds_list</item>
+    </array>
+    <array name="config_za_primary_display_brightness_thresholds_list">
+        <item>@array/config_za_primary_display_condition1_brightness_thresholds</item>
+        <item>@array/config_za_primary_display_condition2_brightness_thresholds</item>
+    </array>
+    <array name="config_za_primary_display_compensation_images_list">
+        <item>@array/config_za_primary_display_condition1_compensation_images</item>
+        <item>@array/config_za_primary_display_condition2_compensation_images</item>
+    </array>
+    <array name="config_za_primary_display_condition1_brightness_thresholds">
+        <item>0.41463414</item>
+        <item>0.42682928</item>
+        <item>0.4390244</item>
+        <item>0.46341464</item>
+        <item>0.4878049</item>
+        <item>0.5365854</item>
+        <item>0.58536583</item>
+        <item>0.63414633</item>
+        <item>0.68292683</item>
+        <item>0.73170733</item>
+        <item>0.7804878</item>
+        <item>0.8292683</item>
+        <item>0.8780488</item>
+    </array>
+    <array name="config_za_primary_display_condition1_compensation_images">
+        <item>@drawable/ZACI_0_2_ZA9162</item>
+        <item>@drawable/ZACI_0_4_ZA8938</item>
+        <item>@drawable/ZACI_0_6_ZA8712</item>
+        <item>@drawable/ZACI_0_7_ZA8488</item>
+        <item>@drawable/ZACI_0_9_ZA8150</item>
+        <item>@drawable/ZACI_0_13_ZA7700</item>
+        <item>@drawable/ZACI_0_14_ZA7588</item>
+        <item>@drawable/ZACI_0_15_ZA7362</item>
+        <item>@drawable/ZACI_0_16_ZA7138</item>
+        <item>@drawable/ZACI_0_18_ZA6800</item>
+        <item>@drawable/ZACI_0_20_ZA6533</item>
+        <item>@drawable/ZACI_0_21_ZA64_61_05</item>
+        <item>@drawable/ZACI_0_22_ZA64_61_03</item>
+    </array>
+    <array name="config_za_primary_display_condition1_opr_thresholds_list">
+        <item>0.35</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+    </array>
+    <array name="config_za_primary_display_condition2_brightness_thresholds">
+        <item>0.41463414</item>
+        <item>0.42682928</item>
+        <item>0.4390244</item>
+        <item>0.46341464</item>
+        <item>0.4878049</item>
+        <item>0.5121951</item>
+        <item>0.5365854</item>
+        <item>0.5609756</item>
+        <item>0.58536583</item>
+        <item>0.6097561</item>
+        <item>0.63414633</item>
+        <item>0.6585366</item>
+        <item>0.68292683</item>
+        <item>0.70731705</item>
+        <item>0.73170733</item>
+        <item>0.75609756</item>
+        <item>0.7804878</item>
+        <item>0.8292683</item>
+        <item>0.8780488</item>
+        <item>1.0</item>
+    </array>
+    <array name="config_za_primary_display_condition2_compensation_images">
+        <item>@drawable/ZACI_0_0_ZA9388</item>
+        <item>@drawable/ZACI_0_1_ZA9275</item>
+        <item>@drawable/ZACI_0_2_ZA9162</item>
+        <item>@drawable/ZACI_0_3_ZA9050</item>
+        <item>@drawable/ZACI_0_5_ZA8825</item>
+        <item>@drawable/ZACI_0_6_ZA8712</item>
+        <item>@drawable/ZACI_0_7_ZA8488</item>
+        <item>@drawable/ZACI_0_8_ZA8375</item>
+        <item>@drawable/ZACI_0_9_ZA8150</item>
+        <item>@drawable/ZACI_0_11_ZA7925</item>
+        <item>@drawable/ZACI_0_12_ZA7812</item>
+        <item>@drawable/ZACI_0_14_ZA7588</item>
+        <item>@drawable/ZACI_0_15_ZA7362</item>
+        <item>@drawable/ZACI_0_16_ZA7138</item>
+        <item>@drawable/ZACI_0_17_ZA7025</item>
+        <item>@drawable/ZACI_0_18_ZA6800</item>
+        <item>@drawable/ZACI_0_19_ZA6667</item>
+        <item>@drawable/ZACI_0_20_ZA6533</item>
+        <item>@drawable/ZACI_0_21_ZA64_61_05</item>
+        <item>@drawable/ZACI_0_22_ZA64_61_03</item>
+    </array>
+    <array name="config_za_primary_display_condition2_opr_thresholds_list">
+        <item>0.5</item>
+        <item>0.4</item>
+        <item>0.33</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+        <item>0.3</item>
+    </array>
+    <array name="config_za_primary_display_opr_thresholds_list">
+        <item>@array/config_za_primary_display_condition1_opr_thresholds_list</item>
+        <item>@array/config_za_primary_display_condition2_opr_thresholds_list</item>
+    </array>
+    <bool name="config_compensation_animation_enabled">true</bool>
+    <item type="dimen" name="config_compensation_filter_intercept">10.0</item>
+    <item type="dimen" name="config_lbe_lux_switch_threshold">1.0</item>
+    <item type="dimen" name="config_za_compensation_brightness_enter_threshold">0.4</item>
+    <integer name="config_ambient_brightness_changed_debounce_ms">500</integer>
+    <integer name="config_compensation_filter_horizon">1500</integer>
+</resources>
diff --git a/tokay/device-lineage.mk b/tokay/device-lineage.mk
index 7a015390..7833465f 100644
--- a/tokay/device-lineage.mk
+++ b/tokay/device-lineage.mk
@@ -8,4 +8,7 @@ $(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
 
 DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
 
+PRODUCT_PACKAGES += \
+    PixelDisplayServiceOverlayTokay
+
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/Android.bp b/tokay/rro_overlays/PixelDisplayServiceOverlay/Android.bp
new file mode 100644
index 00000000..0eb3a933
--- /dev/null
+++ b/tokay/rro_overlays/PixelDisplayServiceOverlay/Android.bp
@@ -0,0 +1,9 @@
+//
+// Copyright (C) 2024 The Android Open Source Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "PixelDisplayServiceOverlayTokay",
+    product_specific: true,
+}
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml b/tokay/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..d4aaad63
--- /dev/null
+++ b/tokay/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 The Android Open Source Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.pixeldisplayservice.overlay.tokay">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="1"
+        android:targetPackage="com.android.pixeldisplayservice" />
+</manifest>
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_0_ZA9388.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_0_ZA9388.png
new file mode 100644
index 00000000..cdfc0cc9
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_0_ZA9388.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_10_ZA8038.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_10_ZA8038.png
new file mode 100644
index 00000000..d860f798
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_10_ZA8038.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_11_ZA7925.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_11_ZA7925.png
new file mode 100644
index 00000000..e222a31c
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_11_ZA7925.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_12_ZA7812.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_12_ZA7812.png
new file mode 100644
index 00000000..bb939aea
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_12_ZA7812.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_13_ZA7700.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_13_ZA7700.png
new file mode 100644
index 00000000..74dbbd73
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_13_ZA7700.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_14_ZA7588.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_14_ZA7588.png
new file mode 100644
index 00000000..2d587e0c
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_14_ZA7588.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_15_ZA7362.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_15_ZA7362.png
new file mode 100644
index 00000000..6e475683
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_15_ZA7362.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_16_ZA7138.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_16_ZA7138.png
new file mode 100644
index 00000000..23cf8a80
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_16_ZA7138.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_17_ZA7025.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_17_ZA7025.png
new file mode 100644
index 00000000..1ed7ac28
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_17_ZA7025.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_18_ZA6800.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_18_ZA6800.png
new file mode 100644
index 00000000..257c06fd
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_18_ZA6800.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_19_ZA6667.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_19_ZA6667.png
new file mode 100644
index 00000000..d9acd863
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_19_ZA6667.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_1_ZA9275.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_1_ZA9275.png
new file mode 100644
index 00000000..a5fbead2
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_1_ZA9275.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_20_ZA6533_6333_05.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_20_ZA6533_6333_05.png
new file mode 100644
index 00000000..1d2d4eb6
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_20_ZA6533_6333_05.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_21_ZA6533_6333_03.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_21_ZA6533_6333_03.png
new file mode 100644
index 00000000..ca9395a5
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_21_ZA6533_6333_03.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_2_ZA9162.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_2_ZA9162.png
new file mode 100644
index 00000000..222d7426
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_2_ZA9162.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_3_ZA9050.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_3_ZA9050.png
new file mode 100644
index 00000000..09b6406a
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_3_ZA9050.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_4_ZA8938.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_4_ZA8938.png
new file mode 100644
index 00000000..d6e9dfd9
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_4_ZA8938.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_5_ZA8825.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_5_ZA8825.png
new file mode 100644
index 00000000..9f2f0468
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_5_ZA8825.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_6_ZA8712.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_6_ZA8712.png
new file mode 100644
index 00000000..1d3920ca
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_6_ZA8712.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_7_ZA8488.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_7_ZA8488.png
new file mode 100644
index 00000000..cac41208
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_7_ZA8488.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_8_ZA8375.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_8_ZA8375.png
new file mode 100644
index 00000000..66bd8d91
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_8_ZA8375.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_9_ZA8150.png b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_9_ZA8150.png
new file mode 100644
index 00000000..e131aa0b
Binary files /dev/null and b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_9_ZA8150.png differ
diff --git a/tokay/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
new file mode 100644
index 00000000..29ab958a
--- /dev/null
+++ b/tokay/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="config_za_compensation_brightness_thresholds_list">
+        <item>@array/config_za_primary_display_brightness_thresholds_list</item>
+    </array>
+    <array name="config_za_compensation_images_list">
+        <item>@array/config_za_primary_display_compensation_images_list</item>
+    </array>
+    <array name="config_za_compensation_opr_thresholds">
+        <item>0.3</item>
+    </array>
+    <array name="config_za_primary_display_brightness_thresholds_list">
+        <item>@array/config_za_primary_display_condition1_brightness_thresholds</item>
+        <item>@array/config_za_primary_display_condition2_brightness_thresholds</item>
+    </array>
+    <array name="config_za_primary_display_compensation_images_list">
+        <item>@array/config_za_primary_display_condition1_compensation_images</item>
+        <item>@array/config_za_primary_display_condition2_compensation_images</item>
+    </array>
+    <array name="config_za_primary_display_condition1_brightness_thresholds">
+        <item>0.4722222</item>
+        <item>0.4861111</item>
+        <item>0.5</item>
+        <item>0.5277778</item>
+        <item>0.5555556</item>
+        <item>0.6111111</item>
+        <item>0.6666667</item>
+        <item>0.7222222</item>
+        <item>0.7777778</item>
+        <item>0.8333333</item>
+        <item>0.8888889</item>
+        <item>1.0</item>
+    </array>
+    <array name="config_za_primary_display_condition1_compensation_images">
+        <item>@drawable/ZACI_0_2_ZA9162</item>
+        <item>@drawable/ZACI_0_4_ZA8938</item>
+        <item>@drawable/ZACI_0_6_ZA8712</item>
+        <item>@drawable/ZACI_0_7_ZA8488</item>
+        <item>@drawable/ZACI_0_9_ZA8150</item>
+        <item>@drawable/ZACI_0_13_ZA7700</item>
+        <item>@drawable/ZACI_0_14_ZA7588</item>
+        <item>@drawable/ZACI_0_15_ZA7362</item>
+        <item>@drawable/ZACI_0_16_ZA7138</item>
+        <item>@drawable/ZACI_0_18_ZA6800</item>
+        <item>@drawable/ZACI_0_20_ZA6533_6333_05</item>
+        <item>@drawable/ZACI_0_21_ZA6533_6333_03</item>
+    </array>
+    <array name="config_za_primary_display_condition2_brightness_thresholds">
+        <item>0.4722222</item>
+        <item>0.4861111</item>
+        <item>0.5</item>
+        <item>0.5277778</item>
+        <item>0.5555556</item>
+        <item>0.5833333</item>
+        <item>0.6111111</item>
+        <item>0.6388889</item>
+        <item>0.6666667</item>
+        <item>0.6944444</item>
+        <item>0.7222222</item>
+        <item>0.75</item>
+        <item>0.7777778</item>
+        <item>0.8055556</item>
+        <item>0.8333333</item>
+        <item>0.8611111</item>
+        <item>0.8888889</item>
+        <item>0.9722222</item>
+        <item>1.0</item>
+    </array>
+    <array name="config_za_primary_display_condition2_compensation_images">
+        <item>@drawable/ZACI_0_0_ZA9388</item>
+        <item>@drawable/ZACI_0_1_ZA9275</item>
+        <item>@drawable/ZACI_0_2_ZA9162</item>
+        <item>@drawable/ZACI_0_3_ZA9050</item>
+        <item>@drawable/ZACI_0_5_ZA8825</item>
+        <item>@drawable/ZACI_0_6_ZA8712</item>
+        <item>@drawable/ZACI_0_7_ZA8488</item>
+        <item>@drawable/ZACI_0_8_ZA8375</item>
+        <item>@drawable/ZACI_0_9_ZA8150</item>
+        <item>@drawable/ZACI_0_11_ZA7925</item>
+        <item>@drawable/ZACI_0_12_ZA7812</item>
+        <item>@drawable/ZACI_0_14_ZA7588</item>
+        <item>@drawable/ZACI_0_15_ZA7362</item>
+        <item>@drawable/ZACI_0_16_ZA7138</item>
+        <item>@drawable/ZACI_0_17_ZA7025</item>
+        <item>@drawable/ZACI_0_18_ZA6800</item>
+        <item>@drawable/ZACI_0_19_ZA6667</item>
+        <item>@drawable/ZACI_0_20_ZA6533_6333_05</item>
+        <item>@drawable/ZACI_0_21_ZA6533_6333_03</item>
+    </array>
+    <bool name="config_compensation_animation_enabled">true</bool>
+    <item type="dimen" name="config_compensation_filter_intercept">10.0</item>
+    <item type="dimen" name="config_lbe_lux_switch_threshold">1.0</item>
+    <item type="dimen" name="config_za_compensation_brightness_enter_threshold">0.4</item>
+    <integer name="config_ambient_brightness_changed_debounce_ms">500</integer>
+    <integer name="config_compensation_filter_horizon">1500</integer>
+</resources>