diff --git a/EFI/OC/Config.plist b/EFI/OC/Config.plist
index 6962d3d..c9558c6 100755
--- a/EFI/OC/Config.plist
+++ b/EFI/OC/Config.plist
@@ -1910,13 +1910,13 @@
 			<key>LauncherPath</key>
 			<string>Default</string>
 			<key>PickerAttributes</key>
-			<integer>1</integer>
+			<integer>17</integer>
 			<key>PickerAudioAssist</key>
 			<false/>
 			<key>PickerMode</key>
 			<string>External</string>
 			<key>PickerVariant</key>
-			<string>Auto</string>
+			<string>Modern</string>
 			<key>PollAppleHotKeys</key>
 			<false/>
 			<key>ShowPicker</key>
@@ -2089,7 +2089,7 @@
 				</data>
 				<key>prev-lang:kbd</key>
 				<data>
-				Blbi1VU6Pg==
+				ZW4tVVM6MA==
 				</data>
 				<key>run-efi-updater</key>
 				<string>No</string>
@@ -2155,14 +2155,13 @@
 			<key>AdviseWindows</key>
 			<false/>
 			<key>MLB</key>
-			<string>M0000000000000001</string>
+			<string>0</string>
 			<key>MaxBIOSVersion</key>
 			<false/>
 			<key>ProcessorType</key>
 			<integer>0</integer>
 			<key>ROM</key>
 			<data>
-			ESIzRFVm
 			</data>
 			<key>SpoofVendor</key>
 			<true/>
@@ -2171,9 +2170,9 @@
 			<key>SystemProductName</key>
 			<string>MacBookPro12,1</string>
 			<key>SystemSerialNumber</key>
-			<string>W00000000001</string>
+			<string>0</string>
 			<key>SystemUUID</key>
-			<string>00000000-0000-0000-0000-000000000000</string>
+			<string>0</string>
 		</dict>
 		<key>UpdateDataHub</key>
 		<true/>
diff --git a/EFI/OC/Resources/Font/Font_1x.bin b/EFI/OC/Resources/Font/Font_1x.bin
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Font/Font_1x.png b/EFI/OC/Resources/Font/Font_1x.png
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Font/Font_2x.bin b/EFI/OC/Resources/Font/Font_2x.bin
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Font/Font_2x.png b/EFI/OC/Resources/Font/Font_2x.png
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Image/AppleRecv.icns b/EFI/OC/Resources/Image/AppleRecv.icns
old mode 100755
new mode 100644
index d69d201..4475304
Binary files a/EFI/OC/Resources/Image/AppleRecv.icns and b/EFI/OC/Resources/Image/AppleRecv.icns differ
diff --git a/EFI/OC/Resources/Image/AppleTM.icns b/EFI/OC/Resources/Image/AppleTM.icns
old mode 100755
new mode 100644
index 364026e..25478fa
Binary files a/EFI/OC/Resources/Image/AppleTM.icns and b/EFI/OC/Resources/Image/AppleTM.icns differ
diff --git a/EFI/OC/Resources/Image/Cursor.icns b/EFI/OC/Resources/Image/Cursor.icns
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Image/ExtAppleRecv.icns b/EFI/OC/Resources/Image/ExtAppleRecv.icns
old mode 100755
new mode 100644
index 5ad36e6..a9fae37
Binary files a/EFI/OC/Resources/Image/ExtAppleRecv.icns and b/EFI/OC/Resources/Image/ExtAppleRecv.icns differ
diff --git a/EFI/OC/Resources/Image/ExtAppleTM.icns b/EFI/OC/Resources/Image/ExtAppleTM.icns
old mode 100755
new mode 100644
index 70fe4c4..af4f4c1
Binary files a/EFI/OC/Resources/Image/ExtAppleTM.icns and b/EFI/OC/Resources/Image/ExtAppleTM.icns differ
diff --git a/EFI/OC/Resources/Image/ExtHardDrive.icns b/EFI/OC/Resources/Image/ExtHardDrive.icns
old mode 100755
new mode 100644
index 4824239..1206d23
Binary files a/EFI/OC/Resources/Image/ExtHardDrive.icns and b/EFI/OC/Resources/Image/ExtHardDrive.icns differ
diff --git a/EFI/OC/Resources/Image/ExtWindows.icns b/EFI/OC/Resources/Image/ExtWindows.icns
deleted file mode 100755
index 90eb804..0000000
Binary files a/EFI/OC/Resources/Image/ExtWindows.icns and /dev/null differ
diff --git a/EFI/OC/Resources/Image/HardDrive.icns b/EFI/OC/Resources/Image/HardDrive.icns
old mode 100755
new mode 100644
index 812a109..8112976
Binary files a/EFI/OC/Resources/Image/HardDrive.icns and b/EFI/OC/Resources/Image/HardDrive.icns differ
diff --git a/EFI/OC/Resources/Image/Left.icns b/EFI/OC/Resources/Image/Left.icns
new file mode 100644
index 0000000..d73684f
Binary files /dev/null and b/EFI/OC/Resources/Image/Left.icns differ
diff --git a/EFI/OC/Resources/Image/ModernAppleRecv.icns b/EFI/OC/Resources/Image/ModernAppleRecv.icns
new file mode 100644
index 0000000..54b49c9
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernAppleRecv.icns differ
diff --git a/EFI/OC/Resources/Image/ModernAppleTM.icns b/EFI/OC/Resources/Image/ModernAppleTM.icns
new file mode 100644
index 0000000..7acb4f3
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernAppleTM.icns differ
diff --git a/EFI/OC/Resources/Image/ModernCursor.icns b/EFI/OC/Resources/Image/ModernCursor.icns
new file mode 100644
index 0000000..e8ce44f
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernCursor.icns differ
diff --git a/EFI/OC/Resources/Image/ModernExtAppleRecv.icns b/EFI/OC/Resources/Image/ModernExtAppleRecv.icns
new file mode 100644
index 0000000..2ec68de
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernExtAppleRecv.icns differ
diff --git a/EFI/OC/Resources/Image/ModernExtAppleTM.icns b/EFI/OC/Resources/Image/ModernExtAppleTM.icns
new file mode 100644
index 0000000..ec13a62
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernExtAppleTM.icns differ
diff --git a/EFI/OC/Resources/Image/ModernExtHardDrive.icns b/EFI/OC/Resources/Image/ModernExtHardDrive.icns
new file mode 100644
index 0000000..890d769
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernExtHardDrive.icns differ
diff --git a/EFI/OC/Resources/Image/ModernHardDrive.icns b/EFI/OC/Resources/Image/ModernHardDrive.icns
new file mode 100644
index 0000000..ec8343f
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernHardDrive.icns differ
diff --git a/EFI/OC/Resources/Image/ModernLeft.icns b/EFI/OC/Resources/Image/ModernLeft.icns
new file mode 100644
index 0000000..d73684f
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernLeft.icns differ
diff --git a/EFI/OC/Resources/Image/ModernRight.icns b/EFI/OC/Resources/Image/ModernRight.icns
new file mode 100644
index 0000000..92dca82
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernRight.icns differ
diff --git a/EFI/OC/Resources/Image/ModernSelected.icns b/EFI/OC/Resources/Image/ModernSelected.icns
new file mode 100644
index 0000000..8c53ea2
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernSelected.icns differ
diff --git a/EFI/OC/Resources/Image/ModernSelector.icns b/EFI/OC/Resources/Image/ModernSelector.icns
new file mode 100644
index 0000000..45ca6c6
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernSelector.icns differ
diff --git a/EFI/OC/Resources/Image/ModernShell.icns b/EFI/OC/Resources/Image/ModernShell.icns
new file mode 100644
index 0000000..2e453d6
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernShell.icns differ
diff --git a/EFI/OC/Resources/Image/ModernTool.icns b/EFI/OC/Resources/Image/ModernTool.icns
new file mode 100644
index 0000000..d8e13fd
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernTool.icns differ
diff --git a/EFI/OC/Resources/Image/ModernWindows.icns b/EFI/OC/Resources/Image/ModernWindows.icns
new file mode 100644
index 0000000..cc9e1ad
Binary files /dev/null and b/EFI/OC/Resources/Image/ModernWindows.icns differ
diff --git a/EFI/OC/Resources/Image/OldAppleRecv.icns b/EFI/OC/Resources/Image/OldAppleRecv.icns
new file mode 100644
index 0000000..179244e
Binary files /dev/null and b/EFI/OC/Resources/Image/OldAppleRecv.icns differ
diff --git a/EFI/OC/Resources/Image/OldAppleTM.icns b/EFI/OC/Resources/Image/OldAppleTM.icns
new file mode 100644
index 0000000..5287181
Binary files /dev/null and b/EFI/OC/Resources/Image/OldAppleTM.icns differ
diff --git a/EFI/OC/Resources/Image/OldCursor.icns b/EFI/OC/Resources/Image/OldCursor.icns
new file mode 100644
index 0000000..e6b430d
Binary files /dev/null and b/EFI/OC/Resources/Image/OldCursor.icns differ
diff --git a/EFI/OC/Resources/Image/OldExtAppleRecv.icns b/EFI/OC/Resources/Image/OldExtAppleRecv.icns
new file mode 100644
index 0000000..b3272dc
Binary files /dev/null and b/EFI/OC/Resources/Image/OldExtAppleRecv.icns differ
diff --git a/EFI/OC/Resources/Image/OldExtAppleTM.icns b/EFI/OC/Resources/Image/OldExtAppleTM.icns
new file mode 100644
index 0000000..0038ac9
Binary files /dev/null and b/EFI/OC/Resources/Image/OldExtAppleTM.icns differ
diff --git a/EFI/OC/Resources/Image/OldExtHardDrive.icns b/EFI/OC/Resources/Image/OldExtHardDrive.icns
new file mode 100644
index 0000000..2a99bf5
Binary files /dev/null and b/EFI/OC/Resources/Image/OldExtHardDrive.icns differ
diff --git a/EFI/OC/Resources/Image/OldHardDrive.icns b/EFI/OC/Resources/Image/OldHardDrive.icns
new file mode 100644
index 0000000..ce33792
Binary files /dev/null and b/EFI/OC/Resources/Image/OldHardDrive.icns differ
diff --git a/EFI/OC/Resources/Image/OldLeft.icns b/EFI/OC/Resources/Image/OldLeft.icns
new file mode 100644
index 0000000..4e5eda3
Binary files /dev/null and b/EFI/OC/Resources/Image/OldLeft.icns differ
diff --git a/EFI/OC/Resources/Image/OldRight.icns b/EFI/OC/Resources/Image/OldRight.icns
new file mode 100644
index 0000000..106d899
Binary files /dev/null and b/EFI/OC/Resources/Image/OldRight.icns differ
diff --git a/EFI/OC/Resources/Image/OldSelected.icns b/EFI/OC/Resources/Image/OldSelected.icns
new file mode 100644
index 0000000..095b8f9
Binary files /dev/null and b/EFI/OC/Resources/Image/OldSelected.icns differ
diff --git a/EFI/OC/Resources/Image/OldSelector.icns b/EFI/OC/Resources/Image/OldSelector.icns
new file mode 100644
index 0000000..d0f6972
Binary files /dev/null and b/EFI/OC/Resources/Image/OldSelector.icns differ
diff --git a/EFI/OC/Resources/Image/OldShell.icns b/EFI/OC/Resources/Image/OldShell.icns
new file mode 100644
index 0000000..78bee4a
Binary files /dev/null and b/EFI/OC/Resources/Image/OldShell.icns differ
diff --git a/EFI/OC/Resources/Image/OldTool.icns b/EFI/OC/Resources/Image/OldTool.icns
new file mode 100644
index 0000000..d29bfc6
Binary files /dev/null and b/EFI/OC/Resources/Image/OldTool.icns differ
diff --git a/EFI/OC/Resources/Image/OldWindows.icns b/EFI/OC/Resources/Image/OldWindows.icns
new file mode 100644
index 0000000..4995b14
Binary files /dev/null and b/EFI/OC/Resources/Image/OldWindows.icns differ
diff --git a/EFI/OC/Resources/Image/Right.icns b/EFI/OC/Resources/Image/Right.icns
new file mode 100644
index 0000000..92dca82
Binary files /dev/null and b/EFI/OC/Resources/Image/Right.icns differ
diff --git a/EFI/OC/Resources/Image/Selected.icns b/EFI/OC/Resources/Image/Selected.icns
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Image/Selector.icns b/EFI/OC/Resources/Image/Selector.icns
old mode 100755
new mode 100644
index 5fb15af..c5f7651
Binary files a/EFI/OC/Resources/Image/Selector.icns and b/EFI/OC/Resources/Image/Selector.icns differ
diff --git a/EFI/OC/Resources/Image/Shell.icns b/EFI/OC/Resources/Image/Shell.icns
old mode 100755
new mode 100644
index 29db7ab..5fa71ea
Binary files a/EFI/OC/Resources/Image/Shell.icns and b/EFI/OC/Resources/Image/Shell.icns differ
diff --git a/EFI/OC/Resources/Image/Tool.icns b/EFI/OC/Resources/Image/Tool.icns
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Image/Windows.icns b/EFI/OC/Resources/Image/Windows.icns
old mode 100755
new mode 100644
index bb8d14d..57b6546
Binary files a/EFI/OC/Resources/Image/Windows.icns and b/EFI/OC/Resources/Image/Windows.icns differ
diff --git a/EFI/OC/Resources/Label/AppleRecv.l2x b/EFI/OC/Resources/Label/AppleRecv.l2x
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Label/AppleRecv.lbl b/EFI/OC/Resources/Label/AppleRecv.lbl
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Label/AppleTM.l2x b/EFI/OC/Resources/Label/AppleTM.l2x
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Label/AppleTM.lbl b/EFI/OC/Resources/Label/AppleTM.lbl
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Label/Other.l2x b/EFI/OC/Resources/Label/Other.l2x
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Label/Other.lbl b/EFI/OC/Resources/Label/Other.lbl
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Label/Shell.l2x b/EFI/OC/Resources/Label/Shell.l2x
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Label/Shell.lbl b/EFI/OC/Resources/Label/Shell.lbl
old mode 100755
new mode 100644
diff --git a/EFI/OC/Resources/Label/Windows.l2x b/EFI/OC/Resources/Label/Windows.l2x
index 0c7d8cc..87b014e 100755
Binary files a/EFI/OC/Resources/Label/Windows.l2x and b/EFI/OC/Resources/Label/Windows.l2x differ
diff --git a/EFI/OC/Resources/Label/Windows.lbl b/EFI/OC/Resources/Label/Windows.lbl
index 2278042..be97d86 100755
Binary files a/EFI/OC/Resources/Label/Windows.lbl and b/EFI/OC/Resources/Label/Windows.lbl differ