diff --git a/app/Android.bp b/app/Android.bp
index d0925ff..7ec1b61 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2022-2023 The LineageOS Project
+// SPDX-FileCopyrightText: 2022-2024 The LineageOS Project
 // SPDX-License-Identifier: Apache-2.0
 //
 
@@ -19,6 +19,11 @@
     sdk_version: "33",
     product_specific: true,
 
+    required: [
+        "ApertureFrameworksBaseOverlay",
+        "ApertureLensLauncher",
+    ],
+
     static_libs: [
         // DO NOT EDIT THIS SECTION MANUALLY
         "androidx.core_core-ktx",
@@ -41,12 +46,10 @@
         "Aperture_io.coil-kt_coil",
         "Aperture_io.coil-kt_coil-video",
     ],
+
     optional_uses_libs: [
         "androidx.camera.extensions.impl"
     ],
-    required: [
-        "ApertureLensLauncher",
-    ],
 
     optimize: {
         proguard_flags_files: ["proguard-rules.pro"],
diff --git a/rro_overlays/ApertureFrameworksBaseOverlay/Android.bp b/rro_overlays/ApertureFrameworksBaseOverlay/Android.bp
new file mode 100644
index 0000000..d33ca5d
--- /dev/null
+++ b/rro_overlays/ApertureFrameworksBaseOverlay/Android.bp
@@ -0,0 +1,13 @@
+//
+// SPDX-FileCopyrightText: 2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "ApertureFrameworksBaseOverlay",
+    product_specific: true,
+}
diff --git a/rro_overlays/ApertureFrameworksBaseOverlay/AndroidManifest.xml b/rro_overlays/ApertureFrameworksBaseOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..09a0a57
--- /dev/null
+++ b/rro_overlays/ApertureFrameworksBaseOverlay/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2024 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.lineageos.aperture.frameworksbaseoverlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <application android:hasCode="false" />
+
+    <overlay android:targetPackage="android"
+        android:priority="0"
+        android:isStatic="true" />
+</manifest>
diff --git a/rro_overlays/ApertureFrameworksBaseOverlay/res/values/config.xml b/rro_overlays/ApertureFrameworksBaseOverlay/res/values/config.xml
new file mode 100644
index 0000000..08c03ba
--- /dev/null
+++ b/rro_overlays/ApertureFrameworksBaseOverlay/res/values/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2024 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Default component for QR code scanner -->
+    <string name="config_defaultQrCodeComponent" translatable="false">org.lineageos.aperture/.QrScannerActivity</string>
+</resources>