diff --git a/Nokia/b2n/Android.mk b/Nokia/B2N-7Plus/Android.mk
similarity index 81%
rename from Nokia/b2n/Android.mk
rename to Nokia/B2N-7Plus/Android.mk
index 668916f..195ce14 100644
--- a/Nokia/b2n/Android.mk
+++ b/Nokia/B2N-7Plus/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-nokia-b2n
+LOCAL_PACKAGE_NAME := treble-overlay-nokia-b2n-7plus
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Nokia/b2n/AndroidManifest.xml b/Nokia/B2N-7Plus/AndroidManifest.xml
similarity index 87%
rename from Nokia/b2n/AndroidManifest.xml
rename to Nokia/B2N-7Plus/AndroidManifest.xml
index b7e9566..0c999cf 100644
--- a/Nokia/b2n/AndroidManifest.xml
+++ b/Nokia/B2N-7Plus/AndroidManifest.xml
@@ -1,5 +1,5 @@
+
+
diff --git a/Nokia/PNX-8.1-X7-SystemUI/res/values-sw372dp/config.xml b/Nokia/PNX-8.1-X7-SystemUI/res/values-sw372dp/config.xml
new file mode 100644
index 0000000..42a128e
--- /dev/null
+++ b/Nokia/PNX-8.1-X7-SystemUI/res/values-sw372dp/config.xml
@@ -0,0 +1,28 @@
+
+
+
+24.0px
+32.0px
+24.0px
+50.0px
+37.0px
+37.0px
+37.0px
+110.0px
+110.0px
+
diff --git a/Nokia/PNX-8.1-X7-SystemUI/res/values/config.xml b/Nokia/PNX-8.1-X7-SystemUI/res/values/config.xml
new file mode 100644
index 0000000..42a128e
--- /dev/null
+++ b/Nokia/PNX-8.1-X7-SystemUI/res/values/config.xml
@@ -0,0 +1,28 @@
+
+
+
+24.0px
+32.0px
+24.0px
+50.0px
+37.0px
+37.0px
+37.0px
+110.0px
+110.0px
+
diff --git a/Nokia/drg/Android.mk b/Nokia/PNX-8.1-X7/Android.mk
similarity index 80%
rename from Nokia/drg/Android.mk
rename to Nokia/PNX-8.1-X7/Android.mk
index 994aae0..e55aae1 100644
--- a/Nokia/drg/Android.mk
+++ b/Nokia/PNX-8.1-X7/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := treble-overlay-nokia-drg
+LOCAL_PACKAGE_NAME := treble-overlay-nokia-pnx-8.1-x7
LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
LOCAL_PRIVATE_PLATFORM_APIS := true
diff --git a/Nokia/PNX-8.1-X7/AndroidManifest.xml b/Nokia/PNX-8.1-X7/AndroidManifest.xml
new file mode 100644
index 0000000..0345834
--- /dev/null
+++ b/Nokia/PNX-8.1-X7/AndroidManifest.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/Nokia/PNX-8.1-X7/res/values/config.xml b/Nokia/PNX-8.1-X7/res/values/config.xml
new file mode 100644
index 0000000..e8d6699
--- /dev/null
+++ b/Nokia/PNX-8.1-X7/res/values/config.xml
@@ -0,0 +1,122 @@
+
+
+ true
+ true
+ true
+
+ 86px
+ 86px
+ 24dp
+ 110.0px
+ 110.0px
+ 10.0dip
+ 11.0dip
+
+ 1
+ 3300
+ 2
+ 3
+ 1
+ 2
+ 17
+ 128
+ 255
+ 600
+ 1
+ 2000
+ 8000
+
+
+ - 9
+ - 13
+ - 45
+ - 100
+ - 140
+ - 170
+ - 190
+ - 200
+ - 302
+ - 345
+ - 588
+
+
+ - 0
+ - 1
+ - 10
+ - 15
+ - 30
+ - 45
+ - 60
+ - 75
+ - 90
+ - 105
+ - 120
+ - 135
+ - 150
+ - 165
+ - 180
+ - 195
+ - 210
+ - 225
+ - 240
+ - 255
+
+
+ - 0
+ - 4
+ - 23
+ - 35
+ - 71
+ - 103
+ - 143
+ - 175
+ - 202
+ - 233
+ - 275
+ - 311
+ - 346
+ - 382
+ - 414
+ - 452
+ - 487
+ - 522
+ - 556
+ - 588
+
+
+ - 4
+ - 23
+ - 112
+ - 300
+ - 500
+ - 700
+ - 950
+ - 3050
+ - 7000
+ - 10000
+
+
+ - wifi,1,1,1,-1,true
+ - mobile,0,0,0,-1,true
+ - mobile_mms,2,0,4,60000,true
+ - mobile_supl,3,0,2,60000,true
+ - mobile_dun,4,0,2,60000,true
+ - mobile_hipri,5,0,3,60000,true
+ - mobile_fota,10,0,2,60000,true
+ - mobile_ims,11,0,2,60000,true
+ - mobile_cbs,12,0,2,60000,true
+ - wifi_p2p,13,1,0,-1,true
+ - ethernet,9,9,9,-1,true
+ - bluetooth,7,7,2,-1,true
+ - mobile_emergency,15,0,5,-1,true
+
+
+ - 1,1
+ - 0,1
+ - 9,1
+
+
+
+ true
+ M315,0c-16.7,0-31.6,10.4-37.3,26.1l-8.5,23.3C261.5,72.4,240.4,86,217.1,86H-217.1 c-23.3,0-44.7-14.7-52.2-36.6l-8.5-23.3C-283.4,10.4,-298.3,0,-315,0H315z
+
diff --git a/Nokia/PNX-8.1-X7/res/xml/power_profile.xml b/Nokia/PNX-8.1-X7/res/xml/power_profile.xml
new file mode 100644
index 0000000..96e4c26
--- /dev/null
+++ b/Nokia/PNX-8.1-X7/res/xml/power_profile.xml
@@ -0,0 +1,100 @@
+
+
+ - 0
+ - 127.2
+ - 296.6
+ - 13.65
+ - 0.47
+ - 0.28
+ - 171.9
+ - 43.43
+ - 11.79
+ - 75.35
+ - 288
+ - 550
+ - 50
+ - 134.8
+ - 10
+
+ 2
+ 1
+
+ - 0
+ - 0
+ - 0
+ - 0
+
+ 6
+ 2
+
+
+ 300000
+ 576000
+ 748800
+ 998400
+ 1209600
+ 1324800
+ 1516800
+ 1612800
+ 1708800
+
+
+ 35.5
+ 40.0
+ 42.5
+ 48.7
+ 54.1
+ 57.5
+ 64.2
+ 68.4
+ 73.7
+
+
+ 300000
+ 652800
+ 825600
+ 979200
+ 1132800
+ 1363200
+ 1536000
+ 1747200
+ 1843200
+ 1996800
+ 2054400
+ 2169600
+ 2208000
+
+
+ 44.2
+ 60.7
+ 69.4
+ 80.6
+ 92.8
+ 117.7
+ 136.1
+ 161.2
+ 194.3
+ 224.5
+ 248.6
+ 285.3
+ 293.6
+
+ - 4
+ - 17
+ - 3500
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+ - 0
+
+ - 0
+
+ .0002
+ .002
+ .02
+ .2
+ 2
+
+
\ No newline at end of file
diff --git a/overlay.mk b/overlay.mk
index ac8beb1..541416b 100644
--- a/overlay.mk
+++ b/overlay.mk
@@ -46,10 +46,12 @@ PRODUCT_PACKAGES += \
treble-overlay-moto-g6plus \
treble-overlay-moto-g7play \
treble-overlay-moto-g7power \
- treble-overlay-nokia-PL2 \
- treble-overlay-nokia-b2n \
- treble-overlay-nokia-ctl \
- treble-overlay-nokia-drg \
+ treble-overlay-nokia-b2n-7plus \
+ treble-overlay-nokia-ctl-7.1 \
+ treble-overlay-nokia-drg-6.1plus-x6 \
+ treble-overlay-nokia-pl2-6.1 \
+ treble-overlay-nokia-pnx-8.1-x7 \
+ treble-overlay-nokia-pnx-8.1-x7-systemui \
treble-overlay-nubia-z18mini \
treble-overlay-oneplus-op6 \
treble-overlay-oneplus-op6t \