diff --git a/debloater/Android.mk b/debloater/Android.mk
index 44f25d2..077c862 100644
--- a/debloater/Android.mk
+++ b/debloater/Android.mk
@@ -11,7 +11,18 @@ LOCAL_OVERRIDES_PACKAGES += \
     Jelly \
     SoterService \
     EuiccGoogle \
-    EasterEgg
+    EasterEgg \
+    MarkupGoogle_v2 \
+    SpeechServicesByGoogle \
+    talkback \
+    PrebuiltExchange3Google \
+    AndroidAutoStub \
+    GooglePartnerSetup \
+    GoogleFeedback \
+    com.google.android.dialer.support \
+    com.google.android.dialer.support.xml \
+    Wellbeing \
+    wellbeing.xml \
 LOCAL_UNINSTALLABLE_MODULE := true
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_SRC_FILES := /dev/null
diff --git a/overlay/fonts/FontWkmonoOverlay/Android.bp b/overlay/fonts/FontWkmonoOverlay/Android.bp
deleted file mode 100644
index 2efd5f3..0000000
--- a/overlay/fonts/FontWkmonoOverlay/Android.bp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-runtime_resource_overlay {
-    name: "FontWkmonoOverlay",
-    theme: "FontWkmono",
-    sdk_version: "current",
-    product_specific: true,
-}
diff --git a/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml b/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml
deleted file mode 100644
index e720c83..0000000
--- a/overlay/fonts/FontWkmonoOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-    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">
-
-    <application
-        android:hasCode="false"
-        android:label="@string/font_wkmono_overlay">
-        <meta-data
-            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
-            android:value="wkmono" />
-    </application>
-
-    <overlay
-        android:category="android.theme.customization.font"
-        android:priority="1"
-        android:targetPackage="android" />
-</manifest>
diff --git a/overlay/fonts/FontWkmonoOverlay/res/values/config.xml b/overlay/fonts/FontWkmonoOverlay/res/values/config.xml
deleted file mode 100644
index a5f3151..0000000
--- a/overlay/fonts/FontWkmonoOverlay/res/values/config.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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">
-    <string name="config_bodyFontFamily" translatable="false">wkmono</string>
-    <string name="config_bodyFontFamilyMedium" translatable="false">wkmono-medium</string>
-    <string name="config_bodyFontFamilyBold" translatable="false">wkmono-bold</string>
-
-    <string name="config_headlineFontFamily" translatable="false">wkmono</string>
-    <string name="config_headlineFontFamilyMedium" translatable="false">wkmono-medium</string>
-    <string name="config_headlineFontFamilyBold" translatable="false">wkmono-bold</string>
-
-    <string name="config_labelFontFamily" translatable="false">wkmono</string>
-    <string name="config_labelFontFamilyMedium" translatable="false">wkmono-medium</string>
-    <string name="config_labelFontFamilyBold" translatable="false">wkmono-bold</string>
-</resources>
-
diff --git a/overlay/fonts/FontWkmonoOverlay/res/values/strings.xml b/overlay/fonts/FontWkmonoOverlay/res/values/strings.xml
deleted file mode 100644
index 6cc4b06..0000000
--- a/overlay/fonts/FontWkmonoOverlay/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-/**
- * 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
index 608f9ee..e77d24c 100644
--- a/overlay/fonts/config/fonts_customization.xml
+++ b/overlay/fonts/config/fonts_customization.xml
@@ -13,18 +13,4 @@
     <alias name="wenkai-medium" to="wenkai" weight="500" />
     <alias name="wenkai-bold" to="wenkai" weight="700" />
     <alias name="wenkai-black" to="wenkai" weight="900" />
-
-    <family customizationType="new-named-family" name="wkmono">
-        <font weight="100" style="normal">LXGWWenKaiMono-Light.ttf</font>
-        <font weight="300" style="normal">LXGWWenKaiMono-Light.ttf</font>
-        <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>
-        <font weight="900" style="normal">LXGWWenKaiMono-Medium.ttf</font>
-    </family>
-    <alias name="wkmono-thin" to="wkmono" weight="100" />
-    <alias name="wkmono-light" to="wkmono" weight="300" />
-    <alias name="wkmono-medium" to="wkmono" weight="500" />
-    <alias name="wkmono-bold" to="wkmono" weight="700" />
-    <alias name="wkmono-black" to="wkmono" weight="900" />
 </fonts-modification>
diff --git a/overlay/overlay.mk b/overlay/overlay.mk
index 39c6956..fc3e3b2 100644
--- a/overlay/overlay.mk
+++ b/overlay/overlay.mk
@@ -1,3 +1,2 @@
 PRODUCT_PACKAGES += \
-    FontWenkaiOverlay \
-    FontWkmonoOverlay
+    FontWenkaiOverlay
diff --git a/prebuilts/Android.bp b/prebuilts/Android.bp
index 8227d69..cfd6fe6 100644
--- a/prebuilts/Android.bp
+++ b/prebuilts/Android.bp
@@ -16,3 +16,12 @@ cc_prebuilt_binary {
     installable: true,
     product_specific: true
 }
+
+cc_prebuilt_binary {
+    name: "openvpn",
+    srcs: [
+        "product/bin/openvpn",
+    ],
+    installable: true,
+    product_specific: true
+}
diff --git a/prebuilts/prebuilts.mk b/prebuilts/prebuilts.mk
index fcd1cd9..74e8c91 100644
--- a/prebuilts/prebuilts.mk
+++ b/prebuilts/prebuilts.mk
@@ -1,8 +1,14 @@
 
 PRODUCT_PACKAGES +=\
     wg \
-    wg-quick
+    wg-quick \
+    openvpn
 
 # Fonts
 PRODUCT_COPY_FILES += \
     $(call find-copy-subdir-files,*,vendor/custom/prebuilts/product/fonts/,$(TARGET_COPY_OUT_PRODUCT)/fonts)
+
+PRODUCT_COPY_FILES += \
+   vendor/custom/prebuilts/product/fonts/LXGWWenKai-Regular.ttf:system/fonts/Roboto-Regular.ttf \
+   vendor/custom/prebuilts/product/fonts/LXGWWenKai-Medium.ttf:system/fonts/RobotoFlex-Regular.ttf \
+   vendor/custom/prebuilts/product/fonts/LXGWWenKai-Medium.ttf:system/fonts/RobotoStatic-Regular.ttf
diff --git a/prebuilts/product/bin/openvpn b/prebuilts/product/bin/openvpn
new file mode 100644
index 0000000..ca64a11
Binary files /dev/null and b/prebuilts/product/bin/openvpn differ
diff --git a/prebuilts/product/fonts/LXGWWenKaiMono-Light.ttf b/prebuilts/product/fonts/LXGWWenKaiMono-Light.ttf
deleted file mode 100644
index 9f76383..0000000
Binary files a/prebuilts/product/fonts/LXGWWenKaiMono-Light.ttf and /dev/null differ
diff --git a/prebuilts/product/fonts/LXGWWenKaiMono-Medium.ttf b/prebuilts/product/fonts/LXGWWenKaiMono-Medium.ttf
deleted file mode 100644
index dbfedb6..0000000
Binary files a/prebuilts/product/fonts/LXGWWenKaiMono-Medium.ttf and /dev/null differ
diff --git a/prebuilts/product/fonts/LXGWWenKaiMono-Regular.ttf b/prebuilts/product/fonts/LXGWWenKaiMono-Regular.ttf
deleted file mode 100644
index 0fd85bd..0000000
Binary files a/prebuilts/product/fonts/LXGWWenKaiMono-Regular.ttf and /dev/null differ