diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 4048b1cf..31f118a0 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -11,6 +11,23 @@
 	<remove-project name="device/sample" />
 	<remove-project name="LineageOS/android_external_ant-wireless_ant_native" />
 	<remove-project name="LineageOS/android_external_ant-wireless_ant_service" />
+	<remove-project name="LineageOS/android_external_bash" />
+	<remove-project name="LineageOS/android_external_htop" />
+	<remove-project name="LineageOS/android_external_libncurses" />
+	<remove-project name="LineageOS/android_external_nano" />
+	<remove-project name="LineageOS/android_external_openssh" />
+	<remove-project name="LineageOS/android_external_powertop" />
+	<remove-project name="LineageOS/android_external_rsync" />
+	<remove-project name="LineageOS/android_external_unrar" />
+	<remove-project name="LineageOS/android_external_vim" />
+	<!-- Untested
+	<remove-project name="LineageOS/android_external_libtar" />
+	<remove-project name="LineageOS/android_external_ntfs-3g" />
+	<remove-project name="LineageOS/android_external_p7zip" />
+	<remove-project name="LineageOS/android_external_pigz" />
+	<remove-project name="LineageOS/android_external_unzip" />
+	<remove-project name="LineageOS/android_external_yaffs2" />
+	<remove-project name="LineageOS/android_external_zip" />-->
 	<remove-project name="LineageOS/android_hardware_intel_common_libmix" />
 	<remove-project name="LineageOS/android_hardware_intel_common_libva" />
 	<remove-project name="LineageOS/android_hardware_intel_common_libwsbm" />
@@ -68,22 +85,6 @@
 	<remove-project name="platform/prebuilts/go/darwin-x86" />
 	<remove-project name="platform/prebuilts/ninja/darwin-x86" />
 	<remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
-	<remove-project name="LineageOS/android_external_unrar" />
-	<!-- Untested
-	<remove-project name="LineageOS/android_external_bash" />
-	<remove-project name="LineageOS/android_external_htop" />
-	<remove-project name="LineageOS/android_external_libncurses" />
-	<remove-project name="LineageOS/android_external_libtar" />
-	<remove-project name="LineageOS/android_external_nano" />
-	<remove-project name="LineageOS/android_external_ntfs-3g" />
-	<remove-project name="LineageOS/android_external_openssh" />
-	<remove-project name="LineageOS/android_external_p7zip" />
-	<remove-project name="LineageOS/android_external_pigz" />
-	<remove-project name="LineageOS/android_external_rsync" />
-	<remove-project name="LineageOS/android_external_unzip" />
-	<remove-project name="LineageOS/android_external_vim" />
-	<remove-project name="LineageOS/android_external_yaffs2" />
-	<remove-project name="LineageOS/android_external_zip" />-->
 <!-- END OF UNNECESSARY REPO REMOVAL -->
 
 <!-- START OF ADDITIONAL REPOS -->
diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index 6f70f644..bb7c80c5 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -11,7 +11,23 @@
 	<remove-project name="device/sample" />
 	<remove-project name="LineageOS/android_external_ant-wireless_ant_native" />
 	<remove-project name="LineageOS/android_external_ant-wireless_ant_service" />
+	<remove-project name="LineageOS/android_external_bash" />
+	<remove-project name="LineageOS/android_external_htop" />
+	<remove-project name="LineageOS/android_external_libncurses" />
+	<remove-project name="LineageOS/android_external_nano" />
+	<remove-project name="LineageOS/android_external_openssh" />
+	<remove-project name="LineageOS/android_external_powertop" />
+	<remove-project name="LineageOS/android_external_rsync" />
 	<remove-project name="LineageOS/android_external_unrar" />
+	<remove-project name="LineageOS/android_external_vim" />
+	<!-- Untested
+	<remove-project name="LineageOS/android_external_libtar" />
+	<remove-project name="LineageOS/android_external_ntfs-3g" />
+	<remove-project name="LineageOS/android_external_p7zip" />
+	<remove-project name="LineageOS/android_external_pigz" />
+	<remove-project name="LineageOS/android_external_unzip" />
+	<remove-project name="LineageOS/android_external_yaffs2" />
+	<remove-project name="LineageOS/android_external_zip" />-->
 	<remove-project name="LineageOS/android_packages_apps_Jelly" />
 	<remove-project name="LineageOS/android_packages_apps_LockClock" />
 	<remove-project name="LineageOS/android_packages_apps_ManagedProvisioning" />
@@ -53,21 +69,6 @@
 	<remove-project name="platform/prebuilts/gdb/darwin-x86" />
 	<remove-project name="platform/prebuilts/go/darwin-x86" />
 	<remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
-	<!-- Untested
-	<remove-project name="LineageOS/android_external_bash" />
-	<remove-project name="LineageOS/android_external_htop" />
-	<remove-project name="LineageOS/android_external_libncurses" />
-	<remove-project name="LineageOS/android_external_libtar" />
-	<remove-project name="LineageOS/android_external_nano" />
-	<remove-project name="LineageOS/android_external_ntfs-3g" />
-	<remove-project name="LineageOS/android_external_openssh" />
-	<remove-project name="LineageOS/android_external_p7zip" />
-	<remove-project name="LineageOS/android_external_pigz" />
-	<remove-project name="LineageOS/android_external_rsync" />
-	<remove-project name="LineageOS/android_external_unzip" />
-	<remove-project name="LineageOS/android_external_vim" />
-	<remove-project name="LineageOS/android_external_yaffs2" />
-	<remove-project name="LineageOS/android_external_zip" />-->
 <!-- END OF UNNECESSARY REPO REMOVAL -->
 
 <!-- START OF ADDITIONAL REPOS -->
diff --git a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
index bb2ea93e..107ec034 100644
--- a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
+++ b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk
@@ -13,7 +13,7 @@ PRODUCT_PACKAGES += \
 # F-Droid
 PRODUCT_PACKAGES += \
     F-Droid \
-    FDroidPrivilegedExtension
+    F-DroidPrivilegedExtension
 
 # Others
 PRODUCT_PACKAGES += \
diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk b/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk
index bb2ea93e..107ec034 100644
--- a/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk
+++ b/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk
@@ -13,7 +13,7 @@ PRODUCT_PACKAGES += \
 # F-Droid
 PRODUCT_PACKAGES += \
     F-Droid \
-    FDroidPrivilegedExtension
+    F-DroidPrivilegedExtension
 
 # Others
 PRODUCT_PACKAGES += \
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh
deleted file mode 100644
index 7cd9f6be..00000000
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-cd $base"kernel/lge/msm8974"
-git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2015-8939/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2016-0806/prima/0001.patch
-git apply $cvePatchesLinux/CVE-2016-0806/prima/0006.patch
-git apply $cvePatchesLinux/CVE-2016-0806/prima/0007.patch
-git apply $cvePatchesLinux/CVE-2016-0806/prima/0010.patch
-git apply $cvePatchesLinux/CVE-2016-6751/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch
-git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch
-git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch
-git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch
-git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch
-git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch
-git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch
-git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch
-git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch
-git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
-git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p23"
-cd $base
diff --git a/Scripts/LineageOS-14.1/Defaults.sh b/Scripts/LineageOS-14.1/Defaults.sh
index cbfa7b43..8a6ede24 100644
--- a/Scripts/LineageOS-14.1/Defaults.sh
+++ b/Scripts/LineageOS-14.1/Defaults.sh
@@ -36,13 +36,6 @@ sed -i '/string\/rooted/!b;n;s/defaultValue="true"/defaultValue="false"/' app/sr
 sed -i 's|DEFAULT_HIDE_ANTI_FEATURE_APPS = false;|DEFAULT_HIDE_ANTI_FEATURE_APPS = true;|' app/src/main/java/org/fdroid/fdroid/Preferences.java; #Hide anti-feature apps
 sed -i '/string\/hide_anti_feature_apps/!b;n;s/defaultValue="false"/defaultValue="true"/' app/src/main/res/xml/preferences.xml;
 
-enter "packages/apps/Jelly"
-sed -i 's|default_suggestion_provider">GOOGLE|default_suggestion_provider">NONE|' app/src/main/res/values/strings.xml; #Disable search suggestions
-sed -i 's|KEY_LOCATION, true|KEY_LOCATION, false|' app/src/main/java/org/lineageos/jelly/utils/PrefsUtils.java; #Disable location
-sed -i 's|KEY_DO_NOT_TRACK, false|KEY_DO_NOT_TRACK, true|' app/src/main/java/org/lineageos/jelly/utils/PrefsUtils.java; #Enable do not track
-sed -i 's|KEY_SAVE_FORM_DATA, true|KEY_SAVE_FORM_DATA, false|' app/src/main/java/org/lineageos/jelly/utils/PrefsUtils.java; #Disable form data saving
-sed -i 's|KEY_REMOVE_IDENTIFYING_HEADERS, false|KEY_REMOVE_IDENTIFYING_HEADERS, true|' app/src/main/java/org/lineageos/jelly/utils/PrefsUtils.java; #Remove certain headers
-
 enter "packages/apps/Nfc"
 sed -i 's/static final boolean NFC_ON_DEFAULT = true;/static final boolean NFC_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NFC
 sed -i 's/static final boolean NDEF_PUSH_ON_DEFAULT = true;/static final boolean NDEF_PUSH_ON_DEFAULT = false;/' src/com/android/nfc/NfcService.java; #Disable NDEF Push