diff --git a/data/build-package.database b/data/build-package.database
index 47a3d9b..3f4fb9c 100644
--- a/data/build-package.database
+++ b/data/build-package.database
@@ -41,6 +41,7 @@ fd_BEHEKEYBOARD=(fdroid com.vlath.keyboard app BeHeKeyboard)
 fd_BLOCKADA=(fdroid org.blokada.alarm app Blockada)
 fd_FACESLIM=(fdroid org.indywidualni.fblite app FaceSlim)
 fd_KEEPASSDX=(fdroid com.kunzisoft.keepass.libre app KeePassDX)
+fd_K9MAIL=(fdroid com.fsck.k9 app K9Mail)
 fd_LIGHTNING=(fdroid acr.browser.lightning app Lightning)
 fd_NEWPIPE=(fdroid org.schabi.newpipe app NewPipe)
 fd_OANDBACKUP=(fdroid dk.jens.backup app Oandbackup)
@@ -53,21 +54,17 @@ fd_QKSMS=(fdroid com.moez.QKSMS app QKSMS)
 fd_SIMPLECALENDAR=(fdroid com.simplemobiletools.calendar app SimpleCalendar)
 fd_SIMPLEGALLERY=(fdroid com.simplemobiletools.gallery app SimpleGallery)
 fd_TERMUX=(fdroid com.termux app Termux)
+fd_TWIDERE=(fdroid org.mariotaku.twidere app Twidere)
 
 gd_ORBOT=(guardian org.torproject.android app Orbot)
 gd_ORFOX=(guardian info.guardianproject.orfox app Orfox)
 
-
 TORBROWSER_APK=$(wget -O- https://www.torproject.org/projects/torbrowser.html.en 2>/dev/null | \
 	gawk -F\" '/apk.*Android/{print $2}' | \
 	sed 's|..|https://www.torproject.org|')
 tp_TORBROWSER=(${TORBROWSER_APK} app TorBrowser)
 
 gh_AMAZE=(TeamAmaze/AmazeFileManager app Amaze)
-gh_K9MAIL=(k9mail/k-9 app K9Mail)
-gh_MPV=(mpv-android/mpv-android app MPV)
-gh_TWIDERE=(TwidereProject/Twidere-Android app Twidere)
-gh_QKSMS=(moezbhatti/qksms app QKSMS)
 
 ###
 # Google Sync Adapters
diff --git a/data/build-package.update b/data/build-package.update
index c2bf64d..0d12ebd 100644
--- a/data/build-package.update
+++ b/data/build-package.update
@@ -46,12 +46,12 @@ update_fdroid () {
 
 update_apps () {
 	# applications managed in repositories
-	#grab_apk_from_repo ${fd_AMAZE[@]}
 	grab_apk_from_repo ${fd_ANYSOFTKEYBOARD[@]}
 	grab_apk_from_repo ${fd_BEHEKEYBOARD[@]}
 	grab_apk_from_repo ${fd_BLOCKADA[@]}
 	grab_apk_from_repo ${fd_FACESLIM[@]}
 	grab_apk_from_repo ${fd_KEEPASSDX[@]}
+	grab_apk_from_repo ${fd_K9MAIL[@]}
 	grab_apk_from_repo ${fd_LIGHTNING[@]}
 	grab_apk_from_repo ${fd_NEWPIPE[@]}
 	grab_apk_from_repo ${fd_OANDBACKUP[@]}
@@ -64,19 +64,15 @@ update_apps () {
 	grab_apk_from_repo ${fd_SIMPLECALENDAR[@]}
 	grab_apk_from_repo ${fd_SIMPLEGALLERY[@]}
 	grab_apk_from_repo ${fd_TERMUX[@]}
+	grab_apk_from_repo ${fd_TWIDERE[@]}
 	grab_apk_from_repo ${gd_ORBOT[@]}
-	#grab_apk_from_repo ${gd_ORFOX[@]}
-	grab_apk_from_url ${tp_TORBROWSER[@]}
 
-	#grab_apk_from_url ${nlx_AMAZE[@]}
+	# generic URL
+	grab_apk_from_url ${tp_TORBROWSER[@]}
 	grab_apk_from_url ${nlx_OMNICLOCK[@]}
 
 	# GitHub
 	grab_apk_from_github ${gh_AMAZE[@]}
-	grab_apk_from_github ${gh_K9MAIL[@]}
-	#grab_apk_from_github ${gh_MPV[@]}
-	grab_apk_from_github ${gh_TWIDERE[@]}
-	#grab_apk_from_github ${gh_QKSMS[@]}
 
 	# APK Mirror
 	grab_apk_from_apkmirror ${am_KERNELADIUTOR[@]}