diff --git a/Samsung/r0q-SystemUI/Android.mk b/Samsung/r0q-SystemUI/Android.mk
new file mode 100644
index 0000000..3eb8ff3
--- /dev/null
+++ b/Samsung/r0q-SystemUI/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-samsung-r0q-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/Samsung/r0q-SystemUI/AndroidManifest.xml b/Samsung/r0q-SystemUI/AndroidManifest.xml
new file mode 100644
index 0000000..f1d56b3
--- /dev/null
+++ b/Samsung/r0q-SystemUI/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.samsung.r0q.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+                android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+                android:requiredSystemPropertyValue="+*samsung/r0q*"
+				android:priority="978"
+				android:isStatic="true" />
+</manifest>
diff --git a/Samsung/r0q-SystemUI/res/values/config.xml b/Samsung/r0q-SystemUI/res/values/config.xml
new file mode 100644
index 0000000..7f85097
--- /dev/null
+++ b/Samsung/r0q-SystemUI/res/values/config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="status_bar_padding_start">52px</dimen>
+    <dimen name="status_bar_padding_end">14px</dimen>
+    <dimen name="status_bar_padding_top">0px</dimen>
+  	<dimen name="status_bar_header_height_keyguard">104px</dimen>
+    <dimen name="keyguard_carrier_text_margin">68px</dimen>
+    <dimen name="system_icons_keyguard_padding_end">55px</dimen>
+
+</resources>
diff --git a/Samsung/r0q/Android.mk b/Samsung/r0q/Android.mk
new file mode 100644
index 0000000..201e836
--- /dev/null
+++ b/Samsung/r0q/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-samsung-r0q
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Samsung/r0q/AndroidManifest.xml b/Samsung/r0q/AndroidManifest.xml
new file mode 100644
index 0000000..7678d03
--- /dev/null
+++ b/Samsung/r0q/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.samsung.r0q"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+                android:requiredSystemPropertyValue="+*samsung/r0q*"
+				android:priority="978"
+                android:isStatic="true" />
+</manifest>
diff --git a/Samsung/r0q/res/values/config.xml b/Samsung/r0q/res/values/config.xml
new file mode 100644
index 0000000..7460c39
--- /dev/null
+++ b/Samsung/r0q/res/values/config.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+      <integer name="config_autoBrightnessBrighteningLightDebounce">4000</integer>
+      <integer name="config_autoBrightnessDarkeningLightDebounce">8000</integer>
+      <integer name="config_autoBrightnessInitialLightSensorRate">-1</integer>
+      <integer name="config_autoBrightnessLightSensorRate">250</integer>
+      <integer name="config_screenBrightnessDark">1</integer>
+      <integer name="config_screenBrightnessDim">10</integer>
+      <integer name="config_screenBrightnessDoze">1</integer>
+      <integer name="config_screenBrightnessForVrSettingDefault">180</integer>
+      <integer name="config_screenBrightnessForVrSettingMaximum">255</integer>
+      <integer name="config_screenBrightnessForVrSettingMinimum">1</integer>
+      <integer name="config_screenBrightnessSettingDefault">102</integer>
+      <integer name="config_screenBrightnessSettingMaximum">255</integer>
+      <integer name="config_screenBrightnessSettingMinimum">10</integer>
+    <array name="config_autoBrightnessDisplayValuesNits" />
+    <integer-array name="config_autoBrightnessLcdBacklightValues">
+        <item>6</item>
+        <item>6</item>
+        <item>6</item>
+        <item>11</item>
+        <item>79</item>
+        <item>95</item>
+        <item>141</item>
+        <item>183</item>
+        <item>200</item>
+        <item>219</item>
+        <item>255</item>
+        <item>255</item>
+        <item>255</item>
+    </integer-array>
+    <integer-array name="config_autoBrightnessLevels">
+        <item>1</item>
+        <item>5</item>
+        <item>6</item>
+        <item>10</item>
+	<item>15</item>
+	<item>20</item>
+	<item>25</item>
+        <item>50</item>
+        <item>100</item>
+        <item>500</item>
+        <item>1500</item>
+        <item>3000</item>
+        <item>4999</item>
+        <item>5000</item>
+        <item>19999</item>
+        <item>20000</item>
+    </integer-array>
+    <array name="config_screenBrightnessBacklight" />
+    <array name="config_screenBrightnessNits" />
+	<bool name="config_automatic_brightness_available">true</bool>
+	<bool name="config_dozeAfterScreenOffByDefault">true</bool>
+	<bool name="config_displayBlanksAfterDoze">false</bool>
+	<fraction name="config_autoBrightnessAdjustmentMaxGamma">300.0%</fraction>
+	<dimen name="status_bar_height_landscape">24.0dip</dimen>
+        <dimen name="status_bar_height_portrait">24.0dip</dimen>
+	<dimen name="rounded_corner_radius_top">32.0dip</dimen>
+	<dimen name="rounded_corner_radius_bottom">32.0dip</dimen>
+	<string name="config_mainBuiltInDisplayCutout">M 0,0 H -9.333333333333333 V 27 H 9.333333333333333 V 0 H 0 Z @dp</string>
+</resources>
diff --git a/Samsung/r0q/res/xml/power_profile.xml b/Samsung/r0q/res/xml/power_profile.xml
new file mode 100644
index 0000000..4d85912
--- /dev/null
+++ b/Samsung/r0q/res/xml/power_profile.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
+    <item name="battery.capacity">3590</item>
+    <array name="cpu.clusters.cores">
+        <value>4</value>
+        <value>4</value>
+    </array>
+    <item name="cpu.suspend">5</item>
+    <item name="cpu.idle">1.11</item>
+    <item name="cpu.active">2.55</item>
+    <item name="cpu.cluster_power.cluster0">2.11</item>
+    <item name="cpu.cluster_power.cluster1">2.22</item>
+    <array name="cpu.core_speeds.cluster0">
+        <value>300000</value>
+        <value>1000000</value>
+        <value>2000000</value>
+    </array>
+    <array name="cpu.core_speeds.cluster1">
+        <value>300000</value>
+        <value>1000000</value>
+        <value>2500000</value>
+        <value>3000000</value>
+    </array>
+    <array name="cpu.core_power.cluster0">
+        <value>10</value>
+        <value>20</value>
+        <value>30</value>
+    </array>
+    <array name="cpu.core_power.cluster1">
+        <value>25</value>
+        <value>35</value>
+        <value>50</value>
+        <value>60</value>
+    </array>
+    <item name="ambient.on">0.5</item>
+    <item name="screen.on">100</item>
+    <item name="screen.full">800</item>
+    <item name="camera.flashlight">500</item>
+    <item name="camera.avg">600</item>
+    <item name="audio">100.0</item>
+    <item name="video">150.0</item>
+    <item name="gps.on">10</item>
+    <item name="radio.active">60</item>
+    <item name="radio.scanning">3</item>
+    <array name="radio.on">
+        <value>6</value>
+        <value>5</value>
+        <value>4</value>
+        <value>3</value>
+        <value>3</value>
+    </array>
+</device>
diff --git a/overlay.mk b/overlay.mk
index 18c3fa3..0d78b8e 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -182,6 +182,8 @@ PRODUCT_PACKAGES += \
 	treble-overlay-samsung-n9q \
 	treble-overlay-samsung-o1s \
 	treble-overlay-samsung-p3s \
+	treble-overlay-samsung-r0q \
+	treble-overlay-samsung-r0q-systemui \
 	treble-overlay-samsung-r0s \
 	treble-overlay-samsung-r0s-systemui \
 	treble-overlay-samsung-r9q \