diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh
index 4eb44af7..27624e86 100755
--- a/Scripts/Common/Deblob.sh
+++ b/Scripts/Common/Deblob.sh
@@ -53,8 +53,10 @@ echo "Deblobbing..."
 	blobs=$blobs"|ATFWD-daemon|atfwd.apk";
 	sepolicy=$sepolicy" atfwd.te";
 
-	#AudioFX (Audio Effects) [Qualcomm] XXX: Breaks audio on some devices
-	#blobs=$blobs"|libqcbassboost.so|libqcreverb.so|libqcvirt.so";
+	#AudioFX (Audio Effects) [Qualcomm]
+	if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
+	blobs=$blobs"|libqcbassboost.so|libqcreverb.so|libqcvirt.so";
+	fi;
 
 	#Camera
 	#Attempted, don't waste your time...
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index eac54792..8141f79a 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -191,6 +191,10 @@ awk -i inplace '!/50-cm.sh/' config/common.mk; #Make sure our hosts is always us
 awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/common.mk; #Remove extra keys
 awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys
 sed -i '3iinclude vendor/cm/config/sce.mk' config/common.mk; #Include extra apps
+if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
+	awk -i inplace '!/AudioFX/' config/common.mk;
+	awk -i inplace '!/AudioService/' config/common.mk;
+fi;
 cp "$patches/android_vendor_cm/sce.mk" config/sce.mk;
 if [ "$MICROG_INCLUDED" = true ]; then cp "$patches/android_vendor_cm/sce-microG.mk" config/sce-microG.mk; fi;
 if [ "$MICROG_INCLUDED" = true ]; then echo "include vendor/cm/config/sce-microG.mk" >> config/sce.mk; fi;
@@ -206,6 +210,7 @@ if [ "$HOSTS_BLOCKING" = false ]; then sed -i '4iPRODUCT_COPY_FILES += vendor/cm
 
 enterAndClear "vendor/cmsdk";
 awk -i inplace '!/WeatherManagerServiceBroker/' cm/res/res/values/config.xml; #Disable Weather
+if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/CMAudioService/' cm/res/res/values/config.xml; fi;
 cp "$patches/cm_platform_sdk/profile_default.xml" cm/res/res/xml/profile_default.xml; #Replace default profiles with *way* better ones
 sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java; #Per app performance profiles fix
 #
diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh
index f521761f..5bf0d534 100755
--- a/Scripts/LineageOS-15.1/Patch.sh
+++ b/Scripts/LineageOS-15.1/Patch.sh
@@ -104,6 +104,7 @@ awk -i inplace '!/com.android.internal.R.bool.config_permissionReviewRequired/'
 
 enterAndClear "lineage-sdk";
 awk -i inplace '!/WeatherManagerServiceBroker/' lineage/res/res/values/config.xml; #Disable Weather
+if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/LineageAudioService/' lineage/res/res/values/config.xml; fi;
 cp "$patches/android_lineage-sdk/profile_default.xml" lineage/res/res/xml/profile_default.xml; #Replace default profiles with *way* better ones
 
 if [ "$MICROG_INCLUDED" = true ]; then
@@ -192,6 +193,7 @@ if [ "$HOSTS_BLOCKING" = true ]; then awk -i inplace '!/50-lineage.sh/' config/c
 awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/common.mk; #Remove extra keys
 awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys
 sed -i '3iinclude vendor/lineage/config/sce.mk' config/common.mk; #Include extra apps
+if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/AudioFX/' config/common.mk; fi;
 cp "$patches/android_vendor_lineage/sce.mk" config/sce.mk;
 if [ "$MICROG_INCLUDED" = true ]; then cp "$patches/android_vendor_lineage/sce-microG.mk" config/sce-microG.mk; fi;
 if [ "$MICROG_INCLUDED" = true ]; then echo "include vendor/lineage/config/sce-microG.mk" >> config/sce.mk; fi;
diff --git a/Scripts/init.sh b/Scripts/init.sh
index d0323175..fe130899 100644
--- a/Scripts/init.sh
+++ b/Scripts/init.sh
@@ -20,6 +20,7 @@
 #START OF USER CONFIGURABLE OPTIONS
 export androidWorkspace="/mnt/Drive-3/"; #XXX: THIS MUST BE CORRECT TO BUILD!
 
+export DEBLOBBER_REMOVE_AUDIOFX=false; #Set true to remove AudioFX
 export DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs
 export DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation
 export DEFAULT_DNS="OpenNIC"; #Sets default DNS. Options: Cloudflare, OpenNIC
@@ -32,7 +33,6 @@ export OVERCLOCKS_ENABLED=true; #Switch to false to disable overclocks
 export STRONG_ENCRYPTION_ENABLED=false; #Switch to true to enable AES-256bit encryption XXX: THIS WILL **DESTROY** EXISTING INSTALLS!
 export NON_COMMERCIAL_USE_PATCHES=false; #Switch to false to prevent inclusion of non-commercial use patches
 
-#XXX: Changing the following rebranding variables only updates textual references
 export REBRAND_NAME="DivestOS";
 export REBRAND_ZIP_PREFIX="divested";
 export REBRAND_LEGAL="https://divestos.xyz/index.php?page=privacy_policy";