diff --git a/config.mk b/config.mk
index 878625c..77d5832 100644
--- a/config.mk
+++ b/config.mk
@@ -1,11 +1,12 @@
 LOCAL_PATH := $(call my-dir)
 include $(call all-subdir-makefiles,$(LOCAL_PATH))
 
-# Include prebuilts packages
 include vendor/custom/prebuilts/prebuilts.mk
 RELAX_USES_LIBRARY_CHECK=true
 
-PRODUCT_REMOVE_PACKAGES += \
+# LOCAL_OVERRIDES_PACKAGES PRODUCT_REMOVE_PACKAGES
+LOCAL_OVERRIDES_PACKAGES += \
     Seedvault \
     XiaomiEuicc \
     Jelly
+
diff --git a/overlay/fonts/Android.bp b/overlay/fonts/Android.bp
new file mode 100644
index 0000000..e69de29
diff --git a/overlay/fonts/Android.mk b/overlay/fonts/Android.mk
new file mode 100644
index 0000000..57599d6
--- /dev/null
+++ b/overlay/fonts/Android.mk
@@ -0,0 +1,3 @@
+# Fonts
+PRODUCT_COPY_FILES += \
+    $(call find-copy-subdir-files,*,vendor/custom/fonts/fonts/,$(TARGET_COPY_OUT_PRODUCT)/fonts)
diff --git a/overlay/fonts/AndroidManifest.xml b/overlay/fonts/AndroidManifest.xml
deleted file mode 100644
index f242ee7..0000000
--- a/overlay/fonts/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.custom.fonts">
-    <application android:hasCode="false">
-        <overlay android:targetPackage="android"
-            android:priority="1"
-            android:isStatic="true" />
-    </application>
-</manifest>
\ No newline at end of file
diff --git a/overlay/fonts/FontWenkaiOverlay/Android.bp b/overlay/fonts/FontWenkaiOverlay/Android.bp
new file mode 100644
index 0000000..149bc71
--- /dev/null
+++ b/overlay/fonts/FontWenkaiOverlay/Android.bp
@@ -0,0 +1,25 @@
+//
+// Copyright (c) 2020,2022 The LineageOS Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "FontWenkaiOverlay",
+    theme: "FontWenkai",
+    product_specific: true,
+}
diff --git a/overlay/fonts/FontWenkaiOverlay/AndroidManifest.xml b/overlay/fonts/FontWenkaiOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..c0e3321
--- /dev/null
+++ b/overlay/fonts/FontWenkaiOverlay/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<!--
+    Copyright (c) 2020, The LineageOS Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.overlay.font.wenkai"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <overlay
+        android:targetPackage="android"
+        android:category="android.theme.customization.font"
+        android:priority="1" />
+
+    <application
+        android:hasCode="false"
+        android:label="@string/font_wenkai_overlay">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="wenkai,wenkai-medium" />
+    </application>
+</manifest>
diff --git a/overlay/fonts/FontWenkaiOverlay/res/values/config.xml b/overlay/fonts/FontWenkaiOverlay/res/values/config.xml
new file mode 100644
index 0000000..016d102
--- /dev/null
+++ b/overlay/fonts/FontWenkaiOverlay/res/values/config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2020, The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+     <!-- Name of a font family to use for body text. -->
+    <string name="config_bodyFontFamily" translatable="false">wenkai</string>
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium" translatable="false">wenkai-medium</string>
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily" translatable="false">wenkai</string>
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium" translatable="false">wenkai-medium</string>
+</resources>
+
diff --git a/overlay/fonts/FontWenkaiOverlay/res/values/strings.xml b/overlay/fonts/FontWenkaiOverlay/res/values/strings.xml
new file mode 100644
index 0000000..2527807
--- /dev/null
+++ b/overlay/fonts/FontWenkaiOverlay/res/values/strings.xml
@@ -0,0 +1,20 @@
+<!--
+/**
+ * Copyright (c) 2020, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="font_wenkai_overlay" translatable="false">WenKai</string>
+</resources>
diff --git a/overlay/fonts/FontWkmonoOverlay/Android.bp b/overlay/fonts/FontWkmonoOverlay/Android.bp
new file mode 100644
index 0000000..149bc71
--- /dev/null
+++ b/overlay/fonts/FontWkmonoOverlay/Android.bp
@@ -0,0 +1,25 @@
+//
+// Copyright (c) 2020,2022 The LineageOS Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "FontWenkaiOverlay",
+    theme: "FontWenkai",
+    product_specific: true,
+}
diff --git a/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml b/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..038a364
--- /dev/null
+++ b/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<!--
+    Copyright (c) 2020, The LineageOS Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.overlay.font.wkmono"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <overlay
+        android:targetPackage="android"
+        android:category="android.theme.customization.font"
+        android:priority="1" />
+
+    <application
+        android:hasCode="false"
+        android:label="@string/font_wkmono_overlay">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="wkmono,wkmono-medium" />
+    </application>
+</manifest>
diff --git a/overlay/fonts/FontWkmonoOverlay/res/values/config.xml b/overlay/fonts/FontWkmonoOverlay/res/values/config.xml
new file mode 100644
index 0000000..511e829
--- /dev/null
+++ b/overlay/fonts/FontWkmonoOverlay/res/values/config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2020, The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+     <!-- Name of a font family to use for body text. -->
+    <string name="config_bodyFontFamily" translatable="false">wkmono</string>
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium" translatable="false">wkmono-medium</string>
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily" translatable="false">wkmono</string>
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium" translatable="false">wkmono-medium</string>
+</resources>
+
diff --git a/overlay/fonts/FontWkmonoOverlay/res/values/strings.xml b/overlay/fonts/FontWkmonoOverlay/res/values/strings.xml
new file mode 100644
index 0000000..6cc4b06
--- /dev/null
+++ b/overlay/fonts/FontWkmonoOverlay/res/values/strings.xml
@@ -0,0 +1,20 @@
+<!--
+/**
+ * Copyright (c) 2020, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="font_wkmono_overlay" translatable="false">Wkmono</string>
+</resources>
diff --git a/overlay/fonts/config/fonts_customization.xml b/overlay/fonts/config/fonts_customization.xml
new file mode 100644
index 0000000..ba7f59f
--- /dev/null
+++ b/overlay/fonts/config/fonts_customization.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<fonts-modification version="1">
+    <family customizationType="new-named-family" name="wenkai">
+        <font weight="400" style="normal">LXGWWenKai-Light.ttf</font>
+        <font weight="500" style="normal">LXGWWenKai-Regular.ttf</font>
+        <font weight="700" style="normal">LXGWWenKai-Medium.ttf</font>
+    </family>
+    <alias name="wenkai-medium" to="wenkai" weight="500" />
+    <alias name="wenkai-bold" to="wenkai" weight="700" />
+
+    <family customizationType="new-named-family" name="wkmono">
+        <font weight="400" style="normal">LXGWWenKaiMono-Light.ttf</font>
+        <font weight="500" style="normal">LXGWWenKaiMono-Regular.ttf</font>
+        <font weight="700" style="normal">LXGWWenKaiMono-Medium.ttf</font>
+    </family>
+    <alias name="wkmono-medium" to="wkmono" weight="500" />
+    <alias name="wkmono-bold" to="wkmono" weight="700" />
+</fonts-modification>
diff --git a/overlay/fonts/res/font/LXGWWenKai-Light.ttf b/overlay/fonts/fonts/LXGWWenKai-Light.ttf
similarity index 100%
rename from overlay/fonts/res/font/LXGWWenKai-Light.ttf
rename to overlay/fonts/fonts/LXGWWenKai-Light.ttf
diff --git a/overlay/fonts/res/font/LXGWWenKai-Medium.ttf b/overlay/fonts/fonts/LXGWWenKai-Medium.ttf
similarity index 100%
rename from overlay/fonts/res/font/LXGWWenKai-Medium.ttf
rename to overlay/fonts/fonts/LXGWWenKai-Medium.ttf
diff --git a/overlay/fonts/res/font/LXGWWenKai-Regular.ttf b/overlay/fonts/fonts/LXGWWenKai-Regular.ttf
similarity index 100%
rename from overlay/fonts/res/font/LXGWWenKai-Regular.ttf
rename to overlay/fonts/fonts/LXGWWenKai-Regular.ttf
diff --git a/overlay/fonts/res/font/LXGWWenKaiMono-Light.ttf b/overlay/fonts/fonts/LXGWWenKaiMono-Light.ttf
similarity index 100%
rename from overlay/fonts/res/font/LXGWWenKaiMono-Light.ttf
rename to overlay/fonts/fonts/LXGWWenKaiMono-Light.ttf
diff --git a/overlay/fonts/res/font/LXGWWenKaiMono-Medium.ttf b/overlay/fonts/fonts/LXGWWenKaiMono-Medium.ttf
similarity index 100%
rename from overlay/fonts/res/font/LXGWWenKaiMono-Medium.ttf
rename to overlay/fonts/fonts/LXGWWenKaiMono-Medium.ttf
diff --git a/overlay/fonts/res/font/LXGWWenKaiMono-Regular.ttf b/overlay/fonts/fonts/LXGWWenKaiMono-Regular.ttf
similarity index 100%
rename from overlay/fonts/res/font/LXGWWenKaiMono-Regular.ttf
rename to overlay/fonts/fonts/LXGWWenKaiMono-Regular.ttf
diff --git a/overlay/fonts/res/values/fonts.xml b/overlay/fonts/res/values/fonts.xml
deleted file mode 100644
index 053f831..0000000
--- a/overlay/fonts/res/values/fonts.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family>
-    <font android:fontFamily="@font/>LXGWWenKai-Light.ttf" android:weight="300" android:style="normal" />
-    <font android:fontFamily="@font/>LXGWWenKai-Regular.ttf" android:weight="400" android:style="normal" />
-    <font android:fontFamily="@font/LXGWWenKai-Medium.ttf" android:weight="700" android:style="normal" />
-
-    <font android:fontFamily="@font/LXGWWenKaiMono-Light.ttf" android:weight="300" android:style="normal" />
-    <font android:fontFamily="@font/LXGWWenKaiMono-Regular.ttf" android:weight="400" android:style="normal" />
-    <font android:fontFamily="@font/LXGWWenKaiMono-Medium.ttf" android:weight="700" android:style="normal" />
-</font-family>
\ No newline at end of file