diff --git a/build/gapps.sh b/build/gapps.sh
index a1f9374..66a03a0 100755
--- a/build/gapps.sh
+++ b/build/gapps.sh
@@ -8,7 +8,7 @@
 #
 DATE=$(date +%F-%H-%M)
 TOP=$(realpath .)
-ANDROIDV=7.1.2
+ANDROIDV=8.1.0
 GARCH=$1
 OUT=$TOP/out
 BUILD=$TOP/build
diff --git a/proprietary-files-arm.txt b/proprietary-files-arm.txt
index 5fae1b6..d976120 100644
--- a/proprietary-files-arm.txt
+++ b/proprietary-files-arm.txt
@@ -1,2 +1,2 @@
--priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|df53a2657634ac197c78595f6a0f5ec3081ceed1
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|df53a2657634ac197c78595f6a0f5ec3081ceed1
 lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
diff --git a/proprietary-files-arm64.txt b/proprietary-files-arm64.txt
index 57f331d..59790f8 100644
--- a/proprietary-files-arm64.txt
+++ b/proprietary-files-arm64.txt
@@ -1,3 +1,3 @@
--priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|9a2bf96c5c171dfb8aa1726a5a21bc096f73c84e
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|9a2bf96c5c171dfb8aa1726a5a21bc096f73c84e
 lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e
 lib64/libjni_latinimegoogle.so|84f9b1dc4c1b45f0c5ec9043b99a50c54e58ae1d
diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt
index 2f00706..f7002db 100644
--- a/proprietary-files-common.txt
+++ b/proprietary-files-common.txt
@@ -1,23 +1,22 @@
--app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk:app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk:PRESIGNED|aa482580c87a43c83882c05a4757754917d47f32
--app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk:app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk:PRESIGNED
--app/GoogleExtShared/GoogleExtShared.apk:app/GoogleExtShared/GoogleExtShared.apk:PRESIGNED
+-app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED|aa482580c87a43c83882c05a4757754917d47f32
+-app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED
+-app/GoogleExtShared/GoogleExtShared.apk;PRESIGNED
 
--priv-app/GoogleBackupTransport/GoogleBackupTransport.apk:priv-app/GoogleBackupTransport/GoogleBackupTransport.apk::PRESIGNED
--priv-app/GoogleExtServices/GoogleExtServices.apk:priv-app/GoogleExtServices/GoogleExtServices.apk:PRESIGNED
--priv-app/GoogleFeedback/GoogleFeedback.apk:priv-app/GoogleFeedback/GoogleFeedback.apk:PRESIGNED
--priv-app/GoogleLoginService/GoogleLoginService.apk:priv-app/GoogleLoginService/GoogleLoginService.apk:PRESIGNED
--priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk:priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk:PRESIGNED
--priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:PRESIGNED
--priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:PRESIGNED
--priv-app/Phonesky/Phonesky.apk:priv-app/Phonesky/Phonesky.apk:PRESIGNED
--priv-app/SetupWizard/SetupWizard.apk:priv-app/SetupWizard/SetupWizard.apk:PRESIGNED
+-priv-app/ConfigUpdater/ConfigUpdater.apk;PRESIGNED
+-priv-app/GoogleBackupTransport/GoogleBackupTransport.apk;PRESIGNED
+-priv-app/GoogleExtServices/GoogleExtServices.apk;PRESIGNED
+-priv-app/GoogleFeedback/GoogleFeedback.apk;PRESIGNED
+-priv-app/GoogleLoginService/GoogleLoginService.apk;PRESIGNED
+-priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitialer.apk;PRESIGNED
+-priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED
+-priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED
+-priv-app/Phonesky/Phonesky.apk;PRESIGNED
+-priv-app/SetupWizard/SetupWizard.apk;PRESIGNED
 
--framework/com.google.android.maps.jar:PRESIGNED
--framework/com.google.android.media.effects.jar:PRESIGNED
--framework/com.google.widevine.software.drm.jar:PRESIGNED
+-framework/com.google.android.maps.jar;PRESIGNED
+-framework/com.google.widevine.software.drm.jar;PRESIGNED
 
 etc/permissions/com.google.android.maps.xml
-etc/permissions/com.google.android.media.effects.xml
 etc/permissions/com.google.widevine.software.drm.xml
 etc/permissions/com.android.omadm.service.xml
 
diff --git a/proprietary-files-x86.txt b/proprietary-files-x86.txt
index 4772f86..adf54ac 100644
--- a/proprietary-files-x86.txt
+++ b/proprietary-files-x86.txt
@@ -1,2 +1,2 @@
--priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED|e37f94a30b762ee2dd47dd0f22808bfacf176dbe
+-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|e37f94a30b762ee2dd47dd0f22808bfacf176dbe
 lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79