diff --git a/fonts/FontGoogleSansOverlay/Android.bp b/fonts/FontGoogleSansOverlay/Android.bp
new file mode 100644
index 0000000..e902989
--- /dev/null
+++ b/fonts/FontGoogleSansOverlay/Android.bp
@@ -0,0 +1,19 @@
+// Copyright (C) 2022 LeafOS 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.
+
+runtime_resource_overlay {
+    name: "FontGoogleSansOverlay",
+    theme: "FontGoogleSans",
+    product_specific: true,
+}
diff --git a/fonts/FontGoogleSansOverlay/AndroidManifest.xml b/fonts/FontGoogleSansOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..3710fb4
--- /dev/null
+++ b/fonts/FontGoogleSansOverlay/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 LeafOS 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.theme.font.googlesans">
+
+    <overlay
+        android:category="android.theme.customization.font"
+        android:priority="600"
+        android:targetPackage="android" />
+
+    <application
+        android:label="@string/font_googlesans_overlay">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="google-sans,google-sans-medium" />
+    </application>
+</manifest>
diff --git a/fonts/FontGoogleSansOverlay/res/values/config.xml b/fonts/FontGoogleSansOverlay/res/values/config.xml
new file mode 100644
index 0000000..2f25d02
--- /dev/null
+++ b/fonts/FontGoogleSansOverlay/res/values/config.xml
@@ -0,0 +1,26 @@
+<!--
+/**
+ * Copyright (C) 2022 LeafOS 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">google-sans</string>
+       <string name="config_bodyFontFamilyMedium" translatable="false">google-sans-medium</string>
+
+       <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+       <string name="config_headlineFontFamily">google-sans</string>
+       <string name="config_headlineFontFamilyMedium">google-sans-medium</string>
+</resources>
diff --git a/fonts/FontGoogleSansOverlay/res/values/strings.xml b/fonts/FontGoogleSansOverlay/res/values/strings.xml
new file mode 100644
index 0000000..8917065
--- /dev/null
+++ b/fonts/FontGoogleSansOverlay/res/values/strings.xml
@@ -0,0 +1,20 @@
+<!--
+/**
+ * Copyright (C) 2022 LeafOS 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_googlesans_overlay" translatable="false">Google Sans</string>
+</resources>
diff --git a/fonts/FontHarmonySansOverlay/Android.bp b/fonts/FontHarmonySansOverlay/Android.bp
new file mode 100644
index 0000000..f0b0a13
--- /dev/null
+++ b/fonts/FontHarmonySansOverlay/Android.bp
@@ -0,0 +1,19 @@
+// Copyright (C) 2022 LeafOS 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.
+
+runtime_resource_overlay {
+    name: "FontHarmonyOsSansOverlay",
+    theme: "FontHarmonyOsSans",
+    product_specific: true,
+}
diff --git a/fonts/FontHarmonySansOverlay/AndroidManifest.xml b/fonts/FontHarmonySansOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..07d3805
--- /dev/null
+++ b/fonts/FontHarmonySansOverlay/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 LeafOS 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.theme.font.harmonyossans">
+
+    <overlay
+        android:category="android.theme.customization.font"
+        android:priority="600"
+        android:targetPackage="android" />
+
+    <application
+        android:label="@string/font_harmonyossans_overlay">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="harmonyos-sans,harmonyos-sans-medium" />
+    </application>
+</manifest>
diff --git a/fonts/FontHarmonySansOverlay/res/values/config.xml b/fonts/FontHarmonySansOverlay/res/values/config.xml
new file mode 100644
index 0000000..f14dc94
--- /dev/null
+++ b/fonts/FontHarmonySansOverlay/res/values/config.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 LeafOS 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>
+
+    <!-- Name of a font family to use for body text. -->
+    <string name="config_bodyFontFamily" translatable="false">harmonyos-sans</string>
+
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium" translatable="false">harmonyos-sans-medium</string>
+
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily" translatable="false">harmonyos-sans</string>
+
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium" translatable="false">harmonyos-sans-medium</string>
+
+</resources>
diff --git a/fonts/FontHarmonySansOverlay/res/values/strings.xml b/fonts/FontHarmonySansOverlay/res/values/strings.xml
new file mode 100644
index 0000000..00d77ef
--- /dev/null
+++ b/fonts/FontHarmonySansOverlay/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 LeafOS 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>
+
+    <string name="font_harmonyossans_overlay" translatable="false">HarmonyOS Sans</string>
+</resources>
diff --git a/fonts/FontInterOverlay/Android.bp b/fonts/FontInterOverlay/Android.bp
new file mode 100644
index 0000000..689b3a2
--- /dev/null
+++ b/fonts/FontInterOverlay/Android.bp
@@ -0,0 +1,19 @@
+// Copyright (C) 2022 LeafOS 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.
+
+runtime_resource_overlay {
+    name: "FontInterOverlay",
+    theme: "FontInter",
+    product_specific: true,
+}
diff --git a/fonts/FontInterOverlay/AndroidManifest.xml b/fonts/FontInterOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..f5e7bc3
--- /dev/null
+++ b/fonts/FontInterOverlay/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 LeafOS 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.theme.font.inter">
+
+    <overlay
+        android:category="android.theme.customization.font"
+        android:priority="600"
+        android:targetPackage="android" />
+
+    <application
+        android:label="@string/font_inter_overlay">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="inter,inter-medium" />
+    </application>
+</manifest>
diff --git a/fonts/FontInterOverlay/res/values/config.xml b/fonts/FontInterOverlay/res/values/config.xml
new file mode 100644
index 0000000..9a5516e
--- /dev/null
+++ b/fonts/FontInterOverlay/res/values/config.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 LeafOS 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>
+
+    <!-- Name of a font family to use for body text. -->
+    <string name="config_bodyFontFamily" translatable="false">inter</string>
+
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium" translatable="false">inter-medium</string>
+
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily" translatable="false">inter</string>
+
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium" translatable="false">inter-medium</string>
+
+</resources>
diff --git a/fonts/FontInterOverlay/res/values/strings.xml b/fonts/FontInterOverlay/res/values/strings.xml
new file mode 100644
index 0000000..6ab6ee2
--- /dev/null
+++ b/fonts/FontInterOverlay/res/values/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 LeafOS 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>
+
+    <!-- Inter overlay -->
+    <string name="font_inter_overlay" translatable="false">Inter</string>
+
+</resources>
diff --git a/fonts/FontLinotteSourceOverlay/Android.bp b/fonts/FontLinotteSourceOverlay/Android.bp
new file mode 100644
index 0000000..b83f879
--- /dev/null
+++ b/fonts/FontLinotteSourceOverlay/Android.bp
@@ -0,0 +1,20 @@
+//
+//  Copyright (C) 2022 LeafOS 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.
+//
+runtime_resource_overlay {
+    name: "FontLinotteSourceOverlay",
+    theme: "FontLinotte",
+    product_specific: true,
+}
diff --git a/fonts/FontLinotteSourceOverlay/AndroidManifest.xml b/fonts/FontLinotteSourceOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..c1c2185
--- /dev/null
+++ b/fonts/FontLinotteSourceOverlay/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<!--
+/**
+ * Copyright (C) 2022 LeafOS 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.theme.font.linottesource">
+
+    <overlay
+        android:category="android.theme.customization.font"
+        android:priority="600"
+        android:targetPackage="android" />
+
+    <application
+        android:label="@string/font_linotte_source_overlay">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="linotte,linotte-semi-bold,linotte-bold" />
+    </application>
+</manifest>
diff --git a/fonts/FontLinotteSourceOverlay/res/values/config.xml b/fonts/FontLinotteSourceOverlay/res/values/config.xml
new file mode 100644
index 0000000..0c5a911
--- /dev/null
+++ b/fonts/FontLinotteSourceOverlay/res/values/config.xml
@@ -0,0 +1,32 @@
+<!--
+/**
+ * Copyright (C) 2022 LeafOS 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">linotte</string>
+
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium" translatable="false">linotte-semi-bold</string>
+
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily" translatable="false">linotte</string>
+
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium" translatable="false">linotte-bold</string>
+
+</resources>
diff --git a/fonts/FontLinotteSourceOverlay/res/values/strings.xml b/fonts/FontLinotteSourceOverlay/res/values/strings.xml
new file mode 100644
index 0000000..351ae4d
--- /dev/null
+++ b/fonts/FontLinotteSourceOverlay/res/values/strings.xml
@@ -0,0 +1,23 @@
+<!--
+/**
+ * Copyright (C) 2022 LeafOS 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">
+
+    <!-- Headline / Body font Aclonica overlay -->
+    <string name="font_linotte_source_overlay" translatable="false">Linotte</string>
+
+</resources>
diff --git a/fonts/FontManropeOverlay/Android.bp b/fonts/FontManropeOverlay/Android.bp
new file mode 100644
index 0000000..32df8af
--- /dev/null
+++ b/fonts/FontManropeOverlay/Android.bp
@@ -0,0 +1,19 @@
+// Copyright (C) 2022 LeafOS 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.
+
+runtime_resource_overlay {
+    name: "FontManropeOverlay",
+    theme: "FontManrope",
+    product_specific: true,
+}
diff --git a/fonts/FontManropeOverlay/AndroidManifest.xml b/fonts/FontManropeOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..b10ad48
--- /dev/null
+++ b/fonts/FontManropeOverlay/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 LeafOS 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.theme.font.manrope">
+
+    <overlay
+        android:category="android.theme.customization.font"
+        android:priority="600"
+        android:targetPackage="android" />
+
+    <application
+        android:label="@string/font_manrope_overlay">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="manrope,manrope-medium" />
+    </application>
+</manifest>
diff --git a/fonts/FontManropeOverlay/res/values/config.xml b/fonts/FontManropeOverlay/res/values/config.xml
new file mode 100644
index 0000000..e3f70a7
--- /dev/null
+++ b/fonts/FontManropeOverlay/res/values/config.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 LeafOS 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>
+
+    <!-- Name of a font family to use for body text. -->
+    <string name="config_bodyFontFamily" translatable="false">manrope</string>
+
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium" translatable="false">manrope-medium</string>
+
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily" translatable="false">manrope</string>
+
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium" translatable="false">manrope-medium</string>
+
+</resources>
diff --git a/fonts/FontManropeOverlay/res/values/strings.xml b/fonts/FontManropeOverlay/res/values/strings.xml
new file mode 100644
index 0000000..c8978c6
--- /dev/null
+++ b/fonts/FontManropeOverlay/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 LeafOS 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>
+    <!-- Manrope overlay -->
+    <string name="font_manrope_overlay" translatable="false">Manrope</string>
+</resources>
diff --git a/fonts/FontOppoSansOverlay/Android.bp b/fonts/FontOppoSansOverlay/Android.bp
new file mode 100644
index 0000000..986f8f8
--- /dev/null
+++ b/fonts/FontOppoSansOverlay/Android.bp
@@ -0,0 +1,19 @@
+// Copyright (C) 2022 LeafOS 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.
+
+runtime_resource_overlay {
+    name: "FontOppoSansOverlay",
+    theme: "FontOppoSans",
+    product_specific: true,
+}
diff --git a/fonts/FontOppoSansOverlay/AndroidManifest.xml b/fonts/FontOppoSansOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..0026a06
--- /dev/null
+++ b/fonts/FontOppoSansOverlay/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 LeafOS 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.theme.font.opposans">
+
+    <overlay
+        android:category="android.theme.customization.font"
+        android:priority="600"
+        android:targetPackage="android" />
+
+    <application
+        android:label="@string/font_opposans_overlay">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="opposans,opposans-medium"/>
+    </application>
+</manifest>
diff --git a/fonts/FontOppoSansOverlay/res/values/config.xml b/fonts/FontOppoSansOverlay/res/values/config.xml
new file mode 100644
index 0000000..7bbe1a5
--- /dev/null
+++ b/fonts/FontOppoSansOverlay/res/values/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 LeafOS 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>
+    <!-- Name of a font family to use for body text. -->
+    <string name="config_bodyFontFamily" translatable="false">opposans</string>
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium" translatable="false">opposans-medium</string>
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily" translatable="false">opposans</string>
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium" translatable="false">opposans-medium</string>
+</resources>
diff --git a/fonts/FontOppoSansOverlay/res/values/strings.xml b/fonts/FontOppoSansOverlay/res/values/strings.xml
new file mode 100644
index 0000000..d118fa7
--- /dev/null
+++ b/fonts/FontOppoSansOverlay/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 LeafOS 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>
+
+    <string name="font_opposans_overlay" translatable="false">Oppo Sans</string>
+</resources>
diff --git a/fonts/etc/Android.bp b/fonts/etc/Android.bp
new file mode 100644
index 0000000..87f5e6c
--- /dev/null
+++ b/fonts/etc/Android.bp
@@ -0,0 +1,5 @@
+prebuilt_etc {
+    name: "fonts_customization.xml",
+    src: "fonts_customization.xml",
+    product_specific: true,
+}
diff --git a/fonts/etc/Android.mk b/fonts/etc/Android.mk
deleted file mode 100644
index 64bc664..0000000
--- a/fonts/etc/Android.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := fonts_customization.xml
-LOCAL_SRC_FILES := fonts_customization.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_PRODUCT_MODULE := true
-include $(BUILD_PREBUILT)
diff --git a/fonts/etc/fonts_customization.xml b/fonts/etc/fonts_customization.xml
index 0c9a7fb..d11ef8c 100644
--- a/fonts/etc/fonts_customization.xml
+++ b/fonts/etc/fonts_customization.xml
@@ -21,4 +21,316 @@
     </family>
     <alias name="rubik-medium" to="rubik" weight="500" />
     <alias name="rubik-bold" to="rubik" weight="700" />
+
+  <family customizationType="new-named-family" name="google-sans">
+    <font weight="400" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="400"/>
+    </font>
+    <font weight="500" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+    <font weight="600" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="600"/>
+    </font>
+    <font weight="700" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+    <font weight="400" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="400"/>
+    </font>
+    <font weight="500" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+    <font weight="600" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="600"/>
+    </font>
+    <font weight="700" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+  </family>
+  <family customizationType="new-named-family" name="google-sans-medium">
+    <font weight="500" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+  </family>
+  <family customizationType="new-named-family" name="google-sans-bold">
+    <font weight="700" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="18.0"/>
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+  </family>
+  <family customizationType="new-named-family" name="google-sans-text">
+    <font weight="400" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="400"/>
+    </font>
+    <font weight="500" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+    <font weight="600" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="600"/>
+    </font>
+    <font weight="700" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+    <font weight="400" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="400"/>
+    </font>
+    <font weight="500" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+    <font weight="600" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="600"/>
+    </font>
+    <font weight="700" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+  </family>
+  <family customizationType="new-named-family" name="google-sans-text-medium">
+    <font weight="500" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+  </family>
+  <family customizationType="new-named-family" name="google-sans-text-bold">
+    <font weight="700" style="normal">GoogleSans-Regular.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+  </family>
+  <family customizationType="new-named-family" name="google-sans-text-italic">
+    <font weight="400" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="400"/>
+    </font>
+  </family>
+  <family customizationType="new-named-family" name="google-sans-text-medium-italic">
+    <font weight="500" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+  </family>
+  <family customizationType="new-named-family" name="google-sans-text-bold-italic">
+    <font weight="700" style="italic">GoogleSans-Italic.ttf
+      <axis tag="GRAD" stylevalue="0"/>
+      <axis tag="opsz" stylevalue="17.0"/>
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+  </family>
+
+  <family customizationType="new-named-family" name="manrope">
+    <font weight="500" style="normal">Manrope-VF.ttf
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+    <font weight="600" style="normal">Manrope-VF.ttf
+      <axis tag="wght" stylevalue="600"/>
+    </font>
+    <font weight="700" style="normal">Manrope-VF.ttf
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+    <font weight="800" style="normal">Manrope-VF.ttf
+      <axis tag="wght" stylevalue="800"/>
+    </font>
+  </family>
+  <alias name="manrope-medium" to="manrope" weight="600" />
+
+  <family customizationType="new-named-family" name="inter">
+    <font weight="100" style="normal">Inter-VF.ttf
+      <axis tag="wght" stylevalue="100"/>
+    </font>
+    <font weight="100" style="italic">Inter-VF.ttf
+      <axis tag="wght" stylevalue="100"/>
+    </font>
+    <font weight="200" style="normal">Inter-VF.ttf
+      <axis tag="wght" stylevalue="200"/>
+    </font>
+    <font weight="200" style="italic">Inter-VF.ttf
+      <axis tag="wght" stylevalue="200"/>
+    </font>
+    <font weight="300" style="normal">Inter-VF.ttf
+      <axis tag="wght" stylevalue="300"/>
+    </font>
+    <font weight="300" style="italic">Inter-VF.ttf
+      <axis tag="wght" stylevalue="300"/>
+    </font>
+    <font weight="400" style="normal">Inter-VF.ttf
+      <axis tag="wght" stylevalue="400"/>
+    </font>
+    <font weight="400" style="italic">Inter-VF.ttf
+      <axis tag="wght" stylevalue="400"/>
+    </font>
+    <font weight="500" style="normal">Inter-VF.ttf
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+    <font weight="500" style="italic">Inter-VF.ttf
+      <axis tag="wght" stylevalue="500"/>
+    </font>
+    <font weight="700" style="normal">Inter-VF.ttf
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+    <font weight="700" style="italic">Inter-VF.ttf
+      <axis tag="wght" stylevalue="700"/>
+    </font>
+    <font weight="900" style="normal">Inter-VF.ttf
+      <axis tag="wght" stylevalue="900"/>
+    </font>
+    <font weight="900" style="italic">Inter-VF.ttf
+      <axis tag="wght" stylevalue="900"/>
+    </font>
+  </family>
+  <alias name="inter-medium" to="inter" weight="500" />
+
+  <family customizationType="new-named-family" name="linotte">
+    <font weight="300" style="normal">Linotte.ttf</font>
+  </family>
+  <alias name="linotte-semi-bold" to="linotte" weight="600" />
+  <alias name="linotte-bold" to="linotte" weight="700" />
+
+  <family customizationType="new-named-family" name="harmonyos-sans">
+    <font weight="100" style="normal">HarmonyOS-Sans-Thin.ttf</font>
+    <font weight="100" style="italic">HarmonyOS-Sans-ThinItalic.ttf</font>
+    <font weight="300" style="normal">HarmonyOS-Sans-Light.ttf</font>
+    <font weight="300" style="italic">HarmonyOS-Sans-LightItalic.ttf</font>
+    <font weight="400" style="normal">HarmonyOS-Sans-Regular.ttf</font>
+    <font weight="400" style="italic">HarmonyOS-Sans-Italic.ttf</font>
+    <font weight="500" style="normal">HarmonyOS-Sans-Medium.ttf</font>
+    <font weight="500" style="italic">HarmonyOS-Sans-MediumItalic.ttf</font>
+    <font weight="700" style="normal">HarmonyOS-Sans-Bold.ttf</font>
+    <font weight="700" style="italic">HarmonyOS-Sans-BoldItalic.ttf</font>
+    <font weight="900" style="normal">HarmonyOS-Sans-Black.ttf</font>
+    <font weight="900" style="italic">HarmonyOS-Sans-BlackItalic.ttf</font>
+  </family>
+  <alias name="harmonyos-sans-medium" to="harmonyos-sans" weight="500"/>
+
+  <family customizationType="new-named-family" name="opposans">
+    <font weight="100" style="normal">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="0" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="250" />
+    </font>
+    <font weight="200" style="normal">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="0" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="350" />
+    </font>
+    <font weight="300" style="normal">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="0" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="450" />
+    </font>
+    <font weight="400" style="normal">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="0" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="550" />
+    </font>
+    <font weight="500" style="normal">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="0" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="620" />
+    </font>
+    <font weight="600" style="normal">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="0" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="690" />
+    </font>
+    <font weight="700" style="normal">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="0" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="760" />
+    </font>
+    <font weight="800" style="normal">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="0" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="830" />
+    </font>
+    <font weight="900" style="normal">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="0" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="900" />
+    </font>
+    <font weight="100" style="italic">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="1" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="250" />
+    </font>
+    <font weight="200" style="italic">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="1" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="350" />
+    </font>
+    <font weight="300" style="italic">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="1" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="450" />
+    </font>
+    <font weight="400" style="italic">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="1" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="550" />
+    </font>
+    <font weight="500" style="italic">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="1" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="620" />
+    </font>
+    <font weight="600" style="italic">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="1" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="690" />
+    </font>
+    <font weight="700" style="italic">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="1" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="760" />
+    </font>
+    <font weight="800" style="italic">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="1" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="830" />
+    </font>
+    <font weight="900" style="italic">OppoSans-En-Regular.ttf
+      <axis tag="ital" stylevalue="1" />
+      <axis tag="wdth" stylevalue="100" />
+      <axis tag="wght" stylevalue="900" />
+    </font>
+  </family>
+  <alias name="opposans-medium" to="opposans" weight="500" />
 </fonts-modification>