diff --git a/Misc/Features/SwiftShader.txt b/Misc/Features/SwiftShader.txt
index da4cbafe..d523a61a 100644
--- a/Misc/Features/SwiftShader.txt
+++ b/Misc/Features/SwiftShader.txt
@@ -13,10 +13,14 @@
 06-30 23:33:44.860  1445  1445 F DEBUG   :     #07 pc 0001b155  /system/lib/libc.so (__start_thread+32)
 
 
+https://groups.google.com/forum/#!topic/swiftshader/ROLHwRei7T8
+
+https://android.googlesource.com/platform/frameworks/native/+/e7f39727a484107b2d2a78eaaaacad3d7f44c24d%5E%21/#F0
+
 https://github.com/android-rpi/device_brcm_rpi3/wiki/Oreo-:-patch-framework-source
 https://github.com/android-rpi/device_brcm_rpi3/wiki
 
-frameworks/native/opengl/java/android/opengl/GLSurfaceView.java
+frameworks/base/opengl/java/android/opengl/GLSurfaceView.java
 @@ line 976 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
          public SimpleEGLConfigChooser(boolean withDepthBuffer) {
 -            super(8, 8, 8, 0, withDepthBuffer ? 16 : 0, 0);
@@ -24,7 +28,7 @@ frameworks/native/opengl/java/android/opengl/GLSurfaceView.java
          }
 
 
-frameworks/base/opengl/libs/EGL/eglApi.cpp
+frameworks/native/opengl/libs/EGL/eglApi.cpp
 @@ line 478 @@ EGLSurface eglCreateWindowSurface(  EGLDisplay dpy, EGLConfig config,
              // alpha-channel requested, there's really only one suitable format
 -            format = HAL_PIXEL_FORMAT_RGBA_8888;
diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh
index a8211ab7..846354fd 100755
--- a/Scripts/Common/Deblob.sh
+++ b/Scripts/Common/Deblob.sh
@@ -57,8 +57,8 @@ echo "Deblobbing..."
 
 	#AudioFX (Audio Effects) [Qualcomm]
 	if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
-		blobs=$blobs"|fmas_eq.dat|libasphere.so|libbundlewrapper.so|libdownmix.so|libeffectproxy.so|libfmas.so|libldnhncr.so|libmmieffectswrapper.so|libqcbassboost.so|libqcomvisualizer.so|libqcomvoiceprocessing.so|libqcreverb.so|libqcvirt.so|libreverbwrapper.so|libshoebox.so|libspeakerbundle.so|libvisualizer.so|libvolumelistener.so|libLifevibes_lvverx.so|libhwdap.so|libsonypostprocbundle.so|libsonysweffect.so";
-		makes=$makes"audio_effects.xml|libqcomvoiceprocessing";
+		blobs=$blobs"|fmas_eq.dat|libasphere.so|libdownmix.so|libeffectproxy.so|libfmas.so|libldnhncr.so|libmmieffectswrapper.so|libqcbassboost.so|libqcreverb.so|libqcvirt.so|libreverbwrapper.so|libshoebox.so|libspeakerbundle.so|libvisualizer.so|libvolumelistener.so|libLifevibes_lvverx.so|libhwdap.so|libsonypostprocbundle.so|libsonysweffect.so";
+		#blobs=$blobs"|libbundlewrapper.so|libqcompostprocbundle.so|libqcomvoiceprocessing.so|libqcomvisualizer.so";
 	fi;
 
 	#Camera
@@ -75,7 +75,7 @@ echo "Deblobbing..."
 	#CNE (Automatic Cell/Wi-Fi Switching) [Qualcomm]
 	#blobs=$blobs"|libcneapiclient.so|libNimsWrap.so"; #XXX: Breaks radio
 	blobs=$blobs"|andsfCne.xml|ATT_profile.*.xml|cnd|cneapiclient.jar|cneapiclient.xml|CNEService.apk|com.quicinc.cne.*.jar|com.quicinc.cne.*.so|com.quicinc.cne.xml|ConnectivityExt.jar|ConnectivityExt.xml|libcneconn.so|libcneqmiutils.so|libcne.so|libvendorconn.so|libwms.so|libwqe.so|profile1.xml|profile2.xml|profile3.xml|profile4.xml|profile5.xml|ROW_profile.*.xml|SwimConfig.xml|VZW_profile.*.xml";
-	makes=$makes"|libcnefeatureconfig";
+	makes=$makes"libcnefeatureconfig";
 	sepolicy=$sepolicy" cnd.te qcneservice.te";
 
 	#Diagnostics [Qualcomm]
@@ -307,7 +307,6 @@ deblobDevice() {
 			#sed -i 's/USE_OPENGL_RENDERER := true/USE_OPENGL_RENDERER := false/' BoardConfig.mk;
 			#if ! grep -q "USE_OPENGL_RENDERER := false" BoardConfig.mk; then echo "USE_OPENGL_RENDERER := false" >> BoardConfig.mk; fi;
 			awk -i inplace '!/RS_DRIVER/' BoardConfig.mk;
-
 			if ! grep -q "USE_OPENGL_RENDERER := true" BoardConfig.mk; then echo "USE_OPENGL_RENDERER := true" >> BoardConfig.mk; fi;
 		fi;
 	fi;
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index 5263be99..1e87f816 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -254,6 +254,7 @@ sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google
 sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/lge/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
 sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/motorola/msm8974/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile
 sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/motorola/msm8996/arch/arm64/configs/*_defconfig; #Breaks on compile
+sed -i "s/CONFIG_RANDOMIZE_BASE=y/# CONFIG_RANDOMIZE_BASE is not set/" kernel/samsung/universal9810/arch/arm64/configs/*_defconfig; #Breaks on compile
 #
 #END OF DEVICE CHANGES
 #