diff --git a/arm/Android.mk b/arm/Android.mk
index eb3c08d..1547094 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -31,6 +31,17 @@ LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
 ifeq ($(TARGET_IS_GROUPER),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := MarkupGoogle
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/app/MarkupGoogle/MarkupGoogle.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := Velvet
 LOCAL_MODULE_OWNER := gapps
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index d20c2d5..c26a0f1 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -20,8 +20,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
 ifeq ($(TARGET_IS_GROUPER),)
+PRODUCT_COPY_FILES += \
+    vendor/gapps/arm/proprietary/app/MarkupGoogle/MarkupGoogle/lib/arm/libsketchology_native.so:system/app/MarkupGoogle/MarkupGoogle/lib/arm/libsketchology_native.so
 
 PRODUCT_PACKAGES += \
+    MarkupGoogle \
     Velvet
 endif
 
diff --git a/common/proprietary/app/MarkupGoogle/MarkupGoogle.apk b/arm/proprietary/app/MarkupGoogle/MarkupGoogle.apk
similarity index 100%
rename from common/proprietary/app/MarkupGoogle/MarkupGoogle.apk
rename to arm/proprietary/app/MarkupGoogle/MarkupGoogle.apk
diff --git a/arm/proprietary/app/MarkupGoogle/MarkupGoogle/lib/arm/libsketchology_native.so b/arm/proprietary/app/MarkupGoogle/MarkupGoogle/lib/arm/libsketchology_native.so
new file mode 100644
index 0000000..2d1aa86
Binary files /dev/null and b/arm/proprietary/app/MarkupGoogle/MarkupGoogle/lib/arm/libsketchology_native.so differ
diff --git a/arm64/Android.mk b/arm64/Android.mk
index e7283e4..b410af4 100644
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -31,6 +31,17 @@ LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
 ifeq ($(TARGET_IS_GROUPER),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := MarkupGoogle
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/app/MarkupGoogle/MarkupGoogle.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := Velvet
 LOCAL_MODULE_OWNER := gapps
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 6aad52f..02f6562 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -21,8 +21,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
 ifeq ($(TARGET_IS_GROUPER),)
+PRODUCT_COPY_FILES += \
+    vendor/gapps/arm64/proprietary/app/MarkupGoogle/MarkupGoogle/lib/arm64/libsketchology_native.so:system/app/MarkupGoogle/MarkupGoogle/lib/arm64/libsketchology_native.so
 
 PRODUCT_PACKAGES += \
+    MarkupGoogle \
     Velvet
 endif
 
diff --git a/arm64/proprietary/app/MarkupGoogle/MarkupGoogle.apk b/arm64/proprietary/app/MarkupGoogle/MarkupGoogle.apk
new file mode 100644
index 0000000..0ef9092
Binary files /dev/null and b/arm64/proprietary/app/MarkupGoogle/MarkupGoogle.apk differ
diff --git a/arm64/proprietary/app/MarkupGoogle/MarkupGoogle/lib/arm64/libsketchology_native.so b/arm64/proprietary/app/MarkupGoogle/MarkupGoogle/lib/arm64/libsketchology_native.so
new file mode 100644
index 0000000..9b15563
Binary files /dev/null and b/arm64/proprietary/app/MarkupGoogle/MarkupGoogle/lib/arm64/libsketchology_native.so differ
diff --git a/common/Android.mk b/common/Android.mk
index 604e8a5..54db505 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -132,17 +132,6 @@ LOCAL_MODULE_SUFFIX := .jar
 include $(BUILD_PREBUILT)
 
 ifeq ($(TARGET_IS_GROUPER),)
-include $(CLEAR_VARS)
-LOCAL_MODULE := MarkupGoogle
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/app/MarkupGoogle/MarkupGoogle.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := AndroidMigratePrebuilt
 LOCAL_MODULE_OWNER := gapps
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index 1ba3976..fbcfe37 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -37,7 +37,6 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
-    MarkupGoogle \
     AndroidMigratePrebuilt \
     SetupWizard
 endif
diff --git a/common/proprietary/framework/com.google.android.dialer.support.jar b/common/proprietary/framework/com.google.android.dialer.support.jar
index 8e84f2e..7a9e229 100644
Binary files a/common/proprietary/framework/com.google.android.dialer.support.jar and b/common/proprietary/framework/com.google.android.dialer.support.jar differ
diff --git a/common/proprietary/framework/com.google.android.maps.jar b/common/proprietary/framework/com.google.android.maps.jar
index 153e7ca..5e02402 100644
Binary files a/common/proprietary/framework/com.google.android.maps.jar and b/common/proprietary/framework/com.google.android.maps.jar differ
diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt
index cc6c118..8314b7d 100644
--- a/proprietary-files-arm-nongrouper.txt
+++ b/proprietary-files-arm-nongrouper.txt
@@ -1 +1,3 @@
+-app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED
 -priv-app/Velvet/Velvet.apk;PRESIGNED|1bd57d7a32d77ec007ca7ad8032cca8d9038c555
+app/MarkupGoogle/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db
diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt
index 82a268f..9db1823 100644
--- a/proprietary-files-arm64-nongrouper.txt
+++ b/proprietary-files-arm64-nongrouper.txt
@@ -1 +1,3 @@
+-app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
 -priv-app/Velvet/Velvet.apk;PRESIGNED|314043242c4253b61d9d4fcf656489d3fa0265be
+app/MarkupGoogle/MarkupGoogle/lib/arm64/libsketchology_native.so|71898873b8d07af8f0589ac6faf64770300b2e21
diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt
index 7661bf5..94cef06 100644
--- a/proprietary-files-common-nongrouper.txt
+++ b/proprietary-files-common-nongrouper.txt
@@ -1,3 +1,2 @@
--app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED
 -priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc
 -priv-app/SetupWizard/SetupWizard.apk;PRESIGNED|cef140e63d5dd861a876b3b24b9e21c82d3749ef