diff --git a/common.mk b/common.mk
index fd45222..33fb97a 100644
--- a/common.mk
+++ b/common.mk
@@ -372,6 +372,18 @@ PRODUCT_PACKAGES += \
     libOmxVenc \
     libstagefrighthw
 
+# OnePlus
+#PRODUCT_PACKAGES += \
+#    oneplus-fwk
+#
+#PRODUCT_BOOT_JARS += \
+#    oneplus-fwk
+
+# OnePlus Apps
+PRODUCT_PACKAGES += \
+    OnePlusCameraOverlay \
+    OnePlusGalleryOverlay
+
 # Power
 PRODUCT_PACKAGES += \
     android.hardware.power-service-qti \
diff --git a/rro_overlays/OnePlusCameraOverlay/Android.bp b/rro_overlays/OnePlusCameraOverlay/Android.bp
new file mode 100644
index 0000000..0aac845
--- /dev/null
+++ b/rro_overlays/OnePlusCameraOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "OnePlusCameraOverlay",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/OnePlusCameraOverlay/AndroidManifest.xml b/rro_overlays/OnePlusCameraOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..0c6ce89
--- /dev/null
+++ b/rro_overlays/OnePlusCameraOverlay/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.oneplus.camera.overlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="com.oneplus.camera" android:priority="1" android:isStatic="true" />
+
+    <application android:label="OnePlusCameraOverlay" android:hasCode="false"/>
+</manifest>
diff --git a/rro_overlays/OnePlusCameraOverlay/res/values/colors.xml b/rro_overlays/OnePlusCameraOverlay/res/values/colors.xml
new file mode 100644
index 0000000..3ee6c0a
--- /dev/null
+++ b/rro_overlays/OnePlusCameraOverlay/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <color name="oneplus_accent_color">@*android:color/accent_device_default</color>
+    <color name="oneplus_accent_text_color">@*android:color/accent_device_default</color>
+</resources>
diff --git a/rro_overlays/OnePlusGalleryOverlay/Android.bp b/rro_overlays/OnePlusGalleryOverlay/Android.bp
new file mode 100644
index 0000000..49f1fe7
--- /dev/null
+++ b/rro_overlays/OnePlusGalleryOverlay/Android.bp
@@ -0,0 +1,6 @@
+runtime_resource_overlay {
+    name: "OnePlusGalleryOverlay",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/OnePlusGalleryOverlay/AndroidManifest.xml b/rro_overlays/OnePlusGalleryOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..31d843e
--- /dev/null
+++ b/rro_overlays/OnePlusGalleryOverlay/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.oneplus.gallery.overlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="com.oneplus.gallery" android:priority="1" android:isStatic="true" />
+
+    <application android:label="OnePlusGalleryOverlay" android:hasCode="false"/>
+</manifest>
diff --git a/rro_overlays/OnePlusGalleryOverlay/res/values/colors.xml b/rro_overlays/OnePlusGalleryOverlay/res/values/colors.xml
new file mode 100644
index 0000000..3ee6c0a
--- /dev/null
+++ b/rro_overlays/OnePlusGalleryOverlay/res/values/colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <color name="oneplus_accent_color">@*android:color/accent_device_default</color>
+    <color name="oneplus_accent_text_color">@*android:color/accent_device_default</color>
+</resources>