diff --git a/Changelogs/Changes-LAOS_14.1.txt b/Changelogs/Changes-LAOS_14.1.txt
index 85cda71f..70a5f7be 100644
--- a/Changelogs/Changes-LAOS_14.1.txt
+++ b/Changelogs/Changes-LAOS_14.1.txt
@@ -7,6 +7,7 @@ Warnings
 	- Do *not* use AdAway or any other Adblocker
 	- Flashing of any Gapps is not recommended and most likely won't work.
 	- No browser is installed by default, please install getChromium or IceCat from F-Droid. Chromium will be included in future releases.
+	- To enable Cell/Wi-Fi location resolving: microG Settings > UnifiedNlp Settings > Configure location backends > Check 'Mozilla Location Service'.
 
 Recommended Apps
 	- Visit https://spotco.us/faa after flashing to find a very comprehensive list of apps that can replace what you're used to
diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 5ff0261c..7b10a908 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -86,6 +86,7 @@
 	<project path="packages/apps/GmsCore" name="microg/android_packages_apps_GmsCore" remote="github" revision="master" />
 	<project path="packages/apps/GsfProxy" name="microg/android_packages_apps_GsfProxy" remote="github" revision="master" />
 	<project path="packages/apps/FakeStore" name="microg/android_packages_apps_FakeStore" remote="github" revision="master" />
+	<project path="packages/apps/IchnaeaNlpBackend" name="microg/IchnaeaNlpBackend" remote="github" revision="master" />
 
 	<!-- F-Droid -->
 	<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
diff --git a/Patches/LineageOS-14.1/android_packages_apps_IchnaeaNlpBackend/0001-Fixes.patch b/Patches/LineageOS-14.1/android_packages_apps_IchnaeaNlpBackend/0001-Fixes.patch
new file mode 100644
index 00000000..1f0bd5ca
--- /dev/null
+++ b/Patches/LineageOS-14.1/android_packages_apps_IchnaeaNlpBackend/0001-Fixes.patch
@@ -0,0 +1,42 @@
+From 5178642bc1092a259d1dd366859083ebe740bb6e Mon Sep 17 00:00:00 2001
+From: Tad <tad@spotco.us>
+Date: Sun, 29 Jan 2017 12:50:51 -0500
+Subject: [PATCH] Build fixes
+
+Change-Id: I5843e1df6191d76641893b452eb5e6e0b4334418
+---
+ Android.mk   | 2 +-
+ build.gradle | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Android.mk b/Android.mk
+index 1da0fbb..74fff61 100644
+--- a/Android.mk
++++ b/Android.mk
+@@ -7,7 +7,7 @@ LOCAL_MODULE_TAGS := optional
+ LOCAL_PACKAGE_NAME := IchnaeaNlpBackend
+ 
+ ichnaea_root  := $(LOCAL_PATH)
+-ichnaea_out   := $(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates
++ichnaea_out   := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates
+ ichnaea_build := $(ichnaea_root)/build
+ ichnaea_apk   := build/outputs/apk/IchnaeaNlpBackend-release-unsigned.apk
+ 
+diff --git a/build.gradle b/build.gradle
+index abfde7c..f80763c 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -58,8 +58,8 @@ dependencies {
+ }
+ 
+ android {
+-    compileSdkVersion 23
+-    buildToolsVersion "23.0.2"
++    compileSdkVersion 24
++    buildToolsVersion "25.0.1"
+ 
+     defaultConfig {
+         versionName getMyVersionName()
+-- 
+2.9.3
+
diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh
index 4bcb640e..01061777 100644
--- a/Scripts/LAOS-14.1_Patches.sh
+++ b/Scripts/LAOS-14.1_Patches.sh
@@ -79,6 +79,9 @@ patch -p1 < $patches"android_packages_apps_GsfProxy/0001-Fixes.patch" #Update ou
 enter "packages/apps/FakeStore"
 patch -p1 < $patches"android_packages_apps_FakeStore/0001-Fixes.patch" #Update output paths and build tools
 
+enter "packages/apps/IchnaeaNlpBackend"
+patch -p1 < $patches"android_packages_apps_IchnaeaNlpBackend/0001-Fixes.patch" #Update output paths and build tools
+
 enter "packages/apps/FDroid"
 patch -p1 < $patches"android_packages_apps_FDroid/0001.patch" #Enable privigled module
 patch -p1 < $patches"android_packages_apps_FDroid/0003.patch" #Hide app updates for apps that are installed to /system
@@ -113,7 +116,8 @@ patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.pat
 patch -p1 < $patches"android_packages_apps_SetupWizard/0002-No_GMS.patch" #Disable GMS page
 
 enter "frameworks/base"
-git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/8 && git cherry-pick FETCH_HEAD #Network Traffic
+#git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/11/154011/2 && git cherry-pick FETCH_HEAD #Pixel Colors
+git fetch https://review.lineageos.org/LineageOS/android_frameworks_base refs/changes/75/151975/10 && git cherry-pick FETCH_HEAD #Network Traffic
 git revert 2aaa0472da8d254da1f07aa65a664012b52410f4 #re-enable doze on devices without gms
 #patch -p1 < $patches"android_frameworks_base/0002-Failed_Unlock_Shutdown.patch" #Shutdown after five failed unlock attempts FIXME: Update shutdown() to match new args
 patch -p1 < $patches"android_frameworks_base/0003-Signature_Spoofing.patch" #Allow packages to spoof their signature (MicroG)