diff --git a/device.mk b/device.mk
index 688307a..f39f709 100644
--- a/device.mk
+++ b/device.mk
@@ -25,6 +25,17 @@ PRODUCT_COPY_FILES += \
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay
 
+# Overlays-RRO
+PRODUCT_PACKAGES += \
+    HaydnCNSettingsProviderOverlay \
+    HaydnCNWifiOverlay \
+    HaydnGLSettingsProviderOverlay \
+    HaydnGLWifiOverlay \
+    HaydnINSettingsProviderOverlay \
+    HaydnINWifiOverlay \
+    HaydnproCNSettingsProviderOverlay \
+    HaydnproCNWifiOverlay
+
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
     $(LOCAL_PATH)
diff --git a/rro_overlays/HaydnCNSettingsProviderOverlay/Android.bp b/rro_overlays/HaydnCNSettingsProviderOverlay/Android.bp
new file mode 100644
index 0000000..6f5b190
--- /dev/null
+++ b/rro_overlays/HaydnCNSettingsProviderOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "HaydnCNSettingsProviderOverlay",
+    vendor: true
+}
diff --git a/rro_overlays/HaydnCNSettingsProviderOverlay/AndroidManifest.xml b/rro_overlays/HaydnCNSettingsProviderOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..f27fd8d
--- /dev/null
+++ b/rro_overlays/HaydnCNSettingsProviderOverlay/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settingsproviders.haydncn">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="850"
+        android:requiredSystemPropertyName="ro.boot.hwc"
+        android:requiredSystemPropertyValue="CN"
+        android:targetPackage="com.android.providers.settings" />
+</manifest>
diff --git a/rro_overlays/HaydnCNSettingsProviderOverlay/res/values/defaults.xml b/rro_overlays/HaydnCNSettingsProviderOverlay/res/values/defaults.xml
new file mode 100644
index 0000000..8eaf30b
--- /dev/null
+++ b/rro_overlays/HaydnCNSettingsProviderOverlay/res/values/defaults.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
+    <string name="def_device_name_simple">Redmi K40 Pro</string>
+</resources>
diff --git a/rro_overlays/HaydnCNWifiOverlay/Android.bp b/rro_overlays/HaydnCNWifiOverlay/Android.bp
new file mode 100644
index 0000000..d22e759
--- /dev/null
+++ b/rro_overlays/HaydnCNWifiOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "HaydnCNWifiOverlay",
+    vendor: true
+}
diff --git a/rro_overlays/HaydnCNWifiOverlay/AndroidManifest.xml b/rro_overlays/HaydnCNWifiOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..2245d15
--- /dev/null
+++ b/rro_overlays/HaydnCNWifiOverlay/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.wifi.resources.haydncn"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.wifi.resources"
+      android:targetName="WifiCustomization"
+      android:isStatic="true"
+      android:requiredSystemPropertyName="ro.boot.hwc"
+      android:requiredSystemPropertyValue="CN"
+      android:priority="850"/>
+</manifest>
diff --git a/rro_overlays/HaydnCNWifiOverlay/res/values/config.xml b/rro_overlays/HaydnCNWifiOverlay/res/values/config.xml
new file mode 100644
index 0000000..6fb6087
--- /dev/null
+++ b/rro_overlays/HaydnCNWifiOverlay/res/values/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Do not translate. Default access point SSID used for tethering -->
+    <string name="wifi_tether_configure_ssid_default" translatable="false">Redmi K40 Pro</string>
+</resources>
diff --git a/rro_overlays/HaydnGLSettingsProviderOverlay/Android.bp b/rro_overlays/HaydnGLSettingsProviderOverlay/Android.bp
new file mode 100644
index 0000000..b5f1703
--- /dev/null
+++ b/rro_overlays/HaydnGLSettingsProviderOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "HaydnGLSettingsProviderOverlay",
+    vendor: true
+}
diff --git a/rro_overlays/HaydnGLSettingsProviderOverlay/AndroidManifest.xml b/rro_overlays/HaydnGLSettingsProviderOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..738a2e2
--- /dev/null
+++ b/rro_overlays/HaydnGLSettingsProviderOverlay/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settingsproviders.haydngl">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="850"
+        android:requiredSystemPropertyName="ro.boot.hwc"
+        android:requiredSystemPropertyValue="GL"
+        android:targetPackage="com.android.providers.settings" />
+</manifest>
diff --git a/rro_overlays/HaydnGLSettingsProviderOverlay/res/values/defaults.xml b/rro_overlays/HaydnGLSettingsProviderOverlay/res/values/defaults.xml
new file mode 100644
index 0000000..dbb721a
--- /dev/null
+++ b/rro_overlays/HaydnGLSettingsProviderOverlay/res/values/defaults.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
+    <string name="def_device_name_simple">Mi 11i</string>
+</resources>
diff --git a/rro_overlays/HaydnGLWifiOverlay/Android.bp b/rro_overlays/HaydnGLWifiOverlay/Android.bp
new file mode 100644
index 0000000..a761b84
--- /dev/null
+++ b/rro_overlays/HaydnGLWifiOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "HaydnGLWifiOverlay",
+    vendor: true
+}
diff --git a/rro_overlays/HaydnGLWifiOverlay/AndroidManifest.xml b/rro_overlays/HaydnGLWifiOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..4becdc5
--- /dev/null
+++ b/rro_overlays/HaydnGLWifiOverlay/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.wifi.resources.haydngl"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.wifi.resources"
+      android:targetName="WifiCustomization"
+      android:isStatic="true"
+      android:requiredSystemPropertyName="ro.boot.hwc"
+      android:requiredSystemPropertyValue="GL"
+      android:priority="850"/>
+</manifest>
diff --git a/rro_overlays/HaydnGLWifiOverlay/res/values/config.xml b/rro_overlays/HaydnGLWifiOverlay/res/values/config.xml
new file mode 100644
index 0000000..640e3af
--- /dev/null
+++ b/rro_overlays/HaydnGLWifiOverlay/res/values/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Do not translate. Default access point SSID used for tethering -->
+    <string name="wifi_tether_configure_ssid_default" translatable="false">Mi 11i</string>
+</resources>
diff --git a/rro_overlays/HaydnINSettingsProviderOverlay/Android.bp b/rro_overlays/HaydnINSettingsProviderOverlay/Android.bp
new file mode 100644
index 0000000..6169a0d
--- /dev/null
+++ b/rro_overlays/HaydnINSettingsProviderOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "HaydnINSettingsProviderOverlay",
+    vendor: true
+}
diff --git a/rro_overlays/HaydnINSettingsProviderOverlay/AndroidManifest.xml b/rro_overlays/HaydnINSettingsProviderOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..b5152a9
--- /dev/null
+++ b/rro_overlays/HaydnINSettingsProviderOverlay/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settingsproviders.haydnin">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="850"
+        android:requiredSystemPropertyName="ro.boot.hwc"
+        android:requiredSystemPropertyValue="IN"
+        android:targetPackage="com.android.providers.settings" />
+</manifest>
diff --git a/rro_overlays/HaydnINSettingsProviderOverlay/res/values/defaults.xml b/rro_overlays/HaydnINSettingsProviderOverlay/res/values/defaults.xml
new file mode 100644
index 0000000..5fac83f
--- /dev/null
+++ b/rro_overlays/HaydnINSettingsProviderOverlay/res/values/defaults.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
+    <string name="def_device_name_simple">Mi 11X Pro</string>
+</resources>
diff --git a/rro_overlays/HaydnINWifiOverlay/Android.bp b/rro_overlays/HaydnINWifiOverlay/Android.bp
new file mode 100644
index 0000000..306c5b9
--- /dev/null
+++ b/rro_overlays/HaydnINWifiOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "HaydnINWifiOverlay",
+    vendor: true
+}
diff --git a/rro_overlays/HaydnINWifiOverlay/AndroidManifest.xml b/rro_overlays/HaydnINWifiOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..3457498
--- /dev/null
+++ b/rro_overlays/HaydnINWifiOverlay/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.wifi.resources.haydnin"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.wifi.resources"
+      android:targetName="WifiCustomization"
+      android:isStatic="true"
+      android:requiredSystemPropertyName="ro.boot.hwc"
+      android:requiredSystemPropertyValue="IN"
+      android:priority="850"/>
+</manifest>
diff --git a/rro_overlays/HaydnINWifiOverlay/res/values/config.xml b/rro_overlays/HaydnINWifiOverlay/res/values/config.xml
new file mode 100644
index 0000000..5bb4509
--- /dev/null
+++ b/rro_overlays/HaydnINWifiOverlay/res/values/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Do not translate. Default access point SSID used for tethering -->
+    <string name="wifi_tether_configure_ssid_default" translatable="false">Mi 11X Pro</string>
+</resources>
diff --git a/rro_overlays/HaydnproCNSettingsProviderOverlay/Android.bp b/rro_overlays/HaydnproCNSettingsProviderOverlay/Android.bp
new file mode 100644
index 0000000..b93fcb3
--- /dev/null
+++ b/rro_overlays/HaydnproCNSettingsProviderOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "HaydnproCNSettingsProviderOverlay",
+    vendor: true
+}
diff --git a/rro_overlays/HaydnproCNSettingsProviderOverlay/AndroidManifest.xml b/rro_overlays/HaydnproCNSettingsProviderOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..e22cda7
--- /dev/null
+++ b/rro_overlays/HaydnproCNSettingsProviderOverlay/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settingsproviders.haydnprocn">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="851"
+        android:requiredSystemPropertyName="ro.boot.hwc,ro.boot.hardware.sku"
+        android:requiredSystemPropertyValue="CN,haydnpro"
+        android:targetPackage="com.android.providers.settings" />
+</manifest>
diff --git a/rro_overlays/HaydnproCNSettingsProviderOverlay/res/values/defaults.xml b/rro_overlays/HaydnproCNSettingsProviderOverlay/res/values/defaults.xml
new file mode 100644
index 0000000..69f66cb
--- /dev/null
+++ b/rro_overlays/HaydnproCNSettingsProviderOverlay/res/values/defaults.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+    <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL-->
+    <string name="def_device_name_simple">Redmi K40 Pro+</string>
+</resources>
diff --git a/rro_overlays/HaydnproCNWifiOverlay/Android.bp b/rro_overlays/HaydnproCNWifiOverlay/Android.bp
new file mode 100644
index 0000000..672cc20
--- /dev/null
+++ b/rro_overlays/HaydnproCNWifiOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "HaydnproCNWifiOverlay",
+    vendor: true
+}
diff --git a/rro_overlays/HaydnproCNWifiOverlay/AndroidManifest.xml b/rro_overlays/HaydnproCNWifiOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..ccea728
--- /dev/null
+++ b/rro_overlays/HaydnproCNWifiOverlay/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.wifi.resources.haydnprocn"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.wifi.resources"
+      android:targetName="WifiCustomization"
+      android:isStatic="true"
+      android:requiredSystemPropertyName="ro.boot.hwc,ro.boot.hardware.sku"
+      android:requiredSystemPropertyValue="CN,haydnpro"
+      android:priority="851"/>
+</manifest>
diff --git a/rro_overlays/HaydnproCNWifiOverlay/res/values/config.xml b/rro_overlays/HaydnproCNWifiOverlay/res/values/config.xml
new file mode 100644
index 0000000..03d5391
--- /dev/null
+++ b/rro_overlays/HaydnproCNWifiOverlay/res/values/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Do not translate. Default access point SSID used for tethering -->
+    <string name="wifi_tether_configure_ssid_default" translatable="false">Redmi K40 Pro+</string>
+</resources>