diff --git a/Misc/AOD-SystemUI/Android.mk b/Misc/AOD-SystemUI/Android.mk
new file mode 100644
index 0000000..bc402dc
--- /dev/null
+++ b/Misc/AOD-SystemUI/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-misc-aod-systemui
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Misc/AOD-SystemUI/AndroidManifest.xml b/Misc/AOD-SystemUI/AndroidManifest.xml
new file mode 100644
index 0000000..4016a54
--- /dev/null
+++ b/Misc/AOD-SystemUI/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.misc.aod_systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+		android:priority="8003"
+            />
+</manifest>
diff --git a/Misc/AOD-SystemUI/res/values/config.xml b/Misc/AOD-SystemUI/res/values/config.xml
new file mode 100644
index 0000000..6f08ea8
--- /dev/null
+++ b/Misc/AOD-SystemUI/res/values/config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="doze_display_state_supported">true</bool>
+    <bool name="doze_suspend_display_state_supported">true</bool>
+    <bool name="doze_proximity_check_before_pulse">false</bool>
+    <bool name="doze_pickup_performs_proximity_check">false</bool>
+</resources>
diff --git a/Misc/AOD/Android.mk b/Misc/AOD/Android.mk
new file mode 100644
index 0000000..9e917da
--- /dev/null
+++ b/Misc/AOD/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-misc-aod
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Misc/AOD/AndroidManifest.xml b/Misc/AOD/AndroidManifest.xml
new file mode 100644
index 0000000..673cb32
--- /dev/null
+++ b/Misc/AOD/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.misc.aod"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+		android:requiredSystemPropertyName="persist.sys.overlay.aod"
+		android:requiredSystemPropertyValue="true"
+		android:priority="8003"
+		android:isStatic="true" />
+</manifest>
diff --git a/Misc/AOD/res/values/config.xml b/Misc/AOD/res/values/config.xml
new file mode 100644
index 0000000..9c83bca
--- /dev/null
+++ b/Misc/AOD/res/values/config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+    <bool name="config_dozeSupportsAodWallpaper">false</bool>
+    <bool name="config_displayBlanksAfterDoze">true</bool>
+    <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>
+    <bool name="config_powerDecoupleInteractiveModeFromDisplay">true</bool>
+    <integer name="config_screenBrightnessDoze">1</integer>
+    <bool name="config_displayBrightnessBucketsInDoze">false</bool>
+</resources>
diff --git a/overlay.mk b/overlay.mk
index 028056e..bd6adc3 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -52,6 +52,8 @@ PRODUCT_PACKAGES += \
 	treble-overlay-lg-g7 \
 	treble-overlay-lg-v40 \
 	treble-overlay-lg-velvet \
+	treble-overlay-misc-aod \
+	treble-overlay-misc-aod-systemui \
 	treble-overlay-misc-dt2w \
 	treble-overlay-misc-minimal-brightness \
 	treble-overlay-moto-e5 \
diff --git a/tests/knownKeys b/tests/knownKeys
index 88b96db..76028e0 100644
--- a/tests/knownKeys
+++ b/tests/knownKeys
@@ -126,3 +126,5 @@ config_wifi_p2p_mac_randomization_supported
 config_availableColorModes
 config_swipe_up_gesture_setting_available
 config_bluetooth_max_connected_audio_devices
+config_dozeSupportsAodWallpaper
+config_displayBrightnessBucketsInDoze