diff --git a/NightMode/Android.mk b/NightMode/Android.mk
index 0a763e2..48816a3 100644
--- a/NightMode/Android.mk
+++ b/NightMode/Android.mk
@@ -2,4 +2,6 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-NightMode
+LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 include $(BUILD_PACKAGE)
diff --git a/NightMode/AndroidManifest.xml b/NightMode/AndroidManifest.xml
index f0cbe4b..1b6b920 100644
--- a/NightMode/AndroidManifest.xml
+++ b/NightMode/AndroidManifest.xml
@@ -3,5 +3,8 @@
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
-                android:priority="3"/>
+                android:requiredSystemPropertyName="persist.sys.overlay.nightmode"
+                android:requiredSystemPropertyValue="true"
+		android:priority="3"
+		android:isStatic="true" />
 </manifest>
diff --git a/Picker/src/me/phh/treble/overlaypicker/Starter.java b/Picker/src/me/phh/treble/overlaypicker/Starter.java
index b889efc..fd6bc4e 100644
--- a/Picker/src/me/phh/treble/overlaypicker/Starter.java
+++ b/Picker/src/me/phh/treble/overlaypicker/Starter.java
@@ -32,13 +32,6 @@
 			setOverlayEnabled("me.phh.treble.overlay.navbar", true);
 	}
 
-	private void handleNightmode(Context ctxt) {
-		if("msm8998".equals(platform)) {
-			Log.d("OverlayPicker", "Enabling nightmode");
-			setOverlayEnabled("me.phh.treble.overlay.nightmode", true);
-		}
-	}
-
 	private void enableLte(Context ctxt) {
 		//TODO: List here all non-LTE platforms
 		if(!"mt6580".equals(platform))
@@ -51,7 +44,6 @@
 				ServiceManager.getService(Context.OVERLAY_SERVICE));
 
 		handleHtc(ctxt);
-		handleNightmode(ctxt);
 		enableLte(ctxt);
 
 		setOverlayEnabled("me.phh.treble.overlay.systemui.falselocks", true);