diff --git a/.DS_Store b/.DS_Store
index 6ccd107f..fe5e5d83 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/EFI/.DS_Store b/EFI/.DS_Store
index 40ada80e..d7433a74 100755
Binary files a/EFI/.DS_Store and b/EFI/.DS_Store differ
diff --git a/EFI/CLOVER/.DS_Store b/EFI/CLOVER/.DS_Store
index e794cb9a..951bb2fb 100755
Binary files a/EFI/CLOVER/.DS_Store and b/EFI/CLOVER/.DS_Store differ
diff --git a/EFI/CLOVER/ACPI/.DS_Store b/EFI/CLOVER/ACPI/.DS_Store
index a0d74b7b..40c4c250 100755
Binary files a/EFI/CLOVER/ACPI/.DS_Store and b/EFI/CLOVER/ACPI/.DS_Store differ
diff --git a/EFI/CLOVER/ACPI/patched/.DS_Store b/EFI/CLOVER/ACPI/patched/.DS_Store
index b4833b40..ae560f3e 100755
Binary files a/EFI/CLOVER/ACPI/patched/.DS_Store and b/EFI/CLOVER/ACPI/patched/.DS_Store differ
diff --git a/EFI/CLOVER/ACPI/patched/SSDT-PNLF.aml b/EFI/CLOVER/ACPI/patched/SSDT-PNLF.aml
old mode 100755
new mode 100644
index 74c37dff..f0512a24
Binary files a/EFI/CLOVER/ACPI/patched/SSDT-PNLF.aml and b/EFI/CLOVER/ACPI/patched/SSDT-PNLF.aml differ
diff --git a/EFI/CLOVER/ACPI/patched/SSDT-PXSX.aml b/EFI/CLOVER/ACPI/patched/SSDT-PXSX.aml
deleted file mode 100755
index 415686c9..00000000
Binary files a/EFI/CLOVER/ACPI/patched/SSDT-PXSX.aml and /dev/null differ
diff --git a/EFI/CLOVER/config.plist b/EFI/CLOVER/config.plist
index 19d6ad1e..ee8b470c 100755
--- a/EFI/CLOVER/config.plist
+++ b/EFI/CLOVER/config.plist
@@ -17,7 +17,7 @@
 				<key>AddMCHC</key>
 				<true/>
 				<key>AddPNLF</key>
-				<true/>
+				<false/>
 				<key>FixADP1</key>
 				<true/>
 				<key>FixRTC</key>
@@ -283,98 +283,144 @@
 		</dict>
 		<key>Properties</key>
 		<dict>
+			<key>PciRoot(0x0)/Pci(0x0,0x0)</key>
+			<dict>
+				<key>AAPL,slot-name</key>
+				<string>Internal</string>
+				<key>device_type</key>
+				<string>Host bridge</string>
+				<key>model</key>
+				<string>Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers</string>
+			</dict>
 			<key>PciRoot(0x0)/Pci(0x14,0x0)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
-				<string>PCI-Express</string>
+				<string>Internal</string>
+				<key>device_type</key>
+				<string>USB controller</string>
 				<key>model</key>
-				<string>Intel Sunrise Point-LP USB 3.0 xHCI Controller</string>
-				<key>name</key>
-				<string>pci8086,9d2f</string>
+				<string>Sunrise Point-LP USB 3.0 xHCI Controller</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x15,0x0)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
-				<string>PCI-Express</string>
+				<string>Internal</string>
 				<key>device_type</key>
-				<string>I2C</string>
+				<string>Signal processing controller</string>
 				<key>model</key>
-				<string>Intel Sunrise Point-LP Serial IO I2C Controller #0</string>
+				<string>Sunrise Point-LP Serial IO I2C Controller #0</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x15,0x1)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
-				<string>PCI-Express</string>
+				<string>Internal</string>
 				<key>device_type</key>
-				<string>I2C</string>
+				<string>Signal processing controller</string>
 				<key>model</key>
-				<string>Intel Sunrise Point-LP Serial IO I2C Controller #1</string>
+				<string>Sunrise Point-LP Serial IO I2C Controller #1</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x16,0x0)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
-				<string>PCI-Express</string>
+				<string>Internal</string>
+				<key>device_type</key>
+				<string>Communication controller</string>
+				<key>model</key>
+				<string>Sunrise Point-LP CSME HECI #1</string>
+			</dict>
+			<key>PciRoot(0x0)/Pci(0x17,0x0)</key>
+			<dict>
+				<key>AAPL,slot-name</key>
+				<string>Internal</string>
 				<key>device_type</key>
-				<string>IMEI</string>
+				<string>SATA controller</string>
 				<key>model</key>
-				<string>Intel Sunrise Point-LP CSME HECI #1</string>
+				<string>Sunrise Point-LP SATA Controller [AHCI mode]</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x0)</key>
 			<dict>
-				<key>reg-ltrovr</key>
-				<data>
-				AAQAAAAAAAA=
-				</data>
+				<key>AAPL,slot-name</key>
+				<string>Internal</string>
+				<key>device_type</key>
+				<string>PCI bridge</string>
+				<key>model</key>
+				<string>Sunrise Point-LP PCI Express Root Port #1</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x4)</key>
 			<dict>
-				<key>reg-ltrovr</key>
-				<data>
-				AAQAAAAAAAA=
-				</data>
+				<key>AAPL,slot-name</key>
+				<string>Internal</string>
+				<key>device_type</key>
+				<string>PCI bridge</string>
+				<key>model</key>
+				<string>Sunrise Point-LP PCI Express Root Port #5</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x7)</key>
+			<key>PciRoot(0x0)/Pci(0x1c,0x4)/Pci(0x0,0x0)</key>
 			<dict>
-				<key>reg-ltrovr</key>
-				<data>
-				AAQAAAAAAAA=
-				</data>
+				<key>AAPL,slot-name</key>
+				<string>Internal@2,0,0</string>
+				<key>device_type</key>
+				<string>Network controller</string>
+				<key>model</key>
+				<string>Wireless 8265 / 8275</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x8)</key>
+			<key>PciRoot(0x0)/Pci(0x1d,0x0)</key>
 			<dict>
-				<key>reg-ltrovr</key>
-				<data>
-				AAQAAAAAAAA=
-				</data>
+				<key>AAPL,slot-name</key>
+				<string>Internal</string>
+				<key>device_type</key>
+				<string>PCI bridge</string>
+				<key>model</key>
+				<string>Sunrise Point-LP PCI Express Root Port #9</string>
+			</dict>
+			<key>PciRoot(0x0)/Pci(0x1d,0x0)/Pci(0x0,0x0)</key>
+			<dict>
+				<key>AAPL,slot-name</key>
+				<string>Internal@3,0,0</string>
+				<key>device_type</key>
+				<string>Non-Volatile memory controller</string>
+				<key>model</key>
+				<string>NVMe SSD Controller SM981/PM981</string>
+			</dict>
+			<key>PciRoot(0x0)/Pci(0x1f,0x0)</key>
+			<dict>
+				<key>AAPL,slot-name</key>
+				<string>Internal</string>
+				<key>device_type</key>
+				<string>ISA bridge</string>
+				<key>model</key>
+				<string>Sunrise Point LPC Controller/eSPI Controller</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1f,0x2)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
-				<string>PCI-Express</string>
+				<string>Internal</string>
 				<key>device_type</key>
-				<string>PCHPMC Controller</string>
+				<string>Memory controller</string>
 				<key>model</key>
-				<string>Intel Sunrise Point-LP PMC</string>
+				<string>Sunrise Point-LP PMC</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1f,0x3)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
-				<string>PCI-Express</string>
+				<string>Internal</string>
+				<key>device_type</key>
+				<string>Audio device</string>
 				<key>hda-gfx</key>
 				<string>onboard-1</string>
-				<key>hda-idle-support</key>
-				<string>1</string>
 				<key>layout-id</key>
 				<integer>99</integer>
 				<key>model</key>
-				<string>Intel Sunrise Point-LP HD Audio</string>
+				<string>Sunrise Point-LP HD Audio</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1f,0x4)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
-				<string>PCI-Express</string>
+				<string>Internal</string>
+				<key>device_type</key>
+				<string>SMBus</string>
 				<key>model</key>
-				<string>Intel Sunrise Point-LP SMBus</string>
+				<string>Sunrise Point-LP SMBus</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x2,0x0)</key>
 			<dict>
@@ -391,11 +437,13 @@
 				AAAWWQ==
 				</data>
 				<key>AAPL,slot-name</key>
-				<string>PCI-Express</string>
+				<string>Internal</string>
 				<key>device-id</key>
 				<data>
 				FlkAAA==
 				</data>
+				<key>device_type</key>
+				<string>VGA compatible controller</string>
 				<key>disable-external-gpu</key>
 				<data>
 				AQAAAA==
@@ -426,12 +474,14 @@
 				</data>
 				<key>hda-gfx</key>
 				<string>onboard-1</string>
+				<key>model</key>
+				<string>HD Graphics 620</string>
 			</dict>
 		</dict>
 		<key>SetIntelBacklight</key>
-		<true/>
+		<false/>
 		<key>SetIntelMaxBacklight</key>
-		<true/>
+		<false/>
 		<key>USB</key>
 		<dict>
 			<key>FixOwnership</key>