diff --git a/device.mk b/device.mk
index 0185873..1e16181 100644
--- a/device.mk
+++ b/device.mk
@@ -1,7 +1,11 @@
+# Include overlay package
+PRODUCT_PACKAGES += \
+    FrameworkResDevOxmcOverlay
+
 # Copy system-wide font
 PRODUCT_COPY_FILES += \
     vendor/dev.oxmc/fonts/ArcticonsSans-Regular.otf:system/fonts/ArcticonsSans-Regular.otf
 
-# Copy system-wide icon
-#PRODUCT_COPY_FILES += \
-#	vendor/dev.oxmc/icons/ic_settings_oxmc.xml:system/etc/permissions/ic_settings_oxmc.xml
\ No newline at end of file
+# Copy system-wide icon (commented out until needed)
+# PRODUCT_COPY_FILES += \
+#     vendor/dev.oxmc/icons/ic_settings_oxmc.xml:system/etc/permissions/ic_settings_oxmc.xml
\ No newline at end of file
diff --git a/overlays/FrameworkResOverlay/Android.bp b/overlays/FrameworkResOverlay/Android.bp
index eedd15e..5a48c40 100644
--- a/overlays/FrameworkResOverlay/Android.bp
+++ b/overlays/FrameworkResOverlay/Android.bp
@@ -1,5 +1,5 @@
 runtime_resource_overlay {
     name: "FrameworkResDevOxmcOverlay",
-    theme: "android.overlay.frameworkres.oxmc",
     certificate: "platform",
+    product_specific: true,
 }
\ No newline at end of file
diff --git a/overlays/FrameworkResOverlay/res/fallback_fonts.xml b/overlays/FrameworkResOverlay/res/fallback_fonts.xml
new file mode 100644
index 0000000..d67d69f
--- /dev/null
+++ b/overlays/FrameworkResOverlay/res/fallback_fonts.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<familyset version="21">
+    <!-- Use ArcticonsSans as primary font -->
+    <family>
+        <font weight="400" style="normal">ArcticonsSans-Regular.otf</font>
+    </family>
+
+    <!-- Keep Roboto as fallback -->
+    <family>
+        <font weight="400" style="normal">Roboto-Regular.ttf</font>
+        <font weight="700" style="normal">Roboto-Bold.ttf</font>
+        <font weight="400" style="italic">Roboto-Italic.ttf</font>
+        <font weight="700" style="italic">Roboto-BoldItalic.ttf</font>
+    </family>
+</familyset>
\ No newline at end of file