diff --git a/Misc/android-devel/PKGBUILD b/Misc/android-devel/PKGBUILD
index 9dbaaaa0..fe46f5c2 100644
--- a/Misc/android-devel/PKGBUILD
+++ b/Misc/android-devel/PKGBUILD
@@ -6,4 +6,4 @@ pkgdesc='Metapackage to pull all dependencies required to build Android'
 arch=('x86_64')
 url='https://wiki.archlinux.org/index.php/Android#Building_Android'
 license=('None')
-depends=('gcc-multilib' 'git' 'gnupg' 'flex' 'bison' 'gperf' 'sdl' 'wxgtk' 'squashfs-tools' 'curl' 'ncurses' 'zlib' 'schedtool' 'perl-switch' 'zip' 'unzip' 'libxslt' 'python2-virtualenv' 'bc' 'rsync' 'lib32-zlib' 'lib32-ncurses' 'lib32-readline' 'xml2' 'lzop' 'pngcrush' 'imagemagick' 'repo' 'ccache' 'maven' 'gradle' 'ninja' 'lib32-ncurses5-compat-libs' 'ncurses5-compat-libs')
+depends=('gcc-multilib' 'git' 'gnupg' 'flex' 'bison' 'gperf' 'sdl' 'wxgtk' 'squashfs-tools' 'curl' 'ncurses' 'zlib' 'schedtool' 'perl-switch' 'zip' 'unzip' 'libxslt' 'python2-virtualenv' 'bc' 'rsync' 'lib32-zlib' 'lib32-ncurses' 'lib32-readline' 'xml2' 'lzop' 'pngcrush' 'imagemagick' 'repo' 'ccache' 'maven' 'gradle' 'ninja' 'lib32-ncurses5-compat-libs' 'ncurses5-compat-libs' 'firejail')
diff --git a/Patches/LineageOS-14.1/android_external_svox/94d2ddb.diff b/Patches/LineageOS-14.1/android_external_svox/94d2ddb.diff
deleted file mode 100644
index b316dd3c..00000000
--- a/Patches/LineageOS-14.1/android_external_svox/94d2ddb.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-From 94d2ddb00a2dbcaa4b352a3fceaaa5e6296a9ae0 Mon Sep 17 00:00:00 2001
-From: Daniel Micay <danielmicay@gmail.com>
-Date: Sun, 13 Nov 2016 02:01:45 -0500
-Subject: [PATCH] force 32-bit build to fix garbled output
-
-Pico TTS is currently broken on 64-bit. There was an attempt to port it,
-but the voices are garbled, perhaps due to integer truncation. Until it
-gets fixed (if ever), it needs to be compiled as 32-bit.
-
-Change-Id: Iae009dafc41796169999cab2dae4b246be2ea0f4
----
-
-diff --git a/pico/Android.mk b/pico/Android.mk
-index 2f6420e..e35e6be 100755
---- a/pico/Android.mk
-+++ b/pico/Android.mk
-@@ -8,6 +8,7 @@
- include $(CLEAR_VARS)
- 
- LOCAL_PACKAGE_NAME := PicoTts
-+LOCAL_MULTILIB := 32
- 
- LOCAL_SRC_FILES := \
-     $(call all-java-files-under, src) \
-diff --git a/pico/compat/jni/Android.mk b/pico/compat/jni/Android.mk
-index 5a7180c..9b3ad60 100755
---- a/pico/compat/jni/Android.mk
-+++ b/pico/compat/jni/Android.mk
-@@ -2,6 +2,7 @@
- include $(CLEAR_VARS)
- 
- LOCAL_MODULE:= libttscompat
-+LOCAL_MULTILIB := 32
- 
- LOCAL_SRC_FILES:= \
- 	com_android_tts_compat_SynthProxy.cpp
-diff --git a/pico/lib/Android.mk b/pico/lib/Android.mk
-index 70f0099..cdf0026 100644
---- a/pico/lib/Android.mk
-+++ b/pico/lib/Android.mk
-@@ -4,6 +4,7 @@
- include $(CLEAR_VARS)
- 
- LOCAL_MODULE := libsvoxpico
-+LOCAL_MULTILIB := 32
- 
- LOCAL_SRC_FILES := \
- 	picoacph.c \
-diff --git a/pico/tts/Android.mk b/pico/tts/Android.mk
-index 335a1c2..0f0d737 100644
---- a/pico/tts/Android.mk
-+++ b/pico/tts/Android.mk
-@@ -7,6 +7,7 @@
- include $(CLEAR_VARS)
- 
- LOCAL_MODULE := libttspico_engine
-+LOCAL_MULTILIB := 32
- 
- LOCAL_SRC_FILES := \
- 	com_svox_picottsengine.cpp \
-@@ -36,6 +37,7 @@
- include $(CLEAR_VARS)
- 
- LOCAL_MODULE := libttspico
-+LOCAL_MULTILIB := 32
- 	
- LOCAL_SRC_FILES := \
- 	com_svox_picottsengine.cpp \
diff --git a/Scripts/Generic_Deblob.sh b/Scripts/Generic_Deblob.sh
index 257a9e67..0e3e74ba 100755
--- a/Scripts/Generic_Deblob.sh
+++ b/Scripts/Generic_Deblob.sh
@@ -77,8 +77,8 @@ export base;
 
 	#DRM
 	blobs=$blobs"|lib-sec-disp.so|libSecureUILib.so|libsecureui.so|libsecureuisvc_jni.so|libsecureui_svcsock.so";
-	blobs=$blobs"|liboemcrypto.so|libSSEPKCS11.so|libtzdrmgenprov.so";
-	blobs=$blobs"|libpvr.so|librmp.so|libsi.so";
+	blobs=$blobs"|liboemcrypto.so|libtzdrmgenprov.so";
+	blobs=$blobs"|libpvr.so|librmp.so|libsi.so|libSSEPKCS11.so";
 
 	#Face Unlock [Google]
 	blobs=$blobs"|libfacenet.so|libfilterpack_facedetect.so|libfrsdk.so";
diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh
index 5758e241..211f3d7e 100755
--- a/Scripts/LAOS-14.1_Patches.sh
+++ b/Scripts/LAOS-14.1_Patches.sh
@@ -52,17 +52,29 @@ disableDexPreOpt() {
 }
 
 enableGlonass() {
-	#GLONASS
-	sed -i 's/#A_GLONASS_POS_PROTOCOL_SELECT/A_GLONASS_POS_PROTOCOL_SELECT/' gps.conf gps/gps.conf configs/gps.conf || true;
-	sed -i 's/A_GLONASS_POS_PROTOCOL_SELECT = 0/A_GLONASS_POS_PROTOCOL_SELECT = 15/' gps.conf gps/gps.conf configs/gps.conf || true;
-	sed -i 's/A_GLONASS_POS_PROTOCOL_SELECT=0/A_GLONASS_POS_PROTOCOL_SELECT=15/' overlay/frameworks/base/core/res/res/values-*/*.xml || true;
+	sed -i 's/#A_GLONASS_POS_PROTOCOL_SELECT/A_GLONASS_POS_PROTOCOL_SELECT/' $1/gps.conf $1/gps/gps.conf $1/configs/gps.conf || true;
+	sed -i 's/A_GLONASS_POS_PROTOCOL_SELECT = 0.*/A_GLONASS_POS_PROTOCOL_SELECT = 15/' $1/gps.conf $1/gps/gps.conf $1/configs/gps.conf || true;
+	sed -i 's/A_GLONASS_POS_PROTOCOL_SELECT=0.*/A_GLONASS_POS_PROTOCOL_SELECT=15/' overlay/frameworks/base/core/res/res/values-*/*.xml || true;
 	echo "Enabled GLONASS";
 }
+export -f enableGlonass;
+
+enableXtraHttps() {
+	sed -i 's|http://xtrapath|https://xtrapath|' $1/overlay/frameworks/base/core/res/res/values-*/*.xml $1/gps.conf $1/gps/gps.conf $1/configs/gps.conf || true;
+	echo "Switched XTRA to HTTPS";
+}
+export -f enableXtraHttps;
 
 enableZram() {
 	sed -i 's|#/dev/block/zram0|/dev/block/zram0|' fstab.* rootdir/fstab.* rootdir/etc/fstab.* || true;
 	echo "Enabled zram";
 }
+
+#Enable GLONASS and HTTPS XTRA for all devices
+find $base"device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableGlonass "$0"' {} \;
+find $base"device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableXtraHttps "$0"' {} \;
+exit
+
 #
 #END OF PREPRATION
 #
@@ -82,9 +94,6 @@ patch -p1 < $patches"android_device_qcom_sepolicy/0001-Camera_Fix.patch" #Fix ca
 enter "external/sqlite"
 patch -p1 < $patches"android_external_sqlite/0001-Secure_Delete.patch" #Enable secure_delete by default
 
-enter "external/svox"
-patch -p1 < $patches"android_external_svox/94d2ddb.diff" #Fix garbled output See https://android-review.googlesource.com/#/c/302872/
-
 enter "frameworks/base"
 git revert 0326bb5e41219cf502727c3aa44ebf2daa19a5b3 #re-enable doze on devices without gms
 git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/37 && git cherry-pick FETCH_HEAD #network traffic
@@ -196,11 +205,9 @@ sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod
 #
 enter "device/motorola/clark"
 enableDexPreOpt
-enableGlonass
 
 enter "device/oneplus/bacon"
 enableDexPreOpt
-enableGlonass
 sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/
 
 enter "kernel/oneplus/msm8974"
@@ -208,7 +215,6 @@ patch -p1 < $patches"android_kernel_oneplus_msm8974/0001-OverUnderClock-EXTREME.
 
 enter "device/lge/mako"
 disableDexPreOpt #bootloops
-enableGlonass
 #patch -p1 < $patches"android_device_lge_mako/0001-Enable_LTE.patch" #Enable LTE support (Requires LTE hybrid modem to be flashed) XXX: Doesn't seem to work under 7.x
 
 enter "kernel/lge/hammerhead"