diff --git a/EFI/OC/config.BigSur.plist b/EFI/OC/config.BigSur.plist
index f8fc710f0eb34ae860dc812119b2ea430177ef8a..2fd4fe6a1661c1f765a35d4e01ead844f37cfa58 100644
--- a/EFI/OC/config.BigSur.plist
+++ b/EFI/OC/config.BigSur.plist
@@ -152,38 +152,45 @@
 	<dict>
 		<key>Add</key>
 		<dict>
-			<key>PciRoot(0x0)/Pci(0x2,0x0)</key>
-			<dict>
-				<key>AAPL,ig-platform-id</key>
-				<data>BwCbPg==</data>
-				<key>device-id</key>
-				<data>mz4AAA==</data>
-				<key>model</key>
-				<string>Intel UHD Graphics 630</string>
-			</dict>
-			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)</key>
+			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
 				<string>Thunderbolt</string>
 				<key>device_type</key>
-				<string>USB controller</string>
+				<string>System peripheral</string>
 				<key>model</key>
-				<string>Thunderbolt 3 USB Controller</string>
+				<string>Thunderbolt 3 NHI</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)</key>
+			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
 				<string>Thunderbolt</string>
 				<key>device_type</key>
-				<string>System peripheral</string>
+				<string>USB controller</string>
 				<key>model</key>
-				<string>Thunderbolt 3 NHI</string>
+				<string>Thunderbolt 3 USB Controller</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1D,0x5)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>compatible</key>
 				<string>pci14e4,16bc</string>
 			</dict>
+			<key>PciRoot(0x0)/Pci(0x1F,0x3)</key>
+			<dict>
+				<key>device-id</key>
+				<data>cJ0AAA==</data>
+				<key>layout-id</key>
+				<integer>23</integer>
+			</dict>
+			<key>PciRoot(0x0)/Pci(0x2,0x0)</key>
+			<dict>
+				<key>AAPL,ig-platform-id</key>
+				<data>BwCbPg==</data>
+				<key>device-id</key>
+				<data>mz4AAA==</data>
+				<key>model</key>
+				<string>Intel UHD Graphics 630</string>
+			</dict>
 		</dict>
 		<key>Delete</key>
 		<dict/>
diff --git a/EFI/OC/config.Catalina.plist b/EFI/OC/config.Catalina.plist
index d53d185ecc2aebb47d5bc34baff3d70ab9a6f634..f6dd70c4b3244f935e7c95cf03f6287b6658a90a 100644
--- a/EFI/OC/config.Catalina.plist
+++ b/EFI/OC/config.Catalina.plist
@@ -152,38 +152,45 @@
 	<dict>
 		<key>Add</key>
 		<dict>
-			<key>PciRoot(0x0)/Pci(0x2,0x0)</key>
-			<dict>
-				<key>AAPL,ig-platform-id</key>
-				<data>BwCbPg==</data>
-				<key>device-id</key>
-				<data>mz4AAA==</data>
-				<key>model</key>
-				<string>Intel UHD Graphics 630</string>
-			</dict>
-			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)</key>
+			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
 				<string>Thunderbolt</string>
 				<key>device_type</key>
-				<string>USB controller</string>
+				<string>System peripheral</string>
 				<key>model</key>
-				<string>Thunderbolt 3 USB Controller</string>
+				<string>Thunderbolt 3 NHI</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)</key>
+			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
 				<string>Thunderbolt</string>
 				<key>device_type</key>
-				<string>System peripheral</string>
+				<string>USB controller</string>
 				<key>model</key>
-				<string>Thunderbolt 3 NHI</string>
+				<string>Thunderbolt 3 USB Controller</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1D,0x5)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>compatible</key>
 				<string>pci14e4,16bc</string>
 			</dict>
+			<key>PciRoot(0x0)/Pci(0x1F,0x3)</key>
+			<dict>
+				<key>device-id</key>
+				<data>cJ0AAA==</data>
+				<key>layout-id</key>
+				<integer>23</integer>
+			</dict>
+			<key>PciRoot(0x0)/Pci(0x2,0x0)</key>
+			<dict>
+				<key>AAPL,ig-platform-id</key>
+				<data>BwCbPg==</data>
+				<key>device-id</key>
+				<data>mz4AAA==</data>
+				<key>model</key>
+				<string>Intel UHD Graphics 630</string>
+			</dict>
 		</dict>
 		<key>Delete</key>
 		<dict/>
diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist
index 5eed3457ee8ba578f8a9320dddd49449f99e6b48..a8691853fd9b4f43371f3b600e66e344389f0b0c 100644
--- a/EFI/OC/config.plist
+++ b/EFI/OC/config.plist
@@ -152,38 +152,45 @@
 	<dict>
 		<key>Add</key>
 		<dict>
-			<key>PciRoot(0x0)/Pci(0x2,0x0)</key>
-			<dict>
-				<key>AAPL,ig-platform-id</key>
-				<data>BwCbPg==</data>
-				<key>device-id</key>
-				<data>mz4AAA==</data>
-				<key>model</key>
-				<string>Intel UHD Graphics 630</string>
-			</dict>
-			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)</key>
+			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
 				<string>Thunderbolt</string>
 				<key>device_type</key>
-				<string>USB controller</string>
+				<string>System peripheral</string>
 				<key>model</key>
-				<string>Thunderbolt 3 USB Controller</string>
+				<string>Thunderbolt 3 NHI</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)</key>
+			<key>PciRoot(0x0)/Pci(0x1C,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>AAPL,slot-name</key>
 				<string>Thunderbolt</string>
 				<key>device_type</key>
-				<string>System peripheral</string>
+				<string>USB controller</string>
 				<key>model</key>
-				<string>Thunderbolt 3 NHI</string>
+				<string>Thunderbolt 3 USB Controller</string>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x1D,0x5)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>compatible</key>
 				<string>pci14e4,16bc</string>
 			</dict>
+			<key>PciRoot(0x0)/Pci(0x1F,0x3)</key>
+			<dict>
+				<key>device-id</key>
+				<data>cJ0AAA==</data>
+				<key>layout-id</key>
+				<integer>23</integer>
+			</dict>
+			<key>PciRoot(0x0)/Pci(0x2,0x0)</key>
+			<dict>
+				<key>AAPL,ig-platform-id</key>
+				<data>BwCbPg==</data>
+				<key>device-id</key>
+				<data>mz4AAA==</data>
+				<key>model</key>
+				<string>Intel UHD Graphics 630</string>
+			</dict>
 		</dict>
 		<key>Delete</key>
 		<dict/>