diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index ab8f387c..4c7c57b7 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -150,10 +150,6 @@
 	<project path="device/motorola/clark" name="LineageOS/android_device_motorola_clark" remote="github" />
 	<project path="kernel/motorola/msm8992" name="LineageOS/android_kernel_motorola_msm8992" remote="github" />
 
-	<!-- Nextbit Robin (ether) -->
-	<project path="device/nextbit/ether" name="LineageOS/android_device_nextbit_ether" remote="github" />
-	<project path="kernel/nextbit/msm8992" name="LineageOS/android_kernel_nextbit_msm8992" remote="github" />
-
 	<!-- Nexus 5 (hammerhead) -->
 	<project path="device/lge/hammerhead" name="LineageOS/android_device_lge_hammerhead" remote="github" />
 	<project path="kernel/lge/hammerhead" name="LineageOS/android_kernel_lge_hammerhead" remote="github" />
@@ -209,7 +205,6 @@
 	<project path="vendor/htc" name="TheMuppets/proprietary_vendor_htc" remote="github" />
 	<project path="vendor/lge" name="TheMuppets/proprietary_vendor_lge" remote="github" />
 	<project path="vendor/motorola" name="TheMuppets/proprietary_vendor_motorola" remote="github" />
-	<project path="vendor/nextbit" name="TheMuppets/proprietary_vendor_nextbit" remote="github" />
 	<project path="vendor/samsung" name="TheMuppets/proprietary_vendor_samsung" remote="github" />
 <!-- END OF DEVICE REPOS -->
 
diff --git a/Misc/Features/Disable_Firebase_Analytics.txt b/Misc/Features/Disable_Firebase_Analytics.txt
index 9f4e5d06..4ece1690 100644
--- a/Misc/Features/Disable_Firebase_Analytics.txt
+++ b/Misc/Features/Disable_Firebase_Analytics.txt
@@ -1,6 +1,69 @@
-Try and automatically add the following when parsing AndroidManifest
+It turns out some ad/analytics SDKs used by various proprietary Android apps can be disabled/kneecapped by adding meta-data entries to the apps AndroidManifest
+In order for an app to read its meta-data from its own AndroidManifest it actuallly has to go through the getPackageManager() call
+This means we can change the system package parser and simply add these variables to every app
+This would hopefully make usage of proprietary apps more private, granted they are still proprietary and can very well simply ignore these
 
-<meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
-<meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
+core/java/android/content/pm/PackageParser.java
+parseMetaData
+line 5526
 
-core/java/android/content/pm/PackageItemInfo.java ?
+data.putBoolean("batch_opted_out_by_default", true);
+data.putBoolean("com.ad4screen.no_geoloc", true);
+data.putBoolean("com.bugsnag.android.AUTO_CAPTURE_SESSIONS", false);
+data.putBoolean("com.bugsnag.android.ENABLE_EXCEPTION_HANDLER", false);
+data.putBoolean("com.bugsnag.android.PERSIST_USER_BETWEEN_SESSIONS", false);
+data.putBoolean("com.bugsnag.android.SEND_THREADS", false);
+data.putBoolean("com.facebook.sdk.AutoLogAppEventsEnabled", false);
+data.putBoolean("com.followanalytics.message.inapp.enable", false);
+data.putBoolean("com.followanalytics.message.push.enable", false);
+data.putBoolean("com.mixpanel.android.MPConfig.AutoShowMixpanelUpdates", false);
+data.putBoolean("com.mixpanel.android.MPConfig.DisableAppOpenEvent", true);
+data.putBoolean("com.mixpanel.android.MPConfig.DisableDecideChecker", true);
+data.putBoolean("com.mixpanel.android.MPConfig.DisableFallback", true);
+data.putBoolean("com.mixpanel.android.MPConfig.DisableGestureBindingUI", true);
+data.putBoolean("com.mixpanel.android.MPConfig.DisableViewCrawler", true);
+data.putBoolean("com.mixpanel.android.MPConfig.TestMode", true);
+data.putBoolean("com.mixpanel.android.MPConfig.UseIpAddressForGeolocation", false);
+data.putBoolean("com.webengage.sdk.android.location_tracking", false);
+data.putBoolean("engagement:adm:register", false);
+data.putBoolean("engagement:locationReport:lazyArea", false);
+data.putBoolean("engagement:locationReport:realTime:background", false);
+data.putBoolean("engagement:locationReport:realTime", false);
+data.putBoolean("engagement:locationReport:realTime:fine", false);
+data.putBoolean("engagement:log:test", false);
+data.putBoolean("engagement:reportCrash", false);
+data.putBoolean("firebase_analytics_collection_deactivated", true);
+data.putBoolean("firebase_analytics_collection_enabled", false);
+data.putBoolean("firebase_crash_collection_enabled", false);
+data.putBoolean("firebase_performance_collection_deactivated", true);
+data.putBoolean("FYBEnableSSLRewardedVideo", true);
+data.putBoolean("google_analytics_adid_collection_enabled", false);
+data.putBoolean("mceSessionEnabled", false);
+data.putBoolean("tapjoy.disable_video_offers", true);
+data.putInteger("CLEVERTAP_USE_GOOGLE_AD_ID", 0)
+data.putInteger("engagement:connection:delay", 2629800);
+data.putString("apptentive_api_key", "");
+data.putString("apptentive_key", "");
+data.putString("apptentive_signature", "");
+data.putString("__ChartboostAir__AppID", "");
+data.putString("__ChartboostAir__AppSignature", "");
+data.putString("com.ad4screen.facebook_appid", "");
+data.putString("com.ad4screen.partnerid", "");
+data.putString("com.ad4screen.privatekey", "");
+data.putString("com.ad4screen.senderid", "");
+data.putString("com.ad4screen.tracking_mode", "Restricted");
+data.putString("com.appsee.ApiKey", "");
+data.putString("com.blueshift.gcm_sender_id", "");
+data.putString("com.google.android.awareness.API_KEY", "");
+data.putString("com.pushwoosh.appid", "");
+data.putString("com.pushwoosh.senderid", "");
+data.putString("com.sprooki.LOCATION_SERVICES", "disable");
+data.putString("com.upsight.app_token", "");
+data.putString("com.upsight.public_key", "");
+data.putString("FAID", "");
+data.putString("io.branch.sdk.BranchKey", "");
+data.putString("io.emma.SESSION_KEY", "");
+data.putString("net.hockeyapp.android.appIdentifier", "");
+data.putString("pilgrim_sdk_key", "");
+data.putString("pilgrim_sdk_secret", "");
+data.putString("presage_key", "");
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 09146da2..eee4c7f7 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2018-04-27
 
 patchAllKernels() {
-	startPatcher "kernel_amazon_hdx-common kernel_asus_msm8916 kernel_fairphone_msm8974 kernel_htc_msm8994 kernel_lge_hammerhead kernel_lge_msm8992 kernel_lge_msm8996 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_nextbit_msm8992 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890";
+	startPatcher "kernel_amazon_hdx-common kernel_asus_msm8916 kernel_fairphone_msm8974 kernel_htc_msm8994 kernel_lge_hammerhead kernel_lge_msm8992 kernel_lge_msm8996 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890";
 }
 export -f patchAllKernels;
 
@@ -53,7 +53,6 @@ buildAll() {
 #TODO: Add victara, athene, us997, us996, pme, t0lte, hlte
 	brunch lineage_thor-userdebug; #deprecated
 	brunch lineage_clark-user;
-	brunch lineage_ether-user;
 	brunch lineage_FP2-user;
 #	brunch lineage_h815-user; #deprecated (UPSTREAM) drivers/input/touchscreen/DS5/RefCode_CustomerImplementation.c:147:1: warning: the frame size of 2064 bytes is larger than 2048 bytes
 	brunch lineage_h850-userdebug;
diff --git a/Scripts/LineageOS-14.1/Overclock.sh b/Scripts/LineageOS-14.1/Overclock.sh
index 41865f8d..13327b20 100644
--- a/Scripts/LineageOS-14.1/Overclock.sh
+++ b/Scripts/LineageOS-14.1/Overclock.sh
@@ -48,13 +48,5 @@ patch -p1 < $patches"android_kernel_common_msm8992/0005-Overclock.patch";
 patch -p1 < $patches"android_kernel_common_msm8992/0006-Overclock.patch";
 patch -p1 < $patches"android_kernel_common_msm8992/0007-Overclock.patch";
 
-enter "kernel/nextbit/msm8992";
-patch -p1 < $patches"android_kernel_common_msm8992/0001-Overclock.patch";
-patch -p1 < $patches"android_kernel_common_msm8992/0003-Overclock.patch";
-patch -p1 < $patches"android_kernel_common_msm8992/0004-Overclock.patch";
-patch -p1 < $patches"android_kernel_common_msm8992/0005-Overclock.patch";
-patch -p1 < $patches"android_kernel_common_msm8992/0006-Overclock.patch";
-patch -p1 < $patches"android_kernel_common_msm8992/0007-Overclock.patch";
-
 cd $base;
 echo "Overclocks applied!";
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index b33ccccb..b6d319f7 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -66,6 +66,8 @@ patch -p1 < $patches"android_bootable_recovery/0001-Squash_Menus.patch"; #What's
 enterAndClear "build";
 patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch"; #Automated build signing (CopperheadOS-13.0)
 sed -i 's/messaging/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence
+sed -i 's/ro.secure=0/ro.secure=1/' core/main.mk;
+#sed -i 's/ro.adb.secure=0/ro.adb.secure=1/' core/main.mk;
 
 enterAndClear "device/qcom/sepolicy";
 patch -p1 < $patches"android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH
diff --git a/Scripts/LineageOS-15.1/Overclock.sh b/Scripts/LineageOS-15.1/Overclock.sh
index 96f6f36f..2263f461 100644
--- a/Scripts/LineageOS-15.1/Overclock.sh
+++ b/Scripts/LineageOS-15.1/Overclock.sh
@@ -62,6 +62,14 @@ echo "CONFIG_CPU_OVERCLOCK=y" >> arch/arm/configs/lineageos_mako_defconfig; #1.5
 #enter "kernel/motorola/msm8916";
 #patch -p1 < $patches"android_kernel_motorola_msm8916/0001-Overclock.patch"; #1.36Ghz -> 1.88Ghz	=+ 2.07Ghz
 
+enter "kernel/nextbit/msm8992";
+patch -p1 < $patches"android_kernel_common_msm8992/0001-Overclock.patch";
+patch -p1 < $patches"android_kernel_common_msm8992/0003-Overclock.patch";
+patch -p1 < $patches"android_kernel_common_msm8992/0004-Overclock.patch";
+patch -p1 < $patches"android_kernel_common_msm8992/0005-Overclock.patch";
+patch -p1 < $patches"android_kernel_common_msm8992/0006-Overclock.patch";
+patch -p1 < $patches"android_kernel_common_msm8992/0007-Overclock.patch";
+
 enter "kernel/oppo/msm8974";
 patch -p1 < $patches"android_kernel_oppo_msm8974/0001-OverUnderClock-EXTREME.patch"; #300Mhz -> 268Mhz, 2.45Ghz -> 2.95Ghz	=+2.02Ghz XXX: Not 100% stable under intense workloads