diff --git a/data/build-package.database b/data/build-package.database
index 069ac5c..699722f 100644
--- a/data/build-package.database
+++ b/data/build-package.database
@@ -106,37 +106,26 @@ fd_OSMAND_CONTOURLINES=(fdroid net.osmand.srtmPlugin.paid app OsmAnd_ContourLine
 # Files Database (for consistency check)
 ###
 
-apk_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
-	Full/gsync/K/app/GoogleContactsSync/GoogleContactsSync.apk.gz
-	Full/gsync/K/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
-	Full/gsync/L/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
-	Full/gsync/L/app/GoogleContactsSync/GoogleContactsSync.apk.gz
-	Full/gsync/L/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
-	Full/gsync/M/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
-	Full/gsync/M/app/GoogleContactsSync/GoogleContactsSync.apk.gz
-	Full/gsync/M/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
-	Full/gsync/N/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
-	Full/gsync/N/app/GoogleContactsSync/GoogleContactsSync.apk.gz
-	Full/gsync/N/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
-	Full/gsync/O/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
-	Full/gsync/O/app/GoogleContactsSync/GoogleContactsSync.apk.gz
-	Full/gsync/O/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
-	Full/gsync/P/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
-	Full/gsync/P/app/GoogleContactsSync/GoogleContactsSync.apk.gz
-	Full/gsync/P/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
+apk_database=(
 	Full/system/app/Alarmio/Alarmio.apk.gz
 	Full/system/app/Amaze/Amaze.apk.gz
 	Full/system/app/AnysoftKeyboard/AnysoftKeyboard.apk.gz
 	Full/system/app/AuroraDroid/AuroraDroid.apk.gz
 	Full/system/app/AuroraStore/AuroraStore.apk.gz
 	Full/system/app/Blokada/Blokada.apk.gz
-	Full/system/app/FDroid/FDroid.apk.gz
+	Full/system/app/DroidGuard/DroidGuard.apk.gz
 	Full/system/app/FaceSlim/FaceSlim.apk.gz
+	Full/system/app/FDroid/FDroid.apk.gz
 	Full/system/app/HackersKeyboard/HackersKeyboard.apk.gz
 	Full/system/app/K9Mail/K9Mail.apk.gz
 	Full/system/app/KeePassDX/KeePassDX.apk.gz
 	Full/system/app/MPV/MPV.apk.gz
 	Full/system/app/NewPipe/NewPipe.apk.gz
+	Full/system/app/nlpBackendApple/nlpBackendApple.apk.gz
+	Full/system/app/nlpBackendDejavu/nlpBackendDejavu.apk.gz
+	Full/system/app/nlpBackendIchnaea/nlpBackendIchnaea.apk.gz
+	Full/system/app/nlpBackendNominatim/nlpBackendNominatim.apk.gz
+	Full/system/app/nlpBackendRadiocell/nlpBackendRadiocell.apk.gz
 	Full/system/app/Oandbackup/Oandbackup.apk.gz
 	Full/system/app/Odyssey/Odyssey.apk.gz
 	Full/system/app/OpenCamera/OpenCamera.apk.gz
@@ -154,39 +143,55 @@ apk_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
 	Full/system/app/TorBrowser/TorBrowser.apk.gz
 	Full/system/app/Twidere/Twidere.apk.gz
 	Full/system/app/XDALabs/XDALabs.apk.gz
-	Full/system/app/nlpBackendApple/nlpBackendApple.apk.gz
-	Full/system/app/nlpBackendIchnaea/nlpBackendIchnaea.apk.gz
-	Full/system/app/nlpBackendDejavu/nlpBackendDejavu.apk.gz
-	Full/system/app/nlpBackendRadiocell/nlpBackendRadiocell.apk.gz
-	Full/system/app/nlpBackendNominatim/nlpBackendNominatim.apk.gz
-	Full/system/app/DroidGuard/DroidGuard.apk.gz
-	Full/system/priv-app/FDroidPrivileged/FDroidPrivileged.apk.gz
+
+	Full/system/priv-app/AuroraServices/AuroraServices.apk.gz
 	Full/system/priv-app/FakeStore/FakeStore.apk.gz
+	Full/system/priv-app/FDroidPrivileged/FDroidPrivileged.apk.gz
+	Full/system/priv-app/GmsCore/GmsCore.apk.gz
+	Full/system/priv-app/GsfProxy/GsfProxy.apk.gz
 	Full/system/priv-app/Phonesky/Phonesky.apk.gz
 	Full/system/priv-app/YalpStore/YalpStore.apk.gz
-	Full/system/priv-app/GsfProxy/GsfProxy.apk.gz
-	Full/system/priv-app/GmsCore/GmsCore.apk.gz
-	Full/system/priv-app/AuroraServices/AuroraServices.apk.gz
+
+	Full/gsync/common/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
+	Full/gsync/K/app/GoogleContactsSync/GoogleContactsSync.apk.gz
+	Full/gsync/K/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
+	Full/gsync/L/app/GoogleContactsSync/GoogleContactsSync.apk.gz
+	Full/gsync/L/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
+	Full/gsync/M/app/GoogleContactsSync/GoogleContactsSync.apk.gz
+	Full/gsync/M/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
+	Full/gsync/N/app/GoogleContactsSync/GoogleContactsSync.apk.gz
+	Full/gsync/N/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
+	Full/gsync/O/app/GoogleContactsSync/GoogleContactsSync.apk.gz
+	Full/gsync/O/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
+	Full/gsync/P/app/GoogleContactsSync/GoogleContactsSync.apk.gz
+	Full/gsync/P/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
+
 	BromiteWebView/system/app/BromiteWebView_arm/BromiteWebView_arm.apk.gz
 	BromiteWebView/system/app/BromiteWebView_arm64/BromiteWebView_arm64.apk.gz
 	BromiteWebView/system/app/BromiteWebView_x86/BromiteWebView_x86.apk.gz
+
 	OsmAnd/system/app/OsmAnd/OsmAnd.apk.gz
-	OsmAnd/system/app/OsmAnd_ContourLines/OsmAnd_ContourLines.apk.gz )
+	OsmAnd/system/app/OsmAnd_ContourLines/OsmAnd_ContourLines.apk.gz
+)
 
-lib_database=( Full/swipe/arm/libjni_keyboarddecoder.so
+lib_database=(
+	Full/swipe/arm/libjni_keyboarddecoder.so
 	Full/swipe/arm/libjni_latinimegoogle.so_19
 	Full/swipe/arm/libjni_latinimegoogle.so_21
 	Full/swipe/arm/libjni_latinimegoogle.so_22
 	Full/swipe/arm/libjni_latinimegoogle.so_23
 	Full/swipe/arm/libjni_latinimegoogle.so_27
 	Full/swipe/arm/libjni_latinimegoogle.so_28
+
 	Full/swipe/arm64/libjni_keyboarddecoder.so
 	Full/swipe/arm64/libjni_latinimegoogle.so_21
 	Full/swipe/arm64/libjni_latinimegoogle.so_22
 	Full/swipe/arm64/libjni_latinimegoogle.so_23
 	Full/swipe/arm64/libjni_latinimegoogle.so_27
 	Full/swipe/arm64/libjni_latinimegoogle.so_28
+
 	Full/swipe/x86/libjni_keyboarddecoder.so
 	Full/swipe/x86/libjni_latinimegoogle.so
 	Full/swipe/x86_64/libjni_keyboarddecoder.so
-	Full/swipe/x86_64/libjni_latinimegoogle.so )
+	Full/swipe/x86_64/libjni_latinimegoogle.so
+)