diff --git a/LG/V40/Android.mk b/LG/V40/Android.mk
new file mode 100644
index 0000000..9042c43
--- /dev/null
+++ b/LG/V40/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-lg-v40
+LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/LG/V40/AndroidManifest.xml b/LG/V40/AndroidManifest.xml
new file mode 100644
index 0000000..a0f4eb7
--- /dev/null
+++ b/LG/V40/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.lg.v40"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+                android:requiredSystemPropertyValue="+lge/judypn*"
+		android:priority="54"
+		android:isStatic="true" />
+</manifest>
diff --git a/LG/V40/res/values-land/notch.xml b/LG/V40/res/values-land/notch.xml
new file mode 100644
index 0000000..7e9d1fc
--- /dev/null
+++ b/LG/V40/res/values-land/notch.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/LG/V40/res/values/notch.xml b/LG/V40/res/values/notch.xml
new file mode 100644
index 0000000..ee3ffc8
--- /dev/null
+++ b/LG/V40/res/values/notch.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- Height of the status bar in portrait -->
+    <dimen name="status_bar_height_portrait">94px</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">94px</dimen>
+    <!-- Height of the status bar in landscape -->
+    <dimen name="status_bar_height_landscape">24dp</dimen>
+	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -250,0 L -250,94 L 250,94 L 250,0 Z</string>
+</resources>
\ No newline at end of file
diff --git a/Xiaomi/Mi8/res/values/notch.xml b/Xiaomi/Mi8/res/values/notch.xml
index 2f45c07..93b43fa 100644
--- a/Xiaomi/Mi8/res/values/notch.xml
+++ b/Xiaomi/Mi8/res/values/notch.xml
@@ -18,10 +18,10 @@
 -->
 <resources>
     <!-- Height of the status bar in portrait -->
-    <dimen name="status_bar_height_portrait">110px</dimen>
+    <dimen name="status_bar_height_portrait">88px</dimen>
     <!-- Height of the status bar -->
-    <dimen name="status_bar_height">110px</dimen>
+    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -295,0 L -295,88 L 295,88 L 295,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Xiaomi/Mi8EE/res/values/notch.xml b/Xiaomi/Mi8EE/res/values/notch.xml
index 2f45c07..93b43fa 100644
--- a/Xiaomi/Mi8EE/res/values/notch.xml
+++ b/Xiaomi/Mi8EE/res/values/notch.xml
@@ -18,10 +18,10 @@
 -->
 <resources>
     <!-- Height of the status bar in portrait -->
-    <dimen name="status_bar_height_portrait">110px</dimen>
+    <dimen name="status_bar_height_portrait">88px</dimen>
     <!-- Height of the status bar -->
-    <dimen name="status_bar_height">110px</dimen>
+    <dimen name="status_bar_height">88px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
 	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -295,0 L -295,88 L 295,88 L 295,0 Z</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Xiaomi/Mi8Lite/res/values/notch.xml b/Xiaomi/Mi8Lite/res/values/notch.xml
index cf0a8f5..0968a40 100644
--- a/Xiaomi/Mi8Lite/res/values/notch.xml
+++ b/Xiaomi/Mi8Lite/res/values/notch.xml
@@ -18,9 +18,10 @@
 -->
 <resources>
     <!-- Height of the status bar in portrait -->
-    <dimen name="status_bar_height_portrait">110px</dimen>
+    <dimen name="status_bar_height_portrait">81px</dimen>
     <!-- Height of the status bar -->
-    <dimen name="status_bar_height">110px</dimen>
+    <dimen name="status_bar_height">81px</dimen>
     <!-- Height of the status bar in landscape -->
     <dimen name="status_bar_height_landscape">24dp</dimen>
+	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -160,0 L -160,81 L 160,81 L 160,0 Z</string>
     </resources>
diff --git a/Xiaomi/Mi8Pro/res/values-land/notch.xml b/Xiaomi/Mi8Pro/res/values-land/notch.xml
new file mode 100644
index 0000000..7e9d1fc
--- /dev/null
+++ b/Xiaomi/Mi8Pro/res/values-land/notch.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/Xiaomi/Mi8Pro/res/values/notch.xml b/Xiaomi/Mi8Pro/res/values/notch.xml
new file mode 100644
index 0000000..93b43fa
--- /dev/null
+++ b/Xiaomi/Mi8Pro/res/values/notch.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- Height of the status bar in portrait -->
+    <dimen name="status_bar_height_portrait">88px</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">88px</dimen>
+    <!-- Height of the status bar in landscape -->
+    <dimen name="status_bar_height_landscape">24dp</dimen>
+	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -295,0 L -295,88 L 295,88 L 295,0 Z</string>
+</resources>
diff --git a/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk b/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk
new file mode 100644
index 0000000..0b7ba2a
--- /dev/null
+++ b/Xiaomi/RedmiNote6Pro-SystemUI/Android.mk
@@ -0,0 +1,6 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-xiaomi-redminote6pro-systemui
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Xiaomi/RedmiNote6Pro-SystemUI/AndroidManifest.xml b/Xiaomi/RedmiNote6Pro-SystemUI/AndroidManifest.xml
new file mode 100644
index 0000000..3f7056d
--- /dev/null
+++ b/Xiaomi/RedmiNote6Pro-SystemUI/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.xiaomi.redminote6pro.systemui"
+        android:versionCode="1"
+        android:versionName="1.0">
+        <overlay android:targetPackage="com.android.systemui"
+                android:requiredSystemPropertyName="ro.vendor.build.fingerprint"
+                android:requiredSystemPropertyValue="+*iaomi/tulip*"
+		android:priority="56" />
+</manifest>
diff --git a/Xiaomi/RedmiNote6Pro-SystemUI/res/values-sw372dp/dimens.xml b/Xiaomi/RedmiNote6Pro-SystemUI/res/values-sw372dp/dimens.xml
new file mode 100644
index 0000000..4b81351
--- /dev/null
+++ b/Xiaomi/RedmiNote6Pro-SystemUI/res/values-sw372dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2006, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+-->
+<resources>
+    <dimen name="rounded_corner_content_padding">46px</dimen>
+</resources>
diff --git a/Xiaomi/RedmiNote6Pro-SystemUI/res/values/dimens.xml b/Xiaomi/RedmiNote6Pro-SystemUI/res/values/dimens.xml
new file mode 100644
index 0000000..4b81351
--- /dev/null
+++ b/Xiaomi/RedmiNote6Pro-SystemUI/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2006, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+-->
+<resources>
+    <dimen name="rounded_corner_content_padding">46px</dimen>
+</resources>
diff --git a/Xiaomi/RedmiNote6Pro/res/values-land/notch.xml b/Xiaomi/RedmiNote6Pro/res/values-land/notch.xml
new file mode 100644
index 0000000..7e9d1fc
--- /dev/null
+++ b/Xiaomi/RedmiNote6Pro/res/values-land/notch.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">24dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/Xiaomi/RedmiNote6Pro/res/values/notch.xml b/Xiaomi/RedmiNote6Pro/res/values/notch.xml
new file mode 100644
index 0000000..c227fc1
--- /dev/null
+++ b/Xiaomi/RedmiNote6Pro/res/values/notch.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2017, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- Height of the status bar in portrait -->
+    <dimen name="status_bar_height_portrait">88px</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">88px</dimen>
+    <!-- Height of the status bar in landscape -->
+    <dimen name="status_bar_height_landscape">24dp</dimen>
+	<string translatable="false" name="config_mainBuiltInDisplayCutout">M -280,0 L -280,88 L 280,88 L 280,0 Z</string>
+    <!-- Radius of the software rounded corners. -->
+    <dimen name="rounded_corner_radius">92px</dimen>
+</resources>
diff --git a/build/build.sh b/build/build.sh
old mode 100644
new mode 100755
index aa2b738..15595c9
--- a/build/build.sh
+++ b/build/build.sh
@@ -2,8 +2,17 @@
 
 set -e
 
-export LD_LIBRARY_PATH=.
-export PATH=$PATH:.
+if [ "$1" == "--local-aapt" ];then
+    export LD_LIBRARY_PATH=.
+    export PATH=.:$PATH
+    shift
+fi
+
+if ! which aapt > /dev/null;then
+    export LD_LIBRARY_PATH=.
+    export PATH=$PATH:.
+fi
+
 if ! which aapt > /dev/null;then
     echo "Please install aapt (apt install aapt should do)"
     exit 1
diff --git a/overlay.mk b/overlay.mk
index d17be4c..1a8df4b 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -25,6 +25,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-huawei-telephony \
 	treble-overlay-lenovo-z5 \
 	treble-overlay-lg-g7 \
+	treble-overlay-lg-v40 \
 	treble-overlay-moto-g6 \
 	treble-overlay-moto-g6plus \
 	treble-overlay-nokia-b2n \
@@ -53,6 +54,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-xiaomi-redmi6pro \
 	treble-overlay-xiaomi-redminote5 \
 	treble-overlay-xiaomi-redminote6pro \
+	treble-overlay-xiaomi-redminote6pro-systemui \
 	treble-overlay-xiaomi-redmis2 \
 
 PRODUCT_PACKAGES += \